From e2b882cde716ff05bb2626f8d421ffe95a53b51f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 12 Nov 2012 17:31:31 +0530
Subject: [PATCH 01/12] [IMP] in leads & oppertunity form view, invisible
 Escalate button when sales team is blank

bzr revid: fka@tinyerp.com-20121112120131-n7blwfb96z5zz0ym
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5ff1bc15f69..d257c8780a4 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -189,7 +189,7 @@
                             <label for="section_id"/>
                             <div>
                                 <field name="section_id"/>
-                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
+                                <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
                             </div>
                             <field name="type" invisible="1"/>
                         </group>
@@ -452,7 +452,7 @@
                                 <label for="section_id"/>
                                 <div>
                                     <field name="section_id" widget="selection"/>
-                                    <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" />
+                                    <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
                                 </div>
                             </group>
                             <group>

From cb8330183e6ff2a86697a9c9b8da7af3ee9774bd Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 16 Nov 2012 11:52:22 +0530
Subject: [PATCH 02/12] [IMP] put update button in Quotation Sent status

bzr revid: fka@tinyerp.com-20121116062222-dbdqxbx5b2ay57n1
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9f385339173..04fe9f16c7b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -283,7 +283,7 @@
                                 <div class="oe_subtotal_footer_separator oe_inline">
                                     <label for="amount_total" />
                                     <button name="button_dummy"
-                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                        states="draft,sent" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                             </group>

From 949a24056feae89fe1c1e83743fc1526326fa4dc Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 4 Dec 2012 17:26:14 +0530
Subject: [PATCH 03/12] [IMP] improve code

bzr revid: fka@tinyerp.com-20121204115614-whx2azk2l42z8geu
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a509bf25333..f1af0765cc1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -453,7 +453,7 @@
                                 <label for="section_id"/>
                                 <div>
                                     <field name="section_id" widget="selection"/>
-                                    <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
                                 </div>
                             </group>
                             <group>

From c5e5201546cb520e2b0c9a20754a82f515b311bc Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 23 Dec 2012 04:39:49 +0000
Subject: [PATCH 04/12] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121222051100-uj56wf2s12hip7c9
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223043949-l8ore8omoj3zz7j6
---
 openerp/addons/base/i18n/ab.po       | 2249 ++++++++++--------
 openerp/addons/base/i18n/af.po       | 2249 ++++++++++--------
 openerp/addons/base/i18n/am.po       | 2272 ++++++++++--------
 openerp/addons/base/i18n/ar.po       | 2336 ++++++++++--------
 openerp/addons/base/i18n/bg.po       | 2348 ++++++++++--------
 openerp/addons/base/i18n/bs.po       | 2268 ++++++++++--------
 openerp/addons/base/i18n/ca.po       | 2349 ++++++++++--------
 openerp/addons/base/i18n/cs.po       | 2350 ++++++++++--------
 openerp/addons/base/i18n/da.po       | 2272 ++++++++++--------
 openerp/addons/base/i18n/de.po       | 2674 ++++++++++++---------
 openerp/addons/base/i18n/el.po       | 2332 ++++++++++--------
 openerp/addons/base/i18n/en_GB.po    | 2405 ++++++++++---------
 openerp/addons/base/i18n/es.po       | 2684 +++++++++++----------
 openerp/addons/base/i18n/es_AR.po    | 2348 ++++++++++--------
 openerp/addons/base/i18n/es_CL.po    | 2351 ++++++++++--------
 openerp/addons/base/i18n/es_CR.po    | 2439 ++++++++++---------
 openerp/addons/base/i18n/es_DO.po    | 2611 ++++++++++----------
 openerp/addons/base/i18n/es_EC.po    | 2383 ++++++++++---------
 openerp/addons/base/i18n/es_MX.po    | 2249 ++++++++++--------
 openerp/addons/base/i18n/es_VE.po    | 2254 ++++++++++--------
 openerp/addons/base/i18n/et.po       | 2336 ++++++++++--------
 openerp/addons/base/i18n/eu.po       | 2249 ++++++++++--------
 openerp/addons/base/i18n/fa.po       | 2332 ++++++++++--------
 openerp/addons/base/i18n/fa_AF.po    | 2249 ++++++++++--------
 openerp/addons/base/i18n/fi.po       | 2364 +++++++++---------
 openerp/addons/base/i18n/fr.po       | 2545 ++++++++++----------
 openerp/addons/base/i18n/gl.po       | 2349 ++++++++++--------
 openerp/addons/base/i18n/gu.po       | 2294 ++++++++++--------
 openerp/addons/base/i18n/he.po       | 2330 ++++++++++--------
 openerp/addons/base/i18n/hi.po       | 2249 ++++++++++--------
 openerp/addons/base/i18n/hr.po       | 2365 +++++++++---------
 openerp/addons/base/i18n/hu.po       | 3307 ++++++++++++++------------
 openerp/addons/base/i18n/hy.po       | 2273 ++++++++++--------
 openerp/addons/base/i18n/id.po       | 2258 ++++++++++--------
 openerp/addons/base/i18n/is.po       | 2269 ++++++++++--------
 openerp/addons/base/i18n/it.po       | 2402 ++++++++++---------
 openerp/addons/base/i18n/ja.po       | 2415 ++++++++++---------
 openerp/addons/base/i18n/ka.po       | 2342 ++++++++++--------
 openerp/addons/base/i18n/kk.po       | 2280 ++++++++++--------
 openerp/addons/base/i18n/ko.po       | 2302 ++++++++++--------
 openerp/addons/base/i18n/lt.po       | 2289 ++++++++++--------
 openerp/addons/base/i18n/lv.po       | 2345 ++++++++++--------
 openerp/addons/base/i18n/mk.po       | 2258 ++++++++++--------
 openerp/addons/base/i18n/mn.po       | 2500 ++++++++++---------
 openerp/addons/base/i18n/nb.po       | 2338 ++++++++++--------
 openerp/addons/base/i18n/nl.po       | 2643 +++++++++++---------
 openerp/addons/base/i18n/nl_BE.po    | 2254 ++++++++++--------
 openerp/addons/base/i18n/pl.po       | 2333 ++++++++++--------
 openerp/addons/base/i18n/pt.po       | 2396 ++++++++++---------
 openerp/addons/base/i18n/pt_BR.po    | 2510 ++++++++++---------
 openerp/addons/base/i18n/ro.po       | 2573 +++++++++++---------
 openerp/addons/base/i18n/ru.po       | 2404 ++++++++++---------
 openerp/addons/base/i18n/sk.po       | 2347 ++++++++++--------
 openerp/addons/base/i18n/sl.po       | 2920 +++++++++++------------
 openerp/addons/base/i18n/sq.po       | 2249 ++++++++++--------
 openerp/addons/base/i18n/sr.po       | 2341 ++++++++++--------
 openerp/addons/base/i18n/sr@latin.po | 2433 ++++++++++---------
 openerp/addons/base/i18n/sv.po       | 2335 ++++++++++--------
 openerp/addons/base/i18n/th.po       | 2252 ++++++++++--------
 openerp/addons/base/i18n/tlh.po      | 2249 ++++++++++--------
 openerp/addons/base/i18n/tr.po       | 2350 ++++++++++--------
 openerp/addons/base/i18n/uk.po       | 2318 ++++++++++--------
 openerp/addons/base/i18n/ur.po       | 2249 ++++++++++--------
 openerp/addons/base/i18n/vi.po       | 2295 ++++++++++--------
 openerp/addons/base/i18n/zh_CN.po    | 2465 ++++++++++---------
 openerp/addons/base/i18n/zh_HK.po    | 2263 ++++++++++--------
 openerp/addons/base/i18n/zh_TW.po    | 2317 ++++++++++--------
 67 files changed, 87029 insertions(+), 72130 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index be70e3eb1d3..c20632cfd4a 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-27 08:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Abkhazian <ab@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 04:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 026b1c1398b..e681d5321b1 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-21 07:32+0000\n"
 "Last-Translator: Jacobus Erasmus <jacobus@kewlconcepts.co.za>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "DagTyd"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -190,41 +190,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -232,7 +206,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -243,7 +217,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -254,7 +228,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -333,20 +307,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -354,11 +314,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -417,7 +372,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -454,6 +409,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -492,7 +448,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -544,7 +500,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -582,8 +538,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -609,26 +565,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -637,8 +573,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -712,14 +664,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -783,16 +733,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -821,11 +769,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -954,10 +912,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -976,7 +932,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1024,15 +980,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1130,8 +1079,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1146,12 +1124,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1178,7 +1161,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1206,7 +1236,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1238,14 +1268,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1380,7 +1408,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1402,7 +1430,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1417,7 +1445,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1543,7 +1578,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1658,18 +1707,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1750,7 +1794,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1791,11 +1835,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1810,7 +1849,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1851,6 +1890,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1927,16 +1971,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1991,7 +2030,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2015,11 +2054,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2031,7 +2070,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2069,11 +2107,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2206,6 +2239,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2239,12 +2277,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2292,6 +2335,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2343,7 +2395,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2421,7 +2473,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2468,11 +2519,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2589,8 +2635,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2669,7 +2726,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2728,6 +2785,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2736,7 +2806,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2822,7 +2892,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2852,7 +2922,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2917,22 +2987,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3026,12 +3096,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3048,17 +3118,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3068,7 +3140,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3119,34 +3191,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3185,7 +3229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3197,6 +3241,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3233,7 +3305,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3267,7 +3339,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3295,32 +3367,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3338,9 +3384,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3356,7 +3406,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3464,7 +3514,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3653,7 +3703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3664,13 +3713,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3730,9 +3784,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3743,7 +3798,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3762,13 +3817,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3798,12 +3876,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3852,19 +3926,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3882,7 +3944,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3927,7 +3989,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3946,8 +4008,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4004,13 +4100,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4026,8 +4127,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4086,32 +4187,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4190,7 +4268,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4262,6 +4339,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4323,8 +4405,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4405,6 +4494,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4428,6 +4533,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4455,6 +4597,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4532,12 +4680,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4552,7 +4694,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4563,13 +4704,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4612,6 +4758,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4627,7 +4775,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4720,7 +4868,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4808,7 +4961,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4923,6 +5076,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4936,7 +5094,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4947,7 +5105,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4979,6 +5137,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5142,7 +5311,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5158,16 +5327,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5208,8 +5372,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5273,15 +5438,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5297,6 +5453,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5380,6 +5541,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5630,7 +5797,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5687,6 +5854,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5802,13 +5978,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5828,7 +6006,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5861,9 +6039,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5897,6 +6074,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5907,7 +6089,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5923,26 +6105,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6075,11 +6237,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6091,8 +6248,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6199,7 +6356,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6237,7 +6394,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6264,8 +6421,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6298,6 +6483,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6340,7 +6532,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6432,7 +6624,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6452,23 +6644,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6501,10 +6676,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6578,8 +6753,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6603,8 +6778,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6652,18 +6827,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6768,6 +6938,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6862,7 +7039,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6963,12 +7139,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7010,6 +7180,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7067,7 +7238,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7087,6 +7258,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7098,13 +7274,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7135,7 +7316,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7181,7 +7362,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7201,30 +7381,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7312,6 +7492,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7395,6 +7580,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7424,11 +7624,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7453,7 +7648,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7464,8 +7658,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7544,7 +7753,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7631,14 +7840,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7647,7 +7858,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7658,13 +7869,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7683,12 +7894,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7861,7 +8073,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7890,14 +8102,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7921,7 +8125,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8036,7 +8239,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8351,7 +8554,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8363,7 +8566,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8373,7 +8576,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8388,6 +8591,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8427,7 +8641,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8449,14 +8663,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8481,7 +8695,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8493,7 +8707,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8571,7 +8784,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8599,8 +8812,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8624,7 +8837,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8771,7 +8984,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8810,8 +9023,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8885,7 +9098,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8899,7 +9112,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8962,6 +9175,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9060,8 +9278,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9090,13 +9308,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9117,7 +9335,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9165,7 +9383,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9211,6 +9429,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9219,7 +9438,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9238,6 +9457,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9273,7 +9529,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9325,6 +9581,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9367,23 +9628,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9417,7 +9666,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9508,6 +9757,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9712,7 +9966,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9723,13 +9977,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9897,7 +10156,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9930,6 +10189,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9955,6 +10219,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10044,7 +10313,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10080,13 +10348,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10145,19 +10420,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10171,6 +10471,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10189,7 +10491,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10201,13 +10508,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10289,6 +10589,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10358,6 +10678,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10416,9 +10741,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10436,8 +10761,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10476,13 +10801,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10493,7 +10817,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10522,36 +10851,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10573,6 +10872,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10589,16 +10893,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10615,8 +10909,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10642,11 +10936,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10672,7 +10961,7 @@ msgid "Domain"
 msgstr "Domein"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10688,12 +10977,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10714,29 +11003,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10757,7 +11026,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10804,7 +11073,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10828,6 +11096,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10913,19 +11182,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10967,22 +11245,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11115,7 +11377,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11205,7 +11466,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11255,8 +11516,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11347,7 +11608,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11374,7 +11635,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11460,7 +11721,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11473,7 +11734,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11518,8 +11779,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11527,7 +11786,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11556,12 +11815,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11668,8 +11921,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11706,7 +11961,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11842,11 +12097,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11863,7 +12113,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11886,7 +12136,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11928,13 +12178,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11983,73 +12233,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12057,13 +12242,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12240,6 +12460,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12256,7 +12481,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12304,7 +12529,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12480,10 +12705,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12515,12 +12744,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12534,7 +12764,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12556,23 +12785,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12640,24 +12852,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12686,6 +12882,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12722,6 +12938,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12789,6 +13006,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12878,6 +13100,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12890,7 +13113,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12921,16 +13144,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12995,6 +13222,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13067,29 +13299,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13137,7 +13346,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13181,8 +13390,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13427,9 +13636,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13456,62 +13670,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13553,17 +13718,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13598,7 +13752,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13678,11 +13832,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13697,6 +13850,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13717,6 +13875,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13753,41 +13935,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13848,40 +13995,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13970,6 +14085,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14012,34 +14142,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14062,9 +14164,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14075,7 +14177,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14101,7 +14233,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14146,7 +14278,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14179,11 +14311,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14199,8 +14330,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14315,7 +14444,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14327,7 +14456,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14360,7 +14488,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14371,8 +14499,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14398,11 +14526,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14492,7 +14615,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14559,8 +14681,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14588,7 +14714,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14649,6 +14775,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14673,7 +14830,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14712,6 +14869,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14764,6 +14927,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14788,6 +14958,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14804,7 +14979,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14825,14 +15000,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14869,7 +15081,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14887,11 +15104,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14927,11 +15148,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14959,7 +15175,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14970,7 +15186,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15036,7 +15252,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index bf0423a6f69..515617e0046 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2010-03-06 13:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 16:53+0000\n"
+"Last-Translator: Michael Telahun Makonnen <Unknown>\n"
 "Language-Team: Amharic <am@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,24 +25,27 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"የቼክ መጻፍያና ፕሪንት ማድረግያ ሞዱል\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "ቅድስት ህሊና"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "ሌሎቸ ማስተካከያዎች"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr ""
+msgstr "ቀንና ሰዓት"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -53,27 +56,27 @@ msgstr ""
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr ""
+msgstr "የዕይታ አወቃቀር"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "ጥቅሶች፣ የሽያጭ ትዕዛዞች፣ ዴሊቨሪና ኢንቮይስ መቆጣጠሪያ"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "ክፍተት አይኑረው"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr ""
+msgstr "ስፓኒሽ / ማግያር"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PY) / Español (PY)"
-msgstr ""
+msgstr "ስፓኒሽ (PY) / Español (PY)"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_project_management
@@ -186,41 +189,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +205,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +216,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +227,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +306,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +313,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +371,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +408,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +447,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +499,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +537,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +564,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +572,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +663,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +732,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +768,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +911,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +931,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +979,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1078,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1123,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1160,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1235,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1267,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1407,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1429,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1444,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1577,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1706,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1793,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1834,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1848,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1889,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1970,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2029,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2053,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2069,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2106,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2238,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2276,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2334,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2394,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2472,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2518,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2634,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2725,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2784,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2805,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2891,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2921,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2986,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3095,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3117,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3139,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3190,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3228,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3240,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3304,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3338,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3366,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3383,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3405,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3513,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3702,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3712,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3783,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3797,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3816,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3875,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3925,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3943,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3988,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4007,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4099,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4126,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4186,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4267,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4338,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4404,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4493,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4532,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4596,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4679,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4693,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4703,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4757,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4774,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4867,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4960,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5075,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5093,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5104,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5136,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5310,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5326,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5371,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5437,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5452,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5540,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5796,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5853,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5977,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6005,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6038,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6073,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6088,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6104,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6236,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6247,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6355,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6393,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6420,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6482,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6531,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6623,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6643,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6675,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6752,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6777,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6826,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6937,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7038,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7138,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7179,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7237,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7257,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7273,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7315,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7361,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7380,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7491,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7579,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7623,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7647,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7657,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7752,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7839,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7857,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7868,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7893,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8072,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8101,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8124,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8238,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8553,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8565,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8575,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8590,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8640,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8662,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8694,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8706,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8783,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8811,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8836,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8983,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9022,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9097,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9111,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9174,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9277,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9307,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9334,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9382,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9428,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9437,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9456,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9528,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9580,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9627,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9665,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9756,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9965,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9976,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10155,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10188,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10218,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10312,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10347,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10419,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10470,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10490,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10507,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10588,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10677,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10740,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10760,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10800,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10816,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10850,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10871,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10892,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10908,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10935,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10960,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10976,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +11002,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11025,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11072,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11095,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11181,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11244,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11376,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11465,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11515,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11607,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11634,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11720,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11733,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11778,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11785,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11814,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11920,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11960,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12096,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12112,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12135,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12177,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12232,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12241,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12459,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12480,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12528,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12704,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12743,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12763,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12784,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12851,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12881,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12937,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13005,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13099,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13112,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13143,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13221,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13298,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13345,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13389,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13635,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13669,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13717,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13751,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13831,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13849,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13874,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13934,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13994,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14084,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14141,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14163,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14176,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14232,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14277,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14310,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14329,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14443,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14455,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14487,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14498,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14525,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14614,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14680,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14713,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14774,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14829,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14868,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14926,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14957,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14978,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14999,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15080,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15103,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15147,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15174,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15185,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15251,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 326dc303817..ac43411e1b8 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-25 18:53+0000\n"
 "Last-Translator: waleed bazaza <waleed_bazaza@yahoo.com>\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: 2012-12-04 04:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "الوقت و التاريخ"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -190,41 +190,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "تحذير!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -234,7 +208,7 @@ msgstr ""
 "كود البايثون , و يستحسن استخدام برنامج إضافي!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "خطأ تقييد"
@@ -245,7 +219,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "إعادة تسمية الحقل \"%s\" غير مسموحة"
@@ -256,7 +230,7 @@ msgid "Swaziland"
 msgstr "سوازيلاند"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "تمّ الإنشاء"
@@ -335,20 +309,6 @@ msgstr "الشركة لحفظ السجل الحالي"
 msgid "Max. Size"
 msgstr "الحجم الأقصى"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -356,11 +316,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "اسم جهة الاتصال"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -419,7 +374,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -456,6 +411,7 @@ msgstr "قواعد الاحداث التلقائية"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "المالِك"
 
@@ -494,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -546,7 +502,7 @@ msgid "Netherlands Antilles"
 msgstr "جزر الأنتيل الهولندية"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -586,9 +542,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "طريقة العرض الأصلية"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "أفكار"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -613,26 +569,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "البوسنية/ bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -643,9 +579,25 @@ msgstr ""
 "اذا  طبع المستخدم نفس الملف المرفق"
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "أنجولا"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -720,14 +672,12 @@ msgid ""
 msgstr "القيمة الافتراضية فارغة (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "المعالجات"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "الحقول الخاصة يجب أن تيدأ باسم يبدأ بـ 'x_' !"
@@ -791,16 +741,14 @@ msgid "Model Description"
 msgstr "وصف النموذج"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -829,11 +777,21 @@ msgstr "صيغة المشغل"
 msgid "Jordan"
 msgstr "الأردن"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "تاريخ الحدث المقرر لاحقا لهذه الوظيفة."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -962,13 +920,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"يقدم اسم الحقل الذي يشير إليه معرف الحقل بالنسبة لععملية الكتابة. غ\\فإذا "
-"كان فارغاً فانه سوف يشير إلى المعرف النشظ في المشروع."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "بابوا غينيا الجديدة"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -987,7 +941,7 @@ msgid "Email Preferences"
 msgstr "تفضيلات البريد الالكتروني"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1035,16 +989,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "الأسبانية / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "الجوال"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1141,9 +1088,38 @@ msgid "Mongolia"
 msgstr "منغوليا"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1158,12 +1134,17 @@ msgstr ""
 "الاشخاص المضافون الى هذه المجموعة أضيفوا تلقائيا الى المجموعات التالية."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1190,7 +1171,54 @@ msgid "Username"
 msgstr "اسم المستخدم"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1220,7 +1248,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "فشلت محاولة الاتصال!"
@@ -1252,14 +1280,12 @@ msgid "South Korea"
 msgstr "كوريا الجنوبية"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "الانتقالات"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1397,7 +1423,7 @@ msgid "Marshall Islands"
 msgstr "جزر المارشال"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "لا يمكن تغيير نموذج أي حقل!"
@@ -1419,7 +1445,7 @@ msgid "Search"
 msgstr "بحث"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1437,7 +1463,14 @@ msgid "Parent Application"
 msgstr "التطبيق الرئيسي"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "المعالجات"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "تمّ إلغاء العملية"
@@ -1568,7 +1601,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "لا توجد لغة برمز \"%s\""
@@ -1688,18 +1735,13 @@ msgid "On Create"
 msgstr "عند الإنشاء"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1780,7 +1822,7 @@ msgid "East Timor"
 msgstr "تيمور الشرقية"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1821,11 +1863,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "معرف ملحقات"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1842,7 +1879,7 @@ msgstr ""
 "وضع مبسط للدفع وإصدار تلقائي لقوائم الالتقاط وغير ذلك."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1883,6 +1920,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "صلاحيات القراءة"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1959,16 +2001,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "نموذج ملحق"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2023,7 +2060,7 @@ msgid "Formula"
 msgstr "الصيغة"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "لا يمكن حذف المستخدم root!"
@@ -2047,11 +2084,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (نسخة)"
@@ -2063,7 +2100,6 @@ msgstr "قوالب المخططات البيانية للحسابات"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "نوع العنوان"
 
@@ -2101,11 +2137,6 @@ msgstr "المسار كاملاً"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "أفكار"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2238,6 +2269,11 @@ msgstr "عدد الوحدات البرمجية التي تمّ نحديثها"
 msgid "Method"
 msgstr "طريقة"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2271,12 +2307,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2326,6 +2367,15 @@ msgstr "بليز"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2379,7 +2429,7 @@ msgstr ""
 "'تقويم'، إلخ. (القيمة الافتراضية: شجرة، نموذج)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "ثمّة مستند تمّ تعديله بعد آخر مرة عاينته فيها (%s:%d)"
@@ -2457,7 +2507,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "الفاتورة"
 
@@ -2504,11 +2553,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2625,9 +2669,20 @@ msgid "Default limit for the list view"
 msgstr "الحد الافتراضي لطريقة عرض القائمة"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "بابوا غينيا الجديدة"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2705,7 +2760,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2764,6 +2819,19 @@ msgstr "ارتباطات الحقول"
 msgid "Export Translations"
 msgstr "تصدير ترجمة"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2772,7 +2840,7 @@ msgid "Manager"
 msgstr "المدير"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2858,7 +2926,7 @@ msgid "Inherited"
 msgstr "موروث"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2888,7 +2956,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2953,22 +3021,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "هيكل الكائن غير صحيح!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "خطأ!"
@@ -3064,12 +3132,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3086,17 +3154,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3106,7 +3176,7 @@ msgid "Params storage"
 msgstr "مخزن المعاملات (Parameters)"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "لا يمكنك ترقية الوحدة البرمجية '%s' لأنها غير مثبّتة."
@@ -3157,34 +3227,6 @@ msgstr "متغيرات الإعدادات"
 msgid "Invalid arguments"
 msgstr "معطيات غير سليمة"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3223,7 +3265,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3235,6 +3277,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "نوع الحساب المصرفي"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3271,7 +3341,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3305,7 +3375,7 @@ msgid "Access Controls"
 msgstr "التحكم في الصلاحيات"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3333,32 +3403,6 @@ msgstr "الشركة الرئيسية"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3376,9 +3420,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "تاريخ الميلاد"
 
@@ -3394,7 +3442,7 @@ msgid "Products Manufacturers"
 msgstr "مصنعو المتجات"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3502,7 +3550,7 @@ msgid "Malta"
 msgstr "مالطة"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3691,7 +3739,6 @@ msgstr "التقارير"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "اللقب"
@@ -3702,13 +3749,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "ثمّة تداخل."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "خطأ تداخل في متطلبات الوحدات البرمجية!"
@@ -3768,9 +3820,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3781,7 +3834,7 @@ msgid "Company Name"
 msgstr "اسم الشركة"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3800,14 +3853,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "رمز اللغة لعنصر الترجمة يجب أن يكون من بين اللغات المعروفة."
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "قواعد السجلات"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "سان بيار وميكلون"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3836,13 +3912,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3890,19 +3962,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3922,7 +3982,7 @@ msgid "Nauru"
 msgstr "ناورو"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3967,7 +4027,7 @@ msgid "Email Gateway"
 msgstr "بوابة البريد الالكتروني"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3986,9 +4046,43 @@ msgid "Technical Data"
 msgstr "بيانات تقنية"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4044,13 +4138,18 @@ msgstr "الجدول الزمني للاصدارات"
 msgid "Ltd"
 msgstr "ذ.م.م"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "هيكل غير صحيح!"
@@ -4066,9 +4165,9 @@ msgid "Share any Document"
 msgstr "مشاركة اي مستند"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "المجموعة مطلوبة"
 
 #. module: base
 #: view:res.lang:0
@@ -4126,33 +4225,10 @@ msgid "Languages"
 msgstr "اللغات"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4230,7 +4306,6 @@ msgstr "تقييد"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "القيمة الافتراضية"
 
@@ -4304,6 +4379,11 @@ msgstr ""
 "حين إستداعاء البريد من الخادم، يتم اختيار الملف الملقم حسب الاولوية.\r\n"
 "القيمة الافتراضية هي 10 (الارقام الاصغر= اولوية أعلى)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4367,9 +4447,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "سورينام"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4449,6 +4536,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4472,6 +4575,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4501,6 +4641,12 @@ msgstr ""
 msgid "View"
 msgstr "طريقة العرض"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4578,12 +4724,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4598,7 +4738,6 @@ msgstr "محاسبة سوسرا"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "ألبريدي"
@@ -4609,13 +4748,18 @@ msgstr "ألبريدي"
 msgid "Author"
 msgstr "المؤلف"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "اجعل في انتظار التنفيذ"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4661,6 +4805,8 @@ msgstr "الاتجاه"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "طرق العرض"
 
@@ -4676,7 +4822,7 @@ msgid "SMTP Server"
 msgstr "خادم SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4769,7 +4915,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4857,7 +5008,7 @@ msgid "System Configuration Done"
 msgstr "تمّ إعداد النظام"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "حصل خطأ أثناء التحقق من صحة الحقل / الحقول %s: %s"
@@ -4972,6 +5123,11 @@ msgstr "موريشيوس"
 msgid "Full Access"
 msgstr "صلاحيات كاملة"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4985,7 +5141,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4996,7 +5152,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "فقط إذا كان هذا الحساب مملوكا لشركتك"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5028,6 +5184,17 @@ msgstr "السنغال"
 msgid "Hungary"
 msgstr "المجر"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5191,7 +5358,7 @@ msgid "Account Owner Name"
 msgstr "أسم صاحب الحساب"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "لا يمكن إعادة تسمية العمود بـ %s لأن ذلك الاسم مستخدم حالياً!"
@@ -5207,16 +5374,11 @@ msgid "Decimal Separator"
 msgstr "فاصل الخانات العشرية"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5257,9 +5419,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "المُنشِئ"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "يجب أن يكون اسم الوحدة البرمجية فريداً!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5322,15 +5485,6 @@ msgstr "فينزويلا"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5346,6 +5500,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "اسم المرفق"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5429,6 +5588,12 @@ msgstr "كازاخستان"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - رقم اليوم في الأسبوع [0 (الأحد)،6]"
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "إسم المصدر"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5680,7 +5845,7 @@ msgid "title"
 msgstr "الاسم"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5737,6 +5902,15 @@ msgstr "المنتجات"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5852,13 +6026,15 @@ msgid "Bank Type"
 msgstr "نوع المصرف"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "لا يمكن أن يبدأ اسم المجموعة بـ '-'"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "تطبيقات"
 
@@ -5878,7 +6054,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5912,10 +6088,9 @@ msgid "Uncategorized"
 msgstr "غير مصنف"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "إسم المصدر"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5948,6 +6123,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "طريقة العرض الأصلية"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5958,7 +6138,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5974,26 +6154,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6126,11 +6286,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6142,8 +6297,8 @@ msgid "Malaysia"
 msgstr "ماليزيا"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6250,7 +6405,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "طريقة العرض '%s' غير معرفة لهذا الهيكل!"
@@ -6288,7 +6443,7 @@ msgid "Created Menus"
 msgstr "أنشاء القوائم"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6315,9 +6470,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "اجعل في انتظار التنفيذ"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6349,6 +6532,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "السنة الحالية دون القرن: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6391,7 +6581,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6483,7 +6673,7 @@ msgid "Israel"
 msgstr "إسرائيل"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6503,23 +6693,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "الجوال"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6552,10 +6725,10 @@ msgstr "تقرير XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "الوحدات البرمجية"
 
@@ -6629,9 +6802,9 @@ msgid "United Kingdom"
 msgstr "المملكة المتّحدة"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6654,8 +6827,8 @@ msgid "Partner Titles"
 msgstr "ألقاب الشريك"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6703,7 +6876,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6712,11 +6885,6 @@ msgstr ""
 "لا يمكنك تنفيذ هذه العملية. لا يمكن إنشاء سجل جديد لهذا الكائن لأن الهدف منه "
 "هو إصدار تقارير."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6821,6 +6989,13 @@ msgstr "تمّ استيراد ملف الوحدة البرمجية بنجاح!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "الانتقالات"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6915,7 +7090,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "المحافظة / الولاية"
@@ -7016,12 +7190,6 @@ msgstr "الاسم الكامل"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "يجب أن يكون اسم الوحدة البرمجية فريداً!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7063,6 +7231,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7120,7 +7289,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "فضلاً حدد إجراءً للبدء بتنفيذه!"
@@ -7140,6 +7309,11 @@ msgstr "اسم الفئة"
 msgid "Northern Mariana Islands"
 msgstr "جزر ماريانا الشمالية"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7151,7 +7325,7 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7160,6 +7334,11 @@ msgstr ""
 "فضلاً استخدم معالج تغيير كلمة المرور (في تفضيلات المستخدم أو قائمة المستخدم) "
 "لتغيير كلمة مرورك."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7190,7 +7369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "لا يوجد حقول كافية لاستخدام طريقة عرض التقويم!"
@@ -7236,7 +7415,6 @@ msgstr "انتقال"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7256,30 +7434,30 @@ msgid "Child Categories"
 msgstr "فئات فرعية"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "خطأ"
@@ -7367,6 +7545,11 @@ msgstr ""
 msgid "This Window"
 msgstr "هذه النافذة"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7452,6 +7635,21 @@ msgstr "الحقول"
 msgid "Employees"
 msgstr "الموظفون"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7481,11 +7679,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "العناوين"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7510,7 +7703,6 @@ msgstr "خيارات الاختيار"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "الشارع"
@@ -7521,8 +7713,23 @@ msgid "Yugoslavia"
 msgstr "يوغوسلافيا"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7601,7 +7808,7 @@ msgid "Change My Preferences"
 msgstr "تغيير تفضيلاتي"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "اسم نموذج خاطئ في تعريف الإجراء."
@@ -7688,14 +7895,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7704,7 +7913,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "لا يمكن استخدام كلمات مرور فارغة لأسباب أمنية!"
@@ -7715,13 +7924,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7743,12 +7952,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "المعالج"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7921,7 +8131,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7952,14 +8162,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "تحذير!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7983,7 +8185,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8098,7 +8299,7 @@ msgid "Nigeria"
 msgstr "نيجيريا"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "يجب سرد الاختيارات الممكنة لحقل الاختيار!"
@@ -8413,7 +8614,7 @@ msgid "Update Modules List"
 msgstr "تحديث قائمة الوحدات البرمجية"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8425,7 +8626,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8435,7 +8636,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8450,6 +8651,17 @@ msgstr "إستمرار"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8489,7 +8701,7 @@ msgid "Mexico"
 msgstr "المكسيك"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8511,15 +8723,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "اسم المرفق"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "رمز اللغة لعنصر الترجمة يجب أن يكون من بين اللغات المعروفة."
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8543,7 +8755,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - اسم الشهر المختصر"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8555,7 +8767,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "مورِّد"
@@ -8633,7 +8844,7 @@ msgid "Selectable"
 msgstr "قابل للاختيار"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8661,8 +8872,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "خطأ مستخدم"
@@ -8686,7 +8897,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8833,7 +9044,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8872,8 +9083,8 @@ msgid "Solomon Islands"
 msgstr "جزر سليمان"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8947,7 +9158,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8961,7 +9172,7 @@ msgid "Ukraine"
 msgstr "أوكرانيا"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9024,6 +9235,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9122,8 +9338,8 @@ msgid "Custom Shortcuts"
 msgstr "اختصارات مخصصة"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9152,13 +9368,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9179,7 +9395,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9227,7 +9443,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "النموذج %s غير موجود!"
@@ -9273,6 +9489,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9281,7 +9498,7 @@ msgid "Cancel"
 msgstr "إلغاء"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9300,6 +9517,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9335,7 +9589,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9387,6 +9641,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - الساعة (12 ساعة) [01،12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9429,23 +9688,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9479,7 +9726,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "انقر 'استمرار' لإعداد الإضافة التالية..."
@@ -9570,6 +9817,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9776,7 +10028,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9787,13 +10039,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "وحدة الفترة"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "النوع"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9963,7 +10220,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9996,6 +10253,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10021,6 +10283,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10110,7 +10377,6 @@ msgstr "%m - رقم الشهر [01،12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "المدينة"
@@ -10146,13 +10412,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"يقدم اسم الحقل الذي يشير إليه معرف الحقل بالنسبة لععملية الكتابة. غ\\فإذا "
+"كان فارغاً فانه سوف يشير إلى المعرف النشظ في المشروع."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 أو أحدث"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10211,19 +10486,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10237,6 +10537,8 @@ msgid "Activity"
 msgstr "النشاط"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10255,7 +10557,12 @@ msgid "Parent Company"
 msgstr "الشركة الأم"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10267,13 +10574,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10360,6 +10660,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10429,6 +10749,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10489,9 +10814,9 @@ msgstr ""
 "فضلاً عطّل اللغة أولاً."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10509,8 +10834,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10549,13 +10874,12 @@ msgid "Laos"
 msgstr "لاوس"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "البريد الإلكتروني"
@@ -10566,7 +10890,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10595,36 +10924,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10646,6 +10945,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "الإكوادور"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "مسار عمل"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10662,16 +10966,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "لا يمكنك حذف اللغة المفضلة لمستخدم!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10688,9 +10982,9 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "المجموعة مطلوبة"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10715,11 +11009,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10745,7 +11034,7 @@ msgid "Domain"
 msgstr "نطاق"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10761,12 +11050,12 @@ msgid "State Name"
 msgstr "اسم المحافظة"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10787,30 +11076,10 @@ msgid "Timezone"
 msgstr "المنطقة الزمنية"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10830,7 +11099,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10880,7 +11149,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "الشارع ٢"
 
@@ -10904,6 +11172,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10989,19 +11258,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "مسار عمل"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "لا يمكن أن يكون حجم الحقل أقل من 1 !"
@@ -11043,22 +11321,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "المحددات"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11191,7 +11453,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "العميل"
 
@@ -11281,7 +11542,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11331,8 +11592,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11423,7 +11684,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11450,7 +11711,7 @@ msgid "Object"
 msgstr "كائن"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11536,7 +11797,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11549,7 +11810,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11594,8 +11855,6 @@ msgstr "الدليل المرجعي"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11603,7 +11862,7 @@ msgid "Partner"
 msgstr "الشريك"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11632,12 +11891,6 @@ msgstr "جزر الفالكلاند"
 msgid "Lebanon"
 msgstr "لبنان"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11744,8 +11997,10 @@ msgid "Selection"
 msgstr "الاختيار"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11782,7 +12037,7 @@ msgid "Action Type"
 msgstr "نوع الإجراء"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11920,11 +12175,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "أزل اختيار حقل 'نشط' لإخفاء جهة الاتصال."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11941,7 +12191,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11964,7 +12214,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -12005,16 +12255,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "تغيير كلمة المرور"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "سورينام"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12061,87 +12311,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
-
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12321,6 +12541,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12337,7 +12562,7 @@ msgid "Body"
 msgstr "المتن"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12385,7 +12610,7 @@ msgid "choose"
 msgstr "اختر"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12561,10 +12786,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12596,12 +12825,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12615,7 +12845,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "متفرقات"
@@ -12637,23 +12866,6 @@ msgstr ""
 msgid "China"
 msgstr "الصّين"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12723,25 +12935,9 @@ msgid "Bulgaria"
 msgstr "بلغاريا"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "أنجولا"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12769,6 +12965,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12805,6 +13021,7 @@ msgstr "السلوفاكية / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "غير معروف"
@@ -12872,6 +13089,11 @@ msgstr "سجل العناوين"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12961,6 +13183,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12973,7 +13196,7 @@ msgid "Information"
 msgstr "المعلومات"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13004,16 +13227,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "تحديث قائمة الوحدات البرمجية"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13078,6 +13305,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13150,29 +13382,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "مُعرف خارجي"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13220,7 +13429,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13264,9 +13473,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "قواعد السجلات"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13510,9 +13719,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13539,63 +13753,14 @@ msgid "System Configuration done"
 msgstr "تمّ إعداد النظام"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "جزر تركس وكايكوس"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13636,17 +13801,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13681,7 +13835,7 @@ msgid "Low"
 msgstr "منخفض"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "خطأ! لا يمكنك إنشاء قائمة متداخلة."
@@ -13761,11 +13915,10 @@ msgid "El Salvador"
 msgstr "السّلفادور"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "هاتف"
@@ -13780,6 +13933,11 @@ msgstr "قائمة الوصول"
 msgid "Thailand"
 msgstr "تايلاند"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13800,6 +13958,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "الرومانية / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13836,41 +14018,6 @@ msgstr "علاقة الكائن"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13931,40 +14078,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14057,6 +14172,21 @@ msgstr "عرض:"
 msgid "View Auto-Load"
 msgstr "عرض التحميل التلقائي"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14099,34 +14229,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارسي"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14149,9 +14251,9 @@ msgid "Unmet dependency !"
 msgstr "ثمّة متطلبات غير متوفرة"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14162,7 +14264,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14188,7 +14320,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14233,7 +14365,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14266,11 +14398,10 @@ msgid "Bahrain"
 msgstr "مملكة البحرين"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "فاكس"
@@ -14286,8 +14417,6 @@ msgstr "فاكس"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14402,7 +14531,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14414,7 +14543,6 @@ msgstr "جامايكا"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14447,7 +14575,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14458,8 +14586,8 @@ msgid "Azerbaijan"
 msgstr "أذربيجان"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "تحذير"
@@ -14485,11 +14613,6 @@ msgstr "جزر العذراء (بريطانيا)"
 msgid "Parameters"
 msgstr "المحددات"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "سان بيار وميكلون"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14579,7 +14702,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "الدولة"
@@ -14648,8 +14770,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14677,7 +14803,7 @@ msgid "Japan"
 msgstr "اليابان"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "يمكنك تغيير اسم عمود واحد فقط كل مرة!"
@@ -14738,6 +14864,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "كندا - محاسبة"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14762,7 +14919,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "لاحظ أن هذه العملية قد تستغرق عدة دقائق."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14801,6 +14958,12 @@ msgstr "تنفيذ"
 msgid "Condition"
 msgstr "شرط"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14853,6 +15016,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "كرواتيا"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14877,6 +15047,11 @@ msgstr "تحديث النظام"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14893,7 +15068,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14914,15 +15089,52 @@ msgstr "سيراليون"
 msgid "General Information"
 msgstr "المعلومات العامة"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "جزر تركس وكايكوس"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14958,7 +15170,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "تحذير بشأن تحويل الشركة"
@@ -14976,11 +15193,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "سيتم زيادة الرقم التالي للمسلسل بهذا الرقم"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "وظيفة"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15017,11 +15238,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "التسليم"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15049,7 +15265,7 @@ msgid "Workflow Instances"
 msgstr "حالات مسار العمل"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "الشركاء: "
@@ -15060,7 +15276,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15126,7 +15342,6 @@ msgstr "اسم التصدير"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15212,6 +15427,9 @@ msgstr ""
 #~ msgid "Miscellaneous Suppliers"
 #~ msgstr "مورّدون متنوعون"
 
+#~ msgid "Contact Name"
+#~ msgstr "اسم جهة الاتصال"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15346,6 +15564,9 @@ msgstr ""
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "معرف ملحقات"
+
 #~ msgid "Homepage Widgets"
 #~ msgstr "عناصر واجهة المستخدم للصفحة الرئيسية"
 
@@ -15598,6 +15819,9 @@ msgstr ""
 #~ msgid "System update completed"
 #~ msgstr "تمّ تحديث النظام"
 
+#~ msgid "Creator"
+#~ msgstr "المُنشِئ"
+
 #~ msgid "Apply For Delete"
 #~ msgstr "اطلب صلاحية الحذف"
 
@@ -15722,6 +15946,9 @@ msgstr ""
 #~ msgid "Latest version"
 #~ msgstr "الإصدارة الأخيرة"
 
+#~ msgid "Addresses"
+#~ msgstr "العناوين"
+
 #~ msgid "Skipped"
 #~ msgstr "تمّ تجاوزه"
 
@@ -15955,6 +16182,9 @@ msgstr ""
 #~ msgid "Report Header"
 #~ msgstr "رأس التقرير"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "أزل اختيار حقل 'نشط' لإخفاء جهة الاتصال."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "أضف عنصر واجهة مستخدم للمستخدم"
 
@@ -16161,6 +16391,9 @@ msgstr ""
 #~ msgid "Homepage Widgets Management"
 #~ msgstr "إدارة عناصر واجهة المستخدم الخاصة بالصفحة الرئيسية"
 
+#~ msgid "Delivery"
+#~ msgstr "التسليم"
+
 #~ msgid "Extended"
 #~ msgstr "مفصلة"
 
@@ -16300,6 +16533,9 @@ msgstr ""
 #~ msgid "Create Action"
 #~ msgstr "أنشأ إجراء"
 
+#~ msgid "Attached Model"
+#~ msgstr "نموذج ملحق"
+
 #~ msgid "Trigger Name"
 #~ msgstr "اسم المشغل"
 
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index df4394a57b0..a011cb7ea0c 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:49+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-12-04 04:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Дата час"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -189,41 +189,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Предупреждение!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -231,7 +205,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Ограничение за грешка"
@@ -242,7 +216,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -253,7 +227,7 @@ msgid "Swaziland"
 msgstr "Свазиленд"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "създаден."
@@ -332,20 +306,6 @@ msgstr "Компания, към която да се съхрани текущ
 msgid "Max. Size"
 msgstr "Макс. размер"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -353,11 +313,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Име на контакта"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -416,7 +371,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -453,6 +408,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Собственик"
 
@@ -491,7 +447,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -545,7 +501,7 @@ msgid "Netherlands Antilles"
 msgstr "Холандски Антили"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -585,9 +541,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Оригинален изглед"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -612,26 +568,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Босна / Босненски език"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -642,9 +578,25 @@ msgstr ""
 "приложено име, ще се върне предишната справка."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Ангола"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -719,14 +671,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Помощници"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Персонализираните полета трябва да имат име което започва с 'x_' !"
@@ -790,16 +740,14 @@ msgid "Model Description"
 msgstr "Описание на модела"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -828,11 +776,21 @@ msgstr "Задействащ израз"
 msgid "Jordan"
 msgstr "Йордания"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -964,14 +922,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Задайте името на полето към което се отнася идентификатора на записа при "
-"операцията на запис. Ако оставите празно, ще сочи към активния запис от "
-"обекта."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Папуа Нова Гвинея"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -990,7 +943,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1038,16 +991,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Испански (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Мобилен"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1144,9 +1090,38 @@ msgid "Mongolia"
 msgstr "Монголия"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1160,12 +1135,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1192,7 +1172,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1222,7 +1249,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1254,14 +1281,12 @@ msgid "South Korea"
 msgstr "Южна Корея"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Преходи"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1399,7 +1424,7 @@ msgid "Marshall Islands"
 msgstr "Маршалови острови"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Промяна на модела на полете е забранена!"
@@ -1421,7 +1446,7 @@ msgid "Search"
 msgstr "Търсене"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1436,7 +1461,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Помощници"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Отказана операция"
@@ -1564,7 +1596,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Не съществува език с код \"%s\""
@@ -1681,7 +1727,7 @@ msgid "On Create"
 msgstr "При създаване"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1691,11 +1737,6 @@ msgstr ""
 "точки! Те се използват за свързване към данни от други модули, например в "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1778,7 +1819,7 @@ msgid "East Timor"
 msgstr "Източен Тимор"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1819,11 +1860,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Прикачен ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1838,7 +1874,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1879,6 +1915,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Права за четене"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1955,16 +1996,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Прикачен модел"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2019,7 +2055,7 @@ msgid "Formula"
 msgstr "Формула"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Не може да се премахне потребителят root!"
@@ -2043,11 +2079,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (копие)"
@@ -2059,7 +2095,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Вид на адреса"
 
@@ -2097,11 +2132,6 @@ msgstr "Пълен път"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2237,6 +2267,11 @@ msgstr "Брой обновени модули"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2270,12 +2305,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2326,6 +2366,15 @@ msgstr "Белиз"
 msgid "Add or not the corporate RML header"
 msgstr "Да се добави или не RML колонтитул на фирмата"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2377,7 +2426,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2459,7 +2508,6 @@ msgstr "Демократична република Сао Томе и Прин
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Фактура"
 
@@ -2506,11 +2554,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2629,9 +2672,20 @@ msgid "Default limit for the list view"
 msgstr "Ограничения по подразбиране за изгледа на списъка"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Папуа Нова Гвинея"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2709,7 +2763,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2768,6 +2822,19 @@ msgstr "Свързване на полета"
 msgid "Export Translations"
 msgstr "Експортиране на преводи"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2776,7 +2843,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2862,7 +2929,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2892,7 +2959,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2957,22 +3024,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Невалидна архитектура на обект"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Грешка!"
@@ -3066,12 +3133,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Грешка! НЕ може да създавате рекурсивни компании"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3088,17 +3155,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3108,7 +3177,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Модул '%s' не може да бъде обновен. Той не е инсталиран."
@@ -3159,34 +3228,6 @@ msgstr "Праметри за настройка"
 msgid "Invalid arguments"
 msgstr "Невалидни аргументи"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3225,7 +3266,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3237,6 +3278,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Тип на банкова сметка"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3273,7 +3342,7 @@ msgid "Signal (subflow.*)"
 msgstr "Сигнал (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3307,7 +3376,7 @@ msgid "Access Controls"
 msgstr "Контрол на достъпа"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3335,32 +3404,6 @@ msgstr "Основна фирма"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3379,9 +3422,13 @@ msgid ""
 msgstr ""
 "Ако използвате формула, използвайте израз на python с променливата 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Грешка! НЕ може да създавате рекурсивни компании"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Рождена дата"
 
@@ -3397,7 +3444,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3505,7 +3552,7 @@ msgid "Malta"
 msgstr "Малта"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3694,7 +3741,6 @@ msgstr "Отчитане"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Заглавие"
@@ -3707,13 +3753,18 @@ msgstr ""
 "ресурси"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Устанена е рекурсия"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Рекурсивна грешка при зависимостите на модулите !"
@@ -3773,9 +3824,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3786,7 +3838,7 @@ msgid "Company Name"
 msgstr "Име на фирма"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3805,14 +3857,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Правила на записа"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Сен Пиер и Микелон"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3841,13 +3916,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3895,19 +3966,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3927,7 +3986,7 @@ msgid "Nauru"
 msgstr "Науру"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3972,7 +4031,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3991,9 +4050,43 @@ msgid "Technical Data"
 msgstr "Технически данни"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4049,13 +4142,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "ООД"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Невалидна архитектура!"
@@ -4071,9 +4169,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Изисква се група"
 
 #. module: base
 #: view:res.lang:0
@@ -4131,33 +4229,10 @@ msgid "Languages"
 msgstr "Езици"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4235,7 +4310,6 @@ msgstr "Ограничение"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -4307,6 +4381,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4368,9 +4447,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Суринам"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4450,6 +4536,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4473,6 +4575,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4502,6 +4641,12 @@ msgstr ""
 msgid "View"
 msgstr "Изглед"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4579,12 +4724,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4599,7 +4738,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Пощенски код"
@@ -4610,13 +4748,18 @@ msgstr "Пощенски код"
 msgid "Author"
 msgstr "Автор"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Определи като \"Да се направи\""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Подходящо представяне на дата и време."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4662,6 +4805,8 @@ msgstr "Посока"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Изгледи"
 
@@ -4677,7 +4822,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4771,7 +4916,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4859,7 +5009,7 @@ msgid "System Configuration Done"
 msgstr "Настройката на системата е направена"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Грешка при проверка на полета (s) %s: %s"
@@ -4974,6 +5124,11 @@ msgstr "Мавриций"
 msgid "Full Access"
 msgstr "Пълен достъп"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4987,7 +5142,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4998,7 +5153,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5030,6 +5185,17 @@ msgstr "Сенегал"
 msgid "Hungary"
 msgstr "Унгария"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5193,7 +5359,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5211,16 +5377,11 @@ msgid "Decimal Separator"
 msgstr "Десетичен разделител"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5261,9 +5422,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Създател"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Името на модула трябва да бъде уникално!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5326,15 +5488,6 @@ msgstr "Венецуела"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5350,6 +5503,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Име на прикачения файл"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5433,6 +5591,12 @@ msgstr "Казахстан"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Номер на ден от седмицата [0(Неделя),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Име на ресурс"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5683,7 +5847,7 @@ msgid "title"
 msgstr "заглавие"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5740,6 +5904,15 @@ msgstr "Продукти"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5855,13 +6028,15 @@ msgid "Bank Type"
 msgstr "Вид банка"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Името на група не може да започва с \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5881,7 +6056,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Гуджарати / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5914,10 +6089,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Име на ресурс"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5950,6 +6124,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Оригинален изглед"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5960,7 +6139,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5976,26 +6155,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6128,11 +6287,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6144,8 +6298,8 @@ msgid "Malaysia"
 msgstr "Малайзия"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6252,7 +6406,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Няма изглед от тип  '%s' дефиниран за тази структура!"
@@ -6290,7 +6444,7 @@ msgid "Created Menus"
 msgstr "Създадени менюта"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6317,9 +6471,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Определи като \"Да се направи\""
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6351,6 +6533,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Текущата година без века: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6393,7 +6582,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6485,7 +6674,7 @@ msgid "Israel"
 msgstr "Израел"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6505,23 +6694,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Мобилен"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6554,10 +6726,10 @@ msgstr "Справка xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Модули"
 
@@ -6631,9 +6803,9 @@ msgid "United Kingdom"
 msgstr "Обединено кралство"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6657,8 +6829,8 @@ msgid "Partner Titles"
 msgstr "Обръщения към партньори"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6706,7 +6878,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6715,11 +6887,6 @@ msgstr ""
 "Тази операция не може да бъде извършена. Не е разрешено създаването на нов "
 "запис за този обект, защото е само с цел спавка."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6827,6 +6994,13 @@ msgstr "Модулът е успешно импортиран!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Преходи"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6921,7 +7095,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Област"
@@ -7022,12 +7195,6 @@ msgstr "Пълно име"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Името на модула трябва да бъде уникално!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7069,6 +7236,7 @@ msgstr "Върху множество документи"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7126,7 +7294,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Моля укажете действие за изпълнение !"
@@ -7146,6 +7314,11 @@ msgstr "Име на категория"
 msgid "Northern Mariana Islands"
 msgstr "Северни Мариански острови"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7157,7 +7330,7 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7166,6 +7339,11 @@ msgstr ""
 "Моля, използвайте помощникът за промята на потребителска парола (в "
 "Потребителски настройки или от меню Потребител) за да си смените пароалата."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7196,7 +7374,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Недостатъчни полета за Календарен изглед!"
@@ -7242,7 +7420,6 @@ msgstr "Преход"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7262,30 +7439,30 @@ msgid "Child Categories"
 msgstr "Подкатегории"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Грешка"
@@ -7373,6 +7550,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Този прозорец"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7456,6 +7638,21 @@ msgstr "Полета"
 msgid "Employees"
 msgstr "Служители"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7485,11 +7682,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Адреси"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7514,7 +7706,6 @@ msgstr "Опции за селекция"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Улица"
@@ -7525,8 +7716,23 @@ msgid "Yugoslavia"
 msgstr "Югославия"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7605,7 +7811,7 @@ msgid "Change My Preferences"
 msgstr "Промени настройките ми"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Невалидно име на модел при задаването на действие."
@@ -7692,14 +7898,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7708,7 +7916,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Използване на празни пароли не е разрешено по причини за сигурност!"
@@ -7719,13 +7927,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7747,12 +7955,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Помощник"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7925,7 +8134,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7956,14 +8165,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Предупреждение!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7987,7 +8188,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8106,7 +8306,7 @@ msgid "Nigeria"
 msgstr "Нигерия"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8421,7 +8621,7 @@ msgid "Update Modules List"
 msgstr "Обнови списъка с модули"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8433,7 +8633,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8443,7 +8643,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8458,6 +8658,17 @@ msgstr "Продължи"
 msgid "Thai / ภาษาไทย"
 msgstr "тайски / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8497,7 +8708,7 @@ msgid "Mexico"
 msgstr "Мексико"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8519,15 +8730,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Име на прикачения файл"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8551,7 +8762,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Съкращение на име на месец."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8563,7 +8774,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Доставчик"
@@ -8641,7 +8851,7 @@ msgid "Selectable"
 msgstr "Избираем"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8669,8 +8879,8 @@ msgid "Iteration"
 msgstr "Повтаряне"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Потребителска грешка"
@@ -8694,7 +8904,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8841,7 +9051,7 @@ msgid "Reunion (French)"
 msgstr "Реюнион (Франция)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8880,8 +9090,8 @@ msgid "Solomon Islands"
 msgstr "Соломонови острови"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -8955,7 +9165,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8969,7 +9179,7 @@ msgid "Ukraine"
 msgstr "Украйна"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9032,6 +9242,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Виетнамски / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9130,9 +9345,9 @@ msgid "Custom Shortcuts"
 msgstr "Потребителски клавишни комбинации"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Виетнамски / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9160,13 +9375,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9187,7 +9402,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9235,7 +9450,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9281,6 +9496,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9289,7 +9505,7 @@ msgid "Cancel"
 msgstr "Откажи"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9308,6 +9524,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9343,7 +9596,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9395,6 +9648,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9437,23 +9695,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9487,7 +9733,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9580,6 +9826,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9784,7 +10035,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9795,13 +10046,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Единица интервал"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Вид"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Методът повече не съществува"
@@ -9971,7 +10227,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10004,6 +10260,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10029,6 +10290,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10118,7 +10384,6 @@ msgstr "%m - Месец номер [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Град"
@@ -10154,13 +10419,23 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "естонски / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Задайте името на полето към което се отнася идентификатора на записа при "
+"операцията на запис. Ако оставите празно, ще сочи към активния запис от "
+"обекта."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 или по-късна версия"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10219,19 +10494,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10245,6 +10545,8 @@ msgid "Activity"
 msgstr "Дейност"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10263,7 +10565,12 @@ msgid "Parent Company"
 msgstr "Фирма майка"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10275,13 +10582,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10363,6 +10663,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10434,6 +10754,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10492,9 +10817,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10512,8 +10837,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Проблем в конфигурацията 'Record Id' в Действия на Сървъра!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Грешка при валидиране"
@@ -10552,13 +10877,12 @@ msgid "Laos"
 msgstr "Лаос"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Имейл"
@@ -10569,7 +10893,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10600,36 +10929,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10651,6 +10950,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Еквадор"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "последователност от действия"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10667,16 +10971,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10693,9 +10987,9 @@ msgid "Cascade"
 msgstr "Каскадно"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Изисква се група"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10720,11 +11014,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10750,7 +11039,7 @@ msgid "Domain"
 msgstr "Домейн"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10766,12 +11055,12 @@ msgid "State Name"
 msgstr "Име на провинцията"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10792,30 +11081,10 @@ msgid "Timezone"
 msgstr "Часови пояс"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10835,7 +11104,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10882,7 +11151,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Улица2"
 
@@ -10906,6 +11174,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10991,19 +11260,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "последователност от действия"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Рамерът на полето никога не може да бъде по-малко от 1!"
@@ -11045,22 +11323,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Аргументи"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11193,7 +11455,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Клиент"
 
@@ -11283,7 +11544,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11333,8 +11594,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11425,7 +11686,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11452,7 +11713,7 @@ msgid "Object"
 msgstr "Обект"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11538,7 +11799,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11551,7 +11812,7 @@ msgid "User Ref."
 msgstr "Потребителска справка"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11596,8 +11857,6 @@ msgstr "Съответстващо упътване"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11605,7 +11864,7 @@ msgid "Partner"
 msgstr "Партньор"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11634,12 +11893,6 @@ msgstr "Фолклендски острови"
 msgid "Lebanon"
 msgstr "Ливан"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11746,8 +11999,10 @@ msgid "Selection"
 msgstr "Избрано"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11784,7 +12039,7 @@ msgid "Action Type"
 msgstr "Вид действие"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11920,11 +12175,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Час 00->12: %(h12)с"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Активно поле без отметка за скриване на контакта"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11941,7 +12191,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11964,7 +12214,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "непознат метод get!"
@@ -12005,16 +12255,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Променя на паролата"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Суринам"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12061,92 +12311,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Формата на разделителя трябва дабъде [,n] , където 0 < n : като се започне "
-"от цифрата за единици. \"-1\" спира разделянето. Например, [3,2,-1] ще "
-"представи 106500 като 1,06,500; [1,2,-1] ще представи същото като 106,50,0; "
-"[3] ще представи същото като 106,500. ',' е разделител за хиляди във всеки "
-"случай."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12325,6 +12540,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12341,7 +12561,7 @@ msgid "Body"
 msgstr "Тяло"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12389,7 +12609,7 @@ msgid "choose"
 msgstr "избери"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12565,10 +12785,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12600,12 +12824,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12619,7 +12844,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Разни"
@@ -12641,23 +12865,6 @@ msgstr ""
 msgid "China"
 msgstr "Китай"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12725,25 +12932,9 @@ msgid "Bulgaria"
 msgstr "България"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Ангола"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12771,6 +12962,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12807,6 +13018,7 @@ msgstr "Словашки / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "неизвестен"
@@ -12874,6 +13086,11 @@ msgstr "Адресна книга"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12963,6 +13180,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12975,7 +13193,7 @@ msgid "Information"
 msgstr "Информация"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13006,16 +13224,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13080,6 +13302,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13152,29 +13379,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13222,7 +13426,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13266,9 +13470,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Правила на записа"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13512,9 +13716,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13541,63 +13750,14 @@ msgid "System Configuration done"
 msgstr "Сисемната настройка е готова"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "о-ви Търкс и Кайкос"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13638,17 +13798,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13683,7 +13832,7 @@ msgid "Low"
 msgstr "Нисък"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Грешка! Не можете да създавате рекурсивни менюта."
@@ -13763,11 +13912,10 @@ msgid "El Salvador"
 msgstr "Салвадор"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Телефон"
@@ -13782,6 +13930,11 @@ msgstr "Меню за достъп"
 msgid "Thailand"
 msgstr "Тайланд"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13802,6 +13955,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Румънци / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13838,41 +14015,6 @@ msgstr "Обектна свързаност"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13933,40 +14075,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14056,6 +14166,21 @@ msgstr "\"Изглед\":"
 msgid "View Auto-Load"
 msgstr "Изглед автоматично зареждане"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14098,34 +14223,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Фарси / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14148,9 +14245,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14161,7 +14258,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14187,7 +14314,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14232,7 +14359,7 @@ msgid "Access"
 msgstr "Достъп"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14265,11 +14392,10 @@ msgid "Bahrain"
 msgstr "Бахрейн"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Факс"
@@ -14285,8 +14411,6 @@ msgstr "Факс"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14401,7 +14525,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14413,7 +14537,6 @@ msgstr "Ямайка"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14446,7 +14569,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14457,8 +14580,8 @@ msgid "Azerbaijan"
 msgstr "Азербайджан"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Предупреждение"
@@ -14484,11 +14607,6 @@ msgstr "Вирджински острови (Великобритания)"
 msgid "Parameters"
 msgstr "Параметри"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Сен Пиер и Микелон"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14578,7 +14696,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Държава"
@@ -14647,9 +14764,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Испански (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Формата на разделителя трябва дабъде [,n] , където 0 < n : като се започне "
+"от цифрата за единици. \"-1\" спира разделянето. Например, [3,2,-1] ще "
+"представи 106500 като 1,06,500; [1,2,-1] ще представи същото като 106,50,0; "
+"[3] ще представи същото като 106,500. ',' е разделител за хиляди във всеки "
+"случай."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14676,7 +14802,7 @@ msgid "Japan"
 msgstr "Япония"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14737,6 +14863,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14761,7 +14918,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Имайте в предвид, че тази операция може да отнеме няколко минути."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14800,6 +14957,12 @@ msgstr "Изпълнение"
 msgid "Condition"
 msgstr "Условие"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14852,6 +15015,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Хърватска"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14876,6 +15046,11 @@ msgstr "Системна актуализация"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14892,7 +15067,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14913,15 +15088,52 @@ msgstr "Сиера Леоне"
 msgid "General Information"
 msgstr "Обща информация"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "о-ви Търкс и Кайкос"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14957,7 +15169,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14975,11 +15192,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Функция"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15015,11 +15236,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Доставка"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15047,7 +15263,7 @@ msgid "Workflow Instances"
 msgstr "Инстанции от последователности от действия"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Парньори: "
@@ -15058,7 +15274,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15124,7 +15340,6 @@ msgstr "Име на изнасянето"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15171,6 +15386,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "На множество документи."
 
+#~ msgid "Contact Name"
+#~ msgstr "Име на контакта"
+
 #~ msgid "E-Mail"
 #~ msgstr "ел. поща"
 
@@ -15333,6 +15551,9 @@ msgstr ""
 #~ msgid "Requests"
 #~ msgstr "Заявки"
 
+#~ msgid "Delivery"
+#~ msgstr "Доставка"
+
 #~ msgid "Report Header"
 #~ msgstr "Горен колонтитул на справка"
 
@@ -15519,6 +15740,9 @@ msgstr ""
 #~ "програма за електронни таблици. Кодировката на файла е UTF-8. Необходимо е "
 #~ "да преведете последната колона преди да го върнете обратно."
 
+#~ msgid "Creator"
+#~ msgstr "Създател"
+
 #~ msgid ""
 #~ "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
 #~ "object.partner_id.name ]]`"
@@ -15642,6 +15866,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Зареждане на официален превод"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Активно поле без отметка за скриване на контакта"
+
 #~ msgid "Python code to be executed"
 #~ msgstr "Python код за изпълнение"
 
@@ -15811,6 +16038,9 @@ msgstr ""
 #~ msgid "Wood Suppliers"
 #~ msgstr "Доставчици на дървен материал"
 
+#~ msgid "Attached ID"
+#~ msgstr "Прикачен ID"
+
 #~ msgid "Advanced"
 #~ msgstr "Разширени"
 
@@ -16015,6 +16245,12 @@ msgstr ""
 #~ msgid "Has a web component"
 #~ msgstr "Има уеб компонент"
 
+#~ msgid "Addresses"
+#~ msgstr "Адреси"
+
+#~ msgid "Attached Model"
+#~ msgstr "Прикачен модел"
+
 #, python-format
 #~ msgid "Not implemented set_memory method !"
 #~ msgstr "Методът set_memory не е реализиран!"
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 7db323bb2f8..73d65294a79 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-29 08:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 04:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -185,41 +185,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -227,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -238,7 +212,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -249,7 +223,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -328,20 +302,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Max. veličina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -349,11 +309,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Naziv kontakta"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -412,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -449,6 +404,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -487,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -539,7 +495,7 @@ msgid "Netherlands Antilles"
 msgstr "Nizozemski Antili"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -579,9 +535,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Izvorni prikaz"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -606,26 +562,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosanski / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -636,8 +572,24 @@ msgstr ""
 "biti će vraćen prethodni izvještaj."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -713,14 +665,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Čarobnjaci"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Prilagođena polja moraju imati ime koje počinje sa 'x_' !"
@@ -785,16 +735,14 @@ msgid "Model Description"
 msgstr "Opis modela"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -823,11 +771,21 @@ msgstr "Izraz koji koji pokreće radnju"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.prikaz"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -956,11 +914,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nova Gvineja"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -978,7 +934,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1026,16 +982,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobitel"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1132,8 +1081,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1148,12 +1126,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1180,7 +1163,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1208,7 +1238,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1240,14 +1270,12 @@ msgid "South Korea"
 msgstr "Južna Koreja"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Prijelazi"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1382,7 +1410,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1404,7 +1432,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1419,7 +1447,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Čarobnjaci"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1545,7 +1580,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1660,18 +1709,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1752,7 +1796,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1793,11 +1837,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1812,7 +1851,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1853,6 +1892,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1929,16 +1973,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1993,7 +2032,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2017,11 +2056,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2033,7 +2072,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2071,11 +2109,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2208,6 +2241,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2241,12 +2279,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2294,6 +2337,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2345,7 +2397,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2423,7 +2475,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2470,11 +2521,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2591,9 +2637,20 @@ msgid "Default limit for the list view"
 msgstr "Podrazumjevana granica za prikaz liste"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nova Gvineja"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2671,7 +2728,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2730,6 +2787,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2738,7 +2808,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2824,7 +2894,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2854,7 +2924,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2919,22 +2989,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3028,12 +3098,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3050,17 +3120,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3070,7 +3142,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3121,34 +3193,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3187,7 +3231,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3199,6 +3243,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3235,7 +3307,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3269,7 +3341,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3297,32 +3369,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3340,9 +3386,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3358,7 +3408,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3466,7 +3516,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3655,7 +3705,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Naslov"
@@ -3666,13 +3715,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3732,9 +3786,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3745,7 +3800,7 @@ msgid "Company Name"
 msgstr "Naziv firme"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3764,13 +3819,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3800,12 +3878,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3854,19 +3928,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3884,7 +3946,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3929,7 +3991,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3948,9 +4010,43 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.prikaz"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4006,13 +4102,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4028,8 +4129,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4088,33 +4189,10 @@ msgid "Languages"
 msgstr "Jezici"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Ekskluzivno ili"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4192,7 +4270,6 @@ msgstr "Ograničenje"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Uobičajeno"
 
@@ -4264,6 +4341,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4325,8 +4407,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4407,6 +4496,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4430,6 +4535,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4457,6 +4599,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4534,12 +4682,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4554,7 +4696,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4565,13 +4706,18 @@ msgstr ""
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4614,6 +4760,8 @@ msgstr "Smjer"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4629,7 +4777,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4722,7 +4870,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4810,7 +4963,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4925,6 +5078,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4938,7 +5096,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4949,7 +5107,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4981,6 +5139,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5144,7 +5313,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5160,16 +5329,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5210,8 +5374,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5275,15 +5440,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5299,6 +5455,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5382,6 +5543,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5632,7 +5799,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5689,6 +5856,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5804,13 +5980,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5830,7 +6008,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5863,9 +6041,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5899,6 +6076,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Izvorni prikaz"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5909,7 +6091,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5925,26 +6107,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6077,11 +6239,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6093,8 +6250,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6201,7 +6358,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6239,7 +6396,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6266,8 +6423,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6300,6 +6485,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6342,7 +6534,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6434,7 +6626,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6454,23 +6646,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobitel"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6503,10 +6678,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6580,8 +6755,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6605,8 +6780,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6654,18 +6829,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6770,6 +6940,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Prijelazi"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6864,7 +7041,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6965,12 +7141,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7012,6 +7182,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7069,7 +7240,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7089,6 +7260,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7100,13 +7276,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7137,7 +7318,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7183,7 +7364,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7203,30 +7383,30 @@ msgid "Child Categories"
 msgstr "Podkategorije"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7314,6 +7494,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7397,6 +7582,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7426,11 +7626,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7455,7 +7650,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7466,8 +7660,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7546,7 +7755,7 @@ msgid "Change My Preferences"
 msgstr "Promjeni Moje postavke"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7633,14 +7842,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7649,7 +7860,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7660,13 +7871,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7685,12 +7896,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Čarobnjak"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7863,7 +8075,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7892,14 +8104,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7923,7 +8127,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8038,7 +8241,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8353,7 +8556,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8365,7 +8568,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8375,7 +8578,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8390,6 +8593,17 @@ msgstr "Nastavi"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8429,7 +8643,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8451,14 +8665,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8483,7 +8697,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Skraćen naziv mjeseca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8495,7 +8709,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -8573,7 +8786,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8601,8 +8814,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8626,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8773,7 +8986,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8812,8 +9025,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8887,7 +9100,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8901,7 +9114,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8964,6 +9177,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9062,8 +9280,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9092,13 +9310,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9119,7 +9337,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9167,7 +9385,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9213,6 +9431,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9221,7 +9440,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9240,6 +9459,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9275,7 +9531,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9327,6 +9583,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9369,23 +9630,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9419,7 +9668,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9510,6 +9759,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9714,7 +9968,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9725,13 +9979,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9899,7 +10158,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9932,6 +10191,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9957,6 +10221,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10046,7 +10315,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10082,13 +10350,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10147,19 +10422,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10173,6 +10473,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10191,7 +10493,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10203,13 +10510,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10291,6 +10591,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10360,6 +10680,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10418,9 +10743,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10438,8 +10763,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10478,13 +10803,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10495,7 +10819,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10524,36 +10853,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10575,6 +10874,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10591,16 +10895,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10617,8 +10911,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10644,11 +10938,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10674,7 +10963,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10690,12 +10979,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10716,29 +11005,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10759,7 +11028,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10806,7 +11075,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10830,6 +11098,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10915,19 +11184,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10969,22 +11247,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11117,7 +11379,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11207,7 +11468,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11257,8 +11518,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11349,7 +11610,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11376,7 +11637,7 @@ msgid "Object"
 msgstr "Objekat"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11462,7 +11723,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11475,7 +11736,7 @@ msgid "User Ref."
 msgstr "Korisnik ref."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11520,8 +11781,6 @@ msgstr "Referentni vodič"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11529,7 +11788,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11558,12 +11817,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Ekskluzivno ili"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11670,8 +11923,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11708,7 +11963,7 @@ msgid "Action Type"
 msgstr "Tip akcije"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11844,11 +12099,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11865,7 +12115,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11888,7 +12138,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11930,13 +12180,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11985,73 +12235,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12059,13 +12244,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12242,6 +12462,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12258,7 +12483,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12306,7 +12531,7 @@ msgid "choose"
 msgstr "odaberi"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12482,10 +12707,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12517,12 +12746,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12536,7 +12766,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12558,23 +12787,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12642,24 +12854,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12688,6 +12884,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12724,6 +12940,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12791,6 +13008,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12880,6 +13102,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12892,7 +13115,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12923,16 +13146,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12997,6 +13224,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13069,29 +13301,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13139,7 +13348,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13183,8 +13392,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13429,9 +13638,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13458,62 +13672,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13555,17 +13720,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13600,7 +13754,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13680,11 +13834,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13699,6 +13852,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13719,6 +13877,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13755,41 +13937,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13850,40 +13997,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13972,6 +14087,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14014,34 +14144,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14064,9 +14166,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14077,7 +14179,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14103,7 +14235,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14148,7 +14280,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14181,11 +14313,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14201,8 +14332,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14317,7 +14446,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14329,7 +14458,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14362,7 +14490,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14373,8 +14501,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14400,11 +14528,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14494,7 +14617,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14561,8 +14683,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14590,7 +14716,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14651,6 +14777,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14675,7 +14832,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14714,6 +14871,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14766,6 +14929,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14790,6 +14960,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14806,7 +14981,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14827,14 +15002,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14871,7 +15083,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14889,11 +15106,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14929,11 +15150,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14961,7 +15177,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14972,7 +15188,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15038,7 +15254,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15080,6 +15295,9 @@ msgstr ""
 #~ msgid "SMS - Gateway: clickatell"
 #~ msgstr "SMS - pristupnik: clickatell"
 
+#~ msgid "Contact Name"
+#~ msgstr "Naziv kontakta"
+
 #~ msgid "Select Action Type"
 #~ msgstr "Odaberi tip akcije"
 
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index f2cd3d359bc..9e6be14417d 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:44+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\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: 2012-12-04 04:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Data i hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -190,41 +190,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Avís!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -235,7 +209,7 @@ msgstr ""
 "d'un mòdul (addon) personalitzat."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error en la restricción (constraint)"
@@ -246,7 +220,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -257,7 +231,7 @@ msgid "Swaziland"
 msgstr "Swazilàndia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creat."
@@ -336,20 +310,6 @@ msgstr "Companyia on es guardarà el registre actual."
 msgid "Max. Size"
 msgstr "Tamany màx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -357,11 +317,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nom"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -420,7 +375,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -457,6 +412,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietari"
 
@@ -495,7 +451,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -549,7 +505,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilles holandeses"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -589,9 +545,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -616,26 +572,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnià / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -646,9 +582,25 @@ msgstr ""
 "per segona vegada, obtindrá l'informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -725,14 +677,12 @@ msgstr ""
 "defecte (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Assistents"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Els camps personalitzats han de tenir un nom que comenci amb 'x_'!"
@@ -796,16 +746,14 @@ msgid "Model Description"
 msgstr "Descripció del model"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -836,11 +784,21 @@ msgstr "Expresió de l'activació"
 msgid "Jordan"
 msgstr "Jordània"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.vista"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -972,13 +930,9 @@ msgid "base.language.export"
 msgstr "base.idioma.exportar"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indiqueu el nom de camp al qual e refereix el id del registre per a "
-"l'operació escriure. Si esta buit es referirà al id actiu de l'objecte."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nova Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -998,7 +952,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1048,16 +1002,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Espanyol (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mòbil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1154,9 +1101,38 @@ msgid "Mongolia"
 msgstr "Mongòlia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1170,12 +1146,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1202,7 +1183,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1232,7 +1260,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1264,14 +1292,12 @@ msgid "South Korea"
 msgstr "Corea del Sud"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transicions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "No s'ha trobat el registre #%d de %s, no es pot copiar!"
@@ -1409,7 +1435,7 @@ msgid "Marshall Islands"
 msgstr "Illes Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Està prohibit canviar el model d'un camp!"
@@ -1431,7 +1457,7 @@ msgid "Search"
 msgstr "Cerca"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1450,7 +1476,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Assistents"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operació cancel·lada"
@@ -1578,7 +1611,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "No existeix un idioma amb codi \"%s\""
@@ -1697,7 +1744,7 @@ msgid "On Create"
 msgstr "En creació"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1707,11 +1754,6 @@ msgstr ""
 "punts es fan servir per referir-se a dades d'altres mòduls, per exemple "
 "mòdul.referència_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1794,7 +1836,7 @@ msgid "East Timor"
 msgstr "Timor Oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1835,11 +1877,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID fitxer adjunt"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1854,7 +1891,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1895,6 +1932,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Permís per llegir"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1971,16 +2013,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Model fitxer adjunt"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2035,7 +2072,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "No es pot eliminar l'usuari principal!"
@@ -2059,11 +2096,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (còpia)"
@@ -2075,7 +2112,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipus d'adreça"
 
@@ -2113,11 +2149,6 @@ msgstr "Ruta completa"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2253,6 +2284,11 @@ msgstr "Número de mòduls actualitzats"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2286,12 +2322,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2342,6 +2383,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Afegeix o no la capçalera corporativa en l'informe RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2396,7 +2446,7 @@ msgstr ""
 "tree, form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2478,7 +2528,6 @@ msgstr "Santo Tomé i Príncep"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2525,11 +2574,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2648,9 +2692,20 @@ msgid "Default limit for the list view"
 msgstr "Límit per defecte per la vista de llista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nova Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2728,7 +2783,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2787,6 +2842,19 @@ msgstr "Mapa de camps"
 msgid "Export Translations"
 msgstr "Exporta traduccions"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2795,7 +2863,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2881,7 +2949,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2911,7 +2979,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2976,22 +3044,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Estructura de l'objecte no vàlida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -3088,12 +3156,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! No podeu crear companyies recursives."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3110,17 +3178,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3130,7 +3200,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No es pot actualitzar mòdul '%s'. No està instal·lat."
@@ -3181,34 +3251,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Arguments no vàlids"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3247,7 +3289,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3259,6 +3301,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipus de compte de banc"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3295,7 +3365,7 @@ msgid "Signal (subflow.*)"
 msgstr "Senyal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3335,7 +3405,7 @@ msgid "Access Controls"
 msgstr "Controls d'accés"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3365,32 +3435,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Fitxer icona web (immòbil)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3410,9 +3454,13 @@ msgstr ""
 "Si utilitza un tipus fórmula, introduïu una expressió Python que inclogui "
 "la variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No podeu crear companyies recursives."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Data naixement"
 
@@ -3428,7 +3476,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3538,7 +3586,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3729,7 +3777,6 @@ msgstr "Informe"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Títol"
@@ -3741,13 +3788,18 @@ msgstr ""
 "Si no s'especifica actua com a valor per defecte per als nous recursos."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "S'ha detectat recursivitat."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Error de recurrència entre dependències de mòduls!"
@@ -3807,9 +3859,10 @@ msgid "Urdu / اردو"
 msgstr "Tayiko / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3820,7 +3873,7 @@ msgid "Company Name"
 msgstr "Nom d'empresa"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3839,14 +3892,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (obsolet - utilitzar Informe)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Regles de registre"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre i Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3875,13 +3951,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.traduccio"
 
 #. module: base
 #: view:res.lang:0
@@ -3929,19 +4001,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3961,7 +4021,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4006,7 +4066,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4025,9 +4085,43 @@ msgid "Technical Data"
 msgstr "Dades tècniques"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.vista"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4083,13 +4177,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Estructura no vàlida!"
@@ -4105,9 +4204,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grup requerit"
 
 #. module: base
 #: view:res.lang:0
@@ -4165,33 +4264,10 @@ msgid "Languages"
 msgstr "Idiomes"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4269,7 +4345,6 @@ msgstr "Restricció"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Per defecte"
 
@@ -4341,6 +4416,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4404,9 +4484,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4486,6 +4573,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4512,6 +4615,43 @@ msgstr ""
 "camp està buit, OpenERP atorgarà la visibilitat basant-se en els permisos de "
 "lectura dels objectes associats."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4541,6 +4681,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4618,12 +4764,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.accions.informe.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4638,7 +4778,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -4649,13 +4788,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Marca com Per executar"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representació apropiada de data i hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4701,6 +4845,8 @@ msgstr "Direcció"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistes"
 
@@ -4716,7 +4862,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4810,7 +4956,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4898,7 +5049,7 @@ msgid "System Configuration Done"
 msgstr "Configuració del sistema realitzada"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "S'ha produït un error mentre es validaven els camp(s) %s:%s"
@@ -5013,6 +5164,11 @@ msgstr "Maurici"
 msgid "Full Access"
 msgstr "Accés complet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5026,7 +5182,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5037,7 +5193,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5069,6 +5225,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hongria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5233,7 +5400,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5250,16 +5417,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimals"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5305,9 +5467,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "El nom del mòdul ha de ser únic!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5370,15 +5533,6 @@ msgstr "Veneçuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5394,6 +5548,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nom del document adjunt"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5477,6 +5636,12 @@ msgstr "Kazakhstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "% w - Dia de la setmana [0 (diumenge), 6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nom de recurs"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5731,7 +5896,7 @@ msgid "title"
 msgstr "títol"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5788,6 +5953,15 @@ msgstr "Productes"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5903,13 +6077,15 @@ msgid "Bank Type"
 msgstr "Tipus de banc"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nom del grup no pot començar amb \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5929,7 +6105,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5964,10 +6140,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nom de recurs"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6003,6 +6178,11 @@ msgstr ""
 "client, el senyal comprova el nom del botó premut. Si el senyal és NULL, cap "
 "botó és necessari per validar aquesta transició."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6013,7 +6193,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6029,26 +6209,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6181,11 +6341,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6197,8 +6352,8 @@ msgid "Malaysia"
 msgstr "Malàisia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6307,7 +6462,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "No existeix una vista del tipus '%s' definida per a l'estructura!"
@@ -6345,7 +6500,7 @@ msgid "Created Menus"
 msgstr "Menús creats"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6372,9 +6527,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Marca com Per executar"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6406,6 +6589,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Any actual sense centúria: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6448,7 +6638,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6540,7 +6730,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6560,23 +6750,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mòbil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6609,10 +6782,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Mòduls"
 
@@ -6686,9 +6859,9 @@ msgid "United Kingdom"
 msgstr "Regne Unit"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_continguts"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6712,8 +6885,8 @@ msgid "Partner Titles"
 msgstr "Títols d'empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6761,7 +6934,7 @@ msgid "ir.attachment"
 msgstr "ir.adjunt"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6771,11 +6944,6 @@ msgstr ""
 "permesa per aquest objecte ja que aquest objecte té com a finalitat la "
 "generació d'informes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6883,6 +7051,13 @@ msgstr "Arxiu de mòdul importat amb èxit!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transicions"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6977,7 +7152,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Província"
@@ -7078,12 +7252,6 @@ msgstr "Nom complet"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "El nom del mòdul ha de ser únic!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7125,6 +7293,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7182,7 +7351,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Indiqueu una acció per ser executada!"
@@ -7202,6 +7371,11 @@ msgstr "Nom de categoria"
 msgid "Northern Mariana Islands"
 msgstr "Illes Marianes del Nord"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7213,7 +7387,7 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7222,6 +7396,11 @@ msgstr ""
 "Utilitzeu l'assistent de canvi de contrasenya (a Preferències d'usuari o "
 "menú Usuari) per canviar la vostra pròpia contrasenya."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7252,7 +7431,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Insuficients camps per a la vista calendari!"
@@ -7300,7 +7479,6 @@ msgstr "Transició"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7320,30 +7498,30 @@ msgid "Child Categories"
 msgstr "Categories filles"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7431,6 +7609,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Aquesta finestra"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7516,6 +7699,21 @@ msgstr "Camps"
 msgid "Employees"
 msgstr "Empleats"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7545,11 +7743,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adreces"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7574,7 +7767,6 @@ msgstr "Opcions de selecció"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Carrer"
@@ -7585,9 +7777,24 @@ msgid "Yugoslavia"
 msgstr "Iugoslàvia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Pare dret"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7665,7 +7872,7 @@ msgid "Change My Preferences"
 msgstr "Canvia les preferències"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nom de model no vàlid en la definició de l'acció."
@@ -7752,14 +7959,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7768,7 +7977,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "No es permet establir contrasenyes buides per motius de seguretat!"
@@ -7779,13 +7988,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7807,12 +8016,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Assistent"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7985,7 +8195,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8016,14 +8226,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.actualitzar.tranduccions"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Avís!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8047,7 +8249,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8165,7 +8366,7 @@ msgid "Nigeria"
 msgstr "Nigèria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Per camps selection heu d'indicar les opcions de selecció!"
@@ -8481,7 +8682,7 @@ msgid "Update Modules List"
 msgstr "Actualitza llista de mòduls"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8495,7 +8696,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8509,7 +8710,7 @@ msgstr ""
 "diferent (ara podeu fer clic a Cancel·la en les preferències de l'usuari)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8524,6 +8725,17 @@ msgstr "Següent"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandès / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8563,7 +8775,7 @@ msgid "Mexico"
 msgstr "Mèxic"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8585,15 +8797,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nom del document adjunt"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8617,7 +8829,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nom abreviat del mes.8"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8629,7 +8841,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveïdor"
@@ -8707,7 +8918,7 @@ msgid "Selectable"
 msgstr "Seleccionable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8735,8 +8946,8 @@ msgid "Iteration"
 msgstr "Iteració"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Error de l'usuari"
@@ -8760,7 +8971,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8909,7 +9120,7 @@ msgid "Reunion (French)"
 msgstr "Reunió (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8949,8 +9160,8 @@ msgid "Solomon Islands"
 msgstr "Illes Salomó"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ErrorAccés"
@@ -9024,7 +9235,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9038,7 +9249,7 @@ msgid "Ukraine"
 msgstr "Ucraïna"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9101,6 +9312,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenc (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9199,9 +9415,9 @@ msgid "Custom Shortcuts"
 msgstr "Dreceres personalitzades"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9229,13 +9445,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9256,7 +9472,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9304,7 +9520,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "No existeix el mòdul %s!"
@@ -9350,6 +9566,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9358,7 +9575,7 @@ msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9377,6 +9594,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9412,7 +9666,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9464,6 +9718,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "% I - Hora (rellotge 12-hores) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_continguts"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9506,23 +9765,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9556,7 +9803,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Feu clic a 'Continua' per a establir el següent mòdul ..."
@@ -9649,6 +9896,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9856,7 +10108,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9867,13 +10119,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unitat d'interval"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Classe"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Aquest mètode ja no existeix"
@@ -10049,7 +10306,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10084,6 +10341,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10109,6 +10371,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10198,7 +10465,6 @@ msgstr "%m - Número mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciutat"
@@ -10234,13 +10500,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonià / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indiqueu el nom de camp al qual e refereix el id del registre per a "
+"l'operació escriure. Si esta buit es referirà al id actiu de l'objecte."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versió posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10302,19 +10577,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.traduccio"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10328,6 +10628,8 @@ msgid "Activity"
 msgstr "Activitat"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10346,7 +10648,12 @@ msgid "Parent Company"
 msgstr "Empresa matriu"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10358,13 +10665,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10451,6 +10751,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10522,6 +10842,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipus de seqüències"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10580,9 +10905,9 @@ msgid ""
 msgstr "No podeu eliminar l'idioma que està actualment actiu!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10600,8 +10925,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema en configuració `Id registre` en l'acció del servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Error de Validació"
@@ -10642,13 +10967,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10659,7 +10983,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10690,36 +11019,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10741,6 +11040,11 @@ msgstr "Altre propietari"
 msgid "Ecuador"
 msgstr "Equador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10758,16 +11062,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "No podeu eliminar l'idioma que és l'idioma predeterminat d'un usuari!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10784,9 +11078,9 @@ msgid "Cascade"
 msgstr "En cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grup requerit"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10811,11 +11105,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10841,7 +11130,7 @@ msgid "Domain"
 msgstr "Domini"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10857,12 +11146,12 @@ msgid "State Name"
 msgstr "Nom província"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10883,30 +11172,10 @@ msgid "Timezone"
 msgstr "Zona horària"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.accions.informe.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10926,7 +11195,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10979,7 +11248,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Carrer2"
 
@@ -11003,6 +11271,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11088,19 +11357,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Error d'integritat"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "La grandària del camp no pot ser menor que 1!"
@@ -11142,22 +11420,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Arguments"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11290,7 +11552,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Client"
 
@@ -11380,7 +11641,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11430,8 +11691,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11522,7 +11783,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11549,7 +11810,7 @@ msgid "Object"
 msgstr "Objecte"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11638,7 +11899,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11653,7 +11914,7 @@ msgid "User Ref."
 msgstr "Ref. usuari"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11698,8 +11959,6 @@ msgstr "Guía de referència"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11707,7 +11966,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11736,12 +11995,6 @@ msgstr "Illes Malvines"
 msgid "Lebanon"
 msgstr "Líban"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11848,8 +12101,10 @@ msgid "Selection"
 msgstr "Selecció"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11886,7 +12141,7 @@ msgid "Action Type"
 msgstr "Tipus d'acció"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12024,11 +12279,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarqueu el camp actiu per ocultar el contacte."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12045,7 +12295,7 @@ msgid "workflow.instance"
 msgstr "workflow.instancia"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atribut desconegut %s en %s "
@@ -12068,7 +12318,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Mètode get (obtenir) no definit!"
@@ -12109,16 +12359,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Fitxer binari o URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Canvia contrasenya"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12165,91 +12415,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El format de separació hauria de ser com [,n] on 0 < n, començant pel dígit "
-"unitat. -1 acabarà la separació. Per ex. [3,2,-1] representarà 106500 com "
-"1,06,500; [1,2,-1] ho representarà com 106,50,0; [3] ho representarà com "
-"106,500. Sempre que ',' sigui el separador de mil en cada cas."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.valors"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occità (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12432,6 +12648,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.valors"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12448,7 +12669,7 @@ msgid "Body"
 msgstr "Contingut"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12499,7 +12720,7 @@ msgid "choose"
 msgstr "selecció"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12675,10 +12896,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12710,12 +12935,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12731,7 +12957,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Varis"
@@ -12753,23 +12978,6 @@ msgstr ""
 msgid "China"
 msgstr "Xina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12841,25 +13049,9 @@ msgid "Bulgaria"
 msgstr "Bulgària"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12887,6 +13079,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12923,6 +13135,7 @@ msgstr "Eslovaco / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconegut"
@@ -12990,6 +13203,11 @@ msgstr "Llibreta d'adreces"
 msgid "ir.sequence.type"
 msgstr "ir.seqüència.tipus"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13079,6 +13297,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13091,7 +13310,7 @@ msgid "Information"
 msgstr "Informació"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13122,16 +13341,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Pare dret"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualitza llista de mòduls"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13196,6 +13419,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "El camp osv_memory només pot ser comparat amb els operadors = i ! =."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13268,29 +13496,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13338,7 +13543,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13382,9 +13587,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Regles de registre"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13630,9 +13835,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13659,63 +13869,14 @@ msgid "System Configuration done"
 msgstr "Configuració del sistema realitzada."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Illes Turques i Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13756,17 +13917,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13801,7 +13951,7 @@ msgid "Low"
 msgstr "Baixa"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Error! No podeu crear menús recursius."
@@ -13883,11 +14033,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telèfon"
@@ -13902,6 +14051,11 @@ msgstr "Menú d'accés"
 msgid "Thailand"
 msgstr "Tailàndia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13922,6 +14076,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanès / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13958,41 +14136,6 @@ msgstr "Relació objecte"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14053,40 +14196,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14181,6 +14292,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Vista auto-carregar"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14223,34 +14349,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14273,9 +14371,9 @@ msgid "Unmet dependency !"
 msgstr "Dependència no resolta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14286,7 +14384,37 @@ msgid "base.module.configuration"
 msgstr "base.modul.configuracio"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14312,7 +14440,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14357,7 +14485,7 @@ msgid "Access"
 msgstr "Accés"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14390,11 +14518,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14410,8 +14537,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14526,7 +14651,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14538,7 +14663,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14575,7 +14699,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14586,8 +14710,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaidjan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Avís"
@@ -14613,11 +14737,6 @@ msgstr "Illes Vírgenes (Britànica)"
 msgid "Parameters"
 msgstr "Paràmetres"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre i Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14707,7 +14826,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -14778,9 +14896,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Espanyol (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"El format de separació hauria de ser com [,n] on 0 < n, començant pel dígit "
+"unitat. -1 acabarà la separació. Per ex. [3,2,-1] representarà 106500 com "
+"1,06,500; [1,2,-1] ho representarà com 106,50,0; [3] ho representarà com "
+"106,500. Sempre que ',' sigui el separador de mil en cada cas."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14807,7 +14933,7 @@ msgid "Japan"
 msgstr "Japó"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Només podeu canviar el nom una columna a la vegada!"
@@ -14868,6 +14994,37 @@ msgstr "ir.accions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14892,7 +15049,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Per a la vostra informació, aquesta operació pot trigar varis minuts"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14931,6 +15088,12 @@ msgstr "Execució"
 msgid "Condition"
 msgstr "Condició"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14985,6 +15148,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croàcia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15009,6 +15179,11 @@ msgstr "Actualització del sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15025,7 +15200,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15046,15 +15221,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Informació general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Illes Turques i Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15090,7 +15302,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Advertència de canvi de companyia."
@@ -15109,11 +15326,15 @@ msgstr ""
 "El número següent d'aquesta seqüència serà incrementat per aquest número."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funció"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15149,11 +15370,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Lliurament"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15181,7 +15397,7 @@ msgid "Workflow Instances"
 msgstr "Instàncies flux"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Empreses: "
@@ -15192,7 +15408,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15258,7 +15474,6 @@ msgstr "Nom exportació"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15314,6 +15529,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "En múltiples doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Nom"
+
 #~ msgid "Select Action Type"
 #~ msgstr "Seleccioneu tipus d'acció"
 
@@ -15366,6 +15584,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "assistent.ir.model.menú.crea.línia"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID fitxer adjunt"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Deixeu-lo a 0 si l'acció ha d'aparèixer en tots els recursos."
 
@@ -15376,6 +15597,9 @@ msgstr ""
 #~ "Indiqueu el missatge. Podeu utilitzar els camps de l'objecte. per ex. "
 #~ "`Estimat [[object.partner_id.name]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Model fitxer adjunt"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Nom d'activació"
 
@@ -15495,6 +15719,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "Ruta SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid "res.users"
 #~ msgstr "res.usuaris"
 
@@ -15677,6 +15904,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Carrega una traducció oficial"
 
+#~ msgid "Delivery"
+#~ msgstr "Lliurament"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Empresa de serveis de software lliure"
 
@@ -15686,6 +15916,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Camps de tipus"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarqueu el camp actiu per ocultar el contacte."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "República Democràtica del Congo"
 
@@ -15882,6 +16115,9 @@ msgstr ""
 #~ msgid "Not Implemented"
 #~ msgstr "No implementat"
 
+#~ msgid "Addresses"
+#~ msgstr "Adreces"
+
 #, python-format
 #~ msgid "The copy method is not implemented on this object !"
 #~ msgstr "El mètode copy (copiar) no està implementat en aquest objecte!"
@@ -16639,6 +16875,9 @@ msgstr ""
 #~ "Introduïu un valor si voleu canviar la contrasenya de l'usuari. Aquest "
 #~ "usuari haurà de desconnectar-se i tornar-se a connectar!"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Fitxer binari o URL externa"
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Afegir un widget per usuari"
 
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 0dd4d476b75..bbb0861b939 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:44+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: openerp-i18n-czech <openerp-i18n-czech@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Datum a čas"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -192,41 +192,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Varování!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -236,7 +210,7 @@ msgstr ""
 "upravte je přes kód Pythonu, přednostně přes vlastní doplněk!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Chyba omezení"
@@ -247,7 +221,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -258,7 +232,7 @@ msgid "Swaziland"
 msgstr "Svazijsko"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "vytvořeno."
@@ -337,20 +311,6 @@ msgstr "Společnost k uložení aktuálního záznamu"
 msgid "Max. Size"
 msgstr "Maximální velikost"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -358,11 +318,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Název kontaktu"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -421,7 +376,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -458,6 +413,7 @@ msgstr "Pravidla automatických akcí"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Vlastník"
 
@@ -496,7 +452,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -549,7 +505,7 @@ msgid "Netherlands Antilles"
 msgstr "Nizozemské Antily"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -589,9 +545,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Původní pohled"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Nápady"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -616,26 +572,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosenština / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -646,9 +582,25 @@ msgstr ""
 "vytiskne stejné jméno přílohy."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -725,14 +677,12 @@ msgstr ""
 "(výchozí: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Průvodci"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Vlastní pole musí mít název začínající s 'x_' !"
@@ -796,16 +746,14 @@ msgid "Model Description"
 msgstr "Popis modelu"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -834,11 +782,21 @@ msgstr "Výraz spouštěče"
 msgid "Jordan"
 msgstr "Jordánsko"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Další plánované datum vykonání této úlohy."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -970,13 +928,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Poskytuje název pole, na které odkazuje id záznamu, pro operaci zápisu. "
-"Pokud je prázdné tak odkazuje na aktivní id objektu."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua - Nová Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -995,7 +949,7 @@ msgid "Email Preferences"
 msgstr "Předvolby Emailu"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1043,16 +997,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Španělština (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1149,9 +1096,38 @@ msgid "Mongolia"
 msgstr "Mongolsko"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1167,12 +1143,17 @@ msgstr ""
 "skupin."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1199,7 +1180,54 @@ msgid "Username"
 msgstr "Uživatelské jméno"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1229,7 +1257,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Test spojení selhal!"
@@ -1261,14 +1289,12 @@ msgid "South Korea"
 msgstr "Jižní Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Překlady"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Záznam #%d of %s nenalezen, nelze kopírovat!"
@@ -1406,7 +1432,7 @@ msgid "Marshall Islands"
 msgstr "Marshallovy ostrovy"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Je zakázána změna modelu pole!"
@@ -1428,7 +1454,7 @@ msgid "Search"
 msgstr "Hledat"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1446,7 +1472,14 @@ msgid "Parent Application"
 msgstr "Nadřazená aplikace"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Průvodci"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operace zrušena"
@@ -1574,7 +1607,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Jazyk s kódem \"%s\" neexistuje"
@@ -1695,7 +1742,7 @@ msgid "On Create"
 msgstr "Při vytvoření"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1704,11 +1751,6 @@ msgstr ""
 "'%s' obsahuje příliš mnoho teček. Id XML by nemělo obsahovat tečky ! Tyto "
 "jsou použity pro odkazování na data jiných modulů, jako module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1791,7 +1833,7 @@ msgid "East Timor"
 msgstr "Východní Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1832,11 +1874,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Přiložené ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1854,7 +1891,7 @@ msgstr ""
 "seznamu a další."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1895,6 +1932,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Přístup pro čtení"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1971,16 +2013,11 @@ msgid "Create Tasks on SO"
 msgstr "Vytvořit úlokoly nad SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Přiložený model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2035,7 +2072,7 @@ msgid "Formula"
 msgstr "Vzorec"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Nelze odstranit uživatele root!"
@@ -2066,11 +2103,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -2082,7 +2119,6 @@ msgstr "Šablona Účtové osnovy"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Typ adresy"
 
@@ -2120,11 +2156,6 @@ msgstr "Plná cesta"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Nápady"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2260,6 +2291,11 @@ msgstr "Počet aktualizovaných modulů"
 msgid "Method"
 msgstr "Metoda"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2293,12 +2329,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2348,6 +2389,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Přidat nebo nepřidat RML hlavičku společnosti"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2401,7 +2451,7 @@ msgstr ""
 "'calendar', aj. (Výchozí: tree, form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Dokument byl upraven od vašeho posledního prohlížení (%s:%d)"
@@ -2482,7 +2532,6 @@ msgstr "¨"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2529,11 +2578,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2651,9 +2695,20 @@ msgid "Default limit for the list view"
 msgstr "Výchozí omezení pro zobrazení seznamu"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua - Nová Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2731,7 +2786,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2790,6 +2845,19 @@ msgstr "Mapování polí"
 msgid "Export Translations"
 msgstr "Exportovat překlady"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2798,7 +2866,7 @@ msgid "Manager"
 msgstr "Správce"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2884,7 +2952,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2914,7 +2982,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2981,22 +3049,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Neplatná architektura objektu!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Chyba!"
@@ -3093,12 +3161,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Chyba! Nemůžete vytvářet rekurzivní společnosti."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3115,17 +3183,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3135,7 +3205,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Nelze povýšit modul '%s'. Není nainstalován."
@@ -3186,34 +3256,6 @@ msgstr "Konfigurační parametry"
 msgid "Invalid arguments"
 msgstr "Neplatné parametry"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3252,7 +3294,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3264,6 +3306,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Typ bankovního účtu"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3300,7 +3370,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signál (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3339,7 +3409,7 @@ msgid "Access Controls"
 msgstr "Správa přístupových práv"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3369,32 +3439,6 @@ msgstr "Hlavní společnost"
 msgid "Web Icon File (hover)"
 msgstr "Název webové ikony (při najetí myší)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3414,9 +3458,13 @@ msgstr ""
 "Pokud použijete typ vzorce, použijte výraz pythonu s použitím proměnné "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Chyba! Nemůžete vytvářet rekurzivní společnosti."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Datum narození"
 
@@ -3432,7 +3480,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3541,7 +3589,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3732,7 +3780,6 @@ msgstr "Vykazování"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Oslovení"
@@ -3743,13 +3790,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Pokud není nastaveno, chová se jako výchozí hodnota pro nové zdroje"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Zjištěna rekurze."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Chyba rekurze v závislostech modulů !"
@@ -3809,9 +3861,10 @@ msgid "Urdu / اردو"
 msgstr "Urdština / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3822,7 +3875,7 @@ msgid "Company Name"
 msgstr "Název společnosti"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3843,14 +3896,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (zastaralé - použijte Výkaz)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Kód jazyka překladové položky musí být ze známých jazyků"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Pravidla záznamů"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Svatý Pierre a Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3879,13 +3955,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3933,19 +4005,7 @@ msgid "Paper Format"
 msgstr "Formát papíru"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3965,7 +4025,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4010,7 +4070,7 @@ msgid "Email Gateway"
 msgstr "Poštovní brána"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4031,9 +4091,43 @@ msgid "Technical Data"
 msgstr "Technická data"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4089,13 +4183,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "s.r.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Neplatná architektura!"
@@ -4111,9 +4210,9 @@ msgid "Share any Document"
 msgstr "Sdílet jakýkoliv dokument"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Požadována skupina"
 
 #. module: base
 #: view:res.lang:0
@@ -4171,33 +4270,10 @@ msgid "Languages"
 msgstr "Jazyky"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4275,7 +4351,6 @@ msgstr "Omezení"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Standartní"
 
@@ -4347,6 +4422,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4410,9 +4490,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4492,6 +4579,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4518,6 +4621,43 @@ msgstr ""
 "skupinách. Pokud je toto pole prázdné, OpenERP spočítá viditelnost na "
 "základě přístupu pro čtení vztažených objektů."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4547,6 +4687,12 @@ msgstr ""
 msgid "View"
 msgstr "Pohled"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4624,12 +4770,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4644,7 +4784,6 @@ msgstr "Švýcarsko - Účetnictví"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Zip"
@@ -4655,13 +4794,18 @@ msgstr "Zip"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Nastavit jako úkol"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Odpovídající reprezentace data a času."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4707,6 +4851,8 @@ msgstr "Směr"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Pohledy"
 
@@ -4722,7 +4868,7 @@ msgid "SMTP Server"
 msgstr "Server SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Snažíte se odebrat modul, který je instalovaný nebo bude instalován"
@@ -4815,7 +4961,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4903,7 +5054,7 @@ msgid "System Configuration Done"
 msgstr "Provedena konfigurace systému"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Nastala chyba při ověřování polí %s: %s"
@@ -5018,6 +5169,11 @@ msgstr "Mauricius"
 msgid "Full Access"
 msgstr "Plný přístup"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5031,7 +5187,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5042,7 +5198,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5074,6 +5230,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Maďarsko"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5237,7 +5404,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Nelze přejmenovat sloupec %s, protože takový sloupec již existuje!"
@@ -5253,16 +5420,11 @@ msgid "Decimal Separator"
 msgstr "Desetinný oddělovač"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5303,9 +5465,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Tvůrce"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Název modulu musí být jedinečný !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5368,15 +5531,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5392,6 +5546,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Název přílohy"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5475,6 +5634,12 @@ msgstr "Kazachstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Číslo dne v týdnu [0(Neděle),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Název zdroje"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5729,7 +5894,7 @@ msgid "title"
 msgstr "název"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5786,6 +5951,15 @@ msgstr "Výrobky"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5901,13 +6075,15 @@ msgid "Bank Type"
 msgstr "Typ banky"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Název skupiny nemůže začínat \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5927,7 +6103,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5961,10 +6137,9 @@ msgid "Uncategorized"
 msgstr "Bez kategorie"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Název zdroje"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6000,6 +6175,11 @@ msgstr ""
 "formuláři, signal otestuje jméno stisknutého tlačítka. Pokud je signál NULL, "
 "žádné tlačítko není potřeba ověřovat tímto přechodem."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Původní pohled"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6010,7 +6190,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6026,26 +6206,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6178,11 +6338,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6194,8 +6349,8 @@ msgid "Malaysia"
 msgstr "Malajsie"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6304,7 +6459,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Pro strukturu není definován pohled typu '%s'!"
@@ -6342,7 +6497,7 @@ msgid "Created Menus"
 msgstr "Vytvořené nabídky"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6369,9 +6524,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Nastavit jako úkol"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6403,6 +6586,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Aktuální rok bez století: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6445,7 +6635,7 @@ msgid "Audit Trail"
 msgstr "Prověřovací záznam"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6537,7 +6727,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6557,23 +6747,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6606,10 +6779,10 @@ msgstr "XML výkazu"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduly"
 
@@ -6683,9 +6856,9 @@ msgid "United Kingdom"
 msgstr "Spojené království"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6708,8 +6881,8 @@ msgid "Partner Titles"
 msgstr "Jména partnerů"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6757,7 +6930,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6766,11 +6939,6 @@ msgstr ""
 "Nemůžete rpovést tuto operaci. Vytváření nových záznamů není pro tento "
 "objekt povoleno, protože tento objekt je pro účely výkazů."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6877,6 +7045,13 @@ msgstr "Soubor modulu úspěšně importován!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Překlady"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6972,7 +7147,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Fed. stát"
@@ -7073,12 +7247,6 @@ msgstr "Celé jméno"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Název modulu musí být jedinečný !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7120,6 +7288,7 @@ msgstr "Na více dok."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7177,7 +7346,7 @@ msgid "Connection Security"
 msgstr "Zabezpečení spojení"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Prosíme určete akci k vykonání !"
@@ -7197,6 +7366,11 @@ msgstr "Název kategorie"
 msgid "Northern Mariana Islands"
 msgstr "Severní Mariany"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7208,7 +7382,7 @@ msgid "Intrastat Reporting"
 msgstr "Vykazování Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7217,6 +7391,11 @@ msgstr ""
 "Ke změně vašeho vlastního hesla prosíme použijte průvodce změny hesla (v "
 "uživatelských předvolbách nebo uživatelské nabídce)."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7247,7 +7426,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Nedostatek polí pro zobraznení kalendáře!"
@@ -7295,7 +7474,6 @@ msgstr "Změny"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7315,30 +7493,30 @@ msgid "Child Categories"
 msgstr "Kategorie potomků"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Chyba"
@@ -7426,6 +7604,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Toto okno"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7511,6 +7694,21 @@ msgstr "Pole"
 msgid "Employees"
 msgstr "Zaměstnanci"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7540,11 +7738,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresy"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7569,7 +7762,6 @@ msgstr "Volby výběru"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Ulice"
@@ -7580,9 +7772,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslávie"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Pravý rodič"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7660,7 +7867,7 @@ msgid "Change My Preferences"
 msgstr "Změnit moje předvolby"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Neplatný název modulu v definici akce."
@@ -7747,14 +7954,16 @@ msgid "US Letter"
 msgstr "Dopis US"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7763,7 +7972,7 @@ msgid "Company Bank Accounts"
 msgstr "Bankovní účty společnosti"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Nastavení prázdného hesla není povoleno z bezpečnostních důvodů!"
@@ -7774,13 +7983,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7802,12 +8011,13 @@ msgid "Normal Bank Account"
 msgstr "Obyčejný bankovní účet"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Průvodce"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7980,7 +8190,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8011,14 +8221,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Varování!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8042,7 +8244,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8160,7 +8361,7 @@ msgid "Nigeria"
 msgstr "Nigérie"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Volby výběru musí být dány pro vybraná pole."
@@ -8476,7 +8677,7 @@ msgid "Update Modules List"
 msgstr "Aktualizovat seznam modulů"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8489,7 +8690,7 @@ msgid "eInvoicing"
 msgstr "eFakturace"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8499,7 +8700,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "Hodnota \"%s\" pro pole \"%s.%s\" není ve výběru"
@@ -8514,6 +8715,17 @@ msgstr "Pokračovat"
 msgid "Thai / ภาษาไทย"
 msgstr "Thajština / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8553,7 +8765,7 @@ msgid "Mexico"
 msgstr "Mexiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8575,15 +8787,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Chybějící server SMTP"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Název přílohy"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Kód jazyka překladové položky musí být ze známých jazyků"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8607,7 +8819,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - zkratka měsíce."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8619,7 +8831,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dodavatel"
@@ -8697,7 +8908,7 @@ msgid "Selectable"
 msgstr "Lze vybrat"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Všechno se zdá být správně nastavené!"
@@ -8725,8 +8936,8 @@ msgid "Iteration"
 msgstr "Iterace"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "UserError"
@@ -8750,7 +8961,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8897,7 +9108,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Francouzský)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8936,8 +9147,8 @@ msgid "Solomon Islands"
 msgstr "Šalamounovy ostrovy"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -9011,7 +9222,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9028,7 +9239,7 @@ msgid "Ukraine"
 msgstr "Ukrajina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9091,6 +9302,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Vlámština (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamština / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9189,9 +9405,9 @@ msgid "Custom Shortcuts"
 msgstr "Vlastní zkratky"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamština / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9219,13 +9435,13 @@ msgid "Models"
 msgstr "Modely"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Záznam nyní nelze změnit"
@@ -9246,7 +9462,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9294,7 +9510,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s neexistuje!"
@@ -9340,6 +9556,7 @@ msgstr "Spojené státy - Účtová osnova"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9348,7 +9565,7 @@ msgid "Cancel"
 msgstr "Zrušit"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9367,6 +9584,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9402,7 +9656,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9454,6 +9708,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hodiny (12-hodinový formát) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9496,23 +9755,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Kód měny musí být jedinečný podle společnosti!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9546,7 +9793,7 @@ msgid "Products Expiry Date"
 msgstr "Datum vypršení výrobku"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Klikněte na 'Pokračovat' k nastavení dašlího doplňku..."
@@ -9638,6 +9885,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9844,7 +10096,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Marketingové kampaně - ukázka"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9855,13 +10107,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Jednotka intervalu"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Druh"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Tato metoda již neexistuje"
@@ -10035,7 +10292,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10070,6 +10327,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10095,6 +10357,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Ikona URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10184,7 +10451,6 @@ msgstr "%s - Číslo měsíce [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Město"
@@ -10220,13 +10486,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estónština / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Poskytuje název pole, na které odkazuje id záznamu, pro operaci zápisu. "
+"Pokud je prázdné tak odkazuje na aktivní id objektu."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 nebo pozdější verze"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10287,19 +10562,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10313,6 +10613,8 @@ msgid "Activity"
 msgstr "Činnosti"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10331,7 +10633,12 @@ msgid "Parent Company"
 msgstr "Nadřazená společnost"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Ověření OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10343,13 +10650,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10436,6 +10736,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10509,6 +10829,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Typ posloupnosti"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10569,9 +10894,9 @@ msgstr ""
 "Prosíme nejdříve jazyk deaktivujte,"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10589,8 +10914,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problém s nastavením `Record Id` v akci serveru!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10631,13 +10956,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10648,7 +10972,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10679,36 +11008,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10730,6 +11029,11 @@ msgstr "Jiné vlastnictví"
 msgid "Ecuador"
 msgstr "Ekvádor"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "pracovní postup"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10746,16 +11050,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Nemůžete smazat jazyk, který mají uživatelé jako upřednostňovaný !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10772,9 +11066,9 @@ msgid "Cascade"
 msgstr "Kaskáda"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Požadována skupina"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10801,11 +11095,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10831,7 +11120,7 @@ msgid "Domain"
 msgstr "Doména"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10847,12 +11136,12 @@ msgid "State Name"
 msgstr "Název státu"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10873,30 +11162,10 @@ msgid "Timezone"
 msgstr "Časová zóna"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10917,7 +11186,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10965,7 +11234,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Ulice 2"
 
@@ -10989,6 +11257,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11074,19 +11343,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Chyba integrity"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "pracovní postup"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Velikost pole nikdy nemůže být menší než 1 !"
@@ -11128,22 +11406,6 @@ msgstr "Adresář zaměstnance"
 msgid "Arguments"
 msgstr "Parametry"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11276,7 +11538,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Zákazník"
 
@@ -11366,7 +11627,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11416,9 +11677,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Ověření OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11508,7 +11769,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Doručení pošty selhalo"
@@ -11535,7 +11796,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11624,7 +11885,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11639,7 +11900,7 @@ msgid "User Ref."
 msgstr "Ref. uživatele"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11684,8 +11945,6 @@ msgstr "Referenční příručka"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11693,7 +11952,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11722,12 +11981,6 @@ msgstr "Falklandy"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11835,9 +12088,11 @@ msgid "Selection"
 msgstr "Výběr"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Ikona URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -11873,7 +12128,7 @@ msgid "Action Type"
 msgstr "Typ akce"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12011,11 +12266,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hodina 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Odškrtněte aktivní pole ke skrytí kontaktu."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12032,7 +12282,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Neznámá vlastnost %s v %s "
@@ -12055,7 +12305,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "nedefinována metoda get !"
@@ -12096,16 +12346,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Mzdové účetnictví"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binární soubor nebo vnější URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Změnit heslo"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12152,87 +12402,57 @@ msgid "Address Format"
 msgstr "Formát adresy"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
-
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Technické rysy"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12418,6 +12638,11 @@ msgstr ""
 "Pomůže vám spravovat váš inventář a hlavní skladové operace: doručovací "
 "příkazy, příjmy, aj."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12434,7 +12659,7 @@ msgid "Body"
 msgstr "Tělo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Test spojení uspěl!"
@@ -12482,7 +12707,7 @@ msgid "choose"
 msgstr "vybrat"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12660,10 +12885,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12695,12 +12924,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12714,7 +12944,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Různé"
@@ -12736,23 +12965,6 @@ msgstr ""
 msgid "China"
 msgstr "Čína"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12826,25 +13038,9 @@ msgid "Bulgaria"
 msgstr "Bulharsko"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12872,6 +13068,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "s.r.o."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12908,6 +13124,7 @@ msgstr "Slovenština / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "neznámé"
@@ -12975,6 +13192,11 @@ msgstr "Adresář"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13064,6 +13286,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13076,7 +13299,7 @@ msgid "Information"
 msgstr "Informace"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13107,16 +13330,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Pravý rodič"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Aktualizovat seznam modulů"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13181,6 +13408,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "Pole osv_memory může být pouze porovnáno s operátory = a !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13253,29 +13485,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Vnější identifikátor"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13323,7 +13532,7 @@ msgid "Delivery Costs"
 msgstr "Ceny dodání"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13367,9 +13576,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Šifrování hesla databáze"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Pravidla záznamů"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13615,9 +13824,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13644,63 +13858,14 @@ msgid "System Configuration done"
 msgstr "Nastavení systému provedeno"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Ostrovy Turks a Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13741,17 +13906,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13786,7 +13940,7 @@ msgid "Low"
 msgstr "Nízká"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Chyba ! Nemůžete vytvořit rekurzivní nabídku."
@@ -13868,11 +14022,10 @@ msgid "El Salvador"
 msgstr "Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13887,6 +14040,11 @@ msgstr "Přístup k nabídce"
 msgid "Thailand"
 msgstr "Thajsko"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13907,6 +14065,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumunština / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13943,41 +14125,6 @@ msgstr "Vztah objektu"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14038,40 +14185,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14167,6 +14282,21 @@ msgstr "Pohled :"
 msgid "View Auto-Load"
 msgstr "Zobrazit automatické načtení"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14209,34 +14339,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Perština / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14259,9 +14361,9 @@ msgid "Unmet dependency !"
 msgstr "Nevyřešená závislost !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14272,7 +14374,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14298,7 +14430,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14343,7 +14475,7 @@ msgid "Access"
 msgstr "Přístup"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14376,11 +14508,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14396,8 +14527,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14512,7 +14641,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14524,7 +14653,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Index barvy"
 
@@ -14561,7 +14689,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14572,8 +14700,8 @@ msgid "Azerbaijan"
 msgstr "Ázerbájdžán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Varování"
@@ -14599,11 +14727,6 @@ msgstr "Panenské ostrovy"
 msgid "Parameters"
 msgstr "Parametry"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Svatý Pierre a Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14695,7 +14818,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Země"
@@ -14766,8 +14888,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Španělština (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14795,7 +14921,7 @@ msgid "Japan"
 msgstr "Japonsko"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Lze přejmenovat pouze jeden sloupec najednou!"
@@ -14856,6 +14982,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Kanada - Účetnictví"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14880,7 +15037,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Vemte na vědomí, že tato operace může trvat několik minut."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14919,6 +15076,12 @@ msgstr "Vykonání"
 msgid "Condition"
 msgstr "Podmínka"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14973,6 +15136,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Chorvatsko"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14997,6 +15167,11 @@ msgstr "Aktualizace systému"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15013,7 +15188,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15034,15 +15209,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Obecné informace"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Ostrovy Turks a Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15078,7 +15290,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Varování přepnutí společnosti"
@@ -15098,11 +15315,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Další číslo posloupnosti bude zvýšeno o toto číslo"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkce"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15140,11 +15361,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Dodací"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15172,7 +15388,7 @@ msgid "Workflow Instances"
 msgstr "Instance pracovních postupů"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneři: "
@@ -15183,7 +15399,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15249,7 +15465,6 @@ msgstr "Název exportu"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15329,6 +15544,9 @@ msgstr ""
 #~ msgid "Rounding factor"
 #~ msgstr "Faktor zaokrouhlení"
 
+#~ msgid "Delivery"
+#~ msgstr "Dodací"
+
 #~ msgid "Report Header"
 #~ msgstr "Záhlaví výpisu"
 
@@ -15495,6 +15713,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Přiložené ID"
+
 #~ msgid "Homepage Widgets"
 #~ msgstr "Pomůcky domovské stránky"
 
@@ -15505,6 +15726,9 @@ msgstr ""
 #~ "Zadejte zprávu. Můžete použít pole z objektu. např. `Vážený [[ "
 #~ "object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Přiložený model"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Nastavení domény"
 
@@ -15771,6 +15995,9 @@ msgstr ""
 #~ msgid "Apply For Delete"
 #~ msgstr "Použít pro smazání"
 
+#~ msgid "Creator"
+#~ msgstr "Tvůrce"
+
 #~ msgid "Plugins"
 #~ msgstr "Doplňky"
 
@@ -15942,6 +16169,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresy"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML identifikátor"
 
@@ -16244,6 +16474,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Typ polí"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Odškrtněte aktivní pole ke skrytí kontaktu."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Přidat pomůcku pro uživatele"
 
@@ -16254,6 +16487,9 @@ msgstr ""
 #~ "Zadejte pouze hodnotu pokud chcete změnit uživatelské heslo. Tento uživatel "
 #~ "bude opět odhlášen a přihlášen!"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binární soubor nebo vnější URL"
+
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr "Vaše logo - Použijte velikost okolo 450x150 bodů."
 
@@ -16983,6 +17219,9 @@ msgstr ""
 #~ msgid "web calendar"
 #~ msgstr "webový kalendář"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Šifrování hesla databáze"
+
 #~ msgid "Address Information"
 #~ msgstr "Informace adresy"
 
@@ -17255,6 +17494,9 @@ msgstr ""
 #~ msgid "Tasks-Mail Integration"
 #~ msgstr "Integrace úkolů a e-mailů"
 
+#~ msgid "Contact Name"
+#~ msgstr "Název kontaktu"
+
 #~ msgid "Billing Rates on Contracts"
 #~ msgstr "Fakturační sazby na smlouvách"
 
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 483c7b0656c..62da883fd26 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Dato og tidspunkt"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Advarsel!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Max. størrelse"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontakt navn"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr "Nederlandske Antiller"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,9 +569,25 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,11 +908,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Ny Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,16 +976,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr "Mongoliet"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr "Sydkorea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Overgange"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr "Marshalløerne"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr "Søg"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr "Ved oprettelse"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr "Øst Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adressetype"
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,9 +2631,20 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Ny Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Fejl!"
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Bank Kontotype"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fødselsdato"
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr "Virksomhedsnavn"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr "Sprog"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postnummer"
@@ -4559,13 +4700,18 @@ msgstr "Postnummer"
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr "Fuld adgang"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungarn"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr "Kazakstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr "Bank type"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr "Malaysien"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduler"
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr "Storbritannien"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Overgange"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr "Fulde navn"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr "Kategori Navn"
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Fejl!"
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr "Felter"
 msgid "Employees"
 msgstr "Ansatte"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresser"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Vej"
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr "Jugoslavien"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Advarsel!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Leverandør"
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr "Ukraine"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "By"
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 eller senere version"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr "Aktivitet"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Equador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr "Domæne"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr "Tidszone"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Kunde"
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr "Falklandsøerne"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr "Kina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,25 +12848,9 @@ msgid "Bulgaria"
 msgstr "Bulgarien"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr "Adressebog"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14195,8 +14326,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Advarsel!"
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Land"
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Kroatien"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr "Systemopdatering"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funktion"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Levering"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15078,6 +15293,9 @@ msgstr ""
 #~ msgid "new"
 #~ msgstr "ny"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontakt navn"
+
 #~ msgid "E-Mail"
 #~ msgstr "E-mail"
 
@@ -15150,6 +15368,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Aldrig"
 
+#~ msgid "Delivery"
+#~ msgstr "Levering"
+
 #~ msgid "Portugese / Português"
 #~ msgstr "Portugisisk / Português"
 
@@ -15175,6 +15396,9 @@ msgstr ""
 #~ msgid "Read"
 #~ msgstr "Læst"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresser"
+
 #~ msgid "SMS Message"
 #~ msgstr "SMS besked"
 
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index d7bbf2b8d3a..b923c24b1b3 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -7,15 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-18 19:16+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 01:32+0000\n"
+"Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:14+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -47,7 +46,7 @@ msgid "DateTime"
 msgstr "Datum/Zeit"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -222,69 +221,15 @@ msgstr ""
 "erzeugen."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"OpenERP Customer Reletionship Management\n"
-"=====================================================\n"
-"\n"
-"Diese Anwendung ermöglicht Ihrem Vertrieb intelligent und effizient Leads, "
-"Opportunities, Verabredungen und Telefonanrufe zu verwalten.\n"
-"\n"
-"Sie verwaltet Schlüsselaufgaben wie die Kommunikation, Identifikation, "
-"Priorisierung, Zuweisung und Benachrichtigungen.\n"
-"\n"
-"OpenERP stellt sicher, das alle Prozesse von Benutzern, Kunden und "
-"Lieferanten dokumentiert werden. Das System sendet automatisch Erinnerungen, "
-"eskaliert Anfragen, löst Methoden und Aktionen basierend auf Ihren eigenen "
-"Regeln aus.\n"
-"\n"
-"Das CRM Modul verfügt über ein eigenes E-Mail Gateway, zur Syncronisierung "
-"zwischen Ihrem Mailserver und OpenERP. Auf diese Weise kann auch ein Trouble-"
-"Ticket-System realisiert werden.\n"
-"\n"
-"OpenERP stellt sicher, das Sie sich für Nachrichten automatisch bedanken, "
-"die Verteilung von Nachrichten automatisiert wird und das die Kommunikation "
-"bei den richtigen Mitarbeitern landet.\n"
-"\n"
-"\n"
-"Das CRM-Dashboard umfasst standardmässig:\n"
-"-------------------------------\n"
-"* Geplanter Umsatz sortiert nach Stufen und Benutzer (Graph)\n"
-"* Opportunities sortiert nach Stufen (Graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Achtung!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -295,7 +240,7 @@ msgstr ""
 "Python Code vor, idealerweise durch ein eigenes Modul."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Abhängigkeitsfehler"
@@ -306,7 +251,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Umbenennen des Ersatzfeldes \"%s\" ist nicht erlaubt"
@@ -317,7 +262,7 @@ msgid "Swaziland"
 msgstr "Swasiland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "erstellt."
@@ -363,6 +308,12 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Chilienischer Kontenplan und Steuerlokalisierung.\n"
+"==============================================\n"
+"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale
@@ -398,29 +349,6 @@ msgstr "Module: base"
 msgid "Max. Size"
 msgstr "Max. Groesse"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Fügt zusätzliche Datumsinformationen auf Aufträgen hinzu.\n"
-"===================================================\n"
-"\n"
-"Sie können folgende zusätliche Daten auf Ihren Aufträgen hinzufügen:\n"
-"-----------------------------------------------------------\n"
-"    * Anfragedatum\n"
-"    * Auftragsdatum\n"
-"    * Bestätigungsdatum\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -430,11 +358,6 @@ msgstr ""
 "Datenbank ID des Datensatzes des Form Views, wenn als Ansichtsmodus nur "
 "'Form' gewählt wurde"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontakt"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -479,6 +402,14 @@ msgid ""
 "document and Wiki based Hidden.\n"
 "    "
 msgstr ""
+"\n"
+"Installer für den administrativen Zugriff der Knowledge Base.\n"
+"=====================================\n"
+"\n"
+"Ermöglicht den Zugriff auf die Konfiguration der Knowledge Base, so das der "
+"Benutzer\n"
+"das Dokumentenmanagement und das Wiki installieren kann.\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
@@ -507,7 +438,7 @@ msgstr ""
 "berechnen.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -546,6 +477,7 @@ msgstr "Regeln für automatische Aktionen"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -586,7 +518,7 @@ msgstr ""
 "bei der Wartung der Sprachen angezeigt werden."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -643,7 +575,7 @@ msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -681,11 +613,22 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Modul zur Bereitstellung der Analytischen Konten.\n"
+" ===============================================\n"
+"\n"
+"In OpenERP werden Analytische Konten mit Konten des Hauptbuches verknüpft\n"
+"jedoch komplett unabhängig verarbeitet. Daher können Sie diverse "
+"analytische\n"
+"Auswertungen und Prozesse anlegen ohne das diese Einfluss auf Ihre "
+"Finanzkonten\n"
+"haben.\n"
+"    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Ursprüngliche Ansicht"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -704,32 +647,25 @@ msgid ""
 "* Use emails to automatically confirm and send acknowledgements for any "
 "event registration\n"
 msgstr ""
+"\n"
+"Organisation und Verwaltung von Events.\n"
+"======================================\n"
+"\n"
+"Das Event Modul ermöglicht Ihnen die effiziente Organisation Ihrer Events "
+"und der zugehörigen Aufgaben:\n"
+"Planung, Verfolgung der Registrierungen, Anwesenheit, usw.\n"
+"\n"
+"Kernfunktionen\n"
+"------------\n"
+"* Verwalten Sie Ihre Events und Anmeldungen\n"
+"* Verwendung des E-Mail Gateways zur automatischen Anmeldung und Versand der "
+"Teilnahmebestätigung für jegliche Arten von Events.\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnisch"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -740,9 +676,25 @@ msgstr ""
 "gleichen Namen gedruck."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -817,14 +769,12 @@ msgid ""
 msgstr "Kontext Verzeichnis eines Python Ausdruckes (Standard: {} )"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Assistenten"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -889,17 +839,21 @@ msgid "Model Description"
 msgstr "Beschreibung Datenmodell"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Menü für Marketing.\n"
+"====================\n"
+"\n"
+"Enthält einen Installations-Assistenten für auf Marketing bezogene Module.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -910,6 +864,12 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP LinkeIn Modul.\n"
+"============================\n"
+"\n"
+"Diese Modul stellt die Integration von LinkedIn in OpenERP bereit.\n"
+"        "
 
 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -928,11 +888,21 @@ msgstr "Trigger Ausdrücke"
 msgid "Jordan"
 msgstr "Jordanien"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Nächstes geplantes Ausführungsdatum für diesen Job"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -956,7 +926,7 @@ msgstr "Rumänien - Kontenführung"
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"
 
 #. module: base
 #: help:res.partner,image_small:0
@@ -1067,13 +1037,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Angabe des Feldnames auf den sich die Datensatz ID bei Schreibvorgängen "
-"bezieht. Wenn leer, dann wird auf den Aktuellen Datensatz verwiesen."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Neu-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1091,7 +1057,7 @@ msgid "Email Preferences"
 msgstr "E-Mail Einstellungen"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' ist kein gültiges Datumsformat für das Feld  '%%(field)s'"
@@ -1140,16 +1106,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1198,7 +1157,7 @@ msgstr "Andere OSI genehmigten Lizenzen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Gantt"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1248,7 +1207,7 @@ msgstr "Andorra, Fürstentum"
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply for Read"
-msgstr ""
+msgstr "Setze Leseberechtigung"
 
 #. module: base
 #: model:res.country,name:base.mn
@@ -1256,9 +1215,38 @@ msgid "Mongolia"
 msgstr "Mongolei"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1274,12 +1262,17 @@ msgstr ""
 "folgenden Gruppen hinzugefügt"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Dokumenten Model"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1306,7 +1299,54 @@ msgid "Username"
 msgstr "Benutzername"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1336,7 +1376,7 @@ msgid "Delete Access Right"
 msgstr "Zugriffsrecht löschen"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Verbindungstest fehlgeschlagen!"
@@ -1368,14 +1408,12 @@ msgid "South Korea"
 msgstr "Südkorea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Verbindungen"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1389,7 +1427,7 @@ msgstr "Beitragende"
 #. module: base
 #: field:ir.rule,perm_unlink:0
 msgid "Apply for Delete"
-msgstr ""
+msgstr "Setze Löschberechtigung"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1514,7 +1552,7 @@ msgid "Marshall Islands"
 msgstr "Marschall-Inseln"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Die Änderung des Moduls für ein Feld ist nicht zulässig."
@@ -1536,7 +1574,7 @@ msgid "Search"
 msgstr "Suche"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1557,7 +1595,14 @@ msgid "Parent Application"
 msgstr "Übergeordnete Applikation"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Assistenten"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Vorgang abgebrochen"
@@ -1689,7 +1734,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Es existiert keine Sprache mit dem Code \"%s\""
@@ -1813,7 +1872,7 @@ msgid "On Create"
 msgstr "Bei Erzeugung"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1823,11 +1882,6 @@ msgstr ""
 "Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Angebote, Aufträge, Rechnungen"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1914,7 +1968,7 @@ msgid "East Timor"
 msgstr "Ost-Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1963,11 +2017,6 @@ msgstr ""
 "Dem Administrator werden Verwaltungs- und Benutzer Rechte zugewiesen, der "
 "Demo Benutzer erhält nur Benutzer Rechte. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Sie können dieses Dokument nicht lesen ! (%s)"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1985,7 +2034,7 @@ msgstr ""
 "Anwendungen."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2027,6 +2076,11 @@ msgstr "Fahrzeuge, Leasing, Versicherungen, Kosten"
 msgid "Read Access"
 msgstr "Leserecht"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr "Die Datensatz ID ist verknüpft mit"
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2105,16 +2159,11 @@ msgid "Create Tasks on SO"
 msgstr "Aufgaben der Auftragserfassung"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Diese Spalte enthält Modul Daten und kann nicht gelöscht werden!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Angehängte Vorlage"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2169,7 +2218,7 @@ msgid "Formula"
 msgstr "Formel"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Kann den root Benutzer nicht entfernen!"
@@ -2199,11 +2248,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copy)"
@@ -2215,7 +2264,6 @@ msgstr "Vorlage für Kontenplan"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adressart"
 
@@ -2253,11 +2301,6 @@ msgstr "Pfad"
 msgid "The next step depends on the file format:"
 msgstr "Der nächste Schritt ist abhängig vom Dateiformat:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideen"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2361,7 +2404,7 @@ msgstr "Bahamas"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply for Create"
-msgstr ""
+msgstr "Setze Anlageberechtigung"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
@@ -2397,6 +2440,11 @@ msgstr "Anzahl Module mit Updates"
 msgid "Method"
 msgstr "Methode"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr "Passwort Verschlüsselung"
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2430,11 +2478,18 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
+"Kein passender Datensatz für %(field_type)s '%(value)s' in Feld '%%(field)s' "
+"gefunden"
+
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr "Neues Passwort"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2486,6 +2541,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Firmen RML Header hinzufügen?"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2539,7 +2603,7 @@ msgstr ""
 "'calendar', etc. (Default: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Ein Beleg wurde seit der letzten Ansicht geändert (%s:%d)"
@@ -2611,6 +2675,9 @@ msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
 msgstr ""
+"Ansichtstyp: Listenansichtstyp für die Benutzung in Listen, wird entweder "
+"auf 'Liste' für hierarchische Listenansicht oder auf \"Formular\" für "
+"normale Listenansicht gesetzt"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2634,7 +2701,6 @@ msgstr "Sao Tome und Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Rechnung"
 
@@ -2663,6 +2729,29 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"Dies ist das Basis Modul zur Verwaltung von Produkten und Preislisten in "
+"OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Das Modul unterstützt Varianten, unterschiedliche Preisberrechnungsmethoden, "
+"Lieferanten\n"
+"-informationen, unterschiedliche Maßeinheiten, Verpackungen und "
+"Eigenschaften für Produkte.\n"
+"\n"
+"Preislisten Bestandteile:\n"
+"-------------------\n"
+"    * Verschiedene Rabattoptionen (auf Produkt, Kategorie, Mengen)\n"
+"    * Preisermittlung auf Basis unterschiedlicher Kriterien:\n"
+"        * Andere Preislisten\n"
+"        * Selbstkostenpreis\n"
+"        * Listenpreis\n"
+"        * Lieferantenpreis\n"
+"\n"
+"Preislistendefinition definiert durch Produkt und/oder Partner.\n"
+"\n"
+"Preisetikettendruck mit Barcode\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -2680,11 +2769,19 @@ msgid ""
 "    * Date\n"
 "    "
 msgstr ""
-
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Unternehmensmotto"
+"\n"
+"Verwaltet die Standardwerte für Analytische Konten.\n"
+"==============================================\n"
+"\n"
+"Ermöglicht die automatische Auswahl von analytischen Konten basierend auf "
+"folgenden Kriterien:\n"
+"---------------------------------------------------------------------\n"
+"    * Produkt\n"
+"    * Partner\n"
+"    * Benutzer\n"
+"    * Unternehmen\n"
+"    * Datum\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.bb
@@ -2708,7 +2805,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
 msgid "Signup with OAuth2 Authentication"
-msgstr ""
+msgstr "Anmeldung mit OAuth2 Authentifizierung"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -2768,6 +2865,10 @@ msgid ""
 "==================================\n"
 "    "
 msgstr ""
+"\n"
+"United States - Kontenplan.\n"
+"==================================\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_url,target:0
@@ -2810,9 +2911,31 @@ msgid "Default limit for the list view"
 msgstr "Standardlimit Liste"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Neu-Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
+"\n"
+"Dies ist ein vollständiges Dokumentenmanagementsystem.\n"
+"================================================\n"
+"    * Benutzer Authentifizierung\n"
+"    * Dokumentenindizierung (.pptx und .docx werden unter Windows nicht "
+"unterstützt)\n"
+"    * Dashboard für Dokumente:\n"
+"        * Neu hinzugefügte Dateien (Liste)\n"
+"        * Dateien nach Typ (Graph)\n"
+"        * Dateien nach Partner (Graph)\n"
+"        * Dateigrößen nach Monat (Graph)\n"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2862,6 +2985,41 @@ msgid ""
 "* Monthly Turnover (Graph)\n"
 "    "
 msgstr ""
+"\n"
+"Verwaltet Angebote und Aufträge\n"
+"==================================\n"
+"\n"
+"Diese Anwendung ermöglicht ihnen die effektie und effiziente Verwaltung "
+"Ihrer Verkaufsziele mittels Verfolgung aller Ihrer Aufträge und Ihrer "
+"Historie.\n"
+"\n"
+"Sie stellt den kompletten Verkaufsworkflow bereit:\n"
+"\n"
+"* **Anbebot**->**Auftrag**->**Rechnung**  \n"
+"\n"
+"Voreinstellungen (wenn das Lagerverwaltungsmodul installiert ist)\n"
+"------------------------------------------------------\n"
+"\n"
+"Wenn Sie auch das Lagerverwaltungsmodul installiert haben, können Sie "
+"folgende Voreinstellungen verwalten:\n"
+"\n"
+"* Versand: Lieferung des Gesamtauftrages oder Teillieferungen\n"
+"* Rechnungserstellung: Auswahl der Zahlungsart\n"
+"* Allgemeine Geschäftsbedingungen\n"
+"\n"
+"Sie können zwischen verschiedenen Rechnungserzeugungsarten wählen:\n"
+"* Bei Bedarf: Rechnungen werden manuell auf Basis von Auftragsbestätigungen "
+"erzeugt\n"
+"* Lieferschein: Rechungen werden nach Erzeugung des Lieferscheins "
+"(Lagerentnahme) auf dessen Basis erzeugt\n"
+"* Vor Auslieferung: Ein Rechnungsentwurf wird erzeugt und muss vor der "
+"Auslieferung bezahlt werden\n"
+"\n"
+"Das Dashboard für den Verkauf enthält:\n"
+"------------------------------------------------\n"
+"* Meine Angebote\n"
+"* Monatlicher Umsatz (Graph)\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window,res_id:0
@@ -2888,9 +3046,12 @@ msgid ""
 "Module to attach a google document to any model.\n"
 "================================================\n"
 msgstr ""
+"\n"
+"Modul zur Verknüpfung eines Google Dokumentes mit einem beliebigen Modell.\n"
+"================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "Mehrere Treffer für das Feld  '%%(field)s' (%d matches) gefunden"
@@ -2912,6 +3073,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Peruanischer Kontenplan und Steuer Lokalisierung nach PCGE 2010.\n"
+"========================================================================\n"
+"\n"
+"Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la\n"
+"SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2951,6 +3120,26 @@ msgstr "Felder Zuordnungen"
 msgid "Export Translations"
 msgstr "Exportiere Übersetzungen"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+"\n"
+"Verschlüsselte Passwörter\n"
+"==================\n"
+"\n"
+"ACHTUNG: Dieses Modul ist momentan noch inkompatibel mit dem LDAP-Modul!\n"
+"Es deaktiviert die LDAP Authentifizierung, wenn das LDAP Modul installiert "
+"ist!\n"
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2959,7 +3148,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -3007,6 +3196,31 @@ msgid ""
 "* Purchase Analysis\n"
 "    "
 msgstr ""
+"\n"
+"Verwaltet Ihre Beschaffungsaufträge\n"
+"==================================================\n"
+"\n"
+"Die Beschaffungsverwaltung erlaubt Ihnen die Verfolgung von Angebotsanfragen "
+"und ermöglicht die Konvertierung in einen Beschaffungsauftrag, falls "
+"erforderlich.\n"
+"OpenERP stellt diverse Verfahren zur Rechnugsüberwachung und Verfolgung "
+"Ihrer Lieferscheine zur Verfügung. Sie können Teillieferungen verarbeiten "
+"und so den Verlauf der Lieferungen überwachen, sowie bei Bedarf automatische "
+"Erinnerungen erzeugen.\n"
+"\n"
+"OpenERP's Regeln zur Mindestmengenverwaltung ermöglichen die Erzeugung von "
+"Beschaffungsauftragsentwürfen oder Sie können einen schlanken "
+"Beschaffungsprozess zur bedarfsorientierten Beschaffung basierend auf Ihrer "
+"Auslastung konfigurieren.\n"
+"\n"
+"Dashboard/Berichte für die Beschaffungsverwaltung enthalten:\n"
+"---------------------------------------------------------\n"
+"* Angebotsanfrage\n"
+"* Beschaffungsaufträge, die auf die Freigabe warten\n"
+"* Monatliche Beschaffungen nach Kategorie\n"
+"* Wareneingangsanalysen\n"
+"* Beschaffungsanalysen\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
@@ -3046,7 +3260,7 @@ msgid "Inherited"
 msgstr "Vererbt"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "Ja"
@@ -3076,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' ist keine ganzzahlige Eingabe für das Feld '%%(field)s'"
@@ -3142,22 +3356,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn Integration"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Fehlerhafte Objekt Architektur !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Fehler!"
@@ -3257,12 +3471,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3281,19 +3495,33 @@ msgstr ""
 "auf die zugehörigen Berichte."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul dient der Verwaltung des Kontenplans und der Steuern für Polen "
+"in OpenERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3301,7 +3529,7 @@ msgid "Params storage"
 msgstr "Ablage für Parameter"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Kann Modul '%s' nicht upgraden. Es ist gar nicht installiert."
@@ -3352,34 +3580,6 @@ msgstr "Konfigurationsparameter"
 msgid "Invalid arguments"
 msgstr "Fehlerhafte Argumente"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3388,7 +3588,7 @@ msgstr "Schweden"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report File"
-msgstr ""
+msgstr "Berichtsdatei"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3418,7 +3618,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Fehlende(s) Dokument(e)"
@@ -3430,6 +3630,34 @@ msgstr "Fehlende(s) Dokument(e)"
 msgid "Bank Account Type"
 msgstr "Bankkontotyp"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3468,7 +3696,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3507,7 +3735,7 @@ msgid "Access Controls"
 msgstr "Zugriffskontolle"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3537,32 +3765,6 @@ msgstr "Hauptunternehmen"
 msgid "Web Icon File (hover)"
 msgstr "Web Icon Datei (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3582,9 +3784,13 @@ msgstr ""
 "Wenn Sie einen Typ 'Formel' benutzen setze eine python Ausdruck mit der "
 "Variable 'object'"
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Geb. Datum"
 
@@ -3600,7 +3806,7 @@ msgid "Products Manufacturers"
 msgstr "Produktehersteller"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-über-SSL Modus nicht verfügbar"
@@ -3717,7 +3923,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3909,7 +4115,6 @@ msgstr "Berichtswesen"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Anrede"
@@ -3920,13 +4125,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Wenn nicht definiert, dann Standardwert für neue Datensätze"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Rekursive Einträge entdeckt"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Fehler durch Abhängigkeiten zwischen Modulen !"
@@ -3986,9 +4196,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Zugriff verweigert"
@@ -3999,7 +4210,7 @@ msgid "Company Name"
 msgstr "Unternehmen"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4020,16 +4231,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (nunmehr ungültig - verwende Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"Sprachenschlüssel des zu übersetzenden Ausdrucks muss aus einer der "
-"bekannten Sprachen gewählt werden."
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Aufzeichnung Regel"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "St.-Pierre und Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4058,13 +4290,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4112,19 +4340,7 @@ msgid "Paper Format"
 msgstr "Papierformat"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4144,7 +4360,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4189,7 +4405,7 @@ msgid "Email Gateway"
 msgstr "E-Mail Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4210,9 +4426,43 @@ msgid "Technical Data"
 msgstr "Technische Daten"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4268,13 +4518,18 @@ msgstr "Stundennachweis für Anliegen"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Fehlerhafte Architektur!"
@@ -4290,9 +4545,9 @@ msgid "Share any Document"
 msgstr "Teile jegliche Art von Dokumenten"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Leads, Opportunities, Telefonate"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Gruppe erforderlich"
 
 #. module: base
 #: view:res.lang:0
@@ -4353,33 +4608,10 @@ msgid "Languages"
 msgstr "Sprachen"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4465,7 +4697,6 @@ msgstr "Bedingung"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Standard"
 
@@ -4540,6 +4771,11 @@ msgstr ""
 "Server mit der höchsten Priorität genutzt. Standardmässige Priorität ist 10 "
 "(kleinere Nummer = höhere Priorität)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4603,9 +4839,16 @@ msgid "Default value or action reference"
 msgstr "Standard Wert oder Aktions Referenz"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4688,6 +4931,22 @@ msgstr "Eine Übersetzung laden"
 msgid "Installed Version"
 msgstr "Installierte Version"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4714,6 +4973,43 @@ msgstr ""
 "Gruppenzugehörigkeit angezeigt, ansonst aufgrund der Leseerlaubnis des "
 "Objektes."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4743,6 +5039,12 @@ msgstr ""
 msgid "View"
 msgstr "Ansicht"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "Nein"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4820,12 +5122,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4840,7 +5136,6 @@ msgstr "Schweizer Buchführung"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "PLZ"
@@ -4851,13 +5146,18 @@ msgstr "PLZ"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Als \"Zu erledigen\" setzen"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Datums und Zeitangabe."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4904,6 +5204,8 @@ msgstr "Strategie"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Ansichten"
 
@@ -4919,7 +5221,7 @@ msgid "SMTP Server"
 msgstr "Postausgang-Server (SMTP)"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5017,7 +5319,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "Name"
@@ -5105,7 +5412,7 @@ msgid "System Configuration Done"
 msgstr "Systemkonfiguration beendet"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Fehler während der Prüfung des Feldes field(s) %s: %s"
@@ -5234,6 +5541,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Vollständiger Zugriff"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5247,7 +5559,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Die Speicherungstechnik für Feld \"%s\" darf nicht verändert werden."
@@ -5258,7 +5570,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Nur, wenn dieses Bankkonto zu Ihrem Unternehmen gehört"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5290,6 +5602,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungarn"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5457,7 +5780,7 @@ msgid "Account Owner Name"
 msgstr "Name des Kontoeigentümers"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5475,16 +5798,11 @@ msgid "Decimal Separator"
 msgstr "Dezimalzeichen"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5531,9 +5849,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Urheber"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Der Name des Moduls muss eindeutig sein!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5596,15 +5915,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5620,6 +5930,11 @@ msgstr "Starte Konfigurations Assistenten"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Produktionsaufträge, Stücklisten, Arbeitspläne"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Dateianhang Bezeichnung"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5703,6 +6018,12 @@ msgstr "Kasachstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Wochentagnummer [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Ressource Bezeichnung"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5956,7 +6277,7 @@ msgid "title"
 msgstr "Titel"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "Wahr"
@@ -6013,6 +6334,15 @@ msgstr "Produktverzeichnis"
 msgid "User-defined Defaults"
 msgstr "Benutzerdefinierte Standards"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6128,13 +6458,15 @@ msgid "Bank Type"
 msgstr "Bank Typ"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Der Name der Gruppe kann nicht mit einem \"-\" beginnen"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Apps"
 
@@ -6154,7 +6486,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6189,10 +6521,9 @@ msgid "Uncategorized"
 msgstr "Nicht kategorisiert"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Ressource Bezeichnung"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6228,6 +6559,11 @@ msgstr ""
 "wird, wird der Name der gedrückten Schaltfläche getestet. Wenn das Signal "
 "NULL ist, dann ist keine Schaltfläche für die Validierung notwendig."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Ursprüngliche Ansicht"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6241,7 +6577,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6257,26 +6593,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Meine Banken"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6409,11 +6725,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Passwort zurücksetzen"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6425,8 +6736,8 @@ msgid "Malaysia"
 msgstr "Malaysien"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6538,7 +6849,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Es wurde keine Ansicht des Typs '%s'  für diese Struktur definiert!"
@@ -6578,7 +6889,7 @@ msgid "Created Menus"
 msgstr "Erzeugtes Menü"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6605,9 +6916,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Als \"Zu erledigen\" setzen"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6639,6 +6978,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Aktuelles Jahr ohne Jahrhundert: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "System Parameter"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6692,7 +7038,7 @@ msgid "Audit Trail"
 msgstr "Nachweis der Veränderungen in der Datenbank"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6784,7 +7130,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "Die Konfiguration kann nicht dupliziert werden!"
@@ -6804,23 +7150,6 @@ msgstr "Manchmal BIC oder SWIFT genannt"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6853,10 +7182,10 @@ msgstr "Bericht in xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Übersicht Module"
 
@@ -6930,9 +7259,9 @@ msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6957,8 +7286,8 @@ msgid "Partner Titles"
 msgstr "Partner Gesellschaften"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Benutzen Sie das Format '%s'"
@@ -7006,7 +7335,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7016,11 +7345,6 @@ msgstr ""
 "Datensatzes wurde für dieses Objekt nicht freigegeben, das dieses Objekt "
 "lediglich für die Auswertungen benötigt wird."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anonym"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7133,6 +7457,13 @@ msgstr "Moduldatei erfolgreich importiert"
 msgid "Model Constraints"
 msgstr "Model Abhängigkeiten"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Verbindungen"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7230,7 +7561,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Bundesländer"
@@ -7331,12 +7661,6 @@ msgstr "Vollständiger Name"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Der Name des Moduls muss eindeutig sein!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7380,6 +7704,7 @@ msgstr "Für mehrfache Dokumente"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7437,7 +7762,7 @@ msgid "Connection Security"
 msgstr "Verbindungssicherheit"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Bitte spezifiziere Startaktion !"
@@ -7457,6 +7782,11 @@ msgstr "Kategorie Bezeichnung"
 msgid "Northern Mariana Islands"
 msgstr "Nördliche Marianen"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7468,7 +7798,7 @@ msgid "Intrastat Reporting"
 msgstr "Innergemeinschaftliche Handelsstatistik"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7477,6 +7807,11 @@ msgstr ""
 "Bitte benutzen Sie den Passwort Assistenten (in den Benutzereinstellungen "
 "oder dem Menü Benutzer) für eine Änderung des Passworts."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7507,7 +7842,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Fehler bei Feldern für Kalenderansicht"
@@ -7555,7 +7890,6 @@ msgstr "Übersetzung"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7575,30 +7909,30 @@ msgid "Child Categories"
 msgstr "Unterkategorien"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Fehler"
@@ -7686,6 +8020,11 @@ msgstr "Regeldefinition (Domain Filter)"
 msgid "This Window"
 msgstr "Dieses Fenster"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7771,6 +8110,21 @@ msgstr "Felder"
 msgid "Employees"
 msgstr "Mitarbeiter"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7800,11 +8154,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Verbindung testen"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adressdaten"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7829,7 +8178,6 @@ msgstr "Datenauswahl"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Straße"
@@ -7840,9 +8188,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslawien"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Übergeordneter Partner"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7923,7 +8286,7 @@ msgid "Change My Preferences"
 msgstr "Einstellungen jetzt vornehmen"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Ungültiger Modulname in der Aktionsdefinition."
@@ -8010,21 +8373,29 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menü für Marketing.\n"
-"====================\n"
-"\n"
-"Enthält einen Installations-Assistenten für auf Marketing bezogene Module.\n"
-"    "
+"Copy text \t\n"
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie hier, um einen Kontakt zu Ihrem Adressbuch "
+"hinzzufügen.\n"
+"              </p><p>\n"
+"                OpenERP unterstützt Sie bei der Verfolgung aller Aufgaben "
+"die mit\n"
+"                einem Kunden verknüpft sind: Diskussionen, Verlauf der "
+"Opportunities,\n"
+"                Dokumente, usw.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8032,7 +8403,7 @@ msgid "Company Bank Accounts"
 msgstr "Unternehmens Bankkonten"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -8045,14 +8416,14 @@ msgid "Optional password for SMTP authentication"
 msgstr "Optionales Passwort für SMTP Authentifizierung"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 "Entschuldigen Sie, Sie sind nicht berechtigt dieses Dokument zu ändern."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8074,12 +8445,13 @@ msgid "Normal Bank Account"
 msgstr "Normales Bankkonto"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Assistent"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8262,7 +8634,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Stellen, Personalbeschaffung, Bewerbungen, Vorstellungsgespräche"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8293,14 +8665,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Achtung!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8324,7 +8688,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8444,7 +8807,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8768,7 +9131,7 @@ msgid "Update Modules List"
 msgstr "Update der Module"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8782,7 +9145,7 @@ msgid "eInvoicing"
 msgstr "eRechnung"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8796,7 +9159,7 @@ msgstr ""
 "Formulare vor Beendigung nochmals gespeichert werden."
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "Der Wert \"%s\" für Feld \"%s.%s\" ist nicht in der Auswahl"
@@ -8811,6 +9174,17 @@ msgstr "Weiter"
 msgid "Thai / ภาษาไทย"
 msgstr "Thailand / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8858,7 +9232,7 @@ msgid "Mexico"
 msgstr "Mexiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8882,15 +9256,17 @@ msgstr ""
 "Datensätze automatisch aus der Datenbank gelöscht werden sollen oder nicht)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Fehlender SMTP Server"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Dateianhang Bezeichnung"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"Sprachenschlüssel des zu übersetzenden Ausdrucks muss aus einer der "
+"bekannten Sprachen gewählt werden."
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8914,7 +9290,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Abkürzung Monatsname."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8927,7 +9303,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Lieferant"
@@ -9005,7 +9380,7 @@ msgid "Selectable"
 msgstr "Suchbar"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Alles scheint richtig konfiguriert zu sein."
@@ -9033,8 +9408,8 @@ msgid "Iteration"
 msgstr "Iteration"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Benutzer Fehler"
@@ -9058,7 +9433,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9207,7 +9582,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (franz.)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9248,8 +9623,8 @@ msgid "Solomon Islands"
 msgstr "Solomoninseln"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ZugrifffFehler"
@@ -9327,7 +9702,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9343,7 +9718,7 @@ msgid "Ukraine"
 msgstr "Ukraine"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9406,6 +9781,11 @@ msgstr "Stufen"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9504,9 +9884,9 @@ msgid "Custom Shortcuts"
 msgstr "benutzerdefinierte Tastaturkürzel"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9534,13 +9914,13 @@ msgid "Models"
 msgstr "Modelle"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "Das Modul 'base' kann nicht deinstalliert werden"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Der Datensatz kann augenblicklich nicht verändert werden."
@@ -9561,7 +9941,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9611,7 +9991,7 @@ msgid "On Delete"
 msgstr "Beim Entfernen"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Modul %s existiert nicht!"
@@ -9657,6 +10037,7 @@ msgstr "USA - Kontenführung"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9665,7 +10046,7 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Unbekannte Datenbankkennung '%s'"
@@ -9688,6 +10069,43 @@ msgstr ""
 "=============================\n"
 "\n"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9723,7 +10141,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9775,6 +10193,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Stunde (12-Stunden Format) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9823,23 +10246,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Der Währungscode muss je Unternehmen eindeutig sein"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Neue Sprache (leere Übersetzungsvorlage)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9886,7 +10297,7 @@ msgid "Products Expiry Date"
 msgstr "Produkt Ablaufdatum"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9984,6 +10395,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10191,7 +10607,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Beispiel einer Marketing-Kampagne"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10202,13 +10618,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Intervall in Minuten"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Art"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Diese Methode existiert zwischenzeitlich nicht mehr"
@@ -10369,7 +10790,7 @@ msgstr "Rechte für Daten"
 #. module: base
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi-Company"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_portal
@@ -10383,7 +10804,7 @@ msgid "To Translate"
 msgstr "zu übersetzen"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Alle möglichen Werte anzeigen"
@@ -10418,6 +10839,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10443,6 +10869,11 @@ msgstr "RML Kopfzeile hinzufügen"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Fußzeilentext, der auf allen Berichten angezeigt wird."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Icon URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10534,7 +10965,6 @@ msgstr "%m - Monat Nummer [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Stadt"
@@ -10570,13 +11000,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Angabe des Feldnames auf den sich die Datensatz ID bei Schreibvorgängen "
+"bezieht. Wenn leer, dann wird auf den Aktuellen Datensatz verwiesen."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 oder höher"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10638,12 +11077,37 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -10652,7 +11116,7 @@ msgstr ""
 "sich um einen Fehler handelt."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10666,6 +11130,8 @@ msgid "Activity"
 msgstr "Aktivität"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10684,7 +11150,12 @@ msgid "Parent Company"
 msgstr "Stamm-Unternehmen"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Authentifizierung"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10696,13 +11167,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10802,6 +11266,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Verkaufs- und Lagerverwaltung"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10877,6 +11361,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Folgenart"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10946,9 +11435,9 @@ msgstr ""
 "Bitte diese vorher deaktivieren."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Zugriff verweigert"
@@ -10967,8 +11456,8 @@ msgstr ""
 "Problem mit der Konfiguration der 'Datensatznummer' in Server-Aktion!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Validierungsfehler"
@@ -11010,13 +11499,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-Mail Adresse"
@@ -11027,7 +11515,12 @@ msgid "Office Supplies"
 msgstr "Bürobedarf"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11069,36 +11562,6 @@ msgstr ""
 "- uid: Nutzerkennung des aktuellen Benutzers\n"
 "- context: Aktueller Kontext"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11120,6 +11583,11 @@ msgstr "Andere geschützte"
 msgid "Ecuador"
 msgstr "Equador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11138,23 +11606,6 @@ msgstr ""
 "Eine Sprache, die in einer Benutzereinstellung definiert ist, kann nicht "
 "gelöscht werden."
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"Dieses Modul Modul stellt Kontenrahmen der Buchhaltung in Venezuela für "
-"OpenERP zur Verfügung.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11171,9 +11622,9 @@ msgid "Cascade"
 msgstr "Mehrstufig"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Gruppe erforderlich"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Leads, Opportunities, Telefonate"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11201,11 +11652,6 @@ msgstr "Übersetzt"
 msgid "Default Company per Object"
 msgstr "Standard Unternehmen je Objekt"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Anzahl der Aktionen, die der Benutzer durchführen muss"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11231,7 +11677,7 @@ msgid "Domain"
 msgstr "Domäne"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Benutzen Sie '1' für Ja und '0' für Nein"
@@ -11247,12 +11693,12 @@ msgid "State Name"
 msgstr "Bundesland Bezeichnung"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11273,30 +11719,10 @@ msgid "Timezone"
 msgstr "Zeitzone"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11318,7 +11744,7 @@ msgid "Shared"
 msgstr "Freigegeben"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11370,7 +11796,6 @@ msgstr "Doppelte Kontrolle bei Bestellungen"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Straße 2"
 
@@ -11394,6 +11819,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11487,19 +11913,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Datenintegritäts Fehler"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Die Feldlänge kann niemals kleiner als 1 sein!"
@@ -11541,22 +11976,6 @@ msgstr "Angestelltenverzeichnis"
 msgid "Arguments"
 msgstr "Argumente"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11689,7 +12108,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Kunde"
 
@@ -11779,7 +12197,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Kann keinen Kontakt ohne E-Mail Adresse anlegen!"
@@ -11829,9 +12247,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Authentifizierung"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11936,7 +12354,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Mail Auslieferung fehlgeschlagen"
@@ -11963,7 +12381,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12052,7 +12470,7 @@ msgid "Mrs."
 msgstr "Fr."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12068,7 +12486,7 @@ msgid "User Ref."
 msgstr "Benutzer Referenz"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -12113,8 +12531,6 @@ msgstr "Referenzen"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12122,7 +12538,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12154,12 +12570,6 @@ msgstr "Falklandinseln"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12268,9 +12678,11 @@ msgid "Selection"
 msgstr "Auswahl"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12306,7 +12718,7 @@ msgid "Action Type"
 msgstr "Aktionart"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12445,11 +12857,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Stunde 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Entferne Haken, um den Kontakt in der Ansicht zu verstecken"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12466,7 +12873,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Unbekanntes Attribut %s in %s "
@@ -12489,7 +12896,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "nicht definierte 'get' Funktion"
@@ -12530,16 +12937,16 @@ msgstr "Bronze"
 msgid "Payroll Accounting"
 msgstr "Lohnbuchhaltung"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binäre Datei oder externe URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Ändere Passwort"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12586,91 +12993,57 @@ msgid "Address Format"
 msgstr "Adressenformat"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Das Trennzeichenformat sollte [,n] entsprechen mit 0 < n, beginnenend bei "
-"Einer-Stelle. -1 beendet die Trennung. Z. B. [3,2,-1] bei 106500 entspricht "
-"1,06,500; [1,2,-1] würde dann 106,50,0 ergeben; [3] wird 106,500 daraus "
-"erstellen. Vorausgesetzt ',' sei jeweils der Tausender-Trenner."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Technische Eigenschaften"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Okzitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12856,6 +13229,11 @@ msgstr ""
 "Management Ihrer Bestände, Erfassen von Bestandsveränderungen, Durchführung "
 "von Inventuren."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12872,7 +13250,7 @@ msgid "Body"
 msgstr "Textkörper"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Verbindungstest erfolgreich"
@@ -12923,7 +13301,7 @@ msgid "choose"
 msgstr "auswählen"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13103,13 +13481,15 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"Bestätigen Sie die Entfernung dieses Moduls? Es werden alle Daten gelöscht, "
-"die im Kontext mit diesem Modul gespeichert sind!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -13148,12 +13528,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13169,7 +13550,6 @@ msgstr "Handelsregister"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
@@ -13191,35 +13571,6 @@ msgstr "Technisch"
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Dieses Modul dient der Verwaltung des Kontenplans und der Steuern für Polen "
-"in OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13297,25 +13648,9 @@ msgid "Bulgaria"
 msgstr "Bulgarien"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13343,6 +13678,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "mbH"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13379,6 +13734,7 @@ msgstr "Slovakisch / Slowakei"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "unbekannt"
@@ -13446,6 +13802,11 @@ msgstr "Partnerverzeichnis"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13535,6 +13896,7 @@ msgid "Projects, Tasks"
 msgstr "Projekte, Aufgaben"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13547,7 +13909,7 @@ msgid "Information"
 msgstr "Information"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13578,16 +13940,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Übergeordneter Partner"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Aktualisiere Modulliste"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13653,6 +14019,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "Das osv_memory Feld erlaubt nur einen Vergleich mit den = und != Operatoren."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13725,29 +14096,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Externe Identifikation"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13797,7 +14145,7 @@ msgid "Delivery Costs"
 msgstr "Lieferkosten"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13848,9 +14196,9 @@ msgstr ""
 "Deaktiviert einen minimalen Kontenplan/Kontenrahmen.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Datenbank-Verschlüsselung mittels Passwort"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Aufzeichnung Regel"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14097,10 +14445,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "Nein"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14126,63 +14479,14 @@ msgid "System Configuration done"
 msgstr "System Konfiguration erledigt"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "System Parameter"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks- und Caicosinseln"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14223,17 +14527,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14271,7 +14564,7 @@ msgid "Low"
 msgstr "Niedrig"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
@@ -14353,11 +14646,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Tel"
@@ -14372,6 +14664,11 @@ msgstr "Rechte Menü"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14392,6 +14689,30 @@ msgstr "Guernsey"
 msgid "Romanian / română"
 msgstr "Romänisch / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14428,41 +14749,6 @@ msgstr "Objekt Beziehungen"
 msgid "eInvoicing & Payments"
 msgstr "eRechnung & Zahlungen"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14523,40 +14809,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14655,6 +14909,21 @@ msgstr "Sicht :"
 msgid "View Auto-Load"
 msgstr "Autom. Öffnen des Ansichtsformulars"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14700,34 +14969,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persisch / Persien"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14750,9 +14991,9 @@ msgid "Unmet dependency !"
 msgstr "Nicht erfüllte Abhängigkeit !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "Nur der Administrator kann Module deinstallieren"
@@ -14763,7 +15004,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14789,7 +15060,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14834,7 +15105,7 @@ msgid "Access"
 msgstr "Datenzugriffsfehler"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14867,11 +15138,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14887,8 +15157,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -15003,7 +15271,7 @@ msgid "Officer"
 msgstr "Personalsachbearbeiter"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "Serialisierungsfeld `%s` für Ersatzfeld `%s` nicht  gefunden!"
@@ -15015,7 +15283,6 @@ msgstr "Jamaika"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Farbkennzeichnung"
 
@@ -15053,7 +15320,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -15064,8 +15331,8 @@ msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Warnung"
@@ -15091,11 +15358,6 @@ msgstr "Jungferninseln (GB)"
 msgid "Parameters"
 msgstr "Parameter"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "St.-Pierre und Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15191,7 +15453,6 @@ msgstr "Schulungen, Konferenzen, Meetings, Messen, Anmeldungen"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Land"
@@ -15261,9 +15522,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Ein Modul installieren"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"Das Trennzeichenformat sollte [,n] entsprechen mit 0 < n, beginnenend bei "
+"Einer-Stelle. -1 beendet die Trennung. Z. B. [3,2,-1] bei 106500 entspricht "
+"1,06,500; [1,2,-1] würde dann 106,50,0 ergeben; [3] wird 106,500 daraus "
+"erstellen. Vorausgesetzt ',' sei jeweils der Tausender-Trenner."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15290,7 +15559,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Es kann jeweils nur eine Spalte umbenannt werden!"
@@ -15351,6 +15620,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Kanadische Buchführung"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15375,7 +15675,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Beachten Sie, dass dieser Vorgang einige Zeit dauern kann."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15416,6 +15716,12 @@ msgstr "Ausführung"
 msgid "Condition"
 msgstr "Zustand"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15471,6 +15777,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Kroatien"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Bestätigen Sie die Entfernung dieses Moduls? Es werden alle Daten gelöscht, "
+"die im Kontext mit diesem Modul gespeichert sind!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15495,6 +15810,11 @@ msgstr "Systemaktualisierung"
 msgid "SXW Content"
 msgstr "SXW Inhalt"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15511,7 +15831,7 @@ msgid "Gold"
 msgstr "Gold"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15532,15 +15852,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Allgemeine Informationen"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks- und Caicosinseln"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15578,7 +15935,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Warnhinweis zum Unternehmenswechsel"
@@ -15598,11 +15960,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Die nächste Zahl dieser Folge wird um diesen Wert erhöht."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funktion"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15644,11 +16010,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Interne Notizen"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Lieferung"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15676,7 +16037,7 @@ msgid "Workflow Instances"
 msgstr "Arbeitsablauf-Abschnitte"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partner: "
@@ -15687,7 +16048,7 @@ msgid "Is a Company?"
 msgstr "Ist ein Unternehmen?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15753,7 +16114,6 @@ msgstr "Exportbezeichnung"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15848,6 +16208,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Sie können dieses Dokument nicht lesen ! (%s)"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Belasse 0 falls diese Aktion alle Ressourcen betrifft"
 
@@ -15858,6 +16221,9 @@ msgstr ""
 #~ "Definition der Nachricht. Es können Felder dies Objetes verwendet werden zB "
 #~ "`Sehr geehrte(r) [[ object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Angehängte Vorlage"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Name Trigger"
 
@@ -15960,6 +16326,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW Pfad"
 
+#~ msgid "Creator"
+#~ msgstr "Urheber"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -16130,6 +16499,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Lade offizielle Übersetzung"
 
+#~ msgid "Delivery"
+#~ msgstr "Lieferung"
+
 #~ msgid "Report Header"
 #~ msgstr "Report Kopf (Header)"
 
@@ -16721,6 +17093,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Dieses Kästchen unmarkiert lassen um alle Tips für alle Menüpunkte zusehen"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontakt"
+
 #~ msgid "Human Resources Dashboard"
 #~ msgstr "Pinnwand Personalwesen"
 
@@ -16841,6 +17216,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Aktivieren, wenn versäumte Ereignisse bei Neustart wiederholt werden sollen."
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Entferne Haken, um den Kontakt in der Ansicht zu verstecken"
+
 #~ msgid "Emails"
 #~ msgstr "Email Konfiguration"
 
@@ -16863,6 +17241,9 @@ msgstr ""
 #~ msgid "Partner Contacts"
 #~ msgstr "Partner Kontakte"
 
+#~ msgid "Addresses"
+#~ msgstr "Adressdaten"
+
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "Pinnwand Personalleitung"
 
@@ -21376,6 +21757,9 @@ msgstr ""
 #~ msgid "Check writing"
 #~ msgstr "Ausstellung von Schecks"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Datenbank-Verschlüsselung mittels Passwort"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module provides features to improve the layout of the Sales Order.\n"
@@ -21918,6 +22302,9 @@ msgstr ""
 #~ "in der technischen Dokumentation unter http://doc.openerp.com\n"
 #~ "    "
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binäre Datei oder externe URL"
+
 #~ msgid ""
 #~ "\n"
 #~ "This is a full-featured calendar system.\n"
@@ -22389,6 +22776,21 @@ msgstr ""
 #~ msgid "Wiki: Internal FAQ"
 #~ msgstr "Wiki: Interne Fragen & Antworten"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Dieses Modul Modul stellt Kontenrahmen der Buchhaltung in Venezuela für "
+#~ "OpenERP zur Verfügung.\n"
+#~ "============================================================================="
+#~ "=====\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
 #~ msgid "Register a Contract"
 #~ msgstr "Vertrag aufnehmen"
 
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index f18085e89a5..fd25cc85ede 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:34+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:56+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -43,7 +43,7 @@ msgid "DateTime"
 msgstr "ΗμερομηνίαΏρα"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -187,41 +187,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -229,7 +203,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -240,7 +214,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -251,7 +225,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -330,20 +304,6 @@ msgstr "Εταιρεία για αποθήκευση της τρέχουσας 
 msgid "Max. Size"
 msgstr "Μέγιστο Μέγεθος"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -351,11 +311,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Όνομα Επαφής"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -414,7 +369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -451,6 +406,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
@@ -489,7 +445,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -541,7 +497,7 @@ msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles (Ολλανδικές Αντίλλες)"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -579,9 +535,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Αρχική Προβολή"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -606,26 +562,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnian / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -636,9 +572,25 @@ msgstr ""
 "συνημμένου, θα εκτυπωθεί η προηγούμενη αναφορά."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -715,14 +667,12 @@ msgstr ""
 "})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Οδηγοί"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Τα ειδικά πεδία πρέπει να έχουν όνομα που ξεκινάει από 'x_' !"
@@ -786,16 +736,14 @@ msgid "Model Description"
 msgstr "Περιγραφή Μοντέλου"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -826,11 +774,21 @@ msgstr "Φράση Εναύσματος (trigger)."
 msgid "Jordan"
 msgstr "Jordan (Ιορδανία)"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -962,13 +920,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua New Guinea (Παπούα Νέα Γουινέα)"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -986,7 +940,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1036,16 +990,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Ισπανικά (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Κινητό"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1142,8 +1089,37 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1158,12 +1134,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1190,7 +1171,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1218,7 +1246,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1250,14 +1278,12 @@ msgid "South Korea"
 msgstr "Νότια Κορέα"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Ροές"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1395,7 +1421,7 @@ msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1417,7 +1443,7 @@ msgid "Search"
 msgstr "Αναζήτηση"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1432,7 +1458,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Οδηγοί"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1558,7 +1591,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Δεν υπάρχει γλώσσα με κωδικό \"%s\""
@@ -1677,7 +1724,7 @@ msgid "On Create"
 msgstr "Κατά τη Δημιουργία"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1687,11 +1734,6 @@ msgstr ""
 "περιέχουν τελείες! Οι τελείες χρησιμοποιούνται σε αναφορές σε άλλες ενότητες "
 "όπως στο module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1774,7 +1816,7 @@ msgid "East Timor"
 msgstr "East Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1815,11 +1857,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Συνημμένη ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1834,7 +1871,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1875,6 +1912,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Πρόσβαση Ανάγνωσης"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1951,16 +1993,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Συνδεδεμένο Μοντέλο"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2015,7 +2052,7 @@ msgid "Formula"
 msgstr "Τύπος"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Can not remove root user!"
@@ -2039,11 +2076,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (αντίγραφο)"
@@ -2055,7 +2092,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Τύπος Διεύθυνσης"
 
@@ -2093,11 +2129,6 @@ msgstr "Πλήρης Διαδρομή"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2233,6 +2264,11 @@ msgstr "Αριθμός Αρθρωμάτων που ενημερώθηκαν"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2266,12 +2302,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2322,6 +2363,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Add or not the corporate RML header"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2375,7 +2425,7 @@ msgstr ""
 "'φόρμα','δέντρο','ημερολόγιο', κ.λπ. (Προεπιλογή: δέντρο, φόρμα)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2456,7 +2506,6 @@ msgstr "Saint Tome (Sao Tome) and Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Τιμολόγιο"
 
@@ -2503,11 +2552,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2625,9 +2669,20 @@ msgid "Default limit for the list view"
 msgstr "Προεπιλεγμένο όριο για την προβολή λίστας"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua New Guinea (Παπούα Νέα Γουινέα)"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2705,7 +2760,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2764,6 +2819,19 @@ msgstr "Field Mappings"
 msgid "Export Translations"
 msgstr "Εξαγωγή Μεταφράσεων"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2772,7 +2840,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2858,7 +2926,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2888,7 +2956,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2953,22 +3021,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Σφάλμα!"
@@ -3066,12 +3134,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Σφάλμα! Υπάρχει εταιρεία με την ίδια περιγραφή"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3088,17 +3156,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3108,7 +3178,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3161,34 +3231,6 @@ msgstr "Παράμετροι διαμόρφωσης"
 msgid "Invalid arguments"
 msgstr "Μη έγκυρες παράμετροι"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3227,7 +3269,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3239,6 +3281,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Τύπος Τραπεζικού Λογαριασμού"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3275,7 +3345,7 @@ msgid "Signal (subflow.*)"
 msgstr "Σινιάλο (υπο-ροή.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3312,7 +3382,7 @@ msgid "Access Controls"
 msgstr "Ρυθμίσεις Πρόσβασης"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3340,32 +3410,6 @@ msgstr "Κύρια Εταρεία"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3385,9 +3429,13 @@ msgstr ""
 "If you use a formula type, use a python expression using the variable "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Σφάλμα! Υπάρχει εταιρεία με την ίδια περιγραφή"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Ημερ/νία γέννησης"
 
@@ -3403,7 +3451,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3511,7 +3559,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3700,7 +3748,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Τίτλος"
@@ -3711,13 +3758,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Αν δεν έχει ορισθεί, δρα ως η προεπιλεγμένη τιμή για νέους πόρους."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Σφάλμα στις εξαρτήσεις Αρθρωμάτων!"
@@ -3777,9 +3829,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3790,7 +3843,7 @@ msgid "Company Name"
 msgstr "Όνομα Εταιρείας"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3809,14 +3862,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (παρωχημένο - χρησιμοποιήστε Αναφορά)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Καταχώρηση κανόνων"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre and Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3845,13 +3921,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3899,19 +3971,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3931,7 +3991,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3976,7 +4036,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3995,9 +4055,43 @@ msgid "Technical Data"
 msgstr "Τεχνικά Δεδομένα"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4053,13 +4147,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "ΕΠΕ"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4075,8 +4174,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4135,33 +4234,10 @@ msgid "Languages"
 msgstr "Γλώσσες"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4239,7 +4315,6 @@ msgstr "Constraint"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Προεπιλογή"
 
@@ -4311,6 +4386,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4374,9 +4454,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4456,6 +4543,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4479,6 +4582,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4508,6 +4648,12 @@ msgstr ""
 msgid "View"
 msgstr "Προβολή"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4585,12 +4731,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4605,7 +4745,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "ΤΚ"
@@ -4616,13 +4755,18 @@ msgstr "ΤΚ"
 msgid "Author"
 msgstr "Δημιουργός"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Ορθή εμφάνιση ημερ/νίας και ώρας"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4668,6 +4812,8 @@ msgstr "Κατεύθυνση"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Προβολές"
 
@@ -4683,7 +4829,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4778,7 +4924,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4866,7 +5017,7 @@ msgid "System Configuration Done"
 msgstr "Διαμόρφωση συστήματος ολοκληρώθηκε"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Σφάλμα κατά την επικύρωση των πεδίων %s: %s"
@@ -4981,6 +5132,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Πλήρης πρόσβαση"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4994,7 +5150,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5005,7 +5161,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5037,6 +5193,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungary"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5202,7 +5369,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5218,16 +5385,11 @@ msgid "Decimal Separator"
 msgstr "Υποδιαστολή"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5275,9 +5437,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Δημιουργός"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5340,15 +5503,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5364,6 +5518,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Όνομα Συνημμένου"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5447,6 +5606,12 @@ msgstr "Kazakhstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Περιγραφή Πόρου"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5699,7 +5864,7 @@ msgid "title"
 msgstr "τίτλος"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5756,6 +5921,15 @@ msgstr "Προϊόντα"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5871,13 +6045,15 @@ msgid "Bank Type"
 msgstr "Τύπος Τράπεζας"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Το όνομα της ομάδας δεν μπορεί να ξεκινάει με \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5897,7 +6073,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5932,10 +6108,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Περιγραφή Πόρου"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5968,6 +6143,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Αρχική Προβολή"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5978,7 +6158,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5994,26 +6174,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6146,11 +6306,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6162,8 +6317,8 @@ msgid "Malaysia"
 msgstr "Malaysia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6270,7 +6425,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6308,7 +6463,7 @@ msgid "Created Menus"
 msgstr "Δημιουργημένα Μενού"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6335,8 +6490,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6369,6 +6552,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Τρέχον έτος χωρίς τον αιώνα: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6412,7 +6602,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6504,7 +6694,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6524,23 +6714,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Κινητό"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6573,10 +6746,10 @@ msgstr "Αναφορά xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Αρθρώματα"
 
@@ -6650,9 +6823,9 @@ msgid "United Kingdom"
 msgstr "United Kingdom"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6677,8 +6850,8 @@ msgid "Partner Titles"
 msgstr "Τίτλοι Συνεργάτη"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6726,18 +6899,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6844,6 +7012,13 @@ msgstr "Το αρχείο αρθρώματος εισήχθη επιτυχώς!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Ροές"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6938,7 +7113,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Πολιτεία"
@@ -7039,12 +7213,6 @@ msgstr "Πλήρες Όνομα"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7086,6 +7254,7 @@ msgstr "On Multiple Doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7143,7 +7312,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Παρακαλώ επιλέξτε ενέργειας προς εκτέλεση!"
@@ -7163,6 +7332,11 @@ msgstr "Όνομα Κατηγορίας"
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7174,13 +7348,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7211,7 +7390,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7257,7 +7436,6 @@ msgstr "Ροή"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7277,30 +7455,30 @@ msgid "Child Categories"
 msgstr "Υποκατηγορίες"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -7388,6 +7566,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Αυτό το παράθυρο"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7474,6 +7657,21 @@ msgstr "Πεδία"
 msgid "Employees"
 msgstr "Υπάλληλοι"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7503,11 +7701,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Διευθύνσεις"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7532,7 +7725,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Οδός"
@@ -7543,8 +7735,23 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7623,7 +7830,7 @@ msgid "Change My Preferences"
 msgstr "Αλλαγή Προτιμήσεων"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
@@ -7710,14 +7917,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7726,7 +7935,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7737,13 +7946,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7765,12 +7974,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Αυτόματος Οδηγός"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7943,7 +8153,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7975,14 +8185,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8006,7 +8208,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8124,7 +8325,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8439,7 +8640,7 @@ msgid "Update Modules List"
 msgstr "Ενημέρωση Λίστας Αρθρωμάτων"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8451,7 +8652,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8461,7 +8662,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8476,6 +8677,17 @@ msgstr "Συνέχεια"
 msgid "Thai / ภาษาไทย"
 msgstr "Ταϋλανδικά / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8515,7 +8727,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8537,15 +8749,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Όνομα Συνημμένου"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8569,7 +8781,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Σύντομο όνομα μήνα."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8581,7 +8793,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Προμηθευτής"
@@ -8659,7 +8870,7 @@ msgid "Selectable"
 msgstr "Επιλέξιμο"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8687,8 +8898,8 @@ msgid "Iteration"
 msgstr "Επανάληψη"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "UserError"
@@ -8712,7 +8923,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8859,7 +9070,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8898,8 +9109,8 @@ msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -8973,7 +9184,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8987,7 +9198,7 @@ msgid "Ukraine"
 msgstr "Ukraine"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9050,6 +9261,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9148,8 +9364,8 @@ msgid "Custom Shortcuts"
 msgstr "Προσαρμοσμένες συντομεύσεις"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9178,13 +9394,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9205,7 +9421,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9253,7 +9469,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9299,6 +9515,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9307,7 +9524,7 @@ msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9326,6 +9543,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9361,7 +9615,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9413,6 +9667,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9455,23 +9714,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9505,7 +9752,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9599,6 +9846,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9803,7 +10055,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9814,13 +10066,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Μονάδα Διαστήματος"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Είδος"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Αυτή η μέθοδος δε χρησιμοποιείται πια"
@@ -9990,7 +10247,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10023,6 +10280,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10048,6 +10310,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10137,7 +10404,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Πόλη"
@@ -10173,13 +10439,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ή μεταγενέστερη έκδοση"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10238,19 +10513,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10264,6 +10564,8 @@ msgid "Activity"
 msgstr "Δραστηριότητα"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10282,7 +10584,12 @@ msgid "Parent Company"
 msgstr "Μητρική Εταιρεία"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10294,13 +10601,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10382,6 +10682,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10453,6 +10773,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10513,9 +10838,9 @@ msgstr ""
 "Παρακαλούμε να απενεργοποιήσετε τη γλώσσα πρώτα."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10533,8 +10858,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem in configuration `Record Id` in Server Action!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10575,13 +10900,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10592,7 +10916,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10623,36 +10952,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10674,6 +10973,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "ροή εργασίας"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10691,16 +10995,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "Δεν μπορείτε να διαγράψετε τη γλώσσα που είναι προτιμώμενη από τον χρήστη!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10717,8 +11011,8 @@ msgid "Cascade"
 msgstr "Ανάλυση"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10744,11 +11038,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10774,7 +11063,7 @@ msgid "Domain"
 msgstr "Τομέας"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10790,12 +11079,12 @@ msgid "State Name"
 msgstr "Όνομα Κατάστασης"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10816,30 +11105,10 @@ msgid "Timezone"
 msgstr "Ζώνη Ώρας"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10861,7 +11130,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10908,7 +11177,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Οδός 2"
 
@@ -10932,6 +11200,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11017,19 +11286,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "ροή εργασίας"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "ο μέγεθος του πεδίου δεν μπορεί ποτέ να είναι μικρότερο του 1!"
@@ -11071,22 +11349,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Arguments"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11219,7 +11481,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Πελάτης"
 
@@ -11309,7 +11570,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11359,8 +11620,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11451,7 +11712,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11478,7 +11739,7 @@ msgid "Object"
 msgstr "Αντικείμενο"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11564,7 +11825,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11577,7 +11838,7 @@ msgid "User Ref."
 msgstr "User Ref."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11622,8 +11883,6 @@ msgstr "Οδηγός Παραπομπών"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11631,7 +11890,7 @@ msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11660,12 +11919,6 @@ msgstr "Falkland Islands"
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11772,8 +12025,10 @@ msgid "Selection"
 msgstr "Επιλογή"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11810,7 +12065,7 @@ msgid "Action Type"
 msgstr "Τύπος Ενέργειας"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11946,11 +12201,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Ώρα 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Ξετικάρετε το ενεργό πεδίο για να κρύψετε την επαφή"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11967,7 +12217,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11990,7 +12240,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "undefined get method !"
@@ -12031,16 +12281,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12087,91 +12337,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12350,6 +12566,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12366,7 +12587,7 @@ msgid "Body"
 msgstr "Κυρίως θέμα"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12414,7 +12635,7 @@ msgid "choose"
 msgstr "επιλέξτε"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12590,10 +12811,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12625,12 +12850,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12644,7 +12870,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Διάφορα"
@@ -12666,23 +12891,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12753,25 +12961,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12799,6 +12991,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "Ε.Π.Ε."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12835,6 +13047,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "άγνωστο"
@@ -12902,6 +13115,11 @@ msgstr "Βιβλίο Διευθύνσεων"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12991,6 +13209,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13003,7 +13222,7 @@ msgid "Information"
 msgstr "Πληροφορίες"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13034,16 +13253,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13108,6 +13331,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13180,29 +13408,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13250,7 +13455,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13294,9 +13499,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Καταχώρηση κανόνων"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13540,9 +13745,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13569,63 +13779,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13666,17 +13827,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13711,7 +13861,7 @@ msgid "Low"
 msgstr "Χαμηλή"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13791,11 +13941,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Τηλέφωνο"
@@ -13810,6 +13959,11 @@ msgstr "Μενού Πρόσβασης"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13830,6 +13984,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13866,41 +14044,6 @@ msgstr "Σχέση Αντικειμένου"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13961,40 +14104,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14085,6 +14196,21 @@ msgstr "Προβολή:"
 msgid "View Auto-Load"
 msgstr "Αυτόματη Φόρτωση Προβολής"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14127,34 +14253,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14177,9 +14275,9 @@ msgid "Unmet dependency !"
 msgstr "Ανεκπλήρωτες εξαρτήσεις!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14190,7 +14288,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14216,7 +14344,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14261,7 +14389,7 @@ msgid "Access"
 msgstr "Πρόσβαση"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14294,11 +14422,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14314,8 +14441,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14430,7 +14555,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14442,7 +14567,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14475,7 +14599,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14486,8 +14610,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Προσοχή"
@@ -14513,11 +14637,6 @@ msgstr "Virgin Islands (British)"
 msgid "Parameters"
 msgstr "Παράμετροι"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14607,7 +14726,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Χώρα"
@@ -14676,9 +14794,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14705,7 +14831,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14766,6 +14892,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14790,7 +14947,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14829,6 +14986,12 @@ msgstr ""
 msgid "Condition"
 msgstr "Συνθήκη"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14881,6 +15044,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14905,6 +15075,11 @@ msgstr "Ενημέρωση συστήματος"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14921,7 +15096,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14942,15 +15117,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Γενικές Πληροφορίες"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14986,7 +15198,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Προειδοποίηση αλλαγής εταιρίας"
@@ -15004,11 +15221,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Λειτουργία"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15044,11 +15265,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Παράδοση"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15076,7 +15292,7 @@ msgid "Workflow Instances"
 msgstr "Workflow Instances"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Συνεργάτες "
@@ -15087,7 +15303,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15153,7 +15369,6 @@ msgstr "Όνομα Εξαγωγής"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15217,6 +15432,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Σε πολλαπλά έγγραφα."
 
+#~ msgid "Contact Name"
+#~ msgstr "Όνομα Επαφής"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15286,6 +15504,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Συνημμένη ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "0 αν η ενέργεια πρέπει να εμφανίζεται σε όλους τους πόρους."
 
@@ -15296,6 +15517,9 @@ msgstr ""
 #~ "Συγκεκριμενοποιήστε το μήνυμα. Μπορείτε να χρησιμοποιήσετε τα πεδία του "
 #~ "αντικειμένου, π.χ. 'Αγαπητέ [[ object.partner_id.name ]]'"
 
+#~ msgid "Attached Model"
+#~ msgstr "Συνδεδεμένο Μοντέλο"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Όνομα Εναύσματος"
 
@@ -15456,6 +15680,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW path"
 
+#~ msgid "Creator"
+#~ msgstr "Δημιουργός"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15551,6 +15778,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Διευθύνσεις"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML Identifier"
 
@@ -15679,6 +15909,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Φόρτωση Επίσημης Μετάφρασης"
 
+#~ msgid "Delivery"
+#~ msgstr "Παράδοση"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Εταιρεία Συντήρησης Ανοικτού Λογισμικού"
 
@@ -15688,6 +15921,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Type fields"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Ξετικάρετε το ενεργό πεδίο για να κρύψετε την επαφή"
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Congo, The Democratic Republic of the"
 
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 5be4080d6a6..89d39202f42 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 19:54+0000\n"
 "Last-Translator: David Bowers <sales@skitzotek.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:09+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "DateTime"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -205,70 +205,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate a request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Warning!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -278,7 +223,7 @@ msgstr ""
 "them through Python code, preferably by a custom addon!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Constraint Error"
@@ -289,7 +234,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Renaming sparse field \"%s\" is not allowed"
@@ -300,7 +245,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "created."
@@ -380,20 +325,6 @@ msgstr "Company to store the current record"
 msgid "Max. Size"
 msgstr "Max. Size"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -401,11 +332,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Contact Name"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -470,7 +396,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -507,6 +433,7 @@ msgstr "Automated Action Rules"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Owner"
 
@@ -547,7 +474,7 @@ msgstr ""
 "allowed directives, displayed when you edit a language."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -605,7 +532,7 @@ msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -645,9 +572,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -685,26 +612,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnian / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -713,9 +620,25 @@ msgid ""
 msgstr "On checking this successive reports are generated from cache."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -791,14 +714,12 @@ msgstr ""
 "Context dictionary as Python expression, empty by default (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "The name of custom fields must begin with 'x_' !"
@@ -862,16 +783,14 @@ msgid "Model Description"
 msgstr "Model Description"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -901,11 +820,21 @@ msgstr "Trigger Expression"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Next planned execution date for this job."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1040,11 +969,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua New Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1063,7 +990,7 @@ msgid "Email Preferences"
 msgstr "Email Preferences"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1112,16 +1039,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobile"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1230,9 +1150,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1247,12 +1196,17 @@ msgstr ""
 "Users added to this group are automatically added to the following groups."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1279,7 +1233,54 @@ msgid "Username"
 msgstr "Username"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1309,7 +1310,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Connection test failed!"
@@ -1341,14 +1342,12 @@ msgid "South Korea"
 msgstr "South Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Record #%d of %s not found, cannot copy!"
@@ -1486,7 +1485,7 @@ msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Changing the model of a field is forbidden!"
@@ -1508,7 +1507,7 @@ msgid "Search"
 msgstr "Search"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1527,7 +1526,14 @@ msgid "Parent Application"
 msgstr "Parent Application"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Wizards"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operation Cancelled"
@@ -1659,7 +1665,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "No language with code \"%s\" exists"
@@ -1780,7 +1800,7 @@ msgid "On Create"
 msgstr "On Create"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1789,11 +1809,6 @@ msgstr ""
 "'%s' contains too many dots. XML ids should not contain dots! These are used "
 "to refer to other modules' data, as in module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1876,7 +1891,7 @@ msgid "East Timor"
 msgstr "East Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1917,11 +1932,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Attached ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1938,7 +1948,7 @@ msgstr ""
 "payment mode encoding, automatic pick list generation and more."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1979,6 +1989,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Read Access"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2055,16 +2070,11 @@ msgid "Create Tasks on SO"
 msgstr "Create Tasks on SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Attached Model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2127,7 +2137,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Can not remove root user!"
@@ -2159,11 +2169,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copy)"
@@ -2175,7 +2185,6 @@ msgstr "Template of Charts of Accounts"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Address Type"
 
@@ -2232,11 +2241,6 @@ msgstr "Full Path"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideas"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2374,6 +2378,11 @@ msgstr "Number of modules updated"
 msgid "Method"
 msgstr "Method"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2429,12 +2438,17 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2484,6 +2498,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Optionally add the corporate RML header"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2563,7 +2586,7 @@ msgstr ""
 "'calendar', etc. (Default: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "A document was modified since you last viewed it (%s:%d)"
@@ -2654,7 +2677,6 @@ msgstr "Saint Tome (Sao Tome) and Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Invoice"
 
@@ -2734,11 +2756,6 @@ msgstr ""
 "    * Date\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2863,9 +2880,20 @@ msgid "Default limit for the list view"
 msgstr "Default limit for the list view"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2943,7 +2971,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -3002,6 +3030,19 @@ msgstr "Field Mappings"
 msgid "Export Translations"
 msgstr "Export Translations"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3010,7 +3051,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -3119,7 +3160,7 @@ msgid "Inherited"
 msgstr "Inherited"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -3149,7 +3190,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3225,22 +3266,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Invalid Object Architecture!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -3337,12 +3378,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3359,19 +3400,33 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3379,7 +3434,7 @@ msgid "Params storage"
 msgstr "Params storage"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Can not upgrade module '%s'. It is not installed."
@@ -3430,34 +3485,6 @@ msgstr "Configuration Parameters"
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3496,7 +3523,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3508,6 +3535,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Bank Account Type"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3546,7 +3601,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3586,7 +3641,7 @@ msgid "Access Controls"
 msgstr "Access Controls"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3616,32 +3671,6 @@ msgstr "Main Company"
 msgid "Web Icon File (hover)"
 msgstr "Web Icon File (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3661,9 +3690,13 @@ msgstr ""
 "If you use a formula type, use a python expression using the variable "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! You can not create recursive companies."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Birthdate"
 
@@ -3679,7 +3712,7 @@ msgid "Products Manufacturers"
 msgstr "Products Manufacturers"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL mode unavailable"
@@ -3789,7 +3822,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3988,7 +4021,6 @@ msgstr "Reporting"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Title"
@@ -3999,13 +4031,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "If not set, acts as a default value for new resources"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Recursion detected."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Recursion error in modules dependencies!"
@@ -4065,9 +4102,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -4078,7 +4116,7 @@ msgid "Company Name"
 msgstr "Company Name"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4099,14 +4137,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (deprecated - use Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre and Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4135,13 +4196,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4189,26 +4246,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-"\n"
-"This module updates memos inside OpenERP when using an external pad\n"
-"=====================================================================\n"
-"\n"
-"Use to update your text memo in real time with a user following that you "
-"invite.\n"
-"\n"
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4228,7 +4266,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4277,7 +4315,7 @@ msgid "Email Gateway"
 msgstr "Email Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4298,9 +4336,43 @@ msgid "Technical Data"
 msgstr "Technical Data"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4356,13 +4428,18 @@ msgstr "Timesheet on Issues"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Invalid Architecture!"
@@ -4378,9 +4455,9 @@ msgid "Share any Document"
 msgstr "Share any Document"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Group Required"
 
 #. module: base
 #: view:res.lang:0
@@ -4441,33 +4518,10 @@ msgid "Languages"
 msgstr "Languages"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4554,7 +4608,6 @@ msgstr "Constraint"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Default"
 
@@ -4628,6 +4681,11 @@ msgstr ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4691,9 +4749,16 @@ msgid "Default value or action reference"
 msgstr "Default value or action reference"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4773,6 +4838,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4799,6 +4880,43 @@ msgstr ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4828,6 +4946,12 @@ msgstr ""
 msgid "View"
 msgstr "View"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4905,12 +5029,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4925,7 +5043,6 @@ msgstr "Switzerland - Accounting"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postcode"
@@ -4936,13 +5053,18 @@ msgstr "Postcode"
 msgid "Author"
 msgstr "Author"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Set as Todo"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Appropriate date and time representation."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4988,6 +5110,8 @@ msgstr "Direction"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Views"
 
@@ -5003,7 +5127,7 @@ msgid "SMTP Server"
 msgstr "SMTP Server"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "You try to remove a module that is installed or will be installed"
@@ -5096,7 +5220,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -5184,7 +5313,7 @@ msgid "System Configuration Done"
 msgstr "System Configuration Done"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Error occurred while validating the field(s) %s: %s"
@@ -5299,6 +5428,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Full Access"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5312,7 +5446,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Changing the storing system for field \"%s\" is not allowed."
@@ -5323,7 +5457,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Only if this bank account belongs to your company"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5355,6 +5489,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungary"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5518,7 +5663,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Cannot rename column to %s, because that column already exists!"
@@ -5534,16 +5679,11 @@ msgid "Decimal Separator"
 msgstr "Decimal Separator"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5589,9 +5729,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "The module name must be unique !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5654,15 +5795,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5678,6 +5810,11 @@ msgstr "Launch Configuration Wizard"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Attachment Name"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5761,6 +5898,12 @@ msgstr "Kazakhstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Weekday number [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Resource Name"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6015,7 +6158,7 @@ msgid "title"
 msgstr "title"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -6072,6 +6215,15 @@ msgstr "Products"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6187,13 +6339,15 @@ msgid "Bank Type"
 msgstr "Bank Type"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "The name of the group can not start with \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -6213,7 +6367,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6247,10 +6401,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6286,6 +6439,11 @@ msgstr ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Original View"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6296,7 +6454,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6312,26 +6470,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6464,11 +6602,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6480,8 +6613,8 @@ msgid "Malaysia"
 msgstr "Malaysia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6590,7 +6723,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "There is no view of type '%s' defined for the structure!"
@@ -6628,7 +6761,7 @@ msgid "Created Menus"
 msgstr "Created Menus"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6655,9 +6788,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6689,6 +6850,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Current Year without Century: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6731,7 +6899,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6823,7 +6991,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6843,23 +7011,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobile"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6892,10 +7043,10 @@ msgstr "Report xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Modules"
 
@@ -6969,9 +7120,9 @@ msgid "United Kingdom"
 msgstr "United Kingdom"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6995,8 +7146,8 @@ msgid "Partner Titles"
 msgstr "Partner Titles"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -7044,7 +7195,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7053,11 +7204,6 @@ msgstr ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as it is for reporting purposes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7164,6 +7310,13 @@ msgstr "Module file successfully imported!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transitions"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7258,7 +7411,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Fed. State"
@@ -7359,12 +7511,6 @@ msgstr "Full Name"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "The module name must be unique !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7406,6 +7552,7 @@ msgstr "On Multiple Doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7463,7 +7610,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Please specify an action to launch !"
@@ -7483,6 +7630,11 @@ msgstr "Category Name"
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7494,7 +7646,7 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7503,6 +7655,11 @@ msgstr ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7533,7 +7690,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Insufficient fields for Calendar View!"
@@ -7581,7 +7738,6 @@ msgstr "Transition"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7601,30 +7757,30 @@ msgid "Child Categories"
 msgstr "Child Categories"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7712,6 +7868,11 @@ msgstr ""
 msgid "This Window"
 msgstr "This Window"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7797,6 +7958,21 @@ msgstr "Fields"
 msgid "Employees"
 msgstr "Employees"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7826,11 +8002,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Addresses"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7855,7 +8026,6 @@ msgstr "Selection Options"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Street"
@@ -7866,9 +8036,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7946,7 +8131,7 @@ msgid "Change My Preferences"
 msgstr "Change My Preferences"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Invalid model name in the action definition."
@@ -8033,14 +8218,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -8049,7 +8236,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Setting empty passwords is not allowed for security reasons!"
@@ -8060,13 +8247,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8088,12 +8275,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Wizard"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8266,7 +8454,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8297,14 +8485,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Warning!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8328,7 +8508,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8446,7 +8625,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "For selection fields, the Selection Options must be given!"
@@ -8761,7 +8940,7 @@ msgid "Update Modules List"
 msgstr "Update Modules List"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8774,7 +8953,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8788,7 +8967,7 @@ msgstr ""
 "on Cancel in the User Preferences now)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8803,6 +8982,17 @@ msgstr "Continue"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8842,7 +9032,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8864,15 +9054,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Language code of translation item must be among known languages"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8896,7 +9086,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Abbreviated month name."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8908,7 +9098,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Supplier"
@@ -8986,7 +9175,7 @@ msgid "Selectable"
 msgstr "Selectable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -9014,8 +9203,8 @@ msgid "Iteration"
 msgstr "Iteration"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "UserError"
@@ -9039,7 +9228,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9187,7 +9376,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9227,8 +9416,8 @@ msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -9302,7 +9491,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9316,7 +9505,7 @@ msgid "Ukraine"
 msgstr "Ukraine"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9379,6 +9568,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9477,9 +9671,9 @@ msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9507,13 +9701,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9534,7 +9728,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9582,7 +9776,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s does not exist!"
@@ -9628,6 +9822,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9636,7 +9831,7 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9655,6 +9850,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9690,7 +9922,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9742,6 +9974,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hour (12-hour clock) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9784,23 +10021,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9834,7 +10059,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Click 'Continue' to configure the next addon..."
@@ -9926,6 +10151,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10133,7 +10363,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10144,13 +10374,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Interval Unit"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Kind"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "This method no longer exists"
@@ -10322,7 +10557,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10357,6 +10592,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10382,6 +10622,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10471,7 +10716,6 @@ msgstr "%m - Month number [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "City"
@@ -10507,13 +10751,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 or later version"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10574,19 +10825,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10600,6 +10876,8 @@ msgid "Activity"
 msgstr "Activity"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10618,7 +10896,12 @@ msgid "Parent Company"
 msgstr "Parent Company"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10630,13 +10913,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10723,6 +10999,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10794,6 +11090,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Sequences Type"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10854,9 +11155,9 @@ msgstr ""
 "Please de-activate the language first."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10874,8 +11175,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem in configuration `Record Id` in Server Action!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10916,13 +11217,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10933,7 +11233,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10964,36 +11269,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11015,6 +11290,11 @@ msgstr "Other Proprietary"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11031,16 +11311,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "You cannot delete the language which is User's Preferred Language !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11057,9 +11327,9 @@ msgid "Cascade"
 msgstr "Cascade"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11084,11 +11354,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11114,7 +11379,7 @@ msgid "Domain"
 msgstr "Domain"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11130,12 +11395,12 @@ msgid "State Name"
 msgstr "State Name"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11156,30 +11421,10 @@ msgid "Timezone"
 msgstr "Timezone"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11199,7 +11444,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11251,7 +11496,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Street2"
 
@@ -11275,6 +11519,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11360,19 +11605,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Integrity Error"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Size of the field can never be less than 1 !"
@@ -11414,22 +11668,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Arguments"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11562,7 +11800,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Customer"
 
@@ -11652,7 +11889,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11702,8 +11939,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11794,7 +12031,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11821,7 +12058,7 @@ msgid "Object"
 msgstr "Object"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11910,7 +12147,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11925,7 +12162,7 @@ msgid "User Ref."
 msgstr "User Ref."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11970,8 +12207,6 @@ msgstr "Reference Guide"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11979,7 +12214,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12008,12 +12243,6 @@ msgstr "Falkland Islands"
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12120,8 +12349,10 @@ msgid "Selection"
 msgstr "Selection"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -12158,7 +12389,7 @@ msgid "Action Type"
 msgstr "Action Type"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12296,11 +12527,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hour 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Uncheck the active field to hide the contact."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12317,7 +12543,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Unknown attribute %s in %s "
@@ -12340,7 +12566,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "undefined get method !"
@@ -12381,16 +12607,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binary File or external URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Change password"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12437,91 +12663,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12703,6 +12895,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12719,7 +12916,7 @@ msgid "Body"
 msgstr "Body"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12770,7 +12967,7 @@ msgid "choose"
 msgstr "choose"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12946,10 +13143,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12981,12 +13182,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13002,7 +13204,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
@@ -13024,35 +13225,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13124,25 +13296,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13170,6 +13326,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13206,6 +13382,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "unknown"
@@ -13273,6 +13450,11 @@ msgstr "Address Book"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13362,6 +13544,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13374,7 +13557,7 @@ msgid "Information"
 msgstr "Information"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13405,16 +13588,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Right parent"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Update Module List"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13479,6 +13666,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "The osv_memory field can only be compared with = and != operator."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13551,29 +13743,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13621,7 +13790,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13665,9 +13834,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Record rules"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13913,9 +14082,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13942,63 +14116,14 @@ msgid "System Configuration done"
 msgstr "System Configuration done"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14039,17 +14164,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14084,7 +14198,7 @@ msgid "Low"
 msgstr "Low"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Error ! You can not create recursive Menu."
@@ -14166,11 +14280,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Phone"
@@ -14185,6 +14298,11 @@ msgstr "Access Menu"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14205,6 +14323,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanian / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14241,41 +14383,6 @@ msgstr "Object Relation"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14336,40 +14443,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14463,6 +14538,21 @@ msgstr "View :"
 msgid "View Auto-Load"
 msgstr "View Auto-Load"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14505,34 +14595,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14555,9 +14617,9 @@ msgid "Unmet dependency !"
 msgstr "Unmet dependency !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14568,7 +14630,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14594,7 +14686,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14639,7 +14731,7 @@ msgid "Access"
 msgstr "Access"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14672,11 +14764,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14692,8 +14783,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14808,7 +14897,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14820,7 +14909,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14857,7 +14945,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14868,8 +14956,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Warning"
@@ -14895,11 +14983,6 @@ msgstr "Virgin Islands (British)"
 msgid "Parameters"
 msgstr "Parameters"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14989,7 +15072,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Country"
@@ -15060,9 +15142,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15089,7 +15179,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Can only rename one column at a time!"
@@ -15150,6 +15240,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15174,7 +15295,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Note that this operation might take a few minutes."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15213,6 +15334,12 @@ msgstr "Execution"
 msgid "Condition"
 msgstr "Condition"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15267,6 +15394,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15291,6 +15425,11 @@ msgstr "System Update"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15307,7 +15446,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15328,15 +15467,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "General Information"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15372,7 +15548,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Company Switch Warning"
@@ -15390,11 +15571,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "The next number of the sequence will be incremented by this number"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Function"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15430,11 +15615,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Delivery"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15462,7 +15642,7 @@ msgid "Workflow Instances"
 msgstr "Workflow Instances"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partners: "
@@ -15473,7 +15653,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15539,7 +15719,6 @@ msgstr "Export Name"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15599,6 +15778,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "On multiple doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Contact Name"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15827,6 +16009,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW path"
 
+#~ msgid "Creator"
+#~ msgstr "Creator"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -16030,6 +16215,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Type fields"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Uncheck the active field to hide the contact."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Congo, The Democratic Republic of the"
 
@@ -16153,6 +16341,9 @@ msgstr ""
 #~ msgid "Save As Attachment Prefix"
 #~ msgstr "Save As Attachment Prefix"
 
+#~ msgid "Delivery"
+#~ msgstr "Delivery"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "BIC/Swift code"
 
@@ -16295,6 +16486,12 @@ msgstr ""
 #~ msgid "Homepage Widgets"
 #~ msgstr "Homepage Widgets"
 
+#~ msgid "Attached Model"
+#~ msgstr "Attached Model"
+
+#~ msgid "Attached ID"
+#~ msgstr "Attached ID"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Domain Setup"
 
@@ -16504,6 +16701,9 @@ msgstr ""
 #~ msgid "Has a web component"
 #~ msgstr "Has a web component"
 
+#~ msgid "Addresses"
+#~ msgstr "Addresses"
+
 #~ msgid "Content"
 #~ msgstr "Content"
 
@@ -17066,6 +17266,9 @@ msgstr ""
 #~ "Only specify a value if you want to change the user password. This user will "
 #~ "have to logout and login again!"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binary File or external URL"
+
 #~ msgid "- type,name,res_id,src,value"
 #~ msgstr "- type,name,res_id,src,value"
 
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 2a50ce20df6..cfd0a83ea5f 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-19 23:24+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 18:23+0000\n"
+"Last-Translator: Omar (Pexego) <bronxkds@hotmail.com>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "Fecha y hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -221,41 +221,15 @@ msgstr ""
 "teórico de beneficios."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -266,7 +240,7 @@ msgstr ""
 "de un módulo (addon) personalizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error en la restricción (constraint)"
@@ -277,7 +251,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "No está permitido renombrar el campo \"%s\""
@@ -288,7 +262,7 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado."
@@ -374,29 +348,6 @@ msgstr "Compañía donde se guardará el registro actual."
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Añade información adicional al pedido de venta.\n"
-"===================================================\n"
-"\n"
-"Puede añadir las siguientes fechas adicionales a un pedido de venta:\n"
-"-----------------------------------------------------------\n"
-"    * Fecha solicitada\n"
-"    * Fecha de confirmación\n"
-"    * Fecha efectiva\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -406,11 +357,6 @@ msgstr ""
 "Id. de la base datos del registro para abrir en el formulario de vista, "
 "cuando se establece el modo de visto únicamente a 'formulario'"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre del contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -488,7 +434,7 @@ msgstr ""
 "envío.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -527,6 +473,7 @@ msgstr "Reglas de acción automáticas"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -567,7 +514,7 @@ msgstr ""
 "la lista de las directivas permitidas, mostradas cuando edita un idioma."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -625,7 +572,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -675,9 +622,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -722,26 +669,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -752,9 +679,40 @@ msgstr ""
 "por segunda vez, obtendrá el informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo permite fabricar varios productos de una orden de fabricación.\n"
+"============================================================================="
+"\n"
+"\n"
+"Puede configurar subproductos en la lista de materiales.\n"
+"\n"
+"Sin este módulo:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"Con este módulo:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -831,14 +789,12 @@ msgstr ""
 "defecto (por defecto: {})."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr "Logo web"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -896,6 +852,33 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Gestión contable y financiera.\n"
+"============================\n"
+"\n"
+"El módulo de gestión contable y financiera cubre:\n"
+"--------------------------------------------\n"
+"    * Contabilidad general\n"
+"    *Contabilidad analítica/costes\n"
+"    * Contabilidad de terceros\n"
+"    * Gestión de impuestos\n"
+"    * Presupuestos\n"
+"    * Facturas de cliente y proveedor\n"
+"    * Extractos bancarios\n"
+"    * Proceso de reconciliación por empresa\n"
+"\n"
+"Crea un tablero para contables que incluye:\n"
+"--------------------------------------------------\n"
+"    * Lista de facturas de cliente pendientes de aprobación\n"
+"    * Análisis de la compañía\n"
+"    * Gráfico de tesorería\n"
+"\n"
+"Los procesos de mantenimiento del Libro Mayor se hacen a través de la "
+"definición de diarios fiscales (apuntes contables o su agrupación se "
+"mantienen a través de los diarios) \n"
+"Para un ejercicio determinado y para la preparación de recibos hay un módulo "
+"de nombre account_voucher.\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -904,25 +887,21 @@ msgid "Model Description"
 msgstr "Descripción del modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para añadir un contacto en la libreta de direcciones.\n"
-"</p><p>\n"
-"OpenERP le ayuda a gestionar todas las actividades relacionadas con los "
-"clientes: discusiones, historial de oportunidades de negocio, documentos, "
-"etc.\n"
-"</p>\n"
-"            "
+"\n"
+"Menú para Marketing.\n"
+"===================\n"
+"\n"
+"Contiene el instalador para los módulos relacionados con marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -957,11 +936,21 @@ msgstr "Expresión de activación"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Fecha de la próxima ejecución programada para esta acción."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1080,6 +1069,34 @@ msgid ""
 "also possible in order to automatically create a meeting when a holiday "
 "request is accepted by setting up a type of meeting in Leave Type.\n"
 msgstr ""
+"\n"
+"Gestiona ausencias y solicitudes de asignación\n"
+"====================================\n"
+"\n"
+"Esta aplicación controla la planificación de vacaciones de su compañía. "
+"Permite a los empleado solicitar vacaciones. Luego, los gestores pueden "
+"revisar las solicitudes de vacaciones y aprobarlas o rechazarlas. De esta "
+"manera usted puede controlar en conjunto la planificación de las vacaciones "
+"para una compañía o departamento.\n"
+"\n"
+"Usted puede configurar distintos tipos de ausencias (enfermedad, vacaciones, "
+"días compensatorios, ...) y distribuirlas para un empleado o departamento "
+"rápidamente usando las solicitudes de asignación. Un empleado puede también "
+"hacer una petición para más días creando una nueva asignación. Esto "
+"incrementará el total de días disponibles para ese tipo de ausencia (si la "
+"petición es aceptada).\n"
+"\n"
+"Usted puede seguir las ausencias de diferentes maneras con los siguientes "
+"informes: \n"
+"\n"
+"* Resumen de ausencias\n"
+"* Ausencias por departamento\n"
+"* Análisis de ausencias\n"
+"\n"
+"Una sincronización con la agenda interna (Reuniones del módulo de CRM) es "
+"también posible de cara automáticamente crear una reunión cuando una "
+"solicitud de vacaciones es aceptada configurando un tipo reunión como tipo "
+"de ausencia.\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1097,13 +1114,9 @@ msgid "base.language.export"
 msgstr "base.idioma.exportar"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indique el nombre de campo al cual se refiere el id del registro para la "
-"operación escribir. Si está vacío se referirá al id activo del objeto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1123,7 +1136,7 @@ msgid "Email Preferences"
 msgstr "Preferencias de email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' no parece ser una fecha valida para el campo '%%(field)s'"
@@ -1174,23 +1187,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
-"\n"
-"Éste es el módulo base para gestionar el plan de cuentas para Luxemburgo.\n"
-"======================================================================\n"
-"\n"
-"    * El plan de cuentas KLUWER\n"
-"    * Los códigos de impuestos para Luxemburgo\n"
-"    * Los impuestos principales usados en Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1300,9 +1299,67 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
+"\n"
+"El genérico de OpenERP para la gestión de relaciones con el cliente (CRM)\n"
+"==========================================================\n"
+"\n"
+"Esta aplicación permite que grupo de personas gestione iniciativas de forma "
+"inteligente y eficaz, oportunidades, reuniones y llamadas.\n"
+"\n"
+"Gestiona tareas claves como la comunicación, identificación, priorización, "
+"asignación, resolución y notificación.\n"
+"\n"
+"OpenERP se asegura de que todos los casos están satisfactoriamente seguidos "
+"por los usuarios, clientes y proveedores. Puede automáticamente enviar "
+"recordatorios, escalar las solicitudes, lanzar funciones específicas y "
+"muchas otras acciones basadas en sus propias reglas empresariales.\n"
+"\n"
+"Lo mejor de este sistema es que los usuarios no necesitan hacer nada "
+"especial. El módulo de CRM tiene una plataforma de email que sincroniza los "
+"emails con OpenERP. De esta manera, los usuarios pueden simplemente enviar "
+"emails para el seguimiento de la solicitud.\n"
+"\n"
+"OpenERP se encargará de dar las gracias por su mensaje, automáticamente "
+"dirigiéndolo al personal apropiado y asegurándose de que toda la futura "
+"correspondencia quede en el lugar adecuado.\n"
+"\n"
+"\n"
+"Tablero CRM que incluye:\n"
+"-------------------------------\n"
+"* Ingresos planificados por etapa y usuario (gráfico)\n"
+"* Oportunidades por etapa (gráfico)\n"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1318,12 +1375,17 @@ msgstr ""
 "siguientes grupos."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modelo de documento"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr "Cambiar la contraseña de usuario"
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1350,7 +1412,54 @@ msgid "Username"
 msgstr "Nombre de usuario"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1380,7 +1489,7 @@ msgid "Delete Access Right"
 msgstr "Eliminar derecho de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "¡Ha fallado el test de conexión!"
@@ -1412,14 +1521,12 @@ msgid "South Korea"
 msgstr "Corea del Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transiciones"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "¡No se ha encontrado el registro #%d de %s, no se puede copiar!"
@@ -1559,7 +1666,7 @@ msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "¡Está prohibido cambiar el modelo de un campo!"
@@ -1581,7 +1688,7 @@ msgid "Search"
 msgstr "Búsqueda"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1601,7 +1708,14 @@ msgid "Parent Application"
 msgstr "Aplicación padre"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operación cancelada"
@@ -1647,6 +1761,35 @@ msgid ""
 "Also implements IETF RFC 5785 for services discovery on a http server,\n"
 "which needs explicit configuration in openerp-server.conf too.\n"
 msgstr ""
+"\n"
+"Con este módulo, el servidor WebDAV para documentos es activado\n"
+"===============================================================\n"
+"\n"
+"Usted puede entonces usar algún navegador compatible donde remotamente ver "
+"los adjuntos de OpenObject.\n"
+"\n"
+"Después de la instalación, el servidor de WebDAV puede ser controlado por "
+"una sección [webdav] en la configuración del servidor.\n"
+"\n"
+"Parámetro en la configuración del servidor:\n"
+"-------------------------------\n"
+"[webdav]:\n"
+"+++++++++ \n"
+"    * enable = True ; Sirve webdav sobre los servidores http(s)\n"
+"    * vdir = webdav ; el directorio donde webdav será servido\n"
+"    * el valor por defecto dice que webdav estará\n"
+"    * en \"http://localhost:8069/webdav/\n"
+"    * verbose = True ; Activa los mensajes verbosos de webdav\n"
+"    * debug = True ; Activa los mensajes de depuración de webdav\n"
+"    * ya que los mensajes se dirigen al log de python, con\n"
+"    * los niveles \"debug\" y \"debug_rpc\" respectivamente, usted puede "
+"dejar\n"
+"    * esta opciones activas\n"
+"\n"
+"También implementa IETF RFC 5785 para el descubrimiento de servicios en un "
+"servidor http,\n"
+"el cual necesita explicitamente configuración en el openerp-server.conf "
+"también.\n"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_purchase_management
@@ -1749,7 +1892,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "No existe un idioma con código \"%s\""
@@ -1872,7 +2029,7 @@ msgid "On Create"
 msgstr "Al crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1882,11 +2039,6 @@ msgstr ""
 "puntos! Los puntos se usan para referirse a datos de otros módulos, por "
 "ejemplo módulo.referencia_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Presupuestos, órdenes de venta, facturación"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1973,7 +2125,7 @@ msgid "East Timor"
 msgstr "Timor oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2031,11 +2183,6 @@ msgstr ""
 "Asinga derechos de gestor y de usuario al administrador y sólo permisos de "
 "usuario al usuario demo. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID archivo adjunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2053,7 +2200,7 @@ msgstr ""
 "automática de albaranes y más."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2095,6 +2242,11 @@ msgstr "Vehículo, leasing, seguros, costes"
 msgid "Read Access"
 msgstr "Permiso para leer"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2173,16 +2325,11 @@ msgid "Create Tasks on SO"
 msgstr "Crear tareas en OV"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "¡Esta columna contiene datos del módulo y no puede ser eliminada!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo archivo adjunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2254,7 +2401,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "¡No se puede eliminar el usuario principal!"
@@ -2286,11 +2433,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -2302,7 +2449,6 @@ msgstr "Plantilla de planes contables"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de dirección"
 
@@ -2340,11 +2486,6 @@ msgstr "Ruta completa"
 msgid "The next step depends on the file format:"
 msgstr "El siguiente paso depende del formato del archivo:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideas"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2484,6 +2625,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr "Método"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2517,7 +2663,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2525,6 +2671,11 @@ msgstr ""
 "No se han encontrado registros coincidentes para %(field_type)s '%(value)s' "
 "en el campo '%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2575,6 +2726,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Añadir o no el encabezado corporativo en el informe RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2629,7 +2789,7 @@ msgstr ""
 "tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2727,7 +2887,6 @@ msgstr "Santo Tomé y Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2774,11 +2933,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Lema de la empresa"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2908,9 +3062,20 @@ msgid "Default limit for the list view"
 msgstr "Límite por defecto para la vista de lista."
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nueva Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2991,7 +3156,7 @@ msgstr ""
 "========================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -3060,6 +3225,19 @@ msgstr "Mapeado de campos"
 msgid "Export Translations"
 msgstr "Exportar traducciones"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3068,7 +3246,7 @@ msgid "Manager"
 msgstr "Responsable"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Lo siento, no está autorizado para acceder a este documento."
@@ -3167,7 +3345,7 @@ msgid "Inherited"
 msgstr "Hededado"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "Sí"
@@ -3197,7 +3375,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' no parece ser un entero para el campo '%%(field)s'"
@@ -3273,22 +3451,22 @@ msgid "LinkedIn Integration"
 msgstr "Integración con LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "¡Estructura del objeto no válida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -3387,12 +3565,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3411,19 +3589,27 @@ msgstr ""
 "los informes estadísticos."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Éste es el módulo para administrar el plan de cuentas e impuestos en OpenERP "
+"para Polonia.\n"
+"============================================================================="
+"=====\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3431,7 +3617,7 @@ msgid "Params storage"
 msgstr "Almacenamiento de parámetros"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No puede actualizar el módulo '% s'. No está instalado"
@@ -3486,34 +3672,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Argumentos no válidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3552,7 +3710,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Falta el documento(s)"
@@ -3564,6 +3722,34 @@ msgstr "Falta el documento(s)"
 msgid "Bank Account Type"
 msgstr "Tipo de cuenta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3602,7 +3788,7 @@ msgid "Signal (subflow.*)"
 msgstr "Señal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3642,7 +3828,7 @@ msgid "Access Controls"
 msgstr "Controles de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3672,32 +3858,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Archivo icono web (inmóvil)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3717,9 +3877,13 @@ msgstr ""
 "Si utiliza un tipo fórmula, introduzca una expresión Python que incluya la "
 "variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fecha de nacimiento"
 
@@ -3735,7 +3899,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricantes de los productos"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Modo SMTP sobre SSL no disponible"
@@ -3853,7 +4017,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4052,7 +4216,6 @@ msgstr "Informes"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -4064,13 +4227,18 @@ msgstr ""
 "Si no se especifica actúa como valor por defecto para los nuevos recursos."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Se ha detectado recursividad."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "¡Error de recurrencia entre dependencias de módulos!"
@@ -4130,9 +4298,10 @@ msgid "Urdu / اردو"
 msgstr "Tayiko / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Acceso denegado"
@@ -4143,7 +4312,7 @@ msgid "Company Name"
 msgstr "Nombre de la compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4164,16 +4333,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (obsoleto - usar Informe)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"El código de idioma del elemento de traducción debe estar dentro de los "
-"lenguajes conocidos"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Reglas de registro"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pierre y Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4213,17 +4403,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Permite el acceso anónimo a OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.traduccion"
 
 #. module: base
 #: view:res.lang:0
@@ -4271,27 +4453,7 @@ msgid "Paper Format"
 msgstr "Formato de papel"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-"\n"
-"Este módulo actualiza los memorándum dentro de OpenERP para usar un pad "
-"externo.\n"
-"=======================================================================\n"
-"\n"
-"Úselo para actualizar los textos de los memorándum en tiempo real con los "
-"usuarios a los que invite.\n"
-"\n"
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4311,7 +4473,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "Reg"
@@ -4360,7 +4522,7 @@ msgid "Email Gateway"
 msgstr "Pasarela de e-mail"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4381,9 +4543,43 @@ msgid "Technical Data"
 msgstr "Datos técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4439,13 +4635,18 @@ msgstr "Parte de horas para las incidencias"
 msgid "Ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "¡Estructura no válida!"
@@ -4461,9 +4662,9 @@ msgid "Share any Document"
 msgstr "Compartir cualquier documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Iniciativas, oportunidades, llamadas telefónicas"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupo requerido"
 
 #. module: base
 #: view:res.lang:0
@@ -4524,33 +4725,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4636,7 +4814,6 @@ msgstr "Restricción"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4711,6 +4888,11 @@ msgstr ""
 "usa el de mayor prioridad. La prioridad por defecto es 10 (número más "
 "pequeño = más prioridad)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4774,9 +4956,16 @@ msgid "Default value or action reference"
 msgstr "Valor por defecto o referencia de acción"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4860,6 +5049,22 @@ msgstr "Cargar una traducción"
 msgid "Installed Version"
 msgstr "Versión instalada"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4886,6 +5091,43 @@ msgstr ""
 "campo está vacío, OpenERP otorgará la visibilidad basándose en los permisos "
 "de lectura de los objetos asociados."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4915,6 +5157,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "no"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4992,12 +5240,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.acciones.informe.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -5012,7 +5254,6 @@ msgstr "Suiza - Contabilidad"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -5023,13 +5264,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Marcar como Para ejecutar"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5075,6 +5321,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -5090,7 +5338,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5187,7 +5435,12 @@ msgid "Google Docs integration"
 msgstr "Integración con Google Docs"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "nombre"
@@ -5275,7 +5528,7 @@ msgid "System Configuration Done"
 msgstr "Configuración del sistema realizada"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ha ocurrido un error mientras se validaban los campo(s) %s: %s"
@@ -5404,6 +5657,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr "Acceso completo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5417,7 +5675,7 @@ msgid "Portuguese / Português"
 msgstr "Portugués / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5429,7 +5687,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Sólo si esta cuenta bancaria pertenece a su compañía"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "Sub-campo '%s' desconocido"
@@ -5461,6 +5719,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5630,7 +5899,7 @@ msgid "Account Owner Name"
 msgstr "Nombre del propietario de la cuenta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5647,16 +5916,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimales"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Falta el valor requerido para el campo '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "Dirección de empresa"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5703,9 +5967,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "Modelo opcional, usado en su mayoría para acciones requeridas."
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5768,19 +6033,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"Permite a los usuarios acceder.\n"
-"==========================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5796,6 +6048,11 @@ msgstr "Iniciar asistente de configuración"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Órdenes de fabricación, lista de materiales, rutas de producción"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nombre del documento adjunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5879,6 +6136,12 @@ msgstr "Kazajstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Día de la semana [0(domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6136,7 +6399,7 @@ msgid "title"
 msgstr "título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "verdadero"
@@ -6193,6 +6456,15 @@ msgstr "Productos"
 msgid "User-defined Defaults"
 msgstr "Predeterminados definidos por el usuario"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6326,13 +6598,15 @@ msgid "Bank Type"
 msgstr "Tipo de banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -6352,7 +6626,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6387,10 +6661,9 @@ msgid "Uncategorized"
 msgstr "Sin categoría"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nombre del recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6426,6 +6699,11 @@ msgstr ""
 "formulario de cliente, la señal comprueba el nombre del botón pulsado. Si la "
 "señal es NULL, ningún botón es necesario para validar esta transición."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6440,7 +6718,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' no parece ser un número para el campo '%%(field)s'"
@@ -6458,26 +6736,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Bancos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6610,11 +6868,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Restablecer contraseña"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6626,8 +6879,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "El número de incremento no debe ser cero."
@@ -6749,7 +7002,7 @@ msgstr ""
 "de ausencia, partes de horas, ...), si se enlaza a un empleado en el sistema."
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
@@ -6789,7 +7042,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6816,9 +7069,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Marcar como Para ejecutar"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6850,6 +7131,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Año actual sin centuria: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Parámetros del sistema"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6902,7 +7190,7 @@ msgid "Audit Trail"
 msgstr "Rastro de auditoría"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6995,7 +7283,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "¡No se puede duplicar la configuración!"
@@ -7015,29 +7303,6 @@ msgstr "Algunas veces llamado BIC o Swift"
 msgid "Indian - Accounting"
 msgstr "India - Contabilidad"
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Módulo para gestionar el plan de cuentas para México en OpenERP\n"
-"=====================================================\n"
-"\n"
-"Plan de cuentas y localización mexicanos.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -7070,10 +7335,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -7153,9 +7418,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7179,8 +7444,8 @@ msgid "Partner Titles"
 msgstr "Títulos de empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Use el formato '%s'"
@@ -7228,7 +7493,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7238,11 +7503,6 @@ msgstr ""
 "permitida para este objeto ya que este objeto tiene como finalidad la "
 "generación de informes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anónimo"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7352,6 +7612,13 @@ msgstr "¡Archivo de módulo importado con éxito!"
 msgid "Model Constraints"
 msgstr "Restricciones del modelo"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7453,7 +7720,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Provincia"
@@ -7560,12 +7826,6 @@ msgstr "Nombre completo"
 msgid "on"
 msgstr "en"
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7609,6 +7869,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7666,7 +7927,7 @@ msgid "Connection Security"
 msgstr "Seguridad de la conexión"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "¡ Por favor, indique una acción a ejecutar !"
@@ -7686,6 +7947,11 @@ msgstr "Nombre de categoría"
 msgid "Northern Mariana Islands"
 msgstr "Islas Marianas del Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7697,7 +7963,7 @@ msgid "Intrastat Reporting"
 msgstr "Informe Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7706,6 +7972,11 @@ msgstr ""
 "Utilice el asistente de cambio de contraseña (en Preferencias de usuario o "
 "menú Usuario) para cambiar su propia contraseña."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7736,7 +8007,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "¡Insuficientes campos para la vista calendario!"
@@ -7784,7 +8055,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7804,30 +8074,30 @@ msgid "Child Categories"
 msgstr "Categorías hijas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7925,6 +8195,11 @@ msgstr "Definición de regla (filtro de dominio)"
 msgid "This Window"
 msgstr "Esta ventana"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -8013,6 +8288,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Empleados"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -8046,11 +8336,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Probar conexión"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Direcciones"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -8075,7 +8360,6 @@ msgstr "Opciones de selección"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Calle"
@@ -8086,9 +8370,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Padre derecho"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8169,7 +8468,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar mis preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
@@ -8264,21 +8563,25 @@ msgid "US Letter"
 msgstr "Carta de EEUU"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menú para Marketing.\n"
-"===================\n"
-"\n"
-"Contiene el instalador para los módulos relacionados con marketing.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir un contacto en la libreta de direcciones.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar todas las actividades relacionadas con los "
+"clientes: discusiones, historial de oportunidades de negocio, documentos, "
+"etc.\n"
+"</p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8286,7 +8589,7 @@ msgid "Company Bank Accounts"
 msgstr "Cuentas bancarias de la compañía"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -8298,13 +8601,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Contraseña opcional para la autenticación SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Lo siento, no está autorizado para modificar este documento."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8326,12 +8629,13 @@ msgid "Normal Bank Account"
 msgstr "Cuenta bancaria habitual"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "id de la base de datos"
@@ -8514,7 +8818,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Trabajos, reclutamiento, solicitudes, entrevista de trabajo"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8547,14 +8851,6 @@ msgstr "Pad en las tareas"
 msgid "base.update.translations"
 msgstr "base.actualizar.tranducciones"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8578,7 +8874,6 @@ msgstr "Accesos rápidos para web"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8701,7 +8996,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "¡Para campos selection debe indicar las opciones de selección!"
@@ -9028,7 +9323,7 @@ msgid "Update Modules List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -9042,7 +9337,7 @@ msgid "eInvoicing"
 msgstr "Facturación electrónica"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -9056,7 +9351,7 @@ msgstr ""
 "(ahora puede hacer clic en Cancelar en las preferencias del usuario)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "El valor \"%s\" para el campo \"%s.%s\" no está en la selección"
@@ -9071,6 +9366,17 @@ msgstr "Siguiente"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandés / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -9114,7 +9420,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -9142,15 +9448,17 @@ msgstr ""
 "registros se eliminan automáticamente de la base de datos o no)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Servidor SMTP ausente"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nombre del documento adjunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"El código de idioma del elemento de traducción debe estar dentro de los "
+"lenguajes conocidos"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9174,7 +9482,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Lo siento, no está autorizado a eliminar este documento."
@@ -9187,7 +9495,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveedor"
@@ -9265,7 +9572,7 @@ msgid "Selectable"
 msgstr "Seleccionable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "¡Todo parece correctamente configurado!"
@@ -9293,8 +9600,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Error de usuario"
@@ -9320,7 +9627,7 @@ msgstr ""
 "modelo que usa el mecanismo de acción requerida, este campo estará marcado."
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9475,7 +9782,7 @@ msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9516,8 +9823,8 @@ msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ErrorAcceso"
@@ -9607,7 +9914,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9624,7 +9931,7 @@ msgid "Ukraine"
 msgstr "Ucrania"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9697,6 +10004,11 @@ msgstr "Etapas"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenco (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9807,9 +10119,9 @@ msgid "Custom Shortcuts"
 msgstr "Accesos rápidos personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9845,13 +10157,13 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "El modulo `base`no puede ser desinstalado"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "El registro no puede ser modificado en este momento"
@@ -9872,7 +10184,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "Lo siento, no estás autorizado a crear este tipo de documento."
@@ -9920,7 +10232,7 @@ msgid "On Delete"
 msgstr "Al eliminar"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "¡No existe el módulo %s!"
@@ -9973,6 +10285,7 @@ msgstr "Estados Unidos - Plan de cuentas"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9981,7 +10294,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Identificador de base de datos '%s' desconocido"
@@ -10004,6 +10317,43 @@ msgstr ""
 "==============================\n"
 "\n"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -10039,7 +10389,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "id. externo"
@@ -10097,6 +10447,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (reloj 12-horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -10151,31 +10506,11 @@ msgid "The currency code must be unique per company!"
 msgstr "¡El código de moneda debe ser único por compañía!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Nuevo idioma (Plantilla de traducción vacía)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-"\n"
-"Restablece la contraseña\n"
-"=====================\n"
-"\n"
-"Permite a los usuarios restablecer su contraseña desde la página de inicio "
-"de sesión.\n"
-"Permite a los administradores pulsar un botón para enviar una petición de "
-"restablecimiento de la contraseña a los usuarios.\n"
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -10221,7 +10556,7 @@ msgid "Products Expiry Date"
 msgstr "Fecha de expiración de productos"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Haga clic en 'Continuar' para configurar el siguiente módulo..."
@@ -10324,6 +10659,11 @@ msgstr ""
 "============================================================================="
 "=============\n"
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10548,7 +10888,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campaña de marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10561,13 +10901,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidad de intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Clase"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método ya no existe"
@@ -10749,7 +11094,7 @@ msgid "To Translate"
 msgstr "A traducir"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Ver todos los posibles valores"
@@ -10789,6 +11134,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr "Restricción PostgreSQL o nombre de la clave externa."
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10814,6 +11164,11 @@ msgstr "Añadir encabezado RML"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Texto mostrado en el pie de página de todos los informes."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL del ícono"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10905,7 +11260,6 @@ msgstr "%m - Número mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciudad"
@@ -10941,13 +11295,22 @@ msgstr "Empleados de RRHH en el portal"
 msgid "Estonian / Eesti keel"
 msgstr "Estonio / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indique el nombre de campo al cual se refiere el id del registro para la "
+"operación escribir. Si está vacío se referirá al id activo del objeto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versió posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -11020,12 +11383,37 @@ msgstr ""
 "    "
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.traduccion"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -11034,7 +11422,7 @@ msgstr ""
 "un error."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -11048,6 +11436,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -11066,7 +11456,12 @@ msgid "Parent Company"
 msgstr "Compañía matriz"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Autentificación OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -11080,15 +11475,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-"Si el modelo objetivo usa el mecanismo de acción requerida, este campo da el "
-"número de acciones que el usuario tiene que realizar."
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -11186,6 +11572,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Gestión de ventas y almacén"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -11262,6 +11668,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipo de secuencias"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -11328,9 +11739,9 @@ msgid ""
 msgstr "No puede eliminar el idioma que está actualmente activo!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Permiso denegado"
@@ -11348,8 +11759,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "¡Problema en configuración `Id registro` en la acción del servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -11390,13 +11801,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -11407,7 +11817,12 @@ msgid "Office Supplies"
 msgstr "Material de oficina"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11449,62 +11864,6 @@ msgstr ""
 " - uid: id del usuario actual\n"
 " - context: contexto actual"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-"\n"
-"Módulo para automatizar las cartas para facturas impagadas, con múltiples "
-"niveles de aviso.\n"
-"============================================================================="
-"====\n"
-"\n"
-"Puede configurar niveles múltiples de aviso a través del menú:\n"
-"---------------------------------------------------------------\n"
-"    Configuración / Niveles de seguimiento\n"
-"    \n"
-"Una vez se definan, puede imprimir automáticamente avisos cada día pulsando "
-"simplemente en el menú:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Seguimiento de pagos / Enviar cartas y correos electrónicos\n"
-"\n"
-"Generará un PDF / enviará correos electrónicos / establecerá acciones "
-"manuales dependiendo de los diferentes niveles de aviso definidos. Puede "
-"definir políticas diferentes para cada compañía.\n"
-"\n"
-"Tenga en cuenta que si quiere comprobar el nivel de seguimiento para una "
-"empresa en concreto, puede hacerlo desde el menú:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Informes / Contabilidad / **Análisis de seguimientos\n"
-"\n"
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11528,6 +11887,11 @@ msgstr "Otro propietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "flujo"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11545,21 +11909,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "¡No puede eliminar el idioma que es el idioma predeterminado de un usuario!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"Este módulo administra el plan de cuentas de Venezuela para OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11576,9 +11925,9 @@ msgid "Cascade"
 msgstr "En cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupo requerido"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Iniciativas, oportunidades, llamadas telefónicas"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11605,11 +11954,6 @@ msgstr "Traducido"
 msgid "Default Company per Object"
 msgstr "Compañía por defecto por objeto"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Número de acciones que el usuario tiene que realizar"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11635,7 +11979,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Use '1' para sí y '0' para no"
@@ -11651,12 +11995,12 @@ msgid "State Name"
 msgstr "Nombre provincia"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
-msgstr "Bélgica - Nóminas con contabilidad"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "Id. de base de datos '%s' no válido para el campo '%%(field)s'"
@@ -11677,30 +12021,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11721,7 +12045,7 @@ msgid "Shared"
 msgstr "Compartido"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11774,7 +12098,6 @@ msgstr "Doble validación en compras"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Calle2"
 
@@ -11801,6 +12124,7 @@ msgstr ""
 "===============================================\n"
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11894,19 +12218,28 @@ msgid "Related Partner"
 msgstr "Empresa relacionada"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de integridad"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "flujo"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
@@ -11948,34 +12281,6 @@ msgstr "Directorio de empleados"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"Gestionar reclamaciones de clientes.\n"
-"============================================================================="
-"===\n"
-"Esta aplicación permite gestionar las reclamaciones y quejas de sus "
-"clientes/proveedores.\n"
-"\n"
-"Está totalmente integrado con la pasarela de correo electrónico, para que "
-"puede crear automáticamente nuevas quejas basadas en los correos "
-"electrónicos entrantes.\n"
-"    "
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -12115,7 +12420,6 @@ msgstr "Instalador de la configuración"
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -12211,7 +12515,7 @@ msgid "ir.fields.converter"
 msgstr "Convertidor de campos"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "¡No se puede crear el contacto sin correo electrónico!"
@@ -12261,9 +12565,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Autentificación OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12364,7 +12668,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Entrega fallida del correo"
@@ -12391,7 +12695,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12480,7 +12784,7 @@ msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12495,7 +12799,7 @@ msgid "User Ref."
 msgstr "Ref. usuario"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr "'%s' no parece una fecha valida para el campo '%%(field)s'"
@@ -12540,8 +12844,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12549,7 +12851,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12582,12 +12884,6 @@ msgstr "Islas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12697,9 +12993,11 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL del ícono"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12749,7 +13047,7 @@ msgid "Action Type"
 msgstr "Tipo de acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12892,11 +13190,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque el campo activo para ocultar el contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12913,7 +13206,7 @@ msgid "workflow.instance"
 msgstr "workflow.instancia"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo desconocido %s en %s "
@@ -12943,7 +13236,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "¡Método get (obtener) no definido!"
@@ -12984,16 +13277,16 @@ msgstr "Bronce"
 msgid "Payroll Accounting"
 msgstr "Cálculo de nóminas"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Archivo binario o URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -13040,92 +13333,57 @@ msgid "Address Format"
 msgstr "Formato de dirección"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
-"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
-"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
-"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.valores"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Características técnicas"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitano (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -13327,6 +13585,11 @@ msgstr ""
 "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
 "las órdenes de entrega, recepciones, ..."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.valores"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -13343,7 +13606,7 @@ msgid "Body"
 msgstr "Contenido"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "¡Prueba de conexión realizada con éxito!"
@@ -13394,7 +13657,7 @@ msgid "choose"
 msgstr "selección"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13590,13 +13853,15 @@ msgid "Components Buyer"
 msgstr "Comprador de componentes"
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"¿Confirma la desinstalación de este módulo? ¡Esto eliminará permanentemente "
-"todos los datos almacenados actualmente por el módulo!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -13634,12 +13899,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13655,7 +13921,6 @@ msgstr "Registro de compañía"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Varios"
@@ -13677,29 +13942,6 @@ msgstr "Técnico"
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Éste es el módulo para administrar el plan de cuentas e impuestos en OpenERP "
-"para Polonia.\n"
-"============================================================================="
-"=====\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13787,40 +14029,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
-"\n"
-"Este módulo permite fabricar varios productos de una orden de fabricación.\n"
-"============================================================================="
-"\n"
-"\n"
-"Puede configurar subproductos en la lista de materiales.\n"
-"\n"
-"Sin este módulo:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"Con este módulo:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13848,6 +14059,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13884,6 +14115,7 @@ msgstr "Eslovaco / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconocido"
@@ -13954,6 +14186,11 @@ msgstr "Libreta de direcciones"
 msgid "ir.sequence.type"
 msgstr "ir.secuencia.tipo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr "Bélgica - Nóminas con contabilidad"
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -14052,6 +14289,7 @@ msgid "Projects, Tasks"
 msgstr "Proyectos, tareas"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -14064,7 +14302,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "falso"
@@ -14112,16 +14350,20 @@ msgstr ""
 "    * Gestión de participación de las empresas\n"
 "    "
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Padre derecho"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -14203,6 +14445,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "El campo osv_memory solo puede ser comparado con los operadores = y !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -14301,29 +14548,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identificador externo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -14373,7 +14597,7 @@ msgid "Delivery Costs"
 msgstr "Gastos de envío"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -14426,9 +14650,9 @@ msgstr ""
 "Desactiva el plan de cuentas mínimo.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Encriptación de la contraseña en la BD"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Reglas de registro"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14715,10 +14939,15 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14750,63 +14979,14 @@ msgid "System Configuration done"
 msgstr "Configuración del sistema realizada."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Parámetros del sistema"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14847,23 +15027,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Recopila información de uso de la aplicación con Google Analytics.\n"
-"    "
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14901,7 +15064,7 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Error ! No puede crear menús recursivos"
@@ -14983,11 +15146,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -15002,6 +15164,11 @@ msgstr "Acceso a menús"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -15022,6 +15189,30 @@ msgstr "Guernsey"
 msgid "Romanian / română"
 msgstr "Rumano / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -15060,41 +15251,6 @@ msgstr "Objeto relación"
 msgid "eInvoicing & Payments"
 msgstr "Facturación electrónica y pagos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -15155,40 +15311,8 @@ msgid "Apply for Write"
 msgstr "Aplicar para escritura"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -15295,6 +15419,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Vista auto-carga"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -15339,34 +15478,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -15389,9 +15500,9 @@ msgid "Unmet dependency !"
 msgstr "¡Dependencia no resuelta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "Se requiere acceso como administrador para desinstalar un módulo"
@@ -15402,7 +15513,37 @@ msgid "base.module.configuration"
 msgstr "base.modulo.configuracion"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -15432,7 +15573,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -15479,7 +15620,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -15512,11 +15653,10 @@ msgid "Bahrain"
 msgstr "Bahréin"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -15532,8 +15672,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -15661,7 +15799,7 @@ msgid "Officer"
 msgstr "Directivo"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -15674,7 +15812,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Índice de colores"
 
@@ -15723,7 +15860,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr "¡El modelo '%s' contiene datos del módulo y no puede ser eliminado!"
@@ -15734,8 +15871,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -15761,11 +15898,6 @@ msgstr "Islas Vírgenes (Británicas)"
 msgid "Parameters"
 msgstr "Parámetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pierre y Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15861,7 +15993,6 @@ msgstr "Formaciones, conferencias, reuniones, exhibiciones, inscripciones"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -15934,9 +16065,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Español (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Instalar un módulo"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
+"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
+"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
+"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15969,7 +16109,7 @@ msgid "Japan"
 msgstr "Japón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "¡Sólo puede renombrar una columna a la vez!"
@@ -16030,6 +16170,37 @@ msgstr "ir.acciones.server"
 msgid "Canada - Accounting"
 msgstr "Canada - Contabilidad"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -16054,7 +16225,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Para su información, esta operación puede llevar varios minutos"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -16095,6 +16266,12 @@ msgstr "Ejecución"
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -16149,6 +16326,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"¿Confirma la desinstalación de este módulo? ¡Esto eliminará permanentemente "
+"todos los datos almacenados actualmente por el módulo!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -16173,6 +16359,11 @@ msgstr "Actualización del sistema"
 msgid "SXW Content"
 msgstr "Contenido del SXW"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -16189,7 +16380,7 @@ msgid "Gold"
 msgstr "Oro"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -16210,15 +16401,52 @@ msgstr "Sierra Leona"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "Id. completo"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Islas Turcas y Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -16256,7 +16484,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Advertencia de cambio de compañia."
@@ -16277,11 +16510,15 @@ msgstr ""
 "El número siguiente de esta secuencia será incrementado por este número."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -16319,11 +16556,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Notas internas"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Envío"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -16351,7 +16583,7 @@ msgid "Workflow Instances"
 msgstr "Instancias del flujo"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Empresas: "
@@ -16362,7 +16594,7 @@ msgid "Is a Company?"
 msgstr "¿Es una empresa?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -16436,7 +16668,6 @@ msgstr "Nombre exportación"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -16554,6 +16785,9 @@ msgstr "Registro"
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "asistente.ir.modelo.menu.crea.linea"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID archivo adjunto"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Dejar un 0 si la acción debe aparecer en todos los recursos."
 
@@ -16564,6 +16798,9 @@ msgstr "Registro"
 #~ "Indique el mensaje. Puede utilizar los campos del objeto. por ej. `Estimado "
 #~ "[[object.partner_id.name]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo archivo adjunto"
+
 #~ msgid "Reply"
 #~ msgstr "Responder"
 
@@ -16674,6 +16911,9 @@ msgstr "Registro"
 #~ msgid "SXW path"
 #~ msgstr "Ruta SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid "res.users"
 #~ msgstr "res.usuarios"
 
@@ -16853,6 +17093,9 @@ msgstr "Registro"
 #~ msgid "Load an Official Translation"
 #~ msgstr "Cargar una traducción oficial"
 
+#~ msgid "Delivery"
+#~ msgstr "Envío"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Empresa de servicios de software libre"
 
@@ -16862,6 +17105,9 @@ msgstr "Registro"
 #~ msgid "Type fields"
 #~ msgstr "Campos de tipo"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque el campo activo para ocultar el contacto."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "República Democrática del Congo"
 
@@ -17072,6 +17318,9 @@ msgstr "Registro"
 #~ msgid "Not Implemented"
 #~ msgstr "No implementado"
 
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
 #, python-format
 #~ msgid "Module %s: Invalid Quality Certificate"
 #~ msgstr "Módulo %s: Certificado de calidad no válido"
@@ -18057,6 +18306,9 @@ msgstr "Registro"
 #~ "Formatos de archivos soportados: *.csv (valores separados por comas) o *.po "
 #~ "(objetos portables GetText)"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Archivo binario o URL externa"
+
 #~ msgid "Report file"
 #~ msgstr "Archivo del informe"
 
@@ -18172,6 +18424,9 @@ msgstr "Registro"
 #~ msgid "Partner Manager"
 #~ msgstr "Gestor de empresas"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nombre del contacto"
+
 #~ msgid "Openerp web graph view"
 #~ msgstr "Vista grafico de Openerp web"
 
@@ -19943,6 +20198,21 @@ msgstr "Registro"
 #~ msgid "Hidden"
 #~ msgstr "Oculto"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Módulo para gestionar el plan de cuentas para México en OpenERP\n"
+#~ "=====================================================\n"
+#~ "\n"
+#~ "Plan de cuentas y localización mexicanos.\n"
+#~ "    "
+
 #, python-format
 #~ msgid ""
 #~ "Please check that all your lines have %d columns.Stopped around line %d "
@@ -20750,6 +21020,19 @@ msgstr "Registro"
 #~ "\"cuentas\", \"contactos, \"empleados\", reuniones, llamadas telefónicas, e-"
 #~ "mails, y los datos de proyectos desde SugarCRM a OpenERP."
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo administra el plan de cuentas de Venezuela para OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
 #~ msgid "HR Manager"
 #~ msgstr "Responsable de RRHH"
 
@@ -21251,6 +21534,9 @@ msgstr "Registro"
 #~ msgid "Check writing"
 #~ msgstr "Verificación de escritura"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Encriptación de la contraseña en la BD"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module provides features to improve the layout of the Sales Order.\n"
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 96376d90ee4..b024a9848a9 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-27 08:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:02+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:09+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Fecha y hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -195,41 +195,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -237,7 +211,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -248,7 +222,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -259,7 +233,7 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -338,20 +312,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -359,11 +319,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre de Contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -422,7 +377,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -459,6 +414,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -497,7 +453,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -549,7 +505,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -589,9 +545,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -616,26 +572,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -646,9 +582,25 @@ msgstr ""
 "por segunda vez, devolverá el informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -723,14 +675,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -796,16 +746,14 @@ msgid "Model Description"
 msgstr "Descripción del modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -834,11 +782,21 @@ msgstr "Expresión del disparo"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -970,13 +928,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indique el nombre de campo al cual se refiere el id del registro para la "
-"operación escribir. Si está vacío se referirá al id activo del objeto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -994,7 +948,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1042,16 +996,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Celular"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1148,8 +1095,37 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1164,12 +1140,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1196,7 +1177,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1224,7 +1252,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1256,14 +1284,12 @@ msgid "South Korea"
 msgstr "Corea del Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transiciones"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1401,7 +1427,7 @@ msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1423,7 +1449,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1438,7 +1464,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1564,7 +1597,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1681,18 +1728,13 @@ msgid "On Create"
 msgstr "Al crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1773,7 +1815,7 @@ msgid "East Timor"
 msgstr "Timor oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1814,11 +1856,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID archivo adjunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1833,7 +1870,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1874,6 +1911,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Acceso de Lectura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1950,16 +1992,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo archivo adjunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2014,7 +2051,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "No se puede eliminar el usuario principal !"
@@ -2038,11 +2075,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2054,7 +2091,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de dirección"
 
@@ -2092,11 +2128,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2232,6 +2263,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2265,12 +2301,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2318,6 +2359,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Añadir o no la cabecera corporativa en el informe RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2369,7 +2419,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2450,7 +2500,6 @@ msgstr "Santo Tomé y Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2497,11 +2546,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2620,9 +2664,20 @@ msgid "Default limit for the list view"
 msgstr "Límite predeterminado para la vista tipo lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nueva Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2700,7 +2755,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2759,6 +2814,19 @@ msgstr "Asignación de campos"
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2767,7 +2835,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2853,7 +2921,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2883,7 +2951,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2948,22 +3016,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3057,12 +3125,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3079,17 +3147,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3099,7 +3169,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No se puede actualizar módulo '%s'. No está instalado."
@@ -3150,34 +3220,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3216,7 +3258,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3228,6 +3270,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipo de cuenta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3264,7 +3334,7 @@ msgid "Signal (subflow.*)"
 msgstr "Señal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3298,7 +3368,7 @@ msgid "Access Controls"
 msgstr "Controles de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3326,32 +3396,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3371,9 +3415,13 @@ msgstr ""
 "Si utiliza una fórmula tipo, introduzca una expresión Python que incluya la "
 "variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fecha nacimiento"
 
@@ -3389,7 +3437,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3497,7 +3545,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3686,7 +3734,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Denominación"
@@ -3697,13 +3744,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Se ha detectado recursividad."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Error de recursión en dependencias de módulos!"
@@ -3763,9 +3815,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3776,7 +3829,7 @@ msgid "Company Name"
 msgstr "Nombre de la compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3795,14 +3848,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr ""
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pierre y Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3831,13 +3907,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3885,19 +3957,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3917,7 +3977,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3962,7 +4022,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3981,9 +4041,43 @@ msgid "Technical Data"
 msgstr "Datos técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4039,13 +4133,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4061,8 +4160,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4121,33 +4220,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "XOR"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4225,7 +4301,6 @@ msgstr "Restricción"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -4297,6 +4372,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4358,9 +4438,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4440,6 +4527,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4463,6 +4566,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4490,6 +4630,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4567,12 +4713,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4587,7 +4727,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -4598,13 +4737,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4647,6 +4791,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -4662,7 +4808,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4756,7 +4902,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4844,7 +4995,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Error al validar el campo (s) de% s:% s"
@@ -4959,6 +5110,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4972,7 +5128,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4983,7 +5139,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5015,6 +5171,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5178,7 +5345,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5194,16 +5361,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimales"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5244,9 +5406,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5309,15 +5472,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5333,6 +5487,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nombre del documento adjunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5416,6 +5575,12 @@ msgstr "Kazajstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5666,7 +5831,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5723,6 +5888,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5838,13 +6012,15 @@ msgid "Bank Type"
 msgstr "Tipo de banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5864,7 +6040,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5897,10 +6073,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nombre del recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5933,6 +6108,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5943,7 +6123,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5959,26 +6139,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6111,11 +6271,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6127,8 +6282,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6235,7 +6390,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6273,7 +6428,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6300,8 +6455,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6334,6 +6517,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6376,7 +6566,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6468,7 +6658,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6488,23 +6678,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Celular"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6537,10 +6710,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -6614,8 +6787,8 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6640,8 +6813,8 @@ msgid "Partner Titles"
 msgstr "Títulos del partner"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6689,18 +6862,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6808,6 +6976,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6902,7 +7077,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Provincia"
@@ -7003,12 +7177,6 @@ msgstr "Nombre completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7050,6 +7218,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7107,7 +7276,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Por favor indique una acción a ejecutar !"
@@ -7127,6 +7296,11 @@ msgstr "Nombre de categoría"
 msgid "Northern Mariana Islands"
 msgstr "Islas Marianas del Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7138,13 +7312,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7175,7 +7354,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7221,7 +7400,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7241,30 +7419,30 @@ msgid "Child Categories"
 msgstr "Categorías hijas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7352,6 +7530,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Esta ventana"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7435,6 +7618,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7464,11 +7662,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Direcciones"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7493,7 +7686,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Calle"
@@ -7504,8 +7696,23 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7584,7 +7791,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar mis preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7671,14 +7878,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7687,7 +7896,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7698,13 +7907,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7723,12 +7932,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7901,7 +8111,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7932,14 +8142,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7963,7 +8165,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8081,7 +8282,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8396,7 +8597,7 @@ msgid "Update Modules List"
 msgstr "Actualizar la lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8408,7 +8609,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8418,7 +8619,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8433,6 +8634,17 @@ msgstr "Continuar"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8472,7 +8684,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8494,15 +8706,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nombre del documento adjunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8526,7 +8738,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8538,7 +8750,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveedor"
@@ -8616,7 +8827,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8644,8 +8855,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8669,7 +8880,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8816,7 +9027,7 @@ msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8855,8 +9066,8 @@ msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ErrorAcceso"
@@ -8930,7 +9141,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8944,7 +9155,7 @@ msgid "Ukraine"
 msgstr "Ucrania"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9007,6 +9218,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9105,8 +9321,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9135,13 +9351,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9162,7 +9378,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9210,7 +9426,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9256,6 +9472,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9264,7 +9481,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9283,6 +9500,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9318,7 +9572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9370,6 +9624,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9412,23 +9671,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9462,7 +9709,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9554,6 +9801,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9758,7 +10010,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9769,13 +10021,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidad de Intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Clase"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método ya no existe"
@@ -9945,7 +10202,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9978,6 +10235,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10003,6 +10265,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10092,7 +10359,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciudad"
@@ -10128,13 +10394,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonio / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indique el nombre de campo al cual se refiere el id del registro para la "
+"operación escribir. Si está vacío se referirá al id activo del objeto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versió posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10193,19 +10468,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10219,6 +10519,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10237,7 +10539,12 @@ msgid "Parent Company"
 msgstr "Empresa matriz"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10249,13 +10556,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10337,6 +10637,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10408,6 +10728,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10466,9 +10791,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10486,8 +10811,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema en configuración `Id registro` en la acción del servidor !"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10526,13 +10851,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10543,7 +10867,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10574,36 +10903,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10625,6 +10924,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10641,16 +10945,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10667,8 +10961,8 @@ msgid "Cascade"
 msgstr "En cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10694,11 +10988,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10724,7 +11013,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10740,12 +11029,12 @@ msgid "State Name"
 msgstr "Nombre de Provincia"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10766,30 +11055,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10809,7 +11078,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10856,7 +11125,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Calle2"
 
@@ -10880,6 +11148,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10965,19 +11234,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11019,22 +11297,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11167,7 +11429,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11257,7 +11518,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11307,8 +11568,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11399,7 +11660,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11426,7 +11687,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11512,7 +11773,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11525,7 +11786,7 @@ msgid "User Ref."
 msgstr "Ref. usuario"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11570,8 +11831,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11579,7 +11838,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11608,12 +11867,6 @@ msgstr "Islas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "XOR"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11720,8 +11973,10 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11758,7 +12013,7 @@ msgid "Action Type"
 msgstr "Tipo de acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11894,11 +12149,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque el campo activo para ocultar el contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11915,7 +12165,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11938,7 +12188,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Método get (obtener) no definido!"
@@ -11979,16 +12229,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12035,92 +12285,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
-"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
-"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
-"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12299,6 +12514,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12315,7 +12535,7 @@ msgid "Body"
 msgstr "Cuerpo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12363,7 +12583,7 @@ msgid "choose"
 msgstr "selección"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12539,10 +12759,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12574,12 +12798,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12593,7 +12818,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12615,23 +12839,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12699,25 +12906,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12745,6 +12936,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12781,6 +12992,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconocido"
@@ -12848,6 +13060,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12937,6 +13154,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12949,7 +13167,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12980,16 +13198,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13054,6 +13276,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13126,29 +13353,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13196,7 +13400,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13240,8 +13444,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13486,9 +13690,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13515,63 +13724,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13612,17 +13772,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13657,7 +13806,7 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13737,11 +13886,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -13756,6 +13904,11 @@ msgstr "Acceso a menús"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13776,6 +13929,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13812,41 +13989,6 @@ msgstr "Relación objeto"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13907,40 +14049,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14029,6 +14139,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Auto-carga de la vista"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14071,34 +14196,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14121,9 +14218,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14134,7 +14231,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14160,7 +14287,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14205,7 +14332,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14238,11 +14365,10 @@ msgid "Bahrain"
 msgstr "Bahréin"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14258,8 +14384,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14374,7 +14498,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14386,7 +14510,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14419,7 +14542,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14430,8 +14553,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -14457,11 +14580,6 @@ msgstr "Islas Vírgenes (Británicas)"
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pierre y Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14551,7 +14669,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -14620,9 +14737,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
+"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
+"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
+"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14649,7 +14775,7 @@ msgid "Japan"
 msgstr "Japón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14710,6 +14836,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14734,7 +14891,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14773,6 +14930,12 @@ msgstr ""
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14825,6 +14988,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14849,6 +15019,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14865,7 +15040,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14886,15 +15061,52 @@ msgstr "Sierra Leona"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Islas Turcas y Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14930,7 +15142,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14948,11 +15165,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14988,11 +15209,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "de Entrega"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15020,7 +15236,7 @@ msgid "Workflow Instances"
 msgstr "Instancias del workflow"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partners: "
@@ -15031,7 +15247,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15097,7 +15313,6 @@ msgstr "Nombre de export"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15161,6 +15376,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "En múltiples doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Nombre de Contacto"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15230,6 +15448,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID archivo adjunto"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Dejar un 0 si la acción debe aparecer en todos los recursos."
 
@@ -15240,6 +15461,9 @@ msgstr ""
 #~ "Indique el mensaje. Puede utilizar los campos del objeto. por ej. `Estimado "
 #~ "[[object.partner_id.name]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo archivo adjunto"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Nombre de disparador"
 
@@ -15394,6 +15618,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "Ruta SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15494,6 +15721,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "Número cuenta"
 
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
 #~ msgid "XML Identifier"
 #~ msgstr "Identificador XML"
 
@@ -15617,6 +15847,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Cargar una traducción oficial"
 
+#~ msgid "Delivery"
+#~ msgstr "de Entrega"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Empresa de servicios de software libre"
 
@@ -15626,6 +15859,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Campos de tipo"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque el campo activo para ocultar el contacto."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "República Democrática del Congo"
 
@@ -15818,3 +16054,21 @@ msgstr ""
 #~ "======================================\n"
 #~ "\n"
 #~ "Este módulo permite crear retro planning para gestionar tus eventos.\n"
+
+#~ msgid "Simplified"
+#~ msgstr "Simplificado"
+
+#~ msgid ""
+#~ "If you use OpenERP for the first time we strongly advise you to select the "
+#~ "simplified interface, which has less features but is easier. You can always "
+#~ "switch later from the user preferences."
+#~ msgstr ""
+#~ "Si utiliza OpenERP por primera vez, le recomendamos que seleccione la "
+#~ "interfaz simplificada, que tiene menos funciones, pero es más fácil. Siempre "
+#~ "puede cambiarla más tarde en las preferencias del usuario."
+
+#~ msgid "Extended"
+#~ msgstr "Extendida"
+
+#~ msgid "Choose between the simplified interface and the extended one"
+#~ msgstr "Seleccione entre el modo de trabajo simplificado o el extendido."
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 3fceb32f546..0dd48f0a3d0 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-15 20:44+0000\n"
 "Last-Translator: doingit translator <Unknown>\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: 2012-12-04 05:02+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:09+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Fecha Hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -194,41 +194,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -239,7 +213,7 @@ msgstr ""
 "de un módulo (addon) personalizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error en la restricción (constraint)"
@@ -250,7 +224,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.vista.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -261,7 +235,7 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado."
@@ -340,20 +314,6 @@ msgstr "Compañía donde se guardará el registro actual."
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -361,11 +321,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre de contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -424,7 +379,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -461,6 +416,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -499,7 +455,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -553,7 +509,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -593,9 +549,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -620,26 +576,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -650,9 +586,25 @@ msgstr ""
 "por segunda vez, obtendrá el informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -729,14 +681,12 @@ msgstr ""
 "defecto (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -802,16 +752,14 @@ msgid "Model Description"
 msgstr "Descripción del modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -842,11 +790,21 @@ msgstr "Expresión del Disparador"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -979,13 +937,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indique el nombre de campo al cual se refiere el id del registro para la "
-"operación escribir. Si está vacío se referirá al id activo del objeto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1005,7 +959,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1055,16 +1009,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1167,9 +1114,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1183,12 +1159,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1215,7 +1196,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1245,7 +1273,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1277,14 +1305,12 @@ msgid "South Korea"
 msgstr "Corea del Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transiciones"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "¡No se ha encontrado el registro #%d de %s, no se puede copiar!"
@@ -1422,7 +1448,7 @@ msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "¡Está prohibido cambiar el modelo de un campo!"
@@ -1444,7 +1470,7 @@ msgid "Search"
 msgstr "Búsqueda"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1464,7 +1490,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operación Cancelada"
@@ -1592,7 +1625,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "No existe un idioma con código \"%s\""
@@ -1711,7 +1758,7 @@ msgid "On Create"
 msgstr "Al crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1721,11 +1768,6 @@ msgstr ""
 "puntos! Los puntos se usan para referirse a datos de otros módulos, por "
 "ejemplo módulo.referencia_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1808,7 +1850,7 @@ msgid "East Timor"
 msgstr "Timor oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1849,11 +1891,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID archivo adjunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1868,7 +1905,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1909,6 +1946,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Permisos de lectura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1985,16 +2027,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo archivo adjunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2049,7 +2086,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "¡No se puede eliminar el usuario principal!"
@@ -2073,11 +2110,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copiar)"
@@ -2089,7 +2126,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de dirección"
 
@@ -2127,11 +2163,6 @@ msgstr "Ruta completa"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2267,6 +2298,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2300,12 +2336,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2356,6 +2397,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2410,7 +2460,7 @@ msgstr ""
 "tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2492,7 +2542,6 @@ msgstr "Santo Tomé y Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2539,11 +2588,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2662,9 +2706,20 @@ msgid "Default limit for the list view"
 msgstr "Límite por defecto para la vista de lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nueva Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2742,7 +2797,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2801,6 +2856,19 @@ msgstr "Mapeado de campos"
 msgid "Export Translations"
 msgstr "Exportar traducciones"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2809,7 +2877,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2895,7 +2963,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2925,7 +2993,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2990,22 +3058,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "¡Estructura del objeto no válida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -3102,12 +3170,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3124,17 +3192,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3144,7 +3214,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No puede actualizar el módulo '% s'. No está instalado"
@@ -3195,34 +3265,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Argumentos no válidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3261,7 +3303,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3273,6 +3315,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipo de cuenta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3309,7 +3379,7 @@ msgid "Signal (subflow.*)"
 msgstr "Señal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3349,7 +3419,7 @@ msgid "Access Controls"
 msgstr "Controles de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3379,32 +3449,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Archivo icono web (inmóvil)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3424,9 +3468,13 @@ msgstr ""
 "Si utiliza un tipo fórmula, introduzca una expresión Python que incluya la "
 "variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fecha de nacimiento"
 
@@ -3442,7 +3490,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3552,7 +3600,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3743,7 +3791,6 @@ msgstr "Informes"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -3755,13 +3802,18 @@ msgstr ""
 "Si no está especificado, actúa como valor por defecto para nuevos recursos"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Se ha detectado recursividad."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "¡Error de recurrencia entre dependencias de módulos!"
@@ -3821,9 +3873,10 @@ msgid "Urdu / اردو"
 msgstr "Tayiko / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3834,7 +3887,7 @@ msgid "Company Name"
 msgstr "Nombre de la compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3853,14 +3906,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (obsoleto - usar Informe)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Reglas de registro"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pierre y Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3889,13 +3965,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.traduccion"
 
 #. module: base
 #: view:res.lang:0
@@ -3943,19 +4015,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3975,7 +4035,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4020,7 +4080,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4039,9 +4099,43 @@ msgid "Technical Data"
 msgstr "Datos técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4097,13 +4191,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "¡Estructura no válida!"
@@ -4119,9 +4218,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupo requerido"
 
 #. module: base
 #: view:res.lang:0
@@ -4179,33 +4278,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4283,7 +4359,6 @@ msgstr "Restricción"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4355,6 +4430,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4418,9 +4498,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4500,6 +4587,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4526,6 +4629,43 @@ msgstr ""
 "campo está vacío, OpenERP otorgará la visibilidad basándose en los permisos "
 "de lectura de los objetos asociados."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4555,6 +4695,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4632,12 +4778,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.acciones.informe.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4652,7 +4792,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -4663,13 +4802,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Marcar como Para ejecutar"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4715,6 +4859,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -4730,7 +4876,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4824,7 +4970,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4912,7 +5063,7 @@ msgid "System Configuration Done"
 msgstr "Configuración del sistema realizada"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ha ocurrido un error mientras se validaban los campo(s) %s: %s"
@@ -5027,6 +5178,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr "Acceso Total"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5040,7 +5196,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5051,7 +5207,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5083,6 +5239,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5248,7 +5415,7 @@ msgid "Account Owner Name"
 msgstr "Nombre dueño cuenta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5265,16 +5432,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimales"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5321,9 +5483,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5386,15 +5549,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5410,6 +5564,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nombre del documento adjunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5493,6 +5652,12 @@ msgstr "Kazajstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Día de la semana [0(domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5747,7 +5912,7 @@ msgid "title"
 msgstr "título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5804,6 +5969,15 @@ msgstr "Productos"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5919,13 +6093,15 @@ msgid "Bank Type"
 msgstr "Tipo de banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5945,7 +6121,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5980,10 +6156,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nombre del recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6019,6 +6194,11 @@ msgstr ""
 "formulario de cliente, la señal comprueba el nombre del botón pulsado. Si la "
 "señal es NULL, ningún botón es necesario para validar esta transición."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6029,7 +6209,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6045,26 +6225,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6197,11 +6357,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6213,8 +6368,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6323,7 +6478,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
@@ -6361,7 +6516,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6388,9 +6543,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Marcar como Para ejecutar"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6422,6 +6605,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Año actual sin centuria: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6464,7 +6654,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6556,7 +6746,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6576,23 +6766,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6625,10 +6798,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -6702,9 +6875,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6728,8 +6901,8 @@ msgid "Partner Titles"
 msgstr "Títulos de empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6777,7 +6950,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6787,11 +6960,6 @@ msgstr ""
 "permitida para este objeto ya que este objeto tiene como finalidad la "
 "generación de informes o reportes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6899,6 +7067,13 @@ msgstr "¡Archivo de módulo importado con éxito!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6993,7 +7168,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Provincia"
@@ -7094,12 +7268,6 @@ msgstr "Nombre completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7141,6 +7309,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7198,7 +7367,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "¡ Por favor, indique una acción a ejecutar !"
@@ -7218,6 +7387,11 @@ msgstr "Nombre de categoría"
 msgid "Northern Mariana Islands"
 msgstr "Islas Marianas del Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7229,7 +7403,7 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7238,6 +7412,11 @@ msgstr ""
 "Utilice el \"asistente de cambio de contraseña\" (en Preferencias de usuario "
 "o menú Usuario) para cambiar su propia contraseña."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7268,7 +7447,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "¡Campos insuficientes para la vista calendario!"
@@ -7316,7 +7495,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7336,30 +7514,30 @@ msgid "Child Categories"
 msgstr "Categorías hijas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7447,6 +7625,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Esta ventana"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7532,6 +7715,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Empleados"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7561,11 +7759,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Direcciones"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7590,7 +7783,6 @@ msgstr "Opciones de Selección"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Calle"
@@ -7601,9 +7793,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Padre derecho"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7681,7 +7888,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar mis preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
@@ -7768,14 +7975,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7784,7 +7993,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7797,13 +8006,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7825,12 +8034,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8003,7 +8213,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8034,14 +8244,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.actualizar.tranducciones"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8065,7 +8267,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8183,7 +8384,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "¡Para los campos selección, debe indicar las opciones de selección!"
@@ -8500,7 +8701,7 @@ msgid "Update Modules List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8514,7 +8715,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8528,7 +8729,7 @@ msgstr ""
 "(ahora puede hacer clic en Cancelar en las preferencias del usuario)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8543,6 +8744,17 @@ msgstr "Siguiente"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandés / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8582,7 +8794,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8604,15 +8816,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nombre del documento adjunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8636,7 +8848,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8648,7 +8860,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveedor"
@@ -8726,7 +8937,7 @@ msgid "Selectable"
 msgstr "Seleccionable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8754,8 +8965,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Error de usuario"
@@ -8779,7 +8990,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8928,7 +9139,7 @@ msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8969,8 +9180,8 @@ msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ErrorAcceso"
@@ -9044,7 +9255,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9058,7 +9269,7 @@ msgid "Ukraine"
 msgstr "Ucrania"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9121,6 +9332,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenco (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9219,9 +9435,9 @@ msgid "Custom Shortcuts"
 msgstr "Accesos rápidos personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9249,13 +9465,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9276,7 +9492,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9324,7 +9540,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "¡No existe el módulo %s!"
@@ -9370,6 +9586,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9378,7 +9595,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9397,6 +9614,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9432,7 +9686,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9484,6 +9738,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (reloj 12-horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9526,23 +9785,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9576,7 +9823,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Haga clic en 'Continuar' para configurar el siguiente módulo..."
@@ -9668,6 +9915,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9876,7 +10128,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9887,13 +10139,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidad de intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Clase"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método ya no existe"
@@ -10069,7 +10326,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10104,6 +10361,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10129,6 +10391,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10218,7 +10485,6 @@ msgstr "%m - Número mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciudad"
@@ -10254,13 +10520,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonio / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indique el nombre de campo al cual se refiere el id del registro para la "
+"operación escribir. Si está vacío se referirá al id activo del objeto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versió posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10322,19 +10597,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.traduccion"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10348,6 +10648,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10366,7 +10668,12 @@ msgid "Parent Company"
 msgstr "Compañía matriz"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10378,13 +10685,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10471,6 +10771,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10542,6 +10862,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipo de secuencias"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10600,9 +10925,9 @@ msgid ""
 msgstr "No puede eliminar le idioma que está actualmente activo!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10620,8 +10945,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "¡Problema en configuración `Id registro` en la acción del servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -10662,13 +10987,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10679,7 +11003,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10710,36 +11039,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10761,6 +11060,11 @@ msgstr "Otro propietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "flujo"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10778,16 +11082,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "¡No puede eliminar el idioma que es el idioma predeterminado de un usuario!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10804,9 +11098,9 @@ msgid "Cascade"
 msgstr "En cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupo requerido"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10831,11 +11125,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10861,7 +11150,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10877,12 +11166,12 @@ msgid "State Name"
 msgstr "Nombre provincia"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10903,30 +11192,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10947,7 +11216,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11000,7 +11269,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Calle2"
 
@@ -11024,6 +11292,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11109,19 +11378,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de integridad."
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "flujo"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
@@ -11163,22 +11441,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11311,7 +11573,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11401,7 +11662,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11451,8 +11712,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11543,7 +11804,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11570,7 +11831,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11659,7 +11920,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11674,7 +11935,7 @@ msgid "User Ref."
 msgstr "Ref. usuario"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11719,8 +11980,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11728,7 +11987,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11757,12 +12016,6 @@ msgstr "Islas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11869,8 +12122,10 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11907,7 +12162,7 @@ msgid "Action Type"
 msgstr "Tipo de acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12045,11 +12300,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque el campo activo para ocultar el contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12066,7 +12316,7 @@ msgid "workflow.instance"
 msgstr "workflow.instancia"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo desconocido %s en %s "
@@ -12089,7 +12339,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "¡Método get (obtener) no definido!"
@@ -12130,16 +12380,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Fichero binario de URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Cambiar la Contraseña"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12186,92 +12436,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
-"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
-"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
-"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.valores"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitano (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12454,6 +12669,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.valores"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12470,7 +12690,7 @@ msgid "Body"
 msgstr "Contenido"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12521,7 +12741,7 @@ msgid "choose"
 msgstr "selección"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12697,10 +12917,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12732,12 +12956,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12753,7 +12978,6 @@ msgstr "Registro empresa"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Varios"
@@ -12775,23 +12999,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12863,25 +13070,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12909,6 +13100,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12945,6 +13156,7 @@ msgstr "Eslovaco / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconocido"
@@ -13012,6 +13224,11 @@ msgstr "Libreta de direcciones"
 msgid "ir.sequence.type"
 msgstr "ir.secuencia.tipo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13101,6 +13318,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13113,7 +13331,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13144,16 +13362,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Padre derecho"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13219,6 +13441,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "El campo osv_memory solo puede ser comparado con los operadores = y !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13291,29 +13518,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13361,7 +13565,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13405,9 +13609,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Reglas de registro"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13653,9 +13857,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13682,63 +13891,14 @@ msgid "System Configuration done"
 msgstr "Configuración del sistema realizada."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13779,17 +13939,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13824,7 +13973,7 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Error ! No puede crear menús recursivos"
@@ -13906,11 +14055,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -13925,6 +14073,11 @@ msgstr "Acceso a menús"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13945,6 +14098,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumano / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13981,41 +14158,6 @@ msgstr "Relación objeto"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14076,40 +14218,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14205,6 +14315,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Vista auto-carga"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14247,34 +14372,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14297,9 +14394,9 @@ msgid "Unmet dependency !"
 msgstr "¡Dependencia no resuleta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14310,7 +14407,37 @@ msgid "base.module.configuration"
 msgstr "base.modulo.configuracion"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14336,7 +14463,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14381,7 +14508,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14414,11 +14541,10 @@ msgid "Bahrain"
 msgstr "Bahréin"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14434,8 +14560,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14550,7 +14674,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14562,7 +14686,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14599,7 +14722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14610,8 +14733,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -14637,11 +14760,6 @@ msgstr "Islas Vírgenes (Británicas)"
 msgid "Parameters"
 msgstr "Parámetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pierre y Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14731,7 +14849,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -14802,9 +14919,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Español (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
+"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
+"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
+"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14831,7 +14957,7 @@ msgid "Japan"
 msgstr "Japón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "¡Sólo puede renombrar una sola columna a la vez!"
@@ -14892,6 +15018,37 @@ msgstr "ir.acciones.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14916,7 +15073,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Para su informciín, esta operación puede llevar varios minutos"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14955,6 +15112,12 @@ msgstr "Ejecución"
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15009,6 +15172,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15033,6 +15203,11 @@ msgstr "Actualización del sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15049,7 +15224,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15070,15 +15245,52 @@ msgstr "Sierra Leona"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Islas Turcas y Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15114,7 +15326,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Advertencia de cambio de compañia."
@@ -15133,11 +15350,15 @@ msgstr ""
 "El próximo número de esta secuencia será incrementado por este número"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15173,11 +15394,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Envío"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15205,7 +15421,7 @@ msgid "Workflow Instances"
 msgstr "Instancias del flujo"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Empresas: "
@@ -15216,7 +15432,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15282,7 +15498,6 @@ msgstr "Nombre exportación"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15543,6 +15758,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "asistente.ir.modelo.menu.crea.linea"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID archivo adjunto"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Dejar un 0 si la acción debe aparecer en todos los recursos."
 
@@ -15563,6 +15781,9 @@ msgstr ""
 #~ "Indique el mensaje. Puede utilizar los campos del objeto. por ej. `Estimado "
 #~ "[[object.partner_id.name]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo archivo adjunto"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Configuración del dominio"
 
@@ -15913,6 +16134,9 @@ msgstr ""
 #~ msgid "Apply For Delete"
 #~ msgstr "Aplicar para Eliminar"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid ""
 #~ "Please note that the following payments are now due. If your payment         "
 #~ "                has been sent, kindly forward your payment details. If "
@@ -16155,6 +16379,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "Número cuenta"
 
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
 #~ msgid "XML Identifier"
 #~ msgstr "Identificador XML"
 
@@ -16497,9 +16724,15 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Campos de tipo"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque el campo activo para ocultar el contacto."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Añadir un widget para usuario"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Fichero binario de URL externa"
+
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr "Su logo – Utilizar un tamaño de 450x150 píxeles aprox."
 
@@ -16761,12 +16994,18 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Nunca"
 
+#~ msgid "Delivery"
+#~ msgstr "Envío"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "Código BIC/Swift"
 
 #~ msgid "Workflow On"
 #~ msgstr "Flujo de trabajo activo"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nombre de contacto"
+
 #~ msgid "Select Action Type"
 #~ msgstr "Seleccione el tipo de acción"
 
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 83770bc7905..d73b2dc1900 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-10 17:23+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:03+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: base
@@ -43,7 +43,7 @@ msgid "DateTime"
 msgstr "FechaHora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -196,41 +196,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -241,7 +215,7 @@ msgstr ""
 "de un módulo (addon) personalizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error en la restricción (constraint)"
@@ -252,7 +226,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Cambio para nombre de campo son escasos \"%s\" no está permitido"
@@ -263,7 +237,7 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado."
@@ -342,20 +316,6 @@ msgstr "Compañía donde se guardará el registro actual."
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -363,11 +323,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre del contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -432,7 +387,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -469,6 +424,7 @@ msgstr "Reglas automatizadas de acción"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -509,7 +465,7 @@ msgstr ""
 "la lista de las directivas permitidas, mostradas cuando edita un idioma."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -567,7 +523,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -607,9 +563,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -634,26 +590,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -664,9 +600,25 @@ msgstr ""
 "por segunda vez, obtendrá el informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -743,14 +695,12 @@ msgstr ""
 "defecto (por defecto: {})."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -816,17 +766,22 @@ msgid "Model Description"
 msgstr "Descripción del modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Menú para la comercialización.\n"
+"===================\n"
+"\n"
+"Contiene el programa de instalación de módulos relacionados con el "
+"marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -856,11 +811,21 @@ msgstr "Expresión de activación"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Fecha de la próxima ejecución programada para esta acción."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -993,13 +958,9 @@ msgid "base.language.export"
 msgstr "base.idioma.exportar"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indique el nombre de campo al cual se refiere el id del registro para la "
-"operación escribir. Si está vacío se referirá al id activo del objeto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1019,7 +980,7 @@ msgid "Email Preferences"
 msgstr "Preferencias de email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1069,16 +1030,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1188,9 +1142,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1206,12 +1189,17 @@ msgstr ""
 "siguientes grupos."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1238,7 +1226,54 @@ msgid "Username"
 msgstr "Nombre de usuario"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1268,7 +1303,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "¡Ha fallado el test de conexión!"
@@ -1300,14 +1335,12 @@ msgid "South Korea"
 msgstr "Corea del Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transiciones"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "¡No se ha encontrado el registro #%d de %s, no se puede copiar!"
@@ -1445,7 +1478,7 @@ msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "¡Está prohibido cambiar el modelo de un campo!"
@@ -1467,7 +1500,7 @@ msgid "Search"
 msgstr "Búsqueda"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1487,7 +1520,14 @@ msgid "Parent Application"
 msgstr "Padres de aplicaciones"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operación cancelada"
@@ -1620,7 +1660,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "No existe un idioma con código \"%s\""
@@ -1743,7 +1797,7 @@ msgid "On Create"
 msgstr "Al crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1753,11 +1807,6 @@ msgstr ""
 "puntos! Los puntos se usan para referirse a datos de otros módulos, por "
 "ejemplo módulo.referencia_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1840,7 +1889,7 @@ msgid "East Timor"
 msgstr "Timor oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1881,11 +1930,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID archivo adjunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1903,7 +1947,7 @@ msgstr ""
 "generación automática de listas de recolección y mucho mas."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1944,6 +1988,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Permiso para leer"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2020,16 +2069,11 @@ msgid "Create Tasks on SO"
 msgstr "Crear tareas en SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo archivo adjunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2084,7 +2128,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "¡No se puede eliminar el usuario principal!"
@@ -2114,11 +2158,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -2130,7 +2174,6 @@ msgstr "Plantilla de planes contables"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de dirección"
 
@@ -2168,11 +2211,6 @@ msgstr "Ruta completa"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideas"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2310,6 +2348,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr "Método"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2343,12 +2386,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2399,6 +2447,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Añadir o no la cabecera corporativa en el informe RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2453,7 +2510,7 @@ msgstr ""
 "tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2547,7 +2604,6 @@ msgstr "Santo Tomé y Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2594,11 +2650,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2725,9 +2776,20 @@ msgid "Default limit for the list view"
 msgstr "Límite por defecto para la vista de lista."
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nueva Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2805,7 +2867,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2864,6 +2926,19 @@ msgstr "Mapeado de campos"
 msgid "Export Translations"
 msgstr "Exportar traducciones"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2872,7 +2947,7 @@ msgid "Manager"
 msgstr "Gerente"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2958,7 +3033,7 @@ msgid "Inherited"
 msgstr "Heredado"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2988,7 +3063,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3055,22 +3130,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "¡Estructura del objeto no válida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -3167,12 +3242,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3189,19 +3264,33 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Este es el módulo para gestionar la tabla de la contabilidad y los impuestos "
+"a Polonia en Open ERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"Se trata de un módulo para crear un plan de cuentas estándar y el conjunto "
+"básico de los impuestos\n"
+"IVA 0%, 7% y el 22%. En el módulo también se establece la cuenta para "
+"comprar y vender bienes, en el supuesto\n"
+"que todos los bienes son objeto de comercio al por mayor.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3209,7 +3298,7 @@ msgid "Params storage"
 msgstr "Parámetros de Almacenamiento"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No puede actualizar el módulo '% s'. No está instalado"
@@ -3260,34 +3349,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Argumentos no válidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3326,7 +3387,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3338,6 +3399,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipo de cuenta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3374,7 +3463,7 @@ msgid "Signal (subflow.*)"
 msgstr "Señal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3414,7 +3503,7 @@ msgid "Access Controls"
 msgstr "Controles de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3444,32 +3533,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Archivo icono web (inmóvil)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3489,9 +3552,13 @@ msgstr ""
 "Si utiliza un tipo fórmula, introduzca una expresión Python que incluya la "
 "variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fecha de nacimiento"
 
@@ -3507,7 +3574,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricantes de Productos"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL modo no disponible"
@@ -3625,7 +3692,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3816,7 +3883,6 @@ msgstr "Informes"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -3828,13 +3894,18 @@ msgstr ""
 "Si no se especifica actúa como valor por defecto para los nuevos recursos."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Se ha detectado recursividad."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "¡Error de recurrencia entre dependencias de módulos!"
@@ -3894,9 +3965,10 @@ msgid "Urdu / اردو"
 msgstr "Tayiko / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3907,7 +3979,7 @@ msgid "Company Name"
 msgstr "Nombre de la compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3928,15 +4000,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (obsoleto - usar Informe)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"Código de idioma de la traducción debe ser tema entre las lenguas conocidas"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Reglas de registro"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pierre y Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3965,13 +4059,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.traduccion"
 
 #. module: base
 #: view:res.lang:0
@@ -4019,19 +4109,7 @@ msgid "Paper Format"
 msgstr "Formato de Papel"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4051,7 +4129,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4102,7 +4180,7 @@ msgid "Email Gateway"
 msgstr "gateway de correo electrónico"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4123,9 +4201,43 @@ msgid "Technical Data"
 msgstr "Datos técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4181,13 +4293,18 @@ msgstr "Parte de horas para las Cuestiones"
 msgid "Ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "¡Estructura no válida!"
@@ -4203,9 +4320,9 @@ msgid "Share any Document"
 msgstr "Compartir cualquier documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupo requerido"
 
 #. module: base
 #: view:res.lang:0
@@ -4266,33 +4383,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4379,7 +4473,6 @@ msgstr "Restricción"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4454,6 +4547,11 @@ msgstr ""
 "alta prioridad se utiliza. Prioridad por defecto es 10 (número más pequeño = "
 "prioridad más alta)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4517,9 +4615,16 @@ msgid "Default value or action reference"
 msgstr "Valor por defecto o acción de referencia"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4599,6 +4704,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4625,6 +4746,43 @@ msgstr ""
 "campo está vacío, OpenERP otorgará la visibilidad basándose en los permisos "
 "de lectura de los objetos asociados."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4654,6 +4812,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4731,12 +4895,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.acciones.informe.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4751,7 +4909,6 @@ msgstr "Suiza - Contabilidad"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -4762,13 +4919,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Marcar como Para ejecutar"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4814,6 +4976,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -4829,7 +4993,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4927,7 +5091,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -5015,7 +5184,7 @@ msgid "System Configuration Done"
 msgstr "Configuración del sistema realizada"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ha ocurrido un error mientras se validaban los campo(s) %s: %s"
@@ -5144,6 +5313,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr "Acceso completo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5157,7 +5331,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5169,7 +5343,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Sólo si esta cuenta bancaria pertenece a su empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5201,6 +5375,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5366,7 +5551,7 @@ msgid "Account Owner Name"
 msgstr "Nombre de la cuenta del propietario"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5383,16 +5568,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimales"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5439,9 +5619,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5504,15 +5685,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5528,6 +5700,11 @@ msgstr "Inicie el Asistente para configuración"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nombre del documento adjunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5611,6 +5788,12 @@ msgstr "Kazajstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Día de la semana [0(domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5865,7 +6048,7 @@ msgid "title"
 msgstr "título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5922,6 +6105,15 @@ msgstr "Productos"
 msgid "User-defined Defaults"
 msgstr "Definidos por el usuario por defecto"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6039,13 +6231,15 @@ msgid "Bank Type"
 msgstr "Tipo de banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -6065,7 +6259,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6100,10 +6294,9 @@ msgid "Uncategorized"
 msgstr "Sin categoría"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nombre del recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6139,6 +6332,11 @@ msgstr ""
 "formulario de cliente, la señal comprueba el nombre del botón pulsado. Si la "
 "señal es NULL, ningún botón es necesario para validar esta transición."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6149,7 +6347,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6165,26 +6363,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mis Bancos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6317,11 +6495,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6333,8 +6506,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6446,7 +6619,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
@@ -6486,7 +6659,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6513,9 +6686,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Marcar como Para ejecutar"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6547,6 +6748,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Año actual sin centuria: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6602,7 +6810,7 @@ msgid "Audit Trail"
 msgstr "Auditoría"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6694,7 +6902,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6714,30 +6922,6 @@ msgstr "A veces se denomina BIC o Swift."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Este es el módulo para gestionar el gráfico que representa a México en "
-"OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Gráfico de la contabilidad mexicana y la localización.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6770,10 +6954,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -6847,9 +7031,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6873,8 +7057,8 @@ msgid "Partner Titles"
 msgstr "Títulos de empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6922,7 +7106,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6932,11 +7116,6 @@ msgstr ""
 "permitida para este objeto ya que este objeto tiene como finalidad la "
 "generación de informes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7046,6 +7225,13 @@ msgstr "¡Archivo de módulo importado con éxito!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7143,7 +7329,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Provincia"
@@ -7244,12 +7429,6 @@ msgstr "Nombre completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7293,6 +7472,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7350,7 +7530,7 @@ msgid "Connection Security"
 msgstr "Seguridad de la Conexión"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "¡ Por favor, indique una acción a ejecutar !"
@@ -7370,6 +7550,11 @@ msgstr "Nombre de categoría"
 msgid "Northern Mariana Islands"
 msgstr "Islas Marianas del Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7381,7 +7566,7 @@ msgid "Intrastat Reporting"
 msgstr "Informe de Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7390,6 +7575,11 @@ msgstr ""
 "Utilice el asistente de cambio de contraseña (en Preferencias de usuario o "
 "menú Usuario) para cambiar su propia contraseña."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7420,7 +7610,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "¡Insuficientes campos para la vista calendario!"
@@ -7468,7 +7658,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7488,30 +7677,30 @@ msgid "Child Categories"
 msgstr "Categorías hijas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7599,6 +7788,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Esta ventana"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7684,6 +7878,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Empleados"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7713,11 +7922,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Probar Conexión"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Direcciones"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7742,7 +7946,6 @@ msgstr "Opciones de selección"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Calle"
@@ -7753,9 +7956,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Padre derecho"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7836,7 +8054,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar mis preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
@@ -7931,22 +8149,17 @@ msgid "US Letter"
 msgstr "Carta de EE.UU."
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menú para la comercialización.\n"
-"===================\n"
-"\n"
-"Contiene el programa de instalación de módulos relacionados con el "
-"marketing.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7954,7 +8167,7 @@ msgid "Company Bank Accounts"
 msgstr "Cuentas de la empresa del Banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7966,13 +8179,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Opcional de contraseña para la autenticación SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7994,12 +8207,13 @@ msgid "Normal Bank Account"
 msgstr "Cuenta bancaria normal"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8178,7 +8392,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8211,14 +8425,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.actualizar.tranducciones"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8242,7 +8448,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8362,7 +8567,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "¡Para campos selection debe indicar las opciones de selección!"
@@ -8684,7 +8889,7 @@ msgid "Update Modules List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8698,7 +8903,7 @@ msgid "eInvoicing"
 msgstr "Facturación Electrónica"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8712,7 +8917,7 @@ msgstr ""
 "(ahora puede hacer clic en Cancelar en las preferencias del usuario)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "El valor \"%s\" para el campo \"%s.%s\" no está en la selección"
@@ -8727,6 +8932,17 @@ msgstr "Siguiente"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandés / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8774,7 +8990,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8796,15 +9012,16 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Falta de servidor SMTP"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nombre del documento adjunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"Código de idioma de la traducción debe ser tema entre las lenguas conocidas"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8828,7 +9045,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8840,7 +9057,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveedor"
@@ -8918,7 +9134,7 @@ msgid "Selectable"
 msgstr "Seleccionable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Todo parece bien configurado!"
@@ -8946,8 +9162,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Error de usuario"
@@ -8971,7 +9187,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9126,7 +9342,7 @@ msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9167,8 +9383,8 @@ msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ErrorAcceso"
@@ -9242,7 +9458,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9259,7 +9475,7 @@ msgid "Ukraine"
 msgstr "Ucrania"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9322,6 +9538,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenco (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9420,9 +9641,9 @@ msgid "Custom Shortcuts"
 msgstr "Accesos rápidos personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9450,13 +9671,13 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "El registro no se puede modificar en este momento"
@@ -9477,7 +9698,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9525,7 +9746,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "¡No existe el módulo %s!"
@@ -9571,6 +9792,7 @@ msgstr "Estados Unidos - Plan de cuentas"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9579,7 +9801,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9598,6 +9820,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9633,7 +9892,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9685,6 +9944,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (reloj 12-horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9733,23 +9997,11 @@ msgid "The currency code must be unique per company!"
 msgstr "¡El código de moneda debe ser único por compañía!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9796,7 +10048,7 @@ msgid "Products Expiry Date"
 msgstr "Fecha de Expiración de productos"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Haga clic en 'Continuar' para configurar el siguiente módulo..."
@@ -9894,6 +10146,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10102,7 +10359,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campaña de marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10113,13 +10370,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidad de intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Clase"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método ya no existe"
@@ -10295,7 +10557,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10335,6 +10597,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10361,6 +10628,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL del icono"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10452,7 +10724,6 @@ msgstr "%m - Número mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciudad"
@@ -10488,13 +10759,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonio / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indique el nombre de campo al cual se refiere el id del registro para la "
+"operación escribir. Si está vacío se referirá al id activo del objeto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versió posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10556,19 +10836,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.traduccion"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10582,6 +10887,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10600,7 +10907,12 @@ msgid "Parent Company"
 msgstr "Compañía matriz"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Authentification"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10612,13 +10924,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10716,6 +11021,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10790,6 +11115,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipo de secuencias"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10856,9 +11186,9 @@ msgid ""
 msgstr "No puede eliminar el idioma que está actualmente activo!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10876,8 +11206,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "¡Problema en configuración `Id registro` en la acción del servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -10918,13 +11248,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10935,7 +11264,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10979,36 +11313,6 @@ msgstr ""
 "  - Uid: Identificación del usuario actual\n"
 "  - El contexto: el contexto actual"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11030,6 +11334,11 @@ msgstr "Otro propietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "flujo"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11047,21 +11356,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "¡No puede eliminar el idioma que es el idioma predeterminado de un usuario!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11078,9 +11372,9 @@ msgid "Cascade"
 msgstr "En cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupo requerido"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11107,11 +11401,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11137,7 +11426,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11153,12 +11442,12 @@ msgid "State Name"
 msgstr "Nombre provincia"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11179,30 +11468,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11223,7 +11492,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11276,7 +11545,6 @@ msgstr "Validación de Dobles en compras"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Calle2"
 
@@ -11300,6 +11568,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11394,19 +11663,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de integridad"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "flujo"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
@@ -11448,22 +11726,6 @@ msgstr "Directorio de empleados"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11596,7 +11858,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11686,7 +11947,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11736,9 +11997,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11843,7 +12104,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "La entrega de correo falló"
@@ -11870,7 +12131,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11959,7 +12220,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11974,7 +12235,7 @@ msgid "User Ref."
 msgstr "Ref. usuario"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -12019,8 +12280,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12028,7 +12287,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12059,12 +12318,6 @@ msgstr "Islas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12174,9 +12427,11 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL del icono"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12212,7 +12467,7 @@ msgid "Action Type"
 msgstr "Tipo de acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12350,11 +12605,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque el campo activo para ocultar el contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12371,7 +12621,7 @@ msgid "workflow.instance"
 msgstr "workflow.instancia"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo desconocido %s en %s "
@@ -12394,7 +12644,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "¡Método get (obtener) no definido!"
@@ -12435,16 +12685,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Cálculo de nóminas"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Archivo binario o URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12491,92 +12741,57 @@ msgid "Address Format"
 msgstr "Formato de la dirección"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
-"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
-"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
-"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.valores"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Características técnicas"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitano (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12763,6 +12978,11 @@ msgstr ""
 "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
 "las órdenes de entrega, recepciones, ..."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.valores"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12779,7 +12999,7 @@ msgid "Body"
 msgstr "Contenido"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Prueba de conexión se realizó correctamente!"
@@ -12830,7 +13050,7 @@ msgid "choose"
 msgstr "selección"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13010,10 +13230,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13052,12 +13276,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13073,7 +13298,6 @@ msgstr "Registro  de Compañía"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Varios"
@@ -13095,35 +13319,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Este es el módulo para gestionar la tabla de la contabilidad y los impuestos "
-"a Polonia en Open ERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"Se trata de un módulo para crear un plan de cuentas estándar y el conjunto "
-"básico de los impuestos\n"
-"IVA 0%, 7% y el 22%. En el módulo también se establece la cuenta para "
-"comprar y vender bienes, en el supuesto\n"
-"que todos los bienes son objeto de comercio al por mayor.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13199,25 +13394,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13245,6 +13424,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13281,6 +13480,7 @@ msgstr "Eslovaco / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconocido"
@@ -13348,6 +13548,11 @@ msgstr "Libreta de direcciones"
 msgid "ir.sequence.type"
 msgstr "ir.secuencia.tipo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13437,6 +13642,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13449,7 +13655,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13480,16 +13686,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Padre derecho"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13555,6 +13765,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "El campo osv_memory solo puede ser comparado con los operadores = y !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13627,29 +13842,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identificador externo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13697,7 +13889,7 @@ msgid "Delivery Costs"
 msgstr "Costes de envío"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13748,9 +13940,9 @@ msgstr ""
 "Desactiva el gráfico de un mínimo de cuentas.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "BD Cifrado de la clave"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Reglas de registro"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13998,9 +14190,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14027,63 +14224,14 @@ msgid "System Configuration done"
 msgstr "Configuración del sistema realizada."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14124,17 +14272,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14172,7 +14309,7 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Error ! No puede crear menús recursivos"
@@ -14254,11 +14391,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -14273,6 +14409,11 @@ msgstr "Acceso a menús"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14293,6 +14434,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumano / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14331,41 +14496,6 @@ msgstr "Objeto relación"
 msgid "eInvoicing & Payments"
 msgstr "facturación electrónica y pagos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14426,40 +14556,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14560,6 +14658,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Vista auto-carga"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14602,34 +14715,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14652,9 +14737,9 @@ msgid "Unmet dependency !"
 msgstr "¡Dependencia no resuelta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14665,7 +14750,37 @@ msgid "base.module.configuration"
 msgstr "base.modulo.configuracion"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14691,7 +14806,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14736,7 +14851,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14769,11 +14884,10 @@ msgid "Bahrain"
 msgstr "Bahréin"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14789,8 +14903,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14905,7 +15017,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "La serialización de campo `%s 'no existe por el campo%s escasa`'!"
@@ -14917,7 +15029,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Índice de colores"
 
@@ -14954,7 +15065,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14965,8 +15076,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -14992,11 +15103,6 @@ msgstr "Islas Vírgenes (Británicas)"
 msgid "Parameters"
 msgstr "Parámetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pierre y Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15089,7 +15195,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -15160,9 +15265,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Español (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
+"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
+"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
+"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15189,7 +15303,7 @@ msgid "Japan"
 msgstr "Japón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "¡Sólo puede renombrar una columna a la vez!"
@@ -15250,6 +15364,37 @@ msgstr "ir.acciones.server"
 msgid "Canada - Accounting"
 msgstr "Canada - Contabilidad"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15274,7 +15419,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Para su información, esta operación puede llevar varios minutos"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15313,6 +15458,12 @@ msgstr "Ejecución"
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15367,6 +15518,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15391,6 +15549,11 @@ msgstr "Actualización del sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15407,7 +15570,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15428,15 +15591,52 @@ msgstr "Sierra Leona"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Islas Turcas y Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15472,7 +15672,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Advertencia de cambio de compañia."
@@ -15493,11 +15698,15 @@ msgstr ""
 "El número siguiente de esta secuencia será incrementado por este número."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15535,11 +15744,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Envío"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15567,7 +15771,7 @@ msgid "Workflow Instances"
 msgstr "Instancias del flujo"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Empresas: "
@@ -15578,7 +15782,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15644,7 +15848,6 @@ msgstr "Nombre exportación"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15773,6 +15976,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "En múltiples doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Nombre del contacto"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -16240,6 +16446,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "asistente.ir.modelo.menu.crea.linea"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID archivo adjunto"
+
 #~ msgid ""
 #~ "\n"
 #~ "VAT validation for Partners' VAT numbers\n"
@@ -16360,6 +16569,9 @@ msgstr ""
 #~ msgid "General Information Footer"
 #~ msgstr "Pie de página de la Información General"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo archivo adjunto"
+
 #~ msgid "References"
 #~ msgstr "Referencias"
 
@@ -16661,6 +16873,9 @@ msgstr ""
 #~ msgid "Apply For Delete"
 #~ msgstr "Aplicar para eliminar"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid "Plugins"
 #~ msgstr "Plugins"
 
@@ -16833,6 +17048,9 @@ msgstr ""
 #~ msgid "Latest version"
 #~ msgstr "Última versión"
 
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
 #~ msgid "SMS Message"
 #~ msgstr "Mensaje de SMS"
 
@@ -17074,9 +17292,15 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Campos de tipo"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque el campo activo para ocultar el contacto."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Añadir un widget para usuario"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Archivo binario o URL externa"
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "República Democrática del Congo"
 
@@ -17273,6 +17497,9 @@ msgstr ""
 #~ msgid "Search Widget"
 #~ msgstr "Buscar widget"
 
+#~ msgid "Delivery"
+#~ msgstr "Envío"
+
 #~ msgid "Homepage Widgets"
 #~ msgstr "Widgets página inicial"
 
@@ -19170,6 +19397,22 @@ msgstr ""
 #~ "Por favor, compruebe que todas sus líneas tienen %d columns.Stopped torno a "
 #~ "la línea %d tiene%d columnas."
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este es el módulo para gestionar el gráfico que representa a México en "
+#~ "OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Gráfico de la contabilidad mexicana y la localización.\n"
+#~ "    "
+
 #~ msgid "Issues Tracker"
 #~ msgstr "Seguimiento de problemas"
 
@@ -21689,6 +21932,19 @@ msgstr ""
 #~ "            \"Contacts\", \"Employees\", Meetings, Phonecalls, Emails, and "
 #~ "Project, Project Tasks Data into OpenERP Module."
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
 #~ msgid "Retro-Planning on Events"
 #~ msgstr "Retro-Planificación de Eventos"
 
@@ -22869,6 +23125,9 @@ msgstr ""
 #~ "\n"
 #~ "Se utiliza, por ejemplo, en las industrias alimentarias."
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "BD Cifrado de la clave"
+
 #~ msgid ""
 #~ "\n"
 #~ "        OpenERP Web process view.\n"
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index e24379a3711..c690c120d34 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 20:53+0000\n"
 "Last-Translator: Carlos Matos Villar <carlosmvillar19@hotmail.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:09+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -46,7 +46,7 @@ msgid "DateTime"
 msgstr "Fecha Hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -215,41 +215,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Advertencia!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -260,7 +234,7 @@ msgstr ""
 "de un módulo (addon) personalizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error en la restricción (constraint)"
@@ -271,7 +245,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "No está permitido renombrar el campo \"%s\""
@@ -282,7 +256,7 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado."
@@ -361,20 +335,6 @@ msgstr "Compañía donde se guardará el registro actual."
 msgid "Max. Size"
 msgstr "Tamaño máximo."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -382,11 +342,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre de contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -458,7 +413,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -495,6 +450,7 @@ msgstr "Reglas de acción automáticas"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -535,7 +491,7 @@ msgstr ""
 "la lista de las directivas permitidas, mostradas cuando edita un idioma."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -589,7 +545,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -629,9 +585,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -656,26 +612,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -686,9 +622,41 @@ msgstr ""
 "por segunda vez, obtendrá el informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+"\n"
+"Este modulo les permite producir varios productos desde una orden de "
+"producción.\n"
+"============================================================================="
+"==\n"
+"\n"
+"usted puede configurar por productos en la lista de materiales.\n"
+"\n"
+"Sin este modulo:\n"
+"---------------\n"
+"     A + B + C -> D\n"
+"\n"
+"Con este modulo:\n"
+"---------------\n"
+"     A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -765,14 +733,12 @@ msgstr ""
 "defecto (por defecto: {})."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -838,17 +804,21 @@ msgid "Model Description"
 msgstr "Descripción del modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Menú para Marketing.\n"
+"===================\n"
+"\n"
+"Contiene el instalador para los módulos relacionados con marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -883,11 +853,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Fecha de la próxima ejecución programada para esta acción."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1023,11 +1003,9 @@ msgid "base.language.export"
 msgstr "base.idioma.exportar"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1047,7 +1025,7 @@ msgid "Email Preferences"
 msgstr "Preferencias de email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' no parece tener una fecha valida para el campo '%%(field)s'"
@@ -1097,23 +1075,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
-"\n"
-"Esta es el modulo base para administrar la cuenta gráfica para Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    *El KLUWER Plan de Cuentas\n"
-"    *Plan de código de impuestos para Luxembourg\n"
-"    *Impuestos principales usados en Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1223,9 +1187,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1241,12 +1234,17 @@ msgstr ""
 "siguientes grupos."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modelo del documento"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1273,7 +1271,54 @@ msgid "Username"
 msgstr "Nombre de usuario"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1303,7 +1348,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Ha fallado la prueba de conexión!"
@@ -1335,14 +1380,12 @@ msgid "South Korea"
 msgstr "Corea del Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transiciones"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "¡No se ha encontrado el registro #%d de %s, no se puede copiar!"
@@ -1484,7 +1527,7 @@ msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "¡Está prohibido cambiar el modelo de un campo!"
@@ -1506,7 +1549,7 @@ msgid "Search"
 msgstr "Buscar"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1526,7 +1569,14 @@ msgid "Parent Application"
 msgstr "Aplicación padre"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operación cancelada"
@@ -1701,7 +1751,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "No existe un idioma con código \"%s\""
@@ -1824,7 +1888,7 @@ msgid "On Create"
 msgstr "Al crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1834,11 +1898,6 @@ msgstr ""
 "puntos! Los puntos se usan para referirse a datos de otros módulos, por "
 "ejemplo módulo.referencia_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Cotizaciones, Ordenes de Venta, Facturación"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1925,7 +1984,7 @@ msgid "East Timor"
 msgstr "Timor oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1981,11 +2040,6 @@ msgstr ""
 "Asigna derechos de acceso al administrador y usuario hacía el Administrador "
 "y solo derechos de usuarios  al usuario Demo. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID archivo adjunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2003,7 +2057,7 @@ msgstr ""
 "automática de albaranes y más."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2045,6 +2099,11 @@ msgstr "Vehiculo, Arquiler, Seguros, Costos"
 msgid "Read Access"
 msgstr "Permisos de lectura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2123,16 +2182,11 @@ msgid "Create Tasks on SO"
 msgstr "Crear tareas en SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Esta columna contiene modulos de datos y no puede ser eliminada!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo archivo adjunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2197,7 +2251,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "¡No se puede eliminar el usuario principal!"
@@ -2229,11 +2283,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copiar)"
@@ -2245,7 +2299,6 @@ msgstr "Plantilla de planes contables"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de dirección"
 
@@ -2304,11 +2357,6 @@ msgstr "Ruta completa"
 msgid "The next step depends on the file format:"
 msgstr "El proximo paso depende de el formato de archivo:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideas"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2448,6 +2496,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr "Método"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2506,7 +2559,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2514,6 +2567,11 @@ msgstr ""
 "No se encuentran coincidencias de registros para %(field_type)s '%(value)s' "
 "in field '%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2564,6 +2622,15 @@ msgstr "Bélice"
 msgid "Add or not the corporate RML header"
 msgstr "Añadir o no la cabecera corporativa en el informe RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2618,7 +2685,7 @@ msgstr ""
 "tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2715,7 +2782,6 @@ msgstr "Santo Tomé y Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2799,11 +2865,6 @@ msgstr ""
 "    *Fecha\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Slogan de la Compañía"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2932,9 +2993,20 @@ msgid "Default limit for the list view"
 msgstr "Límite por defecto para la vista de lista."
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nueva Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3051,7 +3123,7 @@ msgstr ""
 "=========================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -3118,6 +3190,19 @@ msgstr "Mapeado de campos"
 msgid "Export Translations"
 msgstr "Exportar traducciones"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3126,7 +3211,7 @@ msgid "Manager"
 msgstr "Responsable"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Lo sentimos, usted no tiene permitido acceder a este documento."
@@ -3237,7 +3322,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "Sí"
@@ -3267,7 +3352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' No parece haber un entero para el campo '%%(field)s'"
@@ -3362,22 +3447,22 @@ msgid "LinkedIn Integration"
 msgstr "Integración LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "¡Estructura del objeto no válida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -3476,12 +3561,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3500,28 +3585,26 @@ msgstr ""
 "reportes estáticos."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 "\n"
-"Habilita accesos directos en el cliente web.\n"
-"=========================================\n"
-"\n"
-"Agregar un icono de acceso directo en la bandeja del sistema en orden de "
-"acceder a los accesos directos del usuario (Si los hay).\n"
-"\n"
-"Agregar un icono de acceso directo detrás del titulo de vistas en orden a "
-"agregar/eliminar un acceso directo.\n"
+"Éste es el módulo para administrar el plan de cuentas e impuestos en OpenERP "
+"para Polonia.\n"
+"============================================================================="
+"=====\n"
 "    "
 
 #. module: base
@@ -3530,7 +3613,7 @@ msgid "Params storage"
 msgstr "Almacenamiento de parámetros"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No puede actualizar el módulo '% s'. No está instalado"
@@ -3581,34 +3664,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Argumentos no válidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3647,7 +3702,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Documentos Perdidos"
@@ -3659,6 +3714,34 @@ msgstr "Documentos Perdidos"
 msgid "Bank Account Type"
 msgstr "Tipo de cuenta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3695,7 +3778,7 @@ msgid "Signal (subflow.*)"
 msgstr "Señal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3735,7 +3818,7 @@ msgid "Access Controls"
 msgstr "Controles de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3765,54 +3848,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Archivo icono web (flotar)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-"\n"
-"Este es un documento completo de gestión de sistemas.\n"
-"====================================================\n"
-"\n"
-"     *Autenticación de Usuarios\n"
-"     *Indexación de Documentos:- .pptx y .docx archivos no soportados en la "
-"plataforma de Windows.\n"
-"     *Tablero para Documentos que incluidos:\n"
-"        *Nuevos Archivos (Lista)\n"
-"        *Archivos por tipos de Recursos (Gráficos)\n"
-"        *Archivos por Socios (Gráficos)\n"
-"        *Tamaño de Archivos por Mes (Gráficos)\n"
-"\n"
-"Atención:\n"
-"-------\n"
-"    - Cuando usted instala este modulo en una compañía en curso que tiene "
-"archivos PDF \n"
-"      previamente almacenados dentro de una base de datos, usted perderá "
-"todo.\n"
-"    - Después de la instalación de este Modulo los PDF ya no se almacenan "
-"dentro la Base de Datos,\n"
-"      pero en la raíz del servidor como /server/bin/filestore.\n"
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3832,9 +3867,13 @@ msgstr ""
 "Si utiliza un tipo fórmula, introduzca una expresión Python que incluya la "
 "variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fecha de nacimiento"
 
@@ -3850,7 +3889,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricantes de los productos"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Modo SMTP sobre SSL no disponible"
@@ -3968,7 +4007,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4199,7 +4238,6 @@ msgstr "Informes"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -4211,13 +4249,18 @@ msgstr ""
 "Si no se especifica actúa como valor por defecto para los nuevos recursos."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Se ha detectado recursividad."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "¡Error de recurrencia entre dependencias de módulos!"
@@ -4277,9 +4320,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Acceso denegado"
@@ -4290,7 +4334,7 @@ msgid "Company Name"
 msgstr "Nombre de la compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4311,16 +4355,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (obsoleto - usar Informe)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"El código de idioma del elemento de traducción debe estar dentro de los "
-"lenguajes conocidos"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Reglas de registro"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pierre y Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4361,17 +4426,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Permite el acceso anónimo a OpenERP.\n"
-"====================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4419,26 +4476,7 @@ msgid "Paper Format"
 msgstr "Formato de papel"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-"\n"
-"Este modulo actualiza memos dentro de OpenERP para usar un pad externo\n"
-"===================================================================\n"
-"\n"
-"Se usa para actualizar sus memos de texto en tiempo real con los siguientes "
-"usuarios que usted invite.\n"
-"\n"
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4458,7 +4496,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "Reg"
@@ -4507,7 +4545,7 @@ msgid "Email Gateway"
 msgstr "Pasarela de e-mail"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4528,9 +4566,43 @@ msgid "Technical Data"
 msgstr "Datos técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4606,13 +4678,18 @@ msgstr "Parte de horas para las incidencias"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "¡Estructura no válida!"
@@ -4628,9 +4705,9 @@ msgid "Share any Document"
 msgstr "Compartir cualquier documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Conduce, Oportunidades, Llamadas Teléfono"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupo requerido"
 
 #. module: base
 #: view:res.lang:0
@@ -4691,58 +4768,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
-"\n"
-"Rápido y Fácil proceso de ventas.\n"
-"=================================\n"
-"\n"
-"Este modulo les permite gestionar sus tiendas de ventas muy fácilmente con "
-"una completa interfaz táctil web.\n"
-"Esto es compatible con todas las Tabletas y las iPad's ofreciendo múltiples "
-"métodos de pago. \n"
-"\n"
-"La selección de productos puede ser hecha en varias formas: \n"
-"\n"
-"*Usando un lector de código de barra\n"
-"*Navegando a través de las categorías de productos o vía una búsqueda de "
-"texto.\n"
-"\n"
-"Características Principales\n"
-"------------------\n"
-"*Rápida codificación de las ventas\n"
-"*Elija un método (la vía rápida) o dividir el pago entre varios métodos de "
-"pago\n"
-"*Calculo de la cantidad de dinero a regresar\n"
-"*Crear y confirmar la lista de recolección automática\n"
-"*Le Permite al usuario crear una factura automática\n"
-"*Reembolso de ventas anteriores\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4828,7 +4857,6 @@ msgstr "Restricción"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4921,6 +4949,11 @@ msgstr ""
 "usa el de mayor prioridad. La prioridad por defecto es 10 (número más "
 "pequeño = más prioridad)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4984,9 +5017,16 @@ msgid "Default value or action reference"
 msgstr "Valor por defecto o referencia de acción"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -5086,6 +5126,22 @@ msgstr "Cargar una Traducción"
 msgid "Installed Version"
 msgstr "Versión instalada"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -5112,6 +5168,43 @@ msgstr ""
 "campo está vacío, OpenERP otorgará la visibilidad basándose en los permisos "
 "de lectura de los objetos asociados."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -5141,6 +5234,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "no"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -5269,12 +5368,6 @@ msgstr ""
 "Bancos en OpenERP: La primera con el tipo 'RIB', la segunda con el tipo "
 "'IBAN'. \n"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -5289,7 +5382,6 @@ msgstr "Suiza - Contabilidad"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -5300,13 +5392,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5352,6 +5449,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -5367,7 +5466,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5483,7 +5582,12 @@ msgid "Google Docs integration"
 msgstr "Documentos Integrados de Google"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "nombre"
@@ -5571,7 +5675,7 @@ msgid "System Configuration Done"
 msgstr "Configuración del sistema realizada"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ha ocurrido un error mientras se validaban los campo(s) %s: %s"
@@ -5700,6 +5804,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr "Acceso completo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5713,7 +5822,7 @@ msgid "Portuguese / Português"
 msgstr "Portugues / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5725,7 +5834,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Sólo si esta cuenta bancaria pertenece a su compañía"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "Sub-campo '%s' Desconocido"
@@ -5757,6 +5866,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5925,7 +6045,7 @@ msgid "Account Owner Name"
 msgstr "Nombre del propietario de la cuenta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5942,16 +6062,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimales"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Falta valor requerido para el campo '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5998,9 +6113,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "Modelo opcional, mayormente usado para acciones necesarias."
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -6071,19 +6187,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"Permite a los usuarios iniciar sesión.\n"
-"===============================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -6099,6 +6202,11 @@ msgstr "Iniciar asistente de configuración"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Ordenes de Producción, Lista de Materiales, Rutas"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nombre del adjunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -6182,6 +6290,12 @@ msgstr "Kazajstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Día de la semana [0(domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6453,7 +6567,7 @@ msgid "title"
 msgstr "título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "verdadero"
@@ -6510,6 +6624,15 @@ msgstr "Productos"
 msgid "User-defined Defaults"
 msgstr "Predeterminados definidos por el usuario"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6648,13 +6771,15 @@ msgid "Bank Type"
 msgstr "Tipo de banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -6674,7 +6799,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6709,10 +6834,9 @@ msgid "Uncategorized"
 msgstr "Sin categoría"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nombre del recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6748,6 +6872,11 @@ msgstr ""
 "formulario de cliente, la señal comprueba el nombre del botón pulsado. Si la "
 "señal es NULL, ningún botón es necesario para validar esta transición."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6762,7 +6891,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' no parece haber un número para el campo '%%(field)s'"
@@ -6779,41 +6908,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Bancos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-"\n"
-"Gestiona las posiciones de trabajo y los procesos de reclutamiento\n"
-"========================================================\n"
-"\n"
-"Esta aplicación permite fácilmente mantener el rastreo de sus trabajos, "
-"vacantes, aplicaciones, entrevistas...\n"
-"\n"
-"Se integra con la pasarela de correo para recuperar automáticamente el "
-"correo electrónico enviado a <jobs@yourcompany.com> en la lista de "
-"aplicaciones. También integrada con el administrador de documentos del "
-"sistema para almacenar y buscar en la base de CV y buscar los candidatos  "
-"que usted esta buscando. Similarmente, esta integrado con el modulo de "
-"encuestas que te permite definir entrevistas para diferentes trabajos.\n"
-"Usted puede definir las diferentes fases de entrevistas y rango de "
-"aplicaciones de la vista kanban.\n"
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6946,11 +7040,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Restablecer contraseña"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6962,8 +7051,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "El incremento de números debe ser cero."
@@ -7121,7 +7210,7 @@ msgstr ""
 "a un empleado del sistema."
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
@@ -7161,7 +7250,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -7188,8 +7277,36 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -7222,6 +7339,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Año actual sin centuria: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Parámetros del sistema"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -7274,7 +7398,7 @@ msgid "Audit Trail"
 msgstr "Rastro de auditoría"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr "Valor '%s' no encontrado en campo seleccionado '%%(field)s'"
@@ -7366,7 +7490,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "No se puede configurar la configuración!"
@@ -7386,29 +7510,6 @@ msgstr "Algunas veces llamado BIC o Swift"
 msgid "Indian - Accounting"
 msgstr "Contabilidad - India"
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Módulo para gestionar el plan de cuentas para México en OpenERP\n"
-"=====================================================\n"
-"\n"
-"Plan de cuentas y localización mexicanos.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -7441,10 +7542,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -7524,9 +7625,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7550,8 +7651,8 @@ msgid "Partner Titles"
 msgstr "Títulos de empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Use el formato '%s'"
@@ -7599,7 +7700,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7609,11 +7710,6 @@ msgstr ""
 "permitida para este objeto ya que este objeto tiene como finalidad la "
 "generación de informes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anónimo"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7723,6 +7819,13 @@ msgstr "¡Archivo de módulo importado con éxito!"
 msgid "Model Constraints"
 msgstr "Modelo de Restrinciones"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7834,7 +7937,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Estado Federal"
@@ -7935,12 +8037,6 @@ msgstr "Nombre completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7984,6 +8080,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -8041,7 +8138,7 @@ msgid "Connection Security"
 msgstr "Seguridad de la conexión"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "¡ Por favor, indique una acción a ejecutar !"
@@ -8061,6 +8158,11 @@ msgstr "Nombre de categoría"
 msgid "Northern Mariana Islands"
 msgstr "Islas Marianas del Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -8072,7 +8174,7 @@ msgid "Intrastat Reporting"
 msgstr "Informe Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -8081,6 +8183,11 @@ msgstr ""
 "Utilice el asistente de cambio de contraseña (en Preferencias de usuario o "
 "menú Usuario) para cambiar su propia contraseña."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -8111,7 +8218,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "¡Insuficientes campos para la vista calendario!"
@@ -8159,7 +8266,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -8179,30 +8285,30 @@ msgid "Child Categories"
 msgstr "Categorías hijas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -8290,6 +8396,11 @@ msgstr "Definición de Regla (Filtro de Dominio)"
 msgid "This Window"
 msgstr "Esta ventana"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -8376,6 +8487,31 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Empleados"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+"\n"
+"Habilita accesos directos en el cliente web.\n"
+"=========================================\n"
+"\n"
+"Agregar un icono de acceso directo en la bandeja del sistema en orden de "
+"acceder a los accesos directos del usuario (Si los hay).\n"
+"\n"
+"Agregar un icono de acceso directo detrás del titulo de vistas en orden a "
+"agregar/eliminar un acceso directo.\n"
+"    "
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -8409,11 +8545,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Probar conexión"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Direcciones"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -8438,7 +8569,6 @@ msgstr "Opciones de selección"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Calle"
@@ -8449,9 +8579,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Padre derecho"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8532,7 +8677,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar mis preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
@@ -8627,21 +8772,17 @@ msgid "US Letter"
 msgstr "Carta de EEUU"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menú para Marketing.\n"
-"===================\n"
-"\n"
-"Contiene el instalador para los módulos relacionados con marketing.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8649,7 +8790,7 @@ msgid "Company Bank Accounts"
 msgstr "Cuentas bancarias de la compañía"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -8661,13 +8802,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Contraseña opcional para la autenticación SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Lo sentimos, usted no tiene permitido modificar este documento."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8689,12 +8830,13 @@ msgid "Normal Bank Account"
 msgstr "Cuenta bancaria habitual"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "ID de la Base de Datos"
@@ -8877,7 +9019,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Trabajos, Reclutamiento, Aplicaciones, Entrevistas de Trabajo"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8910,14 +9052,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.actualizar.tranducciones"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Advertencia!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8941,7 +9075,6 @@ msgstr "Atajos Web"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -9064,7 +9197,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "¡Para campos selection debe indicar las opciones de selección!"
@@ -9429,7 +9562,7 @@ msgid "Update Modules List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -9443,7 +9576,7 @@ msgid "eInvoicing"
 msgstr "Facturación electrónica"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -9457,7 +9590,7 @@ msgstr ""
 "(ahora puede hacer clic en Cancelar en las preferencias del usuario)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "El valor \"%s\" para el campo \"%s.%s\" no está en la selección"
@@ -9472,6 +9605,17 @@ msgstr "Siguiente"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandés / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -9515,7 +9659,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -9543,15 +9687,17 @@ msgstr ""
 "archivos son automáticamente eliminados desde la base de datos o no)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Servidor SMTP ausente"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nombre del adjunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"El código de idioma del elemento de traducción debe estar dentro de los "
+"lenguajes conocidos"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9575,7 +9721,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Lo sentimos, usted no tiene permitod eliminar este documento."
@@ -9587,7 +9733,6 @@ msgstr "Las reglas no pueden ser aplicadas en el archivo modelo de reglas."
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveedor"
@@ -9683,7 +9828,7 @@ msgid "Selectable"
 msgstr "Seleccionable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "¡Todo parece correctamente configurado!"
@@ -9711,8 +9856,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Error de usuario"
@@ -9736,7 +9881,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9891,7 +10036,7 @@ msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9932,8 +10077,8 @@ msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Error de acceso"
@@ -10007,7 +10152,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -10024,7 +10169,7 @@ msgid "Ukraine"
 msgstr "Ucrania"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -10087,6 +10232,11 @@ msgstr "Etapas"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenco (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -10191,9 +10341,9 @@ msgid "Custom Shortcuts"
 msgstr "Accesos rápidos personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -10230,13 +10380,13 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "El modulo 'base' no puede ser instalado"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "El registro no puede ser modificado en este momento"
@@ -10257,7 +10407,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -10306,7 +10456,7 @@ msgid "On Delete"
 msgstr "Al eliminar"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "¡No existe el módulo %s!"
@@ -10359,6 +10509,7 @@ msgstr "Estados Unidos - Plan de cuentas"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -10367,7 +10518,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Identificador de Base de Datos desconocido '%s'"
@@ -10390,6 +10541,43 @@ msgstr ""
 "=============================\n"
 "\n"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -10425,7 +10613,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "ID Externo"
@@ -10483,6 +10671,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (reloj 12-horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -10531,30 +10724,11 @@ msgid "The currency code must be unique per company!"
 msgstr "¡El código de moneda debe ser único por compañía!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Nuevo Idioma (Plantilla de Traducción Vacia)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-"\n"
-"Reiniciar Contraseña\n"
-"===================\n"
-"\n"
-"Permite a los usuarios reiniciar sus contraseñas desde la página de inicio.\n"
-"Permite al Administrador hacer click en un botón para enviar una "
-"\"Contraseña Reiniciada\" solicitada a un usuario.\n"
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -10597,7 +10771,7 @@ msgid "Products Expiry Date"
 msgstr "Fecha de expiración de productos"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Haga clic en 'Continuar' para configurar el siguiente módulo..."
@@ -10695,6 +10869,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10907,7 +11086,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campaña de marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10918,13 +11097,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidad de intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Clase"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método ya no existe"
@@ -11107,7 +11291,7 @@ msgid "To Translate"
 msgstr "A Traducir"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Ver todos los valores posibles"
@@ -11147,6 +11331,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -11172,6 +11361,11 @@ msgstr "Agregar Cabecera RML"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Prueba de pie de página mostrada al final de todos los reportes."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL del ícono"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -11271,7 +11465,6 @@ msgstr "%m - Número mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciudad"
@@ -11307,13 +11500,20 @@ msgstr "Portal HR employees"
 msgid "Estonian / Eesti keel"
 msgstr "Estonio / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versión posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -11385,12 +11585,37 @@ msgstr ""
 "    "
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -11399,7 +11624,7 @@ msgstr ""
 "error."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -11413,6 +11638,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -11431,7 +11658,12 @@ msgid "Parent Company"
 msgstr "Compañía Padre"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Autentificación OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -11445,13 +11677,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -11544,6 +11769,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Ventas y Gestión de Almacén"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -11619,6 +11864,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipo de secuencias"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -11677,9 +11927,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Permiso denegado"
@@ -11697,8 +11947,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "¡Problema en configuración `Id registro` en la acción del servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -11739,13 +11989,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Correo"
@@ -11756,7 +12005,12 @@ msgid "Office Supplies"
 msgstr "Suplidores de Oficina"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11798,36 +12052,6 @@ msgstr ""
 " - uid: id del usuario actual\n"
 " - context: contexto actual"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11851,6 +12075,11 @@ msgstr "Otro propietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "flujo de trabajo"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11868,21 +12097,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "¡No puede eliminar el idioma que es el idioma predeterminado de un usuario!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"Este módulo administra el plan de cuentas de Venezuela para OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11899,9 +12113,9 @@ msgid "Cascade"
 msgstr "Cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupo requerido"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Conduce, Oportunidades, Llamadas Teléfono"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11928,11 +12142,6 @@ msgstr "Traducidos"
 msgid "Default Company per Object"
 msgstr "Compañía por defecto por objeto"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Número de acciones que el usuario tiene que realizar"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11958,7 +12167,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Usar '1' para Si y '0' para no"
@@ -11974,12 +12183,12 @@ msgid "State Name"
 msgstr "Nombre provincia"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
-msgstr "Belgica - Nómina de Contabilidad"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "ID de la base de datos invalido '%s' para el campo '%%(field)s'"
@@ -12000,53 +12209,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
-"\n"
-"Facturación y Pagos por Voucher y Ingresos de Contabilidad\n"
-"========================================================\n"
-"El especifico y de fácil uso sistema de Facturación en OpenERP les permite "
-"mantener el rastreo de su contabilidad, incluso cuando usted no es un "
-"contable. Esto provee una vía fácil de seguimiento en sus suplidores y "
-"clientes. \n"
-"\n"
-"Usted podría usar esta contabilidad simplificada en caso de que usted "
-"trabaje con una cuenta (externa) para mantener sus diarios, y usted quiere "
-"mantener el rastreo de sus pagos. \n"
-"\n"
-"El sistema de facturación incluye ingresos y vouchers (una vía fácil de "
-"mantener el rastreo de compras y ventas). También les ofrece un método fácil "
-"de registro de pagos, sin tener que codificar completamente resúmenes de "
-"cuentas.\n"
-"\n"
-"Este modulo gestiona:\n"
-"\n"
-"*Entrada de Voucher\n"
-"*Ingresos de Voucher [Compras y Ventas]\n"
-"*Pagos de Voucher [Suplidores y Clientes]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -12067,7 +12233,7 @@ msgid "Shared"
 msgstr "Compartido"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -12120,7 +12286,6 @@ msgstr "Doble validación en compras"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Calle2"
 
@@ -12147,6 +12312,7 @@ msgstr ""
 "=================================================================\n"
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -12240,19 +12406,28 @@ msgid "Related Partner"
 msgstr "Empresa relacionada"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de integridad"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "flujo de trabajo"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
@@ -12294,34 +12469,6 @@ msgstr "Directorio de empleados"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"Gestiona reclamaciones de Clientes.\n"
-"============================================================================="
-"======================\n"
-"Esta aplicación les permite rastrear las reclamaciones y quejas de sus "
-"Clientes/Suplidores.\n"
-"\n"
-"Esta totalmente integrado con la puerta de enlace del correo electrónico que "
-"usted puede crear automáticamente\n"
-"nuevas reclamaciones basadas en correos entrantes.\n"
-"    "
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -12461,7 +12608,6 @@ msgstr "Instalador de Configuración"
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -12558,7 +12704,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Usted no puede crear contacto sin dirección de correo electrónico"
@@ -12608,9 +12754,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Autentificación OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12711,7 +12857,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Entrega fallida del correo"
@@ -12738,7 +12884,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12871,7 +13017,7 @@ msgid "Mrs."
 msgstr "Sr."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12886,7 +13032,7 @@ msgid "User Ref."
 msgstr "Ref. de usuario"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr "'%s' no parece una fecha valida para el campo '%%(field)s'"
@@ -12931,8 +13077,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12940,7 +13084,7 @@ msgid "Partner"
 msgstr "Socio"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12973,12 +13117,6 @@ msgstr "Islas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -13088,9 +13226,11 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL del ícono"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -13140,7 +13280,7 @@ msgid "Action Type"
 msgstr "Tipo de acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -13283,11 +13423,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque el campo activo para ocultar el contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -13304,7 +13439,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo desconocido %s en %s "
@@ -13332,7 +13467,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "¡Método get (obtener) no definido!"
@@ -13373,16 +13508,16 @@ msgstr "Bronce"
 msgid "Payroll Accounting"
 msgstr "Cálculo de nóminas"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Archivo binario o URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -13429,92 +13564,57 @@ msgid "Address Format"
 msgstr "Formato de dirección"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
-"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
-"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
-"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Características técnicas"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitano (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -13712,6 +13812,11 @@ msgstr ""
 "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
 "las órdenes de entrega, recepciones, ..."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -13728,7 +13833,7 @@ msgid "Body"
 msgstr "Contenido"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "¡Prueba de conexión realizada con éxito!"
@@ -13800,7 +13905,7 @@ msgid "choose"
 msgstr "elegir"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13980,13 +14085,15 @@ msgid "Components Buyer"
 msgstr "Componentes del Comprador"
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"Usted confirmó la desinstalación de este modulo? Esto borrará "
-"permanentemente todos los datos previamente almacenados por el modulo!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -14024,12 +14131,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -14045,7 +14153,6 @@ msgstr "Registro de compañía"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Misceláneo"
@@ -14067,29 +14174,6 @@ msgstr "Técnico"
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Éste es el módulo para administrar el plan de cuentas e impuestos en OpenERP "
-"para Polonia.\n"
-"============================================================================="
-"=====\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -14177,41 +14261,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
-"\n"
-"Este modulo les permite producir varios productos desde una orden de "
-"producción.\n"
-"============================================================================="
-"==\n"
-"\n"
-"usted puede configurar por productos en la lista de materiales.\n"
-"\n"
-"Sin este modulo:\n"
-"---------------\n"
-"     A + B + C -> D\n"
-"\n"
-"Con este modulo:\n"
-"---------------\n"
-"     A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -14239,6 +14291,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -14283,6 +14355,7 @@ msgstr "Eslovaco / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconocido"
@@ -14350,6 +14423,11 @@ msgstr "Libreta de direcciones"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr "Belgica - Nómina de Contabilidad"
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -14448,6 +14526,7 @@ msgid "Projects, Tasks"
 msgstr "Proyectos, tareas"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -14460,7 +14539,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "falso"
@@ -14491,16 +14570,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Padre derecho"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -14568,6 +14651,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "El campo osv_memory solo puede ser comparado con los operadores = y !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -14667,29 +14755,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identificador externo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -14744,7 +14809,7 @@ msgid "Delivery Costs"
 msgstr "Costos de envío"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -14799,9 +14864,9 @@ msgstr ""
 "Desactiva el plan de cuentas mínimo.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Encriptación de la contraseña en la BD"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Reglas de registro"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -15056,10 +15121,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -15091,63 +15161,14 @@ msgid "System Configuration done"
 msgstr "Configuración del sistema realizada."
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Parámetros del sistema"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -15188,23 +15209,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-"\n"
-"Google Analytics.\n"
-"========================\n"
-"\n"
-"Coleccionar aplicaciones web usadas con Google Analytics.\n"
-"    "
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -15242,7 +15246,7 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Error ! No puede crear menús recursivos"
@@ -15324,11 +15328,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -15343,6 +15346,11 @@ msgstr "Menú de acceso"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -15363,6 +15371,30 @@ msgstr "Guernsey"
 msgid "Romanian / română"
 msgstr "Rumano / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -15401,41 +15433,6 @@ msgstr "Relacion de objeto"
 msgid "eInvoicing & Payments"
 msgstr "Facturación electrónica y pagos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -15496,40 +15493,8 @@ msgid "Apply for Write"
 msgstr "Aplicar para Escritura"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -15635,6 +15600,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Vista auto-carga"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -15679,34 +15659,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -15729,9 +15681,9 @@ msgid "Unmet dependency !"
 msgstr "¡Dependencia no resuelta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -15742,7 +15694,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -15772,7 +15754,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -15844,7 +15826,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -15877,11 +15859,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -15897,8 +15878,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -16013,7 +15992,7 @@ msgid "Officer"
 msgstr "Oficial"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -16026,7 +16005,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Índice de colores"
 
@@ -16063,7 +16041,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr "Modelo '%s' contiene datos de módulos y no pueden ser eliminados!"
@@ -16074,8 +16052,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -16101,11 +16079,6 @@ msgstr "Islas Vírgenes (Británicas)"
 msgid "Parameters"
 msgstr "Parámetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pierre y Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -16201,7 +16174,6 @@ msgstr "Capacitaciones, Conferencias, Reuniones, Exposiciones, Registros"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -16274,9 +16246,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Español (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Instalar un Modulo"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
+"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
+"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
+"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -16307,7 +16288,7 @@ msgid "Japan"
 msgstr "Japón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "¡Sólo puede renombrar una columna a la vez!"
@@ -16368,6 +16349,37 @@ msgstr "ir.acciones.servidor"
 msgid "Canada - Accounting"
 msgstr "Canada - Contabilidad"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -16392,7 +16404,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Para su información, esta operación puede llevar varios minutos"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -16433,6 +16445,12 @@ msgstr "Ejecución"
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -16487,6 +16505,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Usted confirmó la desinstalación de este modulo? Esto borrará "
+"permanentemente todos los datos previamente almacenados por el modulo!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -16511,6 +16538,11 @@ msgstr "Actualización del sistema"
 msgid "SXW Content"
 msgstr "Contenido SXW"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -16527,7 +16559,7 @@ msgid "Gold"
 msgstr "Oro"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -16548,15 +16580,52 @@ msgstr "Sierra Leona"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "ID Completo"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Islas Turcas y Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -16592,7 +16661,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Advertencia de cambio de compañia."
@@ -16613,11 +16687,15 @@ msgstr ""
 "El número siguiente de esta secuencia será incrementado por este número."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -16655,11 +16733,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Notas internas"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Envío"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -16687,7 +16760,7 @@ msgid "Workflow Instances"
 msgstr "Instancias del flujo"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Socios: "
@@ -16698,7 +16771,7 @@ msgid "Is a Company?"
 msgstr "¿Es una empresa?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -16764,7 +16837,6 @@ msgstr "Nombre exportación"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -16805,6 +16877,9 @@ msgstr "Ruso / русский язык"
 msgid "Signup"
 msgstr "firmar"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nombre de contacto"
+
 #~ msgid ""
 #~ "Date : %(date)s\n"
 #~ "\n"
@@ -16832,3 +16907,55 @@ msgstr "firmar"
 #~ "--\n"
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
+
+#~ msgid "Attached ID"
+#~ msgstr "ID archivo adjunto"
+
+#~ msgid "Attached Model"
+#~ msgstr "Modelo archivo adjunto"
+
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Módulo para gestionar el plan de cuentas para México en OpenERP\n"
+#~ "=====================================================\n"
+#~ "\n"
+#~ "Plan de cuentas y localización mexicanos.\n"
+#~ "    "
+
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo administra el plan de cuentas de Venezuela para OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque el campo activo para ocultar el contacto."
+
+#~ msgid "Binary File or external URL"
+#~ msgstr "Archivo binario o URL externa"
+
+#~ msgid "DB Password Encryption"
+#~ msgstr "Encriptación de la contraseña en la BD"
+
+#~ msgid "Delivery"
+#~ msgstr "Envío"
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index ce83e828fae..28fa8bd4fa6 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 19:00+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "FechaHora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -221,41 +221,15 @@ msgstr ""
 "teórico de beneficios."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -266,7 +240,7 @@ msgstr ""
 "de un módulo (addon) personalizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error de restriccion"
@@ -277,7 +251,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.vista.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "No está permitido renombrar el campo \"%s\""
@@ -288,7 +262,7 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado."
@@ -374,29 +348,6 @@ msgstr "Compañía para almacenar el registro actual"
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Añade información adicional al pedido de venta.\n"
-"===================================================\n"
-"\n"
-"Puede añadir las siguientes fechas adicionales a un pedido de venta:\n"
-"-----------------------------------------------------------\n"
-"    * Fecha solicitada\n"
-"    * Fecha de confirmación\n"
-"    * Fecha efectiva\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -406,11 +357,6 @@ msgstr ""
 "Id. de la base datos del registro para abrir en el formulario de vista, "
 "cuando se establece el modo de visto únicamente a 'formulario'"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre del contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -474,7 +420,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -513,6 +459,7 @@ msgstr "Reglas de acción automáticas"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -553,7 +500,7 @@ msgstr ""
 "las directivas permitidas, mostradas cuando edita un idioma."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -609,7 +556,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -649,9 +596,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -676,26 +623,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnian / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -706,9 +633,25 @@ msgstr ""
 "por segunda vez, obtendrá el informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -784,14 +727,12 @@ msgstr ""
 "Context diccionario como expresión de Python, vacío por defecto (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -856,25 +797,18 @@ msgid "Model Description"
 msgstr "Descripción del modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para añadir un contacto en la libreta de direcciones.\n"
-"</p><p>\n"
-"OpenERP le ayuda a gestionar todas las actividades relacionadas con los "
-"clientes: discusiones, historial de oportunidades de negocio, documentos, "
-"etc.\n"
-"</p>\n"
-"            "
+"\n"
+"Menú para Marketing\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -903,11 +837,21 @@ msgstr "Expresión del disparo"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Fecha de la próxima ejecución programada para esta acción."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1043,13 +987,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indique el nombre de campo al cual se refiere el id del registro para la "
-"operación escribir. Si está vacío se referirá al id activo del objeto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1068,7 +1008,7 @@ msgid "Email Preferences"
 msgstr "Preferencias de email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' no parece ser una fecha valida para el campo '%%(field)s'"
@@ -1119,16 +1059,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1231,9 +1164,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "Parametros de Configuracion"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1249,12 +1211,17 @@ msgstr ""
 "siguientes grupos."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modelo de documento"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1281,7 +1248,54 @@ msgid "Username"
 msgstr "Usuario"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1311,7 +1325,7 @@ msgid "Delete Access Right"
 msgstr "Eliminar permiso de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "¡Ha fallado el test de conexión!"
@@ -1343,14 +1357,12 @@ msgid "South Korea"
 msgstr "Corea del Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transiciones"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "¡No se ha encontrado el registro #%d de %s, no se puede copiar!"
@@ -1488,7 +1500,7 @@ msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "¡Está prohibido cambiar el modelo de un campo!"
@@ -1510,7 +1522,7 @@ msgid "Search"
 msgstr "Buscar"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1528,7 +1540,14 @@ msgid "Parent Application"
 msgstr "Aplicación padre"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operación cancelada"
@@ -1666,7 +1685,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Ninguna lengua con el código \"%s\" existe"
@@ -1789,7 +1822,7 @@ msgid "On Create"
 msgstr "Al crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1799,11 +1832,6 @@ msgstr ""
 "puntos! Los puntos se usan para referirse a datos de otros módulos, por "
 "ejemplo módulo.referencia_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Presupuestos, órdenes de venta, facturación"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1886,7 +1914,7 @@ msgid "East Timor"
 msgstr "Timor oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1927,11 +1955,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID archivo adjunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1949,7 +1972,7 @@ msgstr ""
 "automática de albaranes, ..."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1990,6 +2013,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Acceso de lectura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2066,16 +2094,11 @@ msgid "Create Tasks on SO"
 msgstr "Crear Tareas en SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo archivo adjunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2130,7 +2153,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "¡No se puede eliminar el usuario principal!"
@@ -2161,11 +2184,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -2177,7 +2200,6 @@ msgstr "Plantilla de Plan de Cuentas"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de dirección"
 
@@ -2215,11 +2237,6 @@ msgstr "Ruta de acceso completa"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideas"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2357,6 +2374,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr "Método"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2390,12 +2412,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2446,6 +2473,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Añadir o no la cabecera corporativa en el informe RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2499,7 +2535,7 @@ msgstr ""
 "como 'form', 'tree', 'calendar', etc. (Default: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2591,7 +2627,6 @@ msgstr "Santo Tomé y Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2638,11 +2673,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2768,9 +2798,20 @@ msgid "Default limit for the list view"
 msgstr "Límite por defecto para la vista de lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nueva Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2848,7 +2889,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2907,6 +2948,19 @@ msgstr "Mapeado de campos"
 msgid "Export Translations"
 msgstr "Traducciones de exportación"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2915,7 +2969,7 @@ msgid "Manager"
 msgstr "Gerente"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -3001,7 +3055,7 @@ msgid "Inherited"
 msgstr "Heredado"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -3031,7 +3085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3098,22 +3152,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "¡Estructura del objeto no válida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -3210,12 +3264,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3232,17 +3286,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3252,7 +3308,7 @@ msgid "Params storage"
 msgstr "Parámetros de Almacenamiento"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "No puede actualizar el módulo '% s'. No está instalado"
@@ -3303,34 +3359,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3369,7 +3397,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3381,6 +3409,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipo de cuenta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3417,7 +3473,7 @@ msgid "Signal (subflow.*)"
 msgstr "Señal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3457,7 +3513,7 @@ msgid "Access Controls"
 msgstr "Controles de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3487,32 +3543,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Archivo icono web (inmóvil)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3532,9 +3562,13 @@ msgstr ""
 "Si utiliza un tipo fórmula, introduzca una expresión Python que incluya la "
 "variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fecha nacimiento"
 
@@ -3550,7 +3584,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricantes de Productos"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL no disponible"
@@ -3660,7 +3694,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3851,7 +3885,6 @@ msgstr "Informe"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -3864,13 +3897,18 @@ msgstr ""
 "recursos"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Se ha detectado recursividad."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "¡Error de recurrencia entre dependencias de módulos!"
@@ -3930,9 +3968,10 @@ msgid "Urdu / اردو"
 msgstr "Tayiko / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3943,7 +3982,7 @@ msgid "Company Name"
 msgstr "Nombre de la compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3964,14 +4003,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (deprecated - use Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pierre y Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4000,13 +4062,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.traduccion"
 
 #. module: base
 #: view:res.lang:0
@@ -4054,19 +4112,7 @@ msgid "Paper Format"
 msgstr "Formato de página"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4086,7 +4132,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4137,7 +4183,7 @@ msgid "Email Gateway"
 msgstr "Email Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4158,9 +4204,43 @@ msgid "Technical Data"
 msgstr "Datos técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4216,13 +4296,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "S.L."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "¡Estructura no válida!"
@@ -4238,9 +4323,9 @@ msgid "Share any Document"
 msgstr "Compartir cualquier Documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupo Requerido"
 
 #. module: base
 #: view:res.lang:0
@@ -4298,33 +4383,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4402,7 +4464,6 @@ msgstr "Restricción"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4476,6 +4537,11 @@ msgstr ""
 "Cuando no se especifica un servidor de correo, la prioridad mas alta es "
 "usada. La prioridad por defecto es 10(menor número=prioridad mas alta)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4539,9 +4605,16 @@ msgid "Default value or action reference"
 msgstr "Valor por defecto para referencia de acción"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4621,6 +4694,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4647,6 +4736,43 @@ msgstr ""
 "este campo está vacío, OpenERP calculará sobre la base de la visibilidad de "
 "acceso de lectura del objeto relacionado."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4676,6 +4802,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4753,12 +4885,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.acciones.informe.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4773,7 +4899,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "C.P."
@@ -4784,13 +4909,18 @@ msgstr "C.P."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Establecer como Todo"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4836,6 +4966,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -4851,7 +4983,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4948,7 +5080,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -5036,7 +5173,7 @@ msgid "System Configuration Done"
 msgstr "Configuración del sistema terminada"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ha ocurrido un error mientras se validaban los campo(s) %s: %s"
@@ -5151,6 +5288,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr "Acceso total"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5164,7 +5306,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Cambiar el almacenamiento para el campo \"%s\" no está permitido"
@@ -5175,7 +5317,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Sólo si esta cuenta pertenece a tu compañía"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5207,6 +5349,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5370,7 +5523,7 @@ msgid "Account Owner Name"
 msgstr "Propietario de la Cuenta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5387,16 +5540,11 @@ msgid "Decimal Separator"
 msgstr "Separador de decimales"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5443,9 +5591,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "El nombre del módulo debe ser único !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5508,15 +5657,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5532,6 +5672,11 @@ msgstr "Lanzar Asistente de Configuración"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nombre del documento adjunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5615,6 +5760,12 @@ msgstr "Kazajstán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Día de la semana [0(domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5869,7 +6020,7 @@ msgid "title"
 msgstr "título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5926,6 +6077,15 @@ msgstr "Productos"
 msgid "User-defined Defaults"
 msgstr "User-defined Defaults"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6043,13 +6203,15 @@ msgid "Bank Type"
 msgstr "Tipo de banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -6069,7 +6231,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6104,10 +6266,9 @@ msgid "Uncategorized"
 msgstr "Sin categoría"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nombre del recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6143,6 +6304,11 @@ msgstr ""
 "formulario de cliente, Pruebas de señal con el nombre del botón pulsado. Si "
 "la señal es NULL, ningún botón es necesario para validar esta transición."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6153,7 +6319,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6169,26 +6335,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mis bancos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6321,11 +6467,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6337,8 +6478,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6449,7 +6590,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
@@ -6489,7 +6630,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6516,9 +6657,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Establecer como Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6550,6 +6719,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Año sin siglo actual: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6592,7 +6768,7 @@ msgid "Audit Trail"
 msgstr "Registro de Auditoría"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6684,7 +6860,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6704,23 +6880,6 @@ msgstr "A veces llamado BIC o Swift"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6753,10 +6912,10 @@ msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -6830,9 +6989,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6856,8 +7015,8 @@ msgid "Partner Titles"
 msgstr "Títulos de empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6905,7 +7064,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6915,11 +7074,6 @@ msgstr ""
 "permitida para este objeto ya que este objeto tiene como finalidad la "
 "generación de informes."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7029,6 +7183,13 @@ msgstr "¡Módulo de archivo importado con éxito!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7123,7 +7284,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Provincia"
@@ -7224,12 +7384,6 @@ msgstr "Nombre completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "El nombre del módulo debe ser único !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7271,6 +7425,7 @@ msgstr "En múltiples doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7328,7 +7483,7 @@ msgid "Connection Security"
 msgstr "Seguridad de la Conexión"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "¡Por favor, indique una acción a ejecutar!"
@@ -7348,6 +7503,11 @@ msgstr "Nombre de categoría"
 msgid "Northern Mariana Islands"
 msgstr "Islas Marianas del Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7359,7 +7519,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat Reporting"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7368,6 +7528,11 @@ msgstr ""
 "Utilice el asistente de cambio de contraseña (en Preferencias de usuario o "
 "menú Usuario) para cambiar su propia contraseña."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "Parametros de Configuracion"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7398,7 +7563,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "¡Insuficientes campos para la vista calendario!"
@@ -7446,7 +7611,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7466,30 +7630,30 @@ msgid "Child Categories"
 msgstr "Categorías hijos"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -7577,6 +7741,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Esta ventana"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7662,6 +7831,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Empleados"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7691,11 +7875,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Probar Conexión"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Direcciones"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7720,7 +7899,6 @@ msgstr "Opciones de selección"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Calle"
@@ -7731,9 +7909,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Padre derecho"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7811,7 +8004,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar mis preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
@@ -7898,18 +8091,25 @@ msgid "US Letter"
 msgstr "Carta de EE.UU."
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menú para Marketing\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir un contacto en la libreta de direcciones.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar todas las actividades relacionadas con los "
+"clientes: discusiones, historial de oportunidades de negocio, documentos, "
+"etc.\n"
+"</p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7917,7 +8117,7 @@ msgid "Company Bank Accounts"
 msgstr "Cuentas de Banco de la Compañía"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7929,13 +8129,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Contraseña opcional para autentificación SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7957,12 +8157,13 @@ msgid "Normal Bank Account"
 msgstr "Cuenta de Banco"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8135,7 +8336,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8167,14 +8368,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8198,7 +8391,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8317,7 +8509,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "¡Para campos selection debe indicar las opciones de selección!"
@@ -8635,7 +8827,7 @@ msgid "Update Modules List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8649,7 +8841,7 @@ msgid "eInvoicing"
 msgstr "Facturación Electrónica"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8663,7 +8855,7 @@ msgstr ""
 "(ahora puede hacer clic en Cancelar en las preferencias del usuario)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "El valor \"%s\" para el campo \"%s.%s\" no esta en la selección."
@@ -8678,6 +8870,17 @@ msgstr "Siguiente"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8725,7 +8928,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8747,15 +8950,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Servidor SMTP perdido"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nombre del documento adjunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8779,7 +8982,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8791,7 +8994,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Proveedor"
@@ -8869,7 +9071,7 @@ msgid "Selectable"
 msgstr "Seleccionable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Todo parece estar correctamente configurado."
@@ -8897,8 +9099,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Error de usuario"
@@ -8922,7 +9124,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9071,7 +9273,7 @@ msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9112,8 +9314,8 @@ msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ErrorAcceso"
@@ -9187,7 +9389,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9203,7 +9405,7 @@ msgid "Ukraine"
 msgstr "Ucrania"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9266,6 +9468,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenco (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9364,9 +9571,9 @@ msgid "Custom Shortcuts"
 msgstr "Atajos personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9394,13 +9601,13 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Registro no puede ser modificado ahora"
@@ -9421,7 +9628,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9469,7 +9676,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "¡No existe el módulo %s!"
@@ -9515,6 +9722,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9523,7 +9731,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9542,6 +9750,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9577,7 +9822,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9629,6 +9874,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (reloj 12-horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9671,23 +9921,11 @@ msgid "The currency code must be unique per company!"
 msgstr "¡El código de moneda debe ser único por compañía!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9724,7 +9962,7 @@ msgid "Products Expiry Date"
 msgstr "Fecha de expiración"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Haga clic en 'Continuar' para configurar el siguiente módulo..."
@@ -9816,6 +10054,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10025,7 +10268,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10036,13 +10279,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidad de intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Clase"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método ya no existe"
@@ -10217,7 +10465,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10252,6 +10500,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10277,6 +10530,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10366,7 +10624,6 @@ msgstr "%m - Número mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ciudad"
@@ -10402,13 +10659,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indique el nombre de campo al cual se refiere el id del registro para la "
+"operación escribir. Si está vacío se referirá al id activo del objeto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versió posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10470,19 +10736,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.traduccion"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10496,6 +10787,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10514,7 +10807,12 @@ msgid "Parent Company"
 msgstr "Compañía matriz"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10526,13 +10824,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10619,6 +10910,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10693,6 +11004,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Secuencias de tipo"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10753,9 +11069,9 @@ msgstr ""
 " Por favor, desactivar la primera lengua."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10773,8 +11089,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "¡Problema en configuración `Id registro` en la acción del servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -10815,13 +11131,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10832,7 +11147,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10863,36 +11183,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10914,6 +11204,11 @@ msgstr "Otro propietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "flujo"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10932,16 +11227,6 @@ msgstr ""
 "¡No se puede eliminar el lenguaje que es preferido por el usuario de la "
 "Lengua!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10958,9 +11243,9 @@ msgid "Cascade"
 msgstr "En cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupo Requerido"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10985,11 +11270,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11015,7 +11295,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11031,12 +11311,12 @@ msgid "State Name"
 msgstr "Nombre provincia"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11057,30 +11337,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11101,7 +11361,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11154,7 +11414,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Calle2"
 
@@ -11178,6 +11437,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11263,19 +11523,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de Integridad"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "flujo"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Tamaño del campo nunca puede ser menor que 1 !"
@@ -11317,22 +11586,6 @@ msgstr "Directorio de empleado"
 msgid "Arguments"
 msgstr "Alegaciones"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11465,7 +11718,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11555,7 +11807,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11605,8 +11857,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11697,7 +11949,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Envio de mail falló"
@@ -11724,7 +11976,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11813,7 +12065,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11828,7 +12080,7 @@ msgid "User Ref."
 msgstr "Ref. usuario"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11873,8 +12125,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11882,7 +12132,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11911,12 +12161,6 @@ msgstr "Islas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12024,8 +12268,10 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -12062,7 +12308,7 @@ msgid "Action Type"
 msgstr "Tipo de acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12200,11 +12446,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque el campo activo para ocultar el contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12221,7 +12462,7 @@ msgid "workflow.instance"
 msgstr "workflow.instancia"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo desconocido %s en %s "
@@ -12244,7 +12485,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "¡Método get (obtener) no definido!"
@@ -12285,16 +12526,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Archivo binario o una URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12341,92 +12582,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
-"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
-"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
-"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.valores"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Características técnicas"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitano (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12609,6 +12815,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.valores"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12625,7 +12836,7 @@ msgid "Body"
 msgstr "Contenido"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12676,7 +12887,7 @@ msgid "choose"
 msgstr "elegir"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12852,10 +13063,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12887,12 +13102,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12908,7 +13124,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
@@ -12930,23 +13145,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13020,25 +13218,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13066,6 +13248,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13102,6 +13304,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconocido"
@@ -13169,6 +13372,11 @@ msgstr "Libreta de direcciones"
 msgid "ir.sequence.type"
 msgstr "ir.secuencia.tipo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13258,6 +13466,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13270,7 +13479,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13301,16 +13510,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Padre derecho"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualización de Lista de Módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13376,6 +13589,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "El campo osv_memory solo puede ser comparado con los operadores = y !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13448,29 +13666,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13518,7 +13713,7 @@ msgid "Delivery Costs"
 msgstr "Costes de envío"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13562,9 +13757,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Encriptación de la contraseña de la DB"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Record rules"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13810,9 +14005,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13839,63 +14039,14 @@ msgid "System Configuration done"
 msgstr "Configuración del sistema terminado"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13936,17 +14087,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13981,7 +14121,7 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "¡Error! Usted no puede crear menús recursivos."
@@ -14063,11 +14203,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -14082,6 +14221,11 @@ msgstr "Acceso a menús"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14102,6 +14246,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumano / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14138,41 +14306,6 @@ msgstr "Relación objeto"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14233,40 +14366,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14362,6 +14463,21 @@ msgstr "Vista:"
 msgid "View Auto-Load"
 msgstr "Vista auto-carga"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14404,34 +14520,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14454,9 +14542,9 @@ msgid "Unmet dependency !"
 msgstr "¡Dependencia no resuleta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14467,7 +14555,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14493,7 +14611,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14538,7 +14656,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14571,11 +14689,10 @@ msgid "Bahrain"
 msgstr "Bahréin"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14591,8 +14708,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14707,7 +14822,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14719,7 +14834,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Color del Indice"
 
@@ -14756,7 +14870,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14767,8 +14881,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -14794,11 +14908,6 @@ msgstr "Islas Vírgenes (Británicas)"
 msgid "Parameters"
 msgstr "Parámetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pierre y Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14888,7 +14997,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -14959,9 +15067,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Español (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"El formato de separación debería ser como [,n] dónde 0 < n, empezando por "
+"el dígito unidad. -1 terminará la separación. Por ej. [3,2,-1] representará "
+"106500 como 1,06,500; [1,2,-1] lo representará como 106,50,0; [3] lo "
+"representará como 106,500. Siempre que ',' sea el separador de mil en cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14988,7 +15105,7 @@ msgid "Japan"
 msgstr "Japón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "¡Sólo puede renombrar una columna a la vez!"
@@ -15049,6 +15166,37 @@ msgstr "ir.acciones.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15073,7 +15221,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Tenga en cuenta que esta operación puede tardar unos minutos."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15112,6 +15260,12 @@ msgstr "Execution"
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15166,6 +15320,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15190,6 +15351,11 @@ msgstr "Actualización del sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15206,7 +15372,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15227,15 +15393,52 @@ msgstr "Sierra Leona"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Islas Turcas y Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15271,7 +15474,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Advertencia de cambio de compañia."
@@ -15289,11 +15497,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "El próximo número de la secuencia se incrementa en este número"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15329,11 +15541,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Envío"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15361,7 +15568,7 @@ msgid "Workflow Instances"
 msgstr "Instancias del flujo"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Empresas: "
@@ -15372,7 +15579,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15438,7 +15645,6 @@ msgstr "Nombre exportación"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15692,6 +15898,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "Ruta SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid "res.users"
 #~ msgstr "res.usuarios"
 
@@ -15863,6 +16072,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Campos de tipo"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque el campo activo para ocultar el contacto."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "República Democrática del Congo"
 
@@ -15968,9 +16180,18 @@ msgstr ""
 #~ msgid "Save As Attachment Prefix"
 #~ msgstr "Prefijo guardar como adjunto"
 
+#~ msgid "Delivery"
+#~ msgstr "Envío"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "Código BIC/Swift"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID archivo adjunto"
+
+#~ msgid "Attached Model"
+#~ msgstr "Modelo archivo adjunto"
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "¡El método unlink (eliminar) no está implementado en este objeto!"
@@ -16021,6 +16242,9 @@ msgstr ""
 #~ msgid "Not Implemented"
 #~ msgstr "No implementado"
 
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
 #, python-format
 #~ msgid "The copy method is not implemented on this object !"
 #~ msgstr "¡El método copy (copiar) no está implementado en este objeto!"
@@ -16072,6 +16296,9 @@ msgstr ""
 #~ msgstr ""
 #~ "\"smtp_server\" debe ser configurado para enviar mensajes a los usuarios"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nombre del contacto"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -16578,6 +16805,9 @@ msgstr ""
 #~ msgid "- type,name,res_id,src,value"
 #~ msgstr "- tipo,nombre,res_id,src,valor"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Archivo binario o una URL externa"
+
 #~ msgid "Modules to update"
 #~ msgstr "Módulos para actualizar"
 
@@ -17797,6 +18027,9 @@ msgstr ""
 #~ msgid "Address Information"
 #~ msgstr "Información de dirección"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Encriptación de la contraseña de la DB"
+
 #~ msgid "Live Chat Support"
 #~ msgstr "Chat de asistencia"
 
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index c66d5076b16..29cf6061bcf 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-09-07 01:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:03+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index e9b634d091c..fa3e6a8373b 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 14:21+0000\n"
-"Last-Translator: Nhomar Hernandez (Vauxoo) <nhomar@gmail.com>\n"
+"Last-Translator: Nhomar - Vauxoo <nhomar@gmail.com>\n"
 "Language-Team: Spanish (Venezuela) <es_VE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:02+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:09+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -46,7 +46,7 @@ msgid "DateTime"
 msgstr "Fecha y hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -199,41 +199,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -244,7 +218,7 @@ msgstr ""
 "de un módulo (addon) personalizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Error en la restricción (constraint)"
@@ -255,7 +229,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "No está permitido renombrar el campo \"%s\""
@@ -266,7 +240,7 @@ msgid "Swaziland"
 msgstr "Swazilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado."
@@ -347,20 +321,6 @@ msgstr "Compañía donde se guardará el registro actual."
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -368,11 +328,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nombre del contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -436,7 +391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -473,6 +428,7 @@ msgstr "Reglas para acciones automáticas"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -514,7 +470,7 @@ msgstr ""
 "no tiene permisos consulte al administrador del sistema"
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -572,7 +528,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -612,8 +568,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -639,26 +595,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -667,8 +603,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -742,14 +694,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -813,16 +763,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -851,11 +799,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -984,10 +942,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -1006,7 +962,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1054,15 +1010,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1160,8 +1109,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1176,12 +1154,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1208,7 +1191,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1236,7 +1266,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1268,14 +1298,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1410,7 +1438,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1432,7 +1460,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1447,7 +1475,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1573,7 +1608,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1688,18 +1737,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1780,7 +1824,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1821,11 +1865,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1840,7 +1879,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1881,6 +1920,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1957,16 +2001,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2021,7 +2060,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2045,11 +2084,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2061,7 +2100,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2099,11 +2137,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2236,6 +2269,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2269,12 +2307,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2322,6 +2365,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2373,7 +2425,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2451,7 +2503,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2498,11 +2549,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2619,8 +2665,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2699,7 +2756,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2758,6 +2815,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2766,7 +2836,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2852,7 +2922,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2882,7 +2952,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2947,22 +3017,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3056,12 +3126,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3078,17 +3148,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3098,7 +3170,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3149,34 +3221,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3215,7 +3259,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3227,6 +3271,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3263,7 +3335,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3297,7 +3369,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3325,32 +3397,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3368,9 +3414,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3386,7 +3436,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3494,7 +3544,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3683,7 +3733,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3694,13 +3743,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3760,9 +3814,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3773,7 +3828,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3792,13 +3847,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3828,12 +3906,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3882,19 +3956,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3912,7 +3974,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3957,7 +4019,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3976,8 +4038,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4034,13 +4130,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4056,8 +4157,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4116,32 +4217,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4220,7 +4298,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4292,6 +4369,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4353,8 +4435,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4435,6 +4524,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4458,6 +4563,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4485,6 +4627,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4562,12 +4710,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4582,7 +4724,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4593,13 +4734,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4642,6 +4788,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4657,7 +4805,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4750,7 +4898,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4838,7 +4991,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4953,6 +5106,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4966,7 +5124,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4977,7 +5135,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5009,6 +5167,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5172,7 +5341,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5188,16 +5357,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5238,8 +5402,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5303,15 +5468,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5327,6 +5483,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5410,6 +5571,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5660,7 +5827,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5717,6 +5884,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5832,13 +6008,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5858,7 +6036,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5891,9 +6069,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5927,6 +6104,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5937,7 +6119,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5953,26 +6135,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6105,11 +6267,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6121,8 +6278,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6229,7 +6386,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6267,7 +6424,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6294,8 +6451,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6328,6 +6513,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6370,7 +6562,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6462,7 +6654,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6482,23 +6674,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6531,10 +6706,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6608,8 +6783,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6633,8 +6808,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6682,18 +6857,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6798,6 +6968,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6892,7 +7069,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6993,12 +7169,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7040,6 +7210,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7097,7 +7268,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7117,6 +7288,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7128,13 +7304,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7165,7 +7346,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7211,7 +7392,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7231,30 +7411,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7342,6 +7522,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7425,6 +7610,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7454,11 +7654,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7483,7 +7678,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7494,8 +7688,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7574,7 +7783,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7661,14 +7870,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7677,7 +7888,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7688,13 +7899,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7713,12 +7924,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7891,7 +8103,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7920,14 +8132,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7951,7 +8155,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8066,7 +8269,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8381,7 +8584,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8393,7 +8596,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8403,7 +8606,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8418,6 +8621,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8457,7 +8671,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8479,14 +8693,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8511,7 +8725,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8523,7 +8737,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8601,7 +8814,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8629,8 +8842,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8654,7 +8867,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8801,7 +9014,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8840,8 +9053,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8915,7 +9128,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8929,7 +9142,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8992,6 +9205,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9090,8 +9308,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9120,13 +9338,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9147,7 +9365,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9195,7 +9413,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9241,6 +9459,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9249,7 +9468,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9268,6 +9487,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9303,7 +9559,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9355,6 +9611,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9397,23 +9658,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9447,7 +9696,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9538,6 +9787,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9742,7 +9996,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9753,13 +10007,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9927,7 +10186,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9960,6 +10219,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9985,6 +10249,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10074,7 +10343,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10110,13 +10378,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10175,19 +10450,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10201,6 +10501,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10219,7 +10521,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10231,13 +10538,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10319,6 +10619,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10388,6 +10708,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10446,9 +10771,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10466,8 +10791,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10506,13 +10831,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10523,7 +10847,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10552,36 +10881,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10603,6 +10902,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10619,16 +10923,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10645,8 +10939,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10672,11 +10966,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10702,7 +10991,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10718,12 +11007,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10744,29 +11033,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10787,7 +11056,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10834,7 +11103,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10858,6 +11126,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10943,19 +11212,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10997,22 +11275,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11145,7 +11407,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11235,7 +11496,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11285,8 +11546,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11377,7 +11638,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11404,7 +11665,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11490,7 +11751,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11503,7 +11764,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11548,8 +11809,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11557,7 +11816,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11586,12 +11845,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11698,8 +11951,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11736,7 +11991,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11872,11 +12127,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11893,7 +12143,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11916,7 +12166,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11958,13 +12208,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -12013,73 +12263,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12087,13 +12272,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12270,6 +12490,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12286,7 +12511,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12334,7 +12559,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12510,10 +12735,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12545,12 +12774,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12564,7 +12794,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12586,23 +12815,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12670,24 +12882,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12716,6 +12912,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12752,6 +12968,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12819,6 +13036,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12908,6 +13130,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12920,7 +13143,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12951,16 +13174,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13025,6 +13252,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13097,29 +13329,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13167,7 +13376,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13211,8 +13420,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13457,9 +13666,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13486,62 +13700,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13583,17 +13748,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13628,7 +13782,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13708,11 +13862,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13727,6 +13880,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13747,6 +13905,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13783,41 +13965,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13878,40 +14025,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14000,6 +14115,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14042,34 +14172,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14092,9 +14194,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14105,7 +14207,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14131,7 +14263,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14176,7 +14308,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14209,11 +14341,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14229,8 +14360,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14345,7 +14474,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14357,7 +14486,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14390,7 +14518,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14401,8 +14529,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14428,11 +14556,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14522,7 +14645,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14589,8 +14711,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14618,7 +14744,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14679,6 +14805,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14703,7 +14860,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14742,6 +14899,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14794,6 +14957,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14818,6 +14988,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14834,7 +15009,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14855,14 +15030,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14899,7 +15111,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14917,11 +15134,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14957,11 +15178,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14989,7 +15205,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -15000,7 +15216,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15066,7 +15282,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15104,3 +15319,6 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base.module_auth_signup
 msgid "Signup"
 msgstr ""
+
+#~ msgid "Contact Name"
+#~ msgstr "Nombre del contacto"
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index c6053f615b7..cd4d3462563 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-20 18:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 18:17+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-21 04:38+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Kuupäev ja kellaaeg"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -185,41 +185,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Hoiatus!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -227,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Piirangu viga"
@@ -238,7 +212,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -249,7 +223,7 @@ msgid "Swaziland"
 msgstr "Svaasimaa"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "loodud."
@@ -328,20 +302,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Maks. suurus"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -349,11 +309,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontaktnimi"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -412,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -449,6 +404,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Omanik"
 
@@ -487,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -539,7 +495,7 @@ msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -579,9 +535,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Originaalvaade"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideed"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -606,26 +562,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnia / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -636,9 +572,25 @@ msgstr ""
 "prindib olemasoleva manuse nimega"
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -713,14 +665,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Nõustajad"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Kohandatud väljadel peab olema nimi mis algab 'x_'-ga !"
@@ -784,16 +734,14 @@ msgid "Model Description"
 msgstr "Mudeli kirjeldus"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -822,11 +770,21 @@ msgstr "Käivita avaldis"
 msgid "Jordan"
 msgstr "Jordaania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -958,13 +916,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Sisesta välja nimi, mille poole kirje id kirjutamiseks pöördub. Kui see on "
-"tühi, siis pöördutakse objekti aktiivse id poole."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Paapua Uus-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -983,7 +937,7 @@ msgid "Email Preferences"
 msgstr "E-posti seadistused"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1031,16 +985,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobiil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1137,8 +1084,37 @@ msgid "Mongolia"
 msgstr "Mongoolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1153,12 +1129,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1185,7 +1166,54 @@ msgid "Username"
 msgstr "Kasutajanimi"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1213,7 +1241,7 @@ msgid "Delete Access Right"
 msgstr "Kustuta ligipääsureegel"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1245,14 +1273,12 @@ msgid "South Korea"
 msgstr "Lõuna-Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Siirded"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1389,7 +1415,7 @@ msgid "Marshall Islands"
 msgstr "Marshalli Saared"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1411,7 +1437,7 @@ msgid "Search"
 msgstr "Otsi"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1426,7 +1452,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Nõustajad"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1552,7 +1585,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1669,18 +1716,13 @@ msgid "On Create"
 msgstr "Loomisel"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Pakkumised, Müügikorraldused, Arveldused"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1761,7 +1803,7 @@ msgid "East Timor"
 msgstr "Ida-Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1802,11 +1844,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Manustatud ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1821,7 +1858,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1862,6 +1899,11 @@ msgstr "Sõiduk, liising, kindlustus, kulud"
 msgid "Read Access"
 msgstr "Lugemisõigus"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1938,16 +1980,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Lisatud mudel"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2002,7 +2039,7 @@ msgid "Formula"
 msgstr "Valem"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Ei saa eemaldada juurkasutajat!"
@@ -2026,11 +2063,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2042,7 +2079,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Aadressi tüüp"
 
@@ -2080,11 +2116,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideed"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2219,6 +2250,11 @@ msgstr "Uuendatud moodulite arv"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2252,12 +2288,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2305,6 +2346,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Kas lisada ühine RML päis või mitte"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2356,7 +2406,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2437,7 +2487,6 @@ msgstr "Saint Tome (Sao Tome) ja Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Arve"
 
@@ -2484,11 +2533,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Ettevõtte loosung"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2606,9 +2650,20 @@ msgid "Default limit for the list view"
 msgstr "Vaikimisi limiit nimekirjavaatele"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Paapua Uus-Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2686,7 +2741,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2745,6 +2800,19 @@ msgstr "Välja seostamised"
 msgid "Export Translations"
 msgstr "Ekspordi tõlked"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2753,7 +2821,7 @@ msgid "Manager"
 msgstr "Juht"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2839,7 +2907,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2869,7 +2937,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2934,22 +3002,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Viga!"
@@ -3043,12 +3111,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Viga! Sa ei saa luua rekursiivseid ettevõtteid."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3065,17 +3133,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3085,7 +3155,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Ei saa uuendata moodulit '%s'. See pole paigaldatud"
@@ -3136,34 +3206,6 @@ msgstr "Konfiguratsiooni parameetrid"
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3202,7 +3244,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3214,6 +3256,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Pangakonto tüüp"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3250,7 +3320,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signaal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3284,7 +3354,7 @@ msgid "Access Controls"
 msgstr "Ligipääsukontroll"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3312,32 +3382,6 @@ msgstr "Emaettevõte"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3357,9 +3401,13 @@ msgstr ""
 "Kui sa tarvitad valemi tüüpi siis kasuta pythoni avaldist rakendades "
 "muutujat 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Viga! Sa ei saa luua rekursiivseid ettevõtteid."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Sünnipäev"
 
@@ -3375,7 +3423,7 @@ msgid "Products Manufacturers"
 msgstr "Tootjad"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3483,7 +3531,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3672,7 +3720,6 @@ msgstr "Aruandlus"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Tiitel"
@@ -3683,13 +3730,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekursiooni viga moodulite sõltuvustes !"
@@ -3749,9 +3801,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Juurdepääs keelatud"
@@ -3762,7 +3815,7 @@ msgid "Company Name"
 msgstr "Ettevõtte nimi"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3781,14 +3834,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Kirje reeglid"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint-Pierre ja Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3817,13 +3893,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3871,19 +3943,7 @@ msgid "Paper Format"
 msgstr "Paberi formaat"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3903,7 +3963,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3948,7 +4008,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3967,9 +4027,43 @@ msgid "Technical Data"
 msgstr "Tehnilised andmed"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4025,13 +4119,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4047,8 +4146,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4107,33 +4206,10 @@ msgid "Languages"
 msgstr "Keeled"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4211,7 +4287,6 @@ msgstr "Piirang"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Vaikimisi"
 
@@ -4283,6 +4358,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4344,9 +4424,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4426,6 +4513,22 @@ msgstr "Lae tõlge"
 msgid "Installed Version"
 msgstr "Paigaldatud versioon"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4449,6 +4552,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4478,6 +4618,12 @@ msgstr ""
 msgid "View"
 msgstr "Vaade"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4555,12 +4701,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4575,7 +4715,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postiindeks"
@@ -4586,13 +4725,18 @@ msgstr "Postiindeks"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Sobiv kuupäeva ja aja esitlus."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4635,6 +4779,8 @@ msgstr "Suund"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vaated"
 
@@ -4650,7 +4796,7 @@ msgid "SMTP Server"
 msgstr "SMTP server"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4711,7 +4857,7 @@ msgstr "Töövood"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Ost"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4744,7 +4890,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4832,7 +4983,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4947,6 +5098,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Täielik juurdepääs"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4960,7 +5116,7 @@ msgid "Portuguese / Português"
 msgstr "Portugali / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4971,7 +5127,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5003,6 +5159,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungari"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5170,7 +5337,7 @@ msgid "Account Owner Name"
 msgstr "Kontoomaniku nimi"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5186,16 +5353,11 @@ msgid "Decimal Separator"
 msgstr "Kümnendkohtade eraldaja"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5236,9 +5398,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Looja"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5301,15 +5464,6 @@ msgstr "Venetsueela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5325,6 +5479,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Manuse nimi"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5408,6 +5567,12 @@ msgstr "Kasahstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Vahendi nimi"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5658,7 +5823,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5715,6 +5880,15 @@ msgstr "Tooted"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5830,13 +6004,15 @@ msgid "Bank Type"
 msgstr "Panga tüüp"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Grupi nimi ei tohi alata \"-\" märgiga"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Rakendused"
 
@@ -5856,7 +6032,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5889,10 +6065,9 @@ msgid "Uncategorized"
 msgstr "Kategoriseerimata"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Vahendi nimi"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5925,6 +6100,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Originaalvaade"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5935,7 +6115,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5951,26 +6131,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Minu pangad"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6103,11 +6263,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6119,8 +6274,8 @@ msgid "Malaysia"
 msgstr "Malaisia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6227,7 +6382,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6265,7 +6420,7 @@ msgid "Created Menus"
 msgstr "Loodud menüüd"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6292,8 +6447,36 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6326,6 +6509,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6368,7 +6558,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6460,7 +6650,7 @@ msgid "Israel"
 msgstr "Iisrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6480,23 +6670,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobiil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6529,10 +6702,10 @@ msgstr "XML aruanne"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moodulid"
 
@@ -6606,8 +6779,8 @@ msgid "United Kingdom"
 msgstr "Suurbritannia"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6631,8 +6804,8 @@ msgid "Partner Titles"
 msgstr "Partneri tiitlid"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6680,18 +6853,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6798,6 +6966,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Siirded"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6892,7 +7067,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Maakond"
@@ -6993,12 +7167,6 @@ msgstr "Täielik nimi"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7040,6 +7208,7 @@ msgstr "Mitmel dokumendil"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7097,7 +7266,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Palun määra toiming, mida alustada!"
@@ -7117,6 +7286,11 @@ msgstr "Kategooria nimi"
 msgid "Northern Mariana Islands"
 msgstr "Põhja-Mariaani saared"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7128,13 +7302,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7165,7 +7344,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7211,7 +7390,6 @@ msgstr "Siire"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7231,30 +7409,30 @@ msgid "Child Categories"
 msgstr "Alamkategooriad"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Tõrge"
@@ -7342,6 +7520,11 @@ msgstr ""
 msgid "This Window"
 msgstr "See aken"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7425,6 +7608,21 @@ msgstr "Väljad"
 msgid "Employees"
 msgstr "Töötajad"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7454,11 +7652,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Aadressid"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7483,7 +7676,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Tänav"
@@ -7494,8 +7686,23 @@ msgid "Yugoslavia"
 msgstr "Jugoslaavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7574,7 +7781,7 @@ msgid "Change My Preferences"
 msgstr "Muuda Eelistusi"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Vigane mudeli nimi toimingu definitsioonis."
@@ -7661,14 +7868,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7677,7 +7886,7 @@ msgid "Company Bank Accounts"
 msgstr "Ettevõtte pangakontod"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7688,13 +7897,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7713,12 +7922,13 @@ msgid "Normal Bank Account"
 msgstr "Tavaline pangakonto"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Nõustaja"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7891,7 +8101,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7922,14 +8132,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Hoiatus!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7953,7 +8155,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8071,7 +8272,7 @@ msgid "Nigeria"
 msgstr "Nigeeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8386,7 +8587,7 @@ msgid "Update Modules List"
 msgstr "Uuenda moodulite nimekirja"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8398,7 +8599,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8408,7 +8609,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8423,6 +8624,17 @@ msgstr "Jätka"
 msgid "Thai / ภาษาไทย"
 msgstr "Tai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8462,7 +8674,7 @@ msgid "Mexico"
 msgstr "Mehhiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8484,15 +8696,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Manuse nimi"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8516,7 +8728,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Kuu nime lühend."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8528,7 +8740,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Tarnija"
@@ -8606,7 +8817,7 @@ msgid "Selectable"
 msgstr "Valitav"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8634,8 +8845,8 @@ msgid "Iteration"
 msgstr "Iteratsioon"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8659,7 +8870,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8806,7 +9017,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Prantsuse)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8845,8 +9056,8 @@ msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Ligipääsuviga"
@@ -8920,7 +9131,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8934,7 +9145,7 @@ msgid "Ukraine"
 msgstr "Ukraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8997,6 +9208,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9095,8 +9311,8 @@ msgid "Custom Shortcuts"
 msgstr "Kohandatud kiirklahvid"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9125,13 +9341,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9152,7 +9368,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9200,7 +9416,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9246,6 +9462,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9254,7 +9471,7 @@ msgid "Cancel"
 msgstr "Loobu"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9273,6 +9490,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9308,7 +9562,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9360,6 +9614,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9402,23 +9661,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9452,7 +9699,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9543,6 +9790,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9747,7 +9999,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9758,13 +10010,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Intervalli ühik"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Liik"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9933,7 +10190,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9966,6 +10223,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9991,6 +10253,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10080,7 +10347,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Linn"
@@ -10116,13 +10382,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Sisesta välja nimi, mille poole kirje id kirjutamiseks pöördub. Kui see on "
+"tühi, siis pöördutakse objekti aktiivse id poole."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 või hilisem versioon"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10181,19 +10456,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10207,6 +10507,8 @@ msgid "Activity"
 msgstr "Tegevus"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10225,7 +10527,12 @@ msgid "Parent Company"
 msgstr "Emaettevõte"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10237,13 +10544,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10325,6 +10625,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Müük ja laohaldus"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10396,6 +10716,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10454,9 +10779,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Ligipääs keelatud"
@@ -10474,8 +10799,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10514,13 +10839,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-post"
@@ -10531,7 +10855,12 @@ msgid "Office Supplies"
 msgstr "Kontoritarbed"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10560,36 +10889,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10611,6 +10910,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "töövoog"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10627,16 +10931,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10653,8 +10947,8 @@ msgid "Cascade"
 msgstr "Kaskaad"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10680,11 +10974,6 @@ msgstr "Tõlgitud"
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10710,7 +10999,7 @@ msgid "Domain"
 msgstr "Domeen"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10726,12 +11015,12 @@ msgid "State Name"
 msgstr "Maakonna nimi"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10752,30 +11041,10 @@ msgid "Timezone"
 msgstr "Ajavöönd"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10795,7 +11064,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10842,7 +11111,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Tänav2"
 
@@ -10866,6 +11134,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10951,19 +11220,28 @@ msgid "Related Partner"
 msgstr "Seotud partner"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "töövoog"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11005,22 +11283,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumendid"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11153,7 +11415,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Klient"
 
@@ -11243,7 +11504,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Ei saanud luua kontakti e-posti aadressita !"
@@ -11293,8 +11554,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11385,7 +11646,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11412,7 +11673,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11498,7 +11759,7 @@ msgid "Mrs."
 msgstr "Pr."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11511,7 +11772,7 @@ msgid "User Ref."
 msgstr "Kasutaja viide"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11556,8 +11817,6 @@ msgstr "Viite juhend"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11565,7 +11824,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11594,12 +11853,6 @@ msgstr "Falklandi saared"
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11706,8 +11959,10 @@ msgid "Selection"
 msgstr "Valik"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11744,7 +11999,7 @@ msgid "Action Type"
 msgstr "Toimingu tüüp"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11880,11 +12135,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Tund 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Kontakti peitmiseks eemalda märge \"Aktiivne\" kastist"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11901,7 +12151,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11924,7 +12174,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11965,16 +12215,16 @@ msgstr "Pronks"
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Vaheta salasõna"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12021,91 +12271,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Eraldaja formaat peaks olema sarnane. [.n] kus 0 < n : alustades ühiku "
-"numbrist. -1 lõpetab eraldamise. Nt [3,2,-1] puhul kuvatakse 106500 -> "
-"1,06,500; [1,2,-1] puhul 106,50,0; [3] puhul 106,500. Kasutatakse ',' "
-"tuhandike eraldajana igal juhul."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Tehnilised funktsioonid"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12284,6 +12500,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12300,7 +12521,7 @@ msgid "Body"
 msgstr "Sisu"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12348,7 +12569,7 @@ msgid "choose"
 msgstr "vali"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12524,10 +12745,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12559,12 +12784,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12578,7 +12804,6 @@ msgstr "Ettevõtte registrikood"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Mitmesugune"
@@ -12600,23 +12825,6 @@ msgstr "Tehniline"
 msgid "China"
 msgstr "Hiina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12684,25 +12892,9 @@ msgid "Bulgaria"
 msgstr "Bulgaaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12730,6 +12922,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12766,6 +12978,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "tundmatu"
@@ -12833,6 +13046,11 @@ msgstr "Aadressiraamat"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12922,6 +13140,7 @@ msgid "Projects, Tasks"
 msgstr "Projektid, ülesanded"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12934,7 +13153,7 @@ msgid "Information"
 msgstr "Informatsioon"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12965,16 +13184,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Uuenda moodulite nimekirja"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13039,6 +13262,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13111,29 +13339,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13181,7 +13386,7 @@ msgid "Delivery Costs"
 msgstr "Tarnekulud"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13225,9 +13430,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Kirje reeglid"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13471,9 +13676,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13500,63 +13710,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turksi and Caicose saared"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13597,17 +13758,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13642,7 +13792,7 @@ msgid "Low"
 msgstr "Madal"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13722,11 +13872,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13741,6 +13890,11 @@ msgstr "Menüü ligipääs"
 msgid "Thailand"
 msgstr "Tai"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13761,6 +13915,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumeenia / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13797,41 +13975,6 @@ msgstr "Objekti seos"
 msgid "eInvoicing & Payments"
 msgstr "eArveldus ja maksed"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13892,40 +14035,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14014,6 +14125,21 @@ msgstr "Vaade :"
 msgid "View Auto-Load"
 msgstr "Vaate automaatlaadimine"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14056,34 +14182,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persia / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14106,9 +14204,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14119,7 +14217,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14145,7 +14273,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14190,7 +14318,7 @@ msgid "Access"
 msgstr "Ligipääs"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14223,11 +14351,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faks"
@@ -14243,8 +14370,6 @@ msgstr "Faks"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14359,7 +14484,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14371,7 +14496,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14404,7 +14528,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14415,8 +14539,8 @@ msgid "Azerbaijan"
 msgstr "Aserbaidžaan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Hoiatus"
@@ -14442,11 +14566,6 @@ msgstr "Neitsisaared (Briti)"
 msgid "Parameters"
 msgstr "Parameetrid"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint-Pierre ja Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14536,7 +14655,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Riik"
@@ -14605,9 +14723,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Paigalda moodul"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"Eraldaja formaat peaks olema sarnane. [.n] kus 0 < n : alustades ühiku "
+"numbrist. -1 lõpetab eraldamise. Nt [3,2,-1] puhul kuvatakse 106500 -> "
+"1,06,500; [1,2,-1] puhul 106,50,0; [3] puhul 106,500. Kasutatakse ',' "
+"tuhandike eraldajana igal juhul."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14634,7 +14760,7 @@ msgid "Japan"
 msgstr "Jaapan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14695,6 +14821,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14719,7 +14876,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14758,6 +14915,12 @@ msgstr ""
 msgid "Condition"
 msgstr "Tingimus"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14810,6 +14973,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Horvaatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14834,6 +15004,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14850,7 +15025,7 @@ msgid "Gold"
 msgstr "Kuld"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14871,15 +15046,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Üldine info"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turksi and Caicose saared"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14915,7 +15127,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14933,11 +15150,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funktsioon"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14973,11 +15194,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Kättetoimetamine"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15005,7 +15221,7 @@ msgid "Workflow Instances"
 msgstr "Töövoo juhtumid"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partnerid: "
@@ -15016,7 +15232,7 @@ msgid "Is a Company?"
 msgstr "On ettevõte?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15082,7 +15298,6 @@ msgstr "Ekspordi nimi"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15177,6 +15392,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Manustatud ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Hoia see väärtus 0, kui toiming peab ilmuma kõigil vahenditel."
 
@@ -15187,6 +15405,9 @@ msgstr ""
 #~ "Määra sõnum. Sa saad kasutada välju objektidest. Nt 'Kallis [[ "
 #~ "object.partner_id.name ]]'"
 
+#~ msgid "Attached Model"
+#~ msgstr "Lisatud mudel"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Päästiku nimi"
 
@@ -15301,6 +15522,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW rada"
 
+#~ msgid "Creator"
+#~ msgstr "Looja"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15487,6 +15711,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Lae ametlik tõlge"
 
+#~ msgid "Delivery"
+#~ msgstr "Kättetoimetamine"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Avatud lähtekoodiga teenindusettevõte"
 
@@ -15496,6 +15723,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Tüübi väljad"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Kontakti peitmiseks eemalda märge \"Aktiivne\" kastist"
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Kongo Demokraatlik Vabariik"
 
@@ -15673,6 +15903,9 @@ msgstr ""
 #~ msgid "\"smtp_server\" needs to be set to send mails to users"
 #~ msgstr "\"smtp_server\" peab olema määratud, et saata e-posti kasutajatele"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontaktnimi"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15815,6 +16048,9 @@ msgstr ""
 #~ msgid "Read"
 #~ msgstr "Loe"
 
+#~ msgid "Addresses"
+#~ msgstr "Aadressid"
+
 #~ msgid "Content"
 #~ msgstr "Sisu"
 
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 365c53f7fcc..f29ef6ce8f0 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-12-24 06:47+0000\n"
 "Last-Translator: Ander Elortondo <ander.elor@gmail.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr "Hego Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index f0af6ea82e0..e968745d3f2 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-18 22:57+0000\n"
 "Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: OpenERP Iran <info@openerp-iran.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:58+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
@@ -39,7 +39,7 @@ msgid "DateTime"
 msgstr "تاریخ و ساعت"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -183,41 +183,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "هشدار!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -225,7 +199,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "خطا در محدودیت"
@@ -236,7 +210,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -247,7 +221,7 @@ msgid "Swaziland"
 msgstr "سوازیلند"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "ایجاد میشود."
@@ -326,20 +300,6 @@ msgstr "شرکت ذخیره رکورد جاری"
 msgid "Max. Size"
 msgstr "اندازه بیشینه"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -347,11 +307,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "نام تماس"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -410,7 +365,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -447,6 +402,7 @@ msgstr "قوانین عملیات خودکار"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "مالک‌"
 
@@ -485,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -537,7 +493,7 @@ msgid "Netherlands Antilles"
 msgstr "آنتیل هلند"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,9 +534,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "نمای بُنیانی"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "‌ایده‌ها"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "بوسنیایی / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -635,9 +571,25 @@ msgstr ""
 "می‌کند، گزارش پیشین بازگردانده می‌شود."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "آنگولا"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -712,14 +664,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "تَردست‌ها"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "نام فیلدهای دلخواه باید با 'x_' آغاز شوند!"
@@ -783,16 +733,14 @@ msgid "Model Description"
 msgstr "شرح مدل"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -821,11 +769,21 @@ msgstr "عبارت رهاساز"
 msgid "Jordan"
 msgstr "اردن"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "تاریخ برنامه ریزی شده بعدی برای انجام این کار"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -957,13 +915,9 @@ msgid "base.language.export"
 msgstr "پایه.زبان.خروج"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"شامل نام فیلدی که شناسه رکورد آن به گردانش نوشتن اشاره دارد. اگر خالی باشد "
-"به شناسه فعال شی اشاره دارد."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "پاپوا گینه‌ی نو"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -981,7 +935,7 @@ msgid "Email Preferences"
 msgstr "تنظیمات ایمیل"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1029,16 +983,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "اسپانیایی / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "همراه"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1135,8 +1082,37 @@ msgid "Mongolia"
 msgstr "مغولستان"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1153,12 +1129,17 @@ msgstr ""
 "میشوند."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1185,7 +1166,54 @@ msgid "Username"
 msgstr "نام کاربری"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1213,7 +1241,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "آزمایش ارتباط ناموفق بود!"
@@ -1245,14 +1273,12 @@ msgid "South Korea"
 msgstr "کره جنوبی"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "گذارها"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1390,7 +1416,7 @@ msgid "Marshall Islands"
 msgstr "جزایر مارشال"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "تغییر مدل این فیلد ممنوع است"
@@ -1412,7 +1438,7 @@ msgid "Search"
 msgstr "جستجو"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1427,7 +1453,14 @@ msgid "Parent Application"
 msgstr "برنامه اصلی"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "تَردست‌ها"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "عملیات لغوشده"
@@ -1553,7 +1586,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "هیچ زبانی با کد %s وجود ندارد"
@@ -1670,7 +1717,7 @@ msgid "On Create"
 msgstr "در هنگام پدیدن"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1680,11 +1727,6 @@ msgstr ""
 "باشنتد!آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در "
 "module.reference_id آمده، هستند."
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1765,7 +1807,7 @@ msgid "East Timor"
 msgstr "تیمور شرقی"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1806,11 +1848,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "شناسه پیوست"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1825,7 +1862,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1866,6 +1903,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "دسترسی خواندن"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1942,16 +1984,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "مدل پیوست"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2006,7 +2043,7 @@ msgid "Formula"
 msgstr "فرمول"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "نمی‌توانید کاربر ریشه را بردارید!"
@@ -2030,11 +2067,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2046,7 +2083,6 @@ msgstr "قالب نمودار حساب ها"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "نوع نشانی"
 
@@ -2084,11 +2120,6 @@ msgstr "آدرس کامل"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "‌ایده‌ها"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2224,6 +2255,11 @@ msgstr "تعداد پیمانه‌های بروزرسانده"
 msgid "Method"
 msgstr "روش"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2257,12 +2293,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2310,6 +2351,15 @@ msgstr "بلیز"
 msgid "Add or not the corporate RML header"
 msgstr "Add or not the corporate RML header"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2361,7 +2411,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2442,7 +2492,6 @@ msgstr "سنت تومه (سائو تومه) و پرینسایپ"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "سیاهه"
 
@@ -2489,11 +2538,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2610,9 +2654,20 @@ msgid "Default limit for the list view"
 msgstr "محدودیت پیش‌فرض برای نمای فهرستی"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "پاپوا گینه‌ی نو"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2690,7 +2745,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2749,6 +2804,19 @@ msgstr "نگاشت‌های فیلد"
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2757,7 +2825,7 @@ msgid "Manager"
 msgstr "مدیر"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2843,7 +2911,7 @@ msgid "Inherited"
 msgstr "موروثی"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2873,7 +2941,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2938,22 +3006,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "خطا!"
@@ -3047,12 +3115,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "خطا! نمی‌توانید شرکت‌های تودرتو بسازید."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3069,17 +3137,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3089,7 +3159,7 @@ msgid "Params storage"
 msgstr "پارامترهای ذخیره سازی"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "نمی‌توانید پیمانه '%s' را ارتقا دهید زیرا برپاسازی نشده است."
@@ -3140,34 +3210,6 @@ msgstr "پارامترهای پیکربندی"
 msgid "Invalid arguments"
 msgstr "آرگومان‌های نامعتبر"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3206,7 +3248,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3218,6 +3260,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "نوع حساب بانکی"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3254,7 +3324,7 @@ msgid "Signal (subflow.*)"
 msgstr "سیگنال (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3288,7 +3358,7 @@ msgid "Access Controls"
 msgstr "کنترل‌های دسترسی"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3316,32 +3386,6 @@ msgstr "شرکت اصلی"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3361,9 +3405,13 @@ msgstr ""
 "اگر از یک نوعِ فرمولی بکار می‌برید، از یک عبارتِ پایتونی جهت مقدار دهی به شی "
 "سود برید."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "خطا! نمی‌توانید شرکت‌های تودرتو بسازید."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "تاریخ تولد"
 
@@ -3379,7 +3427,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3487,7 +3535,7 @@ msgid "Malta"
 msgstr "مالت"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3676,7 +3724,6 @@ msgstr "گزارش"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "عنوان"
@@ -3687,13 +3734,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "تودرتویی پیدا شده"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "خطای تودرتویی در وابستگی‌های پیمانه‌ها!"
@@ -3753,9 +3805,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3766,7 +3819,7 @@ msgid "Company Name"
 msgstr "نام شرکت"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3785,14 +3838,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "قواعد رکورد"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "سنت پیر و میکلون"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3821,13 +3897,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3875,19 +3947,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3907,7 +3967,7 @@ msgid "Nauru"
 msgstr "نائورو"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3952,7 +4012,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3971,9 +4031,43 @@ msgid "Technical Data"
 msgstr "داده‌ فنی"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4029,13 +4123,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "محدود"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "بارکد"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4051,8 +4150,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4111,33 +4210,10 @@ msgid "Languages"
 msgstr "زبان‌ها"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4215,7 +4291,6 @@ msgstr "قید"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "پیش‌فرض"
 
@@ -4287,6 +4362,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4348,9 +4428,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "سورینام"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4430,6 +4517,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4453,6 +4556,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4480,6 +4620,12 @@ msgstr ""
 msgid "View"
 msgstr "نما"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4557,12 +4703,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4577,7 +4717,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "کدپستی"
@@ -4588,13 +4727,18 @@ msgstr "کدپستی"
 msgid "Author"
 msgstr "مولف"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - چگونگی نمایش مناسب تاریخ و ساعت"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4637,6 +4781,8 @@ msgstr "جهت"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "نماها"
 
@@ -4652,7 +4798,7 @@ msgid "SMTP Server"
 msgstr "سرور SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4746,7 +4892,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4834,7 +4985,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4949,6 +5100,11 @@ msgstr "موریتیوس"
 msgid "Full Access"
 msgstr "دسترسی کامل"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4962,7 +5118,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4973,7 +5129,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5005,6 +5161,17 @@ msgstr "سنگال"
 msgid "Hungary"
 msgstr "مجارستان"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5168,7 +5335,7 @@ msgid "Account Owner Name"
 msgstr "نام صاحب حساب"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5184,16 +5351,11 @@ msgid "Decimal Separator"
 msgstr "جداساز شمارگانی"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5234,9 +5396,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "پدیدار"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5299,15 +5462,6 @@ msgstr "ونزوئلا"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> ۳۴۰"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5323,6 +5477,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "نام پیوست"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5406,6 +5565,12 @@ msgstr "قزاقستان"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "نام منبع"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5656,7 +5821,7 @@ msgid "title"
 msgstr "عنوان"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5713,6 +5878,15 @@ msgstr "محصولات"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5828,13 +6002,15 @@ msgid "Bank Type"
 msgstr "نوع بانک"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "نام گروه نمی‌تواند با \"-\" آغاز شود"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5854,7 +6030,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5887,10 +6063,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "نام منبع"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5923,6 +6098,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "نمای بُنیانی"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5933,7 +6113,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5949,26 +6129,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6101,11 +6261,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6117,8 +6272,8 @@ msgid "Malaysia"
 msgstr "مالزی"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6225,7 +6380,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6263,7 +6418,7 @@ msgid "Created Menus"
 msgstr "منوهای پدیدآمده"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6290,8 +6445,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6324,6 +6507,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6366,7 +6556,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6458,7 +6648,7 @@ msgid "Israel"
 msgstr "اسرائیل"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6478,23 +6668,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "همراه"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6527,10 +6700,10 @@ msgstr "گزارش xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "پیمانه‌ها"
 
@@ -6604,8 +6777,8 @@ msgid "United Kingdom"
 msgstr "انگلستان"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6629,8 +6802,8 @@ msgid "Partner Titles"
 msgstr "عناوین همکار"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6678,18 +6851,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6796,6 +6964,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "گذارها"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6890,7 +7065,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "ایالت فدرال"
@@ -6991,12 +7165,6 @@ msgstr "نام کامل"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7038,6 +7206,7 @@ msgstr "روی چند سند"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7095,7 +7264,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "لطفا کُنشی را برای اجرا مشخص کنید!"
@@ -7115,6 +7284,11 @@ msgstr "نام دسته‌بندی"
 msgid "Northern Mariana Islands"
 msgstr "جزایر ماریانای شمالی"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7126,13 +7300,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7163,7 +7342,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7209,7 +7388,6 @@ msgstr "گذار"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7229,30 +7407,30 @@ msgid "Child Categories"
 msgstr "دسته‌بندی‌های فرزند"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "خطا"
@@ -7340,6 +7518,11 @@ msgstr ""
 msgid "This Window"
 msgstr "این پنجره"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7423,6 +7606,21 @@ msgstr "فیلدها"
 msgid "Employees"
 msgstr "کارمندان"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7452,11 +7650,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "نشانی‌ها"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7481,7 +7674,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "خیابان"
@@ -7492,8 +7684,23 @@ msgid "Yugoslavia"
 msgstr "یوگسلاوی"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7572,7 +7779,7 @@ msgid "Change My Preferences"
 msgstr "تغییر ترجیحات من"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "نام مدل در تعریف کنش نامعتبر است."
@@ -7659,14 +7866,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7675,7 +7884,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "به دلایل امنیتی کلمه عبور نمیتواند خالی باشد!"
@@ -7686,13 +7895,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7711,12 +7920,13 @@ msgid "Normal Bank Account"
 msgstr "حساب بانکی معمولی"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "تَردست"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7889,7 +8099,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7921,14 +8131,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "هشدار!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7952,7 +8154,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8070,7 +8271,7 @@ msgid "Nigeria"
 msgstr "نیجریه"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8385,7 +8586,7 @@ msgid "Update Modules List"
 msgstr "بروزرسانی فهرست پیمانه‌ها"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8397,7 +8598,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8407,7 +8608,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8422,6 +8623,17 @@ msgstr "ادامه"
 msgid "Thai / ภาษาไทย"
 msgstr "تایلندی / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8461,7 +8673,7 @@ msgid "Mexico"
 msgstr "مکزیک"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8483,15 +8695,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "نام پیوست"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8515,7 +8727,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - نام اختصاری ماه"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8527,7 +8739,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "تامین‌کننده"
@@ -8605,7 +8816,7 @@ msgid "Selectable"
 msgstr "گزینش پذیر"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8633,8 +8844,8 @@ msgid "Iteration"
 msgstr "تکرار"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "خطای کاربر"
@@ -8658,7 +8869,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8805,7 +9016,7 @@ msgid "Reunion (French)"
 msgstr "گویان فرانسه"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8844,8 +9055,8 @@ msgid "Solomon Islands"
 msgstr "جزایر سلیمان"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "خطای دسترسی"
@@ -8919,7 +9130,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8933,7 +9144,7 @@ msgid "Ukraine"
 msgstr "اوکراین"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8996,6 +9207,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9094,8 +9310,8 @@ msgid "Custom Shortcuts"
 msgstr "میان‌برهای دلخواه"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9124,13 +9340,13 @@ msgid "Models"
 msgstr "مدل ها"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9151,7 +9367,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9199,7 +9415,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9245,6 +9461,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9253,7 +9470,7 @@ msgid "Cancel"
 msgstr "لغو"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9272,6 +9489,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9307,7 +9561,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9359,6 +9613,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9401,23 +9660,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9451,7 +9698,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9542,6 +9789,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9746,7 +9998,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9757,13 +10009,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "یکای بازه"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "گونه"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9933,7 +10190,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9966,6 +10223,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9991,6 +10253,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10080,7 +10347,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "شهر"
@@ -10116,13 +10382,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "استونیایی /  Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"شامل نام فیلدی که شناسه رکورد آن به گردانش نوشتن اشاره دارد. اگر خالی باشد "
+"به شناسه فعال شی اشاره دارد."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 یا نگارش پس"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10181,19 +10456,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10207,6 +10507,8 @@ msgid "Activity"
 msgstr "فعالیت"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10225,7 +10527,12 @@ msgid "Parent Company"
 msgstr "شرکت مادر"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10237,13 +10544,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10325,6 +10625,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10396,6 +10716,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10454,9 +10779,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10474,8 +10799,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "ایراد در پیکربندی 'شناسه رکورد' در کُنش سمت کارپذیر!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10514,13 +10839,12 @@ msgid "Laos"
 msgstr "لائوس"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "پست الکترونیک"
@@ -10531,7 +10855,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10560,36 +10889,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10611,6 +10910,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "اکوادور"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "گردش کار"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10627,16 +10931,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10653,8 +10947,8 @@ msgid "Cascade"
 msgstr "آبشاری"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10680,11 +10974,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10710,7 +10999,7 @@ msgid "Domain"
 msgstr "دامنه"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10726,12 +11015,12 @@ msgid "State Name"
 msgstr "نام استان"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10752,30 +11041,10 @@ msgid "Timezone"
 msgstr "منطقه‌ زمانی"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10795,7 +11064,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10842,7 +11111,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "خیابان۲"
 
@@ -10866,6 +11134,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10951,19 +11220,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "گردش کار"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11005,22 +11283,6 @@ msgstr "دایرکتوری کارمندان"
 msgid "Arguments"
 msgstr "نشانوندها"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11153,7 +11415,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "مشتری"
 
@@ -11243,7 +11504,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11293,8 +11554,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11385,7 +11646,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "ارسال پست الکترونیک موفق نبود"
@@ -11412,7 +11673,7 @@ msgid "Object"
 msgstr "شی"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11498,7 +11759,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11511,7 +11772,7 @@ msgid "User Ref."
 msgstr "مرجع کاربر"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11556,8 +11817,6 @@ msgstr "راهنمای مرجع"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11565,7 +11824,7 @@ msgid "Partner"
 msgstr "همکار"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11594,12 +11853,6 @@ msgstr "جزایر فالکلند"
 msgid "Lebanon"
 msgstr "لبنان"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11706,8 +11959,10 @@ msgid "Selection"
 msgstr "انتخاب"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11744,7 +11999,7 @@ msgid "Action Type"
 msgstr "نوع واکنش"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11880,11 +12135,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "ساعت ۰۰->۱۲: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "تیک فیلد فعال را برای مخفی شدن تماس بردارید."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11901,7 +12151,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11924,7 +12174,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11965,16 +12215,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "حسابداری حقوق و دستمزد"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "سورینام"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12021,91 +12271,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12284,6 +12500,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12300,7 +12521,7 @@ msgid "Body"
 msgstr "بدنه"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12348,7 +12569,7 @@ msgid "choose"
 msgstr "انتخاب"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12524,10 +12745,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12559,12 +12784,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12578,7 +12804,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12600,23 +12825,6 @@ msgstr ""
 msgid "China"
 msgstr "چین"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12684,25 +12892,9 @@ msgid "Bulgaria"
 msgstr "بلغارستان"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "آنگولا"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12730,6 +12922,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12766,6 +12978,7 @@ msgstr "اسلواکی / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "ناشناخته"
@@ -12833,6 +13046,11 @@ msgstr "دفترچه آدرس"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12922,6 +13140,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12934,7 +13153,7 @@ msgid "Information"
 msgstr "اطلاعات"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12965,16 +13184,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13039,6 +13262,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13111,29 +13339,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13181,7 +13386,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13225,9 +13430,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "قواعد رکورد"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13471,9 +13676,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13500,63 +13710,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "جزایر ترک و کایکوس"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13597,17 +13758,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13642,7 +13792,7 @@ msgid "Low"
 msgstr "پایین"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13722,11 +13872,10 @@ msgid "El Salvador"
 msgstr "ال‌سالوادور"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "تلفن"
@@ -13741,6 +13890,11 @@ msgstr "منوی دسترسی"
 msgid "Thailand"
 msgstr "تایلند"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13761,6 +13915,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13797,41 +13975,6 @@ msgstr "رابطه شی"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13892,40 +14035,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14014,6 +14125,21 @@ msgstr "نما:"
 msgid "View Auto-Load"
 msgstr "نمایش بارگذاری خودکار"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14056,34 +14182,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارسی"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14106,9 +14204,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14119,7 +14217,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14145,7 +14273,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14190,7 +14318,7 @@ msgid "Access"
 msgstr "دسترسی"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14223,11 +14351,10 @@ msgid "Bahrain"
 msgstr "بحرین"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "فکس"
@@ -14243,8 +14370,6 @@ msgstr "فکس"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14359,7 +14484,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14371,7 +14496,6 @@ msgstr "جامائیکا"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14404,7 +14528,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14415,8 +14539,8 @@ msgid "Azerbaijan"
 msgstr "آذربایجان"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "هشدار"
@@ -14442,11 +14566,6 @@ msgstr "جزایر ویرجین انگلستان"
 msgid "Parameters"
 msgstr "پارامترها"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "سنت پیر و میکلون"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14536,7 +14655,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "کشور"
@@ -14605,9 +14723,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14634,7 +14760,7 @@ msgid "Japan"
 msgstr "ژاپن"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14695,6 +14821,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "کانادا - حسابداری"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14719,7 +14876,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14758,6 +14915,12 @@ msgstr "اجرا"
 msgid "Condition"
 msgstr "شرط"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14810,6 +14973,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "کرواسی"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14834,6 +15004,11 @@ msgstr "به روز رسانی سیستم"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14850,7 +15025,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14871,15 +15046,52 @@ msgstr "سیرالئون"
 msgid "General Information"
 msgstr "اطلاعات عمومی"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "جزایر ترک و کایکوس"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14915,7 +15127,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14933,11 +15150,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "کارکرد"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14973,11 +15194,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "تحویل"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15005,7 +15221,7 @@ msgid "Workflow Instances"
 msgstr "وهله‌های کارگردش"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "همکاران: "
@@ -15016,7 +15232,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15082,7 +15298,6 @@ msgstr "نام برونش"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15136,6 +15351,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "روی چندین سند."
 
+#~ msgid "Contact Name"
+#~ msgstr "نام تماس"
+
 #~ msgid "Select Action Type"
 #~ msgstr "نوع کنش را برگزینید"
 
@@ -15183,6 +15401,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "شناسه پیوست"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "اگر کُنش باید روی همه منابع نشان داده شود با صفر را ادامه دهید."
 
@@ -15193,6 +15414,9 @@ msgstr ""
 #~ "پیغام را تعیین کنید. می‌توانید از فیلدهای شی بکار گیرید. برای نمونه '[[ "
 #~ "object.partner_id.name ]] گرامی'"
 
+#~ msgid "Attached Model"
+#~ msgstr "مدل پیوست"
+
 #~ msgid "Trigger Name"
 #~ msgstr "نام رهاساز"
 
@@ -15323,6 +15547,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "مسیر SXW"
 
+#~ msgid "Creator"
+#~ msgstr "پدیدار"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15405,6 +15632,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "نشانی‌ها"
+
 #~ msgid "XML Identifier"
 #~ msgstr "شناسه XML"
 
@@ -15623,6 +15853,9 @@ msgstr ""
 #~ msgid "Save As Attachment Prefix"
 #~ msgstr "ذخیره بصورت پیشوند پیوست"
 
+#~ msgid "Delivery"
+#~ msgstr "تحویل"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "کد شناسه بانک / سویفت"
 
@@ -15816,6 +16049,9 @@ msgstr ""
 #~ msgid "Open Source Service Company"
 #~ msgstr "شرکت خدماتی متن باز"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "تیک فیلد فعال را برای مخفی شدن تماس بردارید."
+
 #~ msgid "Modules to update"
 #~ msgstr "ماژول هایی که بروزرسانی می شوند"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 91e3499cb64..7f8b61fdd32 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-04 20:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dari Persian <fa_AF@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:03+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 040b1e09b34..d55406ed6b0 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 04:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "PäivämääräKellonaika"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -191,41 +191,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Varoitus!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -235,7 +209,7 @@ msgstr ""
 "Python koodilla, mielummin käyttämällä addon modulia!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Rajoitus virhe"
@@ -246,7 +220,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -257,7 +231,7 @@ msgid "Swaziland"
 msgstr "Swazimaa"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "luotu."
@@ -336,20 +310,6 @@ msgstr "Yritys johon nykyinen tietue tallennetaan"
 msgid "Max. Size"
 msgstr "Maksimikoko"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -357,11 +317,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontaktin nimi"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -420,7 +375,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -457,6 +412,7 @@ msgstr "Automaattiset toimintasäännöt"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Omistaja"
 
@@ -497,7 +453,7 @@ msgstr ""
 "sallitut muotoilut, jotka näytetään kun muokkaat kieltä."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -550,7 +506,7 @@ msgid "Netherlands Antilles"
 msgstr "Alankomaiden Antillit"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -590,9 +546,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Alkuperäinen näkymä"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideat"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -617,26 +573,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnia / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -647,9 +583,25 @@ msgstr ""
 "liitteen, palautetaan edellinen raportti."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -724,14 +676,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Ohjatut toiminnot"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Kustomoidun kentän nimen täytyy alkaa 'x_' !"
@@ -795,17 +745,21 @@ msgid "Model Description"
 msgstr "Mallin kuvaus"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Markkinoinnin valikko.\n"
+"==================\n"
+"\n"
+"Sisältää asennusohjelman markkinointiin liittyville moduuleille.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -833,11 +787,21 @@ msgstr "Liipaiseva lauseke"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Työn seuraava suunniteltu toteutuspäivä."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -969,13 +933,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Anna kentän nimi johon tunnuksen kirjoitus tapahtuu. Jos jätetään tyhjäksi, "
-"kirjoitukseen käytetään objektin aktiivista tunnusta."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua-Uusi-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -994,7 +954,7 @@ msgid "Email Preferences"
 msgstr "Sähköpostiasetukset"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1042,16 +1002,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Espanja / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Matkapuhelin"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1148,8 +1101,37 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1165,12 +1147,17 @@ msgstr ""
 "Tähän ryhmään lisätyt käyttäjät lisätään automaattisesti seuraaviin ryhmiin."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1197,7 +1184,54 @@ msgid "Username"
 msgstr "Käyttäjänimi"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1227,7 +1261,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Yhteystesti epäonnistui!"
@@ -1259,14 +1293,12 @@ msgid "South Korea"
 msgstr "Etelä-Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Siirtymät"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Tietuetta #%d / %s ei löydy, ei voi kopioida!"
@@ -1404,7 +1436,7 @@ msgid "Marshall Islands"
 msgstr "Marshallinsaaret"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Kenttämallin muuttaminen on kielletty!"
@@ -1426,7 +1458,7 @@ msgid "Search"
 msgstr "Haku"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1445,7 +1477,14 @@ msgid "Parent Application"
 msgstr "Ylätason ohjelma"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Ohjatut toiminnot"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Toiminto Peruutettu"
@@ -1573,7 +1612,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Kieltä \"%s\" ei löydy"
@@ -1696,7 +1749,7 @@ msgid "On Create"
 msgstr "Luotaessa"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1706,11 +1759,6 @@ msgstr ""
 "käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id "
 "kerrotaan"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1793,7 +1841,7 @@ msgid "East Timor"
 msgstr "Itä-Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1834,11 +1882,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Liitetty ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1855,7 +1898,7 @@ msgstr ""
 "maksutavan käsittelyä, automatisoi keräilyistan luonnin yms."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1896,6 +1939,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Lukuoikeus"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1972,16 +2020,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Liitetty malli"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2036,7 +2079,7 @@ msgid "Formula"
 msgstr "Kaava"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Root-käyttäjää ei voi poistaa!"
@@ -2060,11 +2103,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopio)"
@@ -2076,7 +2119,6 @@ msgstr "Tilikarttamalli"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Osoitteen tyyppi"
 
@@ -2114,11 +2156,6 @@ msgstr "Täydellinen tiedostopolku"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideat"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2254,6 +2291,11 @@ msgstr "Päivitettyjen moduulien määrä"
 msgid "Method"
 msgstr "Menetelmä"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2287,12 +2329,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2342,6 +2389,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Lisää halutessasi RML-ylätunniste"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2395,7 +2451,7 @@ msgstr ""
 "'tree', 'calendar', etc. (oletusarvo: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2477,7 +2533,6 @@ msgstr "São Tomé ja Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Lasku"
 
@@ -2524,11 +2579,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2645,9 +2695,20 @@ msgid "Default limit for the list view"
 msgstr "Oletusasetus raja listanäkymälle"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua-Uusi-Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2725,7 +2786,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2784,6 +2845,19 @@ msgstr "Kenttien kartoitukset"
 msgid "Export Translations"
 msgstr "Viennin käännökset"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2792,7 +2866,7 @@ msgid "Manager"
 msgstr "Ylläpitäjä"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2878,7 +2952,7 @@ msgid "Inherited"
 msgstr "Peritty"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2908,7 +2982,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2975,22 +3049,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Virheellinen objekti arkkitehtuuri!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Virhe!"
@@ -3087,12 +3161,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3109,17 +3183,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3129,7 +3205,7 @@ msgid "Params storage"
 msgstr "Parametrien säilö"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Moduulia \"%s\" ei voi päivittää, koska sitä ei ole asennettu."
@@ -3180,34 +3256,6 @@ msgstr "Asetuksien parametrit"
 msgid "Invalid arguments"
 msgstr "Virheellisiä argumentteja"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3246,7 +3294,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3258,6 +3306,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Pankkitilin tyyppi"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3294,7 +3370,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signaali (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3333,7 +3409,7 @@ msgid "Access Controls"
 msgstr "Käyttöoikeudet"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3363,32 +3439,6 @@ msgstr "Pääyritys"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3408,9 +3458,13 @@ msgstr ""
 "Jos valitset tyypiksi kaavan, kirjoita python-lauseke käyttämällä muuttujaa "
 "\"object\"."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Syntymäpäivä"
 
@@ -3426,7 +3480,7 @@ msgid "Products Manufacturers"
 msgstr "Tuotteiden valmistajat"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Turvattu sähköposti (SMTP-over-SSL) ei ole käytettävissä."
@@ -3535,7 +3589,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3725,7 +3779,6 @@ msgstr "Raportointi"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Otsikko"
@@ -3736,13 +3789,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Jos ei asetettu, toimii oletusarvona uusille resursseille"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Rekursiivisyys havaittu."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekursiivisyysvirhe moduulien riippuvuuksissa!"
@@ -3802,9 +3860,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3815,7 +3874,7 @@ msgid "Company Name"
 msgstr "Yrityksen nimi"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3834,14 +3893,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Tietuesäännöt"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint-Pierre ja Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3870,13 +3952,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3924,19 +4002,7 @@ msgid "Paper Format"
 msgstr "Paperin formaatti"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3956,7 +4022,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4001,7 +4067,7 @@ msgid "Email Gateway"
 msgstr "Sähköpostin välityspalvelin"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4020,9 +4086,43 @@ msgid "Technical Data"
 msgstr "Tekniset tiedot"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4078,13 +4178,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Väärä arkkitehtuuri!"
@@ -4100,9 +4205,9 @@ msgid "Share any Document"
 msgstr "Jaa mikä tahansa dokumentti"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Ryhmä vaaditaan"
 
 #. module: base
 #: view:res.lang:0
@@ -4160,33 +4265,10 @@ msgid "Languages"
 msgstr "Kielet"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4264,7 +4346,6 @@ msgstr "Rajoitus"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Oletus"
 
@@ -4339,6 +4420,11 @@ msgstr ""
 "prioriteetin palvelinta käytetään. Oletusprioriteetti on 10 (pienempi numero "
 "= suurempi prioriteetti)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4402,9 +4488,16 @@ msgid "Default value or action reference"
 msgstr "Oletusarvo tai toiminnon viite"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4484,6 +4577,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4509,6 +4618,43 @@ msgstr ""
 "Jos sinulla on ryhmiä, tämän menun näkyvyys riippuu ryhmistä. Jos tämä "
 "kenttä on tyhjä, OpenERP laskee näkyvyyden objektin lukuoikeuden pohjalta."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4538,6 +4684,12 @@ msgstr ""
 msgid "View"
 msgstr "Näkymä"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4615,12 +4767,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4635,7 +4781,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postinumero"
@@ -4646,13 +4791,18 @@ msgstr "Postinumero"
 msgid "Author"
 msgstr "Laatija"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Aseta tehtäväksi"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Sopiva päivämäärän ja kellonajan esitysmuoto."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4698,6 +4848,8 @@ msgstr "Suunta"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Näkymät"
 
@@ -4713,7 +4865,7 @@ msgid "SMTP Server"
 msgstr "SMTP-palvelin"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Yrität poistaa moduulia joka on asennettu tai tullaan asentamaan"
@@ -4806,7 +4958,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4894,7 +5051,7 @@ msgid "System Configuration Done"
 msgstr "Järjestelmän määrittelyt tehty"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Virhe tarkistettaessa kenttiä %s: %s"
@@ -5009,6 +5166,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Täydet oikeudet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5022,7 +5184,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Kentän \"%s\" tallennustavan muuttaminen ei ole sallittu."
@@ -5033,7 +5195,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Vain jos tämä tili kuuluu yrityksellesi"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5065,6 +5227,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Unkari"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5228,7 +5401,7 @@ msgid "Account Owner Name"
 msgstr "Tilin omistajan nimi"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Ei voi muuttaa sarakkeen nimeä %s, koska se sarake on jo olemassa!"
@@ -5244,16 +5417,11 @@ msgid "Decimal Separator"
 msgstr "Desimaalin erotin"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5298,9 +5466,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Tekijä"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Moduulin nimen pitää olla uniikki"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5363,15 +5532,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j = 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5387,6 +5547,11 @@ msgstr "Lounaskonfiguraation velho"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Liitteen nimi"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5470,6 +5635,12 @@ msgstr "Kazakstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - viikonpäivän numero 0(Sunnuntai),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Resurssin nimi"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5724,7 +5895,7 @@ msgid "title"
 msgstr "otsake"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5781,6 +5952,15 @@ msgstr "Tuotteet"
 msgid "User-defined Defaults"
 msgstr "Käyttäjän määrittelemät oletusarvot"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5896,13 +6076,15 @@ msgid "Bank Type"
 msgstr "Pankin tyyppi"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Ryhmän nimi ei voi alkaa \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Sovellukset"
 
@@ -5922,7 +6104,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5957,10 +6139,9 @@ msgid "Uncategorized"
 msgstr "Luokittelemattomat"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Resurssin nimi"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5996,6 +6177,11 @@ msgstr ""
 "signaali testaa painetun napin nimen. Jos signaali on NULL, nappi ei ole "
 "tarpeellinen siirtymän varmistamiseksi."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Alkuperäinen näkymä"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6006,7 +6192,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6022,26 +6208,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Omat pankit"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6174,11 +6340,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6190,8 +6351,8 @@ msgid "Malaysia"
 msgstr "Malesia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6300,7 +6461,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Näkymätyyppiä '%s' ei ole määritelty rakenteelle."
@@ -6338,7 +6499,7 @@ msgid "Created Menus"
 msgstr "Luodut valikot"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6365,9 +6526,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Aseta tehtäväksi"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6399,6 +6588,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Nykyinen vuosi ilman vuosisataa. %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6441,7 +6637,7 @@ msgid "Audit Trail"
 msgstr "Seuranta"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6533,7 +6729,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6553,23 +6749,6 @@ msgstr "Kutsutaan myös BIC tai SWIFT koodiksi."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Matkapuhelin"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6602,10 +6781,10 @@ msgstr "Reportin XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduulit"
 
@@ -6679,8 +6858,8 @@ msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6705,8 +6884,8 @@ msgid "Partner Titles"
 msgstr "Kumppanien yhtiömuodot"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6754,7 +6933,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6763,11 +6942,6 @@ msgstr ""
 "Et voi suorittaa tätä operaatiota. Uusien tietueiden luonti ei ole sallittu "
 "tässä objektissa, koska tämä objekti on tarkoitettu raportointia varten."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6876,6 +7050,13 @@ msgstr "Moduulitiedosto tuotu onnistuneesti!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Siirtymät"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6973,7 +7154,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Osavaltio"
@@ -7074,12 +7254,6 @@ msgstr "Koko nimi"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Moduulin nimen pitää olla uniikki"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7121,6 +7295,7 @@ msgstr "Useammassa dokumentissa"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7178,7 +7353,7 @@ msgid "Connection Security"
 msgstr "Yhteyden turvallisuus"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Määrittele toiminto joka käynnistetään!"
@@ -7198,6 +7373,11 @@ msgstr "Kategorian nimi"
 msgid "Northern Mariana Islands"
 msgstr "Pohjois-Mariaanit"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7209,7 +7389,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat raportointi"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7218,6 +7398,11 @@ msgstr ""
 "Ole hyvä ja käytä salasanan vaihto velhoa (käyttäjäasetuksissa tai käyttäjä "
 "menussa) vaihtaaksesi salasanaa."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7248,7 +7433,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Ei riittävästi kenttiä kalenterinäkymän"
@@ -7296,7 +7481,6 @@ msgstr "Siirtymä"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7316,30 +7500,30 @@ msgid "Child Categories"
 msgstr "Alakategoriat"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Virhe"
@@ -7427,6 +7611,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Tämä ikkuna"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7512,6 +7701,21 @@ msgstr "Kentät"
 msgid "Employees"
 msgstr "Työntekijät"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7541,11 +7745,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Testaa yhteyttä"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Osoitteet"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7570,7 +7769,6 @@ msgstr "Valitaoptiot"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Katu"
@@ -7581,9 +7779,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Oikea ylätaso"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7661,7 +7874,7 @@ msgid "Change My Preferences"
 msgstr "Muuta asetuksiani"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
@@ -7748,21 +7961,17 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Markkinoinnin valikko.\n"
-"==================\n"
-"\n"
-"Sisältää asennusohjelman markkinointiin liittyville moduuleille.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7770,7 +7979,7 @@ msgid "Company Bank Accounts"
 msgstr "Yrityksen pankkitilit"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Tyhjän salasanan käyttäminen ei ole sallittua tietoturvasyistä!"
@@ -7781,13 +7990,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Mahdollinen SMTP autentikoinnin salasana"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7809,12 +8018,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Ohjattu toiminto"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7987,7 +8197,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8019,14 +8229,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Varoitus!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8050,7 +8252,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8170,7 +8371,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Valinta optiot on annettava valintakentille!"
@@ -8487,7 +8688,7 @@ msgid "Update Modules List"
 msgstr "Päivitä lista moduuleista"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8501,7 +8702,7 @@ msgid "eInvoicing"
 msgstr "eLasku"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8515,7 +8716,7 @@ msgstr ""
 "(voit klikata Peruuta käyttäjäasetuksissa nyt)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "Arvo \"%s\" kentälle \"%s.%s\" ei ole valittavissa"
@@ -8530,6 +8731,17 @@ msgstr "Jatka"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8569,7 +8781,7 @@ msgid "Mexico"
 msgstr "Meksiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8591,15 +8803,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "SMTP palvelin puuttuu"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Liitteen nimi"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8623,7 +8835,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Lyhennetty kuukauden nimi."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8635,7 +8847,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Toimittaja"
@@ -8713,7 +8924,7 @@ msgid "Selectable"
 msgstr "Valittavissa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Kaikki näyttäisi olevan kunnolla asetettuna!"
@@ -8741,8 +8952,8 @@ msgid "Iteration"
 msgstr "Iteraatio"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Käyttäjävirhe"
@@ -8766,7 +8977,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8913,7 +9124,7 @@ msgid "Reunion (French)"
 msgstr "Réunion (Ranska)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8954,8 +9165,8 @@ msgid "Solomon Islands"
 msgstr "Salomonsaaret"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Käyttöoikeusvirhe"
@@ -9029,7 +9240,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9046,7 +9257,7 @@ msgid "Ukraine"
 msgstr "Ukraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9109,6 +9320,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flaami (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnam / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9207,9 +9423,9 @@ msgid "Custom Shortcuts"
 msgstr "Omat pikalinkit"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnam / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9237,13 +9453,13 @@ msgid "Models"
 msgstr "Mallit"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Tietuetta ei voi muuttaa juuri nyt"
@@ -9264,7 +9480,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9312,7 +9528,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Mallia %s ei ole olemassa!"
@@ -9358,6 +9574,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9366,7 +9583,7 @@ msgid "Cancel"
 msgstr "Peruuta"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9385,6 +9602,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9420,7 +9674,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9472,6 +9726,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - tuntia (12-tunnin kello) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9514,23 +9773,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Valuuttakoodin pitää olla uniikki yrityskohtaisesti!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9564,7 +9811,7 @@ msgid "Products Expiry Date"
 msgstr "Tuotteen vanhenemispäivä"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Klikkaa 'Jatka' konfiguroidaksesi seuraavan lisäohjelman..."
@@ -9656,6 +9903,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9862,7 +10114,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Markkinointikamppanja - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9873,13 +10125,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Väliyksikkö"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tyyppi"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Tätä menetelmää ei ole enää olemassa"
@@ -10051,7 +10308,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10086,6 +10343,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10111,6 +10373,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Kuvakkeen URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10202,7 +10469,6 @@ msgstr "%m - kuukauden numero [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Kaupunki"
@@ -10238,13 +10504,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Viro / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Anna kentän nimi johon tunnuksen kirjoitus tapahtuu. Jos jätetään tyhjäksi, "
+"kirjoitukseen käytetään objektin aktiivista tunnusta."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 tai myöhäisempi versio"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10305,19 +10580,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10331,6 +10631,8 @@ msgid "Activity"
 msgstr "Toiminto"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10349,7 +10651,12 @@ msgid "Parent Company"
 msgstr "Emoyhtiö"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID autentikointi"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10361,13 +10668,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10454,6 +10754,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10527,6 +10847,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Sekvenssi tyyppi"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10587,9 +10912,9 @@ msgstr ""
 "Poista ensin kieli käytöstä."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10607,8 +10932,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Ongelma palvelintoiminnon konfiguraatiossa \"Talletustunnus\"."
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10649,13 +10974,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Sähköposti"
@@ -10666,7 +10990,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10697,36 +11026,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10748,6 +11047,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "työnkulku"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10764,16 +11068,6 @@ msgstr "Työsuhteiden sopimukset"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Et voi poistaa kieltä joka on käyttäjän asettama kieli!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10790,9 +11084,9 @@ msgid "Cascade"
 msgstr "Sarjoita"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Ryhmä vaaditaan"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10819,11 +11113,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10849,7 +11138,7 @@ msgid "Domain"
 msgstr "Toimialue"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10865,12 +11154,12 @@ msgid "State Name"
 msgstr "Valtion nimi"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10891,30 +11180,10 @@ msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10934,7 +11203,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10987,7 +11256,6 @@ msgstr "Ostojen kaksinkertainen tarkistus"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Katuosoite2"
 
@@ -11011,6 +11279,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11096,19 +11365,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Eheysvirhe"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "työnkulku"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Kentän koko ei voi koskaan olla alle 1 !"
@@ -11150,22 +11428,6 @@ msgstr "Työntekijähakemisto"
 msgid "Arguments"
 msgstr "Argumentit"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11298,7 +11560,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Asiakas"
 
@@ -11388,7 +11649,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11438,9 +11699,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID autentikointi"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11530,7 +11791,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Sähköpostin lähetys epäonnistui"
@@ -11557,7 +11818,7 @@ msgid "Object"
 msgstr "Objekti"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11643,7 +11904,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11656,7 +11917,7 @@ msgid "User Ref."
 msgstr "Käyttäjän viite"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11701,8 +11962,6 @@ msgstr "Referenssiopaste"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11710,7 +11969,7 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11740,12 +11999,6 @@ msgstr "Falklandinsaaret"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11854,9 +12107,11 @@ msgid "Selection"
 msgstr "Valinta"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Kuvakkeen URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -11892,7 +12147,7 @@ msgid "Action Type"
 msgstr "Toiminnon tyyppi"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12030,11 +12285,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Tunti 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Poista valinta piilottaaksesi yhteyshenkilön."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12051,7 +12301,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "%s sisältää tuntemattoman attribuutin %s "
@@ -12074,7 +12324,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Määrittelemätön \"get\" menetelmä!"
@@ -12115,16 +12365,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Palkkakirjanpito"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binääritiedosto tai ulkoinen verkko-osoite"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Vaihda salasana"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12171,91 +12421,57 @@ msgid "Address Format"
 msgstr "Osoitteen muotoilu"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa "
-"erottelun. Esimerkiksi luku 106500 (tuhaterottimena on käytetty "
-"pilkkua):[3,2,-1] esittää sen muodossa 1,06,500;[1,2,-1] esittää sen "
-"muodossa 106,50,0;[3] esittää sen muodossa 106,500."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Tekniset ominaisuudet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12439,6 +12655,11 @@ msgstr ""
 "Auttaa sinua hallitsemaan varastoa ja varaston päätoimenpiteitä, "
 "toimitusmääräyksiä, vastaanottoja yms."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12455,7 +12676,7 @@ msgid "Body"
 msgstr "Runko"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Yhteystesti onnistui!"
@@ -12505,7 +12726,7 @@ msgid "choose"
 msgstr "valitse"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12683,10 +12904,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12718,12 +12943,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12738,7 +12964,6 @@ msgstr "Yritysrekisteri"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
@@ -12760,23 +12985,6 @@ msgstr ""
 msgid "China"
 msgstr "Kiina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12852,25 +13060,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12898,6 +13090,26 @@ msgstr "5. %y, %Y = 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12934,6 +13146,7 @@ msgstr "Slovakia / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "tuntematon"
@@ -13001,6 +13214,11 @@ msgstr "Osoitekirja"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13090,6 +13308,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13102,7 +13321,7 @@ msgid "Information"
 msgstr "Tiedot"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13133,16 +13352,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Oikea ylätaso"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Päivitettävien moduulien lista"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13207,6 +13430,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "osv_memory kenttää voidaan vertailla vain = and != operaattoreilla."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13279,29 +13507,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Ulkoinen tunniste"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13349,7 +13554,7 @@ msgid "Delivery Costs"
 msgstr "Toimituskustannukset"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13395,9 +13600,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Tietokantasalasanan kryptaus"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Tietuesäännöt"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13644,9 +13849,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13673,63 +13883,14 @@ msgid "System Configuration done"
 msgstr "Järjestelmä on konfiguroitu"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks- ja Caicossaaret"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13770,17 +13931,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13815,7 +13965,7 @@ msgid "Low"
 msgstr "Matala"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Virhe! Et voi luoda rekursiivista valikkoa."
@@ -13897,11 +14047,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Puhelin"
@@ -13916,6 +14065,11 @@ msgstr "Käyttöoikeus valikko"
 msgid "Thailand"
 msgstr "Thaimaa"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13936,6 +14090,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romania / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13972,41 +14150,6 @@ msgstr "Objektin suhde"
 msgid "eInvoicing & Payments"
 msgstr "sähköinen laskutus ja maksut"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14067,40 +14210,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14195,6 +14306,21 @@ msgstr "Näkymä:"
 msgid "View Auto-Load"
 msgstr "Näkymän automaattinen lataus"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14237,34 +14363,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14287,9 +14385,9 @@ msgid "Unmet dependency !"
 msgstr "Riippuvuus ei kunnossa !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14300,7 +14398,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14326,7 +14454,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14371,7 +14499,7 @@ msgid "Access"
 msgstr "Käyttöoikeus"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14404,11 +14532,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faksi"
@@ -14424,8 +14551,6 @@ msgstr "Faksi"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14540,7 +14665,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14552,7 +14677,6 @@ msgstr "Jamaika"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Väri-indeksi"
 
@@ -14589,7 +14713,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14600,8 +14724,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaidžan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Varoitus"
@@ -14627,11 +14751,6 @@ msgstr "Brittiläiset Neitsytsaaret"
 msgid "Parameters"
 msgstr "Parametrit"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint-Pierre ja Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14723,7 +14842,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Maa"
@@ -14794,9 +14912,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Espanja (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa "
+"erottelun. Esimerkiksi luku 106500 (tuhaterottimena on käytetty "
+"pilkkua):[3,2,-1] esittää sen muodossa 1,06,500;[1,2,-1] esittää sen "
+"muodossa 106,50,0;[3] esittää sen muodossa 106,500."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14823,7 +14949,7 @@ msgid "Japan"
 msgstr "Japani"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Vain yhden sarakkeen nimeä voi muuttaa kerrallaan"
@@ -14884,6 +15010,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14908,7 +15065,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Huomaa että tämä operaatio voi kestää muutaman minuutin"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14947,6 +15104,12 @@ msgstr "Suorittaminen"
 msgid "Condition"
 msgstr "Ehto"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15001,6 +15164,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Kroatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15025,6 +15195,11 @@ msgstr "Järjestelmäpäivitys"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15041,7 +15216,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15062,15 +15237,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Yleistiedot"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks- ja Caicossaaret"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15106,7 +15318,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Varoitus yrityksen vaihtamisesta"
@@ -15126,11 +15343,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Sarjan seuraavaan numeroon lisätään tämä luku"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Toiminto"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15168,11 +15389,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Toimitus"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15200,7 +15416,7 @@ msgid "Workflow Instances"
 msgstr "Työnkulun instanssit"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Kumppanit: "
@@ -15211,7 +15427,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15277,7 +15493,6 @@ msgstr "Vienti nimi"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15333,6 +15548,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Useammassa dokumentissa"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontaktin nimi"
+
 #~ msgid "Select Action Type"
 #~ msgstr "Valitse toiminnon tyyppi"
 
@@ -15396,6 +15614,9 @@ msgstr ""
 #~ "Kirjoita viesti. Voit käyttää kenttiä objektista, esim. \"Hei [[ "
 #~ "object.partner_id.name ]]\""
 
+#~ msgid "Attached Model"
+#~ msgstr "Liitetty malli"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Liipaisimen nimi"
 
@@ -15486,6 +15707,9 @@ msgstr ""
 #~ msgid "res.groups"
 #~ msgstr "res.groups"
 
+#~ msgid "Creator"
+#~ msgstr "Tekijä"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15659,6 +15883,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Lataa virallinen käännös"
 
+#~ msgid "Delivery"
+#~ msgstr "Toimitus"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Avoimen lähdekoodin palveluyritys"
 
@@ -15668,6 +15895,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Tyyppikentät"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Poista valinta piilottaaksesi yhteyshenkilön."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Kongon demokraattinen tasavalta"
 
@@ -15802,6 +16032,9 @@ msgstr ""
 #~ msgid "You can not remove the model '%s' !"
 #~ msgstr "Mallia '%s' ei voida poistaa!"
 
+#~ msgid "Attached ID"
+#~ msgstr "Liitetty ID"
+
 #, python-format
 #~ msgid "Not implemented search_memory method !"
 #~ msgstr "Search_memory-menetelmä ei käytössä!"
@@ -15889,6 +16122,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Osoitteet"
+
 #, python-format
 #~ msgid "The exists method is not implemented on this object !"
 #~ msgstr "Käytettävää metodia ei ole toteutettu tälle objektille !"
@@ -16676,6 +16912,9 @@ msgstr ""
 #~ "moduuleita klikkaa napiia 'Ajasta asennettavaksi' lomakenäkymästä, sen "
 #~ "jälkeeen klikkaa 'Asenna ajastetut päviitykset' päivitysten käynnistämiseksi."
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binääritiedosto tai ulkoinen verkko-osoite"
+
 #~ msgid ""
 #~ "Indicates whether this object model lives in memory only, i.e. is not "
 #~ "persisted (osv.osv_memory)"
@@ -17233,6 +17472,9 @@ msgstr ""
 #~ msgid "User - All Leads"
 #~ msgstr "Käyttäjä - Kaikki liidit"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Tietokantasalasanan kryptaus"
+
 #~ msgid "Address Information"
 #~ msgstr "Osoitetiedot"
 
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 548314881e4..07d6efbe5d0 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-06 10:07+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-12-07 04:34+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "Horodatage"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -220,70 +220,15 @@ msgstr ""
 "fabriquer des rapports de revenus théoriques."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"Le module générique de Gestion de la Relation Client d'OpenERP (CRM)\n"
-"====================================================================\n"
-"Cette application permet à un groupe de personnes de gérer intelligemment et "
-"efficacement les pistes, les opportunités, les réunions et les appels "
-"téléphoniques.\n"
-"Elle gère des tâches clés comme la communication, l'identification, "
-"l'établissement de la priorité, l'affectation, la résolution et la "
-"notification.\n"
-"\n"
-"\n"
-"OpenERP s'assure que tous les cas sont effectivement suivis par les "
-"utilisateurs, les clients et les fournisseurs. Il peut automatiquement "
-"envoyer des rappels, escalader les requêtes, déclencher des méthodes "
-"spécifiques et beaucoup d'autres actions basées sur vos propres règles de "
-"gestion.\n"
-"\n"
-"La meilleure fonctionnalité de ce système est que les utilisateurs n'ont "
-"rien à faire de spécial. Le module de GRC a une passerelle e-mail pour "
-"synchroniser les e-mails avec OpenERP. De cette façon, les utilisateurs "
-"peuvent directement envoyer des e-mails dans le suivi des requêtes.\n"
-"OpenERP prendra soin de les remercier pour leur message, l'affecter "
-"automatiquement à l'équipe appropriée et s'assurer que les correspondances "
-"futures se fassent au bon endroit.\n"
-"\n"
-"Le tableau de bord CRM inclura :\n"
-"--------------------------------\n"
-"* Le revenu planifié par étape et par utilisateur (graphique)\n"
-"* Les opportunités par étape (graphique)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Attention !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -294,7 +239,7 @@ msgstr ""
 "module personnalisé !"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Violation de contrainte"
@@ -305,7 +250,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Renommer un champ fragmenté \"%s\" n'est pas autorisé"
@@ -316,7 +261,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "créé."
@@ -403,29 +348,6 @@ msgstr "Société pour laquelle est fait cet enregistrement"
 msgid "Max. Size"
 msgstr "Taille Max."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Ajoute des informations de date additionnelles au commandes de vente.\n"
-"=====================================================================\n"
-"\n"
-"Vous pouvez ajouter les dates suivantes à un bon de commande:\n"
-"-------------------------------------------------------------\n"
-"    * Date de la demande\n"
-"    * Date de confirmation\n"
-"    * Date Effective\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -435,11 +357,6 @@ msgstr ""
 "Identifiant en base de données de l'enregistrement à ouvrir dans les vues "
 "formulaires quand \"view_mode\" est réglé sur \"form\" uniquement."
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nom du contact"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -522,7 +439,7 @@ msgstr ""
 "calculer une ligne de livraison.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -561,6 +478,7 @@ msgstr "Règles d'action automatisées"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -602,7 +520,7 @@ msgstr ""
 "vous modifiez une langue."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -660,7 +578,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilles Néerlandaises"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -711,9 +629,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vue originelle"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Idées"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -751,42 +669,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosniaque / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-"\n"
-"Traductions automatiques à travers l'API Gengo\n"
-"------------------------------------------------------------------\n"
-"\n"
-"Ce module va installer une tâche planifiée pour les traductions automatiques "
-"\n"
-"en utilisant l'API Gengo. Pour l'activer, vous devez\n"
-"1) Configurer vos paramètres d'authentifications Gengo en passant par "
-"'Paramètres -> Sociétés -> Paramètres Gengo'\n"
-"2) Lancer le wizard en passant par 'Paramètres -> Termes de l'application -> "
-"Gengo : Demander manuellement une traduction' et suivez l'assistant.\n"
-"\n"
-"Cet assistant va activer la tâche CRON et le planificateur et va démarrer la "
-"traduction automatique via les services Gengo pour tous les termes que vous "
-"aviez demandé.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -797,9 +679,25 @@ msgstr ""
 "pièce jointe, cela retourne la version précédente du rapport."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -875,14 +773,12 @@ msgstr ""
 "Dictionnaire de contexte, expression Python vide par défaut (Défaut: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Assistants"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Les champs personnalisés doivent avoir un nom commençant par 'x_' !"
@@ -974,27 +870,21 @@ msgid "Model Description"
 msgstr "Description du modèle"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliquez pour ajouter un contact dans votre carnet "
-"d'adresses.\n"
-"              </p><p>\n"
-"                OpenERP vous aide à suivre toutes les activités avec un "
-"client : \n"
-"                les discussions, l'historiques des opportunités, \n"
-"                les documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu pour le marketing.\n"
+"===================\n"
+"\n"
+"Contient le programme d'installation des modules relatifs au marketing .\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -1029,11 +919,21 @@ msgstr "Expression de déclenchement"
 msgid "Jordan"
 msgstr "Jordanie"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Prochaine date d'exécution pour cette tâche."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1196,14 +1096,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Fournissez le nom du champ qui référence l'identifiant de l'enregistrement "
-"pour l'opération d'écriture. S'il est vide, il référencera l'identifiant de "
-"l'objet actif."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papouasie-Nouvelle-Guinée"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1222,7 +1117,7 @@ msgid "Email Preferences"
 msgstr "Préférences de messagerie électronique"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' n'est pas une date valide pour le champ '%%(field)s'"
@@ -1273,23 +1168,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Espagnol (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
-"\n"
-"Ceci est le module de base pour gérer le plan de comptes pour le Luxembourg\n"
-"===========================================================================\n"
-"\n"
-"    * le plan de compte KLUWER\n"
-"    * le plan de codes de taxes pour le Luxembourg\n"
-"    * les taxes principales utilisées au Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Tél. portable"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1399,9 +1280,38 @@ msgid "Mongolia"
 msgstr "Mongolie"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1417,12 +1327,17 @@ msgstr ""
 "groupes suivants."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modèle de document"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1449,7 +1364,54 @@ msgid "Username"
 msgstr "Nom d'utilisateur"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1479,7 +1441,7 @@ msgid "Delete Access Right"
 msgstr "Supprimer un droit d'accès"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Le test de connexion a échoué!"
@@ -1511,14 +1473,12 @@ msgid "South Korea"
 msgstr "Corée du Sud"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Enregistrement #%d de %s non trouvé, vous ne pouvez pas le copier !"
@@ -1659,7 +1619,7 @@ msgid "Marshall Islands"
 msgstr "Îles Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Changer le modèle d'un champ est interdit !"
@@ -1681,7 +1641,7 @@ msgid "Search"
 msgstr "Recherche"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1700,7 +1660,14 @@ msgid "Parent Application"
 msgstr "Application parente"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Assistants"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operation annulée"
@@ -1876,7 +1843,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Aucune langue n'a le code \"%s\""
@@ -2020,7 +2001,7 @@ msgid "On Create"
 msgstr "Lors de la création"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -2030,11 +2011,6 @@ msgstr ""
 "points! Les points sont utilisés pour faire référence à des données d'autres "
 "modules, tel que module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Devis, bons de commande, factures"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -2121,7 +2097,7 @@ msgid "East Timor"
 msgstr "Timor Oriental"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2179,11 +2155,6 @@ msgstr ""
 "l'administrateur et seulement les droits des utilisateurs classiques à "
 "l'utilisateur Demo. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID lié"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2201,7 +2172,7 @@ msgstr ""
 "des bons de préparation, et bien d'autres choses."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2243,6 +2214,11 @@ msgstr "Véhicule, crédit-bail, assurances, coûts"
 msgid "Read Access"
 msgstr "Accès en lecture"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2343,17 +2319,12 @@ msgid "Create Tasks on SO"
 msgstr "Création de tâches sur les commandes de vente"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 "Cette colonne contient des données du module et ne peut pas être supprimée !"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modèle lié"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2431,7 +2402,7 @@ msgid "Formula"
 msgstr "Formule"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Impossible de supprimer l'utilisateur root"
@@ -2461,11 +2432,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -2477,7 +2448,6 @@ msgstr "Modèle de plans de comptes"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Type d'adresse"
 
@@ -2535,11 +2505,6 @@ msgstr "Chemin Complet"
 msgid "The next step depends on the file format:"
 msgstr "La prochaine étape dépend du format de fichier :"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Idées"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2680,6 +2645,11 @@ msgstr "Nombre de modules mis à jour"
 msgid "Method"
 msgstr "Méthode"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2736,7 +2706,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2744,6 +2714,11 @@ msgstr ""
 "Aucun enregistrement trouvé pour %(field_type)s '%(value)s' dans le champ "
 "'%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2794,6 +2769,15 @@ msgstr "Le Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Ajouter ou non l'en-tête RML de la société"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2847,7 +2831,7 @@ msgstr ""
 "'tree', 'calendar', etc. (Par défault : tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2943,7 +2927,6 @@ msgstr "Sao Tomé et Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Facture"
 
@@ -3004,11 +2987,6 @@ msgstr ""
 "    * Date\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Slogan de la société"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -3138,9 +3116,20 @@ msgid "Default limit for the list view"
 msgstr "Limite par défaut de la vue 'liste'"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papouasie-Nouvelle-Guinée"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3221,7 +3210,7 @@ msgstr ""
 "=================================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -3281,6 +3270,19 @@ msgstr "Correspondances de champ"
 msgid "Export Translations"
 msgstr "Exporter les traductions"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3289,7 +3291,7 @@ msgid "Manager"
 msgstr "Responsable"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Désolé, vous n'êtes pas autorisé à accéder à ce document."
@@ -3375,7 +3377,7 @@ msgid "Inherited"
 msgstr "Hérité"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "oui"
@@ -3405,7 +3407,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' ne semble pas être un entier pour le champ '%%(field)s'"
@@ -3472,22 +3474,22 @@ msgid "LinkedIn Integration"
 msgstr "Intégration avec LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Architecture de l'objet invalide"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Erreur!"
@@ -3586,12 +3588,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3608,19 +3610,32 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Module de gestion de la comptabilité et des taxes pour la Pologne\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3628,7 +3643,7 @@ msgid "Params storage"
 msgstr "Paramètre de stockage"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Impossible de mettre à jour le module '%s'. Il n'est pas installé."
@@ -3679,59 +3694,6 @@ msgstr "Paramètres de configuration"
 msgid "Invalid arguments"
 msgstr "Arguments non valides"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-"\n"
-"Règles pour la paie française.\n"
-"==============================\n"
-"\n"
-"    - Configuration du module hr_payroll pour la localisation française\n"
-"    - Toutes les principales règles de contribution pour la fiche de paie "
-"française, pour les cadres et les non-cadres\n"
-"    - Nouveau rapport des feuilles de paie\n"
-"\n"
-"Reste à faire :\n"
-"---------------\n"
-"    - Intégration avec le module de gestion des congés pour la déduction des "
-"congés et la gestion des indemnités\n"
-"    - Intégration avec le module hr_payroll_account pour la création des "
-"lignes d'écritures \n"
-"      depuis la feuille de paie\n"
-"    - Continuer l'intégration des contributions. Seules les principales "
-"contributions sont \n"
-"      actuellement implémentées.\n"
-"    - Retravailler le rapport sous webkit\n"
-"    - Les lignes de paie avec appears_in_payslip = False doivent apparaître "
-"dans\n"
-"      l'interface des fiches de paie, mais pas dans le rapport des fiches de "
-"paie.\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3770,7 +3732,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Document(s) manquant(s)"
@@ -3782,6 +3744,34 @@ msgstr "Document(s) manquant(s)"
 msgid "Bank Account Type"
 msgstr "Type de compte bancaire"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3820,7 +3810,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3860,7 +3850,7 @@ msgid "Access Controls"
 msgstr "Contrôles d'accès"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3890,54 +3880,6 @@ msgstr "Société mère"
 msgid "Web Icon File (hover)"
 msgstr "Fichier de l'icone web (au survol)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-"\n"
-"Ceci est un système complet de gestion de documents.\n"
-"=====================================================\n"
-"\n"
-"    * Authentification des utilisateurs\n"
-"    * Indexation des documents ; les fichiers .pptx et .docx ne sont pas "
-"supportés sous Windows.\n"
-"    * Tableau de bord des documents qui inclut :\n"
-"        * Nouveaux fichiers (liste)\n"
-"        * Fichiers par type de ressources (graphique)\n"
-"        * Fichiers par partenaire (graphique)\n"
-"        * Taille des fichiers par mois (graphique)\n"
-"\n"
-"ATTENTION :\n"
-"-----------\n"
-"\n"
-"    - Quand vous installez ce module en production dans une société qui a "
-"déjà des fichiers PDF\n"
-"      enregistrés dans la base de données, ils seront tous perdus.\n"
-"    - Après l'installation de ce module les PDF ne seront plus enregistrés "
-"dans la base de données,\n"
-"      mais à la racine du serveur dans /server/bin/filestore.\n"
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3957,9 +3899,13 @@ msgstr ""
 "Si vous utilisez le type \"formule\", utilisez une expression python "
 "utilisant la variable \"object\"."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Date de Naissance"
 
@@ -3975,7 +3921,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricants de produits"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Mode SMTP-sur-SSL  indisponible"
@@ -4093,7 +4039,7 @@ msgid "Malta"
 msgstr "Malte"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4286,7 +4232,6 @@ msgstr "Suivi d'activité"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Civilité"
@@ -4298,13 +4243,18 @@ msgstr ""
 "Si non renseigné, devient la valeur par défaut pour les nouvelles ressources"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Récursivité détectée"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Erreur de récursion dans les dépendances des modules !"
@@ -4364,9 +4314,10 @@ msgid "Urdu / اردو"
 msgstr "Ourdou / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -4377,7 +4328,7 @@ msgid "Company Name"
 msgstr "Nom de la société"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4398,15 +4349,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (obsolète - utiliser Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"Le code de la  langue de  traduction doit figurer parmi les langues connues"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Enregistrer la règle"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre et Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4435,13 +4408,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4489,19 +4458,7 @@ msgid "Paper Format"
 msgstr "Format de papier"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4521,7 +4478,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4572,7 +4529,7 @@ msgid "Email Gateway"
 msgstr "Passerelle de courriels"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4593,9 +4550,43 @@ msgid "Technical Data"
 msgstr "Données techniques"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4651,13 +4642,18 @@ msgstr "Feuilles de temps sur incidents"
 msgid "Ltd"
 msgstr "SARL"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Architecture invalide !"
@@ -4673,9 +4669,9 @@ msgid "Share any Document"
 msgstr "Partage de documents"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Groupe requis"
 
 #. module: base
 #: view:res.lang:0
@@ -4736,33 +4732,10 @@ msgid "Languages"
 msgstr "Langues"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4850,7 +4823,6 @@ msgstr "Contrainte"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Par défaut"
 
@@ -4925,6 +4897,11 @@ msgstr ""
 "courriel, la priorité la plus haute est utilisé. La priorité par défaut est  "
 "10 (petit nombre = priorité élevée )"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4988,9 +4965,16 @@ msgid "Default value or action reference"
 msgstr "Valeur par défaut ou référence de l'action"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -5070,6 +5054,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -5096,6 +5096,43 @@ msgstr ""
 "groupes. Si ce champ est vide, OpenERP calculera la visibilité sur le "
 "critère des droits d'accès aux objets relatifs."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -5126,6 +5163,12 @@ msgstr ""
 msgid "View"
 msgstr "Vue"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -5203,12 +5246,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -5223,7 +5260,6 @@ msgstr "Suisse - Comptabilité"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Code Postal"
@@ -5234,13 +5270,18 @@ msgstr "Code Postal"
 msgid "Author"
 msgstr "Auteur"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Marquer comme \"à faire\""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Représentation appropriées d'une date et d'une heure"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5286,6 +5327,8 @@ msgstr "Direction"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vues"
 
@@ -5301,7 +5344,7 @@ msgid "SMTP Server"
 msgstr "Serveur SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5398,7 +5441,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -5486,7 +5534,7 @@ msgid "System Configuration Done"
 msgstr "Configuration du système terminée"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Une erreur est apparue lors de la validation du/des champ(s) %s: %s"
@@ -5601,6 +5649,11 @@ msgstr "Île Maurice"
 msgid "Full Access"
 msgstr "Accès complet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5614,7 +5667,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5626,7 +5679,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Seulement si ce compte bancaire appartiennent à votre société"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5658,6 +5711,17 @@ msgstr "Sénégal"
 msgid "Hungary"
 msgstr "Hongrie"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5821,7 +5885,7 @@ msgid "Account Owner Name"
 msgstr "Nom du titulaire du compte"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5838,16 +5902,11 @@ msgid "Decimal Separator"
 msgstr "Séparateur décimal"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5894,9 +5953,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Créateur"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Le nom d'un module doit être unique !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5959,15 +6019,6 @@ msgstr "Vénézuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5983,6 +6034,11 @@ msgstr "Lancer l'assistant de configuration"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nom de la pièce jointe"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -6066,6 +6122,12 @@ msgstr "Kazakhstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Numéro de semaine [0(Dimanche),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nom de la ressource"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6320,7 +6382,7 @@ msgid "title"
 msgstr "titre"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -6377,6 +6439,15 @@ msgstr "Produits"
 msgid "User-defined Defaults"
 msgstr "Paramétrage  par défaut de l'utilisateur"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6494,13 +6565,15 @@ msgid "Bank Type"
 msgstr "Type de banque"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Le nom du groupe ne peut pas commencer par \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Applications"
 
@@ -6520,7 +6593,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6555,10 +6628,9 @@ msgid "Uncategorized"
 msgstr "Sans catégorie"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nom de la ressource"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6594,6 +6666,11 @@ msgstr ""
 "client, le signal vérifie le nom du bouton. Si le signal est à NULL, aucun "
 "bouton n'est nécessaire."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vue originelle"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6604,7 +6681,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6620,26 +6697,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mes banques"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6772,11 +6829,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6788,8 +6840,8 @@ msgid "Malaysia"
 msgstr "Malaisie"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6901,7 +6953,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Il n'y a pas de vue de type '%s' définie pour la structure!"
@@ -6941,7 +6993,7 @@ msgid "Created Menus"
 msgstr "Menus créés"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6968,9 +7020,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Marquer comme \"à faire\""
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -7002,6 +7082,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Année en cours sans les siècles : %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -7057,7 +7144,7 @@ msgid "Audit Trail"
 msgstr "Rapport de l' audit"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -7149,7 +7236,7 @@ msgid "Israel"
 msgstr "Israël"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -7169,29 +7256,6 @@ msgstr "Parfois appelé BIC ou Swift"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Tél. portable"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Ceci est le module pour gérer le plan de comptes mexicain dans OpenERP\n"
-"========================================================================\n"
-"\n"
-"Plan de comptes et localisation mexicaine.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -7224,10 +7288,10 @@ msgstr "Rapport XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Modules"
 
@@ -7301,9 +7365,9 @@ msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7327,8 +7391,8 @@ msgid "Partner Titles"
 msgstr "Formes juridiques"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -7376,7 +7440,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7385,11 +7449,6 @@ msgstr ""
 "Vous ne pouvez pas effectuer cette opération. Un nouvel enregistrement n'est "
 "pas autorisé sur cet objet puisque cet objet est réservé au reporting"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7499,6 +7558,13 @@ msgstr "Fichier de module importé avec succès !"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transitions"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7598,7 +7664,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "État fédéral"
@@ -7699,12 +7764,6 @@ msgstr "Nom complet"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Le nom d'un module doit être unique !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7748,6 +7807,7 @@ msgstr "Sur plusieurs documents"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7805,7 +7865,7 @@ msgid "Connection Security"
 msgstr "Sécurité de la connexion"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Veuillez spécifier une action à lancer !"
@@ -7825,6 +7885,11 @@ msgstr "Nom de la catégorie"
 msgid "Northern Mariana Islands"
 msgstr "Îles Mariannes du Nord"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7836,7 +7901,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat Reporting"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7845,6 +7910,11 @@ msgstr ""
 "Utilisez l'assistant de changement de mot de passe (dans les préférences "
 "utilisateur ou le menu \"utilisateur\") pour changer votre mot de passe."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7875,7 +7945,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Champs insufisant pour la visualisation du calendrier!"
@@ -7923,7 +7993,6 @@ msgstr "Transition"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7943,30 +8012,30 @@ msgid "Child Categories"
 msgstr "Catégories enfants"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -8054,6 +8123,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Cette fenêtre"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -8139,6 +8213,21 @@ msgstr "Champs"
 msgid "Employees"
 msgstr "Employés"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -8168,11 +8257,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Test de connexion"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresses"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -8197,7 +8281,6 @@ msgstr "Options de sélection"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Rue"
@@ -8208,9 +8291,24 @@ msgid "Yugoslavia"
 msgstr "Yougoslavie"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Parent de droite"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8291,7 +8389,7 @@ msgid "Change My Preferences"
 msgstr "Changer mes préférences"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Modèle non valide dans la définition de l'action."
@@ -8387,21 +8485,27 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menu pour le marketing.\n"
-"===================\n"
-"\n"
-"Contient le programme d'installation des modules relatifs au marketing .\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour ajouter un contact dans votre carnet "
+"d'adresses.\n"
+"              </p><p>\n"
+"                OpenERP vous aide à suivre toutes les activités avec un "
+"client : \n"
+"                les discussions, l'historiques des opportunités, \n"
+"                les documents, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8409,7 +8513,7 @@ msgid "Company Bank Accounts"
 msgstr "Comptes bancaires  de la société"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -8422,13 +8526,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Mot de passe (facultatif) pour l'authentification SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8450,12 +8554,13 @@ msgid "Normal Bank Account"
 msgstr "Compte bancaire normal"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Assistant"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8635,7 +8740,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8668,14 +8773,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Attention !"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8699,7 +8796,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8820,7 +8916,7 @@ msgid "Nigeria"
 msgstr "Nigéria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -9143,7 +9239,7 @@ msgid "Update Modules List"
 msgstr "Mettre à jour la liste des modules"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -9157,7 +9253,7 @@ msgid "eInvoicing"
 msgstr "eFacturation"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -9172,7 +9268,7 @@ msgstr ""
 "pouvez maintenant cliquer sur Annuler dans les Préférences Utilisateur)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "La valeur \"%s\" pour le champ \"%s.%s\" n'est pas dans la sélection"
@@ -9187,6 +9283,17 @@ msgstr "Continuer"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -9226,7 +9333,7 @@ msgid "Mexico"
 msgstr "Mexique"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -9248,15 +9355,16 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Serveur SMTP manquant"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nom de la pièce jointe"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"Le code de la  langue de  traduction doit figurer parmi les langues connues"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9280,7 +9388,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Abréviation du nom du mois."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -9292,7 +9400,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Fournisseur"
@@ -9370,7 +9477,7 @@ msgid "Selectable"
 msgstr "Sélectionnable"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Tout semble correctement configuré!"
@@ -9398,8 +9505,8 @@ msgid "Iteration"
 msgstr "Itération"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Erreur utilisateur"
@@ -9423,7 +9530,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9578,7 +9685,7 @@ msgid "Reunion (French)"
 msgstr "Réunion (Française)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9619,8 +9726,8 @@ msgid "Solomon Islands"
 msgstr "Îles Salomon"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Erreur d'accès"
@@ -9694,7 +9801,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9711,7 +9818,7 @@ msgid "Ukraine"
 msgstr "Ukraine"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9774,6 +9881,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamand (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamien / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9872,9 +9984,9 @@ msgid "Custom Shortcuts"
 msgstr "Raccourcis personnalisés"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamien / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9902,13 +10014,13 @@ msgid "Models"
 msgstr "Modèles"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "L'enregistrement ne peut pas être modifié en ce moment"
@@ -9929,7 +10041,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9977,7 +10089,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Le modèle %s n'existe pas!"
@@ -10023,6 +10135,7 @@ msgstr "États Unis - Comptabilité"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -10031,7 +10144,7 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -10050,6 +10163,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -10085,7 +10235,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -10137,6 +10287,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Heure (Affichage 12h) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -10186,23 +10341,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Le code de la devise doit être unique par société !"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -10248,7 +10391,7 @@ msgid "Products Expiry Date"
 msgstr "Date de péremption"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Cliquer sur 'Continuer' pour configurer le prochain module..."
@@ -10347,6 +10490,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10555,7 +10703,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campagne marketing - Démo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10566,13 +10714,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unité de l'intervalle"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Genre"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "La méthode n'existe plus"
@@ -10746,7 +10899,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10786,6 +10939,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10812,6 +10970,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL de l’icône"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10903,7 +11066,6 @@ msgstr "%m - Numéro de mois [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Ville"
@@ -10939,13 +11101,23 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonien / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Fournissez le nom du champ qui référence l'identifiant de l'enregistrement "
+"pour l'opération d'écriture. S'il est vide, il référencera l'identifiant de "
+"l'objet actif."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ou version supérieure"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -11007,19 +11179,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -11033,6 +11230,8 @@ msgid "Activity"
 msgstr "Activité"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -11051,7 +11250,12 @@ msgid "Parent Company"
 msgstr "Société mère"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Authentification OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -11063,13 +11267,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -11169,6 +11366,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -11243,6 +11460,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Type de séquences"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -11303,9 +11525,9 @@ msgstr ""
 "Veuillez désactiver cette langue."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -11323,8 +11545,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problème dans la configuration `Record Id`dans le Server Action!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Erreur de validation"
@@ -11366,13 +11588,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Courriel"
@@ -11383,7 +11604,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11414,36 +11640,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11467,6 +11663,11 @@ msgstr "Autre propriétaire"
 msgid "Ecuador"
 msgstr "Équateur"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11485,16 +11686,6 @@ msgstr ""
 "Vous ne pouvez pas supprimer une langue qui est utilisée par un des "
 "utilisateurs !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11511,9 +11702,9 @@ msgid "Cascade"
 msgstr "Cascade"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Groupe requis"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11540,11 +11731,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11570,7 +11756,7 @@ msgid "Domain"
 msgstr "Domaine"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11586,12 +11772,12 @@ msgid "State Name"
 msgstr "Nom de l'État"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11612,30 +11798,10 @@ msgid "Timezone"
 msgstr "Fuseau horaire"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11656,7 +11822,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11710,7 +11876,6 @@ msgstr "Double validation des achats"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Rue (suite)"
 
@@ -11734,6 +11899,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11828,19 +11994,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Erreur d'intégrité"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
@@ -11882,22 +12057,6 @@ msgstr "Répertoire des employés"
 msgid "Arguments"
 msgstr "Arguments"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -12030,7 +12189,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Client"
 
@@ -12120,7 +12278,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -12170,9 +12328,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Authentification OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12262,7 +12420,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Échec de l'envoi du courriel"
@@ -12289,7 +12447,7 @@ msgid "Object"
 msgstr "Objet"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12378,7 +12536,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12393,7 +12551,7 @@ msgid "User Ref."
 msgstr "Réf. utilisateur"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -12438,8 +12596,6 @@ msgstr "Guide de référence"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12447,7 +12603,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12478,12 +12634,6 @@ msgstr "Îles Malouines"
 msgid "Lebanon"
 msgstr "Liban"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12592,9 +12742,11 @@ msgid "Selection"
 msgstr "Sélection"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL de l’icône"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12630,7 +12782,7 @@ msgid "Action Type"
 msgstr "Type d'action"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12768,11 +12920,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Heure 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Décochez le champ 'Actif' pour cacher le contact sans le supprimer."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12789,7 +12936,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Attribut %s inconnu dans %s "
@@ -12812,7 +12959,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Méthode 'get' non définie !"
@@ -12853,16 +13000,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Comptabilité de la paie"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Fichier binaire ou URL externe"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12909,92 +13056,57 @@ msgid "Address Format"
 msgstr "Format d'adresse"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Le Format du Séparateur doit être comme [,n] où 0 < n : en commençant par le "
-"chiffre des unités.-1 stoppera la fin des séparations. Exemple. [3,2,-1] "
-"représentera le nombre 106500 comme 1,06,500; [1,2,-1] le représentera comme "
-"106,50,0; [3] le représentera comme 106,500. En fournissant le caractère ',' "
-"comme séparateur des milliers dans chaque cas."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Caractéristiques techniques"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -13182,6 +13294,11 @@ msgstr ""
 "Vous aide à gérer votre inventaire et les principales opérations de stocks : "
 "bon de livraison, réceptions, etc..."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -13198,7 +13315,7 @@ msgid "Body"
 msgstr "Corps"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Test de connexion réussi!"
@@ -13249,7 +13366,7 @@ msgid "choose"
 msgstr "Choisir"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13429,10 +13546,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13472,12 +13593,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13493,7 +13615,6 @@ msgstr "Registre  de la société"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Divers"
@@ -13515,34 +13636,6 @@ msgstr ""
 msgid "China"
 msgstr "Chine"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Module de gestion de la comptabilité et des taxes pour la Pologne\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13620,25 +13713,9 @@ msgid "Bulgaria"
 msgstr "Bulgarie"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13666,6 +13743,26 @@ msgstr "5.  %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "SARL"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13703,6 +13800,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "inconnu"
@@ -13770,6 +13868,11 @@ msgstr "Carnet d'adresses"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13859,6 +13962,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13871,7 +13975,7 @@ msgid "Information"
 msgstr "Information"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13902,16 +14006,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Parent de droite"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Mise à jour de la liste des modules"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13977,6 +14085,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "Le champ osv_memory peut seulement être comparé avec les opérateurs = et !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -14049,29 +14162,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identifiant externe"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -14119,7 +14209,7 @@ msgid "Delivery Costs"
 msgstr "Frais de port"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -14170,9 +14260,9 @@ msgstr ""
 "Désactive le plan comptable de base installé par défaut.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Cryptage du mot de passe de la BDD"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Enregistrer la règle"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14418,9 +14508,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14447,63 +14542,14 @@ msgid "System Configuration done"
 msgstr "Configuration du système terminée"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Îles Turques et Caïques"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14544,17 +14590,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14592,7 +14627,7 @@ msgid "Low"
 msgstr "Faible"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
@@ -14674,11 +14709,10 @@ msgid "El Salvador"
 msgstr "Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Tél."
@@ -14693,6 +14727,11 @@ msgstr "Accès au menu"
 msgid "Thailand"
 msgstr "Thaïlande"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14713,6 +14752,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanie / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14751,41 +14814,6 @@ msgstr "Relation de l'objet"
 msgid "eInvoicing & Payments"
 msgstr "eFacturation & Règlements"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14846,40 +14874,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14978,6 +14974,21 @@ msgstr "Vue :"
 msgid "View Auto-Load"
 msgstr "Auto-chargement de la vue"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -15020,34 +15031,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Perse / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -15070,9 +15053,9 @@ msgid "Unmet dependency !"
 msgstr "Dépendance non trouvé !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -15083,7 +15066,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -15109,7 +15122,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -15154,7 +15167,7 @@ msgid "Access"
 msgstr "Accès"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -15187,11 +15200,10 @@ msgid "Bahrain"
 msgstr "Bahreïn"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -15207,8 +15219,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -15323,7 +15333,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -15336,7 +15346,6 @@ msgstr "Jamaïque"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Couleur"
 
@@ -15374,7 +15383,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -15385,8 +15394,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Avertissement"
@@ -15412,11 +15421,6 @@ msgstr "Îles Vierges (Britaniques)"
 msgid "Parameters"
 msgstr "Paramètres"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre et Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15509,7 +15513,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Pays"
@@ -15580,9 +15583,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Espagnol (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Le Format du Séparateur doit être comme [,n] où 0 < n : en commençant par le "
+"chiffre des unités.-1 stoppera la fin des séparations. Exemple. [3,2,-1] "
+"représentera le nombre 106500 comme 1,06,500; [1,2,-1] le représentera comme "
+"106,50,0; [3] le représentera comme 106,500. En fournissant le caractère ',' "
+"comme séparateur des milliers dans chaque cas."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15609,7 +15621,7 @@ msgid "Japan"
 msgstr "Japon"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Vous ne pouvez renommer q'une seule colonne à la fois !"
@@ -15670,6 +15682,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Canada - Comptabilité"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15694,7 +15737,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Noter que cette opération peut prendre quelques minutes"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15733,6 +15776,12 @@ msgstr "Exécution"
 msgid "Condition"
 msgstr "Condition"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15787,6 +15836,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croatie"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15811,6 +15867,11 @@ msgstr "Mise à jour du système"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15827,7 +15888,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15848,15 +15909,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Informations générales"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Îles Turques et Caïques"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15892,7 +15990,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Avertissement lors du changement de société"
@@ -15912,11 +16015,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Le prochain numéro de séquence sera incréménté par ce nombre"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Fonction"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15954,11 +16061,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Livraison"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15986,7 +16088,7 @@ msgid "Workflow Instances"
 msgstr "Instances de workflow"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partenaires "
@@ -15997,7 +16099,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -16063,7 +16165,6 @@ msgstr "Nom de l'export"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -16226,6 +16327,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "Répertoire SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Créateur"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -16366,6 +16470,9 @@ msgstr ""
 #~ msgid "Gold Partner"
 #~ msgstr "Partenaire Gold"
 
+#~ msgid "Delivery"
+#~ msgstr "Livraison"
+
 #~ msgid "Report Header"
 #~ msgstr "En-tête de rapport"
 
@@ -16458,6 +16565,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Sur de multiples enregistrements"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nom du contact"
+
 #, python-format
 #~ msgid "The read method is not implemented on this object !"
 #~ msgstr "La méthode \"read\" n'est pas implémentée dans cet objet !"
@@ -16474,6 +16584,9 @@ msgstr ""
 #~ msgid "Payment Term (short name)"
 #~ msgstr "Conditions de paiement"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID lié"
+
 #~ msgid ""
 #~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 #~ "object.partner_id.name ]]`"
@@ -16481,6 +16594,9 @@ msgstr ""
 #~ "Indiquez le message. Vous pouvez utiliser les champs de l'objet. ex: `Cher "
 #~ "[[ object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modèle lié"
+
 #~ msgid "Add or not the coporate RML header"
 #~ msgstr "Ajouter ou non l'en-tête RML de la société"
 
@@ -16647,6 +16763,9 @@ msgstr ""
 #~ msgid "Not Implemented"
 #~ msgstr "Non implémenté"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresses"
+
 #, python-format
 #~ msgid "The value \"%s\" for the field \"%s\" is not in the selection"
 #~ msgstr "La valeur \"%s\" pour le champ \"%s\" n'est pas dans la sélection"
@@ -16925,6 +17044,9 @@ msgstr ""
 #~ msgid "Created"
 #~ msgstr "Créé"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Fichier binaire ou URL externe"
+
 #~ msgid ""
 #~ "Indicates whether this object model lives in memory only, i.e. is not "
 #~ "persisted (osv.osv_memory)"
@@ -17578,6 +17700,9 @@ msgstr ""
 #~ "Nom de la méthode qui peut être appelée sur l'objet quand cet ordonnanceur "
 #~ "est exécuté."
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Décochez le champ 'Actif' pour cacher le contact sans le supprimer."
+
 #~ msgid "Menu Tips"
 #~ msgstr "Astuces"
 
@@ -18476,6 +18601,9 @@ msgstr ""
 #~ "        suite de tests pour OpenERP Web.\n"
 #~ "        "
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Cryptage du mot de passe de la BDD"
+
 #~ msgid ""
 #~ "\n"
 #~ "        OpenERP Web process view.\n"
@@ -21490,6 +21618,21 @@ msgstr ""
 #~ "\n"
 #~ "     "
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ceci est le module pour gérer le plan de comptes mexicain dans OpenERP\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Plan de comptes et localisation mexicaine.\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "This module contains basic functionality for Caldav system.\n"
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 63281d6f0a7..1eb208a9b77 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:56+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Datetime"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -191,41 +191,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -236,7 +210,7 @@ msgstr ""
 "addon personalizado!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Erro de restrición"
@@ -247,7 +221,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -258,7 +232,7 @@ msgid "Swaziland"
 msgstr "Suacilandia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creado"
@@ -337,20 +311,6 @@ msgstr "Compañía para almacenar o rexistro actual"
 msgid "Max. Size"
 msgstr "Tamaño máx."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -358,11 +318,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nome de contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -421,7 +376,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -458,6 +413,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -496,7 +452,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -550,7 +506,7 @@ msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -590,9 +546,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista Orixinal"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -617,26 +573,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -647,9 +583,25 @@ msgstr ""
 "co mesmo nome, devolverá o informe anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -726,14 +678,12 @@ msgstr ""
 "defecto: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Os campos personalizados deben ter un nome que comeza con 'x_' !"
@@ -798,16 +748,14 @@ msgid "Model Description"
 msgstr "Descrición do Modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -837,11 +785,21 @@ msgstr "Expresión do Disparador"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -973,13 +931,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Indica o nome do campo ó que se refire o id do rexistro para a operación de "
-"escritura. Se está baleiro referirase ó id activo do obxecto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nova Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -999,7 +953,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1048,16 +1002,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1154,9 +1101,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1170,12 +1146,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1202,7 +1183,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1232,7 +1260,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1264,14 +1292,12 @@ msgid "South Korea"
 msgstr "Corea do Sur"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transicións"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "¡Rexistro #%d de %s non atopado, non se pode copiar!"
@@ -1409,7 +1435,7 @@ msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "¡Cambiar o modelo dun campo está prohibido!"
@@ -1431,7 +1457,7 @@ msgid "Search"
 msgstr "Búsqueda"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1452,7 +1478,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operación Cancelada"
@@ -1580,7 +1613,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Non existe ningunha linguaxe con código \"%s\""
@@ -1699,7 +1746,7 @@ msgid "On Create"
 msgstr "Ó Crear"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1709,11 +1756,6 @@ msgstr ""
 "utilizados para referirse a datos de outros módulos, como en "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1796,7 +1838,7 @@ msgid "East Timor"
 msgstr "Timor Leste"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1837,11 +1879,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID do Adxunto"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1856,7 +1893,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1897,6 +1934,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Acceso de lectura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1973,16 +2015,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo adxunto"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2037,7 +2074,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Non se pode eliminar o usuario root!"
@@ -2061,11 +2098,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -2077,7 +2114,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de enderezo"
 
@@ -2115,11 +2151,6 @@ msgstr "Ruta completa"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2255,6 +2286,11 @@ msgstr "Número de módulos actualizados"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2288,12 +2324,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2343,6 +2384,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Engadir ou non a cabeceira coporativa RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2396,7 +2446,7 @@ msgstr ""
 "'árbore', 'calendario', etc (Por defecto: árbore,formulario)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Un documento foi modificado dende a última vez que o viu (%s:%d)"
@@ -2477,7 +2527,6 @@ msgstr "San Tomé (San Tomé) e Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2524,11 +2573,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2646,9 +2690,20 @@ msgid "Default limit for the list view"
 msgstr "Límite estándar para a visualización de lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nova Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2726,7 +2781,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2785,6 +2840,19 @@ msgstr "Mapeador de Campos"
 msgid "Export Translations"
 msgstr "Exportar Traducións"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2793,7 +2861,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2879,7 +2947,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2909,7 +2977,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2974,22 +3042,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "¡Arquitectura do obxecto inválido!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -3086,12 +3154,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Non podes crear compañías recursivamente."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3108,17 +3176,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3128,7 +3198,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Non se pode actualizar o módulo '%s' . Non está instalado."
@@ -3179,34 +3249,6 @@ msgstr "Parámetros de configuración"
 msgid "Invalid arguments"
 msgstr "Argumentos non válidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3245,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3257,6 +3299,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipo de conta bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3293,7 +3363,7 @@ msgid "Signal (subflow.*)"
 msgstr "Sinal (subflow. *)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3333,7 +3403,7 @@ msgid "Access Controls"
 msgstr "Controis de acceso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3363,32 +3433,6 @@ msgstr "Compañía Principal"
 msgid "Web Icon File (hover)"
 msgstr "Arquivo de Icono da Web (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3407,9 +3451,13 @@ msgid ""
 msgstr ""
 "Se usa un tipo fórmula, use unha expresión python usando a variable 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Non podes crear compañías recursivamente."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Aniversario"
 
@@ -3425,7 +3473,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3535,7 +3583,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3726,7 +3774,6 @@ msgstr "Reportaxe"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -3738,13 +3785,18 @@ msgstr ""
 "Se non se define, actúa como un valor por defecto para novas características"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Detectada recursividade."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Erro de recursión nas dependencias dos módulos!"
@@ -3804,9 +3856,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3817,7 +3870,7 @@ msgid "Company Name"
 msgstr "Nome da Compañía"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3836,14 +3889,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (obsoleto - utilizar Informe)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Regras do rexistro"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pedro e Miguelón"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3872,13 +3948,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3926,19 +3998,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3958,7 +4018,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4003,7 +4063,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4022,9 +4082,43 @@ msgid "Technical Data"
 msgstr "Ficha Técnica"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4080,13 +4174,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "¡Arquitectura Inválida!"
@@ -4102,9 +4201,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupo Obrigatorio"
 
 #. module: base
 #: view:res.lang:0
@@ -4162,33 +4261,10 @@ msgid "Languages"
 msgstr "Linguas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4266,7 +4342,6 @@ msgstr "Restrición"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Default"
 
@@ -4338,6 +4413,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4401,9 +4481,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4483,6 +4570,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4509,6 +4612,43 @@ msgstr ""
 "este campo está baleiro, OpenERP administrará a visibilidade baseándose nos "
 "permisos de lectura dos obxectos."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4538,6 +4678,12 @@ msgstr ""
 msgid "View"
 msgstr "Ver"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4615,12 +4761,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4635,7 +4775,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Zip"
@@ -4646,13 +4785,18 @@ msgstr "Zip"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Set as Todo"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - representación da data e hora axeitadas."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4698,6 +4842,8 @@ msgstr "Dirección"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -4713,7 +4859,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Intenta eliminar un módulo que está instalado ou será instalado"
@@ -4806,7 +4952,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4894,7 +5045,7 @@ msgid "System Configuration Done"
 msgstr "Configuración do Sistema Feita"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Houbo un erro ao validar o campo(s) %s: %s"
@@ -5009,6 +5160,11 @@ msgstr "Mauricio"
 msgid "Full Access"
 msgstr "Acceso Total"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5022,7 +5178,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5033,7 +5189,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5065,6 +5221,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungría"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5228,7 +5395,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Non se pode renombrar a columna a %s, porque esa columna xa existe!"
@@ -5244,16 +5411,11 @@ msgid "Decimal Separator"
 msgstr "Separador de Decimais"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5300,9 +5462,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "¡ O nome do módulo debe ser único !E"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5365,15 +5528,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5389,6 +5543,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nome do Adxunto"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5472,6 +5631,12 @@ msgstr "Casaquistán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Número do día da semana [0(Domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nome do recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5726,7 +5891,7 @@ msgid "title"
 msgstr "título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5783,6 +5948,15 @@ msgstr "Produtos"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5898,13 +6072,15 @@ msgid "Bank Type"
 msgstr "Tipo de Banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "O nome do grupo non pode comezar por \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5924,7 +6100,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5959,10 +6135,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nome do recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5998,6 +6173,11 @@ msgstr ""
 "cliente, o sinal comproba o nome do botón premido. Se o sinal é NULL, ningún "
 "botón fai falla para validar esta transición."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista Orixinal"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6008,7 +6188,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6024,26 +6204,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6176,11 +6336,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6192,8 +6347,8 @@ msgid "Malaysia"
 msgstr "Malasia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6302,7 +6457,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "¡Non ai ningunha vista do tipo '%s' definida para a estructura!"
@@ -6340,7 +6495,7 @@ msgid "Created Menus"
 msgstr "Menús creados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6367,9 +6522,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6401,6 +6584,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Ano actual sen o século: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6443,7 +6633,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6535,7 +6725,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6555,23 +6745,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6604,10 +6777,10 @@ msgstr "Informe xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -6681,9 +6854,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6706,8 +6879,8 @@ msgid "Partner Titles"
 msgstr "Títulos da Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6755,7 +6928,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6764,11 +6937,6 @@ msgstr ""
 "Non podes efectuar esta operación. Un Novo Rexistro de Creación non se "
 "permite para este obxeto xa que este obxeto ten a finalidade de informe."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6875,6 +7043,13 @@ msgstr "Arquivo do Módulo importado con éxito!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transicións"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6969,7 +7144,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Estado Federal"
@@ -7070,12 +7244,6 @@ msgstr "Nome Completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "¡ O nome do módulo debe ser único !E"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7117,6 +7285,7 @@ msgstr "En múltiples Doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7174,7 +7343,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Por favor, especifique unha acción para lanzar!"
@@ -7194,6 +7363,11 @@ msgstr "Nome da Categoría"
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7205,7 +7379,7 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7214,6 +7388,11 @@ msgstr ""
 "Por favor, use o asistente de cambio de contrasinal (en Preferencias do "
 "usuario ou Menú de Usuario) para cambiar a súa contrasinal."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7244,7 +7423,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "¡Campos insuficientes para a Vista de Calendario!"
@@ -7292,7 +7471,6 @@ msgstr "Transición"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7312,30 +7490,30 @@ msgid "Child Categories"
 msgstr "Categorías Fillas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -7423,6 +7601,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Esta xanela"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7509,6 +7692,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Empregados"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7538,11 +7736,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Enderezos"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7567,7 +7760,6 @@ msgstr "Opcións de Selección"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Rúa"
@@ -7578,9 +7770,24 @@ msgid "Yugoslavia"
 msgstr "Iugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Pai Dereito"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7658,7 +7865,7 @@ msgid "Change My Preferences"
 msgstr "Cambiar as Miñas Preferencias"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nome inválido do modelo na definición da acción."
@@ -7745,14 +7952,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7761,7 +7970,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7774,13 +7983,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7802,12 +8011,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Asistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7980,7 +8190,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8011,14 +8221,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8042,7 +8244,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8160,7 +8361,7 @@ msgid "Nigeria"
 msgstr "Nixeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8476,7 +8677,7 @@ msgid "Update Modules List"
 msgstr "Lista de Módulos a Actualizar"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8490,7 +8691,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8505,7 +8706,7 @@ msgstr ""
 "agora)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8520,6 +8721,17 @@ msgstr "Continúe"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandés / ภาษา ไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8559,7 +8771,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8581,15 +8793,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nome do Adxunto"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8613,7 +8825,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - nome do mes abreviado."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8625,7 +8837,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Provedor"
@@ -8703,7 +8914,7 @@ msgid "Selectable"
 msgstr "Selecionável"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8731,8 +8942,8 @@ msgid "Iteration"
 msgstr "Iteración"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Erro de usuario"
@@ -8756,7 +8967,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8905,7 +9116,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (francesa)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8945,8 +9156,8 @@ msgid "Solomon Islands"
 msgstr "Illas Salomón"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -9020,7 +9231,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9034,7 +9245,7 @@ msgid "Ukraine"
 msgstr "Ucraína"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9097,6 +9308,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamenco (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamita / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9195,9 +9411,9 @@ msgid "Custom Shortcuts"
 msgstr "Personalizar Accesos directos"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamita / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9225,13 +9441,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9252,7 +9468,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9300,7 +9516,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "¡Omodelo %s non existe!"
@@ -9346,6 +9562,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9354,7 +9571,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9373,6 +9590,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9408,7 +9662,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9460,6 +9714,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (reloxo de 12 horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9502,23 +9761,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9552,7 +9799,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Prema 'Continuar' para configurar o seguinte módulo..."
@@ -9644,6 +9891,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9852,7 +10104,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9863,13 +10115,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Rango de Unidade"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tipo"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método xa non existe"
@@ -10041,7 +10298,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10076,6 +10333,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10101,6 +10363,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10190,7 +10457,6 @@ msgstr "%m - Número de mes [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Cidade"
@@ -10226,13 +10492,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonia / Eesti Keeler"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Indica o nome do campo ó que se refire o id do rexistro para a operación de "
+"escritura. Se está baleiro referirase ó id activo do obxecto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ou versión posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10294,19 +10569,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10320,6 +10620,8 @@ msgid "Activity"
 msgstr "Actividade"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10338,7 +10640,12 @@ msgid "Parent Company"
 msgstr "Compañía Pai"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10350,13 +10657,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10443,6 +10743,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10514,6 +10834,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipo de Secuencias"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10574,9 +10899,9 @@ msgstr ""
 "Desactive primeiro o idioma."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10594,8 +10919,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema na configuración `Record Id` na Acción de Servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Erro de Validación"
@@ -10636,13 +10961,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10653,7 +10977,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10684,36 +11013,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10735,6 +11034,11 @@ msgstr "Outro Propietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10751,16 +11055,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Non podes eliminar a linguaxe que é a preferida do usuario!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10777,9 +11071,9 @@ msgid "Cascade"
 msgstr "Cascada"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupo Obrigatorio"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10804,11 +11098,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10834,7 +11123,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10850,12 +11139,12 @@ msgid "State Name"
 msgstr "Nome do Estado"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10876,30 +11165,10 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10919,7 +11188,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10973,7 +11242,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Rúa2"
 
@@ -10997,6 +11265,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11082,19 +11351,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Erro de Integridade"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "¡O tamaño do campo nunca pode ser menor que 1!"
@@ -11136,22 +11414,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11284,7 +11546,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11374,7 +11635,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11424,8 +11685,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11516,7 +11777,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11543,7 +11804,7 @@ msgid "Object"
 msgstr "Obxecto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11632,7 +11893,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11647,7 +11908,7 @@ msgid "User Ref."
 msgstr "Usuario Ref."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11692,8 +11953,6 @@ msgstr "Guía de referencia"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11701,7 +11960,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11730,12 +11989,6 @@ msgstr "Illas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11842,8 +12095,10 @@ msgid "Selection"
 msgstr "Selección"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11880,7 +12135,7 @@ msgid "Action Type"
 msgstr "Tipo de Acción"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12018,11 +12273,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque o campo activo para ocultar o contacto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12039,7 +12289,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo descoñecido %s en %s "
@@ -12062,7 +12312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "¡método get non definido!"
@@ -12103,16 +12353,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Ficheiro binario ou URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12159,91 +12409,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"O formato de separación debe ser como, [,n] onde 0 <n :a partir do díxito da "
-"unidade.-1 acabará coa separación. por exemplo [3,2, -1] representará 106500 "
-"a 1,06,500;[1,2, -1] ha representalo para ser 106,50,0;[3] vai representalo "
-"como 106,500. Sendo ',' o separador de miles en cada caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitano (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12425,6 +12641,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12441,7 +12662,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12492,7 +12713,7 @@ msgid "choose"
 msgstr "elección"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12668,10 +12889,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12703,12 +12928,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12724,7 +12950,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Diversos"
@@ -12746,23 +12971,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12834,25 +13042,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12880,6 +13072,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12916,6 +13128,7 @@ msgstr "Jazyk Eslovaca / Slovenský"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "descoñecido"
@@ -12983,6 +13196,11 @@ msgstr "Enderezos"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13072,6 +13290,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13084,7 +13303,7 @@ msgid "Information"
 msgstr "Información"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13115,16 +13334,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Pai Dereito"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualizar lista de módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13189,6 +13412,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "O campo osv_memory solo pode ser comparado cos operadores = e != ."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13261,29 +13489,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13331,7 +13536,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13375,9 +13580,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Regras do rexistro"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13623,9 +13828,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13652,63 +13862,14 @@ msgid "System Configuration done"
 msgstr "Configuración do Sistema feita"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Illas Turks e Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13749,17 +13910,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13794,7 +13944,7 @@ msgid "Low"
 msgstr "Baixa"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Erro! Non podes crear Menú recursivamente."
@@ -13876,11 +14026,10 @@ msgid "El Salvador"
 msgstr "O Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Teléfono"
@@ -13895,6 +14044,11 @@ msgstr "Menú de Acceso"
 msgid "Thailand"
 msgstr "Tailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13915,6 +14069,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanés / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13951,41 +14129,6 @@ msgstr "Obxecto Relación"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14046,40 +14189,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14173,6 +14284,21 @@ msgstr "Vista:"
 msgid "View Auto-Load"
 msgstr "Ver Auto-Load"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14215,34 +14341,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14265,9 +14363,9 @@ msgid "Unmet dependency !"
 msgstr "¡Dependencia descoñecida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14278,7 +14376,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14304,7 +14432,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14349,7 +14477,7 @@ msgid "Access"
 msgstr "Acceso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14382,11 +14510,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14402,8 +14529,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14518,7 +14643,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14530,7 +14655,6 @@ msgstr "Xamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14567,7 +14691,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14578,8 +14702,8 @@ msgid "Azerbaijan"
 msgstr "Acerbaixán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -14605,11 +14729,6 @@ msgstr "Illas Virxes (Británicas)"
 msgid "Parameters"
 msgstr "Parámetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "San Pedro e Miguelón"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14699,7 +14818,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -14770,9 +14888,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Español (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"O formato de separación debe ser como, [,n] onde 0 <n :a partir do díxito da "
+"unidade.-1 acabará coa separación. por exemplo [3,2, -1] representará 106500 "
+"a 1,06,500;[1,2, -1] ha representalo para ser 106,50,0;[3] vai representalo "
+"como 106,500. Sendo ',' o separador de miles en cada caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14799,7 +14925,7 @@ msgid "Japan"
 msgstr "Xapón"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "¡Soamente pode renombrar unha columna de cada vez!"
@@ -14860,6 +14986,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14884,7 +15041,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Teña en conta que esta operación pode levar varios minutos."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14923,6 +15080,12 @@ msgstr "Execución"
 msgid "Condition"
 msgstr "Condición"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14977,6 +15140,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croacia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15001,6 +15171,11 @@ msgstr "Actualización do Sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15017,7 +15192,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15038,15 +15213,52 @@ msgstr "Serra Leoa"
 msgid "General Information"
 msgstr "Información xeral"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Illas Turks e Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15082,7 +15294,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Aviso de Cambio de Compañía"
@@ -15100,11 +15317,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "O próximo número da secuencia será incrementado por este número"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Función"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15140,11 +15361,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Entrega"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15172,7 +15388,7 @@ msgid "Workflow Instances"
 msgstr "Instancias do Fluxo de Traballo"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Empresas: "
@@ -15183,7 +15399,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15249,7 +15465,6 @@ msgstr "Exportar Nome"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15303,6 +15518,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "En múltiples doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Nome de contacto"
+
 #~ msgid "E-Mail"
 #~ msgstr "Correo electrónico"
 
@@ -15395,12 +15613,18 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID do Adxunto"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Manteña 0 se a acción debe aparecer en todos os recursos."
 
 #~ msgid "Homepage Widgets"
 #~ msgstr "Homepage Widgets"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo adxunto"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Configuración de dominio"
 
@@ -15586,6 +15810,9 @@ msgstr ""
 #~ msgid "Apply For Delete"
 #~ msgstr "Aplique Para Eliminar"
 
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
 #~ msgid "Plugins"
 #~ msgstr "Plugins"
 
@@ -15733,6 +15960,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Enderezos"
+
 #~ msgid "XML Identifier"
 #~ msgstr "Identificador XML"
 
@@ -15961,6 +16191,12 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Tipo campos"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque o campo activo para ocultar o contacto."
+
+#~ msgid "Binary File or external URL"
+#~ msgstr "Ficheiro binario ou URL externa"
+
 #~ msgid "Emails"
 #~ msgstr "Correos"
 
@@ -16126,6 +16362,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Nunca"
 
+#~ msgid "Delivery"
+#~ msgstr "Entrega"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "Código BIC/Swift"
 
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 49929ea8a08..4f93d390de5 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-13 11:33+0000\n"
 "Last-Translator: Serpent Consulting Services <Unknown>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:56+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "દિવસ અને સમય"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -195,41 +195,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "ચેતવણી!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -239,7 +213,7 @@ msgstr ""
 "પાયથન કોડ થી ફેરફાર કરો, શક્ય હોય તો એક કસ્ટમ એડ-ઓન થી."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "મર્યાદા(કન્સ્ટ્રૈન્ટ) ભૂલ"
@@ -250,7 +224,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "સ્પાર્સ ફિલ્ડ \"%s\" નુ નામ બદલવુ માન્ય નથી."
@@ -261,7 +235,7 @@ msgid "Swaziland"
 msgstr "સ્વાઝિલેન્ડ"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "સર્જન કર્યુ."
@@ -340,20 +314,6 @@ msgstr "વર્તમાન રેકોર્ડ નો સંગ્રહ 
 msgid "Max. Size"
 msgstr "મહત્તમ પરિમાણ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -361,11 +321,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "સંપર્ક નામ"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -430,7 +385,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -467,6 +422,7 @@ msgstr "સ્વયંસંચાલિત ક્રિયા ના નિય
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "માલિક"
 
@@ -505,7 +461,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -559,7 +515,7 @@ msgid "Netherlands Antilles"
 msgstr "નેધરલેન્ડઝ એન્ટિલિસ"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -599,9 +555,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "મૂળ દ્રશ્ય"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "વિચારો"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -626,26 +582,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "બોસ્નિયન / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -656,8 +592,24 @@ msgstr ""
 "અહેવાલ(રિપોર્ટ) છાપે છે ત્યારે, જુનો અહેવાલ(રિપોર્ટ) જ છપાય છે ."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -735,14 +687,12 @@ msgstr ""
 "(Default:{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "વિઝાર્ડો"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "કસ્ટમ ફિલ્ડ નુ નામ 'x_' થી જ શરુ થવુ જોઇયે!"
@@ -806,16 +756,14 @@ msgid "Model Description"
 msgstr "મોડેલ નુ વર્ણન"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -844,11 +792,21 @@ msgstr "સમીકરણ(એક્સપ્રેશન) ચલિત કર
 msgid "Jordan"
 msgstr "જોર્ડન"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -977,11 +935,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "પાપુઆ ન્યુ જીનેવા"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1001,7 +957,7 @@ msgid "Email Preferences"
 msgstr "ઈમેઈલ પસંદગીઓ"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1051,16 +1007,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "સ્પેનિશ (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "મોબાઇલ"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1157,9 +1106,38 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1173,12 +1151,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1205,7 +1188,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1235,7 +1265,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "જોડાણ પરીક્ષણ નિષ્ફળ!"
@@ -1267,14 +1297,12 @@ msgid "South Korea"
 msgstr "દક્ષિણ કોરિયા"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "ભાષાંતરો"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "રેકોર્ડ #%d  કે જે %s નો છે તે મળેલ નથી, પ્રતિકૃતિ અશક્ય!"
@@ -1409,7 +1437,7 @@ msgid "Marshall Islands"
 msgstr "માર્શલ ટાપુઓ"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "ફિલ્ડ નુ મોડેલ બદલવુ પ્રતિબંધિત છે!"
@@ -1431,7 +1459,7 @@ msgid "Search"
 msgstr "શોધ"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1450,7 +1478,14 @@ msgid "Parent Application"
 msgstr "પિતૃ અરજી"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "વિઝાર્ડો"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "પ્રક્રિયા રદ્"
@@ -1576,7 +1611,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "\"%s\" સંકેત વાળી કોઇ પણ ભાષા અસ્તિત્વ મા નથી."
@@ -1695,7 +1744,7 @@ msgid "On Create"
 msgstr "સર્જન પર"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1705,11 +1754,6 @@ msgstr ""
 "પૂર્ણવિરામો નો સમાવેશ થવો ન જોઇયે! તેઓ બીજા મોડ્યુલો ના ડેટા ને સંદર્ભે છે, "
 "જેમકે, module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1792,7 +1836,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1833,11 +1877,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "v"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1852,7 +1891,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1893,6 +1932,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "વાંચન પરવાનગી"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1969,16 +2013,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "જોડાયેલ મોડલ"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2033,7 +2072,7 @@ msgid "Formula"
 msgstr "સૂત્ર"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "રુટ વપરાશકર્તા દૂર કરી શકતા નથી!"
@@ -2057,11 +2096,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "% s (નકલ)"
@@ -2073,7 +2112,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2111,11 +2149,6 @@ msgstr "સંપૂર્ણ પાથ"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "વિચારો"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2248,6 +2281,11 @@ msgstr ""
 msgid "Method"
 msgstr "રીત"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2281,12 +2319,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2334,6 +2377,15 @@ msgstr "બેલિઝ"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2385,7 +2437,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2463,7 +2515,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "બિલ"
 
@@ -2510,11 +2561,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2631,9 +2677,20 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "પાપુઆ ન્યુ જીનેવા"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2711,7 +2768,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2770,6 +2827,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2778,7 +2848,7 @@ msgid "Manager"
 msgstr "વ્યવસ્થાપક"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2864,7 +2934,7 @@ msgid "Inherited"
 msgstr "સંદર્ભિત"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2894,7 +2964,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2959,22 +3029,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "ભૂલ!"
@@ -3068,12 +3138,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "ભૂલ! તમે પાસાના કંપનીઓ ન બનાવી શકો."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3090,17 +3160,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3110,7 +3182,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3161,34 +3233,6 @@ msgstr "રૂપરેખાંકન પરિમાણો"
 msgid "Invalid arguments"
 msgstr "અયોગ્ય દલીલો"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3227,7 +3271,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3239,6 +3283,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "બેન્ક ખાતા પ્રકાર"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3275,7 +3347,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3309,7 +3381,7 @@ msgid "Access Controls"
 msgstr "વપરાશ નિયંત્રણ"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3337,32 +3409,6 @@ msgstr "મુખ્ય કંપની"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3380,9 +3426,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "ભૂલ! તમે પાસાના કંપનીઓ ન બનાવી શકો."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "જન્મતારીખ"
 
@@ -3398,7 +3448,7 @@ msgid "Products Manufacturers"
 msgstr "ઉત્પાદનો ના ઉત્પાદકો"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3506,7 +3556,7 @@ msgid "Malta"
 msgstr "માલ્ટા"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3695,7 +3745,6 @@ msgstr "અહેવાલીકરણ"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "શીર્ષક"
@@ -3706,13 +3755,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3772,9 +3826,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3785,7 +3840,7 @@ msgid "Company Name"
 msgstr "કંપનીનું નામ"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3804,14 +3859,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "અનુવાદ વસ્તુ ભાષા કોડ જાણીતા ભાષાઓ વચ્ચે જ હોવી જોઈએ"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "રેકોર્ડ નિયમો"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3840,12 +3918,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3894,19 +3968,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3924,7 +3986,7 @@ msgid "Nauru"
 msgstr "નૌરુ"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3969,7 +4031,7 @@ msgid "Email Gateway"
 msgstr "ઈમેઈલ ગેટવે"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3988,8 +4050,42 @@ msgid "Technical Data"
 msgstr "તકનિકી આધારસામગ્રી"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4046,13 +4142,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "અયોગ્ય આર્કીટેક્ચર!"
@@ -4068,8 +4169,8 @@ msgid "Share any Document"
 msgstr "કોઈપણ દસ્તાવેજ શેર કરો"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4128,33 +4229,10 @@ msgid "Languages"
 msgstr "ભાષાઓ"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4232,7 +4310,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4304,6 +4381,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4365,9 +4447,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "સુરીનેમ"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4447,6 +4536,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4470,6 +4575,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4497,6 +4639,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4574,12 +4722,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4594,7 +4736,6 @@ msgstr "સ્વિટ્ઝર્લૅન્ડ - હિસાબ"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4605,13 +4746,18 @@ msgstr ""
 msgid "Author"
 msgstr "લેખક"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4654,6 +4800,8 @@ msgstr "દિશા"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "દેખાવો"
 
@@ -4669,7 +4817,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4762,7 +4910,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4850,7 +5003,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4965,6 +5118,11 @@ msgstr "મોરેશિયસ"
 msgid "Full Access"
 msgstr "પૂર્ણ વપરાશ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4978,7 +5136,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4989,7 +5147,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5021,6 +5179,17 @@ msgstr "સેનેગલ"
 msgid "Hungary"
 msgstr "હંગેરી"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5184,7 +5353,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5200,16 +5369,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5250,8 +5414,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5315,15 +5480,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5339,6 +5495,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5422,6 +5583,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5672,7 +5839,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5729,6 +5896,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5844,13 +6020,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5870,7 +6048,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5903,9 +6081,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5939,6 +6116,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "મૂળ દ્રશ્ય"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5949,7 +6131,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5965,26 +6147,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6117,11 +6279,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6133,8 +6290,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6241,7 +6398,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6279,7 +6436,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6306,8 +6463,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6340,6 +6525,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6382,7 +6574,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6474,7 +6666,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6494,23 +6686,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "મોબાઇલ"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6543,10 +6718,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6620,8 +6795,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6645,8 +6820,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6694,18 +6869,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6810,6 +6980,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "ભાષાંતરો"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6904,7 +7081,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -7005,12 +7181,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7052,6 +7222,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7109,7 +7280,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7129,6 +7300,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7140,13 +7316,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7177,7 +7358,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7223,7 +7404,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7243,30 +7423,30 @@ msgid "Child Categories"
 msgstr "વંશજ વર્ગ(શ્રેણી)"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7354,6 +7534,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7437,6 +7622,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7466,11 +7666,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7495,7 +7690,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7506,8 +7700,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7586,7 +7795,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7673,14 +7882,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7689,7 +7900,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "સુરક્ષા કારણો થી ખાલી પાસવર્ડ સેટ કરવા માન્ય નથી!"
@@ -7700,13 +7911,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7725,12 +7936,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7903,7 +8115,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7932,14 +8144,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "ચેતવણી!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7963,7 +8167,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8078,7 +8281,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8393,7 +8596,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8405,7 +8608,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8415,7 +8618,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8430,6 +8633,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8469,7 +8683,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8491,15 +8705,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr ""
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "અનુવાદ વસ્તુ ભાષા કોડ જાણીતા ભાષાઓ વચ્ચે જ હોવી જોઈએ"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8523,7 +8737,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8535,7 +8749,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8613,7 +8826,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8641,8 +8854,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8666,7 +8879,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8813,7 +9026,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8852,8 +9065,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8927,7 +9140,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8941,7 +9154,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9004,6 +9217,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9102,8 +9320,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9132,13 +9350,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9159,7 +9377,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9207,7 +9425,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9253,6 +9471,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9261,7 +9480,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9280,6 +9499,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9315,7 +9571,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9367,6 +9623,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9409,23 +9670,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9459,7 +9708,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9550,6 +9799,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9754,7 +10008,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9765,13 +10019,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9939,7 +10198,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9972,6 +10231,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9997,6 +10261,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10086,7 +10355,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10122,13 +10390,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10187,19 +10462,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10213,6 +10513,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10231,7 +10533,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10243,13 +10550,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10331,6 +10631,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10400,6 +10720,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10458,9 +10783,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10478,8 +10803,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10518,13 +10843,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10535,7 +10859,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10564,36 +10893,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10615,6 +10914,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10631,16 +10935,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10657,8 +10951,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10684,11 +10978,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10714,7 +11003,7 @@ msgid "Domain"
 msgstr "શરતી અવકાશ"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10730,12 +11019,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10756,29 +11045,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10799,7 +11068,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10846,7 +11115,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10870,6 +11138,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10955,19 +11224,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11009,22 +11287,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11157,7 +11419,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11247,7 +11508,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11297,8 +11558,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11389,7 +11650,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11416,7 +11677,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11502,7 +11763,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11515,7 +11776,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11560,8 +11821,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11569,7 +11828,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11598,12 +11857,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11710,8 +11963,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11748,7 +12003,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11884,11 +12139,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11905,7 +12155,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11928,7 +12178,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11969,16 +12219,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "સુરીનેમ"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12025,73 +12275,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12099,13 +12284,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12282,6 +12502,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12298,7 +12523,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12346,7 +12571,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12522,10 +12747,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12557,12 +12786,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12576,7 +12806,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12598,23 +12827,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12682,24 +12894,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12728,6 +12924,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12764,6 +12980,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12831,6 +13048,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12920,6 +13142,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12932,7 +13155,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12963,16 +13186,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13037,6 +13264,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13109,29 +13341,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13179,7 +13388,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13223,9 +13432,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "રેકોર્ડ નિયમો"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13469,9 +13678,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13498,63 +13712,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "તુર્કસ અને કાઇકોસ ટાપુઓ"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13595,17 +13760,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13640,7 +13794,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13720,11 +13874,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13739,6 +13892,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13759,6 +13917,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13795,41 +13977,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13890,40 +14037,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14012,6 +14127,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14054,34 +14184,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14104,9 +14206,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14117,7 +14219,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14143,7 +14275,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14188,7 +14320,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14221,11 +14353,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14241,8 +14372,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14357,7 +14486,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14369,7 +14498,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14402,7 +14530,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14413,8 +14541,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14440,11 +14568,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14534,7 +14657,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14601,8 +14723,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14630,7 +14756,7 @@ msgid "Japan"
 msgstr "જાપાન"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14691,6 +14817,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14715,7 +14872,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14754,6 +14911,12 @@ msgstr "ચલાવવું"
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14806,6 +14969,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "ક્રોએશિઆ"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14830,6 +15000,11 @@ msgstr "સિસ્ટમ અપડેટ"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14846,7 +15021,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14867,15 +15042,52 @@ msgstr "સિએરા લિઓન"
 msgid "General Information"
 msgstr "સામાન્ય માહિતી"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "તુર્કસ અને કાઇકોસ ટાપુઓ"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14911,7 +15123,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14929,11 +15146,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "કાર્ય"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14969,11 +15190,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15001,7 +15217,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "ભાગીદાર: "
@@ -15012,7 +15228,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15078,7 +15294,6 @@ msgstr "એક્સપોર્ટ નામ"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15166,6 +15381,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "અનેક દસ્તાવેજો પર."
 
+#~ msgid "Contact Name"
+#~ msgstr "સંપર્ક નામ"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15326,9 +15544,15 @@ msgstr ""
 #~ msgid "Please be patient, as this operation may take a few seconds..."
 #~ msgstr "કૃપા કરીને નમ્ર બાનો, કારણ કે આ પ્રક્રિયા થોડી સેકન્ડો લઈ શકે ..."
 
+#~ msgid "Attached ID"
+#~ msgstr "v"
+
 #~ msgid "Symbol position"
 #~ msgstr "સંજ્ઞા સ્થિતિ"
 
+#~ msgid "Attached Model"
+#~ msgstr "જોડાયેલ મોડલ"
+
 #~ msgid "References"
 #~ msgstr "સંદર્ભો"
 
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 6a88585302c..5c253d3b353 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:56+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "תאריך ושעה"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "מידה מקס."
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "שם להתקשרות"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -580,9 +536,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "מראה מקורי"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -607,26 +563,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "בוסניה/bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -637,9 +573,25 @@ msgstr ""
 "הקודם."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -714,14 +666,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "אשפים"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "שדות מותאמים אישית חייבים להתחיל ב 'x_' !"
@@ -785,16 +735,14 @@ msgid "Model Description"
 msgstr "תאור מודל"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -823,11 +771,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -958,13 +916,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"ספק את שם השדה שמזהה הרשומה מתייחס לרישום הפעולה. אם זה ריק זה יתייחס למזהה "
-"הפעיל של האובייקט."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua New Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -982,7 +936,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1030,16 +984,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "נייד"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1136,8 +1083,37 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1152,12 +1128,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1184,7 +1165,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1212,7 +1240,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1244,14 +1272,12 @@ msgid "South Korea"
 msgstr "South Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "העברות"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1388,7 +1414,7 @@ msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1410,7 +1436,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1425,7 +1451,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "אשפים"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1551,7 +1584,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1666,18 +1713,13 @@ msgid "On Create"
 msgstr "בהפקה"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1758,7 +1800,7 @@ msgid "East Timor"
 msgstr "East Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1799,11 +1841,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "מזהה קובץ מצורף"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1818,7 +1855,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1859,6 +1896,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "גישה לקריאה"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1935,16 +1977,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "מודל מצורף"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1999,7 +2036,7 @@ msgid "Formula"
 msgstr "נוסחה"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "לא ניתן להסיר משתמש מקור!"
@@ -2023,11 +2060,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2039,7 +2076,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "סוג הכתובת"
 
@@ -2077,11 +2113,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2216,6 +2247,11 @@ msgstr "מספר מודולים עודכנו."
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2249,12 +2285,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2302,6 +2343,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2353,7 +2403,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2433,7 +2483,6 @@ msgstr "Saint Tome (Sao Tome) and Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "חשבונית"
 
@@ -2480,11 +2529,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2601,9 +2645,20 @@ msgid "Default limit for the list view"
 msgstr "ברירת המחדל מוגבלת לרשימה המופיעה"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2681,7 +2736,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2740,6 +2795,19 @@ msgstr "מיפוי שדות"
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2748,7 +2816,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2834,7 +2902,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2864,7 +2932,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2929,22 +2997,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3038,12 +3106,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "שגיאה! אינך יכול ליצור חברות נסוגות."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3060,17 +3128,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3080,7 +3150,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "לא ניתן לשדרג מודול '%s'. הוא לא מותקן."
@@ -3131,34 +3201,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3197,7 +3239,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3209,6 +3251,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "סוג חשבון בנק"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3245,7 +3315,7 @@ msgid "Signal (subflow.*)"
 msgstr "סימן (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3279,7 +3349,7 @@ msgid "Access Controls"
 msgstr "הגדרות גישה"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3307,32 +3377,6 @@ msgstr "חברה מרכזית"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3350,9 +3394,13 @@ msgid ""
 "'object'."
 msgstr "אם תשתמש בסגנון נוסחא, השתמש בביטוי python על ידי 'אובייקט' משתנה."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "שגיאה! אינך יכול ליצור חברות נסוגות."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "תאריך לידה"
 
@@ -3368,7 +3416,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3476,7 +3524,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3665,7 +3713,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "כותרת"
@@ -3676,13 +3723,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "שגיאה רקורסיה בהתניות המודולים"
@@ -3742,9 +3794,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3755,7 +3808,7 @@ msgid "Company Name"
 msgstr "שם חברה"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3774,14 +3827,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "חוקי רישום"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre and Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3810,13 +3886,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3864,19 +3936,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3896,7 +3956,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3941,7 +4001,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3960,9 +4020,43 @@ msgid "Technical Data"
 msgstr "מידע טכני"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4018,13 +4112,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "בע\"מ"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "בר קוד בשיטת EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4040,8 +4139,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4100,33 +4199,10 @@ msgid "Languages"
 msgstr "שפות"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4204,7 +4280,6 @@ msgstr "אילוץ"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "ברירת מחדל"
 
@@ -4276,6 +4351,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4337,9 +4417,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4419,6 +4506,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4442,6 +4545,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4469,6 +4609,12 @@ msgstr ""
 msgid "View"
 msgstr "תצוגה"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4546,12 +4692,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4566,7 +4706,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "מיקוד"
@@ -4577,13 +4716,18 @@ msgstr "מיקוד"
 msgid "Author"
 msgstr "מחבר"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - ייצוג תאריך וזמן מתאים."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4626,6 +4770,8 @@ msgstr "כיוון"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "תצוגות"
 
@@ -4641,7 +4787,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "אתה מנסה להסיר מודול מותקן או שיותקן."
@@ -4734,7 +4880,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4822,7 +4973,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "שגיאה הופיעה בזמן נתינת תוקף לשדה(ות)  %s: %s"
@@ -4937,6 +5088,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4950,7 +5106,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4961,7 +5117,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4993,6 +5149,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungary"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5156,7 +5323,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5172,16 +5339,11 @@ msgid "Decimal Separator"
 msgstr "מפריד עשרות"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5222,9 +5384,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "יוצר"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5287,15 +5450,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5311,6 +5465,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "שם קובץ המצורף"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5394,6 +5553,12 @@ msgstr "Kazakhstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "שם מקור"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5644,7 +5809,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5701,6 +5866,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5816,13 +5990,15 @@ msgid "Bank Type"
 msgstr "סוג בנק"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "שם הקבוצה אינו יכול להתחיל ב \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5842,7 +6018,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5875,10 +6051,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "שם מקור"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5911,6 +6086,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "מראה מקורי"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5921,7 +6101,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5937,26 +6117,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6089,11 +6249,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6105,8 +6260,8 @@ msgid "Malaysia"
 msgstr "Malaysia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6213,7 +6368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6251,7 +6406,7 @@ msgid "Created Menus"
 msgstr "תפריטים שנוצרו"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6278,8 +6433,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6312,6 +6495,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6354,7 +6544,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6446,7 +6636,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6466,23 +6656,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "נייד"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6515,10 +6688,10 @@ msgstr "דוח XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "מודולים"
 
@@ -6592,8 +6765,8 @@ msgid "United Kingdom"
 msgstr "United Kingdom"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6617,8 +6790,8 @@ msgid "Partner Titles"
 msgstr "כותרת שותף"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6666,18 +6839,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6784,6 +6952,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "העברות"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6878,7 +7053,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6979,12 +7153,6 @@ msgstr "שם מלא"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7026,6 +7194,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7083,7 +7252,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "אנא ציין פעולה לביצוע!"
@@ -7103,6 +7272,11 @@ msgstr "שם קטגוריה"
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7114,13 +7288,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7151,7 +7330,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7197,7 +7376,6 @@ msgstr "שינוי"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7217,30 +7395,30 @@ msgid "Child Categories"
 msgstr "קטגוריות ילד"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "שגיאה"
@@ -7328,6 +7506,11 @@ msgstr ""
 msgid "This Window"
 msgstr "החלון הזה"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7411,6 +7594,21 @@ msgstr "שדות"
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7440,11 +7638,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "כתובות"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7469,7 +7662,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "רחוב"
@@ -7480,8 +7672,23 @@ msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7560,7 +7767,7 @@ msgid "Change My Preferences"
 msgstr "שנה את העדפות שלי"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7647,14 +7854,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7663,7 +7872,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7674,13 +7883,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7699,12 +7908,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "אשף"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7877,7 +8087,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7908,14 +8118,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7939,7 +8141,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8056,7 +8257,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8371,7 +8572,7 @@ msgid "Update Modules List"
 msgstr "עדכן רשימת מודולים"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8383,7 +8584,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8393,7 +8594,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8408,6 +8609,17 @@ msgstr "המשך"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8447,7 +8659,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8469,15 +8681,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "שם קובץ המצורף"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8501,7 +8713,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - שם חודש מקוצר."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8513,7 +8725,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "ספק"
@@ -8591,7 +8802,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8619,8 +8830,8 @@ msgid "Iteration"
 msgstr "איטרציה"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "משתמש שגוי"
@@ -8644,7 +8855,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8791,7 +9002,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8830,8 +9041,8 @@ msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "שגיאת גישה"
@@ -8905,7 +9116,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8919,7 +9130,7 @@ msgid "Ukraine"
 msgstr "Ukraine"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8982,6 +9193,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9080,8 +9296,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9110,13 +9326,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9137,7 +9353,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9185,7 +9401,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9231,6 +9447,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9239,7 +9456,7 @@ msgid "Cancel"
 msgstr "בטל"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9258,6 +9475,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9293,7 +9547,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9345,6 +9599,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9387,23 +9646,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9437,7 +9684,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9528,6 +9775,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9732,7 +9984,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9743,13 +9995,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "יחידת מרוח /פער"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "סוג"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "שיטה זו אינה קיימת יותר"
@@ -9917,7 +10174,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9950,6 +10207,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9975,6 +10237,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10064,7 +10331,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "עיר"
@@ -10100,13 +10366,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "אסטונית / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"ספק את שם השדה שמזהה הרשומה מתייחס לרישום הפעולה. אם זה ריק זה יתייחס למזהה "
+"הפעיל של האובייקט."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "גרסא GPL-3 או מאוחרת יותר"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10165,19 +10440,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10191,6 +10491,8 @@ msgid "Activity"
 msgstr "פעילות"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10209,7 +10511,12 @@ msgid "Parent Company"
 msgstr "חברת הורה"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10221,13 +10528,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10309,6 +10609,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10379,6 +10699,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10437,9 +10762,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10457,8 +10782,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "בעיה בקביעת תצורה 'מזהה רשומה' בפעולת שרת!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10497,13 +10822,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "דוא\"ל"
@@ -10514,7 +10838,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10545,36 +10874,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10596,6 +10895,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "רצף עבודה"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10612,16 +10916,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10638,8 +10932,8 @@ msgid "Cascade"
 msgstr "מדורג"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10665,11 +10959,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10695,7 +10984,7 @@ msgid "Domain"
 msgstr "מתחם"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10711,12 +11000,12 @@ msgid "State Name"
 msgstr "שם מדינה"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10737,30 +11026,10 @@ msgid "Timezone"
 msgstr "אזור זמן"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10780,7 +11049,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10827,7 +11096,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10851,6 +11119,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10936,19 +11205,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "רצף עבודה"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10990,22 +11268,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "טיעונים"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11138,7 +11400,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "לקוח"
 
@@ -11228,7 +11489,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11278,8 +11539,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11370,7 +11631,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11397,7 +11658,7 @@ msgid "Object"
 msgstr "אובייקט"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11483,7 +11744,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11496,7 +11757,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11541,8 +11802,6 @@ msgstr "מדריך התיחסות"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11550,7 +11809,7 @@ msgid "Partner"
 msgstr "שותף"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11579,12 +11838,6 @@ msgstr "Falkland Islands"
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11691,8 +11944,10 @@ msgid "Selection"
 msgstr "בחירה"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11729,7 +11984,7 @@ msgid "Action Type"
 msgstr "סוג פעולה"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11865,11 +12120,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "שעה 00->12: %(h12)ות"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "הסר את הסימון מהשדה הפעיל כדי להסתיר את איש הקשר."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11886,7 +12136,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11909,7 +12159,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11950,16 +12200,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12006,91 +12256,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"מבנה המפריד צריך להיות [,n] כאשר 0<n : מתחיל מיחידת ספרה. -1 יסיים את "
-"ההפרדה. למשל [1-,3,2] ייצג את 106500 להיות  1,06,500;[1-,1,2] ייצג  את אותו "
-"מספר להיות  106,50,0;[3] ייצג אותו כ 106,500. השתמש ב- ',' כמפריד אלפים בכל "
-"מקרה ."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12269,6 +12485,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12285,7 +12506,7 @@ msgid "Body"
 msgstr "גוף"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12333,7 +12554,7 @@ msgid "choose"
 msgstr "בחר"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12509,10 +12730,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12544,12 +12769,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12563,7 +12789,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12585,23 +12810,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12669,25 +12877,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12715,6 +12907,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12751,6 +12963,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "לא ידוע"
@@ -12818,6 +13031,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12907,6 +13125,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12919,7 +13138,7 @@ msgid "Information"
 msgstr "מידע"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12950,16 +13169,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13024,6 +13247,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13096,29 +13324,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13166,7 +13371,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13210,9 +13415,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "חוקי רישום"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13456,9 +13661,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13485,63 +13695,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13582,17 +13743,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13627,7 +13777,7 @@ msgid "Low"
 msgstr "נמוך"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13707,11 +13857,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "טלפון"
@@ -13726,6 +13875,11 @@ msgstr "תפריט גישה"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13746,6 +13900,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13782,41 +13960,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13877,40 +14020,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13999,6 +14110,21 @@ msgstr "הצג:"
 msgid "View Auto-Load"
 msgstr "הצג טעינה אוטומטית"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14041,34 +14167,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14091,9 +14189,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14104,7 +14202,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14130,7 +14258,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14175,7 +14303,7 @@ msgid "Access"
 msgstr "גישה"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14208,11 +14336,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "פקס"
@@ -14228,8 +14355,6 @@ msgstr "פקס"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14344,7 +14469,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14356,7 +14481,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14389,7 +14513,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14400,8 +14524,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "אזהרה"
@@ -14427,11 +14551,6 @@ msgstr "Virgin Islands (British)"
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14521,7 +14640,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "ארץ"
@@ -14588,9 +14706,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"מבנה המפריד צריך להיות [,n] כאשר 0<n : מתחיל מיחידת ספרה. -1 יסיים את "
+"ההפרדה. למשל [1-,3,2] ייצג את 106500 להיות  1,06,500;[1-,1,2] ייצג  את אותו "
+"מספר להיות  106,50,0;[3] ייצג אותו כ 106,500. השתמש ב- ',' כמפריד אלפים בכל "
+"מקרה ."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14617,7 +14743,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14678,6 +14804,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14702,7 +14859,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14741,6 +14898,12 @@ msgstr ""
 msgid "Condition"
 msgstr "מצב"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14793,6 +14956,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14817,6 +14987,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14833,7 +15008,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14854,15 +15029,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "מידע כללי"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14898,7 +15110,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14916,11 +15133,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "תפקוד"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14956,11 +15177,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "משלוח"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14988,7 +15204,7 @@ msgid "Workflow Instances"
 msgstr "שלב ברצף העבודה"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "שותפים: "
@@ -14999,7 +15215,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15065,7 +15281,6 @@ msgstr "ייצא שם"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15125,6 +15340,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "בריבוי מסמכים"
 
+#~ msgid "Contact Name"
+#~ msgstr "שם להתקשרות"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15191,6 +15409,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "מזהה קובץ מצורף"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "השאר 0 אם הפעולה חייבת להופיע בכל המקורות."
 
@@ -15201,6 +15422,9 @@ msgstr ""
 #~ "פרט את ההודעה. ניתן להשתמש בשדה מהאובייקט לדוגמא ` [[ object.partner_id.name "
 #~ "]] יקר`"
 
+#~ msgid "Attached Model"
+#~ msgstr "מודל מצורף"
+
 #~ msgid "Trigger Name"
 #~ msgstr "שם הגורם"
 
@@ -15349,6 +15573,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "נתיב SXW"
 
+#~ msgid "Creator"
+#~ msgstr "יוצר"
+
 #, python-format
 #~ msgid "The write method is not implemented on this object !"
 #~ msgstr "שיטת הכתיבת אינה מיושמת באובייקט זה."
@@ -15435,6 +15662,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "כתובות"
+
 #~ msgid "XML Identifier"
 #~ msgstr "מזהה XML"
 
@@ -15553,6 +15783,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "טען תרגום רשמי"
 
+#~ msgid "Delivery"
+#~ msgstr "משלוח"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "חברת שירות קוד פתוח"
 
@@ -15562,6 +15795,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "סוג שדה"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "הסר את הסימון מהשדה הפעיל כדי להסתיר את איש הקשר."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Congo, The Democratic Republic of the"
 
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index 3edb81ed8ef..38a8bc14422 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 11:23+0000\n"
 "Last-Translator: Harshraj Nanotiya <harshrajnanotiya@gmail.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:03+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "वेड"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 0dacf6c6adb..a3fd254bba1 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 20:48+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "DateTime"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -194,41 +194,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -238,7 +212,7 @@ msgstr ""
 "promijeniti u Python kodu, najbolje u korisničkom modulu."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Greška ograničenja"
@@ -249,7 +223,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Preimenovanje polja \"%s\" nije dopušteno"
@@ -260,7 +234,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "kreiran."
@@ -294,7 +268,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Više valuta"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -339,20 +313,6 @@ msgstr "Tvrtka u u koju će se spremiti trenutni zapis"
 msgid "Max. Size"
 msgstr "Max. veličina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -360,11 +320,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Naziv kontakta"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -429,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -466,6 +421,7 @@ msgstr "Automatska akcijska pravila"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Vlasnik"
 
@@ -506,7 +462,7 @@ msgstr ""
 "formata, prikazuju se kod uređuvanja jezičkih postavki."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -560,7 +516,7 @@ msgid "Netherlands Antilles"
 msgstr "Nizozemski Antili"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -600,9 +556,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Izvorni ekran za pregled"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideje"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -627,26 +583,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnian / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -657,9 +593,25 @@ msgstr ""
 "biti će vraćen prethodni izvještaj."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -736,14 +688,12 @@ msgstr ""
 "{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Čarobnjaci"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr "Logotip za web"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Imena dodatnih polja moraju počinjati s 'x_' !"
@@ -807,16 +757,14 @@ msgid "Model Description"
 msgstr "Opis modela"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -850,11 +798,21 @@ msgstr "Izraz koji koji pokreće radnju"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr "Hrvatska - RRIF Računski plan 2012"
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Sljedeće planirano vrijeme izvršenja za ovu radnju."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -986,13 +944,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Unesite naziv polja na kojega se odnosi šifra zapisa za operacije "
-"zapisivanja. Ako je prazno odnosit će se na trenutnu šifru objekta."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nova Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1011,7 +965,7 @@ msgid "Email Preferences"
 msgstr "Postavke za E-mail"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' nije ispravna vrijednost za datumsko polje '%%(field)s'"
@@ -1059,16 +1013,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Španjolski"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobilni"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1165,9 +1112,38 @@ msgid "Mongolia"
 msgstr "Mongolija"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1182,12 +1158,17 @@ msgstr ""
 "Korisnici dodani ovoj grupi automatski se dodaju i slijedećim grupama."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1214,7 +1195,54 @@ msgid "Username"
 msgstr "Korisničko ime"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1242,7 +1270,7 @@ msgid "Delete Access Right"
 msgstr "Prava brisanja"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Graška pri testiranju povezivanja!"
@@ -1274,14 +1302,12 @@ msgid "South Korea"
 msgstr "Republika Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Poveznice"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Zapis #%d od %s nije pronađen, kopiranje nije moguće!"
@@ -1419,7 +1445,7 @@ msgid "Marshall Islands"
 msgstr "Maršalovi otoci"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Nije dopušteno mjenjanje modela polja."
@@ -1441,7 +1467,7 @@ msgid "Search"
 msgstr "Pronađi"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1460,7 +1486,14 @@ msgid "Parent Application"
 msgstr "Nadređena aplikacija"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Čarobnjaci"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operacija prekinuta"
@@ -1586,7 +1619,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Jezik \"%s\" ne postoji/ nije definiran"
@@ -1702,7 +1749,7 @@ msgid "On Create"
 msgstr "Pri stvaranju"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1711,11 +1758,6 @@ msgstr ""
 "'%s' sadrži točke. XML id ne dovoljava točke, jer se one koriste za "
 "odvajanje naziva modula u kojem je definiran i XML id !"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Ponude, prodajni nalozi, fakturiranje"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1796,7 +1838,7 @@ msgid "East Timor"
 msgstr "Istočni timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1837,11 +1879,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID privitka"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1856,7 +1893,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1897,6 +1934,11 @@ msgstr "Vozilo, leasing, osiguranja, troškovi"
 msgid "Read Access"
 msgstr "Pravo čitanja"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1973,16 +2015,11 @@ msgid "Create Tasks on SO"
 msgstr "Kreiranje zadataka iz prodajnih naloga"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Pridruženi model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2037,7 +2074,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Nije moguće obrisati root korisnika!"
@@ -2061,11 +2098,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -2077,7 +2114,6 @@ msgstr "Predložak kontnog plana"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Vrsta adrese"
 
@@ -2115,11 +2151,6 @@ msgstr "Puna putanja"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideje"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2256,6 +2287,11 @@ msgstr "Broj nadograđenih modula"
 msgid "Method"
 msgstr "Metoda"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2289,12 +2325,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2342,6 +2383,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Dodaj ili ne korporativno RML zaglavlje"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2395,7 +2445,7 @@ msgstr ""
 "etc. (Default: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Dokument je u međuvremenu promjenjen (%s:%d)"
@@ -2476,7 +2526,6 @@ msgstr "Sveti Toma (sao Tome) i Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2523,11 +2572,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2645,9 +2689,20 @@ msgid "Default limit for the list view"
 msgstr "Zadano ograničenje broja stavki u ekranu pregleda"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nova Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2728,7 +2783,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2787,6 +2842,19 @@ msgstr "Mapiranje polja"
 msgid "Export Translations"
 msgstr "Izvoz prijevoda"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2795,7 +2863,7 @@ msgid "Manager"
 msgstr "Voditelj"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2881,7 +2949,7 @@ msgid "Inherited"
 msgstr "Naslijeđeno"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "da"
@@ -2911,7 +2979,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2976,22 +3044,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn Integracija"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Neispravna struktura objekta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -3085,12 +3153,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Graška! Ne može se stvoriti tvrtka s rekurzijom."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3109,17 +3177,19 @@ msgstr ""
 "statističkim izvještajima."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3129,7 +3199,7 @@ msgid "Params storage"
 msgstr "Spremanje parametara"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Nije moguće nadograditi modul '%s'. Nije instaliran."
@@ -3180,34 +3250,6 @@ msgstr "Konfigurabilni parametri"
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3246,7 +3288,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3258,6 +3300,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Vrsta bankovnog računa"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3294,7 +3364,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3330,7 +3400,7 @@ msgid "Access Controls"
 msgstr "Kontrola pristupa"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3360,32 +3430,6 @@ msgstr "Glavna tvrtka"
 msgid "Web Icon File (hover)"
 msgstr "Datoteka web ikone (lebdeća)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3405,9 +3449,13 @@ msgstr ""
 "Ako koristite tip formula, upotrijebite python izraz koristeći promjenjivu "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Graška! Ne može se stvoriti tvrtka s rekurzijom."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Datum rođenja"
 
@@ -3423,7 +3471,7 @@ msgid "Products Manufacturers"
 msgstr "Proizvođači"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-kroz-SSL način nije dostupan"
@@ -3531,7 +3579,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3722,7 +3770,6 @@ msgstr "Izvještaji"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Naslov"
@@ -3734,13 +3781,18 @@ msgstr ""
 "Ako nije postavljeno, služi kao pretpostavljena vrijednost za nove resurse"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Otkrivena je rekurzivnost"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekurzivna greška u zavisnosti modula !"
@@ -3800,9 +3852,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Pristup odbijen / zabranjen"
@@ -3813,7 +3866,7 @@ msgid "Company Name"
 msgstr "Naziv tvrtke"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3834,14 +3887,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (zastarjelo - koristite Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre and Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3870,17 +3946,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Dozvoli anonimni pristup OpenERP-u.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3928,19 +3996,7 @@ msgid "Paper Format"
 msgstr "Format papira"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3960,7 +4016,7 @@ msgid "Nauru"
 msgstr "Naurujski"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4005,7 +4061,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4024,9 +4080,43 @@ msgid "Technical Data"
 msgstr "Tehnički podaci"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4082,13 +4172,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Pogrešna arhitektura!"
@@ -4104,9 +4199,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Potencijali, prilike, tel. pozivi"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Potrebna grupa"
 
 #. module: base
 #: view:res.lang:0
@@ -4164,33 +4259,10 @@ msgid "Languages"
 msgstr "Jezici"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Isključivo ili"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4268,7 +4340,6 @@ msgstr "Ograničenje"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Predefinirano"
 
@@ -4340,6 +4411,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4401,9 +4477,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4483,6 +4566,22 @@ msgstr "Učitaj prijevod"
 msgid "Installed Version"
 msgstr "Instalirana verzija"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4509,6 +4608,43 @@ msgstr ""
 "je ovo polje prazno, OpenERP će izračunati vidljivost na temelju prava "
 "čitanja povezanih objekta."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4536,6 +4672,12 @@ msgstr ""
 msgid "View"
 msgstr "Prikaz"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "ne"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4613,12 +4755,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4633,7 +4769,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Poštanski kod"
@@ -4644,13 +4779,18 @@ msgstr "Poštanski kod"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Postavi kao Todo"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Odgovarajući oblik datuma i vremena"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4696,6 +4836,8 @@ msgstr "Smjer"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Pregled"
 
@@ -4711,7 +4853,7 @@ msgid "SMTP Server"
 msgstr "SMTP poslužitelj"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4805,7 +4947,12 @@ msgid "Google Docs integration"
 msgstr "Integracija Google dokumenata"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "naziv"
@@ -4893,7 +5040,7 @@ msgid "System Configuration Done"
 msgstr "Konfiguracija sistema dovršena"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Dogodila se greška pri provjeri polja %s: %s"
@@ -5008,6 +5155,11 @@ msgstr "Mauricijus"
 msgid "Full Access"
 msgstr "Puni pristup"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5021,7 +5173,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5032,7 +5184,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5064,6 +5216,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Mađarska"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5231,7 +5394,7 @@ msgid "Account Owner Name"
 msgstr "Naziv vlasnika računa"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Stupac %s već postoji!"
@@ -5247,16 +5410,11 @@ msgid "Decimal Separator"
 msgstr "Decimalni separator"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Nedostaje vrijednost za obavezno polje '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5303,9 +5461,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Autor"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Naziv modula mora biti jedinstven!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5368,19 +5527,6 @@ msgstr "Venecuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"Dozvoli prijavu korisnicima.\n"
-"=======================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5396,6 +5542,11 @@ msgstr "Pokreni asistenta za konfiguraciju"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Naziv privitka"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5479,6 +5630,12 @@ msgstr "Kazahstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - dan u tjednu [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Naziv resursa"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5732,7 +5889,7 @@ msgid "title"
 msgstr "naslov"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "točno"
@@ -5789,6 +5946,15 @@ msgstr "Proizvodi"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5906,13 +6072,15 @@ msgid "Bank Type"
 msgstr "Tip banke"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Naziv grupe ne može počimati sa \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplikacije"
 
@@ -5932,7 +6100,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5966,10 +6134,9 @@ msgid "Uncategorized"
 msgstr "Bez kategorije"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Naziv resursa"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6002,6 +6169,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Izvorni ekran za pregled"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6012,7 +6184,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6028,26 +6200,6 @@ msgstr "Administrativna podjela države. ( Županije, fed. jedinice, kantoni)"
 msgid "My Banks"
 msgstr "Moje banke"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6180,11 +6332,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Promijeni lozinku"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6196,8 +6343,8 @@ msgid "Malaysia"
 msgstr "Malezija"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6304,7 +6451,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Pogled tipa '%s' ne postoji!"
@@ -6342,7 +6489,7 @@ msgid "Created Menus"
 msgstr "kreirani izbornici"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6369,9 +6516,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Postavi kao Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6403,6 +6578,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Trenutna godina dvoznamenkasto: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Sistemski parametri"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6445,7 +6627,7 @@ msgid "Audit Trail"
 msgstr "Nadzor upisa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6537,7 +6719,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6557,23 +6739,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6606,10 +6771,10 @@ msgstr "Xml izvješća"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduli"
 
@@ -6683,9 +6848,9 @@ msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6709,8 +6874,8 @@ msgid "Partner Titles"
 msgstr "Titule partnera"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Koristi format '%s'"
@@ -6758,7 +6923,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6767,11 +6932,6 @@ msgstr ""
 "Nije moguće izvršiti radnju. Stvaranje novog zapisa nije dozvoljeno za "
 "objekte namijenjene izvještavanju."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anonimno"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6878,6 +7038,13 @@ msgstr "Datoteka modula uspješno uvezena!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Poveznice"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6972,7 +7139,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Država/Pokrajina/Županija"
@@ -7073,12 +7239,6 @@ msgstr "Puno ime"
 msgid "on"
 msgstr "na"
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Naziv modula mora biti jedinstven!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7120,6 +7280,7 @@ msgstr "Na više dokumenata"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7177,7 +7338,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Navedite radnju za pokretanje !"
@@ -7197,6 +7358,11 @@ msgstr "Naziv kategorije"
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7208,13 +7374,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr "Koristite čarobnjaka za promjenu lozinke."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7245,7 +7416,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Nedovoljno polja za kalendarski pogled."
@@ -7291,7 +7462,6 @@ msgstr "Tranzicija"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7311,30 +7481,30 @@ msgid "Child Categories"
 msgstr "Kategorije kćeri"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -7422,6 +7592,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Ovaj prozor"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7505,6 +7680,21 @@ msgstr "Polja"
 msgid "Employees"
 msgstr "Radnici"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7534,11 +7724,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adrese"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7563,7 +7748,6 @@ msgstr "Odabir"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Ulica"
@@ -7574,9 +7758,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslavija (više ne postoji)"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Roditelj desno"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7654,7 +7853,7 @@ msgid "Change My Preferences"
 msgstr "Izmjeni moje postavke"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Pogrešan naziv modela u definiciji akcije."
@@ -7741,14 +7940,16 @@ msgid "US Letter"
 msgstr "US pismo"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7757,7 +7958,7 @@ msgid "Company Bank Accounts"
 msgstr "Bankovni računi"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Zaporka ne može ostati prazna."
@@ -7768,13 +7969,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7796,12 +7997,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Čarobnjak"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7974,7 +8176,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8005,14 +8207,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Upozorenje!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8036,7 +8230,6 @@ msgstr "Internetski prečaci"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8154,7 +8347,7 @@ msgid "Nigeria"
 msgstr "Nigerija"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Za polja iz odabira, ocije odabira moraju biti zadane!"
@@ -8469,7 +8662,7 @@ msgid "Update Modules List"
 msgstr "Osvježi listu modula"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8483,7 +8676,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8497,7 +8690,7 @@ msgstr ""
 "kliknuti na 'Odustani' u  Korisničkim postavkama)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8512,6 +8705,17 @@ msgstr "Nastavi"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8551,7 +8755,7 @@ msgid "Mexico"
 msgstr "Meksiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8573,15 +8777,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Naziv privitka"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8605,7 +8809,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Skraćeni naziv mjeseca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8617,7 +8821,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -8695,7 +8898,7 @@ msgid "Selectable"
 msgstr "Može se odabrati"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8723,8 +8926,8 @@ msgid "Iteration"
 msgstr "Iteracija"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Korisnička Greška"
@@ -8748,7 +8951,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8896,7 +9099,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8935,8 +9138,8 @@ msgid "Solomon Islands"
 msgstr "Solomonski otoci"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -9010,7 +9213,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9024,7 +9227,7 @@ msgid "Ukraine"
 msgstr "Ukrajina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9087,6 +9290,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9185,9 +9393,9 @@ msgid "Custom Shortcuts"
 msgstr "Prečaci"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9215,13 +9423,13 @@ msgid "Models"
 msgstr "Modeli"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9242,7 +9450,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9290,7 +9498,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s ne postoji!"
@@ -9336,6 +9544,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9344,7 +9553,7 @@ msgid "Cancel"
 msgstr "Odustani"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9363,6 +9572,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9398,7 +9644,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9450,6 +9696,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Sat (12-satni) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9492,23 +9743,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9542,7 +9781,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Odaberite 'Nastavi' za postavke sljedećeg dodatka..."
@@ -9633,6 +9872,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9839,7 +10083,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9850,13 +10094,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Jedinica intervala"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Vrsta"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Ova metoda više ne postoji"
@@ -10027,7 +10276,7 @@ msgid "To Translate"
 msgstr "Za prevesti"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Vidi sve moguće vrijednosti"
@@ -10060,6 +10309,11 @@ msgstr "Potreban broj vodećih \"0\" će se automatski dodati."
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10085,6 +10339,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10174,7 +10433,6 @@ msgstr "%m - Mjesec [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Grad"
@@ -10210,13 +10468,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonijski / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Unesite naziv polja na kojega se odnosi šifra zapisa za operacije "
+"zapisivanja. Ako je prazno odnosit će se na trenutnu šifru objekta."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ili novija verzija"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10275,19 +10542,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10301,6 +10593,8 @@ msgid "Activity"
 msgstr "Aktivnost"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10319,7 +10613,12 @@ msgid "Parent Company"
 msgstr "Nadređena tvrtka"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10331,13 +10630,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10424,6 +10716,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Prodaja i skladište"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10495,6 +10807,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tip sekvence"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10554,9 +10871,9 @@ msgstr ""
 "Brisanje aktivnih jezika nije moguće. Deaktivirajte jezik ako je potrebno."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10574,8 +10891,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem u konfiguraciji 'Zapis id' u akciji poslužitelja!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10614,13 +10931,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10631,7 +10947,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10662,36 +10983,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10713,6 +11004,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ekvador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "tok rada"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10729,16 +11025,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Ne možete obrisati jezik. Postoje korisnici koji ga koriste!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10755,9 +11041,9 @@ msgid "Cascade"
 msgstr "Kaskadno"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Potrebna grupa"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Potencijali, prilike, tel. pozivi"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10782,11 +11068,6 @@ msgstr "Prevedeno"
 msgid "Default Company per Object"
 msgstr "Predefinirana organizacija po objektu"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10812,7 +11093,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10828,12 +11109,12 @@ msgid "State Name"
 msgstr "Naziv države/pokrajine/županije"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10854,30 +11135,10 @@ msgid "Timezone"
 msgstr "Vremenska zona"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10897,7 +11158,7 @@ msgid "Shared"
 msgstr "Dijeljen"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10950,7 +11211,6 @@ msgstr "Dvostruka ovjera u nabavi"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Ulica2"
 
@@ -10974,6 +11234,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11059,19 +11320,28 @@ msgid "Related Partner"
 msgstr "Povezani partner"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Greška integriteta"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "tok rada"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Veličina polja nikada ne može biti manja od 1!"
@@ -11113,22 +11383,6 @@ msgstr "Popis zaposlenih"
 msgid "Arguments"
 msgstr "Argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11261,7 +11515,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Kupac"
 
@@ -11351,7 +11604,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11401,8 +11654,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11493,7 +11746,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11520,7 +11773,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11609,7 +11862,7 @@ msgid "Mrs."
 msgstr "Gđa."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11622,7 +11875,7 @@ msgid "User Ref."
 msgstr "Vezani korisnik"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11667,8 +11920,6 @@ msgstr "Referentni vodič"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11676,7 +11927,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11705,12 +11956,6 @@ msgstr "Falklandski Otoci"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Isključivo ili"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11817,8 +12062,10 @@ msgid "Selection"
 msgstr "Odabir"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11855,7 +12102,7 @@ msgid "Action Type"
 msgstr "Vrsta akcije"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11993,11 +12240,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Sat 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Odznačite polje aktivan da biste sakrili kontakt."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12014,7 +12256,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Nepoznat atribut %s u %s "
@@ -12037,7 +12279,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "nedefinirana get metoda !"
@@ -12078,16 +12320,16 @@ msgstr "Brončani"
 msgid "Payroll Accounting"
 msgstr "Knjigovodstvo obračuna plaća"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binarna datoteka ili vanjski URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Promjena lozinke"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12134,92 +12376,57 @@ msgid "Address Format"
 msgstr "Format adrese"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Format razdijelnika bi trebao biti kao [,n] gdje je 0 < n:započeto s brojem "
-"jedinice. -1 će prekinuti razdvajanje. npr. [3,2,-1] predstavlja 106500 da "
-"bude 1,06,500;[1,2,-1] će predstavljati ga kao 106,50,0;[3] će ga "
-"predstavljati kao 106,500. Pod uvjetom da je ',' razdijelnik tisućica u "
-"svakom slučaju."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12398,6 +12605,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12414,7 +12626,7 @@ msgid "Body"
 msgstr "Tijelo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12462,7 +12674,7 @@ msgid "choose"
 msgstr "odaberite"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12638,10 +12850,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12673,12 +12889,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12692,7 +12909,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Razno"
@@ -12714,23 +12930,6 @@ msgstr "Tehnički"
 msgid "China"
 msgstr "Kina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12798,25 +12997,9 @@ msgid "Bulgaria"
 msgstr "Bugarska"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12844,6 +13027,26 @@ msgstr "5. %y, %Y ==> 11, 2011"
 msgid "ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12880,6 +13083,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "nepoznato"
@@ -12947,6 +13151,11 @@ msgstr "Adresar"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13036,6 +13245,7 @@ msgid "Projects, Tasks"
 msgstr "Projekti, zadaci"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13048,7 +13258,7 @@ msgid "Information"
 msgstr "Informacije"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "netočno"
@@ -13079,16 +13289,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Roditelj desno"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Ažuriraj listu modula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13153,6 +13367,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13225,29 +13444,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13295,7 +13491,7 @@ msgid "Delivery Costs"
 msgstr "Troškovi dostave"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13339,9 +13535,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Pravila zapisa"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13585,10 +13781,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "ne"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -13614,63 +13815,14 @@ msgid "System Configuration done"
 msgstr "Konfiguracija dovršena"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Sistemski parametri"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13711,17 +13863,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13756,7 +13897,7 @@ msgid "Low"
 msgstr "Niska"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Greška ! Ne možete kreirati rekurzivni Izbornik."
@@ -13838,11 +13979,10 @@ msgid "El Salvador"
 msgstr "San Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13857,6 +13997,11 @@ msgstr "Izbornik prava"
 msgid "Thailand"
 msgstr "Tajland"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13877,6 +14022,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanian / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13913,41 +14082,6 @@ msgstr "Relacija objekta"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14008,40 +14142,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14130,6 +14232,21 @@ msgstr "Pogled :"
 msgid "View Auto-Load"
 msgstr "Automatsko učitavanje"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14172,34 +14289,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14222,9 +14311,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14235,7 +14324,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14261,7 +14380,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14306,7 +14425,7 @@ msgid "Access"
 msgstr "Pristup"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14339,11 +14458,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14359,8 +14477,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14475,7 +14591,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14487,7 +14603,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Indeks boje"
 
@@ -14520,7 +14635,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14531,8 +14646,8 @@ msgid "Azerbaijan"
 msgstr "Azerbajdžan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -14558,11 +14673,6 @@ msgstr "Djevičansko otočje"
 msgid "Parameters"
 msgstr "Parametri"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14652,7 +14762,6 @@ msgstr "Edukacije, konferencije, sastanci, izložbe, registracije"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Država"
@@ -14723,9 +14832,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Instaliraj modul"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"Format razdijelnika bi trebao biti kao [,n] gdje je 0 < n:započeto s brojem "
+"jedinice. -1 će prekinuti razdvajanje. npr. [3,2,-1] predstavlja 106500 da "
+"bude 1,06,500;[1,2,-1] će predstavljati ga kao 106,50,0;[3] će ga "
+"predstavljati kao 106,500. Pod uvjetom da je ',' razdijelnik tisućica u "
+"svakom slučaju."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14752,7 +14870,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14813,6 +14931,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14837,7 +14986,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Ova operacija može potrajati nekoliko minuta."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14876,6 +15025,12 @@ msgstr "Izvršavanje"
 msgid "Condition"
 msgstr "Uvjet"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14930,6 +15085,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Hrvatska"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14954,6 +15116,11 @@ msgstr "Ažuriranje sustava"
 msgid "SXW Content"
 msgstr "SXW Sadržaj"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14970,7 +15137,7 @@ msgid "Gold"
 msgstr "Zlatni"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14991,15 +15158,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Opći podaci"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "Puni ID"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15035,7 +15239,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Upozorenje: Promjena tvrtke"
@@ -15053,11 +15262,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Korak uvećanja brojača. 1 će uvećavati brojač za jedan, 10 za 10."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcija"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15093,11 +15306,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Interne bilješke"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Dostava"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15125,7 +15333,7 @@ msgid "Workflow Instances"
 msgstr "Instance radnog tijeka"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneri: "
@@ -15136,7 +15344,7 @@ msgid "Is a Company?"
 msgstr "Je tvrtka="
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15202,7 +15410,6 @@ msgstr "Naziv izvoza"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15243,6 +15450,9 @@ msgstr "Ruski / русский язык"
 msgid "Signup"
 msgstr ""
 
+#~ msgid "Addresses"
+#~ msgstr "Adrese"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
 
@@ -15268,6 +15478,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Na više dokum."
 
+#~ msgid "Contact Name"
+#~ msgstr "Naziv kontakta"
+
 #~ msgid "E-Mail"
 #~ msgstr "Email"
 
@@ -15459,6 +15672,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW putanja"
 
+#~ msgid "Creator"
+#~ msgstr "Autor"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15544,6 +15760,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Ne prikazuj ovaj log ako pripada objektu na kojem korisnik upravo radi"
 
+#~ msgid "Attached Model"
+#~ msgstr "Pridruženi model"
+
 #~ msgid ""
 #~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 #~ "object.partner_id.name ]]`"
@@ -16120,6 +16339,9 @@ msgstr ""
 #~ msgid "Add a widget for User"
 #~ msgstr "Dodaj widget"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Odznačite polje aktivan da biste sakrili kontakt."
+
 #~ msgid ""
 #~ "Only specify a value if you want to change the user password. This user will "
 #~ "have to logout and login again!"
@@ -16130,6 +16352,9 @@ msgstr ""
 #~ msgid "Emails"
 #~ msgstr "E-pošta"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binarna datoteka ili vanjski URL"
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Kongo, Demokratska Repubilika"
 
@@ -16296,6 +16521,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Nikad"
 
+#~ msgid "Delivery"
+#~ msgstr "Dostava"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "BIC/Swift"
 
@@ -16366,6 +16594,9 @@ msgstr ""
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID privitka"
+
 #~ msgid "Logs"
 #~ msgstr "Praćenja"
 
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 3808cfd8516..87893920dab 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-20 15:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 14:58+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <openerp-hungarian-team@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:38+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "Dátum/Idő"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -219,70 +219,15 @@ msgstr ""
 "kimutatást készíthet."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"Az alapértelemezett OpenERP CRM Ügyfélkapcsolat-kezelés\n"
-"=====================================================\n"
-"\n"
-"Ez az alkalmazás lehetővé teszi egy csoportnak, hogy inteligensen és "
-"hatékonyan kezelje a vezetői gyűléseket, lehetőségeket, találkozókat és "
-"telefonokat.\n"
-"\n"
-"Kezeli a kulcsfontosságú munkákat mint kommunikáció, azonosítás, kiosztás, "
-"felosztás és értesítés.\n"
-"\n"
-"OpenERP biztosítja, hogy minden esetben nyomon követhetőek legyenek a "
-"felhasználók, vásárlók és beszállítók. Autómatikusan küldhető emlékeztető, "
-"kiterjezti az igényt, bekapcsol speciális eszközt és még több cselekvésen "
-"alapuló módot, melyet a vállalkozása szabályaira szabhat.\n"
-"\n"
-"A legnayobb dolog ebben a rendszerben, hgoy a felhasználónak nem kell semmi "
-"speciálisat véghezvinnie. A CRM modulnak van egy e-amil átjárója  ami "
-"szinkronizálja az e-maileket az OpenERP által. Így, a felhasználók e-"
-"maileket küldhetnek az igénylés helyére.\n"
-"\n"
-"OpenERP törődni fog az üzenetek megköszönésével, automatikusan átirányítva a "
-"megfelelő osztályhoz, biztosítva a jövőbeni munkafolyamat megfelő helyét.\n"
-"\n"
-"\n"
-"Dashboard / irányítópult a CRM-ben, ezt is beleértve:\n"
-"-------------------------------\n"
-"* Tervezett bevétel szintek és felhasználók szerint (grafikon)\n"
-"* Lehetőségek szintenként (grafikon)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Figyelem!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -292,7 +237,7 @@ msgstr ""
 "kódon keresztül, lehetőleg egyéni modul szerkesztésével!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Kényszerítés hiba"
@@ -303,7 +248,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Nem megengedett a \"%s\" ritka mező átnevezése"
@@ -314,7 +259,7 @@ msgid "Swaziland"
 msgstr "Szváziföld"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "létrehozva."
@@ -402,29 +347,6 @@ msgstr "Cég a jelenlegi rekord tárolására"
 msgid "Max. Size"
 msgstr "Max. méret"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"A rendeléshez további dátum információ hozzáadása.\n"
-"===================================================\n"
-"\n"
-"Ezeket a dátum kiegészítéseket adhatja hozzá a rendeléshez:\n"
-"-----------------------------------------------------------\n"
-"    * Igényelt / kért dátum\n"
-"    * Vállalási dátum\n"
-"    * Tényleges dátum\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -434,11 +356,6 @@ msgstr ""
 "A rekord adatbázis azonosítója ID a forma nézet megnyitásához, ha "
 "``view_mode`` csak a 'form' beállításra állítva"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kapcsolattartó neve"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -518,7 +435,7 @@ msgstr ""
 "és számolásához is.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -557,6 +474,7 @@ msgstr "Automata végrehalytási szabályok"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Tulajdonos"
 
@@ -598,7 +516,7 @@ msgstr ""
 "képernyőn látható."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -656,7 +574,7 @@ msgid "Netherlands Antilles"
 msgstr "Holland Antillák"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -706,9 +624,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Eredeti Nézet"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ötletek"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -745,40 +663,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnyák / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-"\n"
-"Automata fordítás a Gengo API keresztül\n"
-"----------------------------------------\n"
-"\n"
-"Ez a modul telepíti a passzív ütemtervet az automata fordításhoz \n"
-"a Gengo API használatával. Aktiváláshoz, el kell végeznie\n"
-"1) A Gengo hitelesítő paraméterek beállítását a `Beállítások > Vállalatok > "
-"Gengo Paraméterek`\n"
-"2) Elindítani a varázslót a `Beállítások > Alkalmazás Feltételek > Gengo: "
-"Fordítás igénylése kézzel` és követni a varázsló utasításait.\n"
-"\n"
-"Ez a varázsló elindítja a CRON munkát és az ütemtervet és elindítja a Gengo "
-"szolgáltatás automata fordítóját a megadott és igényelt feltételek szerint.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -789,9 +673,41 @@ msgstr ""
 "a csatolmánynévvel nyomtat, az előző kimutatással tér vissza."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+"\n"
+"Ez a modul lehetővé teszi több termék egy gyártási rendelésen belüli "
+"legyártását.\n"
+"============================================================================="
+"\n"
+"\n"
+"Be tudja állítani termékekként a darabjegyzékben.\n"
+"\n"
+"A modul nélkül:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"Ezzel a modullal:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -867,14 +783,12 @@ msgstr ""
 "Context dictionary as Python expression, empty by default (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Varázslók"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Egyéni mező nevének 'x_'-el kell kezdődnie!"
@@ -965,27 +879,21 @@ msgid "Model Description"
 msgstr "Model leírás"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kattintson a kapcsolat címtárba való hozzáadásához.\n"
-"              </p><p>\n"
-"                OpenERP segít könnyen követhetővé tenni az ügyfélhez tartozó "
-"tevékenység\n"
-"                nyomonkövetéséhez: megbeszélések, üzleti lehetőségek "
-"története,\n"
-"                dokumentumok, stb.\n"
-"              </p>\n"
-"            "
+"\n"
+"Üzleti menü.\n"
+"===================\n"
+"\n"
+"Telepítőt tartalmaz az üzletiügyvitel modulokhoz.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -1020,11 +928,21 @@ msgstr "Trigger Expression"
 msgid "Jordan"
 msgstr "Jordánia"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Ennek a munkának a következő tervezett végrehajtási dátuma."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1184,13 +1102,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Adja meg a mező nevét, amire a rekord azonosító hivatkozik az írási "
-"művelethez. Ha ez üres, akkor az objektum aktív azonosítójára fog hivatkozni."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Pápua Új-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1209,7 +1123,7 @@ msgid "Email Preferences"
 msgstr "Email preferencia"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' nem érvényes dátumnak néz ki a mezőhöz '%%(field)s'"
@@ -1257,26 +1171,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanyol (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
-"\n"
-"Luxenburgi könyvelési modul.\n"
-"\n"
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1386,9 +1283,38 @@ msgid "Mongolia"
 msgstr "Mongólia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1404,12 +1330,17 @@ msgstr ""
 "a következő csoportokhoz."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Dokumentum model"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1436,7 +1367,54 @@ msgid "Username"
 msgstr "Felhasználó név"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1466,7 +1444,7 @@ msgid "Delete Access Right"
 msgstr "Hozzáférési jog törlése"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Csatlakozás teszt nem sikerült!"
@@ -1498,14 +1476,12 @@ msgid "South Korea"
 msgstr "Dél-Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Átmenetek"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Record #%d of %s not found, cannot copy!"
@@ -1646,7 +1622,7 @@ msgid "Marshall Islands"
 msgstr "Marshall-szigetek"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Nem lehet megváltoztatni egy mezőhöz tartozó model-t!"
@@ -1668,7 +1644,7 @@ msgid "Search"
 msgstr "Keresés"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1687,7 +1663,14 @@ msgid "Parent Application"
 msgstr "Szülő alkalmazás"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Varázslók"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Művelet Visszavonva"
@@ -1864,7 +1847,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Nem létezik nyelv a \"%s\" kóddal"
@@ -2008,7 +2005,7 @@ msgid "On Create"
 msgstr "Létrehozáskor"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -2017,11 +2014,6 @@ msgstr ""
 "'%s' túl sok pontot tartalmaz. XML azonosítók nem tartalmazhatnak pontot! A "
 "pontokkal más modeladatokra hivatkozunk, mint pl. a module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Árajánlat, Megrendelés, Számlázás"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -2108,7 +2100,7 @@ msgid "East Timor"
 msgstr "Kelet-Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2166,11 +2158,6 @@ msgstr ""
 "Kioszthatók vele a kezelési és felhasználói hozzáférési jogosultságok az "
 "admin részére, valamint felhasználói jogok a Demo felhasználó részére. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Csatolt ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2188,7 +2175,7 @@ msgstr ""
 "kiválasztási listák generálásával, stb."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2230,6 +2217,11 @@ msgstr "Gépjármű, lízing, biztosítás, költség"
 msgid "Read Access"
 msgstr "Olvasási Hozzáférés"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2326,16 +2318,11 @@ msgid "Create Tasks on SO"
 msgstr "Munka végzés ezen a megrendelésen"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Ez az oszlop modul adatokat tartalmaz és ezért nem lehet törölni!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Csatolt modell"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2411,7 +2398,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "A root felhasználót nem lehet eltávolítani"
@@ -2442,11 +2429,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (másolat)"
@@ -2458,7 +2445,6 @@ msgstr "Számlatükrők sablonjai"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Cím típusa"
 
@@ -2518,11 +2504,6 @@ msgstr "Teljes elérés"
 msgid "The next step depends on the file format:"
 msgstr "A következő lépés a fájl formátumától függ:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ötletek"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2661,6 +2642,11 @@ msgstr "A frissített modulok száma"
 msgid "Method"
 msgstr "Módszer"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2718,7 +2704,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2726,6 +2712,11 @@ msgstr ""
 "Nem található azonos rekord erre %(field_type)s '%(value)s' ebben a mezőben "
 "'%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2776,6 +2767,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Hozzáadja vagy ne a vállalati RML fejlécet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2859,7 +2859,7 @@ msgstr ""
 "'űrlap', 'fa', 'naptár', etc. (Alapértelmezett: fa, űrlap)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "A document was modified since you last viewed it (%s:%d)"
@@ -2954,7 +2954,6 @@ msgstr "Sao Tome és Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Számlázás"
 
@@ -3035,11 +3034,6 @@ msgstr ""
 "    * Dátum\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Cég Szlogen"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -3172,9 +3166,20 @@ msgid "Default limit for the list view"
 msgstr "Alapértelmezett limit a lista nézethez"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Pápua Új-Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3292,7 +3297,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "Több találatot talált a mezőhöz '%%(field)s' (%d találatok)"
@@ -3361,6 +3366,19 @@ msgstr "Mező leképezések"
 msgid "Export Translations"
 msgstr "Fordítások Exportálása"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3369,7 +3387,7 @@ msgid "Manager"
 msgstr "Igazgató"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Bocsánat, nincs jogosultsága ehhez a dokumentumhoz."
@@ -3491,7 +3509,7 @@ msgid "Inherited"
 msgstr "Örökölt"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "igen"
@@ -3537,7 +3555,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' úgy tűnik nem egész szám ehhez a mezőhöz '%%(field)s'"
@@ -3635,22 +3653,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn Integráció"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Invalid Object Architecture!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Hiba!"
@@ -3763,12 +3781,12 @@ msgstr ""
 "    "
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3787,28 +3805,32 @@ msgstr ""
 "statikus kimutatásokhoz."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 "\n"
-"Lerövidítés lehetőséget kapcsol be a web kiszolgálóhoz.\n"
-"===========================================\n"
+"Ez a modul a Lengyel könyvelési számla tükrök és adók kezelését végzi az "
+"OpenERP-ben.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Lerövidítési ikont ad a rendszertálcához a felhasználói rövidítések "
-"eléréséhez (ha léteznek).\n"
-"\n"
-"A nézetek cím mellé egy rövidítés ikont ad a rövidített útvonalak "
-"hozzáadásához/törléséhez.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 
 #. module: base
@@ -3817,7 +3839,7 @@ msgid "Params storage"
 msgstr "Paraméterek tárolása"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "A(z) '%s' modult nem lehet frissíteni, mivel nincs telepítve."
@@ -3874,59 +3896,6 @@ msgstr "Konfiguráció Paraméterek"
 msgid "Invalid arguments"
 msgstr "Érvénytelen argumentumok"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-"\n"
-"Francia bérszámfejtés könyvelési adatok\n"
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3983,7 +3952,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Hiányzó dokumentum(ok)"
@@ -3995,6 +3964,34 @@ msgstr "Hiányzó dokumentum(ok)"
 msgid "Bank Account Type"
 msgstr "Bankszámla típus"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -4033,7 +4030,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -4073,7 +4070,7 @@ msgid "Access Controls"
 msgstr "Hozzáférés vezérlés"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -4104,53 +4101,6 @@ msgstr "Fő Cég"
 msgid "Web Icon File (hover)"
 msgstr "Web ikon fájl (föléhúzáskor)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-"\n"
-"Ez egy teljes dokumentum kezelő rendszer.\n"
-"==============================================\n"
-"\n"
-"    * Felhasználó hitelesítés\n"
-"    * Dokumentum indexálás:- .pptx és .docx fájlok nem támogatottak Windows "
-"felületen.\n"
-"    * Dashboard/Műszerfal a dokumentumhoz beleétve:\n"
-"        * Új fájlok (lista)\n"
-"        * Fájlok forrás típusa szerint (grafikon)\n"
-"        * Fájlok partnerek szerint (grafikon)\n"
-"        * Fájlo terjedelem havi bontásban (grafikon)\n"
-"\n"
-"FIGYELEM:\n"
-"----------\n"
-"    - Ha ezt a modult telepíti egy működő vállalati rendszerben mely "
-"rendelkezik \n"
-"      adatbázisba mentett PDF fájlokkal, akkor azokat el fogja veszíteni.\n"
-"    - Ha telepíti ezt a modult, akkor a PDF-ek nem lesznek többet az "
-"adatbázisban tárolva,\n"
-"      hanem a szerveren egy gyökérszerkezetben mint /server/bin/filestore.\n"
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -4170,9 +4120,13 @@ msgstr ""
 "Ha egy formulatípust használ, használjon egy python kifejezést az 'object' "
 "változót alkalmazva."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Születésnap"
 
@@ -4188,7 +4142,7 @@ msgid "Products Manufacturers"
 msgstr "Termékek gyártói"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SSL-en-keresztüli-SMTP mód nem elérhető"
@@ -4305,7 +4259,7 @@ msgid "Malta"
 msgstr "Málta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4539,7 +4493,6 @@ msgstr "Kimutatás készítés"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Megsz."
@@ -4551,13 +4504,18 @@ msgstr ""
 "Ha nincs beállítva, alapértelmezett értékként szolgál az új erőforrásoknak"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Recursivity Detected."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekurziós hiba a modul függőségekben !"
@@ -4634,9 +4592,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Hozzáférés megtagadva"
@@ -4647,7 +4606,7 @@ msgid "Company Name"
 msgstr "Cég neve"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4668,16 +4627,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (érvénytelenítve - használjon kimutatást)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"A lefordított tétel fordítási kódjának ismert nyelvek közül választottnak "
-"kell lennie"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Rekord szabályok"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre és Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4718,17 +4698,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Névtelen hozzáférés engedélyezése az OpenERP-hez.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4776,26 +4748,7 @@ msgid "Paper Format"
 msgstr "Papír Formátum"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-"\n"
-"Ez a modul az OpenERP belső feljegyzéseit frissíti egy külső szerkesztővel\n"
-"===================================================================\n"
-"\n"
-"Haszálja a szöveges feljegyzései, következő maghívott felhasználó általi, "
-"valós idejű frissítéséhez.\n"
-"\n"
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4815,10 +4768,10 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
-msgstr ""
+msgstr "Reg"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -4869,7 +4822,7 @@ msgid "Email Gateway"
 msgstr "Email átjáró"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4890,9 +4843,43 @@ msgid "Technical Data"
 msgstr "Technikai adatok"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4967,13 +4954,18 @@ msgstr "Az ügyek időkiosztásai"
 msgid "Ltd"
 msgstr "Kft."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Érvénytelen felépítés!"
@@ -4989,9 +4981,9 @@ msgid "Share any Document"
 msgstr "Bármely dokumentum megosztása"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Érdeklődők, Lehetőségek, Telefonhívások"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Csoport kötelező"
 
 #. module: base
 #: view:res.lang:0
@@ -5066,57 +5058,10 @@ msgid "Languages"
 msgstr "Nyelvek"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
-"\n"
-"Gyors és könnyű eladási folyamat\n"
-"============================\n"
-"\n"
-"Ez a modul lehetővé teszi a bolti eladás nagyon könnyű és teljesen web alapú "
-"érintő képernyős illeszőegység kezelését.\n"
-"Ez kompatibilis minden PC táblával és iPad-al , választhaó többféle fizetési "
-"móddal. \n"
-"\n"
-"A termék kiválasztás többféle úton lehetésges: \n"
-"\n"
-"* Bárkód használatával\n"
-"* Kategóriák böngészésével vagy szöveg bevitellel történő kereséssel.\n"
-"\n"
-"Fő tulajdonságok\n"
-"-------------\n"
-"* Az eladás gyors feldolgozása\n"
-"* Egy fizetési mód kiválasztásával (a gyors mód) vagy a fizetés "
-"szétválasztása többféle fizetési módra\n"
-"* A visszafizetett pénz mennyiségének kiszámítása\n"
-"* A kiválasztási lista autómatikus létrehozása és megerősítése\n"
-"* Lehetővé teszi egy felhasználó részére az autómatikus számla létrehozást\n"
-"* Előző értékesítés visszafizetése\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -5203,7 +5148,6 @@ msgstr "Kikötés"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -5297,6 +5241,11 @@ msgstr ""
 "legmagasabb prioritású lesz használva. alap esetben a prioritási szám 10 "
 "(kisebb szám = magasabb prioritás)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -5360,9 +5309,16 @@ msgid "Default value or action reference"
 msgstr "Alapértelmezett érték vagy művelet hivatkozás"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -5460,6 +5416,22 @@ msgstr "Fordítás Betöltése"
 msgid "Installed Version"
 msgstr "Telepített Verzió"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -5486,6 +5458,43 @@ msgstr ""
 "függ. Ha ez a mező üres, az OpenERP a kapcsolódó objektumok olvasási "
 "hozzáférése alapján számítja ki a láthatóságot."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -5515,6 +5524,12 @@ msgstr ""
 msgid "View"
 msgstr "Nézet"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "nem"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -5647,12 +5662,6 @@ msgstr ""
 "Accounts in OpenERP: the first with the type 'RIB', the second with the type "
 "'IBAN'. \n"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -5667,7 +5676,6 @@ msgstr "Svájc - Könyvelés"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Irsz"
@@ -5678,13 +5686,18 @@ msgstr "Irsz"
 msgid "Author"
 msgstr "Szerző"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Beállítás tennivalóként"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Pontos dátum és idő."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5730,6 +5743,8 @@ msgstr "Irány"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Nézetek"
 
@@ -5745,7 +5760,7 @@ msgid "SMTP Server"
 msgstr "SMTP Szerver"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5859,7 +5874,12 @@ msgid "Google Docs integration"
 msgstr "Google Docs integráció"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "név"
@@ -5982,7 +6002,7 @@ msgid "System Configuration Done"
 msgstr "Rendszer konfigurálása kész"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Hiba a mező(k) ellenőrzése során %s: %s"
@@ -6110,6 +6130,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Teljes hozzáférés"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -6123,7 +6148,7 @@ msgid "Portuguese / Português"
 msgstr "Portuguese / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "A \"%s\" mező tároló rendszerének megváltoztatása nem megengedett."
@@ -6134,7 +6159,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Csak ez a bank számla tartozik a vállalkozásához"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "Ismeretlen al-mező '%s'"
@@ -6166,6 +6191,17 @@ msgstr "Szenegál"
 msgid "Hungary"
 msgstr "Magyarország"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -6310,11 +6346,50 @@ msgid ""
 "Email by Openlabs was kept.\n"
 "    "
 msgstr ""
+"\n"
+"Email sablonkészítő (az eredeti Openlabs Power email egyszerűsített "
+"verziója).\n"
+"============================================================================="
+"=\n"
+"\n"
+"Lehetővé teszi a teljeskörű OpenERP-hez valamennyi dokumentumához kapcsolódó "
+"email sablonok készítését\n"
+"(Megrendelések, Számlák és így tovább), beleértve a feladót, címzettet, "
+"tárgyat, törzsanyagot (HTML és\n"
+"szöveg). Automatikusan fájlt is hozzá tud adni a sablonokhoz, vagy "
+"kinyomtathatja és kimutatást fűzhet hozzá.\n"
+"\n"
+"Haladó felhasználáshoz, a sablonok tartalmazhatják a dokumentum dinamikus \n"
+"tulajdonságait amik rá vonatkoznak. Példásul, használhatja a kapcsolatának\n"
+"az ország nevét ha írt neki, de biztonsági tulajdonság is ki van jelölve, \n"
+"ha nem lenne meghatározva előre. Mindegyik sablon tartalmaz egy\n"
+"beépített segédet ezeknek a dinamikus értékeknek a dokumentumba "
+"foglalásához.\n"
+"\n"
+"Ha bekapcsolja ezt a lehetőséget, egy összeállító segéd is feltűnik az "
+"OpenERP\n"
+"dokumentum peremén amihez a sablon kapcsolódik (pl. Számlák).\n"
+"Ez a szolgáltatás az útja a  gyors sablon alapján elvégzett email küldésnek, "
+"és ha \n"
+"szükséges még a tartalmat is adhat hozzá és átnézheti.\n"
+"Ez az összeállító segéd átalakul egy teljes email rendszerré ha egyszerre "
+"több dokumentumot\n"
+"kezel vele.\n"
+"\n"
+"Ezek az email sablonok a motorját képezik a vállalat marketing kampány "
+"rendszerének\n"
+"(nézze meg a ``marketing kampány`` alkalmazást), ha automatizálni akar "
+"naygobb \n"
+"kampányt bármely OpenERP dokumentumon.\n"
+"\n"
+"    **Műszaki megjegyzés:** az Openlabs Power Email rendszerének csak a "
+"sablonkészítője lett felhasználva.\n"
+"    "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Partner címkék"
 
 #. module: base
 #: view:res.company:0
@@ -6333,7 +6408,7 @@ msgid "Account Owner Name"
 msgstr "Számla tulajdonos neve"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -6351,16 +6426,11 @@ msgid "Decimal Separator"
 msgstr "Tizedes elválasztó"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Hiányzik a megkövetelt érték ehhez a mezőhöz '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -6407,9 +6477,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "Választható modell, főként szükséges műveletekhez használják."
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Létrehozó"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "A modul nevének egyedinek kell lennie!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -6479,19 +6550,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"Lehetővé tesz a felhasználók feliratkozását.\n"
-"=======================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -6507,6 +6565,11 @@ msgstr "Beállítás varázsló indítása"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Gyártás rendelések, Darabjegyzékek, Útvonalak"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Melléklet neve"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -6642,6 +6705,12 @@ msgstr "Kazahsztán"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Hét napja  [0(vasárnap),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Erőforrás neve"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6956,7 +7025,7 @@ msgid "title"
 msgstr "cím"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "igaz"
@@ -7013,6 +7082,15 @@ msgstr "Termékek"
 msgid "User-defined Defaults"
 msgstr "Felhasználó által definiált alapértelmezések"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -7159,13 +7237,15 @@ msgid "Bank Type"
 msgstr "Bank típus"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "A csoport neve nem kezdődhet \"-\"-al."
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Alkalmazások"
 
@@ -7185,7 +7265,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -7220,10 +7300,9 @@ msgid "Uncategorized"
 msgstr "Nem kategorizált"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Erőforrás neve"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -7259,6 +7338,11 @@ msgstr ""
 "történik, a jelző ellenőrzi a megnyomott gomb nevét. Ha a jel NULLA, nem "
 "szükséges gomb az átmenet érvényesítéséhez."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Eredeti Nézet"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -7273,7 +7357,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' nem számnak tűnik ehhez a mezőhöz '%%(field)s'"
@@ -7290,41 +7374,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Én bankjaim"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-"\n"
-"Állás lehetőségek szervezése és a toborzás előkészítése a munkafelvételhez\n"
-"=================================================\n"
-"\n"
-"Ez az alkalmazás lehetővé teszi a munkahelyek, állásajánlatok, kérelmek, "
-"interjúk könnyű nyomon követését...\n"
-"\n"
-"Ez integrálva van ez e-mail átjáróval az autómata e-mail küldéshez a "
-"<jobs@azönválalkozása.com> címre az alkalmazások listájában. Integrelva van "
-"még a doukmentum kezelés rendszerrel a CV adatbázis elmentéséhez és "
-"kereséséhez és, hogy megtalálja a megfelelő jelentkezőt akit keresett. "
-"Hasonlóság, integrálva van a felmérés modullal interjúk szervezésének "
-"engedélyezéséhez a különböző állásokhoz.\n"
-"Definiálni tud interjú szakasz szinteket és könnyen értékelni tudja a "
-"jelentkezőket a kanban nézetből.\n"
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -7549,11 +7598,6 @@ msgstr ""
 "If required, you can manually adjust the descriptions via the CODA "
 "configuration menu.\n"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Jelszó visszaállítása"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -7565,8 +7609,8 @@ msgid "Malaysia"
 msgstr "Malajzia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "A növekmény szám nem lehet nulla."
@@ -7720,7 +7764,7 @@ msgstr ""
 "kapcsolva a rendszerben."
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "There is no view of type '%s' defined for the structure!"
@@ -7760,7 +7804,7 @@ msgid "Created Menus"
 msgstr "Létrehozott menük"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -7787,9 +7831,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Beállítás tennivalóként"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -7821,6 +7893,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Aktuális év század nélkül: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Rendszer paraméterek"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -7873,7 +7952,7 @@ msgid "Audit Trail"
 msgstr "Könyvelés kontroll"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr "A '%s' érték nem található a kiválasztott '%%(field)s' mezőben"
@@ -8000,7 +8079,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "nem tudja a beállítást megduplázni!"
@@ -8020,31 +8099,6 @@ msgstr "Valamikor BIC vagy Swift nevezik."
 msgid "Indian - Accounting"
 msgstr "Indiai - Könyvelés"
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Mexikói könyvelés\n"
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -8077,10 +8131,10 @@ msgstr "Kimutatás xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Modulok"
 
@@ -8160,9 +8214,9 @@ msgid "United Kingdom"
 msgstr "Egyesült Királyság"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -8185,8 +8239,8 @@ msgid "Partner Titles"
 msgstr "Partner cégformák"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Használja a '%s' formátumot"
@@ -8234,7 +8288,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -8244,11 +8298,6 @@ msgstr ""
 "megengedett erre az objektumra mivel ez az objectum akimutatásra lett "
 "létrehozva."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Névtelen"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -8383,6 +8432,13 @@ msgstr "A modul sikeresen importálva!"
 msgid "Model Constraints"
 msgstr "Model illesztések"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Átmenetek"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -8511,7 +8567,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Szöv. állam"
@@ -8622,12 +8677,6 @@ msgstr "Teljes név"
 msgid "on"
 msgstr "ezen:"
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "A modul nevének egyedinek kell lennie!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -8671,6 +8720,7 @@ msgstr "Több dokumentumon"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -8742,7 +8792,7 @@ msgid "Connection Security"
 msgstr "Kapcsolat biztonsága"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Kérem nevezzen meg egy végrehajtandó műveletet !"
@@ -8762,6 +8812,11 @@ msgstr "Kategórianév"
 msgid "Northern Mariana Islands"
 msgstr "Északi-Mariana-szigetek"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -8773,7 +8828,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat kimutatás"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -8782,6 +8837,11 @@ msgstr ""
 "Kérlek, válaszd a jelszóváltoztató varázslót (a Felhasználói beállításokban "
 "vagy a Felhasználói menüben), hogy megváltoztasd a jelszavadat."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -8835,7 +8895,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Naptár nézethez nem elégségesek a mezők!"
@@ -8883,7 +8943,6 @@ msgstr "Átmenet"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -8903,30 +8962,30 @@ msgid "Child Categories"
 msgstr "Alkategóriák"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Hiba"
@@ -9024,6 +9083,11 @@ msgstr "Szabály meghatározás (Domain szűrő)"
 msgid "This Window"
 msgstr "Ez az ablak"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -9113,6 +9177,31 @@ msgstr "Mezők"
 msgid "Employees"
 msgstr "Alkalmazottak"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+"\n"
+"Lerövidítés lehetőséget kapcsol be a web kiszolgálóhoz.\n"
+"===========================================\n"
+"\n"
+"Lerövidítési ikont ad a rendszertálcához a felhasználói rövidítések "
+"eléréséhez (ha léteznek).\n"
+"\n"
+"A nézetek cím mellé egy rövidítés ikont ad a rövidített útvonalak "
+"hozzáadásához/törléséhez.\n"
+"    "
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -9147,11 +9236,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Teszt kapcsolat"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Címek"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -9176,7 +9260,6 @@ msgstr "Választási lehetőségek"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Utca"
@@ -9187,9 +9270,24 @@ msgid "Yugoslavia"
 msgstr "Jugoszlávia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Jobb szülő"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -9306,7 +9404,7 @@ msgid "Change My Preferences"
 msgstr "Változtassa meg a beállításaimat"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Érvénytelen model név a műveleti meghatározásban"
@@ -9404,21 +9502,27 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Üzleti menü.\n"
-"===================\n"
-"\n"
-"Telepítőt tartalmaz az üzletiügyvitel modulokhoz.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson a kapcsolat címtárba való hozzáadásához.\n"
+"              </p><p>\n"
+"                OpenERP segít könnyen követhetővé tenni az ügyfélhez tartozó "
+"tevékenység\n"
+"                nyomonkövetéséhez: megbeszélések, üzleti lehetőségek "
+"története,\n"
+"                dokumentumok, stb.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -9426,7 +9530,7 @@ msgid "Company Bank Accounts"
 msgstr "Válalkozás bank számlák"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Üres jelszó beállítása biztonsági okokból nem engedélyezett!"
@@ -9437,13 +9541,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Választható jelszó az SMTP hitelesítéshez"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Bocsánat, nem módosíthatja ezt a dokumentumot."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -9465,12 +9569,13 @@ msgid "Normal Bank Account"
 msgstr "Normál bankszámlák"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Varázsló"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "adatbázis azonosító"
@@ -9699,7 +9804,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Állás, Toborzás, Pályázat kiírás, Állás interjúk"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -9731,14 +9836,6 @@ msgstr "Szerkesztés a feladatokon"
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Figyelem!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -9762,7 +9859,6 @@ msgstr "Web rövidítések"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -9886,7 +9982,7 @@ msgid "Nigeria"
 msgstr "Nigéria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "A kiválasztás mezőkhöz a Kiválasztás opciót meg kell adni!"
@@ -10299,7 +10395,7 @@ msgid "Update Modules List"
 msgstr "Modullista frissítés"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -10313,7 +10409,7 @@ msgid "eInvoicing"
 msgstr "Számlázás"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -10327,7 +10423,7 @@ msgstr ""
 "másik cégre. (Most rákattinthat a Mégse gombra a Felhasználói beállításokban)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "A \"%s\" érték ehhez a mezőhöz \"%s.%s\" nincs a választásban"
@@ -10342,6 +10438,17 @@ msgstr "Folytatás"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -10391,7 +10498,7 @@ msgid "Mexico"
 msgstr "Mexikó"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -10419,15 +10526,17 @@ msgstr ""
 "autómatikusan törölve lesz az adatbázisból vagy sem)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Nem található  SMTP Szerver"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Melléklet neve"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"A lefordított tétel fordítási kódjának ismert nyelvek közül választottnak "
+"kell lennie"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -10451,7 +10560,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Hónap rövid neve."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Bocsánat, nem megengedett, hogy törölje ezt a dokumentumot."
@@ -10463,7 +10572,6 @@ msgstr "A szabályok nem alkalmazhatóak a Rekord szabály modellhez."
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Szállító"
@@ -10559,7 +10667,7 @@ msgid "Selectable"
 msgstr "választható"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Ugy néz ki minden megfelelően beállítva!"
@@ -10587,8 +10695,8 @@ msgid "Iteration"
 msgstr "Ismétlés"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "UserError"
@@ -10615,7 +10723,7 @@ msgstr ""
 "akkor ez a mező igazra állított. Egyébént, hamisra állított."
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -10764,6 +10872,104 @@ msgid ""
 "authentication if installed at the same time.\n"
 "    "
 msgstr ""
+"\n"
+"LDAP szerver hitelesítés támogatása.\n"
+"===============================================\n"
+"Ez a modul lehetővé teszi a felhasználók LDAP felhasználónévvel és "
+"jelszavával való\n"
+"bejelentkezését, ezzel egyúttal létre lesz hozva automatikusan egy OpenERP "
+"felhasználó.\n"
+"\n"
+"**Megjegyzés:** Ez a modul kizárólag olyan szerveren fut, melyen a Python's "
+"``ldap`` modul \n"
+"telepítve van.\n"
+"\n"
+"Beállítás:\n"
+"--------------\n"
+"A madul telepítése után konfigurálni kell az LDAP paramétereket a vállalat "
+"részletei\n"
+"beállítás fülön. Különböző vállalatoknak különböző LDAP szerverei vannak,\n"
+"amíg egyedi felhasználó nevei vannak (a felhasználó neveknek az OpenERP-ben\n"
+"egyedieknek kell lenniük, még a különböző vállalatokon belül is).\n"
+"\n"
+"A névtelen LDAP kizárás is támogatott (amelyik LDAP szerver megengedi), "
+"egyszerűen\n"
+"az LDAP felhasználó nevének és jelszavának üresen hagyásával a \n"
+"beállításoknál. Ez nem engedi meg a névtelen felhasználó azonosítást, ez\n"
+"csak a mester LDAP -hez van azért, hogy ellenőrizve legyen a felhasználó "
+"megléte\n"
+"az azonosítás előtt.\n"
+"\n"
+"A kapcsolat biztosítva lehet a STARTTLS által ami a LDAP szerveren megvan és "
+"támogatja\n"
+"azt, a TLS opció kiválasztásának bekapcsolásával a LDAP beállításnál.\n"
+"\n"
+"További lehetőségek az LDAP beállításoknál, hivatkozzon az ldap.conf-ra\n"
+"kezelés:`ldap.conf(5)`.\n"
+"\n"
+"Biztonsági megfontolások:\n"
+"------------------------\n"
+"Felhasználók LDAP jelszavai nem lesznek tárolva az OpenERP adatbázisában, az "
+"LDAP szerver\n"
+"le lesz kérdezve ha egy felhasználót ellenőrizni kell. A jelszó nem lesz "
+"megkettőzve,\n"
+"és a jelszavak csak egy helyen kezeltek.\n"
+"\n"
+"OpenERP nem kezeli az LDAP jelszavak változását, így a jelszó \n"
+"változásokat csak az LDAP könyvtár irányítja direktben (az LDAP "
+"felhasználóknak).\n"
+"\n"
+"Az is lehetséges hogy helyi OpenERP felhasználók adatbázisa együtt legyen a "
+"\n"
+"LDAP-ellenőrzött felhasználókéval (pl az adminisztrátori egy ilyen példa).\n"
+"\n"
+"Hogyan működik:\n"
+"---------------------\n"
+"    * Először megpróbálja a rendszer a felhasználó azonosítást a helyi "
+"OpenERP \n"
+"       adatbázisán;\n"
+"    * ha ez az ellenőrzés sikertelen (pl. a felhasználónak nincs helyi \n"
+"      jelszava), akkor a rendszer ellenőrzi az LDAP azonosítást;\n"
+"\n"
+"Mint LDAP felhasználónak üres jelszava van alap értelmezésben a helyi "
+"OpenERP adatbázisban\n"
+"(így nincs hozzáférése), ezért az első lépés mindig sikertelen lesz és az "
+"LDAP szerver lesz\n"
+"megkérve az azonosításra.\n"
+"\n"
+"A STARTTLS bekapcsolása biztosítja az LDAP szerver azonosítás titkosságát "
+"és\n"
+"titkosítását.\n"
+"\n"
+"Felhasználói sablonok:\n"
+"--------------\n"
+"Az LDAP beállításokban a vállalati formulákban, be lehet állítani "
+"*Felhasználói\n"
+"sablonok*-at. Ha beállított, akkor ez a felhasználó lesz beállítva "
+"sablonként a \n"
+"többi helyi felhasználóhoz ha bárki elvégzi az első LDAP azonosítást. Ez a \n"
+"az első belépéshez csoportok és menük elő beállításait teszi lehetővé.\n"
+"\n"
+"**Vigyázat:** ha a felhasználói sablonba jelszavat állít be, akkor ez mint \n"
+"          helyi jelszó lesz beállítva minden LDAP felhasználóhoz, "
+"ténylegesen mint\n"
+"         *mester jelszó* ezekhez a felhasználókhoz (mielőtt kézzel "
+"módosításra kerülne).\n"
+"         Ezt nem szeretnénk. Egy egyszerű módja a sablon beállításának, hogy "
+"belép\n"
+"         mint LDAP felhasználó, hagyja, hogy  az OpenERP létrehozza az üres "
+"helyi\n"
+"         felhasználót ugyanazzal a bejelentkezéssel (és üres jelszóval), "
+"ezután átállítja\n"
+"         ezt a felhasználó nevet egy LDAP névre ami még nem létezik, és\n"
+"         beállítja a csoportra amelyikre szeretné.\n"
+"\n"
+"A  base_crypt kölcsönhatása:\n"
+"----------------------------\n"
+"A base_crypt modul nem kompatibilis ezzel a modullal, és kikapcsolja az "
+"LDAP\n"
+"azonosítást ha egyszerre telepítettek.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.re
@@ -10771,7 +10977,7 @@ msgid "Reunion (French)"
 msgstr "Réunion (Francia)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -10811,8 +11017,8 @@ msgid "Solomon Islands"
 msgstr "Salamon-szigetek"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Hozzáférési hiba"
@@ -10902,7 +11108,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -10919,7 +11125,7 @@ msgid "Ukraine"
 msgstr "Ukrajna"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -10998,6 +11204,11 @@ msgstr "Szakaszok"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamand (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnámi / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -11111,9 +11322,9 @@ msgid "Custom Shortcuts"
 msgstr "Egyéni gyorsbillentyűk"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnámi / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -11150,13 +11361,13 @@ msgid "Models"
 msgstr "Modellek"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "Az `alap` modult nem lehet törölni"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "A rekordot most nem lehet módosítani"
@@ -11177,7 +11388,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "Bocsánat, nincs engedélye ilyen dokumentum létrehozásához."
@@ -11225,7 +11436,7 @@ msgid "On Delete"
 msgstr "Törléskor"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "A %s model nem létezik!"
@@ -11278,6 +11489,7 @@ msgstr "United States számlatükör - United States - Chart of accounts"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -11286,7 +11498,7 @@ msgid "Cancel"
 msgstr "Mégsem"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Ismeretlen adatbázis azonosító '%s'"
@@ -11309,6 +11521,43 @@ msgstr ""
 "=========================\n"
 "\n"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -11367,7 +11616,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "Külső  id /azonosító/"
@@ -11425,6 +11674,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Óra (12 órás) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -11479,31 +11733,11 @@ msgid "The currency code must be unique per company!"
 msgstr "A valuta kódnak vállalkozásonként egyedinek kell lennie!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Új nyelv (Üres fordítási sablon)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-"\n"
-"Jelszó visszaállítás\n"
-"==============\n"
-"\n"
-"Megengedi, hogy a belépési oldalon a felhasználók újraállíthassák a "
-"jelszavukat.\n"
-"Megengedi az adminisztrátornak, hogy rákattintson egy gombra amivel "
-"elküldhet  \"Jelszó visszaállítás\" igényt a felhasználók részére.\n"
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -11550,7 +11784,7 @@ msgid "Products Expiry Date"
 msgstr "Termék lejárati ideje"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -11654,6 +11888,11 @@ msgstr ""
 "============================================================================="
 "=========================\n"
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -11879,7 +12118,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Értékesítő kampány - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -11892,13 +12131,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Időköz egysége"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Fajta"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "This method does not exist anymore"
@@ -12081,7 +12325,7 @@ msgid "To Translate"
 msgstr "Lefordításhoz"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Az összes lehetésges érték megtekintése"
@@ -12121,6 +12365,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr "PostgreSQL érintés vagy idegen kulcs név."
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -12148,6 +12397,11 @@ msgstr "RML fejléc hozzáadása"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Lábjegyzet szövege megjelenítve minden kimutatás alján."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Ikon URL elérési útvonal"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -12250,7 +12504,6 @@ msgstr "%m - Hónap számmal [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Város"
@@ -12286,13 +12539,22 @@ msgstr "Munkavállalók humán erőforrás portálja"
 msgid "Estonian / Eesti keel"
 msgstr "Észt / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Adja meg a mező nevét, amire a rekord azonosító hivatkozik az írási "
+"művelethez. Ha ez üres, akkor az objektum aktív azonosítójára fog hivatkozni."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 or later version"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -12366,12 +12628,37 @@ msgstr ""
 "    "
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -12380,7 +12667,7 @@ msgstr ""
 "gondolja, hogy ez egy hiba."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -12394,6 +12681,8 @@ msgid "Activity"
 msgstr "Tevékenység"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -12412,7 +12701,12 @@ msgid "Parent Company"
 msgstr "Anyavállalat"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID azonosító"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -12426,15 +12720,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-"Ha a cél modul használja a művelet szükséges szerkezetet, ez a mező megadja "
-"a műveletek számát melyet az aktuális felhasználónak el kell végeznie."
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -12535,6 +12820,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Eladói és raktár szervezés"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -12609,6 +12914,11 @@ msgstr "Jelölje be ha a kapcsolat egy vállalat, egyéb esetben egy személy"
 msgid "Sequences Type"
 msgstr "Sorszám típusok"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -12679,9 +12989,9 @@ msgstr ""
 "Kérjük először deaktiválja a nyelvet."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Hozzáférés visszautasítva"
@@ -12699,8 +13009,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Probléma a 'Rekord Azonosító' beállításánál a Szerver müveletben!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -12742,13 +13052,12 @@ msgid "Laos"
 msgstr "Laosz"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -12759,7 +13068,12 @@ msgid "Office Supplies"
 msgstr "Irodaszerek"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -12802,36 +13116,6 @@ msgstr ""
 " - uid: Jelenlegi felhasználó azonosítója\n"
 " - context: jeenlegi összefüggés"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -12854,6 +13138,11 @@ msgstr "Egyéb tulajdonos"
 msgid "Ecuador"
 msgstr "Ekvádor"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -12870,23 +13159,6 @@ msgstr "Feladatok a szerződésekben"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Nem törölheti a nyelvet, mivel ez a felhasználó preferált nyelve !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"Venezuela számlatükör\n"
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -12903,9 +13175,9 @@ msgid "Cascade"
 msgstr "Kaszkád"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Csoport kötelező"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Érdeklődők, Lehetőségek, Telefonhívások"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -12932,11 +13204,6 @@ msgstr "Lefordított"
 msgid "Default Company per Object"
 msgstr "Feladatonténki alapértelmezett vállalat"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "A feladatok száma amit a felhasználónak el kell végeznie"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -12962,7 +13229,7 @@ msgid "Domain"
 msgstr "Tartomány"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Használja az '1'-et az igenhez és a '0'-át a nemhez"
@@ -12978,13 +13245,12 @@ msgid "State Name"
 msgstr "Állam neve"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
-"Belgiumi könyvelés és bérszámfejtés  - Belgium - Payroll with Accounting"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "Érvénytelen adatbázis azonosító '%s' ehhez a mezőhöz '%%(field)s'"
@@ -13005,51 +13271,10 @@ msgid "Timezone"
 msgstr "Időzóna"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
-"\n"
-"Könyvelési bizonylatok & nyugták szerinti számlázások & fizetések\n"
-"======================================================\n"
-"A sajátos és könnyen használható  Számlázási rendszer az OpenERP rendszerben "
-"lehetővé teszi a könyvelése nyomkövetését, még akkor is ha Ön nem könyvelő. "
-"Biztosítja a beszállítók és vevők könnyű nyomon követését. \n"
-"\n"
-"Használhatja ezt az egyszerű könyvelést ha egy külső könyvelővel végezteti a "
-"könyvelést, és emellett szeretné nyomon követni a kifizetéseket. \n"
-"\n"
-"A számlázó rendszer magában foklalja a bizonylatok kézhezvételét (egy könnyű "
-"módja az eladások és a vásárlások követésének). Lehetőséget ad a fizetések "
-"könnyű módú regisztrálására, análkül, hogy a könyvelés átfogó kódolás el "
-"kellene végezni.\n"
-"\n"
-"Ez a modul kezeli:\n"
-"\n"
-"* Bizonylat bevite\n"
-"* Bizonylat beérkezés [Eladás & Vásárlás]\n"
-"* Fizetési bizonylat [Vásárló & Beszállító]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -13071,7 +13296,7 @@ msgid "Shared"
 msgstr "Megosztott"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -13125,7 +13350,6 @@ msgstr "A vásárlásokra kétszeres érvényesítés"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Utca 2"
 
@@ -13152,6 +13376,7 @@ msgstr ""
 "===============================================\n"
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -13246,19 +13471,28 @@ msgid "Related Partner"
 msgstr "Kapcsolódó partner"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Integritási hiba"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "A mező mérete nem lehet kisebb 1-nél!"
@@ -13300,33 +13534,6 @@ msgstr "Munkavállalók könyvtára"
 msgid "Arguments"
 msgstr "Argumentumok"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"Ügyfelek jótállási ügyeinek szervezése.\n"
-"============================================================================="
-"===\n"
-"Ez az alkalmazás lehetővé teszi a vevők/beszállítók jótállási igényeinek és "
-"panaszainak nyomon követését.\n"
-"\n"
-"Teljesen integrált az e-mail árjáróval így autómatikusan tud létrehozni új "
-"jótállási igényeket a beérkező e-mailek alapján.\n"
-"    "
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -13434,6 +13641,88 @@ msgid ""
 "from Gate A\n"
 "    "
 msgstr ""
+"\n"
+"Ez a modul kiegészíti a Raktárház alkalmazást hatátosan beágyazva a Belökés "
+"& Kihúzás raktár folyamatokat.\n"
+"============================================================================="
+"===============================\n"
+"\n"
+"Tipikusan ehhez használható:\n"
+"--------------------------------\n"
+"    * Termék gyártási lánc kezelés\n"
+"    * Alapértelmezett termék hely kezelés\n"
+"    * Útvonalak meghatározása a raktárban az üzletvitel igényeihez, mint:\n"
+"        - Minőség ellenőrzés\n"
+"        - Eladás utáni szolgáltatások\n"
+"        - Beszállítókhoz visszáruk\n"
+"\n"
+"    * Segít a bérbeadás kezelésében, automatikus bérbe adott termékek "
+"visszavétel generálásával\n"
+"\n"
+"Ha ezt a modult telepítette, még egy fül jelenik meg a termék oldalon,\n"
+"ahol Belökés & Kihúzásfolyamatokat részletezhet. A PC1 demó termék adat\n"
+"ehhez a Belökés & Kihúzás-hoz:\n"
+"\n"
+"Belökés folyamatok:\n"
+"-----------\n"
+"Belökés folyamat hasznos ha egy bizonyos helyre egyes termékek megérkezését\n"
+"mindig követnie kell egy ide vonatkozó másik helyen való mozgásnak, "
+"választhatóan\n"
+"egy bizonyos idő múlva. Ez eredeti raktárhely alkalmazás is támogatja ezt a "
+"Belökés \n"
+"folyamat részleteket a helymeghatározásban, de nem finomítható egyes "
+"termékekre.\n"
+"\n"
+"Belökés folyamatok megmutatják, hogy mely helyek vannak összefűzve,\n"
+"és milyen paraméterekkel. amint a megadott mennyiségű termék mozgatva lett\n"
+"a forrás helyen, egy láncreakció automatikusan elindulhat a folyamat "
+"beállítási \n"
+"paraméterekkel megadottak alapján (célállomás helye, időzítés, mozgás "
+"típusa, \n"
+"jelentés). Az új mozgás automatikusan végrehajtható  is lehet, vagy kézi\n"
+"engedélyezéssel, a paraméterektől függően.\n"
+"\n"
+"Kihúzás folyamatok:\n"
+"-----------\n"
+"Kihúzás folyamatok kicsit különböznek a Belökés folyamattól, mivel a \n"
+"végrehajtás nem függ a termék mozgásoktól, de a beszerzési rendelések\n"
+"végrehajtásától azonban igen. amire szükség van az a kihúzott, \n"
+"nem kimondottan a termék. Egy klasszikus példa a Kihúzás folyamatra ha\n"
+"egy Outlet vállalata van, egy másik anyavállalat a tulajdonosa és az "
+"anyavállalat\n"
+"a felelős az Outlet ellátására.\n"
+"\n"
+"  [ Vevő ] <- A - [ Outlet ]  <- B -  [ Holding - Anyavállalat] <~ C ~ [ "
+"Beszállító ]\n"
+"\n"
+"Ha egy új beszerzés (A, egy megrendelés visszaigazolásából például) \n"
+"megérkezik az Outlet-be, ez át lesz konvertálva egy másik beszerzésre\n"
+"(B, egy 'mozgás' típusú Kihúzás folyamattal) amit a Holding - anyavállalat "
+"igényelt.\n"
+"Amikor a B beszerzést végrehajtja a Holding-Anyavállalat, \n"
+"s a termék kifogyott a raktárból, akkor át lehet alakítani megrendeléssé\n"
+"(C) a beszállító részére (a vásárlás Kihúzási folyamata). \n"
+"Végeredményben a beszerzési megbízás, a szükség, végig lett \n"
+"nyomva a Vevőtől a Beszállítóig.\n"
+"\n"
+"Technikailag, Kihúzás folyamat a beszerzés folyamat másféle úton való "
+"végrehajtás, \n"
+"nem csak a kiválasztott terméken múlik, hanem attól is függ melyik helynek\n"
+"'kell' a termék (pl. a célállomása a beszerzésnek).\n"
+"\n"
+"Felhasználási -példa:\n"
+"---------\n"
+"\n"
+"A demó adatokat így hasznélhatja:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"  **CPU1:** Elad egy pár CPU1-et a Chicago Shop-ból és futtatja az ütemezőt\n"
+"     - Raktárhely: kézbesítési bizonylat, Chicago Shop: érkeztetés\n"
+"  **CPU3:**\n"
+"     - Ha megkapták a terméket, eljut a minőségirányítás helyéhez\n"
+"       utána a 2. polcon tárolják.\n"
+"     - Ha a vevőhöz szállítják: Kiválogatási lista -> Csomagolás -> "
+"Megrendelés az A kaputól\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_decimal_precision
@@ -13466,7 +13755,6 @@ msgstr "Configuráció telepítő"
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Vevő"
 
@@ -13563,7 +13851,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Nem tudja létrehozni a kapcsolatot e-mail cím nélkül !"
@@ -13625,9 +13913,9 @@ msgstr ""
 "      "
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID azonosító"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -13761,7 +14049,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "EMail továbbítás megszakadt"
@@ -13788,7 +14076,7 @@ msgid "Object"
 msgstr "Objektum"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -13865,6 +14153,49 @@ msgid ""
 "\n"
 "**PASSWORD:** ${object.moodle_user_password}\n"
 msgstr ""
+"\n"
+"Moodle szerver konfiguráció.\n"
+"============================= \n"
+"\n"
+"Ezzel a modullal az OpenERP kapcsolódni tud egy moodle állomáshoz.\n"
+"Ez a modul automatikusa előadásokat és tanulókat hoz létre a moodle "
+"állomásához \n"
+"amivel időt takarít meg.\n"
+"Egyszerűen tud létrehozni előadásokat és kurzusokat az OpenERP és moodle "
+"keresztül.\n"
+"\n"
+"BEÁLLÍTÁS LÉPÉSEI:\n"
+"-------------------\n"
+"\n"
+"1. Moodle web szervíz aktiválása.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+">oldal adminisztráció >plugin-ok >web szervizek >protokolok kezelése az "
+"xmlrpc web szerviz aktiválása \n"
+"\n"
+"\n"
+">oldal adminisztráció >plugin-ok >web szervizek  >Tokenek kezelése token "
+"létrehozása \n"
+"\n"
+"\n"
+">oldal adminisztráció >plugin-ok >web szervizek  >áttekintés Webszerviz "
+"aktiválás\n"
+"\n"
+"\n"
+"2. Visszaigazoló email létrehozása belépési adattal és jelszóval.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"Mindenféleképpen ajánljuk ezeknek a soroknak a hozzáadását az esemény "
+"visszaigazolás emil \n"
+"aljára, hogy át tudja adni a moodle feliratkozóknak a belépés/jelszó "
+"párost.\n"
+"\n"
+"\n"
+"........visszaigazoló szöveg.......\n"
+"\n"
+"**URL:** a moddle elérési útvonal pléldául: http://openerp.moodle.com\n"
+"\n"
+"**LOGIN:** ${object.moodle_username}\n"
+"\n"
+"**PASSWORD:** ${object.moodle_user_password}\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uk
@@ -13877,7 +14208,7 @@ msgid "Mrs."
 msgstr "Asszonyom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -13891,7 +14222,7 @@ msgid "User Ref."
 msgstr "Felhasználó Ref."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -13937,8 +14268,6 @@ msgstr "Hivatkozási útmutató"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -13946,7 +14275,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -13979,12 +14308,6 @@ msgstr "Falkland-szigetek"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -14093,9 +14416,11 @@ msgid "Selection"
 msgstr "Kiválasztás"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Ikon URL elérési útvonal"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -14147,7 +14472,7 @@ msgid "Action Type"
 msgstr "Művelet típus"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -14197,6 +14522,18 @@ msgid ""
 "    * Repair quotation report\n"
 "    * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"A cél egy komplett modul a termék javítások szervezéséhez.\n"
+"====================================================================\n"
+"\n"
+"A következő témákat kell átfognia ennek a modulnak:\n"
+"------------------------------------------------------\n"
+"    * A javításhoz hozzáadja/elveszi a termékeket\n"
+"    * Raktárral ütköztetés\n"
+"    * Számlázás (termékek és/vagy szolgáltatások)\n"
+"    * Garancia fogalma\n"
+"    * Javítási árajánlat jelentés\n"
+"    * Megjegyzések a műszaki szakembernek és az tulajdonos ügyfélnek\n"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -14290,11 +14627,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Óra (00-12): %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Az aktív mező segítségével el lehet rejteni a kapcsolattartót."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -14311,7 +14643,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Unknown attribute %s in %s "
@@ -14343,7 +14675,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "undefined get method !"
@@ -14384,16 +14716,16 @@ msgstr "Bronz"
 msgid "Payroll Accounting"
 msgstr "Bérszámfejtés"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Bináris fájl vagy külső URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Jelszó változtatás"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -14440,145 +14772,57 @@ msgid "Address Format"
 msgstr "Címek létrehozása"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Az Elválasztó formátumnak olyannak kell lennie [,n] ahol 0 < n :egység "
-"számjegytől indul. A -1 fogja jelezni az elválasztás végét. Pl. a [3,2,-1] "
-"fogja jelölni a 106500-nál, hogy 1,06,500 lehessen; az [1,2,-1] fogja "
-"lehetővé tenni, hogy a szám 106,50,0 legyen. Ebben az esetben mindig a ',' "
-"az ezres elválasztó."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-"\n"
-"Brazil lokalizációs modul \n"
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Műszaki tulajdonságok"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Okcitán (FR, 1500 után) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -14636,6 +14880,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Pénzügyi és könyvelési tárgyi eszköz kezelés.\n"
+"==========================================\n"
+"\n"
+"Ez a modul kezeli a vállalkozás vagy az egyén tulajdonában lévő tárgyi "
+"eszközöket. \n"
+"Nyomon követi ezeknek a tárgyi eszközöknek az értékcsökkenéseit. \n"
+"Megenged mozgás létrehozását az értékcsökkenés sorai közt.\n"
+"\n"
+"    "
 
 #. module: base
 #: field:ir.cron,numbercall:0
@@ -14688,6 +14942,36 @@ msgid ""
 "email is actually sent.\n"
 "    "
 msgstr ""
+"\n"
+"Üzleti irányú szociális hálózat\n"
+"===================================\n"
+"A Szociális/Társas hálózati modul egy egységes szociális hálózati tulajdon "
+"réteggel lát el az alkalmazásoknak megengedve a dokumentumokon a teljes "
+"kommunikáció történetének a bemutatását, egy teljesen integrált email és "
+"üzenetküldő szervező rendszerrel együtt. \n"
+"\n"
+"Ez lehetővé tesz a felhasználók részére az üzenetek és emailek írását és "
+"olvasását. Egy beíró felülettel is ellát egy feliratkozó mechanizmussal ami "
+"a dokumentumok nyomon követését és az újdonságokról értesítés frissítéseket "
+"küld.\n"
+"\n"
+"Fő tulajdonságok\n"
+"-------------\n"
+"* Tiszta és megújult kommunikáció előzmények minden OpenERP dokumentumhoz "
+"ami mint lehet egy beszélgetés tárgya is\n"
+"* Feliratkozási motor ami értesít a kiválasztott dokumentum új üzeneteiről\n"
+"* Univerzális hírek oldal az új üzenetek és a nyomon követett dokumentum "
+"aktivitásának megtekintéséhez \n"
+"* Felhasználó kommunikáció a hírek oldalon keresztül\n"
+"* A dokumentumokon összefűzött megbeszélések szerkezete\n"
+"* a globális kimenő levelező szerverhez kapcsolat - egy beépített email "
+"kezelő rendszer - lehetővé teszi az emailek küldését egy beállítható "
+"ütemterv alapú feldolgozó motoron keresztül\n"
+"* Benne van egy bővíthető általános email létrehozó segéd, ami átalakítható "
+"egy fő levelező  segéddé és egyszerű *kisebb kifejezések* fordítására is "
+"amik dinamikus adatokkal lesznek felváltva az aktuálisan kiküldeni kívánt "
+"emailekhez.\n"
+"    "
 
 #. module: base
 #: help:ir.actions.server,sequence:0
@@ -14771,6 +15055,11 @@ msgstr ""
 "Segít Önnek a készletek és a fő készletműveletek kezelésében: "
 "szállítólevelek, áruátvételek, stb."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -14787,10 +15076,10 @@ msgid "Body"
 msgstr "Törzs"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
-msgstr ""
+msgstr "Kapcsolat teszt sikeres!"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_gtd
@@ -14815,6 +15104,26 @@ msgid ""
 "actually performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"A \"dolgok elvégzése\" / \"Get Things done\" eszköz  végrehajtási fogalmának "
+"beillesztése \n"
+"===========================================================\n"
+"\n"
+"Ez a modul beilleszt egy egyszerű teendő listát a munkák listái alapján. "
+"hozzáadd egy szerkeszthető munka listát leegyszerűsítve a legszükségesebb "
+"mezőkre a tervező alkalmazásban.\n"
+"\n"
+"A teendő lista a GTD - dolgok elvégzése - fogalmán alapszik. Ez a világon "
+"széles körben elterjedt fogalmat használják\n"
+"a személyi idő beosztás kezelés fejlesztéséhez.\n"
+"\n"
+"Getting Things Done (a rövidítése GTD) egy olyan művelet szervező fogalom "
+"amit David Allen írt le, az ugyanolyan című könyvében.\n"
+"\n"
+"GTD azon az alapelven nyugszik, hogy az embereknek a gondolatait pontosan ki "
+"kell írni magukból. Így, a gondolatok felszabadulnak a mindenre amit el kell "
+"végezni emlékezés alól, és koncentrálni tud az aktuális futó munkákra.\n"
+"    "
 
 #. module: base
 #: field:res.users,menu_id:0
@@ -14838,7 +15147,7 @@ msgid "choose"
 msgstr "válasszon"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -15053,13 +15362,15 @@ msgid "Components Buyer"
 msgstr "Alkatrész vásárló"
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"Megrősíti a modul törlését? Véglegesen törölni fogja a modul által "
-"ténylegesen tárolt minden adatot!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -15098,12 +15409,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -15119,7 +15431,6 @@ msgstr "Vállalat regisztálás"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Egyéb"
@@ -15141,35 +15452,6 @@ msgstr "Technikai"
 msgid "China"
 msgstr "Kína"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Ez a modul a Lengyel könyvelési számla tükrök és adók kezelését végzi az "
-"OpenERP-ben.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -15260,41 +15542,9 @@ msgid "Bulgaria"
 msgstr "Bulgária"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
-"\n"
-"Ez a modul lehetővé teszi több termék egy gyártási rendelésen belüli "
-"legyártását.\n"
-"============================================================================="
-"\n"
-"\n"
-"Be tudja állítani termékekként a darabjegyzékben.\n"
-"\n"
-"A modul nélkül:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"Ezzel a modullal:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -15322,6 +15572,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "Kft."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -15366,6 +15636,7 @@ msgstr "Szlovák / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "ismeretlen"
@@ -15436,6 +15707,12 @@ msgstr "Címjegyzék"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+"Belgiumi könyvelés és bérszámfejtés  - Belgium - Payroll with Accounting"
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -15536,6 +15813,7 @@ msgid "Projects, Tasks"
 msgstr "Projektek, Feladatok"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -15548,7 +15826,7 @@ msgid "Information"
 msgstr "Információ"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "hamis"
@@ -15596,16 +15874,20 @@ msgstr ""
 "    * Vállalati adó kezelés\n"
 "    "
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Jobb szülő"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Modullista frissítése"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -15687,6 +15969,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "Az osv_memory mezőt csak = és != operátorokkal lehet összehasonlítani."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -15785,45 +16072,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Külső azonosító"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-"\n"
-"Regisztráció létrehozás megrendelésekkel.\n"
-"=======================================\n"
-"\n"
-"Ez a modul lehetővé teszi a fő eladási folyamattal való regisztráció "
-"létrehozás kapcsolást és automatizálást, és ezért be tudja kapcsolni a "
-"regisztráció számázási tulajdonságát.\n"
-"\n"
-"Ez egy új fajta szolgáltatás terméket határoz meg ami lehetőséget ad, hogy "
-"válasszon\n"
-"egy esemény kategóriát amivel társítva lesz. Ha bevisz egy megrendelést erre "
-"a \n"
-"termékre, akkor tud majd választani egy a kategóriához tartozó meglévő "
-"esemény közül és\n"
-"ha nyugtázza a megrendelést akkor automatikusan regisztrálva lesz ehez az "
-"eseményhez.\n"
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -15882,12 +16130,14 @@ msgid "Delivery Costs"
 msgstr "Szállítási költségek"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
 "try again in a few minutes"
 msgstr ""
+"Ez a futtatási feladat most van műveleti fázisban ezért az nem módosítható, "
+"kérem próbálja meg pár perc múlva"
 
 #. module: base
 #: view:base.language.export:0
@@ -15935,9 +16185,9 @@ msgstr ""
 "Kikapcsolja a minimum számlatükröket.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "DB adatbázis jelszó titkosítás"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Rekord szabályok"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -16246,10 +16496,15 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "nem"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -16281,112 +16536,14 @@ msgid "System Configuration done"
 msgstr "Rendszer konfigurálása kész"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Rendszer paraméterek"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
-"\n"
-"Svájci számlatükör lokalizáció\n"
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks- és Caicos-szigetek"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -16443,23 +16600,6 @@ msgstr ""
 "a titkosító eljárással az adatok visszanyeréssel.\n"
 "    "
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Összegyűjti a web alkalmazás használaát a  Google Analytics rendszerrel.\n"
-"    "
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -16497,7 +16637,7 @@ msgid "Low"
 msgstr "Alacsony"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Hiba ! Nem hozhat létre rekurzív menüket."
@@ -16623,11 +16763,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -16642,6 +16781,11 @@ msgstr "Hozzáférési menü"
 msgid "Thailand"
 msgstr "Thaiföld"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -16663,6 +16807,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Román / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -16712,77 +16880,6 @@ msgstr "Objektum kapcsolat"
 msgid "eInvoicing & Payments"
 msgstr "Számlázás & Kifizetések"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-"\n"
-"Rendesszövegű jelszó kiváltása biztonsági hasító függvénnyel az "
-"adatbázisban.\n"
-"================================================================\n"
-"\n"
-"A meglévő felhasználói adatbázisban, a rendesszövegű jelszavak azonnal el "
-"lesznek távolítva\n"
-"amint telepítésre kerül a base_crypt.\n"
-"\n"
-"Minden jelszó ki lesz cserélve egy biztonságos, konzervált, kriptográfiai "
-"hasító függvénnyel, \n"
-"ezzel megakadályozva az eredeti jelszó kiolvasását az adatbázisból.\n"
-"\n"
-"Miután telepítette ezt a modult, nem lesz lehetősége az elfelejtett jelszó "
-"visszafejtésére \n"
-"a felhasználók részéről, az adminisztátor egyedüli lehetősége lesz egy új "
-"jelszó megadása.\n"
-"\n"
-"Biztonsági figyelmeztetés:\n"
-"-----------------\n"
-"Ennek a modulnak a telepítésével nem hagyhatja figyelmen kívül a többi "
-"biztonsági intézkedést,\n"
-"mivel a jelszó a hálózaton keresztül kódolatlanul halad keresztül, kivéve, "
-"ha \n"
-"biztonsági protokolt használ mint a XML-RPCS vagy HTTPS.\n"
-"\n"
-"Ez nem védi meg az adatbázis többi részét, mely bizalmas\n"
-"adatokat is tartalmazhat. Pontos biztonsági intézkedést kell beileszteni\n"
-"a rendszer adminisztrátornak minden területen, mint: adatbázis védelmi "
-"mentések,\n"
-"rendszer fájlok, távoli héj hozzáférések, fizikai szerver hozzáférések.\n"
-"\n"
-"Kölcsönhatás az LDAP azonosítással:\n"
-"-------------------------------------\n"
-"Ez a modul most még nem kompatibilis a ``user_ldap`` modullal és\n"
-"ki fogja iktatni a LDAP azonosítást teljesen ha ugyanakkor telepítettek.\n"
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -16843,73 +16940,9 @@ msgid "Apply for Write"
 msgstr "Íráshoz alkamaz"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
-"\n"
-"Több-raktárhely kezelése, multi- és struktúrált  raktár helyek\n"
-"==============================================================\n"
-"\n"
-"A raktár és leltár kezelés a hierarchikus elhelyezkedés struktúrán alapul, a "
-"raktárhelyből a raktárba kapcsolattal. \n"
-"A dupla bevitelű raktár rendszer lehetővé teszi a vevők és beszállítók "
-"kezelését beleértve a gyártási raktárkészletet is. \n"
-"\n"
-"OpenERP-ben megvan a lehetőség a köteg és gyáriszám kezelésre biztosítva a "
-"nyomon követhetőséget, ami a gyártást szavatolja.\n"
-"\n"
-"Fő jellemzők\n"
-"-------------\n"
-"* Mozgások előzményei és tervezése,\n"
-"* Raktár értékelése (alapár vagy átlagár, ...)\n"
-"* Erőteljesség a raktárkészlet különbségek tükrében\n"
-"* Automata újrarendelés szabályok\n"
-"* Bárkódok támogatása\n"
-"* Gyors hiba érzékelés a dupla beviteli rendszer  miatt\n"
-"* Nyomon követhetőség (ellentétes irányú / Folyamat irányú, Széria számok, "
-"...)\n"
-"\n"
-"Dashboard / Műszerfal kimutatások a Raktárhely kezeléshez ideérve:\n"
-"----------------------------------------------------------\n"
-"* Bejövő áruk (Grafikon)\n"
-"* Kimenő áruk (Grafikon)\n"
-"* Lehetséges beszerzés\n"
-"* Raktári tételek analízisei / elemzései\n"
-"* Záró tételek raktárhelyei\n"
-"* Mozgás analízis, elemzés\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_page
@@ -17011,6 +17044,21 @@ msgstr "Nézet :"
 msgid "View Auto-Load"
 msgstr "Automatikus betöltés bézet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -17055,57 +17103,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Perzsa / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-"\n"
-"Munkavállalók szerinti kiadások kezelése\n"
-"============================\n"
-"\n"
-"Ez az alkalmazás lehetővé teszi a munkavállalók napi kiadásait. Hozzáférést "
-"biztosít a munkavállalói kiadási jegyzeteihez és azok kiegészítésének és "
-"érvényesítésének jogához vagy érvénytelenítheti is a jegyzeteket. Az "
-"érvényesítés után egy számlát készít a munkavállaló részére.\n"
-"A munkavállalók bevihetik a saját kiadásaikat amit az érvényesítési út "
-"automatikusan felad könyvelésre az osztályvezető érvényesítése után.\n"
-"\n"
-"\n"
-"A teljes folyamat a következő:\n"
-"----------------------------------\n"
-"* Kiadás terve\n"
-"* a munkavállaló visszaigazolása a listára\n"
-"* az osztályvezetője általi érvényesítés\n"
-"* a könyvelő érvényesítése és számla készítés\n"
-"\n"
-"Ez a modul használja az analitikai, elemző számlát és kompatibilis az "
-"időbeosztásos számlázás modullal így automatikus munkavállalói kiadás újra-"
-"számlázást készíthet ha projektenként dolgozik.\n"
-"    "
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -17128,9 +17125,9 @@ msgid "Unmet dependency !"
 msgstr "Függőség nem teljesült !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "Adminisztrátori hozzáférés szükséges a modul törléséhez"
@@ -17141,7 +17138,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -17184,7 +17211,7 @@ msgstr ""
 "Ha telepítve lett, az 'eszközök' menü 'ötletek' címszó alatt találja az meg."
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -17254,7 +17281,7 @@ msgid "Access"
 msgstr "Hozzáférés"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -17287,11 +17314,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -17307,8 +17333,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -17460,7 +17484,7 @@ msgid "Officer"
 msgstr "Hivatalnok"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "Soros művelet mező `%s` nem található az elszórt mezőkhöz `%s`!"
@@ -17472,7 +17496,6 @@ msgstr "Jamaika"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Szín mutató"
 
@@ -17524,7 +17547,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr "Modell '%s' modul adatokat tartalmaz és ezért nem lehet törölni!"
@@ -17535,8 +17558,8 @@ msgid "Azerbaijan"
 msgstr "Azerbajdzsán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Figyelem"
@@ -17562,11 +17585,6 @@ msgstr "Virgin-szigetek (British)"
 msgid "Parameters"
 msgstr "Paraméterek"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre és Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -17661,7 +17679,6 @@ msgstr "Képzések, Konferenciák, Találkozók, Kiállítások, Regisztrációk
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Ország"
@@ -17734,9 +17751,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanyol (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Egy modul telepítése"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"Az Elválasztó formátumnak olyannak kell lennie [,n] ahol 0 < n :egység "
+"számjegytől indul. A -1 fogja jelezni az elválasztás végét. Pl. a [3,2,-1] "
+"fogja jelölni a 106500-nál, hogy 1,06,500 lehessen; az [1,2,-1] fogja "
+"lehetővé tenni, hogy a szám 106,50,0 legyen. Ebben az esetben mindig a ',' "
+"az ezres elválasztó."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -17775,7 +17801,7 @@ msgid "Japan"
 msgstr "Japán"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Egyszerre csak egy oszlopot lehet átnevezni!"
@@ -17859,6 +17885,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Kanada - Könyvelés"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -17883,7 +17940,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Ez a művelet eltarthat néhány percig."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -17924,6 +17981,12 @@ msgstr "Végrehajtás"
 msgid "Condition"
 msgstr "Feltétel"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -17994,6 +18057,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Horvátország"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Megrősíti a modul törlését? Véglegesen törölni fogja a modul által "
+"ténylegesen tárolt minden adatot!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -18018,6 +18090,11 @@ msgstr "Rendszer frissítés"
 msgid "SXW Content"
 msgstr "SXW tartalom"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -18034,7 +18111,7 @@ msgid "Gold"
 msgstr "Arany"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -18055,15 +18132,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Általános információk"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "Teljes azonosító"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks- és Caicos-szigetek"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -18121,7 +18235,12 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Cégváltási figyelmeztetés"
@@ -18141,17 +18260,23 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "A következő számot a sorban ezzel a számmal fogjuk növelni"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Beosztás"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
 msgstr ""
+"Összefüggések kezelése lehetőségekkel és vásárlókkal a vezérszereplők, "
+"lehetőségek, igények és kérdések használatával."
 
 #. module: base
 #: model:ir.module.module,description:base.module_project
@@ -18175,17 +18300,31 @@ msgid ""
 "* Cumulative Flow\n"
 "    "
 msgstr ""
+"\n"
+"Többszintű munka nyomon követése, feladat, a feladaton munka elvégezve\n"
+"====================================================\n"
+"\n"
+"Ez az alkalmazás lehetővé teszi egy működő feladat szervező rendszerben a "
+"műveletei feladatokba való szervezését és megtervezni milyen feladatokat "
+"kell elvégeznie ahhoz, hogy befejezze azt.\n"
+"\n"
+"Gantt diagramok grafikus ábráival láthatja a munkaterveket, valamint az "
+"erőforrások elérhetőségét és a munkafolyamatot.\n"
+"\n"
+"Dashboard / Műszerfal kimutatás a Munka Szervező részére ami magában "
+"foglalja:\n"
+"--------------------------------------------------------\n"
+"* Az én feladataim\n"
+"* Nyitott feladatok\n"
+"* Feladat elemzés\n"
+"* Folyamat összegző\n"
+"    "
 
 #. module: base
 #: view:res.partner:0
 msgid "Internal Notes"
 msgstr "Belső jegyzetek"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Szállítás"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -18213,7 +18352,7 @@ msgid "Workflow Instances"
 msgstr "Munkafolyamat példányok"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partnerek: "
@@ -18224,7 +18363,7 @@ msgid "Is a Company?"
 msgstr "Ez egy Cég?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -18299,7 +18438,6 @@ msgstr "Név exportálása"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -18347,7 +18485,7 @@ msgstr "Orosz / русский язык"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_signup
 msgid "Signup"
-msgstr ""
+msgstr "Regisztráció"
 
 #~ msgid "Reply"
 #~ msgstr "Válasz"
@@ -18394,6 +18532,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Több dokumentumon"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kapcsolattartó neve"
+
 #, python-format
 #~ msgid "The read method is not implemented on this object !"
 #~ msgstr "The read method is not implemented on this object !"
@@ -18742,6 +18883,9 @@ msgstr ""
 #~ msgid "HR sector"
 #~ msgstr "HR szektor"
 
+#~ msgid "Creator"
+#~ msgstr "Létrehozó"
+
 #~ msgid "Retailers"
 #~ msgstr "Kiskereskedők"
 
@@ -18997,6 +19141,9 @@ msgstr ""
 #~ msgid "Latest version"
 #~ msgstr "Utolsó verzió"
 
+#~ msgid "Addresses"
+#~ msgstr "Címek"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML azonosító"
 
@@ -19111,6 +19258,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Típus mezők"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Az aktív mező segítségével el lehet rejteni a kapcsolattartót."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Kongói Demokratikus Köztársaság"
 
@@ -19183,6 +19333,9 @@ msgstr ""
 #~ msgid "Ending Date"
 #~ msgstr "Záró dátum"
 
+#~ msgid "Attached Model"
+#~ msgstr "Csatolt modell"
+
 #~ msgid "Textile Suppliers"
 #~ msgstr "Textilipari szállítók"
 
@@ -19195,6 +19348,9 @@ msgstr ""
 #~ msgid "Starter Partner"
 #~ msgstr "Kezdő partner"
 
+#~ msgid "Attached ID"
+#~ msgstr "Csatolt ID"
+
 #~ msgid "Openstuff.net"
 #~ msgstr "Openstuff.net"
 
@@ -19768,6 +19924,9 @@ msgstr ""
 #~ "jelszót. Ennek a felhasználónak ki kell jelentkeznie és ismét be kell "
 #~ "jelentkeznie!"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Bináris fájl vagy külső URL"
+
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr "A vállalat logója (a méret kb. 450 x 150 képpont legyen)."
 
@@ -19956,6 +20115,9 @@ msgstr ""
 #~ msgid "Search Widget"
 #~ msgstr "Widget keresése"
 
+#~ msgid "Delivery"
+#~ msgstr "Szállítás"
+
 #~ msgid "Check this box if the partner is an Employee."
 #~ msgstr "Jelölje be, ha a partner egy alkalmazott"
 
@@ -21723,3 +21885,38 @@ msgstr ""
 #~ "Kezeli az összes erőforrás al kapcsolatait /ágakat, leveleket/.\n"
 #~ "\n"
 #~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Mexikói könyvelés\n"
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Venezuela számlatükör\n"
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
+#~ msgid "DB Password Encryption"
+#~ msgstr "DB adatbázis jelszó titkosítás"
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index b295ec95ff6..468a5542e52 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 18:52+0000\n"
 "Last-Translator: Vahe Sahakyan <vahe@it-consulting.am>\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: 2012-12-14 05:35+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -37,7 +37,7 @@ msgid "DateTime"
 msgstr "Ամսաթիվ"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -185,41 +185,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "ՈՒշադրություն"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -227,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Կառուցվածքային սխալ"
@@ -238,7 +212,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "\"%s\" դածտի անվանափոխումն արգելված է"
@@ -249,7 +223,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "ստեղծված է:"
@@ -328,20 +302,6 @@ msgstr "Ընկերությունը որին վերաբերում է այս գր
 msgid "Max. Size"
 msgstr "Մաքս. չափ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -349,11 +309,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Կոնտակտի Անուն"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -412,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -449,6 +404,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -487,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -539,7 +495,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -577,9 +533,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Հիմնական տեսք"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Մտքեր"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -604,26 +560,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -632,8 +568,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -707,14 +659,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Գործիքներ"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -778,16 +728,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -816,11 +764,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -949,10 +907,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -971,7 +927,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1019,15 +975,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1125,8 +1074,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1141,12 +1119,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1173,7 +1156,54 @@ msgid "Username"
 msgstr "Օգտ. անուն"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1201,7 +1231,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1233,14 +1263,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Թարգմանություններ"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1375,7 +1403,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1397,7 +1425,7 @@ msgid "Search"
 msgstr "Որոնում"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1412,7 +1440,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Գործիքներ"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Գործողությունը մերժված է"
@@ -1538,7 +1573,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1653,18 +1702,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1745,7 +1789,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1786,11 +1830,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1805,7 +1844,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1846,6 +1885,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1922,16 +1966,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1986,7 +2025,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2010,11 +2049,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2026,7 +2065,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2064,11 +2102,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Մտքեր"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2201,6 +2234,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2234,12 +2272,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2287,6 +2330,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2338,7 +2390,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2416,7 +2468,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "ՀԱ հաշիվ-ապրանքագիր"
 
@@ -2463,11 +2514,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2584,8 +2630,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2664,7 +2721,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2723,6 +2780,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2731,7 +2801,7 @@ msgid "Manager"
 msgstr "Կառավարիչ"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2817,7 +2887,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2847,7 +2917,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2912,22 +2982,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Սխալ"
@@ -3021,12 +3091,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Սխալ: Դուք չեք կարող ստեղծել Recursive ընկերություններ."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3043,17 +3113,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3063,7 +3135,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3114,34 +3186,6 @@ msgstr "Կարգաբերման պարամետրեր"
 msgid "Invalid arguments"
 msgstr "Անվավեր արժեքներ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3180,7 +3224,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3192,6 +3236,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Բանկային հաշվի տեսակ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3228,7 +3300,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3262,7 +3334,7 @@ msgid "Access Controls"
 msgstr "Մուտքի Վերահսկում"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3290,32 +3362,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3333,9 +3379,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Սխալ: Դուք չեք կարող ստեղծել Recursive ընկերություններ."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "ծննդյան ամսաթիվ"
 
@@ -3351,7 +3401,7 @@ msgid "Products Manufacturers"
 msgstr "Ապրանքներ արտադրողները"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3459,7 +3509,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3648,7 +3698,6 @@ msgstr "Զեկույցներ"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Կոչում"
@@ -3659,13 +3708,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3725,9 +3779,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3738,7 +3793,7 @@ msgid "Company Name"
 msgstr "Ընկերության անվանումը"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3757,13 +3812,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3793,12 +3871,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3847,19 +3921,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3877,7 +3939,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3922,7 +3984,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3941,8 +4003,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -3999,13 +4095,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "ՍՊԸ"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4021,8 +4122,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4081,32 +4182,9 @@ msgid "Languages"
 msgstr "Լեզուներ"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4185,7 +4263,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4257,6 +4334,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4318,9 +4400,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Ազգանուն"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4400,6 +4489,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4423,6 +4528,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4450,6 +4592,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4527,12 +4675,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4547,7 +4689,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4558,13 +4699,18 @@ msgstr ""
 msgid "Author"
 msgstr "Հեղինակ"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4607,6 +4753,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4622,7 +4770,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4715,7 +4863,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4803,7 +4956,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4918,6 +5071,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4931,7 +5089,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4942,7 +5100,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4974,6 +5132,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5137,7 +5306,7 @@ msgid "Account Owner Name"
 msgstr "Հաշվի Սեփականատիրոջ Անունը"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5153,16 +5322,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5203,8 +5367,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5268,15 +5433,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5292,6 +5448,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Ներդիրի անունը"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5375,6 +5536,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5625,7 +5792,7 @@ msgid "title"
 msgstr "վեռնագիր"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5682,6 +5849,15 @@ msgstr "Ապրանքներ"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5797,13 +5973,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5823,7 +6001,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5856,9 +6034,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5892,6 +6069,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Հիմնական տեսք"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5902,7 +6084,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5918,26 +6100,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Բանկերը"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6070,11 +6232,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6086,8 +6243,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6194,7 +6351,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6232,7 +6389,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6259,8 +6416,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6293,6 +6478,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6335,7 +6527,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6427,7 +6619,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6447,23 +6639,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6496,10 +6671,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6573,8 +6748,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6598,8 +6773,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6647,18 +6822,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6763,6 +6933,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Թարգմանություններ"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6857,7 +7034,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6958,12 +7134,6 @@ msgstr "Անունը"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7005,6 +7175,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7062,7 +7233,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7082,6 +7253,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7093,13 +7269,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7130,7 +7311,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7176,7 +7357,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7196,30 +7376,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7307,6 +7487,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7390,6 +7575,21 @@ msgstr ""
 msgid "Employees"
 msgstr "Աշխատակիցներ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7419,11 +7619,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Հասցեներ"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7448,7 +7643,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Փողոց"
@@ -7459,8 +7653,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7539,7 +7748,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7626,14 +7835,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7642,7 +7853,7 @@ msgid "Company Bank Accounts"
 msgstr "Ընկերության բանկային հաշիվները"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7653,13 +7864,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7678,12 +7889,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Գործիքներ"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7856,7 +8068,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7885,14 +8097,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "ՈՒշադրություն"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7916,7 +8120,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8031,7 +8234,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8346,7 +8549,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8358,7 +8561,7 @@ msgid "eInvoicing"
 msgstr "eInvoicing"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8368,7 +8571,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8383,6 +8586,17 @@ msgstr "Շարունակել"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8422,7 +8636,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8444,15 +8658,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Ներդիրի անունը"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8476,7 +8690,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8488,7 +8702,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Մատակարար"
@@ -8566,7 +8779,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8594,8 +8807,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8619,7 +8832,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8766,7 +8979,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8805,8 +9018,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8880,7 +9093,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8894,7 +9107,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8957,6 +9170,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9055,8 +9273,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9085,13 +9303,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9112,7 +9330,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9160,7 +9378,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9206,6 +9424,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9214,7 +9433,7 @@ msgid "Cancel"
 msgstr "Հրաժարվել"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9233,6 +9452,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9268,7 +9524,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9320,6 +9576,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9362,23 +9623,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9412,7 +9661,7 @@ msgid "Products Expiry Date"
 msgstr "Ապրանքի օգտագործման ժամկետ"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9503,6 +9752,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9707,7 +9961,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9718,13 +9972,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9892,7 +10151,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9925,6 +10184,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9950,6 +10214,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10039,7 +10308,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Քաղաք"
@@ -10075,13 +10343,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10140,19 +10415,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10166,6 +10466,8 @@ msgid "Activity"
 msgstr "Գործունեություն"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10184,7 +10486,12 @@ msgid "Parent Company"
 msgstr "Գերակա ընկերությունը"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10196,13 +10503,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10284,6 +10584,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10353,6 +10673,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10411,9 +10736,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10431,8 +10756,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10471,13 +10796,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "էլ.փոստ"
@@ -10488,7 +10812,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10517,36 +10846,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10568,6 +10867,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "ընթացակարգ"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10584,16 +10888,6 @@ msgstr "Պայմանագրային աշխատանքներ"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10610,8 +10904,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10637,11 +10931,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10667,7 +10956,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10683,12 +10972,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10709,29 +10998,9 @@ msgid "Timezone"
 msgstr "Ժամանակային գօտին"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10752,7 +11021,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10799,7 +11068,6 @@ msgstr "Գնման երկակի հաստատում"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10823,6 +11091,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10908,19 +11177,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "ընթացակարգ"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10962,22 +11240,6 @@ msgstr "Աշխատակցի տեղեկատու"
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11110,7 +11372,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Հաճախորդ"
 
@@ -11200,7 +11461,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11250,8 +11511,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11342,7 +11603,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Նամակը տեղ չի հասցվել"
@@ -11369,7 +11630,7 @@ msgid "Object"
 msgstr "Օբյեկտ"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11455,7 +11716,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11468,7 +11729,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11513,8 +11774,6 @@ msgstr "Տեղեկատու ուղեցույց"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11522,7 +11781,7 @@ msgid "Partner"
 msgstr "Գործընկեր"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11551,12 +11810,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11663,8 +11916,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11701,7 +11956,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11837,11 +12092,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Ժամ 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11858,7 +12108,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11881,7 +12131,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11922,16 +12172,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Աշխ. վարձ հաշվառում"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Ազգանուն"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -11978,73 +12228,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12052,13 +12237,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12235,6 +12455,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12251,7 +12476,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12299,7 +12524,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12475,10 +12700,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12510,12 +12739,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12529,7 +12759,6 @@ msgstr "Ընկերության ռեգիստրը"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12551,23 +12780,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12635,24 +12847,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12681,6 +12877,26 @@ msgstr ""
 msgid "ltd"
 msgstr "ՍՊԸ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12717,6 +12933,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12784,6 +13001,11 @@ msgstr "Հասցեագիրք"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12873,6 +13095,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12885,7 +13108,7 @@ msgid "Information"
 msgstr "Տեղեկություն"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12916,16 +13139,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12990,6 +13217,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13062,29 +13294,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13132,7 +13341,7 @@ msgid "Delivery Costs"
 msgstr "Առաքման ծախսեր"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13176,8 +13385,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13422,9 +13631,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13451,62 +13665,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13548,17 +13713,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13593,7 +13747,7 @@ msgid "Low"
 msgstr "Ցածր"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13673,11 +13827,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Հեռ."
@@ -13692,6 +13845,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13712,6 +13870,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13748,41 +13930,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr "eInvoicing & վճարումներ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13843,40 +13990,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13965,6 +14080,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14007,34 +14137,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14057,9 +14159,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14070,7 +14172,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14096,7 +14228,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14141,7 +14273,7 @@ msgid "Access"
 msgstr "Հասցե"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14174,11 +14306,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Ֆաքս"
@@ -14194,8 +14325,6 @@ msgstr "Ֆաքս"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14310,7 +14439,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14322,7 +14451,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14355,7 +14483,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14366,8 +14494,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Զգուշացում"
@@ -14393,11 +14521,6 @@ msgstr ""
 msgid "Parameters"
 msgstr "Պարամետրեր"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14487,7 +14610,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Երկիր"
@@ -14554,8 +14676,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14583,7 +14709,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14644,6 +14770,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14668,7 +14825,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14707,6 +14864,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14759,6 +14922,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14783,6 +14953,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14799,7 +14974,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14820,14 +14995,51 @@ msgstr ""
 msgid "General Information"
 msgstr "Ընկերության տվյալները"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14864,7 +15076,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14882,11 +15099,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14922,11 +15143,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14954,7 +15170,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Գործընկերներ. "
@@ -14965,7 +15181,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15031,7 +15247,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15140,6 +15355,9 @@ msgstr ""
 #~ msgid "new"
 #~ msgstr "նոր"
 
+#~ msgid "Contact Name"
+#~ msgstr "Կոնտակտի Անուն"
+
 #~ msgid "Partner Manager"
 #~ msgstr "Գործընկերների կառավարում"
 
@@ -15308,6 +15526,9 @@ msgstr ""
 #~ msgid "Partner Firm"
 #~ msgstr "Գորշընկեր ընկերություն"
 
+#~ msgid "Addresses"
+#~ msgstr "Հասցեներ"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "Գիտելիքի շտեմարան"
 
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index d23c951504c..f676f579771 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-22 17:30+0000\n"
 "Last-Translator: Agus Purnomo <goesspoerr@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:56+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Perhatian!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "dibuat"
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Ukuran Maksimal"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nama Kontak"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -580,9 +536,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "View Asli"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -607,26 +563,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnia"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -635,8 +571,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -710,14 +662,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -781,16 +731,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -819,11 +767,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -952,10 +910,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -974,7 +930,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1022,15 +978,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1128,8 +1077,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1144,12 +1122,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1176,7 +1159,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1204,7 +1234,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1236,14 +1266,12 @@ msgid "South Korea"
 msgstr "Korea Selatan"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transisi"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1378,7 +1406,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1400,7 +1428,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1415,7 +1443,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1541,7 +1576,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1656,18 +1705,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1748,7 +1792,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1789,11 +1833,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1808,7 +1847,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1849,6 +1888,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1925,16 +1969,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1989,7 +2028,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2013,11 +2052,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2029,7 +2068,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2067,11 +2105,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2204,6 +2237,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2237,12 +2275,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2290,6 +2333,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2341,7 +2393,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2419,7 +2471,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2466,11 +2517,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2587,8 +2633,19 @@ msgid "Default limit for the list view"
 msgstr "Batas baku untuk daftar view"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2667,7 +2724,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2726,6 +2783,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2734,7 +2804,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2820,7 +2890,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2850,7 +2920,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2915,22 +2985,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3024,12 +3094,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3046,17 +3116,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3066,7 +3138,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3117,34 +3189,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3183,7 +3227,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3195,6 +3239,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3231,7 +3303,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3265,7 +3337,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3293,32 +3365,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3336,9 +3382,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3354,7 +3404,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3462,7 +3512,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3651,7 +3701,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3662,13 +3711,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3728,9 +3782,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3741,7 +3796,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3760,13 +3815,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3796,12 +3874,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3850,19 +3924,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3880,7 +3942,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3925,7 +3987,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3944,8 +4006,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4002,13 +4098,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4024,8 +4125,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4084,32 +4185,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4188,7 +4266,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4260,6 +4337,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4321,8 +4403,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4403,6 +4492,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4426,6 +4531,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4453,6 +4595,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4530,12 +4678,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4550,7 +4692,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4561,13 +4702,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4610,6 +4756,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4625,7 +4773,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4718,7 +4866,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4806,7 +4959,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4921,6 +5074,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4934,7 +5092,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4945,7 +5103,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4977,6 +5135,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5140,7 +5309,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5156,16 +5325,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5206,8 +5370,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5271,15 +5436,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5295,6 +5451,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5378,6 +5539,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5628,7 +5795,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5685,6 +5852,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5800,13 +5976,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5826,7 +6004,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5859,9 +6037,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5895,6 +6072,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "View Asli"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5905,7 +6087,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5921,26 +6103,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6073,11 +6235,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6089,8 +6246,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6197,7 +6354,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6235,7 +6392,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6262,8 +6419,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6296,6 +6481,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6338,7 +6530,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6430,7 +6622,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6450,23 +6642,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6499,10 +6674,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6576,8 +6751,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6601,8 +6776,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6650,18 +6825,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6766,6 +6936,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transisi"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6860,7 +7037,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6961,12 +7137,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7008,6 +7178,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7065,7 +7236,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7085,6 +7256,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7096,13 +7272,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7133,7 +7314,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7179,7 +7360,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7199,30 +7379,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7310,6 +7490,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7393,6 +7578,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7422,11 +7622,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7451,7 +7646,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7462,8 +7656,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7542,7 +7751,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7629,14 +7838,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7645,7 +7856,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7656,13 +7867,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7681,12 +7892,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7859,7 +8071,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7888,14 +8100,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Perhatian!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7919,7 +8123,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8034,7 +8237,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8349,7 +8552,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8361,7 +8564,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8371,7 +8574,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8386,6 +8589,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8425,7 +8639,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8447,14 +8661,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8479,7 +8693,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8491,7 +8705,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8569,7 +8782,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8597,8 +8810,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8622,7 +8835,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8769,7 +8982,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8808,8 +9021,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8883,7 +9096,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8897,7 +9110,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8960,6 +9173,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9058,8 +9276,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9088,13 +9306,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9115,7 +9333,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9163,7 +9381,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9209,6 +9427,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9217,7 +9436,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9236,6 +9455,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9271,7 +9527,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9323,6 +9579,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9365,23 +9626,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9415,7 +9664,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9506,6 +9755,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9710,7 +9964,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9721,13 +9975,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9895,7 +10154,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9928,6 +10187,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9953,6 +10217,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10042,7 +10311,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10078,13 +10346,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10143,19 +10418,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10169,6 +10469,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10187,7 +10489,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10199,13 +10506,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10287,6 +10587,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10356,6 +10676,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10414,9 +10739,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10434,8 +10759,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10474,13 +10799,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10491,7 +10815,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10520,36 +10849,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10571,6 +10870,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10587,16 +10891,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10613,8 +10907,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10640,11 +10934,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10670,7 +10959,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10686,12 +10975,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10712,29 +11001,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10755,7 +11024,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10802,7 +11071,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10826,6 +11094,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10911,19 +11180,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10965,22 +11243,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11113,7 +11375,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11203,7 +11464,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11253,8 +11514,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11345,7 +11606,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11372,7 +11633,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11458,7 +11719,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11471,7 +11732,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11516,8 +11777,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11525,7 +11784,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11554,12 +11813,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11666,8 +11919,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11704,7 +11959,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11840,11 +12095,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11861,7 +12111,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11884,7 +12134,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11926,13 +12176,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11981,73 +12231,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12055,13 +12240,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12238,6 +12458,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12254,7 +12479,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12302,7 +12527,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12478,10 +12703,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12513,12 +12742,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12532,7 +12762,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12554,23 +12783,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12638,24 +12850,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12684,6 +12880,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12720,6 +12936,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12787,6 +13004,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12876,6 +13098,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12888,7 +13111,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12919,16 +13142,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12993,6 +13220,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13065,29 +13297,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13135,7 +13344,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13179,8 +13388,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13425,9 +13634,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13454,62 +13668,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13551,17 +13716,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13596,7 +13750,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13676,11 +13830,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13695,6 +13848,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13715,6 +13873,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13751,41 +13933,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13846,40 +13993,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13968,6 +14083,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14010,34 +14140,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14060,9 +14162,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14073,7 +14175,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14099,7 +14231,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14144,7 +14276,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14177,11 +14309,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14197,8 +14328,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14313,7 +14442,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14325,7 +14454,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14358,7 +14486,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14369,8 +14497,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14396,11 +14524,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14490,7 +14613,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14557,8 +14679,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14586,7 +14712,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14647,6 +14773,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14671,7 +14828,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14710,6 +14867,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14762,6 +14925,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14786,6 +14956,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14802,7 +14977,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14823,14 +14998,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14867,7 +15079,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14885,11 +15102,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14925,11 +15146,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14957,7 +15173,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14968,7 +15184,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15034,7 +15250,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15092,6 +15307,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Pada multi dok."
 
+#~ msgid "Contact Name"
+#~ msgstr "Nama Kontak"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index cfc2dc40d8e..0ef211e6b3e 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:56+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "DagsTími"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -188,41 +188,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Aðvörun!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -232,7 +206,7 @@ msgstr ""
 "breytið þeim í gegnum Python kóða, helst í gegnum auka viðbót!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -243,7 +217,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -254,7 +228,7 @@ msgid "Swaziland"
 msgstr "Svasíland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "Búið til."
@@ -333,20 +307,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Hámarks stærð"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -354,11 +314,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nafn tengiliðs"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -417,7 +372,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -454,6 +409,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Eigandi"
 
@@ -492,7 +448,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -544,7 +500,7 @@ msgid "Netherlands Antilles"
 msgstr "Hollensku Antillaeyjar"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -584,8 +540,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -611,26 +567,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -641,8 +577,24 @@ msgstr ""
 "prentað er í annað sinn."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -718,14 +670,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Leiðbeinendur"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Sérsniðið svæði verður að hafa nafn sem byrjar á 'x_'!"
@@ -789,16 +739,14 @@ msgid "Model Description"
 msgstr "Lýsing viðbótar"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -827,11 +775,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Jórdanía"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Næsta áætlaða keyrsla á þessu verki."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -960,11 +918,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papúa Nýja-Gínea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -983,7 +939,7 @@ msgid "Email Preferences"
 msgstr "Stillingar tölvupósts"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1031,16 +987,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Farsími"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1137,8 +1086,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1153,12 +1131,17 @@ msgid ""
 msgstr "Notanda var bætt í þennan hóp sjálfkrafa í gegnum eftirfarandi hópa."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1185,7 +1168,54 @@ msgid "Username"
 msgstr "Notandanafn"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1213,7 +1243,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Prófun tengingar mistókst!"
@@ -1245,14 +1275,12 @@ msgid "South Korea"
 msgstr "Suður-Kórea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1387,7 +1415,7 @@ msgid "Marshall Islands"
 msgstr "Marshall-eyjar"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1409,7 +1437,7 @@ msgid "Search"
 msgstr "Leita"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1428,7 +1456,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Leiðbeinendur"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Aðgerð afturkölluð"
@@ -1554,7 +1589,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Ekkert tungumál með kóða \"%s\" er til"
@@ -1671,18 +1720,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1763,7 +1807,7 @@ msgid "East Timor"
 msgstr "Austur-Tímor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1804,11 +1848,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1823,7 +1862,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1864,6 +1903,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1940,16 +1984,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2004,7 +2043,7 @@ msgid "Formula"
 msgstr "Formúla"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Get ekki fjarlægt rótar notanda!"
@@ -2028,11 +2067,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (afrita)"
@@ -2044,7 +2083,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2082,11 +2120,6 @@ msgstr "Full slóð"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2221,6 +2254,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2254,12 +2292,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2307,6 +2350,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2358,7 +2410,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2436,7 +2488,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2483,11 +2534,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2604,9 +2650,20 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papúa Nýja-Gínea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2684,7 +2741,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2743,6 +2800,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2751,7 +2821,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2837,7 +2907,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2867,7 +2937,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2932,22 +3002,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3041,12 +3111,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3063,17 +3133,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3083,7 +3155,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3134,34 +3206,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3200,7 +3244,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3212,6 +3256,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Gerð banka reiknings"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3248,7 +3320,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3282,7 +3354,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3310,32 +3382,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3353,9 +3399,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fæðingardagur"
 
@@ -3371,7 +3421,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3479,7 +3529,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3668,7 +3718,6 @@ msgstr "Skýrslur"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3679,13 +3728,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3745,9 +3799,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3758,7 +3813,7 @@ msgid "Company Name"
 msgstr "Nafn fyrirtækis"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3777,13 +3832,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3813,12 +3891,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3867,19 +3941,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3897,7 +3959,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3942,7 +4004,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3961,8 +4023,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4019,13 +4115,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4041,8 +4142,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4101,32 +4202,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4205,7 +4283,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4277,6 +4354,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4338,8 +4420,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4420,6 +4509,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4443,6 +4548,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4470,6 +4612,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4547,12 +4695,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4567,7 +4709,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4578,13 +4719,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4627,6 +4773,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4642,7 +4790,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4735,7 +4883,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4823,7 +4976,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4938,6 +5091,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4951,7 +5109,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4962,7 +5120,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4994,6 +5152,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5157,7 +5326,7 @@ msgid "Account Owner Name"
 msgstr "Nafn eiganda reiknings"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Get ekki endurnefnt dálk í %s, þar sem hann er þegar til!"
@@ -5173,16 +5342,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5223,9 +5387,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr ""
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Nafn viðbótarinnar verður að vera einstakt!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5288,15 +5453,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5312,6 +5468,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nafn viðhengis"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5395,6 +5556,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5645,7 +5812,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5702,6 +5869,15 @@ msgstr "Vörur"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5817,13 +5993,15 @@ msgid "Bank Type"
 msgstr "Gerð banka"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5843,7 +6021,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5876,9 +6054,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5912,6 +6089,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5922,7 +6104,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5938,26 +6120,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mínir bankar"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6090,11 +6252,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6106,8 +6263,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6214,7 +6371,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6252,7 +6409,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6279,8 +6436,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6313,6 +6498,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6355,7 +6547,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6447,7 +6639,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6467,23 +6659,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Farsími"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6516,10 +6691,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6593,8 +6768,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6618,8 +6793,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6667,18 +6842,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6783,6 +6953,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6877,7 +7054,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6978,12 +7154,6 @@ msgstr "Fullt nafn"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Nafn viðbótarinnar verður að vera einstakt!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7025,6 +7195,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7082,7 +7253,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7102,6 +7273,11 @@ msgstr "Nafn flokks"
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7113,13 +7289,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7150,7 +7331,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7196,7 +7377,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7216,30 +7396,30 @@ msgid "Child Categories"
 msgstr "Undirflokkar"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7327,6 +7507,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7410,6 +7595,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7439,11 +7639,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Heimilsföng"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7468,7 +7663,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7479,8 +7673,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7559,7 +7768,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7646,14 +7855,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7662,7 +7873,7 @@ msgid "Company Bank Accounts"
 msgstr "Banka reikningar fyrirtækis"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Ekki er leyfilegt að hafa tómt lykilorð af öryggis ásætðum!"
@@ -7673,13 +7884,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7698,12 +7909,13 @@ msgid "Normal Bank Account"
 msgstr "Venjulegur banka reikningur"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7876,7 +8088,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7905,14 +8117,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Aðvörun!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7936,7 +8140,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8051,7 +8254,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8366,7 +8569,7 @@ msgid "Update Modules List"
 msgstr "Uppfæra lista yfir Viðbætur"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8378,7 +8581,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8388,7 +8591,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8403,6 +8606,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8442,7 +8656,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8464,15 +8678,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nafn viðhengis"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8496,7 +8710,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8508,7 +8722,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8586,7 +8799,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8614,8 +8827,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8639,7 +8852,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8786,7 +8999,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8826,8 +9039,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8901,7 +9114,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8915,7 +9128,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8978,6 +9191,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9076,8 +9294,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9106,13 +9324,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9133,7 +9351,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9181,7 +9399,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9227,6 +9445,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9235,7 +9454,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9254,6 +9473,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9289,7 +9545,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9341,6 +9597,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9383,23 +9644,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9433,7 +9682,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9524,6 +9773,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9728,7 +9982,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9739,13 +9993,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9915,7 +10174,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9948,6 +10207,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9973,6 +10237,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10062,7 +10331,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Staður"
@@ -10098,13 +10366,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10163,19 +10438,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10189,6 +10489,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10207,7 +10509,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10219,13 +10526,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10310,6 +10610,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10379,6 +10699,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10437,9 +10762,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10457,8 +10782,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "StaðfestingarVilla"
@@ -10497,13 +10822,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Tölvupóstur"
@@ -10514,7 +10838,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10543,36 +10872,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10594,6 +10893,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10610,16 +10914,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10636,8 +10930,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10663,11 +10957,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10693,7 +10982,7 @@ msgid "Domain"
 msgstr "Lén"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10709,12 +10998,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10735,29 +11024,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10778,7 +11047,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10825,7 +11094,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10849,6 +11117,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10934,19 +11203,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10988,22 +11266,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11136,7 +11398,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11226,7 +11487,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11276,8 +11537,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11368,7 +11629,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11395,7 +11656,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11481,7 +11742,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11494,7 +11755,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11539,8 +11800,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11548,7 +11807,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11577,12 +11836,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11689,8 +11942,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11727,7 +11982,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11863,11 +12118,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11884,7 +12134,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11907,7 +12157,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11949,13 +12199,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -12004,73 +12254,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12078,13 +12263,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12261,6 +12481,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12277,7 +12502,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12325,7 +12550,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12501,10 +12726,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12536,12 +12765,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12555,7 +12785,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12577,23 +12806,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12661,24 +12873,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12707,6 +12903,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12743,6 +12959,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12810,6 +13027,11 @@ msgstr "Tengiliðaskrá"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12899,6 +13121,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12911,7 +13134,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12942,16 +13165,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Uppfæra lista yfir Viðbætur"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13016,6 +13243,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13088,29 +13320,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13158,7 +13367,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13202,8 +13411,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13448,9 +13657,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13477,62 +13691,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13574,17 +13739,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13619,7 +13773,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13699,11 +13853,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Sími"
@@ -13718,6 +13871,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13738,6 +13896,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13774,41 +13956,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13869,40 +14016,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13991,6 +14106,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14033,34 +14163,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14083,9 +14185,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14096,7 +14198,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14122,7 +14254,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14167,7 +14299,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14200,11 +14332,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14220,8 +14351,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14336,7 +14465,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14348,7 +14477,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14381,7 +14509,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14392,8 +14520,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14419,11 +14547,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14513,7 +14636,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Land"
@@ -14580,8 +14702,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14609,7 +14735,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Aðeins er hægt að endurnefna einn dálk í einu."
@@ -14670,6 +14796,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14694,7 +14851,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14733,6 +14890,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14785,6 +14948,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14809,6 +14979,11 @@ msgstr "Kerfis uppfærsla"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14825,7 +15000,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14846,14 +15021,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14890,7 +15102,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14908,11 +15125,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14948,11 +15169,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14980,7 +15196,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14991,7 +15207,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15057,7 +15273,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15102,6 +15317,9 @@ msgstr ""
 #~ msgid "Metadata"
 #~ msgstr "Metagögn"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nafn tengiliðs"
+
 #~ msgid "Payment Term (short name)"
 #~ msgstr "Greiðslu skilmálar (stutt nafn)"
 
@@ -15145,6 +15363,9 @@ msgstr ""
 #~ msgid "Partner Addresses"
 #~ msgstr "Heimilisfang viðskiptaaðila"
 
+#~ msgid "Addresses"
+#~ msgstr "Heimilsföng"
+
 #~ msgid "description"
 #~ msgstr "lýsing"
 
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 3aad5ecfc8d..5b4d990a798 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:39+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-21 04:38+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "DateTime"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -221,70 +221,15 @@ msgstr ""
 "entrata."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"Il Customer Relationship Management generico di OpenERP\n"
-"=====================================================\n"
-"\n"
-"Questa funzionalità abilita un gruppo di persone a gestire in maniera "
-"intelligente ed efficace i leads, opportunità, incontri e telefonate.\n"
-"\n"
-"Gestisce attività cruciali quali comunicazione, identificazione, priorità, "
-"assegnazione, soluzione e notifiche.\n"
-"\n"
-"OpenERP assicura che tutti i casi siano gestiti con successo dagli utenti, "
-"clienti e fornitori. Può inviare automaticamente promemoria, intensificare "
-"la richiesta, avviare metodi specifici e tante altre azioni basate sulle "
-"regole aziendali.\n"
-"\n"
-"La cosa più importante di questo sistema è che gli utenti non devono fare "
-"nulla di speciale. Il modulo CRM ha un gestore di email per sincronizzare "
-"l'interfaccia tra le mail e OpenERP. In questo modo, gli utenti possono "
-"semplicemente inviare email al gestore della richiesta.\n"
-"\n"
-"OpenERP si attiverà per ringraziarli per il loro messagio, girandolo "
-"automaticamente al personale appropriato e assicurandosi che tutta la futura "
-"corrispondenza arrivi al posto giusto.\n"
-"\n"
-"\n"
-"La Dashboard del CRM includerà:\n"
-"-------------------------------\n"
-"* Ricavi Previsti per Stage e Utente (grafico)\n"
-"* Opportunità per Stage (grafico)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Attenzione!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -295,7 +240,7 @@ msgstr ""
 "modulo custom!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Errore nei Vincoli"
@@ -306,7 +251,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Non è possibile rinominare il campo \"%s\""
@@ -317,7 +262,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creato."
@@ -402,29 +347,6 @@ msgstr "Azienda dove salvare il record corrente"
 msgid "Max. Size"
 msgstr "Dimensione Massima"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Aggiungere informazioni addizionali all'ordine di vendita.\n"
-"====================================================\n"
-"\n"
-"Puoi aggiungere le seguenti date aggiuntive all'ordine di vendita:\n"
-"----------------------------------------------------------\n"
-"    * Data della richiesta\n"
-"    * Data dell'ordine\n"
-"    * Data effettiva\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -434,11 +356,6 @@ msgstr ""
 "ID record del database da aprire nella modalità form quando  ``view_mode`` è "
 "impostato a form solamente"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nome Contatto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -518,7 +435,7 @@ msgstr ""
 "spese di spedizione.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -557,6 +474,7 @@ msgstr "Regole Azione Automatiche"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Proprietario"
 
@@ -597,7 +515,7 @@ msgstr ""
 "ammesse, mostrate quando viene modificata la lungua."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -655,7 +573,7 @@ msgid "Netherlands Antilles"
 msgstr "Antille olandesi"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -705,9 +623,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista originale"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Idee"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -745,26 +663,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosniaco / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -776,9 +674,25 @@ msgstr ""
 "precedente."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -855,14 +769,12 @@ msgstr ""
 "{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Procedure guidate"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "I Campi personalizzati devono avere un nome che inizia con 'x_' !"
@@ -926,16 +838,14 @@ msgid "Model Description"
 msgstr "Descrizione Modello"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -971,11 +881,21 @@ msgstr "Espressione attivatrice"
 msgid "Jordan"
 msgstr "Giordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Prossima data di esecuzione pianificata per questo job."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1136,13 +1056,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Fornire il nome del campo a cui il record si riferisce per le operazioni di "
-"scrittura. Se fosse vuoto, si riferirà all'ID attivo dell'oggetto"
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nuova Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1161,7 +1077,7 @@ msgid "Email Preferences"
 msgstr "Preferenze Email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' non sembra essere una data valida per il campo '%%(field)s'"
@@ -1211,16 +1127,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Cellulare"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1317,9 +1226,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1335,12 +1273,17 @@ msgstr ""
 "seguenti gruppi."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modello Documento"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1367,7 +1310,54 @@ msgid "Username"
 msgstr "Utente"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1397,7 +1387,7 @@ msgid "Delete Access Right"
 msgstr "Cancella Diritto di Accesso"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Test connessione fallito!"
@@ -1429,14 +1419,12 @@ msgid "South Korea"
 msgstr "Corea del Sud"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transizioni"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Il record #%d di %s non è stato trovato, impossibile copiare!"
@@ -1577,7 +1565,7 @@ msgid "Marshall Islands"
 msgstr "Isole Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Modificare il modello di un campo è proibito!"
@@ -1599,7 +1587,7 @@ msgid "Search"
 msgstr "Ricerca"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1619,7 +1607,14 @@ msgid "Parent Application"
 msgstr "Funzionalità padre"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Procedure guidate"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operazione annullata"
@@ -1762,7 +1757,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Nessuna esiste lingua con il codice \"%s\""
@@ -1907,7 +1916,7 @@ msgid "On Create"
 msgstr "Alla Creazione"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1917,11 +1926,6 @@ msgstr ""
 "sono usati per riferisti ad altri modelli di dato, come in: "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Preventivi, Ordini di Vendita, Fatturazione"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -2004,7 +2008,7 @@ msgid "East Timor"
 msgstr "Timor Est"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2053,11 +2057,6 @@ msgstr ""
 "Assegna manager e diritti di accesso utente all'amministratore e solamente "
 "diritti utente all'utente Demo. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID Allegato"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2075,7 +2074,7 @@ msgstr ""
 "documenti di trasporto e altro."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2117,6 +2116,11 @@ msgstr "Veicoli, Leasing, assicurazioni, costi"
 msgid "Read Access"
 msgstr "Lettura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2196,16 +2200,11 @@ msgid "Create Tasks on SO"
 msgstr "Crea attività su Ordine acquisto"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Questa colonna contiene dati modulo e non può essere rimossa!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modello allegato"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2260,7 +2259,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Non posso rimuovere l'utente root"
@@ -2284,11 +2283,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -2300,7 +2299,6 @@ msgstr "Modello di piano dei conti"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo Indirizzo"
 
@@ -2338,11 +2336,6 @@ msgstr "Percorso completo"
 msgid "The next step depends on the file format:"
 msgstr "Il prossimo passo dipenderà dal formato del file:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Idee"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2483,6 +2476,11 @@ msgstr "Numero di moduli aggiornati"
 msgid "Method"
 msgstr "Metodo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2516,13 +2514,18 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 "Nessun record trovato per %(field_type)s '%(value)s' nel campo '%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2573,6 +2576,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Aggiungi o meno l'intestazione aziendale RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2626,7 +2638,7 @@ msgstr ""
 "'form', 'tree', 'calendar', ... (Default: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2723,7 +2735,6 @@ msgstr "São Tomé e Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Fattura"
 
@@ -2783,11 +2794,6 @@ msgstr ""
 "    * Data\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Slogan azienda"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2918,9 +2924,20 @@ msgid "Default limit for the list view"
 msgstr "Limite Predefinito per la vista 'Lista'"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nuova Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3001,7 +3018,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "Trovati record multipli in base al campo '%%(field)s' (%d trovati)"
@@ -3060,6 +3077,19 @@ msgstr "Mappatura Campi"
 msgid "Export Translations"
 msgstr "Esporta traduzioni"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3068,7 +3098,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Spiacente, non avete i diritti di accesso a questo documento."
@@ -3154,7 +3184,7 @@ msgid "Inherited"
 msgstr "Ereditato"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "sì"
@@ -3184,7 +3214,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' non sembra un campo intero '%%(field)s'"
@@ -3251,22 +3281,22 @@ msgid "LinkedIn Integration"
 msgstr "Integrazione con LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Architettura oggetto non valida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -3365,12 +3395,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Attenzione: non puoi creare aziende ricorsive"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3389,17 +3419,19 @@ msgstr ""
 "report statistici."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3409,7 +3441,7 @@ msgid "Params storage"
 msgstr "Parametri deposito"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Impossibile aggiornare il modulo '%s'. Non è installato.,"
@@ -3460,34 +3492,6 @@ msgstr "Parametri di configurazione"
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3526,7 +3530,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Documento(i) mancante"
@@ -3538,6 +3542,34 @@ msgstr "Documento(i) mancante"
 msgid "Bank Account Type"
 msgstr "Tipo Conto Bancario"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3576,7 +3608,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3616,7 +3648,7 @@ msgid "Access Controls"
 msgstr "Controlli Accesso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3646,32 +3678,6 @@ msgstr "Azienda Principale"
 msgid "Web Icon File (hover)"
 msgstr "File icona web (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3691,9 +3697,13 @@ msgstr ""
 "Se si utilizza una formula, utilizzare una espressione python usando la "
 "variabile 'object'"
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Attenzione: non puoi creare aziende ricorsive"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Data di Nascita"
 
@@ -3709,7 +3719,7 @@ msgid "Products Manufacturers"
 msgstr "Produttore"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Modalità SMTP-over-SSL non disponibile"
@@ -3819,7 +3829,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4012,7 +4022,6 @@ msgstr "Reportistica"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Qualifica"
@@ -4024,13 +4033,18 @@ msgstr ""
 "Se non impostato, sarà usato come valore di default per le nuove risorse"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Ricorsività scoperta."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Errore di ricorsione delle dipendenze dei moduli !"
@@ -4090,9 +4104,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Accesso negato"
@@ -4103,7 +4118,7 @@ msgid "Company Name"
 msgstr "Nome Azienda"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4124,16 +4139,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (deprecato - usare Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"Il codice lingua per la traduzione elemento deve essere tra le lingue "
-"conosciute"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Registra Regole"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre e Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4174,17 +4210,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Permetti accessi anonimi a OpenERP.\n"
-"=====================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4232,26 +4260,7 @@ msgid "Paper Format"
 msgstr "Formato Carta"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-"\n"
-"Questo modulo aggiorna i memo dentro OpenERP per utilizzare un pad esterno\n"
-"===================================================================\n"
-"\n"
-"Usato per aggiornare i memo tetuali in tempo reale con i sequenti utenti che "
-"avete intivato.\n"
-"\n"
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4271,7 +4280,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "Reg"
@@ -4322,7 +4331,7 @@ msgid "Email Gateway"
 msgstr "Server email"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4343,9 +4352,43 @@ msgid "Technical Data"
 msgstr "Informazioni Tecniche"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4401,13 +4444,18 @@ msgstr "Timesheet su problematica"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Architettura non valida!"
@@ -4423,9 +4471,9 @@ msgid "Share any Document"
 msgstr "Condividi qualsiasi documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Leads, Opportunità, Telefonate"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Gruppo richiesto"
 
 #. module: base
 #: view:res.lang:0
@@ -4486,33 +4534,10 @@ msgid "Languages"
 msgstr "Lingue"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4590,7 +4615,6 @@ msgstr "Vincolo"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Predefinito"
 
@@ -4665,6 +4689,11 @@ msgstr ""
 "alta viene utilizzato. La priorità di default è 10 (numero piccolo = alta "
 "priorità)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4728,9 +4757,16 @@ msgid "Default value or action reference"
 msgstr "Valore di default nella azione di riferimento"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4814,6 +4850,22 @@ msgstr "Carica una traduzione"
 msgid "Installed Version"
 msgstr "Versione installata"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4840,6 +4892,43 @@ msgstr ""
 "Se il campo è lasciato vuoto, OpenERP calcola la visibilità basandosi sugli "
 "accessi di lettura del relativo oggetto"
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4869,6 +4958,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4946,12 +5041,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4966,7 +5055,6 @@ msgstr "Contabilità - Svizzera"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "CAP"
@@ -4977,13 +5065,18 @@ msgstr "CAP"
 msgid "Author"
 msgstr "Autore"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Imposta come \"da fare\""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Rappresentazione appropriata della data e dell'ora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5029,6 +5122,8 @@ msgstr "Direzione"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Visualizzazioni"
 
@@ -5044,7 +5139,7 @@ msgid "SMTP Server"
 msgstr "Server SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5141,7 +5236,12 @@ msgid "Google Docs integration"
 msgstr "Integrazione Google Docs"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "nome"
@@ -5229,7 +5329,7 @@ msgid "System Configuration Done"
 msgstr "Configurazione di sistema completata"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Si è verificato un errore durante la convalida dei campi %s: %s"
@@ -5344,6 +5444,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Accesso completo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5357,7 +5462,7 @@ msgid "Portuguese / Português"
 msgstr "Portoghese / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5369,7 +5474,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Solamente se questo conto bancario appartiene alla tua azienda."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "Sottocampo sconosciuto \"%s\""
@@ -5401,6 +5506,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungheria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5568,7 +5684,7 @@ msgid "Account Owner Name"
 msgstr "Nome intestatario conto"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5585,16 +5701,11 @@ msgid "Decimal Separator"
 msgstr "Separatore Decimale"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Valore obbligatorio mancante per il campo '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5641,9 +5752,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "Model opzionale, solitamente usato per needactions."
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creatore"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Il nome del modulo deve essere unico!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5706,15 +5818,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5730,6 +5833,11 @@ msgstr "Avvia wizard di configurazione"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Ordini di produzione, distinte base, routings"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nome Allegato"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5813,6 +5921,12 @@ msgstr "Kazakistan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Numero del giorno della settiamana [0(domenica),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nome Risorsa"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6070,7 +6184,7 @@ msgid "title"
 msgstr "Titolo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "vero"
@@ -6127,6 +6241,15 @@ msgstr "Prodotti"
 msgid "User-defined Defaults"
 msgstr "Valori predefiniti per utente"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6248,13 +6371,15 @@ msgid "Bank Type"
 msgstr "Tipo Conto"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Il nome del gruppo non può iniziare con '-'"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Apps"
 
@@ -6274,7 +6399,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6309,10 +6434,9 @@ msgid "Uncategorized"
 msgstr "Senza Categoria"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nome Risorsa"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6348,6 +6472,11 @@ msgstr ""
 "client, il segnale verifica il nome del tasto premuto. Se il segnale e NULL, "
 "nessun tasto è stato premuto per validare la trasazione."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista originale"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6362,7 +6491,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' non sempre essere un numero valido per il campo '%%(field)s'"
@@ -6380,26 +6509,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mie banche"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6532,11 +6641,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Reimposta Password"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6548,8 +6652,8 @@ msgid "Malaysia"
 msgstr "Malesia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "Il numero di incremento deve essere zero"
@@ -6670,7 +6774,7 @@ msgstr ""
 "risorse umane (permessi, timesheet, ...) se viene collegato ad un dipendente."
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Non è stata definita una vista di tipo '%s' per la struttura!"
@@ -6708,7 +6812,7 @@ msgid "Created Menus"
 msgstr "Menu Creati"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6735,9 +6839,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Imposta come \"da fare\""
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6769,6 +6901,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Anno corrente senza il secolo: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6811,7 +6950,7 @@ msgid "Audit Trail"
 msgstr "Audit Trail"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6903,7 +7042,7 @@ msgid "Israel"
 msgstr "Israele"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "Impossibile duplicare la configurazione!"
@@ -6923,23 +7062,6 @@ msgstr "A volte chiamato BIC o Swift"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Cellulare"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6972,10 +7094,10 @@ msgstr "Report XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduli"
 
@@ -7049,9 +7171,9 @@ msgid "United Kingdom"
 msgstr "Regno Unito"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7076,8 +7198,8 @@ msgid "Partner Titles"
 msgstr "Qualifiche Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Usa il formato '%s'"
@@ -7125,7 +7247,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7135,11 +7257,6 @@ msgstr ""
 "record non è permessa per questo oggetto dal momento che questo oggetto è "
 "per scopi di reportistica."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anonimo"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7249,6 +7366,13 @@ msgstr "File del modulo importato con successo!"
 msgid "Model Constraints"
 msgstr "Vincoli model"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transizioni"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7345,7 +7469,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Stato fed."
@@ -7446,12 +7569,6 @@ msgstr "Nome Completo"
 msgid "on"
 msgstr "il"
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7493,6 +7610,7 @@ msgstr "Su multipli doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7550,7 +7668,7 @@ msgid "Connection Security"
 msgstr "Sicurezza connessione"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Per favore specificare una azione da lanciare !"
@@ -7570,6 +7688,11 @@ msgstr "Nome Categoria"
 msgid "Northern Mariana Islands"
 msgstr "Isole Marianne Settentrionali"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7581,7 +7704,7 @@ msgid "Intrastat Reporting"
 msgstr "Report Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7590,6 +7713,11 @@ msgstr ""
 "Prego utilizzare il wizard di modifica password (in Preferenze utente o Menu "
 "utente) per la modificare la propria password."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7620,7 +7748,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Campi insufficienti per una vista calendario!"
@@ -7668,7 +7796,6 @@ msgstr "Transizione"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7688,30 +7815,30 @@ msgid "Child Categories"
 msgstr "Categorie Secondarie"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Errore"
@@ -7799,6 +7926,11 @@ msgstr "Definizione regola (filtro dominio)"
 msgid "This Window"
 msgstr "Questa Finestra"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7884,6 +8016,21 @@ msgstr "Campi"
 msgid "Employees"
 msgstr "Impiegati"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7913,11 +8060,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Prova Connessione"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Indirizzi"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7942,7 +8084,6 @@ msgstr "Opzioni selezione"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Indirizzo"
@@ -7953,9 +8094,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Genitore destra"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8033,7 +8189,7 @@ msgid "Change My Preferences"
 msgstr "Cambia le Mie Preferenze"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nome di modulo non valido nella definizione dell'azione."
@@ -8120,14 +8276,16 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -8136,7 +8294,7 @@ msgid "Company Bank Accounts"
 msgstr "Conti bancari aziendali"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Non è permesso impostare password vuote per motivi di sicurezza!"
@@ -8147,13 +8305,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Password opzionale per l'autenticazione SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Siamo spiacenti, non è possibile modificare questo documento."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8175,12 +8333,13 @@ msgid "Normal Bank Account"
 msgstr "Conto bancario standard"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Procedura guidata"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "id database"
@@ -8353,7 +8512,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8384,14 +8543,6 @@ msgstr "Pad per attività"
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Attenzione!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8415,7 +8566,6 @@ msgstr "Scorciatoie web"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8533,7 +8683,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8850,7 +9000,7 @@ msgid "Update Modules List"
 msgstr "Aggiorna Lista Moduli"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8864,7 +9014,7 @@ msgid "eInvoicing"
 msgstr "Fatturazione elettronica"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8878,7 +9028,7 @@ msgstr ""
 "una altra azienda. (Puoi cliccare su Cancella nelle Preferenze Utente ora)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8893,6 +9043,17 @@ msgstr "Continua"
 msgid "Thai / ภาษาไทย"
 msgstr "Thailandia"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8932,7 +9093,7 @@ msgid "Mexico"
 msgstr "Messico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8954,15 +9115,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nome Allegato"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"Il codice lingua per la traduzione elemento deve essere tra le lingue "
+"conosciute"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8986,7 +9149,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nome del mese abbreviato"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8998,7 +9161,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Fornitore"
@@ -9076,7 +9238,7 @@ msgid "Selectable"
 msgstr "Selezionabile"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -9104,8 +9266,8 @@ msgid "Iteration"
 msgstr "Iterazione"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "ErroreUtente"
@@ -9129,7 +9291,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9278,7 +9440,7 @@ msgid "Reunion (French)"
 msgstr "La Réunion"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9319,8 +9481,8 @@ msgid "Solomon Islands"
 msgstr "Isole Salomone"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Errore in Accesso"
@@ -9394,7 +9556,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9408,7 +9570,7 @@ msgid "Ukraine"
 msgstr "Ucraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9471,6 +9633,11 @@ msgstr "Fasi"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9569,9 +9736,9 @@ msgid "Custom Shortcuts"
 msgstr "Scorciatoie personalizzate"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9599,13 +9766,13 @@ msgid "Models"
 msgstr "Modelli"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9626,7 +9793,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9674,7 +9841,7 @@ msgid "On Delete"
 msgstr "All'eliminazione"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Il modello %s non esiste!"
@@ -9720,6 +9887,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9728,7 +9896,7 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9747,6 +9915,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9782,7 +9987,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "id esterno"
@@ -9834,6 +10039,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Ora (12 ore) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9876,23 +10086,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9926,7 +10124,7 @@ msgid "Products Expiry Date"
 msgstr "Data scadenza prodotto"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Cliccare 'Continua' per configurare il prossimo modulo..."
@@ -10019,6 +10217,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10227,7 +10430,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campagne di marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10238,13 +10441,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unità di Intervallo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tipo"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Questo metodo non esiste più"
@@ -10420,7 +10628,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10455,6 +10663,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10480,6 +10693,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10569,7 +10787,6 @@ msgstr "%m - Numero mese [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Città"
@@ -10605,13 +10822,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Fornire il nome del campo a cui il record si riferisce per le operazioni di "
+"scrittura. Se fosse vuoto, si riferirà all'ID attivo dell'oggetto"
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 o versione successiva"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10673,19 +10899,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10699,6 +10950,8 @@ msgid "Activity"
 msgstr "Attività"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10717,7 +10970,12 @@ msgid "Parent Company"
 msgstr "Azienda Principale"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10729,13 +10987,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10822,6 +11073,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10893,6 +11164,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipo di sequenze"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10953,9 +11229,9 @@ msgstr ""
 "Disattiva il linguaggio prima di eliminarlo."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10973,8 +11249,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema nella configurazione 'Record Id' nell'azione del Server!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ErroreConvalida"
@@ -11015,13 +11291,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -11032,7 +11307,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11063,36 +11343,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11114,6 +11364,11 @@ msgstr "Altro proprietario"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "Workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11132,16 +11387,6 @@ msgstr ""
 "Impossibile eliminare il linguaggio che corrisponde al Linguaggio Preferito "
 "dell'Utente"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11158,9 +11403,9 @@ msgid "Cascade"
 msgstr "A Cascata"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Gruppo richiesto"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Leads, Opportunità, Telefonate"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11185,11 +11430,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11215,7 +11455,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11231,12 +11471,12 @@ msgid "State Name"
 msgstr "Nome Stato"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11257,30 +11497,10 @@ msgid "Timezone"
 msgstr "Fuso orario"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11300,7 +11520,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11354,7 +11574,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Indirizzo 2"
 
@@ -11378,6 +11597,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11463,19 +11683,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Errore di integrità"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "Workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "La dimensione del campo non può mai essere minore a 1 !"
@@ -11517,22 +11746,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argomenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11665,7 +11878,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11755,7 +11967,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11805,8 +12017,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11897,7 +12109,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11924,7 +12136,7 @@ msgid "Object"
 msgstr "Oggetto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12013,7 +12225,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12028,7 +12240,7 @@ msgid "User Ref."
 msgstr "Rif. Utente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -12073,8 +12285,6 @@ msgstr "Guida di Riferimento"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12082,7 +12292,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12111,12 +12321,6 @@ msgstr "Isole Falkland/Malvine"
 msgid "Lebanon"
 msgstr "Libano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12223,8 +12427,10 @@ msgid "Selection"
 msgstr "Selezione"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -12261,7 +12467,7 @@ msgid "Action Type"
 msgstr "Tipo Azione"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12400,11 +12606,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Formato Orario 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Deseleziona il campo attivo per nascondere il contatto."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12421,7 +12622,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Attributo sconosciuto %s in %s "
@@ -12444,7 +12645,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Metodo get non definito !"
@@ -12485,16 +12686,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "File binario o URL esterno"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Cambia password"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12541,92 +12742,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Il formato del separatore dovrebbe essere [,n] dove 0 < n:a partire "
-"dall'unità. -1 terminerà la separazione. Ad esempio [3,2,-1] rappresenterà "
-"106500 come 1,06,500;[1,2,-1] lo rappresenterà come 106,50,0;[3] lo "
-"rappresenterà come 106,500. Utilizzando ',' come separatore delle migliaia "
-"in ciascun caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Funzionalità tecniche"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12820,6 +12986,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12836,7 +13007,7 @@ msgid "Body"
 msgstr "Testo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12887,7 +13058,7 @@ msgid "choose"
 msgstr "Scegli"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13064,10 +13235,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13099,12 +13274,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13120,7 +13296,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Varie"
@@ -13142,23 +13317,6 @@ msgstr ""
 msgid "China"
 msgstr "Cina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13230,25 +13388,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13276,6 +13418,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13312,6 +13474,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "Sconosciuto"
@@ -13379,6 +13542,11 @@ msgstr "Rubrica"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13468,6 +13636,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13480,7 +13649,7 @@ msgid "Information"
 msgstr "Informazioni"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13511,16 +13680,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Genitore destra"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Aggiorna lista moduli"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13587,6 +13760,11 @@ msgstr ""
 "Il campo osv_memory può essere paragonato utilizzando i soli operatori: = "
 "oppure !="
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13659,29 +13837,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13729,7 +13884,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13773,9 +13928,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Registra Regole"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14021,9 +14176,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14050,63 +14210,14 @@ msgid "System Configuration done"
 msgstr "Configurazione sistema completata"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks e Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14147,17 +14258,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14192,7 +14292,7 @@ msgid "Low"
 msgstr "Bassa"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Errore! Non è possibile creare un menù ricorsivo."
@@ -14274,11 +14374,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefono"
@@ -14293,6 +14392,11 @@ msgstr "Menu Accesso"
 msgid "Thailand"
 msgstr "Thailandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14313,6 +14417,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanian / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14349,41 +14477,6 @@ msgstr "Relazione Oggetto"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14444,40 +14537,8 @@ msgid "Apply for Write"
 msgstr "Salva per Scrivere"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14572,6 +14633,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Visualizza Auto-Caricamento"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14614,34 +14690,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14664,9 +14712,9 @@ msgid "Unmet dependency !"
 msgstr "Dipendenza non trovata!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14677,7 +14725,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14703,7 +14781,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14748,7 +14826,7 @@ msgid "Access"
 msgstr "Accesso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14781,11 +14859,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14801,8 +14878,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14917,7 +14992,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14929,7 +15004,6 @@ msgstr "Giamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14967,7 +15041,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14978,8 +15052,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Avviso"
@@ -15005,11 +15079,6 @@ msgstr "Isole Vergini (Gran Bretagna)"
 msgid "Parameters"
 msgstr "Parametri"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre e Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15099,7 +15168,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Nazione"
@@ -15170,9 +15238,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Il formato del separatore dovrebbe essere [,n] dove 0 < n:a partire "
+"dall'unità. -1 terminerà la separazione. Ad esempio [3,2,-1] rappresenterà "
+"106500 come 1,06,500;[1,2,-1] lo rappresenterà come 106,50,0;[3] lo "
+"rappresenterà come 106,500. Utilizzando ',' come separatore delle migliaia "
+"in ciascun caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15199,7 +15276,7 @@ msgid "Japan"
 msgstr "Giappone"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Si può rinominare una sola colonna per volta!"
@@ -15260,6 +15337,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15284,7 +15392,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Da notare che questa operazione può richiedere qualche minuto."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15323,6 +15431,12 @@ msgstr "Esecuzione"
 msgid "Condition"
 msgstr "Condizione"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15377,6 +15491,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croazia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15401,6 +15522,11 @@ msgstr "Aggiornamento del sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15417,7 +15543,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15438,15 +15564,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Informazioni Generali"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks e Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15484,7 +15647,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Messaggio di warning per il Cambiamento dell'Azienda"
@@ -15502,11 +15670,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Il prossimo numero della sequenza sarà incrementato di questo numero"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funzione"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15542,11 +15714,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Consegna"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15574,7 +15741,7 @@ msgid "Workflow Instances"
 msgstr "Istanze Workflow"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partners: "
@@ -15585,7 +15752,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15651,7 +15818,6 @@ msgstr "Nome esportato"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15714,6 +15880,9 @@ msgstr "Iscrizione"
 #~ msgid "On multiple doc."
 #~ msgstr "Su documenti multipli"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nome Contatto"
+
 #~ msgid "Select Action Type"
 #~ msgstr "Selezionare il Tipo di Azione"
 
@@ -15743,6 +15912,9 @@ msgstr "Iscrizione"
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID Allegato"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Nome Trigger"
 
@@ -15836,6 +16008,9 @@ msgstr "Iscrizione"
 #~ msgid "SXW path"
 #~ msgstr "Percorso SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Creatore"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15992,6 +16167,9 @@ msgstr "Iscrizione"
 #~ msgid "Load an Official Translation"
 #~ msgstr "Carica una Traduzione Ufficiale"
 
+#~ msgid "Delivery"
+#~ msgstr "Consegna"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Società di servizi Open Source"
 
@@ -16001,6 +16179,9 @@ msgstr "Iscrizione"
 #~ msgid "Type fields"
 #~ msgstr "Campi di Inserimento"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Deseleziona il campo attivo per nascondere il contatto."
+
 #~ msgid "Modules to update"
 #~ msgstr "Moduli da Aggiornare"
 
@@ -16288,6 +16469,9 @@ msgstr "Iscrizione"
 #~ "Numero di partita IVA. Selezionare la casella se il partner è soggetto a "
 #~ "IVA. Utilizzato nelle dichiarazioni IVA"
 
+#~ msgid "Addresses"
+#~ msgstr "Indirizzi"
+
 #~ msgid "Start Configuration"
 #~ msgstr "Avvia Configurazione"
 
@@ -16386,6 +16570,9 @@ msgstr "Iscrizione"
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Digitare 0 se l'azione deve apparire su tutte le risorse."
 
+#~ msgid "Attached Model"
+#~ msgstr "Modello allegato"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Impostazione dominio"
 
@@ -16642,6 +16829,9 @@ msgstr "Iscrizione"
 #~ msgid "Emails"
 #~ msgstr "Email"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "File binario o URL esterno"
+
 #~ msgid "Consumers"
 #~ msgstr "Clienti"
 
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 43700d8df2f..d68f497e16f 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-09-20 05:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:57+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "日時"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -188,41 +188,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "警告"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -230,7 +204,7 @@ msgid ""
 msgstr "この方法では基本項目の属性を置き換えることはできません。Pythonコードやむしろカスタムアドオンを通してそれを修正して下さい。"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "制約エラー"
@@ -241,7 +215,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "スパース項目 %s のりネームは許されていません。"
@@ -252,7 +226,7 @@ msgid "Swaziland"
 msgstr "スワジランド"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "作成済"
@@ -331,20 +305,6 @@ msgstr "会社を現在のレコードに保存します。"
 msgid "Max. Size"
 msgstr "最大サイズ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -352,11 +312,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "連絡先名"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -421,7 +376,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -458,6 +413,7 @@ msgstr "自動化アクションのルール"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "所有者"
 
@@ -496,7 +452,7 @@ msgid ""
 msgstr "日付 / 時間の書式が不正です。編集する際に表示されたリストを参照して下さい。"
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -550,7 +506,7 @@ msgid "Netherlands Antilles"
 msgstr "オランダ領アンチル"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -590,9 +546,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "オリジナルビュー"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "アイデア"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -617,26 +573,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "ボスニア語 / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -645,9 +581,25 @@ msgid ""
 msgstr "ここをチェックした場合、ユーザが同じ名前で２回目も印刷した時は、１回前のレポートを返します。"
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "アンゴラ"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -722,14 +674,12 @@ msgid ""
 msgstr "Pythonのコンテキスト辞書においてデフォルトの空は（デフォルト: {}）"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "ウィザード"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "カスタム項目は、'x_' で始まる名前を持つ必要があります。"
@@ -793,17 +743,21 @@ msgid "Model Description"
 msgstr "モデルの説明"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"マーケティングメニュー\n"
+"===================\n"
+"\n"
+"マーケティング関連のモジュールのインストーラを含んでいます。\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -831,11 +785,21 @@ msgstr "トリガー式"
 msgid "Jordan"
 msgstr "ヨルダン"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "このジョブの次に実行予定のデータ"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -966,11 +930,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr "レコードIDとして書き込み操作のための項目名を指定して下さい。指定されない場合は、オブジェクトのアクティブIDとなります。"
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "パプアニューギニア"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -988,7 +950,7 @@ msgid "Email Preferences"
 msgstr "Eメール設定"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1036,16 +998,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "スペイン語（ウルグアイ）/ Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "携帯電話"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1151,9 +1106,38 @@ msgid "Mongolia"
 msgstr "モンゴル"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1167,12 +1151,17 @@ msgid ""
 msgstr "このグループに加えられたユーザは自動的に次のグループにも加えられます。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1199,7 +1188,54 @@ msgid "Username"
 msgstr "ユーザ名"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1229,7 +1265,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "接続テストが失敗しました。"
@@ -1261,14 +1297,12 @@ msgid "South Korea"
 msgstr "韓国"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "遷移"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "レコード#%d が見つかりません（%s ）。コピーはできません。"
@@ -1403,7 +1437,7 @@ msgid "Marshall Islands"
 msgstr "マーシャル諸島"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "項目のモデルを変更することは禁じられています。"
@@ -1425,7 +1459,7 @@ msgid "Search"
 msgstr "検索"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1443,7 +1477,14 @@ msgid "Parent Application"
 msgstr "パートナアプリケーション"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "ウィザード"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "操作はキャンセルされました。"
@@ -1571,7 +1612,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "コード %s を持つ言語が存在しません。"
@@ -1686,7 +1741,7 @@ msgid "On Create"
 msgstr "作成時"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1695,11 +1750,6 @@ msgstr ""
 "%s には余分なドットが含まれています。XMLのIDはドットを含んではいけません。 これらは module.reference_id "
 "のように、他のモジュールデータに指し示すために使われます。"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1780,7 +1830,7 @@ msgid "East Timor"
 msgstr "東ティモール"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1821,11 +1871,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "添付ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1840,7 +1885,7 @@ msgid ""
 msgstr "迅速な販売のコード化、単純化された支払モードのコード化、自動集荷リストの生成などにより、販売時点管理のために大いなる手助けをします。"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1881,6 +1926,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "読み込みアクセス"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1957,16 +2007,11 @@ msgid "Create Tasks on SO"
 msgstr "タスク作成（受注オーダー）"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "添付モデル"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2021,7 +2066,7 @@ msgid "Formula"
 msgstr "式"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "rootユーザは取り除くことはできません。"
@@ -2052,11 +2097,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s（コピー）"
@@ -2068,7 +2113,6 @@ msgstr "勘定科目表のテンプレート"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "アドレスの種類"
 
@@ -2106,11 +2150,6 @@ msgstr "フルパス"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "アイデア"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2243,6 +2282,11 @@ msgstr "複数のモジュールが更新されました。"
 msgid "Method"
 msgstr "メソッド"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2276,12 +2320,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2329,6 +2378,15 @@ msgstr "ベリーズ"
 msgid "Add or not the corporate RML header"
 msgstr "会社のRMLヘッダーを追加するか否か"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2380,7 +2438,7 @@ msgid ""
 msgstr "'form'、'tree'、'calendar'など（デフォルト：tree、form）のような表示モードの許されたカンマ区切りのリスト"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "このドキュメントはあなたの前回参照時から更新されています（%s：%d）"
@@ -2468,7 +2526,6 @@ msgstr "サントメ・プリンシペ"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "請求書"
 
@@ -2515,11 +2572,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2642,9 +2694,20 @@ msgid "Default limit for the list view"
 msgstr "リストビューのデフォルト上限"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "パプアニューギニア"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2722,7 +2785,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2781,6 +2844,19 @@ msgstr "項目マッピング"
 msgid "Export Translations"
 msgstr "翻訳のエクスポート"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2789,7 +2865,7 @@ msgid "Manager"
 msgstr "マネジャ"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2875,7 +2951,7 @@ msgid "Inherited"
 msgstr "継承"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2905,7 +2981,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2970,22 +3046,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "無効なオブジェクトアーキテクチャです。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "エラー"
@@ -3080,12 +3156,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3102,19 +3178,32 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"これはOpenERPのポーランド用の会計表と税金の管理モジュールです。\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3122,7 +3211,7 @@ msgid "Params storage"
 msgstr "ストレージのパラメータ"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "モジュール %s はインストールされていないためアップグレードできません。"
@@ -3173,34 +3262,6 @@ msgstr "構成のパラメータ"
 msgid "Invalid arguments"
 msgstr "無効な引数"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3239,7 +3300,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3251,6 +3312,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "銀行口座タイプ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3287,7 +3376,7 @@ msgid "Signal (subflow.*)"
 msgstr "シグナル（サブフロー.*）"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3322,7 +3411,7 @@ msgid "Access Controls"
 msgstr "アクセスコントロール"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3350,32 +3439,6 @@ msgstr "主要な会社"
 msgid "Web Icon File (hover)"
 msgstr "Webアイコンファイル（hover）"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3393,9 +3456,13 @@ msgid ""
 "'object'."
 msgstr "式表現を使う場合は、可変的な'object'によるPython表現を使って下さい。"
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "生年月日"
 
@@ -3411,7 +3478,7 @@ msgid "Products Manufacturers"
 msgstr "製品製造者"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSLモードは利用可能ではありません。"
@@ -3526,7 +3593,7 @@ msgid "Malta"
 msgstr "マルタ"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3715,7 +3782,6 @@ msgstr "レポート"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "役職"
@@ -3726,13 +3792,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "セットされない場合、デフォルト値を仮定します。"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "再帰状態を検出しました。"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "モジュールの依存関係による再帰エラー。"
@@ -3792,9 +3863,10 @@ msgid "Urdu / اردو"
 msgstr "ウルドゥー語 / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3805,7 +3877,7 @@ msgid "Company Name"
 msgstr "会社名"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3824,14 +3896,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML（推奨しない - レポートの使用）"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "翻訳項目の言語コードは周知の言語でなければいけません。"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "レコード規則"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "サンピエール島・ミクロン島"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3860,12 +3955,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3914,19 +4005,7 @@ msgid "Paper Format"
 msgstr "用紙書式"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3946,7 +4025,7 @@ msgid "Nauru"
 msgstr "ナウル"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3997,7 +4076,7 @@ msgid "Email Gateway"
 msgstr "Eメールゲートウェイ"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4018,8 +4097,42 @@ msgid "Technical Data"
 msgstr "技術データ"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4076,13 +4189,18 @@ msgstr "問題事項のタイムシート"
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "無効なアーキテクチャです。"
@@ -4098,9 +4216,9 @@ msgid "Share any Document"
 msgstr "ドキュメント共有"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "グループは必須です。"
 
 #. module: base
 #: view:res.lang:0
@@ -4160,33 +4278,10 @@ msgid "Languages"
 msgstr "言語"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4272,7 +4367,6 @@ msgstr "制約"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "デフォルト"
 
@@ -4344,6 +4438,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr "メールサーバを特に指定しないメールは最も高い優先度が使われます。デフォルトの優先度は10（より小さい番号がより高い優先度）。"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4405,9 +4504,16 @@ msgid "Default value or action reference"
 msgstr "デフォルト値またはアクションリファレンス"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "スリナム"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4487,6 +4593,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4512,6 +4634,43 @@ msgstr ""
 "グループを持つ場合、このメニューはそのグループを基にした表示となります。この項目が空の場合は、OpenERPは関連するオブジェクトの読み込み権限を基にした"
 "表示を行います。"
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4539,6 +4698,12 @@ msgstr "選択した言語のインストールに成功しました。ユーザ
 msgid "View"
 msgstr "ビュー"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4616,12 +4781,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4636,7 +4795,6 @@ msgstr "スイス - 会計"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "郵便番号"
@@ -4647,13 +4805,18 @@ msgstr "郵便番号"
 msgid "Author"
 msgstr "著者"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "ToDoとしてセット"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - 日付と時間表示の割当"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4699,6 +4862,8 @@ msgstr "指示"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "ビュー"
 
@@ -4714,7 +4879,7 @@ msgid "SMTP Server"
 msgstr "SMTP サーバ"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "インストールされるかインストール予定のモジュールを削除しようとしています。"
@@ -4810,7 +4975,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4898,7 +5068,7 @@ msgid "System Configuration Done"
 msgstr "システム設定完了"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "項目の検証中にエラーが発生しました %s： %s"
@@ -5025,6 +5195,11 @@ msgstr "モーリシャス"
 msgid "Full Access"
 msgstr "フルアクセス"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5038,7 +5213,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "システムに保存されている項目%s は変更が許されていません。"
@@ -5049,7 +5224,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "この銀行口座があなたの会社に属している場合に限り"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5081,6 +5256,17 @@ msgstr "セネガル"
 msgid "Hungary"
 msgstr "ハンガリー"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5244,7 +5430,7 @@ msgid "Account Owner Name"
 msgstr "口座所有者名"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "既にそのカラムは存在しています。列のリネームはできません %s。"
@@ -5260,16 +5446,11 @@ msgid "Decimal Separator"
 msgstr "10進数のセパレータ"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5313,9 +5494,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "作成者"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "モジュール名は固有でなければなりません。"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5378,15 +5560,6 @@ msgstr "ベネズエラ"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5402,6 +5575,11 @@ msgstr "起動設定ウィザード"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "添付ファイル名"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5485,6 +5663,12 @@ msgstr "カザフスタン"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w－曜日番号 [0(日曜),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "リソース名"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5735,7 +5919,7 @@ msgid "title"
 msgstr "タイトル"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5792,6 +5976,15 @@ msgstr "製品"
 msgid "User-defined Defaults"
 msgstr "ユーザに定義されたデフォルト"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5907,13 +6100,15 @@ msgid "Bank Type"
 msgstr "銀行タイプ"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "グループ名は\"-\"で始めることはできません。"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "アプリ"
 
@@ -5933,7 +6128,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "グジャラート語 / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5966,10 +6161,9 @@ msgid "Uncategorized"
 msgstr "未分類"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "リソース名"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6004,6 +6198,11 @@ msgstr ""
 "遷移の操作が顧客フォームの中のボタンが押されたことで発生するなら、シグナルは押された名前のボタンをテストします。シグナルがNULLであれば、この遷移を有効"
 "にするためにはどのボタンも必要ではありません。"
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "オリジナルビュー"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6014,7 +6213,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6030,26 +6229,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "私の銀行"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6182,11 +6361,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6198,8 +6372,8 @@ msgid "Malaysia"
 msgstr "マレーシア"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6307,7 +6481,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "構造のために定義されたビューのタイプ %s がありません。"
@@ -6347,7 +6521,7 @@ msgid "Created Menus"
 msgstr "作成済メニュー"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6374,9 +6548,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "ToDoとしてセット"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6408,6 +6610,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "世紀なしの現在年： %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6456,7 +6665,7 @@ msgid "Audit Trail"
 msgstr "監査証跡"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6548,7 +6757,7 @@ msgid "Israel"
 msgstr "イスラエル"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6568,29 +6777,6 @@ msgstr "時々、BICあるいはSwiftと呼ばれます。"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "携帯電話"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"このモジュールはOpenERPのメキシコのための会計表を管理します。\n"
-"========================================================================\n"
-"\n"
-"メキシコの会計表とローカル化\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6623,10 +6809,10 @@ msgstr "レポートXML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "モジュール"
 
@@ -6700,8 +6886,8 @@ msgid "United Kingdom"
 msgstr "イギリス"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6725,8 +6911,8 @@ msgid "Partner Titles"
 msgstr "パートナのタイトル"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6774,18 +6960,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr "あなたはこの操作を実行できません。このオブジェクトは報告目的のオブジェクトであるため新しいレコード作成はできません。"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6890,6 +7071,13 @@ msgstr "モジュールファイルのインポートが成功しました。"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "遷移"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6984,7 +7172,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "都道府県"
@@ -7085,12 +7272,6 @@ msgstr "氏名"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "モジュール名は固有でなければなりません。"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7132,6 +7313,7 @@ msgstr "多数のドキュメント上に"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7189,7 +7371,7 @@ msgid "Connection Security"
 msgstr "接続セキュリティ"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "起動するためのアクションを指定して下さい。"
@@ -7209,6 +7391,11 @@ msgstr "分類名"
 msgid "Northern Mariana Islands"
 msgstr "北マリアナ諸島"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7220,13 +7407,18 @@ msgid "Intrastat Reporting"
 msgstr "イントラスタット報告"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr "あなた自身のパスワードを変更をするには、パスワード変更ウィザード（ユーザ設定またはユーザメニューの中の）を利用して下さい。"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7257,7 +7449,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "カレンダービューの不十分な項目があります。"
@@ -7303,7 +7495,6 @@ msgstr "遷移"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7323,30 +7514,30 @@ msgid "Child Categories"
 msgstr "子分類"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "エラー"
@@ -7434,6 +7625,11 @@ msgstr ""
 msgid "This Window"
 msgstr "このウィンドウ"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7518,6 +7714,21 @@ msgstr "項目"
 msgid "Employees"
 msgstr "従業員"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7547,11 +7758,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "接続テスト"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "住所"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7576,7 +7782,6 @@ msgstr "選択オプション"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "町名番地"
@@ -7587,9 +7792,24 @@ msgid "Yugoslavia"
 msgstr "ユーゴスラビア"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "右括弧"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7668,7 +7888,7 @@ msgid "Change My Preferences"
 msgstr "設定の変更"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "アクション定義におけるモデル名が無効です。"
@@ -7762,21 +7982,17 @@ msgid "US Letter"
 msgstr "US レター"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"マーケティングメニュー\n"
-"===================\n"
-"\n"
-"マーケティング関連のモジュールのインストーラを含んでいます。\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7784,7 +8000,7 @@ msgid "Company Bank Accounts"
 msgstr "顧客銀行口座"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "空のパスワードの設定はセキュリティ上の理由から許可されていません。"
@@ -7795,13 +8011,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "SMTP認証のための任意のパスワード"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7823,12 +8039,13 @@ msgid "Normal Bank Account"
 msgstr "通常の銀行口座"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "ウィザード"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8005,7 +8222,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8036,14 +8253,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "警告"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8067,7 +8276,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8184,7 +8392,7 @@ msgid "Nigeria"
 msgstr "ナイジェリア"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "選択項目の場合は、選択オプションは指定されねばなりません。"
@@ -8499,7 +8707,7 @@ msgid "Update Modules List"
 msgstr "モジュールリストの更新"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8511,7 +8719,7 @@ msgid "eInvoicing"
 msgstr "電子請求"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8523,7 +8731,7 @@ msgstr ""
 "に全てのフォームを保存し、フォームを閉じたことを確認して下さい（ユーザ設定でキャンセルをクリックすることもできます）。"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "その値 %s は項目%s.%s の上では選択できません。"
@@ -8538,6 +8746,17 @@ msgstr "続き"
 msgid "Thai / ภาษาไทย"
 msgstr "タイ語 / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8585,7 +8804,7 @@ msgid "Mexico"
 msgstr "メキシコ"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8607,15 +8826,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "SMTPサーバが見つかりません。"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "添付ファイル名"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "翻訳項目の言語コードは周知の言語でなければいけません。"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8639,7 +8858,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - 省略形の月の名称"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8651,7 +8870,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "仕入先"
@@ -8729,7 +8947,7 @@ msgid "Selectable"
 msgstr "選択可能"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "全てのセットアップが適切に行われました。"
@@ -8757,8 +8975,8 @@ msgid "Iteration"
 msgstr "繰り返し"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "ユーザエラー"
@@ -8782,7 +9000,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8935,7 +9153,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8974,8 +9192,8 @@ msgid "Solomon Islands"
 msgstr "ソロモン諸島"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "アクセスエラー"
@@ -9049,7 +9267,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9066,7 +9284,7 @@ msgid "Ukraine"
 msgstr "ウクライナ"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9129,6 +9347,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "フラマン語（ベルギー）/ Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "ベトナム語 / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9227,9 +9450,9 @@ msgid "Custom Shortcuts"
 msgstr "カスタムショートカット"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "ベトナム語 / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9257,13 +9480,13 @@ msgid "Models"
 msgstr "モデル"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "現在はレコードを修正することができません。"
@@ -9284,7 +9507,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9332,7 +9555,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "モデル %s は存在しません。"
@@ -9378,6 +9601,7 @@ msgstr "アメリカ合衆国 - 勘定科目表"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9386,7 +9610,7 @@ msgid "Cancel"
 msgstr "キャンセル"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9405,6 +9629,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9440,7 +9701,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9492,6 +9753,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - 時（12時間表示）[01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9540,23 +9806,11 @@ msgid "The currency code must be unique per company!"
 msgstr "通貨コードは会社ごとに固有でなければいけません。"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9599,7 +9853,7 @@ msgid "Products Expiry Date"
 msgstr "製品の有効期限"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "次のアドオンを設定するには\"続行\"をクリックして下さい。"
@@ -9694,6 +9948,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9898,7 +10157,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "マーケティングキャンペーン - デモ"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9909,13 +10168,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "間隔の単位"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "種類"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "この方法はもはや存在していません。"
@@ -10083,7 +10347,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10121,6 +10385,11 @@ msgstr "OpenERPは自動的に次の番号に要求されているサイズに
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10146,6 +10415,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "アイコンのURL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10235,7 +10509,6 @@ msgstr "%m - 月[01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "市区町村"
@@ -10271,13 +10544,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "エストニア語 / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr "レコードIDとして書き込み操作のための項目名を指定して下さい。指定されない場合は、オブジェクトのアクティブIDとなります。"
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 またはそれ以降のバージョン"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10338,19 +10618,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10364,6 +10669,8 @@ msgid "Activity"
 msgstr "活動"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10382,7 +10689,12 @@ msgid "Parent Company"
 msgstr "親会社"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID認証"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10394,13 +10706,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10493,6 +10798,26 @@ msgstr "ユーザ自身がダッシュボードビュー（Webクライアント
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10562,6 +10887,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "順序タイプ"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10628,9 +10958,9 @@ msgstr ""
 "最初にその言語を非アクティブにして下さい。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10648,8 +10978,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "サーバアクションのレコードID設定の問題です。"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "検証エラー"
@@ -10688,13 +11018,12 @@ msgid "Laos"
 msgstr "ラオス"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Eメール"
@@ -10705,7 +11034,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10746,36 +11080,6 @@ msgstr ""
 "　・ uid：現在のユーザID\n"
 "　・ context：現在のコンテキスト"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10797,6 +11101,11 @@ msgstr "他の所有"
 msgid "Ecuador"
 msgstr "エクアドル"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "ワークフロー"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10813,21 +11122,6 @@ msgstr "契約上の仕事"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "ユーザの優先言語となっている言語を削除することはできません。"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"このモジュールはOpenERPのベネズエラの会計表を管理するモジュールです。\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10844,9 +11138,9 @@ msgid "Cascade"
 msgstr "カスケード"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "グループは必須です。"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10871,11 +11165,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10901,7 +11190,7 @@ msgid "Domain"
 msgstr "ドメイン"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10917,12 +11206,12 @@ msgid "State Name"
 msgstr "状態の名前"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10943,29 +11232,9 @@ msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10986,7 +11255,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11035,7 +11304,6 @@ msgstr "発注時の二重検証"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "町名番地2"
 
@@ -11059,6 +11327,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11151,19 +11420,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "完全性のエラー"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "ワークフロー"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "項目のサイズは１未満にすることはできません。"
@@ -11205,22 +11483,6 @@ msgstr "従業員名簿"
 msgid "Arguments"
 msgstr "引数"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11353,7 +11615,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "顧客"
 
@@ -11443,7 +11704,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11493,9 +11754,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID認証"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11594,7 +11855,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "メールの配信が失敗しました。"
@@ -11621,7 +11882,7 @@ msgid "Object"
 msgstr "オブジェクト"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11710,7 +11971,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11723,7 +11984,7 @@ msgid "User Ref."
 msgstr "ユーザの参照"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11768,8 +12029,6 @@ msgstr "リファレンスガイド"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11777,7 +12036,7 @@ msgid "Partner"
 msgstr "パートナ"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11806,12 +12065,6 @@ msgstr "フォークランド諸島"
 msgid "Lebanon"
 msgstr "レバノン"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11918,9 +12171,11 @@ msgid "Selection"
 msgstr "選択"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "アイコンのURL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -11956,7 +12211,7 @@ msgid "Action Type"
 msgstr "アクションタイプ"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12094,11 +12349,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "時 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "連絡先を隠すためにはアクティブな項目のチェックを外します。"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12115,7 +12365,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "不明な属性 %s in %s "
@@ -12138,7 +12388,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "未定義のメソッドを取得しています。"
@@ -12179,16 +12429,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "給与計算"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "バイナリファイルまたは外部URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "スリナム"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12235,76 +12485,8 @@ msgid "Address Format"
 msgstr "アドレスフォーマット"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-"0 < n の時に、セパレータのフォーマットは [,n] のようにすべきです：ユニットディジットが -1 "
-"から始まるとセパレーションの終了です。例えば、[3,2,-1] は 106500 を 1,06,500 に；[1,2,-1] は 106,50,0 "
-"に；[3] は 106,500 となります。それぞれのケースでは千のセパレータとして\",\"を与えて下さい。"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12312,13 +12494,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr "技術的特長"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "オック語（FR, post 1500）/ Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12500,6 +12717,11 @@ msgid ""
 "receptions, etc."
 msgstr "在庫表と主な在庫操作の管理を手助けします：配達オーダー、受け取りなど"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12516,7 +12738,7 @@ msgid "Body"
 msgstr "本文"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "接続テストが成功しました。"
@@ -12566,7 +12788,7 @@ msgid "choose"
 msgstr "選択"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12744,10 +12966,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12785,12 +13011,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "かんばん"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12804,7 +13031,6 @@ msgstr "会社のレジストリ"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "その他"
@@ -12826,34 +13052,6 @@ msgstr ""
 msgid "China"
 msgstr "中国"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"これはOpenERPのポーランド用の会計表と税金の管理モジュールです。\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12923,25 +13121,9 @@ msgid "Bulgaria"
 msgstr "ブルガリア"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "アンゴラ"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12969,6 +13151,26 @@ msgstr ""
 msgid "ltd"
 msgstr "株式会社"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13005,6 +13207,7 @@ msgstr "スロバキア語 / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "不明"
@@ -13072,6 +13275,11 @@ msgstr "アドレス帳"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13161,6 +13369,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13173,7 +13382,7 @@ msgid "Information"
 msgstr "情報"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13204,16 +13413,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "右括弧"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "モジュールリストの更新"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13278,6 +13491,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "osv_memory項目は、= と != 演算子とのみ比較することができます。"
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13350,29 +13568,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "外部識別子"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13420,7 +13615,7 @@ msgid "Delivery Costs"
 msgstr "配達コスト"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13469,9 +13664,9 @@ msgstr ""
 "最小限の勘定科目表を無効にします。\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "DBパスワードの暗号化"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "レコード規則"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13717,9 +13912,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13746,63 +13946,14 @@ msgid "System Configuration done"
 msgstr "システム設定が完了しました。"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "タークス・カイコス諸島"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13843,17 +13994,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13890,7 +14030,7 @@ msgid "Low"
 msgstr "低い"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "エラーです。再帰的な関係となるメニューを作ることはできません。"
@@ -13970,11 +14110,10 @@ msgid "El Salvador"
 msgstr "エルサルバドル"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "電話"
@@ -13989,6 +14128,11 @@ msgstr "アドレスメニュー"
 msgid "Thailand"
 msgstr "タイ王国"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14009,6 +14153,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "ルーマニア語 / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14045,41 +14213,6 @@ msgstr "オブジェクトの関係"
 msgid "eInvoicing & Payments"
 msgstr "電子請求と支払"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14140,40 +14273,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14267,6 +14368,21 @@ msgstr "ビュー："
 msgid "View Auto-Load"
 msgstr "自動ロードの表示"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14309,34 +14425,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "ペルシア語 / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14359,9 +14447,9 @@ msgid "Unmet dependency !"
 msgstr "依存関係が満たされていません。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14372,7 +14460,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14398,7 +14516,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14443,7 +14561,7 @@ msgid "Access"
 msgstr "アクセス"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14476,11 +14594,10 @@ msgid "Bahrain"
 msgstr "バーレーン"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "FAX"
@@ -14496,8 +14613,6 @@ msgstr "FAX"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14612,7 +14727,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "シリアライズ項目%s が（スパース項目 %s のための）見つかりません。"
@@ -14624,7 +14739,6 @@ msgstr "ジャマイカ"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "カラーインデックス"
 
@@ -14659,7 +14773,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14670,8 +14784,8 @@ msgid "Azerbaijan"
 msgstr "アゼルバイジャン"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "警告"
@@ -14697,11 +14811,6 @@ msgstr "イギリス領ヴァージン諸島"
 msgid "Parameters"
 msgstr "パラメータ"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "サンピエール島・ミクロン島"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14791,7 +14900,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "国"
@@ -14858,9 +14966,16 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "スペイン語（エルサルバドル）/ Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"0 < n の時に、セパレータのフォーマットは [,n] のようにすべきです：ユニットディジットが -1 "
+"から始まるとセパレーションの終了です。例えば、[3,2,-1] は 106500 を 1,06,500 に；[1,2,-1] は 106,50,0 "
+"に；[3] は 106,500 となります。それぞれのケースでは千のセパレータとして\",\"を与えて下さい。"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14887,7 +15002,7 @@ msgid "Japan"
 msgstr "日本"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "リネームは一度に１カラムしかできません。"
@@ -14948,6 +15063,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr "カナダ - 会計"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14972,7 +15118,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "この操作は数分を要しますのでご注意下さい。"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15011,6 +15157,12 @@ msgstr "実行"
 msgid "Condition"
 msgstr "条件"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15064,6 +15216,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "クロアチア"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15088,6 +15247,11 @@ msgstr "システム アップデート"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15104,7 +15268,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15125,15 +15289,52 @@ msgstr "シエラレオネ"
 msgid "General Information"
 msgstr "一般情報"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "タークス・カイコス諸島"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15169,7 +15370,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "会社切替の警告"
@@ -15187,11 +15393,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "順序の次の番号はこの数値だけ増加します。"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "機能"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15227,11 +15437,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "配達"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15259,7 +15464,7 @@ msgid "Workflow Instances"
 msgstr "ワークフローインスタンス"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "パートナ： "
@@ -15270,7 +15475,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15336,7 +15541,6 @@ msgstr "エクスポート名"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15439,6 +15643,9 @@ msgstr ""
 #~ "        他のソフトウェアからの複雑なデータ\n"
 #~ "    "
 
+#~ msgid "Contact Name"
+#~ msgstr "連絡先名"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15634,6 +15841,9 @@ msgstr ""
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "添付ID"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module adds generic sharing tools to your current OpenERP database.\n"
@@ -15683,6 +15893,9 @@ msgstr ""
 #~ "on"
 #~ msgstr "もしそれが、ユーザが作業中の同じオブジェクトに属しているなら、このログを表示しないで下さい。"
 
+#~ msgid "Attached Model"
+#~ msgstr "添付モデル"
+
 #~ msgid "References"
 #~ msgstr "リファレンス"
 
@@ -16199,6 +16412,9 @@ msgstr ""
 #~ msgid "Plugins"
 #~ msgstr "プラグイン"
 
+#~ msgid "Creator"
+#~ msgstr "作成者"
+
 #~ msgid ""
 #~ "Financial and accounting asset management.\n"
 #~ "    This Module manages the assets owned by a company or an individual. It "
@@ -16565,6 +16781,21 @@ msgstr ""
 #~ msgid "Add"
 #~ msgstr "追加"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "このモジュールはOpenERPのメキシコのための会計表を管理します。\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "メキシコの会計表とローカル化\n"
+#~ "    "
+
 #~ msgid "SMS - Gateway: clickatell"
 #~ msgstr "SMS - ゲートウェイ：Clickatell"
 
@@ -16635,6 +16866,9 @@ msgstr ""
 #~ msgid "Reg: "
 #~ msgstr "Reｇ： "
 
+#~ msgid "Addresses"
+#~ msgstr "住所"
+
 #~ msgid ""
 #~ "\n"
 #~ "Changes dates according to change in project End Date.\n"
@@ -17422,6 +17656,19 @@ msgstr ""
 #~ msgid "Want to Clear Ids ? "
 #~ msgstr "IDのクリアを望みますか？ "
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "このモジュールはOpenERPのベネズエラの会計表を管理するモジュールです。\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
 #~ msgid "Register a Contract"
 #~ msgstr "契約の登録"
 
@@ -18195,6 +18442,9 @@ msgstr ""
 #~ "http://doc.openerp.com\n"
 #~ "    "
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "バイナリファイルまたは外部URL"
+
 #~ msgid ""
 #~ "\n"
 #~ "Allows you to add delivery methods in sale orders and picking.\n"
@@ -18891,6 +19141,9 @@ msgstr ""
 #~ msgid "Check writing"
 #~ msgstr "書き込みチェック"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "DBパスワードの暗号化"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module provides features to improve the layout of the Sales Order.\n"
@@ -20167,6 +20420,9 @@ msgstr ""
 #~ msgid "eMail Gateway for Project Issues"
 #~ msgstr "プロジェクトの問題のためのEメールゲートウェイ"
 
+#~ msgid "Delivery"
+#~ msgstr "配達"
+
 #~ msgid ""
 #~ "\n"
 #~ "Common base for tools modules.\n"
@@ -21456,6 +21712,9 @@ msgstr ""
 #~ "\n"
 #~ "    "
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "連絡先を隠すためにはアクティブな項目のチェックを外します。"
+
 #~ msgid ""
 #~ "You can access all information regarding your suppliers from the supplier "
 #~ "form: accounting data, history of emails, meetings, purchases, etc. You can "
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index f17f48e6e2d..b8b6a12bf6d 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Georgian <ka@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "თარიღი და დრო"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -195,41 +195,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "ყურადღება!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -239,7 +213,7 @@ msgstr ""
 "ისინი Python-ის კოდის მეშვეობით, სასურველია დამატებითი addon-ით!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "შეზღუდვის შეცდომა"
@@ -250,7 +224,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "დარჩენილი sparse ველი \"%s\" დაუშვებელია"
@@ -261,7 +235,7 @@ msgid "Swaziland"
 msgstr "სვაზილენდი"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "შექმნილი."
@@ -340,20 +314,6 @@ msgstr "კომპანია რომელშიც მიმდინა
 msgid "Max. Size"
 msgstr "მაქს. ზომა"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -361,11 +321,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "კონტაქტის სახელი"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -430,7 +385,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -467,6 +422,7 @@ msgstr "ავტომატიზირებული ქმედებე
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "მფლობელი"
 
@@ -507,7 +463,7 @@ msgstr ""
 "ფორმატებთან, რომლებიც ჩამოთვლილია ენის რედაქტირებისას/არჩევისას."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -565,7 +521,7 @@ msgid "Netherlands Antilles"
 msgstr "ნიდერლანდური ანტილიები"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -606,9 +562,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "სტანდარტული ვიუ"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "აზრები"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -633,26 +589,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "ბოსნიური"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -663,9 +599,25 @@ msgstr ""
 "დააბრუნებს წინა რეპორტს."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "ანგოლა"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -742,14 +694,12 @@ msgstr ""
 "სტანდარტულად (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "ვიზარდები"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "სპეციფიური ველების დასახელებები უნდა იწყებოდეს 'x_'-ით !"
@@ -814,17 +764,21 @@ msgid "Model Description"
 msgstr "მოდელის აღწერა"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"მარკეტინგისთვის განკუთვნილი მენიუ.\n"
+"===================\n"
+"\n"
+"შეიცავს მარკეტინგთან დაკავშირებული მოდულების მენეჯერს.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -854,11 +808,21 @@ msgstr "ექსპრესიის გამოწვევა"
 msgid "Jordan"
 msgstr "იორდანია"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "ამ ამოცანის შემდგომი განხორციელების გეგმიური თარიღი."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -990,14 +954,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"გთხოვთ განსაზღვროთ ველის სახელი რომლის ჩანაწერის იდენტიფიკატორი უკავშირდება "
-"ჩაწერის ოპერაციას. თუ იგი ცარიელია, მაშინ მიმართეთ ობიექტის აქტიურ "
-"იდენტიფიკატორს."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "პაპუა ახალი გვინეა"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1016,7 +975,7 @@ msgid "Email Preferences"
 msgstr "ელ.ფოსტის პარამეტრები"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1065,16 +1024,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "ესპანური"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "მობილური"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1185,9 +1137,38 @@ msgid "Mongolia"
 msgstr "მონღოლეთი"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1203,12 +1184,17 @@ msgstr ""
 "ჯგუფებში."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1235,7 +1221,54 @@ msgid "Username"
 msgstr "მომხმარებლის სახელი"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1265,7 +1298,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "კავშირის ტესტირება ჩავარდა!"
@@ -1297,14 +1330,12 @@ msgid "South Korea"
 msgstr "სამხრეთ კორეა"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "გადასვლები"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1443,7 +1474,7 @@ msgid "Marshall Islands"
 msgstr "მარშალის კუნძულები"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "ველის მოდელის შეცვლა აკრძალულია!"
@@ -1465,7 +1496,7 @@ msgid "Search"
 msgstr "ძიება"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1484,7 +1515,14 @@ msgid "Parent Application"
 msgstr "მშობელი პრორგამა"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "ვიზარდები"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "ოპერაცია გაუქმდა"
@@ -1617,7 +1655,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "ენა კოდით \"%s\" არ არსებობს"
@@ -1738,7 +1790,7 @@ msgid "On Create"
 msgstr "შექმნისას"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1748,11 +1800,6 @@ msgstr ""
 "წერტილებს ! ისინი გამოიყენებიან სხვა პროგრამულ მოდულებში არსებულ "
 "მონაცემებთან დასაკავშირებლად, როგრც ეს არის module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1835,7 +1882,7 @@ msgid "East Timor"
 msgstr "აღმოსავლეთ ტიმორი"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1876,11 +1923,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "დართული იდენტიფიკატორი"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1898,7 +1940,7 @@ msgstr ""
 "სიიდან და სხვა."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1939,6 +1981,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "წაკითხვის წვდომა"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2015,16 +2062,11 @@ msgid "Create Tasks on SO"
 msgstr "ამოცანის შექმნა SO-ზე"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "დართული მოდელი"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2079,7 +2121,7 @@ msgid "Formula"
 msgstr "ფორმულა"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "root მომხმარებლის გაუქმება შეუძლებელია!"
@@ -2111,11 +2153,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2127,7 +2169,6 @@ msgstr "ანგარიშთა გეგმის შაბლონი"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "მისამართის ტიპი"
 
@@ -2165,11 +2206,6 @@ msgstr "სრული მისამართი"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "აზრები"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2307,6 +2343,11 @@ msgstr "განახლებული მოდულების რაო
 msgid "Method"
 msgstr "მეთოდი"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2340,12 +2381,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2396,6 +2442,15 @@ msgstr "ბელიზი"
 msgid "Add or not the corporate RML header"
 msgstr "დავამატოთ თუ არა კორპორატიული RML თავსართი"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2449,7 +2504,7 @@ msgstr ""
 "'იერარქია', 'კალენდარი', და ა.შ. (გაჩუმებით: იერარქია,ფორმა)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2544,7 +2599,6 @@ msgstr "წმინდა ტომე და პრინციპე"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "ინვოისი"
 
@@ -2591,11 +2645,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2721,9 +2770,20 @@ msgid "Default limit for the list view"
 msgstr "სტანდარტული ლიმიტი სიის ხედისთვის"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "პაპუა ახალი გვინეა"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2801,7 +2861,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2860,6 +2920,19 @@ msgstr "ველების დაკავშირება"
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2868,7 +2941,7 @@ msgid "Manager"
 msgstr "მენეჯერი"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2954,7 +3027,7 @@ msgid "Inherited"
 msgstr "მემკვიდრეობით მიღებული"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2984,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3051,22 +3124,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "ობიექტის არასწორი არქიტექტურა"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "შეცდომა!"
@@ -3163,12 +3236,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "შეცდომა! თქვენ არ შეგიძლიათ შექმნათ რეკურსიული კომპანიები."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3185,17 +3258,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3205,7 +3280,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "ვერ ვაახლებთ მოდულს '%s', რადგანაც არ არის დაყენებული."
@@ -3256,34 +3331,6 @@ msgstr "კონფიგურაციის პარამეტრებ
 msgid "Invalid arguments"
 msgstr "არასწორი არგუმენტები"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3322,7 +3369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3334,6 +3381,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "საბანკო ანგარიშის ტიპი"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3370,7 +3445,7 @@ msgid "Signal (subflow.*)"
 msgstr "სიგნალი (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3411,7 +3486,7 @@ msgid "Access Controls"
 msgstr "დაშვების კონტროლები"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3441,32 +3516,6 @@ msgstr "ძირითადი კომპანი"
 msgid "Web Icon File (hover)"
 msgstr "Web Icon-ის ფაილი (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3486,9 +3535,13 @@ msgstr ""
 "თუ თქვენ იყენებთ ფორმულის ტიპს, მაშინ გამოიყენეთ python ექსპრესია ცვლად "
 "'object'-ის დახმარებით."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "შეცდომა! თქვენ არ შეგიძლიათ შექმნათ რეკურსიული კომპანიები."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "დაბადების თარიღი"
 
@@ -3504,7 +3557,7 @@ msgid "Products Manufacturers"
 msgstr "პროდუქტის მწარმოებლები"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL რეჟიმი მიუწვდომელია"
@@ -3614,7 +3667,7 @@ msgid "Malta"
 msgstr "მალტა"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3805,7 +3858,6 @@ msgstr "რეპორტინგი"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "სახელწოდება"
@@ -3818,13 +3870,18 @@ msgstr ""
 "რესურსებისთვის"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "რეკურსიულობა აღმოჩენილ იქნა"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "რეკურსიის შეცდომა მოდულის დამოკიდებულებებში!"
@@ -3884,9 +3941,10 @@ msgid "Urdu / اردو"
 msgstr "ურდუ"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3897,7 +3955,7 @@ msgid "Company Name"
 msgstr "კომპანიის სახელი"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3918,14 +3976,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (უარყოფილი - გამოყენების რეპორტი)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "ენის კოდი თარგმანის პუნქტში უნდა იყოს, ცნობილი ენებს შორის"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "ჩანაწერის წესები"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3954,12 +4035,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -4008,19 +4085,7 @@ msgid "Paper Format"
 msgstr "ქაღალდის ფორმატი"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4040,7 +4105,7 @@ msgid "Nauru"
 msgstr "ნაურუ"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4085,7 +4150,7 @@ msgid "Email Gateway"
 msgstr "ელ.ფოსტის არხი"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4106,8 +4171,42 @@ msgid "Technical Data"
 msgstr "ტექნიკური მონაცემები"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4164,13 +4263,18 @@ msgstr "დროის აღრიცხვა საკითხებზე"
 msgid "Ltd"
 msgstr "შპს"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "არასწორი არქიტექტურა!"
@@ -4186,9 +4290,9 @@ msgid "Share any Document"
 msgstr "გააზიარე ნებისმიერი დოკუმენტი"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "ჯგუფი აუცილებელია"
 
 #. module: base
 #: view:res.lang:0
@@ -4249,32 +4353,9 @@ msgid "Languages"
 msgstr "ენები"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4363,7 +4444,6 @@ msgstr "შეზღუდვა"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "ნაგულისხმევი"
 
@@ -4438,6 +4518,11 @@ msgstr ""
 "უმაღლესი პრიორიტეტის მქონე სერვერი გამოიყენება. ნაგულისხმები პრიორიტეტი არის "
 "10 (რაც უფრო მცირეა რიცხვი, მით უფრო მაღალია პრიორიტეტი)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4501,9 +4586,16 @@ msgid "Default value or action reference"
 msgstr "ნაგულისხმები მნიშვნელობა ან მოქმედების წყარო"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "სურინამი"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4583,6 +4675,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4608,6 +4716,43 @@ msgstr ""
 "თუ თქვენ გაქვთ ჯგუფები, ამ მენიუს გამოჩენა დაფუძნებულია მათზე. თუ ეს ველი "
 "ცარიელია, OpenERP გადაწყვეტს გამოჩნდეს თუ არა ობიექტის უფლებების შესაბამისად."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4637,6 +4782,12 @@ msgstr ""
 msgid "View"
 msgstr "ვიუ"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4714,12 +4865,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4734,7 +4879,6 @@ msgstr "შვეიცარია - ბუღალტერია"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "ინდექსი"
@@ -4745,13 +4889,18 @@ msgstr "ინდექსი"
 msgid "Author"
 msgstr "ავტორი"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "განსაზღვრე როგორც გასაკეთებელია"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - შესაბამისი თარიღისა და დროის წარმოდგენა."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4797,6 +4946,8 @@ msgstr "მიმართულება"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "ვიუები"
 
@@ -4812,7 +4963,7 @@ msgid "SMTP Server"
 msgstr "SMTP სერვერი"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "თქვენ ცდილობთ მოდულის გაუქმებას რომელიც არის დაყენებული ან დაყენდება"
@@ -4908,7 +5059,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4996,7 +5152,7 @@ msgid "System Configuration Done"
 msgstr "სისტემის კონფიგურაცია დასრულდა"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "შეცდომა ველის(ების) %s: %s ვალიდაციისას"
@@ -5111,6 +5267,11 @@ msgstr "მავრიკის კუნძულები"
 msgid "Full Access"
 msgstr "სწრული წვდომა"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5124,7 +5285,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "შენახვის სისტემის მდებარეობის შეცვლა ველისთვის \"%s\" აკრძალულია."
@@ -5135,7 +5296,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "მხოლოდ თუ ეს საბანკო ანგარიში ეკუთვნის თქვენს კომპანიას"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5167,6 +5328,17 @@ msgstr "სენეგალი"
 msgid "Hungary"
 msgstr "უნგრეთი"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5330,7 +5502,7 @@ msgid "Account Owner Name"
 msgstr "ანგარიშის მფლობელის სახელი"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5348,16 +5520,11 @@ msgid "Decimal Separator"
 msgstr "ათობითი გამყოფი"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5404,9 +5571,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "შემქმნელი"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "მოდულის სახელი უნდა იყოს უნიკალური"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5469,15 +5637,6 @@ msgstr "ვენესუელა"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5493,6 +5652,11 @@ msgstr "კონფიგურაციის ვიზარდის გა
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "დანართის სახელი"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5576,6 +5740,12 @@ msgstr "ყაზახეთი"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - კვირის დღის ნომერი [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "რესურსის სახელი"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5830,7 +6000,7 @@ msgid "title"
 msgstr "სათაური"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5887,6 +6057,15 @@ msgstr "პროდუქტები"
 msgid "User-defined Defaults"
 msgstr "მომხმარებლის მიერ განსაზღვრული ნაგულისხმები"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6004,13 +6183,15 @@ msgid "Bank Type"
 msgstr "ბანკის ტიპი"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "ჯგუფის სახელი არ შეიძლება იწყებოდეს \"-\"-ით"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "მოდულები"
 
@@ -6030,7 +6211,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "გუჯარათი"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6065,10 +6246,9 @@ msgid "Uncategorized"
 msgstr "კატეგორიის გარეშე"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "რესურსის სახელი"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6105,6 +6285,11 @@ msgstr ""
 "მაშინ ღილაკი არ არის საჭირო ამ ტრანზიციის დასავალიდირებლად no button is "
 "necessary to validate this transition."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "სტანდარტული ვიუ"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6115,7 +6300,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6131,26 +6316,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "ჩემი ბანკები"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6283,11 +6448,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6299,8 +6459,8 @@ msgid "Malaysia"
 msgstr "მალაზია"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6409,7 +6569,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "ამ სტრუქტურისთვის არ არსებობს განსაზღვრული ვიუს ტიპი '%s' !"
@@ -6449,7 +6609,7 @@ msgid "Created Menus"
 msgstr "შექმნილი მენიუები"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6476,9 +6636,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "განსაზღვრე როგორც გასაკეთებელია"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6510,6 +6698,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "მიმდინარე წელი საუკუნის გარეშე: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6561,7 +6756,7 @@ msgid "Audit Trail"
 msgstr "აუდიტის კვალი"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6653,7 +6848,7 @@ msgid "Israel"
 msgstr "ისრაელი"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6673,23 +6868,6 @@ msgstr "ზოგჯერ ეძახიან BIC-ს ან Swift-ს."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "მობილური"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6722,10 +6900,10 @@ msgstr "რეპორტი xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "მოდულები"
 
@@ -6799,8 +6977,8 @@ msgid "United Kingdom"
 msgstr "დიდი ბრიტანეთი"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6824,8 +7002,8 @@ msgid "Partner Titles"
 msgstr "პარტნიორის სათაურები"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6873,7 +7051,7 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6882,11 +7060,6 @@ msgstr ""
 "თქვენ არ შეგიძლიათ ამ ოპერაციის განხორციელება. ახალი ჩანაწერის შექმნა "
 "დაუშვებელია ამ ობიექტისთვის რადგანაც იგი განკუთვნილია რეპორტინგისთვის."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6996,6 +7169,13 @@ msgstr "მოდულის ფაილის იმპორტი წარ
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "გადასვლები"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7093,7 +7273,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -7194,12 +7373,6 @@ msgstr "სრული სახელი"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "მოდულის სახელი უნდა იყოს უნიკალური"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7241,6 +7414,7 @@ msgstr "მრავალ დოკუმენტზე."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7298,7 +7472,7 @@ msgid "Connection Security"
 msgstr "კავშირის უსაფრთხოება"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "გთხოვთ განსაზღვროთ ასამოქმედებელი ქმედება"
@@ -7318,6 +7492,11 @@ msgstr "კატეგორიის სახელი"
 msgid "Northern Mariana Islands"
 msgstr "ჩრდილო მარიანას კუნძულები"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7329,7 +7508,7 @@ msgid "Intrastat Reporting"
 msgstr "ინტრასტატ რეპორტინგი"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7338,6 +7517,11 @@ msgstr ""
 "გთხოვთ გამოიყენოთ პაროლის ცვლილების ვიზარდი (მომხმარებლის პარამეტრებში ან "
 "მომხმარებლის მენიუში) რათა შეცვალოთ თქვენი საკუთარი პაროლი."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7368,7 +7552,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "ველების არასაკმარისი რაოდენობა კანდარის ვიუსთვის!"
@@ -7414,7 +7598,6 @@ msgstr "გარდაქმნა"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7434,30 +7617,30 @@ msgid "Child Categories"
 msgstr "შვილობილი კატეგორიები"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "შეცდომა"
@@ -7545,6 +7728,11 @@ msgstr ""
 msgid "This Window"
 msgstr "ეს ფანჯარა"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7628,6 +7816,21 @@ msgstr "ველები"
 msgid "Employees"
 msgstr "თანამშრომლები"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7657,11 +7860,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "საცდელი კავშირი"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "მისამართები"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7686,7 +7884,6 @@ msgstr "არჩეულის ოპერაცია"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "ქუჩა"
@@ -7697,9 +7894,24 @@ msgid "Yugoslavia"
 msgstr "იუგოსლავია"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "მარჯვენა მშობელი"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7780,7 +7992,7 @@ msgid "Change My Preferences"
 msgstr "ჩემი პარამეტრების ცვლილება"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "ქმედების განსაზღვრებაში არასწორი მოდელის სახელი."
@@ -7867,21 +8079,17 @@ msgid "US Letter"
 msgstr "აშშ წერილი"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"მარკეტინგისთვის განკუთვნილი მენიუ.\n"
-"===================\n"
-"\n"
-"შეიცავს მარკეტინგთან დაკავშირებული მოდულების მენეჯერს.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7889,7 +8097,7 @@ msgid "Company Bank Accounts"
 msgstr "კომპანიის საბანკო ანგარიშები"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "ცარიელი პაროლის დაყენება აკრძალულია უსაფრთხოების მიზნით!"
@@ -7900,13 +8108,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "არჩევითი პაროლი SMTP აუთენტიფიკაციისთვის"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7928,12 +8136,13 @@ msgid "Normal Bank Account"
 msgstr "ნორმალური საბანკო ანგარიში"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "ვიზარდი"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8109,7 +8318,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8141,14 +8350,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "ყურადღება!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8172,7 +8373,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8292,7 +8492,7 @@ msgid "Nigeria"
 msgstr "ნიგერია"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "არჩევადი ველებისთვის, პარამეტრები უნდა იყოს მითითებული!"
@@ -8613,7 +8813,7 @@ msgid "Update Modules List"
 msgstr "მოდულების ჩამონათვალის განახლება"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8627,7 +8827,7 @@ msgid "eInvoicing"
 msgstr "ელექტრონული ინვოისინგი"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8642,7 +8842,7 @@ msgstr ""
 "მომხმარებლის პარამეტრები)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "მნიშვნელობა \"%s\" ველისთვის \"%s.%s\" არ ფიგურირებს არჩევანში"
@@ -8657,6 +8857,17 @@ msgstr "გაგრძელება"
 msgid "Thai / ภาษาไทย"
 msgstr "ტაივანი"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8696,7 +8907,7 @@ msgid "Mexico"
 msgstr "მექსიკა"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8718,15 +8929,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "არასწორი SMTP სერვერუ"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "დანართის სახელი"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "ენის კოდი თარგმანის პუნქტში უნდა იყოს, ცნობილი ენებს შორის"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8750,7 +8961,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - შემოკლებული თვის სახელი."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8762,7 +8973,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "მომწოდებელი"
@@ -8840,7 +9050,7 @@ msgid "Selectable"
 msgstr "მონიშვნადი"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "როგორც ჩანს ყველაფერი კარგად არის დაკონფიგურირებული!"
@@ -8868,8 +9078,8 @@ msgid "Iteration"
 msgstr "იტერაცია"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8893,7 +9103,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9041,7 +9251,7 @@ msgid "Reunion (French)"
 msgstr "რეუნიონი"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9081,8 +9291,8 @@ msgid "Solomon Islands"
 msgstr "სოლომინის კუნძულები"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -9156,7 +9366,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9170,7 +9380,7 @@ msgid "Ukraine"
 msgstr "უკრაინა"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9233,6 +9443,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "ფლამანდური"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "ვიეტნამური"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9331,9 +9546,9 @@ msgid "Custom Shortcuts"
 msgstr "განსხვავებული მალსახმობი"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "ვიეტნამური"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9361,13 +9576,13 @@ msgid "Models"
 msgstr "მოდელები"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "ჩანაწერის შეცვლა ახლა შეუძლებელია"
@@ -9388,7 +9603,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9436,7 +9651,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "მოდელი %s არ არსებობს!"
@@ -9482,6 +9697,7 @@ msgstr "აშშ - ანგარიშთა გეგმა"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9490,7 +9706,7 @@ msgid "Cancel"
 msgstr "შეწყვეტა"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9509,6 +9725,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9544,7 +9797,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9596,6 +9849,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - საათი (12-საათიანი დრო ) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9644,23 +9902,11 @@ msgid "The currency code must be unique per company!"
 msgstr "ვალუტის კოდი უნიკალური უნდა იყოს ყოველი კომპანიისთვის!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9694,7 +9940,7 @@ msgid "Products Expiry Date"
 msgstr "პროდუქტების ვადის გასვლის თარიღი"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "დააკლიკეთ გაგრძელებაზე რათა დააკონფიგურიროთ შემდეგი მოდული"
@@ -9787,6 +10033,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9992,7 +10243,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "მარკეტინგული კამპანია - დემო"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10003,13 +10254,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "ინტერვალის ერთეული"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "ეს მეთოდი უკვე აღარ არსებობს"
@@ -10179,7 +10435,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10212,6 +10468,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10237,6 +10498,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "ხატულას URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10326,7 +10592,6 @@ msgstr "%m - თვის ნომერი [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "ქალაქი"
@@ -10362,13 +10627,23 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "ესტონური"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"გთხოვთ განსაზღვროთ ველის სახელი რომლის ჩანაწერის იდენტიფიკატორი უკავშირდება "
+"ჩაწერის ოპერაციას. თუ იგი ცარიელია, მაშინ მიმართეთ ობიექტის აქტიურ "
+"იდენტიფიკატორს."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ან უფრო ახალი ვერსია"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10430,19 +10705,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10456,6 +10756,8 @@ msgid "Activity"
 msgstr "აქტივობა"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10474,7 +10776,12 @@ msgid "Parent Company"
 msgstr "მშობელი კომპანია"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID აუთენტიფიკაცია"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10486,13 +10793,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10577,6 +10877,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10648,6 +10968,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "მიმდევრობის ტიპი"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10708,9 +11033,9 @@ msgstr ""
 "გთხოვთ პირველ ჯერ დეაქტივაცია გაუკეთოთ აღნიშნულ ენას."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10728,8 +11053,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10770,13 +11095,12 @@ msgid "Laos"
 msgstr "ლაოსი"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "ელ.ფოსტა"
@@ -10787,7 +11111,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10818,36 +11147,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10869,6 +11168,11 @@ msgstr "სხვა დაპატენტებული"
 msgid "Ecuador"
 msgstr "ეკვადორი"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "ვორკფლოუ"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10885,16 +11189,6 @@ msgstr "სამუშაოები კონტრაქტებზე"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "ვერ წაშლით ენას რომელიც მომხმარებლის მიერ გამოყენებულია !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10911,9 +11205,9 @@ msgid "Cascade"
 msgstr "მიყოლებით დალაგება"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "ჯგუფი აუცილებელია"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10938,11 +11232,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10968,7 +11257,7 @@ msgid "Domain"
 msgstr "დომენი"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10984,12 +11273,12 @@ msgid "State Name"
 msgstr "შტატის სახელი"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11010,29 +11299,9 @@ msgid "Timezone"
 msgstr "დროის სარტყელი"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -11054,7 +11323,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11108,7 +11377,6 @@ msgstr "შესყიდვების ორმაგი ვალიდა
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "ქუჩა 2"
 
@@ -11132,6 +11400,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11217,19 +11486,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "მთლიანობის შეცდომა"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "ვორკფლოუ"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "ველის ზომა შეუძლებელია იყოს 1-ზე ნაკლების !"
@@ -11271,22 +11549,6 @@ msgstr "თანამშრომლების ცნობარი"
 msgid "Arguments"
 msgstr "არგუმენტები"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11419,7 +11681,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "კლიენტი"
 
@@ -11509,7 +11770,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11559,9 +11820,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID აუთენტიფიკაცია"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11651,7 +11912,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "ელ.ფოსტის გაგზავნა არ განხორციელდა"
@@ -11678,7 +11939,7 @@ msgid "Object"
 msgstr "ობიექტი"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11764,7 +12025,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11779,7 +12040,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11824,8 +12085,6 @@ msgstr "ფუნქციონალური დოკუმენტაც
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11833,7 +12092,7 @@ msgid "Partner"
 msgstr "პარტნიორი"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11862,12 +12121,6 @@ msgstr "ფოლკლენდის კუნძულები"
 msgid "Lebanon"
 msgstr "ლიბანი"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11976,9 +12229,11 @@ msgid "Selection"
 msgstr "არჩეული"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "ხატულას URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12014,7 +12269,7 @@ msgid "Action Type"
 msgstr "ქმედების ტიპი"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12150,11 +12405,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "საათი 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "შეუძლებელია აქტიური ველის შემოწმება კონტაქტის დასამალად."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12171,7 +12421,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "უცნობი ატრიბუტი %s in %s "
@@ -12194,7 +12444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "განუსაზღვრელი get მეთოდი !"
@@ -12235,16 +12485,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "სახელფასო ბუღალტერია"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "ორობითი ფაილი ან გარე URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "სურინამი"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12291,73 +12541,8 @@ msgid "Address Format"
 msgstr "მისამართის ფორმატი"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12365,13 +12550,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr "ტექნიკური შესაძლებლობები"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12553,6 +12773,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12569,7 +12794,7 @@ msgid "Body"
 msgstr "შიგთავსი"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "კავშირის ტესტირება წარმატებით ჩატარდა!"
@@ -12617,7 +12842,7 @@ msgid "choose"
 msgstr "არჩევა"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12793,10 +13018,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12830,12 +13059,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "კანბანი"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12849,7 +13079,6 @@ msgstr "კომპანიის რეესტრი"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "სხვადასხვაგვარი"
@@ -12871,23 +13100,6 @@ msgstr ""
 msgid "China"
 msgstr "ჩინეთი"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12960,25 +13172,9 @@ msgid "Bulgaria"
 msgstr "ბულგარეთი"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "ანგოლა"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13006,6 +13202,26 @@ msgstr ""
 msgid "ltd"
 msgstr "შპს"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13042,6 +13258,7 @@ msgstr "სლოვაკური"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "უცნობი"
@@ -13109,6 +13326,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13198,6 +13420,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13210,7 +13433,7 @@ msgid "Information"
 msgstr "ინფორმაცია"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13241,16 +13464,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "მარჯვენა მშობელი"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "მოდულების სიის განახლება"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13315,6 +13542,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13387,29 +13619,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "გარე იდენტიფიკატორი"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13457,7 +13666,7 @@ msgid "Delivery Costs"
 msgstr "მიწოდების ხარჯი"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13501,9 +13710,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "ჩანაწერის წესები"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13749,9 +13958,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13778,62 +13992,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13875,17 +14040,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13920,7 +14074,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -14000,11 +14154,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -14019,6 +14172,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14039,6 +14197,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14075,41 +14257,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14170,40 +14317,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14293,6 +14408,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14335,34 +14465,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14385,9 +14487,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14398,7 +14500,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14424,7 +14556,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14469,7 +14601,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14502,11 +14634,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14522,8 +14653,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14638,7 +14767,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14650,7 +14779,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14683,7 +14811,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14694,8 +14822,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14721,11 +14849,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14815,7 +14938,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14882,8 +15004,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14911,7 +15037,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14972,6 +15098,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14996,7 +15153,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15035,6 +15192,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15087,6 +15250,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15111,6 +15281,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15127,7 +15302,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15148,14 +15323,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -15192,7 +15404,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -15210,11 +15427,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15250,11 +15471,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15282,7 +15498,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -15293,7 +15509,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15359,7 +15575,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15603,6 +15818,9 @@ msgstr ""
 #~ "არ გამოაჩინო ეს ლოგი თუ იგი ეკუთვნის იგივე ობიექტს რომელზეც მომხმარებელი "
 #~ "მუშაობს ამჟამად"
 
+#~ msgid "Attached ID"
+#~ msgstr "დართული იდენტიფიკატორი"
+
 #~ msgid "OpenERP Web web"
 #~ msgstr "OpenERP ვები"
 
@@ -15612,6 +15830,9 @@ msgstr ""
 #~ msgid "Symbol position"
 #~ msgstr "სიმბოლოს პოზიცია"
 
+#~ msgid "Attached Model"
+#~ msgstr "დართული მოდელი"
+
 #~ msgid "General Information Footer"
 #~ msgstr "ძირითადი საინფორმაციო ქვედა ტანი"
 
@@ -15821,6 +16042,9 @@ msgstr ""
 #~ "აპირებთ:\n"
 #~ " %s"
 
+#~ msgid "Contact Name"
+#~ msgstr "კონტაქტის სახელი"
+
 #~ msgid "Openerp web graph view"
 #~ msgstr "Openerp ვებ გრაფიკის ვიუ"
 
@@ -17052,6 +17276,9 @@ msgstr ""
 #~ msgid "Plugins"
 #~ msgstr "დამატებითი პროგრამები"
 
+#~ msgid "Creator"
+#~ msgstr "შემქმნელი"
+
 #~ msgid "Parent Partner"
 #~ msgstr "მშობელი პარტნიორი"
 
@@ -17738,6 +17965,9 @@ msgstr ""
 #~ "მიერ.\n"
 #~ "    "
 
+#~ msgid "Addresses"
+#~ msgstr "მისამართები"
+
 #~ msgid ""
 #~ "\n"
 #~ "Changes dates according to change in project End Date.\n"
@@ -19748,12 +19978,18 @@ msgstr ""
 #~ msgid "Generate Docs of Modules"
 #~ msgstr "მოდულების დოკუმენტების გენერირება"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "შეუძლებელია აქტიური ველის შემოწმება კონტაქტის დასამალად."
+
 #~ msgid "Rule definition (domain filter)"
 #~ msgstr "წესის განსაზღვრა (დომენის ფილტრი)"
 
 #~ msgid "Add a widget for User"
 #~ msgstr "მომხმარებლისთვის ვიჯეტის დამატება"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "ორობითი ფაილი ან გარე URL"
+
 #~ msgid "Modules to update"
 #~ msgstr "გასაახლებელი მოდულები"
 
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 4c5db8ee781..b417cad75d8 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-16 07:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:57+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Күн мен уақыт"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr "Свазиленд"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Контакт атауы"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Иесі"
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr "Нидерландияның Антиль аралдары"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,9 +569,25 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Ангола"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Хордан"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,11 +908,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Папуа - Жаңа Гвинея"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,16 +976,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Қалтафон"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr "Монғолия"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr "Корей Республикасы"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr "Маршалл аралдары"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr "Іздеу"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr "Шығыс Тимор"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr "Формула"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr "Толық жолы"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Инвойс"
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,9 +2631,20 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Папуа - Жаңа Гвинея"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr "Мальта"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Атауы"
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr "Компаниясының атауы"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,14 +3813,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr ""
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Сен-Пьер және Микелон"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr "Науру"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr "Тілдер:"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Әдетті"
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,9 +4401,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Суринам"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr "Қарау"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr "Авторы"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr "Бағыты"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Көріністер"
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr "Маврикий"
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr "Сенегал"
 msgid "Hungary"
 msgstr "Венгрия"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,9 +5368,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Құрушысы"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5269,15 +5434,6 @@ msgstr "Венесуэла"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr "Қазақстан"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr "Тақырыбы..."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr "Малайзия"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr "Израиль"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Қалтафон"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Модульдер"
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr "Ұлы Британия"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr "Толық аты"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr "Солтүстік Мариана ар-ы"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Қате"
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Адрестер"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Көше"
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr "Югославия"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Шебері"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr "Нигерия"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr "Жалғастыру"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr "Мексика"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr "Соломон аралдары"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr "Украина"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr "Өзінің тіркесімдері"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr "Бас тарту"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Қала"
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr "Ісі"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr "Лаос"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Эл.поштасы"
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Экуадор"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr "Кезектеп"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr "Домен"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr "Уақыт белдеуі"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Аргументтер"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Сатып алу"
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr "Объект"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr "Фолкленд (Мальвин) ар-ы"
 msgid "Lebanon"
 msgstr "Ливан"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr "Таңдағанды ғана"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11923,16 +12173,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Парольді өзгерту"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Суринам"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr "Беті"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Әр түрлі"
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr "Қытай"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,25 +12848,9 @@ msgid "Bulgaria"
 msgstr "Болгария"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Ангола"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "беймәлім"
@@ -12785,6 +13002,11 @@ msgstr "Адрестік кітапша"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr "Ақпарат"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,63 +13666,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Теркс және Кайкос ар-ы"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr "Төмен"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr "Сальвадор"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Телефондау"
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr "Тайланд"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr "Құқықтары"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr "Бахрейн"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Факс"
@@ -14195,8 +14326,6 @@ msgstr "Факс"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr "Ямайка"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr "Әзірбайжан"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Ескерту"
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr "Параметрлер"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Сен-Пьер және Микелон"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Кантри"
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr "Жапония"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr "Орындау"
 msgid "Condition"
 msgstr "Шарты"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Хорватия"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,15 +14996,52 @@ msgstr "Съера-Леоне"
 msgid "General Information"
 msgstr "Жалпы мәліметі"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Теркс және Кайкос ар-ы"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Функция"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15078,6 +15293,9 @@ msgstr ""
 #~ msgid "new"
 #~ msgstr "жаңа"
 
+#~ msgid "Contact Name"
+#~ msgstr "Контакт атауы"
+
 #~ msgid "E-Mail"
 #~ msgstr "Эл.поштасы"
 
@@ -15138,6 +15356,9 @@ msgstr ""
 #~ msgid "Event"
 #~ msgstr "Оқиға"
 
+#~ msgid "Creator"
+#~ msgstr "Құрушысы"
+
 #~ msgid "Plugins"
 #~ msgstr "Плагиндер"
 
@@ -15162,6 +15383,9 @@ msgstr ""
 #~ msgid "Read"
 #~ msgstr "Оқылған"
 
+#~ msgid "Addresses"
+#~ msgstr "Адрестер"
+
 #~ msgid "Skipped"
 #~ msgstr "Қалдырып кетекен"
 
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 76fb1112b26..ea475179516 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:29+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:57+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "일시"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -188,41 +188,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "경고!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -230,7 +204,7 @@ msgid ""
 msgstr "기본 필드의 속성은 이 방법으로 변경이 안됩니다. 가급적 커스텀 부가기능으로  파이썬 코드를 수정하세요"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "제한에러"
@@ -241,7 +215,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -252,7 +226,7 @@ msgid "Swaziland"
 msgstr "스와질랜드"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "생성됨."
@@ -331,20 +305,6 @@ msgstr "현재 레코드를 저장할 회사"
 msgid "Max. Size"
 msgstr "최대 크기"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -352,11 +312,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "연락처 이름"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -415,7 +370,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -452,6 +407,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "소유자"
 
@@ -490,7 +446,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -542,7 +498,7 @@ msgid "Netherlands Antilles"
 msgstr "네덜란드령 안틸레스"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -581,9 +537,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "원래 뷰"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -608,26 +564,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "보스니아"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -636,8 +572,24 @@ msgid ""
 msgstr "여기를 체크하면, 동일한 첨부 이름으로 사용자가 인쇄할 다음 번에, 이전 리포트를 제공합니다."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -711,14 +663,12 @@ msgid ""
 msgstr "파이썬 문법의 컨텍스트 사전, 디폴트: 비움 (Default:{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "위저드"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "고객화 필드 이름은 'x_'로 시작해야 합니다!"
@@ -782,16 +732,14 @@ msgid "Model Description"
 msgstr "모델 설명"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -820,11 +768,21 @@ msgstr "트리거 표현식"
 msgid "Jordan"
 msgstr "요르단"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -955,11 +913,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr "쓰기 오퍼레이션을 위해 레코드 ID가 참조하는 필드 이름을 기입하십시오. 비워두면, 이 오브젝트의 활성 ID를 참조합니다."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "파푸아뉴기니"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -977,7 +933,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1025,16 +981,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "스페인어"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "모바일"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1131,8 +1080,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1147,12 +1125,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1179,7 +1162,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1209,7 +1239,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1241,14 +1271,12 @@ msgid "South Korea"
 msgstr "대한민국"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "트랜지션"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "레코드 #%d (%s) 가 발견되지 않아서 복사될 수 없습니다."
@@ -1385,7 +1413,7 @@ msgid "Marshall Islands"
 msgstr "마셜 제도"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "필드 모델 변경은 금지되어 있습니다."
@@ -1407,7 +1435,7 @@ msgid "Search"
 msgstr "찾아보기"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1425,7 +1453,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "위저드"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "오퍼레이션 취소"
@@ -1551,7 +1586,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "코드 \"%s\"를 가진 언어가 존재하지 않습니다."
@@ -1666,7 +1715,7 @@ msgid "On Create"
 msgstr "생성"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1675,11 +1724,6 @@ msgstr ""
 "'%s'는 너무 많은 점들 포함하고 있다. XML id들에 점이 포함되서는 안된다.\r\n"
 "그것들은 다른 모듈의 자료를 참조하기 위해 사용된다."
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1760,7 +1804,7 @@ msgid "East Timor"
 msgstr "동티모르"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1801,11 +1845,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "첨부된 ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1820,7 +1859,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1861,6 +1900,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "읽기 접근"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1937,16 +1981,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "첨부된 모델"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2001,7 +2040,7 @@ msgid "Formula"
 msgstr "공식"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "루트 사용자를 제거할 수는 없음!"
@@ -2025,11 +2064,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (사본)"
@@ -2041,7 +2080,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "주소 타입"
 
@@ -2079,11 +2117,6 @@ msgstr "전체 경로"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2218,6 +2251,11 @@ msgstr "갱신된 모듈들의 수"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2251,12 +2289,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2306,6 +2349,15 @@ msgstr "벨리제"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2357,7 +2409,7 @@ msgid ""
 msgstr "'폼', '트리', '달력'과 같은 보기 모드를 구분하기 위한 쉼표,구분 리스트"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "문서는 당신이 마지막으로 본 시점이후에 수정되었다. (%s:%d)"
@@ -2437,7 +2489,6 @@ msgstr "세인트 톰 (사오 톰) 과 프린시프섬"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "송장"
 
@@ -2484,11 +2535,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2605,9 +2651,20 @@ msgid "Default limit for the list view"
 msgstr "리스트 뷰를 위한 기본 제한"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "파푸아뉴기니"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2685,7 +2742,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2744,6 +2801,19 @@ msgstr "필드 매핑"
 msgid "Export Translations"
 msgstr "번역 내보내기"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2752,7 +2822,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2838,7 +2908,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2868,7 +2938,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2933,22 +3003,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "잘못된 객체 아키텍쳐"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "오류!"
@@ -3044,12 +3114,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "에러! 재귀적 기업들을 생성할 수는 없습니다."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3066,17 +3136,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3086,7 +3158,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "모듈 '%s' 을 업그레이드할 수 없습니다. 설치 안됨."
@@ -3137,34 +3209,6 @@ msgstr "구성 파라메터"
 msgid "Invalid arguments"
 msgstr "인자가 잘못되었습니다"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3203,7 +3247,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3215,6 +3259,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "은행 계정 타입"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3251,7 +3323,7 @@ msgid "Signal (subflow.*)"
 msgstr "신호 (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3287,7 +3359,7 @@ msgid "Access Controls"
 msgstr "접근 컨트롤"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3315,32 +3387,6 @@ msgstr "메인 기업"
 msgid "Web Icon File (hover)"
 msgstr "웹 아이콘 파일"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3358,9 +3404,13 @@ msgid ""
 "'object'."
 msgstr "공식 파입을 이용하려면, 변수 '오브젝트'를 이용한 파이썬 표현식을 이용하십시오."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "에러! 재귀적 기업들을 생성할 수는 없습니다."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "생일"
 
@@ -3376,7 +3426,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3484,7 +3534,7 @@ msgid "Malta"
 msgstr "몰타"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3673,7 +3723,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "제목"
@@ -3684,13 +3733,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "셋팅되어 있지 않다면 새로운 자원에 대하여 기본값으로서 동작하라."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "재귀성이 탐지됨."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "모듈 의존성에서 재귀성 오류가 발생!"
@@ -3750,9 +3804,10 @@ msgid "Urdu / اردو"
 msgstr "우르드"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3763,7 +3818,7 @@ msgid "Company Name"
 msgstr "회사 이름"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3782,14 +3837,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML ( 더이상 사용안됨 - 보고서 사용 )"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "기록 규칙"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3818,12 +3896,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3872,19 +3946,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3904,7 +3966,7 @@ msgid "Nauru"
 msgstr "나우루어"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3949,7 +4011,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3968,8 +4030,42 @@ msgid "Technical Data"
 msgstr "기술적 데이터"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4026,13 +4122,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "잘못된 아키텍쳐"
@@ -4048,8 +4149,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4108,32 +4209,9 @@ msgid "Languages"
 msgstr "언어"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4212,7 +4290,6 @@ msgstr "제약"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "디폴트"
 
@@ -4284,6 +4361,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4345,9 +4427,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "수리남"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4427,6 +4516,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4450,6 +4555,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4477,6 +4619,12 @@ msgstr "선택한 언어가 성공적으로 설치되었습니다. 사용자 옵
 msgid "View"
 msgstr "뷰"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4554,12 +4702,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4574,7 +4716,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "우편번호"
@@ -4585,13 +4726,18 @@ msgstr "우편번호"
 msgid "Author"
 msgstr "저자"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - 적절한 날짜 및 시간 표시"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4634,6 +4780,8 @@ msgstr "방향"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "뷰"
 
@@ -4649,7 +4797,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "설치된 혹은 설치 예정 모듈을 제거하려 합니다."
@@ -4742,7 +4890,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4830,7 +4983,7 @@ msgid "System Configuration Done"
 msgstr "시스템 구성 완료"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "필드 %s를 검증하는 동안 오류 발생: %s"
@@ -4945,6 +5098,11 @@ msgstr "마우리티우스"
 msgid "Full Access"
 msgstr "전체 접근"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4958,7 +5116,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4969,7 +5127,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5001,6 +5159,17 @@ msgstr "세네갈"
 msgid "Hungary"
 msgstr "헝가리"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5164,7 +5333,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "컬럼이 이미 존재하기 때문에, 컬럼명을 %s로 변경할 수 없다."
@@ -5180,16 +5349,11 @@ msgid "Decimal Separator"
 msgstr "십진수 분리자"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5233,9 +5397,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "생성자"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5298,15 +5463,6 @@ msgstr "베네수엘라"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5322,6 +5478,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "첨부물 이름"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5405,6 +5566,12 @@ msgstr "카자흐스탄"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "리소스 이름"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5655,7 +5822,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5712,6 +5879,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5827,13 +6003,15 @@ msgid "Bank Type"
 msgstr "은행 타입"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "그룹 이름은 \"-\"로 시작할 수 없습니다."
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5853,7 +6031,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5886,10 +6064,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "리소스 이름"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5922,6 +6099,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "원래 뷰"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5932,7 +6114,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5948,26 +6130,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6100,11 +6262,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6116,8 +6273,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6224,7 +6381,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "구조를 위한 정의된 유형 '%s'의 뷰는 없다."
@@ -6262,7 +6419,7 @@ msgid "Created Menus"
 msgstr "생성된 메뉴"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6289,8 +6446,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6323,6 +6508,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6365,7 +6557,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6457,7 +6649,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6477,23 +6669,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "모바일"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6526,10 +6701,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "모듈"
 
@@ -6603,8 +6778,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6628,8 +6803,8 @@ msgid "Partner Titles"
 msgstr "파트너 제목"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6677,18 +6852,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6793,6 +6963,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "트랜지션"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6887,7 +7064,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6988,12 +7164,6 @@ msgstr "전체 이름"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7035,6 +7205,7 @@ msgstr "여러 문서 상"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7092,7 +7263,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "시작할 액션을 지정하십시오!"
@@ -7112,6 +7283,11 @@ msgstr "카테고리 이름"
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7123,13 +7299,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7160,7 +7341,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7206,7 +7387,6 @@ msgstr "트랜지션"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7226,30 +7406,30 @@ msgid "Child Categories"
 msgstr "자식 카테고리"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "에러"
@@ -7337,6 +7517,11 @@ msgstr ""
 msgid "This Window"
 msgstr "이 창"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7420,6 +7605,21 @@ msgstr "필드"
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7449,11 +7649,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "주소"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7478,7 +7673,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "번지"
@@ -7489,8 +7683,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7569,7 +7778,7 @@ msgid "Change My Preferences"
 msgstr "내 설정 변경"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7656,14 +7865,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7672,7 +7883,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "보안을 위해 패스워드는 반드시 입력해야 합니다!"
@@ -7683,13 +7894,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7708,12 +7919,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "위저드"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7886,7 +8098,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7917,14 +8129,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "경고!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7948,7 +8152,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8065,7 +8268,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8380,7 +8583,7 @@ msgid "Update Modules List"
 msgstr "갱신된 모듈 리스트"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8392,7 +8595,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8402,7 +8605,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8417,6 +8620,17 @@ msgstr "계속"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8456,7 +8670,7 @@ msgid "Mexico"
 msgstr "멕시코"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8478,15 +8692,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "첨부물 이름"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8510,7 +8724,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - 축약된 월 이름"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8522,7 +8736,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "공급자"
@@ -8600,7 +8813,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8628,8 +8841,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "사용자에러"
@@ -8653,7 +8866,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8800,7 +9013,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8839,8 +9052,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "접근에러"
@@ -8914,7 +9127,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8928,7 +9141,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8991,6 +9204,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9089,8 +9307,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9119,13 +9337,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9146,7 +9364,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9194,7 +9412,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9240,6 +9458,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9248,7 +9467,7 @@ msgid "Cancel"
 msgstr "취소"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9267,6 +9486,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9302,7 +9558,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9354,6 +9610,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9396,23 +9657,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9446,7 +9695,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9537,6 +9786,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9741,7 +9995,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9752,13 +10006,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "인터벌 유닛"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "종류"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "이 메쏘드는 더 이상 존재하지 않습니다."
@@ -9926,7 +10185,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9959,6 +10218,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9984,6 +10248,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10073,7 +10342,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "도시"
@@ -10109,13 +10377,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr "쓰기 오퍼레이션을 위해 레코드 ID가 참조하는 필드 이름을 기입하십시오. 비워두면, 이 오브젝트의 활성 ID를 참조합니다."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10174,19 +10449,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10200,6 +10500,8 @@ msgid "Activity"
 msgstr "활동"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10218,7 +10520,12 @@ msgid "Parent Company"
 msgstr "모기업"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10230,13 +10537,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10318,6 +10618,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10387,6 +10707,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10445,9 +10770,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10465,8 +10790,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "서버 액션에서 '레코드 ID' 구성에 문제"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "검증에러"
@@ -10505,13 +10830,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "이메일"
@@ -10522,7 +10846,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10551,36 +10880,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10602,6 +10901,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "에콰도르"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "워크플로우"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10618,16 +10922,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10644,8 +10938,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10671,11 +10965,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10701,7 +10990,7 @@ msgid "Domain"
 msgstr "도메인"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10717,12 +11006,12 @@ msgid "State Name"
 msgstr "상태 이름"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10743,29 +11032,9 @@ msgid "Timezone"
 msgstr "시간대"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10786,7 +11055,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10833,7 +11102,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "번지2"
 
@@ -10857,6 +11125,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10942,19 +11211,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "워크플로우"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10996,22 +11274,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11144,7 +11406,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "고객"
 
@@ -11234,7 +11495,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11284,8 +11545,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11376,7 +11637,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11403,7 +11664,7 @@ msgid "Object"
 msgstr "오브젝트"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11489,7 +11750,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11502,7 +11763,7 @@ msgid "User Ref."
 msgstr "사용자 참조"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11547,8 +11808,6 @@ msgstr "참조 가이드"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11556,7 +11815,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11585,12 +11844,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11697,8 +11950,10 @@ msgid "Selection"
 msgstr "선택"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11735,7 +11990,7 @@ msgid "Action Type"
 msgstr "액션 타입"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11871,11 +12126,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "시간 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "연락처를 숨기려면 활성 필드를 체크하지 마십시오."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11892,7 +12142,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11915,7 +12165,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "정의되지 않은 Get 메쏘드!"
@@ -11956,16 +12206,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "수리남"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12012,73 +12262,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12086,13 +12271,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12269,6 +12489,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12285,7 +12510,7 @@ msgid "Body"
 msgstr "본문"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12333,7 +12558,7 @@ msgid "choose"
 msgstr "선택"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12509,10 +12734,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12544,12 +12773,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12563,7 +12793,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12585,23 +12814,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12669,24 +12881,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12715,6 +12911,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12751,6 +12967,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "알려지지 않음"
@@ -12818,6 +13035,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12907,6 +13129,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12919,7 +13142,7 @@ msgid "Information"
 msgstr "정보"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12950,16 +13173,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13024,6 +13251,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13096,29 +13328,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13166,7 +13375,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13210,9 +13419,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "기록 규칙"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13456,9 +13665,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13485,62 +13699,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13582,17 +13747,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13627,7 +13781,7 @@ msgid "Low"
 msgstr "낮음"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13707,11 +13861,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "전화"
@@ -13726,6 +13879,11 @@ msgstr "접근 메뉴"
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13746,6 +13904,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13782,41 +13964,6 @@ msgstr "오브젝트 관계"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13877,40 +14024,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13999,6 +14114,21 @@ msgstr "뷰 :"
 msgid "View Auto-Load"
 msgstr "뷰 자동 로드"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14041,34 +14171,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14091,9 +14193,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14104,7 +14206,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14130,7 +14262,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14175,7 +14307,7 @@ msgid "Access"
 msgstr "접근"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14208,11 +14340,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "팩스"
@@ -14228,8 +14359,6 @@ msgstr "팩스"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14344,7 +14473,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14356,7 +14485,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14389,7 +14517,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14400,8 +14528,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "경고"
@@ -14427,11 +14555,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14521,7 +14644,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "국가"
@@ -14588,8 +14710,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14617,7 +14743,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14678,6 +14804,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14702,7 +14859,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14741,6 +14898,12 @@ msgstr ""
 msgid "Condition"
 msgstr "조건"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14793,6 +14956,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14817,6 +14987,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14833,7 +15008,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14854,14 +15029,51 @@ msgstr ""
 msgid "General Information"
 msgstr "일반 정보"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14898,7 +15110,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14916,11 +15133,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "기능"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14956,11 +15177,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "배송"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14988,7 +15204,7 @@ msgid "Workflow Instances"
 msgstr "워크플로우 인스턴스"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "파트너: "
@@ -14999,7 +15215,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15065,7 +15281,6 @@ msgstr "이름 익스포트"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15121,6 +15336,9 @@ msgstr ""
 #~ msgid "new"
 #~ msgstr "새로"
 
+#~ msgid "Contact Name"
+#~ msgstr "연락처 이름"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15162,6 +15380,9 @@ msgstr ""
 #~ msgid "Payment Term (short name)"
 #~ msgstr "결제 조건 (짧은 이름)"
 
+#~ msgid "Attached ID"
+#~ msgstr "첨부된 ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "이 액션이 모든 리소스에 나타나려면, 0으로 설정"
 
@@ -15171,6 +15392,9 @@ msgstr ""
 #~ msgstr ""
 #~ "메시지를 지정하세요. 오브젝트 필드를 잉요할 수 있습니다 .e.g. `[[ object.partner_id.name ]]님, 안녕하세요`"
 
+#~ msgid "Attached Model"
+#~ msgstr "첨부된 모델"
+
 #~ msgid "Trigger Name"
 #~ msgstr "트리거 이름"
 
@@ -15302,6 +15526,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW 경로"
 
+#~ msgid "Creator"
+#~ msgstr "생성자"
+
 #, python-format
 #~ msgid "The write method is not implemented on this object !"
 #~ msgstr "쓰기 메쏘드는 이 오브젝트에 적용되지 않음!"
@@ -15378,6 +15605,9 @@ msgstr ""
 #~ msgid "Textile Suppliers"
 #~ msgstr "섬유 공급자"
 
+#~ msgid "Addresses"
+#~ msgstr "주소"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML 식별자"
 
@@ -15471,12 +15701,18 @@ msgstr ""
 #~ msgid "Short Description"
 #~ msgstr "짧은 설명"
 
+#~ msgid "Delivery"
+#~ msgstr "배송"
+
 #~ msgid "Report Header"
 #~ msgstr "리포트 헤더"
 
 #~ msgid "Type fields"
 #~ msgstr "타입 필드"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "연락처를 숨기려면 활성 필드를 체크하지 마십시오."
+
 #~ msgid "Modules to update"
 #~ msgstr "갱신할 모듈들"
 
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index a035765e958..4962ae48636 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:52+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\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: 2012-12-04 04:58+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Data laikas"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -187,41 +187,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Įspėjimas!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -229,7 +203,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -240,7 +214,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -251,7 +225,7 @@ msgid "Swaziland"
 msgstr "Svazilandas"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "sukurtas."
@@ -330,20 +304,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Maksimalus dydis"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -351,11 +311,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontakto pavadinimas"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -414,7 +369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -451,6 +406,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Savininkas"
 
@@ -489,7 +445,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -541,7 +497,7 @@ msgid "Netherlands Antilles"
 msgstr "Nyderlandų Antilai"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -579,8 +535,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -606,26 +562,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -636,8 +572,24 @@ msgstr ""
 "priedo pavadinimų, bus gražintas ankstesnė ataskaita."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -713,14 +665,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Vedliai"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Sukurtų laukų pavadinimai turi prasidėti 'x_'!"
@@ -784,16 +734,14 @@ msgid "Model Description"
 msgstr "Modelio aprašymas"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -822,11 +770,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Jordanas"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -955,10 +913,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -977,7 +933,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1025,16 +981,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobilus tel."
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1131,8 +1080,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1147,12 +1125,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1179,7 +1162,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1207,7 +1237,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1239,14 +1269,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1381,7 +1409,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1403,7 +1431,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1418,7 +1446,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Vedliai"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1544,7 +1579,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1659,18 +1708,13 @@ msgid "On Create"
 msgstr "Sukuriant"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1751,7 +1795,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1792,11 +1836,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Prisegto ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1811,7 +1850,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1852,6 +1891,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1928,16 +1972,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Prisegto modelis"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1992,7 +2031,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2016,11 +2055,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2032,7 +2071,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adreso tipas"
 
@@ -2070,11 +2108,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2207,6 +2240,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2240,12 +2278,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2293,6 +2336,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2344,7 +2396,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2422,7 +2474,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Sąskaita faktūra"
 
@@ -2469,11 +2520,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2590,8 +2636,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2670,7 +2727,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2729,6 +2786,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2737,7 +2807,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2823,7 +2893,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2853,7 +2923,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2918,22 +2988,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3030,12 +3100,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3052,17 +3122,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3072,7 +3144,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3123,34 +3195,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3189,7 +3233,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3201,6 +3245,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Banko sąskaitos tipas"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3237,7 +3309,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3274,7 +3346,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3302,32 +3374,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3345,9 +3391,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Gimimo diena"
 
@@ -3363,7 +3413,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3471,7 +3521,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3660,7 +3710,6 @@ msgstr "Ataskaitos"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Tipas"
@@ -3671,13 +3720,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3737,9 +3791,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3750,7 +3805,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3769,13 +3824,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3805,12 +3883,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3859,19 +3933,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3889,7 +3951,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3934,7 +3996,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3953,8 +4015,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4011,13 +4107,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "UAB"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4033,8 +4134,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4093,32 +4194,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4197,7 +4275,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Numatytas"
 
@@ -4269,6 +4346,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4330,8 +4412,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4412,6 +4501,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4435,6 +4540,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4462,6 +4604,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4539,12 +4687,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4559,7 +4701,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Pašto indeksas"
@@ -4570,13 +4711,18 @@ msgstr "Pašto indeksas"
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4619,6 +4765,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4634,7 +4782,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4727,7 +4875,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4815,7 +4968,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4930,6 +5083,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4943,7 +5101,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4954,7 +5112,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4986,6 +5144,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5149,7 +5318,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5165,16 +5334,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5215,9 +5379,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Sukūrė"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5280,15 +5445,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5304,6 +5460,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Priedo pavadinimas"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5387,6 +5548,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Resurso pavadinimas"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5637,7 +5804,7 @@ msgid "title"
 msgstr "kreipinys"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5694,6 +5861,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5809,13 +5985,15 @@ msgid "Bank Type"
 msgstr "Banko tipas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5835,7 +6013,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5868,10 +6046,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Resurso pavadinimas"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5904,6 +6081,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5914,7 +6096,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5930,26 +6112,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6082,11 +6244,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6098,8 +6255,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6206,7 +6363,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6244,7 +6401,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6271,8 +6428,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6305,6 +6490,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6347,7 +6539,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6439,7 +6631,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6459,23 +6651,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobilus tel."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6508,10 +6683,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6585,8 +6760,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6610,8 +6785,8 @@ msgid "Partner Titles"
 msgstr "Partnerio kreipiniai"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6659,18 +6834,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6775,6 +6945,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6869,7 +7046,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Savivaldybė"
@@ -6970,12 +7146,6 @@ msgstr "Pilnas pavadinimas"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7017,6 +7187,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7074,7 +7245,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7094,6 +7265,11 @@ msgstr "Kategorijos pavadinimas"
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7105,13 +7281,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7142,7 +7323,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7188,7 +7369,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7208,30 +7388,30 @@ msgid "Child Categories"
 msgstr "Vaikinės kategorijos"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7319,6 +7499,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7402,6 +7587,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7431,11 +7631,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresai"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7460,7 +7655,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Gatvė"
@@ -7471,9 +7665,24 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Dešinysis tėvinis"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7551,7 +7760,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7638,14 +7847,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7654,7 +7865,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7665,13 +7876,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7690,12 +7901,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7868,7 +8080,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7897,14 +8109,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Įspėjimas!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7928,7 +8132,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8043,7 +8246,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8358,7 +8561,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8370,7 +8573,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8380,7 +8583,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8395,6 +8598,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8434,7 +8648,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8456,15 +8670,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Priedo pavadinimas"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8488,7 +8702,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8500,7 +8714,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Tiekėjas"
@@ -8578,7 +8791,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8606,8 +8819,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8631,7 +8844,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8778,7 +8991,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8817,8 +9030,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8892,7 +9105,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8906,7 +9119,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8969,6 +9182,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9067,8 +9285,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9097,13 +9315,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9124,7 +9342,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9172,7 +9390,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9218,6 +9436,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9226,7 +9445,7 @@ msgid "Cancel"
 msgstr "Atsisakyti"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9245,6 +9464,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9280,7 +9536,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9332,6 +9588,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9374,23 +9635,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9424,7 +9673,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9515,6 +9764,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9719,7 +9973,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9730,13 +9984,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9904,7 +10163,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9937,6 +10196,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9962,6 +10226,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10051,7 +10320,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Miestas"
@@ -10087,13 +10355,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10154,19 +10429,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10180,6 +10480,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10198,7 +10500,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10210,13 +10517,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10298,6 +10598,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10367,6 +10687,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10425,9 +10750,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10445,8 +10770,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10485,13 +10810,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "El. paštas"
@@ -10502,7 +10826,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10531,36 +10860,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10582,6 +10881,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ekvadoras"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10598,16 +10902,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10624,8 +10918,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10651,11 +10945,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10681,7 +10970,7 @@ msgid "Domain"
 msgstr "Sritis"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10697,12 +10986,12 @@ msgid "State Name"
 msgstr "Savivaldybės pavadinimas"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10723,29 +11012,9 @@ msgid "Timezone"
 msgstr "Laiko juosta"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10766,7 +11035,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10813,7 +11082,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Gatvė 2"
 
@@ -10837,6 +11105,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10922,19 +11191,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10976,22 +11254,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11124,7 +11386,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Klientas"
 
@@ -11214,7 +11475,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11264,8 +11525,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11356,7 +11617,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11383,7 +11644,7 @@ msgid "Object"
 msgstr "Objektas"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11469,7 +11730,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11482,7 +11743,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11527,8 +11788,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11536,7 +11795,7 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11565,12 +11824,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11677,8 +11930,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11715,7 +11970,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11851,11 +12106,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Panaikinkite aktyvaus lauko žymėjimą norint paslėpti kontaktą."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11872,7 +12122,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11895,7 +12145,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11936,16 +12186,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Dvejetainis failas arba išorinis URL adresas"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -11992,73 +12242,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12066,13 +12251,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12249,6 +12469,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12265,7 +12490,7 @@ msgid "Body"
 msgstr "Tekstas"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12313,7 +12538,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12489,10 +12714,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12524,12 +12753,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12543,7 +12773,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12565,23 +12794,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12649,24 +12861,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12695,6 +12891,26 @@ msgstr ""
 msgid "ltd"
 msgstr "uab"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12731,6 +12947,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12798,6 +13015,11 @@ msgstr "Adresų knyga"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12887,6 +13109,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12899,7 +13122,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12930,16 +13153,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Dešinysis tėvinis"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13004,6 +13231,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13076,29 +13308,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13146,7 +13355,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13190,8 +13399,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13436,9 +13645,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13465,62 +13679,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13562,17 +13727,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13607,7 +13761,7 @@ msgid "Low"
 msgstr "Žemas"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13687,11 +13841,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefonas"
@@ -13706,6 +13859,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13726,6 +13884,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13762,41 +13944,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13857,40 +14004,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13979,6 +14094,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14021,34 +14151,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14071,9 +14173,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14084,7 +14186,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14110,7 +14242,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14155,7 +14287,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14188,11 +14320,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faksas"
@@ -14208,8 +14339,6 @@ msgstr "Faksas"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14324,7 +14453,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14336,7 +14465,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14374,7 +14502,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14385,8 +14513,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Įspėjimas"
@@ -14412,11 +14540,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14506,7 +14629,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Šalis"
@@ -14573,8 +14695,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14602,7 +14728,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14663,6 +14789,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14687,7 +14844,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14726,6 +14883,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14778,6 +14941,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14802,6 +14972,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14818,7 +14993,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14839,14 +15014,51 @@ msgstr ""
 msgid "General Information"
 msgstr "Bendra informacija"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14883,7 +15095,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14901,11 +15118,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcija"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14941,11 +15162,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Pristatymas"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14973,7 +15189,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneriai: "
@@ -14984,7 +15200,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15050,7 +15266,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15104,6 +15319,9 @@ msgstr ""
 #~ msgid "new"
 #~ msgstr "naujas"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontakto pavadinimas"
+
 #~ msgid "E-Mail"
 #~ msgstr "El. paštas"
 
@@ -15140,6 +15358,12 @@ msgstr ""
 #~ msgid "Request Date"
 #~ msgstr "Užklausos data"
 
+#~ msgid "Attached ID"
+#~ msgstr "Prisegto ID"
+
+#~ msgid "Attached Model"
+#~ msgstr "Prisegto modelis"
+
 #~ msgid "References"
 #~ msgstr "Nuorodos"
 
@@ -15208,6 +15432,9 @@ msgstr ""
 #~ msgid "Event"
 #~ msgstr "Įvykis"
 
+#~ msgid "Creator"
+#~ msgstr "Sukūrė"
+
 #~ msgid "General Description"
 #~ msgstr "Bendras aprašymas"
 
@@ -15279,6 +15506,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "sąskaitos numeris"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresai"
+
 #~ msgid "SMS Message"
 #~ msgstr "SMS žinutė"
 
@@ -15354,6 +15584,12 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Laukų tipas"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Panaikinkite aktyvaus lauko žymėjimą norint paslėpti kontaktą."
+
+#~ msgid "Binary File or external URL"
+#~ msgstr "Dvejetainis failas arba išorinis URL adresas"
+
 #~ msgid "Send Email"
 #~ msgstr "Siųsti laišką"
 
@@ -15403,6 +15639,9 @@ msgstr ""
 #~ msgid "Localisation"
 #~ msgstr "Lokalizavimas"
 
+#~ msgid "Delivery"
+#~ msgstr "Pristatymas"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "BIC/Swift kodas"
 
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index edd890e35a6..9f2607fb950 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:31+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:57+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Datums/Laiks"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -188,41 +188,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Uzmanību!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -230,7 +204,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -241,7 +215,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -252,7 +226,7 @@ msgid "Swaziland"
 msgstr "Svazilenda"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "izveidots."
@@ -331,20 +305,6 @@ msgstr "Uzņēmums, kur glabāt aktīvo ierakstu"
 msgid "Max. Size"
 msgstr "Max. Izmērs"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -352,11 +312,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontakts (Vārds)"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -415,7 +370,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -452,6 +407,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Īpašnieks"
 
@@ -490,7 +446,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -542,7 +498,7 @@ msgid "Netherlands Antilles"
 msgstr "Nīderlandes Antiļu salas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -582,9 +538,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Oriģinālais Skatījums"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Idejas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -609,26 +565,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosniešu / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -639,9 +575,25 @@ msgstr ""
 "atgriezta iepriekšējā atskaite."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -716,14 +668,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Vedņi"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Speciālo lauku nosaukumiem jāsākas ar 'x_' !"
@@ -787,16 +737,14 @@ msgid "Model Description"
 msgstr "Modeļa Apraksts"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -825,11 +773,21 @@ msgstr "Frāze, kas palaidīs notikumu"
 msgid "Jordan"
 msgstr "Jordānija"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -961,14 +919,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Nodrošina lauka nosaukumu, uz kuru norāda ieraksta identifikators "
-"rakstīšanas operācijām. Ja tas ir tukšs, tad tas ir objekta tekošais "
-"aktīvais identifikators."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua-Jaungvineja"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -987,7 +940,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1035,16 +988,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spāņu (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobilais tālr."
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1141,9 +1087,38 @@ msgid "Mongolia"
 msgstr "Mongolija"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1157,12 +1132,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1189,7 +1169,54 @@ msgid "Username"
 msgstr "Lietotājvārds"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1217,7 +1244,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1249,14 +1276,12 @@ msgid "South Korea"
 msgstr "Dienvidkoreja (Korejas Republika)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Pārejas"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1395,7 +1420,7 @@ msgid "Marshall Islands"
 msgstr "Māršala Salas"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1417,7 +1442,7 @@ msgid "Search"
 msgstr "Meklēt"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1432,7 +1457,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Vedņi"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Darbība atcelta"
@@ -1558,7 +1590,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Valoda pēc \"%s\" koda nav atrasta"
@@ -1677,18 +1723,13 @@ msgid "On Create"
 msgstr "Pie Izveides"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1769,7 +1810,7 @@ msgid "East Timor"
 msgstr "Austrumtimora"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1810,11 +1851,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Pievienotais ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1829,7 +1865,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1870,6 +1906,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Lasīšanas Pieejas"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1946,16 +1987,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Pievienotais Modelis"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2010,7 +2046,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Nevar dzēst root lietotāju!"
@@ -2034,11 +2070,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopēt)"
@@ -2050,7 +2086,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adreses Tips"
 
@@ -2088,11 +2123,6 @@ msgstr "Pilns ceļš"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Idejas"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2228,6 +2258,11 @@ msgstr "Jaunināto moduļu skaits"
 msgid "Method"
 msgstr "Metode"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2261,12 +2296,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2314,6 +2354,15 @@ msgstr "Beliza"
 msgid "Add or not the corporate RML header"
 msgstr "Pievienot vai nepievienot korporatīvo RML augšiestarpinājumu"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2365,7 +2414,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2446,7 +2495,6 @@ msgstr "Santome un Prinsipi"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Rēķins"
 
@@ -2493,11 +2541,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2615,9 +2658,20 @@ msgid "Default limit for the list view"
 msgstr "Noklusētais ierobežojums saraksta skatījumam."
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua-Jaungvineja"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2695,7 +2749,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2754,6 +2808,19 @@ msgstr "Lauka Sasaistes"
 msgid "Export Translations"
 msgstr "Eksportēt tulkojumus"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2762,7 +2829,7 @@ msgid "Manager"
 msgstr "Menedžeris"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2848,7 +2915,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2878,7 +2945,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2945,22 +3012,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Kļūda!"
@@ -3054,12 +3121,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3076,17 +3143,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3096,7 +3165,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Neizdodas jaunināt moduli '%s'. Tas nav uzinstalēts."
@@ -3147,34 +3216,6 @@ msgstr "Konfigurācijas parametri"
 msgid "Invalid arguments"
 msgstr "Nederīgi argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3213,7 +3254,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3225,6 +3266,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Bankas Konta Tips"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3261,7 +3330,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signāls (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3297,7 +3366,7 @@ msgid "Access Controls"
 msgstr "Pieejas Kontrole"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3325,32 +3394,6 @@ msgstr "Galvenais Uzņēmums"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3370,9 +3413,13 @@ msgstr ""
 "Ja izmantojat datu tipu \"formula\", tad jāizmanto python izteiksmes "
 "mainīgais 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Dzimšanas Datums"
 
@@ -3388,7 +3435,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3496,7 +3543,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3685,7 +3732,6 @@ msgstr "Atskaites"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Nosaukums"
@@ -3696,13 +3742,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Noskaidrots, ka objekts ir rekursīvs."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekursijas kļūda atkarīgajos moduļos."
@@ -3762,9 +3813,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu valoda / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3775,7 +3827,7 @@ msgid "Company Name"
 msgstr "Uzņēmuma nosaukums"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3794,14 +3846,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Ierakstu noteikumi"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Senpjēra un Mikelona"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3830,13 +3905,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3884,19 +3955,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3916,7 +3975,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3961,7 +4020,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3980,9 +4039,43 @@ msgid "Technical Data"
 msgstr "Tehniskie Dati"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4038,13 +4131,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "SIA"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4060,8 +4158,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4120,33 +4218,10 @@ msgid "Languages"
 msgstr "Valodas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4224,7 +4299,6 @@ msgstr "Ierobežojums"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Noklusētais"
 
@@ -4296,6 +4370,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4357,9 +4436,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinama"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4439,6 +4525,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4462,6 +4564,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4489,6 +4628,12 @@ msgstr ""
 msgid "View"
 msgstr "Skats"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4566,12 +4711,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4586,7 +4725,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Zip"
@@ -4597,13 +4735,18 @@ msgstr "Zip"
 msgid "Author"
 msgstr "Autors"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Iestatīt kā darāmo"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Atbilstošais datuma un laika attēlojums."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4646,6 +4789,8 @@ msgstr "Virziens"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Skatījumi"
 
@@ -4661,7 +4806,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4755,7 +4900,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4843,7 +4993,7 @@ msgid "System Configuration Done"
 msgstr "Sistēmas konfigurācija pabeigta"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Lauku %s: %s pārbaudes kļūda!"
@@ -4958,6 +5108,11 @@ msgstr "Maurīcija"
 msgid "Full Access"
 msgstr "Pilna piekļuve"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4971,7 +5126,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4982,7 +5137,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5014,6 +5169,17 @@ msgstr "Senegāla"
 msgid "Hungary"
 msgstr "Ungārija"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5177,7 +5343,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5193,16 +5359,11 @@ msgid "Decimal Separator"
 msgstr "Decimālatdalītājs"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5243,9 +5404,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Izveidotājs"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5308,15 +5470,6 @@ msgstr "Venecuēla"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5332,6 +5485,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Pievienojuma nosaukums"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5415,6 +5573,12 @@ msgstr "Kazahstāna"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "Copy text \t %w - nedēļas dienas numurs [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Resursa Nosaukums"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5665,7 +5829,7 @@ msgid "title"
 msgstr "uzruna"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5722,6 +5886,15 @@ msgstr "Produkti"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5837,13 +6010,15 @@ msgid "Bank Type"
 msgstr "Bankas Tips"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Grupas nosaukums nedrīkst sākties ar \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5863,7 +6038,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gudžaratu valoda / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5896,10 +6071,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Resursa Nosaukums"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5932,6 +6106,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Oriģinālais Skatījums"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5942,7 +6121,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5958,26 +6137,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6110,11 +6269,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6126,8 +6280,8 @@ msgid "Malaysia"
 msgstr "Malaizija"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6234,7 +6388,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6272,7 +6426,7 @@ msgid "Created Menus"
 msgstr "Izveidotās Izvēlnes"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6299,9 +6453,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Iestatīt kā darāmo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6333,6 +6515,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6375,7 +6564,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6467,7 +6656,7 @@ msgid "Israel"
 msgstr "Izraēla"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6487,23 +6676,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobilais tālr."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6536,10 +6708,10 @@ msgstr "Atskaites"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduļi"
 
@@ -6613,9 +6785,9 @@ msgid "United Kingdom"
 msgstr "Apvienotā Karaliste"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6638,8 +6810,8 @@ msgid "Partner Titles"
 msgstr "Partneru Darbības Formas"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6687,18 +6859,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6805,6 +6972,13 @@ msgstr "Moduļa fails veiksmīgi importēts!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Pārejas"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6899,7 +7073,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Fed. Valsts"
@@ -7000,12 +7173,6 @@ msgstr "Pilns Nosaukums"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7047,6 +7214,7 @@ msgstr "Daudziem Dokumentiem"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7104,7 +7272,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Lūdzu norādiet darbību, kuru palaist!"
@@ -7124,6 +7292,11 @@ msgstr "Kategorijas Nosaukums"
 msgid "Northern Mariana Islands"
 msgstr "Ziemeļu Marianas Salas"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7135,13 +7308,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7172,7 +7350,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7218,7 +7396,6 @@ msgstr "Pāreja"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7238,30 +7415,30 @@ msgid "Child Categories"
 msgstr "Apakškategorijas"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Kļūda"
@@ -7349,6 +7526,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Šis Logs"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7433,6 +7615,21 @@ msgstr "Lauki"
 msgid "Employees"
 msgstr "Darbinieki"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7462,11 +7659,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adreses"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7491,7 +7683,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Iela"
@@ -7502,8 +7693,23 @@ msgid "Yugoslavia"
 msgstr "Dienvidslāvija"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7582,7 +7788,7 @@ msgid "Change My Preferences"
 msgstr "Izmainīt manus Uzstādījumus"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Procesa definīcijā nepareizs modeļa nosaukums."
@@ -7669,14 +7875,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7685,7 +7893,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7696,13 +7904,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7724,12 +7932,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Vednis"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7902,7 +8111,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7933,14 +8142,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Uzmanību!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7964,7 +8165,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8082,7 +8282,7 @@ msgid "Nigeria"
 msgstr "Nigērija"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8397,7 +8597,7 @@ msgid "Update Modules List"
 msgstr "Jaunināt moduļu sarakstu"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8409,7 +8609,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8419,7 +8619,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8434,6 +8634,17 @@ msgstr "Turpināt"
 msgid "Thai / ภาษาไทย"
 msgstr "Taju valoda / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8473,7 +8684,7 @@ msgid "Mexico"
 msgstr "Meksika"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8495,15 +8706,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Pievienojuma nosaukums"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8527,7 +8738,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b -  saīsināts mēneša nosaukums"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8539,7 +8750,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Piegādātājs"
@@ -8617,7 +8827,7 @@ msgid "Selectable"
 msgstr "Izvēlējams"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8645,8 +8855,8 @@ msgid "Iteration"
 msgstr "Iterācija"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Lietotāja Kļūda"
@@ -8670,7 +8880,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8817,7 +9027,7 @@ msgid "Reunion (French)"
 msgstr "Reinjona"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8856,8 +9066,8 @@ msgid "Solomon Islands"
 msgstr "Zālamana Salas"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Pieejas Kļūda"
@@ -8931,7 +9141,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8945,7 +9155,7 @@ msgid "Ukraine"
 msgstr "Ukraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9008,6 +9218,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flāmu (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vjetnamiešu / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9106,9 +9321,9 @@ msgid "Custom Shortcuts"
 msgstr "Pielāgotas saīsnes"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vjetnamiešu / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9136,13 +9351,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9163,7 +9378,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9211,7 +9426,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Modulis %s neeksistē!"
@@ -9257,6 +9472,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9265,7 +9481,7 @@ msgid "Cancel"
 msgstr "Atcelt"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9284,6 +9500,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9319,7 +9572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9371,6 +9624,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Stunda (12-stundu) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9413,23 +9671,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9463,7 +9709,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9555,6 +9801,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9759,7 +10010,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9770,13 +10021,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Intervāla Vienība"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tips"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Šī funkcija vairs neeksistē"
@@ -9945,7 +10201,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9978,6 +10234,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10003,6 +10264,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10092,7 +10358,6 @@ msgstr "%m - Mēnēsis pēc kārtas [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Pilsēta"
@@ -10128,13 +10393,23 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Igauņu / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Nodrošina lauka nosaukumu, uz kuru norāda ieraksta identifikators "
+"rakstīšanas operācijām. Ja tas ir tukšs, tad tas ir objekta tekošais "
+"aktīvais identifikators."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 vai jaunāka versija"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10194,19 +10469,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10220,6 +10520,8 @@ msgid "Activity"
 msgstr "Aktivitāte"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10238,7 +10540,12 @@ msgid "Parent Company"
 msgstr "Virsuzņēmums"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10250,13 +10557,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10338,6 +10638,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10409,6 +10729,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Secību tipi"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10467,9 +10792,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10487,8 +10812,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problēma konfigurācijā `Record Id` Servera Darbības kontekstā!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Validācijas Kļūda"
@@ -10527,13 +10852,12 @@ msgid "Laos"
 msgstr "Laosa"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-pasts"
@@ -10544,7 +10868,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10575,36 +10904,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10626,6 +10925,11 @@ msgstr "Cita slēgtā licence"
 msgid "Ecuador"
 msgstr "Ekvadora"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "darbaplūsma"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10642,16 +10946,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10668,8 +10962,8 @@ msgid "Cascade"
 msgstr "Kaskāde"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10695,11 +10989,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10725,7 +11014,7 @@ msgid "Domain"
 msgstr "Filtrs"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10741,12 +11030,12 @@ msgid "State Name"
 msgstr "Štata Nosaukums"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10767,30 +11056,10 @@ msgid "Timezone"
 msgstr "Laika josla"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10810,7 +11079,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10857,7 +11126,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Iela2"
 
@@ -10881,6 +11149,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10966,19 +11235,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "darbaplūsma"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11020,22 +11298,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11168,7 +11430,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Klients"
 
@@ -11258,7 +11519,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11308,8 +11569,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11400,7 +11661,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11427,7 +11688,7 @@ msgid "Object"
 msgstr "Objekts"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11513,7 +11774,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11526,7 +11787,7 @@ msgid "User Ref."
 msgstr "Lietotāja Atsauce"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11571,8 +11832,6 @@ msgstr "Lietotāja rokasgrāmata"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11580,7 +11839,7 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11609,12 +11868,6 @@ msgstr "Folklenda Salas"
 msgid "Lebanon"
 msgstr "Libāna"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11721,8 +11974,10 @@ msgid "Selection"
 msgstr "Atlase"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11759,7 +12014,7 @@ msgid "Action Type"
 msgstr "Darbības Tips"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11895,11 +12150,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Stunda 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Atcelt iezīmējumu aktīvajam laukam, lai noslēptu kontaktu."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11916,7 +12166,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11939,7 +12189,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "nedefinēta get funkcija!"
@@ -11980,16 +12230,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Datne vai ārēja saite"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Mainīt paroli"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinama"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12036,91 +12286,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Atdalītāja formātam jābūt kā [,n], kur 0 < n. Skaitlis -1 norāda, ka "
-"atdalīšana beigusies, piem. [3,2,-1] attēlos skaitli 106500 kā 1,06,500, "
-"toties [1,2,-1] attēlos to kā 106,50,0. [3] attēlos to kā 106,500. \",\" "
-"visos gadījumos ir kā tūkstošu atdalītājs."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12299,6 +12515,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12315,7 +12536,7 @@ msgid "Body"
 msgstr "Galvenā daļa"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12363,7 +12584,7 @@ msgid "choose"
 msgstr "izvēlēties"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12539,10 +12760,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12574,12 +12799,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12593,7 +12819,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Dažādi"
@@ -12615,23 +12840,6 @@ msgstr ""
 msgid "China"
 msgstr "Ķīna"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12699,25 +12907,9 @@ msgid "Bulgaria"
 msgstr "Bulgārija"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12745,6 +12937,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12781,6 +12993,7 @@ msgstr "Slovāku / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "nav zināms"
@@ -12848,6 +13061,11 @@ msgstr "Adrešu grāmata"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12937,6 +13155,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12949,7 +13168,7 @@ msgid "Information"
 msgstr "Informācija"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12980,16 +13199,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Jaunināt Moduļu Sarakstu"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13054,6 +13277,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13126,29 +13354,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13196,7 +13401,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13240,9 +13445,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Ierakstu noteikumi"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13486,9 +13691,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13515,63 +13725,14 @@ msgid "System Configuration done"
 msgstr "Sistēmas Konfigurācija Pabeigta"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Tērksas un Kaikosas"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13612,17 +13773,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13657,7 +13807,7 @@ msgid "Low"
 msgstr "Zems"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13737,11 +13887,10 @@ msgid "El Salvador"
 msgstr "Salvadora"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefons"
@@ -13756,6 +13905,11 @@ msgstr "Pieejas Izvēlne"
 msgid "Thailand"
 msgstr "Taizeme"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13776,6 +13930,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumāņu / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13812,41 +13990,6 @@ msgstr "Objekta Saite"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13907,40 +14050,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14029,6 +14140,21 @@ msgstr "Skatījums:"
 msgid "View Auto-Load"
 msgstr "Skatīt Auto-Ielādi"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14071,34 +14197,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persiešu / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14121,9 +14219,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14134,7 +14232,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14160,7 +14288,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14205,7 +14333,7 @@ msgid "Access"
 msgstr "Pieeja"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14238,11 +14366,10 @@ msgid "Bahrain"
 msgstr "Bahreina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fakss"
@@ -14258,8 +14385,6 @@ msgstr "Fakss"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14374,7 +14499,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14386,7 +14511,6 @@ msgstr "Jamaika"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14423,7 +14547,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14434,8 +14558,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaidžāna"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Brīdinājums"
@@ -14461,11 +14585,6 @@ msgstr "Britu Virdžīnu salas"
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Senpjēra un Mikelona"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14555,7 +14674,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Valsts"
@@ -14624,9 +14742,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spāņu (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Atdalītāja formātam jābūt kā [,n], kur 0 < n. Skaitlis -1 norāda, ka "
+"atdalīšana beigusies, piem. [3,2,-1] attēlos skaitli 106500 kā 1,06,500, "
+"toties [1,2,-1] attēlos to kā 106,50,0. [3] attēlos to kā 106,500. \",\" "
+"visos gadījumos ir kā tūkstošu atdalītājs."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14653,7 +14779,7 @@ msgid "Japan"
 msgstr "Japāna"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14714,6 +14840,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14738,7 +14895,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14777,6 +14934,12 @@ msgstr ""
 msgid "Condition"
 msgstr "Nosacījums"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14829,6 +14992,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Horvātija"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14853,6 +15023,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14869,7 +15044,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14890,15 +15065,52 @@ msgstr "Sjerraleone"
 msgid "General Information"
 msgstr "Vispārīgā informācija"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Tērksas un Kaikosas"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14934,7 +15146,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14952,11 +15169,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcija"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14992,11 +15213,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Sūtījums"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15024,7 +15240,7 @@ msgid "Workflow Instances"
 msgstr "Darbaplūsmas stāvokļi"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneri: "
@@ -15035,7 +15251,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15101,7 +15317,6 @@ msgstr "Eksporta Nosaukums"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15165,6 +15380,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Daudziem doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontakts (Vārds)"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15230,6 +15448,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Pievienotais ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Atstāt vērtību 0, ja vēlaties lai darbība attainotos visos resursos"
 
@@ -15240,6 +15461,9 @@ msgstr ""
 #~ "Norādiet ziņojumu. Var lietot objektu laukus - piem. `Cien. [[ "
 #~ "object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Pievienotais Modelis"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Darbības Izraisītāja Nosaukums"
 
@@ -15400,6 +15624,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW atrašanās vieta"
 
+#~ msgid "Creator"
+#~ msgstr "Izveidotājs"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15495,6 +15722,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Adreses"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML identifikators"
 
@@ -15621,6 +15851,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Ielādēt Oficiālu tulkojumu"
 
+#~ msgid "Delivery"
+#~ msgstr "Sūtījums"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Atvērtā Koda Servisa kompānija"
 
@@ -15630,6 +15863,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Ievades lauki"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Atcelt iezīmējumu aktīvajam laukam, lai noslēptu kontaktu."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Kongo Demokrātiskā Republika"
 
@@ -16123,6 +16359,9 @@ msgstr ""
 #~ msgid "Created"
 #~ msgstr "Izveidots"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Datne vai ārēja saite"
+
 #~ msgid "Emails"
 #~ msgstr "E-pasti"
 
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index f7e56c62fa3..b0b1742a15c 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-20 15:20+0000\n"
 "Last-Translator: Slavko Zivkovic <slavko.zivkovic@mi-c3.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:58+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -191,41 +191,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Предупредување!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -235,7 +209,7 @@ msgstr ""
 "молиме менувајте ги преку Python код, пожелно преку прилагоден додаток."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Грешка при ограничувањето"
@@ -246,7 +220,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -257,7 +231,7 @@ msgid "Swaziland"
 msgstr "Свазиленд"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "креирано."
@@ -336,20 +310,6 @@ msgstr "Компанија за зачувување на тековниот з
 msgid "Max. Size"
 msgstr "Макс. големина"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -357,11 +317,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Име на контактот"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -420,7 +375,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -457,6 +412,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Сопственик"
 
@@ -495,7 +451,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -547,7 +503,7 @@ msgid "Netherlands Antilles"
 msgstr "Холандски антили"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -587,8 +543,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -614,26 +570,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Босански / Bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -644,8 +580,24 @@ msgstr ""
 "име на приврзокот, ќе биде вратен претходниот извештај."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -721,14 +673,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Прилагодените полиња мора да имаат име кое почнува со 'x_' !"
@@ -792,16 +742,14 @@ msgid "Model Description"
 msgstr "Опис на моделот"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -831,11 +779,21 @@ msgstr ""
 msgid "Jordan"
 msgstr "Јордан"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Нареден датум на извршување за селектираниот процес"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -964,10 +922,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -988,7 +944,7 @@ msgid "Email Preferences"
 msgstr "Подесувања за Електронска Пошта"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1036,16 +992,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Шшански (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Мобилен"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1142,8 +1091,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1159,12 +1137,17 @@ msgstr ""
 "Корисниците додадени во оваа група автоматски се додадени во следните групи."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1191,7 +1174,54 @@ msgid "Username"
 msgstr "Корисничко име"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1221,7 +1251,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Тестот за поврзување е неуспешен!"
@@ -1253,14 +1283,12 @@ msgid "South Korea"
 msgstr "Јужна Кореа"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Транзиции"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1395,7 +1423,7 @@ msgid "Marshall Islands"
 msgstr "Маршалови острови"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Менување на моделот на полето е забрането!"
@@ -1417,7 +1445,7 @@ msgid "Search"
 msgstr "Пребарај"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1432,7 +1460,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Операцијата е прекината!"
@@ -1558,7 +1593,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Јазик со кодот  \"%s\" не постои"
@@ -1673,18 +1722,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1765,7 +1809,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1806,11 +1850,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1825,7 +1864,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1866,6 +1905,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1942,16 +1986,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2006,7 +2045,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2030,11 +2069,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2046,7 +2085,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2084,11 +2122,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2221,6 +2254,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2254,12 +2292,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2307,6 +2350,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2358,7 +2410,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2436,7 +2488,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2483,11 +2534,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2604,8 +2650,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2684,7 +2741,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2743,6 +2800,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2751,7 +2821,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2837,7 +2907,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2867,7 +2937,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2932,22 +3002,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3041,12 +3111,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3063,17 +3133,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3083,7 +3155,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3134,34 +3206,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3200,7 +3244,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3212,6 +3256,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3248,7 +3320,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3282,7 +3354,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3310,32 +3382,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3353,9 +3399,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3371,7 +3421,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3479,7 +3529,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3668,7 +3718,6 @@ msgstr "Известувања"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3679,13 +3728,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3745,9 +3799,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3758,7 +3813,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3777,13 +3832,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3813,12 +3891,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3867,19 +3941,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3897,7 +3959,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3942,7 +4004,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3961,8 +4023,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4019,13 +4115,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4041,8 +4142,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4101,32 +4202,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4205,7 +4283,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4277,6 +4354,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4338,8 +4420,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4420,6 +4509,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4443,6 +4548,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4470,6 +4612,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4547,12 +4695,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4567,7 +4709,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4578,13 +4719,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4627,6 +4773,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4642,7 +4790,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4735,7 +4883,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4823,7 +4976,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4938,6 +5091,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4951,7 +5109,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4962,7 +5120,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4994,6 +5152,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5157,7 +5326,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5173,16 +5342,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5223,8 +5387,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5288,15 +5453,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5312,6 +5468,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5395,6 +5556,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5645,7 +5812,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5702,6 +5869,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5817,13 +5993,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5843,7 +6021,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5876,9 +6054,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5912,6 +6089,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5922,7 +6104,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5938,26 +6120,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6090,11 +6252,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6106,8 +6263,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6214,7 +6371,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6252,7 +6409,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6279,8 +6436,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6313,6 +6498,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6355,7 +6547,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6447,7 +6639,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6467,23 +6659,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Мобилен"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6516,10 +6691,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6593,8 +6768,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6618,8 +6793,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6667,18 +6842,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6783,6 +6953,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Транзиции"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6877,7 +7054,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6978,12 +7154,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7025,6 +7195,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7082,7 +7253,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7102,6 +7273,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7113,13 +7289,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7150,7 +7331,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7196,7 +7377,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7216,30 +7396,30 @@ msgid "Child Categories"
 msgstr "Под-Категорија"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7327,6 +7507,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7410,6 +7595,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7439,11 +7639,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7468,7 +7663,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7479,8 +7673,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7559,7 +7768,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7646,14 +7855,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7662,7 +7873,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7674,13 +7885,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7699,12 +7910,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7877,7 +8089,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7906,14 +8118,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Предупредување!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7937,7 +8141,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8052,7 +8255,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8367,7 +8570,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8379,7 +8582,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8389,7 +8592,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8404,6 +8607,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8443,7 +8657,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8465,14 +8679,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8497,7 +8711,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8509,7 +8723,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8587,7 +8800,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8615,8 +8828,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8640,7 +8853,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8787,7 +9000,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8826,8 +9039,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8901,7 +9114,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8915,7 +9128,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8978,6 +9191,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9076,8 +9294,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9106,13 +9324,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9133,7 +9351,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9181,7 +9399,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9227,6 +9445,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9235,7 +9454,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9254,6 +9473,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9289,7 +9545,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9341,6 +9597,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9383,23 +9644,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9433,7 +9682,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9524,6 +9773,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9728,7 +9982,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9739,13 +9993,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9913,7 +10172,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9946,6 +10205,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9971,6 +10235,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10060,7 +10329,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10096,13 +10364,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10161,19 +10436,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10187,6 +10487,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10205,7 +10507,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10217,13 +10524,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10305,6 +10605,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10374,6 +10694,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10432,9 +10757,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10452,8 +10777,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10492,13 +10817,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10509,7 +10833,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10538,36 +10867,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10589,6 +10888,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10605,16 +10909,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10631,8 +10925,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10658,11 +10952,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10688,7 +10977,7 @@ msgid "Domain"
 msgstr "Домен"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10704,12 +10993,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10730,29 +11019,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10773,7 +11042,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10820,7 +11089,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10844,6 +11112,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10929,19 +11198,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10983,22 +11261,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11131,7 +11393,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11221,7 +11482,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11271,8 +11532,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11363,7 +11624,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11390,7 +11651,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11476,7 +11737,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11489,7 +11750,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11534,8 +11795,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11543,7 +11802,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11572,12 +11831,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11684,8 +11937,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11722,7 +11977,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11858,11 +12113,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11879,7 +12129,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11902,7 +12152,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11944,13 +12194,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11999,73 +12249,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12073,13 +12258,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12256,6 +12476,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12272,7 +12497,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12320,7 +12545,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12496,10 +12721,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12531,12 +12760,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12550,7 +12780,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12572,23 +12801,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12656,24 +12868,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12702,6 +12898,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12738,6 +12954,7 @@ msgstr "Словачки / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12805,6 +13022,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12894,6 +13116,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12906,7 +13129,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12937,16 +13160,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13011,6 +13238,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13083,29 +13315,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13153,7 +13362,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13197,8 +13406,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13443,9 +13652,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13472,62 +13686,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13569,17 +13734,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13614,7 +13768,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13694,11 +13848,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13713,6 +13866,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13733,6 +13891,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13769,41 +13951,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13864,40 +14011,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13986,6 +14101,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14028,34 +14158,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14078,9 +14180,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14091,7 +14193,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14117,7 +14249,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14162,7 +14294,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14195,11 +14327,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14215,8 +14346,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14331,7 +14460,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14343,7 +14472,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14376,7 +14504,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14387,8 +14515,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14414,11 +14542,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14508,7 +14631,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14575,8 +14697,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14604,7 +14730,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14665,6 +14791,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14689,7 +14846,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14728,6 +14885,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14780,6 +14943,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14804,6 +14974,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14820,7 +14995,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14841,14 +15016,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14885,7 +15097,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14903,11 +15120,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14943,11 +15164,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14975,7 +15191,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14986,7 +15202,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15052,7 +15268,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15132,6 +15347,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "На повеќе док."
 
+#~ msgid "Contact Name"
+#~ msgstr "Име на контактот"
+
 #~ msgid "Widget"
 #~ msgstr "Елемент"
 
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index b7b1a63eda6..6946f1973d6 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 05:45+0000\n"
 "Last-Translator: gobi <Unknown>\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: 2012-12-19 05:14+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "Огноо Цаг"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -217,68 +217,15 @@ msgstr ""
 "тайланг үүсгэж болно."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"OpenERP-н Захиалагчийн Харилцааны Менежмент (CRM)-н ерөнхий модуль\n"
-"=====================================================\n"
-"\n"
-"Энэ модуль нь хүмүүсийн бүлэгүүд сэжим, боломж, уулзалт, утасны дуудлагыг "
-"ухаалаг бөгөөд оновчтой зохион байгуулах боломжийг олгодог.\n"
-"\n"
-"Түүнчлэн харилцах, олж таних, эрэмбэлэх, оноох, шийдэх, мэдэгдэх гэх мэт "
-"түлхүүр даалгавруудыг удирддаг.\n"
-"\n"
-"OpenERP нь бүх хэрэгүүд хэрэглэгч, захиалагч, нийлүүлэгчээр амжилттай "
-"хөтлөгдөх баталгааг хангадаг. Автомат сануулга илгээх, хүсэлтийг дээд шат "
-"рүү хүргэх, байгууллагын дүрэм дээр тулгуурласан маш олон төрлийн "
-"үйлдлүүдийг гүйцэтгэх боломжтой. \n"
-"\n"
-"Системийн гайхалтай тал нь хэрэглэгчид ямар нэг нарийвчилсан ажил хийх "
-"шаардлагагүй байдаг.  CRM модуль нь имэйл болон OpenERP-г хооронд нь холбох "
-"имэйл үүдтэй. Иймээс зөвхөн имэйл илгээх замаар сэжим үүсгэж боломж "
-"олгодог.\n"
-"\n"
-"OpenERP нь талархлын мессеж илгээгээд имэйлийг харгалзах ажилтан руу илгээж "
-"цаашид авах бүх арга хэмжээг авч зөв боловсруулалтыг хийлгэдэг.\n"
-"\n"
-"CRM-н хянах самбар дараах зүйлсийг агуулдаг:\n"
-"-------------------------------\n"
-"* Төлөвлөсөн орлого үеээр болон хэрэглэгчээр (graph)\n"
-"* Боломж үеээр (график)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Анхааруулга!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -289,7 +236,7 @@ msgstr ""
 "зохимжтой!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Хориг, хязгаарлалтын Алдаа"
@@ -300,7 +247,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Тархмал талбар \"%s\"-г нэрийг солих боломжгүй"
@@ -311,7 +258,7 @@ msgid "Swaziland"
 msgstr "Швецарь"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "үүсгэгдсэн."
@@ -394,29 +341,6 @@ msgstr "Одоогийн бичлэгийг компанид нөөцлөх"
 msgid "Max. Size"
 msgstr "Дээд хэмжээ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Борлуулалтын захиалгад огнооны нэмэлт мэдээлэл нэмдэг .\n"
-"===================================================\n"
-"\n"
-"Борлуулалтын захиалгад дараах огноонуудыг нэмж болно:\n"
-"-----------------------------------------------------------\n"
-"    * Хүссэн Огноо\n"
-"    * Амласан Огноо\n"
-"    * Зохистой Огноо\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -426,11 +350,6 @@ msgstr ""
 "Форм харагдацийг нээх бичлэгийн өгөгдлийн баазын ID, зөвхөн ``view_mode`` нь "
 "'form' гэж тохируулагдсан үед."
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Харилцагчийн нэр"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -510,7 +429,7 @@ msgstr ""
 "нэмж тооцоолж чаддаг.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -549,6 +468,7 @@ msgstr "Автомат Үйлдлийн Дүрэм"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Эзэмшигч"
 
@@ -589,7 +509,7 @@ msgstr ""
 "зөвшөөрөгдсөн заалтыг өгнө үү."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -646,7 +566,7 @@ msgid "Netherlands Antilles"
 msgstr "Нидерландын Антилын арлууд"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -695,9 +615,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Ориг харагдац"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Санаанууд"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -734,41 +654,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Босни хэл / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-"\n"
-"Gengo API-н тусламжтай автомат орчуулга\n"
-"----------------------------------------\n"
-"\n"
-"Энэ модуль нь Gengo API-г ашиглан автомат орчуулгын идэлвхгүй товлогдсон "
-"үйлдлийг суулгадаг.\n"
-"Идэвхжүүлэхийн тулд:\n"
-"1) Gengo эрхийн тохиргоог `Тохиргоо > Компаниуд > Gengo параметрүүд`-д "
-"тохируулах ёстой\n"
-"2) `Тохиргоо > Програмын нэр томъёо > Gengo: Орчуулгын Гар хүсэлт` харилцах "
-"цонхыг дуудаж тохиргоог хийнэ.\n"
-"\n"
-"Энэ харилцах цонх нь CRON даалгавр болон Товлогчийг идэвхжүүлдэг бөгөөд таны "
-"хүссэн бүх нэр томъёог Gengo сервисээр автомат орчуулж эхэлдэг.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -779,9 +664,25 @@ msgstr ""
 "хэвлэж байсан баримт хэвлэгдэнэ."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Ангол"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -857,14 +758,12 @@ msgstr ""
 "Python илэрхийлэл бүхий Контекст утгууд, анх хоосон байна (Заяамал: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Визардууд"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Нэмэлт талбарын нэр нь 'x_' -аар эхэлсэн байх ёстой !"
@@ -954,25 +853,21 @@ msgid "Model Description"
 msgstr "Моделийн тайлбар"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Хаягийн дэвтэрт холбогчийг нэмэхийн тулд дарна уу.\n"
-"              </p><p>\n"
-"                OpenERP нь захиалагчтай холбогдох бүх харилцааг хялбархан \n"
-"                боломж олгодог: харилцаа, бизнес боломжуудын түүх,\n"
-"                баримтууд, гм.\n"
-"              </p>\n"
-"            "
+"\n"
+"Маркетингэд зориулсан Меню.\n"
+"===================\n"
+"\n"
+"Маркетингтай холбоотой модулиудыг суулгацуудыг агуулна.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -1005,11 +900,21 @@ msgstr "Гол илэрхийлэл"
 msgid "Jordan"
 msgstr "Иордан"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Энэ ажил дээр дараагийн товлосон огноо."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1167,13 +1072,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Бичих үйлдэлд бичлэгийг ялгах талбарын нэрийг оруулна уу. Хэрэв энэ нь "
-"хоосон байвал идэвхтэй обьектийн ID гэж үзнэ."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Папуа Шинэ Гвиней"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1192,7 +1093,7 @@ msgid "Email Preferences"
 msgstr "Имэйл тохиргоо"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' нь '%%(field)s' гэсэн огноо талбарт тохирохгүй бололтой"
@@ -1241,16 +1142,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Спани хэл (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Гар утас"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1358,9 +1252,38 @@ msgid "Mongolia"
 msgstr "Монгол"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1376,12 +1299,17 @@ msgstr ""
 "нэмэгдэнэ."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Баримтын модель"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1408,7 +1336,54 @@ msgid "Username"
 msgstr "Хэрэглэгчийн нэр"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1438,7 +1413,7 @@ msgid "Delete Access Right"
 msgstr "Хандах Эрхийг Устгах"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Холболтын тест амжилтгүй боллоо!"
@@ -1470,14 +1445,12 @@ msgid "South Korea"
 msgstr "Өмнөд Солонгос"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Шилжилтүүд"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "#%d гэсэн %s -н бичлэг олдсонгүй, хуулах боломжгүй!"
@@ -1618,7 +1591,7 @@ msgid "Marshall Islands"
 msgstr "Маршалын арлууд"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Моделийн талбарыг өөрчлөх явдал зөвшөөрөгдөхгүй!"
@@ -1640,7 +1613,7 @@ msgid "Search"
 msgstr "Хайх"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1659,7 +1632,14 @@ msgid "Parent Application"
 msgstr "Эцэг Аппликэшн"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Визардууд"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Үйлдэл Цуцлагдсан"
@@ -1822,7 +1802,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Кодгүй хэл \"%s\" байна"
@@ -1966,7 +1960,7 @@ msgid "On Create"
 msgstr "Үүсгэх үед"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1975,11 +1969,6 @@ msgstr ""
 "'%s' нь хэт олон цэг агуулж байна. XML id цэг агуулах ёсгүй ! Бусад модульд "
 "байгаа өгөгдлийг module.reference_id байдлаар заахад цэгийг хэрэглэнэ"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Үнийн санал, Борлуулалтын Захиалга, Нэхэмжлэл"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -2066,7 +2055,7 @@ msgid "East Timor"
 msgstr "Зүүн Тимор"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2116,11 +2105,6 @@ msgstr ""
 "Энэ нь менежер, хэрэглэгч хандалтын эрхийг Администраторт олгож Demo \n"
 "хэрэглэгчид хэрэглэгч эрхийг олгодог. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Хавсрагасан ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2137,7 +2121,7 @@ msgstr ""
 "түүврийн жагсаалт бэлдэх зэрэгт тусладаг."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2180,6 +2164,11 @@ msgstr "Машин, лизинг, даатгал, өртөгүүд"
 msgid "Read Access"
 msgstr "Унших эрх"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2275,17 +2264,12 @@ msgid "Create Tasks on SO"
 msgstr "БЗ-д даалгавар үүсгэх"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 "Энэ багана нь модулийн өгөгдлийг хадгалж байгаа тул устгагдах боломжгүй!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Модул хавсаргах"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2356,7 +2340,7 @@ msgid "Formula"
 msgstr "Томьёолол"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Супер хэрэглэгчийг устгах боломжгүй!"
@@ -2387,11 +2371,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copy)"
@@ -2403,7 +2387,6 @@ msgstr "Дансны Модны Үлгэр"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Хаягийн төрөл"
 
@@ -2460,11 +2443,6 @@ msgstr "Бүтэн зам"
 msgid "The next step depends on the file format:"
 msgstr "Дараагийн алхам файлын форматаас хамаарна:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Санаанууд"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2604,6 +2582,11 @@ msgstr "Шинэчлэгдсэн модулийн тоо"
 msgid "Method"
 msgstr "Метод"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2658,7 +2641,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2666,6 +2649,11 @@ msgstr ""
 "%(field_type)s талбарт тохирох '%(value)s' гэсэн утга '%%(field)s' талбарт "
 "алга"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2715,6 +2703,15 @@ msgstr "Белиз"
 msgid "Add or not the corporate RML header"
 msgstr "RML толгойг нэмэх эсвэл холбохгүй байх"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2768,7 +2765,7 @@ msgstr ""
 "(Жишээлбэл: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Барим таныг хамгийн сүүлд үзсэнээс хойш өөрчлөгдсөн байна (%s:%d)"
@@ -2860,7 +2857,6 @@ msgstr "Сайнт Том(Sao Tome) Үндсэн хуульт"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Нэхэмжлэл"
 
@@ -2938,11 +2934,6 @@ msgstr ""
 "    * Огноо\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Компаний уриа"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -3068,9 +3059,20 @@ msgid "Default limit for the list view"
 msgstr "Жагсаалт харагдацын бичлэгийн хязгаар (Заяамал:)"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Папуа Шинэ Гвиней"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3184,7 +3186,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "'%%(field)s' талбарын хувьд олон олдоц байна (%d олдоцууд)"
@@ -3243,6 +3245,19 @@ msgstr "Талбарын зурагжуулалт"
 msgid "Export Translations"
 msgstr "Орчуулга экспортлох"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3251,7 +3266,7 @@ msgid "Manager"
 msgstr "Менежер"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Уулаарай, та энэ баримт руу хандах эрхгүй"
@@ -3376,7 +3391,7 @@ msgid "Inherited"
 msgstr "Удамшсан"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "тийм"
@@ -3406,7 +3421,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' нь '%%(field)s' талбарын хувьд бүхэл тоо биш бололтой"
@@ -3482,22 +3497,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn Уялдуулалт"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Обьектийн буруу архитектур!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Алдаа!"
@@ -3607,12 +3622,12 @@ msgstr ""
 "    "
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3631,29 +3646,21 @@ msgstr ""
 "эрхтэй болох болно."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
-"\n"
-"Веб клиентэд хурдавчилсан боломжийг нээдэг.\n"
-"===========================================\n"
-"\n"
-"Хэрэглэгчийн ямарваа хурдавчилсан холбоосууд байгаа бол системийн tray-д "
-"нэмж өгдөг.\n"
-"\n"
-"Харагдацын нэр хэсэгт хурдавчлалийн тэмдэг зурагийг нэмдэг бөгөөд үүгээр "
-"хурдавчлалийг нэмж/хасч болдог.\n"
-"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3661,7 +3668,7 @@ msgid "Params storage"
 msgstr "Парамтерийн хадагалалт"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3713,34 +3720,6 @@ msgstr "Тохиргооны өгөгдлүүд"
 msgid "Invalid arguments"
 msgstr "Алдаатай аргумент"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3779,7 +3758,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Алга болсон баримтууд"
@@ -3791,6 +3770,34 @@ msgstr "Алга болсон баримтууд"
 msgid "Bank Account Type"
 msgstr "Банкны дансны төрөл"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3827,7 +3834,7 @@ msgid "Signal (subflow.*)"
 msgstr "Сигнал (дэд урсгал.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3865,7 +3872,7 @@ msgid "Access Controls"
 msgstr "Хандалтын удирдлага"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3895,50 +3902,6 @@ msgstr "Үндсэн Компани"
 msgid "Web Icon File (hover)"
 msgstr "Вебийн Таних Тэмдэгийн Файл (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-"\n"
-"Энэ нь бүрэн хэмжээний баримтын менежментийн систем. \n"
-"==============================================\n"
-"\n"
-"    * Хэрэглэгчийн эрх\n"
-"    * Баримтын индекслэлт :- .pptx and .docx файлууд нь Windows орчинд "
-"дэмжигдэхгүй.\n"
-"    * Баримтын Хяналтын Самбар нь дараах зүйлсийг агуулна:\n"
-"        * Шинэ файл (жагсаалт)\n"
-"        * Файлууд Нөөцийн Төрөлөөл (график)\n"
-"        * Файлууд Харилцагчаар (график)\n"
-"        * Файлууд сарын хэмжээгээр (график)\n"
-"\n"
-"АНХААРАХ НЬ:\n"
-"    - Хэрэв энэ модулийг ажиллаж байгаа системд суулгах юм бол өгөгдлийн "
-"баазад хадгалсан PDF баримтууд нь бүгд устах болно.\n"
-"    - Энэ модулийг суулгасан дараа PDF нь баазад хадгалагдахаа больж "
-"серверийн файл системд хадгалагдана. Жишээлбэл:  /server/bin/filestore.\n"
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3958,9 +3921,13 @@ msgstr ""
 "Хэрэв та томьёо төрлийг хэрэглэх бол 'object' хувьсагч ашиглан python нөхцөл "
 "бичнэ."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Төрсөн огноо"
 
@@ -3976,7 +3943,7 @@ msgid "Products Manufacturers"
 msgstr "Бараа Үйлдвэрлэл"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL горим байхгүй байна"
@@ -4086,7 +4053,7 @@ msgid "Malta"
 msgstr "Малта"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4315,7 +4282,6 @@ msgstr "Тайлан"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Гарчиг"
@@ -4327,13 +4293,18 @@ msgstr ""
 "Хэрэв тохируулагдаагүй бол шинэ нөөцийн анхны утга байдлаар ажиллана."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Рекурсив байна."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Модулиудын хамааралд рекурсын алдаа байна !"
@@ -4407,9 +4378,10 @@ msgid "Urdu / اردو"
 msgstr "Урду  / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Хандалтыг татгалзав"
@@ -4420,7 +4392,7 @@ msgid "Company Name"
 msgstr "Компанийн нэр"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4441,16 +4413,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (deprecated - use Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"Орчуулах зүйлийн хэлний код нь мэдэгдэж байгаа хэлнүүд дотор байх ёстой.\r\n"
-"Language code of translation item must be among known languages"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Бичлэгийн дүрэм"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre and Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4489,16 +4482,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Үл мэдэгдэх нэрийн хандалтыг OpenERP-д зөвшөөрнө\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4546,19 +4532,7 @@ msgid "Paper Format"
 msgstr "Цаасны Формат"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4578,7 +4552,7 @@ msgid "Nauru"
 msgstr "Науру"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "Бүртгэл"
@@ -4623,7 +4597,7 @@ msgid "Email Gateway"
 msgstr "Имэйл Үүд"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4644,9 +4618,43 @@ msgid "Technical Data"
 msgstr "Техникийн өгөгдөл"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4702,13 +4710,18 @@ msgstr "Асуудалын Цагийн Хуваарь"
 msgid "Ltd"
 msgstr "ХК"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "Зур.код"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Буруу Архитектур!"
@@ -4724,9 +4737,9 @@ msgid "Share any Document"
 msgstr "Дурын Баримтыг Хуваалцах"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Сэжимүүд, Боломжууд, Утасны дуудлагууд"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Шаардлагатай груп"
 
 #. module: base
 #: view:res.lang:0
@@ -4787,57 +4800,10 @@ msgid "Languages"
 msgstr "Хэлүүд"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
-"\n"
-"Хурдан, Хялбар Борлуулалтын Процесс\n"
-"============================\n"
-"\n"
-"Энэ модуль нь дэлгүүрийн борлуулалтыг маш хялбар мааждаг дэлгэцийн "
-"тусламжтай, веб дээр суурилсан дэлгэцээр менежмент хийх боломжийг олгодог. "
-"Энэ нь бүх төрлийн таблет, iPad-тай нийцтэй бөгөөд төлбөрийн олон аргыг "
-"санал болгодог.\n"
-"\n"
-"Барааны сонголт хэд хэдэн аргаар хийгдэж болно: \n"
-"\n"
-"* Баркод уншигчаар\n"
-"* Барааны төрөл, нэрээр текст хайлтаар.\n"
-"\n"
-"Үндсэн Боломжууд\n"
-"-------------\n"
-"* Борлуулалтыг хурдан оруулах\n"
-"* Төлбөрийн нэг арга сонгох (хурдан арга) эсвэл төлбөрийг олон төлөх аргаар "
-"хуваах\n"
-"* Хариултыг тооцоолох\n"
-"* Бэлтгэх баримтыг автоматаар үүсгэж, батлах\n"
-"* Нэхэмжлэлийг автоматаар үүсгэх боломж олгох\n"
-"* Өмнөх борлуулалтыг буцаах\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4924,7 +4890,6 @@ msgstr "Нөхцөл"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Үндсэн"
 
@@ -5014,6 +4979,11 @@ msgstr ""
 "урьтамжтай нь хэрэглэгдэнэ. Урьтамжийн анхны утга нь 10 (бага тоо нь өндөр "
 "урьтамж)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -5077,9 +5047,16 @@ msgid "Default value or action reference"
 msgstr "Анхны утга эсвэл үйлдлийн сурвалж"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Суринам"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -5176,6 +5153,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -5202,6 +5195,43 @@ msgstr ""
 "Хэрэв энэ талбар хоосон бол OpenERP таны унших эрхтэй обьектуудын холбогдох "
 "цэсүүдийг танд харагдуулна."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -5231,6 +5261,12 @@ msgstr ""
 msgid "View"
 msgstr "Дэлгэц"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -5308,12 +5344,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -5328,7 +5358,6 @@ msgstr "Швецарь - Санхүү"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Зип код"
@@ -5339,13 +5368,18 @@ msgstr "Зип код"
 msgid "Author"
 msgstr "Зохиогч"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Хийхээр Тэмдэглэх"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Тохиромжтой огнооны дүрслэл."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5391,6 +5425,8 @@ msgstr "Чиглэл"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Дэлгэцүүд"
 
@@ -5406,7 +5442,7 @@ msgid "SMTP Server"
 msgstr "SMTP сервер"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Суулгасан эсвэл суулгах модулиудыг хасаад үзэх хэрэгтэй."
@@ -5502,7 +5538,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -5590,7 +5631,7 @@ msgid "System Configuration Done"
 msgstr "Системийн тохиргоо хийгдсэн"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "%s талбарыг шалгахад алдаа тохиолдлоо: %s"
@@ -5717,6 +5758,11 @@ msgstr "Маврик"
 msgid "Full Access"
 msgstr "Дээд хандалт"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5730,7 +5776,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5742,7 +5788,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Энэ банкны данс зөвхөн танай компанид харъяалагдаж байгаа тохиолдолд"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5774,6 +5820,17 @@ msgstr "Сенегал"
 msgid "Hungary"
 msgstr "Унгар"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5937,7 +5994,7 @@ msgid "Account Owner Name"
 msgstr "Данс Эзэмшигчийн Нэр"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5954,16 +6011,11 @@ msgid "Decimal Separator"
 msgstr "Орон тусгаарлагч"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -6009,9 +6061,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Үүсгэгч"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Модулийн нэр давхцах ёсгүй !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -6074,15 +6127,6 @@ msgstr "Венесуэль"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -6098,6 +6142,11 @@ msgstr "Ачаалах Тохиргооны Визард"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Хавсралтын нэр"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -6181,6 +6230,12 @@ msgstr "Казакстан"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Хэд дэх өдөр [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Нөөцийн нэр"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6435,7 +6490,7 @@ msgid "title"
 msgstr "гарчиг"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -6492,6 +6547,15 @@ msgstr "Бараанууд"
 msgid "User-defined Defaults"
 msgstr "Хэрэглэгчийн Тодорхойлсон Анхны Утгууд"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6607,13 +6671,15 @@ msgid "Bank Type"
 msgstr "Банкны төрөл"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Группын нэр \"-\" тэмдэгтээр эхэлж болохгүй"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Аппууд"
 
@@ -6633,7 +6699,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6668,10 +6734,9 @@ msgid "Uncategorized"
 msgstr "Ангилагдаагүй"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Нөөцийн нэр"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6707,6 +6772,11 @@ msgstr ""
 "байвал сигнал нь даруулын нэрийг шалгадаг. Хэрэв сигнал нь NULL байвал "
 "даруулыг шилжилттэй тулгаж шалгах шаардлага байхгүй."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Ориг харагдац"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6717,7 +6787,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6733,26 +6803,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Миний Банкууд"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6885,11 +6935,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6901,8 +6946,8 @@ msgid "Malaysia"
 msgstr "Малайз"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -7014,7 +7059,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Энэ бүтцэд '%s' төрөлийн харагдац байхгүй байна!"
@@ -7054,7 +7099,7 @@ msgid "Created Menus"
 msgstr "Үүссэн цэсүүд"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -7081,9 +7126,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Хийхээр Тэмдэглэх"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -7115,6 +7188,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Жил"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -7166,7 +7246,7 @@ msgid "Audit Trail"
 msgstr "Хөндлөнгийн Хяналтын Ул Мөр"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -7258,7 +7338,7 @@ msgid "Israel"
 msgstr "Израйл"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -7278,23 +7358,6 @@ msgstr "Заримдаа BIC юмуу Swift гэж нэрлэдэг."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Гар утас"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -7327,10 +7390,10 @@ msgstr "Тайлан xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Модулиуд"
 
@@ -7404,9 +7467,9 @@ msgid "United Kingdom"
 msgstr "Их Британи"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7429,8 +7492,8 @@ msgid "Partner Titles"
 msgstr "Харилцагчийн гарчиг"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -7478,7 +7541,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7487,11 +7550,6 @@ msgstr ""
 "Энэ үйлдлийг та хийж чадахгүй. Энэ обьект тайлангийн зориулалттай бөгөөд "
 "шинэ бичлэг үүсгэх явдал зөвшөөрөгдөөгүй."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7600,6 +7658,13 @@ msgstr "Модел амжилттай импортлогдлоо !"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Шилжилтүүд"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7698,7 +7763,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Аймаг/Хот"
@@ -7799,12 +7863,6 @@ msgstr "Бүтэн нэр"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Модулийн нэр давхцах ёсгүй !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7848,6 +7906,7 @@ msgstr "Олон баримтад."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7905,7 +7964,7 @@ msgid "Connection Security"
 msgstr "Холболтын Нууцлал"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Эхлүүлэх үйлдлийг заана уу!"
@@ -7925,6 +7984,11 @@ msgstr "Ангиллын нэр"
 msgid "Northern Mariana Islands"
 msgstr "Хойд марианы арлууд"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7936,7 +8000,7 @@ msgid "Intrastat Reporting"
 msgstr "Дотоод Статистик Тайлан"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7945,6 +8009,11 @@ msgstr ""
 "Нууц үг солих харилцах цонх(Хэрэглэгчийн тохиргооноос эсвэл Хэрэлэгч "
 "менюнээс)-ыг ашиглаж өөрийн нууц үгийг солино."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7975,7 +8044,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Цаглабар харагдацад талбар хүрэлцэхгүй!"
@@ -8023,7 +8092,6 @@ msgstr "Шилжилт"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -8043,30 +8111,30 @@ msgid "Child Categories"
 msgstr "Дэд ангилалууд"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Алдаа"
@@ -8154,6 +8222,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Энэ цонх"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -8237,6 +8310,31 @@ msgstr "Талбарууд"
 msgid "Employees"
 msgstr "Ажилчид"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+"\n"
+"Веб клиентэд хурдавчилсан боломжийг нээдэг.\n"
+"===========================================\n"
+"\n"
+"Хэрэглэгчийн ямарваа хурдавчилсан холбоосууд байгаа бол системийн tray-д "
+"нэмж өгдөг.\n"
+"\n"
+"Харагдацын нэр хэсэгт хурдавчлалийн тэмдэг зурагийг нэмдэг бөгөөд үүгээр "
+"хурдавчлалийг нэмж/хасч болдог.\n"
+"    "
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -8266,11 +8364,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Холболтыг Тестлэх"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Хаяг"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -8295,7 +8388,6 @@ msgstr "Сонгох Сонголтууд"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Гудамж"
@@ -8306,9 +8398,24 @@ msgid "Yugoslavia"
 msgstr "Югослав"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Баруун эцэг"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8389,7 +8496,7 @@ msgid "Change My Preferences"
 msgstr "Өөрийн тохиргоог өөрчлөх"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
@@ -8476,21 +8583,25 @@ msgid "US Letter"
 msgstr "US захиа"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Маркетингэд зориулсан Меню.\n"
-"===================\n"
-"\n"
-"Маркетингтай холбоотой модулиудыг суулгацуудыг агуулна.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Хаягийн дэвтэрт холбогчийг нэмэхийн тулд дарна уу.\n"
+"              </p><p>\n"
+"                OpenERP нь захиалагчтай холбогдох бүх харилцааг хялбархан \n"
+"                боломж олгодог: харилцаа, бизнес боломжуудын түүх,\n"
+"                баримтууд, гм.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8498,7 +8609,7 @@ msgid "Company Bank Accounts"
 msgstr "Компаний Банкны Данс"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Нууцлалын шалтгаанаар хоосон нууц үг зөвшөөрөгдөхгүй!"
@@ -8509,13 +8620,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "SMTP нэвтрэх заавал биш нууц үг"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8537,12 +8648,13 @@ msgid "Normal Bank Account"
 msgstr "Энгийн Харилцахын Данс"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Визард"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8721,7 +8833,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8752,14 +8864,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Анхааруулга!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8783,7 +8887,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8900,7 +9003,7 @@ msgid "Nigeria"
 msgstr "Нигер"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Сонгох талбарын хувьд Сонгох Хувилбар өгөгдсөн байх ёстой."
@@ -9217,7 +9320,7 @@ msgid "Update Modules List"
 msgstr "Модулийн жагсаалтыг шинэчлэх"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -9231,7 +9334,7 @@ msgid "eInvoicing"
 msgstr "цНэхэмцлэх"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -9245,7 +9348,7 @@ msgstr ""
 "хэрэглэгчийн тохиргооны Цуцлах даруулыг одоо дарж болно)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "\"%s\" гэсэн утга нь \"%s.%s\" талбарын сонголтонд алга байна"
@@ -9260,6 +9363,17 @@ msgstr "Үргэлжлүүлэх"
 msgid "Thai / ภาษาไทย"
 msgstr "Тай хэл / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -9299,7 +9413,7 @@ msgid "Mexico"
 msgstr "Мексик"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -9321,15 +9435,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "SMTP Сервер Алга"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Хавсралтын нэр"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"Орчуулах зүйлийн хэлний код нь мэдэгдэж байгаа хэлнүүд дотор байх ёстой.\r\n"
+"Language code of translation item must be among known languages"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9353,7 +9469,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Сарын товчилсон нэр."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -9365,7 +9481,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Нийлүүлэгч"
@@ -9443,7 +9558,7 @@ msgid "Selectable"
 msgstr "Сонгогдох"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Бүх зүйлс зөв суусан шиг байна!"
@@ -9471,8 +9586,8 @@ msgid "Iteration"
 msgstr "Давталт"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Хэрэглэгчийн Алдаа"
@@ -9496,7 +9611,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9645,7 +9760,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9684,8 +9799,8 @@ msgid "Solomon Islands"
 msgstr "Соломоны арлууд"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "ХандалтынАлдаа"
@@ -9759,7 +9874,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9776,7 +9891,7 @@ msgid "Ukraine"
 msgstr "Украйн"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9839,6 +9954,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Виетнам / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9937,9 +10057,9 @@ msgid "Custom Shortcuts"
 msgstr "Зохиомол товчлол"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Виетнам / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9967,13 +10087,13 @@ msgid "Models"
 msgstr "Модел"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Бичлэг яг одоо засагдах боломжгүй"
@@ -9994,7 +10114,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -10042,7 +10162,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Модель %s байхгүй байна!"
@@ -10088,6 +10208,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -10096,7 +10217,7 @@ msgid "Cancel"
 msgstr "Цуцлах"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -10115,6 +10236,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -10150,7 +10308,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -10202,6 +10360,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Цаг (12-цагаарх) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -10250,23 +10413,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Валютийн код компанийн хэмжээнд үл давхцах байх ёстой!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -10311,7 +10462,7 @@ msgid "Products Expiry Date"
 msgstr "Барааны Хугацаа Дуусах Огноо"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "'Үргэлжлүүлэх'-г дарж дараах нэмэлтийг тохируулна..."
@@ -10408,6 +10559,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10615,7 +10771,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Маркетенгийн Компанит ажил - Үзүүлэн"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10626,13 +10782,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Интервал нэгж"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Төрөл"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Энэ арга байхаа больсон"
@@ -10802,7 +10963,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10842,6 +11003,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10868,6 +11034,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Таних Тэмдэг URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10959,7 +11130,6 @@ msgstr "%m - Сарын дугаар [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Сум/Дүүрэг"
@@ -10995,13 +11165,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Эстон хэл / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Бичих үйлдэлд бичлэгийг ялгах талбарын нэрийг оруулна уу. Хэрэв энэ нь "
+"хоосон байвал идэвхтэй обьектийн ID гэж үзнэ."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 эсвэл сүүлийн хувилбар"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -11062,19 +11241,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -11088,6 +11292,8 @@ msgid "Activity"
 msgstr "Ажилбар"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -11106,7 +11312,12 @@ msgid "Parent Company"
 msgstr "Толгой компани"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Нэвтрэлт"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -11118,13 +11329,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -11216,6 +11420,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -11289,6 +11513,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Дарааллын төрөл"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -11357,9 +11586,9 @@ msgstr ""
 "Эхлээд идэвхтэй биш болгоно уу."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -11377,8 +11606,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Серверийн үйлдэлд `Record Id` тохиргооны асуудал байна!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -11419,13 +11648,12 @@ msgid "Laos"
 msgstr "Лаос"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Имэйл"
@@ -11436,7 +11664,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11478,36 +11711,6 @@ msgstr ""
 " - uid: идэвхтэй хэрэглэгчийн id\n"
 " - context: идэвхтэй context"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11530,6 +11733,11 @@ msgstr "Бусад өмчлөх эрх"
 msgid "Ecuador"
 msgstr "Эквадор"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "ажлын урсгал"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11546,16 +11754,6 @@ msgstr "Гэрээний Ажлууд"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Хэрэглэгчийн Эрхэм хэлийг устгаж болохгүй !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11572,9 +11770,9 @@ msgid "Cascade"
 msgstr "Хүрээ"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Шаардлагатай груп"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Сэжимүүд, Боломжууд, Утасны дуудлагууд"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11601,11 +11799,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11631,7 +11824,7 @@ msgid "Domain"
 msgstr "Домэйн"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11647,12 +11840,12 @@ msgid "State Name"
 msgstr "Мужын нэр"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11673,30 +11866,10 @@ msgid "Timezone"
 msgstr "Цагийн бүс"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11717,7 +11890,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11769,7 +11942,6 @@ msgstr "Худалдан авалт дээр Давхар Хяналт, Батл
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Гудамж2"
 
@@ -11793,6 +11965,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11886,19 +12059,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Нэгдмэл уялдааны Алдаа"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "ажлын урсгал"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
@@ -11940,22 +12122,6 @@ msgstr "Ажилчдийн Лавлах"
 msgid "Arguments"
 msgstr "Аргумент"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -12088,7 +12254,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Захиалагч"
 
@@ -12178,7 +12343,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -12228,9 +12393,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Нэвтрэлт"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12330,7 +12495,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Имэйл хүргэлт бүтэлгүйтлээ"
@@ -12357,7 +12522,7 @@ msgid "Object"
 msgstr "Объект"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12446,7 +12611,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12461,7 +12626,7 @@ msgid "User Ref."
 msgstr "Хэрэглэгч дугаар."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -12506,8 +12671,6 @@ msgstr "Гарын авлагын дугаар"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12515,7 +12678,7 @@ msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12546,12 +12709,6 @@ msgstr "Фолклендын арлууд"
 msgid "Lebanon"
 msgstr "Либони"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12660,9 +12817,11 @@ msgid "Selection"
 msgstr "Сонголт"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Таних Тэмдэг URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12698,7 +12857,7 @@ msgid "Action Type"
 msgstr "Үйлдлийн төрөл"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12837,11 +12996,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Цаг 00->12: %(h12)"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Харьцах хүнийг нуухын тулд идэвхитэй чагтыг авч хаяна."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12858,7 +13012,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Үл мэдэгдэх %s аттрибут %s-д байна "
@@ -12881,7 +13035,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "тодорхойлогдоогүй get метод !"
@@ -12922,16 +13076,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Цалингийн санхүү бүртгэл"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Бинари файл буюу гадаад URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Суринам"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12978,92 +13132,57 @@ msgid "Address Format"
 msgstr "Хаягийн формат"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Тусгаарлагчийн формат нь [,n] гэсэн хэлбэртэй байх ёстой. Энд 0 < n :Нэгжийн "
-"цифр нь.-1 -с эхлээд тусгаарлалтийг төгсгөнө. ө.х. [3,2,-1] нь 106500 гэсэн "
-"тоог 1,06,500 байдлаар илэрхийлнэ;[1,2,-1] нь 106,50,0 гэсэн байдлаар "
-"илэрхийлнэ;[3] нь 106,500 гэсэн байдлаар илэрхийлнэ. Өгөгдсөн ',' бүх "
-"тохиолдолд мянгатын тусгаарлагч байна"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Техник Боломжууд"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -13249,6 +13368,11 @@ msgstr ""
 "Бараа материал болон агуулахын үндсэн үйлдлүүдийг менеж хийхэд тусладаг: "
 "хүргэх захиалгууд, хүлээн авалтууд, гм."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -13265,7 +13389,7 @@ msgid "Body"
 msgstr "Бие"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Холболтын шалгалт амжилттай!"
@@ -13316,7 +13440,7 @@ msgid "choose"
 msgstr "сонгох"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13496,10 +13620,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13538,12 +13666,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Канбан"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13558,7 +13687,6 @@ msgstr "Компаний Бүртгэлийн Дугаар"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Олон төрлийн"
@@ -13580,23 +13708,6 @@ msgstr ""
 msgid "China"
 msgstr "Хятад"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13672,25 +13783,9 @@ msgid "Bulgaria"
 msgstr "Болгар"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Ангол"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13718,6 +13813,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "ххк"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13754,6 +13869,7 @@ msgstr "Словак хэл / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "тодорхой бус"
@@ -13821,6 +13937,11 @@ msgstr "Хаягийн дэвтэр"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13910,6 +14031,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13922,7 +14044,7 @@ msgid "Information"
 msgstr "Мэдээлэл"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13953,16 +14075,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Баруун эцэг"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Модулийн жагсаалтыг шинэчлэх"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -14027,6 +14153,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "osv_memory талбарыг зөвхөн = эсвэл != оператороор жиших боломжтой."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -14099,29 +14230,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Гадаад Хувийн Дугаар"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -14169,7 +14277,7 @@ msgid "Delivery Costs"
 msgstr "Хүргэлтийн өртөг"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -14220,9 +14328,9 @@ msgstr ""
 "Минимал санхүүгийн мөчрийг идэвхгүй болгоно.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "DB нууц үгийн шифрлэлт"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Бичлэгийн дүрэм"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14468,9 +14576,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14497,62 +14610,13 @@ msgid "System Configuration done"
 msgstr "Системийн тохиргоо дууссан"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -14594,17 +14658,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14642,7 +14695,7 @@ msgid "Low"
 msgstr "Бага"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй."
@@ -14724,11 +14777,10 @@ msgid "El Salvador"
 msgstr "Эл салвадор"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Утас"
@@ -14743,6 +14795,11 @@ msgstr "Мэдээлэл хадгалах цэс"
 msgid "Thailand"
 msgstr "Тайланд"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14763,6 +14820,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Румынь / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14800,41 +14881,6 @@ msgstr "Объектын хамаарал"
 msgid "eInvoicing & Payments"
 msgstr "цНэхэмжлэх ба Төлбөр"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14895,40 +14941,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -15025,6 +15039,21 @@ msgstr "Дэлгэц :"
 msgid "View Auto-Load"
 msgstr "Автомат-Ачааг Харах"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -15067,34 +15096,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Перс хэл / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -15117,9 +15118,9 @@ msgid "Unmet dependency !"
 msgstr "Биелээгүй хамаарал !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -15130,7 +15131,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -15156,7 +15187,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -15201,7 +15232,7 @@ msgid "Access"
 msgstr "Хандалт"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -15234,11 +15265,10 @@ msgid "Bahrain"
 msgstr "Бахрейн"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Факс"
@@ -15254,8 +15284,6 @@ msgstr "Факс"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -15370,7 +15398,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "Сериалчлах талбар `%s` олдсонгүй. Хувааж таслах талбар `%s`!"
@@ -15382,7 +15410,6 @@ msgstr "Ямайка"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Өнгөний Индекс"
 
@@ -15418,7 +15445,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -15429,8 +15456,8 @@ msgid "Azerbaijan"
 msgstr "Азербайжан"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Сануулга"
@@ -15456,11 +15483,6 @@ msgstr "Virgin Islands (British)"
 msgid "Parameters"
 msgstr "Параметер"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15554,7 +15576,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Улс"
@@ -15625,9 +15646,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Тусгаарлагчийн формат нь [,n] гэсэн хэлбэртэй байх ёстой. Энд 0 < n :Нэгжийн "
+"цифр нь.-1 -с эхлээд тусгаарлалтийг төгсгөнө. ө.х. [3,2,-1] нь 106500 гэсэн "
+"тоог 1,06,500 байдлаар илэрхийлнэ;[1,2,-1] нь 106,50,0 гэсэн байдлаар "
+"илэрхийлнэ;[3] нь 106,500 гэсэн байдлаар илэрхийлнэ. Өгөгдсөн ',' бүх "
+"тохиолдолд мянгатын тусгаарлагч байна"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15654,7 +15684,7 @@ msgid "Japan"
 msgstr "Япон"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Нэг удаад зөвхөн нэг баганын нэрийг өөрчилж чадна!"
@@ -15715,6 +15745,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Канад - Санхүү"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15739,7 +15800,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Энэхүү үйлдэл нь хэдэн минутын хугацаа авч болзошгүйг анхаараарай."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15778,6 +15839,12 @@ msgstr "Гүйцэтгэх"
 msgid "Condition"
 msgstr "Нөхцөл"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15832,6 +15899,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Хорват"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15856,6 +15930,11 @@ msgstr "Систем шинэчлэлт"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15872,7 +15951,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15893,14 +15972,51 @@ msgstr "Сьерра-Леоне"
 msgid "General Information"
 msgstr "Ерөнхий мэдээлэл"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -15937,7 +16053,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Компани Шилжих Санамж"
@@ -15957,11 +16078,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Дараагийн дугаарлалт нь энэ утгаар нэмэгдэнэ"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Үүрэг"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15999,11 +16124,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Хүргэлт"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -16031,7 +16151,7 @@ msgid "Workflow Instances"
 msgstr "Ажлын урсгалын тохиолдол"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Харилцагчид: "
@@ -16042,7 +16162,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -16108,7 +16228,6 @@ msgstr "Экспортын нэр"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -16269,6 +16388,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW зам"
 
+#~ msgid "Creator"
+#~ msgstr "Үүсгэгч"
+
 #~ msgid "Demo data"
 #~ msgstr "Жишээ өгөгдөл"
 
@@ -16314,6 +16436,9 @@ msgstr ""
 #~ msgid "Report Header"
 #~ msgstr "Тайлангийн толгой"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Харьцах хүнийг нуухын тулд идэвхитэй чагтыг авч хаяна."
+
 #~ msgid "Python code to be executed"
 #~ msgstr "Ажиллах python код"
 
@@ -16371,6 +16496,9 @@ msgstr ""
 #~ msgid "Latest version"
 #~ msgstr "Сүүлийн хувилбар"
 
+#~ msgid "Delivery"
+#~ msgstr "Хүргэлт"
+
 #~ msgid "-"
 #~ msgstr "-"
 
@@ -16690,9 +16818,15 @@ msgstr ""
 #~ msgid "Main report file path"
 #~ msgstr "Үндсэн тайлангийн файлын зам"
 
+#~ msgid "Attached ID"
+#~ msgstr "Хавсрагасан ID"
+
 #~ msgid "Homepage Widgets"
 #~ msgstr "Нүүр хуудасны виджет"
 
+#~ msgid "Attached Model"
+#~ msgstr "Модул хавсаргах"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Домайн тохируулах"
 
@@ -16814,6 +16948,9 @@ msgstr ""
 #~ msgid "Read"
 #~ msgstr "Унших"
 
+#~ msgid "Addresses"
+#~ msgstr "Хаяг"
+
 #~ msgid "SMS Message"
 #~ msgstr "SMS Мессэж"
 
@@ -16921,6 +17058,9 @@ msgstr ""
 #~ msgid "- type,name,res_id,src,value"
 #~ msgstr "- type,name,res_id,src,value"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Бинари файл буюу гадаад URL"
+
 #~ msgid "Emails"
 #~ msgstr "Э-мэйл"
 
@@ -20953,6 +21093,9 @@ msgstr ""
 #~ "\n"
 #~ "Тухайлбал хүсний зах зээлд хэрэглэгдэн."
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "DB нууц үгийн шифрлэлт"
+
 #~ msgid ""
 #~ "\n"
 #~ "        OpenERP Web process view.\n"
@@ -22672,6 +22815,9 @@ msgstr ""
 #~ msgid "Customization"
 #~ msgstr "Өөриймшүүлэлт"
 
+#~ msgid "Contact Name"
+#~ msgstr "Харилцагчийн нэр"
+
 #~ msgid "Search Contact"
 #~ msgstr "Харилцагч хайх"
 
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 1061f5a3755..a772639eaeb 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:45+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:58+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Dato og klokkeslett"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -192,41 +192,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Advarsel !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -234,7 +208,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Betingelsesfeil"
@@ -245,7 +219,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -256,7 +230,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "opprettet."
@@ -335,20 +309,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr "Maks størrelse"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -356,11 +316,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontaktnavn"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -419,7 +374,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -456,6 +411,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Eier"
 
@@ -494,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -548,7 +504,7 @@ msgid "Netherlands Antilles"
 msgstr "De nederlandske Antillene"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -588,9 +544,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Orginal visning"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Idéer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -615,26 +571,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnisk / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -645,9 +581,25 @@ msgstr ""
 "gangen brukeren skriver ut med samme vedleggsnavnet."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -722,14 +674,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Veivisere"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Egendefinerte felter må ha et navn som starter med 'x_' !"
@@ -793,16 +743,14 @@ msgid "Model Description"
 msgstr "Modellbeskrivelse"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -831,11 +779,21 @@ msgstr "Utløseruttrykk"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -967,13 +925,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Angi feltnavn som rad id'en refererer til for skrive operasjonen. Hvis den "
-"er tom, så vil det refereres til den aktive id'en til objektet."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Ny-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -992,7 +946,7 @@ msgid "Email Preferences"
 msgstr "E-post innstillinger"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1040,16 +994,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1146,9 +1093,38 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1162,12 +1138,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1194,7 +1175,54 @@ msgid "Username"
 msgstr "Brukernavn"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1224,7 +1252,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1256,14 +1284,12 @@ msgid "South Korea"
 msgstr "Sør Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Overganger"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1401,7 +1427,7 @@ msgid "Marshall Islands"
 msgstr "Marshalløyene, Republikken Marshalløyene"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1423,7 +1449,7 @@ msgid "Search"
 msgstr "Søk"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1441,7 +1467,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Veivisere"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operasjon avbrutt"
@@ -1567,7 +1600,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Språkkode \"%s\" finnes ikke"
@@ -1684,7 +1731,7 @@ msgid "On Create"
 msgstr "Ved opprettelse"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1694,11 +1741,6 @@ msgstr ""
 "! Disse er forbeholdt å referere til data i andre moduler, f.eks. som i "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1779,7 +1821,7 @@ msgid "East Timor"
 msgstr "Øst Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1820,11 +1862,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Vedlagt ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1839,7 +1876,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1880,6 +1917,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Lesetilgang"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1956,16 +1998,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Tilknyttet modell"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2020,7 +2057,7 @@ msgid "Formula"
 msgstr "Formel"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Kan ikke fjerne root brukereren!"
@@ -2044,11 +2081,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopi)"
@@ -2060,7 +2097,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adressetype"
 
@@ -2098,11 +2134,6 @@ msgstr "Full sti"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Idéer"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2238,6 +2269,11 @@ msgstr "Antall moduler oppdatert"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2271,12 +2307,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2324,6 +2365,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Legg til, eller ikke RML toppteksten til selskapet"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2375,7 +2425,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Et dokument har blitt endret siden du sist så på det (%s:%d)"
@@ -2456,7 +2506,6 @@ msgstr "Saint Tome (Sao Tome) and Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2503,11 +2552,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2625,9 +2669,20 @@ msgid "Default limit for the list view"
 msgstr "Standard grenseverdi for listevisningen"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Ny-Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2705,7 +2760,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2764,6 +2819,19 @@ msgstr "Feltoversikt"
 msgid "Export Translations"
 msgstr "Eksporter oversettelser"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2772,7 +2840,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2858,7 +2926,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2888,7 +2956,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2953,22 +3021,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Feil!"
@@ -3062,12 +3130,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3084,17 +3152,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3104,7 +3174,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Kan ikke oppgradere modulen '%s'. Den er ikke installert."
@@ -3155,34 +3225,6 @@ msgstr "Konfigurasjonsparametere"
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3221,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3233,6 +3275,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Bankkontotype"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3269,7 +3339,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3303,7 +3373,7 @@ msgid "Access Controls"
 msgstr "Tilgangskontroller"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3331,32 +3401,6 @@ msgstr "Hovedfirma"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3376,9 +3420,13 @@ msgstr ""
 "Hvis du benytter en formeltype, benytt et python uttrykk med variablen "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Fødselsdag"
 
@@ -3394,7 +3442,7 @@ msgid "Products Manufacturers"
 msgstr "Vareprodusenter"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3502,7 +3550,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3691,7 +3739,6 @@ msgstr "Rapportering"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Tittel"
@@ -3702,13 +3749,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Feil grunnet rekursjon i modulavhengigheter !"
@@ -3768,9 +3820,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3781,7 +3834,7 @@ msgid "Company Name"
 msgstr "Firmanavn"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3800,14 +3853,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Opprett regler"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre og Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3836,13 +3912,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3890,19 +3962,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3922,7 +3982,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3967,7 +4027,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3986,9 +4046,43 @@ msgid "Technical Data"
 msgstr "Tekniske data"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4044,13 +4138,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "AS"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4066,8 +4165,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4126,33 +4225,10 @@ msgid "Languages"
 msgstr "Språk"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4230,7 +4306,6 @@ msgstr "Beskrankning"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Standard"
 
@@ -4302,6 +4377,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4363,9 +4443,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4445,6 +4532,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4471,6 +4574,43 @@ msgstr ""
 "Hvis dette feltet er tomt så vil OpenERP beregne synligheten basert på "
 "lesetilganger til relaterte objekter."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4500,6 +4640,12 @@ msgstr ""
 msgid "View"
 msgstr "Vis"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4577,12 +4723,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4597,7 +4737,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postnummer"
@@ -4608,13 +4747,18 @@ msgstr "Postnummer"
 msgid "Author"
 msgstr "Forfatter"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Hensiktsmessig representasjon av tid og dato."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4660,6 +4804,8 @@ msgstr "Retning"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Visninger"
 
@@ -4675,7 +4821,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4769,7 +4915,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4857,7 +5008,7 @@ msgid "System Configuration Done"
 msgstr "Systemkonfigurasjon fullført"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4972,6 +5123,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Full tilgang"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4985,7 +5141,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4996,7 +5152,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5028,6 +5184,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungarn"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5191,7 +5358,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5207,16 +5374,11 @@ msgid "Decimal Separator"
 msgstr "Desimal separator"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5257,9 +5419,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Forfatter"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Modulnavnet må være unikt!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5322,15 +5485,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5346,6 +5500,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Navn på vedlegg"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5429,6 +5588,12 @@ msgstr "Kazakhstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Ukedag [0(Søndag),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Ressursnavn"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5681,7 +5846,7 @@ msgid "title"
 msgstr "tittel"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5738,6 +5903,15 @@ msgstr "Produkter"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5853,13 +6027,15 @@ msgid "Bank Type"
 msgstr "Banktype"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Navnet på gruppen kan ikke starte med \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5879,7 +6055,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5912,10 +6088,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Ressursnavn"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5948,6 +6123,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Orginal visning"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5958,7 +6138,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5974,26 +6154,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6126,11 +6286,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6142,8 +6297,8 @@ msgid "Malaysia"
 msgstr "Malaysia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6250,7 +6405,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6288,7 +6443,7 @@ msgid "Created Menus"
 msgstr "Opprettet menyer"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6315,8 +6470,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6349,6 +6532,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6391,7 +6581,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6483,7 +6673,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6503,23 +6693,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6552,10 +6725,10 @@ msgstr "Rapport xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduler"
 
@@ -6629,9 +6802,9 @@ msgid "United Kingdom"
 msgstr "United Kingdom"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6656,8 +6829,8 @@ msgid "Partner Titles"
 msgstr "Partner titler"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6705,18 +6878,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6823,6 +6991,13 @@ msgstr "Modul ble importert uten feil !"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Overganger"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6917,7 +7092,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Stat (USA)"
@@ -7018,12 +7192,6 @@ msgstr "Fullt navn"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Modulnavnet må være unikt!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7065,6 +7233,7 @@ msgstr "On Multiple Doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7122,7 +7291,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Vær vennlig å velg en handling å uføre !"
@@ -7142,6 +7311,11 @@ msgstr "Kategorinavn"
 msgid "Northern Mariana Islands"
 msgstr "Marianaøyene"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7153,13 +7327,18 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat-rapportering"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7190,7 +7369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7236,7 +7415,6 @@ msgstr "Overgang"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7256,30 +7434,30 @@ msgid "Child Categories"
 msgstr "Underordnede kategorier"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Feil"
@@ -7367,6 +7545,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Dette vinduet"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7450,6 +7633,21 @@ msgstr "Felter"
 msgid "Employees"
 msgstr "Ansatte"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7479,11 +7677,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresser"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7508,7 +7701,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Gate"
@@ -7519,8 +7711,23 @@ msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7599,7 +7806,7 @@ msgid "Change My Preferences"
 msgstr "Endre mine preferanser"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Ugyldig navn på modell i handlingsdefinisjonen."
@@ -7686,14 +7893,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7702,7 +7911,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Tomme passord er ikke tillat!"
@@ -7713,13 +7922,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7738,12 +7947,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Veiviser"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7916,7 +8126,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7947,14 +8157,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Advarsel !"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7978,7 +8180,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8096,7 +8297,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8411,7 +8612,7 @@ msgid "Update Modules List"
 msgstr "Oppdater liste over moduler"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8423,7 +8624,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8433,7 +8634,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8448,6 +8649,17 @@ msgstr "Fortsett"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8487,7 +8699,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8509,15 +8721,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Navn på vedlegg"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8541,7 +8753,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Navn på måned (forkortet)."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8553,7 +8765,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Leverandør"
@@ -8631,7 +8842,7 @@ msgid "Selectable"
 msgstr "Valgbar"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8659,8 +8870,8 @@ msgid "Iteration"
 msgstr "Iterasjon"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "BrukerFeil"
@@ -8684,7 +8895,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8831,7 +9042,7 @@ msgid "Reunion (French)"
 msgstr "Réunion (Frankrike)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8870,8 +9081,8 @@ msgid "Solomon Islands"
 msgstr "Salomonøyene"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Tilgangsfeil"
@@ -8945,7 +9156,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8959,7 +9170,7 @@ msgid "Ukraine"
 msgstr "Ukraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9022,6 +9233,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamsk (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamesisk / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9120,9 +9336,9 @@ msgid "Custom Shortcuts"
 msgstr "Tilpassede snarveier"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamesisk / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9150,13 +9366,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9177,7 +9393,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9225,7 +9441,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s finnes ikke!"
@@ -9271,6 +9487,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9279,7 +9496,7 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9298,6 +9515,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9333,7 +9587,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9385,6 +9639,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Time (12-times klokke) som et desimanummer [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9427,23 +9686,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9477,7 +9724,7 @@ msgid "Products Expiry Date"
 msgstr "Utløpsdato"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9568,6 +9815,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9772,7 +10024,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9783,13 +10035,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Intervallenhet"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Vennlig"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9959,7 +10216,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9992,6 +10249,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10017,6 +10279,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10106,7 +10373,6 @@ msgstr "%m - Måned som et desimaltall [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "By"
@@ -10142,13 +10408,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estisk / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Angi feltnavn som rad id'en refererer til for skrive operasjonen. Hvis den "
+"er tom, så vil det refereres til den aktive id'en til objektet."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 eller senere versjon"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10207,19 +10482,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10233,6 +10533,8 @@ msgid "Activity"
 msgstr "Aktivitet"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10251,7 +10553,12 @@ msgid "Parent Company"
 msgstr "Morselskap"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10263,13 +10570,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10351,6 +10651,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10422,6 +10742,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Sekvenstype"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10480,9 +10805,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10500,8 +10825,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem med konfigurasjon `Record Id` i Server Action!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10540,13 +10865,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-post"
@@ -10557,7 +10881,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10586,36 +10915,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10637,6 +10936,11 @@ msgstr "Annen propertiær"
 msgid "Ecuador"
 msgstr "Equador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "arbeidsflyt"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10653,16 +10957,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Du kan ikke slette et språk som benyttes av en bruker !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10679,8 +10973,8 @@ msgid "Cascade"
 msgstr "Kaskade"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10706,11 +11000,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10736,7 +11025,7 @@ msgid "Domain"
 msgstr "Domene"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10752,12 +11041,12 @@ msgid "State Name"
 msgstr "Navn på stat"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10778,30 +11067,10 @@ msgid "Timezone"
 msgstr "Tidssone"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10821,7 +11090,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10868,7 +11137,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Gate2"
 
@@ -10892,6 +11160,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10977,19 +11246,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "arbeidsflyt"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11031,22 +11309,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumenter"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11179,7 +11441,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Kunde"
 
@@ -11269,7 +11530,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11319,8 +11580,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11411,7 +11672,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11438,7 +11699,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11524,7 +11785,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11537,7 +11798,7 @@ msgid "User Ref."
 msgstr "Bruker ref."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11582,8 +11843,6 @@ msgstr "Veiledning"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11591,7 +11850,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11620,12 +11879,6 @@ msgstr "Falklandsøyene"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11732,8 +11985,10 @@ msgid "Selection"
 msgstr "Valg"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11770,7 +12025,7 @@ msgid "Action Type"
 msgstr "Handlingstype"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11906,11 +12161,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Time 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Fjern avkrysningen fra aktivt felt for å skjule kontakt."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11927,7 +12177,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11950,7 +12200,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11991,16 +12241,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Endre passord"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12047,91 +12297,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12310,6 +12526,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12326,7 +12547,7 @@ msgid "Body"
 msgstr "Innhold"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12374,7 +12595,7 @@ msgid "choose"
 msgstr "velg"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12550,10 +12771,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12585,12 +12810,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12604,7 +12830,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12626,23 +12851,6 @@ msgstr ""
 msgid "China"
 msgstr "Kina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12710,25 +12918,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12756,6 +12948,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "AS"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12792,6 +13004,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "ukjent"
@@ -12859,6 +13072,11 @@ msgstr "Adressebok"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12948,6 +13166,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12960,7 +13179,7 @@ msgid "Information"
 msgstr "Informasjon"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12991,16 +13210,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Oppdater liste over moduler"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13065,6 +13288,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13137,29 +13365,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13207,7 +13412,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13251,9 +13456,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Opprett regler"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13497,9 +13702,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13526,63 +13736,14 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13623,17 +13784,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13668,7 +13818,7 @@ msgid "Low"
 msgstr "Lav"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Feil ! Du kan ikke lage rekursive menyer."
@@ -13748,11 +13898,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13767,6 +13916,11 @@ msgstr "Tilgangsmeny"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13787,6 +13941,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13823,41 +14001,6 @@ msgstr "Objektrelasjon"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13918,40 +14061,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14040,6 +14151,21 @@ msgstr "Vis :"
 msgid "View Auto-Load"
 msgstr "Modell for ikonvisning"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14082,34 +14208,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14132,9 +14230,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14145,7 +14243,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14171,7 +14299,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14216,7 +14344,7 @@ msgid "Access"
 msgstr "Tilgang"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14249,11 +14377,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14269,8 +14396,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14385,7 +14510,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14397,7 +14522,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14430,7 +14554,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14441,8 +14565,8 @@ msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Advarsel"
@@ -14468,11 +14592,6 @@ msgstr "Jomfruøyene"
 msgid "Parameters"
 msgstr "Parametere"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre og Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14562,7 +14681,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Land"
@@ -14631,9 +14749,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spansk (AR) / Español (AR)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14660,7 +14786,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14721,6 +14847,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14745,7 +14902,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Denne operasjonen kan ta noen minutter."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14784,6 +14941,12 @@ msgstr ""
 msgid "Condition"
 msgstr "Betingelse"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14836,6 +14999,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Kroatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14860,6 +15030,11 @@ msgstr "Systemoppdatering"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14876,7 +15051,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14897,15 +15072,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Generell informasjon"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14941,7 +15153,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14959,11 +15176,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funksjon"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14999,11 +15220,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Leveranse"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15031,7 +15247,7 @@ msgid "Workflow Instances"
 msgstr "Arbeidsflytinstanser"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partnere: "
@@ -15042,7 +15258,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15108,7 +15324,6 @@ msgstr "Eksportnavn"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15176,6 +15391,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Feil på linje %d: %s"
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontaktnavn"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15275,6 +15493,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Vedlagt ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Hold igjen 0 hvis handlingen skal omfatte alle ressurser."
 
@@ -15292,6 +15513,9 @@ msgstr ""
 #~ "Spesifiser meldingen. Du kan bruke feltene fra objektet. F.eks. Kjære [[ "
 #~ "objetc.partner_id.name]]'"
 
+#~ msgid "Attached Model"
+#~ msgstr "Tilknyttet modell"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Domene oppsett"
 
@@ -15502,6 +15726,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW sti"
 
+#~ msgid "Creator"
+#~ msgstr "Forfatter"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15632,6 +15859,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresser"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML Identifikator"
 
@@ -15796,6 +16026,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Felttyper"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Fjern avkrysningen fra aktivt felt for å skjule kontakt."
+
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr "Din egen logo - Bruk en logo med størrelse på ca 450x150 pixler"
 
@@ -15947,6 +16180,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Aldri"
 
+#~ msgid "Delivery"
+#~ msgstr "Leveranse"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "BIC/Swift kode"
 
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index aa8f52b4b37..9c77f590f47 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-11-25 07:15+0000\n"
-"Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 07:41+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 04:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -24,6 +24,10 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Module voor het maken en afdrukken van cheques. \n"
+"================================================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -41,7 +45,7 @@ msgid "DateTime"
 msgstr "DatumTijd"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -203,41 +207,15 @@ msgstr ""
 "Je kunt prijslijsten definieren in een grootboek rapportage."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -248,7 +226,7 @@ msgstr ""
 "module."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Voorwaarde Fout"
@@ -259,7 +237,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Hiernoenen sparse field \"%s\" is niet toegestaan"
@@ -270,7 +248,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "gemaakt."
@@ -349,20 +327,6 @@ msgstr "Bedrijf om het huidige record op te slaan"
 msgid "Max. Size"
 msgstr "Max. lengte"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -370,11 +334,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Naam contactpersoon"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -440,7 +399,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -477,6 +436,7 @@ msgstr "Automatische actie regels"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -518,7 +478,7 @@ msgstr ""
 "een taal."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -548,7 +508,7 @@ msgstr "Relatie naam"
 #. module: base
 #: view:ir.rule:0
 msgid "Create Access Right"
-msgstr ""
+msgstr "Toegangsrechten aanmaken"
 
 #. module: base
 #: model:res.country,name:base.tv
@@ -576,7 +536,7 @@ msgid "Netherlands Antilles"
 msgstr "Nederlandse Antillen"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -617,9 +577,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Origineel beeld"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideeën"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -644,26 +604,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosnisch / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -674,9 +614,25 @@ msgstr ""
 "met dezelfde bijlagenaam afdrukt, het vorige rapport gebruikt."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -741,7 +697,7 @@ msgstr "Onvertaald"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Uitgaande mailserver"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -752,14 +708,12 @@ msgstr ""
 "Context dictionary als Python expressie, standaard leeg (Standaard: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Assistenten"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr "Web logo"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Eigen velden dienen een naam te hebben die begint met 'x_' !"
@@ -823,17 +777,21 @@ msgid "Model Description"
 msgstr "Omschrijving model"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Menu voor marketing.\n"
+"==================\n"
+"\n"
+"Bevat de installer voor marketing gerelateerde modules.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -844,6 +802,11 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web LinkedIn module.\n"
+"============================\n"
+"Deze module verzorgt de integratie tussen LinkedIn en OpenERP.\n"
+"        "
 
 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -862,11 +825,21 @@ msgstr "Trigger-expressie"
 msgid "Jordan"
 msgstr "Jordanië"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr "Kroatië  - RRIF 2012 COA"
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Volgende geplande uitvoeringsdatum vor deze taak"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -890,7 +863,7 @@ msgstr "Roemenië  - Boekhouding"
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"
 
 #. module: base
 #: help:res.partner,image_small:0
@@ -899,6 +872,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Klein formaat afbeelding van dit Contact. Afbeelding is automatisch "
+"geschaald naar een 64x64 afbeelding met behoud van de verhoudingen. Gebruik "
+"dit veld overal waar een kleine afbeelding vereist is."
 
 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -930,7 +906,7 @@ msgstr "Zweeds / svenska"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Bestandsnaam"
 
 #. module: base
 #: model:res.country,name:base.rs
@@ -998,13 +974,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Geef de veldnaam waaraan het record-id refereert voor schrijf-operaties. Als "
-"het leeg is wordt het actieve id van het object gebruikt"
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nieuw-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1023,10 +995,10 @@ msgid "Email Preferences"
 msgstr "E-mail voorkeuren"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' is geen geldige datum '%%(field)s'"
 
 #. module: base
 #: view:res.partner:0
@@ -1072,16 +1044,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spaans (UY) / Spanje (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobiel"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1105,8 +1070,8 @@ msgid ""
 "       "
 msgstr ""
 "\n"
-"Deze module kunt u de aanwezigheid van medewerkers beheren\n"
-"====================================================\n"
+"Met deze module kunt u de aanwezigheid van medewerkers beheren\n"
+"=======================================================\n"
 "\n"
 "Registreert de aanwezigheid van medewerkers op basis van hun acties\n"
 "(Sign in/Sign out).\n"
@@ -1130,7 +1095,7 @@ msgstr "Andere OSI erkende licentie"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Web Gantt"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1185,9 +1150,38 @@ msgid "Mongolia"
 msgstr "Mongolië"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1203,11 +1197,16 @@ msgstr ""
 "toegevoegd aan de volgende groepen."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Document model"
+
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr "Gebruikers wachtwoord wijzigen."
 
 #. module: base
 #: view:res.lang:0
@@ -1235,7 +1234,54 @@ msgid "Username"
 msgstr "Gebruikersnaam"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1257,15 +1303,15 @@ msgstr "De landnaam moet uniek zijn !"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Nieuwste versie"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Delete Access Right"
-msgstr ""
+msgstr "Tegangsrechten verwijderen."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Verbindings test mislukt!"
@@ -1297,14 +1343,12 @@ msgid "South Korea"
 msgstr "Zuid-Korea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Overgangen"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Record #%d van %s niet gevonden, kan niet kopieren!"
@@ -1442,7 +1486,7 @@ msgid "Marshall Islands"
 msgstr "Marshall-eilanden"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Het wijzigen van het model van een veld is niet toegestaan!"
@@ -1464,7 +1508,7 @@ msgid "Search"
 msgstr "Zoek"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1483,7 +1527,14 @@ msgid "Parent Application"
 msgstr "Parent applicatie"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Assistenten"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Bewerking geannuleerd"
@@ -1617,7 +1668,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mf
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Sint-Maarten (Franse Antillen)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1625,7 +1676,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Taal met code \"%s\" bestaat niet"
@@ -1634,7 +1699,7 @@ msgstr "Taal met code \"%s\" bestaat niet"
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Sociaal netwerk"
 
 #. module: base
 #: view:res.lang:0
@@ -1644,7 +1709,7 @@ msgstr "%Y - Jaar met eeuw."
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Voettekst instellingen van rapport"
 
 #. module: base
 #: field:ir.translation,comments:0
@@ -1748,7 +1813,7 @@ msgid "On Create"
 msgstr "Bij aanmaken"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1758,11 +1823,6 @@ msgstr ""
 "worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Offertes, Verkoopordes, Facturen"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1780,7 +1840,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project_issue
 msgid "Portal Issue"
-msgstr ""
+msgstr "Portaal Issue"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -1845,7 +1905,7 @@ msgid "East Timor"
 msgstr "Oost-Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1886,11 +1946,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Bijlage ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1907,7 +1962,7 @@ msgstr ""
 "betaalmethode codering, automatische piklijst generatie en meer."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1920,7 +1975,7 @@ msgstr "Nederland"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_event
 msgid "Portal Event"
-msgstr ""
+msgstr "Portaal Event"
 
 #. module: base
 #: selection:ir.translation,state:0
@@ -1948,6 +2003,11 @@ msgstr "Voertuig, lease, verzekeringen, kosten"
 msgid "Read Access"
 msgstr "Lezen"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2024,16 +2084,11 @@ msgid "Create Tasks on SO"
 msgstr "Maak taken bij een verkooporder"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Deze kolom bevat module data en kan niet verwijderd worden!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Bijgevoegd model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2088,7 +2143,7 @@ msgid "Formula"
 msgstr "Formule"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "U kunt de hoofdgebruiker niet verwijderen!"
@@ -2112,11 +2167,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -2128,7 +2183,6 @@ msgstr "Grootboekschema template"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Soort adres"
 
@@ -2166,11 +2220,6 @@ msgstr "Volledig pad"
 msgid "The next step depends on the file format:"
 msgstr "De volgende stap is afhankelijk van het bestandsformaat:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideeën"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2209,7 +2258,7 @@ msgstr "Maken / Schrijven / Kopiëren"
 #. module: base
 #: view:ir.sequence:0
 msgid "Second: %(sec)s"
-msgstr ""
+msgstr "Seconde: %(sec)s"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -2238,7 +2287,7 @@ msgstr "Koreans (KP) / Korea (KP)"
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
-msgstr ""
+msgstr "Åland-eilanden"
 
 #. module: base
 #: field:res.company,logo:0
@@ -2309,6 +2358,11 @@ msgstr "Aantal bijgewerkte modules"
 msgid "Method"
 msgstr "Methode"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr "Wachtwoord encryptie"
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2342,12 +2396,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr "Nieuw wachtwoord"
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2397,6 +2456,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Wel of niet RML-bedrijfskopregels toevoegen"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2450,7 +2518,7 @@ msgstr ""
 "'calendar', etc. (Standaard: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2544,9 +2612,8 @@ msgstr "St. Tome (Sao Tome) en Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
-msgstr "Factuur"
+msgstr "Factuuradres"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product
@@ -2591,11 +2658,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Bedrijfs slogan"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2713,9 +2775,20 @@ msgid "Default limit for the list view"
 msgstr "Standaard aantal items in lijst-weergave"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nieuw-Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2793,7 +2866,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2852,6 +2925,19 @@ msgstr "Veldverwijzingen"
 msgid "Export Translations"
 msgstr "Vertalingen exporteren"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2860,7 +2946,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Sorry, u heeft geen toegang tot dit document."
@@ -2878,7 +2964,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Rapport Xml"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -2946,10 +3032,10 @@ msgid "Inherited"
 msgstr "Overgeërfd"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "Ja"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -2976,7 +3062,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3043,22 +3129,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn Integratie"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Ongeldige object architectuur!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -3089,6 +3175,8 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic "
 "reports."
 msgstr ""
+"De gebruiker krijgt toegang tot de verkoop instellingen en de statistische "
+"rapporten"
 
 #. module: base
 #: model:res.country,name:base.nz
@@ -3155,12 +3243,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr "Bedrijfs slogan"
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3175,19 +3263,23 @@ msgid ""
 "the user will have an access to the human resources configuration as well as "
 "statistic reports."
 msgstr ""
+"De gebruiker krijgt toegang tot de HR instellingen en de statistische "
+"rapporten."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3197,7 +3289,7 @@ msgid "Params storage"
 msgstr "Parameters opslag"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Kan module '%s' niet bijwerken. Deze is niet geïnstalleerd."
@@ -3248,34 +3340,6 @@ msgstr "Configuratie parameters"
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3314,7 +3378,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3326,6 +3390,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Soort bankrekening"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3356,7 +3448,7 @@ msgstr "Agenda"
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge"
-msgstr ""
+msgstr "Kennis"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3364,7 +3456,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signaal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3404,7 +3496,7 @@ msgid "Access Controls"
 msgstr "Toegangsrechten"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3434,32 +3526,6 @@ msgstr "Moederorganisatie"
 msgid "Web Icon File (hover)"
 msgstr "Web icon bestand (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3479,9 +3545,13 @@ msgstr ""
 "Wanneer u een formule gebruikt, gebruik dan een python expressie die de "
 "variabele 'object' gebruikt."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Geboortedatum"
 
@@ -3497,7 +3567,7 @@ msgid "Products Manufacturers"
 msgstr "Product fabricanten"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL mode onbeschikbaar"
@@ -3521,7 +3591,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Export voltooid"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3594,7 +3664,7 @@ msgstr "Selecteer te importeren modulepakket (.zip bestand):"
 #. module: base
 #: view:ir.filters:0
 msgid "Personal"
-msgstr ""
+msgstr "Persoonlijk"
 
 #. module: base
 #: field:base.language.export,modules:0
@@ -3607,7 +3677,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3703,7 +3773,7 @@ msgstr "Antarctica"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Personen"
 
 #. module: base
 #: view:base.language.import:0
@@ -3773,7 +3843,7 @@ msgstr "Rechts-naar-links"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (Nederlands deel)"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -3799,7 +3869,6 @@ msgstr "Rapportages"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Titel"
@@ -3811,13 +3880,18 @@ msgstr ""
 "Indien ingesteld, treedt op als standaardwaarde voor nieuwe resources"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Recursiviteit ontdekt."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr "Boekhouding - Ethiopië"
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Recursiefout in module-afhankelijkheden !"
@@ -3877,12 +3951,13 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Toegang geweigerd"
 
 #. module: base
 #: field:res.company,name:0
@@ -3890,7 +3965,7 @@ msgid "Company Name"
 msgstr "Bedrijfsnaam"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3911,14 +3986,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (achterhaald - gebruik overzicht)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Taalcode van vertalingen moet één van de bekende talen zijn"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Recordregels"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "St. Pierre en Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3947,13 +4045,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4001,19 +4095,7 @@ msgid "Paper Format"
 msgstr "Papier formaat"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4025,7 +4107,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Slowakije"
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -4033,7 +4115,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4078,7 +4160,7 @@ msgid "Email Gateway"
 msgstr "E-mail Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4099,9 +4181,43 @@ msgid "Technical Data"
 msgstr "Technische gegevens"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4157,13 +4273,18 @@ msgstr "Urenstaat op issues"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Ongeldige architectuur!"
@@ -4179,9 +4300,9 @@ msgid "Share any Document"
 msgstr "Deel ieder document"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Groep verplicht"
 
 #. module: base
 #: view:res.lang:0
@@ -4242,33 +4363,10 @@ msgid "Languages"
 msgstr "Talen"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4278,7 +4376,7 @@ msgstr "Rekeningschema's"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organization"
-msgstr ""
+msgstr "Evenementen organiseren"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -4346,9 +4444,8 @@ msgstr "Begrenzing"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
-msgstr "Standaard"
+msgstr "Standaard adres"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_lunch
@@ -4421,6 +4518,11 @@ msgstr ""
 "mail server met de hoogste prioriteit gebruikt. Standaard prioriteit is 10 "
 "(kleiner getal = hogere prioriteit)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4484,9 +4586,16 @@ msgid "Default value or action reference"
 msgstr "Standaard waarde of actie referentie"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4547,7 +4656,7 @@ msgstr "Soort reeks"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4564,6 +4673,22 @@ msgstr "Laad een vertaling"
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
+msgstr "Geïnstalleerde versie"
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
 msgstr ""
 
 #. module: base
@@ -4592,6 +4717,43 @@ msgstr ""
 "groepen. Als het veld leeg is berekent OpenERP de zichtbaarheid op basis van "
 "de leesrechten van het gerelateerde object."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4622,6 +4784,12 @@ msgstr ""
 msgid "View"
 msgstr "Weergave"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "Nee"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4654,7 +4822,7 @@ msgstr "Equatoriaal Guinea"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_api
 msgid "OpenERP Web API"
-msgstr ""
+msgstr "OpenERP Web API"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -4699,16 +4867,10 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Palestijns Gebied, Bezet"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
@@ -4719,7 +4881,6 @@ msgstr "Zwitserland  - Boekhouding"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postcode"
@@ -4730,13 +4891,18 @@ msgstr "Postcode"
 msgid "Author"
 msgstr "Auteur"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Stel in als te doen"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Passende weergave datum en tijd"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4781,6 +4947,8 @@ msgstr "Richting"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Weergaven"
 
@@ -4796,7 +4964,7 @@ msgid "SMTP Server"
 msgstr "SMTP-server"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4861,7 +5029,7 @@ msgstr "Workflows"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Inkoop"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4871,7 +5039,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
 msgid "ir.needaction_mixin"
-msgstr ""
+msgstr "ir.needaction_mixin"
 
 #. module: base
 #: view:base.language.export:0
@@ -4894,10 +5062,15 @@ msgid "Google Docs integration"
 msgstr "Google Docs integratie"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "naam"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -4982,7 +5155,7 @@ msgid "System Configuration Done"
 msgstr "Systeemconfiguratie afgerond"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Fout opgetreden bij het valideren van veld(en) %s: %s"
@@ -5020,12 +5193,12 @@ msgstr "Stel in op NULL"
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML Path"
-msgstr ""
+msgstr "XML Path"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -5097,6 +5270,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Volledige toegang"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5110,7 +5288,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5122,7 +5300,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Alleen wanneer dit bankrekeningnummer behoort tot uw bedrijf"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5154,6 +5332,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hongarije"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5198,7 +5387,7 @@ msgstr "Wisselkoersen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Email-sjablonen"
 
 #. module: base
 #: model:res.country,name:base.sy
@@ -5298,12 +5487,12 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Relatie labels"
 
 #. module: base
 #: view:res.company:0
 msgid "Preview Header/Footer"
-msgstr ""
+msgstr "Bekijk kop/voet"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5317,7 +5506,7 @@ msgid "Account Owner Name"
 msgstr "Naam eigenaar rekening"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5335,16 +5524,11 @@ msgid "Decimal Separator"
 msgstr "Decimaal scheidingsteken"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5383,7 +5567,7 @@ msgstr "Historie"
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Eiland Man"
 
 #. module: base
 #: help:ir.actions.client,res_model:0
@@ -5391,9 +5575,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Maker"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "De modulenaam moet uniek zijn !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5456,15 +5641,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5480,6 +5656,11 @@ msgstr "Start configuratie wizard"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Naam bijlage"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5546,7 +5727,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "See all Leads"
-msgstr ""
+msgstr "Bekijk alle leads"
 
 #. module: base
 #: model:res.country,name:base.ci
@@ -5563,6 +5744,12 @@ msgstr "Kazachstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Weekdag nummer [0(Zondag),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Naam bron"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5623,7 +5810,7 @@ msgstr "Decimale precisie configuratie"
 #: model:ir.model,name:base.model_ir_actions_act_url
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.act_url"
-msgstr ""
+msgstr "ir.actions.act_url"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -5776,7 +5963,7 @@ msgstr ""
 #. module: base
 #: view:ir.translation:0
 msgid "Comments"
-msgstr ""
+msgstr "Reacties"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -5786,7 +5973,7 @@ msgstr "Ethiopië"
 #. module: base
 #: model:ir.module.category,name:base.module_category_authentication
 msgid "Authentication"
-msgstr ""
+msgstr "Authenticatie"
 
 #. module: base
 #: model:res.country,name:base.sj
@@ -5817,10 +6004,10 @@ msgid "title"
 msgstr "titel"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "waar"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -5830,7 +6017,7 @@ msgstr "Taal installeren"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Services"
-msgstr ""
+msgstr "Diensten"
 
 #. module: base
 #: view:ir.translation:0
@@ -5874,6 +6061,15 @@ msgstr "Producten"
 msgid "User-defined Defaults"
 msgstr "Gebruikers standaard"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5934,7 +6130,7 @@ msgstr ""
 #: code:addons/base/ir/workflow/workflow.py:99
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Verwerking niet toegestaan"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -5991,13 +6187,15 @@ msgid "Bank Type"
 msgstr "Soort bank"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "De naam van de groep kan niet beginnen met \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Toepassingen"
 
@@ -6017,7 +6215,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / India"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6052,15 +6250,14 @@ msgid "Uncategorized"
 msgstr "Geen categorie"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Naam bron"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr "Telefoon:"
 
 #. module: base
 #: field:res.partner,is_company:0
 msgid "Is a Company"
-msgstr ""
+msgstr "Is een bedrijf"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6091,6 +6288,11 @@ msgstr ""
 "cliënt formulier, controleert sein de naam van de knop. Als sein NULL is, is "
 "er geen knop nodig voor deze overgang."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Origineel beeld"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6101,7 +6303,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6117,26 +6319,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mijn banken"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6155,7 +6337,7 @@ msgstr ""
 #. module: base
 #: field:ir.filters,is_default:0
 msgid "Default filter"
-msgstr ""
+msgstr "Standaard filter"
 
 #. module: base
 #: report:ir.module.reference:0
@@ -6269,11 +6451,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6285,8 +6462,8 @@ msgid "Malaysia"
 msgstr "Maleisië"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6398,7 +6575,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Er is geen weergave soort '%s' gedefinieerd voor de structuur!"
@@ -6438,7 +6615,7 @@ msgid "Created Menus"
 msgstr "Aangemaakte menu's"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6465,9 +6642,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Stel in als te doen"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6492,13 +6697,20 @@ msgstr "ir.cron"
 #. module: base
 #: model:res.country,name:base.cw
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year without Century: %(y)s"
 msgstr "Huidig jaar zonder eeuw: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Systeem parameters"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6541,7 +6753,7 @@ msgid "Audit Trail"
 msgstr "Audittrail"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6633,7 +6845,7 @@ msgid "Israel"
 msgstr "Israël"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6651,24 +6863,7 @@ msgstr "Soms BIC of Swift genoemd."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "Indian - Accounting"
-msgstr ""
-
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobiel"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
+msgstr "Boekhouding - India"
 
 #. module: base
 #: field:res.lang,time_format:0
@@ -6702,10 +6897,10 @@ msgstr "XML overzicht"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Modules"
 
@@ -6779,9 +6974,9 @@ msgid "United Kingdom"
 msgstr "Groot-Brittanië"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6806,8 +7001,8 @@ msgid "Partner Titles"
 msgstr "Juridische entiteit"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6855,7 +7050,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6864,11 +7059,6 @@ msgstr ""
 "U kunt deze bewerking niet uitvoeren. Nieuw record maken is niet toegestaan "
 "voor dit object omdat dit object voor rapportage doelen is."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6978,6 +7168,13 @@ msgstr "Importeren modulebestand geslaagd!Geannu"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Overgangen"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7024,7 +7221,7 @@ msgstr "Somalië"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_doctor
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #. module: base
 #: model:res.groups,name:base.group_user
@@ -7076,7 +7273,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Staat/Provincie"
@@ -7089,7 +7285,7 @@ msgstr "Kopie van"
 #. module: base
 #: field:ir.model.data,display_name:0
 msgid "Record Name"
-msgstr ""
+msgstr "Record naam"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_client
@@ -7105,7 +7301,7 @@ msgstr "Brits Territorium in de Indische Oceaan"
 #. module: base
 #: model:ir.actions.server,name:base.action_server_module_immediate_install
 msgid "Module Immediate Install"
-msgstr ""
+msgstr "Module directie installatie"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7175,13 +7371,7 @@ msgstr "Volledige naam"
 #. module: base
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
+msgstr "aan"
 
 #. module: base
 #: view:ir.property:0
@@ -7226,13 +7416,14 @@ msgstr "Op meerdere doc."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
@@ -7283,7 +7474,7 @@ msgid "Connection Security"
 msgstr "Connectie beveiliging"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Geef alstublieft een actie om uit te voeren !"
@@ -7303,6 +7494,11 @@ msgstr "Naam categorie"
 msgid "Northern Mariana Islands"
 msgstr "Noordelijke Marianaeilanden"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr "Gebruikersnaam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7314,7 +7510,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat rapportage"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7323,6 +7519,11 @@ msgstr ""
 "Gebruik aub de assistent \"Wachtwoord wijzigen\" (onder menu Gebruikers of "
 "in de Voorkeuren van de gebruiker) om uw eigen wachtwoord te wijzigen."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7353,7 +7554,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Onvoldoende velden voor agenda weergave!"
@@ -7375,7 +7576,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Fabrikant"
 
 #. module: base
 #: help:res.users,company_id:0
@@ -7401,7 +7602,6 @@ msgstr "Overgang"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7421,30 +7621,30 @@ msgid "Child Categories"
 msgstr "Subcategorieën"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -7520,7 +7720,7 @@ msgstr "Volgend nummer in deze reeks"
 #. module: base
 #: view:res.partner:0
 msgid "at"
-msgstr ""
+msgstr "op"
 
 #. module: base
 #: view:ir.rule:0
@@ -7532,6 +7732,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Dit venster"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7619,6 +7824,21 @@ msgstr "Velden"
 msgid "Employees"
 msgstr "Werknemers"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7648,11 +7868,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Test verbinding"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adressen"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7677,7 +7892,6 @@ msgstr "Selectie-opties"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Straat"
@@ -7688,9 +7902,24 @@ msgid "Yugoslavia"
 msgstr "Joegoslavië"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Rechts bovenliggende"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7748,7 +7977,7 @@ msgstr "Canada"
 #. module: base
 #: view:base.language.export:0
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: base
 #: help:res.currency.rate,currency_rate_type_id:0
@@ -7768,7 +7997,7 @@ msgid "Change My Preferences"
 msgstr "Wijzig mijn voorkeuren"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de definitie van de actie."
@@ -7827,7 +8056,7 @@ msgstr "init"
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Verkoper"
 
 #. module: base
 #: view:res.lang:0
@@ -7855,21 +8084,17 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menu voor marketing.\n"
-"==================\n"
-"\n"
-"Bevat de installer voor marketing gerelateerde modules.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7877,7 +8102,7 @@ msgid "Company Bank Accounts"
 msgstr "Bedrijfsbankrekeningen"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7890,13 +8115,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Optioneel wachtwoord voor SMTP authenticatie"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7918,12 +8143,13 @@ msgid "Normal Bank Account"
 msgstr "Normale bankrekening"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Assistent"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7983,7 +8209,7 @@ msgstr "Frans (CH) / Français (CH)"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Distributor"
-msgstr ""
+msgstr "Distributeur"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -8084,7 +8310,7 @@ msgstr "Volgnummers bij boekingen"
 #. module: base
 #: view:base.language.export:0
 msgid "POEdit"
-msgstr ""
+msgstr "POEdit"
 
 #. module: base
 #: view:ir.values:0
@@ -8094,7 +8320,7 @@ msgstr "Cliënt acties"
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type Fields"
-msgstr ""
+msgstr "Type velden"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_recruitment
@@ -8102,7 +8328,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8134,14 +8360,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8160,12 +8378,11 @@ msgstr "Finland"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_shortcuts
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Webkoppelingen"
 
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8174,7 +8391,7 @@ msgstr "Contactpersoon"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
 msgid "Austria - Accounting"
-msgstr ""
+msgstr "Boekhouding - Oostenrijk"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_menu
@@ -8204,12 +8421,12 @@ msgstr "Kostenplaatsen"
 #. module: base
 #: model:ir.model,name:base.model_ir_model_constraint
 msgid "ir.model.constraint"
-msgstr ""
+msgstr "ir.model.constraint"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "Graph Views"
-msgstr ""
+msgstr "Grafiek weergaves"
 
 #. module: base
 #: help:ir.model.relation,name:0
@@ -8237,7 +8454,7 @@ msgstr "België  - Boekhouding"
 #. module: base
 #: view:ir.model.access:0
 msgid "Access Control"
-msgstr ""
+msgstr "Toegangscontrole"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -8285,7 +8502,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Voor selectievelden moeten de selectie-opties opgegeven worden!"
@@ -8459,7 +8676,7 @@ msgstr "Zelfcontrole op rapporten en objecten"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_analytics
 msgid "Google Analytics"
-msgstr ""
+msgstr "Google Analytics"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note
@@ -8487,7 +8704,7 @@ msgstr "Dominica"
 #. module: base
 #: field:ir.translation,name:0
 msgid "Translated field"
-msgstr ""
+msgstr "Vertaald veld"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
@@ -8507,17 +8724,17 @@ msgstr "Nepal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Document pagina"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ar
 msgid "Argentina Localization Chart Account"
-msgstr ""
+msgstr "Boekhoudschema - Argentinië"
 
 #. module: base
 #: field:ir.module.module,description_html:0
 msgid "Description HTML"
-msgstr ""
+msgstr "Omschrijving HTML"
 
 #. module: base
 #: help:res.groups,implied_ids:0
@@ -8606,7 +8823,7 @@ msgid "Update Modules List"
 msgstr "Werk modulelijst bij"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8620,7 +8837,7 @@ msgid "eInvoicing"
 msgstr "Boekhouding"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8635,7 +8852,7 @@ msgstr ""
 "drukken in de Gebruikersvoorkeuren)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "De waarde \"%s\" van het veld \"%s.%s\" is niet in de selectie"
@@ -8650,6 +8867,17 @@ msgstr "Doorgaan"
 msgid "Thai / ภาษาไทย"
 msgstr "Thais / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8663,7 +8891,7 @@ msgstr "Sloveens / slovenščina"
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol Position"
-msgstr ""
+msgstr "Symbool positie"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -8689,7 +8917,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8701,7 +8929,7 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "documentation"
-msgstr ""
+msgstr "documentatie"
 
 #. module: base
 #: help:ir.model,osv_memory:0
@@ -8711,15 +8939,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Ontbrekende SMTP Server"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Naam bijlage"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Taalcode van vertalingen moet één van de bekende talen zijn"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8743,7 +8971,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Afkorting naam maand."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8755,7 +8983,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Leverancier"
@@ -8820,7 +9047,7 @@ msgstr "Amerikaans Samoa"
 #. module: base
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mijn document(en)"
 
 #. module: base
 #: help:ir.actions.act_window,res_model:0
@@ -8833,7 +9060,7 @@ msgid "Selectable"
 msgstr "Kiesbaar"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Alles lijkt goed geïnstalleerd te zijn!"
@@ -8861,8 +9088,8 @@ msgid "Iteration"
 msgstr "Herhaling"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Gebruikersfout"
@@ -8886,7 +9113,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8897,12 +9124,12 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
 msgid "Silver"
-msgstr ""
+msgstr "Zilver"
 
 #. module: base
 #: field:res.partner.title,shortcut:0
 msgid "Abbreviation"
-msgstr ""
+msgstr "Afkorting"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@@ -9035,7 +9262,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9076,8 +9303,8 @@ msgid "Solomon Islands"
 msgstr "Salomoneilanden"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -9099,7 +9326,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_warehouse_management
 msgid "Warehouse"
-msgstr ""
+msgstr "Magazijn"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -9148,10 +9375,10 @@ msgstr "Overzicht"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_prof
 msgid "Prof."
-msgstr ""
+msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9168,7 +9395,7 @@ msgid "Ukraine"
 msgstr "Oekraïne"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9224,13 +9451,18 @@ msgstr "Mali"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_config_project
 msgid "Stages"
-msgstr ""
+msgstr "Fases"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Vlaams (BE) / België (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamees / Vietnam"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9329,9 +9561,9 @@ msgid "Custom Shortcuts"
 msgstr "Eigen sneltoetsen"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamees / Vietnam"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9359,13 +9591,13 @@ msgid "Models"
 msgstr "Modellen"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Regel kan nu niet worden bijgewerkt"
@@ -9386,7 +9618,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9431,10 +9663,10 @@ msgstr "%H - Uur (24-uur klok) [00,23]."
 #. module: base
 #: field:ir.model.fields,on_delete:0
 msgid "On Delete"
-msgstr ""
+msgstr "Bij het verwijderen"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s bestaat niet!"
@@ -9480,6 +9712,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9488,7 +9721,7 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9507,6 +9740,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9542,10 +9812,10 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
-msgstr ""
+msgstr "Externe id"
 
 #. module: base
 #: view:ir.model:0
@@ -9594,6 +9864,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Uur (12-uur klok) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9636,23 +9911,11 @@ msgid "The currency code must be unique per company!"
 msgstr "De valutacode moet uniek zijn per bedrijf!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9686,7 +9949,7 @@ msgid "Products Expiry Date"
 msgstr "Producten THT datum"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Klik 'Doorgaan' om de volgende addon te configureren..."
@@ -9784,6 +10047,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9991,7 +10259,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Marketing Campagne - Demo gegevens"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10002,13 +10270,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Eenheid interval"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Soort"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Deze methode bestaat niet meer"
@@ -10182,7 +10455,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10222,6 +10495,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10248,6 +10526,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL icoon"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10339,7 +10622,6 @@ msgstr "%m - Maandnummer [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Plaats"
@@ -10375,13 +10657,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estlands / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Geef de veldnaam waaraan het record-id refereert voor schrijf-operaties. Als "
+"het leeg is wordt het actieve id van het object gebruikt"
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 of latere versie"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10442,19 +10733,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10468,6 +10784,8 @@ msgid "Activity"
 msgstr "Activiteit"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10486,7 +10804,12 @@ msgid "Parent Company"
 msgstr "Moederbedrijf"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Authentificatie"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10498,13 +10821,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10591,6 +10907,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10664,6 +11000,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Reekssoort"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10732,9 +11073,9 @@ msgstr ""
 "De-activeer de taal eerst aub."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10752,8 +11093,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Probleem in instellingen `Record id` in server-actie!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Validatiefout"
@@ -10794,13 +11135,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10811,7 +11151,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10842,36 +11187,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10893,6 +11208,11 @@ msgstr "Ander eigendom"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10909,16 +11229,6 @@ msgstr "Werknemerfunctie per contract/kostenplaats"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "U kunt geen taal verwijderen die gebruikers voorkeurstaal is !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10935,9 +11245,9 @@ msgid "Cascade"
 msgstr "Trapsgewijs"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Groep verplicht"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10964,11 +11274,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10994,7 +11299,7 @@ msgid "Domain"
 msgstr "Domein"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11010,12 +11315,12 @@ msgid "State Name"
 msgstr "Naam staat/provincie"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11036,30 +11341,10 @@ msgid "Timezone"
 msgstr "Tijdszone"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11080,7 +11365,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11133,7 +11418,6 @@ msgstr "Dubbele controle op inkopen"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Adres 2"
 
@@ -11157,6 +11441,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11242,19 +11527,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Integriteit Fout"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
@@ -11296,22 +11590,6 @@ msgstr "Personeelsbeheer"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11444,7 +11722,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Klant"
 
@@ -11534,7 +11811,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11584,9 +11861,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Authentificatie"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11676,7 +11953,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Mail afleveren mislukt"
@@ -11703,7 +11980,7 @@ msgid "Object"
 msgstr "Object"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11792,7 +12069,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11807,7 +12084,7 @@ msgid "User Ref."
 msgstr "Ref. gebruiker"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11852,8 +12129,6 @@ msgstr "Referentiegids"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11861,7 +12136,7 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11892,12 +12167,6 @@ msgstr "Falkland-eilanden"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12006,9 +12275,11 @@ msgid "Selection"
 msgstr "Selectie"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL icoon"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12044,7 +12315,7 @@ msgid "Action Type"
 msgstr "Soort actie"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12182,11 +12453,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Uur 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Deselecteer het actieve veld op de contactpersoon te verbergen."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12203,7 +12469,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Onbekend attribuut %s in %s "
@@ -12226,7 +12492,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Ongedefinieerde get methode !"
@@ -12267,16 +12533,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Loonadministratie"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binair bestand of externe URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12323,92 +12589,57 @@ msgid "Address Format"
 msgstr "Adres formaat"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"De instellingen voor het scheidingsteken heeft het formaat [,n] waarbij n > "
-"0 gerekend vanaf het decimaalteken. -1 eindigt de scheiding. Bijv. [3,2,-1] "
-"geeft op 106500 het volgende resultaat: 1,06,500. [1,2,-1] geeft 106,50,0; "
-"[3] geeft 106,500. Er is in deze voorbeelden uitgegaan van ',' als "
-"scheidingsteken."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Technische mogelijkheden"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12595,6 +12826,11 @@ msgstr ""
 "Helpt uw voorraad te beheren en bij belangrijke voorraad bewerkingen: "
 "leveringen, ontvangsten, etc."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12611,7 +12847,7 @@ msgid "Body"
 msgstr "Inhoud"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Connectietest geslaagd!"
@@ -12662,7 +12898,7 @@ msgid "choose"
 msgstr "kies"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12842,10 +13078,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12885,12 +13125,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12905,7 +13146,6 @@ msgstr "KvK gegevens"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Overig"
@@ -12927,23 +13167,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13019,25 +13242,9 @@ msgid "Bulgaria"
 msgstr "Bulgarije"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13065,6 +13272,26 @@ msgstr "5.  %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13101,6 +13328,7 @@ msgstr "Slovaaks / Slovakije"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "onbekend"
@@ -13168,6 +13396,11 @@ msgstr "Adresboek"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13257,6 +13490,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13269,7 +13503,7 @@ msgid "Information"
 msgstr "Informatie"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13300,16 +13534,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Rechts bovenliggende"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Modulellijst bijwerken"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13375,6 +13613,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "Het osv_memory veld kan alleen vergeleken worden met = en != operator."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13447,29 +13690,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Externe Id"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13517,7 +13737,7 @@ msgid "Delivery Costs"
 msgstr "Afleveringskosten"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13563,9 +13783,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Database wachtwoord encryptie"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Recordregels"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13813,9 +14033,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13842,63 +14067,14 @@ msgid "System Configuration done"
 msgstr "Systeemconfiguratie afgerond"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr ""
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr "Database Gegevens"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turkse- en Caicoseilanden"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13915,7 +14091,7 @@ msgstr "Actie op meerdere doc."
 #: model:ir.actions.act_window,name:base.action_partner_title_partner
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 msgid "Titles"
-msgstr ""
+msgstr "Titels"
 
 #. module: base
 #: model:ir.module.module,description:base.module_anonymization
@@ -13939,17 +14115,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13979,7 +14144,7 @@ msgstr "Luxemburg"
 #. module: base
 #: model:ir.module.module,summary:base.module_base_calendar
 msgid "Personal & Shared Calendar"
-msgstr ""
+msgstr "Persoonlijke en gedeelde agenda"
 
 #. module: base
 #: selection:res.request,priority:0
@@ -13987,7 +14152,7 @@ msgid "Low"
 msgstr "Laag"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Fout ! U kunt geen recursief menu maken."
@@ -14069,11 +14234,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefoon"
@@ -14088,6 +14252,11 @@ msgstr "Toegangsmenu"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr "Wijzigen wachtwoord wizard"
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14101,13 +14270,37 @@ msgstr "Leads & prospects"
 #. module: base
 #: model:res.country,name:base.gg
 msgid "Guernsey"
-msgstr ""
+msgstr "Guernsey"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / română"
 msgstr "Roemeens / Roemenië"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14146,41 +14339,6 @@ msgstr "Object relatie"
 msgid "eInvoicing & Payments"
 msgstr "Bonnen & Betalingen"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14216,12 +14374,12 @@ msgstr "Wisselkoers"
 #: view:base.module.upgrade:0
 #: field:base.module.upgrade,module_info:0
 msgid "Modules to Update"
-msgstr ""
+msgstr "Module welke geüpdatet moeten worden"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
 msgid "Multi-Companies"
-msgstr ""
+msgstr "Filiaalbedrijven"
 
 #. module: base
 #: field:workflow,osv:0
@@ -14241,41 +14399,9 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
-msgstr ""
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
+msgstr "Linker bovenliggende"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_page
@@ -14286,6 +14412,11 @@ msgid ""
 "Web pages\n"
 "    "
 msgstr ""
+"\n"
+"Pagina's\n"
+"=====\n"
+"Web pagina's\n"
+"    "
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -14337,7 +14468,7 @@ msgstr "Actie-gebruik"
 #. module: base
 #: field:ir.module.module,name:0
 msgid "Technical Name"
-msgstr ""
+msgstr "Technische naam"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -14375,6 +14506,21 @@ msgstr "View :"
 msgid "View Auto-Load"
 msgstr "Weergave vanzelf verversen"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14388,7 +14534,7 @@ msgstr "Duitsland  - Boekhouding"
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the Year: %(doy)s"
-msgstr ""
+msgstr "Dag van het jaar: %(doy)s"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
@@ -14411,40 +14557,15 @@ msgid ""
 "If this field is empty, the view applies to all users. Otherwise, the view "
 "applies to the users of those groups only."
 msgstr ""
+"Als di veld leeg is, dan is de weergave beschikbaar voor alle gebruikers. "
+"Indien niet leeg dan is de weergave alleen beschikbaar voor de gebruikers "
+"van die groepen alleen."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / فارس"
 msgstr "Persisch / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14453,7 +14574,7 @@ msgstr "Exporteer Instellingen"
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Model"
-msgstr ""
+msgstr "Bron model"
 
 #. module: base
 #: view:ir.sequence:0
@@ -14467,12 +14588,13 @@ msgid "Unmet dependency !"
 msgstr "Niet voldane afhankelijkheid !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
+"Administrator toegang is nodig om een module te kunnen deinstalleren."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -14480,7 +14602,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14506,7 +14658,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14551,11 +14703,11 @@ msgid "Access"
 msgstr "Toegang"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
-msgstr ""
+msgstr "TIN"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -14584,11 +14736,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14604,8 +14755,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14620,7 +14769,7 @@ msgstr "Geavanceerde overzichten"
 #. module: base
 #: model:ir.module.module,summary:base.module_purchase
 msgid "Purchase Orders, Receptions, Supplier Invoices"
-msgstr ""
+msgstr "Inkoopporders, inkomende Leveringen, inkoopfacturen."
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_payroll
@@ -14658,7 +14807,7 @@ msgstr "Nazorg"
 #. module: base
 #: field:base.language.import,code:0
 msgid "ISO Code"
-msgstr ""
+msgstr "ISO Code"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
@@ -14673,7 +14822,7 @@ msgstr "Starten"
 #. module: base
 #: selection:res.partner,type:0
 msgid "Shipping"
-msgstr ""
+msgstr "Transport"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_mrp
@@ -14717,10 +14866,10 @@ msgstr "Limiet"
 #. module: base
 #: model:res.groups,name:base.group_hr_user
 msgid "Officer"
-msgstr ""
+msgstr "Manager"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "Reeks veld '%s' niet gevonden voor sparse veld '%s'!"
@@ -14732,7 +14881,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Kleur index"
 
@@ -14769,10 +14917,10 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
-msgstr ""
+msgstr "Model '%s' bevat module gegevens die niet verwijderd kunnen worden!"
 
 #. module: base
 #: model:res.country,name:base.az
@@ -14780,8 +14928,8 @@ msgid "Azerbaijan"
 msgstr "Azerbeidzjan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -14807,11 +14955,6 @@ msgstr "Maagdeneilanden (Brits)"
 msgid "Parameters"
 msgstr "Parameters"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "St. Pierre en Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14825,7 +14968,7 @@ msgstr "Generieke modules"
 #. module: base
 #: model:res.country,name:base.mk
 msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
+msgstr "Macedonië"
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -14839,6 +14982,9 @@ msgid ""
 "Allow users to login through OpenID.\n"
 "====================================\n"
 msgstr ""
+"\n"
+"Geeft gebruikers de mogelijkheid om in te loggen met  OpenID.\n"
+"====================================\n"
 
 #. module: base
 #: help:ir.mail_server,smtp_port:0
@@ -14875,7 +15021,7 @@ msgstr "Huidige venster"
 #: model:ir.module.category,name:base.module_category_hidden
 #: view:res.users:0
 msgid "Technical Settings"
-msgstr ""
+msgstr "Technische instellingen"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_accounting_and_finance
@@ -14893,6 +15039,7 @@ msgstr "Thunderbird-plugin"
 #: model:ir.module.module,summary:base.module_event
 msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations"
 msgstr ""
+"Trainingen, conferenties, afspraken, tentoonstellingen, registraties."
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -14902,7 +15049,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Land"
@@ -14910,7 +15056,7 @@ msgstr "Land"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "Wholesaler"
-msgstr ""
+msgstr "Groothandel"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_vat
@@ -14960,7 +15106,7 @@ msgstr "Nederland - Boekhouding"
 #. module: base
 #: model:res.country,name:base.gs
 msgid "South Georgia and the South Sandwich Islands"
-msgstr ""
+msgstr "Zuid-Georgië en de Zuidelijke Sandwicheilanden"
 
 #. module: base
 #: view:res.lang:0
@@ -14973,9 +15119,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spaans (SV) / Spanje (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Installeer een Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"De instellingen voor het scheidingsteken heeft het formaat [,n] waarbij n > "
+"0 gerekend vanaf het decimaalteken. -1 eindigt de scheiding. Bijv. [3,2,-1] "
+"geeft op 106500 het volgende resultaat: 1,06,500. [1,2,-1] geeft 106,50,0; "
+"[3] geeft 106,500. Er is in deze voorbeelden uitgegaan van ',' als "
+"scheidingsteken."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15002,7 +15157,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Er kan alleen één kolomnaam per keer gewijzigd worden!"
@@ -15063,6 +15218,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Canada  - Boekhouding"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr "Boekhouding - Colombia"
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15087,7 +15273,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Merk op dat deze bewerking enkele minuten kan duren."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15112,7 +15298,7 @@ msgstr "Chili"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_view_editor
 msgid "View Editor"
-msgstr ""
+msgstr "Weergave bewerkingsprogramma"
 
 #. module: base
 #: view:ir.cron:0
@@ -15126,6 +15312,12 @@ msgstr "Uitvoering"
 msgid "Condition"
 msgstr "Voorwaarde"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr "Updates"
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15180,6 +15372,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Kroatië"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Wilt u de deinstllatie van deze module bevestigen? Dit zal alle gegevens "
+"opgeslagen door de module verwijderen!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15202,7 +15403,12 @@ msgstr "Systeem bijwerken"
 #: field:ir.actions.report.xml,report_sxw_content:0
 #: field:ir.actions.report.xml,report_sxw_content_data:0
 msgid "SXW Content"
-msgstr ""
+msgstr "SXW Inhoud"
+
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr "Bestandsgrootte"
 
 #. module: base
 #: help:ir.sequence,prefix:0
@@ -15217,10 +15423,10 @@ msgstr "Seychellen"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Gold"
-msgstr ""
+msgstr "Goud"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15242,14 +15448,51 @@ msgid "General Information"
 msgstr "Algemene informatie"
 
 #. module: base
-#: field:ir.model.data,complete_name:0
-msgid "Complete ID"
-msgstr ""
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr "Grootboekschema - Portugal"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turkse- en Caicoseilanden"
+#: field:ir.model.data,complete_name:0
+msgid "Complete ID"
+msgstr "Volledige ID"
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15287,7 +15530,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr "Geinstalleerde modules"
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Bedrijf overgang waarschuwing"
@@ -15307,11 +15555,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Het volgende nummer in de reeks wordt verhoogd met dit aantal"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Functie"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr "Rechts bovenliggende"
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15345,12 +15597,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Internal Notes"
-msgstr ""
-
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Levering"
+msgstr "Interne notities"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
@@ -15366,7 +15613,7 @@ msgstr "Inkoopaanvragen"
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline Edit"
-msgstr ""
+msgstr "Op de regel bewerken"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -15379,7 +15626,7 @@ msgid "Workflow Instances"
 msgstr "Workflow instanties"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Relaties: "
@@ -15387,10 +15634,10 @@ msgstr "Relaties: "
 #. module: base
 #: view:res.partner:0
 msgid "Is a Company?"
-msgstr ""
+msgstr "Is dit een bedrijf?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15409,7 +15656,7 @@ msgstr "Maak object"
 #. module: base
 #: model:res.country,name:base.ss
 msgid "South Sudan"
-msgstr ""
+msgstr "Zuid-Soedan"
 
 #. module: base
 #: field:ir.filters,context:0
@@ -15456,7 +15703,6 @@ msgstr "Exportnaam"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15495,7 +15741,7 @@ msgstr "Russisch / русский язык"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_signup
 msgid "Signup"
-msgstr ""
+msgstr "Aanmelden"
 
 #~ msgid "SMS - Gateway: clickatell"
 #~ msgstr "SMS - Service : clickatell"
@@ -15525,6 +15771,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Bijlage ID"
+
 #~ msgid ""
 #~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 #~ "object.partner_id.name ]]`"
@@ -15532,6 +15781,9 @@ msgstr ""
 #~ "Geef het bericht. U kunt velden van het object gebruiken, bijv. `Beste [[ "
 #~ "object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Bijgevoegd model"
+
 #~ msgid "Reply"
 #~ msgstr "Antwoorden"
 
@@ -15591,6 +15843,9 @@ msgstr ""
 #~ msgid "res.groups"
 #~ msgstr "res.groups"
 
+#~ msgid "Creator"
+#~ msgstr "Maker"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15694,6 +15949,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Soort velden"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Deselecteer het actieve veld op de contactpersoon te verbergen."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Congo, Democratische Republiek"
 
@@ -15770,6 +16028,9 @@ msgstr ""
 #~ msgid "new"
 #~ msgstr "nieuw"
 
+#~ msgid "Contact Name"
+#~ msgstr "Naam contactpersoon"
+
 #~ msgid "Select Action Type"
 #~ msgstr "Kies soort actie"
 
@@ -16408,6 +16669,9 @@ msgstr ""
 #~ msgid "Has a web component"
 #~ msgstr "Heeft een web component"
 
+#~ msgid "Addresses"
+#~ msgstr "Adressen"
+
 #~ msgid "Content"
 #~ msgstr "Inhoud"
 
@@ -16584,6 +16848,9 @@ msgstr ""
 #~ msgid "Emails"
 #~ msgstr "Emails"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binair bestand of externe URL"
+
 #~ msgid ""
 #~ "Indicates whether this object model lives in memory only, i.e. is not "
 #~ "persisted (osv.osv_memory)"
@@ -17355,6 +17622,9 @@ msgstr ""
 #~ msgid "Address Information"
 #~ msgstr "Adres Informatie"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Database wachtwoord encryptie"
+
 #~ msgid ""
 #~ "\n"
 #~ "        OpenERP Web process view.\n"
@@ -18425,11 +18695,14 @@ msgstr ""
 #~ "in de database, maar in een map van de server, zoals bijv.: "
 #~ "server/bin/filestore.\n"
 
+#~ msgid "Delivery"
+#~ msgstr "Afleveradres"
+
 #~ msgid ""
 #~ "This wizard helps you to import a new module to your OpenERP system. After "
 #~ "importing a new module you can install it by clicking on the button "
 #~ "\"Install\" from the form view."
 #~ msgstr ""
-#~ "Deze wizard helpt u om een neiuwe module in OpenERP te importeren. Na het "
+#~ "Deze wizard helpt u om een nieuwe module in OpenERP te importeren. Na het "
 #~ "importeren van  een nieuwe module kan u op de \"Installeer\"knop drukken, "
 #~ "vanuit d formulierweergave."
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 5ac4c916c51..5565e2eda76 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-07 14:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:02+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:09+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "DatumTijd"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -191,41 +191,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -236,7 +210,7 @@ msgstr ""
 "module."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Voorwaarde Fout"
@@ -247,7 +221,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -258,7 +232,7 @@ msgid "Swaziland"
 msgstr "Swasiland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "gemaakt."
@@ -337,20 +311,6 @@ msgstr "Bedrijf om het huidige record op te slaan"
 msgid "Max. Size"
 msgstr "Max. lengte"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -358,11 +318,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Contactnaam"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -421,7 +376,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -458,6 +413,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -496,7 +452,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -548,7 +504,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -586,8 +542,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -613,26 +569,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -641,8 +577,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -716,14 +668,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -787,16 +737,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -825,11 +773,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -958,10 +916,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -980,7 +936,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1028,15 +984,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1134,8 +1083,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1150,12 +1128,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1182,7 +1165,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1210,7 +1240,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1242,14 +1272,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1384,7 +1412,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1406,7 +1434,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1421,7 +1449,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1547,7 +1582,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1662,18 +1711,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1754,7 +1798,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1795,11 +1839,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1814,7 +1853,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1855,6 +1894,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1931,16 +1975,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1995,7 +2034,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2019,11 +2058,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2035,7 +2074,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2073,11 +2111,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2210,6 +2243,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2243,12 +2281,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2296,6 +2339,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2347,7 +2399,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2425,7 +2477,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2472,11 +2523,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2593,8 +2639,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2673,7 +2730,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2732,6 +2789,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2740,7 +2810,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2826,7 +2896,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2856,7 +2926,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2921,22 +2991,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3030,12 +3100,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3052,17 +3122,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3072,7 +3144,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3123,34 +3195,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3189,7 +3233,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3201,6 +3245,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3237,7 +3309,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3271,7 +3343,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3299,32 +3371,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3342,9 +3388,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3360,7 +3410,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3468,7 +3518,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3657,7 +3707,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3668,13 +3717,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3734,9 +3788,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3747,7 +3802,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3766,13 +3821,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3802,12 +3880,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3856,19 +3930,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3886,7 +3948,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3931,7 +3993,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3950,8 +4012,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4008,13 +4104,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4030,8 +4131,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4090,32 +4191,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4194,7 +4272,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4266,6 +4343,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4327,8 +4409,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4409,6 +4498,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4432,6 +4537,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4459,6 +4601,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4536,12 +4684,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4556,7 +4698,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4567,13 +4708,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4616,6 +4762,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4631,7 +4779,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4724,7 +4872,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4812,7 +4965,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4927,6 +5080,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4940,7 +5098,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4951,7 +5109,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4983,6 +5141,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5146,7 +5315,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5162,16 +5331,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5212,8 +5376,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5277,15 +5442,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5301,6 +5457,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5384,6 +5545,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5634,7 +5801,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5691,6 +5858,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5806,13 +5982,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5832,7 +6010,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5865,9 +6043,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5901,6 +6078,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5911,7 +6093,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5927,26 +6109,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6079,11 +6241,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6095,8 +6252,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6203,7 +6360,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6241,7 +6398,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6268,8 +6425,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6302,6 +6487,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6344,7 +6536,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6436,7 +6628,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6456,23 +6648,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6505,10 +6680,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6582,8 +6757,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6607,8 +6782,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6656,18 +6831,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6772,6 +6942,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6866,7 +7043,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6967,12 +7143,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7014,6 +7184,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7071,7 +7242,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7091,6 +7262,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7102,13 +7278,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7139,7 +7320,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7185,7 +7366,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7205,30 +7385,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7316,6 +7496,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7399,6 +7584,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7428,11 +7628,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7457,7 +7652,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7468,8 +7662,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7548,7 +7757,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7635,14 +7844,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7651,7 +7862,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7662,13 +7873,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7687,12 +7898,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7865,7 +8077,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7894,14 +8106,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7925,7 +8129,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8040,7 +8243,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8355,7 +8558,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8367,7 +8570,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8377,7 +8580,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8392,6 +8595,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8431,7 +8645,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8453,14 +8667,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8485,7 +8699,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8497,7 +8711,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8575,7 +8788,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8603,8 +8816,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8628,7 +8841,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8775,7 +8988,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8814,8 +9027,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8889,7 +9102,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8903,7 +9116,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8966,6 +9179,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9064,8 +9282,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9094,13 +9312,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9121,7 +9339,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9169,7 +9387,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9215,6 +9433,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9223,7 +9442,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9242,6 +9461,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9277,7 +9533,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9329,6 +9585,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9371,23 +9632,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9421,7 +9670,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9512,6 +9761,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9716,7 +9970,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9727,13 +9981,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9901,7 +10160,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9934,6 +10193,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9959,6 +10223,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10048,7 +10317,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10084,13 +10352,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10149,19 +10424,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10175,6 +10475,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10193,7 +10495,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10205,13 +10512,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10293,6 +10593,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10362,6 +10682,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10420,9 +10745,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10440,8 +10765,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10480,13 +10805,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10497,7 +10821,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10526,36 +10855,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10577,6 +10876,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10593,16 +10897,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10619,8 +10913,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10646,11 +10940,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10676,7 +10965,7 @@ msgid "Domain"
 msgstr "Domeinnaam"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10692,12 +10981,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10718,29 +11007,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10761,7 +11030,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10808,7 +11077,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10832,6 +11100,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10917,19 +11186,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10971,22 +11249,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11119,7 +11381,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11209,7 +11470,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11259,8 +11520,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11351,7 +11612,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11378,7 +11639,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11464,7 +11725,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11477,7 +11738,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11522,8 +11783,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11531,7 +11790,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11560,12 +11819,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11672,8 +11925,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11710,7 +11965,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11846,11 +12101,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11867,7 +12117,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11890,7 +12140,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11932,13 +12182,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11987,73 +12237,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12061,13 +12246,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12244,6 +12464,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12260,7 +12485,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12308,7 +12533,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12484,10 +12709,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12519,12 +12748,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12538,7 +12768,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12560,23 +12789,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12644,24 +12856,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12690,6 +12886,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12726,6 +12942,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12793,6 +13010,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12882,6 +13104,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12894,7 +13117,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12925,16 +13148,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12999,6 +13226,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13071,29 +13303,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13141,7 +13350,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13185,8 +13394,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13431,9 +13640,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13460,62 +13674,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13557,17 +13722,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13602,7 +13756,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13682,11 +13836,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13701,6 +13854,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13721,6 +13879,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13757,41 +13939,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13852,40 +13999,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13974,6 +14089,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14016,34 +14146,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14066,9 +14168,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14079,7 +14181,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14105,7 +14237,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14150,7 +14282,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14183,11 +14315,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14203,8 +14334,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14319,7 +14448,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14331,7 +14460,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14364,7 +14492,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14375,8 +14503,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14402,11 +14530,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14496,7 +14619,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14563,8 +14685,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14592,7 +14718,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14653,6 +14779,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14677,7 +14834,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14716,6 +14873,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14768,6 +14931,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14792,6 +14962,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14808,7 +14983,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14829,14 +15004,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14873,7 +15085,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14891,11 +15108,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14931,11 +15152,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14963,7 +15179,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14974,7 +15190,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15040,7 +15256,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15126,6 +15341,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Op meerdere doc."
 
+#~ msgid "Contact Name"
+#~ msgstr "Contactnaam"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 7c8220f5d04..f939eeb1734 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 20:05+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 04:58+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "Data i godzina"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -210,41 +210,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Ostrzeżenie !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -254,7 +228,7 @@ msgstr ""
 "Modyfikuj je kodem Python najlepiej jako własny moduł!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Błąd ograniczeń"
@@ -265,7 +239,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -276,7 +250,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "utworzona."
@@ -355,20 +329,6 @@ msgstr "Firma dla bieżącego rekordu"
 msgid "Max. Size"
 msgstr "Maks. rozmiar"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -376,11 +336,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nazwa kontaktu"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -439,7 +394,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -478,6 +433,7 @@ msgstr "Reguły automatycznych akcji"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Właściciel"
 
@@ -518,7 +474,7 @@ msgstr ""
 "wyświetlaną w trakcie edycji."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -572,7 +528,7 @@ msgid "Netherlands Antilles"
 msgstr "Antyle Holenderskie"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -612,9 +568,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Pierwotny widok"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Pomysły"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -639,26 +595,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bośniacki / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -669,9 +605,25 @@ msgstr ""
 "załącznika. To przywróci poprzedni raport."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -747,14 +699,12 @@ msgstr ""
 "Słownik kontekstowy jako wyrażenie Python, puste domyślnie (Default: { })"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Kreatory"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Własne pole musi mieć nazwę rozpoczynającą się od 'x_' !"
@@ -818,16 +768,14 @@ msgid "Model Description"
 msgstr "Opis modelu"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -858,11 +806,21 @@ msgstr "Wyrażenie wyzwalające"
 msgid "Jordan"
 msgstr "Jordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Nastepne planowane wykonanie tej czynności."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -994,13 +952,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Podaj nazwę pola, do którego id rekordu odwołuje się przy operacji zapisu. "
-"Jeśli jest ono puste, to będzie się odwoływało do aktywnego ID obiektu."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nowa Gwinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1018,7 +972,7 @@ msgid "Email Preferences"
 msgstr "Preferencje email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' nie jest poprawną datą dla pola '%%(field)s'"
@@ -1067,16 +1021,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Tel. komórkowy"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1173,8 +1120,37 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1191,12 +1167,17 @@ msgstr ""
 "następujących grup."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Model dokumentu"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1223,7 +1204,54 @@ msgid "Username"
 msgstr "Użytkownik"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1253,7 +1281,7 @@ msgid "Delete Access Right"
 msgstr "Usuń prawa dostępu"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Testowe połączenie nie powiodło się !"
@@ -1285,14 +1313,12 @@ msgid "South Korea"
 msgstr "Korea Południowa"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Przejścia"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Rekord #%d z %s nie znaleziony, nie mozna kopiować!"
@@ -1430,7 +1456,7 @@ msgid "Marshall Islands"
 msgstr "Wyspy Marshalla"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Zmiana modelu dla pola jest niedozwolona!"
@@ -1452,7 +1478,7 @@ msgid "Search"
 msgstr "Szukanie"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1471,7 +1497,14 @@ msgid "Parent Application"
 msgstr "Aplikacja nadrzędna"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Kreatory"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operacja anulowana"
@@ -1599,7 +1632,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Brak języka z kodem \"%s\""
@@ -1720,7 +1767,7 @@ msgid "On Create"
 msgstr "Przy tworzeniu"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1730,11 +1777,6 @@ msgstr ""
 "są stosowane di budowania odnośników do innych modułów jak "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Oferty, Zamówienia sprzedaży, Fakturowanie"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1815,7 +1857,7 @@ msgid "East Timor"
 msgstr "Timor Wschodni"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1856,11 +1898,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Związane ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1877,7 +1914,7 @@ msgstr ""
 "przygotowane do szybkich działań."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1918,6 +1955,11 @@ msgstr "Pojazdy, leasing, ubezpieczenie, koszty"
 msgid "Read Access"
 msgstr "Prawo odczytu"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1996,16 +2038,11 @@ msgid "Create Tasks on SO"
 msgstr "Utwórz zadania z ZS"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Model powiązany"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2060,7 +2097,7 @@ msgid "Formula"
 msgstr "Formuła"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Nie można usunąć użytkownika root!"
@@ -2084,11 +2121,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -2100,7 +2137,6 @@ msgstr "Szablon planu kont"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Typ adresu"
 
@@ -2138,11 +2174,6 @@ msgstr "Pełna ścieżka"
 msgid "The next step depends on the file format:"
 msgstr "Następny krok zależy od formatu pliku:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Pomysły"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2278,6 +2309,11 @@ msgstr "Liczba zaktualizowanych modułów"
 msgid "Method"
 msgstr "Metoda"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2311,7 +2347,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2319,6 +2355,11 @@ msgstr ""
 "Nie znaleziono rekordu odpowiadającego %(field_type)s '%(value)s' w polu "
 "'%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2368,6 +2409,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Możesz dodać nagłówek RML firmy"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2419,7 +2469,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Dokument został zmodyfikowany od twojego ostatniego otwarcia (%s:%d)"
@@ -2500,7 +2550,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2547,11 +2596,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2670,9 +2714,20 @@ msgid "Default limit for the list view"
 msgstr "Domyślny limit dla widoku listy"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nowa Gwinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2750,7 +2805,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2810,6 +2865,19 @@ msgstr "Mapowanie pól"
 msgid "Export Translations"
 msgstr "Eksportuj tłumaczenie"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2818,7 +2886,7 @@ msgid "Manager"
 msgstr "Menedżer"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Nie jesteś upoważniony do tego dokumentu."
@@ -2904,7 +2972,7 @@ msgid "Inherited"
 msgstr "Dziedziczone"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "tak"
@@ -2934,7 +3002,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' nie jest liczbą całkowitą dla pola '%%(field)s'"
@@ -2999,22 +3067,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Niedozwolona architektura obiektu !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -3110,12 +3178,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3132,17 +3200,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3152,7 +3222,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Nie można aktualizować modułu '%s'. Nie jest on zainstalowany."
@@ -3203,34 +3273,6 @@ msgstr "Parametry konfiguracji"
 msgid "Invalid arguments"
 msgstr "Niepoprawne argumenty"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3269,7 +3311,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Brakujące dokumenty"
@@ -3281,6 +3323,34 @@ msgstr "Brakujące dokumenty"
 msgid "Bank Account Type"
 msgstr "Typ konta bankowego"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3317,7 +3387,7 @@ msgid "Signal (subflow.*)"
 msgstr "Przywołanie (podobieg.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3353,7 +3423,7 @@ msgid "Access Controls"
 msgstr "Prawa dostępu"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3381,32 +3451,6 @@ msgstr "Główna firma"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3426,9 +3470,13 @@ msgstr ""
 "Jeśli używasz typ formułowy, to zastosuj wyrażenie python używając zmienną "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Data urodzenia"
 
@@ -3444,7 +3492,7 @@ msgid "Products Manufacturers"
 msgstr "Producenci produktu"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3552,7 +3600,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3741,7 +3789,6 @@ msgstr "Raportowanie"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Tytuł"
@@ -3753,13 +3800,18 @@ msgstr ""
 "Jeśli nie ustawione, to działa jak wartość domyślna dla nowych zasobów."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Stwierdzono rekurencję"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Błąd rekurencji w zależności modułów !"
@@ -3819,9 +3871,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Brak dostępu"
@@ -3832,7 +3885,7 @@ msgid "Company Name"
 msgstr "Nazwa firmy"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3851,14 +3904,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Kod języka tłumaczenia musi być znanym kodem językowym"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Reguły rekordów"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3887,12 +3963,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3941,19 +4013,7 @@ msgid "Paper Format"
 msgstr "Format papieru"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3973,7 +4033,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4018,7 +4078,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4037,8 +4097,42 @@ msgid "Technical Data"
 msgstr "Dane techniczne"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4095,13 +4189,18 @@ msgstr "Karta czasu pracy dla problemów"
 msgid "Ltd"
 msgstr "Sp z o.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Niedozwolona architektura !"
@@ -4117,9 +4216,9 @@ msgid "Share any Document"
 msgstr "Współdziel dowolny dokument"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Sygnały, Szanse, Rozmowy telefoniczne"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Wymagana grupa"
 
 #. module: base
 #: view:res.lang:0
@@ -4177,33 +4276,10 @@ msgid "Languages"
 msgstr "Języki"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "XOR"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4281,7 +4357,6 @@ msgstr "Ograniczenie"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Domyślny"
 
@@ -4353,6 +4428,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4414,9 +4494,16 @@ msgid "Default value or action reference"
 msgstr "Wartość domyślna lub odnośnik akcji"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4496,6 +4583,22 @@ msgstr "Pobierz tłumaczenie"
 msgid "Installed Version"
 msgstr "Zainstalowana wersja"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4522,6 +4625,43 @@ msgstr ""
 "to pole jest puste, to OpenERP obliczy widoczność na podstawie praw dostępu "
 "do obiektu."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4551,6 +4691,12 @@ msgstr ""
 msgid "View"
 msgstr "Widok"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4628,12 +4774,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4648,7 +4788,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Kod poczt."
@@ -4659,13 +4798,18 @@ msgstr "Kod poczt."
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Ustaw jako Do zrobienia"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Odpowiednia reprezentacja daty i czasu."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4711,6 +4855,8 @@ msgstr "Kierunek"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Widoki"
 
@@ -4726,7 +4872,7 @@ msgid "SMTP Server"
 msgstr "Serwer SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4820,7 +4966,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4908,7 +5059,7 @@ msgid "System Configuration Done"
 msgstr "Wykonano konfigurację systemu"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Wystąpił błąd przy sprawdzaniu pola (pól) %s: %s"
@@ -5023,6 +5174,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Pełny dostęp"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5036,7 +5192,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5047,7 +5203,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Tylko, jeśli to konto bankowe nalezy do twojej firmy"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5079,6 +5235,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Węgry"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5242,7 +5409,7 @@ msgid "Account Owner Name"
 msgstr "Nazwa posiadacza konta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5258,16 +5425,11 @@ msgid "Decimal Separator"
 msgstr "Separator dziesiętny"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5312,9 +5474,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Utworzył"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Nazwa modułu musi być unikalna !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5377,15 +5540,6 @@ msgstr "Wenezuela"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5401,6 +5555,11 @@ msgstr "Uruchom kreatora konfiguracji"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Zamówienia produkcji, Zestawienia materiałowe, Marszruty"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nazwa załącznika"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5484,6 +5643,12 @@ msgstr "Kazachstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Numer dnia tygodnia [0(Niedziela),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nazwa zasobu"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5738,7 +5903,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5795,6 +5960,15 @@ msgstr "Produkty"
 msgid "User-defined Defaults"
 msgstr "Wartości domyślne definiowane"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5910,13 +6084,15 @@ msgid "Bank Type"
 msgstr "Typ banku"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Nazwa grupy nie może rozpoczynać się od \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5936,7 +6112,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5969,10 +6145,9 @@ msgid "Uncategorized"
 msgstr "Bez kategorii"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nazwa zasobu"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6008,6 +6183,11 @@ msgstr ""
 "klienta, to sygnał testuje nazwę naciśniętego przycisku. Jeśli sygnał jest "
 "NULL, to żaden przycisk nie jest konieczny do zatwierdzenia przejścia."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Pierwotny widok"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6018,7 +6198,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' nie jest liczbą dla pola '%%(field)s'"
@@ -6034,26 +6214,6 @@ msgstr "Jednostka administracyjnego podziału kraju. Np. Stan, Województwo"
 msgid "My Banks"
 msgstr "Moje banki"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6186,11 +6346,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Zresetuj hasło"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6202,8 +6357,8 @@ msgid "Malaysia"
 msgstr "Malezja"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "Liczba inkrementacji nie może być zero."
@@ -6310,7 +6465,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6348,7 +6503,7 @@ msgid "Created Menus"
 msgstr "Utworzone menu"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6375,9 +6530,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Ustaw jako Do zrobienia"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6409,6 +6592,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Bieżący rok dwucyfrowo: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Parametry systemu"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6451,7 +6641,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6543,7 +6733,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6563,23 +6753,6 @@ msgstr "Czasem nazywany BIC lub Swift."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Tel. komórkowy"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6612,10 +6785,10 @@ msgstr "Raport xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduły"
 
@@ -6689,8 +6862,8 @@ msgid "United Kingdom"
 msgstr "Zjednoczone Królestwo"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6714,8 +6887,8 @@ msgid "Partner Titles"
 msgstr "Tytuły partnera"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Stosuje format '%s'"
@@ -6763,7 +6936,7 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6773,11 +6946,6 @@ msgstr ""
 "niedozwolone dla tego obiektu, ponieważ obiekt jest tylko do celów "
 "raportowych."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6885,6 +7053,13 @@ msgstr "Plik modułu został zaimportowany !"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Przejścia"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6979,7 +7154,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "woj."
@@ -7080,12 +7254,6 @@ msgstr "Pełna nazwa"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Nazwa modułu musi być unikalna !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7127,6 +7295,7 @@ msgstr "Na wielu dok."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7184,7 +7353,7 @@ msgid "Connection Security"
 msgstr "Bezpieczeństwo połączenia"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Podaj akcję do uruchomienia !"
@@ -7204,6 +7373,11 @@ msgstr "Nazwa kategorii"
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7215,13 +7389,18 @@ msgid "Intrastat Reporting"
 msgstr "Raportowanie Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr "Do zmiany hasła użyj Kreatora zmiany hasła w Menu użytkownika."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7252,7 +7431,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Zbyt mało pół dla widoku kalendarza !"
@@ -7298,7 +7477,6 @@ msgstr "Przejście"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7318,30 +7496,30 @@ msgid "Child Categories"
 msgstr "Kategorie podrzędne"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Błąd"
@@ -7429,6 +7607,11 @@ msgstr ""
 msgid "This Window"
 msgstr "To okno"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7512,6 +7695,21 @@ msgstr "Pola"
 msgid "Employees"
 msgstr "Pracownicy"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7541,11 +7739,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Test połączenia"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresy"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7570,7 +7763,6 @@ msgstr "Opcje wyboru"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Ulica"
@@ -7581,8 +7773,23 @@ msgid "Yugoslavia"
 msgstr "Jugosławia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7661,7 +7868,7 @@ msgid "Change My Preferences"
 msgstr "Zmień moje preferencje"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
@@ -7748,14 +7955,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7764,7 +7973,7 @@ msgid "Company Bank Accounts"
 msgstr "Konta bankowe firmy"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7776,13 +7985,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Opcjonalne hasło dla SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Niestety, nie możesz modyfikować tego dokumentu."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7804,12 +8013,13 @@ msgid "Normal Bank Account"
 msgstr "Zwykłe konto bankowe"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Kreator"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7982,7 +8192,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Stawnowiska, Zatrudnienie, Podania, ROzmowy kwalifikacyjne"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8013,14 +8223,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Ostrzeżenie !"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8044,7 +8246,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8162,7 +8363,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8479,7 +8680,7 @@ msgid "Update Modules List"
 msgstr "Zaktualizuj listę modułów"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8491,7 +8692,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8505,7 +8706,7 @@ msgstr ""
 "użytkownika)."
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8520,6 +8721,17 @@ msgstr "Kontynuuj"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8559,7 +8771,7 @@ msgid "Mexico"
 msgstr "Meksyk"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8581,15 +8793,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Brak serwera SMTP"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nazwa załącznika"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Kod języka tłumaczenia musi być znanym kodem językowym"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8613,7 +8825,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Skrótowa nazwa miesiąca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Nie masz uprawnień do usuwania tego dokumentu"
@@ -8625,7 +8837,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dostawca"
@@ -8703,7 +8914,7 @@ msgid "Selectable"
 msgstr "Wybieralny"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Wsyztsko wygląda na poprawnie ustawione !"
@@ -8731,8 +8942,8 @@ msgid "Iteration"
 msgstr "Iteracja"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8756,7 +8967,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8904,7 +9115,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8943,8 +9154,8 @@ msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -9018,7 +9229,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9034,7 +9245,7 @@ msgid "Ukraine"
 msgstr "Ukraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9097,6 +9308,11 @@ msgstr "Etapy"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9195,8 +9411,8 @@ msgid "Custom Shortcuts"
 msgstr "Własne skróty"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9225,13 +9441,13 @@ msgid "Models"
 msgstr "Modele"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Nie można teraz modyfikować rekordu"
@@ -9252,7 +9468,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9300,7 +9516,7 @@ msgid "On Delete"
 msgstr "Przy usunięciu"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s nie istnieje!"
@@ -9346,6 +9562,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9354,7 +9571,7 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9373,6 +9590,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9408,7 +9662,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9460,6 +9714,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Godzina (czas 12-godzinny) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9502,23 +9761,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Kod waluty musi być unikalny w firmie !"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9555,7 +9802,7 @@ msgid "Products Expiry Date"
 msgstr "Data przydatności produktów"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Naciśnij 'Kontynuuj', aby konfigurować następny dodatek..."
@@ -9647,6 +9894,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9853,7 +10105,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9864,13 +10116,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Jednostka interwału"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Rodzaj"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Ta metoda nie istnieje"
@@ -10042,7 +10299,7 @@ msgid "To Translate"
 msgstr "Do przetłumaczenia"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Pokaż wszystkie możliwe wartości"
@@ -10077,6 +10334,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10102,6 +10364,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10192,7 +10459,6 @@ msgstr "%m - Numer miesiąca [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Miasto"
@@ -10228,13 +10494,22 @@ msgstr "Portal kadrowy pracowników"
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Podaj nazwę pola, do którego id rekordu odwołuje się przy operacji zapisu. "
+"Jeśli jest ono puste, to będzie się odwoływało do aktywnego ID obiektu."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 lub wersja późniejsza"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10296,12 +10571,37 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -10309,7 +10609,7 @@ msgstr ""
 "Skontaktuj się z administratorem systemu, jeśli sądzisz że to jest błąd."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10323,6 +10623,8 @@ msgid "Activity"
 msgstr "Aktywność"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10341,7 +10643,12 @@ msgid "Parent Company"
 msgstr "Firma nadrzędna"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10355,13 +10662,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10446,6 +10746,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Sprzedaż i Magazyn"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10519,6 +10839,11 @@ msgstr "Zaznacz, jeśli kontakt jest firmą. W przeciwnym razie jest osobą."
 msgid "Sequences Type"
 msgstr "Typ numeracji"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10577,9 +10902,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Brak uprawnień"
@@ -10597,8 +10922,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem w konfiguracji `Record Id` w akcji serwera!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10637,13 +10962,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10654,7 +10978,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10685,36 +11014,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10736,6 +11035,11 @@ msgstr "Inne właściwości"
 msgid "Ecuador"
 msgstr "Ekwador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10752,16 +11056,6 @@ msgstr "Stanowiska do umów"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Nie możesz usunąć języka, który jest w preferencjach użytkownika !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10778,9 +11072,9 @@ msgid "Cascade"
 msgstr "Kaskadowo"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Wymagana grupa"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Sygnały, Szanse, Rozmowy telefoniczne"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10806,11 +11100,6 @@ msgstr "Przetłumaczone"
 msgid "Default Company per Object"
 msgstr "Domyślna firma dla obiektów"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Liczba akcji do wykonania przez użytkownika"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10836,7 +11125,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10852,12 +11141,12 @@ msgid "State Name"
 msgstr "Nazwa regionu"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10878,29 +11167,9 @@ msgid "Timezone"
 msgstr "Strefa czasowa"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10923,7 +11192,7 @@ msgid "Shared"
 msgstr "Współdzielone"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10970,7 +11239,6 @@ msgstr "Podwójne zatwierdzanie zakupów"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Ulica2"
 
@@ -10994,6 +11262,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11079,19 +11348,28 @@ msgid "Related Partner"
 msgstr "Powiązany partner"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Błąd integracji"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11133,22 +11411,6 @@ msgstr "Katalog pracowników"
 msgid "Arguments"
 msgstr "Argumenty"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11281,7 +11543,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Klient"
 
@@ -11371,7 +11632,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Ni emożna tworzyć kontaktu bez adresu mailowego !"
@@ -11421,8 +11682,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11513,7 +11774,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Dostarczenie wiadomości nie udało się"
@@ -11540,7 +11801,7 @@ msgid "Object"
 msgstr "Obiekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11626,7 +11887,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11639,7 +11900,7 @@ msgid "User Ref."
 msgstr "Odn. użytkownika"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11684,8 +11945,6 @@ msgstr "Skrócony podręcznik"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11693,7 +11952,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11722,12 +11981,6 @@ msgstr "Falklandy"
 msgid "Lebanon"
 msgstr "Liban"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "XOR"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11834,8 +12087,10 @@ msgid "Selection"
 msgstr "Wybieranie"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11872,7 +12127,7 @@ msgid "Action Type"
 msgstr "Typ akcji"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12010,11 +12265,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Godzina 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Odznacz pole aktywny, aby ukryć kontakt."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12031,7 +12281,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -12054,7 +12304,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -12095,16 +12345,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Księgowość płacowa"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Plik binarny lub URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Zmień hasło"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12151,78 +12401,8 @@ msgid "Address Format"
 msgstr "Format adresu"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-"Format separatora powinien wyglądać jak [,n] gdzie 0 < n :rozpoczynające się "
-"od cyfry jednostek. -1 zakończy separację. tzn. [3,2,-1] reprezentuje liczbę "
-"106500 jako 1,06,500; [1,2,-1] reprezentuje liczbę jako 106,50,0; [3] "
-"reprezentuje tę liczbę jako 106,500. Zastosowano ',' jako separację tysięcy "
-"w każdym przypadku."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12230,13 +12410,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12420,6 +12635,11 @@ msgstr ""
 "Pomaga zarządzać magazynem i jego operacjami jak: przyjęcia, wydania, "
 "przesunięcia itp."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12436,7 +12656,7 @@ msgid "Body"
 msgstr "Treść"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Test połaczenia udany!"
@@ -12484,7 +12704,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12660,10 +12880,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12695,12 +12919,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12714,7 +12939,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Różne"
@@ -12736,23 +12960,6 @@ msgstr ""
 msgid "China"
 msgstr "Chiny"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12824,25 +13031,9 @@ msgid "Bulgaria"
 msgstr "Bułgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12870,6 +13061,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12906,6 +13117,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12973,6 +13185,11 @@ msgstr "Książka adresowa"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13062,6 +13279,7 @@ msgid "Projects, Tasks"
 msgstr "Projekty, Zadania"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13074,7 +13292,7 @@ msgid "Information"
 msgstr "Informacja"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13105,16 +13323,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Aktualizuj listę modułów"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13181,6 +13403,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13253,29 +13480,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identyfikator zewnętrzny"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13323,7 +13527,7 @@ msgid "Delivery Costs"
 msgstr "Koszty dostawy"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13367,9 +13571,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Reguły rekordów"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13613,9 +13817,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13642,62 +13851,13 @@ msgid "System Configuration done"
 msgstr "Wykonano konfiguracje systemu"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Parametry systemu"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13739,17 +13899,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13784,7 +13933,7 @@ msgid "Low"
 msgstr "Niski"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
@@ -13864,11 +14013,10 @@ msgid "El Salvador"
 msgstr "Salwador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13883,6 +14031,11 @@ msgstr "Prawo do menu"
 msgid "Thailand"
 msgstr "Tajlandia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13903,6 +14056,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13939,41 +14116,6 @@ msgstr "Relacja obiektu"
 msgid "eInvoicing & Payments"
 msgstr "Fakturowanie i Płatności"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14034,40 +14176,8 @@ msgid "Apply for Write"
 msgstr "Zastosuj do zapisu"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14162,6 +14272,21 @@ msgstr "Widok :"
 msgid "View Auto-Load"
 msgstr "Autoładowanie widoku"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14204,34 +14329,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14254,9 +14351,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14267,7 +14364,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14293,7 +14420,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14338,7 +14465,7 @@ msgid "Access"
 msgstr "Prawo"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14371,11 +14498,10 @@ msgid "Bahrain"
 msgstr "Bahrajn"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faks"
@@ -14391,8 +14517,6 @@ msgstr "Faks"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14507,7 +14631,7 @@ msgid "Officer"
 msgstr "Urzędnik"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14519,7 +14643,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Indeks kolorów"
 
@@ -14555,7 +14678,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14566,8 +14689,8 @@ msgid "Azerbaijan"
 msgstr "Azerbejdżan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -14593,11 +14716,6 @@ msgstr ""
 msgid "Parameters"
 msgstr "Parametry"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14687,7 +14805,6 @@ msgstr "Szkolenia, Konferencje, Spotkania, Wystawy, Rejestracje"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Kraj"
@@ -14756,9 +14873,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Format separatora powinien wyglądać jak [,n] gdzie 0 < n :rozpoczynające się "
+"od cyfry jednostek. -1 zakończy separację. tzn. [3,2,-1] reprezentuje liczbę "
+"106500 jako 1,06,500; [1,2,-1] reprezentuje liczbę jako 106,50,0; [3] "
+"reprezentuje tę liczbę jako 106,500. Zastosowano ',' jako separację tysięcy "
+"w każdym przypadku."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14785,7 +14911,7 @@ msgid "Japan"
 msgstr "Japonia"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14846,6 +14972,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14870,7 +15027,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Ta operacja może potrwać kilka minut."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14909,6 +15066,12 @@ msgstr "Wykonanie"
 msgid "Condition"
 msgstr "Warunek"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14961,6 +15124,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Chorwacja"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14985,6 +15155,11 @@ msgstr "Aktualizacja systemu"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15001,7 +15176,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15022,14 +15197,51 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Informacje ogólne"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -15068,7 +15280,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Ostrzeżenie przy przełączaniu firmy"
@@ -15086,11 +15303,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Następny numer w numeracji będzie wyższy o tę wartość."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcja"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15126,11 +15347,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Uwagi wewnętrzne"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Dostawa"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15158,7 +15374,7 @@ msgid "Workflow Instances"
 msgstr "Instancje obiegu"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partnerzy: "
@@ -15169,7 +15385,7 @@ msgid "Is a Company?"
 msgstr "Jest firmą?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15235,7 +15451,6 @@ msgstr "Nazwa eksportu"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15295,6 +15510,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Na wielu dok."
 
+#~ msgid "Contact Name"
+#~ msgstr "Nazwa kontaktu"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15353,12 +15571,18 @@ msgstr ""
 #~ msgid "This field is not used, it only helps you to select the right action."
 #~ msgstr "To pole nie jest używane, tylko pomaga wybrać odpowiednią akcję."
 
+#~ msgid "Attached ID"
+#~ msgstr "Związane ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Pozostaw 0 jeśli akcja ma wystąpić na wszystkich zasobach."
 
 #~ msgid "Trigger Name"
 #~ msgstr "Nazwa wyzwalacza"
 
+#~ msgid "Attached Model"
+#~ msgstr "Model powiązany"
+
 #~ msgid ""
 #~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 #~ "object.partner_id.name ]]`"
@@ -15516,6 +15740,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "Scieżka SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Utworzył"
+
 #~ msgid "General Description"
 #~ msgstr "Ogólny opis"
 
@@ -15598,6 +15825,9 @@ msgstr ""
 #~ msgid "XML Identifier"
 #~ msgstr "Identyfikator XML"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresy"
+
 #~ msgid "SMS Message"
 #~ msgstr "Wiadomość SMS"
 
@@ -15670,6 +15900,9 @@ msgstr ""
 #~ msgid "Report Header"
 #~ msgstr "Nagłówek raportu"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Odznacz pole aktywny, aby ukryć kontakt."
+
 #~ msgid "Add RML header"
 #~ msgstr "Dodaj nagłówek RML"
 
@@ -15799,6 +16032,9 @@ msgstr ""
 #~ msgid "Save As Attachment Prefix"
 #~ msgstr "Zapisz jako prefiks załącznika"
 
+#~ msgid "Delivery"
+#~ msgstr "Dostawa"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "Kod BIC/Swift"
 
@@ -16396,6 +16632,9 @@ msgstr ""
 #~ "Podaj tylko wartość, jeśli chcesz zmienić hasło użytkownika. Ten użytkownik "
 #~ "będzie musiał się wylogować i zalogować ponownie."
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Plik binarny lub URL"
+
 #~ msgid ""
 #~ "You can install new modules in order to activate new features, menu, reports "
 #~ "or data in your OpenERP instance. To install some modules, click on the "
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 96fc93d6099..e48fe672338 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 16:10+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 04:58+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Data/Hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -193,41 +193,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -238,7 +212,7 @@ msgstr ""
 "personalizado!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Erro de restrição"
@@ -249,7 +223,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -260,7 +234,7 @@ msgid "Swaziland"
 msgstr "Suazilândia"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "Criado"
@@ -339,20 +313,6 @@ msgstr "Empresa para guardar o registo atual"
 msgid "Max. Size"
 msgstr "Tamanho máximo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -360,11 +320,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nome do contacto"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -423,7 +378,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -460,6 +415,7 @@ msgstr "Regras de ação automáticas"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Dono"
 
@@ -500,7 +456,7 @@ msgstr ""
 "lista de diretivas permitidas, exibida quando se edita uma linguagem."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -558,7 +514,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilhas Holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -598,9 +554,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vista original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideias"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -625,26 +581,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bósnio / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -655,9 +591,25 @@ msgstr ""
 "nome de anexo, será retornado o relatório anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -734,14 +686,12 @@ msgstr ""
 "(Default: { })"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Assistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Os campos personalizados devem ter um nome iniciado por 'x_'!"
@@ -805,16 +755,14 @@ msgid "Model Description"
 msgstr "Descrição do modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -844,11 +792,21 @@ msgstr "Acionar expressões"
 msgid "Jordan"
 msgstr "Jordânia"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Data da próxima execução prevista para este trabalho."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -980,13 +938,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Forneça o nome do campo a que o id do registo está a referir-se para a "
-"operação escrever. Se estiver vazio irá referir-se ao id ativo do objeto."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua-Nova Guiné"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1005,7 +959,7 @@ msgid "Email Preferences"
 msgstr "Preferências de email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "%s' não parece ser uma data válida para o campo '%%(field)s'"
@@ -1057,16 +1011,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Espanhol (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Telemóvel"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1169,9 +1116,38 @@ msgid "Mongolia"
 msgstr "Mongólia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1187,12 +1163,17 @@ msgstr ""
 "seguintes grupos."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modelo de documento"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1219,7 +1200,54 @@ msgid "Username"
 msgstr "Nome de utilizador"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1249,7 +1277,7 @@ msgid "Delete Access Right"
 msgstr "Eliminar direito de acesso"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Teste de ligação falhou!"
@@ -1281,14 +1309,12 @@ msgid "South Korea"
 msgstr "Coreia do Sul"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transições"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Gravar #%d de %s não encontrado, não pode copiar!"
@@ -1426,7 +1452,7 @@ msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Alterar o modelo de um campo é proibido!"
@@ -1448,7 +1474,7 @@ msgid "Search"
 msgstr "Pesquisar"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1467,7 +1493,14 @@ msgid "Parent Application"
 msgstr "Aplicação Ascendente"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Assistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operação cancelada"
@@ -1599,7 +1632,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Não existe um idioma com o código \"%s\""
@@ -1722,7 +1769,7 @@ msgid "On Create"
 msgstr "Na criação"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1731,11 +1778,6 @@ msgstr ""
 "'%s' contem demasiados pontos. Ids XML não devem conter pontos! Pontos são "
 "usados para referir dados de outros módulos, como em module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Orçamentos, ordens de venda, faturação"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1818,7 +1860,7 @@ msgid "East Timor"
 msgstr "Timor Leste"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1859,11 +1901,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID Anexado"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1881,7 +1918,7 @@ msgstr ""
 "automática de listas de picking e muito mais."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1922,6 +1959,11 @@ msgstr "Veículo, 'leasing', seguros, custos"
 msgid "Read Access"
 msgstr "Direito de leitura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1998,16 +2040,11 @@ msgid "Create Tasks on SO"
 msgstr "Criar tarefas no SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Esta coluna contém dados do módulo e não pode ser removida!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo ligado"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2062,7 +2099,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Não pode remover o utilizador raiz!"
@@ -2094,11 +2131,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -2110,7 +2147,6 @@ msgstr "Modelos de planos de contas"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de endereço"
 
@@ -2148,11 +2184,6 @@ msgstr "Caminho completo"
 msgid "The next step depends on the file format:"
 msgstr "O próximo passo depende do tipo de ficheiro:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideias"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2290,6 +2321,11 @@ msgstr "Número de módulos atualizados"
 msgid "Method"
 msgstr "Método"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2323,7 +2359,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2331,6 +2367,11 @@ msgstr ""
 "Não foi encontrado o registo para %(field_type)s '%(value)s' no campo "
 "'%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2380,6 +2421,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Adicionar ou não o cabeçalho RML da corporação"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2433,7 +2483,7 @@ msgstr ""
 "'tree', 'calendar', etc. (padrão: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Um documento foi modificado desde a última vez que o viu (%s:%d)"
@@ -2514,7 +2564,6 @@ msgstr "São Tomé e Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -2561,11 +2610,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Lema da empresa"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2684,9 +2728,20 @@ msgid "Default limit for the list view"
 msgstr "Limite por omissão para a vista de lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua-Nova Guiné"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2764,7 +2819,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2823,6 +2878,19 @@ msgstr "Mapeamento de campos"
 msgid "Export Translations"
 msgstr "Exportar traduções"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2831,7 +2899,7 @@ msgid "Manager"
 msgstr "Gestor"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Infelizmente, não está autorizado a aceder a este documento."
@@ -2917,7 +2985,7 @@ msgid "Inherited"
 msgstr "Herdado"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "sim"
@@ -2947,7 +3015,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' não aparenta ser um número inteiro para o campo '%%(field)s'"
@@ -3014,22 +3082,22 @@ msgid "LinkedIn Integration"
 msgstr "Integração com o LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Arquitetura de objeto Inválida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -3126,12 +3194,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não pode criar empresas recursivamente."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3150,17 +3218,19 @@ msgstr ""
 "relatórios de estatísticas."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3170,7 +3240,7 @@ msgid "Params storage"
 msgstr "Salvaguarda de parâmetros"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3222,34 +3292,6 @@ msgstr "Parâmetros da configuração"
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3288,7 +3330,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Documento(s) em falta"
@@ -3300,6 +3342,34 @@ msgstr "Documento(s) em falta"
 msgid "Bank Account Type"
 msgstr "Tipo de conta bancária"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3338,7 +3408,7 @@ msgid "Signal (subflow.*)"
 msgstr "Sinal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3377,7 +3447,7 @@ msgid "Access Controls"
 msgstr "Controlos de acesso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3407,32 +3477,6 @@ msgstr "Empresa principal"
 msgid "Web Icon File (hover)"
 msgstr "Ficheiro com o ícone web (a aparecer quando o rato passa por cima)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3452,9 +3496,13 @@ msgstr ""
 "Se usa um tipo de fórmula, use uma expressão Python com o uso de uma "
 "variável do tipo 'objeto'"
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivamente."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Data de nascimento"
 
@@ -3470,7 +3518,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricantes de artigos"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Modo SMTP-sobre-SSL indisponível"
@@ -3580,7 +3628,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3773,7 +3821,6 @@ msgstr "Relatórios"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -3784,13 +3831,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Se não for definido, atua como um valor padrão para novos registos."
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Recursividade detetada."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Erro de recursividade nas dependências dos módulos !"
@@ -3850,9 +3902,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Acesso negado"
@@ -3863,7 +3916,7 @@ msgid "Company Name"
 msgstr "Nome da empresa"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3884,14 +3937,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (desatualizado - use Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "O código de idioma da tradução deve pertencer aos idiomas conhecidos"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Regras de gravação"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "S. Pedro e Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3920,13 +3996,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3974,19 +4046,7 @@ msgid "Paper Format"
 msgstr "Formato da folha"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4006,7 +4066,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4051,7 +4111,7 @@ msgid "Email Gateway"
 msgstr "Email Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4072,9 +4132,43 @@ msgid "Technical Data"
 msgstr "Dados técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4130,13 +4224,18 @@ msgstr "Folhas de horas de tickets de suporte"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Arquitetura inválida!"
@@ -4152,9 +4251,9 @@ msgid "Share any Document"
 msgstr "Partilhar qualquer documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Dicas, oportunidades, telefonemas"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Necessário grupo"
 
 #. module: base
 #: view:res.lang:0
@@ -4215,33 +4314,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4328,7 +4404,6 @@ msgstr "Restrição"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Por omissão"
 
@@ -4403,6 +4478,11 @@ msgstr ""
 "maior prioridade. A prioridade por omissão é 10 (numero mais baixo = maior "
 "prioridade)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4466,9 +4546,16 @@ msgid "Default value or action reference"
 msgstr "Valor por omissão ou referência da ação"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4548,6 +4635,22 @@ msgstr "Carregar uma tradução"
 msgid "Installed Version"
 msgstr "Versão instalada"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4574,6 +4677,43 @@ msgstr ""
 "está vazio, o OpenERP calculará a visibilidade baseada nos direitos de "
 "leitura do objeto relacionado."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4603,6 +4743,12 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "não"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4680,12 +4826,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4700,7 +4840,6 @@ msgstr "Suiça - Contabilidade"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Código Postal"
@@ -4711,13 +4850,18 @@ msgstr "Código Postal"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Defina como \"a fazer\""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Apresentação apropriada da data e hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4763,6 +4907,8 @@ msgstr "Direção"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vistas"
 
@@ -4778,7 +4924,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Tentou eliminar um módulo que está instalado ou será instalado"
@@ -4874,7 +5020,12 @@ msgid "Google Docs integration"
 msgstr "Integração com o Google Docs"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "nome"
@@ -4962,7 +5113,7 @@ msgid "System Configuration Done"
 msgstr "Configuração do sistema concluída"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ocorreu um erro ao validar o campo(s) %s: %s"
@@ -5077,6 +5228,11 @@ msgstr "Maurícia"
 msgid "Full Access"
 msgstr "Acesso Total"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5090,7 +5246,7 @@ msgid "Portuguese / Português"
 msgstr "Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5102,7 +5258,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Apenas se a conta bancária pertencer à sua empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5134,6 +5290,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5297,7 +5464,7 @@ msgid "Account Owner Name"
 msgstr "Nome do Proprietário da Conta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Não é possível renomear coluna para% s, pois essa coluna já existe!"
@@ -5313,16 +5480,11 @@ msgid "Decimal Separator"
 msgstr "Separador Decimal"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Falta o valor do campo '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5368,9 +5530,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Criador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "O nome do módulo deve ser único!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5433,15 +5596,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5457,6 +5611,11 @@ msgstr "Lançar Configurador"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nome do Anexo"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5540,6 +5699,12 @@ msgstr "Cazaquistão"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Número de dias da semana [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nome do Recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5794,7 +5959,7 @@ msgid "title"
 msgstr "Título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "verdadeiro"
@@ -5851,6 +6016,15 @@ msgstr "Artigos"
 msgid "User-defined Defaults"
 msgstr "Parâmetros de Utilizador por Omissão"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5972,13 +6146,15 @@ msgid "Bank Type"
 msgstr "Tipo de Banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "O nome do grupo não pode começar com \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Apps"
 
@@ -5998,7 +6174,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6033,10 +6209,9 @@ msgid "Uncategorized"
 msgstr "Sem categoria"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nome do Recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6072,6 +6247,11 @@ msgstr ""
 "no cliente, o sinal testa o nome do botão. Se o sinal for \"NULL\", nenhum "
 "botão é necessário para validar esta transição."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vista original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6082,7 +6262,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6099,26 +6279,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Os Meus Bancos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6251,11 +6411,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Repor a senha"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6267,8 +6422,8 @@ msgid "Malaysia"
 msgstr "Malásia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "O valor de incremento não pode ser zero."
@@ -6377,7 +6532,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Não existe uma vista do tipo '%s' definida para a estrutura!"
@@ -6417,7 +6572,7 @@ msgid "Created Menus"
 msgstr "Menus Criados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6444,9 +6599,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Defina como \"a fazer\""
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6478,6 +6661,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Ano atual (dois dígitos): %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Parametros do Sistema"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6523,7 +6713,7 @@ msgid "Audit Trail"
 msgstr "Atalho para a Auditoria"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6615,7 +6805,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "Não se pode duplicar a configuração!"
@@ -6635,30 +6825,6 @@ msgstr "Às vezes chamado de BIC ou Swift."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Telemóvel"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Este é o módulo para gerir o plano da contabilidade para o México em "
-"OpenERP.\n"
-"================================================== ======================\n"
-"\n"
-"Plano da contabilidade mexicana e localização.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6691,10 +6857,10 @@ msgstr "Relatório xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -6768,9 +6934,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6793,8 +6959,8 @@ msgid "Partner Titles"
 msgstr "Títulos do Parceiro"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Use o formato '%s'"
@@ -6842,7 +7008,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6851,11 +7017,6 @@ msgstr ""
 "Não pode executar esta operação. Criação de novo Record não é permitido para "
 "este objeto como este objeto é para relatar um propósito."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anónimo"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6965,6 +7126,13 @@ msgstr "Ficheiro do módulo importado com sucesso!"
 msgid "Model Constraints"
 msgstr "Restrições de modelo"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transições"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7062,7 +7230,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Distrito"
@@ -7163,12 +7330,6 @@ msgstr "Nome Completo"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7212,6 +7373,7 @@ msgstr "Em múltiplos docs"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7269,7 +7431,7 @@ msgid "Connection Security"
 msgstr "Segurança da Conexão"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Por favor especifique uma ação a iniciar!"
@@ -7289,6 +7451,11 @@ msgstr "Nome Categoria"
 msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7300,7 +7467,7 @@ msgid "Intrastat Reporting"
 msgstr "Relatórios Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7309,6 +7476,11 @@ msgstr ""
 "Por favor, use o assistente de mudança de password (em Preferências do "
 "utilizador ou no menu do utilizador) para alterar a password."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7339,7 +7511,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Campos insuficiente para Visualizar Calendário!"
@@ -7387,7 +7559,6 @@ msgstr "Transição"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7407,30 +7578,30 @@ msgid "Child Categories"
 msgstr "Categorias Descendentes"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -7518,6 +7689,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Esta janela"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7603,6 +7779,21 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Funcionários"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7632,11 +7823,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Testar ligação"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Endereços"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7661,7 +7847,6 @@ msgstr "Opções de Seleção"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Rua"
@@ -7672,9 +7857,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslávia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7752,7 +7952,7 @@ msgid "Change My Preferences"
 msgstr "Mudar as Minhas Preferências"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nome de modelo inválido na definição da ação"
@@ -7839,14 +8039,16 @@ msgid "US Letter"
 msgstr "Letter (EUA)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7855,7 +8057,7 @@ msgid "Company Bank Accounts"
 msgstr "Contas bancárias da empresa"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Definir passwords em branco não é permitido por razões de segurança!"
@@ -7866,13 +8068,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Password opcional para autenticação SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Infelizmente, não pode alterar este documento."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7894,12 +8096,13 @@ msgid "Normal Bank Account"
 msgstr "Conta Bancária Normal"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Assistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "id da base de dados"
@@ -8074,7 +8277,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8106,14 +8309,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8137,7 +8332,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8255,7 +8449,7 @@ msgid "Nigeria"
 msgstr "Nigéria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Para campos de seleção, as opções de seleção devem ser dadas!"
@@ -8573,7 +8767,7 @@ msgid "Update Modules List"
 msgstr "Atualizar a lista de módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8587,7 +8781,7 @@ msgid "eInvoicing"
 msgstr "Faturação Electrónica"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8602,7 +8796,7 @@ msgstr ""
 "do utilizador agora)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "O valor \"%s\" para o campo \"%s.%s\" não está na seleção"
@@ -8617,6 +8811,17 @@ msgstr "Continuar"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandês / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8656,7 +8861,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8682,15 +8887,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Falta Servidor SMTP"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nome do Anexo"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "O código de idioma da tradução deve pertencer aos idiomas conhecidos"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8714,7 +8919,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nome do mês abreviado."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Infelizmente, não pode apagar este documento."
@@ -8726,7 +8931,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -8804,7 +9008,7 @@ msgid "Selectable"
 msgstr "Selecionável"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Tudo parece configurado corretamente!"
@@ -8832,8 +9036,8 @@ msgid "Iteration"
 msgstr "Iteração"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Erro do Utilizador"
@@ -8857,7 +9061,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9006,7 +9210,7 @@ msgid "Reunion (French)"
 msgstr "Reunião (França)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9047,8 +9251,8 @@ msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Erro de Acesso"
@@ -9122,7 +9326,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9136,7 +9340,7 @@ msgid "Ukraine"
 msgstr "Ucrânia"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9199,6 +9403,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9297,9 +9506,9 @@ msgid "Custom Shortcuts"
 msgstr "Atalhos Personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9327,13 +9536,13 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "O módulo \"base\" não pode ser desinstalado"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Registo não pode ser modificado agora"
@@ -9354,7 +9563,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "Infelizmente, não pode criar este tipo de documento."
@@ -9402,7 +9611,7 @@ msgid "On Delete"
 msgstr "Ao apagar"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "O modelo %s não existe!"
@@ -9448,6 +9657,7 @@ msgstr "Estados Unidos - Planos de Contas"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9456,7 +9666,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9475,6 +9685,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9510,7 +9757,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "id externo"
@@ -9562,6 +9809,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (12-horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9604,30 +9856,11 @@ msgid "The currency code must be unique per company!"
 msgstr "O código da moeda deve ser único por empresa!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Novo idioma (modelo de tradução limpo)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-"\n"
-"Recriar senha\n"
-"==============\n"
-"\n"
-"Permite aos utilizadores recriarem a sua senha de acesso.\n"
-"Permite ao administrador carregar num botão para enviar um pedido de "
-"\"Recriar senha\" a um utilizador.\n"
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9661,7 +9894,7 @@ msgid "Products Expiry Date"
 msgstr "Artigos Data de Validade"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Clique em \"Continuar\" para configurar o próximo módulo ..."
@@ -9753,6 +9986,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9960,7 +10198,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campanha de Marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9971,13 +10209,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidade de Intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tipo"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método já não existe"
@@ -10151,7 +10394,7 @@ msgid "To Translate"
 msgstr "Para traduzir"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Ver todos os valores possíveis"
@@ -10186,6 +10429,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10212,6 +10460,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Texto de rodapé mostrados no final de todos os relatórios."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL do ícone."
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10303,7 +10556,6 @@ msgstr "%m - número mês [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Cidade"
@@ -10339,13 +10591,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estónio / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Forneça o nome do campo a que o id do registo está a referir-se para a "
+"operação escrever. Se estiver vazio irá referir-se ao id ativo do objeto."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ou versão mais atual"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10406,12 +10667,37 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -10420,7 +10706,7 @@ msgstr ""
 "erro."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10434,6 +10720,8 @@ msgid "Activity"
 msgstr "Atividade"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10452,7 +10740,12 @@ msgid "Parent Company"
 msgstr "Empresa Ascendente"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Autentificação  OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10464,13 +10757,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10557,6 +10843,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Gestão de vendas e de armazém"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10631,6 +10937,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tipos de Sequências"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10691,9 +11002,9 @@ msgstr ""
 "Desative primeiro o idioma."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Permissão negada"
@@ -10711,8 +11022,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema na configuração `Record Id` na ação do servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Erro de Validação"
@@ -10753,13 +11064,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10770,7 +11080,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10801,36 +11116,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10853,6 +11138,11 @@ msgstr "Outro Proprietário"
 msgid "Ecuador"
 msgstr "Equador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10869,16 +11159,6 @@ msgstr "Contratos de Emprego"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Não pode eliminar o idioma preferido de um utilizador."
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10895,9 +11175,9 @@ msgid "Cascade"
 msgstr "Cascata"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Necessário grupo"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Dicas, oportunidades, telefonemas"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10924,11 +11204,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr "Empresa padrão por objeto"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Número de ações que o utilizador tem de realizar"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10954,7 +11229,7 @@ msgid "Domain"
 msgstr "Domínio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Use '1' para sim e '0' para não"
@@ -10970,12 +11245,12 @@ msgid "State Name"
 msgstr "Nome do Estado"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10996,30 +11271,10 @@ msgid "Timezone"
 msgstr "Fuso Horário"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11039,7 +11294,7 @@ msgid "Shared"
 msgstr "Partilhado"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11093,7 +11348,6 @@ msgstr "Validação Dupla de Compras"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Rua2"
 
@@ -11117,6 +11371,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11202,19 +11457,28 @@ msgid "Related Partner"
 msgstr "Parceiro relacionado"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Erro de integridade"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "O tamanho do campo nunca pode ser menor que 1 !"
@@ -11256,22 +11520,6 @@ msgstr "Lista de Colaboradores"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11404,7 +11652,6 @@ msgstr "Instalador de Configuração"
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11494,7 +11741,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Não foi possível criar o contacto sem o endereço eletrónico!"
@@ -11544,9 +11791,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Autentificação  OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11636,7 +11883,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Entrega de mail falhada"
@@ -11663,7 +11910,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11752,7 +11999,7 @@ msgid "Mrs."
 msgstr "Srª."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11767,7 +12014,7 @@ msgid "User Ref."
 msgstr "Ref. do Utilizador"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11812,8 +12059,6 @@ msgstr "Guia de Referência"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11821,7 +12066,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11852,12 +12097,6 @@ msgstr "Ilhas Malvinas"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11966,9 +12205,11 @@ msgid "Selection"
 msgstr "Seleção"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL do ícone."
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12004,7 +12245,7 @@ msgid "Action Type"
 msgstr "Tipo de Ação"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12142,11 +12383,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desative o Campo para Ocultar o Contato"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12163,7 +12399,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atributo desconhecido %s em %s "
@@ -12186,7 +12422,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "undefined get method !"
@@ -12227,16 +12463,16 @@ msgstr "Bronze"
 msgid "Payroll Accounting"
 msgstr "Contabilidade do Processamento de Salários"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Ficheiro binário ou URL externo"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Mudar Password"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12283,92 +12519,57 @@ msgid "Address Format"
 msgstr "Formato do Endereço"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"O formato do separador deve ser como [,n] onde 0 < n: iniciando do dígito da "
-"unidade. -1 terminará a separação. por exemplo [3.2, -1] representará 106500 "
-"para ser 1,06,500; [1,2, -1] representá-lo-á para ser 106,50,0; [3] "
-"representá-lo-á como 106,500.  fornecido, ',' como o separador dos milhares "
-"em cada caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Características Técnicas"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12555,6 +12756,11 @@ msgstr ""
 "Ajuda na gestão do inventário e outras operações de gestão de stock: ordens "
 "de envio, recepções, etc."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12571,7 +12777,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Teste à ligação bem sucedido!"
@@ -12622,7 +12828,7 @@ msgid "choose"
 msgstr "Escolher"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12802,10 +13008,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12837,12 +13047,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12857,7 +13068,6 @@ msgstr "Registo Empresa"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Diversos"
@@ -12879,23 +13089,6 @@ msgstr "Técnico"
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12972,25 +13165,9 @@ msgid "Bulgaria"
 msgstr "Bulgária"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13018,6 +13195,26 @@ msgstr "5.  %y, %Y==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13054,6 +13251,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "Desconhecido"
@@ -13121,6 +13319,11 @@ msgstr "Livro de Endereços"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13210,6 +13413,7 @@ msgid "Projects, Tasks"
 msgstr "Projetos, tarefas"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13222,7 +13426,7 @@ msgid "Information"
 msgstr "Informação"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "falso"
@@ -13253,16 +13457,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Right parent"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Atualizar a lista de módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13329,6 +13537,11 @@ msgstr ""
 "O campo \"osv_memory\" só pode ser objeto de comparações com os operadores "
 "'=' ou '!='."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13401,29 +13614,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identificador Externo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13471,7 +13661,7 @@ msgid "Delivery Costs"
 msgstr "Custos de Entrega"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13517,9 +13707,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Encriptação da palavra-chave da BD"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Regras de gravação"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13766,10 +13956,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "não"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -13795,63 +13990,14 @@ msgid "System Configuration done"
 msgstr "Configuração do Sistema Concluída"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Parametros do Sistema"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Ilhas Turks e Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13892,17 +14038,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13937,7 +14072,7 @@ msgid "Low"
 msgstr "Baixo"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Erro ! Não pode criar menus recursivos."
@@ -14019,11 +14154,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefone"
@@ -14038,6 +14172,11 @@ msgstr "Menu de Acesso"
 msgid "Thailand"
 msgstr "Tailândia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14058,6 +14197,30 @@ msgstr "Guernsey"
 msgid "Romanian / română"
 msgstr "Romanian / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14096,41 +14259,6 @@ msgstr "Relação do Objeto"
 msgid "eInvoicing & Payments"
 msgstr "Faturação & Pagamentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14191,40 +14319,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14325,6 +14421,21 @@ msgstr "Vista :"
 msgid "View Auto-Load"
 msgstr "Ver Auto-Load"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14367,34 +14478,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14417,9 +14500,9 @@ msgid "Unmet dependency !"
 msgstr "Dependência não encontrada!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14430,7 +14513,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14456,7 +14569,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14501,7 +14614,7 @@ msgid "Access"
 msgstr "Acesso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14534,11 +14647,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14554,8 +14666,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14670,7 +14780,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "O campo de serialização `%s` não foi encontrado para o campo `%s`!"
@@ -14682,7 +14792,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Índice de Cor"
 
@@ -14719,7 +14828,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14730,8 +14839,8 @@ msgid "Azerbaijan"
 msgstr "Azerbeijão"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -14757,11 +14866,6 @@ msgstr "Ilhas Virgens Britânicas"
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "S. Pedro e Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14854,7 +14958,6 @@ msgstr "Formação, conferẽncias, reuniões, exposições, inscrições"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -14925,9 +15028,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Instalar um Módulo"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"O formato do separador deve ser como [,n] onde 0 < n: iniciando do dígito da "
+"unidade. -1 terminará a separação. por exemplo [3.2, -1] representará 106500 "
+"para ser 1,06,500; [1,2, -1] representá-lo-á para ser 106,50,0; [3] "
+"representá-lo-á como 106,500.  fornecido, ',' como o separador dos milhares "
+"em cada caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14954,7 +15066,7 @@ msgid "Japan"
 msgstr "Japão"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Só é possível renomear uma coluna de cada vez!"
@@ -15015,6 +15127,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Canadá - Contabilidade"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15039,7 +15182,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Note que esta operação pode demorar alguns minutos"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15078,6 +15221,12 @@ msgstr "Execução"
 msgid "Condition"
 msgstr "Condição"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15132,6 +15281,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croácia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15156,6 +15312,11 @@ msgstr "Atualização do Sistema"
 msgid "SXW Content"
 msgstr "Conteúdo SXW"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15172,7 +15333,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15193,15 +15354,52 @@ msgstr "Serra Leoa"
 msgid "General Information"
 msgstr "Informação Geral"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "ID Completo"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Ilhas Turks e Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15237,7 +15435,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Aviso mudar empresa"
@@ -15257,11 +15460,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "O próximo número da sequência será incrementado por este número"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Função"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15299,11 +15506,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Notas Internas"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Entrega"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15331,7 +15533,7 @@ msgid "Workflow Instances"
 msgstr "Instâncias do workflow"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Parceiros: "
@@ -15342,7 +15544,7 @@ msgid "Is a Company?"
 msgstr "É uma empresa?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15408,7 +15610,6 @@ msgstr "Exportar Nome"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15455,6 +15656,9 @@ msgstr "Registo"
 #~ msgid "On multiple doc."
 #~ msgstr "Em múltiplos documentos"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nome do contacto"
+
 #~ msgid "Schedule Upgrade"
 #~ msgstr "Agendar actualização"
 
@@ -15467,6 +15671,9 @@ msgstr "Registo"
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Manter 0 se a acção tem de aparecer em todos os recursos."
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo ligado"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Accionar nome"
 
@@ -15529,6 +15736,9 @@ msgstr "Registo"
 #~ msgid "SXW path"
 #~ msgstr "Caminho SXW"
 
+#~ msgid "Creator"
+#~ msgstr "Criador"
+
 #~ msgid "Meta Datas"
 #~ msgstr "Meta-dados"
 
@@ -15610,6 +15820,9 @@ msgstr "Registo"
 #~ msgid "Important customers"
 #~ msgstr "Clientes Importantes"
 
+#~ msgid "Delivery"
+#~ msgstr "Entrega"
+
 #~ msgid "Report Header"
 #~ msgstr "Cabeçalho do relatório"
 
@@ -16006,6 +16219,9 @@ msgstr "Registo"
 #~ msgid "Has a web component"
 #~ msgstr "Possui uma componente web"
 
+#~ msgid "Addresses"
+#~ msgstr "Endereços"
+
 #~ msgid "Ignore"
 #~ msgstr "Ignorar"
 
@@ -16091,6 +16307,9 @@ msgstr "Registo"
 #~ msgid "Emails"
 #~ msgstr "Correio Electrónico"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Ficheiro binário ou URL externo"
+
 #~ msgid "Consumers"
 #~ msgstr "Consumidores"
 
@@ -16847,6 +17066,9 @@ msgstr "Registo"
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID Anexado"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module adds generic sharing tools to your current OpenERP database.\n"
@@ -17221,6 +17443,22 @@ msgstr "Registo"
 #~ msgid "Partner Contacts"
 #~ msgstr "Contatos do Parceiro"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este é o módulo para gerir o plano da contabilidade para o México em "
+#~ "OpenERP.\n"
+#~ "================================================== ======================\n"
+#~ "\n"
+#~ "Plano da contabilidade mexicana e localização.\n"
+#~ "    "
+
 #~ msgid "Payment term"
 #~ msgstr "Termo de Pagamento"
 
@@ -17519,6 +17757,9 @@ msgstr "Registo"
 #~ msgid "Generate Docs of Modules"
 #~ msgstr "Gerar Documentos de Módulos"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desative o Campo para Ocultar o Contato"
+
 #~ msgid "Rule definition (domain filter)"
 #~ msgstr "Definição de Regra (filtrar domínio)"
 
@@ -17888,6 +18129,9 @@ msgstr "Registo"
 #~ msgid "User - Own Leads Only"
 #~ msgstr "Utilizador - Apenas as suas Oportunidades"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Encriptação da palavra-chave da BD"
+
 #~ msgid "Live Chat Support"
 #~ msgstr "Suporte por Conversação Online"
 
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 6e876cd29c1..1b27f418fd5 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-16 22:18+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:44+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -46,7 +46,7 @@ msgid "DateTime"
 msgstr "Data/Hora"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -223,69 +223,15 @@ msgstr ""
 "receitas teóricas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"CRM -  Gestão de Relacionamento com o Cliente\n"
-"================================================== ===\n"
-"\n"
-"Este aplicativo permite que um grupo de pessoas gerencie de forma "
-"inteligente e eficiente prospectos, oportunidades, reuniões e telefonemas.\n"
-"\n"
-"Ele gerencia tarefas essenciais, como a comunicação, a identificação, "
-"priorização, atribuição, resolução e notificação.\n"
-"\n"
-"O OpenERP garante que todos os casos são rastreado com sucesso por usuários, "
-"clientes e fornecedores. É possível enviar automaticamente lembretes, "
-"escalar o pedido, acionar métodos específicos e muitas outras ações com base "
-"em suas próprias regras empresariais.\n"
-"\n"
-"A melhor coisa sobre este sistema é que os usuários não precisam fazer nada "
-"de especial. O módulo de CRM tem um gateway de e-mail para a interface de "
-"sincronização entre e-mails e OpenERP. Dessa forma, os usuários podem enviar "
-"e-mails apenas para o rastreador do pedido.\n"
-"\n"
-"O OpenERP vai cuidar de agradecê-los por sua mensagem, encaminhá-la para o "
-"pessoal apropriado automaticamente e certificar-se de que toda a futura "
-"correspondência chegue ao lugar certo.\n"
-"\n"
-"O Painel para CRM inclue:\n"
-"-----------------------------------\n"
-"* Receita planejada por estágio e usuário (gráfico)\n"
-"* Oportunidades por estágio (gráfico)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -296,7 +242,7 @@ msgstr ""
 "um addon customizado."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Erro de Restrição"
@@ -307,7 +253,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Não é permitido renomear o campo \"%s\""
@@ -318,7 +264,7 @@ msgid "Swaziland"
 msgstr "Suíça"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "criado."
@@ -401,29 +347,6 @@ msgstr "Empresa para guardar o registro atual"
 msgid "Max. Size"
 msgstr "Tamanho Máximo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Incluir outras datas ao pedido de vendas.\n"
-"================================\n"
-"\n"
-"Você pode incluir as seguintes datas ao pedido de vendas:\n"
-"-----------------------------------------------------------\n"
-"* Data de Requisição\n"
-"* Data do Fechamento do pedido\n"
-"* Data Efetiva\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -433,11 +356,6 @@ msgstr ""
 "ID do registro para abrir uma visão form, quando ``view_mode``está definido "
 "somente como 'form'"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nome do Contato"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -502,7 +420,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -541,6 +459,7 @@ msgstr "Regras de ação automatizada"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Proprietário"
 
@@ -581,7 +500,7 @@ msgstr ""
 "permitidas, exibida quando você edita um idioma."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -639,7 +558,7 @@ msgid "Netherlands Antilles"
 msgstr "Antílhas Holandesas"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -688,9 +607,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Visualização Original"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Idéias"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -715,26 +634,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bósnia"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -745,9 +644,25 @@ msgstr ""
 "nome de anexo, retornará a impressão anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -823,14 +738,12 @@ msgstr ""
 "Dicionário de contexto como expressão Python, vazio por default(Default: { })"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Assistentes"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr "Logo Web"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Campos customizados precisam ter nomes que começam com 'x_'!"
@@ -894,24 +807,21 @@ msgid "Model Description"
 msgstr "Descrição de Modelo"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Clique para adicionar um contato à sua agenda.\n"
-"</p><p>\n"
-"OpenERP lhe ajuda a trilhar todas as atividades relativas a\n"
-"um cliente: negociações, histórico de oportunidades, documentos, etc\n"
-"</p>\n"
-"            "
+"\n"
+"Menu para Marketing. \n"
+"=================== \n"
+"\n"
+"Contém o instalador para módulos relacionados ao marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -945,11 +855,21 @@ msgstr "Acionar expressões"
 msgid "Jordan"
 msgstr "Jordânia"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Data da próxima execução planejada para este trabalho."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1108,13 +1028,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Forneça o nome do campo que o id do registro refere para a operação de "
-"gravação(write). Se vazio, se refere ao id do objeto ativo."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nova Guiné"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1133,7 +1049,7 @@ msgid "Email Preferences"
 msgstr "Preferências do Email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' não é uma data válida para '%%(field)s'"
@@ -1184,23 +1100,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Espanhol (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
-"\n"
-"Este é o módulo base para o plano de contas de Luxemburgo.\n"
-"======================================================================\n"
-"\n"
-"    * Plano de contas KLUWER\n"
-"    * Códigos de impostos de Luxembourg\n"
-"    * Impostos utilizados em Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Celular"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1310,9 +1212,38 @@ msgid "Mongolia"
 msgstr "Mongólia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1328,12 +1259,17 @@ msgstr ""
 "seguintes grupos."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Modelo de documento"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr "Trocar senha do usuário."
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1360,7 +1296,54 @@ msgid "Username"
 msgstr "Nome de usuário"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1390,7 +1373,7 @@ msgid "Delete Access Right"
 msgstr "Apagar Permissão de Acesso"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Teste de conexão falhou!"
@@ -1422,14 +1405,12 @@ msgid "South Korea"
 msgstr "Coreia do Sul"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Transições"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Registro #%d do %s não foi encontrado, não é possível copiar!"
@@ -1570,7 +1551,7 @@ msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Alteração de modelo de campo é proibido!"
@@ -1592,7 +1573,7 @@ msgid "Search"
 msgstr "Pesquisar"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1612,7 +1593,14 @@ msgid "Parent Application"
 msgstr "Aplicativo pai"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Assistentes"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operação Cancelada"
@@ -1750,7 +1738,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Não existe idioma para o código \"%s\""
@@ -1873,7 +1875,7 @@ msgid "On Create"
 msgstr "Na Criação"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1883,11 +1885,6 @@ msgstr ""
 "Estes devem ser utilizados para referência a dados de outros módulos como "
 "em: module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Cotações, ordens de venda, faturamento"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1974,7 +1971,7 @@ msgid "East Timor"
 msgstr "Timor Leste"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2023,11 +2020,6 @@ msgstr ""
 "Dá ao Administrador acesso de gerente e usuário, e apenas direito de usuário "
 "ao Demo (usuário demonstração) \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID do anexo"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2045,7 +2037,7 @@ msgstr ""
 "separação automáticas e mais."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2088,6 +2080,11 @@ msgstr "Veículos, leasing, seguros, custos"
 msgid "Read Access"
 msgstr "Acesso de leitura"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr "O id do registro está anexado a"
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2181,16 +2178,11 @@ msgid "Create Tasks on SO"
 msgstr "Criar Tarefas na SO"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Esta coluna contem dados de módulos e não pode ser removida!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modelo anexado"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2245,7 +2237,7 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Não posso remover o usuário root!"
@@ -2277,11 +2269,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -2293,7 +2285,6 @@ msgstr "Modelo de Plano de Contas"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipo de Endereço"
 
@@ -2331,11 +2322,6 @@ msgstr "Caminho Completo"
 msgid "The next step depends on the file format:"
 msgstr "O proximo passo depende do formato do arquivo:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Idéias"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2475,6 +2461,11 @@ msgstr "Número de módulos atualizados"
 msgid "Method"
 msgstr "Método"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr "Criptografar senha"
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2508,7 +2499,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
@@ -2516,6 +2507,11 @@ msgstr ""
 "Nenhum registro encontrado com  '%%(field)s' correspondendo a %(field_type)s "
 "'%(value)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr "Nova Senha"
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2565,6 +2561,19 @@ msgstr "Bélgica"
 msgid "Add or not the corporate RML header"
 msgstr "Adicionar ou não um cabeçalho RML corporativo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+"\n"
+"Permitir acesso anônimo ao Portal.\n"
+"=================================\n"
+" "
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2618,7 +2627,7 @@ msgstr ""
 "'calendar', etc. (Default: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Um documento foi modificado desde a última visita dele (%s:%d)"
@@ -2714,7 +2723,6 @@ msgstr "São Tomé e Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -2761,11 +2769,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Slogan da empresa"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2895,9 +2898,20 @@ msgid "Default limit for the list view"
 msgstr "Limite padrão para a lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nova Guiné"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2978,7 +2992,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -3039,6 +3053,19 @@ msgstr "Mapeamentos de Campo"
 msgid "Export Translations"
 msgstr "Exportar traduções"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3047,7 +3074,7 @@ msgid "Manager"
 msgstr "Gerente"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Usuário não autorizado a acessar esse documento."
@@ -3133,7 +3160,7 @@ msgid "Inherited"
 msgstr "Herdado"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "sim"
@@ -3163,7 +3190,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3232,22 +3259,22 @@ msgid "LinkedIn Integration"
 msgstr "Integração com LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Arquitetura do Objeto Inválida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -3361,12 +3388,12 @@ msgstr ""
 "    "
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3385,28 +3412,32 @@ msgstr ""
 "relatórios estatísticos."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 "\n"
-"Habilitar a funcionalidade de atalhos no cliente web.\n"
-"===========================================\n"
+"Este é o módulo para gerenciar o gráfico contabilidade e impostos para a "
+"Polónia no OpenERP.\n"
+"================================================== "
+"================================\n"
 "\n"
-"Adicionar um ícone na bandeja do sistema (systray) para acessar os atalhos "
-"do usuário (se houverem)\n"
-"\n"
-"Adicionar um ícone ao lado do título da visão para adicionar / remover "
-"atalhos.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 
 #. module: base
@@ -3415,7 +3446,7 @@ msgid "Params storage"
 msgstr "Parametros de armazenamento"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Impossível atualizar o módulo '%s'. Ele não está instalado."
@@ -3466,34 +3497,6 @@ msgstr "Parâmetros de Configuração"
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3532,7 +3535,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Documento(s) faltante(s)"
@@ -3544,6 +3547,34 @@ msgstr "Documento(s) faltante(s)"
 msgid "Bank Account Type"
 msgstr "Tipo de Conta Bancaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3581,7 +3612,7 @@ msgid "Signal (subflow.*)"
 msgstr "Sinal (subfluxo.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3621,7 +3652,7 @@ msgid "Access Controls"
 msgstr "Controles de Acesso"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3651,32 +3682,6 @@ msgstr "Empresa Principal"
 msgid "Web Icon File (hover)"
 msgstr "Image web (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3696,9 +3701,13 @@ msgstr ""
 "Se voce usa um tipo de formula, use uma expressão python usando a variavel "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Você não pode criar empresas recursivas."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Data de Nascimento"
 
@@ -3714,7 +3723,7 @@ msgid "Products Manufacturers"
 msgstr "Fabricantes dos Produtos"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-sobre-SSL modo indisponível"
@@ -3832,7 +3841,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4025,7 +4034,6 @@ msgstr "Relatórios"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Título"
@@ -4036,13 +4044,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Se não for definido, atua como um valor padrão para novos recursos"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Recursividade Detectada."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Erro de recursão nas dependências dos módulos !"
@@ -4102,9 +4115,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Acesso Negado"
@@ -4115,7 +4129,7 @@ msgid "Company Name"
 msgstr "Nome da Empresa"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4136,14 +4150,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (desatualizado - use Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "O idioma deve estar entre os idiomas conhecidos"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Registro de Regras"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre e Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4183,17 +4220,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Permitir acesso anônimo ao OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4241,19 +4270,7 @@ msgid "Paper Format"
 msgstr "Formato de papel"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4273,7 +4290,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "Reg"
@@ -4322,7 +4339,7 @@ msgid "Email Gateway"
 msgstr "Servidor Email"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4343,9 +4360,43 @@ msgid "Technical Data"
 msgstr "Dados Técnicos"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4401,13 +4452,18 @@ msgstr "Agenda de horários para as questões"
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Arquitetura Inválida!"
@@ -4423,9 +4479,9 @@ msgid "Share any Document"
 msgstr "Compartilhar Qualquer Documento"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Prospectos, Oportunidades, Ligações Telefônicas"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "O Grupo é Obrigatório"
 
 #. module: base
 #: view:res.lang:0
@@ -4498,33 +4554,10 @@ msgid "Languages"
 msgstr "Idiomas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4611,7 +4644,6 @@ msgstr "Restringir"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Padrão"
 
@@ -4686,6 +4718,11 @@ msgstr ""
 "prioridade mais alta usado. Prioridade padrão é 10 (número menor = maior "
 "prioridade)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr "Orçamentos, Pedidos, Faturas"
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4749,9 +4786,16 @@ msgid "Default value or action reference"
 msgstr "Referência de valor ou ação padrão"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4834,6 +4878,22 @@ msgstr "Carregar Tradução"
 msgid "Installed Version"
 msgstr "Versão Instalada"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4860,6 +4920,43 @@ msgstr ""
 "campo está em branco, OpenERP calculará a visibilidade baseada nos direitos "
 "de leitura do objeto relacionado"
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4889,6 +4986,12 @@ msgstr ""
 msgid "View"
 msgstr "Visualizar"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "não"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4966,12 +5069,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4986,7 +5083,6 @@ msgstr "Suíça - Contabilidade"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "CEP"
@@ -4997,13 +5093,18 @@ msgstr "CEP"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Definir como À Fazer"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - representação adequada para Data e hora."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5049,6 +5150,8 @@ msgstr "Direção"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Views"
 
@@ -5064,7 +5167,7 @@ msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5161,7 +5264,12 @@ msgid "Google Docs integration"
 msgstr "Integração com Google Docs"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "name"
@@ -5249,7 +5357,7 @@ msgid "System Configuration Done"
 msgstr "Configuração concluída"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Ocorreu um erro validando o(s) campo(s) %s: %s"
@@ -5364,6 +5472,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Acesso Completo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5377,7 +5490,7 @@ msgid "Portuguese / Português"
 msgstr "Portuguese / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5389,7 +5502,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Somente se esta conta bancária pertencer à sua empresa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "sub-campo desconhecido '%s'"
@@ -5421,6 +5534,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Hungria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5587,7 +5711,7 @@ msgid "Account Owner Name"
 msgstr "Nome do proprietário da conta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Impossível renomear a coluna para %s, porque a coluna já existe!"
@@ -5603,16 +5727,11 @@ msgid "Decimal Separator"
 msgstr "Separador decimal"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Valor requerido falhor para o campo '% s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5659,9 +5778,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Criador"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "O nome do módulo deve ser único!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5732,19 +5852,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"Permitir que usuários se cadastrem.\n"
-"=======================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5760,6 +5867,11 @@ msgstr "Iniciar o Assistente de Configuração"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Ordens de produção, lista de materiais, roteamento"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nome do anexo"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5843,6 +5955,12 @@ msgstr "Cazaquistão"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Número do dia da Semana [0(Domingo),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Nome do Recurso"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6100,7 +6218,7 @@ msgid "title"
 msgstr "Título"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "verdadeiro"
@@ -6157,6 +6275,15 @@ msgstr "Produtos"
 msgid "User-defined Defaults"
 msgstr "Padrões definidos pelo usuário"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6283,13 +6410,15 @@ msgid "Bank Type"
 msgstr "Tipo de Banco"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Nome do grupo não pode iniciar com \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplicativos"
 
@@ -6309,7 +6438,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6344,10 +6473,9 @@ msgid "Uncategorized"
 msgstr "Sem categoria"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Nome do Recurso"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6383,6 +6511,11 @@ msgstr ""
 "cliente, testa o nome do botão pressionado. Se o sinal for NULL, nenhum "
 "botão é necessário para validar esta transição."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Visualização Original"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6396,7 +6529,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' não parece ser um número para o campo '%% (field)s'"
@@ -6412,26 +6545,6 @@ msgstr "Divisões administrativas de um país. Ex: Estados, Cidades"
 msgid "My Banks"
 msgstr "Meus Bancos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6564,11 +6677,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Redefinir senha"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6580,8 +6688,8 @@ msgid "Malaysia"
 msgstr "Malásia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "Número de incremento não deve ser zero."
@@ -6696,7 +6804,7 @@ msgstr ""
 "sistema."
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Não existe uma visão do tipo '%s' definida para a estrutura!"
@@ -6736,7 +6844,7 @@ msgid "Created Menus"
 msgstr "Menus criados"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6763,9 +6871,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Definir como À Fazer"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6797,6 +6933,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Ano Atual (2 dígitos): %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Parâmetros do Sistema"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6848,7 +6991,7 @@ msgid "Audit Trail"
 msgstr "Auditoria"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr "Valor '%s' não foi encontrado no campo selecionado '%%(field)s'"
@@ -6940,7 +7083,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "Não posso duplicar configuração!"
@@ -6960,23 +7103,6 @@ msgstr "As vezes chamado de BIC ou Swift."
 msgid "Indian - Accounting"
 msgstr "Contabilidade Indiana"
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Celular"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -7009,10 +7135,10 @@ msgstr "Relatório xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Módulos"
 
@@ -7086,9 +7212,9 @@ msgid "United Kingdom"
 msgstr "Reino Unido"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7111,8 +7237,8 @@ msgid "Partner Titles"
 msgstr "Tratamentos para Parceiros"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Use o formato '%s'"
@@ -7160,7 +7286,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7169,11 +7295,6 @@ msgstr ""
 "Voce não pode fazer essa operação. Criação de novos registros nao esta "
 "permitido para objetos de tipo relatório."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anónimo"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7283,6 +7404,13 @@ msgstr "Módulo importado com sucesso!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Transições"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7380,7 +7508,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Estado(UF)"
@@ -7481,12 +7608,6 @@ msgstr "Nome Completo"
 msgid "on"
 msgstr "em"
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7530,6 +7651,7 @@ msgstr "Em múltiplos Docs."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7587,7 +7709,7 @@ msgid "Connection Security"
 msgstr "Conexão Segurança"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Especifique uma ação a ser disparada !"
@@ -7607,6 +7729,11 @@ msgstr "Nome de Categoria"
 msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7618,7 +7745,7 @@ msgid "Intrastat Reporting"
 msgstr "Relatórios Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7627,6 +7754,11 @@ msgstr ""
 "Por favor, utilizar o assistente de mudança de senha (em Preferências do "
 "usuário ou no menu usuários) para mudar sua própria senha."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7657,7 +7789,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Sem campos suficientes para Visualização de Calendário"
@@ -7705,7 +7837,6 @@ msgstr "Transição"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7725,30 +7856,30 @@ msgid "Child Categories"
 msgstr "Categorias Filha"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -7840,6 +7971,11 @@ msgstr "Definição de Regras (Filtro de Domínio)"
 msgid "This Window"
 msgstr "Esta janela"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7925,6 +8061,31 @@ msgstr "Campos"
 msgid "Employees"
 msgstr "Funcionários"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+"\n"
+"Habilitar a funcionalidade de atalhos no cliente web.\n"
+"===========================================\n"
+"\n"
+"Adicionar um ícone na bandeja do sistema (systray) para acessar os atalhos "
+"do usuário (se houverem)\n"
+"\n"
+"Adicionar um ícone ao lado do título da visão para adicionar / remover "
+"atalhos.\n"
+"    "
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7954,11 +8115,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Testar Conexão"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Endereços"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7983,7 +8139,6 @@ msgstr "Opções de Seleção"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Rua"
@@ -7994,9 +8149,24 @@ msgid "Yugoslavia"
 msgstr "Iugoslávia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Superior direito"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8077,7 +8247,7 @@ msgid "Change My Preferences"
 msgstr "Alterar Preferências"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nome do modelo inválido na definição da ação."
@@ -8164,21 +8334,24 @@ msgid "US Letter"
 msgstr "US Carta"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menu para Marketing. \n"
-"=================== \n"
-"\n"
-"Contém o instalador para módulos relacionados ao marketing.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"Clique para adicionar um contato à sua agenda.\n"
+"</p><p>\n"
+"OpenERP lhe ajuda a trilhar todas as atividades relativas a\n"
+"um cliente: negociações, histórico de oportunidades, documentos, etc\n"
+"</p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8186,7 +8359,7 @@ msgid "Company Bank Accounts"
 msgstr "Contas Bancárias da Empresa"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Senhas vazias não são permitidas por questões de segurança!"
@@ -8197,13 +8370,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Senha opcional para autenticação SMTP"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "Sinto muito, você não tem permissão para alterar este documento."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8225,12 +8398,13 @@ msgid "Normal Bank Account"
 msgstr "Conta Bancária Normal"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Assistente"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "id do banco de dados"
@@ -8413,7 +8587,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Empregos, Recrutamento, Candidaturas, Entrevistas de Emprego"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8444,14 +8618,6 @@ msgstr "Blocos nas Tarefas"
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8475,7 +8641,6 @@ msgstr "Atalhos da Web"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8597,7 +8762,7 @@ msgid "Nigeria"
 msgstr "Nigéria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8923,7 +9088,7 @@ msgid "Update Modules List"
 msgstr "Atualizar Lista de Módulos"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8937,7 +9102,7 @@ msgid "eInvoicing"
 msgstr "Faturamento Eletrônico"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8952,7 +9117,7 @@ msgstr ""
 "agora)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "O valor \"%s\" para o campo \"%s. %s\" não está na seleção"
@@ -8967,6 +9132,17 @@ msgstr "Continuar"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -9006,7 +9182,7 @@ msgid "Mexico"
 msgstr "México"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -9034,15 +9210,15 @@ msgstr ""
 "registros são excluídos automaticamente do banco de dados ou não)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Faltando o Servidor SMTP"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nome do anexo"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "O idioma deve estar entre os idiomas conhecidos"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9066,7 +9242,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Nome do mes abreviado."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Você não tem permissão para excluir este documento."
@@ -9078,7 +9254,6 @@ msgstr "Regras não podem ser aplicadas no modelo de regras de registro."
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -9174,7 +9349,7 @@ msgid "Selectable"
 msgstr "Selecionável"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Tudo parece corretamente definido acima!"
@@ -9202,8 +9377,8 @@ msgid "Iteration"
 msgstr "Iteração"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Erro de Usuário"
@@ -9230,7 +9405,7 @@ msgstr ""
 "definido como verdadeiro. Caso contrário, ela é falso."
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9385,7 +9560,7 @@ msgid "Reunion (French)"
 msgstr "Reunião"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9425,8 +9600,8 @@ msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Erro de Acesso"
@@ -9514,7 +9689,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9531,7 +9706,7 @@ msgid "Ukraine"
 msgstr "Ucrânia"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9606,6 +9781,11 @@ msgstr "Estágios"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9704,9 +9884,9 @@ msgid "Custom Shortcuts"
 msgstr "Atalhos Personalizados"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9742,13 +9922,13 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "O módulo \"base\" não pode ser desinstalado"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Registro não pode ser modificado agora"
@@ -9769,7 +9949,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "Você não tem permissão para criar este tipo de documento."
@@ -9817,7 +9997,7 @@ msgid "On Delete"
 msgstr "Ao Apagar"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Modelo %s não existe!"
@@ -9863,6 +10043,7 @@ msgstr "Estados Unidos - plano de contas"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9871,7 +10052,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Identificador de base de dados desconhecido '%s'"
@@ -9893,6 +10074,43 @@ msgstr ""
 "Visão Diagrama\n"
 "\n"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9928,7 +10146,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "id externo"
@@ -9980,6 +10198,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hora (Relógio 12 horas) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -10034,30 +10257,11 @@ msgid "The currency code must be unique per company!"
 msgstr "O código da moeda deve ser único por empresa!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Novo idioma(Modelo de tradução vazio)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-"\n"
-"Trocar Senha\n"
-"==============\n"
-"\n"
-"Permite aos usuários trocar sua senha a partir da pagina de login.\n"
-"Permite ao administrador clicar no botão para requisitar ao usuário que "
-"troque sua senha.\n"
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -10094,7 +10298,7 @@ msgid "Products Expiry Date"
 msgstr "Data de Validade"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Clique em \"Continuar\" Para configurar o próximo addon..."
@@ -10192,6 +10396,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10400,7 +10609,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campanha de marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10413,13 +10622,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Unidade de Intervalo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tipo"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Este método não existe mais"
@@ -10593,7 +10807,7 @@ msgid "To Translate"
 msgstr "Para traduzir"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Ver valores válidos"
@@ -10633,6 +10847,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr "Nome da constraint PostgreSQL ou chave estrangeira(FK)"
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10658,6 +10877,11 @@ msgstr "Adicionar cabeçalho RML"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Texto a ser mostrado no rodapé de todos os relatórios."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL do ícone"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10749,7 +10973,6 @@ msgstr "%m - Número do mês [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Cidade"
@@ -10785,13 +11008,22 @@ msgstr "Portal RH funcionários"
 msgid "Estonian / Eesti keel"
 msgstr "Estonian / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Forneça o nome do campo que o id do registro refere para a operação de "
+"gravação(write). Se vazio, se refere ao id do objeto ativo."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ou versão posterior"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10855,12 +11087,37 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -10868,7 +11125,7 @@ msgstr ""
 "Contacte seu administrador do sistema se você acha que isto é um erro."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10882,6 +11139,8 @@ msgid "Activity"
 msgstr "Atividade"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10900,7 +11159,12 @@ msgid "Parent Company"
 msgstr "Empresa Superior(Pai)"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Autenticação OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10914,15 +11178,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-"Se o modelo de destino necessita do mecanismo de ação, este campo indica o "
-"número de ações que o usuário atual tem para executar."
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -11020,6 +11275,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Gestão de vendas e armazens"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -11092,6 +11367,11 @@ msgstr "Marque se o contato é uma empresa."
 msgid "Sequences Type"
 msgstr "Tipo de Sequências"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -11162,9 +11442,9 @@ msgstr ""
 "Favor desativar o idioma primeiramente."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Permissão negada"
@@ -11182,8 +11462,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Prbolemas na configuracao do 'id do registro' na ação do servidor!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ErroDeValidação"
@@ -11224,13 +11504,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -11241,7 +11520,12 @@ msgid "Office Supplies"
 msgstr "Materiais de escritório"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11272,36 +11556,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11323,6 +11577,11 @@ msgstr "Outro Proprietário"
 msgid "Ecuador"
 msgstr "Equador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11339,16 +11598,6 @@ msgstr "Empregos em contratos"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Você não pode excluir a linguagem de preferida do usuário!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11365,9 +11614,9 @@ msgid "Cascade"
 msgstr "Cascata"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "O Grupo é Obrigatório"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Prospectos, Oportunidades, Ligações Telefônicas"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11394,11 +11643,6 @@ msgstr "Traduzido"
 msgid "Default Company per Object"
 msgstr "Empresa Padrão por Objeto"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Número de ações que o usuário tem para realizar"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11424,7 +11668,7 @@ msgid "Domain"
 msgstr "Domínio"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Use '1' para sim e '0' para não"
@@ -11440,12 +11684,12 @@ msgid "State Name"
 msgstr "Nome do Estado"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "Base de dados invalida(%s) para o campo '%%(field)s'"
@@ -11466,30 +11710,10 @@ msgid "Timezone"
 msgstr "Fuso horário"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11510,7 +11734,7 @@ msgid "Shared"
 msgstr "Compartilhado"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11563,7 +11787,6 @@ msgstr "Validação Dupla em Compras"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Complemento"
 
@@ -11590,6 +11813,7 @@ msgstr ""
 "============================================================\n"
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11675,19 +11899,28 @@ msgid "Related Partner"
 msgstr "Parceiro Relacionado"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Erro de Integridade"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Tamanho de campo nunca pode ser menor que 1!"
@@ -11729,33 +11962,6 @@ msgstr "Diretório de Funcionários"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"Gerenciar solicitações dos clientes.\n"
-"================================================== "
-"==============================\n"
-"Esta aplicação permite-lhe controlar as solicitações e reclamações dos seus "
-"clientes / fornecedores.\n"
-"\n"
-"É totalmente integrado com o gateway de e-mail para que você possa criar\n"
-"novos pedidos automaticamente baseados em e-mails recebidos.\n"
-"    "
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11895,7 +12101,6 @@ msgstr "Instalador de configuração"
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -11988,7 +12193,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Não posso criar contatos sem endereço de email!"
@@ -12038,9 +12243,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Autenticação OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12130,7 +12335,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Falha na entrega do email"
@@ -12157,7 +12362,7 @@ msgid "Object"
 msgstr "Objeto"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12246,7 +12451,7 @@ msgid "Mrs."
 msgstr "Sra."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12261,7 +12466,7 @@ msgid "User Ref."
 msgstr "Ref. Usuário"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr "'%s' não parece ser um campo datetime válido '%%(field)s'"
@@ -12306,8 +12511,6 @@ msgstr "Guia de Referência"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12315,7 +12518,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12348,12 +12551,6 @@ msgstr "Ilhas Falkland"
 msgid "Lebanon"
 msgstr "Líbano"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12462,9 +12659,11 @@ msgid "Selection"
 msgstr "Seleção"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL do ícone"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12500,7 +12699,7 @@ msgid "Action Type"
 msgstr "Tipo de Ação"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12638,11 +12837,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Desmarque o campo Ativo para esconder o contato."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12659,7 +12853,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "O atributo %s é desconhecido em %s "
@@ -12682,7 +12876,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Método get não definido!"
@@ -12723,16 +12917,16 @@ msgstr "Bronze"
 msgid "Payroll Accounting"
 msgstr "Contabilidade da Folha de Pagamentos"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Arquivo Binário ou URL externa"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Alterar senha"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Suriname"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12779,92 +12973,57 @@ msgid "Address Format"
 msgstr "Formato de endereço"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"O Formato de Separador deveria ser como [, n] onde 0 < n: a partir de dígito "
-"de Unidade.-1 terminará a separação. por exemplo. [3,2, -1] representará "
-"106500 para ser 1,06,500; [1,2, -1] representará isto para ser 106,50,0; [3] "
-"representará isto como 106500. Sendo ',' como o separador de milhar em cada "
-"caso."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Procedimentos técnicos"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -13052,6 +13211,11 @@ msgstr ""
 "Ajuda você a gerenciar seu inventário e principais operações de estoque: "
 "ordens de entrega, recebimentos, etc."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -13068,7 +13232,7 @@ msgid "Body"
 msgstr "Conteúdo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Conexão bem sucedida!"
@@ -13119,7 +13283,7 @@ msgid "choose"
 msgstr "Escolher"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13299,13 +13463,15 @@ msgid "Components Buyer"
 msgstr "Comprador de componentes"
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"Confirma a desinstalação deste módulo? Isto apagará de forma permanente "
-"todos os dados armazenados para este módulo!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -13336,12 +13502,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13357,7 +13524,6 @@ msgstr "Registro da Empresa"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Diversos"
@@ -13379,35 +13545,6 @@ msgstr "Técnico"
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Este é o módulo para gerenciar o gráfico contabilidade e impostos para a "
-"Polónia no OpenERP.\n"
-"================================================== "
-"================================\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13484,25 +13621,9 @@ msgid "Bulgaria"
 msgstr "Bulgária"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13530,6 +13651,26 @@ msgstr "5.  %y, %Y  ==> 08, 2008"
 msgid "ltd"
 msgstr "ltda"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13566,6 +13707,7 @@ msgstr "Slovak / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "desconhecido"
@@ -13636,6 +13778,11 @@ msgstr "Agenda de Endereços"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13725,6 +13872,7 @@ msgid "Projects, Tasks"
 msgstr "Projetos, Tarefas"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13737,7 +13885,7 @@ msgid "Information"
 msgstr "Informação"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "falso"
@@ -13768,16 +13916,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Superior direito"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Atualizar Lista de Módulos"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13847,6 +13999,11 @@ msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 "O campo osv_memory pode ser comparado com os operadores = e != apenas."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13919,29 +14076,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identificador externo"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13991,7 +14125,7 @@ msgid "Delivery Costs"
 msgstr "Custos de Entrega"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -14044,9 +14178,9 @@ msgstr ""
 "Desativa o plano de contas mínimo.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Criptografia de senha de DB"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Registro de Regras"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14298,10 +14432,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "não"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14327,63 +14466,14 @@ msgid "System Configuration done"
 msgstr "Configuração do Sistema pronta"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Parâmetros do Sistema"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Ilhas Turks e Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14424,17 +14514,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14472,7 +14551,7 @@ msgid "Low"
 msgstr "Baixo"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Erro ! Você não pode criar menu recursivo."
@@ -14554,11 +14633,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefone"
@@ -14573,6 +14651,11 @@ msgstr "Menu de Acesso"
 msgid "Thailand"
 msgstr "Tailândia"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14593,6 +14676,30 @@ msgstr "Guernsey"
 msgid "Romanian / română"
 msgstr "Romanian / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14631,41 +14738,6 @@ msgstr "Relação de objetos"
 msgid "eInvoicing & Payments"
 msgstr "eFaturamento & Pagamentos"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14726,40 +14798,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14857,6 +14897,21 @@ msgstr "Visão:"
 msgid "View Auto-Load"
 msgstr "Auto-carregar Visão"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14901,34 +14956,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14951,9 +14978,9 @@ msgid "Unmet dependency !"
 msgstr "Dependência não atendida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "Somente Administradores podem desinstalar um módulo"
@@ -14964,7 +14991,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14994,7 +15051,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -15039,7 +15096,7 @@ msgid "Access"
 msgstr "Acesso"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -15072,11 +15129,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -15092,8 +15148,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -15208,7 +15262,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -15220,7 +15274,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Índice de Cores"
 
@@ -15257,7 +15310,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -15268,8 +15321,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaijão"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -15295,11 +15348,6 @@ msgstr "Ilhas Virgens Britânicas"
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre e Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15392,7 +15440,6 @@ msgstr "Treinamentos, Conferências, Reuniões, Exposições, Inscrições"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "País"
@@ -15463,9 +15510,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Espanhol (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Instalar um Módulo"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"O Formato de Separador deveria ser como [, n] onde 0 < n: a partir de dígito "
+"de Unidade.-1 terminará a separação. por exemplo. [3,2, -1] representará "
+"106500 para ser 1,06,500; [1,2, -1] representará isto para ser 106,50,0; [3] "
+"representará isto como 106500. Sendo ',' como o separador de milhar em cada "
+"caso."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15492,7 +15548,7 @@ msgid "Japan"
 msgstr "Japão"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Renomeie uma coluna de cada vez!"
@@ -15553,6 +15609,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Contabilidade - Canadense"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15577,7 +15664,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Repare que esta operação pode durar alguns minutos."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15616,6 +15703,12 @@ msgstr "Execução"
 msgid "Condition"
 msgstr "Condição"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15670,6 +15763,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croácia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Confirma a desinstalação deste módulo? Isto apagará de forma permanente "
+"todos os dados armazenados para este módulo!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15694,6 +15796,11 @@ msgstr "Atualização do Sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15710,7 +15817,7 @@ msgid "Gold"
 msgstr "Ouro"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15731,15 +15838,52 @@ msgstr "Serra Leoa"
 msgid "General Information"
 msgstr "Informações Gerais"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "ID completo"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Ilhas Turks e Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15777,7 +15921,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Aviso de Mudança de Empresa"
@@ -15797,11 +15946,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "O próximo número da sequência será incrementada com este número"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Função"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15839,11 +15992,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Notas Internas"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Entrega"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15871,7 +16019,7 @@ msgid "Workflow Instances"
 msgstr "Instancia do workflow"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Parceiros "
@@ -15882,7 +16030,7 @@ msgid "Is a Company?"
 msgstr "É uma empresa?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15958,7 +16106,6 @@ msgstr "Nome de Exportação"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -16002,6 +16149,9 @@ msgstr "Inscrever-se"
 #~ msgid "SMS - Gateway: clickatell"
 #~ msgstr "SMS - Gateway: clickatell"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nome do Contato"
+
 #~ msgid "E-Mail"
 #~ msgstr "E-mail"
 
@@ -16030,6 +16180,9 @@ msgstr "Inscrever-se"
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Manter em 0 se a ação precisa aparecer em todos os recursos."
 
+#~ msgid "Attached Model"
+#~ msgstr "Modelo anexado"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Nome da Trigger"
 
@@ -16108,6 +16261,9 @@ msgstr "Inscrever-se"
 #~ msgid "res.groups"
 #~ msgstr "res.groups"
 
+#~ msgid "Creator"
+#~ msgstr "Criador"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -16235,6 +16391,9 @@ msgstr "Inscrever-se"
 #~ msgid "Load an Official Translation"
 #~ msgstr "Carregar uma tradução oficial"
 
+#~ msgid "Delivery"
+#~ msgstr "Entrega"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Empresa de serviço Open Source"
 
@@ -16244,6 +16403,9 @@ msgstr "Inscrever-se"
 #~ msgid "Type fields"
 #~ msgstr "Tipos de campos"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Desmarque o campo Ativo para esconder o contato."
+
 #~ msgid "Modules to update"
 #~ msgstr "Módulos para atualizar"
 
@@ -16531,6 +16693,9 @@ msgstr "Inscrever-se"
 #~ msgid "Salesman"
 #~ msgstr "Representante"
 
+#~ msgid "Addresses"
+#~ msgstr "Endereços"
+
 #~ msgid "SMS Send"
 #~ msgstr "Enviar SMS"
 
@@ -16648,6 +16813,9 @@ msgstr "Inscrever-se"
 #~ msgid "Main report file path"
 #~ msgstr "Principal caminho para o relatório"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID do anexo"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Configurar domínio"
 
@@ -17368,6 +17536,9 @@ msgstr "Inscrever-se"
 #~ msgid "Consumers"
 #~ msgstr "Consumidores"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Arquivo Binário ou URL externa"
+
 #~ msgid ""
 #~ "This wizard helps you add a new language to you OpenERP system. After "
 #~ "loading a new language it becomes available as default interface language "
@@ -18600,6 +18771,9 @@ msgstr "Inscrever-se"
 #~ msgid "web calendar"
 #~ msgstr "calendário web"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Criptografia de senha de DB"
+
 #~ msgid "Live Chat Support"
 #~ msgstr "Suporte com Conversa ao Vivo"
 
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index e265e9878d4..7f76c8b1309 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-20 20:38+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 20:35+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\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: 2012-12-21 04:38+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "DataOra"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -222,71 +222,15 @@ msgstr ""
 "ale veniturilor."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"Managementul general OpenERP al Relatiilor cu Clientii\n"
-"=====================================================\n"
-"\n"
-"Aceasta aplicatie permite unui grup de persoane sa gestioneze in mod "
-"inteligent si eficient piste, oportunitati, intalniri si apeluri "
-"telefonice.\n"
-"\n"
-"Gestioneaza sarcini cheie precum comunicarea, identificarea, prioritizarea, "
-"numirea, rezolutia si instiintarea.\n"
-"\n"
-"OpenERP se asigura ca toate cazurile sunt urmarite cu succes de catre "
-"utilizatori, clienti si furnizori. Poate sa trimita automat memento-uri, sa "
-"prioritizeze cererea, sa declanseze metode specifice si multe alte actiuni "
-"pe baza regulilor companiei.\n"
-"\n"
-"Cel mai bun lucru legat de acest sistem este ca utilizatorii nu trebuie sa "
-"faca nimic special. Modulul MRC are un email gateway pentru interfata de "
-"sincronizare intre email-uri si OpenERP. In acest fel, utilizatorii pot pur "
-"si simplu sa trimita email-uri catre programul care tine evidenta "
-"cererilor.\n"
-"\n"
-"OpenERP le va multumi pentru mesaj, directionandu-l automat catre personalul "
-"adecvat si se va asigura ca toata corespondenta viitoare sa ajunga in locul "
-"potrivit.\n"
-"\n"
-"Panoul pentru MRC va include:\n"
-"-------------------------------\n"
-"* Venitul Planificat dupa Etapa si Utilizator (grafic)\n"
-"* Oportunitati dupa Etapa (grafic)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Avertizare!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -297,7 +241,7 @@ msgstr ""
 "personalizat!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Eroare constrangere"
@@ -308,7 +252,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.vizualizare.personalizata"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Nu este permisa redenumirea campului \"%s\""
@@ -319,7 +263,7 @@ msgid "Swaziland"
 msgstr "Swaziland (tara in sudul Africii)"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "creat(a)."
@@ -406,29 +350,6 @@ msgstr "Compania unde se pastreaza inregistrarea actuala"
 msgid "Max. Size"
 msgstr "Dimensiunea maxima"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Adauga informatii suplimentare despre date la comanda de vanzare.\n"
-"===================================================\n"
-"\n"
-"Puteti adauga urmatoarele date suplimentare la o comanda de vanzare:\n"
-"-----------------------------------------------------------\n"
-"    * Data Solicitata\n"
-"    * Data Angajament\n"
-"    * Data Efectiva\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -438,11 +359,6 @@ msgstr ""
 "ID baza de date a inregistrarii de deschis in vizualizare formular, atunci "
 "cand ``modul_vizualizare`` este setat doar pe 'formular'"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Nume Contact"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -522,7 +438,7 @@ msgstr ""
 "facturi la ridicare, OpenERP poate adauga si calcula linia de transport.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -561,6 +477,7 @@ msgstr "Reguli de actiune automata"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Proprietar"
 
@@ -601,7 +518,7 @@ msgstr ""
 "cu directivele permise, afisate atunci cand editati o limba."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -660,7 +577,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilele Olandeze"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -710,9 +627,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Vizualizare Originala"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Idei"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -750,41 +667,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosniaca / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-"\n"
-"Traduceri Automate prin Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"Acest modul va instala programatorul pasiv pentru traduceri automate \n"
-"folosind Gengo API. Pentru a-l activa, trebuie sa\n"
-"1) Va configurati parametrii de autentificare Gengo din `Setari > Companii > "
-"Parametrii Gengo`\n"
-"2) Lansati wizard-ul din `Setari > Termenii Aplicatiei > Gengo: Solicitare "
-"Manuala a Traducerii` si sa urmeze wizard-ul.\n"
-"\n"
-"Acest wizard va activa CRON si Programatorul si va incepe traducerea "
-"automata prin intermediul Serviciilor Gengo pentru toti termenii solicitati "
-"de dumneavoastra.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -795,9 +677,42 @@ msgstr ""
 "acelasi nume de atasament, va readuce raportul anterior."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+"\n"
+"Acest modul va permite sa produceti mai multe produse dintr-o singura "
+"comanda de productie.\n"
+" "
+"============================================================================="
+"\n"
+" \n"
+"Puteti configura produse secundare in lista de materiale.\n"
+" \n"
+"Fara acest modul:\n"
+" --------------------\n"
+"    A + B + C -> D\n"
+" \n"
+"Cu acest modul:\n"
+" -----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -874,14 +789,12 @@ msgstr ""
 "{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Asistenti"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr "Logo Web"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -975,27 +888,21 @@ msgid "Model Description"
 msgstr "Descrierea Modelului"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p clasa=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
-"                Faceti click pentru a adauga un contact in agenda "
-"dumneavoastra.\n"
-"              </p><p>\n"
-"                OpenERP va ajuta sa tineti evidenta cu usurinta a tuturor "
-"activitatilor legate de\n"
-"                un client: discutii, istoricul oportunitatilor de afaceri,\n"
-"                documente, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Meniul pentru Marketing.\n"
+"=======================\n"
+"\n"
+"Contine programul de instalare pentru modulele legate de marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -1030,11 +937,21 @@ msgstr "Declanseaza Expresia"
 msgid "Jordan"
 msgstr "Iordania"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr "Croatia - RRIF 2012 COA"
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Data urmatoarei executii planificate pentru aceasta sarcina."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.vizualizare"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1197,14 +1114,9 @@ msgid "base.language.export"
 msgstr "export.limba.baza"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Furnizeaza numele campului care face referire la id-ul inregistrarii pentru "
-"operatia de scriere. Daca nu este completat, va face referire la id-ul activ "
-"al obiectului."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Noua Guinee"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1224,7 +1136,7 @@ msgid "Email Preferences"
 msgstr "Preferinte email"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' nu pare a fi o data valabila pentru campul '%%(field)s'"
@@ -1244,6 +1156,7 @@ msgstr "Zimbabwe"
 msgid ""
 "Type of the constraint: `f` for a foreign key, `u` for other constraints."
 msgstr ""
+"Tipul constrangerii: `f` pentru o cheie externa, `u` pentru alte constrangeri"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -1274,16 +1187,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spaniola (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1331,7 +1237,7 @@ msgstr "Alte licente OSI aprobate"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Diagrama Gantt Web"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1348,7 +1254,7 @@ msgstr "India"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr "Cerere Tipuri de Referinta"
+msgstr "Tipuri de Referinta Cerere"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
@@ -1358,7 +1264,7 @@ msgstr "Utilizatori Google"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Managementul Parcului Auto"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1383,7 +1289,7 @@ msgstr "Principatul Andorra"
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply for Read"
-msgstr ""
+msgstr "Se aplica pentru Citit"
 
 #. module: base
 #: model:res.country,name:base.mn
@@ -1391,9 +1297,68 @@ msgid "Mongolia"
 msgstr "Mongolia"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.configurare_parametru"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
+"\n"
+"Managementul general OpenERP al Relatiilor cu Clientii\n"
+" ====================================================\n"
+" \n"
+"Aceasta aplicatie permite unui grup de oameni sa gestioneze in mod "
+"inteligent si eficient piste, oportunitati, intalniri si apeluri "
+"telefonice.\n"
+" \n"
+"Gestioneaza sarcini cheie precum comunicarea, identificarea, prioritizarea, "
+"atribuirea, rezolvarea si notificarea.\n"
+" \n"
+"OpenERP se asigura ca toate cazurile sunt urmarite cu succes de catre "
+"utilizatori, clienti si furnizori. Poate sa trimita automat memento-uri, sa "
+"prioritizeze cererea, sa declanseze metode specifice si multe alte actiuni "
+"bazate pe regulile companiei.\n"
+" \n"
+"Cel mai bun lucru referitor la acst sistem este faptul ca utilizatorii nu "
+"trebuie sa faca nimic special. Modulul MRC are o email gateway pentru "
+"interfata de sincronizare intre email-uri si OpenERP. In aces fel, "
+"utilizatorii pot sa trimita pur si simplu email-uri la urmaritorul cererii.\n"
+" \n"
+"OpenERP se va asigura ca le multumeste pentru mesaj, directionandu-l automat "
+"catre personalul adecvat si se va asigura ca toata corespondenta viitoare "
+"ajunge in locul potrivit. \n"
+" \n"
+"\n"
+"Tabloul de bord pentru MRC va include:\n"
+" -------------------------------\n"
+" * Veniturile Planificate dupa Etapa si Utilizator (grafic)\n"
+" * Oportunitati dupa Etapa (grafic)\n"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1409,11 +1374,16 @@ msgstr ""
 "grupuri."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Model document"
+
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr "Schimba parola utilizatorului."
 
 #. module: base
 #: view:res.lang:0
@@ -1441,7 +1411,54 @@ msgid "Username"
 msgstr "Nume de utilizator"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1471,7 +1488,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Testul de conexiune a esuat!"
@@ -1503,14 +1520,12 @@ msgid "South Korea"
 msgstr "Coreea de Sud"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Tranzitii"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Inregistrarea #%d a %s nu a fost gasita, nu se poate copia!"
@@ -1648,7 +1663,7 @@ msgid "Marshall Islands"
 msgstr "Insulele Marshall"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Schimbarea modelului unui camp este interzisa!"
@@ -1670,7 +1685,7 @@ msgid "Search"
 msgstr "Cautati"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1689,7 +1704,14 @@ msgid "Parent Application"
 msgstr "Aplicatie principala"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Asistenti"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operatiune anulata"
@@ -1822,7 +1844,21 @@ msgid "ir.exports"
 msgstr "ir.exporturi"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Nu exista nici o limba cu codul \"%s\""
@@ -1945,7 +1981,7 @@ msgid "On Create"
 msgstr "La creare"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1955,11 +1991,6 @@ msgstr ""
 "Acestea sunt folosite pentru a face referinta la alte date ale modulelor, de "
 "exemplu id_referinta.modul"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -2042,7 +2073,7 @@ msgid "East Timor"
 msgstr "Timorul de Est"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2083,11 +2114,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID-ul atasat"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2105,7 +2131,7 @@ msgstr ""
 "de plata, generarea automata a listelor de produse si altele."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -2146,6 +2172,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Acces Citire"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2222,16 +2253,11 @@ msgid "Create Tasks on SO"
 msgstr "Creare sarcini in CV"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Model Atasat"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2286,7 +2312,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Nu este posibila stergerea utilizatorului root !"
@@ -2316,11 +2342,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -2332,7 +2358,6 @@ msgstr "Sablon al Planului de Conturi"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tipul adresei"
 
@@ -2370,11 +2395,6 @@ msgstr "Calea completa"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Idei"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2512,6 +2532,11 @@ msgstr "Numarul modulelor actualizate"
 msgid "Method"
 msgstr "Metoda"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2545,12 +2570,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2601,6 +2631,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Adauga sau nu antetul RML al companiei"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2654,7 +2693,7 @@ msgstr ""
 "precum  'formular', 'arbore', 'calendar', etc. (Implicit: arbore,formular)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2748,7 +2787,6 @@ msgstr "Republica Democrata Sao Tome si Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -2795,11 +2833,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2926,9 +2959,20 @@ msgid "Default limit for the list view"
 msgstr "Limita implicita pentru Vizualizare Lista"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Noua Guinee"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3006,7 +3050,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -3065,6 +3109,19 @@ msgstr "Aplicatii Camp"
 msgid "Export Translations"
 msgstr "Exporta Traduceri"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3073,7 +3130,7 @@ msgid "Manager"
 msgstr "Manager"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -3159,7 +3216,7 @@ msgid "Inherited"
 msgstr "Mostenit"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -3189,7 +3246,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3256,22 +3313,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Arhitectura Obiect Nevalida!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Eroare!"
@@ -3368,12 +3425,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Eroare! Nu puteti crea companii recursive."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3390,19 +3447,33 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Acesta este modulul pentru gestionarea planului contabil si taxele pentru "
+"Polonia in OpenERP.\n"
+"============================================================================="
+"=====================\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3410,7 +3481,7 @@ msgid "Params storage"
 msgstr "Stocare params"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Modulul '%s' nu poate fi actualizat. Nu este instalat."
@@ -3461,34 +3532,6 @@ msgstr "Parametri de Configurare"
 msgid "Invalid arguments"
 msgstr "Argumente nevalide"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3527,7 +3570,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3539,6 +3582,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Tipul Contului Bancar"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3575,7 +3646,7 @@ msgid "Signal (subflow.*)"
 msgstr "Semnal (subflux.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3615,7 +3686,7 @@ msgid "Access Controls"
 msgstr "Controale Acces"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3645,32 +3716,6 @@ msgstr "Compania Principala"
 msgid "Web Icon File (hover)"
 msgstr "Fisier Pictograma Web (planare)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3690,9 +3735,13 @@ msgstr ""
 "Daca folositi un tip de formula, utilizati o expresie python folosind "
 "variabila 'obiect'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Eroare! Nu puteti crea companii recursive."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Zi de nastere"
 
@@ -3708,7 +3757,7 @@ msgid "Products Manufacturers"
 msgstr "Producatori de produse"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Modul SMTP-over-SSl nu este disponibil"
@@ -3826,7 +3875,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4017,7 +4066,6 @@ msgstr "Raportare"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Titlu"
@@ -4029,13 +4077,18 @@ msgstr ""
 "Daca nu este setat, actioneaza ca valoare predefinita pentru resursele noi"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Recursivitate detectata."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Eroare de recursivitate in dependentele modulelor !"
@@ -4095,9 +4148,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -4108,7 +4162,7 @@ msgid "Company Name"
 msgstr "Numele Companiei"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4129,15 +4183,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (criticat - folositi Raport)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
-"Obiectul codului limbii de traducere trebuie sa fie printre limbile cunoscute"
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Reguli de inregistrare"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre si Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4166,13 +4242,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.traducere"
 
 #. module: base
 #: view:res.lang:0
@@ -4220,19 +4292,7 @@ msgid "Paper Format"
 msgstr "Format hartie"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4252,7 +4312,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4303,7 +4363,7 @@ msgid "Email Gateway"
 msgstr "E-mail Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4324,9 +4384,43 @@ msgid "Technical Data"
 msgstr "Date Tehnice"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.vizualizare"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4382,13 +4476,18 @@ msgstr "Fisa de pontaj Probleme"
 msgid "Ltd"
 msgstr "SRL"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Arhitectura Nevalida!"
@@ -4404,9 +4503,9 @@ msgid "Share any Document"
 msgstr "Partajati orice document"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grup Obligatoriu"
 
 #. module: base
 #: view:res.lang:0
@@ -4467,33 +4566,10 @@ msgid "Languages"
 msgstr "Limbi"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4580,7 +4656,6 @@ msgstr "Constrangere"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Implicit"
 
@@ -4655,6 +4730,11 @@ msgstr ""
 "mail, este folosit cel cu prioritatea cea mai mare. Prioritatea implicita "
 "este 10 (un numar mai mic = prioritate mai mare)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4718,9 +4798,16 @@ msgid "Default value or action reference"
 msgstr "Valoare predefinita sau referinta actiunii"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4800,6 +4887,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4826,6 +4929,43 @@ msgstr ""
 "grupuri. Daca acest camp este necompletat, OpenERP va calcula vizibilitatea "
 "pe baza accesului de citire asociat obiectului."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4856,6 +4996,12 @@ msgstr ""
 msgid "View"
 msgstr "Vizualizare"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4933,12 +5079,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actiuni.raport.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4953,7 +5093,6 @@ msgstr "Elvetia - Contabilitate"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Cod postal"
@@ -4964,13 +5103,18 @@ msgstr "Cod postal"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Setat ca De efectuat"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Reprezentarea adecvata a datei si a orei."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5016,6 +5160,8 @@ msgstr "Directie"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vizualizari"
 
@@ -5031,7 +5177,7 @@ msgid "SMTP Server"
 msgstr "Server SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -5129,7 +5275,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -5217,7 +5368,7 @@ msgid "System Configuration Done"
 msgstr "Configurarea Sistemului Efectuata"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Eroarea a aparut in timpul validarii campului(campurilor) %s: %s"
@@ -5345,6 +5496,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Acces nelimitat"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5358,7 +5514,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5370,7 +5526,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Numai daca acest cont bancar apartine companiei d-voastra"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5402,6 +5558,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungaria"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5566,7 +5733,7 @@ msgid "Account Owner Name"
 msgstr "Numele Titularului contului"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Coloana nu se poate redenumi %s, deoarece acea coloana deja exista!"
@@ -5582,16 +5749,11 @@ msgid "Decimal Separator"
 msgstr "Separator Zecimal"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5638,9 +5800,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Creat de"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Numele modulului trebuie sa fie unic !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5703,15 +5866,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5727,6 +5881,11 @@ msgstr "Lansati Wizard-ul de Configurare"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Nume Atasament"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5810,6 +5969,12 @@ msgstr "Kazahstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Numarul zilei din saptamana [0(Duminica),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Numele resursei"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6064,7 +6229,7 @@ msgid "title"
 msgstr "titlu"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -6121,6 +6286,15 @@ msgstr "Produse"
 msgid "User-defined Defaults"
 msgstr "Valori implicite definite pentru utilizator"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6239,13 +6413,15 @@ msgid "Bank Type"
 msgstr "Tip Banca"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Numele grupului nu poate sa inceapa cu \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplicatii"
 
@@ -6265,7 +6441,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6300,10 +6476,9 @@ msgid "Uncategorized"
 msgstr "Neclasificat"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Numele resursei"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6340,6 +6515,11 @@ msgstr ""
 "semnalul este NUL, nu mai este nevoie de niciun buton pentru a valida "
 "aceasta tranzitie."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Vizualizare Originala"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6350,7 +6530,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6366,26 +6546,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Bancile mele"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6518,11 +6678,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6534,8 +6689,8 @@ msgid "Malaysia"
 msgstr "Malaezia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6647,7 +6802,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Nu exista nicio vizualizare de tipul '%s' definita pentru structura!"
@@ -6687,7 +6842,7 @@ msgid "Created Menus"
 msgstr "Meniuri Create"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6714,9 +6869,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Setat ca De efectuat"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6748,6 +6931,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Anul curent fara secol: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6802,7 +6992,7 @@ msgid "Audit Trail"
 msgstr "Pista de audit"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6894,7 +7084,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6914,31 +7104,6 @@ msgstr "Uneori numit BIC sau Swift."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Acesta este modulul pentru gestionarea planului de conturi pentru Mexic in "
-"OpenERP.\n"
-"============================================================================="
-"===\n"
-"\n"
-"Planul de conturi si localizarea mexican(a).\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6971,10 +7136,10 @@ msgstr "Raport xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Module"
 
@@ -7048,9 +7213,9 @@ msgid "United Kingdom"
 msgstr "Marea Britanie"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_continuturi"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7073,8 +7238,8 @@ msgid "Partner Titles"
 msgstr "Titluri Partener"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -7122,7 +7287,7 @@ msgid "ir.attachment"
 msgstr "ir.atasament"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -7131,11 +7296,6 @@ msgstr ""
 "Nu puteti efectua aceasta operatiune. Crearea unei Inregistrari Noi nu este "
 "permisa pentru acest obiect deoarece acest obiect are scop de raportare."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7245,6 +7405,13 @@ msgstr "Fisierul modul importat cu succes!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Tranzitii"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7343,7 +7510,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Stat federal"
@@ -7444,12 +7610,6 @@ msgstr "Numele Complet"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Numele modulului trebuie sa fie unic !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7493,6 +7653,7 @@ msgstr "In documente multiple"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7550,7 +7711,7 @@ msgid "Connection Security"
 msgstr "Securitatea Conexiunii"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Specificati o actiune de lansare !"
@@ -7570,6 +7731,11 @@ msgstr "Numele categoriei"
 msgid "Northern Mariana Islands"
 msgstr "Insulele Mariane de Nord"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7581,7 +7747,7 @@ msgid "Intrastat Reporting"
 msgstr "Raportare Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7590,6 +7756,11 @@ msgstr ""
 "Va rugam sa folositi asistentul de schimbare a parolei (din Preferinte "
 "Utilizator sau meniul Utilizator) pentru a va schimba parola."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.configurare_parametru"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7620,7 +7791,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Campuri insuficiente pentru Vizualizarea Calendar!"
@@ -7668,7 +7839,6 @@ msgstr "Tranzitie"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7688,30 +7858,30 @@ msgid "Child Categories"
 msgstr "Categorii secundare"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Eroare"
@@ -7799,6 +7969,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Aceasta fereastra"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7884,6 +8059,21 @@ msgstr "Campuri"
 msgid "Employees"
 msgstr "Angajati"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7913,11 +8103,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Test Conexiune"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adrese"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7942,7 +8127,6 @@ msgstr "Optiuni de selectie"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Strada"
@@ -7953,9 +8137,24 @@ msgid "Yugoslavia"
 msgstr "Iugoslavia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Parinte dreapta"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8036,7 +8235,7 @@ msgid "Change My Preferences"
 msgstr "Schimba Preferintele mele"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nume nevalid de model in definirea actiunii."
@@ -8131,21 +8330,27 @@ msgid "US Letter"
 msgstr "Scrisoare SUA"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Meniul pentru Marketing.\n"
-"=======================\n"
-"\n"
-"Contine programul de instalare pentru modulele legate de marketing.\n"
-"    "
+"<p clasa=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"                Faceti click pentru a adauga un contact in agenda "
+"dumneavoastra.\n"
+"              </p><p>\n"
+"                OpenERP va ajuta sa tineti evidenta cu usurinta a tuturor "
+"activitatilor legate de\n"
+"                un client: discutii, istoricul oportunitatilor de afaceri,\n"
+"                documente, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8153,7 +8358,7 @@ msgid "Company Bank Accounts"
 msgstr "Conturi Bancare ale Companiei"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -8165,13 +8370,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Parola optionala pentru autentificarea SMTP-=="
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -8193,12 +8398,13 @@ msgid "Normal Bank Account"
 msgstr "Cont Bancar Obisnuit"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Wizard"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8377,7 +8583,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8409,14 +8615,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "baza.actualizare.traduceri"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Avertizare!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8440,7 +8638,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8559,7 +8756,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8881,7 +9078,7 @@ msgid "Update Modules List"
 msgstr "Actualizati Lista de Module"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8895,7 +9092,7 @@ msgid "eInvoicing"
 msgstr "eFacturare"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8910,7 +9107,7 @@ msgstr ""
 "Anuleaza in Preferintele Utilizatorului)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "Valoarea \"%s\" pentru campul %s.%s\" nu este in selectie"
@@ -8925,6 +9122,17 @@ msgstr "Continuati"
 msgid "Thai / ภาษาไทย"
 msgstr "Tailandeza / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8971,7 +9179,7 @@ msgid "Mexico"
 msgstr "Mexic"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8993,15 +9201,16 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Lipsa Server SMTP"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Nume Atasament"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+"Obiectul codului limbii de traducere trebuie sa fie printre limbile cunoscute"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9025,7 +9234,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Numele prescurtat al lunii."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -9037,7 +9246,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Furnizor"
@@ -9115,7 +9323,7 @@ msgid "Selectable"
 msgstr "Selectabil"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Totul pare configurat corect!"
@@ -9143,8 +9351,8 @@ msgid "Iteration"
 msgstr "Repetare"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "EroareUtilizator"
@@ -9168,7 +9376,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9324,7 +9532,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Franceza)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9365,8 +9573,8 @@ msgid "Solomon Islands"
 msgstr "Insulele Solomon"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "EroareAcces"
@@ -9440,7 +9648,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9457,7 +9665,7 @@ msgid "Ukraine"
 msgstr "Ucraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9520,6 +9728,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamanda (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnameza / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9618,9 +9831,9 @@ msgid "Custom Shortcuts"
 msgstr "Comenzi rapide personalizate"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnameza / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9648,13 +9861,13 @@ msgid "Models"
 msgstr "Modele"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Inregistrarea nu poate fi modificata acum"
@@ -9675,7 +9888,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memorie.autovid"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9723,7 +9936,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Modelul %s nu exista!"
@@ -9769,6 +9982,7 @@ msgstr "Statele Unite - Plan de Conturi"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9777,7 +9991,7 @@ msgid "Cancel"
 msgstr "Anulati"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9796,6 +10010,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9831,7 +10082,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9883,6 +10134,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Ora (12 ore)  [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_continuturi"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9931,23 +10187,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Codul monedei trebuie sa fie unic per companie!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9993,7 +10237,7 @@ msgid "Products Expiry Date"
 msgstr "Data de expirare a Produselor"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Faceti click pe 'Continua' pentru a configura urmatorul addon..."
@@ -10092,6 +10336,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10300,7 +10549,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Campanie de Marketing - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10311,13 +10560,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Interval Unitate"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Fel"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Aceasta metoda nu mai exista"
@@ -10492,7 +10746,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10532,6 +10786,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10559,6 +10818,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Pictograma URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10650,7 +10914,6 @@ msgstr "%m - Numarul lunii [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Oras"
@@ -10686,13 +10949,23 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estoniana / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Furnizeaza numele campului care face referire la id-ul inregistrarii pentru "
+"operatia de scriere. Daca nu este completat, va face referire la id-ul activ "
+"al obiectului."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 sau o versiune ulterioara"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10754,19 +11027,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.traducere"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10780,6 +11078,8 @@ msgid "Activity"
 msgstr "Activitate"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10798,7 +11098,12 @@ msgid "Parent Company"
 msgstr "Compania principala"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Autentificare OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10810,13 +11115,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.server_e-mail"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10914,6 +11212,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10988,6 +11306,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tip Secvente"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -11056,9 +11379,9 @@ msgstr ""
 "Va rugam mai intai sa dezactivati limba."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -11076,8 +11399,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problema la configurarea 'Inregistreaza Id' in Actiunea Serverului!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Eroare de Validare"
@@ -11119,13 +11442,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -11136,7 +11458,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -11179,36 +11506,6 @@ msgstr ""
 " - uid: id utilizator actual\n"
 " - context: contextul actual"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -11232,6 +11529,11 @@ msgstr "Alti Proprietari"
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "flux de lucru"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11248,22 +11550,6 @@ msgstr "Locuri de munca cu Contracte"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Nu puteti sterge limba care este Limba Preferata a Utilizatorului !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"Acesta este modulul pentru gestionarea planului de conturi pentru Venezuela "
-"in OpenERP.\n"
-"===========================================================================\n"
-" \n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11280,9 +11566,9 @@ msgid "Cascade"
 msgstr "In serie"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grup Obligatoriu"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11309,11 +11595,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11339,7 +11620,7 @@ msgid "Domain"
 msgstr "Domeniu"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11355,12 +11636,12 @@ msgid "State Name"
 msgstr "Numele starii"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11381,30 +11662,10 @@ msgid "Timezone"
 msgstr "Fus orar"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actiuni.raport.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11426,7 +11687,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11479,7 +11740,6 @@ msgstr "Validarea Dubla a Achizitiilor"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Strada2"
 
@@ -11503,6 +11763,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11596,19 +11857,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Eroare de Integritate"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "flux de lucru"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Dimensiunea campului nu poate fi niciodata mai mica de 1 !"
@@ -11650,22 +11920,6 @@ msgstr "Director Angajat"
 msgid "Arguments"
 msgstr "Argumente"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11798,7 +12052,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Client"
 
@@ -11888,7 +12141,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11938,9 +12191,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Autentificare OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12044,7 +12297,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Trimiterea e-mail-ului a esuat"
@@ -12071,7 +12324,7 @@ msgid "Object"
 msgstr "Obiect"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -12160,7 +12413,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -12175,7 +12428,7 @@ msgid "User Ref."
 msgstr "Ref. utilizator"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -12220,8 +12473,6 @@ msgstr "Ghidul referintelor"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -12229,7 +12480,7 @@ msgid "Partner"
 msgstr "Partener"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12260,12 +12511,6 @@ msgstr "Insulele Falkland"
 msgid "Lebanon"
 msgstr "Liban"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12375,9 +12620,11 @@ msgid "Selection"
 msgstr "Selectie"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Pictograma URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12413,7 +12660,7 @@ msgid "Action Type"
 msgstr "Tipul actiunii"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12551,11 +12798,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Ora 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Pentru a ascunde contactul, debifati campul activ."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12572,7 +12814,7 @@ msgid "workflow.instance"
 msgstr "instanta.flux_de_lucru"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Atribut necunoscut %s in %s "
@@ -12595,7 +12837,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "metoda de obtinere nedefinita !"
@@ -12636,16 +12878,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Contabilitate Salarizare"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Fisier binar sau URL extern"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Schimbă parola"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12692,91 +12934,57 @@ msgid "Address Format"
 msgstr "Format Adresa"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Formatul Separator ar trebui sa fie ca si [,n] unde 0 < n : incepand cu "
-"Cifra unitatilor. -1 va incheia separarea.De exemplu [3,2,-1] va reprezenta "
-"106500 ca fiind 1,06,500;[1,2,-1] il va reprezenta ca fiind 106,50,0;[3] il "
-"va reprezenta ca fiind 106,500. Dat',' ca separatorul miilor in fiecare caz."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.valori"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Caracteristici Tehnice"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitana (FR, post 1500) / Occitana"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12962,6 +13170,11 @@ msgstr ""
 "Va ajuta sa va gestionati inventarul si operatiunile principale ale "
 "stocului: ordine de livrare, primiri, etc."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.valori"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12978,7 +13191,7 @@ msgid "Body"
 msgstr "Continut"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Testul de conexiune a reusit!"
@@ -13029,7 +13242,7 @@ msgid "choose"
 msgstr "alegeti"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -13209,10 +13422,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13252,12 +13469,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13273,7 +13491,6 @@ msgstr "Registrul Companiei"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Diverse"
@@ -13295,35 +13512,6 @@ msgstr ""
 msgid "China"
 msgstr "China"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Acesta este modulul pentru gestionarea planului contabil si taxele pentru "
-"Polonia in OpenERP.\n"
-"============================================================================="
-"=====================\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13400,25 +13588,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13446,6 +13618,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "SRL"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13482,6 +13674,7 @@ msgstr "Slovaca / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "necunoscut(a)"
@@ -13549,6 +13742,11 @@ msgstr "Agenda"
 msgid "ir.sequence.type"
 msgstr "ir.tip.secventa"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13638,6 +13836,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13650,7 +13849,7 @@ msgid "Information"
 msgstr "Informatii"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13681,16 +13880,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Parinte dreapta"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Actualizati Lista cu Module"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13755,6 +13958,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "Campul osv_memorie poate fi comparat doar cu operatorul = si !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13827,29 +14035,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Identificator extern"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13897,7 +14082,7 @@ msgid "Delivery Costs"
 msgstr "Costuri de livrare"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13948,9 +14133,9 @@ msgstr ""
 "Dezactiveaza planul de conturi minimal.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Codificare Parola DB"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Reguli de inregistrare"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -14198,9 +14383,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14227,63 +14417,14 @@ msgid "System Configuration done"
 msgstr "Configurarea Sistemului este efectuata"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Insulele Turks si Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14324,17 +14465,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14372,7 +14502,7 @@ msgid "Low"
 msgstr "Scazut(a)"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Eroare ! Nu puteti crea un Meniu recursiv."
@@ -14454,11 +14584,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -14473,6 +14602,11 @@ msgstr "Meniu Acces"
 msgid "Thailand"
 msgstr "Tailanda"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14493,6 +14627,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romana"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14531,41 +14689,6 @@ msgstr "Relatia Obiectului"
 msgid "eInvoicing & Payments"
 msgstr "eFacturare & Plati"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14626,40 +14749,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14758,6 +14849,21 @@ msgstr "Vizualizare :"
 msgid "View Auto-Load"
 msgstr "Vizualizare Incarcare Automata"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14800,34 +14906,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persana / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14850,9 +14928,9 @@ msgid "Unmet dependency !"
 msgstr "Dependenta neindeplinita !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14863,7 +14941,37 @@ msgid "base.module.configuration"
 msgstr "configurare.modul.baza"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14889,7 +14997,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14934,7 +15042,7 @@ msgid "Access"
 msgstr "Acces"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14967,11 +15075,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14987,8 +15094,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -15103,7 +15208,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -15116,7 +15221,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Index Culori"
 
@@ -15153,7 +15257,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -15164,8 +15268,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaidjan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Atentionare"
@@ -15191,11 +15295,6 @@ msgstr "Insulele Virgine (Britanice)"
 msgid "Parameters"
 msgstr "Parametri"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre si Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15288,7 +15387,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Tara"
@@ -15359,9 +15457,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spaniola (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Formatul Separator ar trebui sa fie ca si [,n] unde 0 < n : incepand cu "
+"Cifra unitatilor. -1 va incheia separarea.De exemplu [3,2,-1] va reprezenta "
+"106500 ca fiind 1,06,500;[1,2,-1] il va reprezenta ca fiind 106,50,0;[3] il "
+"va reprezenta ca fiind 106,500. Dat',' ca separatorul miilor in fiecare caz."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15388,7 +15494,7 @@ msgid "Japan"
 msgstr "Japonia"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Puteti redenumi o singura coloana pe rand!"
@@ -15449,6 +15555,37 @@ msgstr "ir.actiuni.server"
 msgid "Canada - Accounting"
 msgstr "Canada - Contabilitate"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15473,7 +15610,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Observati ca aceasta operatiune poate dura cateva minute."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15512,6 +15649,12 @@ msgstr "Executare"
 msgid "Condition"
 msgstr "Conditie"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15566,6 +15709,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Croatia"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15590,6 +15740,11 @@ msgstr "Actualizarea Sistemului"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15606,7 +15761,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15627,15 +15782,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Informatii generale"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Insulele Turks si Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15671,7 +15863,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Avertizare Schimbare Companie"
@@ -15691,11 +15888,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Urmatorul numar al secventei va fi marit de acest numar"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Functie"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15733,11 +15934,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Livrare"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15765,7 +15961,7 @@ msgid "Workflow Instances"
 msgstr "Instante Flux de lucru"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Parteneri: "
@@ -15776,7 +15972,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15842,7 +16038,6 @@ msgstr "Nume Export"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -16037,6 +16232,9 @@ msgstr ""
 #~ msgid "XML Identifier"
 #~ msgstr "Identificator XML"
 
+#~ msgid "Addresses"
+#~ msgstr "Adrese"
+
 #~ msgid "Skipped"
 #~ msgstr "Omis"
 
@@ -16105,6 +16303,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Niciodată"
 
+#~ msgid "Delivery"
+#~ msgstr "Livrare"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "Codul BIC/Swift"
 
@@ -16240,6 +16441,9 @@ msgstr ""
 #~ msgid "Workflow On"
 #~ msgstr "Activare Flux de lucru"
 
+#~ msgid "Contact Name"
+#~ msgstr "Nume Contact"
+
 #, python-format
 #~ msgid "The read method is not implemented on this object !"
 #~ msgstr "Metoda 'citeste' nu este implmentată în acest obiect !"
@@ -16296,6 +16500,9 @@ msgstr ""
 #~ "Nu afisati acest jurnal daca apartine aceluiasi obiect la care lucreaza "
 #~ "utilizatorul"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID-ul atasat"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr ""
 #~ "Păstrati valoarea 0 dacă actiunea trebuie să apară în toate resursele."
@@ -16307,6 +16514,9 @@ msgstr ""
 #~ "Specifică mesajul. Puteti utiliza câmpurile obiectului. de ex. 'Stimate [[ "
 #~ "object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Model Atasat"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Configurarea Domeniului"
 
@@ -16710,6 +16920,9 @@ msgstr ""
 #~ "Specificati o valoare numai daca doriti sa schimbati parola utilizatorului. "
 #~ "Acest utilizator va trebui sa se deconecteze si apoi sa se conecteze nou!"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Fisier binar sau URL extern"
+
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr ""
 #~ "Logo-ul dumneavoastra - Folositi o dimensiune de aproximativ 450x150 pixeli."
@@ -18568,6 +18781,23 @@ msgstr ""
 #~ msgid "Hidden"
 #~ msgstr "Ascuns"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Acesta este modulul pentru gestionarea planului de conturi pentru Mexic in "
+#~ "OpenERP.\n"
+#~ "============================================================================="
+#~ "===\n"
+#~ "\n"
+#~ "Planul de conturi si localizarea mexican(a).\n"
+#~ "    "
+
 #~ msgid "Issues Tracker"
 #~ msgstr "Urmarire probleme"
 
@@ -19702,6 +19932,9 @@ msgstr ""
 #~ msgid "Web Chat"
 #~ msgstr "Conversatie pe Internet"
 
+#~ msgid "Creator"
+#~ msgstr "Creat de"
+
 #~ msgid ""
 #~ "The internal user that is in charge of communicating with this partner if "
 #~ "any."
@@ -22335,6 +22568,20 @@ msgstr ""
 #~ msgid "Wood Suppliers"
 #~ msgstr "Furnizori Lemn"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Acesta este modulul pentru gestionarea planului de conturi pentru Venezuela "
+#~ "in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ " \n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
 #~ msgid ""
 #~ "This Module Import SugarCRM \"Leads\", \"Opportunities\", \"Users\", "
 #~ "\"Accounts\", \n"
@@ -22863,6 +23110,9 @@ msgstr ""
 #~ "Ciad, Togo.\n"
 #~ "    "
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Pentru a ascunde contactul, debifati campul activ."
+
 #~ msgid ""
 #~ "\n"
 #~ "This module is used along with OpenERP OpenOffice Plugin.\n"
@@ -23551,6 +23801,9 @@ msgstr ""
 #~ msgid "Check writing"
 #~ msgstr "Verificati scrisul"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Codificare Parola DB"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module provides features to improve the layout of the Sales Order.\n"
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index fe6bcfdc94d..571ad6dc918 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 09:43+0000\n"
 "Last-Translator: Denis Karataev <dskarataev@gmail.com>\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: 2012-12-06 04:38+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "DateTime"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -196,41 +196,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Предупреждение!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -240,7 +214,7 @@ msgstr ""
 "Измените их в коде Python, желательно при помощи стороннего дополнения!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Ошибка ограничения целостности"
@@ -251,7 +225,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Переименование разбросанного поля \"%s\" запрещено"
@@ -262,7 +236,7 @@ msgid "Swaziland"
 msgstr "Свазиленд"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "создан."
@@ -343,20 +317,6 @@ msgstr "Компания для сохранения текущей записи
 msgid "Max. Size"
 msgstr "Макс. размер"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -364,11 +324,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Имя контакта"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -433,7 +388,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -470,6 +425,7 @@ msgstr "Автоматические правила действий"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Владелец"
 
@@ -510,7 +466,7 @@ msgstr ""
 "форматов, отображаемых при редактировании языка."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -568,7 +524,7 @@ msgid "Netherlands Antilles"
 msgstr "Нидерландские Антиллы"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -608,9 +564,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Исходный вид"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Идеи"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -635,26 +591,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Боснийский / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -665,9 +601,25 @@ msgstr ""
 "точно такое же название вложения, появится предыдущий отчёт."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Ангола"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -744,14 +696,12 @@ msgstr ""
 "умолчанию: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Мастера"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Названия пользовательских полей должны начинаться с 'x_'  !"
@@ -815,17 +765,21 @@ msgid "Model Description"
 msgstr "Описание модели"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Меню для маркетинга.\n"
+"====================\n"
+"\n"
+"Содержит установщик для модулей относящихся к маркетингу.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -854,11 +808,21 @@ msgstr "Выражение триггера"
 msgid "Jordan"
 msgstr "Иордания"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Следующая запланированная дата выполнения для данной работы."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -993,13 +957,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Укажите имя поля, где ID записи ссылается на операцию записи. Если это поле "
-"пусто, оно должно ссылаться на активный ID объекта."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Папуа Новая Гвинея"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1017,7 +977,7 @@ msgid "Email Preferences"
 msgstr "Параметры электронной почты"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' не кажется правильной датой для поля '%%(field)s'"
@@ -1066,16 +1026,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Испанский (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Моб. тел."
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1184,9 +1137,38 @@ msgid "Mongolia"
 msgstr "Монголия"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1202,12 +1184,17 @@ msgstr ""
 "группы."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Модель документа"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1234,7 +1221,54 @@ msgid "Username"
 msgstr "Имя пользователя"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1264,7 +1298,7 @@ msgid "Delete Access Right"
 msgstr "Право доступа на удаление"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Проверка соединения завершилась неудачно!"
@@ -1296,14 +1330,12 @@ msgid "South Korea"
 msgstr "Южная Корея"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Переходы состояний"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Запись №%d из %s не найдена, нельзя скопировать !"
@@ -1441,7 +1473,7 @@ msgid "Marshall Islands"
 msgstr "Маршалловы Острова"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Изменение модели поля запрещено!"
@@ -1463,7 +1495,7 @@ msgid "Search"
 msgstr "Найти"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1482,7 +1514,14 @@ msgid "Parent Application"
 msgstr "Материнское приложение"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Мастера"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Операция отменена"
@@ -1614,7 +1653,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Нет языка с кодом \"%s\""
@@ -1735,7 +1788,7 @@ msgid "On Create"
 msgstr "При создании"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1745,11 +1798,6 @@ msgstr ""
 "точки! Они используются для ссылки на данные в других модулях, например, "
 "module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Предложения, заказы продаж, счета"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1832,7 +1880,7 @@ msgid "East Timor"
 msgstr "Восточный Тимор"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1873,11 +1921,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Вложенный ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1895,7 +1938,7 @@ msgstr ""
 "автоматического создания комплектовочных ведомостей и т.д."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1936,6 +1979,11 @@ msgstr "Автомобиль, лизинг, страховка, затраты"
 msgid "Read Access"
 msgstr "Доступ на чтение"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2014,16 +2062,11 @@ msgid "Create Tasks on SO"
 msgstr "Создание задач по заказу на продажу"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "Этот столбец содержит данные модуля и не может быть удален!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Вложенная модель"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2078,7 +2121,7 @@ msgid "Formula"
 msgstr "Формула"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Невозможно удалить суперпользователя!"
@@ -2102,11 +2145,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (копия)"
@@ -2118,7 +2161,6 @@ msgstr "Шаблон плана счетов"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Тип адреса"
 
@@ -2156,11 +2198,6 @@ msgstr "Полный путь"
 msgid "The next step depends on the file format:"
 msgstr "Следующий шаг зависит от формата файла:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Идеи"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2301,6 +2338,11 @@ msgstr "Количество обновленных модулей"
 msgid "Method"
 msgstr "Метод"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2334,13 +2376,18 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 "Не найдено записей для  %(field_type)s '%(value)s' в поле '%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2390,6 +2437,15 @@ msgstr "Белиз"
 msgid "Add or not the corporate RML header"
 msgstr "Добавлять ли корпоративный заголовок RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2443,7 +2499,7 @@ msgstr ""
 "«форма», «дерево», «календарь» и т.д. (По умолчанию: дерево, форма)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Документ был изменен с момента вашего последнего просмотра (%s:%d)"
@@ -2536,7 +2592,6 @@ msgstr "Сан-Томе и Принсипи"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Счет"
 
@@ -2583,11 +2638,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Девиз компании"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2713,9 +2763,20 @@ msgid "Default limit for the list view"
 msgstr "Лимит по умолчанию для вида списка"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Папуа Новая Гвинея"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2796,7 +2857,7 @@ msgstr ""
 "======================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "Найдено несколько полей  '%%(field)s' (%d найдено)"
@@ -2855,6 +2916,19 @@ msgstr "Соответствия полей"
 msgid "Export Translations"
 msgstr "Экспорт переводов"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2863,7 +2937,7 @@ msgid "Manager"
 msgstr "Руководитель"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Извините, вы не можете получить доступ к этому документу."
@@ -2949,7 +3023,7 @@ msgid "Inherited"
 msgstr "Унаследованный"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "да"
@@ -2979,7 +3053,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' не является целым числом для поля '%%(field)s'"
@@ -3046,22 +3120,22 @@ msgid "LinkedIn Integration"
 msgstr "Интеграция с LinkedIn"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Неверная архитектура объекта"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Ошибка !"
@@ -3159,12 +3233,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3183,19 +3257,31 @@ msgstr ""
 "статистическим отчетам ."
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль обслуживает в OpenERP план счетов и налогов для Польши.\n"
+"===================================================================\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3203,7 +3289,7 @@ msgid "Params storage"
 msgstr "Хранилище параметров"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Невозможно обновить модуль '%s'. Он не установлен."
@@ -3254,34 +3340,6 @@ msgstr "Конфигурационные параметры:"
 msgid "Invalid arguments"
 msgstr "Неправильные параметры"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3320,7 +3378,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Отсутствует документ(ы)"
@@ -3332,6 +3390,34 @@ msgstr "Отсутствует документ(ы)"
 msgid "Bank Account Type"
 msgstr "Тип банковского счета"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3370,7 +3456,7 @@ msgid "Signal (subflow.*)"
 msgstr "Сигнал (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3409,7 +3495,7 @@ msgid "Access Controls"
 msgstr "Управление доступом"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3439,32 +3525,6 @@ msgstr "Головная компания"
 msgid "Web Icon File (hover)"
 msgstr "Файл значка для Web (наведение)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3484,9 +3544,13 @@ msgstr ""
 "Если Вы используете формулу, используйте выражения языка Python с переменной "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Дата рождения"
 
@@ -3502,7 +3566,7 @@ msgid "Products Manufacturers"
 msgstr "Производители товаров"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "Режим SMTP-over-SSL недоступен"
@@ -3612,7 +3676,7 @@ msgid "Malta"
 msgstr "Мальта"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3804,7 +3868,6 @@ msgstr "Отчетность"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Название"
@@ -3817,13 +3880,18 @@ msgstr ""
 "ресурсов"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Обнаружена рекурсия."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Ошибка рекурсии в зависимостях модулей!"
@@ -3883,9 +3951,10 @@ msgid "Urdu / اردو"
 msgstr "Урду / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Доступ запрещён"
@@ -3896,7 +3965,7 @@ msgid "Company Name"
 msgstr "Название компании"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3917,14 +3986,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (устаревший - используйте Отчет)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Код языка перевода должен быть в списке известных языков"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Ограничение доступа"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Сен-Пьер и Микелон"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3953,17 +4045,9 @@ msgid "Jersey"
 msgstr "Джерси"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Анонимный доступ к OpenERP.\n"
-"===========================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4011,19 +4095,7 @@ msgid "Paper Format"
 msgstr "Формат листа"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4043,7 +4115,7 @@ msgid "Nauru"
 msgstr "Науру"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4088,7 +4160,7 @@ msgid "Email Gateway"
 msgstr "Шлюз эл.почты"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4109,9 +4181,43 @@ msgid "Technical Data"
 msgstr "Технические данные"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4167,13 +4273,18 @@ msgstr "Табель по проблемам"
 msgid "Ltd"
 msgstr "ООО"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "Штрих-код 13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Неверная Архитектура!"
@@ -4189,9 +4300,9 @@ msgid "Share any Document"
 msgstr "Совместный доступ к любым документам"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Кандидаты, предложения, телефонные звонки"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Требуется группа"
 
 #. module: base
 #: view:res.lang:0
@@ -4252,33 +4363,10 @@ msgid "Languages"
 msgstr "Языки"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Искл. ИЛИ"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4363,7 +4451,6 @@ msgstr "Ограничение"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -4438,6 +4525,11 @@ msgstr ""
 "которого высший приоритет. Приоритет по умолчанию - 10 (меньше номер = выше "
 "приоритет)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4501,9 +4593,16 @@ msgid "Default value or action reference"
 msgstr "Значение по умолчанию или ссылка на действие"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Суринам"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4583,6 +4682,22 @@ msgstr "Загрузить перевод"
 msgid "Installed Version"
 msgstr "Установленная версия"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4609,6 +4724,43 @@ msgstr ""
 "это поле пустое, OpenERP вычислит видимость на основе прав на просмотр "
 "связанных объектов."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4638,6 +4790,12 @@ msgstr ""
 msgid "View"
 msgstr "Вид"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "нет"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4715,12 +4873,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4735,7 +4887,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Индекс"
@@ -4746,13 +4897,18 @@ msgstr "Индекс"
 msgid "Author"
 msgstr "Автор"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Установить как дело"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Подходящий формат даты и времени."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4799,6 +4955,8 @@ msgstr "Направление"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Виды"
 
@@ -4814,7 +4972,7 @@ msgid "SMTP Server"
 msgstr "SMTP сервер"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Вы пытаетесь удалить модуль, который установлен или будет установлен"
@@ -4910,7 +5068,12 @@ msgid "Google Docs integration"
 msgstr "Интеграция Google Docs"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "имя"
@@ -4998,7 +5161,7 @@ msgid "System Configuration Done"
 msgstr "Настройка системы выполнена"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Произошла ошибка при проверке поля(ей)  %s: %s"
@@ -5126,6 +5289,11 @@ msgstr "Маврикий"
 msgid "Full Access"
 msgstr "Полный доступ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5139,7 +5307,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Изменение системы хранения для поля \"%s\" не допускается."
@@ -5150,7 +5318,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Только если этот банковский счет принадлежит вашей компании"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "Неизвестное суб-поле '%s'"
@@ -5182,6 +5350,17 @@ msgstr "Сенегал"
 msgid "Hungary"
 msgstr "Венгрия"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5345,7 +5524,7 @@ msgid "Account Owner Name"
 msgstr "Имя владельца счета"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Нельзя переименовать столбец в %s, потому что он уже существует !"
@@ -5361,16 +5540,11 @@ msgid "Decimal Separator"
 msgstr "Десятичный разделитель"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "Отсутствие требуемого значения для поля '%s'."
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5417,9 +5591,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "Дополнительная модель, в основном используется для needactions."
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Автор"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Название модуля должно быть уникальным !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5482,15 +5657,6 @@ msgstr "Венесуэла"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5506,6 +5672,11 @@ msgstr "Мастер настройки ланчей"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "Производственные заказы, ведомость материалов, маршрутизация"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Название вложения"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5589,6 +5760,12 @@ msgstr "Казахстан"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - номер дня недели [0(воскресенье),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Название объекта"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5846,7 +6023,7 @@ msgid "title"
 msgstr "Обращение"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "истина"
@@ -5903,6 +6080,15 @@ msgstr "Продукция"
 msgid "User-defined Defaults"
 msgstr "Значения по умолчанию, определённые пользователем"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6020,13 +6206,15 @@ msgid "Bank Type"
 msgstr "Тип банка"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Название группы не может начинаться с \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Приложения"
 
@@ -6046,7 +6234,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Гуджарати / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6081,10 +6269,9 @@ msgid "Uncategorized"
 msgstr "Без категории"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Название объекта"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6120,6 +6307,11 @@ msgstr ""
 "проверяет имя нажатой кнопки. Если сигнал имеет значение NULL — кнопка для "
 "подтверждения перехода не требуется."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Исходный вид"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6130,7 +6322,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' не является числом для поля '%%(field)s'"
@@ -6148,26 +6340,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Мои банки"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6300,11 +6472,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Переустановить пароль"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6316,8 +6483,8 @@ msgid "Malaysia"
 msgstr "Малайзия"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "Приращение не должны быть равным нулю."
@@ -6428,7 +6595,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Представление типа '%s' не определено для этой структуры!"
@@ -6468,7 +6635,7 @@ msgid "Created Menus"
 msgstr "Созданные меню"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6495,9 +6662,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Установить как дело"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6529,6 +6724,13 @@ msgstr "Кюрасао"
 msgid "Current Year without Century: %(y)s"
 msgstr "Текущий год без века: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "Параметры системы"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6581,7 +6783,7 @@ msgid "Audit Trail"
 msgstr "Проведение аудита"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6673,7 +6875,7 @@ msgid "Israel"
 msgstr "Израиль"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "Не могут дублировать конфигурацию !"
@@ -6693,23 +6895,6 @@ msgstr "Иногда называемый БИК или Swift."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Моб. тел."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6742,10 +6927,10 @@ msgstr "Отчет xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Модули"
 
@@ -6819,9 +7004,9 @@ msgid "United Kingdom"
 msgstr "Великобритания"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6844,8 +7029,8 @@ msgid "Partner Titles"
 msgstr "Организационные формы"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "Используйте формат '%s'"
@@ -6893,7 +7078,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6902,11 +7087,6 @@ msgstr ""
 "Вы не можете выполнить это действие. Создание новых записей не разрешено для "
 "этого объекта. Это объект для отчетов."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Анонимный"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7015,6 +7195,13 @@ msgstr "Файл модуля успешно импортирован !"
 msgid "Model Constraints"
 msgstr "Ограничения модели"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Переходы состояний"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7112,7 +7299,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Область"
@@ -7213,12 +7399,6 @@ msgstr "Полное название"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7262,6 +7442,7 @@ msgstr "На несколько док."
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7319,7 +7500,7 @@ msgid "Connection Security"
 msgstr "Безопасность Соединения"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Пожалуйста, укажите действие для запуска!"
@@ -7339,6 +7520,11 @@ msgstr "Название категории"
 msgid "Northern Mariana Islands"
 msgstr "Северные Марианские острова"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7350,7 +7536,7 @@ msgid "Intrastat Reporting"
 msgstr "Отчётность Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7359,6 +7545,11 @@ msgstr ""
 "Пожалуйста, используйте Мастер изменения пароля (в настройках пользователя "
 "или в меню пользователя), чтобы изменить свой пароль."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7389,7 +7580,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Недостаточно полей для режима Календаря!"
@@ -7437,7 +7628,6 @@ msgstr "Переход"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7457,30 +7647,30 @@ msgid "Child Categories"
 msgstr "Подчиненные категории"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Ошибка"
@@ -7573,6 +7763,11 @@ msgstr "Определение правила (ограничение)"
 msgid "This Window"
 msgstr "Данное окно"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7658,6 +7853,21 @@ msgstr "Поля"
 msgid "Employees"
 msgstr "Сотрудники"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7687,11 +7897,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Проверка подключения"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Адреса"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7716,7 +7921,6 @@ msgstr "Варианты выбора"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Улица"
@@ -7727,9 +7931,24 @@ msgid "Yugoslavia"
 msgstr "Югославия"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Родитель справа"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7810,7 +8029,7 @@ msgid "Change My Preferences"
 msgstr "Изменить мои предпочтения"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Недопустимое имя модели в определении действия"
@@ -7897,21 +8116,17 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Меню для маркетинга.\n"
-"====================\n"
-"\n"
-"Содержит установщик для модулей относящихся к маркетингу.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7919,7 +8134,7 @@ msgid "Company Bank Accounts"
 msgstr "Банковские счета организации"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7931,13 +8146,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Пароль для SMTP авторизации (опционально)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "К сожалению, вы не можете изменять этот документ ."
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7959,12 +8174,13 @@ msgid "Normal Bank Account"
 msgstr "Обычный банковский счёт"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Мастер"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "идентификатор базы данных"
@@ -8146,7 +8362,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "Вакансии , подбор персонала , приложения, собеседования"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8178,14 +8394,6 @@ msgstr "Планшет по задачам"
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Предупреждение!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8209,7 +8417,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8329,7 +8536,7 @@ msgid "Nigeria"
 msgstr "Нигерия"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Для полей выбора должны быть предоставлены варианты выбора!"
@@ -8652,7 +8859,7 @@ msgid "Update Modules List"
 msgstr "Обновить список модулей"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8666,7 +8873,7 @@ msgid "eInvoicing"
 msgstr "Эл. выставление счетов"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8681,7 +8888,7 @@ msgstr ""
 "пользователя)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "Значения \"%s\" для поля \"%s.%s\" нет в выборке"
@@ -8696,6 +8903,17 @@ msgstr "Далее"
 msgid "Thai / ภาษาไทย"
 msgstr "Тайский"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8735,7 +8953,7 @@ msgid "Mexico"
 msgstr "Мексика"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8763,15 +8981,15 @@ msgstr ""
 "автоматически удаляются из базы данных или нет)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Отсутствие SMTP сервера"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Название вложения"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Код языка перевода должен быть в списке известных языков"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8795,7 +9013,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Краткое название месяца."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Извините, вы не можете удалить этот документ."
@@ -8807,7 +9025,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Поставщик"
@@ -8885,7 +9102,7 @@ msgid "Selectable"
 msgstr "Выделяемый"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Кажется, все настроено правильно!"
@@ -8913,8 +9130,8 @@ msgid "Iteration"
 msgstr "Повтор"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "UserError"
@@ -8938,7 +9155,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9087,7 +9304,7 @@ msgid "Reunion (French)"
 msgstr "Реюньон (заморский регион Франции)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9128,8 +9345,8 @@ msgid "Solomon Islands"
 msgstr "Соломоновы Острова"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Ошибка доступа"
@@ -9203,7 +9420,7 @@ msgid "Prof."
 msgstr "Проф."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9220,7 +9437,7 @@ msgid "Ukraine"
 msgstr "Украина"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9283,6 +9500,11 @@ msgstr "Этапы"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Фламандский (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Вьетнамский / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9381,9 +9603,9 @@ msgid "Custom Shortcuts"
 msgstr "Пользовательские закладки"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Вьетнамский / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9411,13 +9633,13 @@ msgid "Models"
 msgstr "Модели"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "Базовый модуль нельзя удалить"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Запись не может быть изменена прямо сейчас"
@@ -9438,7 +9660,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "К сожалению, вы не можете создать такой документ."
@@ -9486,7 +9708,7 @@ msgid "On Delete"
 msgstr "При удалении"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Модель %s не существует !"
@@ -9532,6 +9754,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9540,7 +9763,7 @@ msgid "Cancel"
 msgstr "Отмена"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Неизвестный идентификатор базы данных '%s'"
@@ -9559,6 +9782,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9594,7 +9854,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "внешний ID"
@@ -9646,6 +9906,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - часы [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9694,23 +9959,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Код валюты должен быть уникальным в компании!"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "Новый язык ( шаблон пустого перевода)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9756,7 +10009,7 @@ msgid "Products Expiry Date"
 msgstr "Срок годности товара"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Нажмите 'Продолжить' для настройки следующего модуля..."
@@ -9855,6 +10108,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10063,7 +10321,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Маркетинговая кампания - Демонстрация"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10074,13 +10332,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Ед. изм. интервала"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Тип"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Данный метод более не существует"
@@ -10256,7 +10519,7 @@ msgid "To Translate"
 msgstr "Для перевода"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "Смотри все возможные значения"
@@ -10296,6 +10559,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10322,6 +10590,11 @@ msgstr "Добавить заголовок RML"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Нижний колонтитул отображается в нижней части всех отчетов."
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL иконки"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10413,7 +10686,6 @@ msgstr "%m - номер месяца [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Город"
@@ -10449,13 +10721,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Эстонский / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Укажите имя поля, где ID записи ссылается на операцию записи. Если это поле "
+"пусто, оно должно ссылаться на активный ID объекта."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL версии 3 или позже"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10516,12 +10797,37 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -10530,7 +10836,7 @@ msgstr ""
 "что это ошибка."
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10544,6 +10850,8 @@ msgid "Activity"
 msgstr "Действие"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10562,7 +10870,12 @@ msgid "Parent Company"
 msgstr "Родительская компания"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "Авторизация OpenID"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10576,13 +10889,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10674,6 +10980,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr "Продаж и управление складом"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10748,6 +11074,11 @@ msgstr "Отметьте, если это компания, иначе част
 msgid "Sequences Type"
 msgstr "Тип нумерации"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10816,9 +11147,9 @@ msgstr ""
 "Сначала сделайте его не активным."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Доступ запрещён"
@@ -10836,8 +11167,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Проблемы в конфигурации `Record Id` в серверном действии!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10878,13 +11209,12 @@ msgid "Laos"
 msgstr "Лаос"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Эл. почта"
@@ -10895,7 +11225,12 @@ msgid "Office Supplies"
 msgstr "Канцтовары"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10937,36 +11272,6 @@ msgstr ""
 " - uid: ID текущего пользователя\n"
 " - context: текущий контекст"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10989,6 +11294,11 @@ msgstr "Другой проприетарный"
 msgid "Ecuador"
 msgstr "Эквадор"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "рабочий процесс"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -11006,16 +11316,6 @@ msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 "Невозможно удалить язык, установленный как предпочитаемый пользователем!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -11032,9 +11332,9 @@ msgid "Cascade"
 msgstr "Каскадом"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Требуется группа"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Кандидаты, предложения, телефонные звонки"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11061,11 +11361,6 @@ msgstr "Переведено"
 msgid "Default Company per Object"
 msgstr "Компании по умолчанию для объекта"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "Количество действий которые пользователь должен выполнить"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11091,7 +11386,7 @@ msgid "Domain"
 msgstr "Ограничение"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "Используйте '1 ' - да, и '0' для не"
@@ -11107,12 +11402,12 @@ msgid "State Name"
 msgstr "Название области"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "Неверный идентификатор базы данных '%s' для поля '%%(field)s'"
@@ -11133,30 +11428,10 @@ msgid "Timezone"
 msgstr "Часовой пояс"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11176,7 +11451,7 @@ msgid "Shared"
 msgstr "Общие"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11229,7 +11504,6 @@ msgstr "Двойное подтверждение по закупкам"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Улица (2-я строка)"
 
@@ -11253,6 +11527,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11347,19 +11622,28 @@ msgid "Related Partner"
 msgstr "Связанный партнер"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Ошибка целостности"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "рабочий процесс"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Размер поля никогда не может быть меньше 1 !"
@@ -11401,22 +11685,6 @@ msgstr "Каталог работника"
 msgid "Arguments"
 msgstr "Аргументы"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11549,7 +11817,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Заказчик"
 
@@ -11639,7 +11906,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "Не удалось создать контакт без адреса электронной почты !"
@@ -11689,9 +11956,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "Авторизация OpenID"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11791,7 +12058,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Доставка почты не удалось"
@@ -11818,7 +12085,7 @@ msgid "Object"
 msgstr "Объект"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11907,7 +12174,7 @@ msgid "Mrs."
 msgstr "Г-жа"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11922,7 +12189,7 @@ msgid "User Ref."
 msgstr "Ссылка на пользователя"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr "'%s' не является правильной датой/временем для поля '%%(field)s'"
@@ -11967,8 +12234,6 @@ msgstr "Описание"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11976,7 +12241,7 @@ msgid "Partner"
 msgstr "Контрагент"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -12007,12 +12272,6 @@ msgstr "Фолклендские (Мальвинские) острова"
 msgid "Lebanon"
 msgstr "Ливан"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Искл. ИЛИ"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12121,9 +12380,11 @@ msgid "Selection"
 msgstr "Выбор"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL иконки"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12159,7 +12420,7 @@ msgid "Action Type"
 msgstr "Тип действия"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12297,11 +12558,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Час 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Снимите флажок, чтобы скрыть контакт."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12318,7 +12574,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Неизвестный атрибут %s в %s "
@@ -12341,7 +12597,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "не определен метод 'get'!"
@@ -12382,16 +12638,16 @@ msgstr "Бронза"
 msgid "Payroll Accounting"
 msgstr "Учёт заработной платы"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Двоичный файл или внешний URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Сменить пароль"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Суринам"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12438,91 +12694,57 @@ msgid "Address Format"
 msgstr "Формат адреса"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Формат разделителя должен иметь вид [,n] где 0 < n : начиная с разряда "
-"единиц. -1 завершает разделение. Например, [3,2,-1] представит число 106500 "
-"в виде 1,06,500; [1,2,-1] представит его в виде 106,50,0; [3] представит вид "
-"106,500. В каждом случае ',' используется для разделения разрядов."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "Значения"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Технические характеристики"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Окситанский (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12708,6 +12930,11 @@ msgstr ""
 "Помогает управлять инвентаризацией и основными складскими операциями : "
 "заказами доставки, получениями и т.д."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "Значения"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12724,7 +12951,7 @@ msgid "Body"
 msgstr "Содержимое"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Проверка соединения удалось!"
@@ -12775,7 +13002,7 @@ msgid "choose"
 msgstr "выбрать"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12955,13 +13182,15 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"Вы подтверждаете удаление этого модуля ? Все данные, сохраненные модулем, "
-"будут утеряны!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -12999,12 +13228,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -13020,7 +13250,6 @@ msgstr "Регистрация компании"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Прочее"
@@ -13042,33 +13271,6 @@ msgstr "Технический"
 msgid "China"
 msgstr "Китай"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Этот модуль обслуживает в OpenERP план счетов и налогов для Польши.\n"
-"===================================================================\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13144,25 +13346,9 @@ msgid "Bulgaria"
 msgstr "Болгария"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Ангола"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13190,6 +13376,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "ООО"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13226,6 +13432,7 @@ msgstr "Словенский / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "неизвестен"
@@ -13293,6 +13500,11 @@ msgstr "Адресная книга"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13382,6 +13594,7 @@ msgid "Projects, Tasks"
 msgstr "Проекты , Задачи"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13394,7 +13607,7 @@ msgid "Information"
 msgstr "Информация"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "ложь"
@@ -13425,16 +13638,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Родитель справа"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Обновить список модулей"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13500,6 +13717,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "Поле osv_memory можно сравнивать только с помощью операторов = и !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13572,29 +13794,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Внешний идентификатор"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13643,7 +13842,7 @@ msgid "Delivery Costs"
 msgstr "Стоимость доставки"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13694,9 +13893,9 @@ msgstr ""
 "Деактивирует минимальный план счетов.\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Шифрование пароля БД"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Ограничение доступа"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13944,10 +14143,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "нет"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -13973,63 +14177,14 @@ msgid "System Configuration done"
 msgstr "Конфигурация системы завершена"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "Параметры системы"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Острова Тёркс и Кайкос"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14070,17 +14225,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14118,7 +14262,7 @@ msgid "Low"
 msgstr "Низкий"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Ошибка ! Нельзя создать зацикленные меню."
@@ -14200,11 +14344,10 @@ msgid "El Salvador"
 msgstr "Эль Сальвадор"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Телефон"
@@ -14219,6 +14362,11 @@ msgstr "Меню доступа"
 msgid "Thailand"
 msgstr "Таиланд"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14239,6 +14387,30 @@ msgstr "Гернси"
 msgid "Romanian / română"
 msgstr "Румынский / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14277,41 +14449,6 @@ msgstr "Отношение объекта"
 msgid "eInvoicing & Payments"
 msgstr "Эл. счета и платежи"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14372,40 +14509,8 @@ msgid "Apply for Write"
 msgstr "Применить для записи"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14503,6 +14608,21 @@ msgstr "Вид :"
 msgid "View Auto-Load"
 msgstr "Автозагрузка вида"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14547,34 +14667,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Персидский / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14597,9 +14689,9 @@ msgid "Unmet dependency !"
 msgstr "Не удовлетворенная зависимость !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "Для удаления модуля нужны права администратора"
@@ -14610,7 +14702,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14640,7 +14762,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14685,7 +14807,7 @@ msgid "Access"
 msgstr "Доступ"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14718,11 +14840,10 @@ msgid "Bahrain"
 msgstr "Бахрейн"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Факс"
@@ -14738,8 +14859,6 @@ msgstr "Факс"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14854,7 +14973,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "Поле последовательности `%s` не найдено для поля распределения `%s`!"
@@ -14866,7 +14985,6 @@ msgstr "Ямайка"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Цветовая палитра"
 
@@ -14903,7 +15021,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14914,8 +15032,8 @@ msgid "Azerbaijan"
 msgstr "Азербайджан"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Внимание"
@@ -14941,11 +15059,6 @@ msgstr "Виргинские острова (Великобритания)"
 msgid "Parameters"
 msgstr "Параметры"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Сен-Пьер и Микелон"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -15037,7 +15150,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Страна"
@@ -15108,9 +15220,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Испанский (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "Установка модуля"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"Формат разделителя должен иметь вид [,n] где 0 < n : начиная с разряда "
+"единиц. -1 завершает разделение. Например, [3,2,-1] представит число 106500 "
+"в виде 1,06,500; [1,2,-1] представит его в виде 106,50,0; [3] представит вид "
+"106,500. В каждом случае ',' используется для разделения разрядов."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15137,7 +15257,7 @@ msgid "Japan"
 msgstr "Япония"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Можно переименовать только одну колонку за один раз !"
@@ -15198,6 +15318,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15222,7 +15373,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Учтите, что эта операция может занять несколько минут."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15261,6 +15412,12 @@ msgstr "Выполнение"
 msgid "Condition"
 msgstr "Условие"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15315,6 +15472,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Хорватия"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Вы подтверждаете удаление этого модуля ? Все данные, сохраненные модулем, "
+"будут утеряны!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15339,6 +15505,11 @@ msgstr "Обновление системы"
 msgid "SXW Content"
 msgstr "Содержание SWX"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15355,7 +15526,7 @@ msgid "Gold"
 msgstr "Золотой"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15376,15 +15547,52 @@ msgstr "Сьерра-Леоне"
 msgid "General Information"
 msgstr "Общая информация"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "Полный ID"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Острова Тёркс и Кайкос"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15420,7 +15628,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Предупреждение о смене компании"
@@ -15440,11 +15653,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Следующее число в нумерации будет увеличено на это число"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Функция"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15482,11 +15699,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "Внутренние примечания"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Доставка"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15514,7 +15726,7 @@ msgid "Workflow Instances"
 msgstr "Последовательности действий"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Контрагенты: "
@@ -15525,7 +15737,7 @@ msgid "Is a Company?"
 msgstr "Это компания ?"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15591,7 +15803,6 @@ msgstr "Имя для экспорта"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15638,6 +15849,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Во множественных документах"
 
+#~ msgid "Contact Name"
+#~ msgstr "Имя контакта"
+
 #~ msgid "E-Mail"
 #~ msgstr "Эл. почта"
 
@@ -15756,6 +15970,9 @@ msgstr ""
 #~ msgid "Rounding factor"
 #~ msgstr "Фактор округления"
 
+#~ msgid "Delivery"
+#~ msgstr "Доставка"
+
 #~ msgid "Report Header"
 #~ msgstr "Заголовок отчета"
 
@@ -15954,6 +16171,9 @@ msgstr ""
 #~ msgid "res.groups"
 #~ msgstr "res.groups"
 
+#~ msgid "Creator"
+#~ msgstr "Автор"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -16051,6 +16271,9 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Загрузить официальный перевод"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Снимите флажок, чтобы скрыть контакт."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Демократическая республика Конго"
 
@@ -16118,6 +16341,12 @@ msgstr ""
 #~ msgid "Request Date"
 #~ msgstr "Дата запроса"
 
+#~ msgid "Attached ID"
+#~ msgstr "Вложенный ID"
+
+#~ msgid "Attached Model"
+#~ msgstr "Вложенная модель"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Настройка доступа"
 
@@ -16226,6 +16455,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Адреса"
+
 #~ msgid "My Logs"
 #~ msgstr "Мои логи"
 
@@ -16299,6 +16531,9 @@ msgstr ""
 #~ msgid "Audit"
 #~ msgstr "Аудит"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Двоичный файл или внешний URL"
+
 #~ msgid "Consumers"
 #~ msgstr "Потребители"
 
@@ -18288,6 +18523,9 @@ msgstr ""
 #~ msgid "Check writing"
 #~ msgstr "Проверьте написание"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Шифрование пароля БД"
+
 #~ msgid ""
 #~ "\n"
 #~ "        OpenERP Web process view.\n"
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index d40db6b5e75..fcfda4d730a 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:39+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:00+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "DateTime"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr "Svazijsko"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr "Spoločnosť na uloženie aktuálneho záznamu"
 msgid "Max. Size"
 msgstr "Max. veľkosť"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Meno kontaktu"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Vlastník"
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr "Holandské Antily"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -580,9 +536,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Pôvodný pohľad"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -607,26 +563,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosniačtina / banski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -637,9 +573,25 @@ msgstr ""
 "predchádzajúci výkaz."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -714,14 +666,12 @@ msgid ""
 msgstr "Kontextové asociatívne pole ako výraz Python, predvolene prázne {}"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Sprievodcovia"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Vlastné pole musí mať meno, ktoré začína 'x_'!"
@@ -785,16 +735,14 @@ msgid "Model Description"
 msgstr "Popis modelu"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -824,11 +772,21 @@ msgstr "Výraz spúštača"
 msgid "Jordan"
 msgstr "Jordánsko"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -960,13 +918,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Zadajte meno pola na ktoré bude odkazovať id záznamu pri zápise. Ak je "
-"prázdne, bude odkazovať na aktívne id objektu."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nová Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -984,7 +938,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1033,16 +987,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Španielčina (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1139,9 +1086,38 @@ msgid "Mongolia"
 msgstr "Mongolsko"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1155,12 +1131,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1187,7 +1168,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1215,7 +1243,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1247,14 +1275,12 @@ msgid "South Korea"
 msgstr "Južná Kórea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Prechody"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1392,7 +1418,7 @@ msgid "Marshall Islands"
 msgstr "Maršalové ostrovy"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1414,7 +1440,7 @@ msgid "Search"
 msgstr "Hľadanie"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1429,7 +1455,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Sprievodcovia"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1557,7 +1590,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Neexistuje jazyk s kódom \"%s\""
@@ -1675,7 +1722,7 @@ msgid "On Create"
 msgstr "Pri vytvorení"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1684,11 +1731,6 @@ msgstr ""
 "'%s' obsahuje príliš veľa bodiek. XML id by nemal obsahovať bodky! Bodky sú "
 "použité na odkazovanie údajov iných modulov, ako v module.refenrece_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1771,7 +1813,7 @@ msgid "East Timor"
 msgstr "Východný Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1812,11 +1854,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID prílohy"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1831,7 +1868,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1872,6 +1909,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Právo čítať"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1948,16 +1990,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Pripojený model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2012,7 +2049,7 @@ msgid "Formula"
 msgstr "Vzorec"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Nie je možné odstrániť root používateľa!"
@@ -2036,11 +2073,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kópia)"
@@ -2052,7 +2089,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Typ adresy"
 
@@ -2090,11 +2126,6 @@ msgstr "Celá cesta"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2229,6 +2260,11 @@ msgstr "Počet aktualizovaných modulov"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2262,12 +2298,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2318,6 +2359,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Pridať alebo nepridať firemnú RML hlavičku"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2371,7 +2421,7 @@ msgstr ""
 "'calendar', atď. (prevolené: tree, form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2452,7 +2502,6 @@ msgstr "Svätý Tomáš a Princov ostrov"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktúra"
 
@@ -2499,11 +2548,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2621,9 +2665,20 @@ msgid "Default limit for the list view"
 msgstr "Predvolený limit pre zobrazenie zoznamu"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nová Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2701,7 +2756,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2760,6 +2815,19 @@ msgstr "Mapovania pola"
 msgid "Export Translations"
 msgstr "Exportovať preklady"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2768,7 +2836,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2854,7 +2922,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2884,7 +2952,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2949,22 +3017,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Chyba!"
@@ -3061,12 +3129,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Chyba! Nemôžte vytvárať rekurzívne spoločnosti."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3083,17 +3151,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3103,7 +3173,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Nie je možné aktualizovať modul '%s'. Nie je nainštalovaný."
@@ -3154,34 +3224,6 @@ msgstr "Parametre nastavenia"
 msgid "Invalid arguments"
 msgstr "Zlé argumenty"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3220,7 +3262,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3232,6 +3274,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Typ bankového účtu"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3268,7 +3338,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signál (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3304,7 +3374,7 @@ msgid "Access Controls"
 msgstr "Nastavenia prístupov"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3332,32 +3402,6 @@ msgstr "Hlavná spoločnosť"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3375,9 +3419,13 @@ msgid ""
 "'object'."
 msgstr "Ak použijete typ vzorec, použite výraz Python a premennú 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Chyba! Nemôžte vytvárať rekurzívne spoločnosti."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Dátum narodenia"
 
@@ -3393,7 +3441,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3501,7 +3549,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3690,7 +3738,6 @@ msgstr "Výkazy"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Titul"
@@ -3702,13 +3749,18 @@ msgstr ""
 "Ak nie je nastavený, funguje ako predvolená hodnota pre nové prostriedky"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Chyba rekurzie v závislostiach modulov!"
@@ -3768,9 +3820,10 @@ msgid "Urdu / اردو"
 msgstr "Urdština / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3781,7 +3834,7 @@ msgid "Company Name"
 msgstr "Meno spoločnosti"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3800,14 +3853,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML  (zastaralé - použite Report)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Pravidlá záznamu"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre a Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3836,13 +3912,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3890,19 +3962,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3922,7 +3982,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3967,7 +4027,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3986,9 +4046,43 @@ msgid "Technical Data"
 msgstr "Technické údaje"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4044,13 +4138,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4066,9 +4165,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Vyžadovaná skupina"
 
 #. module: base
 #: view:res.lang:0
@@ -4126,33 +4225,10 @@ msgid "Languages"
 msgstr "Jazyky"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4230,7 +4306,6 @@ msgstr "Obmedzenie"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Predvolený"
 
@@ -4302,6 +4377,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4365,9 +4445,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4447,6 +4534,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4473,6 +4576,43 @@ msgstr ""
 "toto pole prázdne, OpenERP zistí viditeľnosť v závislosti na priradenom "
 "objekte (právo na čítanie)."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4502,6 +4642,12 @@ msgstr ""
 msgid "View"
 msgstr "Pohľad"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4579,12 +4725,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4599,7 +4739,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "PSČ"
@@ -4610,13 +4749,18 @@ msgstr "PSČ"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Označiť ako zostávajúce"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Vhodná reprezentácia dátumu a času."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4662,6 +4806,8 @@ msgstr "Smer"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Pohľady"
 
@@ -4677,7 +4823,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4771,7 +4917,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4859,7 +5010,7 @@ msgid "System Configuration Done"
 msgstr "Systémove nastavenie dokončené"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4974,6 +5125,11 @@ msgstr "Maurícius"
 msgid "Full Access"
 msgstr "Plný prístup"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4987,7 +5143,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4998,7 +5154,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5030,6 +5186,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Maďarsko"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5193,7 +5360,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5209,16 +5376,11 @@ msgid "Decimal Separator"
 msgstr "Desatinný oddelovač"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5264,9 +5426,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Vytvoril"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Meno modulu musí byť jedinečné!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5329,15 +5492,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5353,6 +5507,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Meno prílohy"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5436,6 +5595,12 @@ msgstr "Kazachstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Čislo dňa v týždni [0(Nedela),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Meno prostriedku"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5689,7 +5854,7 @@ msgid "title"
 msgstr "titul"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5746,6 +5911,15 @@ msgstr "Produkty"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5861,13 +6035,15 @@ msgid "Bank Type"
 msgstr "Typ banky"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Meno skupiny sa nemôže začínať s \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5887,7 +6063,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gudžarátština / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5922,10 +6098,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Meno prostriedku"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5961,6 +6136,11 @@ msgstr ""
 "tlačidla. Ak je signál nastavený na  NULL, potom tlačidlo nie je nutné na "
 "schválenie tohto prechodu."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Pôvodný pohľad"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5971,7 +6151,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5987,26 +6167,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6139,11 +6299,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6155,8 +6310,8 @@ msgid "Malaysia"
 msgstr "Malajzia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6263,7 +6418,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6301,7 +6456,7 @@ msgid "Created Menus"
 msgstr "Vytvorené menu"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6328,9 +6483,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Označiť ako zostávajúce"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6362,6 +6545,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Aktuálny rok bez storočia: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6404,7 +6594,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6496,7 +6686,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6516,23 +6706,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6565,10 +6738,10 @@ msgstr "Xml výkaz"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduly"
 
@@ -6642,9 +6815,9 @@ msgid "United Kingdom"
 msgstr "Spojené kráľovstvo"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6667,8 +6840,8 @@ msgid "Partner Titles"
 msgstr "Tituly partnera"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6716,18 +6889,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6834,6 +7002,13 @@ msgstr "Súbor modulu bol úspešne importovaný!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Prechody"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6928,7 +7103,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Federálny štát"
@@ -7029,12 +7203,6 @@ msgstr "Celé meno"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Meno modulu musí byť jedinečné!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7076,6 +7244,7 @@ msgstr "Na viacerých dokumentoch"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7133,7 +7302,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Prosím vyberte akciu na spustenie!"
@@ -7153,6 +7322,11 @@ msgstr "Meno kategórie"
 msgid "Northern Mariana Islands"
 msgstr "Severné Mariány"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7164,13 +7338,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7201,7 +7380,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7249,7 +7428,6 @@ msgstr "Prechod"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7269,30 +7447,30 @@ msgid "Child Categories"
 msgstr "Podkategórie"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Chyba"
@@ -7380,6 +7558,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Toto okno"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7465,6 +7648,21 @@ msgstr "Polia"
 msgid "Employees"
 msgstr "Zamestnanci"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7494,11 +7692,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresy"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7523,7 +7716,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Ulica"
@@ -7534,9 +7726,24 @@ msgid "Yugoslavia"
 msgstr "Juhoslávia"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Pravý rodič"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7614,7 +7821,7 @@ msgid "Change My Preferences"
 msgstr "Zmeniť moje predvoľby"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Nesprávne meno modulu v definícii aktivity."
@@ -7701,14 +7908,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7717,7 +7926,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7728,13 +7937,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7753,12 +7962,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Sprievodca"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7931,7 +8141,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7962,14 +8172,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7993,7 +8195,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8111,7 +8312,7 @@ msgid "Nigeria"
 msgstr "Nigéria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8426,7 +8627,7 @@ msgid "Update Modules List"
 msgstr "Aktualizovať zoznam modulov"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8440,7 +8641,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8454,7 +8655,7 @@ msgstr ""
 "kliknúť na Zrušiť v predvoľbách používateľa)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8469,6 +8670,17 @@ msgstr "Pokračovať"
 msgid "Thai / ภาษาไทย"
 msgstr "Thajčina / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8508,7 +8720,7 @@ msgid "Mexico"
 msgstr "Mexiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8530,15 +8742,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Meno prílohy"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8562,7 +8774,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Skrátené meno mesiaca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8574,7 +8786,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dodávateľ"
@@ -8652,7 +8863,7 @@ msgid "Selectable"
 msgstr "Vybrateľný"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8680,8 +8891,8 @@ msgid "Iteration"
 msgstr "Iterácia"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8705,7 +8916,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8852,7 +9063,7 @@ msgid "Reunion (French)"
 msgstr "Réunion (Francúzsko)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8891,8 +9102,8 @@ msgid "Solomon Islands"
 msgstr "Šalamúnove ostrovy"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Chyba prístupu"
@@ -8966,7 +9177,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8980,7 +9191,7 @@ msgid "Ukraine"
 msgstr "Ukrajina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9043,6 +9254,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Holandčina / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamčina / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9141,9 +9357,9 @@ msgid "Custom Shortcuts"
 msgstr "Vlastné skratky"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamčina / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9171,13 +9387,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9198,7 +9414,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9246,7 +9462,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s neexistuje!"
@@ -9292,6 +9508,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9300,7 +9517,7 @@ msgid "Cancel"
 msgstr "Zrušiť"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9319,6 +9536,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9354,7 +9608,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9406,6 +9660,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Hodina (12-hodinový formát) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9448,23 +9707,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9498,7 +9745,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Kliknite na 'Pokračovať' pre nastavenie ďalšieho doplnku..."
@@ -9590,6 +9837,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9796,7 +10048,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9807,13 +10059,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Jednotka intervalu"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Druh"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9986,7 +10243,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10021,6 +10278,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10046,6 +10308,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10135,7 +10402,6 @@ msgstr "%m - Čislo mesiaca [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Mesto"
@@ -10171,13 +10437,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estónčina / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Zadajte meno pola na ktoré bude odkazovať id záznamu pri zápise. Ak je "
+"prázdne, bude odkazovať na aktívne id objektu."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 alebo novšia"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10239,19 +10514,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10265,6 +10565,8 @@ msgid "Activity"
 msgstr "Aktivity"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10283,7 +10585,12 @@ msgid "Parent Company"
 msgstr "Rodičovská spoločnosť"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10295,13 +10602,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10386,6 +10686,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10457,6 +10777,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Typ postupností"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10517,9 +10842,9 @@ msgstr ""
 "Prosím jazyk najprv deaktivujte."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10537,8 +10862,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problémv nastavení `Record Id` v Akcii servera!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10579,13 +10904,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Email"
@@ -10596,7 +10920,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10625,36 +10954,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10676,6 +10975,11 @@ msgstr "Iná súkromná"
 msgid "Ecuador"
 msgstr "Ekvádor"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "pracovný tok"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10692,16 +10996,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Nemôžte vymazať jazyk ktorý je predvoleným jazykom používateľov!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10718,9 +11012,9 @@ msgid "Cascade"
 msgstr "Kaskáda"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Vyžadovaná skupina"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10745,11 +11039,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10775,7 +11064,7 @@ msgid "Domain"
 msgstr "Doména"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10791,12 +11080,12 @@ msgid "State Name"
 msgstr "Meno štátu"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10817,30 +11106,10 @@ msgid "Timezone"
 msgstr "Časová zóna"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10861,7 +11130,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10914,7 +11183,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Ulica2"
 
@@ -10938,6 +11206,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11023,19 +11292,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "pracovný tok"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Veľkosť pola nemôže byť nikdy menšia ako 1!"
@@ -11077,22 +11355,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumenty"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11225,7 +11487,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Zákazník"
 
@@ -11315,7 +11576,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11365,8 +11626,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11457,7 +11718,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11484,7 +11745,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11570,7 +11831,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11583,7 +11844,7 @@ msgid "User Ref."
 msgstr "Odkaz na používateľa"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11628,8 +11889,6 @@ msgstr "Referenčná príručka"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11637,7 +11896,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11666,12 +11925,6 @@ msgstr "Falklandské ostrovy"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11778,8 +12031,10 @@ msgid "Selection"
 msgstr "Výber"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11816,7 +12071,7 @@ msgid "Action Type"
 msgstr "Typ akcie"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11954,11 +12209,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Hodina 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Odznačte aktívne pole pre skrytie kontaktu."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11975,7 +12225,7 @@ msgid "workflow.instance"
 msgstr "workflow.instace"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11998,7 +12248,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -12039,16 +12289,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binárny súbor alebo externá URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12095,91 +12345,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Formát oddeľovača by mal byť [,n] kde 0 < n a začína od označenia jednotky , "
-"-1 znamená koniec oddelenia. napr. formát [3,2,-1 ] rozdelí číslo 106500 ako "
-"1,06,500, formát [1,2,-1] ho rozdelíá ako 106,50,0 a formát [3] ako 106,500. "
-"\",\" je v každom prípade oddelovač tisícov."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Okcitánčina (FR, po 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12358,6 +12574,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12374,7 +12595,7 @@ msgid "Body"
 msgstr "Telo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12422,7 +12643,7 @@ msgid "choose"
 msgstr "vybrať"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12598,10 +12819,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12633,12 +12858,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12652,7 +12878,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Všeobecný"
@@ -12674,23 +12899,6 @@ msgstr ""
 msgid "China"
 msgstr "Čína"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12762,25 +12970,9 @@ msgid "Bulgaria"
 msgstr "Bulharsko"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12808,6 +13000,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12844,6 +13056,7 @@ msgstr "Slovenčina"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "neznámy"
@@ -12911,6 +13124,11 @@ msgstr "Adresár"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13000,6 +13218,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13012,7 +13231,7 @@ msgid "Information"
 msgstr "Informácia"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13043,16 +13262,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Pravý rodič"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Aktualizovať zoznam modulov"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13117,6 +13340,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "Pole osv_memory sa dá porovnávať iba pomocou operátora = alebo !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13189,29 +13417,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13259,7 +13464,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13303,9 +13508,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Pravidlá záznamu"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13549,9 +13754,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13578,63 +13788,14 @@ msgid "System Configuration done"
 msgstr "Systémové nastavenie dokončené"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks a Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13675,17 +13836,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13720,7 +13870,7 @@ msgid "Low"
 msgstr "Nízka"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Chyba! Nemôžte vytvoriť rekurzívne Menu."
@@ -13802,11 +13952,10 @@ msgid "El Salvador"
 msgstr "Salvádor"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefón"
@@ -13821,6 +13970,11 @@ msgstr "Menu prístupov"
 msgid "Thailand"
 msgstr "Thajsko"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13841,6 +13995,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumunčina / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13877,41 +14055,6 @@ msgstr "Objekt vzťahu"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13972,40 +14115,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14098,6 +14209,21 @@ msgstr "Pohľad:"
 msgid "View Auto-Load"
 msgstr "Automatické načítanie pohľadu"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14140,34 +14266,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Perzština / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14190,9 +14288,9 @@ msgid "Unmet dependency !"
 msgstr "Nesplnené závislosti!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14203,7 +14301,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14229,7 +14357,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14274,7 +14402,7 @@ msgid "Access"
 msgstr "Prístup"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14307,11 +14435,10 @@ msgid "Bahrain"
 msgstr "Bahrajn"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14327,8 +14454,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14443,7 +14568,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14455,7 +14580,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14492,7 +14616,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14503,8 +14627,8 @@ msgid "Azerbaijan"
 msgstr "Azerbajdžán"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Varovanie"
@@ -14530,11 +14654,6 @@ msgstr "Britské Panenské ostrovy"
 msgid "Parameters"
 msgstr "Parametre"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre a Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14624,7 +14743,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Krajina"
@@ -14695,9 +14813,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Španielčina (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Formát oddeľovača by mal byť [,n] kde 0 < n a začína od označenia jednotky , "
+"-1 znamená koniec oddelenia. napr. formát [3,2,-1 ] rozdelí číslo 106500 ako "
+"1,06,500, formát [1,2,-1] ho rozdelíá ako 106,50,0 a formát [3] ako 106,500. "
+"\",\" je v každom prípade oddelovač tisícov."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14724,7 +14850,7 @@ msgid "Japan"
 msgstr "Japonsko"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14785,6 +14911,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14809,7 +14966,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Poznámka: Táto operácia môže trvať niekoľko minút."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14848,6 +15005,12 @@ msgstr "Vykonanie"
 msgid "Condition"
 msgstr "Podmienka"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14902,6 +15065,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Chorvátsko"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14926,6 +15096,11 @@ msgstr "Aktualizácia systému"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14942,7 +15117,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14963,15 +15138,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Všeobecné informácie"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks a Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15007,7 +15219,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Varovanie prepnutia spoločnosti"
@@ -15025,11 +15242,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Nasledovné číslo postupnosti bude zvýšené o toto číslo"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcia"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15065,11 +15286,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Dodanie"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15097,7 +15313,7 @@ msgid "Workflow Instances"
 msgstr "Inštancie pracovného toku"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneri: "
@@ -15108,7 +15324,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15174,7 +15390,6 @@ msgstr "Meno exportu"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15384,6 +15599,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW cesta"
 
+#~ msgid "Creator"
+#~ msgstr "Vytvoril"
+
 #~ msgid "General Description"
 #~ msgstr "Všeobecný popis"
 
@@ -15401,6 +15619,9 @@ msgstr ""
 #~ "Niektoré nainštalované moduly závisia na module, ktorý chcete odinštalovať:\n"
 #~ " %s"
 
+#~ msgid "Contact Name"
+#~ msgstr "Meno kontaktu"
+
 #~ msgid "E-Mail"
 #~ msgstr "Email"
 
@@ -15497,6 +15718,9 @@ msgstr ""
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID prílohy"
+
 #~ msgid ""
 #~ "Condition that is to be tested before action is executed, e.g. "
 #~ "object.list_price > object.cost_price"
@@ -15514,6 +15738,9 @@ msgstr ""
 #~ "Špecifikujte správu. Môžte použiť pole pre objekt. napr.: `Vážený  "
 #~ "[[object.partner_id.name]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Pripojený model"
+
 #~ msgid "Domain Setup"
 #~ msgstr "Nastavenie domény"
 
@@ -15856,6 +16083,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresy"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML identifikátor"
 
@@ -16081,9 +16311,15 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Typy polí"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Odznačte aktívne pole pre skrytie kontaktu."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Pridať widget pre používateľa"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binárny súbor alebo externá URL"
+
 #~ msgid "Your Logo - Use a size of about 450x150 pixels."
 #~ msgstr "Vaše logo - použite veľkost približne 450x150 bodov."
 
@@ -16284,6 +16520,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "Nikdy"
 
+#~ msgid "Delivery"
+#~ msgstr "Dodanie"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "Kód BIC/Swift"
 
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 84ddc23ca1a..71c484d6262 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 19:04+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\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: 2012-12-16 04:44+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "DatumČas"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -219,70 +219,15 @@ msgstr ""
 "reports."
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Opozorilo!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -292,7 +237,7 @@ msgstr ""
 "spremenite preko kode Python, po možnosti z dodatkom po meri!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Napaka omejitve"
@@ -303,7 +248,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Renaming sparse field \"%s\" is not allowed"
@@ -314,7 +259,7 @@ msgid "Swaziland"
 msgstr "Švica"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "ustvarjeno."
@@ -399,29 +344,6 @@ msgstr "Podjetje za shranjevanje trenutnega zapisa"
 msgid "Max. Size"
 msgstr "Maksimalna velikost"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -431,11 +353,6 @@ msgstr ""
 "Database ID of record to open in form view, when ``view_mode`` is set to "
 "'form' only"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Ime stika"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -516,7 +433,7 @@ msgstr ""
 "line.\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -555,6 +472,7 @@ msgstr "Automated Action Rules"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Lastnik"
 
@@ -595,7 +513,7 @@ msgstr ""
 "allowed directives, displayed when you edit a language."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -653,7 +571,7 @@ msgid "Netherlands Antilles"
 msgstr "Nizozemski Antili"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -703,9 +621,9 @@ msgstr ""
 "    "
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Originalni pogled"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideje"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -743,41 +661,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -788,9 +671,41 @@ msgstr ""
 "prilogo, se vrne v prejšnje poročilo."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -865,14 +780,12 @@ msgid ""
 msgstr "Kontekst slovar kot izraz Python, prazno privzeto (privzeto: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Čarovniki"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Nazivi polj po meri se morajo začeti z 'x_'."
@@ -963,23 +876,21 @@ msgid "Model Description"
 msgstr "Opis modela"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknite tu če želite dodati kontakt\n"
-"              </p><p>\n"
-"                \n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -1012,11 +923,21 @@ msgstr "Izraz sprožilnika"
 msgid "Jordan"
 msgstr "Jordanija"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Next planned execution date for this job."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1172,13 +1093,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Navedite ime polja, ki se nanaša na zapis id za operacijo pisanja. Če je "
-"prazna, se bo nanašalo na aktivni id predmeta."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nova Gvineja"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1197,7 +1114,7 @@ msgid "Email Preferences"
 msgstr "Nastavitve e-pošte"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "'%s' does not seem to be a valid date for field '%%(field)s'"
@@ -1246,23 +1163,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Špansko (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobilni telefon"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1371,9 +1274,38 @@ msgid "Mongolia"
 msgstr "Mongolija"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1388,12 +1320,17 @@ msgstr ""
 "Users added to this group are automatically added in the following groups."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Model dokumenta"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1420,7 +1357,54 @@ msgid "Username"
 msgstr "Uporabnik"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1450,7 +1434,7 @@ msgid "Delete Access Right"
 msgstr "Delete Access Right"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Povezava ni uspela!"
@@ -1482,14 +1466,12 @@ msgid "South Korea"
 msgstr "Južna Koreja"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Prehodi"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Zapisa #%d  od %s ni mogoče najti. Ne morem kopirati!"
@@ -1631,7 +1613,7 @@ msgid "Marshall Islands"
 msgstr "Maršalovi otoki"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Spreminjanje modela polja ni dovoljeno!"
@@ -1653,7 +1635,7 @@ msgid "Search"
 msgstr "Iskanje"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1672,7 +1654,14 @@ msgid "Parent Application"
 msgstr "Nadrejena aplikacija"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Čarovniki"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Operacija preklicana"
@@ -1843,7 +1832,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Ne obstaja jezik s kodo \"%s\""
@@ -1984,7 +1987,7 @@ msgid "On Create"
 msgstr "Pri ustvarjanju"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1993,11 +1996,6 @@ msgstr ""
 "'%s' vsebuje preveč pik. XML id-ki ne smejo vsebovati pik! To se uporablja  "
 "za nanašanje na druge podatke modulov, kot je module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Ponudbe,Prodajni nalogi,Fakturiranje"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -2084,7 +2082,7 @@ msgid "East Timor"
 msgstr "Vzhodni Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -2140,11 +2138,6 @@ msgstr ""
 "It assigns manager and user access rights to the Administrator and only user "
 "rights to the Demo user. \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID pripetja"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -2159,7 +2152,7 @@ msgid ""
 msgstr "Upravljanje prodajaln"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
@@ -2200,6 +2193,11 @@ msgstr "Vozila,najemi,zavarovanja,stroški"
 msgid "Read Access"
 msgstr "Dovoljenje za branje"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2292,16 +2290,11 @@ msgid "Create Tasks on SO"
 msgstr "Ustvari nalogo za prodajni nalog"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "This column contains module data and cannot be removed!"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Pripeti model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2374,7 +2367,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Ne morete odstaniti uporabnika 'root'!"
@@ -2406,11 +2399,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -2422,7 +2415,6 @@ msgstr "Predloga kontnega načrta"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Vrsta naslova"
 
@@ -2479,11 +2471,6 @@ msgstr "Celotna pot"
 msgid "The next step depends on the file format:"
 msgstr "Naslednji korak je odvisen od vrste datoteke:"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideje"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2619,6 +2606,11 @@ msgstr "Število osveženih modulov"
 msgid "Method"
 msgstr "Način"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2674,13 +2666,18 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2731,6 +2728,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Vključi/izključi skupno RML glavo"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2812,7 +2818,7 @@ msgstr ""
 "\"drevo\", \"koledar\", itd (Default: drevo, oblika)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Dokument je bil spremenjem po vašem zadnjem ogledu (%s:%d)"
@@ -2905,7 +2911,6 @@ msgstr "Saint Tome (Sao Tome) in Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Račun"
 
@@ -2985,11 +2990,6 @@ msgstr ""
 "    * Date\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Slogan podjetja"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -3118,9 +3118,20 @@ msgid "Default limit for the list view"
 msgstr "Privzeta omejitev za tabelarični pogled"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nova Gvineja"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3235,7 +3246,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "Found multiple matches for field '%%(field)s' (%d matches)"
@@ -3302,6 +3313,19 @@ msgstr "Preslikave polj"
 msgid "Export Translations"
 msgstr "Izvoz prevodov"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -3310,7 +3334,7 @@ msgid "Manager"
 msgstr "Vodja"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Nimate dovoljenja za dostop do tega dokumenta"
@@ -3431,7 +3455,7 @@ msgid "Inherited"
 msgstr "Podedovano"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "da"
@@ -3475,7 +3499,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' does not seem to be an integer for field '%%(field)s'"
@@ -3569,22 +3593,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn integracija"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Neveljavna arhitektura predmeta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Napaka!"
@@ -3696,12 +3720,12 @@ msgstr ""
 "    "
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Napaka! Ne morete ustvariti rekurzivnih podjetij."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3719,28 +3743,32 @@ msgstr ""
 "uporabnik bo imel dostop do kadrovskih nastavitev  in statističnih poročil"
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 
 #. module: base
@@ -3749,7 +3777,7 @@ msgid "Params storage"
 msgstr "Params storage"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Modula '%s' ne morete nadgraditi, ker ni nameščen."
@@ -3804,57 +3832,6 @@ msgstr "Parametri konfiguracije"
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3909,7 +3886,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "Manjkajoči dokumenti"
@@ -3921,6 +3898,34 @@ msgstr "Manjkajoči dokumenti"
 msgid "Bank Account Type"
 msgstr "Vrsta bančnega računa"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3959,7 +3964,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3999,7 +4004,7 @@ msgid "Access Controls"
 msgstr "Nadzori dostopov"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -4029,53 +4034,6 @@ msgstr "Glavno podjetje"
 msgid "Web Icon File (hover)"
 msgstr "Datoteka spletne ikone (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -4095,9 +4053,13 @@ msgstr ""
 "Če uporabite tip formule, uporabite python izraz z uporabo spremenljivke "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Napaka! Ne morete ustvariti rekurzivnih podjetij."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Datum rojstva"
 
@@ -4113,7 +4075,7 @@ msgid "Products Manufacturers"
 msgstr "Proizvajalci"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL mode unavailable"
@@ -4231,7 +4193,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -4462,7 +4424,6 @@ msgstr "Poročanje"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Naziv"
@@ -4473,13 +4434,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "Če ni nastavljeno, se obnaša kot privzera vrednost za nove vire"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Zaznana rekurzivnost."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Napaka rekurzije v odvisnostih modulih!"
@@ -4557,9 +4523,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "Dostop zavrnjen"
@@ -4570,7 +4537,7 @@ msgid "Company Name"
 msgstr "Ime podjetja"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -4591,14 +4558,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (opuščeno - uporabite Poročilo)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Seznam pravil"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Sveti Pierre in Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4638,17 +4628,9 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4696,26 +4678,7 @@ msgid "Paper Format"
 msgstr "Format"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4735,7 +4698,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "Reg"
@@ -4786,7 +4749,7 @@ msgid "Email Gateway"
 msgstr "Email Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4807,9 +4770,43 @@ msgid "Technical Data"
 msgstr "Tehnični podatki"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4883,13 +4880,18 @@ msgstr "Časovnice na zadevah"
 msgid "Ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "Črtna koda (EAN13)"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Neveljavna arhitektura"
@@ -4905,9 +4907,9 @@ msgid "Share any Document"
 msgstr "Skupna raba vsakega dokumenta"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "Priložnosti,Telefonski klici"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Zahtevana skupina"
 
 #. module: base
 #: view:res.lang:0
@@ -4980,57 +4982,10 @@ msgid "Languages"
 msgstr "Jeziki"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -5117,7 +5072,6 @@ msgstr "Omejitev"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Privzeto"
 
@@ -5209,6 +5163,11 @@ msgstr ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -5272,9 +5231,16 @@ msgid "Default value or action reference"
 msgstr "Default value or action reference"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -5372,6 +5338,22 @@ msgstr "Naloži prevod"
 msgid "Installed Version"
 msgstr "Nameščena različica"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -5398,6 +5380,43 @@ msgstr ""
 "polje prazno, bo OpenERP izračunal vidljivost osnovano na dostopih branja "
 "povezanih predmetov."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -5427,6 +5446,12 @@ msgstr ""
 msgid "View"
 msgstr "Pogled"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "ne"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -5556,12 +5581,6 @@ msgstr ""
 "Accounts in OpenERP: the first with the type 'RIB', the second with the type "
 "'IBAN'. \n"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -5576,7 +5595,6 @@ msgstr "Switzerland - Accounting"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Pošta"
@@ -5587,13 +5605,18 @@ msgstr "Pošta"
 msgid "Author"
 msgstr "Avtor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Nastavi na Je treba opraviti"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Ustrezni datum in čas zastopanja."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -5639,6 +5662,8 @@ msgstr "Smer"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Pogledi"
 
@@ -5654,7 +5679,7 @@ msgid "SMTP Server"
 msgstr "Strežnik SMTP"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Poskušate odstraniti modul, ki je nameščen ali bo nameščen"
@@ -5764,7 +5789,12 @@ msgid "Google Docs integration"
 msgstr "Google Docs integration"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "ime"
@@ -5883,7 +5913,7 @@ msgid "System Configuration Done"
 msgstr "Konfiguracija sistema končana"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Napaka se je pojavila med preverjanjem polj %s: %s"
@@ -6011,6 +6041,11 @@ msgstr "Mauricius"
 msgid "Full Access"
 msgstr "Polni dostop"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -6024,7 +6059,7 @@ msgid "Portuguese / Português"
 msgstr "Portuguese / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Changing the storing system for field \"%s\" is not allowed."
@@ -6035,7 +6070,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "Unknown sub-field '%s'"
@@ -6067,6 +6102,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Madžarska"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -6275,7 +6321,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Ne morem preimenovati stolpca v %s, ker ta stolpec že obstaja."
@@ -6291,16 +6337,11 @@ msgid "Decimal Separator"
 msgstr "Decimalni ločevalnik"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -6347,9 +6388,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "Optional model, mostly used for needactions."
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Avtor"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Ime modula mora biti edinstven!"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -6420,19 +6462,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -6448,6 +6477,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Ime priponke"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -6584,6 +6618,12 @@ msgstr "Kazahstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Številka dneva v tednu [0(nedelja),6]"
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Ime vira"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -6894,7 +6934,7 @@ msgid "title"
 msgstr "naslov"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "pravilno"
@@ -6951,6 +6991,15 @@ msgstr "Izdelki"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -7098,13 +7147,15 @@ msgid "Bank Type"
 msgstr "Vrsta banke"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Ime skupine se ne sme začeti z \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Programi"
 
@@ -7124,7 +7175,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -7158,10 +7209,9 @@ msgid "Uncategorized"
 msgstr "Neopredeljeno"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Ime vira"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -7197,6 +7247,11 @@ msgstr ""
 "signal testira ime pritisnjenega gumba. Če je signal NULL, ni potreben gumb "
 "za preverjanje transakcije."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Originalni pogled"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -7211,7 +7266,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' does not seem to be a number for field '%%(field)s'"
@@ -7227,41 +7282,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Moje banke"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -7486,11 +7506,6 @@ msgstr ""
 "If required, you can manually adjust the descriptions via the CODA "
 "configuration menu.\n"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "Po nastavitev gesla"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -7502,8 +7517,8 @@ msgid "Malaysia"
 msgstr "Malezija"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -7654,7 +7669,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Ni navedeno vrste pogleda '%s' za strukturo!"
@@ -7694,7 +7709,7 @@ msgid "Created Menus"
 msgstr "Ustvarjeni meniji"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -7721,9 +7736,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Nastavi na Je treba opraviti"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -7755,6 +7798,13 @@ msgstr "Curaçao"
 msgid "Current Year without Century: %(y)s"
 msgstr "Trenutno leto brez stoletja: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "System Parameters"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -7806,7 +7856,7 @@ msgid "Audit Trail"
 msgstr "Revizijska sled"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -7930,7 +7980,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -7950,29 +8000,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr "Indian - Accounting"
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobilni telefon"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -8005,10 +8032,10 @@ msgstr "XML poročila"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduli"
 
@@ -8088,9 +8115,9 @@ msgid "United Kingdom"
 msgstr "Združeno kraljestvo"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -8114,8 +8141,8 @@ msgid "Partner Titles"
 msgstr "Nazivi partnerja"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -8163,7 +8190,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -8172,11 +8199,6 @@ msgstr ""
 "Ne morete izvesti te operacije. Ustvaritev novega  zapisa ni dovoljeno za ta "
 "predemet, ker je ta predmet namenjen samo za poročanje."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "Anonimno"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -8305,6 +8327,13 @@ msgstr "Datoteka modula je bila uspešno uvožena!"
 msgid "Model Constraints"
 msgstr "Model Constraints"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Prehodi"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -8429,7 +8458,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Zvezna država"
@@ -8538,12 +8566,6 @@ msgstr "Polno ime"
 msgid "on"
 msgstr "vklopljeno"
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Ime modula mora biti edinstven!"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -8587,6 +8609,7 @@ msgstr "Na večih dokumentih"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -8656,7 +8679,7 @@ msgid "Connection Security"
 msgstr "Varnost povezave"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Prosim, navedite dejanje za zagon!"
@@ -8676,6 +8699,11 @@ msgstr "Naziv kategorije"
 msgid "Northern Mariana Islands"
 msgstr "Severni Marianski otoki"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -8687,7 +8715,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -8696,6 +8724,11 @@ msgstr ""
 "Prosim, uporabite ta čarovnik za spreminjanje glesa (v Uporabniških "
 "nastavitvah ali meniju Uporabnik), za spremembo vašega gesla."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -8750,7 +8783,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Premalo pol za pogled koledarja!"
@@ -8798,7 +8831,6 @@ msgstr "Prehod"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -8818,30 +8850,30 @@ msgid "Child Categories"
 msgstr "Kategorije podrejenih"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Napaka"
@@ -8935,6 +8967,11 @@ msgstr "Rule Definition (Domain Filter)"
 msgid "This Window"
 msgstr "To okno"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -9023,6 +9060,31 @@ msgstr "Polja"
 msgid "Employees"
 msgstr "Zaposleni"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -9056,11 +9118,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Preizkusi povezavo"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Naslovi"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -9085,7 +9142,6 @@ msgstr "Možnosti izbire"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Naslov"
@@ -9096,9 +9152,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Desni starš"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -9214,7 +9285,7 @@ msgid "Change My Preferences"
 msgstr "Spremeni moje nastavitve"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Napačno ime modela v definiciji dejanja."
@@ -9309,21 +9380,23 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite tu če želite dodati kontakt\n"
+"              </p><p>\n"
+"                \n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -9331,7 +9404,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Nastavitev brez gesla ni dovoljeno zaradi varnostnih razlogov!"
@@ -9342,13 +9415,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -9370,12 +9443,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Čarovnik"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -9598,7 +9672,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -9629,14 +9703,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Opozorilo!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -9660,7 +9726,6 @@ msgstr "Spletne bližnjice"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -9783,7 +9848,7 @@ msgid "Nigeria"
 msgstr "Nigerija"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Za izbrana polja mora biti podana Možnost izbire!"
@@ -10181,7 +10246,7 @@ msgid "Update Modules List"
 msgstr "Posodobi seznam modulov"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -10194,7 +10259,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -10208,7 +10273,7 @@ msgstr ""
 "podjetje. (Lahko sedaj kliknete Prekliči v Uporabniških nastavitvah)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "The value \"%s\" for the field \"%s.%s\" is not in the selection"
@@ -10223,6 +10288,17 @@ msgstr "Naprej"
 msgid "Thai / ภาษาไทย"
 msgstr "Tajski/ ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -10270,7 +10346,7 @@ msgid "Mexico"
 msgstr "Mehika"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -10294,15 +10370,15 @@ msgstr ""
 "are automatically deleted from the database or not)"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Missing SMTP Server"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Ime priponke"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Language code of translation item must be among known languages"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -10326,7 +10402,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - skrajšano ime meseca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -10338,7 +10414,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dobavitelj"
@@ -10432,7 +10507,7 @@ msgid "Selectable"
 msgstr "Izberljivo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -10460,8 +10535,8 @@ msgid "Iteration"
 msgstr "Ponovitev"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "NapakaUporabnika"
@@ -10488,7 +10563,7 @@ msgstr ""
 "true. Otherwise, it is false."
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -10741,7 +10816,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (francoski)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -10780,8 +10855,8 @@ msgid "Solomon Islands"
 msgstr "Solomonovi otoki"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Napaka dostopa"
@@ -10870,7 +10945,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -10887,7 +10962,7 @@ msgid "Ukraine"
 msgstr "Ukrajina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -10953,6 +11028,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamski (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamski/ Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -11063,9 +11143,9 @@ msgid "Custom Shortcuts"
 msgstr "Bližnjice po meri"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamski/ Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -11101,13 +11181,13 @@ msgid "Models"
 msgstr "Modeli"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "The `base` module cannot be uninstalled"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -11128,7 +11208,7 @@ msgid "osv_memory.autovacuum"
 msgstr "Copy text \t osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -11176,7 +11256,7 @@ msgid "On Delete"
 msgstr "Ob izbrisu"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model %s ne obstaja!"
@@ -11228,6 +11308,7 @@ msgstr "United States - Chart of accounts"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -11236,7 +11317,7 @@ msgid "Cancel"
 msgstr "Prekliči"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Unknown database identifier '%s'"
@@ -11259,6 +11340,43 @@ msgstr ""
 "=========================\n"
 "\n"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -11318,7 +11436,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "external id"
@@ -11376,6 +11494,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Ura (12-urna ura) [01,12]"
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -11429,23 +11552,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Valuta mora biti enotna za podjetje"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "New Language (Empty translation template)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -11488,7 +11599,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Kliknite \"Nadaljuj\" za konfiguracijo naslednjega dodatka..."
@@ -11592,6 +11703,11 @@ msgstr ""
 "============================================================================="
 "=========================\n"
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -11807,7 +11923,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -11819,13 +11935,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Enota intervala"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Vrsta"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Ta metoda ne obstaja več"
@@ -12004,7 +12125,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -12037,6 +12158,11 @@ msgstr "OpenERP bo avtomatično dodak nekatere '0' na levo stran"
 msgid "PostgreSQL constraint or foreign key name."
 msgstr "PostgreSQL constraint or foreign key name."
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -12062,6 +12188,11 @@ msgstr "Add RML Header"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -12160,7 +12291,6 @@ msgstr "%m - številka meseca [01,12]"
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Mesto"
@@ -12196,13 +12326,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonsko"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Navedite ime polja, ki se nanaša na zapis id za operacijo pisanja. Če je "
+"prazna, se bo nanašalo na aktivni id predmeta."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ali naslednje verzije"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -12273,19 +12412,44 @@ msgstr ""
 "    "
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -12299,6 +12463,8 @@ msgid "Activity"
 msgstr "Aktivnost"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -12317,7 +12483,12 @@ msgid "Parent Company"
 msgstr "Krovno podjetje"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Authentification"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -12329,15 +12500,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -12434,6 +12596,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -12505,6 +12687,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Vrsta zaporedja"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -12573,9 +12760,9 @@ msgstr ""
 "Prosim, najprej deaktivirajte jezik."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "Dovoljenje je zavrnjeno"
@@ -12593,8 +12780,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem pri konfiguraciji. 'ID zapisa\" v dejanju strežnika!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Napaka preverjanja"
@@ -12635,13 +12822,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-pošta"
@@ -12652,7 +12838,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -12695,61 +12886,6 @@ msgstr ""
 " - uid: current user id\n"
 " - context: current context"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -12772,6 +12908,11 @@ msgstr "Druga lastništva"
 msgid "Ecuador"
 msgstr "Ekvador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "delovni proces"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -12788,21 +12929,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Ne morete izbrisati jezika, ker je želeni jezik uporabnika!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -12819,9 +12945,9 @@ msgid "Cascade"
 msgstr "Kaskadno"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Zahtevana skupina"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "Priložnosti,Telefonski klici"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -12848,11 +12974,6 @@ msgstr "Prevedeno"
 msgid "Default Company per Object"
 msgstr "Default Company per Object"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -12878,7 +12999,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -12894,12 +13015,12 @@ msgid "State Name"
 msgstr "Ime države"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
-msgstr "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -12920,51 +13041,10 @@ msgid "Timezone"
 msgstr "Časovni pas"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -12986,7 +13066,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -13039,7 +13119,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Naslov 2"
 
@@ -13063,6 +13142,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -13156,19 +13236,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Napaka integritete"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "delovni proces"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Velikost polja ne more biti manjša od 1"
@@ -13210,33 +13299,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -13469,7 +13531,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Stranka"
 
@@ -13566,7 +13627,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -13628,9 +13689,9 @@ msgstr ""
 "      "
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -13760,7 +13821,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -13787,7 +13848,7 @@ msgid "Object"
 msgstr "Predmet"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -13918,7 +13979,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -13933,7 +13994,7 @@ msgid "User Ref."
 msgstr "Referenca uporabnika"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr "'%s' does not seem to be a valid datetime for field '%%(field)s'"
@@ -13978,8 +14039,6 @@ msgstr "Priročnik"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -13987,7 +14046,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -14018,12 +14077,6 @@ msgstr "Falklandski otoki"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -14132,8 +14185,10 @@ msgid "Selection"
 msgstr "Izbor"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -14184,7 +14239,7 @@ msgid "Action Type"
 msgstr "Vrsta dejanja"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -14339,11 +14394,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Ura 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Odznačite aktivno polje za skrivanje tega kontakta."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -14360,7 +14410,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Neznan atribut %s v %s "
@@ -14390,7 +14440,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Nedefinirana metoda 'get'!"
@@ -14431,16 +14481,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binarna datoteka ali zunanji URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Spremeni geslo"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -14487,142 +14537,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Oblika ločila mora biti kot [,n] kjer je 0 < n : začetko od enote števila. - "
-"1 bo končalo ločevanje, npr [3,2,-1] bo predstavljalo 106500 kot 1,06,500; "
-"[1,2,-1] bo predstavljajo kot 106,50,0; [3] bo predstavljalo kot 1060,500. "
-"Določena ',' kot ločilo tisoč v vsakem primeru."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Copy text \t Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -14845,6 +14810,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -14861,7 +14831,7 @@ msgid "Body"
 msgstr "Vsebina"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -14930,7 +14900,7 @@ msgid "choose"
 msgstr "izberi"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -15137,13 +15107,15 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -15181,12 +15153,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -15200,7 +15173,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Razno"
@@ -15222,35 +15194,6 @@ msgstr "Tehnično"
 msgid "China"
 msgstr "Kitajska"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -15337,41 +15280,9 @@ msgid "Bulgaria"
 msgstr "Bolgarija"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -15399,6 +15310,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -15443,6 +15374,7 @@ msgstr "Slovaški / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "neznano"
@@ -15510,6 +15442,11 @@ msgstr "Imenik"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr "Belgium - Payroll with Accounting"
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -15608,6 +15545,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -15620,7 +15558,7 @@ msgid "Information"
 msgstr "Informacije"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -15659,16 +15597,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Desni starš"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Posodobi seznam modulov"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -15747,6 +15689,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "Polje osv_memory lahko primerjate samo z operatorjem = in !=."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -15845,47 +15792,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -15943,7 +15849,7 @@ msgid "Delivery Costs"
 msgstr "Stroški dostave"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -15987,9 +15893,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Seznam pravil"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -16286,10 +16192,15 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "ne"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -16321,110 +16232,14 @@ msgid "System Configuration done"
 msgstr "Konfiguracija sistema je končana"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Otoka Turks in Caicos"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -16482,23 +16297,6 @@ msgstr ""
 "anonymization process to recover your previous data.\n"
 "    "
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -16536,7 +16334,7 @@ msgid "Low"
 msgstr "Nizka"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Napaka! Ne morete ustvariti rekurzivnega menija."
@@ -16660,11 +16458,10 @@ msgid "El Salvador"
 msgstr "Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -16679,6 +16476,11 @@ msgstr "Meni dostopa"
 msgid "Thailand"
 msgstr "Tajska"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -16699,6 +16501,30 @@ msgstr "Guernsey"
 msgid "Romanian / română"
 msgstr "Romunski/ română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -16745,71 +16571,6 @@ msgstr "Relacija predmeta"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -16870,73 +16631,9 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_page
@@ -17032,6 +16729,21 @@ msgstr "Pogled:"
 msgid "View Auto-Load"
 msgstr "Pogled samodejnega nalaganja"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -17074,57 +16786,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Perzijski / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -17147,9 +16808,9 @@ msgid "Unmet dependency !"
 msgstr "Neizpolnjene odvisnosti!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -17160,7 +16821,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -17197,7 +16888,7 @@ msgstr ""
 "Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -17270,7 +16961,7 @@ msgid "Access"
 msgstr "Dostop"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -17303,11 +16994,10 @@ msgid "Bahrain"
 msgstr "Bahrajn"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faks"
@@ -17323,8 +17013,6 @@ msgstr "Faks"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -17481,7 +17169,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr "Serialization field `%s` not found for sparse field `%s`!"
@@ -17493,7 +17181,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -17544,7 +17231,7 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -17555,8 +17242,8 @@ msgid "Azerbaijan"
 msgstr "Azerbajdžan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Opozorilo"
@@ -17582,11 +17269,6 @@ msgstr "Deviški otoki (britanski)"
 msgid "Parameters"
 msgstr "Parametri"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Sveti Pierre in Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -17681,7 +17363,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Država"
@@ -17752,9 +17433,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Španski (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Oblika ločila mora biti kot [,n] kjer je 0 < n : začetko od enote števila. - "
+"1 bo končalo ločevanje, npr [3,2,-1] bo predstavljalo 106500 kot 1,06,500; "
+"[1,2,-1] bo predstavljajo kot 106,50,0; [3] bo predstavljalo kot 1060,500. "
+"Določena ',' kot ločilo tisoč v vsakem primeru."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -17790,7 +17479,7 @@ msgid "Japan"
 msgstr "Japonska"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Preimenujete lahko samo en stolpec naenkrat!"
@@ -17880,6 +17569,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Canada - Accounting"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -17904,7 +17624,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Upoštevajte, da lahko ta postopek traja nekaj minut."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -17945,6 +17665,12 @@ msgstr "Izvršitev"
 msgid "Condition"
 msgstr "Pogoj"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -18014,6 +17740,15 @@ msgstr ""
 msgid "Croatia"
 msgstr "Hrvaška"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -18038,6 +17773,11 @@ msgstr "Posodobitev sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -18054,7 +17794,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -18075,15 +17815,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Splošne informacije"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Otoka Turks in Caicos"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -18135,7 +17912,12 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Opozorilo preklopa podjetja"
@@ -18153,11 +17935,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Naslednje število zaporedja bo to število povečalo za to številko"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcija"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -18211,11 +17997,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Dostava"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -18243,7 +18024,7 @@ msgid "Workflow Instances"
 msgstr "Primeri delovnega procesa"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partnerji: "
@@ -18254,7 +18035,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -18320,7 +18101,6 @@ msgstr "Ime izvoza"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -18542,6 +18322,9 @@ msgstr ""
 #~ msgid "Rounding factor"
 #~ msgstr "Faktor zaokroževanja"
 
+#~ msgid "Delivery"
+#~ msgstr "Dostava"
+
 #~ msgid "Open Source Service Company"
 #~ msgstr "Odprtokodna storitveno podjetje"
 
@@ -18644,6 +18427,9 @@ msgstr ""
 #~ "program za razpredelnice. Kodni nabor je UTF-8. Prevesti morate zadnji "
 #~ "stolpec preden ga znova uvozite."
 
+#~ msgid "Creator"
+#~ msgstr "Avtor"
+
 #~ msgid "Partner Contacts"
 #~ msgstr "Kontakti partnerja"
 
@@ -18666,6 +18452,9 @@ msgstr ""
 #~ msgid "acc_number"
 #~ msgstr "številka računa"
 
+#~ msgid "Addresses"
+#~ msgstr "Naslovi"
+
 #~ msgid "Select Report"
 #~ msgstr "Izberite poročilo"
 
@@ -18753,6 +18542,9 @@ msgstr ""
 #~ "\"smtp strežnik\" mora biti nastavljen, da se lahko pošilja e-pošto "
 #~ "uporabnikom"
 
+#~ msgid "Contact Name"
+#~ msgstr "Ime stika"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -18915,6 +18707,9 @@ msgstr ""
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID pripetja"
+
 #~ msgid ""
 #~ "Do not display this log if it belongs to the same object the user is working "
 #~ "on"
@@ -18934,6 +18729,9 @@ msgstr ""
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Obdržite 0, če se mora dejanje pojaviti v vseh virih."
 
+#~ msgid "Attached Model"
+#~ msgstr "Pripeti model"
+
 #~ msgid ""
 #~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 #~ "object.partner_id.name ]]`"
@@ -19715,6 +19513,9 @@ msgstr ""
 #~ msgid "- type,name,res_id,src,value"
 #~ msgstr "- vrsta, ime, res_id, src, vrednost"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Odznačite aktivno polje za skrivanje tega kontakta."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Dodaj  gradnik za uporabnika"
 
@@ -19739,6 +19540,9 @@ msgstr ""
 #~ "kliknite gumb \"Razporedi za namestitev\" iz pogleda obrazca, potem kliknite "
 #~ "na \"Uveljavi posodobitve razporeditve\" za migracijo sistema."
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binarna datoteka ali zunanji URL"
+
 #~ msgid "Modules to update"
 #~ msgstr "Moduli za posodobiti"
 
@@ -20011,3 +19815,31 @@ msgstr ""
 
 #~ msgid "Query Builder"
 #~ msgstr "Čarovnik za poizvedbe"
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 55296c6888c..567e36a3013 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-30 08:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 04:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -185,41 +185,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -227,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -238,7 +212,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -249,7 +223,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -328,20 +302,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -349,11 +309,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -412,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -449,6 +404,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -487,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -539,7 +495,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -577,8 +533,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -604,26 +560,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -632,8 +568,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -707,14 +659,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -778,16 +728,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -816,11 +764,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -949,10 +907,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -971,7 +927,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1019,15 +975,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1125,8 +1074,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1141,12 +1119,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1173,7 +1156,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1201,7 +1231,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1233,14 +1263,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1375,7 +1403,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1397,7 +1425,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1412,7 +1440,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1538,7 +1573,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1653,18 +1702,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1745,7 +1789,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1786,11 +1830,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1805,7 +1844,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1846,6 +1885,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1922,16 +1966,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1986,7 +2025,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2010,11 +2049,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2026,7 +2065,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2064,11 +2102,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2201,6 +2234,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2234,12 +2272,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2287,6 +2330,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2338,7 +2390,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2416,7 +2468,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2463,11 +2514,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2584,8 +2630,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2664,7 +2721,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2723,6 +2780,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2731,7 +2801,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2817,7 +2887,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2847,7 +2917,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2912,22 +2982,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3021,12 +3091,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3043,17 +3113,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3063,7 +3135,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3114,34 +3186,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3180,7 +3224,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3192,6 +3236,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3228,7 +3300,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3262,7 +3334,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3290,32 +3362,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3333,9 +3379,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3351,7 +3401,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3459,7 +3509,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3648,7 +3698,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3659,13 +3708,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3725,9 +3779,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3738,7 +3793,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3757,13 +3812,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3793,12 +3871,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3847,19 +3921,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3877,7 +3939,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3922,7 +3984,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3941,8 +4003,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -3999,13 +4095,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4021,8 +4122,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4081,32 +4182,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4185,7 +4263,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4257,6 +4334,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4318,8 +4400,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4400,6 +4489,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4423,6 +4528,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4450,6 +4592,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4527,12 +4675,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4547,7 +4689,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4558,13 +4699,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4607,6 +4753,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4622,7 +4770,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4715,7 +4863,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4803,7 +4956,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4918,6 +5071,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4931,7 +5089,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4942,7 +5100,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4974,6 +5132,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5137,7 +5306,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5153,16 +5322,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5203,8 +5367,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5268,15 +5433,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5292,6 +5448,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5375,6 +5536,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5625,7 +5792,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5682,6 +5849,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5797,13 +5973,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5823,7 +6001,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5856,9 +6034,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5892,6 +6069,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5902,7 +6084,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5918,26 +6100,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6070,11 +6232,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6086,8 +6243,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6194,7 +6351,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6232,7 +6389,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6259,8 +6416,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6293,6 +6478,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6335,7 +6527,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6427,7 +6619,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6447,23 +6639,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6496,10 +6671,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6573,8 +6748,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6598,8 +6773,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6647,18 +6822,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6763,6 +6933,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6857,7 +7034,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6958,12 +7134,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7005,6 +7175,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7062,7 +7233,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7082,6 +7253,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7093,13 +7269,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7130,7 +7311,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7176,7 +7357,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7196,30 +7376,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7307,6 +7487,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7390,6 +7575,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7419,11 +7619,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7448,7 +7643,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7459,8 +7653,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7539,7 +7748,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7626,14 +7835,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7642,7 +7853,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7653,13 +7864,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7678,12 +7889,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7856,7 +8068,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7885,14 +8097,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7916,7 +8120,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8031,7 +8234,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8346,7 +8549,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8358,7 +8561,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8368,7 +8571,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8383,6 +8586,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8422,7 +8636,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8444,14 +8658,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8476,7 +8690,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8488,7 +8702,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8566,7 +8779,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8594,8 +8807,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8619,7 +8832,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8766,7 +8979,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8805,8 +9018,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8880,7 +9093,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8894,7 +9107,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8957,6 +9170,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9055,8 +9273,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9085,13 +9303,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9112,7 +9330,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9160,7 +9378,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9206,6 +9424,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9214,7 +9433,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9233,6 +9452,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9268,7 +9524,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9320,6 +9576,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9362,23 +9623,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9412,7 +9661,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9503,6 +9752,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9707,7 +9961,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9718,13 +9972,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9892,7 +10151,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9925,6 +10184,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9950,6 +10214,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10039,7 +10308,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10075,13 +10343,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10140,19 +10415,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10166,6 +10466,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10184,7 +10486,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10196,13 +10503,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10284,6 +10584,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10353,6 +10673,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10411,9 +10736,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10431,8 +10756,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10471,13 +10796,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10488,7 +10812,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10517,36 +10846,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10568,6 +10867,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10584,16 +10888,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10610,8 +10904,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10637,11 +10931,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10667,7 +10956,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10683,12 +10972,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10709,29 +10998,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10752,7 +11021,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10799,7 +11068,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10823,6 +11091,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10908,19 +11177,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10962,22 +11240,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11110,7 +11372,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11200,7 +11461,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11250,8 +11511,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11342,7 +11603,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11369,7 +11630,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11455,7 +11716,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11468,7 +11729,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11513,8 +11774,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11522,7 +11781,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11551,12 +11810,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11663,8 +11916,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11701,7 +11956,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11837,11 +12092,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11858,7 +12108,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11881,7 +12131,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11923,13 +12173,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11978,73 +12228,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12052,13 +12237,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12235,6 +12455,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12251,7 +12476,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12299,7 +12524,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12475,10 +12700,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12510,12 +12739,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12529,7 +12759,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12551,23 +12780,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12635,24 +12847,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12681,6 +12877,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12717,6 +12933,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12784,6 +13001,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12873,6 +13095,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12885,7 +13108,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12916,16 +13139,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12990,6 +13217,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13062,29 +13294,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13132,7 +13341,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13176,8 +13385,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13422,9 +13631,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13451,62 +13665,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13548,17 +13713,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13593,7 +13747,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13673,11 +13827,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13692,6 +13845,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13712,6 +13870,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13748,41 +13930,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13843,40 +13990,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13965,6 +14080,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14007,34 +14137,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14057,9 +14159,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14070,7 +14172,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14096,7 +14228,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14141,7 +14273,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14174,11 +14306,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14194,8 +14325,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14310,7 +14439,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14322,7 +14451,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14355,7 +14483,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14366,8 +14494,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14393,11 +14521,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14487,7 +14610,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14554,8 +14676,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14583,7 +14709,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14644,6 +14770,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14668,7 +14825,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14707,6 +14864,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14759,6 +14922,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14783,6 +14953,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14799,7 +14974,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14820,14 +14995,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14864,7 +15076,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14882,11 +15099,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14922,11 +15143,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14954,7 +15170,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14965,7 +15181,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15031,7 +15247,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index c0d493985a5..4baa198cc11 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:30+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:59+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Datum i vreme"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr "Švedska"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr "Preduyeće za čuvanje datih zapisa"
 msgid "Max. Size"
 msgstr "Max. veličina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Ime kontakta"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Vlasnik"
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr "Holandski Antili"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -580,9 +536,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Originalni pregled"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -607,26 +563,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosanski / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -637,9 +573,25 @@ msgstr ""
 "vratiće prethodni izveštaj."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -715,14 +667,12 @@ msgstr ""
 "Sadržaj rečnika kao Python expresija, podrazumevano je prazno ( Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Čarobnjaci"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Posebnim poljima naziv mora da počinje sa 'x_' !"
@@ -787,16 +737,14 @@ msgid "Model Description"
 msgstr "Opis modela"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -826,11 +774,21 @@ msgstr "Izraz okidača"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -962,13 +920,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Navedite naziv polja, na koji se odnosi šifra zapisa, za operacije pisanja. "
-"Ako je prazno odnosiće se na trenutnu šifru objekta."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua nova Gvineja"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -987,7 +941,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1036,16 +990,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobilni"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1142,8 +1089,37 @@ msgid "Mongolia"
 msgstr "Mongolija"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1158,12 +1134,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1190,7 +1171,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1218,7 +1246,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1250,14 +1278,12 @@ msgid "South Korea"
 msgstr "Južna Koreja"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Prelazi"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1395,7 +1421,7 @@ msgid "Marshall Islands"
 msgstr "Maršalska ostrva"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1417,7 +1443,7 @@ msgid "Search"
 msgstr "Pronađi"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1432,7 +1458,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Čarobnjaci"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1560,7 +1593,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Ne postoji jezik sa %s kodom"
@@ -1676,7 +1723,7 @@ msgid "On Create"
 msgstr "Pri kreiranju"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1685,11 +1732,6 @@ msgstr ""
 "'%s' sadrži previše tačaka. XML id-ovi ne bi trebalo da sadrži tačke ! One "
 "se koriste da usmere na ostale podatke modula kao u module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1772,7 +1814,7 @@ msgid "East Timor"
 msgstr "Istočni Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1813,11 +1855,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Priključena šifra"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1832,7 +1869,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1873,6 +1910,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Pristup koji omogućava čitanje"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1949,16 +1991,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Pridruženi model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2013,7 +2050,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Ne mogu ukloniti root korisnika!"
@@ -2037,11 +2074,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -2053,7 +2090,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Vrsta adrese"
 
@@ -2091,11 +2127,6 @@ msgstr "Kompletna putanja"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2231,6 +2262,11 @@ msgstr "Broj ažuriranih modula"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2264,12 +2300,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2317,6 +2358,15 @@ msgstr "Beliz"
 msgid "Add or not the corporate RML header"
 msgstr "Dodaj ili ne korporativno RML zaglavlje"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2370,7 +2420,7 @@ msgstr ""
 "'calendar', itd. ( Podrazumevano: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2451,7 +2501,6 @@ msgstr "Sveti Toma (sao Tome) i Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2498,11 +2547,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2620,9 +2664,20 @@ msgid "Default limit for the list view"
 msgstr "Podrazumevano ograničenje za pregled u obliku liste"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua nova Gvineja"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2700,7 +2755,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2759,6 +2814,19 @@ msgstr "Mapiranje polja"
 msgid "Export Translations"
 msgstr "Izvezi prevod"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2767,7 +2835,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2853,7 +2921,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2883,7 +2951,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2948,22 +3016,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3057,12 +3125,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Greška! Ne možete da napravite rekurzivna preduzeća."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3079,17 +3147,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3099,7 +3169,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Ne možete da nadogradite modul '%s'. Nije instaliran."
@@ -3150,34 +3220,6 @@ msgstr "Parametri Konfiguracije"
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3216,7 +3258,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3228,6 +3270,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Vrsta bankovnog računa"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3264,7 +3334,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (podtok.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3298,7 +3368,7 @@ msgid "Access Controls"
 msgstr "Kontrole pristupa"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3326,32 +3396,6 @@ msgstr "Glavno preduzeće"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3371,9 +3415,13 @@ msgstr ""
 "Ako koristite tip formula, upotrebite python izraz koristeći promenjivu "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Greška! Ne možete da napravite rekurzivna preduzeća."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Datum rođenja"
 
@@ -3389,7 +3437,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3497,7 +3545,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3686,7 +3734,6 @@ msgstr "Izveštavanje"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Naslov"
@@ -3698,13 +3745,18 @@ msgstr ""
 "Ukoliko nije postavljeno, deluje kao podrazumevana vrednost za nove resurse"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Detektovana rekurzivnost."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekurzivna greška u zavisnosti modula !"
@@ -3764,9 +3816,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3777,7 +3830,7 @@ msgid "Company Name"
 msgstr "Ime kompanije"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3796,14 +3849,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML ( zastarelo - koristi izveštaj)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Sveti Pjer i Mikelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3832,13 +3908,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3886,19 +3958,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3918,7 +3978,7 @@ msgid "Nauru"
 msgstr "Narau"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3963,7 +4023,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3982,9 +4042,43 @@ msgid "Technical Data"
 msgstr "Tehnički podaci"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4040,13 +4134,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4062,9 +4161,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Tražena Grupa"
 
 #. module: base
 #: view:res.lang:0
@@ -4122,33 +4221,10 @@ msgid "Languages"
 msgstr "Jezici"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4226,7 +4302,6 @@ msgstr "Ograničenje"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Podrazumevano"
 
@@ -4298,6 +4373,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4361,9 +4441,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4443,6 +4530,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4469,6 +4572,43 @@ msgstr ""
 "je ovo polje prazno, OpenERP će sam proračunati vidljivost na osnovu "
 "pristupnih prava čitanja."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4498,6 +4638,12 @@ msgstr ""
 msgid "View"
 msgstr "Pregled"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4575,12 +4721,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4595,7 +4735,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Poštanski broj"
@@ -4606,13 +4745,18 @@ msgstr "Poštanski broj"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Postavi za Uraditi"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Odgovarajući prikaz datuma i vremena."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4655,6 +4799,8 @@ msgstr "Smer"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Pregledi"
 
@@ -4670,7 +4816,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4764,7 +4910,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4852,7 +5003,7 @@ msgid "System Configuration Done"
 msgstr "Konfiguracija Sistema je završena"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Greška prilikom provere polja %s: %s"
@@ -4967,6 +5118,11 @@ msgstr "Mauricijus"
 msgid "Full Access"
 msgstr "Potpuni pristup"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4980,7 +5136,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4991,7 +5147,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5023,6 +5179,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Mađarska"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5187,7 +5354,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5203,16 +5370,11 @@ msgid "Decimal Separator"
 msgstr "Decimalni separator"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5253,9 +5415,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Autor"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5318,15 +5481,6 @@ msgstr "Venecuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5342,6 +5496,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Naziv dodatka"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5425,6 +5584,12 @@ msgstr "Kazahstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Naziv resursa"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5679,7 +5844,7 @@ msgid "title"
 msgstr "Naslov"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5736,6 +5901,15 @@ msgstr "Proizvod"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5851,13 +6025,15 @@ msgid "Bank Type"
 msgstr "Vrsta banke"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Naziv grupe ne može da počinje sa \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5877,7 +6053,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5910,10 +6086,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Naziv resursa"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5949,6 +6124,11 @@ msgstr ""
 "signal testira ime stisnutog dugmeta. Ako je signal NULL, ni jedno dugme "
 "nije neophodno da bi se potvrdila ova tranzicija."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Originalni pregled"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5959,7 +6139,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5975,26 +6155,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6127,11 +6287,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6143,8 +6298,8 @@ msgid "Malaysia"
 msgstr "Malezija"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6251,7 +6406,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6289,7 +6444,7 @@ msgid "Created Menus"
 msgstr "Kreirani meniji"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6316,9 +6471,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Postavi za Uraditi"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6350,6 +6533,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Trenutna godina bez Vek-a: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6392,7 +6582,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6484,7 +6674,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6504,23 +6694,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6553,10 +6726,10 @@ msgstr "Xml izveštaj"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduli"
 
@@ -6630,9 +6803,9 @@ msgid "United Kingdom"
 msgstr "Velika Britanija"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6656,8 +6829,8 @@ msgid "Partner Titles"
 msgstr "Naslovi partnera"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6705,18 +6878,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6823,6 +6991,13 @@ msgstr "Fajl modula je uspešno uvežen!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Prelazi"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6917,7 +7092,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Država"
@@ -7018,12 +7192,6 @@ msgstr "Puno ime"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7065,6 +7233,7 @@ msgstr "Na više dokumenata"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7122,7 +7291,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Odaberite akciju koju želite da pokrenete !"
@@ -7142,6 +7311,11 @@ msgstr "Ime kategorije"
 msgid "Northern Mariana Islands"
 msgstr "Severna Marijanska Ostrva"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7153,13 +7327,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7190,7 +7369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7238,7 +7417,6 @@ msgstr "Prelaz"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7258,30 +7436,30 @@ msgid "Child Categories"
 msgstr "Kategorije potomci"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -7369,6 +7547,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Ovaj prozor"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7452,6 +7635,21 @@ msgstr "Polja"
 msgid "Employees"
 msgstr "Započljeni"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7481,11 +7679,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adrese"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7510,7 +7703,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Ulica"
@@ -7521,8 +7713,23 @@ msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7601,7 +7808,7 @@ msgid "Change My Preferences"
 msgstr "Izmena postavki"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Neispravno ime modela u definiciji akcije"
@@ -7688,14 +7895,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7704,7 +7913,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7715,13 +7924,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7743,12 +7952,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Čarobnjak"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7921,7 +8131,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7952,14 +8162,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7983,7 +8185,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8101,7 +8302,7 @@ msgid "Nigeria"
 msgstr "Nigerija"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8417,7 +8618,7 @@ msgid "Update Modules List"
 msgstr "Ažuriraj listu modula"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8429,7 +8630,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8439,7 +8640,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8454,6 +8655,17 @@ msgstr "Nastavi"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8493,7 +8705,7 @@ msgid "Mexico"
 msgstr "Meksiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8515,15 +8727,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Naziv dodatka"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8547,7 +8759,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Skraćeni naziv meseca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8559,7 +8771,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -8637,7 +8848,7 @@ msgid "Selectable"
 msgstr "Selektivan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8665,8 +8876,8 @@ msgid "Iteration"
 msgstr "Ponavljanje"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Korisnička greška"
@@ -8690,7 +8901,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8837,7 +9048,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Franciska)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8876,8 +9087,8 @@ msgid "Solomon Islands"
 msgstr "Solomonska ostrva"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Greška u pristupu"
@@ -8951,7 +9162,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8965,7 +9176,7 @@ msgid "Ukraine"
 msgstr "Ukrajina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9028,6 +9239,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9126,8 +9342,8 @@ msgid "Custom Shortcuts"
 msgstr "Prilagođene prečice"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9156,13 +9372,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9183,7 +9399,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9231,7 +9447,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9277,6 +9493,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9285,7 +9502,7 @@ msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9304,6 +9521,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9339,7 +9593,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9391,6 +9645,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9433,23 +9692,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9483,7 +9730,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9576,6 +9823,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9783,7 +10035,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9794,13 +10046,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Jedinica intervala"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Vrsta"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Ova metoda više ne postoji"
@@ -9973,7 +10230,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10008,6 +10265,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10033,6 +10295,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10122,7 +10389,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Grad"
@@ -10158,13 +10424,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonski / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Navedite naziv polja, na koji se odnosi šifra zapisa, za operacije pisanja. "
+"Ako je prazno odnosiće se na trenutnu šifru objekta."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ili novija verzija"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10223,19 +10498,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10249,6 +10549,8 @@ msgid "Activity"
 msgstr "Aktivnost"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10267,7 +10569,12 @@ msgid "Parent Company"
 msgstr "Nad kompanija"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10279,13 +10586,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10367,6 +10667,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10438,6 +10758,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tip Sekvence"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10498,9 +10823,9 @@ msgstr ""
 "Molim, prvo ga deaktiviraj."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10518,8 +10843,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem u konfiguraciji 'Šifre zapisa' u serverskoj akciji!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Greška u potvrdi"
@@ -10560,13 +10885,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10577,7 +10901,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10608,36 +10937,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10659,6 +10958,11 @@ msgstr "Ostala Vlasništva"
 msgid "Ecuador"
 msgstr "Evkador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "tok posla"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10675,16 +10979,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Ne možeš izbrisati jezik koji je kirisnikov izabrani jezik !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10701,9 +10995,9 @@ msgid "Cascade"
 msgstr "Kaskadno"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Tražena Grupa"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10728,11 +11022,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10758,7 +11047,7 @@ msgid "Domain"
 msgstr "Domen"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10774,12 +11063,12 @@ msgid "State Name"
 msgstr "Ime države"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10800,30 +11089,10 @@ msgid "Timezone"
 msgstr "Vremenska zona"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10843,7 +11112,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10890,7 +11159,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Ulica2"
 
@@ -10914,6 +11182,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10999,19 +11268,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "tok posla"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -11053,22 +11331,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11201,7 +11463,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Kupac"
 
@@ -11291,7 +11552,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11341,8 +11602,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11433,7 +11694,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11460,7 +11721,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11546,7 +11807,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11559,7 +11820,7 @@ msgid "User Ref."
 msgstr "Vezani korisnik"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11604,8 +11865,6 @@ msgstr "Referentni vodič"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11613,7 +11872,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11642,12 +11901,6 @@ msgstr "Foklandska ostrva"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11754,8 +12007,10 @@ msgid "Selection"
 msgstr "Izbor"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11792,7 +12047,7 @@ msgid "Action Type"
 msgstr "Tip akcije"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11928,11 +12183,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Sat 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Obeležite aktivno polje da biste sakrili kontakt."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11949,7 +12199,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11972,7 +12222,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "nedefinisana get metoda !"
@@ -12013,16 +12263,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binarni Fajl ili spoljni URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12069,91 +12319,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Format separatora bi trebao da bude kao [,n] gde 0 < n :započeto sa cifrom "
-"jedinice. -1 će da prekine razdvajanje. npr. [3,2,-1] predstavlja 106500 kao "
-"1,06,500;[1,2,-1] kao 106,50,0;[3] kao 106,500. Pod uslovom da je ',' "
-"separator hiljada u svakom slučaju."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12332,6 +12548,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12348,7 +12569,7 @@ msgid "Body"
 msgstr "Telo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12396,7 +12617,7 @@ msgid "choose"
 msgstr "odaberite"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12572,10 +12793,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12607,12 +12832,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12626,7 +12852,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Ostale Sitnice"
@@ -12648,23 +12873,6 @@ msgstr ""
 msgid "China"
 msgstr "Kina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12734,25 +12942,9 @@ msgid "Bulgaria"
 msgstr "Bugarska"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12780,6 +12972,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "Copy text \t ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12816,6 +13028,7 @@ msgstr "Slovak / Slovenský jezik"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "nepoznato"
@@ -12883,6 +13096,11 @@ msgstr "Adresar"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12972,6 +13190,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12984,7 +13203,7 @@ msgid "Information"
 msgstr "Informacija"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13015,16 +13234,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Nadogradi listu Modula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13089,6 +13312,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13161,29 +13389,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13231,7 +13436,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13275,9 +13480,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Pravila zapisa"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13521,9 +13726,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13550,63 +13760,14 @@ msgid "System Configuration done"
 msgstr "Konfiguracija sistema je završena"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks i Kaikos ostrva"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13647,17 +13808,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13692,7 +13842,7 @@ msgid "Low"
 msgstr "Nizak"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Greška ! Ne možeš kreirati rekursivni meni."
@@ -13774,11 +13924,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13793,6 +13942,11 @@ msgstr "Pristupi meniju"
 msgid "Thailand"
 msgstr "Tajland"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13813,6 +13967,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13849,41 +14027,6 @@ msgstr "Veza objekta"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13944,40 +14087,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14066,6 +14177,21 @@ msgstr "Pregled :"
 msgid "View Auto-Load"
 msgstr "Automatsko učitavanje pregleda"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14108,34 +14234,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14158,9 +14256,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14171,7 +14269,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14197,7 +14325,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14242,7 +14370,7 @@ msgid "Access"
 msgstr "Pristup"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14275,11 +14403,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14295,8 +14422,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14411,7 +14536,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14423,7 +14548,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14456,7 +14580,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14467,8 +14591,8 @@ msgid "Azerbaijan"
 msgstr "Azerbejdžan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -14494,11 +14618,6 @@ msgstr "Devičanska ostrva (Engleska)"
 msgid "Parameters"
 msgstr "Parametri"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Sveti Pjer i Mikelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14588,7 +14707,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Zemlja"
@@ -14659,9 +14777,17 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Format separatora bi trebao da bude kao [,n] gde 0 < n :započeto sa cifrom "
+"jedinice. -1 će da prekine razdvajanje. npr. [3,2,-1] predstavlja 106500 kao "
+"1,06,500;[1,2,-1] kao 106,50,0;[3] kao 106,500. Pod uslovom da je ',' "
+"separator hiljada u svakom slučaju."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14688,7 +14814,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14749,6 +14875,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14773,7 +14930,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Upamtite da ova operacija zna potrajati i nekoliko minuta."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14812,6 +14969,12 @@ msgstr "Izvršenje"
 msgid "Condition"
 msgstr "Uslov"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14866,6 +15029,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Hrvatska"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14890,6 +15060,11 @@ msgstr "Nadogradnja Sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14906,7 +15081,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14927,15 +15102,52 @@ msgstr "Sijera Leone"
 msgid "General Information"
 msgstr "Opšte informacije"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks i Kaikos ostrva"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14971,7 +15183,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14989,11 +15206,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Sledeći broj sekvence će biti uvećan za ovaj broj"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcija"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15029,11 +15250,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Dostava"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15061,7 +15277,7 @@ msgid "Workflow Instances"
 msgstr "Instance toka posla"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneri: "
@@ -15072,7 +15288,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15138,7 +15354,6 @@ msgstr "Naziv izvoza"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15199,6 +15414,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "Na više dok."
 
+#~ msgid "Contact Name"
+#~ msgstr "Ime kontakta"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15267,6 +15485,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Priključena šifra"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Zadržite 0 ako akcija mora da se pojavi na svim resursima."
 
@@ -15277,6 +15498,9 @@ msgstr ""
 #~ "Navedite poruku. Možete da koristite polja objekta. Npr. 'Dragi [[ "
 #~ "object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Pridruženi model"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Naziv okidača"
 
@@ -15436,6 +15660,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW putanja"
 
+#~ msgid "Creator"
+#~ msgstr "Autor"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15527,6 +15754,9 @@ msgstr ""
 #~ msgid "res.config.view"
 #~ msgstr "res.config.view"
 
+#~ msgid "Addresses"
+#~ msgstr "Adrese"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML Identifikator"
 
@@ -15650,12 +15880,18 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Učitaj službeni prevod"
 
+#~ msgid "Delivery"
+#~ msgstr "Dostava"
+
 #~ msgid "Report Header"
 #~ msgstr "Zaglavlje izveštaja"
 
 #~ msgid "Type fields"
 #~ msgstr "Polja vrste"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Obeležite aktivno polje da biste sakrili kontakt."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Demokratska Republika Kongo"
 
@@ -16299,6 +16535,9 @@ msgstr ""
 #~ msgid "Emails"
 #~ msgstr "Emailovi"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binarni Fajl ili spoljni URL"
+
 #~ msgid "- type,name,res_id,src,value"
 #~ msgstr "- type,name,res_id,src,vrednost"
 
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index f4dae404416..d207a2b17f9 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:03+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "datum-vreme"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -193,41 +193,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -237,7 +211,7 @@ msgstr ""
 "promijeniti u Python kodu, najbolje u korisničkom modulu."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Sadrži grešku"
@@ -248,7 +222,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "Preimenovanje polja \"%s\" nije dopušteno"
@@ -259,7 +233,7 @@ msgid "Swaziland"
 msgstr "Švajcarska"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "kreirano."
@@ -338,20 +312,6 @@ msgstr "Kompanija koja će sačuvati trenutni zapis"
 msgid "Max. Size"
 msgstr "Max.Veličina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -359,11 +319,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Ime Kontakta"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -428,7 +383,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -465,6 +420,7 @@ msgstr "Pravila automatskih radnji"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Vlasnik"
 
@@ -505,7 +461,7 @@ msgstr ""
 "formata, prikazuju se pri uređuvanju jezika."
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -562,7 +518,7 @@ msgid "Netherlands Antilles"
 msgstr "Holandski Antili"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -602,9 +558,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Originalni pregled"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Ideje"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -629,26 +585,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -659,9 +595,25 @@ msgstr ""
 " vraća  prethodni izvještaj."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -737,14 +689,12 @@ msgstr ""
 "Sadržaj rečnika kao Pithon ekspresija, podrazumevano je prazan  (Default: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Čarobnjak"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Imena prilagođenih polja moraju počinjati sa 'x_' !"
@@ -808,17 +758,21 @@ msgid "Model Description"
 msgstr "Opis Modela"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
+"\n"
+"Meni Marketinga.\n"
+"===================\n"
+"\n"
+"Sadrži instalere za module vezane za marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -846,11 +800,21 @@ msgstr "Izraz koji koji pokreće radnju"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Datum sledećeg planskog pokretanja ovoe radnje."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -982,13 +946,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Unesite naziv polja na kojega se odnosi ID zapisa za upis. Ako je prazno "
-"odnosiće se na trenutno aktivan ID objekta."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nova Gvineja"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1007,7 +967,7 @@ msgid "Email Preferences"
 msgstr "Postavke za E-mail"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1055,16 +1015,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Španski / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobilni"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1173,9 +1126,38 @@ msgid "Mongolia"
 msgstr "Mongolija"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1190,12 +1172,17 @@ msgstr ""
 "Kosisnici dodati ovoj grupi su automatski pridodati i sledećim grupama."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1222,7 +1209,54 @@ msgid "Username"
 msgstr "Korisničko ime"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1252,7 +1286,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Neuspešan Test konekcije!"
@@ -1284,14 +1318,12 @@ msgid "South Korea"
 msgstr "Južna Koreja"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Prelazi"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Zapis #%d od %s nije pronađen, ne mogu da kopiram!"
@@ -1429,7 +1461,7 @@ msgid "Marshall Islands"
 msgstr "Maršalska ostrva"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Nije dopušteno mjenjanje modela polja."
@@ -1451,7 +1483,7 @@ msgid "Search"
 msgstr "Traži"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1470,7 +1502,14 @@ msgid "Parent Application"
 msgstr "Nadređena aplikacija"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Čarobnjak"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Radnja Otkazana"
@@ -1602,7 +1641,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Ne postoji jezik sa kodom  \"%s\""
@@ -1723,7 +1776,7 @@ msgid "On Create"
 msgstr "Pri kreiranju"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1732,11 +1785,6 @@ msgstr ""
 "'%s' sadrži previše tačaka. XML id ne bi trebalo da sadrži tačke. One "
 "koriste za referovanje na podatke drugih modula npr  module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1819,7 +1867,7 @@ msgid "East Timor"
 msgstr "Istočni Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1860,11 +1908,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "ID Dodatka"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1882,7 +1925,7 @@ msgstr ""
 "mnogo vise."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1923,6 +1966,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Pristup koji omogućava čitanje"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1999,16 +2047,11 @@ msgid "Create Tasks on SO"
 msgstr "Kreiranje zadataka iz prodajnih naloga"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Pridodani Model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2063,7 +2106,7 @@ msgid "Formula"
 msgstr "Formula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Ne mogu ukloniti root korisnika"
@@ -2094,11 +2137,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopiranje)"
@@ -2110,7 +2153,6 @@ msgstr "Izgled računovodstvenih Kartica"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Tip Adrese"
 
@@ -2148,11 +2190,6 @@ msgstr "Kompletna putanja"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Ideje"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2289,6 +2326,11 @@ msgstr "Broj nadograđenih modula"
 msgid "Method"
 msgstr "Metod"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2322,12 +2364,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2377,6 +2424,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Dodaj ili ne korporativno RML zaglavlje"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2430,7 +2486,7 @@ msgstr ""
 "'stablo', 'kalendar', itd(Podrazumevano je:stablo,obrazac)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Dokument je  promenjen od vaše poslednje posete (%s:%d)"
@@ -2523,7 +2579,6 @@ msgstr "Sveti Toma (sao Tome) i Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2570,11 +2625,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2699,9 +2749,20 @@ msgid "Default limit for the list view"
 msgstr "Podrazumevani limit broja stavki liste"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nova Gvineja"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2779,7 +2840,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2838,6 +2899,19 @@ msgstr "Mapiranje polja"
 msgid "Export Translations"
 msgstr "Izvoz Prevoda"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2846,7 +2920,7 @@ msgid "Manager"
 msgstr "Menadžer"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2932,7 +3006,7 @@ msgid "Inherited"
 msgstr "Nasleđeni"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2962,7 +3036,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -3029,22 +3103,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Neispravna struktura objekta!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Greška"
@@ -3141,12 +3215,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Greška! Ne možete da napravite rekurzivna preduzeća."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3163,19 +3237,32 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"Ovo je modul za upravljanje kontnim planom Poljske u OpenERP-u.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3183,7 +3270,7 @@ msgid "Params storage"
 msgstr "Sačuvaj parametre"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Nije moguće nadograditi modul '%s'. Nije instaliran."
@@ -3234,34 +3321,6 @@ msgstr "Parametri Konfiguracije"
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3300,7 +3359,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3312,6 +3371,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Vrsta bankovnog računa"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3348,7 +3435,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (podtok.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3388,7 +3475,7 @@ msgid "Access Controls"
 msgstr "Kontrole pristupa"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3418,32 +3505,6 @@ msgstr "Glavno preduzeće"
 msgid "Web Icon File (hover)"
 msgstr "Web Ikona Fajla (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3463,9 +3524,13 @@ msgstr ""
 "Ako koristite tip formula, upotrebite python izraz koristeći promenjivu "
 "'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Greška! Ne možete da napravite rekurzivna preduzeća."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Datum Rodjenja"
 
@@ -3481,7 +3546,7 @@ msgid "Products Manufacturers"
 msgstr "Proizvođači"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP preko SSL moda nedostupno"
@@ -3598,7 +3663,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3789,7 +3854,6 @@ msgstr "Izveštavanje"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Naslov"
@@ -3801,13 +3865,18 @@ msgstr ""
 "Ukoliko nije postavljeno, deluje kao podrazumevana vrednost za nove resurse"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Detektovana rekurzivnost."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekurzivna greška u zavisnosti modula !"
@@ -3867,9 +3936,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3880,7 +3950,7 @@ msgid "Company Name"
 msgstr "Naziv Preduzeca"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3901,14 +3971,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML ( zastarelo - koristi izveštaj)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "Jezički kod prevedene stavke mora pripadati nekom od poznatih jezika"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Sveti Pjer i Mikelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3937,13 +4030,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3991,19 +4080,7 @@ msgid "Paper Format"
 msgstr "Format Papira"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4023,7 +4100,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4074,7 +4151,7 @@ msgid "Email Gateway"
 msgstr "Email Gateway"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4095,9 +4172,43 @@ msgid "Technical Data"
 msgstr "Tehnički podaci"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4153,13 +4264,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Pogrešna arhitektura!"
@@ -4175,9 +4291,9 @@ msgid "Share any Document"
 msgstr "Deli sve Dokumente"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Tražena Grupa"
 
 #. module: base
 #: view:res.lang:0
@@ -4238,33 +4354,10 @@ msgid "Languages"
 msgstr "Jezici"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4350,7 +4443,6 @@ msgstr "Ograničenje"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Podrazumevano"
 
@@ -4425,6 +4517,11 @@ msgstr ""
 "koji će se koristiti. Podrazumevani prioritet je 10 (manji broj=veći "
 "prioritet)"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4488,9 +4585,16 @@ msgid "Default value or action reference"
 msgstr "Podrazumevana vrednost ili referentna akcija"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4570,6 +4674,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4596,6 +4716,43 @@ msgstr ""
 "je ovo polje prazno, OpenERP će sam proračunati vidljivost na osnovu "
 "pristupnih prava čitanja."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4625,6 +4782,12 @@ msgstr ""
 msgid "View"
 msgstr "Pregled"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4702,12 +4865,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4722,7 +4879,6 @@ msgstr "Švajcarska - Računovodstvo"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "ZIP"
@@ -4733,13 +4889,18 @@ msgstr "ZIP"
 msgid "Author"
 msgstr "Autor"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Postavi za Uraditi"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Odgovarajući prikaz datuma i vremena."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4786,6 +4947,8 @@ msgstr "Pravac"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Pregledi"
 
@@ -4801,7 +4964,7 @@ msgid "SMTP Server"
 msgstr "SMTP server"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4898,7 +5061,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4986,7 +5154,7 @@ msgid "System Configuration Done"
 msgstr "Konfiguracija Sistema je završena"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Greška prilikom provere polja %s: %s"
@@ -5101,6 +5269,11 @@ msgstr "Mauricijus"
 msgid "Full Access"
 msgstr "Potpuni pristup"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5114,7 +5287,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "Promena sistema čuvanja za polja  \"%s\" nije dozvoljena"
@@ -5125,7 +5298,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Samo ukoliko bankovni račun pripada tvom preduzeću"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5157,6 +5330,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Mađarska"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5321,7 +5505,7 @@ msgid "Account Owner Name"
 msgstr "Ime vlasnka naloga"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5338,16 +5522,11 @@ msgid "Decimal Separator"
 msgstr "Decimalni separator"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5394,9 +5573,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Kreator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Ime modula mora biti jedinstveno !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5459,15 +5639,6 @@ msgstr "Venecuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5483,6 +5654,11 @@ msgstr "Pokreni Konfiguracionog Čarobnjaka"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Naziv dodatka"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5566,6 +5742,12 @@ msgstr "Kazahstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Broj dana nedelje [0(Sunday),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Naziv resursa"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5820,7 +6002,7 @@ msgid "title"
 msgstr "naslov"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5877,6 +6059,15 @@ msgstr "Proizvodi"
 msgid "User-defined Defaults"
 msgstr "Korisnički definisane podrazumevane vrednosti"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5994,13 +6185,15 @@ msgid "Bank Type"
 msgstr "Vrsta banke"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Naziv grupe ne može da počinje sa \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Aplikacije"
 
@@ -6020,7 +6213,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6054,10 +6247,9 @@ msgid "Uncategorized"
 msgstr "Nekategorisano"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Naziv resursa"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6093,6 +6285,11 @@ msgstr ""
 "signal testira ime stisnutog dugmeta. Ako je signal NULL, ni jedno dugme "
 "nije neophodno da bi se potvrdila ova tranzicija."
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Originalni pregled"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6103,7 +6300,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6119,26 +6316,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Moje Banke"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6271,11 +6448,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6287,8 +6459,8 @@ msgid "Malaysia"
 msgstr "Malezija"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6397,7 +6569,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Pregled tipa '%s' ne postoji!"
@@ -6435,7 +6607,7 @@ msgid "Created Menus"
 msgstr "Kreirani meniji"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6462,9 +6634,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Postavi za Uraditi"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6496,6 +6696,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Trenutna godina bez Vek-a: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6547,7 +6754,7 @@ msgid "Audit Trail"
 msgstr "Revizija Praćenja"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6639,7 +6846,7 @@ msgid "Israel"
 msgstr "Izrael"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6659,29 +6866,6 @@ msgstr "Ponekad nazvanim BIC ili SWIFT"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"Ovaj modul upravlja kontnim planom za Meksiko u OpenERP-u.\n"
-"=============================================================\n"
-"\n"
-"Meksički kontni plan i lokalizacija.\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6714,10 +6898,10 @@ msgstr "Xml izveštaj"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduli"
 
@@ -6791,9 +6975,9 @@ msgid "United Kingdom"
 msgstr "Velika Britanija"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6817,8 +7001,8 @@ msgid "Partner Titles"
 msgstr "Naslovi partnera"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6866,7 +7050,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6875,11 +7059,6 @@ msgstr ""
 "Nije moguće izvršiti radnju. Stvaranje novog zapisa nije dozvoljeno za "
 "objekte namenjene izveštavanju."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6988,6 +7167,13 @@ msgstr "Fajl modula je uspešno uvežen!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Prelazi"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7086,7 +7272,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Federalna država"
@@ -7187,12 +7372,6 @@ msgstr "Puno ime"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Ime modula mora biti jedinstveno !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7236,6 +7415,7 @@ msgstr "Na više dokumenata"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7293,7 +7473,7 @@ msgid "Connection Security"
 msgstr "Bezbednost konekcije"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Odaberite akciju koju želite da pokrenete !"
@@ -7313,6 +7493,11 @@ msgstr "Ime kategorije"
 msgid "Northern Mariana Islands"
 msgstr "Severna Marijanska Ostrva"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7324,7 +7509,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat Izveštavanja"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7333,6 +7518,11 @@ msgstr ""
 "Koristite čarobnjaka za promenu lozinke.(korisničke postavke ili Korisnički "
 "meni)"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7363,7 +7553,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Nedovoljno polja za Pregled Kalendara"
@@ -7411,7 +7601,6 @@ msgstr "Tranzicija"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7431,30 +7620,30 @@ msgid "Child Categories"
 msgstr "Pod kategorije"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -7542,6 +7731,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Ovaj prozor"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7627,6 +7821,21 @@ msgstr "Polja"
 msgid "Employees"
 msgstr "Zapošljeni"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7656,11 +7865,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Isprobaj vezu"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adrese"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7685,7 +7889,6 @@ msgstr "Opcije Selekcije"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Ulica"
@@ -7696,9 +7899,24 @@ msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Desni Nadređeni"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7776,7 +7994,7 @@ msgid "Change My Preferences"
 msgstr "Izmena postavki"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
@@ -7871,21 +8089,17 @@ msgid "US Letter"
 msgstr "SAD pismo"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"Meni Marketinga.\n"
-"===================\n"
-"\n"
-"Sadrži instalere za module vezane za marketing.\n"
-"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7893,7 +8107,7 @@ msgid "Company Bank Accounts"
 msgstr "Bankovni Računi Preduzeća"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Postavljanje prazne lozinke nije dozvoljeno iz sigurnosnih razloga!"
@@ -7904,13 +8118,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "Opcionalna Lozinka za SMTP autentifikaciju"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7932,12 +8146,13 @@ msgid "Normal Bank Account"
 msgstr "Normalni Bančin nalog"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Čarobnjak"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -8110,7 +8325,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8141,14 +8356,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Upozorenje !"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8172,7 +8379,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8290,7 +8496,7 @@ msgid "Nigeria"
 msgstr "Nigerija"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Za selktovana polja , moraju biti zadate selekcione opcije!"
@@ -8607,7 +8813,7 @@ msgid "Update Modules List"
 msgstr "Ažuriraj listu modula"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8621,7 +8827,7 @@ msgid "eInvoicing"
 msgstr "eFakturisanje"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8635,7 +8841,7 @@ msgstr ""
 "(Možete kliknuti na 'Odustani' u Korisničkim postavkama)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "sadržaj  \"%s\" za polje \"%s.%s\" nije u selekciji"
@@ -8650,6 +8856,17 @@ msgstr "Nastavi"
 msgid "Thai / ภาษาไทย"
 msgstr "Thai / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8697,7 +8914,7 @@ msgid "Mexico"
 msgstr "Meksiko"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8719,15 +8936,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Nedostaje SMTP Server"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Naziv dodatka"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "Jezički kod prevedene stavke mora pripadati nekom od poznatih jezika"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8751,7 +8968,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Skraćeni naziv meseca."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8763,7 +8980,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -8841,7 +9057,7 @@ msgid "Selectable"
 msgstr "Selektivan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Izgleda da je sve postavljeno u redu!"
@@ -8869,8 +9085,8 @@ msgid "Iteration"
 msgstr "Ponavljanje"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Korisnička greška"
@@ -8894,7 +9110,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9048,7 +9264,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Francuska)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9088,8 +9304,8 @@ msgid "Solomon Islands"
 msgstr "Solomonska ostrva"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Greška u pristupu"
@@ -9163,7 +9379,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9177,7 +9393,7 @@ msgid "Ukraine"
 msgstr "Ukrajina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9240,6 +9456,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flemish (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamese / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9338,9 +9559,9 @@ msgid "Custom Shortcuts"
 msgstr "Prilagođene prečice"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9368,13 +9589,13 @@ msgid "Models"
 msgstr "Modeli"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Zapis ne može biti sada modifikovan"
@@ -9395,7 +9616,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9443,7 +9664,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Model  %s ne postoji!"
@@ -9489,6 +9710,7 @@ msgstr "USA - kontni plan"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9497,7 +9719,7 @@ msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9516,6 +9738,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9551,7 +9810,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9603,6 +9862,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Sati (12-satni sat) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9645,23 +9909,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Valutni kod mora biti jedinstven po preduzeću"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9704,7 +9956,7 @@ msgid "Products Expiry Date"
 msgstr "Datum isteka trajanja proizvoda"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Klikni na  'Nastavi ' da konfigurišeš sledeći dodatak..."
@@ -9803,6 +10055,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10010,7 +10267,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Marketingška Kampanja -DEMO"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10021,13 +10278,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Jedinica intervala"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Vrsta"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Ova metoda više ne postoji"
@@ -10200,7 +10462,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10239,6 +10501,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10265,6 +10532,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "URL ikona"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10356,7 +10628,6 @@ msgstr "%m - broj Meseca [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Grad"
@@ -10392,13 +10663,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonski / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Unesite naziv polja na kojega se odnosi ID zapisa za upis. Ako je prazno "
+"odnosiće se na trenutno aktivan ID objekta."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 ili novija verzija"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10459,19 +10739,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10485,6 +10790,8 @@ msgid "Activity"
 msgstr "Aktivnost"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10503,7 +10810,12 @@ msgid "Parent Company"
 msgstr "Nad kompanija"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Autentifikacija"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10515,13 +10827,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10618,6 +10923,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10692,6 +11017,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Tip Sekvence"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10760,9 +11090,9 @@ msgstr ""
 "Molim, prvo ga deaktiviraj."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10780,8 +11110,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problem u konfiguraciji 'ID zapisa' u akciji servera!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "PotvrdiGresku"
@@ -10822,13 +11152,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-mail"
@@ -10839,7 +11168,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10882,36 +11216,6 @@ msgstr ""
 " - uid: current user id\n"
 " - context: current context"
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10935,6 +11239,11 @@ msgstr "Ostala Vlasništva"
 msgid "Ecuador"
 msgstr "Ekvador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "tok posla"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10951,21 +11260,6 @@ msgstr "Poslovi po Ugovoru"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Ne možete obrisati jezik. Postoje korisnici koji ga koriste!"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"Ovo je modul za upravljanje kontnim planom za Venecuelu u OpenERP-u.\n"
-"=======================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10982,9 +11276,9 @@ msgid "Cascade"
 msgstr "Kaskadno"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Tražena Grupa"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11011,11 +11305,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11041,7 +11330,7 @@ msgid "Domain"
 msgstr "Domen"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -11057,12 +11346,12 @@ msgid "State Name"
 msgstr "Ime države"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -11083,30 +11372,10 @@ msgid "Timezone"
 msgstr "VremenskaZona"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11126,7 +11395,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11179,7 +11448,6 @@ msgstr "Dvostruka provera pri Kupovinama"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Ulica2"
 
@@ -11203,6 +11471,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11296,19 +11565,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Greška Integriteta"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "tok posla"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Veličina polja nikada ne može biti manja od 1!"
@@ -11350,22 +11628,6 @@ msgstr "Direktorijum Zaposlenih"
 msgid "Arguments"
 msgstr "Argumenti"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11498,7 +11760,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Mušterija"
 
@@ -11588,7 +11849,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11638,9 +11899,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Autentifikacija"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11730,7 +11991,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Isporuka Emaila Neuspešna"
@@ -11757,7 +12018,7 @@ msgid "Object"
 msgstr "Objekat"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11846,7 +12107,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11861,7 +12122,7 @@ msgid "User Ref."
 msgstr "Referentni Korisnik"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11906,8 +12167,6 @@ msgstr "Referentni vodič"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11915,7 +12174,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11946,12 +12205,6 @@ msgstr "Foklandska Ostrva"
 msgid "Lebanon"
 msgstr "Liban"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12058,9 +12311,11 @@ msgid "Selection"
 msgstr "Selekcija"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "URL ikona"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12096,7 +12351,7 @@ msgid "Action Type"
 msgstr "Tip Akcije"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12234,11 +12489,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Sat 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Razčekitajte polje aktivan da biste sakrili kontakt."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12255,7 +12505,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Nepoznat atribut %s u %s "
@@ -12278,7 +12528,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "nedefinirana get metoda !"
@@ -12319,16 +12569,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Platno Računovodstvo"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binarna datoteka ili externi URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12375,92 +12625,57 @@ msgid "Address Format"
 msgstr "Format Adrese"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"Format separatora bi trebao biti kao [,n] gdje je 0 < n:započeto s brojem "
-"jedinice. -1 će prekinuti razdvajanje. npr. [3,2,-1] predstavlja 106500 da "
-"bude 1,06,500;[1,2,-1] će ga predstavljati kao 106,50,0;[3] će ga "
-"predstavljati kao 106,500. Pod uslovom da je ',' separator hiljada u svakom "
-"slučaju."
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Tehničke mogućnosti"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12646,6 +12861,11 @@ msgstr ""
 "POmaze ti da upravljas svojim inventarom i glavnim magacinskim zadacima: "
 "Isporuka zahteva, prijemi, itd..."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12662,7 +12882,7 @@ msgid "Body"
 msgstr "Telo"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Konekcija uspešno testirana"
@@ -12710,7 +12930,7 @@ msgid "choose"
 msgstr "odaberite"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12890,10 +13110,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12932,12 +13156,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12952,7 +13177,6 @@ msgstr "Registar preduzeća"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Ostalo"
@@ -12974,34 +13198,6 @@ msgstr ""
 msgid "China"
 msgstr "Kina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"Ovo je modul za upravljanje kontnim planom Poljske u OpenERP-u.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13077,25 +13273,9 @@ msgid "Bulgaria"
 msgstr "Bugarska"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13123,6 +13303,26 @@ msgstr "5. %y, %Y ==> 11, 2011"
 msgid "ltd"
 msgstr "d.o.o."
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13159,6 +13359,7 @@ msgstr "Slovački / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "nepoznato"
@@ -13226,6 +13427,11 @@ msgstr "Adresar"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13315,6 +13521,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13327,7 +13534,7 @@ msgid "Information"
 msgstr "Informacija"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13358,16 +13565,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Desni Nadređeni"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Ažuriraj listu modula"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13434,6 +13645,11 @@ msgstr ""
 "osv_memory polje se može samo porediti sa = i != operatorom ( jednako i "
 "različito)"
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13506,29 +13722,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Eksterni Identifikatir"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13576,7 +13769,7 @@ msgid "Delivery Costs"
 msgstr "Troškovi Dostave"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13627,9 +13820,9 @@ msgstr ""
 "Deaktivira minimalni grafikon naloga\n"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Enkripcija lozinke databaze"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Pravila zapisa"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13877,9 +14070,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13906,63 +14104,14 @@ msgid "System Configuration done"
 msgstr "Završena je konfiguracija sistema"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks i Kaikos Ostrva"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -14003,17 +14152,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14051,7 +14189,7 @@ msgid "Low"
 msgstr "Nizak"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Greška ! Ne možete kreirati rekurzivni meni."
@@ -14133,11 +14271,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon:"
@@ -14152,6 +14289,11 @@ msgstr "Meni Pristupa"
 msgid "Thailand"
 msgstr "Tajland"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14172,6 +14314,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romanian / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14208,41 +14374,6 @@ msgstr "Relacija objekta"
 msgid "eInvoicing & Payments"
 msgstr "eFakturisanje & Plaćanja"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14303,40 +14434,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14427,6 +14526,21 @@ msgstr "Pregled"
 msgid "View Auto-Load"
 msgstr "Pregled Auto-Učitavanja"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14469,34 +14583,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14519,9 +14605,9 @@ msgid "Unmet dependency !"
 msgstr "Neispunjene zavisnosti !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14532,7 +14618,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14558,7 +14674,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14603,7 +14719,7 @@ msgid "Access"
 msgstr "Pristup"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14636,11 +14752,10 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faks"
@@ -14656,8 +14771,6 @@ msgstr "Faks"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14772,7 +14885,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14785,7 +14898,6 @@ msgstr "Jamajka"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Indeks boja"
 
@@ -14818,7 +14930,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14829,8 +14941,8 @@ msgid "Azerbaijan"
 msgstr "Azerbejdžan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -14856,11 +14968,6 @@ msgstr "Devičanska ostrva"
 msgid "Parameters"
 msgstr "Parametri"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Sveti Pjer i Mikelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14952,7 +15059,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Država"
@@ -15023,9 +15129,18 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Format separatora bi trebao biti kao [,n] gdje je 0 < n:započeto s brojem "
+"jedinice. -1 će prekinuti razdvajanje. npr. [3,2,-1] predstavlja 106500 da "
+"bude 1,06,500;[1,2,-1] će ga predstavljati kao 106,50,0;[3] će ga "
+"predstavljati kao 106,500. Pod uslovom da je ',' separator hiljada u svakom "
+"slučaju."
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15052,7 +15167,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "možete samo reimenocati kolone jednu po jednu"
@@ -15113,6 +15228,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Kanada - Računovodstvo"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15137,7 +15283,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Ova operacija može potrajati nekoliko minuta."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15176,6 +15322,12 @@ msgstr "Izvršavanje"
 msgid "Condition"
 msgstr "Uslov"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15230,6 +15382,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Hrvatska"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15254,6 +15413,11 @@ msgstr "Ažuriranje Sistema"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15270,7 +15434,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15291,15 +15455,52 @@ msgstr "Siera Leone"
 msgid "General Information"
 msgstr "Opšte informacije"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks i Kaikos Ostrva"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15335,7 +15536,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Upozorenje Prelaz na drugo preduzeće"
@@ -15355,11 +15561,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Sledeći broj ovog niza biće povećan ovim brojem"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funkcija"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15397,11 +15607,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Isporuka"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15429,7 +15634,7 @@ msgid "Workflow Instances"
 msgstr "Instance Radnog Toka"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Partneri: "
@@ -15440,7 +15645,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15506,7 +15711,6 @@ msgstr "Naziv izvoza"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15578,6 +15782,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "NA više dok."
 
+#~ msgid "Contact Name"
+#~ msgstr "Ime Kontakta"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15694,6 +15901,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "ID Dodatka"
+
 #~ msgid "OpenERP Web web"
 #~ msgstr "OpenERP Web web"
 
@@ -15703,6 +15913,9 @@ msgstr ""
 #~ msgid "Symbol position"
 #~ msgstr "Pozicija Simbola"
 
+#~ msgid "Attached Model"
+#~ msgstr "Pridodani Model"
+
 #~ msgid "General Information Footer"
 #~ msgstr "Podnožje Generalne Informacije"
 
@@ -16185,6 +16398,9 @@ msgstr ""
 #~ msgid "Apply For Delete"
 #~ msgstr "Prihvati za brisanje"
 
+#~ msgid "Creator"
+#~ msgstr "Kreator"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -16355,6 +16571,9 @@ msgstr ""
 #~ msgstr ""
 #~ "ako je ova stavka loga pročitana , get() ne bi trebalo slati klijentu"
 
+#~ msgid "Addresses"
+#~ msgstr "Adrese"
+
 #, python-format
 #~ msgid "Reg: "
 #~ msgstr "Reg: "
@@ -17181,9 +17400,15 @@ msgstr ""
 #~ msgid "Generate Docs of Modules"
 #~ msgstr "Generiši dokumente modula"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Razčekitajte polje aktivan da biste sakrili kontakt."
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Dodaj widget za korisnika"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binarna datoteka ili externi URL"
+
 #~ msgid "Modules to update"
 #~ msgstr "Moduli za nadogradnju"
 
@@ -17283,6 +17508,9 @@ msgstr ""
 #~ msgid "Check writing"
 #~ msgstr "Provera pisanja"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Enkripcija lozinke databaze"
+
 #~ msgid "Other Actions Configuration"
 #~ msgstr "Konfiguracije Ostalih Akcija"
 
@@ -17544,6 +17772,9 @@ msgstr ""
 #~ msgid "eMail Gateway for Project Issues"
 #~ msgstr "eMail Gateway za Probleme Projekta"
 
+#~ msgid "Delivery"
+#~ msgstr "Isporuka"
+
 #~ msgid "Search Widget"
 #~ msgstr "Pretraga Widgeta"
 
@@ -18441,6 +18672,21 @@ msgstr ""
 #~ msgid "Issues Tracker"
 #~ msgstr "Pratilac Problema"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ovaj modul upravlja kontnim planom za Meksiko u OpenERP-u.\n"
+#~ "=============================================================\n"
+#~ "\n"
+#~ "Meksički kontni plan i lokalizacija.\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "Module for human resource management.\n"
@@ -19476,6 +19722,19 @@ msgstr ""
 #~ "                 \"Kontakti\", \"Zaposleni\", \"Sastanci\", \"TelPozivi\", "
 #~ "\"Emailovi\",  i Projekat, podatke projektnih zadataka u OpenERP modul."
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ovo je modul za upravljanje kontnim planom za Venecuelu u OpenERP-u.\n"
+#~ "=======================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module allows to implement action rules for any object.\n"
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 6cf2424310a..de25daf6954 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:00+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Datum/Tid"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -190,41 +190,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Varning!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -234,7 +208,7 @@ msgstr ""
 "ändra dem med Pythonkod, eller via ett eget tillägg."
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Restriktionsfel"
@@ -245,7 +219,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -256,7 +230,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "skapad."
@@ -335,20 +309,6 @@ msgstr "Bolag att lagra den aktuella posten på"
 msgid "Max. Size"
 msgstr "Största storlek"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -356,11 +316,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kontaktnamn"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -419,7 +374,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -456,6 +411,7 @@ msgstr "Automatiska åtgärdsregler"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Ägare"
 
@@ -494,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -547,7 +503,7 @@ msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -587,9 +543,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Originalvy"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -614,26 +570,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Bosniska/bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -644,9 +580,25 @@ msgstr ""
 "skriver ut andra gången med samma bilagenamn."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -721,14 +673,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Guider"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Anpassade fält måste ha ett namn som börjar med 'x_' ."
@@ -792,16 +742,14 @@ msgid "Model Description"
 msgstr "Modellbeskrivning"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -830,11 +778,21 @@ msgstr "Trigger-uttryck"
 msgid "Jordan"
 msgstr "Jordan"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -965,11 +923,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Nya Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -987,7 +943,7 @@ msgid "Email Preferences"
 msgstr "E-postinställningar"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1035,16 +991,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanska (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1141,9 +1090,38 @@ msgid "Mongolia"
 msgstr "Mongoliet"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1157,12 +1135,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1189,7 +1172,54 @@ msgid "Username"
 msgstr "Användarnamn"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1219,7 +1249,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1251,14 +1281,12 @@ msgid "South Korea"
 msgstr "Sydkorea"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Övergångar"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Post #%d av %s saknas, kan inte kopiera!"
@@ -1396,7 +1424,7 @@ msgid "Marshall Islands"
 msgstr "Marshallöarna"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Förbjudet att ändring av fältets klasstillhörighet!"
@@ -1418,7 +1446,7 @@ msgid "Search"
 msgstr "Sök"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1437,7 +1465,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Guider"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "Åtgärden avbruten"
@@ -1569,7 +1604,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Inget språk med koden %s existerar"
@@ -1687,7 +1736,7 @@ msgid "On Create"
 msgstr "Vid skapande"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1697,11 +1746,6 @@ msgstr ""
 "punkter. Dessa används för att referera till moduldata, som i "
 "modul.referensid"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1784,7 +1828,7 @@ msgid "East Timor"
 msgstr "Östtimor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1825,11 +1869,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Bifogat ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1844,7 +1883,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1885,6 +1924,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Lästillgång"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1961,16 +2005,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Modell som används"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2025,7 +2064,7 @@ msgid "Formula"
 msgstr "Formel"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Kan inte ta bort root-användare."
@@ -2049,11 +2088,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -2065,7 +2104,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adresstyp"
 
@@ -2103,11 +2141,6 @@ msgstr "Fullständig sökväg"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2243,6 +2276,11 @@ msgstr "Antal uppdaterade moduler"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2276,12 +2314,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2331,6 +2374,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Lägg till (eller inte) bolagets RML-sidhuvud"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2384,7 +2436,7 @@ msgstr ""
 "'calendar', etc. (Standard: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Ett dokument har modifierats sedan du sist såg det (%s:%d)."
@@ -2477,7 +2529,6 @@ msgstr "Saint Tome (Sao Tome) and Principe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -2524,11 +2575,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2646,9 +2692,20 @@ msgid "Default limit for the list view"
 msgstr "Standardgräns för listvyn"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Nya Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2726,7 +2783,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2785,6 +2842,19 @@ msgstr "Fältmappning"
 msgid "Export Translations"
 msgstr "Exportera översättningar"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2793,7 +2863,7 @@ msgid "Manager"
 msgstr "Chef"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2879,7 +2949,7 @@ msgid "Inherited"
 msgstr "Ärvd"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2909,7 +2979,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2976,22 +3046,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Ogiltig objektarkitektur"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Fel"
@@ -3088,12 +3158,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3110,17 +3180,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3130,7 +3202,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Kan inte uppgradera modulen \"%s\". Den är inte installerad."
@@ -3181,34 +3253,6 @@ msgstr "Konfigurationsparametrar"
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3247,7 +3291,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3259,6 +3303,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Bankkontotyp"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3295,7 +3367,7 @@ msgid "Signal (subflow.*)"
 msgstr "Signal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3333,7 +3405,7 @@ msgid "Access Controls"
 msgstr "Behörighetskontroller"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3361,32 +3433,6 @@ msgstr "Huvudbolag"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3406,9 +3452,13 @@ msgstr ""
 "Om du använder en formeltyp, använd ett pythonuttryck och använd "
 "objektvariabler."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Födelsedag"
 
@@ -3424,7 +3474,7 @@ msgid "Products Manufacturers"
 msgstr "Produkttillverkare"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3532,7 +3582,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3721,7 +3771,6 @@ msgstr "Rapporter"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Titel"
@@ -3732,13 +3781,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Rekursion upptäckt!"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Rekursiva modulberoenden!"
@@ -3798,9 +3852,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3811,7 +3866,7 @@ msgid "Company Name"
 msgstr "Bolagsnamn"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3830,14 +3885,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (förkastat, använd Rapport)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Postregler"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre and Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3866,13 +3944,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3920,19 +3994,7 @@ msgid "Paper Format"
 msgstr "Pappersformat"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3952,7 +4014,7 @@ msgid "Nauru"
 msgstr "Nauru"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3997,7 +4059,7 @@ msgid "Email Gateway"
 msgstr "E-postbrygga"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4016,9 +4078,43 @@ msgid "Technical Data"
 msgstr "Teknisk data"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4074,13 +4170,18 @@ msgstr "Tidrapporter på ärenden"
 msgid "Ltd"
 msgstr "AB"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Ogiltitg arkitektur"
@@ -4096,9 +4197,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grupp krävs"
 
 #. module: base
 #: view:res.lang:0
@@ -4156,33 +4257,10 @@ msgid "Languages"
 msgstr "Språk"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4260,7 +4338,6 @@ msgstr "Villkor"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Standard"
 
@@ -4332,6 +4409,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4393,9 +4475,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4475,6 +4564,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4498,6 +4603,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4527,6 +4669,12 @@ msgstr ""
 msgid "View"
 msgstr "Vy"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4604,12 +4752,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4624,7 +4766,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Postnummer"
@@ -4635,13 +4776,18 @@ msgstr "Postnummer"
 msgid "Author"
 msgstr "Upphovsman"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Ange som 'att göra'"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "Tillämplig datum- och tidrepresentation"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4687,6 +4833,8 @@ msgstr "Riktning"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Vyer"
 
@@ -4702,7 +4850,7 @@ msgid "SMTP Server"
 msgstr "SMTP-server"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4797,7 +4945,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4885,7 +5038,7 @@ msgid "System Configuration Done"
 msgstr "Systemkonfigureringen är klar"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Fel vid fältvalidering %s: %s"
@@ -5000,6 +5153,11 @@ msgstr "Mauritius"
 msgid "Full Access"
 msgstr "Full åtkomst"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5013,7 +5171,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5024,7 +5182,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Endast om bankkontot tillhör ditt bolag"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5056,6 +5214,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Ungern"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5219,7 +5388,7 @@ msgid "Account Owner Name"
 msgstr "Namn på kontoägare"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "Kan inte byta kolumnnamn till %s, kolumnen finns redan!"
@@ -5235,16 +5404,11 @@ msgid "Decimal Separator"
 msgstr "Decimalseparator"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5290,9 +5454,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Författare"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Modulens namn måste vara unikt !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5355,15 +5520,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5379,6 +5535,11 @@ msgstr "Starta konfigureringsguiden"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Namn på bifogat"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5462,6 +5623,12 @@ msgstr "Kazakstan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Veckodagsnummer [0(Söndag),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Resursnamn"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5712,7 +5879,7 @@ msgid "title"
 msgstr "titel"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5769,6 +5936,15 @@ msgstr "Produkter"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5884,13 +6060,15 @@ msgid "Bank Type"
 msgstr "Banktyp"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Gruppens namn kan inte börja med \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5910,7 +6088,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5943,10 +6121,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Resursnamn"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5979,6 +6156,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Originalvy"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5989,7 +6171,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6005,26 +6187,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Mina banker"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6157,11 +6319,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6173,8 +6330,8 @@ msgid "Malaysia"
 msgstr "Malaysia"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6283,7 +6440,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Det finns ingen vy av typ %s definierad för denna struktur."
@@ -6321,7 +6478,7 @@ msgid "Created Menus"
 msgstr "Skapade menyer"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6348,9 +6505,37 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Ange som 'att göra'"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6382,6 +6567,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Aktuellt år utan århundrade: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6424,7 +6616,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6516,7 +6708,7 @@ msgid "Israel"
 msgstr "Israel"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6536,23 +6728,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6585,10 +6760,10 @@ msgstr "Rapport xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Moduler"
 
@@ -6662,9 +6837,9 @@ msgid "United Kingdom"
 msgstr "Storbritannien"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6688,8 +6863,8 @@ msgid "Partner Titles"
 msgstr "Företagstitlar"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6737,7 +6912,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6746,11 +6921,6 @@ msgstr ""
 "Du kan  inte genomföra denna åtgärd, det är inte tillåtet att skapa en ny "
 "post för detta objekt eftersom det används för rapportändamål."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6857,6 +7027,13 @@ msgstr "Modulfilen blev importerad!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Övergångar"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6951,7 +7128,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Fed. State"
@@ -7052,12 +7228,6 @@ msgstr "Fullständigt namn"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Modulens namn måste vara unikt !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7099,6 +7269,7 @@ msgstr "På flera dokument"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7156,7 +7327,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Ange den åtgärd som skall startas !"
@@ -7176,6 +7347,11 @@ msgstr "Kategorinamn"
 msgid "Northern Mariana Islands"
 msgstr "Norra Marianeröarna"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7187,13 +7363,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr "Använd guiden Ändra Lösenord ( i menyn Användare)."
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7224,7 +7405,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Otillräckliga fält för kalendervy!"
@@ -7272,7 +7453,6 @@ msgstr "Övergång"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7292,30 +7472,30 @@ msgid "Child Categories"
 msgstr "Underkategori"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Fel"
@@ -7403,6 +7583,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Detta fönster"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7486,6 +7671,21 @@ msgstr "Fält"
 msgid "Employees"
 msgstr "Anställda"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7515,11 +7715,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresser"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7544,7 +7739,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Gata"
@@ -7555,8 +7749,23 @@ msgid "Yugoslavia"
 msgstr "Jugoslavien"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7635,7 +7844,7 @@ msgid "Change My Preferences"
 msgstr "Ändra mina inställningar"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Felaktigt namn för modell i händelsedefinitionen."
@@ -7722,14 +7931,16 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7738,7 +7949,7 @@ msgid "Company Bank Accounts"
 msgstr "Bolagets bankkonton"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Att ha tomma lösenord är inte tillåtet av säkerhetskäl."
@@ -7749,13 +7960,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7777,12 +7988,13 @@ msgid "Normal Bank Account"
 msgstr "Vanligt bankkonto"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Guide"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7955,7 +8167,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7986,14 +8198,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Varning!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8017,7 +8221,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8135,7 +8338,7 @@ msgid "Nigeria"
 msgstr "Nigeria"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8450,7 +8653,7 @@ msgid "Update Modules List"
 msgstr "Uppdatera listan med moduler"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8464,7 +8667,7 @@ msgid "eInvoicing"
 msgstr "e-Fakturor"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8474,7 +8677,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8489,6 +8692,17 @@ msgstr "Fortsätt"
 msgid "Thai / ภาษาไทย"
 msgstr "Thailändska / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8528,7 +8742,7 @@ msgid "Mexico"
 msgstr "Mexico"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8550,15 +8764,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "Saknad SMTP-server"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Namn på bifogat"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8582,7 +8796,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Förkortat månadsnamn"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8594,7 +8808,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Leverantör"
@@ -8672,7 +8885,7 @@ msgid "Selectable"
 msgstr "Valbara"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8700,8 +8913,8 @@ msgid "Iteration"
 msgstr "Iterering"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Användarfel"
@@ -8725,7 +8938,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8872,7 +9085,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8912,8 +9125,8 @@ msgid "Solomon Islands"
 msgstr "Salomonöarna"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "Access fel"
@@ -8987,7 +9200,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9001,7 +9214,7 @@ msgid "Ukraine"
 msgstr "Ukraina"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9064,6 +9277,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flamländska (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamesiska / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9162,9 +9380,9 @@ msgid "Custom Shortcuts"
 msgstr "Anpassade genvägar"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamesiska / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9192,13 +9410,13 @@ msgid "Models"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9219,7 +9437,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9267,7 +9485,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Modulen %s finns inte!"
@@ -9313,6 +9531,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9321,7 +9540,7 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9340,6 +9559,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9375,7 +9631,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9427,6 +9683,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Timmar (12-timmar klocka) [01,12]"
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9469,23 +9730,11 @@ msgid "The currency code must be unique per company!"
 msgstr "Valutakoden måste vara unik per bolag"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9526,7 +9775,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Klicka på 'Fortsätt' för att konfigurera nästa tillägg..."
@@ -9617,6 +9866,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9824,7 +10078,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9835,13 +10089,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Intervallenhet"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Sort"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Denan metod existerar inte längre"
@@ -10014,7 +10273,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10049,6 +10308,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10074,6 +10338,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10163,7 +10432,6 @@ msgstr "%m - Månadsnummer [01,12]"
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Stad"
@@ -10199,13 +10467,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estniska / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 eller senare version"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10266,19 +10541,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10292,6 +10592,8 @@ msgid "Activity"
 msgstr "Aktivitet"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10310,7 +10612,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10322,13 +10629,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10415,6 +10715,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10484,6 +10804,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Sekvenstyp"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10552,9 +10877,9 @@ msgstr ""
 "Sätt språket inaktivt först."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10572,8 +10897,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "Valideringsfel"
@@ -10614,13 +10939,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-post"
@@ -10631,7 +10955,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10662,36 +10991,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10713,6 +11012,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Ecuador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "arbetsflöde"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10729,16 +11033,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Du kan inte ta bort språk som är användarens valda språk"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10755,9 +11049,9 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grupp krävs"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10782,11 +11076,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10812,7 +11101,7 @@ msgid "Domain"
 msgstr "Domän"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10828,12 +11117,12 @@ msgid "State Name"
 msgstr "Stat (namn)"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10854,30 +11143,10 @@ msgid "Timezone"
 msgstr "Tidzon"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10897,7 +11166,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10948,7 +11217,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Gata 2"
 
@@ -10972,6 +11240,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11057,19 +11326,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "arbetsflöde"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Storleken på fältet kan inte vara mindre än 1 !"
@@ -11111,22 +11389,6 @@ msgstr "Företagskatalog"
 msgid "Arguments"
 msgstr "Argument"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11259,7 +11521,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Kund"
 
@@ -11349,7 +11610,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11399,8 +11660,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11491,7 +11752,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11518,7 +11779,7 @@ msgid "Object"
 msgstr "Objekt"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11604,7 +11865,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11617,7 +11878,7 @@ msgid "User Ref."
 msgstr "Användarreferens"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11662,8 +11923,6 @@ msgstr "Referensguide"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11671,7 +11930,7 @@ msgid "Partner"
 msgstr "Företag"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11700,12 +11959,6 @@ msgstr "Falklandsöarna"
 msgid "Lebanon"
 msgstr "Libanon"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11812,8 +12065,10 @@ msgid "Selection"
 msgstr "Urval"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11850,7 +12105,7 @@ msgid "Action Type"
 msgstr "Åtgärdstyp"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11988,11 +12243,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Timmar 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Avmarkera aktivfältet för att gömma kontakten."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12009,7 +12259,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Okänt attribut %s in %s "
@@ -12032,7 +12282,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Odefinerad metod: get!"
@@ -12073,16 +12323,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Lön"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Binär fil eller extern URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Ändra lösenord"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12129,87 +12379,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
-
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12391,6 +12611,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12407,7 +12632,7 @@ msgid "Body"
 msgstr "Kropp"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12455,7 +12680,7 @@ msgid "choose"
 msgstr "välj"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12631,10 +12856,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12666,12 +12895,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12685,7 +12915,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Övriga"
@@ -12707,23 +12936,6 @@ msgstr ""
 msgid "China"
 msgstr "Kina"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12793,25 +13005,9 @@ msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12839,6 +13035,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12875,6 +13091,7 @@ msgstr "Slovakiska / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "okänd"
@@ -12942,6 +13159,11 @@ msgstr "Adressbok"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13031,6 +13253,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13043,7 +13266,7 @@ msgid "Information"
 msgstr "Information"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13074,16 +13297,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Uppdateringslista moduler"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13148,6 +13375,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "osv_memory fältet kan bara jämföras med = och != operatorn."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13220,29 +13452,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Externt ID"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13290,7 +13499,7 @@ msgid "Delivery Costs"
 msgstr "Leveranskostnad"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13334,9 +13543,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Postregler"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13580,9 +13789,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13609,63 +13823,14 @@ msgid "System Configuration done"
 msgstr "Systemkonfigurationen klar"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13706,17 +13871,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13751,7 +13905,7 @@ msgid "Low"
 msgstr "Låg"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Fel ! Du kan inte skapa rekursiva menyer."
@@ -13833,11 +13987,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13852,6 +14005,11 @@ msgstr "Åtkomstmeny"
 msgid "Thailand"
 msgstr "Thailand"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13872,6 +14030,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Rumänska / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13908,41 +14090,6 @@ msgstr "Objektrelation"
 msgid "eInvoicing & Payments"
 msgstr "e-Fakturor och betalningar"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14003,40 +14150,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14128,6 +14243,21 @@ msgstr "Vy"
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14170,34 +14300,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14220,9 +14322,9 @@ msgid "Unmet dependency !"
 msgstr "Ej uppfyllt beroende !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14233,7 +14335,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14259,7 +14391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14304,7 +14436,7 @@ msgid "Access"
 msgstr "Åtkomst"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14337,11 +14469,10 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14357,8 +14488,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14473,7 +14602,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14485,7 +14614,6 @@ msgstr "Jamaica"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14522,7 +14650,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14533,8 +14661,8 @@ msgid "Azerbaijan"
 msgstr "Azerbajdzjan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Varning"
@@ -14560,11 +14688,6 @@ msgstr "Jungfruöarna (brittiska)"
 msgid "Parameters"
 msgstr "Parametrar"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14654,7 +14777,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Land"
@@ -14725,8 +14847,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanska (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14754,7 +14880,7 @@ msgid "Japan"
 msgstr "Japan"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Kan bara byta namn på en kolumn åt gången"
@@ -14815,6 +14941,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14839,7 +14996,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Notera att den här operationen kan ta några minuter"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14878,6 +15035,12 @@ msgstr "Exekvering"
 msgid "Condition"
 msgstr "Villkor"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14930,6 +15093,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Kroatien"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14954,6 +15124,11 @@ msgstr "Systemuppdatering"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14970,7 +15145,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14991,15 +15166,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Allmän information"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15035,7 +15247,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Varning bolagsbyte"
@@ -15053,11 +15270,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Nästa nummer i sekvensen kommer att beräknas utgående från detta"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Funktion"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15095,11 +15316,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Leverans"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15127,7 +15343,7 @@ msgid "Workflow Instances"
 msgstr "Arbetsflödeinstanser"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Företag: "
@@ -15138,7 +15354,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15204,7 +15420,6 @@ msgstr "Export namn"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15245,6 +15460,9 @@ msgstr "ryska / русский язык"
 msgid "Signup"
 msgstr ""
 
+#~ msgid "Contact Name"
+#~ msgstr "Kontaktnamn"
+
 #~ msgid "Reply"
 #~ msgstr "Svara"
 
@@ -15257,6 +15475,9 @@ msgstr ""
 #~ msgid "VAT"
 #~ msgstr "Moms"
 
+#~ msgid "Delivery"
+#~ msgstr "Leverans"
+
 #~ msgid "Channel Name"
 #~ msgstr "Kanalnamn"
 
@@ -15320,6 +15541,9 @@ msgstr ""
 #~ "0=Mycket angeläget\n"
 #~ "10=Inte viktigt"
 
+#~ msgid "Creator"
+#~ msgstr "Författare"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15332,6 +15556,9 @@ msgstr ""
 #~ msgid "Select the object from the model on which the workflow will executed."
 #~ msgstr "Markera objektet från den modell som arbetsflödet körs."
 
+#~ msgid "Addresses"
+#~ msgstr "Adresser"
+
 #~ msgid "res.partner.event"
 #~ msgstr "res.partner.event"
 
@@ -15422,6 +15649,9 @@ msgstr ""
 #~ msgid "Wood Suppliers"
 #~ msgstr "Träleverantör"
 
+#~ msgid "Attached ID"
+#~ msgstr "Bifogat ID"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "BIC/Swift nummer"
 
@@ -15742,6 +15972,9 @@ msgstr ""
 #~ "Om du använder CSV-formatet, kontrollera att den första raden är en av de "
 #~ "följande:"
 
+#~ msgid "Attached Model"
+#~ msgstr "Modell som används"
+
 #~ msgid ""
 #~ "Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
 #~ "GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
@@ -15883,9 +16116,15 @@ msgstr ""
 #~ msgid "Emails"
 #~ msgstr "Epost"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Binär fil eller extern URL"
+
 #~ msgid "Add a widget for User"
 #~ msgstr "Lägg till en widget för en användare"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Avmarkera aktivfältet för att gömma kontakten."
+
 #~ msgid "Type fields"
 #~ msgstr "Typfält"
 
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 92ae5517d06..67949c168d3 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-30 09:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:00+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "ชื่อผู้ติดต่อ"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15070,3 +15285,6 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base.module_auth_signup
 msgid "Signup"
 msgstr ""
+
+#~ msgid "Contact Name"
+#~ msgstr "ชื่อผู้ติดต่อ"
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index b19a81e78f9..535cee299ca 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-10 17:36+0000\n"
 "Last-Translator: Felix Malmenbeck <felixm@kth.se>\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: 2012-12-04 05:01+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -185,41 +185,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -227,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -238,7 +212,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -249,7 +223,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -328,20 +302,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -349,11 +309,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -412,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -449,6 +404,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -487,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -539,7 +495,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -577,8 +533,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -604,26 +560,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -632,8 +568,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -707,14 +659,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -778,16 +728,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -816,11 +764,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -949,10 +907,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -971,7 +927,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1019,15 +975,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1125,8 +1074,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1141,12 +1119,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1173,7 +1156,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1201,7 +1231,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1233,14 +1263,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1375,7 +1403,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1397,7 +1425,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1412,7 +1440,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1538,7 +1573,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1653,18 +1702,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1745,7 +1789,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1786,11 +1830,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1805,7 +1844,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1846,6 +1885,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1922,16 +1966,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1986,7 +2025,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2010,11 +2049,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2026,7 +2065,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2064,11 +2102,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2201,6 +2234,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2234,12 +2272,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2287,6 +2330,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2338,7 +2390,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2416,7 +2468,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2463,11 +2514,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2584,8 +2630,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2664,7 +2721,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2723,6 +2780,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2731,7 +2801,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2817,7 +2887,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2847,7 +2917,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2912,22 +2982,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3021,12 +3091,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3043,17 +3113,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3063,7 +3135,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3114,34 +3186,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3180,7 +3224,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3192,6 +3236,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3228,7 +3300,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3262,7 +3334,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3290,32 +3362,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3333,9 +3379,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3351,7 +3401,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3459,7 +3509,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3648,7 +3698,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3659,13 +3708,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3725,9 +3779,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3738,7 +3793,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3757,13 +3812,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3793,12 +3871,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3847,19 +3921,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3877,7 +3939,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3922,7 +3984,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3941,8 +4003,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -3999,13 +4095,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4021,8 +4122,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4081,32 +4182,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4185,7 +4263,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4257,6 +4334,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4318,8 +4400,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4400,6 +4489,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4423,6 +4528,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4450,6 +4592,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4527,12 +4675,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4547,7 +4689,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4558,13 +4699,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4607,6 +4753,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4622,7 +4770,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4715,7 +4863,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4803,7 +4956,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4918,6 +5071,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4931,7 +5089,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4942,7 +5100,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4974,6 +5132,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5137,7 +5306,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5153,16 +5322,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5203,8 +5367,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5268,15 +5433,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5292,6 +5448,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5375,6 +5536,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5625,7 +5792,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5682,6 +5849,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5797,13 +5973,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5823,7 +6001,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5856,9 +6034,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5892,6 +6069,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5902,7 +6084,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5918,26 +6100,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6070,11 +6232,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6086,8 +6243,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6194,7 +6351,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6232,7 +6389,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6259,8 +6416,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6293,6 +6478,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6335,7 +6527,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6427,7 +6619,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6447,23 +6639,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6496,10 +6671,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6573,8 +6748,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6598,8 +6773,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6647,18 +6822,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6763,6 +6933,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6857,7 +7034,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6958,12 +7134,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7005,6 +7175,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7062,7 +7233,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7082,6 +7253,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7093,13 +7269,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7130,7 +7311,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7176,7 +7357,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7196,30 +7376,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7307,6 +7487,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7390,6 +7575,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7419,11 +7619,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7448,7 +7643,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7459,8 +7653,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7539,7 +7748,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7626,14 +7835,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7642,7 +7853,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7653,13 +7864,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7678,12 +7889,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7856,7 +8068,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7885,14 +8097,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7916,7 +8120,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8031,7 +8234,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8346,7 +8549,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8358,7 +8561,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8368,7 +8571,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8383,6 +8586,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8422,7 +8636,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8444,14 +8658,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8476,7 +8690,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8488,7 +8702,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8566,7 +8779,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8594,8 +8807,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8619,7 +8832,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8766,7 +8979,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8805,8 +9018,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8880,7 +9093,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8894,7 +9107,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8957,6 +9170,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9055,8 +9273,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9085,13 +9303,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9112,7 +9330,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9160,7 +9378,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9206,6 +9424,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9214,7 +9433,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9233,6 +9452,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9268,7 +9524,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9320,6 +9576,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9362,23 +9623,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9412,7 +9661,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9503,6 +9752,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9707,7 +9961,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9718,13 +9972,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9892,7 +10151,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9925,6 +10184,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9950,6 +10214,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10039,7 +10308,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10075,13 +10343,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10140,19 +10415,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10166,6 +10466,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10184,7 +10486,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10196,13 +10503,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10284,6 +10584,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10353,6 +10673,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10411,9 +10736,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10431,8 +10756,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10471,13 +10796,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10488,7 +10812,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10517,36 +10846,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10568,6 +10867,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10584,16 +10888,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10610,8 +10904,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10637,11 +10931,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10667,7 +10956,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10683,12 +10972,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10709,29 +10998,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10752,7 +11021,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10799,7 +11068,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10823,6 +11091,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10908,19 +11177,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10962,22 +11240,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11110,7 +11372,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11200,7 +11461,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11250,8 +11511,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11342,7 +11603,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11369,7 +11630,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11455,7 +11716,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11468,7 +11729,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11513,8 +11774,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11522,7 +11781,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11551,12 +11810,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11663,8 +11916,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11701,7 +11956,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11837,11 +12092,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11858,7 +12108,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11881,7 +12131,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11923,13 +12173,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11978,73 +12228,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12052,13 +12237,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12235,6 +12455,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12251,7 +12476,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12299,7 +12524,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12475,10 +12700,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12510,12 +12739,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12529,7 +12759,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12551,23 +12780,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12635,24 +12847,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12681,6 +12877,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12717,6 +12933,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12784,6 +13001,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12873,6 +13095,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12885,7 +13108,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12916,16 +13139,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12990,6 +13217,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13062,29 +13294,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13132,7 +13341,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13176,8 +13385,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13422,9 +13631,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13451,62 +13665,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13548,17 +13713,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13593,7 +13747,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13673,11 +13827,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13692,6 +13845,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13712,6 +13870,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13748,41 +13930,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13843,40 +13990,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13965,6 +14080,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14007,34 +14137,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14057,9 +14159,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14070,7 +14172,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14096,7 +14228,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14141,7 +14273,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14174,11 +14306,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14194,8 +14325,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14310,7 +14439,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14322,7 +14451,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14355,7 +14483,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14366,8 +14494,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14393,11 +14521,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14487,7 +14610,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14554,8 +14676,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14583,7 +14709,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14644,6 +14770,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14668,7 +14825,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14707,6 +14864,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14759,6 +14922,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14783,6 +14953,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14799,7 +14974,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14820,14 +14995,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14864,7 +15076,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14882,11 +15099,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14922,11 +15143,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14954,7 +15170,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14965,7 +15181,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15031,7 +15247,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index a4b0be27b35..30ab091b298 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 08:41+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:01+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "TarihSaat"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -196,41 +196,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Uyarı!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -240,7 +214,7 @@ msgstr ""
 "kodundan değiştirin. Tercihen özel bir eklenti ile!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Kısıt Hatası"
@@ -251,7 +225,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -262,7 +236,7 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "Oluşturuldu."
@@ -341,20 +315,6 @@ msgstr "Güncel kaydın yapılacağı şirket"
 msgid "Max. Size"
 msgstr "Azami Boyut"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -362,11 +322,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Kişi Adı"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -425,7 +380,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -462,6 +417,7 @@ msgstr "Otomatik Eylem Kuralları"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Sahibi"
 
@@ -500,7 +456,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -553,7 +509,7 @@ msgid "Netherlands Antilles"
 msgstr "Hollanda Antilleri"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -593,9 +549,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Orijinal Görünüm"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "Fikirler"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -620,26 +576,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Boşnakça"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -650,9 +586,25 @@ msgstr ""
 "önceki rapor kullanılır."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -728,14 +680,12 @@ msgstr ""
 "Bağlam sözlüğü Python ifadesi olarak, öntanımlı olarak boş (Default{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Sihirbazlar"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Özel alanların 'x_' ile başlayan bir adı olmalıdır !"
@@ -799,16 +749,14 @@ msgid "Model Description"
 msgstr "Model Açıklaması"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -842,11 +790,21 @@ msgstr "Tetik Ifadesi"
 msgid "Jordan"
 msgstr "Ürdün"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "Bir sonraki planlı çalışma tarihi"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -981,13 +939,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
-"Kayıt belirtecinin yazma işlemi için kullandığı alan adını giriniz. Boş "
-"bırakılırsa nesnenin etkin olan belirteci kullanılacaktır. Valla."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Papua Yeni Gine"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1005,7 +959,7 @@ msgid "Email Preferences"
 msgstr "E-posta Seçenekleri"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1054,16 +1008,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "İspanyolca (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Cep"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1160,9 +1107,38 @@ msgid "Mongolia"
 msgstr "Moğolistan"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1177,12 +1153,17 @@ msgstr ""
 "Bu gruba eklenen kullanıcılar otomatikman aşağıdaki gruplara eklenir."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "Döküman Modeli"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1209,7 +1190,54 @@ msgid "Username"
 msgstr "Kullanıcı Adı"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1239,7 +1267,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "Bağlantı denemesi başarısız!"
@@ -1271,14 +1299,12 @@ msgid "South Korea"
 msgstr "Güney Kore"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Geçişler"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "Kayıt #%d / %s  bulunamadı, koypalama yapılamıyor!"
@@ -1416,7 +1442,7 @@ msgid "Marshall Islands"
 msgstr "Marshall Adaları"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "Bir alanın modelini değiştirmek yasaklanmıştır'"
@@ -1438,7 +1464,7 @@ msgid "Search"
 msgstr "Arama"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1457,7 +1483,14 @@ msgid "Parent Application"
 msgstr "Ana Uygulama"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Sihirbazlar"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "İşlem iptal edildi"
@@ -1585,7 +1618,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "\"%s\" kodu ile tanımlı dil yok"
@@ -1706,7 +1753,7 @@ msgid "On Create"
 msgstr "Oluşturmada"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -1716,11 +1763,6 @@ msgstr ""
 "Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, "
 "module.reference_id ."
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "Teklifler, Satış Siparişleri, Faturalama"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1803,7 +1845,7 @@ msgid "East Timor"
 msgstr "Doğu Timor"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1844,11 +1886,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Ekli ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1866,7 +1903,7 @@ msgstr ""
 "yardım eder."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1907,6 +1944,11 @@ msgstr "Araç, leasing, sigortalar, maliyetler"
 msgid "Read Access"
 msgstr "Okuma Erişimi"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1983,16 +2025,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Ekli Model"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2047,7 +2084,7 @@ msgid "Formula"
 msgstr "Formül"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Root kullanıcısı kaldırılamaz!"
@@ -2071,11 +2108,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopya)"
@@ -2087,7 +2124,6 @@ msgstr "Hesap planı Şablonu"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Adres Türü"
 
@@ -2125,11 +2161,6 @@ msgstr "Tam Yol"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "Fikirler"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2267,6 +2298,11 @@ msgstr "Bir kaç modül güncllendi"
 msgid "Method"
 msgstr "Yöntem"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2300,12 +2336,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2356,6 +2397,15 @@ msgstr "Belize"
 msgid "Add or not the corporate RML header"
 msgstr "Şirket RML başlığının eklenip eklenmeyeceği"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2409,7 +2459,7 @@ msgstr ""
 "'form', 'Ağaç', 'Takvim' vs (Ön tanımlı:Ağaç, form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Son görüntülemenizden beri döküman değiştirilmiş (%s:%d)"
@@ -2489,7 +2539,6 @@ msgstr "São Tomé ve Príncipe"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -2536,11 +2585,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "Şirket Sloganı"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2657,9 +2701,20 @@ msgid "Default limit for the list view"
 msgstr "Listeleme görünümü için öntanımlı sınır"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Papua Yeni Gine"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2737,7 +2792,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2796,6 +2851,19 @@ msgstr "Alan Eşleşmeleri"
 msgid "Export Translations"
 msgstr "Çevirileri Dışa Aktar"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2804,7 +2872,7 @@ msgid "Manager"
 msgstr "Yönetici"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2890,7 +2958,7 @@ msgid "Inherited"
 msgstr "Kalıtsal"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2920,7 +2988,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2987,22 +3055,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "Geçersiz nesne yapısı!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Hata!"
@@ -3097,12 +3165,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3119,17 +3187,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3139,7 +3209,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "'%s' modülü güncellenemiyor. Kurulu değil"
@@ -3190,34 +3260,6 @@ msgstr "Yapılandırma Parametreleri"
 msgid "Invalid arguments"
 msgstr "Geçersiz parametreler"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3256,7 +3298,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3268,6 +3310,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Banka Hesap Türü"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3304,7 +3374,7 @@ msgid "Signal (subflow.*)"
 msgstr "Sinyal (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3343,7 +3413,7 @@ msgid "Access Controls"
 msgstr "Erişim Kontrolleri"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3373,32 +3443,6 @@ msgstr "Ana Şirket"
 msgid "Web Icon File (hover)"
 msgstr "Web ikon dosyası (hover)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3418,9 +3462,13 @@ msgstr ""
 "Bir formül tipi kullanıyorsanız, 'object' değişkenini kullanan bir python "
 "ifadesi kullanınız."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Doğum günü"
 
@@ -3436,7 +3484,7 @@ msgid "Products Manufacturers"
 msgstr "Ürün Üreticileri"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SSL üzerinden SMTP biçimi mevcut değil"
@@ -3545,7 +3593,7 @@ msgid "Malta"
 msgstr "Malta"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3734,7 +3782,6 @@ msgstr "Raporlama"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Başlık"
@@ -3746,13 +3793,18 @@ msgstr ""
 "Seçilmemişse, yeni kaynaklar için varsayılan değer olarak görev yapar"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "kendini çağırma tespit edildi."
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Modül bağımlılılklarında özyineleme hatası !"
@@ -3812,9 +3864,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3825,7 +3878,7 @@ msgid "Company Name"
 msgstr "Şirket Adı"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3844,14 +3897,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML (Onaylanmamış - Rapor kullan)"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Kayıt kuralları"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "Sen Piyer ve Miquelon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3880,13 +3956,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3934,19 +4006,7 @@ msgid "Paper Format"
 msgstr "Kağıt Boyutu"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3966,7 +4026,7 @@ msgid "Nauru"
 msgstr "Nauru Adası"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -4011,7 +4071,7 @@ msgid "Email Gateway"
 msgstr "E-posta Kapısı"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4032,9 +4092,43 @@ msgid "Technical Data"
 msgstr "Teknik Veri"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4090,13 +4184,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "Ltd."
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "Geçersiz mimari!"
@@ -4112,9 +4211,9 @@ msgid "Share any Document"
 msgstr "Herhangi bir belgeyi paylaş"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Grup Şart"
 
 #. module: base
 #: view:res.lang:0
@@ -4172,33 +4271,10 @@ msgid "Languages"
 msgstr "Diller"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4285,7 +4361,6 @@ msgstr "Kısıtlama"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -4357,6 +4432,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4420,9 +4500,16 @@ msgid "Default value or action reference"
 msgstr "Öntanımlı değer ya da Eylem referansı"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Surinam"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4502,6 +4589,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4528,6 +4631,43 @@ msgstr ""
 "alan boş ise, OpenERP objelerin görünürlüğünü ilgili nesnenin okuma "
 "haklarına göre hesaplar."
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4557,6 +4697,12 @@ msgstr ""
 msgid "View"
 msgstr "Görünüm"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4634,12 +4780,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4654,7 +4794,6 @@ msgstr "İsviçre - Muhasebe"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Posta Kodu"
@@ -4665,13 +4804,18 @@ msgstr "Posta Kodu"
 msgid "Author"
 msgstr "Yazan"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "Yapılacak İş olarak Ayarla"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Kabul edilen tarih ve zaman sunumu."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4717,6 +4861,8 @@ msgstr "Yön"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Görünümler"
 
@@ -4732,7 +4878,7 @@ msgid "SMTP Server"
 msgstr "SMTP Sunucusu"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "Kurulu veya kurulacak bir modülü kaldırmaya çalışıyorsunuz."
@@ -4827,7 +4973,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4915,7 +5066,7 @@ msgid "System Configuration Done"
 msgstr "Sistem konfigürasyonu Yapıldı"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "Alan kontrolünde hata oluştu. alan %s:%s"
@@ -5030,6 +5181,11 @@ msgstr "Mauritus"
 msgid "Full Access"
 msgstr "Tam Erişim"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5043,7 +5199,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -5054,7 +5210,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "Sadece eğer bu banka hesapları şirketinize ait ise"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5086,6 +5242,17 @@ msgstr "Senegal"
 msgid "Hungary"
 msgstr "Macaristan"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5249,7 +5416,7 @@ msgid "Account Owner Name"
 msgstr "Hesap Sahibi Adi"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5266,16 +5433,11 @@ msgid "Decimal Separator"
 msgstr "Ondalık Ayırıcı"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5316,9 +5478,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Oluşturan"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Modülün adı tekil olmak zorunda !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5381,15 +5544,6 @@ msgstr "Venezuela"
 msgid "9.  %j              ==> 340"
 msgstr "9. %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5405,6 +5559,11 @@ msgstr "Yapılandırma Sihirbazı'nı başlatın"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Ek Adı"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5488,6 +5647,12 @@ msgstr "Kazakistan"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Hafta günü numarası [0(Pazar),6]"
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Kaynak Adı"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5742,7 +5907,7 @@ msgid "title"
 msgstr "Başlık:"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5799,6 +5964,15 @@ msgstr "Ürünler"
 msgid "User-defined Defaults"
 msgstr "Kullanıcı tanımlı öntanımlamalar"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5914,13 +6088,15 @@ msgid "Bank Type"
 msgstr "Banka Türü"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Grup adı \"=\" ile başlayamaz"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "Uygulamalar"
 
@@ -5940,7 +6116,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5973,10 +6149,9 @@ msgid "Uncategorized"
 msgstr "Sınıflandırılmamış"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Kaynak Adı"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6009,6 +6184,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Orijinal Görünüm"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6019,7 +6199,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -6035,26 +6215,6 @@ msgstr ""
 msgid "My Banks"
 msgstr "Bankalarım"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6187,11 +6347,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6203,8 +6358,8 @@ msgid "Malaysia"
 msgstr "Malezya"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6313,7 +6468,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "Bu yapı için tanımlanmış '%s' görünüm tipi yok."
@@ -6351,7 +6506,7 @@ msgid "Created Menus"
 msgstr "Menüler Oluşturuldu"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6378,9 +6533,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "Yapılacak İş olarak Ayarla"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6412,6 +6595,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "Yüzyıl olmadan şimdiki yıl: %(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6454,7 +6644,7 @@ msgid "Audit Trail"
 msgstr "Denetleme Tarihçesi"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6546,7 +6736,7 @@ msgid "Israel"
 msgstr "İsrail"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6566,23 +6756,6 @@ msgstr "Bazen BIC ya da SWIFT olarak geçer."
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Cep"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6615,10 +6788,10 @@ msgstr "Rapor xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Modüller"
 
@@ -6692,9 +6865,9 @@ msgid "United Kingdom"
 msgstr "Birleşik Krallık (İngiltere)"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6717,8 +6890,8 @@ msgid "Partner Titles"
 msgstr "Ortak Ünvanları"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6766,7 +6939,7 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
@@ -6775,11 +6948,6 @@ msgstr ""
 "Bu işlemi gerçekleştiremezsiniz. Bu nesne raporlama amaçlı olduğu için yeni "
 "kayıt oluşturmaya izin verilmemiştir."
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6886,6 +7054,13 @@ msgstr "Modül dosyası başarılı bir şekilde içeri alındı!"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Geçişler"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6980,7 +7155,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "Federal Eyalet"
@@ -7081,12 +7255,6 @@ msgstr "Tam Ad"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Modülün adı tekil olmak zorunda !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7128,6 +7296,7 @@ msgstr "Birden fazla belge üzerinde"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7185,7 +7354,7 @@ msgid "Connection Security"
 msgstr "Bağlantı güvenliği"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Lütfen başlatılacak bir işlem seçiniz !"
@@ -7205,6 +7374,11 @@ msgstr "Sınıf Adı"
 msgid "Northern Mariana Islands"
 msgstr "Kuzey Mariana Adaları"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7216,7 +7390,7 @@ msgid "Intrastat Reporting"
 msgstr "Intrastat Raporlama"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -7225,6 +7399,11 @@ msgstr ""
 "Lütfen kendi şifrenizi değiştirmek için şifre değiştirme sihirbazını "
 "kullanın (Kullanıcı ayarlarında ya da Kullanıcı menüsünde)"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7255,7 +7434,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Takvim görünümü için alanlar yetersiz"
@@ -7303,7 +7482,6 @@ msgstr "Geçiş"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7323,30 +7501,30 @@ msgid "Child Categories"
 msgstr "Alt Sınıflar"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Hata"
@@ -7434,6 +7612,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Bu Pencere"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7519,6 +7702,21 @@ msgstr "Alanlar"
 msgid "Employees"
 msgstr "Çalışanlar"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7548,11 +7746,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "Bağlantıyı Sına"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Adresler"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7577,7 +7770,6 @@ msgstr "Seçim Terihleri"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Cadde"
@@ -7588,9 +7780,24 @@ msgid "Yugoslavia"
 msgstr "Yugoslavya"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Doğru Ebeveyn"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7668,7 +7875,7 @@ msgid "Change My Preferences"
 msgstr "Ayarlarımı değiştir"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "İşlem tanımlamasında geçersiz model adı."
@@ -7755,14 +7962,16 @@ msgid "US Letter"
 msgstr "US Letter"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7771,7 +7980,7 @@ msgid "Company Bank Accounts"
 msgstr "Şirket Banka Hesapları"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "Güvenlik sebebiyle boş şifrelere izin verilmemektedir!"
@@ -7782,13 +7991,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "SMTP kimlik doğrulaması için şifre (opsiyonel)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7810,12 +8019,13 @@ msgid "Normal Bank Account"
 msgstr "Normal Banka Hesabı"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Sihirbaz"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7991,7 +8201,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8022,14 +8232,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Uyarı!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8053,7 +8255,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8171,7 +8372,7 @@ msgid "Nigeria"
 msgstr "Nijerya"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Seçim alanları için, Seçim tercihleri mutlaka sağlanmalı."
@@ -8487,7 +8688,7 @@ msgid "Update Modules List"
 msgstr "Modül Listesini Güncelle"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8499,7 +8700,7 @@ msgid "eInvoicing"
 msgstr "e-Faturalama"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8512,7 +8713,7 @@ msgstr ""
 "(Kullanıcı seçeneklerinden iptale basabilirsiniz)"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8527,6 +8728,17 @@ msgstr "Devam Et"
 msgid "Thai / ภาษาไทย"
 msgstr "Taylandca / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8566,7 +8778,7 @@ msgid "Mexico"
 msgstr "Meksika"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8588,15 +8800,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "SMTP Sunucusu Yok"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Ek Adı"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8620,7 +8832,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Kısaltılmış ay adı."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8632,7 +8844,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Tedarikçi"
@@ -8710,7 +8921,7 @@ msgid "Selectable"
 msgstr "Seçilebilir"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "Her şey düzgün bir şekilde ayarlanmış!"
@@ -8738,8 +8949,8 @@ msgid "Iteration"
 msgstr "Yineleme"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "KullanıcıHatası"
@@ -8763,7 +8974,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8910,7 +9121,7 @@ msgid "Reunion (French)"
 msgstr "Reunion (Fransız)"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8949,8 +9160,8 @@ msgid "Solomon Islands"
 msgstr "Solomon Adaları"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -9024,7 +9235,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9038,7 +9249,7 @@ msgid "Ukraine"
 msgstr "Ukrayna"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9101,6 +9312,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "Flaman dili (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "Vietnamca / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9199,9 +9415,9 @@ msgid "Custom Shortcuts"
 msgstr "Özel Kısayollar"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "Vietnamca / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9229,13 +9445,13 @@ msgid "Models"
 msgstr "Modeller"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "Kayıt şuan değiştirilemiyor"
@@ -9256,7 +9472,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9304,7 +9520,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "%s modeli yok !"
@@ -9350,6 +9566,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9358,7 +9575,7 @@ msgid "Cancel"
 msgstr "Vazgeç"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9377,6 +9594,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9412,7 +9666,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9464,6 +9718,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Saat (12-Saat) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9506,23 +9765,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9556,7 +9803,7 @@ msgid "Products Expiry Date"
 msgstr "Ürün Son Kullanma Tarihi"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "Bir sonraki eklentiyi ayarlamak için 'Devam' tuşuna basın..."
@@ -9647,6 +9894,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9854,7 +10106,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "Pazarlama Kampanyası - Demo"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9865,13 +10117,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Aralık Birimi"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Tür"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Bu yöntem artık mevcut değil"
@@ -10042,7 +10299,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -10079,6 +10336,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10104,6 +10366,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "Simge URL'si"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10193,7 +10460,6 @@ msgstr "%m - Ay numarası [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Şehir"
@@ -10229,13 +10495,22 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Estonyca / Eesti Keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+"Kayıt belirtecinin yazma işlemi için kullandığı alan adını giriniz. Boş "
+"bırakılırsa nesnenin etkin olan belirteci kullanılacaktır. Valla."
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 veya daha yeni sürümü"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10296,19 +10571,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10322,6 +10622,8 @@ msgid "Activity"
 msgstr "Etkinlik"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10340,7 +10642,12 @@ msgid "Parent Company"
 msgstr "Ana Firma"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID Kimlik doğrulaması"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10352,13 +10659,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10445,6 +10745,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10518,6 +10838,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "Sıra No Tipi"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10578,9 +10903,9 @@ msgstr ""
 "lütfen önce dili değiştirin."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10598,8 +10923,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Sunucu İşlemi Yapılandırma `Kayıt Belirteci` sorunu!"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "DoğrulamaHatası"
@@ -10640,13 +10965,12 @@ msgid "Laos"
 msgstr "Laos"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "E-Posta"
@@ -10657,7 +10981,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10688,36 +11017,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10739,6 +11038,11 @@ msgstr "Diğer tescilli"
 msgid "Ecuador"
 msgstr "Ekvador"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "workflow"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10755,16 +11059,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "Kullanıcının varsayılan dili olarak seçilmiş bir dili silemezsiniz !"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10781,9 +11075,9 @@ msgid "Cascade"
 msgstr "Basamakla"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Grup Şart"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10808,11 +11102,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10838,7 +11127,7 @@ msgid "Domain"
 msgstr "Alan adı"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10854,12 +11143,12 @@ msgid "State Name"
 msgstr "Eyalet Adı"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10880,30 +11169,10 @@ msgid "Timezone"
 msgstr "Zaman Dilimi"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10924,7 +11193,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10974,7 +11243,6 @@ msgstr "Satınalmalarda Çifte Onaylama"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Sokak2"
 
@@ -10998,6 +11266,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11083,19 +11352,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "Bütünlük Hatası"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Alanın boyutu 1 den küçük olamaz!"
@@ -11137,22 +11415,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Değişkenler"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11285,7 +11547,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Müşteri"
 
@@ -11375,7 +11636,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11425,9 +11686,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID Kimlik doğrulaması"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11517,7 +11778,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "Posta gönderimi yapılamadı"
@@ -11544,7 +11805,7 @@ msgid "Object"
 msgstr "Nesne"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11633,7 +11894,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11647,7 +11908,7 @@ msgid "User Ref."
 msgstr "Kullanıcı Referansı"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11692,8 +11953,6 @@ msgstr "Referans Rehberi"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11701,7 +11960,7 @@ msgid "Partner"
 msgstr "Ortak"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11730,12 +11989,6 @@ msgstr "Falkland Adaları"
 msgid "Lebanon"
 msgstr "Lübnan"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11844,9 +12097,11 @@ msgid "Selection"
 msgstr "Seçim"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "Simge URL'si"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -11882,7 +12137,7 @@ msgid "Action Type"
 msgstr "İşlem Türü"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12020,11 +12275,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Saat 00->12: %(h12)"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Etkin kutucuğunu seçmeyerek bağlantıyı saklayınız."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12041,7 +12291,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "Bilinmeyen özellik %s de %s "
@@ -12064,7 +12314,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "Tanımlanmamış get yöntemi !"
@@ -12105,16 +12355,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr "Bordro Muhasebesi"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "Çalıştırılabilir dosya ya da dış URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "Şifreyi değiştir"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Surinam"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12161,88 +12411,57 @@ msgid "Address Format"
 msgstr "Adres Biçimi"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"(Ayraç düzeni yardım metni. İngilizcesi çok karışık olduğundan çevrilmedi)"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "Teknik Özellikler"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12426,6 +12645,11 @@ msgstr ""
 "Stoklarınızı ve ana stok işlemlerinizi: sevkiyat emirleri, kabuller, v.s. "
 "yönetmenize yardım eder"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12442,7 +12666,7 @@ msgid "Body"
 msgstr "Gövde"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "Bağlantı denemesi Başarılı!"
@@ -12490,7 +12714,7 @@ msgid "choose"
 msgstr "seç"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12666,10 +12890,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12701,12 +12929,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "Kanban"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12720,7 +12949,6 @@ msgstr "Vergi Dairesi"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Çeşitli"
@@ -12742,23 +12970,6 @@ msgstr ""
 msgid "China"
 msgstr "Çin"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12832,25 +13043,9 @@ msgid "Bulgaria"
 msgstr "Bulgaristan"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12878,6 +13073,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "LTD.ŞTİ"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12914,6 +13129,7 @@ msgstr "Slovakça/ Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "Bilinmiyor"
@@ -12981,6 +13197,11 @@ msgstr "Adres Defteri"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13070,6 +13291,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13082,7 +13304,7 @@ msgid "Information"
 msgstr "Bilgi"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -13113,16 +13335,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Doğru Ebeveyn"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Modül listesini Güncelle"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13187,6 +13413,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13259,29 +13490,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr "Dış Tanımlayıcı"
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13329,7 +13537,7 @@ msgid "Delivery Costs"
 msgstr "Navlun"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13375,9 +13583,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "Veritabanı Şifre Kriptolama"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Kayıt kuralları"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13621,9 +13829,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13650,63 +13863,14 @@ msgid "System Configuration done"
 msgstr "Sistem Yapılandırma Tarihi"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "Türk ve Caicos Adaları"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13747,17 +13911,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13792,7 +13945,7 @@ msgid "Low"
 msgstr "Düşük"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Hata ! iç içe çağırılan menü oluşturamazsınız."
@@ -13874,11 +14027,10 @@ msgid "El Salvador"
 msgstr "El Salvador"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Telefon"
@@ -13893,6 +14045,11 @@ msgstr "Erişim Menüsü"
 msgid "Thailand"
 msgstr "Tayland"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13913,6 +14070,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "Romence / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13949,41 +14130,6 @@ msgstr "Nesne İlişkisi"
 msgid "eInvoicing & Payments"
 msgstr "e-Faturalama & Ödemeler"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14044,40 +14190,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14172,6 +14286,21 @@ msgstr "Görünüm :"
 msgid "View Auto-Load"
 msgstr "Görünüm Kendiliğinden Yüklenmesi"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14214,34 +14343,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Farsça / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14264,9 +14365,9 @@ msgid "Unmet dependency !"
 msgstr "karşınlanmamış bağımlılık !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14277,7 +14378,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14303,7 +14434,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14348,7 +14479,7 @@ msgid "Access"
 msgstr "Erişim"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14381,11 +14512,10 @@ msgid "Bahrain"
 msgstr "Bahreyn"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Faks"
@@ -14401,8 +14531,6 @@ msgstr "Faks"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14517,7 +14645,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14529,7 +14657,6 @@ msgstr "Jamaika"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "Renk İndeksi"
 
@@ -14565,7 +14692,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14576,8 +14703,8 @@ msgid "Azerbaijan"
 msgstr "Azerbaycan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Uyarı"
@@ -14603,11 +14730,6 @@ msgstr "Virgin Adaları (İngiliz)"
 msgid "Parameters"
 msgstr "Parametreler"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "Sen Piyer ve Miquelon"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14697,7 +14819,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Ülke"
@@ -14768,9 +14889,14 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "İspanyolca (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"(Ayraç düzeni yardım metni. İngilizcesi çok karışık olduğundan çevrilmedi)"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14797,7 +14923,7 @@ msgid "Japan"
 msgstr "Japonya"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "Aynı anda sadece bir kolonun adı değiştirilebilir!"
@@ -14858,6 +14984,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr "Kanada - Muhasebe"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14882,7 +15039,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Bu işlem birkaç dakika sürebilir."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14921,6 +15078,12 @@ msgstr "Çalıştırılma"
 msgid "Condition"
 msgstr "Koşul"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14973,6 +15136,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Hırvatistan"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14997,6 +15167,11 @@ msgstr "Sistem Güncelleme"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15013,7 +15188,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15034,15 +15209,52 @@ msgstr "Sierra Leone"
 msgid "General Information"
 msgstr "Genel Bilgiler"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "Türk ve Caicos Adaları"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15078,7 +15290,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "Şirket Değişikliği Uyarısı"
@@ -15097,11 +15314,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Bir sonraki otomatik sayı bu değer kadarki artışla oluşturulacak."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Görev"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15137,11 +15358,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Teslimat"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15169,7 +15385,7 @@ msgid "Workflow Instances"
 msgstr "İş Akışı Oluşumları"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Ortaklar: "
@@ -15180,7 +15396,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15246,7 +15462,6 @@ msgstr "Dışa Aktarım Adı"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15287,6 +15502,9 @@ msgstr "Rusça / русский язык"
 msgid "Signup"
 msgstr ""
 
+#~ msgid "Contact Name"
+#~ msgstr "Kişi Adı"
+
 #~ msgid "SMS Message"
 #~ msgstr "SMS Mesaj"
 
@@ -15555,6 +15773,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Creator"
+#~ msgstr "Oluşturan"
+
 #~ msgid ""
 #~ "The internal user that is in charge of communicating with this partner if "
 #~ "any."
@@ -15698,6 +15919,9 @@ msgstr ""
 #~ msgid "Type fields"
 #~ msgstr "Tür alanları"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Etkin kutucuğunu seçmeyerek bağlantıyı saklayınız."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Demokratik Kongo Cumhuriyeti"
 
@@ -15843,6 +16067,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Bu alan kullanılmamaktadır. Sadece düzgün bir model seçmenize yardımcı olur."
 
+#~ msgid "Delivery"
+#~ msgstr "Teslimat"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "BIC/Swift Kodu"
 
@@ -15993,6 +16220,9 @@ msgstr ""
 #~ "%(user_signature)s\n"
 #~ "%(company_name)s"
 
+#~ msgid "Attached ID"
+#~ msgstr "Ekli ID"
+
 #~ msgid ""
 #~ "Do not display this log if it belongs to the same object the user is working "
 #~ "on"
@@ -16049,6 +16279,9 @@ msgstr ""
 #~ msgid "Homepage Widgets"
 #~ msgstr "Anasayfa Araçları"
 
+#~ msgid "Attached Model"
+#~ msgstr "Ekli Model"
+
 #~ msgid "https://help.launchpad.net/Translations"
 #~ msgstr "https://help.launchpad.net/Translations"
 
@@ -16346,6 +16579,9 @@ msgstr ""
 #~ msgid "My Logs"
 #~ msgstr "Günlüklerim"
 
+#~ msgid "Addresses"
+#~ msgstr "Adresler"
+
 #~ msgid "Integer Big"
 #~ msgstr "Integer Big"
 
@@ -16697,6 +16933,9 @@ msgstr ""
 #~ msgid "key '%s' not found in selection field '%s'"
 #~ msgstr "'%s' anahtarı seçim alanı '%s' de bulunamadı"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "Çalıştırılabilir dosya ya da dış URL"
+
 #~ msgid "- type,name,res_id,src,value"
 #~ msgstr "- type,name,res_id,src,value"
 
@@ -17304,6 +17543,9 @@ msgstr ""
 #~ msgid "web calendar"
 #~ msgstr "web takvimi"
 
+#~ msgid "DB Password Encryption"
+#~ msgstr "Veritabanı Şifre Kriptolama"
+
 #~ msgid "Address Information"
 #~ msgstr "Adres Bilgisi"
 
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 4aa5524eed6..c7b4bf014c4 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:49+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\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: 2012-12-04 05:01+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "Дата та час"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -187,41 +187,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Попередження!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -229,7 +203,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -240,7 +214,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -251,7 +225,7 @@ msgid "Swaziland"
 msgstr "Свазіленд"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -330,20 +304,6 @@ msgstr "Компанія, якої стосується поточний зап
 msgid "Max. Size"
 msgstr "Макс. розмір"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -351,11 +311,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Контактна особа"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -414,7 +369,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -451,6 +406,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Власник"
 
@@ -489,7 +445,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -541,7 +497,7 @@ msgid "Netherlands Antilles"
 msgstr "Нідерландські Антильські Острови"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -582,9 +538,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "Первинний вид"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -609,26 +565,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Боснійська / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -640,9 +576,25 @@ msgstr ""
 "попередній звіт."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "Ангола"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -719,14 +671,12 @@ msgstr ""
 "{})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "Майстри"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Назва поля користувача має починатися з 'x_'!"
@@ -790,16 +740,14 @@ msgid "Model Description"
 msgstr "Опис моделі"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -828,11 +776,21 @@ msgstr "Помилка Трігера"
 msgid "Jordan"
 msgstr "Йорданія"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -961,11 +919,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Папуа Нова Гвінея"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -983,7 +939,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1031,16 +987,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Іспанська (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Мобільний"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1137,9 +1086,38 @@ msgid "Mongolia"
 msgstr "Монголія"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1153,12 +1131,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1185,7 +1168,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1215,7 +1245,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1247,14 +1277,12 @@ msgid "South Korea"
 msgstr "Південна Корея"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Переміщення"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1392,7 +1420,7 @@ msgid "Marshall Islands"
 msgstr "Маршаллові Острови"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1414,7 +1442,7 @@ msgid "Search"
 msgstr "Пошук"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1429,7 +1457,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "Майстри"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1555,7 +1590,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1672,18 +1721,13 @@ msgid "On Create"
 msgstr "Коли створюється"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1764,7 +1808,7 @@ msgid "East Timor"
 msgstr "Східний Тимор"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1805,11 +1849,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "Приєднане ID"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1824,7 +1863,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1865,6 +1904,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Доступ для читання"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1941,16 +1985,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "Приєднана Модель"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2005,7 +2044,7 @@ msgid "Formula"
 msgstr "Формула"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Неможливо видалити користувача root!"
@@ -2029,11 +2068,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2045,7 +2084,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Тип адреси"
 
@@ -2083,11 +2121,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2223,6 +2256,11 @@ msgstr "Кількість обновлених модулів"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2256,12 +2294,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2309,6 +2352,15 @@ msgstr "Беліз"
 msgid "Add or not the corporate RML header"
 msgstr "Додати чи ні корпоративний заголовок RML"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2360,7 +2412,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2438,7 +2490,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Інвойс"
 
@@ -2485,11 +2536,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2607,9 +2653,20 @@ msgid "Default limit for the list view"
 msgstr "Типове обмеження для спискового виду"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Папуа Нова Гвінея"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2687,7 +2744,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2746,6 +2803,19 @@ msgstr "Відповідність полів"
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2754,7 +2824,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2840,7 +2910,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2870,7 +2940,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2935,22 +3005,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3044,12 +3114,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Помилка! Не можна створювати рекурсивні компанії."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3066,17 +3136,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3086,7 +3158,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Неможливо оновити модуль '%s'. Він не встановлений."
@@ -3137,34 +3209,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3203,7 +3247,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3215,6 +3259,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Тип банківського рахунку"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3251,7 +3323,7 @@ msgid "Signal (subflow.*)"
 msgstr "Сигнал (subflow.*)"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3285,7 +3357,7 @@ msgid "Access Controls"
 msgstr "Контроль доступу"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3313,32 +3385,6 @@ msgstr "Головна компанія"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3358,9 +3404,13 @@ msgstr ""
 "Якщо ви використовуєте тип \"формула\", використовуйте python вираз зі "
 "змінною 'object'."
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Помилка! Не можна створювати рекурсивні компанії."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Дата народження"
 
@@ -3376,7 +3426,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3484,7 +3534,7 @@ msgid "Malta"
 msgstr "Мальта"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3673,7 +3723,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Звернення"
@@ -3684,13 +3733,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "Рекурсивна помилка у залежностях модулів!"
@@ -3750,9 +3804,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3763,7 +3818,7 @@ msgid "Company Name"
 msgstr "Назва компанії"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3782,14 +3837,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "Правила запису"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3818,13 +3896,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3872,19 +3946,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3904,7 +3966,7 @@ msgid "Nauru"
 msgstr "Науру"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3949,7 +4011,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3968,9 +4030,43 @@ msgid "Technical Data"
 msgstr "Технічні Данні"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4026,13 +4122,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "Ltd"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4048,8 +4149,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4108,33 +4209,10 @@ msgid "Languages"
 msgstr "Мови"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "Xor"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4212,7 +4290,6 @@ msgstr "Обмеження"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Типовий"
 
@@ -4284,6 +4361,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4345,9 +4427,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "Сурінам"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4427,6 +4516,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4450,6 +4555,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4477,6 +4619,12 @@ msgstr ""
 msgid "View"
 msgstr "Вид"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4554,12 +4702,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4574,7 +4716,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Індекс"
@@ -4585,13 +4726,18 @@ msgstr "Індекс"
 msgid "Author"
 msgstr "Автор"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - Прийнятне відображення дати та часу."
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4634,6 +4780,8 @@ msgstr "Напрямок"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "Види"
 
@@ -4649,7 +4797,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4743,7 +4891,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4831,7 +4984,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4946,6 +5099,11 @@ msgstr "Маврикій"
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4959,7 +5117,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4970,7 +5128,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -5002,6 +5160,17 @@ msgstr "Сенегал"
 msgid "Hungary"
 msgstr "Угорщина"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5165,7 +5334,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5181,16 +5350,11 @@ msgid "Decimal Separator"
 msgstr "Десятковий Роздільник"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5231,9 +5395,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Автор"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5296,15 +5461,6 @@ msgstr "Венесуела"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5320,6 +5476,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "Назва додатку"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5403,6 +5564,12 @@ msgstr "Казахстан"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Назва ресурсу"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5653,7 +5820,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5710,6 +5877,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5825,13 +6001,15 @@ msgid "Bank Type"
 msgstr "Тип Банку"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Назва групи не може починатися з \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5851,7 +6029,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5884,10 +6062,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Назва ресурсу"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5920,6 +6097,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "Первинний вид"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5930,7 +6112,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5946,26 +6128,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6098,11 +6260,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6114,8 +6271,8 @@ msgid "Malaysia"
 msgstr "Малайзія"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6222,7 +6379,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6260,7 +6417,7 @@ msgid "Created Menus"
 msgstr "Створені Меню"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6287,8 +6444,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6321,6 +6506,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6363,7 +6555,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6455,7 +6647,7 @@ msgid "Israel"
 msgstr "Ізраїль"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6475,23 +6667,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Мобільний"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6524,10 +6699,10 @@ msgstr "Звіт xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Модулі"
 
@@ -6601,8 +6776,8 @@ msgid "United Kingdom"
 msgstr "Великобританія"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6626,8 +6801,8 @@ msgid "Partner Titles"
 msgstr "Заголовки Партнера"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6675,18 +6850,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6791,6 +6961,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Переміщення"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6885,7 +7062,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6986,12 +7162,6 @@ msgstr "Повна Назва"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7033,6 +7203,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7090,7 +7261,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "Будьласка вкажіть дію до виконання !"
@@ -7110,6 +7281,11 @@ msgstr "Назва категорії"
 msgid "Northern Mariana Islands"
 msgstr "Північні Маріанські Острови"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7121,13 +7297,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7158,7 +7339,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7204,7 +7385,6 @@ msgstr "Перехід"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7224,30 +7404,30 @@ msgid "Child Categories"
 msgstr "Дочірні Категорії"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Помилка"
@@ -7335,6 +7515,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Це вікно"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7418,6 +7603,21 @@ msgstr "Поля"
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7447,11 +7647,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Адреси"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7476,7 +7671,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Вулиця"
@@ -7487,8 +7681,23 @@ msgid "Yugoslavia"
 msgstr "Югославія"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7567,7 +7776,7 @@ msgid "Change My Preferences"
 msgstr "Змінити мої вподобання"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7654,14 +7863,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7670,7 +7881,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7681,13 +7892,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7706,12 +7917,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "Майстер"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7884,7 +8096,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7915,14 +8127,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Попередження!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7946,7 +8150,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8061,7 +8264,7 @@ msgid "Nigeria"
 msgstr "Нігерія"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8376,7 +8579,7 @@ msgid "Update Modules List"
 msgstr "Обновити Список Модулів"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8388,7 +8591,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8398,7 +8601,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8413,6 +8616,17 @@ msgstr "Далі"
 msgid "Thai / ภาษาไทย"
 msgstr "Тайська / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8452,7 +8666,7 @@ msgid "Mexico"
 msgstr "Мексика"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8474,15 +8688,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "Назва додатку"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8506,7 +8720,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Скорочена назва місяця."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8518,7 +8732,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Постачальник"
@@ -8596,7 +8809,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8624,8 +8837,8 @@ msgid "Iteration"
 msgstr "Повторення"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8649,7 +8862,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8796,7 +9009,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8835,8 +9048,8 @@ msgid "Solomon Islands"
 msgstr "Соломонові Острови"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "AccessError"
@@ -8910,7 +9123,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8924,7 +9137,7 @@ msgid "Ukraine"
 msgstr "Україна"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8987,6 +9200,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9085,8 +9303,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9115,13 +9333,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9142,7 +9360,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9190,7 +9408,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9236,6 +9454,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9244,7 +9463,7 @@ msgid "Cancel"
 msgstr "Скасувати"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9263,6 +9482,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9298,7 +9554,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9350,6 +9606,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9392,23 +9653,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9442,7 +9691,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9533,6 +9782,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9737,7 +9991,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9748,13 +10002,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "Од.виміру інтервалу"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "Вид"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "Цього метода вже не існує"
@@ -9923,7 +10182,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9956,6 +10215,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9981,6 +10245,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10070,7 +10339,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "Місто"
@@ -10106,13 +10374,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "Естонська / Estonian"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 або пізніша версія"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10171,19 +10446,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10197,6 +10497,8 @@ msgid "Activity"
 msgstr "Діяльність"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10215,7 +10517,12 @@ msgid "Parent Company"
 msgstr "Батьківська компанія"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10227,13 +10534,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10315,6 +10615,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10384,6 +10704,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10442,9 +10767,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10462,8 +10787,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -10502,13 +10827,12 @@ msgid "Laos"
 msgstr "Лаос"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Ел.пошта"
@@ -10519,7 +10843,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10550,36 +10879,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10601,6 +10900,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "Еквадор"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "процес"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10617,16 +10921,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10643,8 +10937,8 @@ msgid "Cascade"
 msgstr "Каскадом"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10670,11 +10964,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10700,7 +10989,7 @@ msgid "Domain"
 msgstr "Домен"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10716,12 +11005,12 @@ msgid "State Name"
 msgstr "Назва області"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10742,30 +11031,10 @@ msgid "Timezone"
 msgstr "Часовий пояс"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10785,7 +11054,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10832,7 +11101,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "Вулиця2"
 
@@ -10856,6 +11124,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10941,19 +11210,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "процес"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10995,22 +11273,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Аргументи"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11143,7 +11405,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Покупець"
 
@@ -11233,7 +11494,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11283,8 +11544,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11375,7 +11636,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11402,7 +11663,7 @@ msgid "Object"
 msgstr "Об'єкт"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11488,7 +11749,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11501,7 +11762,7 @@ msgid "User Ref."
 msgstr "Користувач"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11546,8 +11807,6 @@ msgstr "Довідник"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11555,7 +11814,7 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11584,12 +11843,6 @@ msgstr "Фолклендські Острови"
 msgid "Lebanon"
 msgstr "Ліван"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "Xor"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11696,8 +11949,10 @@ msgid "Selection"
 msgstr "Selection"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11734,7 +11989,7 @@ msgid "Action Type"
 msgstr "Тип дії"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11870,11 +12125,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Година 00->12: %(h12)"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "Зніміть відмітку з активного поля щоб приховати контакт."
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11891,7 +12141,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11914,7 +12164,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "невизначений метод get!"
@@ -11955,16 +12205,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "Сурінам"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12011,87 +12261,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
-
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12270,6 +12490,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12286,7 +12511,7 @@ msgid "Body"
 msgstr "Тіло"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12334,7 +12559,7 @@ msgid "choose"
 msgstr "вибір"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12510,10 +12735,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12545,12 +12774,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12564,7 +12794,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12586,23 +12815,6 @@ msgstr ""
 msgid "China"
 msgstr "Китай"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12670,25 +12882,9 @@ msgid "Bulgaria"
 msgstr "Болгарія"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "Ангола"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12716,6 +12912,26 @@ msgstr "5. %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12752,6 +12968,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "невідомий"
@@ -12819,6 +13036,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12908,6 +13130,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12920,7 +13143,7 @@ msgid "Information"
 msgstr "Інформація"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12951,16 +13174,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13025,6 +13252,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13097,29 +13329,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13167,7 +13376,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13211,9 +13420,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "Правила запису"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13457,9 +13666,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13486,62 +13700,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13583,17 +13748,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13628,7 +13782,7 @@ msgid "Low"
 msgstr "Низький"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13708,11 +13862,10 @@ msgid "El Salvador"
 msgstr "Ель Сальвадор"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Телефон"
@@ -13727,6 +13880,11 @@ msgstr "Меню доступу"
 msgid "Thailand"
 msgstr "Таїланд"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13747,6 +13905,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13783,41 +13965,6 @@ msgstr "Залежності об'єкта"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13878,40 +14025,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14001,6 +14116,21 @@ msgstr "Вид:"
 msgid "View Auto-Load"
 msgstr "Продивитися автозавантаження"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14043,34 +14173,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14093,9 +14195,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14106,7 +14208,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14132,7 +14264,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14177,7 +14309,7 @@ msgid "Access"
 msgstr "Доступ"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14210,11 +14342,10 @@ msgid "Bahrain"
 msgstr "Бахрейн"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Факс"
@@ -14230,8 +14361,6 @@ msgstr "Факс"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14346,7 +14475,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14358,7 +14487,6 @@ msgstr "Ямайка"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14391,7 +14519,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14402,8 +14530,8 @@ msgid "Azerbaijan"
 msgstr "Азербайджан"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Попередження"
@@ -14429,11 +14557,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14523,7 +14646,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Країна"
@@ -14592,8 +14714,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14621,7 +14747,7 @@ msgid "Japan"
 msgstr "Японія"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14682,6 +14808,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14706,7 +14863,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14745,6 +14902,12 @@ msgstr ""
 msgid "Condition"
 msgstr "Умова"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14797,6 +14960,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "Хорватія"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14821,6 +14991,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14837,7 +15012,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14858,14 +15033,51 @@ msgstr "Сьєрра-Леоне"
 msgid "General Information"
 msgstr "Загальна інформація"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14902,7 +15114,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14920,11 +15137,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Функція"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14960,11 +15181,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Доставка"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14992,7 +15208,7 @@ msgid "Workflow Instances"
 msgstr "Екземпляри процесу"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Партнери: "
@@ -15003,7 +15219,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15069,7 +15285,6 @@ msgstr "Назва Експорту"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15131,6 +15346,9 @@ msgstr ""
 #~ msgid "On multiple doc."
 #~ msgstr "При багатьох док."
 
+#~ msgid "Contact Name"
+#~ msgstr "Контактна особа"
+
 #, python-format
 #~ msgid ""
 #~ "Save this document to a %s file and edit it with a specific software or a "
@@ -15187,6 +15405,9 @@ msgstr ""
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "Приєднане ID"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "Залишіть 0 якщо дія стосується всіх джерел."
 
@@ -15197,6 +15418,9 @@ msgstr ""
 #~ "Вкажіть повідомлення. Ви можете використати поля об'єкта, наприклад "
 #~ "`Шановний(а) [[ object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "Приєднана Модель"
+
 #~ msgid "Trigger Name"
 #~ msgstr "Назва тригеру"
 
@@ -15331,6 +15555,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW path"
 
+#~ msgid "Creator"
+#~ msgstr "Автор"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15409,6 +15636,9 @@ msgstr ""
 #~ msgid "res.config.view"
 #~ msgstr "res.config.view"
 
+#~ msgid "Addresses"
+#~ msgstr "Адреси"
+
 #~ msgid "XML Identifier"
 #~ msgstr "Ідентифікатор XML"
 
@@ -15524,12 +15754,18 @@ msgstr ""
 #~ msgid "Load an Official Translation"
 #~ msgstr "Завантажити Офіційний Переклад"
 
+#~ msgid "Delivery"
+#~ msgstr "Доставка"
+
 #~ msgid "Report Header"
 #~ msgstr "Верхній колонтитул"
 
 #~ msgid "Type fields"
 #~ msgstr "Поля типу"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "Зніміть відмітку з активного поля щоб приховати контакт."
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "Демократична Республіка Конго"
 
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 98cda6be1ca..82ebd2a2ac1 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-18 21:31+0000\n"
 "Last-Translator: Aamir Riaz <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:01+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "تا ریخ وقت"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,8 +569,24 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,10 +908,8 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
 msgstr ""
 
 #. module: base
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr ""
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr ""
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,8 +2631,19 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
 msgstr ""
 
 #. module: base
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr ""
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,8 +4401,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr ""
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr ""
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr ""
 msgid "Hungary"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr ""
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr ""
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,8 +9274,8 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11924,13 +12174,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,24 +12848,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 1d5d482ef65..1cf89433cc9 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:01+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr "Ngày giờ"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -191,41 +191,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "Cảnh báo!"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -236,7 +210,7 @@ msgstr ""
 "chỉnh!"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "Lỗi ràng buộc"
@@ -247,7 +221,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -258,7 +232,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "đã được tạo."
@@ -337,20 +311,6 @@ msgstr "Công ty lưu trữ bản ghi hiện tại"
 msgid "Max. Size"
 msgstr "Kích thước tối đa"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -358,11 +318,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "Tên liên hệ"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -421,7 +376,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -458,6 +413,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "Chủ sở hữu"
 
@@ -496,7 +452,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -548,7 +504,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -588,8 +544,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -615,26 +571,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "Tiếng Bosnia"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -645,8 +581,24 @@ msgstr ""
 "tin đính kèm, hệ thống sẽ trả về báo cáo trước đó."
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -723,14 +675,12 @@ msgstr ""
 "Từ điển bối cảnh là biểu thức Python, mặc định để trống (Mặc định: {})"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Các trường được tùy chỉnh phải có tên bắt đầu bằng 'x_' !"
@@ -794,16 +744,14 @@ msgid "Model Description"
 msgstr "Mô tả mô hình"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -832,11 +780,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -965,11 +923,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "Pa-pu-a Niu Ghi-nê"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -988,7 +944,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1036,16 +992,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Số di động"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1142,9 +1091,38 @@ msgid "Mongolia"
 msgstr "Mông Cổ"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1158,12 +1136,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1190,7 +1173,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1218,7 +1248,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1250,14 +1280,12 @@ msgid "South Korea"
 msgstr "Nam Triều tiên"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "Chuyển tiếp"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1392,7 +1420,7 @@ msgid "Marshall Islands"
 msgstr "Quần Đảo Ma-san"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1414,7 +1442,7 @@ msgid "Search"
 msgstr "Tìm kiếm"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1429,7 +1457,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1555,7 +1590,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "Không tồn tại ngôn ngữ có mã là \"%s\""
@@ -1670,18 +1719,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1762,7 +1806,7 @@ msgid "East Timor"
 msgstr "Đông Ti-mo"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1803,11 +1847,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1822,7 +1861,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1863,6 +1902,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "Quyền Đọc"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1939,16 +1983,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2003,7 +2042,7 @@ msgid "Formula"
 msgstr "Công thức"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "Không thể xóa người dùng gốc"
@@ -2027,11 +2066,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (sao chép)"
@@ -2043,7 +2082,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "Loại địa chỉ"
 
@@ -2081,11 +2119,6 @@ msgstr "Đường dẫn đầy đủ"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2218,6 +2251,11 @@ msgstr "Số lượng mô đun được cập nhật"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2251,12 +2289,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2304,6 +2347,15 @@ msgstr ""
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2355,7 +2407,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2433,7 +2485,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "Invoice"
 
@@ -2480,11 +2531,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2603,9 +2649,20 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "Pa-pu-a Niu Ghi-nê"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2683,7 +2740,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2742,6 +2799,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2750,7 +2820,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2836,7 +2906,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2866,7 +2936,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2931,22 +3001,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "Lỗi!"
@@ -3040,12 +3110,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3062,17 +3132,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3082,7 +3154,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Không thể nâng cấp mô-đun '%s'. Mô-đun này chưa được cài đặt."
@@ -3133,34 +3205,6 @@ msgstr "Các thông số Cấu hình"
 msgid "Invalid arguments"
 msgstr "Các đối số không hợp lệ"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3199,7 +3243,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3211,6 +3255,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "Loại tài khoản ngân hàng"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3247,7 +3319,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3281,7 +3353,7 @@ msgid "Access Controls"
 msgstr "Các kiểm soát truy cập"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3309,32 +3381,6 @@ msgstr "Công ty chính"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3352,9 +3398,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "Ngày sinh"
 
@@ -3370,7 +3420,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3478,7 +3528,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3667,7 +3717,6 @@ msgstr "Báo cáo"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "Danh xưng"
@@ -3678,13 +3727,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3744,9 +3798,10 @@ msgid "Urdu / اردو"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3757,7 +3812,7 @@ msgid "Company Name"
 msgstr "Tên Công ty"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3776,13 +3831,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3812,13 +3890,9 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -3866,19 +3940,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3898,7 +3960,7 @@ msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3943,7 +4005,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3962,9 +4024,43 @@ msgid "Technical Data"
 msgstr "Dữ liệu kỹ thuật"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4020,13 +4116,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "EAN13"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4042,9 +4143,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "Nhóm bắt buộc"
 
 #. module: base
 #: view:res.lang:0
@@ -4102,32 +4203,9 @@ msgid "Languages"
 msgstr "Các ngôn ngữ"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4206,7 +4284,6 @@ msgstr ""
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "Mặc định"
 
@@ -4278,6 +4355,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4339,8 +4421,15 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -4421,6 +4510,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4444,6 +4549,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4471,6 +4613,12 @@ msgstr ""
 msgid "View"
 msgstr "View"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4548,12 +4696,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4568,7 +4710,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "Mã bưu chính"
@@ -4579,13 +4720,18 @@ msgstr "Mã bưu chính"
 msgid "Author"
 msgstr "Tác giả"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4628,6 +4774,8 @@ msgstr "Hướng"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr ""
 
@@ -4643,7 +4791,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4736,7 +4884,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4824,7 +4977,7 @@ msgid "System Configuration Done"
 msgstr "Hoàn tất Cấu hình hệ thống"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4939,6 +5092,11 @@ msgstr ""
 msgid "Full Access"
 msgstr "Toàn quyền truy cập"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4952,7 +5110,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4963,7 +5121,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4995,6 +5153,17 @@ msgstr "Xê-nê-gan"
 msgid "Hungary"
 msgstr "Hung-ga-ri"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5158,7 +5327,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5174,16 +5343,11 @@ msgid "Decimal Separator"
 msgstr "Phân cách thập phân"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5224,9 +5388,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "Người tạo"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "Tên của mô đun phải duy nhất !"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5289,15 +5454,6 @@ msgstr ""
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j              ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5313,6 +5469,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5396,6 +5557,12 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - Ngày trong tuần [0(Chủ nhật),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "Tên Tài nguyên"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5646,7 +5813,7 @@ msgid "title"
 msgstr "danh xưng"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5703,6 +5870,15 @@ msgstr "Các sản phẩm"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5818,13 +5994,15 @@ msgid "Bank Type"
 msgstr "Loại ngân hàng"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Tên nhóm không thể bắt đầu bằng \"-\""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5844,7 +6022,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5879,10 +6057,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "Tên Tài nguyên"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5915,6 +6092,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5925,7 +6107,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5941,26 +6123,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6093,11 +6255,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6109,8 +6266,8 @@ msgid "Malaysia"
 msgstr "Ma-lai-xi-a"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6217,7 +6374,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6255,7 +6412,7 @@ msgid "Created Menus"
 msgstr "Các trình đơn được tạo"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6282,8 +6439,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6316,6 +6501,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6358,7 +6550,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6450,7 +6642,7 @@ msgid "Israel"
 msgstr "Do Thái"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6470,23 +6662,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "Số di động"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6519,10 +6694,10 @@ msgstr "Báo cáo xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "Các mô đun"
 
@@ -6596,9 +6771,9 @@ msgid "United Kingdom"
 msgstr "Vương Quốc Anh Thống Nhất"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6621,8 +6796,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6670,18 +6845,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6786,6 +6956,13 @@ msgstr "Tập tin của mô đun đã được Module file successfully imported
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "Chuyển tiếp"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6880,7 +7057,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6981,12 +7157,6 @@ msgstr "Tên đầy đủ"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "Tên của mô đun phải duy nhất !"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7028,6 +7198,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7085,7 +7256,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7105,6 +7276,11 @@ msgstr "Tên chủng loại"
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7116,13 +7292,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7153,7 +7334,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7199,7 +7380,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7219,30 +7399,30 @@ msgid "Child Categories"
 msgstr "Các hạng mục con"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "Lỗi"
@@ -7330,6 +7510,11 @@ msgstr ""
 msgid "This Window"
 msgstr "Cửa sổ này"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7413,6 +7598,21 @@ msgstr "Các trường"
 msgid "Employees"
 msgstr "Nhân viên"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7442,11 +7642,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "Địa chỉ"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7471,7 +7666,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "Đường phố"
@@ -7482,8 +7676,23 @@ msgid "Yugoslavia"
 msgstr ""
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7562,7 +7771,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
@@ -7649,14 +7858,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7665,7 +7876,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -7676,13 +7887,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7701,12 +7912,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7879,7 +8091,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7908,14 +8120,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "Cảnh báo!"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7939,7 +8143,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8054,7 +8257,7 @@ msgid "Nigeria"
 msgstr "Ni-giê-ri-a"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8369,7 +8572,7 @@ msgid "Update Modules List"
 msgstr "Cập nhật danh sách mô đun"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8383,7 +8586,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8393,7 +8596,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8408,6 +8611,17 @@ msgstr "Tiếp tục"
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8447,7 +8661,7 @@ msgid "Mexico"
 msgstr "Mê-hi-cô"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8469,14 +8683,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8501,7 +8715,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - Tên viết tắt của tháng."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8513,7 +8727,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "Nhà cung cấp"
@@ -8591,7 +8804,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8619,8 +8832,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "Lỗi người sử dụng"
@@ -8644,7 +8857,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8791,7 +9004,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8830,8 +9043,8 @@ msgid "Solomon Islands"
 msgstr "Quần đảo Xô-lô-mông"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8905,7 +9118,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8919,7 +9132,7 @@ msgid "Ukraine"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8982,6 +9195,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9080,8 +9298,8 @@ msgid "Custom Shortcuts"
 msgstr "Phím tắt tùy chọn"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
 msgstr ""
 
 #. module: base
@@ -9110,13 +9328,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9137,7 +9355,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9185,7 +9403,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "Mô-đun %s không tồn tại!"
@@ -9231,6 +9449,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9239,7 +9458,7 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9258,6 +9477,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9293,7 +9549,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9345,6 +9601,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - Giờ (đồng hồ 12-hour) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9387,23 +9648,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9437,7 +9686,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9528,6 +9777,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9732,7 +9986,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9743,13 +9997,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9917,7 +10176,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9950,6 +10209,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9975,6 +10239,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10064,7 +10333,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "TP thuộc Tỉnh/Quận/Huyện"
@@ -10100,13 +10368,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10165,19 +10440,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10191,6 +10491,8 @@ msgid "Activity"
 msgstr ""
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10209,7 +10511,12 @@ msgid "Parent Company"
 msgstr "Công ty mẹ"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10221,13 +10528,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10309,6 +10609,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10378,6 +10698,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10436,9 +10761,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10456,8 +10781,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10496,13 +10821,12 @@ msgid "Laos"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "Thư điện tử"
@@ -10513,7 +10837,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10542,36 +10871,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10593,6 +10892,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "luồng công việc"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10609,16 +10913,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10635,9 +10929,9 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "Nhóm bắt buộc"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10662,11 +10956,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10692,7 +10981,7 @@ msgid "Domain"
 msgstr "Miền giá trị"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10708,12 +10997,12 @@ msgid "State Name"
 msgstr "Tên tỉnh/TP"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10734,30 +11023,10 @@ msgid "Timezone"
 msgstr "Múi giờ"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -10777,7 +11046,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10826,7 +11095,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10850,6 +11118,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10935,19 +11204,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "luồng công việc"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
@@ -10989,22 +11267,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "Các đối số"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11137,7 +11399,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "Khách hàng"
 
@@ -11227,7 +11488,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11277,8 +11538,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11369,7 +11630,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11396,7 +11657,7 @@ msgid "Object"
 msgstr "Đối tượng"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11482,7 +11743,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11495,7 +11756,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11540,8 +11801,6 @@ msgstr "Hướng dẫn tham khảo"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11549,7 +11808,7 @@ msgid "Partner"
 msgstr "Đối tác"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11578,12 +11837,6 @@ msgstr ""
 msgid "Lebanon"
 msgstr ""
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11690,8 +11943,10 @@ msgid "Selection"
 msgstr "Lựa chọn"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11728,7 +11983,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11864,11 +12119,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "Giờ 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11885,7 +12135,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11908,7 +12158,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11950,13 +12200,13 @@ msgid "Payroll Accounting"
 msgstr ""
 
 #. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
+#: view:res.users:0
+msgid "Change password"
 msgstr ""
 
 #. module: base
-#: view:res.users:0
-msgid "Change password"
+#: model:res.country,name:base.sr
+msgid "Suriname"
 msgstr ""
 
 #. module: base
@@ -12005,87 +12255,57 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
-
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12262,6 +12482,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12278,7 +12503,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12326,7 +12551,7 @@ msgid "choose"
 msgstr "chọn"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12502,10 +12727,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12537,12 +12766,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12556,7 +12786,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
@@ -12578,23 +12807,6 @@ msgstr ""
 msgid "China"
 msgstr "Trung Quốc"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12662,24 +12874,8 @@ msgid "Bulgaria"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
+#: model:res.country,name:base.ao
+msgid "Angola"
 msgstr ""
 
 #. module: base
@@ -12708,6 +12904,26 @@ msgstr "5.  %y, %Y         ==> 08, 2008"
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12744,6 +12960,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "unknown"
@@ -12811,6 +13028,11 @@ msgstr "Sổ địa chỉ"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12900,6 +13122,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12912,7 +13135,7 @@ msgid "Information"
 msgstr "Thông tin"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12943,16 +13166,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "Cập nhật danh sách mô đun"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13017,6 +13244,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13089,29 +13321,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13159,7 +13368,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13203,8 +13412,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13449,9 +13658,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13478,62 +13692,13 @@ msgid "System Configuration done"
 msgstr "Hoàn tất cầu hình hệ thống"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13575,17 +13740,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13620,7 +13774,7 @@ msgid "Low"
 msgstr "Thấp"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
@@ -13700,11 +13854,10 @@ msgid "El Salvador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "Điện thoại"
@@ -13719,6 +13872,11 @@ msgstr "<b>Trình đơn truy cập</b>"
 msgid "Thailand"
 msgstr "Thái Lan"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13739,6 +13897,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13775,41 +13957,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13870,40 +14017,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13992,6 +14107,21 @@ msgstr "Xem :"
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14034,34 +14164,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Hệ ngôn ngữ Do Thái - Ba tư"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14084,9 +14186,9 @@ msgid "Unmet dependency !"
 msgstr "Phụ thuộc không được đáp ứng !"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14097,7 +14199,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14123,7 +14255,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14168,7 +14300,7 @@ msgid "Access"
 msgstr "Truy cập"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14201,11 +14333,10 @@ msgid "Bahrain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "Fax"
@@ -14221,8 +14352,6 @@ msgstr "Fax"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14337,7 +14466,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14349,7 +14478,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14382,7 +14510,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14393,8 +14521,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "Cảnh báo"
@@ -14420,11 +14548,6 @@ msgstr ""
 msgid "Parameters"
 msgstr "Các thông số"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14514,7 +14637,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "Quốc gia"
@@ -14581,8 +14703,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14610,7 +14736,7 @@ msgid "Japan"
 msgstr "Nhật Bản"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14671,6 +14797,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14695,7 +14852,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "Lưu ý hoạt động này có thể mất vài phút"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14734,6 +14891,12 @@ msgstr "Thực hiện"
 msgid "Condition"
 msgstr "Điều kiện"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14786,6 +14949,13 @@ msgstr ""
 msgid "Croatia"
 msgstr ""
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14810,6 +14980,11 @@ msgstr "Cập nhật hệ thống"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14826,7 +15001,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14847,14 +15022,51 @@ msgstr ""
 msgid "General Information"
 msgstr "Thông tin chung"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14891,7 +15103,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14909,11 +15126,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "Số tiếp theo của dãy thứ tự sẽ được tăng bằng số này"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "Chức năng"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14949,11 +15170,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "Giao hàng"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14981,7 +15197,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "Các đối tác: "
@@ -14992,7 +15208,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15058,7 +15274,6 @@ msgstr "Tên Trích xuất"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15097,6 +15312,9 @@ msgstr "Tiếng Nga"
 msgid "Signup"
 msgstr ""
 
+#~ msgid "Contact Name"
+#~ msgstr "Tên liên hệ"
+
 #~ msgid "E-Mail"
 #~ msgstr "Thư điện tử"
 
@@ -15174,6 +15392,9 @@ msgstr ""
 #~ msgid "Starting Date"
 #~ msgstr "Ngày bắt đầu"
 
+#~ msgid "Addresses"
+#~ msgstr "Địa chỉ"
+
 #~ msgid "Skipped"
 #~ msgstr "Đã bỏ qua"
 
@@ -15198,6 +15419,9 @@ msgstr ""
 #~ msgid "Localisation"
 #~ msgstr "Bản địa hóa"
 
+#~ msgid "Delivery"
+#~ msgstr "Giao hàng"
+
 #, python-format
 #~ msgid "Could not load base module"
 #~ msgstr "Không thể nạp mô đun base"
@@ -15531,6 +15755,9 @@ msgstr ""
 #~ msgid "https://help.launchpad.net/Translations"
 #~ msgstr "https://help.launchpad.net/Translations"
 
+#~ msgid "Creator"
+#~ msgstr "Người tạo"
+
 #~ msgid "Configure Your Interface"
 #~ msgstr "Cấu hình giao diện của bạn"
 
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 755d9f27fb1..1effe3b19b8 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 07:05+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2012-12-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -45,7 +45,7 @@ msgid "DateTime"
 msgstr "日期时间"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -210,63 +210,15 @@ msgstr ""
 "你可以在财务分析中定义价格列表，制作理论收入报表。"
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
-"\n"
-"OpenERP客户关系管理\n"
-"=========================================\n"
-"\n"
-"此应用程序可以使一组人的明智和有效地管理团队，机会，会议和电话呼叫\n"
-"\n"
-"管理客户关系的关键任务，如联系信息，识别，确定优先次序，分配，决议和通知。\n"
-"\n"
-"openerp确保所有Cases能成功地跟踪用户，客户和供应商。它可以自动发送提醒，升级的要求，根据自己企业的规则触发特定的方法和许多其他的行动。\n"
-"\n"
-"这一系统，很好的一点是用户不需要做任何特别的事情。客户关系管理模块有一个电子邮件网关之间的接口和openerp邮件同步。这样，用户就可以发送电子邮件，请求"
-"跟踪。\n"
-"\n"
-"openerp会将感谢他们的信息，自动发送到适当的人员哪里，并确保所有未来的信件到达正确的地方。\n"
-"\n"
-"客户关系管理包括仪表板：\n"
-"\n"
-"-------------------------------\n"
-"\n"
-"*财务收入计划阶段和用户（图）\n"
-"\n"
-"*机会的舞台（图）\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -274,7 +226,7 @@ msgid ""
 msgstr "基本字段的属性不能这样修改，请通过 Python 代码来修改它们，更好的办法是通过自定义模块来修改。"
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "约束错误"
@@ -285,7 +237,7 @@ msgid "ir.ui.view.custom"
 msgstr "ir.ui.view.custom"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr "不允许重命名稀疏字段“%s”"
@@ -296,7 +248,7 @@ msgid "Swaziland"
 msgstr "史瓦济兰"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "已创建"
@@ -381,33 +333,6 @@ msgstr "将该记录保存到此公司"
 msgid "Max. Size"
 msgstr "字段长度"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-"\n"
-"在销售订单上添加额外的日期信息。\n"
-"\n"
-"===================================================\n"
-"\n"
-"你可以添加下列附加日期到一个销售订单：\n"
-"-----------------------------------------------------------\n"
-"\n"
-"*申请日期\n"
-"\n"
-"*承诺日期\n"
-"\n"
-"*有效日期\n"
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -415,11 +340,6 @@ msgid ""
 "'form' only"
 msgstr "当“视图模式”是“表单”，此数据库 ID的记录将会以视图模式打开"
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "联系人姓名"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -490,7 +410,7 @@ msgstr ""
 "当从调拨创建发票时，你可以自定义的物流路线的价格。openerp能够按定义好路线的来计算。\n"
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -527,6 +447,7 @@ msgstr "自动化动作规则"
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "所有者"
 
@@ -565,7 +486,7 @@ msgid ""
 msgstr "日期、时间格式不正确。请参照您的语言设置中的日期/时间格式输入。"
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -618,7 +539,7 @@ msgid "Netherlands Antilles"
 msgstr "荷属安德列斯岛"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -656,9 +577,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "原始视图"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr "创意管理模块"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -683,26 +604,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "波斯尼亚语 / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -711,9 +612,25 @@ msgid ""
 msgstr "如果您选中此处，当下次用户使用相同的附件名称打印时将返回以前的报表。"
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "安哥拉"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -788,14 +705,12 @@ msgid ""
 msgstr "使用 Python 语言表达式的上下文字典，默认为空（默认值：{}）。"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "向导"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "自定义的字段名称必须以“x_”开始！"
@@ -885,25 +800,20 @@ msgid "Model Description"
 msgstr "模型描述"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                点击此处在你的地址本中增加一个新的联系人。\n"
-"              </p><p>\n"
-"                Openerp可以帮助你轻松的跟踪所有与客户相关的活动：\n"
-"                例如讨论，商业机会的历史记录，\n"
-"                文档，等等。\n"
-"              </p>\n"
-"            "
+"\n"
+"市场营销的菜单\n"
+"\n"
+"包括市场营销相关的模块\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -936,11 +846,21 @@ msgstr "触发器表达式"
 msgid "Jordan"
 msgstr "约旦"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr "此任务的下一次执行时间"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr "ir.ui.view"
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -1070,11 +990,9 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr "提供记录ID所指定的字段名称作写入操作，如果为空，则使用对象的活动ID"
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "巴布亚新几内亚"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -1092,7 +1010,7 @@ msgid "Email Preferences"
 msgstr "电子邮件选项"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr "对于字段 '%%(field)s' '%s' 不是一个有效的日期"
@@ -1140,16 +1058,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "手机"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1252,9 +1163,38 @@ msgid "Mongolia"
 msgstr "蒙古"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
-msgstr "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -1268,12 +1208,17 @@ msgid ""
 msgstr "若有用户添加至本组时自动将用户添加到下面的组。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr "文档模型"
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1300,7 +1245,54 @@ msgid "Username"
 msgstr "用户名"
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1330,7 +1322,7 @@ msgid "Delete Access Right"
 msgstr "删除访问权限"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr "连接测试失败！"
@@ -1362,14 +1354,12 @@ msgid "South Korea"
 msgstr "韩国"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "迁移"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr "记录 #%d %s 无法找到，不能复制！"
@@ -1504,7 +1494,7 @@ msgid "Marshall Islands"
 msgstr "马绍尔群岛"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr "改变一个字段的所属模型是不允许的！"
@@ -1526,7 +1516,7 @@ msgid "Search"
 msgstr "搜索"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1544,7 +1534,14 @@ msgid "Parent Application"
 msgstr "上级应用"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "向导"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "操作已经取消"
@@ -1697,7 +1694,21 @@ msgid "ir.exports"
 msgstr "ir.exports"
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "不存在代码为“%s”的语言"
@@ -1812,18 +1823,13 @@ msgid "On Create"
 msgstr "创建"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr "'%s'包含太多点。XML 标识符不应该包括点！其作用是引用到其他模块数据，如module.reference_id"
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr "报价单，销售订单，开发票"
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1909,7 +1915,7 @@ msgid "East Timor"
 msgstr "东帝汶"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1960,11 +1966,6 @@ msgstr ""
 "It assigns manager and user access rights to the Administrator and only user "
 "rights to the Demo user。 \n"
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr "附件编号"
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1979,7 +1980,7 @@ msgid ""
 msgstr "帮您完成销售网点的快速录入订单，简单的付款方式、自动生成发货单等。"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr "'%s'对于布尔字段'%%(field)s'是未知的值，期待输入'%s'"
@@ -2020,6 +2021,11 @@ msgstr "车辆，租赁，保险，成本"
 msgid "Read Access"
 msgstr "读权限"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -2096,16 +2102,11 @@ msgid "Create Tasks on SO"
 msgstr "以订单创建任务"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr "此字段包含模块数据，不能删除！"
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr "附加的模型"
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -2160,7 +2161,7 @@ msgid "Formula"
 msgstr "公式"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "不能删除根用户！"
@@ -2191,11 +2192,11 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -2207,7 +2208,6 @@ msgstr "科目表模版"
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "地址类型"
 
@@ -2245,11 +2245,6 @@ msgstr "完整路径"
 msgid "The next step depends on the file format:"
 msgstr "下一个步骤取决于文件格式："
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr "创意管理模块"
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2382,6 +2377,11 @@ msgstr "已更新的模块数"
 msgid "Method"
 msgstr "方法"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2415,12 +2415,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr "在字段'%%(field)s'中没找到匹配的记录%(field_type)s '%(value)s'"
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2468,6 +2473,15 @@ msgstr "伯利兹"
 msgid "Add or not the corporate RML header"
 msgstr "公司／组织 RML 页眉"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2519,7 +2533,7 @@ msgid ""
 msgstr "逗号分隔的视图模式列表，如：'form', 'tree', 'calendar', 等(默认: tree,form)"
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "自您上次查看过以后该单据已被修改(%s:%d)"
@@ -2607,7 +2621,6 @@ msgstr "圣多美和普林西比"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "发票"
 
@@ -2666,11 +2679,6 @@ msgstr ""
 "    * 日期\n"
 "    "
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr "公司标语"
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2793,9 +2801,20 @@ msgid "Default limit for the list view"
 msgstr "列表视图的默认数目限制"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "巴布亚新几内亚"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2876,7 +2895,7 @@ msgstr ""
 "================================================\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr "找到多个匹配的字段 '%%(field)s' (%d 个匹配)"
@@ -2935,6 +2954,19 @@ msgstr "字段映射"
 msgid "Export Translations"
 msgstr "导出翻译"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2943,7 +2975,7 @@ msgid "Manager"
 msgstr "经理"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "对不起，你没权限访问此文档"
@@ -3029,7 +3061,7 @@ msgid "Inherited"
 msgstr "继承"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr "是"
@@ -3059,7 +3091,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr "'%s' 不是一个整型字段 '%%(field)s'"
@@ -3124,22 +3156,22 @@ msgid "LinkedIn Integration"
 msgstr "LinkedIn 集成"
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "无效的对象架构！"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -3233,12 +3265,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "错误！您不能创建循环的公司。"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3255,19 +3287,24 @@ msgid ""
 msgstr "用户将有权限访问人力资源配置以及统计报表。"
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
+"\n"
+"此模块用于管理波兰的科目表\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3275,7 +3312,7 @@ msgid "Params storage"
 msgstr "参数存储"
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "不能升级模块 “%s“，因为它尚未安装。"
@@ -3330,34 +3367,6 @@ msgstr "设置参数"
 msgid "Invalid arguments"
 msgstr "无效的参数"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3396,7 +3405,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr "目标数据丢失"
@@ -3408,6 +3417,34 @@ msgstr "目标数据丢失"
 msgid "Bank Account Type"
 msgstr "银行帐户类型"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3444,7 +3481,7 @@ msgid "Signal (subflow.*)"
 msgstr "信号（subflow.*）"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3478,7 +3515,7 @@ msgid "Access Controls"
 msgstr "访问控制"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3506,32 +3543,6 @@ msgstr "母公司"
 msgid "Web Icon File (hover)"
 msgstr "Web 图标文件（悬停）"
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3549,9 +3560,13 @@ msgid ""
 "'object'."
 msgstr "如果是公式类型，请在 Python 语言表达式中使用变量“object”。"
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "错误！您不能创建循环的公司。"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "生日"
 
@@ -3567,7 +3582,7 @@ msgid "Products Manufacturers"
 msgstr "产品生产商管理"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr "SMTP-over-SSL 模式不可用"
@@ -3682,7 +3697,7 @@ msgid "Malta"
 msgstr "马耳他"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3871,7 +3886,6 @@ msgstr "报表"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "称谓"
@@ -3882,13 +3896,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr "倘若没有设置，则作为新资源的默认值"
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "检测到循环。"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "模块的依赖包含循环错误！"
@@ -3948,9 +3967,10 @@ msgid "Urdu / اردو"
 msgstr "Urdu / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr "访问被拒绝"
@@ -3961,7 +3981,7 @@ msgid "Company Name"
 msgstr "公司名称"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3980,14 +4000,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML （已废弃，使用报表功能）"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
-msgstr "翻译项的语言编码必须是已知的语言之一"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "记录规则"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "圣皮埃尔和密克隆"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4027,17 +4070,9 @@ msgid "Jersey"
 msgstr "泽西岛"
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
-msgstr ""
-"\n"
-"允许匿名访问OpenERP\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
 
 #. module: base
 #: view:res.lang:0
@@ -4085,19 +4120,7 @@ msgid "Paper Format"
 msgstr "纸张格式"
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -4117,7 +4140,7 @@ msgid "Nauru"
 msgstr "瑙鲁"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr "注册处"
@@ -4165,7 +4188,7 @@ msgid "Email Gateway"
 msgstr "邮件网关"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -4186,9 +4209,43 @@ msgid "Technical Data"
 msgstr "技术数据"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
-msgstr "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4244,13 +4301,18 @@ msgstr "问题时间表管理模块"
 msgid "Ltd"
 msgstr "有限公司"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "条形码（EAN13）"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "无效的架构！"
@@ -4266,9 +4328,9 @@ msgid "Share any Document"
 msgstr "共享任意文档"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr "线索，商机，电话"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "必须的用户组"
 
 #. module: base
 #: view:res.lang:0
@@ -4326,33 +4388,10 @@ msgid "Languages"
 msgstr "语言"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
-msgstr ""
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr "异或"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
@@ -4438,7 +4477,6 @@ msgstr "约束"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "默认"
 
@@ -4510,6 +4548,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr "若邮件没有指定邮件服务器，将使用最高优先级的服务器。默认优先级是10（数字越小，优先级越高）"
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4571,9 +4614,16 @@ msgid "Default value or action reference"
 msgstr "默认值或动作引用"
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "苏里南"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4657,6 +4707,22 @@ msgstr "导入一个翻译"
 msgid "Installed Version"
 msgstr "已安装版本"
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4680,6 +4746,43 @@ msgid ""
 "related object's read access."
 msgstr "如果您归属于用户组，则此菜单的可见性将有这些用户组决定。如果该字段为空，系统将基于关联对象的读取权限计算可见性。"
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4707,6 +4810,12 @@ msgstr "所选的语言已经成功安装。你必须改变用户偏好并开启
 msgid "View"
 msgstr "视图"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr "No"
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4784,12 +4893,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4804,7 +4907,6 @@ msgstr "瑞士 - 会计"
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "邮政编码"
@@ -4815,13 +4917,18 @@ msgstr "邮政编码"
 msgid "Author"
 msgstr "作者"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr "作为待办事项"
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - 日期时间表示"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4866,6 +4973,8 @@ msgstr "方向"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "视图"
 
@@ -4881,7 +4990,7 @@ msgid "SMTP Server"
 msgstr "SMTP 服务器"
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "您试图删除一个已安装或正要安装的模块"
@@ -4975,7 +5084,12 @@ msgid "Google Docs integration"
 msgstr "谷歌文档整合"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr "名称"
@@ -5063,7 +5177,7 @@ msgid "System Configuration Done"
 msgstr "系统设置完成"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "验证字段 %s 时发生错误：%s"
@@ -5178,6 +5292,11 @@ msgstr "毛里求斯"
 msgid "Full Access"
 msgstr "完全访问权限"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -5191,7 +5310,7 @@ msgid "Portuguese / Português"
 msgstr "Portuguese / Português"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr "不允许修改字段“%s”的存储系统。"
@@ -5202,7 +5321,7 @@ msgid "Only if this bank account belong to your company"
 msgstr "仅适用于属于贵公司的银行账户"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr "未知的子字段 '%s'"
@@ -5234,6 +5353,17 @@ msgstr "塞内加尔"
 msgid "Hungary"
 msgstr "匈牙利"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5401,7 +5531,7 @@ msgid "Account Owner Name"
 msgstr "账户所有者名称"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr "不能重命名列名为 %s，因为已经存在同名列。"
@@ -5417,16 +5547,11 @@ msgid "Decimal Separator"
 msgstr "十进位分割符"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr "找不到字段 '%s' 所需的值"
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr "res.partner.address"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5468,9 +5593,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr "可选的模型，通常是 动作需要的"
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "创建者"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr "模块名必须唯一！"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5533,19 +5659,6 @@ msgstr "委内瑞拉"
 msgid "9.  %j              ==> 340"
 msgstr "9.  %j ==> 340"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-"\n"
-"允许用户注册\n"
-"=======================\n"
-"    "
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5561,6 +5674,11 @@ msgstr "启动配置向导"
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr "生成订单，BOM，工艺路线"
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "附件名称"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5644,6 +5762,12 @@ msgstr "哈萨克斯坦"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - 星期 [0(周日),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "资源名称"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5897,7 +6021,7 @@ msgid "title"
 msgstr "标题"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr "真"
@@ -5954,6 +6078,15 @@ msgstr "产品"
 msgid "User-defined Defaults"
 msgstr "用户定义默认值"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -6075,13 +6208,15 @@ msgid "Bank Type"
 msgstr "银行类型"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "用户组的名称不能以“-”开始"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr "应用"
 
@@ -6101,7 +6236,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "古吉拉特语  / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -6134,10 +6269,9 @@ msgid "Uncategorized"
 msgstr "未分类"
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "资源名称"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6170,6 +6304,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr "如果转换的操作来源于界面上的一个按钮，信号字段存储按钮的名称。如果该值为NULL，界面上不需要按钮"
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "原始视图"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -6184,7 +6323,7 @@ msgstr ""
 "\n"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr "'%s' 看起来不像是用于字段 '%%(field)s' 的数字。"
@@ -6200,26 +6339,6 @@ msgstr "管理国家或地区的分类。"
 msgid "My Banks"
 msgstr "我的银行"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6352,11 +6471,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr "重置密码"
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6368,8 +6482,8 @@ msgid "Malaysia"
 msgstr "马来西亚"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr "增量数字必须是非0的。"
@@ -6478,7 +6592,7 @@ msgid ""
 msgstr "如果在系统中管理到一个员工，用户能管理自己的人力资源资料（休假请求，计工单，... ... ）"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr "类型 '%s' 没有为该结构定义视图"
@@ -6518,7 +6632,7 @@ msgid "Created Menus"
 msgstr "已创建菜单"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6545,9 +6659,37 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
-msgstr "作为待办事项"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6579,6 +6721,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "两位数的当前年份：%(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr "系统参数"
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6623,7 +6772,7 @@ msgid "Audit Trail"
 msgstr "审核追踪"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr "值 '%s' 没在选择的字段 '%%(field)s' 中找到"
@@ -6715,7 +6864,7 @@ msgid "Israel"
 msgstr "以色列"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "不能复制配置信息！"
@@ -6735,26 +6884,6 @@ msgstr "有时也叫 BIC 或 Swift。"
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "手机"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-"\n"
-"墨西哥会计模块\n"
-"    "
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6787,10 +6916,10 @@ msgstr "报表Xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "模块"
 
@@ -6864,9 +6993,9 @@ msgid "United Kingdom"
 msgstr "英国"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -6889,8 +7018,8 @@ msgid "Partner Titles"
 msgstr "业务伙伴称谓"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr "使用格式 '%s'"
@@ -6938,18 +7067,13 @@ msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr "您不能执行此操作。此对象不允许进行“创建新记录”操作，因为此对象是为报告准备的。"
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr "匿名"
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -7054,6 +7178,13 @@ msgstr "模块文件成功导入"
 msgid "Model Constraints"
 msgstr "模型约束条件"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "迁移"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -7148,7 +7279,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "省/州"
@@ -7249,12 +7379,6 @@ msgstr "全名"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr "模块名必须唯一！"
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7296,6 +7420,7 @@ msgstr "在多个文档上面。"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7353,7 +7478,7 @@ msgid "Connection Security"
 msgstr "连接安全"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "请指定要启动的动作！"
@@ -7373,6 +7498,11 @@ msgstr "分类名称"
 msgid "Northern Mariana Islands"
 msgstr "北马里亚纳群岛"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7384,13 +7514,18 @@ msgid "Intrastat Reporting"
 msgstr "内部统计报告"
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr "请使用更改密码向导（在用户首选项或用户菜单中）来更改您的密码。"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr "ir.config_parameter"
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7421,7 +7556,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "日历视图缺少字段！"
@@ -7467,7 +7602,6 @@ msgstr "迁移"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7487,30 +7621,30 @@ msgid "Child Categories"
 msgstr "子分类"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "错误"
@@ -7598,6 +7732,11 @@ msgstr "规则定义（ Domain  过滤器）"
 msgid "This Window"
 msgstr "此窗口"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7681,6 +7820,21 @@ msgstr "字段"
 msgid "Employees"
 msgstr "员工列表"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7714,11 +7868,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr "测试连接"
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "地址"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7743,7 +7892,6 @@ msgstr "选择项目"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "街道"
@@ -7754,9 +7902,24 @@ msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
-msgstr "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -7834,7 +7997,7 @@ msgid "Change My Preferences"
 msgstr "更改我的首选项"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "动作定义中使用了无效的模式名称。"
@@ -7924,20 +8087,25 @@ msgid "US Letter"
 msgstr "美式信纸"
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"\n"
-"市场营销的菜单\n"
-"\n"
-"包括市场营销相关的模块\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击此处在你的地址本中增加一个新的联系人。\n"
+"              </p><p>\n"
+"                Openerp可以帮助你轻松的跟踪所有与客户相关的活动：\n"
+"                例如讨论，商业机会的历史记录，\n"
+"                文档，等等。\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7945,7 +8113,7 @@ msgid "Company Bank Accounts"
 msgstr "公司银行账户"
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "基于安全上的考虑不允许设置空密码！"
@@ -7956,13 +8124,13 @@ msgid "Optional password for SMTP authentication"
 msgstr "可选的 SMTP 验证密码"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "对不起，你未被允许修改此单据。"
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7984,12 +8152,13 @@ msgid "Normal Bank Account"
 msgstr "普通银行账户"
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "向导"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr "database id"
@@ -8163,7 +8332,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr "工作、招聘、申请、工作面谈"
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -8192,14 +8361,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr "base.update.translations"
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "警告！"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -8223,7 +8384,6 @@ msgstr "网页快捷方式"
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8341,7 +8501,7 @@ msgid "Nigeria"
 msgstr "尼日利亚"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "对于选择字段，必须给出可选择的项目信息！"
@@ -8656,7 +8816,7 @@ msgid "Update Modules List"
 msgstr "更新模块列表"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8668,7 +8828,7 @@ msgid "eInvoicing"
 msgstr "电子发票管理"
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8680,7 +8840,7 @@ msgstr ""
 "您可以单击“取消”按钮进入用户选项设置。"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr "值 “%s”   未在字段 \"%s.%s\" 的选择之中"
@@ -8695,6 +8855,17 @@ msgstr "继续"
 msgid "Thai / ภาษาไทย"
 msgstr "泰国语 / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8737,7 +8908,7 @@ msgid "Mexico"
 msgstr "墨西哥"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8761,15 +8932,15 @@ msgid ""
 msgstr "这个字段指示这个模型是瞬态的或不是（例如：这字段被自动从数据库删除 或 不）"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr "缺少 SMTP 服务器"
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "附件名称"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr "翻译项的语言编码必须是已知的语言之一"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8793,7 +8964,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - 月份缩写。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "对不起，你不允许删除这个单据！"
@@ -8805,7 +8976,6 @@ msgstr "规则不能应用在Record Rules模型"
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "供应商"
@@ -8883,7 +9053,7 @@ msgid "Selectable"
 msgstr "可选择"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr "所有的东西看起来都已经设置好了！"
@@ -8911,8 +9081,8 @@ msgid "Iteration"
 msgstr "反复"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "用户错误"
@@ -8940,7 +9110,7 @@ msgstr ""
 "否则设置false。"
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -9090,7 +9260,7 @@ msgid "Reunion (French)"
 msgstr "法属留尼旺岛"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -9129,8 +9299,8 @@ msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "访问错误"
@@ -9204,7 +9374,7 @@ msgid "Prof."
 msgstr "Prof."
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -9219,7 +9389,7 @@ msgid "Ukraine"
 msgstr "乌克兰"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -9290,6 +9460,11 @@ msgstr "阶段"
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "佛兰德语 (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "越南语 / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9388,9 +9563,9 @@ msgid "Custom Shortcuts"
 msgstr "自定义快捷方式"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "越南语 / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9426,13 +9601,13 @@ msgid "Models"
 msgstr "模型"
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "`base` 不允许卸载"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr "模型现在不能修改"
@@ -9453,7 +9628,7 @@ msgid "osv_memory.autovacuum"
 msgstr "osv_memory.autovacuum"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "对不起，你不允许创建这种类型的单据。"
@@ -9501,7 +9676,7 @@ msgid "On Delete"
 msgstr "删除时"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "模型 %s 不存在！"
@@ -9547,6 +9722,7 @@ msgstr "美国 - 科目表"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9555,7 +9731,7 @@ msgid "Cancel"
 msgstr "取消"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "未知的数据库标识符 '%s'"
@@ -9574,6 +9750,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9609,7 +9822,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr "外部id"
@@ -9661,6 +9874,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - 小时（12小时格式）[01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9709,30 +9927,11 @@ msgid "The currency code must be unique per company!"
 msgstr "每个公司的货币代码必须唯一"
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr "新语言(空的翻译模版)"
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-"\n"
-"重置密码\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9766,7 +9965,7 @@ msgid "Products Expiry Date"
 msgstr "产品过保日"
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr "请单击“继续”按钮设置下一个模块..."
@@ -9861,6 +10060,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -10065,7 +10269,7 @@ msgid "Marketing Campaign - Demo"
 msgstr "市场营销 - 示例"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -10076,13 +10280,18 @@ msgstr "不能间接创建 M2O （多对1）记录，分别导入字段。"
 msgid "Interval Unit"
 msgstr "间隔单位"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "类别"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr "该方法不存在"
@@ -10250,7 +10459,7 @@ msgid "To Translate"
 msgstr "翻译"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr "查看所有可能的值"
@@ -10285,6 +10494,11 @@ msgstr "OpenERP 将自动添加几个“0”在“下一个数字”左侧满足
 msgid "PostgreSQL constraint or foreign key name."
 msgstr "PostgreSQL 约束或者 FK 名称"
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -10310,6 +10524,11 @@ msgstr "增加RML 页首"
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "页尾显示在所有报表的下方。"
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr "图标 URL"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10399,7 +10618,6 @@ msgstr "%m - 月份数 [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "城市"
@@ -10435,13 +10653,20 @@ msgstr "员工门户"
 msgid "Estonian / Eesti keel"
 msgstr "爱沙尼亚语 / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr "提供记录ID所指定的字段名称作写入操作，如果为空，则使用对象的活动ID"
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 或更新版本"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10500,19 +10725,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr "如果你认为这是一个错误，请联系系统管理员。"
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10526,6 +10776,8 @@ msgid "Activity"
 msgstr "活动"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10544,7 +10796,12 @@ msgid "Parent Company"
 msgstr "母公司"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr "OpenID 认证"
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10556,13 +10813,6 @@ msgstr "一个你试图访问的单据已经被删除，请刷新后重试。"
 msgid "ir.mail_server"
 msgstr "ir.mail_server"
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10650,6 +10900,26 @@ msgstr "自定义视图用于用户重新组织他们的控制台视图内容（
 msgid "Sales and Warehouse Management"
 msgstr "销售和仓库管理"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10719,6 +10989,11 @@ msgstr "如果联系人是公司，选中。否则是个人"
 msgid "Sequences Type"
 msgstr "序列类型"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10781,9 +11056,9 @@ msgstr ""
 "请先切换成其它语言。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr "权限不足"
@@ -10801,8 +11076,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "设置服务器动作的“记录标识符”时出错！"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "验证错误"
@@ -10841,13 +11116,12 @@ msgid "Laos"
 msgstr "老挝"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "电子邮件"
@@ -10858,7 +11132,12 @@ msgid "Office Supplies"
 msgstr "办公用品"
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10889,36 +11168,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10940,6 +11189,11 @@ msgstr "其它私有协议"
 msgid "Ecuador"
 msgstr "厄瓜多尔"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "工作流"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10956,18 +11210,6 @@ msgstr "劳动合同"
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr "不能删除用户的首先语言."
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-"\n"
-"委内瑞拉会计模块\n"
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10984,9 +11226,9 @@ msgid "Cascade"
 msgstr "级联"
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "必须的用户组"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr "线索，商机，电话"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -11011,11 +11253,6 @@ msgstr "已翻译"
 msgid "Default Company per Object"
 msgstr "单个对象的默认公司"
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr "用户必须执行的动作数"
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -11041,7 +11278,7 @@ msgid "Domain"
 msgstr "过滤条件"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr "使用 '1' 为是 ，'0' 为否"
@@ -11057,12 +11294,12 @@ msgid "State Name"
 msgstr "州/省名称"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "非法的database id '%s' 在字段'%%(field)s'"
@@ -11083,30 +11320,10 @@ msgid "Timezone"
 msgstr "时区"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
-msgstr ""
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -11126,7 +11343,7 @@ msgid "Shared"
 msgstr "分享"
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -11173,7 +11390,6 @@ msgstr "采购多次审核"
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "街区地址2"
 
@@ -11197,6 +11413,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -11290,19 +11507,28 @@ msgid "Related Partner"
 msgstr "相关的业务伙伴"
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr "完整性错误"
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "工作流"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr "字段的长度不小于1"
@@ -11344,22 +11570,6 @@ msgstr "员工目录"
 msgid "Arguments"
 msgstr "参数"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11492,7 +11702,6 @@ msgstr "配置安装程序"
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "客户"
 
@@ -11582,7 +11791,7 @@ msgid "ir.fields.converter"
 msgstr "ir.fields.converter"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr "不能建立没有email地址的联系人！"
@@ -11632,9 +11841,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
-msgstr "OpenID 认证"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11724,7 +11933,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr "邮件发送失败"
@@ -11751,7 +11960,7 @@ msgid "Object"
 msgstr "对象"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11840,7 +12049,7 @@ msgid "Mrs."
 msgstr "Mrs."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11853,7 +12062,7 @@ msgid "User Ref."
 msgstr "用户参照"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr "'%s' 不像是字段 '%%(field)s' 的正确日期格式。"
@@ -11898,8 +12107,6 @@ msgstr "参考指导"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11907,7 +12114,7 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11936,12 +12143,6 @@ msgstr "福克兰群岛"
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr "异或"
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -12048,9 +12249,11 @@ msgid "Selection"
 msgstr "选中内容"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
-msgstr "图标 URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12086,7 +12289,7 @@ msgid "Action Type"
 msgstr "动作类型"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -12222,11 +12425,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "小时 00->12: %(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "要隐藏该联系人的话反选“激活”字段"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -12243,7 +12441,7 @@ msgid "workflow.instance"
 msgstr "workflow.instance"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr "未知特性 %s 在 %s 中 "
@@ -12266,7 +12464,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr "未定义“get”方法！"
@@ -12307,16 +12505,16 @@ msgstr "青铜"
 msgid "Payroll Accounting"
 msgstr "工资表记账"
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "二进制文件或外部URL"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "更改密码"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "苏里南"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -12363,89 +12561,57 @@ msgid "Address Format"
 msgstr "地址格式"
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
-"分隔符格式形如 [,n] 0 < n :格式开始的分隔单位.-1 将结束分隔. 例如[3,2,-1]  106500 转换为 1,06,500; "
-"[1,2,-1]转换为 106,50,0;[3] 转换为 106,500. ',' 作为1000的分隔符号。"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
-msgstr "ir.values"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
 msgstr "技术特性"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12626,6 +12792,11 @@ msgid ""
 "receptions, etc."
 msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12642,7 +12813,7 @@ msgid "Body"
 msgstr "内容"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr "连接测试成功！"
@@ -12692,7 +12863,7 @@ msgid "choose"
 msgstr "选择"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12870,11 +13041,15 @@ msgid "Components Buyer"
 msgstr "部件买家"
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
-msgstr "你确信要卸载这个模块？将永久性删除所有存储在这个模型的数据！"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:ir.cron,function:0
@@ -12905,12 +13080,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr "看板"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12924,7 +13100,6 @@ msgstr "公司登记"
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "杂项"
@@ -12946,26 +13121,6 @@ msgstr "技术"
 msgid "China"
 msgstr "中国"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-"\n"
-"此模块用于管理波兰的科目表\n"
-"    "
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -13035,25 +13190,9 @@ msgid "Bulgaria"
 msgstr "保加利亚"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "安哥拉"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -13081,6 +13220,26 @@ msgstr "5.  %y, %Y ==> 08, 2008"
 msgid "ltd"
 msgstr "ltd"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -13125,6 +13284,7 @@ msgstr "斯洛伐克语 / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "未知"
@@ -13192,6 +13352,11 @@ msgstr "地址簿"
 msgid "ir.sequence.type"
 msgstr "ir.sequence.type"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -13281,6 +13446,7 @@ msgid "Projects, Tasks"
 msgstr "项目，任务"
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -13293,7 +13459,7 @@ msgid "Information"
 msgstr "信息"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr "假"
@@ -13324,16 +13490,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr "Right parent"
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "更新模块列表"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13398,6 +13568,11 @@ msgstr "自动设置让管理员找到可能需要翻译的术语。"
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr "osv_memory 字段仅用 = 和 != 操作符作比较."
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13470,29 +13645,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13540,7 +13692,7 @@ msgid "Delivery Costs"
 msgstr "运输成本"
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13584,9 +13736,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr "数据库密码加密"
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "记录规则"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13832,10 +13984,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
-msgstr "No"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -13861,63 +14018,14 @@ msgid "System Configuration done"
 msgstr "系统设置已完成"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
-msgstr "系统参数"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "特克斯和凯科斯群岛"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13958,17 +14066,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -14003,7 +14100,7 @@ msgid "Low"
 msgstr "低"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "错误！您不能创建递归的菜单。"
@@ -14083,11 +14180,10 @@ msgid "El Salvador"
 msgstr "萨尔瓦多"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "电话"
@@ -14102,6 +14198,11 @@ msgstr "访问菜单"
 msgid "Thailand"
 msgstr "泰国"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -14122,6 +14223,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "罗马尼亚语 / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -14158,41 +14283,6 @@ msgstr "对象关联"
 msgid "eInvoicing & Payments"
 msgstr "电子发票和支付"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -14253,40 +14343,8 @@ msgid "Apply for Write"
 msgstr "应用写入"
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -14375,6 +14433,21 @@ msgstr "视图"
 msgid "View Auto-Load"
 msgstr "自动加载视图"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14419,34 +14492,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "Persian / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14469,9 +14514,9 @@ msgid "Unmet dependency !"
 msgstr "未满足依赖."
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "卸载模块要求管理访问。"
@@ -14482,7 +14527,37 @@ msgid "base.module.configuration"
 msgstr "base.module.configuration"
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14511,7 +14586,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14556,7 +14631,7 @@ msgid "Access"
 msgstr "访问"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14589,11 +14664,10 @@ msgid "Bahrain"
 msgstr "巴林"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "传真"
@@ -14609,8 +14683,6 @@ msgstr "传真"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14725,7 +14797,7 @@ msgid "Officer"
 msgstr "经理"
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14737,7 +14809,6 @@ msgstr "牙买加"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr "颜色索引"
 
@@ -14772,7 +14843,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr "模型 '%s' 包含了模块数据，不能被移除！"
@@ -14783,8 +14854,8 @@ msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "警告"
@@ -14810,11 +14881,6 @@ msgstr "英属维京群岛"
 msgid "Parameters"
 msgstr "参数"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "圣皮埃尔和密克隆"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14907,7 +14973,6 @@ msgstr "培训，学术会议，商务会议，展览，登记挂号"
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "国家"
@@ -14974,9 +15039,15 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
-msgstr "安装一个模块"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"分隔符格式形如 [,n] 0 < n :格式开始的分隔单位.-1 将结束分隔. 例如[3,2,-1]  106500 转换为 1,06,500; "
+"[1,2,-1]转换为 106,50,0;[3] 转换为 106,500. ',' 作为1000的分隔符号。"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15003,7 +15074,7 @@ msgid "Japan"
 msgstr "日本"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "一次只能给一列改名"
@@ -15064,6 +15135,37 @@ msgstr "ir.actions.server"
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -15088,7 +15190,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "请注意此操作将需要一些时间."
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -15127,6 +15229,12 @@ msgstr "执行"
 msgid "Condition"
 msgstr "条件"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -15179,6 +15287,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "克罗地亚"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr "你确信要卸载这个模块？将永久性删除所有存储在这个模型的数据！"
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -15203,6 +15318,11 @@ msgstr "系统更新"
 msgid "SXW Content"
 msgstr "SXW内容"
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -15219,7 +15339,7 @@ msgid "Gold"
 msgstr "黄金"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -15240,15 +15360,52 @@ msgstr "塞拉利昂"
 msgid "General Information"
 msgstr "一般信息"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr "完整ID"
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "特克斯和凯科斯群岛"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -15284,7 +15441,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "切换公司警告"
@@ -15302,11 +15464,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "下一序号将以此数增加."
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "职能"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -15342,11 +15508,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr "内部单据"
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "配送"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -15374,7 +15535,7 @@ msgid "Workflow Instances"
 msgstr "工作流实例"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "业务伙伴： "
@@ -15385,7 +15546,7 @@ msgid "Is a Company?"
 msgstr "是一个公司？"
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15451,7 +15612,6 @@ msgstr "导出名称"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15659,6 +15819,9 @@ msgstr "注册"
 #~ msgid "wizard.ir.model.menu.create.line"
 #~ msgstr "wizard.ir.model.menu.create.line"
 
+#~ msgid "Attached ID"
+#~ msgstr "附件编号"
+
 #~ msgid "Keep 0 if the action must appear on all resources."
 #~ msgstr "如果该动作要显示于所有资源上的话请保持为“0”。"
 
@@ -15667,6 +15830,9 @@ msgstr "注册"
 #~ "object.partner_id.name ]]`"
 #~ msgstr "请指定该消息。您可以使用对象的字段，如： `亲爱的 [[ object.partner_id.name ]]`"
 
+#~ msgid "Attached Model"
+#~ msgstr "附加的模型"
+
 #~ msgid "Trigger Name"
 #~ msgstr "触发器名称"
 
@@ -15770,6 +15936,9 @@ msgstr "注册"
 #~ msgid "SXW path"
 #~ msgstr "SXW 路径"
 
+#~ msgid "Creator"
+#~ msgstr "创建者"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -15838,6 +16007,9 @@ msgstr "注册"
 #~ msgid "acc_number"
 #~ msgstr "acc_number"
 
+#~ msgid "Addresses"
+#~ msgstr "地址"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML 标识符"
 
@@ -15935,6 +16107,9 @@ msgstr "注册"
 #~ msgid "Open Source Service Company"
 #~ msgstr "开源服务公司"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "要隐藏该联系人的话反选“激活”字段"
+
 #~ msgid "Congo, The Democratic Republic of the"
 #~ msgstr "刚果民主共和国"
 
@@ -16084,6 +16259,9 @@ msgstr "注册"
 #~ msgid "Partner Addresses"
 #~ msgstr "业务伙伴地址列表"
 
+#~ msgid "Contact Name"
+#~ msgstr "联系人姓名"
+
 #~ msgid "FYROM"
 #~ msgstr "马其顿共和国"
 
@@ -16283,6 +16461,9 @@ msgstr "注册"
 #~ msgid "Report file"
 #~ msgstr "报表文件"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "二进制文件或外部URL"
+
 #, python-format
 #~ msgid "Could not load base module"
 #~ msgstr "不能载入基本模块"
@@ -16337,6 +16518,9 @@ msgstr "注册"
 #~ " %s"
 #~ msgstr "一些已安装的模块依赖您打算卸载的模块：%s"
 
+#~ msgid "Delivery"
+#~ msgstr "配送"
+
 #~ msgid "Payment term"
 #~ msgstr "付款方式"
 
@@ -18910,6 +19094,18 @@ msgstr "注册"
 #~ "模块定义辅助核算对象\n"
 #~ "    "
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Mexico in OpenERP.\n"
+#~ "========================================================================\n"
+#~ "\n"
+#~ "Mexican accounting chart and localization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "墨西哥会计模块\n"
+#~ "    "
+
 #~ msgid "Timesheets Validation"
 #~ msgstr "复核计工单"
 
@@ -19895,6 +20091,16 @@ msgstr "注册"
 #~ msgid "Wiki: Internal FAQ"
 #~ msgstr "Wiki: 内部FAQ"
 
+#~ msgid ""
+#~ "\n"
+#~ "This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
+#~ "===========================================================================\n"
+#~ "\n"
+#~ "Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "委内瑞拉会计模块\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module provides the functionality to send messages within a project.\n"
@@ -19966,3 +20172,6 @@ msgstr "注册"
 
 #~ msgid "Generate Docs of Modules"
 #~ msgstr "生成模块文档"
+
+#~ msgid "DB Password Encryption"
+#~ msgstr "数据库密码加密"
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 6cd8710a283..149423af98b 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-30 15:06+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:01+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:08+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -42,7 +42,7 @@ msgid "DateTime"
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -186,41 +186,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -228,7 +202,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr ""
@@ -239,7 +213,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -250,7 +224,7 @@ msgid "Swaziland"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr ""
@@ -329,20 +303,6 @@ msgstr ""
 msgid "Max. Size"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -350,11 +310,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr ""
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -413,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -450,6 +405,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr ""
 
@@ -488,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -540,7 +496,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -578,8 +534,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
 msgstr ""
 
 #. module: base
@@ -605,26 +561,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "波斯尼亞文 / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -633,9 +569,25 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "安哥拉"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -708,14 +660,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -779,16 +729,14 @@ msgid "Model Description"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -817,11 +765,21 @@ msgstr ""
 msgid "Jordan"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -950,11 +908,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr ""
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "巴布亞新畿內亞"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -972,7 +928,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1020,15 +976,8 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "西班牙文 (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
+#: field:res.partner,mobile:0
+msgid "Mobile"
 msgstr ""
 
 #. module: base
@@ -1126,8 +1075,37 @@ msgid "Mongolia"
 msgstr "蒙古"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1142,12 +1120,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1174,7 +1157,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1202,7 +1232,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1234,14 +1264,12 @@ msgid "South Korea"
 msgstr "南韓"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1376,7 +1404,7 @@ msgid "Marshall Islands"
 msgstr "馬紹爾羣島"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1398,7 +1426,7 @@ msgid "Search"
 msgstr "搜尋"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1413,7 +1441,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr ""
@@ -1539,7 +1574,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
@@ -1654,18 +1703,13 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1746,7 +1790,7 @@ msgid "East Timor"
 msgstr "東帝汶"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1787,11 +1831,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1806,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1847,6 +1886,11 @@ msgstr ""
 msgid "Read Access"
 msgstr ""
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1923,16 +1967,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1987,7 +2026,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -2011,11 +2050,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -2027,7 +2066,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr ""
 
@@ -2065,11 +2103,6 @@ msgstr "完整路徑"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2202,6 +2235,11 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2235,12 +2273,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2288,6 +2331,15 @@ msgstr "伯利茲"
 msgid "Add or not the corporate RML header"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2339,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2417,7 +2469,6 @@ msgstr ""
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "發票"
 
@@ -2464,11 +2515,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2585,9 +2631,20 @@ msgid "Default limit for the list view"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "巴布亞新畿內亞"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2665,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2724,6 +2781,19 @@ msgstr ""
 msgid "Export Translations"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2732,7 +2802,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2818,7 +2888,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2848,7 +2918,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2913,22 +2983,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -3022,12 +3092,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3044,17 +3114,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3064,7 +3136,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -3115,34 +3187,6 @@ msgstr ""
 msgid "Invalid arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3181,7 +3225,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3193,6 +3237,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3229,7 +3301,7 @@ msgid "Signal (subflow.*)"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3263,7 +3335,7 @@ msgid "Access Controls"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3291,32 +3363,6 @@ msgstr ""
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3334,9 +3380,13 @@ msgid ""
 "'object'."
 msgstr ""
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr ""
 
@@ -3352,7 +3402,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3460,7 +3510,7 @@ msgid "Malta"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3649,7 +3699,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr ""
@@ -3660,13 +3709,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -3726,9 +3780,10 @@ msgid "Urdu / اردو"
 msgstr "烏爾都文 / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3739,7 +3794,7 @@ msgid "Company Name"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3758,13 +3813,36 @@ msgid "RML  (deprecated - use Report)"
 msgstr ""
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
 msgstr ""
 
 #. module: base
@@ -3794,12 +3872,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3848,19 +3922,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3878,7 +3940,7 @@ msgid "Nauru"
 msgstr "瑙魯"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3923,7 +3985,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3942,8 +4004,42 @@ msgid "Technical Data"
 msgstr "技術資料"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4000,13 +4096,18 @@ msgstr ""
 msgid "Ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr ""
@@ -4022,8 +4123,8 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
 msgstr ""
 
 #. module: base
@@ -4082,32 +4183,9 @@ msgid "Languages"
 msgstr "語言"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4186,7 +4264,6 @@ msgstr "約束"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "預設"
 
@@ -4258,6 +4335,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4319,9 +4401,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "蘇里南"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4401,6 +4490,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4424,6 +4529,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4451,6 +4593,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4528,12 +4676,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4548,7 +4690,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr ""
@@ -4559,13 +4700,18 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4608,6 +4754,8 @@ msgstr "方向"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "檢視"
 
@@ -4623,7 +4771,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -4716,7 +4864,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4804,7 +4957,7 @@ msgid "System Configuration Done"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr ""
@@ -4919,6 +5072,11 @@ msgstr "毛里裘斯"
 msgid "Full Access"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4932,7 +5090,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4943,7 +5101,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4975,6 +5133,17 @@ msgstr "塞內加爾"
 msgid "Hungary"
 msgstr "匈牙利"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5138,7 +5307,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5154,16 +5323,11 @@ msgid "Decimal Separator"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5204,8 +5368,9 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base
@@ -5269,15 +5434,6 @@ msgstr "委內瑞拉"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5293,6 +5449,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5376,6 +5537,12 @@ msgstr "哈薩克"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5626,7 +5793,7 @@ msgid "title"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5683,6 +5850,15 @@ msgstr ""
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5798,13 +5974,15 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5824,7 +6002,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5857,9 +6035,8 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
+#: view:res.partner:0
+msgid "Phone:"
 msgstr ""
 
 #. module: base
@@ -5893,6 +6070,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5903,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5919,26 +6101,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6071,11 +6233,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6087,8 +6244,8 @@ msgid "Malaysia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6195,7 +6352,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6233,7 +6390,7 @@ msgid "Created Menus"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6260,8 +6417,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6294,6 +6479,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6336,7 +6528,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6428,7 +6620,7 @@ msgid "Israel"
 msgstr "以色列"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6448,23 +6640,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6497,10 +6672,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr ""
 
@@ -6574,8 +6749,8 @@ msgid "United Kingdom"
 msgstr "英國"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6599,8 +6774,8 @@ msgid "Partner Titles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6648,18 +6823,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6764,6 +6934,13 @@ msgstr ""
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6858,7 +7035,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr ""
@@ -6959,12 +7135,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7006,6 +7176,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7063,7 +7234,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -7083,6 +7254,11 @@ msgstr ""
 msgid "Northern Mariana Islands"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7094,13 +7270,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7131,7 +7312,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr ""
@@ -7177,7 +7358,6 @@ msgstr ""
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7197,30 +7377,30 @@ msgid "Child Categories"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr ""
@@ -7308,6 +7488,11 @@ msgstr ""
 msgid "This Window"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7391,6 +7576,21 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7420,11 +7620,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7449,7 +7644,6 @@ msgstr ""
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr ""
@@ -7460,8 +7654,23 @@ msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7540,7 +7749,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -7627,14 +7836,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7643,7 +7854,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "因保安理由密碼不能留空！"
@@ -7654,13 +7865,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7679,12 +7890,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7857,7 +8069,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7886,14 +8098,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7917,7 +8121,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8032,7 +8235,7 @@ msgid "Nigeria"
 msgstr "尼日利亞"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8347,7 +8550,7 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8359,7 +8562,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8369,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8384,6 +8587,17 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr "泰文 / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8423,7 +8637,7 @@ msgid "Mexico"
 msgstr "墨西哥"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8445,14 +8659,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
 msgstr ""
 
 #. module: base
@@ -8477,7 +8691,7 @@ msgid "%b - Abbreviated month name."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8489,7 +8703,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "供應商"
@@ -8567,7 +8780,7 @@ msgid "Selectable"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8595,8 +8808,8 @@ msgid "Iteration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -8620,7 +8833,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8767,7 +8980,7 @@ msgid "Reunion (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8806,8 +9019,8 @@ msgid "Solomon Islands"
 msgstr "所羅門羣島"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -8881,7 +9094,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8895,7 +9108,7 @@ msgid "Ukraine"
 msgstr "烏克蘭"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8958,6 +9171,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr ""
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "越南文 / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9056,9 +9274,9 @@ msgid "Custom Shortcuts"
 msgstr ""
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "越南文 / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9086,13 +9304,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9113,7 +9331,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9161,7 +9379,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
@@ -9207,6 +9425,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9215,7 +9434,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9234,6 +9453,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9269,7 +9525,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9321,6 +9577,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr ""
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9363,23 +9624,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9413,7 +9662,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9504,6 +9753,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9708,7 +9962,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9719,13 +9973,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9893,7 +10152,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9926,6 +10185,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9951,6 +10215,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10040,7 +10309,6 @@ msgstr ""
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr ""
@@ -10076,13 +10344,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr ""
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10141,19 +10416,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10167,6 +10467,8 @@ msgid "Activity"
 msgstr "動態"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10185,7 +10487,12 @@ msgid "Parent Company"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10197,13 +10504,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10285,6 +10585,26 @@ msgstr ""
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10354,6 +10674,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10412,9 +10737,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10432,8 +10757,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -10472,13 +10797,12 @@ msgid "Laos"
 msgstr "老撾"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr ""
@@ -10489,7 +10813,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10518,36 +10847,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10569,6 +10868,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "厄瓜多爾"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10585,16 +10889,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10611,8 +10905,8 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
 msgstr ""
 
 #. module: base
@@ -10638,11 +10932,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10668,7 +10957,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10684,12 +10973,12 @@ msgid "State Name"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10710,29 +10999,9 @@ msgid "Timezone"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10753,7 +11022,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10800,7 +11069,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr ""
 
@@ -10824,6 +11092,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10909,19 +11178,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10963,22 +11241,6 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11111,7 +11373,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr ""
 
@@ -11201,7 +11462,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11251,8 +11512,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11343,7 +11604,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11370,7 +11631,7 @@ msgid "Object"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11456,7 +11717,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11469,7 +11730,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11514,8 +11775,6 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11523,7 +11782,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11552,12 +11811,6 @@ msgstr "福克蘭羣島"
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11664,8 +11917,10 @@ msgid "Selection"
 msgstr ""
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11702,7 +11957,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11838,11 +12093,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr ""
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11859,7 +12109,7 @@ msgid "workflow.instance"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11882,7 +12132,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11923,16 +12173,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr ""
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "蘇里南"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -11979,73 +12229,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12053,13 +12238,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12236,6 +12456,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12252,7 +12477,7 @@ msgid "Body"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12300,7 +12525,7 @@ msgid "choose"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12476,10 +12701,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12511,12 +12740,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12530,7 +12760,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr ""
@@ -12552,23 +12781,6 @@ msgstr ""
 msgid "China"
 msgstr "中國"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12636,25 +12848,9 @@ msgid "Bulgaria"
 msgstr "保加利亞"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "安哥拉"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12682,6 +12878,26 @@ msgstr ""
 msgid "ltd"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12718,6 +12934,7 @@ msgstr "斯洛伐克文 / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr ""
@@ -12785,6 +13002,11 @@ msgstr ""
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12874,6 +13096,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12886,7 +13109,7 @@ msgid "Information"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12917,16 +13140,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -12991,6 +13218,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13063,29 +13295,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13133,7 +13342,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13177,8 +13386,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
+#: view:ir.rule:0
+msgid "Record rules"
 msgstr ""
 
 #. module: base
@@ -13423,9 +13632,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13452,62 +13666,13 @@ msgid "System Configuration done"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
 msgstr ""
 
 #. module: base
@@ -13549,17 +13714,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13594,7 +13748,7 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
@@ -13674,11 +13828,10 @@ msgid "El Salvador"
 msgstr "薩爾瓦多"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr ""
@@ -13693,6 +13846,11 @@ msgstr ""
 msgid "Thailand"
 msgstr "泰國"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13713,6 +13871,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "羅馬尼亞文 / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13749,41 +13931,6 @@ msgstr ""
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13844,40 +13991,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13966,6 +14081,21 @@ msgstr ""
 msgid "View Auto-Load"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14008,34 +14138,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "波斯文 / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14058,9 +14160,9 @@ msgid "Unmet dependency !"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14071,7 +14173,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14097,7 +14229,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14142,7 +14274,7 @@ msgid "Access"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14175,11 +14307,10 @@ msgid "Bahrain"
 msgstr "巴林"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr ""
@@ -14195,8 +14326,6 @@ msgstr ""
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14311,7 +14440,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14323,7 +14452,6 @@ msgstr "牙買加"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14356,7 +14484,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14367,8 +14495,8 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -14394,11 +14522,6 @@ msgstr "處女羣島 (英屬)"
 msgid "Parameters"
 msgstr ""
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14488,7 +14611,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr ""
@@ -14555,8 +14677,12 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "西班牙文 (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
 
 #. module: base
@@ -14584,7 +14710,7 @@ msgid "Japan"
 msgstr "日本"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr ""
@@ -14645,6 +14771,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14669,7 +14826,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14708,6 +14865,12 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14760,6 +14923,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "克羅地亞"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14784,6 +14954,11 @@ msgstr ""
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14800,7 +14975,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14821,14 +14996,51 @@ msgstr "塞拉利昂"
 msgid "General Information"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -14865,7 +15077,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -14883,11 +15100,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14923,11 +15144,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr ""
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14955,7 +15171,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr ""
@@ -14966,7 +15182,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15032,7 +15248,6 @@ msgstr ""
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index deadc541b5d..5ed0bc802db 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:41+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-12-04 05:03+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:10+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -41,7 +41,7 @@ msgid "DateTime"
 msgstr "日期時間"
 
 #. module: base
-#: code:addons/fields.py:637
+#: code:addons/fields.py:643
 #, python-format
 msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
@@ -185,41 +185,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_crm
-msgid ""
-"\n"
-"The generic OpenERP Customer Relationship Management\n"
-"=====================================================\n"
-"\n"
-"This application enables a group of people to intelligently and efficiently "
-"manage leads, opportunities, meetings and phone calls.\n"
-"\n"
-"It manages key tasks such as communication, identification, prioritization, "
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers "
-"and suppliers. It can automatically send reminders, escalate the request, "
-"trigger specific methods and many other actions based on your own enterprise "
-"rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything "
-"special. The CRM module has an email gateway for the synchronization "
-"interface between mails and OpenERP. That way, users can just send emails to "
-"the request tracker.\n"
-"\n"
-"OpenERP will take care of thanking them for their message, automatically "
-"routing it to the appropriate staff and make sure all future correspondence "
-"gets to the right place.\n"
-"\n"
-"\n"
-"Dashboard for CRM will include:\n"
-"-------------------------------\n"
-"* Planned Revenue by Stage and User (graph)\n"
-"* Opportunities by Stage (graph)\n"
-msgstr ""
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:467
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:397
+#: code:addons/base/ir/ir_model.py:399
 #, python-format
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
@@ -227,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:130
+#: code:addons/osv.py:132
 #, python-format
 msgid "Constraint Error"
 msgstr "約束錯誤"
@@ -238,7 +212,7 @@ msgid "ir.ui.view.custom"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:366
+#: code:addons/base/ir/ir_model.py:368
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
 msgstr ""
@@ -249,7 +223,7 @@ msgid "Swaziland"
 msgstr "史瓦濟蘭"
 
 #. module: base
-#: code:addons/orm.py:4453
+#: code:addons/orm.py:4485
 #, python-format
 msgid "created."
 msgstr "已建立。"
@@ -328,20 +302,6 @@ msgstr "要儲存當前紀錄之公司"
 msgid "Max. Size"
 msgstr "最大尺寸"
 
-#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid ""
-"\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sale order:\n"
-"-----------------------------------------------------------\n"
-"    * Requested Date\n"
-"    * Commitment Date\n"
-"    * Effective Date\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.act_window,res_id:0
 msgid ""
@@ -349,11 +309,6 @@ msgid ""
 "'form' only"
 msgstr ""
 
-#. module: base
-#: field:res.partner.address,name:0
-msgid "Contact Name"
-msgstr "聯絡人名稱"
-
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
@@ -412,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:83
+#: code:addons/base/ir/ir_filters.py:80
 #, python-format
 msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
@@ -449,6 +404,7 @@ msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
 msgid "Owner"
 msgstr "所有者"
 
@@ -487,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4120
+#: code:addons/orm.py:4152
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -539,7 +495,7 @@ msgid "Netherlands Antilles"
 msgstr "荷屬安地列斯群島"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -577,9 +533,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: field:ir.ui.view.custom,ref_id:0
-msgid "Original View"
-msgstr "原始檢視"
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -604,26 +560,6 @@ msgstr ""
 msgid "Bosnian / bosanski jezik"
 msgstr "波斯尼亞文 / bosanski jezik"
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_gengo
-msgid ""
-"\n"
-"Automated Translations through Gengo API\n"
-"----------------------------------------\n"
-"\n"
-"This module will install passive scheduler job for automated translations \n"
-"using the Gengo API. To activate it, you must\n"
-"1) Configure your Gengo authentication parameters under `Settings > "
-"Companies > Gengo Parameters`\n"
-"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
-"Request of Translation` and follow the wizard.\n"
-"\n"
-"This wizard will activate the CRON job and the Scheduler and will start the "
-"automatic translation via Gengo Services for all the terms where you "
-"requested it.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
 msgid ""
@@ -632,9 +568,25 @@ msgid ""
 msgstr "如果您選中此處，當下次用戶使用相同的附件名稱列印時將返回以前的報表。"
 
 #. module: base
-#: model:res.country,name:base.ao
-msgid "Angola"
-msgstr "安哥拉"
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -709,14 +661,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_action_wizard
-#: view:ir.actions.wizard:0
-#: model:ir.ui.menu,name:base.menu_ir_action_wizard
-msgid "Wizards"
-msgstr "精靈"
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:337
+#: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "自訂欄位名稱開頭必須是 'x_' !"
@@ -780,16 +730,14 @@ msgid "Model Description"
 msgstr "模型說明"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.module.module,description:base.module_marketing
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to add a contact in your address book.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc.\n"
-"              </p>\n"
-"            "
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -818,11 +766,21 @@ msgstr "觸發器表達式"
 msgid "Jordan"
 msgstr "約旦"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
@@ -952,11 +910,9 @@ msgid "base.language.export"
 msgstr ""
 
 #. module: base
-#: help:ir.actions.server,write_id:0
-msgid ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
-msgstr "提供記錄ID所指定的欄位名稱作寫入操作，如空，則使用物件的活動ID。"
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr "巴布亞紐幾內亞"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -974,7 +930,7 @@ msgid "Email Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
 msgstr ""
@@ -1022,16 +978,9 @@ msgid "Spanish (UY) / Español (UY)"
 msgstr "西班牙文 (UY) / Español (UY)"
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_lu
-msgid ""
-"\n"
-"This is the base module to manage the accounting chart for Luxembourg.\n"
-"======================================================================\n"
-"\n"
-"    * the KLUWER Chart of Accounts\n"
-"    * the Tax Code Chart for Luxembourg\n"
-"    * the main taxes used in Luxembourg"
-msgstr ""
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "手提電話"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1128,8 +1077,37 @@ msgid "Mongolia"
 msgstr "蒙古"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
 msgstr ""
 
 #. module: base
@@ -1144,12 +1122,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:725
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Document model"
 msgstr ""
 
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
@@ -1176,7 +1159,54 @@ msgid "Username"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:407
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
 #, python-format
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
@@ -1204,7 +1234,7 @@ msgid "Delete Access Right"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid "Connection test failed!"
 msgstr ""
@@ -1236,14 +1266,12 @@ msgid "South Korea"
 msgstr "南韓"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
-msgstr "轉換"
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4859
+#: code:addons/orm.py:4917
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1378,7 +1406,7 @@ msgid "Marshall Islands"
 msgstr "馬紹爾群島"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
 #, python-format
 msgid "Changing the model of a field is forbidden!"
 msgstr ""
@@ -1400,7 +1428,7 @@ msgid "Search"
 msgstr "搜尋"
 
 #. module: base
-#: code:addons/osv.py:133
+#: code:addons/osv.py:135
 #, python-format
 msgid ""
 "The operation cannot be completed, probably due to the following:\n"
@@ -1415,7 +1443,14 @@ msgid "Parent Application"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr "精靈"
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
 msgstr "操作取消"
@@ -1541,7 +1576,21 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr "無以「%s」為代碼之語言"
@@ -1656,18 +1705,13 @@ msgid "On Create"
 msgstr "建立時"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:905
+#: code:addons/base/ir/ir_model.py:906
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sale
-msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
-
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
@@ -1748,7 +1792,7 @@ msgid "East Timor"
 msgstr "東帝汶"
 
 #. module: base
-#: code:addons/base/module/module.py:388
+#: code:addons/base/module/module.py:415
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
@@ -1789,11 +1833,6 @@ msgid ""
 "rights to the Demo user. \n"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_id:0
-msgid "Attached ID"
-msgstr ""
-
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
@@ -1808,7 +1847,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
@@ -1849,6 +1888,11 @@ msgstr ""
 msgid "Read Access"
 msgstr "讀取存取"
 
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_share
 msgid ""
@@ -1925,16 +1969,11 @@ msgid "Create Tasks on SO"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
 msgstr ""
 
-#. module: base
-#: field:ir.attachment,res_model:0
-msgid "Attached Model"
-msgstr ""
-
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
@@ -1989,7 +2028,7 @@ msgid "Formula"
 msgstr "公式"
 
 #. module: base
-#: code:addons/base/res/res_users.py:311
+#: code:addons/base/res/res_users.py:307
 #, python-format
 msgid "Can not remove root user!"
 msgstr "無法移除 root 使用者！"
@@ -2013,11 +2052,11 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_filters.py:39
-#: code:addons/base/res/res_partner.py:312
-#: code:addons/base/res/res_users.py:96
-#: code:addons/base/res/res_users.py:335
-#: code:addons/base/res/res_users.py:337
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:331
+#: code:addons/base/res/res_users.py:333
 #, python-format
 msgid "%s (copy)"
 msgstr "%s（副本）"
@@ -2029,7 +2068,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,type:0
-#: field:res.partner.address,type:0
 msgid "Address Type"
 msgstr "地址類型"
 
@@ -2067,11 +2105,6 @@ msgstr "完整路徑"
 msgid "The next step depends on the file format:"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_idea
-msgid "Ideas"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid ""
@@ -2204,6 +2237,11 @@ msgstr "已更新模組數"
 msgid "Method"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -2237,12 +2275,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:342
+#: code:addons/base/ir/ir_fields.py:341
 #, python-format
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
 
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid ""
@@ -2290,6 +2333,15 @@ msgstr "貝里斯"
 msgid "Add or not the corporate RML header"
 msgstr "添加公司 RML 頁首與否"
 
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
@@ -2341,7 +2393,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3811
+#: code:addons/orm.py:3842
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
@@ -2420,7 +2472,6 @@ msgstr "聖多美普林西比"
 
 #. module: base
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Invoice"
 msgstr "發票"
 
@@ -2467,11 +2518,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: field:res.company,rml_header1:0
-msgid "Company Slogan"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
@@ -2588,9 +2634,20 @@ msgid "Default limit for the list view"
 msgstr "列表檢視的預設數目限制"
 
 #. module: base
-#: model:res.country,name:base.pg
-msgid "Papua New Guinea"
-msgstr "巴布亞紐幾內亞"
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2668,7 +2725,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:334
+#: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
@@ -2727,6 +2784,19 @@ msgstr "欄位映射"
 msgid "Export Translations"
 msgstr "匯出翻譯"
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
@@ -2735,7 +2805,7 @@ msgid "Manager"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:718
+#: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr ""
@@ -2821,7 +2891,7 @@ msgid "Inherited"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
 msgstr ""
@@ -2851,7 +2921,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:175
+#: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
 msgstr ""
@@ -2916,22 +2986,22 @@ msgid "LinkedIn Integration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
-#: code:addons/orm.py:2032
+#: code:addons/orm.py:2020
+#: code:addons/orm.py:2031
 #, python-format
 msgid "Invalid Object Architecture!"
 msgstr "物件架構無效！"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
 #: code:addons/base/ir/ir_model.py:366
-#: code:addons/base/ir/ir_model.py:396
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:368
+#: code:addons/base/ir/ir_model.py:398
 #: code:addons/base/ir/ir_model.py:412
 #: code:addons/base/ir/ir_model.py:414
-#: code:addons/base/ir/ir_model.py:421
-#: code:addons/base/ir/ir_model.py:424
-#: code:addons/base/module/wizard/base_update_translations.py:38
+#: code:addons/base/ir/ir_model.py:416
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:426
+#: code:addons/base/module/wizard/base_update_translations.py:39
 #, python-format
 msgid "Error!"
 msgstr "錯誤！"
@@ -3025,12 +3095,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "錯誤！您不能建立循環的公司。"
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:671
+#: code:addons/base/res/res_users.py:668
 #: model:ir.model,name:base.model_ir_module_category
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
@@ -3047,17 +3117,19 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_web_shortcuts
+#: model:ir.module.module,description:base.module_l10n_pl
 msgid ""
 "\n"
-"Enable shortcuts feature in the web client.\n"
-"===========================================\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
 "\n"
-"Add a Shortcut icon in the systray in order to access the user's shortcuts "
-"(if any).\n"
-"\n"
-"Add a Shortcut icon besides the views title in order to add/remove a "
-"shortcut.\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
 "    "
 msgstr ""
 
@@ -3067,7 +3139,7 @@ msgid "Params storage"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:526
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "無法升級「%s」模組。其未有安裝！"
@@ -3118,34 +3190,6 @@ msgstr "配置參數"
 msgid "Invalid arguments"
 msgstr "引數無效"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
-msgid ""
-"\n"
-"French Payroll Rules.\n"
-"=====================\n"
-"\n"
-"    - Configuration of hr_payroll for French localization\n"
-"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
-"cadre'\n"
-"    - New payslip report\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Integration with holidays module for deduction and allowance\n"
-"    - Integration with hr_payroll_account for the automatic "
-"account_move_line\n"
-"      creation from the payslip\n"
-"    - Continue to integrate the contribution. Only the main contribution "
-"are\n"
-"      currently implemented\n"
-"    - Remake the report under webkit\n"
-"    - The payslip.line with appears_in_payslip = False should appears in "
-"the\n"
-"      payslip interface, but not in the payslip report\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
@@ -3184,7 +3228,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3839
+#: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
 msgstr ""
@@ -3196,6 +3240,34 @@ msgstr ""
 msgid "Bank Account Type"
 msgstr "銀行帳號類型"
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:base.language.export:0
 msgid ""
@@ -3232,7 +3304,7 @@ msgid "Signal (subflow.*)"
 msgstr "信號（子流程.*）"
 
 #. module: base
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4684
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -3266,7 +3338,7 @@ msgid "Access Controls"
 msgstr "存取控制"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:273
+#: code:addons/base/ir/ir_model.py:275
 #, python-format
 msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
@@ -3294,32 +3366,6 @@ msgstr "主要公司"
 msgid "Web Icon File (hover)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_document
-msgid ""
-"\n"
-"This is a complete document management system.\n"
-"==============================================\n"
-"\n"
-"    * User Authentication\n"
-"    * Document Indexation:- .pptx and .docx files are not supported in "
-"Windows platform.\n"
-"    * Dashboard for Document that includes:\n"
-"        * New Files (list)\n"
-"        * Files by Resource Type (graph)\n"
-"        * Files by Partner (graph)\n"
-"        * Files Size by Month (graph)\n"
-"\n"
-"ATTENTION:\n"
-"----------\n"
-"    - When you install this module in a running company that have already "
-"PDF \n"
-"      files stored into the database, you will lose them all.\n"
-"    - After installing this module PDF's are no longer stored into the "
-"database,\n"
-"      but in the servers rootpad like /server/bin/filestore.\n"
-msgstr ""
-
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
@@ -3337,9 +3383,13 @@ msgid ""
 "'object'."
 msgstr "如果是公式類型，請在 Python 語言表達式中使用變量「object」。"
 
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能建立循環的公司。"
+
 #. module: base
 #: field:res.partner,birthdate:0
-#: field:res.partner.address,birthdate:0
 msgid "Birthdate"
 msgstr "生日"
 
@@ -3355,7 +3405,7 @@ msgid "Products Manufacturers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:238
+#: code:addons/base/ir/ir_mail_server.py:237
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
 msgstr ""
@@ -3463,7 +3513,7 @@ msgid "Malta"
 msgstr "馬爾他"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:724
+#: code:addons/base/ir/ir_model.py:725
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -3652,7 +3702,6 @@ msgstr "報告"
 
 #. module: base
 #: field:res.partner,title:0
-#: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
 msgstr "稱謂"
@@ -3663,13 +3712,18 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4213
+#: code:addons/orm.py:4245
 #, python-format
 msgid "Recursivity Detected."
 msgstr "偵測到有迴圈問題。"
 
 #. module: base
-#: code:addons/base/module/module.py:345
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr "依附的模組循環錯誤！"
@@ -3729,9 +3783,10 @@ msgid "Urdu / اردو"
 msgstr "烏爾都文 / اردو"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:731
-#: code:addons/orm.py:3828
-#: code:addons/orm.py:3870
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/orm.py:3566
+#: code:addons/orm.py:3859
+#: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -3742,7 +3797,7 @@ msgid "Company Name"
 msgstr "公司名稱"
 
 #. module: base
-#: code:addons/orm.py:2811
+#: code:addons/orm.py:2807
 #, python-format
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
@@ -3761,14 +3816,37 @@ msgid "RML  (deprecated - use Report)"
 msgstr "RML（已過時，用「報表」）"
 
 #. module: base
-#: sql_constraint:ir.translation:0
-msgid "Language code of translation item must be among known languages"
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
 msgstr ""
 
 #. module: base
-#: view:ir.rule:0
-msgid "Record rules"
-msgstr "記錄規則"
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr "聖皮耶與密克隆群島"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3797,12 +3875,8 @@ msgid "Jersey"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_auth_anonymous
-msgid ""
-"\n"
-"Allow anonymous access to OpenERP.\n"
-"==================================\n"
-" "
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
 msgstr ""
 
 #. module: base
@@ -3851,19 +3925,7 @@ msgid "Paper Format"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_note_pad
-msgid ""
-"\n"
-"This module update memos inside OpenERP for using an external pad\n"
-"===================================================================\n"
-"\n"
-"Use for update your text memo in real time with the following user that you "
-"invite.\n"
-"\n"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:645
 #, python-format
 msgid ""
 "Can not create the module file:\n"
@@ -3883,7 +3945,7 @@ msgid "Nauru"
 msgstr "諾魯"
 
 #. module: base
-#: code:addons/base/res/res_company.py:152
+#: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
 msgstr ""
@@ -3928,7 +3990,7 @@ msgid "Email Gateway"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:466
+#: code:addons/base/ir/ir_mail_server.py:465
 #, python-format
 msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
@@ -3947,8 +4009,42 @@ msgid "Technical Data"
 msgstr "技術資料"
 
 #. module: base
-#: model:ir.model,name:base.model_ir_ui_view
-msgid "ir.ui.view"
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -4005,13 +4101,18 @@ msgstr ""
 msgid "Ltd"
 msgstr "有限公司"
 
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
 msgstr "條碼類型（EAN13）"
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "Invalid Architecture!"
 msgstr "架構無效！"
@@ -4027,9 +4128,9 @@ msgid "Share any Document"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,summary:base.module_crm
-msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr "必要群組"
 
 #. module: base
 #: view:res.lang:0
@@ -4087,32 +4188,9 @@ msgid "Languages"
 msgstr "語言"
 
 #. module: base
-#: model:ir.module.module,description:base.module_point_of_sale
-msgid ""
-"\n"
-"Quick and Easy sale process\n"
-"============================\n"
-"\n"
-"This module allows you to manage your shop sales very easily with a fully "
-"web based touchscreen interface.\n"
-"It is compatible with all PC tablets and the iPad, offering multiple payment "
-"methods. \n"
-"\n"
-"Product selection can be done in several ways: \n"
-"\n"
-"* Using a barcode reader\n"
-"* Browsing through categories of products or via a text search.\n"
-"\n"
-"Main Features\n"
-"-------------\n"
-"* Fast encoding of the sale\n"
-"* Choose one payment method (the quick way) or split the payment between "
-"several payment methods\n"
-"* Computation of the amount of money to return\n"
-"* Create and confirm the picking list automatically\n"
-"* Allows the user to create an invoice automatically\n"
-"* Refund previous sales\n"
-"    "
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
 msgstr ""
 
 #. module: base
@@ -4191,7 +4269,6 @@ msgstr "約束"
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 msgid "Default"
 msgstr "預設"
 
@@ -4263,6 +4340,11 @@ msgid ""
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
@@ -4324,9 +4406,16 @@ msgid "Default value or action reference"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.sr
-msgid "Suriname"
-msgstr "蘇利南"
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4406,6 +4495,22 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
@@ -4429,6 +4534,43 @@ msgid ""
 "related object's read access."
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.filters,model_id:0
@@ -4456,6 +4598,12 @@ msgstr ""
 msgid "View"
 msgstr "檢視"
 
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
 msgid ""
@@ -4533,12 +4681,6 @@ msgid ""
 "'IBAN'. \n"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_actions_report_xml
-#: selection:ir.ui.menu,action:0
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
@@ -4553,7 +4695,6 @@ msgstr ""
 #: field:res.bank,zip:0
 #: field:res.company,zip:0
 #: field:res.partner,zip:0
-#: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
 msgstr "郵政編碼"
@@ -4564,13 +4705,18 @@ msgstr "郵政編碼"
 msgid "Author"
 msgstr "作者"
 
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr "%c - 合適之日期時間表示"
 
 #. module: base
-#: code:addons/base/res/res_config.py:388
+#: code:addons/base/res/res_config.py:387
 #, python-format
 msgid ""
 "Your database is now fully configured.\n"
@@ -4613,6 +4759,8 @@ msgstr "方向"
 #: field:ir.module.module,views_by_module:0
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
 msgid "Views"
 msgstr "檢視"
 
@@ -4628,7 +4776,7 @@ msgid "SMTP Server"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:299
+#: code:addons/base/module/module.py:320
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr "您嘗試移除已安裝或將要安裝的模組"
@@ -4721,7 +4869,12 @@ msgid "Google Docs integration"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:328
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
 msgstr ""
@@ -4809,7 +4962,7 @@ msgid "System Configuration Done"
 msgstr "系統配置完成"
 
 #. module: base
-#: code:addons/orm.py:1540
+#: code:addons/orm.py:1539
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
 msgstr "檢驗 %s 欄位時發生錯誤：%s"
@@ -4924,6 +5077,11 @@ msgstr "模里西斯"
 msgid "Full Access"
 msgstr "完整存取"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
@@ -4937,7 +5095,7 @@ msgid "Portuguese / Português"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:364
+#: code:addons/base/ir/ir_model.py:366
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
@@ -4948,7 +5106,7 @@ msgid "Only if this bank account belong to your company"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:338
+#: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
 msgstr ""
@@ -4980,6 +5138,17 @@ msgstr "塞內加爾"
 msgid "Hungary"
 msgstr "匈牙利"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
@@ -5143,7 +5312,7 @@ msgid "Account Owner Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:412
+#: code:addons/base/ir/ir_model.py:414
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
@@ -5159,16 +5328,11 @@ msgid "Decimal Separator"
 msgstr "小數分隔符"
 
 #. module: base
-#: code:addons/orm.py:5245
+#: code:addons/orm.py:5318
 #, python-format
 msgid "Missing required value for the field '%s'."
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_res_partner_address
-msgid "res.partner.address"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
@@ -5209,9 +5373,10 @@ msgid "Optional model, mostly used for needactions."
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,create_uid:0
-msgid "Creator"
-msgstr "建立者"
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5274,15 +5439,6 @@ msgstr "委內瑞拉"
 msgid "9.  %j              ==> 340"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_signup
-msgid ""
-"\n"
-"Allow users to sign up.\n"
-"=======================\n"
-"    "
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
@@ -5298,6 +5454,11 @@ msgstr ""
 msgid "Manufacturing Orders, Bill of Materials, Routing"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr "附件名稱"
+
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
@@ -5381,6 +5542,12 @@ msgstr "哈薩克"
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr "%w - 週日數 [0(星期日),6]."
 
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr "資源名稱"
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
@@ -5631,7 +5798,7 @@ msgid "title"
 msgstr "稱謂"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
 msgstr ""
@@ -5688,6 +5855,15 @@ msgstr "產品"
 msgid "User-defined Defaults"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
@@ -5803,13 +5979,15 @@ msgid "Bank Type"
 msgstr "銀行類型"
 
 #. module: base
-#: code:addons/base/res/res_users.py:103
+#: code:addons/base/res/res_users.py:99
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "群組名稱開首不能為「-」"
 
 #. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
 #: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
 msgstr ""
 
@@ -5829,7 +6007,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr "古吉拉特文 / ગુજરાતી"
 
 #. module: base
-#: code:addons/base/module/module.py:340
+#: code:addons/base/module/module.py:361
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
@@ -5862,10 +6040,9 @@ msgid "Uncategorized"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,res_name:0
-#: field:ir.ui.view_sc,resource:0
-msgid "Resource Name"
-msgstr "資源名稱"
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -5898,6 +6075,11 @@ msgid ""
 "button is necessary to validate this transition."
 msgstr ""
 
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr "原始檢視"
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
 msgid ""
@@ -5908,7 +6090,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:183
+#: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
 msgstr ""
@@ -5924,26 +6106,6 @@ msgstr ""
 msgid "My Banks"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_recruitment
-msgid ""
-"\n"
-"Manage job positions and the recruitment process\n"
-"=================================================\n"
-"\n"
-"This application allows you to easily keep track of jobs, vacancies, "
-"applications, interviews...\n"
-"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to "
-"<jobs@yourcompany.com> in the list of applications. It's also integrated "
-"with the document management system to store and search in the CV base and "
-"find the candidate that you are looking for. Similarly, it is integrated "
-"with the survey module to allow you to define interviews for different "
-"jobs.\n"
-"You can define the different phases of interviews and easily rate the "
-"applicant from the kanban view.\n"
-msgstr ""
-
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
@@ -6076,11 +6238,6 @@ msgid ""
 "configuration menu.\n"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_reset_password
-msgid "Reset Password"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
@@ -6092,8 +6249,8 @@ msgid "Malaysia"
 msgstr "馬來西亞"
 
 #. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
 #, python-format
 msgid "Increment number must not be zero."
 msgstr ""
@@ -6200,7 +6357,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2247
+#: code:addons/orm.py:2246
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
@@ -6238,7 +6395,7 @@ msgid "Created Menus"
 msgstr "已建立選單"
 
 #. module: base
-#: code:addons/base/module/module.py:475
+#: code:addons/base/module/module.py:503
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
@@ -6265,8 +6422,36 @@ msgid "SSL/TLS"
 msgstr ""
 
 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
 msgstr ""
 
 #. module: base
@@ -6299,6 +6484,13 @@ msgstr ""
 msgid "Current Year without Century: %(y)s"
 msgstr "不帶世紀之當前年份：%(y)s"
 
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
 #. module: base
 #: help:ir.actions.client,tag:0
 msgid ""
@@ -6341,7 +6533,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:265
+#: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
@@ -6433,7 +6625,7 @@ msgid "Israel"
 msgstr "以色列"
 
 #. module: base
-#: code:addons/base/res/res_config.py:444
+#: code:addons/base/res/res_config.py:443
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr ""
@@ -6453,23 +6645,6 @@ msgstr ""
 msgid "Indian - Accounting"
 msgstr ""
 
-#. module: base
-#: field:res.partner,mobile:0
-#: field:res.partner.address,mobile:0
-msgid "Mobile"
-msgstr "手提電話"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_mx
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Mexico in OpenERP.\n"
-"========================================================================\n"
-"\n"
-"Mexican accounting chart and localization.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
@@ -6502,10 +6677,10 @@ msgstr "報表 xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
+#: model:ir.actions.act_window,name:base.open_module_tree
 #: field:ir.module.category,module_ids:0
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.menu_management
-#: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
 msgstr "模組"
 
@@ -6579,8 +6754,8 @@ msgid "United Kingdom"
 msgstr "英國"
 
 #. module: base
-#: view:res.config:0
-msgid "res_config_contents"
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -6604,8 +6779,8 @@ msgid "Partner Titles"
 msgstr "伙伴稱謂"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:197
-#: code:addons/base/ir/ir_fields.py:228
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
 msgstr ""
@@ -6653,18 +6828,13 @@ msgid "ir.attachment"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:4315
+#: code:addons/orm.py:4347
 #, python-format
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_anonymous
-msgid "Anonymous"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
 msgid ""
@@ -6769,6 +6939,13 @@ msgstr "成功匯入模組檔！"
 msgid "Model Constraints"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr "轉換"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
@@ -6863,7 +7040,6 @@ msgstr ""
 #. module: base
 #: field:res.bank,state:0
 #: field:res.company,state_id:0
-#: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
 msgstr "省或州"
@@ -6964,12 +7140,6 @@ msgstr "全名"
 msgid "on"
 msgstr ""
 
-#. module: base
-#: code:addons/base/module/module.py:284
-#, python-format
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
@@ -7011,6 +7181,7 @@ msgstr "於多重文件。"
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.config.installer:0
@@ -7068,7 +7239,7 @@ msgid "Connection Security"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr "請指定要執行之動作！"
@@ -7088,6 +7259,11 @@ msgstr "分類名稱"
 msgid "Northern Mariana Islands"
 msgstr "北馬里安納群島"
 
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
@@ -7099,13 +7275,18 @@ msgid "Intrastat Reporting"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:135
+#: code:addons/base/res/res_users.py:131
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr "請以「變更密碼精靈」(於「使用者偏好設定」或「使用者」選單) 變更密碼。"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
 msgid ""
@@ -7136,7 +7317,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:2021
+#: code:addons/orm.py:2020
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "行事曆檢視欄位不足！"
@@ -7182,7 +7363,6 @@ msgstr "轉換"
 #: field:res.currency,active:0
 #: field:res.lang,active:0
 #: field:res.partner,active:0
-#: field:res.partner.address,active:0
 #: field:res.partner.category,active:0
 #: field:res.request,active:0
 #: field:res.users,active:0
@@ -7202,30 +7382,30 @@ msgid "Child Categories"
 msgstr "下級分類"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:607
+#: code:addons/base/ir/ir_actions.py:606
 #: code:addons/base/ir/ir_actions.py:702
 #: code:addons/base/ir/ir_actions.py:705
-#: code:addons/base/ir/ir_model.py:163
-#: code:addons/base/ir/ir_model.py:272
-#: code:addons/base/ir/ir_model.py:286
-#: code:addons/base/ir/ir_model.py:316
-#: code:addons/base/ir/ir_model.py:332
-#: code:addons/base/ir/ir_model.py:337
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:164
+#: code:addons/base/ir/ir_model.py:274
+#: code:addons/base/ir/ir_model.py:288
+#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:334
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:342
 #: code:addons/base/ir/ir_translation.py:341
-#: code:addons/base/module/module.py:298
-#: code:addons/base/module/module.py:341
-#: code:addons/base/module/module.py:345
-#: code:addons/base/module/module.py:351
-#: code:addons/base/module/module.py:472
-#: code:addons/base/module/module.py:498
-#: code:addons/base/module/module.py:513
-#: code:addons/base/module/module.py:609
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:500
+#: code:addons/base/module/module.py:526
+#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:645
 #: code:addons/base/res/res_currency.py:193
-#: code:addons/base/res/res_users.py:102
-#: code:addons/custom.py:550
-#: code:addons/orm.py:789
-#: code:addons/orm.py:3929
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:785
+#: code:addons/orm.py:3960
 #, python-format
 msgid "Error"
 msgstr "錯誤"
@@ -7313,6 +7493,11 @@ msgstr ""
 msgid "This Window"
 msgstr "此視窗"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
@@ -7396,6 +7581,21 @@ msgstr "欄位"
 msgid "Employees"
 msgstr "員工"
 
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
@@ -7425,11 +7625,6 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#. module: base
-#: field:res.partner,address:0
-msgid "Addresses"
-msgstr "地址"
-
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
@@ -7454,7 +7649,6 @@ msgstr "選擇選項"
 #: field:res.bank,street:0
 #: field:res.company,street:0
 #: field:res.partner,street:0
-#: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
 msgstr "街道"
@@ -7465,8 +7659,23 @@ msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
 #. module: base
-#: field:res.partner.category,parent_right:0
-msgid "Right parent"
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -7545,7 +7754,7 @@ msgid "Change My Preferences"
 msgstr "變改我的偏好設定"
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:172
+#: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr "動作定義之模型名稱無效。"
@@ -7632,14 +7841,16 @@ msgid "US Letter"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_marketing
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
 msgid ""
-"\n"
-"Menu for Marketing.\n"
-"===================\n"
-"\n"
-"Contains the installer for marketing-related modules.\n"
-"    "
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: base
@@ -7648,7 +7859,7 @@ msgid "Company Bank Accounts"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:470
+#: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr "因安全理由密碼不能留空！"
@@ -7659,13 +7870,13 @@ msgid "Optional password for SMTP authentication"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:719
+#: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:350
+#: code:addons/base/res/res_config.py:349
 #, python-format
 msgid ""
 "\n"
@@ -7684,12 +7895,13 @@ msgid "Normal Bank Account"
 msgstr ""
 
 #. module: base
+#: field:change.password.user,wizard_id:0
 #: view:ir.actions.wizard:0
 msgid "Wizard"
 msgstr "精靈"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:304
+#: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
 msgstr ""
@@ -7862,7 +8074,7 @@ msgid "Jobs, Recruitment, Applications, Job Interviews"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:513
+#: code:addons/base/module/module.py:540
 #, python-format
 msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
@@ -7893,14 +8105,6 @@ msgstr ""
 msgid "base.update.translations"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_sequence.py:105
-#: code:addons/base/ir/ir_sequence.py:131
-#: code:addons/base/res/res_users.py:470
-#, python-format
-msgid "Warning!"
-msgstr "警告！"
-
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
@@ -7924,7 +8128,6 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
@@ -8039,7 +8242,7 @@ msgid "Nigeria"
 msgstr "奈及利亞"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:332
+#: code:addons/base/ir/ir_model.py:334
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
@@ -8354,7 +8557,7 @@ msgid "Update Modules List"
 msgstr "更新模組列表"
 
 #. module: base
-#: code:addons/base/module/module.py:338
+#: code:addons/base/module/module.py:359
 #, python-format
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
@@ -8366,7 +8569,7 @@ msgid "eInvoicing"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:175
+#: code:addons/base/res/res_users.py:171
 #, python-format
 msgid ""
 "Please keep in mind that documents currently displayed may not be relevant "
@@ -8376,7 +8579,7 @@ msgid ""
 msgstr "請注意：目前顯示之文件於轉換公司後可能不再有關。如您有變更未儲存，請確保於轉換公司前先儲存。（您現可於用戶偏好設定按「取消」）"
 
 #. module: base
-#: code:addons/orm.py:2821
+#: code:addons/orm.py:2817
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
 msgstr ""
@@ -8391,6 +8594,17 @@ msgstr "繼續"
 msgid "Thai / ภาษาไทย"
 msgstr "泰文 / ภาษาไทย"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
@@ -8430,7 +8644,7 @@ msgid "Mexico"
 msgstr "墨西哥"
 
 #. module: base
-#: code:addons/orm.py:3871
+#: code:addons/orm.py:3902
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created "
@@ -8452,15 +8666,15 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:441
+#: code:addons/base/ir/ir_mail_server.py:440
 #, python-format
 msgid "Missing SMTP Server"
 msgstr ""
 
 #. module: base
-#: field:ir.attachment,name:0
-msgid "Attachment Name"
-msgstr "附件名稱"
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
 
 #. module: base
 #: field:base.language.export,data:0
@@ -8484,7 +8698,7 @@ msgid "%b - Abbreviated month name."
 msgstr "%b - 月份名縮寫。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:721
+#: code:addons/base/ir/ir_model.py:722
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr ""
@@ -8496,7 +8710,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,supplier:0
-#: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
 msgstr "供應商"
@@ -8574,7 +8787,7 @@ msgid "Selectable"
 msgstr "可選取"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Everything seems properly set up!"
 msgstr ""
@@ -8602,8 +8815,8 @@ msgid "Iteration"
 msgstr "遍歷"
 
 #. module: base
-#: code:addons/orm.py:4213
-#: code:addons/orm.py:4314
+#: code:addons/orm.py:4245
+#: code:addons/orm.py:4346
 #, python-format
 msgid "UserError"
 msgstr "用戶錯誤"
@@ -8627,7 +8840,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3929
+#: code:addons/orm.py:3960
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -8774,7 +8987,7 @@ msgid "Reunion (French)"
 msgstr "法屬留尼旺島"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:414
+#: code:addons/base/ir/ir_model.py:416
 #, python-format
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
@@ -8813,8 +9026,8 @@ msgid "Solomon Islands"
 msgstr "索羅門群島"
 
 #. module: base
-#: code:addons/orm.py:4119
-#: code:addons/orm.py:4652
+#: code:addons/orm.py:4151
+#: code:addons/orm.py:4684
 #, python-format
 msgid "AccessError"
 msgstr "存取錯誤"
@@ -8888,7 +9101,7 @@ msgid "Prof."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:239
+#: code:addons/base/ir/ir_mail_server.py:238
 #, python-format
 msgid ""
 "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
@@ -8902,7 +9115,7 @@ msgid "Ukraine"
 msgstr "烏克蘭"
 
 #. module: base
-#: code:addons/base/res/res_company.py:150
+#: code:addons/base/res/res_company.py:164
 #: field:ir.module.module,website:0
 #: field:res.company,website:0
 #: field:res.partner,website:0
@@ -8965,6 +9178,11 @@ msgstr ""
 msgid "Flemish (BE) / Vlaams (BE)"
 msgstr "佛蘭芒文 (BE) / Vlaams (BE)"
 
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr "越南文 / Tiếng Việt"
+
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
@@ -9063,9 +9281,9 @@ msgid "Custom Shortcuts"
 msgstr "自訂快捷鍵"
 
 #. module: base
-#: selection:base.language.install,lang:0
-msgid "Vietnamese / Tiếng Việt"
-msgstr "越南文 / Tiếng Việt"
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -9093,13 +9311,13 @@ msgid "Models"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:472
+#: code:addons/base/module/module.py:500
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:390
+#: code:addons/base/ir/ir_cron.py:247
 #, python-format
 msgid "Record cannot be modified right now"
 msgstr ""
@@ -9120,7 +9338,7 @@ msgid "osv_memory.autovacuum"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:720
+#: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr ""
@@ -9168,7 +9386,7 @@ msgid "On Delete"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:342
 #, python-format
 msgid "Model %s does not exist!"
 msgstr "無 %s 模型！"
@@ -9214,6 +9432,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.password.wizard:0
 #: view:ir.actions.configuration.wizard:0
 #: view:res.config:0
 #: view:res.users:0
@@ -9222,7 +9441,7 @@ msgid "Cancel"
 msgstr "取消"
 
 #. module: base
-#: code:addons/orm.py:1509
+#: code:addons/orm.py:1506
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr ""
@@ -9241,6 +9460,43 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
@@ -9276,7 +9532,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:317
+#: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
 msgstr ""
@@ -9328,6 +9584,11 @@ msgstr ""
 msgid "%I - Hour (12-hour clock) [01,12]."
 msgstr "%I - 小時 (十二小時制) [01,12]."
 
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
@@ -9370,23 +9631,11 @@ msgid "The currency code must be unique per company!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:38
+#: code:addons/base/module/wizard/base_export_language.py:39
 #, python-format
 msgid "New Language (Empty translation template)"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_auth_reset_password
-msgid ""
-"\n"
-"Reset Password\n"
-"==============\n"
-"\n"
-"Allow users to reset their password from the login page.\n"
-"Allow administrator to click a button to send a \"Reset Password\" request "
-"to a user.\n"
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,email:0
 msgid ""
@@ -9420,7 +9669,7 @@ msgid "Products Expiry Date"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:387
+#: code:addons/base/res/res_config.py:386
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -9511,6 +9760,11 @@ msgid ""
 "=========================\n"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
@@ -9715,7 +9969,7 @@ msgid "Marketing Campaign - Demo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:361
+#: code:addons/base/ir/ir_fields.py:360
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
@@ -9726,13 +9980,18 @@ msgstr ""
 msgid "Interval Unit"
 msgstr "間隔單位"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
 #. module: base
 #: field:workflow.activity,kind:0
 msgid "Kind"
 msgstr "類別"
 
 #. module: base
-#: code:addons/orm.py:4614
+#: code:addons/orm.py:4646
 #, python-format
 msgid "This method does not exist anymore"
 msgstr ""
@@ -9900,7 +10159,7 @@ msgid "To Translate"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:295
+#: code:addons/base/ir/ir_fields.py:294
 #, python-format
 msgid "See all possible values"
 msgstr ""
@@ -9933,6 +10192,11 @@ msgstr ""
 msgid "PostgreSQL constraint or foreign key name."
 msgstr ""
 
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
@@ -9958,6 +10222,11 @@ msgstr ""
 msgid "Footer text displayed at the bottom of all reports."
 msgstr ""
 
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
@@ -10047,7 +10316,6 @@ msgstr "%m - 月份 [01,12]."
 #: field:res.bank,city:0
 #: field:res.company,city:0
 #: field:res.partner,city:0
-#: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
 msgstr "城市"
@@ -10083,13 +10351,20 @@ msgstr ""
 msgid "Estonian / Eesti keel"
 msgstr "愛沙尼亞文 / Eesti keel"
 
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr "提供記錄ID所指定的欄位名稱作寫入操作，如空，則使用物件的活動ID。"
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
 msgstr "GPL-3 或更新版本"
 
 #. module: base
-#: code:addons/orm.py:2033
+#: code:addons/orm.py:2032
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -10148,19 +10423,44 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:727
+#: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:519
+#: code:addons/base/module/module.py:546
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
@@ -10174,6 +10474,8 @@ msgid "Activity"
 msgstr "動態"
 
 #. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.default,uid:0
 #: model:ir.model,name:base.model_res_users
@@ -10192,7 +10494,12 @@ msgid "Parent Company"
 msgstr "母公司"
 
 #. module: base
-#: code:addons/orm.py:3840
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -10204,13 +10511,6 @@ msgstr ""
 msgid "ir.mail_server"
 msgstr ""
 
-#. module: base
-#: help:ir.ui.menu,needaction_counter:0
-msgid ""
-"If the target model uses the need action mechanism, this field gives the "
-"number of actions the current user has to perform."
-msgstr ""
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
@@ -10295,6 +10595,26 @@ msgstr "當用戶（以 web client）重組其 dashboard 檢視即會使用自
 msgid "Sales and Warehouse Management"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
 #. module: base
 #: field:ir.model.fields,model:0
 msgid "Object Name"
@@ -10364,6 +10684,11 @@ msgstr ""
 msgid "Sequences Type"
 msgstr "序列類列"
 
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
@@ -10424,9 +10749,9 @@ msgstr ""
 "請先停用該語言。"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Permission Denied"
 msgstr ""
@@ -10444,8 +10769,8 @@ msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "伺服器動作之「紀錄 Id」配置有問題！"
 
 #. module: base
-#: code:addons/orm.py:2810
-#: code:addons/orm.py:2820
+#: code:addons/orm.py:2806
+#: code:addons/orm.py:2816
 #, python-format
 msgid "ValidateError"
 msgstr "檢驗錯誤"
@@ -10484,13 +10809,12 @@ msgid "Laos"
 msgstr "寮國"
 
 #. module: base
-#: code:addons/base/res/res_company.py:149
+#: code:addons/base/res/res_company.py:163
 #: selection:ir.actions.server,state:0
 #: model:ir.ui.menu,name:base.menu_email
 #: field:res.bank,email:0
 #: field:res.company,email:0
 #: field:res.partner,email:0
-#: field:res.partner.address,email:0
 #, python-format
 msgid "Email"
 msgstr "電郵"
@@ -10501,7 +10825,12 @@ msgid "Office Supplies"
 msgstr ""
 
 #. module: base
-#: code:addons/custom.py:550
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
 #, python-format
 msgid ""
 "The sum of the data (2nd field) is null.\n"
@@ -10530,36 +10859,6 @@ msgid ""
 " - context: current context"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_account_followup
-msgid ""
-"\n"
-"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
-"==========================================================================\n"
-"\n"
-"You can define your multiple levels of recall through the menu:\n"
-"---------------------------------------------------------------\n"
-"    Configuration / Follow-Up Levels\n"
-"    \n"
-"Once it is defined, you can automatically print recalls every day through "
-"simply clicking on the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------\n"
-"    Payment Follow-Up / Send Email and letters\n"
-"\n"
-"It will generate a PDF / send emails / set manual actions according to the "
-"the different levels \n"
-"of recall defined. You can define different policies for different "
-"companies. \n"
-"\n"
-"Note that if you want to check the follow-up level for a given "
-"partner/account entry, you can do from in the menu:\n"
-"-----------------------------------------------------------------------------"
-"-------------------------------------\n"
-"    Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid ""
@@ -10581,6 +10880,11 @@ msgstr ""
 msgid "Ecuador"
 msgstr "厄瓜多"
 
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr "工作流程"
+
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
@@ -10597,16 +10901,6 @@ msgstr ""
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_ve
-msgid ""
-"\n"
-"This is the module to manage the accounting chart for Venezuela in OpenERP.\n"
-"===========================================================================\n"
-"\n"
-"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
@@ -10623,9 +10917,9 @@ msgid "Cascade"
 msgstr ""
 
 #. module: base
-#: field:workflow.transition,group_id:0
-msgid "Group Required"
-msgstr "必要群組"
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -10650,11 +10944,6 @@ msgstr ""
 msgid "Default Company per Object"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,needaction_counter:0
-msgid "Number of actions the user has to perform"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
@@ -10680,7 +10969,7 @@ msgid "Domain"
 msgstr "領域"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
 #, python-format
 msgid "Use '1' for yes and '0' for no"
 msgstr ""
@@ -10696,12 +10985,12 @@ msgid "State Name"
 msgstr "州/省名稱"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
-msgid "Belgium - Payroll with Accounting"
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:314
+#: code:addons/base/ir/ir_fields.py:313
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr ""
@@ -10722,29 +11011,9 @@ msgid "Timezone"
 msgstr "時區"
 
 #. module: base
-#: model:ir.module.module,description:base.module_account_voucher
-msgid ""
-"\n"
-"Invoicing & Payments by Accounting Voucher & Receipts\n"
-"======================================================\n"
-"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
-"track of your accounting, even when you are not an accountant. It provides "
-"an easy way to follow up on your suppliers and customers. \n"
-"\n"
-"You could use this simplified accounting in case you work with an (external) "
-"account to keep your books, and you still want to keep track of payments. \n"
-"\n"
-"The Invoicing system includes receipts and vouchers (an easy way to keep "
-"track of sales and purchases). It also offers you an easy method of "
-"registering payments, without having to encode complete abstracts of "
-"account.\n"
-"\n"
-"This module manages:\n"
-"\n"
-"* Voucher Entry\n"
-"* Voucher Receipt [Sales & Purchase]\n"
-"* Voucher Payment [Customer & Supplier]\n"
-"    "
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: base
@@ -10765,7 +11034,7 @@ msgid "Shared"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:357
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
@@ -10812,7 +11081,6 @@ msgstr ""
 #: field:res.bank,street2:0
 #: field:res.company,street2:0
 #: field:res.partner,street2:0
-#: field:res.partner.address,street2:0
 msgid "Street2"
 msgstr "街道2"
 
@@ -10836,6 +11104,7 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: field:change.password.user,user_id:0
 #: view:ir.cron:0
 #: field:ir.cron,user_id:0
 #: field:ir.filters,user_id:0
@@ -10921,19 +11190,28 @@ msgid "Related Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/osv.py:151
 #: code:addons/osv.py:153
+#: code:addons/osv.py:155
 #, python-format
 msgid "Integrity Error"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_workflow
-msgid "workflow"
-msgstr "工作流程"
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:293
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -10975,22 +11253,6 @@ msgstr ""
 msgid "Arguments"
 msgstr "引數"
 
-#. module: base
-#: model:ir.module.module,description:base.module_crm_claim
-msgid ""
-"\n"
-"\n"
-"Manage Customer Claims.\n"
-"============================================================================="
-"===\n"
-"This application allows you to track your customers/suppliers claims and "
-"grievances.\n"
-"\n"
-"It is fully integrated with the email gateway so that you can create\n"
-"automatically new claims based on incoming emails.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -11123,7 +11385,6 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,customer:0
-#: field:res.partner.address,is_customer_add:0
 msgid "Customer"
 msgstr "客戶"
 
@@ -11213,7 +11474,7 @@ msgid "ir.fields.converter"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Couldn't create contact without email address !"
 msgstr ""
@@ -11263,8 +11524,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_openid
-msgid "OpenID Authentification"
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
 msgstr ""
 
 #. module: base
@@ -11355,7 +11616,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:469
 #, python-format
 msgid "Mail delivery failed"
 msgstr ""
@@ -11382,7 +11643,7 @@ msgid "Object"
 msgstr "物件"
 
 #. module: base
-#: code:addons/osv.py:148
+#: code:addons/osv.py:150
 #, python-format
 msgid ""
 "\n"
@@ -11471,7 +11732,7 @@ msgid "Mrs."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:424
+#: code:addons/base/ir/ir_model.py:426
 #, python-format
 msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
@@ -11484,7 +11745,7 @@ msgid "User Ref."
 msgstr "用戶參照"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:227
+#: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
@@ -11529,8 +11790,6 @@ msgstr "參照手冊"
 #. module: base
 #: model:ir.model,name:base.model_res_partner
 #: field:res.company,partner_id:0
-#: view:res.partner:0
-#: field:res.partner.address,partner_id:0
 #: model:res.partner.category,name:base.res_partner_category_0
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
@@ -11538,7 +11797,7 @@ msgid "Partner"
 msgstr "伙伴"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:478
+#: code:addons/base/ir/ir_mail_server.py:477
 #, python-format
 msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
@@ -11567,12 +11826,6 @@ msgstr "福克蘭群島"
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#. module: base
-#: selection:workflow.activity,join_mode:0
-#: selection:workflow.activity,split_mode:0
-msgid "Xor"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
@@ -11679,8 +11932,10 @@ msgid "Selection"
 msgstr "選取範圍"
 
 #. module: base
-#: field:ir.module.module,icon:0
-msgid "Icon URL"
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
 msgstr ""
 
 #. module: base
@@ -11717,7 +11972,7 @@ msgid "Action Type"
 msgstr "動作類型"
 
 #. module: base
-#: code:addons/base/module/module.py:351
+#: code:addons/base/module/module.py:372
 #, python-format
 msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
@@ -11853,11 +12108,6 @@ msgstr ""
 msgid "Hour 00->12: %(h12)s"
 msgstr "小時 00->12：%(h12)s"
 
-#. module: base
-#: help:res.partner.address,active:0
-msgid "Uncheck the active field to hide the contact."
-msgstr "要隱藏該聯絡人的話取消選取「啟動」欄位。"
-
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
@@ -11874,7 +12124,7 @@ msgid "workflow.instance"
 msgstr "工作流程.實例"
 
 #. module: base
-#: code:addons/orm.py:480
+#: code:addons/orm.py:479
 #, python-format
 msgid "Unknown attribute %s in %s "
 msgstr ""
@@ -11897,7 +12147,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/fields.py:126
+#: code:addons/fields.py:130
 #, python-format
 msgid "undefined get method !"
 msgstr ""
@@ -11938,16 +12188,16 @@ msgstr ""
 msgid "Payroll Accounting"
 msgstr ""
 
-#. module: base
-#: help:ir.attachment,type:0
-msgid "Binary File or external URL"
-msgstr "二進位檔或外部網址"
-
 #. module: base
 #: view:res.users:0
 msgid "Change password"
 msgstr "變更密碼"
 
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr "蘇利南"
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
@@ -11994,75 +12244,8 @@ msgid "Address Format"
 msgstr ""
 
 #. module: base
-#: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-"分隔符格式為 [,n]，當中 0 < n :以單位數字開首.-1 結束分隔. 例如 [3,2,-1]，106500 會顯示為 "
-"1,06,500;[1,2,-1] 會將之顯示為 106,50,0;[3] 會將之顯示為 106,500. ',' 為千位分隔符。"
-
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_br
-msgid ""
-"\n"
-"Base module for the Brazilian localization.\n"
-"===========================================\n"
-"\n"
-"This module consists in:\n"
-"------------------------\n"
-" - Generic Brazilian chart of accounts\n"
-" - Brazilian taxes such as:\n"
-"\n"
-"        - IPI\n"
-"        - ICMS\n"
-"        - PIS\n"
-"        - COFINS\n"
-"        - ISS\n"
-"        - IR\n"
-"        - IRPJ\n"
-"        - CSLL\n"
-"\n"
-" - Tax Situation Code (CST) required for the electronic fiscal invoicing "
-"(NFe)\n"
-"\n"
-"The field tax_discount has also been added in the account.tax.template and "
-"account.tax\n"
-"objects to allow the proper computation of some Brazilian VATs such as ICMS. "
-"The\n"
-"chart of account creation wizard has been extended to propagate those new "
-"data properly.\n"
-"\n"
-"It's important to note however that this module lack many implementations to "
-"use\n"
-"OpenERP properly in Brazil. Those implementations (such as the electronic "
-"fiscal\n"
-"Invoicing which is already operational) are brought by more than 15 "
-"additional\n"
-"modules of the Brazilian Launchpad localization project\n"
-"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the "
-"extra\n"
-"addons branch. Those modules aim at not breaking with the remarkable "
-"OpenERP\n"
-"modularity, this is why they are numerous but small. One of the reasons for\n"
-"maintaining those modules apart is that Brazilian Localization leaders need "
-"commit\n"
-"rights agility to complete the localization as companies fund the remaining "
-"legal\n"
-"requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and "
-"PAF\n"
-"ECF that are still missing as September 2011). Those modules are also "
-"strictly\n"
-"licensed under AGPL V3 and today don't come with any additional paid "
-"permission\n"
-"for online use of 'private modules'."
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_values
-msgid "ir.values"
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
 msgstr ""
 
 #. module: base
@@ -12070,13 +12253,48 @@ msgstr ""
 msgid "Technical Features"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
 msgstr "歐西坦文（法國1500年後）/ Occitan"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:213
+#: code:addons/base/ir/ir_mail_server.py:212
 #, python-format
 msgid ""
 "Here is what we got instead:\n"
@@ -12253,6 +12471,11 @@ msgid ""
 "receptions, etc."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
@@ -12269,7 +12492,7 @@ msgid "Body"
 msgstr "內容"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:220
+#: code:addons/base/ir/ir_mail_server.py:219
 #, python-format
 msgid "Connection test succeeded!"
 msgstr ""
@@ -12317,7 +12540,7 @@ msgid "choose"
 msgstr "選擇"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:442
+#: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
@@ -12493,10 +12716,14 @@ msgid "Components Buyer"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
+#: model:ir.module.module,description:base.module_web_tests_demo
 msgid ""
-"Do you confirm the uninstallation of this module? This will permanently "
-"erase all data currently stored by the module!"
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -12528,12 +12755,13 @@ msgstr ""
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:287
+#: code:addons/base/ir/ir_model.py:289
 #, python-format
 msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
@@ -12547,7 +12775,6 @@ msgstr ""
 
 #. module: base
 #: view:ir.actions.report.xml:0
-#: model:ir.ui.menu,name:base.menu_sales_configuration_misc
 #: view:res.currency:0
 msgid "Miscellaneous"
 msgstr "雜項"
@@ -12569,23 +12796,6 @@ msgstr ""
 msgid "China"
 msgstr "中國"
 
-#. module: base
-#: model:ir.module.module,description:base.module_l10n_pl
-msgid ""
-"\n"
-"This is the module to manage the accounting chart and taxes for Poland in "
-"OpenERP.\n"
-"============================================================================="
-"=====\n"
-"\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid ""
@@ -12655,25 +12865,9 @@ msgid "Bulgaria"
 msgstr "保加利亞"
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_byproduct
-msgid ""
-"\n"
-"This module allows you to produce several products from one production "
-"order.\n"
-"============================================================================="
-"\n"
-"\n"
-"You can configure by-products in the bill of material.\n"
-"\n"
-"Without this module:\n"
-"--------------------\n"
-"    A + B + C -> D\n"
-"\n"
-"With this module:\n"
-"-----------------\n"
-"    A + B + C -> D + E\n"
-"    "
-msgstr ""
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr "安哥拉"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -12701,6 +12895,26 @@ msgstr ""
 msgid "ltd"
 msgstr "有限公司"
 
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
 msgid ""
@@ -12737,6 +12951,7 @@ msgstr "斯洛伐克文 / Slovenský jazyk"
 #. module: base
 #: field:base.language.export,state:0
 #: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
 #: field:res.users,user_email:0
 msgid "unknown"
 msgstr "不詳"
@@ -12804,6 +13019,11 @@ msgstr "通訊錄"
 msgid "ir.sequence.type"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
@@ -12893,6 +13113,7 @@ msgid "Projects, Tasks"
 msgstr ""
 
 #. module: base
+#: field:ir.attachment,res_id:0
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
@@ -12905,7 +13126,7 @@ msgid "Information"
 msgstr "資訊"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
+#: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "false"
 msgstr ""
@@ -12936,16 +13157,20 @@ msgid ""
 "    "
 msgstr ""
 
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
 msgstr "更新模組清單"
 
 #. module: base
-#: code:addons/base/res/res_users.py:682
-#: code:addons/base/res/res_users.py:822
+#: code:addons/base/res/res_users.py:679
+#: code:addons/base/res/res_users.py:819
 #: selection:res.partner,type:0
-#: selection:res.partner.address,type:0
 #: view:res.users:0
 #, python-format
 msgid "Other"
@@ -13010,6 +13235,11 @@ msgstr ""
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
 
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
@@ -13082,29 +13312,6 @@ msgstr ""
 msgid "External Identifier"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_event_sale
-msgid ""
-"\n"
-"Creating registration with sale orders.\n"
-"=======================================\n"
-"\n"
-"This module allows you to automatize and connect your registration creation "
-"with\n"
-"your main sale flow and therefore, to enable the invoicing feature of "
-"registrations.\n"
-"\n"
-"It defines a new kind of service products that offers you the possibility "
-"to\n"
-"choose an event category associated with it. When you encode a sale order "
-"for\n"
-"that product, you will be able to choose an existing event of that category "
-"and\n"
-"when you confirm your sale order it will automatically create a registration "
-"for\n"
-"this event.\n"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
 msgid ""
@@ -13152,7 +13359,7 @@ msgid "Delivery Costs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_cron.py:391
+#: code:addons/base/ir/ir_cron.py:248
 #, python-format
 msgid ""
 "This cron task is currently being executed and may not be modified, please "
@@ -13196,9 +13403,9 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_base_crypt
-msgid "DB Password Encryption"
-msgstr ""
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr "記錄規則"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13442,9 +13649,14 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:147
-#, python-format
-msgid "no"
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
 msgstr ""
 
 #. module: base
@@ -13471,63 +13683,14 @@ msgid "System Configuration done"
 msgstr "系統配置完成"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.ir_config_list_action
-#: view:ir.config_parameter:0
-#: model:ir.ui.menu,name:base.ir_config_menu
-msgid "System Parameters"
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_l10n_ch
-msgid ""
-"\n"
-"Swiss localization :\n"
-"====================\n"
-"    - DTA generation for a lot of payment types\n"
-"    - BVR management (number generation, report.)\n"
-"    - Import account move from the bank file (like v11)\n"
-"    - Simplify the way you handle the bank statement for reconciliation\n"
-"\n"
-"You can also add ZIP and bank completion with:\n"
-"----------------------------------------------\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Author:** Camptocamp SA\n"
-" \n"
-" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
-"\n"
-"Module incluant la localisation Suisse de OpenERP revu et corrigé par "
-"Camptocamp.\n"
-"Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement\n"
-"électronique via DTA (pour les banques, le système postal est en "
-"développement)\n"
-"et l'import du relevé de compte depuis la banque de manière automatisée. De "
-"plus,\n"
-"nous avons intégré la définition de toutes les banques Suisses(adresse, "
-"swift et clearing).\n"
-"\n"
-"Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:\n"
-"--------------------------------------------------------------------------\n"
-"Vous pouvez ajouter la completion des banques et des NPA avec with:\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-"    - l10n_ch_zip\n"
-"    - l10n_ch_bank\n"
-" \n"
-" **Auteur:** Camptocamp SA\n"
-" \n"
-" **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique "
-"SA\n"
-"\n"
-"TODO :\n"
-"------\n"
-"    - Implement bvr import partial reconciliation\n"
-"    - Replace wizard by osv_memory when possible\n"
-"    - Add mising HELP\n"
-"    - Finish code comment\n"
-"    - Improve demo data\n"
-"\n"
-msgstr ""
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr "土克斯及開科斯群島"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -13568,17 +13731,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid ""
-"\n"
-"Google Analytics.\n"
-"==============================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: help:ir.sequence,implementation:0
 msgid ""
@@ -13613,7 +13765,7 @@ msgid "Low"
 msgstr "低"
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:317
+#: code:addons/base/ir/ir_ui_menu.py:354
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr "錯誤！無法建立循環選單。"
@@ -13693,11 +13845,10 @@ msgid "El Salvador"
 msgstr "薩爾瓦多"
 
 #. module: base
-#: code:addons/base/res/res_company.py:147
+#: code:addons/base/res/res_company.py:161
 #: field:res.bank,phone:0
 #: field:res.company,phone:0
 #: field:res.partner,phone:0
-#: field:res.partner.address,phone:0
 #, python-format
 msgid "Phone"
 msgstr "電話"
@@ -13712,6 +13863,11 @@ msgstr "存取選單"
 msgid "Thailand"
 msgstr "泰國"
 
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
@@ -13732,6 +13888,30 @@ msgstr ""
 msgid "Romanian / română"
 msgstr "羅馬尼亞文 / română"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
 msgid ""
@@ -13768,41 +13948,6 @@ msgstr "物件關聯"
 msgid "eInvoicing & Payments"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_base_crypt
-msgid ""
-"\n"
-"Replaces cleartext passwords in the database with a secure hash.\n"
-"================================================================\n"
-"\n"
-"For your existing user base, the removal of the cleartext passwords occurs \n"
-"immediately when you install base_crypt.\n"
-"\n"
-"All passwords will be replaced by a secure, salted, cryptographic hash, \n"
-"preventing anyone from reading the original password in the database.\n"
-"\n"
-"After installing this module, it won't be possible to recover a forgotten "
-"password \n"
-"for your users, the only solution is for an admin to set a new password.\n"
-"\n"
-"Security Warning:\n"
-"-----------------\n"
-"Installing this module does not mean you can ignore other security "
-"measures,\n"
-"as the password is still transmitted unencrypted on the network, unless you\n"
-"are using a secure protocol such as XML-RPCS or HTTPS.\n"
-"\n"
-"It also does not protect the rest of the content of the database, which may\n"
-"contain critical data. Appropriate security measures need to be implemented\n"
-"by the system administrator in all areas, such as: protection of database\n"
-"backups, system files, remote shell access, physical server access.\n"
-"\n"
-"Interaction with LDAP authentication:\n"
-"-------------------------------------\n"
-"This module is currently not compatible with the ``user_ldap`` module and\n"
-"will disable LDAP authentication completely if installed at the same time.\n"
-msgstr ""
-
 #. module: base
 #: view:ir.rule:0
 msgid "General"
@@ -13863,40 +14008,8 @@ msgid "Apply for Write"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_stock
-msgid ""
-"\n"
-"Manage multi-warehouses, multi- and structured stock locations\n"
-"==============================================================\n"
-"\n"
-"The warehouse and inventory management is based on a hierarchical location "
-"structure, from warehouses to storage bins. \n"
-"The double entry inventory system allows you to manage customers, suppliers "
-"as well as manufacturing inventories. \n"
-"\n"
-"OpenERP has the capacity to manage lots and serial numbers ensuring "
-"compliance with the traceability requirements imposed by the majority of "
-"industries.\n"
-"\n"
-"Key Features\n"
-"-------------\n"
-"* Moves history and planning,\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules\n"
-"* Support for barcodes\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
-"\n"
-"Dashboard / Reports for Warehouse Management will include:\n"
-"----------------------------------------------------------\n"
-"* Incoming Products (Graph)\n"
-"* Outgoing Products (Graph)\n"
-"* Procurement in Exception\n"
-"* Inventory Analysis\n"
-"* Last Product Inventories\n"
-"* Moves Analysis\n"
-"    "
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
 msgstr ""
 
 #. module: base
@@ -13985,6 +14098,21 @@ msgstr "檢視："
 msgid "View Auto-Load"
 msgstr "自動載入檢視"
 
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
@@ -14027,34 +14155,6 @@ msgstr ""
 msgid "Persian / فارس"
 msgstr "波斯文 / فارس"
 
-#. module: base
-#: model:ir.module.module,description:base.module_hr_expense
-msgid ""
-"\n"
-"Manage expenses by Employees\n"
-"============================\n"
-"\n"
-"This application allows you to manage your employees' daily expenses. It "
-"gives you access to your employees’ fee notes and give you the right to "
-"complete and validate or refuse the notes. After validation it creates an "
-"invoice for the employee.\n"
-"Employee can encode their own expenses and the validation flow puts it "
-"automatically in the accounting after validation by managers.\n"
-"\n"
-"\n"
-"The whole flow is implemented as:\n"
-"----------------------------------\n"
-"* Draft expense\n"
-"* Confirmation of the sheet by the employee\n"
-"* Validation by his manager\n"
-"* Validation by the accountant and receipt creation\n"
-"\n"
-"This module also uses analytic accounting and is compatible with the invoice "
-"on timesheet module so that you are able to automatically re-invoice your "
-"customers' expenses if your work by project.\n"
-"    "
-msgstr ""
-
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
@@ -14077,9 +14177,9 @@ msgid "Unmet dependency !"
 msgstr "相依性未符合！"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:500
-#: code:addons/base/ir/ir_model.py:561
-#: code:addons/base/ir/ir_model.py:1023
+#: code:addons/base/ir/ir_model.py:502
+#: code:addons/base/ir/ir_model.py:563
+#: code:addons/base/ir/ir_model.py:1024
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr ""
@@ -14090,7 +14190,37 @@ msgid "base.module.configuration"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:3829
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. "
@@ -14116,7 +14246,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:5248
+#: code:addons/orm.py:5321
 #, python-format
 msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
@@ -14161,7 +14291,7 @@ msgid "Access"
 msgstr "存取"
 
 #. module: base
-#: code:addons/base/res/res_company.py:151
+#: code:addons/base/res/res_company.py:165
 #: field:res.partner,vat:0
 #, python-format
 msgid "TIN"
@@ -14194,11 +14324,10 @@ msgid "Bahrain"
 msgstr "巴林"
 
 #. module: base
-#: code:addons/base/res/res_company.py:148
+#: code:addons/base/res/res_company.py:162
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner,fax:0
-#: field:res.partner.address,fax:0
 #, python-format
 msgid "Fax"
 msgstr "傳真"
@@ -14214,8 +14343,6 @@ msgstr "傳真"
 #: field:res.currency,company_id:0
 #: view:res.partner:0
 #: field:res.partner,company_id:0
-#: field:res.partner.address,company_id:0
-#: field:res.partner.address,parent_id:0
 #: field:res.partner.bank,company_id:0
 #: view:res.users:0
 #: field:res.users,company_id:0
@@ -14330,7 +14457,7 @@ msgid "Officer"
 msgstr ""
 
 #. module: base
-#: code:addons/orm.py:789
+#: code:addons/orm.py:785
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
 msgstr ""
@@ -14342,7 +14469,6 @@ msgstr "牙買加"
 
 #. module: base
 #: field:res.partner,color:0
-#: field:res.partner.address,color:0
 msgid "Color Index"
 msgstr ""
 
@@ -14375,7 +14501,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:163
+#: code:addons/base/ir/ir_model.py:164
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
 msgstr ""
@@ -14386,8 +14512,8 @@ msgid "Azerbaijan"
 msgstr "亞塞拜然"
 
 #. module: base
-#: code:addons/base/ir/ir_mail_server.py:477
-#: code:addons/base/res/res_partner.py:436
+#: code:addons/base/ir/ir_mail_server.py:476
+#: code:addons/base/res/res_partner.py:439
 #, python-format
 msgid "Warning"
 msgstr "警告"
@@ -14413,11 +14539,6 @@ msgstr "英屬維京群島"
 msgid "Parameters"
 msgstr "參數"
 
-#. module: base
-#: model:res.country,name:base.pm
-msgid "Saint Pierre and Miquelon"
-msgstr "聖皮耶與密克隆群島"
-
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
@@ -14507,7 +14628,6 @@ msgstr ""
 #: field:res.country.state,country_id:0
 #: field:res.partner,country:0
 #: field:res.partner,country_id:0
-#: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
 msgstr "國家/地區"
@@ -14574,9 +14694,15 @@ msgid "Spanish (SV) / Español (SV)"
 msgstr "西班牙文 (SV) / Español (SV)"
 
 #. module: base
-#: model:ir.actions.act_window,name:base.open_module_tree
-msgid "Install a Module"
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"分隔符格式為 [,n]，當中 0 < n :以單位數字開首.-1 結束分隔. 例如 [3,2,-1]，106500 會顯示為 "
+"1,06,500;[1,2,-1] 會將之顯示為 106,50,0;[3] 會將之顯示為 106,500. ',' 為千位分隔符。"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -14603,7 +14729,7 @@ msgid "Japan"
 msgstr "日本"
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:410
+#: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Can only rename one column at a time!"
 msgstr "每次只能重新命名一個欄位！"
@@ -14664,6 +14790,37 @@ msgstr ""
 msgid "Canada - Accounting"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -14688,7 +14845,7 @@ msgid "Note that this operation might take a few minutes."
 msgstr "請注意：此操作可能花上數分鐘。"
 
 #. module: base
-#: code:addons/base/ir/ir_fields.py:364
+#: code:addons/base/ir/ir_fields.py:363
 #, python-format
 msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
@@ -14727,6 +14884,12 @@ msgstr "執行"
 msgid "Condition"
 msgstr "條件"
 
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
@@ -14779,6 +14942,13 @@ msgstr ""
 msgid "Croatia"
 msgstr "克羅埃西亞"
 
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
@@ -14803,6 +14973,11 @@ msgstr "系統更新"
 msgid "SXW Content"
 msgstr ""
 
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -14819,7 +14994,7 @@ msgid "Gold"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
@@ -14840,15 +15015,52 @@ msgstr "獅子山"
 msgid "General Information"
 msgstr "一般資訊"
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.tc
-msgid "Turks and Caicos Islands"
-msgstr "土克斯及開科斯群島"
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
 
 #. module: base
 #: help:res.partner,vat:0
@@ -14884,7 +15096,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_users.py:174
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
 #, python-format
 msgid "Company Switch Warning"
 msgstr "公司轉換警告"
@@ -14902,11 +15119,15 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr "序列下個號碼按此數字遞增"
 
 #. module: base
-#: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
 msgstr "函式"
 
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
@@ -14942,11 +15163,6 @@ msgstr ""
 msgid "Internal Notes"
 msgstr ""
 
-#. module: base
-#: selection:res.partner.address,type:0
-msgid "Delivery"
-msgstr "運送"
-
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
@@ -14974,7 +15190,7 @@ msgid "Workflow Instances"
 msgstr "工作流程實例"
 
 #. module: base
-#: code:addons/base/res/res_partner.py:524
+#: code:addons/base/res/res_partner.py:532
 #, python-format
 msgid "Partners: "
 msgstr "伙伴： "
@@ -14985,7 +15201,7 @@ msgid "Is a Company?"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_company.py:159
+#: code:addons/base/res/res_company.py:173
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
@@ -15051,7 +15267,6 @@ msgstr "匯出名稱"
 
 #. module: base
 #: help:res.partner,type:0
-#: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -15160,6 +15375,9 @@ msgstr ""
 #~ msgid "SXW path"
 #~ msgstr "SXW 路徑"
 
+#~ msgid "Creator"
+#~ msgstr "建立者"
+
 #~ msgid "Code (eg:en__US)"
 #~ msgstr "語言代碼（如：en__US）"
 
@@ -15241,9 +15459,15 @@ msgstr ""
 #~ msgid "Keep empty for a private address, not related to partner."
 #~ msgstr "留空時為私人地址，不關聯到伙伴。"
 
+#~ msgid "Contact Name"
+#~ msgstr "聯絡人名稱"
+
 #~ msgid "Search Contact"
 #~ msgstr "搜尋聯絡人"
 
+#~ msgid "Uncheck the active field to hide the contact."
+#~ msgstr "要隱藏該聯絡人的話取消選取「啟動」欄位。"
+
 #~ msgid "Advanced"
 #~ msgstr "進階"
 
@@ -15487,6 +15711,9 @@ msgstr ""
 #~ msgid "Latest version"
 #~ msgstr "最新版本"
 
+#~ msgid "Addresses"
+#~ msgstr "地址"
+
 #~ msgid "XML Identifier"
 #~ msgstr "XML 識別碼"
 
@@ -15658,6 +15885,9 @@ msgstr ""
 #~ msgid "Emails"
 #~ msgstr "電郵"
 
+#~ msgid "Binary File or external URL"
+#~ msgstr "二進位檔或外部網址"
+
 #~ msgid "Add RML header"
 #~ msgstr "添加 RML 頁首"
 
@@ -15873,6 +16103,9 @@ msgstr ""
 #~ msgid "Never"
 #~ msgstr "絕不"
 
+#~ msgid "Delivery"
+#~ msgstr "運送"
+
 #~ msgid "BIC/Swift code"
 #~ msgstr "銀行代碼（BIC/Swift）"
 

From 94afe1ccef4ffa84abcbb6e753beacf91f91ec1b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 24 Dec 2012 04:40:35 +0000
Subject: [PATCH 05/12] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
---
 addons/account/i18n/ar.po                     | 1319 +++---
 addons/account/i18n/bg.po                     | 1255 +++---
 addons/account/i18n/br.po                     | 1147 +++--
 addons/account/i18n/bs.po                     | 1222 +++---
 addons/account/i18n/ca.po                     | 1278 +++---
 addons/account/i18n/cs.po                     | 1292 +++---
 addons/account/i18n/da.po                     | 1168 +++--
 addons/account/i18n/de.po                     | 1456 +++---
 addons/account/i18n/el.po                     | 1231 +++---
 addons/account/i18n/en_GB.po                  | 1208 +++--
 addons/account/i18n/en_US.po                  | 1147 +++--
 addons/account/i18n/es.po                     | 1457 +++---
 addons/account/i18n/es_AR.po                  | 1228 +++---
 addons/account/i18n/es_CL.po                  | 1164 +++--
 addons/account/i18n/es_CR.po                  | 1319 +++---
 addons/account/i18n/es_DO.po                  | 1158 +++--
 addons/account/i18n/es_EC.po                  | 1315 +++---
 addons/account/i18n/es_MX.po                  | 1147 +++--
 addons/account/i18n/es_PY.po                  | 1270 +++---
 addons/account/i18n/es_UY.po                  | 1158 +++--
 addons/account/i18n/es_VE.po                  | 1160 +++--
 addons/account/i18n/et.po                     | 1198 +++--
 addons/account/i18n/eu.po                     | 1147 +++--
 addons/account/i18n/fa.po                     | 1152 +++--
 addons/account/i18n/fa_AF.po                  | 1147 +++--
 addons/account/i18n/fi.po                     | 1259 +++---
 addons/account/i18n/fr.po                     | 1473 ++++---
 addons/account/i18n/fr_BE.po                  | 1147 +++--
 addons/account/i18n/gl.po                     | 1239 +++---
 addons/account/i18n/gu.po                     | 1169 +++--
 addons/account/i18n/he.po                     | 1147 +++--
 addons/account/i18n/hi.po                     | 1147 +++--
 addons/account/i18n/hr.po                     | 1276 +++---
 addons/account/i18n/hu.po                     | 1274 +++---
 addons/account/i18n/id.po                     | 1216 +++--
 addons/account/i18n/it.po                     | 1453 +++---
 addons/account/i18n/ja.po                     | 1279 +++---
 addons/account/i18n/kab.po                    | 1147 +++--
 addons/account/i18n/kk.po                     | 1149 +++--
 addons/account/i18n/ko.po                     | 1147 +++--
 addons/account/i18n/lo.po                     | 1147 +++--
 addons/account/i18n/lt.po                     | 1231 +++---
 addons/account/i18n/lv.po                     | 1256 +++---
 addons/account/i18n/mk.po                     | 1309 +++---
 addons/account/i18n/mn.po                     | 1309 +++---
 addons/account/i18n/nb.po                     | 1307 +++---
 addons/account/i18n/nl.po                     | 1343 +++---
 addons/account/i18n/nl_BE.po                  | 1453 +++---
 addons/account/i18n/oc.po                     | 1172 +++--
 addons/account/i18n/pl.po                     | 1409 +++---
 addons/account/i18n/pt.po                     | 1315 +++---
 addons/account/i18n/pt_BR.po                  | 2514 +++++++----
 addons/account/i18n/ro.po                     | 1317 +++---
 addons/account/i18n/ru.po                     | 1290 +++---
 addons/account/i18n/si.po                     | 1147 +++--
 addons/account/i18n/sk.po                     | 1153 +++--
 addons/account/i18n/sl.po                     | 1309 +++---
 addons/account/i18n/sq.po                     | 1163 +++--
 addons/account/i18n/sr.po                     | 1218 +++--
 addons/account/i18n/sr@latin.po               | 1229 +++---
 addons/account/i18n/sv.po                     | 1317 +++---
 addons/account/i18n/ta.po                     | 1147 +++--
 addons/account/i18n/te.po                     | 1156 +++--
 addons/account/i18n/th.po                     | 1156 +++--
 addons/account/i18n/tlh.po                    | 1147 +++--
 addons/account/i18n/tr.po                     | 1313 +++---
 addons/account/i18n/ug.po                     | 1147 +++--
 addons/account/i18n/uk.po                     | 1209 +++--
 addons/account/i18n/ur.po                     | 1147 +++--
 addons/account/i18n/vi.po                     | 1276 +++---
 addons/account/i18n/zh_CN.po                  | 1295 +++---
 addons/account/i18n/zh_HK.po                  | 1160 +++--
 addons/account/i18n/zh_TW.po                  | 1279 +++---
 addons/account_accountant/i18n/ar.po          |    6 +-
 addons/account_accountant/i18n/az.po          |    6 +-
 addons/account_accountant/i18n/bg.po          |    6 +-
 addons/account_accountant/i18n/bn.po          |    6 +-
 addons/account_accountant/i18n/bs.po          |    6 +-
 addons/account_accountant/i18n/ca.po          |    6 +-
 addons/account_accountant/i18n/cs.po          |    6 +-
 addons/account_accountant/i18n/da.po          |    6 +-
 addons/account_accountant/i18n/de.po          |    6 +-
 addons/account_accountant/i18n/el.po          |    6 +-
 addons/account_accountant/i18n/en_GB.po       |    6 +-
 addons/account_accountant/i18n/es.po          |    6 +-
 addons/account_accountant/i18n/es_CR.po       |    6 +-
 addons/account_accountant/i18n/es_DO.po       |    6 +-
 addons/account_accountant/i18n/es_EC.po       |    6 +-
 addons/account_accountant/i18n/es_MX.po       |    6 +-
 addons/account_accountant/i18n/es_PY.po       |    6 +-
 addons/account_accountant/i18n/et.po          |    6 +-
 addons/account_accountant/i18n/fa.po          |    6 +-
 addons/account_accountant/i18n/fi.po          |    6 +-
 addons/account_accountant/i18n/fr.po          |    6 +-
 addons/account_accountant/i18n/gl.po          |    6 +-
 addons/account_accountant/i18n/he.po          |    6 +-
 addons/account_accountant/i18n/hi.po          |    6 +-
 addons/account_accountant/i18n/hr.po          |    6 +-
 addons/account_accountant/i18n/hu.po          |    6 +-
 addons/account_accountant/i18n/id.po          |    6 +-
 addons/account_accountant/i18n/it.po          |    6 +-
 addons/account_accountant/i18n/ja.po          |    6 +-
 addons/account_accountant/i18n/ko.po          |    6 +-
 addons/account_accountant/i18n/lo.po          |    6 +-
 addons/account_accountant/i18n/lt.po          |    6 +-
 addons/account_accountant/i18n/lv.po          |    6 +-
 addons/account_accountant/i18n/mk.po          |    6 +-
 addons/account_accountant/i18n/mn.po          |    6 +-
 addons/account_accountant/i18n/nb.po          |    6 +-
 addons/account_accountant/i18n/nl.po          |    6 +-
 addons/account_accountant/i18n/nl_BE.po       |    6 +-
 addons/account_accountant/i18n/oc.po          |    6 +-
 addons/account_accountant/i18n/pl.po          |    6 +-
 addons/account_accountant/i18n/pt.po          |    6 +-
 addons/account_accountant/i18n/pt_BR.po       |    6 +-
 addons/account_accountant/i18n/ro.po          |    6 +-
 addons/account_accountant/i18n/ru.po          |    6 +-
 addons/account_accountant/i18n/sk.po          |    6 +-
 addons/account_accountant/i18n/sl.po          |    6 +-
 addons/account_accountant/i18n/sq.po          |    6 +-
 addons/account_accountant/i18n/sr.po          |    6 +-
 addons/account_accountant/i18n/sr@latin.po    |    6 +-
 addons/account_accountant/i18n/sv.po          |    6 +-
 addons/account_accountant/i18n/ta.po          |    6 +-
 addons/account_accountant/i18n/th.po          |    6 +-
 addons/account_accountant/i18n/tr.po          |    6 +-
 addons/account_accountant/i18n/uk.po          |    6 +-
 addons/account_accountant/i18n/vi.po          |    6 +-
 addons/account_accountant/i18n/zh_CN.po       |    6 +-
 addons/account_accountant/i18n/zh_TW.po       |    6 +-
 addons/account_analytic_analysis/i18n/ar.po   |   72 +-
 addons/account_analytic_analysis/i18n/bg.po   |   68 +-
 addons/account_analytic_analysis/i18n/bs.po   |   68 +-
 addons/account_analytic_analysis/i18n/ca.po   |   68 +-
 addons/account_analytic_analysis/i18n/cs.po   |   66 +-
 addons/account_analytic_analysis/i18n/da.po   |   64 +-
 addons/account_analytic_analysis/i18n/de.po   |   74 +-
 addons/account_analytic_analysis/i18n/el.po   |   68 +-
 .../account_analytic_analysis/i18n/en_GB.po   |   72 +-
 addons/account_analytic_analysis/i18n/es.po   |   76 +-
 .../account_analytic_analysis/i18n/es_AR.po   |   68 +-
 .../account_analytic_analysis/i18n/es_CR.po   |   72 +-
 .../account_analytic_analysis/i18n/es_EC.po   |   72 +-
 .../account_analytic_analysis/i18n/es_MX.po   |   78 +-
 .../account_analytic_analysis/i18n/es_PY.po   |   68 +-
 addons/account_analytic_analysis/i18n/et.po   |   68 +-
 addons/account_analytic_analysis/i18n/fa.po   |   62 +-
 addons/account_analytic_analysis/i18n/fi.po   |   68 +-
 addons/account_analytic_analysis/i18n/fr.po   |   72 +-
 addons/account_analytic_analysis/i18n/gl.po   |   68 +-
 addons/account_analytic_analysis/i18n/gu.po   |   72 +-
 addons/account_analytic_analysis/i18n/hr.po   |   68 +-
 addons/account_analytic_analysis/i18n/hu.po   |   68 +-
 addons/account_analytic_analysis/i18n/id.po   |   62 +-
 addons/account_analytic_analysis/i18n/it.po   |   76 +-
 addons/account_analytic_analysis/i18n/ja.po   |   72 +-
 addons/account_analytic_analysis/i18n/ko.po   |   68 +-
 addons/account_analytic_analysis/i18n/lt.po   |   68 +-
 addons/account_analytic_analysis/i18n/lv.po   |   68 +-
 addons/account_analytic_analysis/i18n/mk.po   |   64 +-
 addons/account_analytic_analysis/i18n/mn.po   |   72 +-
 addons/account_analytic_analysis/i18n/nb.po   |   76 +-
 addons/account_analytic_analysis/i18n/nl.po   |   78 +-
 .../account_analytic_analysis/i18n/nl_BE.po   |   62 +-
 addons/account_analytic_analysis/i18n/oc.po   |   64 +-
 addons/account_analytic_analysis/i18n/pl.po   |   76 +-
 addons/account_analytic_analysis/i18n/pt.po   |   72 +-
 .../account_analytic_analysis/i18n/pt_BR.po   |   78 +-
 addons/account_analytic_analysis/i18n/ro.po   |   72 +-
 addons/account_analytic_analysis/i18n/ru.po   |   68 +-
 addons/account_analytic_analysis/i18n/sl.po   |   72 +-
 addons/account_analytic_analysis/i18n/sq.po   |   62 +-
 addons/account_analytic_analysis/i18n/sr.po   |   68 +-
 .../i18n/sr@latin.po                          |   72 +-
 addons/account_analytic_analysis/i18n/sv.po   |   72 +-
 addons/account_analytic_analysis/i18n/tlh.po  |   62 +-
 addons/account_analytic_analysis/i18n/tr.po   |   72 +-
 addons/account_analytic_analysis/i18n/uk.po   |   66 +-
 addons/account_analytic_analysis/i18n/vi.po   |   64 +-
 .../account_analytic_analysis/i18n/zh_CN.po   |   72 +-
 .../account_analytic_analysis/i18n/zh_TW.po   |   72 +-
 addons/account_analytic_default/i18n/ar.po    |   60 +-
 addons/account_analytic_default/i18n/bg.po    |   60 +-
 addons/account_analytic_default/i18n/bs.po    |   58 +-
 addons/account_analytic_default/i18n/ca.po    |   60 +-
 addons/account_analytic_default/i18n/cs.po    |   58 +-
 addons/account_analytic_default/i18n/da.po    |   58 +-
 addons/account_analytic_default/i18n/de.po    |   70 +-
 addons/account_analytic_default/i18n/el.po    |   60 +-
 addons/account_analytic_default/i18n/es.po    |   70 +-
 addons/account_analytic_default/i18n/es_AR.po |   58 +-
 addons/account_analytic_default/i18n/es_CR.po |   60 +-
 addons/account_analytic_default/i18n/es_EC.po |   68 +-
 addons/account_analytic_default/i18n/es_MX.po |   72 +-
 addons/account_analytic_default/i18n/es_PY.po |   60 +-
 addons/account_analytic_default/i18n/et.po    |   58 +-
 addons/account_analytic_default/i18n/fa.po    |   58 +-
 addons/account_analytic_default/i18n/fi.po    |   60 +-
 addons/account_analytic_default/i18n/fr.po    |   70 +-
 addons/account_analytic_default/i18n/gl.po    |   60 +-
 addons/account_analytic_default/i18n/gu.po    |   58 +-
 addons/account_analytic_default/i18n/hr.po    |   60 +-
 addons/account_analytic_default/i18n/hu.po    |   60 +-
 addons/account_analytic_default/i18n/id.po    |   58 +-
 addons/account_analytic_default/i18n/it.po    |   72 +-
 addons/account_analytic_default/i18n/ja.po    |   60 +-
 addons/account_analytic_default/i18n/ko.po    |   58 +-
 addons/account_analytic_default/i18n/lt.po    |   58 +-
 addons/account_analytic_default/i18n/lv.po    |   60 +-
 addons/account_analytic_default/i18n/mn.po    |   60 +-
 addons/account_analytic_default/i18n/nb.po    |   66 +-
 addons/account_analytic_default/i18n/nl.po    |   74 +-
 addons/account_analytic_default/i18n/nl_BE.po |   69 +-
 addons/account_analytic_default/i18n/oc.po    |   58 +-
 addons/account_analytic_default/i18n/pl.po    |   60 +-
 addons/account_analytic_default/i18n/pt.po    |   60 +-
 addons/account_analytic_default/i18n/pt_BR.po |   82 +-
 addons/account_analytic_default/i18n/ro.po    |   60 +-
 addons/account_analytic_default/i18n/ru.po    |   60 +-
 addons/account_analytic_default/i18n/sk.po    |   58 +-
 addons/account_analytic_default/i18n/sl.po    |   58 +-
 addons/account_analytic_default/i18n/sq.po    |   58 +-
 addons/account_analytic_default/i18n/sr.po    |   60 +-
 .../account_analytic_default/i18n/sr@latin.po |   60 +-
 addons/account_analytic_default/i18n/sv.po    |   60 +-
 addons/account_analytic_default/i18n/tlh.po   |   58 +-
 addons/account_analytic_default/i18n/tr.po    |   60 +-
 addons/account_analytic_default/i18n/uk.po    |   58 +-
 addons/account_analytic_default/i18n/vi.po    |   60 +-
 addons/account_analytic_default/i18n/zh_CN.po |   60 +-
 addons/account_analytic_default/i18n/zh_TW.po |   60 +-
 addons/account_analytic_plans/i18n/ar.po      |    6 +-
 addons/account_analytic_plans/i18n/bg.po      |    6 +-
 addons/account_analytic_plans/i18n/bs.po      |    6 +-
 addons/account_analytic_plans/i18n/ca.po      |    6 +-
 addons/account_analytic_plans/i18n/cs.po      |    6 +-
 addons/account_analytic_plans/i18n/da.po      |    6 +-
 addons/account_analytic_plans/i18n/de.po      |    6 +-
 addons/account_analytic_plans/i18n/el.po      |    6 +-
 addons/account_analytic_plans/i18n/es.po      |    6 +-
 addons/account_analytic_plans/i18n/es_AR.po   |    6 +-
 addons/account_analytic_plans/i18n/es_CR.po   |    6 +-
 addons/account_analytic_plans/i18n/es_EC.po   |    6 +-
 addons/account_analytic_plans/i18n/es_MX.po   |    8 +-
 addons/account_analytic_plans/i18n/es_PY.po   |    6 +-
 addons/account_analytic_plans/i18n/et.po      |    6 +-
 addons/account_analytic_plans/i18n/fa.po      |    6 +-
 addons/account_analytic_plans/i18n/fi.po      |    6 +-
 addons/account_analytic_plans/i18n/fr.po      |    4 +-
 addons/account_analytic_plans/i18n/gl.po      |    6 +-
 addons/account_analytic_plans/i18n/gu.po      |    6 +-
 addons/account_analytic_plans/i18n/hr.po      |    6 +-
 addons/account_analytic_plans/i18n/hu.po      |    6 +-
 addons/account_analytic_plans/i18n/id.po      |    6 +-
 addons/account_analytic_plans/i18n/it.po      |    6 +-
 addons/account_analytic_plans/i18n/ja.po      |    6 +-
 addons/account_analytic_plans/i18n/ko.po      |    6 +-
 addons/account_analytic_plans/i18n/lt.po      |    6 +-
 addons/account_analytic_plans/i18n/lv.po      |    6 +-
 addons/account_analytic_plans/i18n/mn.po      |    6 +-
 addons/account_analytic_plans/i18n/nb.po      |    6 +-
 addons/account_analytic_plans/i18n/nl.po      |   16 +-
 addons/account_analytic_plans/i18n/nl_BE.po   |    6 +-
 addons/account_analytic_plans/i18n/oc.po      |    6 +-
 addons/account_analytic_plans/i18n/pl.po      |    6 +-
 addons/account_analytic_plans/i18n/pt.po      |    6 +-
 addons/account_analytic_plans/i18n/pt_BR.po   |    4 +-
 addons/account_analytic_plans/i18n/ro.po      |    6 +-
 addons/account_analytic_plans/i18n/ru.po      |    6 +-
 addons/account_analytic_plans/i18n/sl.po      |    6 +-
 addons/account_analytic_plans/i18n/sq.po      |    6 +-
 addons/account_analytic_plans/i18n/sr.po      |    6 +-
 .../account_analytic_plans/i18n/sr@latin.po   |    6 +-
 addons/account_analytic_plans/i18n/sv.po      |    6 +-
 addons/account_analytic_plans/i18n/tlh.po     |    6 +-
 addons/account_analytic_plans/i18n/tr.po      |    6 +-
 addons/account_analytic_plans/i18n/uk.po      |    6 +-
 addons/account_analytic_plans/i18n/vi.po      |    6 +-
 addons/account_analytic_plans/i18n/zh_CN.po   |    6 +-
 addons/account_analytic_plans/i18n/zh_TW.po   |    6 +-
 addons/account_anglo_saxon/i18n/ar.po         |    6 +-
 addons/account_anglo_saxon/i18n/bg.po         |    6 +-
 addons/account_anglo_saxon/i18n/ca.po         |    6 +-
 addons/account_anglo_saxon/i18n/da.po         |    6 +-
 addons/account_anglo_saxon/i18n/de.po         |    6 +-
 addons/account_anglo_saxon/i18n/el.po         |    6 +-
 addons/account_anglo_saxon/i18n/en_GB.po      |    6 +-
 addons/account_anglo_saxon/i18n/es.po         |    6 +-
 addons/account_anglo_saxon/i18n/es_CR.po      |    6 +-
 addons/account_anglo_saxon/i18n/es_EC.po      |    6 +-
 addons/account_anglo_saxon/i18n/es_MX.po      |    8 +-
 addons/account_anglo_saxon/i18n/es_PY.po      |    6 +-
 addons/account_anglo_saxon/i18n/et.po         |    6 +-
 addons/account_anglo_saxon/i18n/fa.po         |    6 +-
 addons/account_anglo_saxon/i18n/fi.po         |    6 +-
 addons/account_anglo_saxon/i18n/fr.po         |    6 +-
 addons/account_anglo_saxon/i18n/gl.po         |    6 +-
 addons/account_anglo_saxon/i18n/gu.po         |    6 +-
 addons/account_anglo_saxon/i18n/hi.po         |    6 +-
 addons/account_anglo_saxon/i18n/hr.po         |    6 +-
 addons/account_anglo_saxon/i18n/hu.po         |    6 +-
 addons/account_anglo_saxon/i18n/id.po         |    6 +-
 addons/account_anglo_saxon/i18n/it.po         |    6 +-
 addons/account_anglo_saxon/i18n/ja.po         |    6 +-
 addons/account_anglo_saxon/i18n/lv.po         |    6 +-
 addons/account_anglo_saxon/i18n/mn.po         |    6 +-
 addons/account_anglo_saxon/i18n/nb.po         |    6 +-
 addons/account_anglo_saxon/i18n/nl.po         |    6 +-
 addons/account_anglo_saxon/i18n/nl_BE.po      |    6 +-
 addons/account_anglo_saxon/i18n/oc.po         |    6 +-
 addons/account_anglo_saxon/i18n/pl.po         |    6 +-
 addons/account_anglo_saxon/i18n/pt.po         |    6 +-
 addons/account_anglo_saxon/i18n/pt_BR.po      |    4 +-
 addons/account_anglo_saxon/i18n/ro.po         |    6 +-
 addons/account_anglo_saxon/i18n/ru.po         |    6 +-
 addons/account_anglo_saxon/i18n/sl.po         |    6 +-
 addons/account_anglo_saxon/i18n/sq.po         |    6 +-
 addons/account_anglo_saxon/i18n/sr@latin.po   |    6 +-
 addons/account_anglo_saxon/i18n/sv.po         |    6 +-
 addons/account_anglo_saxon/i18n/ta.po         |    6 +-
 addons/account_anglo_saxon/i18n/tr.po         |    6 +-
 addons/account_anglo_saxon/i18n/zh_CN.po      |    6 +-
 addons/account_anglo_saxon/i18n/zh_TW.po      |    6 +-
 addons/account_asset/i18n/ar.po               |  155 +-
 addons/account_asset/i18n/ca.po               |  113 +-
 addons/account_asset/i18n/cs.po               |  153 +-
 addons/account_asset/i18n/da.po               |  111 +-
 addons/account_asset/i18n/de.po               |  159 +-
 addons/account_asset/i18n/es.po               |  159 +-
 addons/account_asset/i18n/es_AR.po            |  111 +-
 addons/account_asset/i18n/es_CR.po            |  159 +-
 addons/account_asset/i18n/es_EC.po            |  159 +-
 addons/account_asset/i18n/es_MX.po            |  161 +-
 addons/account_asset/i18n/et.po               |  117 +-
 addons/account_asset/i18n/fi.po               |  113 +-
 addons/account_asset/i18n/fr.po               |  161 +-
 addons/account_asset/i18n/gu.po               |  111 +-
 addons/account_asset/i18n/hr.po               |  113 +-
 addons/account_asset/i18n/id.po               |  115 +-
 addons/account_asset/i18n/it.po               |  161 +-
 addons/account_asset/i18n/ja.po               |  153 +-
 addons/account_asset/i18n/lt.po               |  111 +-
 addons/account_asset/i18n/mn.po               |  157 +-
 addons/account_asset/i18n/nb.po               |  157 +-
 addons/account_asset/i18n/nl.po               |  163 +-
 addons/account_asset/i18n/nl_BE.po            |  157 +-
 addons/account_asset/i18n/pl.po               |  115 +-
 addons/account_asset/i18n/pt.po               |  159 +-
 addons/account_asset/i18n/pt_BR.po            |  166 +-
 addons/account_asset/i18n/ro.po               |  159 +-
 addons/account_asset/i18n/ru.po               |  132 +-
 addons/account_asset/i18n/sl.po               |  167 +-
 addons/account_asset/i18n/sr@latin.po         |  113 +-
 addons/account_asset/i18n/sv.po               |  203 +-
 addons/account_asset/i18n/tr.po               |  157 +-
 addons/account_asset/i18n/vi.po               |  113 +-
 addons/account_asset/i18n/zh_CN.po            |  153 +-
 addons/account_asset/i18n/zh_TW.po            |  153 +-
 .../i18n/ar.po                                |   30 +-
 .../i18n/de.po                                |   30 +-
 .../i18n/es.po                                |   34 +-
 .../i18n/es_CR.po                             |   30 +-
 .../i18n/es_EC.po                             |   30 +-
 .../i18n/es_MX.po                             |   32 +-
 .../i18n/fi.po                                |   25 +-
 .../i18n/fr.po                                |   47 +-
 .../i18n/gu.po                                |   30 +-
 .../i18n/hr.po                                |   28 +-
 .../i18n/it.po                                |   30 +-
 .../i18n/ja.po                                |   30 +-
 .../i18n/mn.po                                |   27 +-
 .../i18n/nb.po                                |   30 +-
 .../i18n/nl.po                                |   32 +-
 .../i18n/pl.po                                |   30 +-
 .../i18n/pt.po                                |   30 +-
 .../i18n/pt_BR.po                             |   30 +-
 .../i18n/ro.po                                |   30 +-
 .../i18n/sr@latin.po                          |   30 +-
 .../i18n/sv.po                                |   30 +-
 .../i18n/tr.po                                |   30 +-
 .../i18n/zh_CN.po                             |   30 +-
 .../i18n/zh_TW.po                             |   30 +-
 addons/account_budget/i18n/ar.po              |    6 +-
 addons/account_budget/i18n/bg.po              |    6 +-
 addons/account_budget/i18n/bs.po              |    6 +-
 addons/account_budget/i18n/ca.po              |    6 +-
 addons/account_budget/i18n/cs.po              |    6 +-
 addons/account_budget/i18n/da.po              |    6 +-
 addons/account_budget/i18n/de.po              |    4 +-
 addons/account_budget/i18n/el.po              |    6 +-
 addons/account_budget/i18n/en_GB.po           |    6 +-
 addons/account_budget/i18n/es.po              |    6 +-
 addons/account_budget/i18n/es_AR.po           |    6 +-
 addons/account_budget/i18n/es_CR.po           |    6 +-
 addons/account_budget/i18n/es_EC.po           |    6 +-
 addons/account_budget/i18n/es_MX.po           |    8 +-
 addons/account_budget/i18n/es_PY.po           |    6 +-
 addons/account_budget/i18n/et.po              |    6 +-
 addons/account_budget/i18n/fa.po              |    6 +-
 addons/account_budget/i18n/fi.po              |    6 +-
 addons/account_budget/i18n/fr.po              |    4 +-
 addons/account_budget/i18n/gl.po              |    6 +-
 addons/account_budget/i18n/gu.po              |    6 +-
 addons/account_budget/i18n/he.po              |    6 +-
 addons/account_budget/i18n/hi.po              |    6 +-
 addons/account_budget/i18n/hr.po              |    6 +-
 addons/account_budget/i18n/hu.po              |    6 +-
 addons/account_budget/i18n/id.po              |    6 +-
 addons/account_budget/i18n/it.po              |    6 +-
 addons/account_budget/i18n/ja.po              |    6 +-
 addons/account_budget/i18n/ko.po              |    6 +-
 addons/account_budget/i18n/lo.po              |    6 +-
 addons/account_budget/i18n/lt.po              |    6 +-
 addons/account_budget/i18n/lv.po              |    6 +-
 addons/account_budget/i18n/mn.po              |    6 +-
 addons/account_budget/i18n/nb.po              |    6 +-
 addons/account_budget/i18n/nl.po              |    6 +-
 addons/account_budget/i18n/nl_BE.po           |    6 +-
 addons/account_budget/i18n/oc.po              |    6 +-
 addons/account_budget/i18n/pl.po              |    6 +-
 addons/account_budget/i18n/pt.po              |    6 +-
 addons/account_budget/i18n/pt_BR.po           |    6 +-
 addons/account_budget/i18n/ro.po              |    6 +-
 addons/account_budget/i18n/ru.po              |    6 +-
 addons/account_budget/i18n/sl.po              |    6 +-
 addons/account_budget/i18n/sq.po              |    6 +-
 addons/account_budget/i18n/sr.po              |    6 +-
 addons/account_budget/i18n/sr@latin.po        |    6 +-
 addons/account_budget/i18n/sv.po              |    6 +-
 addons/account_budget/i18n/tlh.po             |    6 +-
 addons/account_budget/i18n/tr.po              |    6 +-
 addons/account_budget/i18n/uk.po              |    6 +-
 addons/account_budget/i18n/vi.po              |    6 +-
 addons/account_budget/i18n/zh_CN.po           |    6 +-
 addons/account_budget/i18n/zh_TW.po           |    6 +-
 addons/account_cancel/i18n/ar.po              |    6 +-
 addons/account_cancel/i18n/bg.po              |    6 +-
 addons/account_cancel/i18n/bn.po              |    6 +-
 addons/account_cancel/i18n/br.po              |    6 +-
 addons/account_cancel/i18n/bs.po              |    6 +-
 addons/account_cancel/i18n/ca.po              |    6 +-
 addons/account_cancel/i18n/cs.po              |    6 +-
 addons/account_cancel/i18n/da.po              |    6 +-
 addons/account_cancel/i18n/de.po              |    6 +-
 addons/account_cancel/i18n/el.po              |    6 +-
 addons/account_cancel/i18n/en_GB.po           |    6 +-
 addons/account_cancel/i18n/es.po              |    6 +-
 addons/account_cancel/i18n/es_CL.po           |    6 +-
 addons/account_cancel/i18n/es_CR.po           |    6 +-
 addons/account_cancel/i18n/es_EC.po           |    6 +-
 addons/account_cancel/i18n/es_MX.po           |    6 +-
 addons/account_cancel/i18n/es_PY.po           |    6 +-
 addons/account_cancel/i18n/fa.po              |    6 +-
 addons/account_cancel/i18n/fi.po              |    6 +-
 addons/account_cancel/i18n/fr.po              |    6 +-
 addons/account_cancel/i18n/gl.po              |    6 +-
 addons/account_cancel/i18n/gu.po              |    6 +-
 addons/account_cancel/i18n/hi.po              |    6 +-
 addons/account_cancel/i18n/hr.po              |    6 +-
 addons/account_cancel/i18n/hu.po              |    6 +-
 addons/account_cancel/i18n/id.po              |    6 +-
 addons/account_cancel/i18n/it.po              |    6 +-
 addons/account_cancel/i18n/ja.po              |    6 +-
 addons/account_cancel/i18n/kk.po              |    6 +-
 addons/account_cancel/i18n/lo.po              |    6 +-
 addons/account_cancel/i18n/lt.po              |    6 +-
 addons/account_cancel/i18n/lv.po              |    6 +-
 addons/account_cancel/i18n/mk.po              |    6 +-
 addons/account_cancel/i18n/mn.po              |    6 +-
 addons/account_cancel/i18n/nb.po              |    6 +-
 addons/account_cancel/i18n/nl.po              |    6 +-
 addons/account_cancel/i18n/nl_BE.po           |    6 +-
 addons/account_cancel/i18n/oc.po              |    6 +-
 addons/account_cancel/i18n/pl.po              |    6 +-
 addons/account_cancel/i18n/pt.po              |    6 +-
 addons/account_cancel/i18n/pt_BR.po           |    6 +-
 addons/account_cancel/i18n/ro.po              |    6 +-
 addons/account_cancel/i18n/ru.po              |    6 +-
 addons/account_cancel/i18n/sl.po              |    6 +-
 addons/account_cancel/i18n/sq.po              |    6 +-
 addons/account_cancel/i18n/sr.po              |    6 +-
 addons/account_cancel/i18n/sr@latin.po        |    6 +-
 addons/account_cancel/i18n/sv.po              |    6 +-
 addons/account_cancel/i18n/ta.po              |    6 +-
 addons/account_cancel/i18n/tr.po              |    6 +-
 addons/account_cancel/i18n/vi.po              |    6 +-
 addons/account_cancel/i18n/zh_CN.po           |    6 +-
 addons/account_cancel/i18n/zh_TW.po           |    6 +-
 addons/account_check_writing/i18n/ar.po       |   97 +-
 addons/account_check_writing/i18n/de.po       |  113 +-
 addons/account_check_writing/i18n/es.po       |  113 +-
 addons/account_check_writing/i18n/es_CR.po    |   97 +-
 addons/account_check_writing/i18n/es_EC.po    |   97 +-
 addons/account_check_writing/i18n/es_MX.po    |  115 +-
 addons/account_check_writing/i18n/fi.po       |   90 +-
 addons/account_check_writing/i18n/fr.po       |  111 +-
 addons/account_check_writing/i18n/gu.po       |   90 +-
 addons/account_check_writing/i18n/hr.po       |   92 +-
 addons/account_check_writing/i18n/ja.po       |   97 +-
 addons/account_check_writing/i18n/lt.po       |   90 +-
 addons/account_check_writing/i18n/mn.po       |   90 +-
 addons/account_check_writing/i18n/nb.po       |   97 +-
 addons/account_check_writing/i18n/nl.po       |   97 +-
 addons/account_check_writing/i18n/pl.po       |   90 +-
 addons/account_check_writing/i18n/pt.po       |   97 +-
 addons/account_check_writing/i18n/pt_BR.po    |  124 +-
 addons/account_check_writing/i18n/ro.po       |   97 +-
 addons/account_check_writing/i18n/ru.po       |   90 +-
 addons/account_check_writing/i18n/sr@latin.po |   97 +-
 addons/account_check_writing/i18n/sv.po       |   90 +-
 addons/account_check_writing/i18n/tr.po       |   97 +-
 addons/account_check_writing/i18n/zh_CN.po    |  113 +-
 addons/account_check_writing/i18n/zh_TW.po    |   97 +-
 addons/account_followup/i18n/ar.po            |  865 ++--
 addons/account_followup/i18n/bg.po            |  865 ++--
 addons/account_followup/i18n/bs.po            |  856 ++--
 addons/account_followup/i18n/ca.po            |  865 ++--
 addons/account_followup/i18n/cs.po            |  854 ++--
 addons/account_followup/i18n/da.po            |  854 ++--
 addons/account_followup/i18n/de.po            | 1316 ++----
 addons/account_followup/i18n/el.po            |  863 ++--
 addons/account_followup/i18n/es.po            | 1300 ++----
 addons/account_followup/i18n/es_AR.po         |  856 ++--
 addons/account_followup/i18n/es_CR.po         |  904 ++--
 addons/account_followup/i18n/es_EC.po         |  856 ++--
 addons/account_followup/i18n/es_PY.po         |  865 ++--
 addons/account_followup/i18n/et.po            |  860 ++--
 addons/account_followup/i18n/fa.po            |  854 ++--
 addons/account_followup/i18n/fi.po            |  865 ++--
 addons/account_followup/i18n/fr.po            |  902 ++--
 addons/account_followup/i18n/gl.po            |  865 ++--
 addons/account_followup/i18n/hr.po            |  879 ++--
 addons/account_followup/i18n/hu.po            |  865 ++--
 addons/account_followup/i18n/id.po            |  854 ++--
 addons/account_followup/i18n/it.po            |  935 ++--
 addons/account_followup/i18n/ja.po            |  900 ++--
 addons/account_followup/i18n/ko.po            |  856 ++--
 addons/account_followup/i18n/lt.po            |  860 ++--
 addons/account_followup/i18n/mn.po            |  864 ++--
 addons/account_followup/i18n/nb.po            |  926 ++--
 addons/account_followup/i18n/nl.po            |  937 ++--
 addons/account_followup/i18n/nl_BE.po         |  863 ++--
 addons/account_followup/i18n/oc.po            |  856 ++--
 addons/account_followup/i18n/pl.po            |  856 ++--
 addons/account_followup/i18n/pt.po            |  906 ++--
 addons/account_followup/i18n/pt_BR.po         | 1323 ++----
 addons/account_followup/i18n/ro.po            |  904 ++--
 addons/account_followup/i18n/ru.po            |  865 ++--
 addons/account_followup/i18n/sl.po            |  856 ++--
 addons/account_followup/i18n/sq.po            |  854 ++--
 addons/account_followup/i18n/sr.po            |  863 ++--
 addons/account_followup/i18n/sr@latin.po      |  863 ++--
 addons/account_followup/i18n/sv.po            |  904 ++--
 addons/account_followup/i18n/tlh.po           |  854 ++--
 addons/account_followup/i18n/tr.po            |  904 ++--
 addons/account_followup/i18n/uk.po            |  856 ++--
 addons/account_followup/i18n/vi.po            |  865 ++--
 addons/account_followup/i18n/zh_CN.po         |  902 ++--
 addons/account_followup/i18n/zh_TW.po         |  894 ++--
 addons/account_payment/i18n/am.po             |    6 +-
 addons/account_payment/i18n/ar.po             |    6 +-
 addons/account_payment/i18n/bg.po             |    6 +-
 addons/account_payment/i18n/bs.po             |    6 +-
 addons/account_payment/i18n/ca.po             |    6 +-
 addons/account_payment/i18n/cs.po             |    6 +-
 addons/account_payment/i18n/da.po             |    6 +-
 addons/account_payment/i18n/de.po             |    6 +-
 addons/account_payment/i18n/el.po             |    6 +-
 addons/account_payment/i18n/es.po             |    6 +-
 addons/account_payment/i18n/es_AR.po          |    6 +-
 addons/account_payment/i18n/es_CL.po          |    6 +-
 addons/account_payment/i18n/es_CR.po          |    6 +-
 addons/account_payment/i18n/es_EC.po          |    6 +-
 addons/account_payment/i18n/es_PY.po          |    6 +-
 addons/account_payment/i18n/et.po             |    6 +-
 addons/account_payment/i18n/fa.po             |    6 +-
 addons/account_payment/i18n/fi.po             |    6 +-
 addons/account_payment/i18n/fr.po             |    6 +-
 addons/account_payment/i18n/gl.po             |    6 +-
 addons/account_payment/i18n/hi.po             |    6 +-
 addons/account_payment/i18n/hr.po             |    6 +-
 addons/account_payment/i18n/hu.po             |    6 +-
 addons/account_payment/i18n/id.po             |    6 +-
 addons/account_payment/i18n/it.po             |    4 +-
 addons/account_payment/i18n/ja.po             |    6 +-
 addons/account_payment/i18n/ko.po             |    6 +-
 addons/account_payment/i18n/lt.po             |    6 +-
 addons/account_payment/i18n/lv.po             |    6 +-
 addons/account_payment/i18n/mn.po             |    6 +-
 addons/account_payment/i18n/nb.po             |    6 +-
 addons/account_payment/i18n/nl.po             |    6 +-
 addons/account_payment/i18n/nl_BE.po          |    6 +-
 addons/account_payment/i18n/oc.po             |    6 +-
 addons/account_payment/i18n/pl.po             |    6 +-
 addons/account_payment/i18n/pt.po             |    6 +-
 addons/account_payment/i18n/pt_BR.po          |    6 +-
 addons/account_payment/i18n/ro.po             |    6 +-
 addons/account_payment/i18n/ru.po             |    6 +-
 addons/account_payment/i18n/sl.po             |    6 +-
 addons/account_payment/i18n/sq.po             |    6 +-
 addons/account_payment/i18n/sr.po             |    6 +-
 addons/account_payment/i18n/sr@latin.po       |    6 +-
 addons/account_payment/i18n/sv.po             |    6 +-
 addons/account_payment/i18n/tlh.po            |    6 +-
 addons/account_payment/i18n/tr.po             |    6 +-
 addons/account_payment/i18n/uk.po             |    6 +-
 addons/account_payment/i18n/vi.po             |    6 +-
 addons/account_payment/i18n/zh_CN.po          |    6 +-
 addons/account_payment/i18n/zh_TW.po          |    6 +-
 addons/account_sequence/i18n/ar.po            |    6 +-
 addons/account_sequence/i18n/bg.po            |    6 +-
 addons/account_sequence/i18n/ca.po            |    6 +-
 addons/account_sequence/i18n/da.po            |    6 +-
 addons/account_sequence/i18n/de.po            |    6 +-
 addons/account_sequence/i18n/el.po            |    6 +-
 addons/account_sequence/i18n/es.po            |    6 +-
 addons/account_sequence/i18n/es_CR.po         |    6 +-
 addons/account_sequence/i18n/es_EC.po         |    6 +-
 addons/account_sequence/i18n/es_PY.po         |    6 +-
 addons/account_sequence/i18n/fa.po            |    6 +-
 addons/account_sequence/i18n/fr.po            |    6 +-
 addons/account_sequence/i18n/gl.po            |    6 +-
 addons/account_sequence/i18n/hr.po            |    6 +-
 addons/account_sequence/i18n/hu.po            |    6 +-
 addons/account_sequence/i18n/id.po            |    6 +-
 addons/account_sequence/i18n/it.po            |    6 +-
 addons/account_sequence/i18n/ja.po            |    6 +-
 addons/account_sequence/i18n/lv.po            |    6 +-
 addons/account_sequence/i18n/nb.po            |    6 +-
 addons/account_sequence/i18n/nl.po            |    6 +-
 addons/account_sequence/i18n/nl_BE.po         |    6 +-
 addons/account_sequence/i18n/pl.po            |    6 +-
 addons/account_sequence/i18n/pt.po            |    6 +-
 addons/account_sequence/i18n/pt_BR.po         |    6 +-
 addons/account_sequence/i18n/ro.po            |    6 +-
 addons/account_sequence/i18n/ru.po            |    6 +-
 addons/account_sequence/i18n/sq.po            |    6 +-
 addons/account_sequence/i18n/sr@latin.po      |    6 +-
 addons/account_sequence/i18n/sv.po            |    6 +-
 addons/account_sequence/i18n/tr.po            |    6 +-
 addons/account_sequence/i18n/vi.po            |    6 +-
 addons/account_sequence/i18n/zh_CN.po         |    6 +-
 addons/account_sequence/i18n/zh_TW.po         |    6 +-
 addons/account_voucher/i18n/ar.po             |  204 +-
 addons/account_voucher/i18n/bg.po             |  195 +-
 addons/account_voucher/i18n/bs.po             |  190 +-
 addons/account_voucher/i18n/ca.po             |  204 +-
 addons/account_voucher/i18n/cs.po             |  190 +-
 addons/account_voucher/i18n/da.po             |  190 +-
 addons/account_voucher/i18n/de.po             |  214 +-
 addons/account_voucher/i18n/el.po             |  198 +-
 addons/account_voucher/i18n/es.po             |  217 +-
 addons/account_voucher/i18n/es_AR.po          |  190 +-
 addons/account_voucher/i18n/es_CR.po          |  206 +-
 addons/account_voucher/i18n/es_EC.po          |  206 +-
 addons/account_voucher/i18n/es_PY.po          |  204 +-
 addons/account_voucher/i18n/et.po             |  190 +-
 addons/account_voucher/i18n/fa.po             |  190 +-
 addons/account_voucher/i18n/fr.po             |  207 +-
 addons/account_voucher/i18n/gl.po             |  204 +-
 addons/account_voucher/i18n/gu.po             |  190 +-
 addons/account_voucher/i18n/hi.po             |  190 +-
 addons/account_voucher/i18n/hr.po             |  204 +-
 addons/account_voucher/i18n/hu.po             |  204 +-
 addons/account_voucher/i18n/id.po             |  190 +-
 addons/account_voucher/i18n/it.po             |  217 +-
 addons/account_voucher/i18n/ja.po             |  206 +-
 addons/account_voucher/i18n/ko.po             |  190 +-
 addons/account_voucher/i18n/lt.po             |  204 +-
 addons/account_voucher/i18n/mn.po             |  206 +-
 addons/account_voucher/i18n/nb.po             |  208 +-
 addons/account_voucher/i18n/nl.po             |  206 +-
 addons/account_voucher/i18n/nl_BE.po          |  206 +-
 addons/account_voucher/i18n/oc.po             |  190 +-
 addons/account_voucher/i18n/pl.po             |  262 +-
 addons/account_voucher/i18n/pt.po             |  206 +-
 addons/account_voucher/i18n/pt_BR.po          |  225 +-
 addons/account_voucher/i18n/ro.po             |  206 +-
 addons/account_voucher/i18n/ru.po             |  198 +-
 addons/account_voucher/i18n/sl.po             |  190 +-
 addons/account_voucher/i18n/sq.po             |  190 +-
 addons/account_voucher/i18n/sr.po             |  198 +-
 addons/account_voucher/i18n/sr@latin.po       |  198 +-
 addons/account_voucher/i18n/sv.po             |  206 +-
 addons/account_voucher/i18n/tlh.po            |  190 +-
 addons/account_voucher/i18n/tr.po             |  206 +-
 addons/account_voucher/i18n/uk.po             |  190 +-
 addons/account_voucher/i18n/vi.po             |  201 +-
 addons/account_voucher/i18n/zh_CN.po          |  206 +-
 addons/account_voucher/i18n/zh_TW.po          |  206 +-
 addons/analytic/i18n/ar.po                    |  133 +-
 addons/analytic/i18n/bg.po                    |  129 +-
 addons/analytic/i18n/bs.po                    |  129 +-
 addons/analytic/i18n/ca.po                    |  133 +-
 addons/analytic/i18n/cs.po                    |  133 +-
 addons/analytic/i18n/da.po                    |  121 +-
 addons/analytic/i18n/de.po                    |  169 +-
 addons/analytic/i18n/el.po                    |  135 +-
 addons/analytic/i18n/es.po                    |  159 +-
 addons/analytic/i18n/es_CR.po                 |  133 +-
 addons/analytic/i18n/es_EC.po                 |  133 +-
 addons/analytic/i18n/es_PY.po                 |  133 +-
 addons/analytic/i18n/et.po                    |  129 +-
 addons/analytic/i18n/fa.po                    |  121 +-
 addons/analytic/i18n/fi.po                    |  133 +-
 addons/analytic/i18n/fr.po                    |  133 +-
 addons/analytic/i18n/gl.po                    |  133 +-
 addons/analytic/i18n/hr.po                    |  133 +-
 addons/analytic/i18n/hu.po                    |  133 +-
 addons/analytic/i18n/it.po                    |  161 +-
 addons/analytic/i18n/ja.po                    |  131 +-
 addons/analytic/i18n/lv.po                    |  133 +-
 addons/analytic/i18n/mn.po                    |  133 +-
 addons/analytic/i18n/nb.po                    |  145 +-
 addons/analytic/i18n/nl.po                    |  231 +-
 addons/analytic/i18n/nl_BE.po                 |  121 +-
 addons/analytic/i18n/pl.po                    |  159 +-
 addons/analytic/i18n/pt.po                    |  141 +-
 addons/analytic/i18n/pt_BR.po                 |  165 +-
 addons/analytic/i18n/ro.po                    |  133 +-
 addons/analytic/i18n/ru.po                    |  133 +-
 addons/analytic/i18n/sl.po                    |  133 +-
 addons/analytic/i18n/sq.po                    |  121 +-
 addons/analytic/i18n/sr.po                    |  133 +-
 addons/analytic/i18n/sr@latin.po              |  133 +-
 addons/analytic/i18n/sv.po                    |  133 +-
 addons/analytic/i18n/tr.po                    |  133 +-
 addons/analytic/i18n/vi.po                    |  125 +-
 addons/analytic/i18n/zh_CN.po                 |  133 +-
 addons/analytic/i18n/zh_TW.po                 |  131 +-
 .../analytic_contract_hr_expense/i18n/ar.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/de.po   |    8 +-
 .../analytic_contract_hr_expense/i18n/es.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/fr.po   |    8 +-
 .../analytic_contract_hr_expense/i18n/hr.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/it.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/nb.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/nl.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/pl.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/pt.po   |   10 +-
 .../i18n/pt_BR.po                             |   10 +-
 .../i18n/zh_CN.po                             |   10 +-
 addons/analytic_user_function/i18n/ar.po      |    6 +-
 addons/analytic_user_function/i18n/bg.po      |    6 +-
 addons/analytic_user_function/i18n/bs.po      |    6 +-
 addons/analytic_user_function/i18n/ca.po      |    6 +-
 addons/analytic_user_function/i18n/cs.po      |    6 +-
 addons/analytic_user_function/i18n/da.po      |    6 +-
 addons/analytic_user_function/i18n/de.po      |    6 +-
 addons/analytic_user_function/i18n/el.po      |    6 +-
 addons/analytic_user_function/i18n/en_GB.po   |    6 +-
 addons/analytic_user_function/i18n/es.po      |    6 +-
 addons/analytic_user_function/i18n/es_AR.po   |    6 +-
 addons/analytic_user_function/i18n/es_CR.po   |    6 +-
 addons/analytic_user_function/i18n/es_EC.po   |    6 +-
 addons/analytic_user_function/i18n/es_PY.po   |    6 +-
 addons/analytic_user_function/i18n/et.po      |    6 +-
 addons/analytic_user_function/i18n/fa.po      |    6 +-
 addons/analytic_user_function/i18n/fi.po      |    6 +-
 addons/analytic_user_function/i18n/fr.po      |    6 +-
 addons/analytic_user_function/i18n/gl.po      |    6 +-
 addons/analytic_user_function/i18n/gu.po      |    6 +-
 addons/analytic_user_function/i18n/hr.po      |    6 +-
 addons/analytic_user_function/i18n/hu.po      |    6 +-
 addons/analytic_user_function/i18n/id.po      |    6 +-
 addons/analytic_user_function/i18n/it.po      |    6 +-
 addons/analytic_user_function/i18n/ja.po      |    6 +-
 addons/analytic_user_function/i18n/ko.po      |    6 +-
 addons/analytic_user_function/i18n/lt.po      |    6 +-
 addons/analytic_user_function/i18n/mk.po      |    6 +-
 addons/analytic_user_function/i18n/mn.po      |    6 +-
 addons/analytic_user_function/i18n/nb.po      |    6 +-
 addons/analytic_user_function/i18n/nl.po      |    6 +-
 addons/analytic_user_function/i18n/nl_BE.po   |    6 +-
 addons/analytic_user_function/i18n/oc.po      |    6 +-
 addons/analytic_user_function/i18n/pl.po      |    6 +-
 addons/analytic_user_function/i18n/pt.po      |    6 +-
 addons/analytic_user_function/i18n/pt_BR.po   |    6 +-
 addons/analytic_user_function/i18n/ro.po      |    6 +-
 addons/analytic_user_function/i18n/ru.po      |    6 +-
 addons/analytic_user_function/i18n/sk.po      |    6 +-
 addons/analytic_user_function/i18n/sl.po      |    6 +-
 addons/analytic_user_function/i18n/sq.po      |    6 +-
 addons/analytic_user_function/i18n/sr.po      |    6 +-
 .../analytic_user_function/i18n/sr@latin.po   |    6 +-
 addons/analytic_user_function/i18n/sv.po      |    6 +-
 addons/analytic_user_function/i18n/tlh.po     |    6 +-
 addons/analytic_user_function/i18n/tr.po      |    6 +-
 addons/analytic_user_function/i18n/uk.po      |    6 +-
 addons/analytic_user_function/i18n/vi.po      |    6 +-
 addons/analytic_user_function/i18n/zh_CN.po   |    6 +-
 addons/analytic_user_function/i18n/zh_TW.po   |    6 +-
 addons/anonymization/i18n/ar.po               |   94 +-
 addons/anonymization/i18n/bg.po               |   94 +-
 addons/anonymization/i18n/ca.po               |   94 +-
 addons/anonymization/i18n/da.po               |   92 +-
 addons/anonymization/i18n/de.po               |   96 +-
 addons/anonymization/i18n/es.po               |   98 +-
 addons/anonymization/i18n/es_CR.po            |   94 +-
 addons/anonymization/i18n/es_EC.po            |   94 +-
 addons/anonymization/i18n/es_PY.po            |   94 +-
 addons/anonymization/i18n/et.po               |   94 +-
 addons/anonymization/i18n/fa.po               |   92 +-
 addons/anonymization/i18n/fi.po               |   94 +-
 addons/anonymization/i18n/fr.po               |   92 +-
 addons/anonymization/i18n/gl.po               |   94 +-
 addons/anonymization/i18n/hr.po               |   94 +-
 addons/anonymization/i18n/it.po               |   92 +-
 addons/anonymization/i18n/ja.po               |   94 +-
 addons/anonymization/i18n/lv.po               |   94 +-
 addons/anonymization/i18n/mn.po               |   92 +-
 addons/anonymization/i18n/nb.po               |   98 +-
 addons/anonymization/i18n/nl.po               |   94 +-
 addons/anonymization/i18n/pl.po               |   94 +-
 addons/anonymization/i18n/pt.po               |   94 +-
 addons/anonymization/i18n/pt_BR.po            |  118 +-
 addons/anonymization/i18n/ro.po               |   94 +-
 addons/anonymization/i18n/ru.po               |   94 +-
 addons/anonymization/i18n/sq.po               |   92 +-
 addons/anonymization/i18n/sr@latin.po         |   94 +-
 addons/anonymization/i18n/sv.po               |   94 +-
 addons/anonymization/i18n/tr.po               |   94 +-
 addons/anonymization/i18n/zh_CN.po            |   96 +-
 addons/anonymization/i18n/zh_TW.po            |   94 +-
 addons/audittrail/i18n/ar.po                  |    6 +-
 addons/audittrail/i18n/bg.po                  |    6 +-
 addons/audittrail/i18n/bs.po                  |    6 +-
 addons/audittrail/i18n/ca.po                  |    6 +-
 addons/audittrail/i18n/cs.po                  |    6 +-
 addons/audittrail/i18n/da.po                  |    6 +-
 addons/audittrail/i18n/de.po                  |    4 +-
 addons/audittrail/i18n/el.po                  |    6 +-
 addons/audittrail/i18n/es.po                  |    6 +-
 addons/audittrail/i18n/es_AR.po               |    6 +-
 addons/audittrail/i18n/es_CR.po               |    6 +-
 addons/audittrail/i18n/es_EC.po               |    6 +-
 addons/audittrail/i18n/es_PY.po               |    6 +-
 addons/audittrail/i18n/et.po                  |    6 +-
 addons/audittrail/i18n/fa.po                  |    6 +-
 addons/audittrail/i18n/fi.po                  |    6 +-
 addons/audittrail/i18n/fr.po                  |    4 +-
 addons/audittrail/i18n/gl.po                  |    6 +-
 addons/audittrail/i18n/gu.po                  |    6 +-
 addons/audittrail/i18n/hr.po                  |    6 +-
 addons/audittrail/i18n/hu.po                  |    6 +-
 addons/audittrail/i18n/id.po                  |    6 +-
 addons/audittrail/i18n/it.po                  |    6 +-
 addons/audittrail/i18n/ja.po                  |    6 +-
 addons/audittrail/i18n/ko.po                  |    6 +-
 addons/audittrail/i18n/lt.po                  |    6 +-
 addons/audittrail/i18n/lv.po                  |    6 +-
 addons/audittrail/i18n/mn.po                  |    6 +-
 addons/audittrail/i18n/nb.po                  |    6 +-
 addons/audittrail/i18n/nl.po                  |    6 +-
 addons/audittrail/i18n/nl_BE.po               |    6 +-
 addons/audittrail/i18n/oc.po                  |    6 +-
 addons/audittrail/i18n/pl.po                  |    6 +-
 addons/audittrail/i18n/pt.po                  |    6 +-
 addons/audittrail/i18n/pt_BR.po               |    4 +-
 addons/audittrail/i18n/ro.po                  |    6 +-
 addons/audittrail/i18n/ru.po                  |    6 +-
 addons/audittrail/i18n/sl.po                  |    6 +-
 addons/audittrail/i18n/sq.po                  |    6 +-
 addons/audittrail/i18n/sr@latin.po            |    6 +-
 addons/audittrail/i18n/sv.po                  |    6 +-
 addons/audittrail/i18n/tlh.po                 |    6 +-
 addons/audittrail/i18n/tr.po                  |    6 +-
 addons/audittrail/i18n/uk.po                  |    6 +-
 addons/audittrail/i18n/vi.po                  |    6 +-
 addons/audittrail/i18n/zh_CN.po               |    6 +-
 addons/audittrail/i18n/zh_TW.po               |    6 +-
 addons/auth_ldap/i18n/ar.po                   |    6 +-
 addons/auth_ldap/i18n/bg.po                   |    6 +-
 addons/auth_ldap/i18n/ca.po                   |    6 +-
 addons/auth_ldap/i18n/da.po                   |    6 +-
 addons/auth_ldap/i18n/de.po                   |    4 +-
 addons/auth_ldap/i18n/es.po                   |    6 +-
 addons/auth_ldap/i18n/es_CR.po                |    6 +-
 addons/auth_ldap/i18n/fi.po                   |    6 +-
 addons/auth_ldap/i18n/fr.po                   |    6 +-
 addons/auth_ldap/i18n/gl.po                   |    6 +-
 addons/auth_ldap/i18n/hr.po                   |    6 +-
 addons/auth_ldap/i18n/hu.po                   |    6 +-
 addons/auth_ldap/i18n/it.po                   |    6 +-
 addons/auth_ldap/i18n/ja.po                   |    6 +-
 addons/auth_ldap/i18n/mn.po                   |    6 +-
 addons/auth_ldap/i18n/nb.po                   |    6 +-
 addons/auth_ldap/i18n/nl.po                   |    6 +-
 addons/auth_ldap/i18n/pl.po                   |    6 +-
 addons/auth_ldap/i18n/pt.po                   |    6 +-
 addons/auth_ldap/i18n/pt_BR.po                |    6 +-
 addons/auth_ldap/i18n/ro.po                   |    6 +-
 addons/auth_ldap/i18n/ru.po                   |    6 +-
 addons/auth_ldap/i18n/sv.po                   |    6 +-
 addons/auth_ldap/i18n/tr.po                   |    6 +-
 addons/auth_ldap/i18n/zh_CN.po                |    6 +-
 addons/auth_oauth/i18n/ar.po                  |    6 +-
 addons/auth_oauth/i18n/de.po                  |    4 +-
 addons/auth_oauth/i18n/es.po                  |    6 +-
 addons/auth_oauth/i18n/fr.po                  |    6 +-
 addons/auth_oauth/i18n/hr.po                  |    6 +-
 addons/auth_oauth/i18n/it.po                  |  135 +
 addons/auth_oauth/i18n/nb.po                  |    6 +-
 addons/auth_oauth/i18n/nl.po                  |    6 +-
 addons/auth_oauth/i18n/pl.po                  |    6 +-
 addons/auth_oauth/i18n/pt_BR.po               |    6 +-
 addons/auth_oauth/i18n/zh_CN.po               |    6 +-
 addons/auth_openid/i18n/ar.po                 |    6 +-
 addons/auth_openid/i18n/de.po                 |    6 +-
 addons/auth_openid/i18n/es.po                 |    6 +-
 addons/auth_openid/i18n/es_CR.po              |    6 +-
 addons/auth_openid/i18n/fi.po                 |    6 +-
 addons/auth_openid/i18n/fr.po                 |    6 +-
 addons/auth_openid/i18n/gu.po                 |    6 +-
 addons/auth_openid/i18n/hr.po                 |    6 +-
 addons/auth_openid/i18n/it.po                 |    6 +-
 addons/auth_openid/i18n/ja.po                 |    6 +-
 addons/auth_openid/i18n/nb.po                 |    6 +-
 addons/auth_openid/i18n/nl.po                 |    6 +-
 addons/auth_openid/i18n/pl.po                 |    6 +-
 addons/auth_openid/i18n/pt.po                 |    6 +-
 addons/auth_openid/i18n/pt_BR.po              |    6 +-
 addons/auth_openid/i18n/ro.po                 |    4 +-
 addons/auth_openid/i18n/sk.po                 |    6 +-
 addons/auth_openid/i18n/sr@latin.po           |    6 +-
 addons/auth_openid/i18n/sv.po                 |    6 +-
 addons/auth_openid/i18n/tr.po                 |    6 +-
 addons/auth_openid/i18n/zh_CN.po              |    6 +-
 addons/auth_signup/i18n/ar.po                 |   57 +-
 addons/auth_signup/i18n/de.po                 |   55 +-
 addons/auth_signup/i18n/es.po                 |   57 +-
 addons/auth_signup/i18n/fr.po                 |  132 +-
 addons/auth_signup/i18n/hr.po                 |   57 +-
 addons/auth_signup/i18n/it.po                 |   57 +-
 addons/auth_signup/i18n/nb.po                 |   57 +-
 addons/auth_signup/i18n/nl.po                 |   57 +-
 addons/auth_signup/i18n/pl.po                 |   57 +-
 addons/auth_signup/i18n/pt.po                 |   57 +-
 addons/auth_signup/i18n/pt_BR.po              |   75 +-
 addons/auth_signup/i18n/ru.po                 |   57 +-
 addons/auth_signup/i18n/tr.po                 |   57 +-
 addons/auth_signup/i18n/zh_CN.po              |   57 +-
 addons/base_action_rule/i18n/ar.po            |  333 +-
 addons/base_action_rule/i18n/bg.po            |  280 +-
 addons/base_action_rule/i18n/bs.po            |  332 +-
 addons/base_action_rule/i18n/ca.po            |  333 +-
 addons/base_action_rule/i18n/da.po            |  251 +-
 addons/base_action_rule/i18n/de.po            |  364 +-
 addons/base_action_rule/i18n/el.po            |  283 +-
 addons/base_action_rule/i18n/es.po            |  364 +-
 addons/base_action_rule/i18n/es_CR.po         |  333 +-
 addons/base_action_rule/i18n/es_EC.po         |  237 +-
 addons/base_action_rule/i18n/es_PY.po         |  333 +-
 addons/base_action_rule/i18n/fa.po            |  228 +-
 addons/base_action_rule/i18n/fi.po            |  301 +-
 addons/base_action_rule/i18n/fr.po            |  335 +-
 addons/base_action_rule/i18n/gl.po            |  331 +-
 addons/base_action_rule/i18n/gu.po            |  256 +-
 addons/base_action_rule/i18n/hr.po            |  337 +-
 addons/base_action_rule/i18n/hu.po            |  335 +-
 addons/base_action_rule/i18n/it.po            |  360 +-
 addons/base_action_rule/i18n/ja.po            |  320 +-
 addons/base_action_rule/i18n/lt.po            |  332 +-
 addons/base_action_rule/i18n/lv.po            |  292 +-
 addons/base_action_rule/i18n/mn.po            |  331 +-
 addons/base_action_rule/i18n/nb.po            |  335 +-
 addons/base_action_rule/i18n/nl.po            |  361 +-
 addons/base_action_rule/i18n/pl.po            |  278 +-
 addons/base_action_rule/i18n/pt.po            |  341 +-
 addons/base_action_rule/i18n/pt_BR.po         |  382 +-
 addons/base_action_rule/i18n/ro.po            |  335 +-
 addons/base_action_rule/i18n/ru.po            |  333 +-
 addons/base_action_rule/i18n/sl.po            |  247 +-
 addons/base_action_rule/i18n/sq.po            |  228 +-
 addons/base_action_rule/i18n/sr.po            |  333 +-
 addons/base_action_rule/i18n/sr@latin.po      |  333 +-
 addons/base_action_rule/i18n/sv.po            |  288 +-
 addons/base_action_rule/i18n/tr.po            |  333 +-
 addons/base_action_rule/i18n/zh_CN.po         |  331 +-
 addons/base_action_rule/i18n/zh_TW.po         |  268 +-
 addons/base_calendar/i18n/af.po               |  107 +-
 addons/base_calendar/i18n/ar.po               |  114 +-
 addons/base_calendar/i18n/bg.po               |  114 +-
 addons/base_calendar/i18n/bn.po               |  107 +-
 addons/base_calendar/i18n/bs.po               |  105 +-
 addons/base_calendar/i18n/ca.po               |  114 +-
 addons/base_calendar/i18n/cs.po               |  114 +-
 addons/base_calendar/i18n/da.po               |  107 +-
 addons/base_calendar/i18n/de.po               |  114 +-
 addons/base_calendar/i18n/el.po               |  114 +-
 addons/base_calendar/i18n/es.po               |  116 +-
 addons/base_calendar/i18n/es_CR.po            |  114 +-
 addons/base_calendar/i18n/es_EC.po            |  110 +-
 addons/base_calendar/i18n/es_PY.po            |  114 +-
 addons/base_calendar/i18n/et.po               |  115 +-
 addons/base_calendar/i18n/fa.po               |  105 +-
 addons/base_calendar/i18n/fi.po               |  111 +-
 addons/base_calendar/i18n/fr.po               |  114 +-
 addons/base_calendar/i18n/gl.po               |  114 +-
 addons/base_calendar/i18n/hr.po               |  114 +-
 addons/base_calendar/i18n/hu.po               |  114 +-
 addons/base_calendar/i18n/id.po               |  105 +-
 addons/base_calendar/i18n/it.po               |  114 +-
 addons/base_calendar/i18n/ja.po               |  111 +-
 addons/base_calendar/i18n/ln.po               |  110 +-
 addons/base_calendar/i18n/lt.po               |  109 +-
 addons/base_calendar/i18n/lv.po               |  114 +-
 addons/base_calendar/i18n/mk.po               |  105 +-
 addons/base_calendar/i18n/mn.po               |  114 +-
 addons/base_calendar/i18n/nb.po               |  114 +-
 addons/base_calendar/i18n/nl.po               |  114 +-
 addons/base_calendar/i18n/pl.po               |  111 +-
 addons/base_calendar/i18n/pt.po               |  114 +-
 addons/base_calendar/i18n/pt_BR.po            |  116 +-
 addons/base_calendar/i18n/ro.po               |  114 +-
 addons/base_calendar/i18n/ru.po               |  114 +-
 addons/base_calendar/i18n/sk.po               |  112 +-
 addons/base_calendar/i18n/sl.po               |  109 +-
 addons/base_calendar/i18n/sq.po               |  105 +-
 addons/base_calendar/i18n/sr.po               |  114 +-
 addons/base_calendar/i18n/sr@latin.po         |  114 +-
 addons/base_calendar/i18n/sv.po               |  114 +-
 addons/base_calendar/i18n/th.po               |  107 +-
 addons/base_calendar/i18n/tr.po               |  114 +-
 addons/base_calendar/i18n/zh_CN.po            |  114 +-
 addons/base_calendar/i18n/zh_TW.po            |  109 +-
 addons/base_gengo/i18n/ar.po                  |    6 +-
 addons/base_gengo/i18n/de.po                  |    4 +-
 addons/base_gengo/i18n/es.po                  |    6 +-
 addons/base_gengo/i18n/hr.po                  |    6 +-
 addons/base_gengo/i18n/it.po                  |    6 +-
 addons/base_gengo/i18n/nb.po                  |    6 +-
 addons/base_gengo/i18n/pt.po                  |    6 +-
 addons/base_gengo/i18n/pt_BR.po               |    6 +-
 addons/base_gengo/i18n/zh_CN.po               |    6 +-
 addons/base_iban/i18n/ar.po                   |    6 +-
 addons/base_iban/i18n/bg.po                   |    6 +-
 addons/base_iban/i18n/bs.po                   |    6 +-
 addons/base_iban/i18n/ca.po                   |    6 +-
 addons/base_iban/i18n/cs.po                   |    6 +-
 addons/base_iban/i18n/da.po                   |    6 +-
 addons/base_iban/i18n/de.po                   |    6 +-
 addons/base_iban/i18n/el.po                   |    6 +-
 addons/base_iban/i18n/en_GB.po                |    6 +-
 addons/base_iban/i18n/es.po                   |    6 +-
 addons/base_iban/i18n/es_AR.po                |    6 +-
 addons/base_iban/i18n/es_CR.po                |    6 +-
 addons/base_iban/i18n/es_EC.po                |    6 +-
 addons/base_iban/i18n/es_PY.po                |    6 +-
 addons/base_iban/i18n/et.po                   |    6 +-
 addons/base_iban/i18n/eu.po                   |    6 +-
 addons/base_iban/i18n/fa.po                   |    6 +-
 addons/base_iban/i18n/fi.po                   |    6 +-
 addons/base_iban/i18n/fr.po                   |    6 +-
 addons/base_iban/i18n/gl.po                   |    6 +-
 addons/base_iban/i18n/gu.po                   |    6 +-
 addons/base_iban/i18n/hr.po                   |    6 +-
 addons/base_iban/i18n/hu.po                   |    6 +-
 addons/base_iban/i18n/id.po                   |    6 +-
 addons/base_iban/i18n/it.po                   |    6 +-
 addons/base_iban/i18n/ja.po                   |    6 +-
 addons/base_iban/i18n/ko.po                   |    6 +-
 addons/base_iban/i18n/lt.po                   |    6 +-
 addons/base_iban/i18n/lv.po                   |    6 +-
 addons/base_iban/i18n/mn.po                   |    6 +-
 addons/base_iban/i18n/nb.po                   |    6 +-
 addons/base_iban/i18n/nl.po                   |    6 +-
 addons/base_iban/i18n/nl_BE.po                |    6 +-
 addons/base_iban/i18n/oc.po                   |    6 +-
 addons/base_iban/i18n/pl.po                   |    6 +-
 addons/base_iban/i18n/pt.po                   |    6 +-
 addons/base_iban/i18n/pt_BR.po                |    6 +-
 addons/base_iban/i18n/ro.po                   |    6 +-
 addons/base_iban/i18n/ru.po                   |    6 +-
 addons/base_iban/i18n/sk.po                   |    6 +-
 addons/base_iban/i18n/sl.po                   |    6 +-
 addons/base_iban/i18n/sq.po                   |    6 +-
 addons/base_iban/i18n/sr.po                   |    6 +-
 addons/base_iban/i18n/sr@latin.po             |    6 +-
 addons/base_iban/i18n/sv.po                   |    6 +-
 addons/base_iban/i18n/ta.po                   |    6 +-
 addons/base_iban/i18n/tlh.po                  |    6 +-
 addons/base_iban/i18n/tr.po                   |    6 +-
 addons/base_iban/i18n/uk.po                   |    6 +-
 addons/base_iban/i18n/vi.po                   |    6 +-
 addons/base_iban/i18n/zh_CN.po                |    6 +-
 addons/base_iban/i18n/zh_TW.po                |    6 +-
 addons/base_import/i18n/ar.po                 |   24 +-
 addons/base_import/i18n/de.po                 |   25 +-
 addons/base_import/i18n/es.po                 |   28 +-
 addons/base_import/i18n/fr.po                 |   22 +-
 addons/base_import/i18n/hr.po                 |   24 +-
 addons/base_import/i18n/it.po                 |   26 +-
 addons/base_import/i18n/nb.po                 |   24 +-
 addons/base_import/i18n/nl.po                 |   24 +-
 addons/base_import/i18n/pl.po                 |   22 +-
 addons/base_import/i18n/pt_BR.po              |   26 +-
 addons/base_import/i18n/ru.po                 |   24 +-
 addons/base_import/i18n/zh_CN.po              |   22 +-
 addons/base_report_designer/i18n/ar.po        |    6 +-
 addons/base_report_designer/i18n/bg.po        |    6 +-
 addons/base_report_designer/i18n/bs.po        |    6 +-
 addons/base_report_designer/i18n/ca.po        |    6 +-
 addons/base_report_designer/i18n/cs.po        |    6 +-
 addons/base_report_designer/i18n/da.po        |    6 +-
 addons/base_report_designer/i18n/de.po        |    4 +-
 addons/base_report_designer/i18n/el.po        |    6 +-
 addons/base_report_designer/i18n/es.po        |    6 +-
 addons/base_report_designer/i18n/es_AR.po     |    6 +-
 addons/base_report_designer/i18n/es_CR.po     |    6 +-
 addons/base_report_designer/i18n/es_EC.po     |    6 +-
 addons/base_report_designer/i18n/es_PY.po     |    6 +-
 addons/base_report_designer/i18n/et.po        |    6 +-
 addons/base_report_designer/i18n/fa.po        |    6 +-
 addons/base_report_designer/i18n/fi.po        |    6 +-
 addons/base_report_designer/i18n/fr.po        |    6 +-
 addons/base_report_designer/i18n/gl.po        |    6 +-
 addons/base_report_designer/i18n/hr.po        |    6 +-
 addons/base_report_designer/i18n/hu.po        |    6 +-
 addons/base_report_designer/i18n/id.po        |    6 +-
 addons/base_report_designer/i18n/it.po        |    6 +-
 addons/base_report_designer/i18n/ja.po        |    6 +-
 addons/base_report_designer/i18n/ko.po        |    6 +-
 addons/base_report_designer/i18n/lt.po        |    6 +-
 addons/base_report_designer/i18n/mn.po        |    6 +-
 addons/base_report_designer/i18n/nb.po        |    6 +-
 addons/base_report_designer/i18n/nl.po        |    6 +-
 addons/base_report_designer/i18n/nl_BE.po     |    6 +-
 addons/base_report_designer/i18n/pl.po        |    6 +-
 addons/base_report_designer/i18n/pt.po        |    6 +-
 addons/base_report_designer/i18n/pt_BR.po     |    6 +-
 addons/base_report_designer/i18n/ro.po        |    6 +-
 addons/base_report_designer/i18n/ru.po        |    6 +-
 addons/base_report_designer/i18n/sk.po        |    6 +-
 addons/base_report_designer/i18n/sl.po        |    6 +-
 addons/base_report_designer/i18n/sq.po        |    6 +-
 addons/base_report_designer/i18n/sr.po        |    6 +-
 addons/base_report_designer/i18n/sr@latin.po  |    6 +-
 addons/base_report_designer/i18n/sv.po        |    6 +-
 addons/base_report_designer/i18n/tlh.po       |    6 +-
 addons/base_report_designer/i18n/tr.po        |    6 +-
 addons/base_report_designer/i18n/uk.po        |    6 +-
 addons/base_report_designer/i18n/vi.po        |    6 +-
 addons/base_report_designer/i18n/zh_CN.po     |    6 +-
 addons/base_report_designer/i18n/zh_TW.po     |    6 +-
 addons/base_setup/i18n/ar.po                  |   64 +-
 addons/base_setup/i18n/bg.po                  |   64 +-
 addons/base_setup/i18n/bs.po                  |   64 +-
 addons/base_setup/i18n/ca.po                  |   64 +-
 addons/base_setup/i18n/cs.po                  |   64 +-
 addons/base_setup/i18n/da.po                  |   64 +-
 addons/base_setup/i18n/de.po                  |   66 +-
 addons/base_setup/i18n/el.po                  |   64 +-
 addons/base_setup/i18n/en_GB.po               |   64 +-
 addons/base_setup/i18n/es.po                  |   68 +-
 addons/base_setup/i18n/es_AR.po               |   64 +-
 addons/base_setup/i18n/es_CL.po               |   64 +-
 addons/base_setup/i18n/es_CR.po               |   64 +-
 addons/base_setup/i18n/es_EC.po               |   64 +-
 addons/base_setup/i18n/es_PY.po               |   64 +-
 addons/base_setup/i18n/et.po                  |   64 +-
 addons/base_setup/i18n/fa.po                  |   64 +-
 addons/base_setup/i18n/fi.po                  |   64 +-
 addons/base_setup/i18n/fr.po                  |   62 +-
 addons/base_setup/i18n/gl.po                  |   64 +-
 addons/base_setup/i18n/gu.po                  |   64 +-
 addons/base_setup/i18n/hr.po                  |   68 +-
 addons/base_setup/i18n/hu.po                  |   64 +-
 addons/base_setup/i18n/id.po                  |   64 +-
 addons/base_setup/i18n/it.po                  |   69 +-
 addons/base_setup/i18n/ja.po                  |   64 +-
 addons/base_setup/i18n/ko.po                  |   64 +-
 addons/base_setup/i18n/lt.po                  |   64 +-
 addons/base_setup/i18n/lv.po                  |   64 +-
 addons/base_setup/i18n/mn.po                  |   64 +-
 addons/base_setup/i18n/nb.po                  |   68 +-
 addons/base_setup/i18n/nl.po                  |   66 +-
 addons/base_setup/i18n/nl_BE.po               |   64 +-
 addons/base_setup/i18n/pl.po                  |   68 +-
 addons/base_setup/i18n/pt.po                  |   64 +-
 addons/base_setup/i18n/pt_BR.po               |   85 +-
 addons/base_setup/i18n/ro.po                  |   64 +-
 addons/base_setup/i18n/ru.po                  |   64 +-
 addons/base_setup/i18n/sk.po                  |   64 +-
 addons/base_setup/i18n/sl.po                  |   64 +-
 addons/base_setup/i18n/sq.po                  |   64 +-
 addons/base_setup/i18n/sr.po                  |   64 +-
 addons/base_setup/i18n/sr@latin.po            |   64 +-
 addons/base_setup/i18n/sv.po                  |   64 +-
 addons/base_setup/i18n/th.po                  |   64 +-
 addons/base_setup/i18n/tlh.po                 |   64 +-
 addons/base_setup/i18n/tr.po                  |   64 +-
 addons/base_setup/i18n/uk.po                  |   64 +-
 addons/base_setup/i18n/vi.po                  |   64 +-
 addons/base_setup/i18n/zh_CN.po               |   72 +-
 addons/base_setup/i18n/zh_TW.po               |   64 +-
 addons/base_status/i18n/ar.po                 |   30 +-
 addons/base_status/i18n/de.po                 |   30 +-
 addons/base_status/i18n/es.po                 |   30 +-
 addons/base_status/i18n/fr.po                 |   30 +-
 addons/base_status/i18n/hr.po                 |   30 +-
 addons/base_status/i18n/id.po                 |   30 +-
 addons/base_status/i18n/it.po                 |   30 +-
 addons/base_status/i18n/nl.po                 |   28 +-
 addons/base_status/i18n/pl.po                 |   30 +-
 addons/base_status/i18n/pt.po                 |   30 +-
 addons/base_status/i18n/pt_BR.po              |   30 +-
 addons/base_status/i18n/zh_CN.po              |   30 +-
 addons/base_vat/i18n/ar.po                    |    6 +-
 addons/base_vat/i18n/bg.po                    |    6 +-
 addons/base_vat/i18n/bs.po                    |    6 +-
 addons/base_vat/i18n/ca.po                    |    6 +-
 addons/base_vat/i18n/cs.po                    |    6 +-
 addons/base_vat/i18n/da.po                    |    6 +-
 addons/base_vat/i18n/de.po                    |    6 +-
 addons/base_vat/i18n/el.po                    |    6 +-
 addons/base_vat/i18n/en_AU.po                 |    6 +-
 addons/base_vat/i18n/en_GB.po                 |    6 +-
 addons/base_vat/i18n/es.po                    |    6 +-
 addons/base_vat/i18n/es_AR.po                 |    6 +-
 addons/base_vat/i18n/es_CL.po                 |    6 +-
 addons/base_vat/i18n/es_CR.po                 |    6 +-
 addons/base_vat/i18n/es_EC.po                 |    6 +-
 addons/base_vat/i18n/es_MX.po                 |    6 +-
 addons/base_vat/i18n/es_PY.po                 |    6 +-
 addons/base_vat/i18n/et.po                    |    6 +-
 addons/base_vat/i18n/eu.po                    |    6 +-
 addons/base_vat/i18n/fa.po                    |    6 +-
 addons/base_vat/i18n/fi.po                    |    6 +-
 addons/base_vat/i18n/fr.po                    |    4 +-
 addons/base_vat/i18n/gl.po                    |    6 +-
 addons/base_vat/i18n/gu.po                    |    6 +-
 addons/base_vat/i18n/hr.po                    |    6 +-
 addons/base_vat/i18n/hu.po                    |    6 +-
 addons/base_vat/i18n/id.po                    |    6 +-
 addons/base_vat/i18n/it.po                    |    6 +-
 addons/base_vat/i18n/ja.po                    |    6 +-
 addons/base_vat/i18n/ko.po                    |    6 +-
 addons/base_vat/i18n/lt.po                    |    6 +-
 addons/base_vat/i18n/lv.po                    |    6 +-
 addons/base_vat/i18n/mn.po                    |    6 +-
 addons/base_vat/i18n/nb.po                    |    6 +-
 addons/base_vat/i18n/nl.po                    |    6 +-
 addons/base_vat/i18n/nl_BE.po                 |    6 +-
 addons/base_vat/i18n/oc.po                    |    6 +-
 addons/base_vat/i18n/pl.po                    |    6 +-
 addons/base_vat/i18n/pt.po                    |    6 +-
 addons/base_vat/i18n/pt_BR.po                 |    6 +-
 addons/base_vat/i18n/ro.po                    |    6 +-
 addons/base_vat/i18n/ru.po                    |    6 +-
 addons/base_vat/i18n/sk.po                    |    6 +-
 addons/base_vat/i18n/sl.po                    |    6 +-
 addons/base_vat/i18n/sq.po                    |    6 +-
 addons/base_vat/i18n/sr.po                    |    6 +-
 addons/base_vat/i18n/sr@latin.po              |    6 +-
 addons/base_vat/i18n/sv.po                    |    6 +-
 addons/base_vat/i18n/th.po                    |    6 +-
 addons/base_vat/i18n/tlh.po                   |    6 +-
 addons/base_vat/i18n/tr.po                    |    6 +-
 addons/base_vat/i18n/uk.po                    |    6 +-
 addons/base_vat/i18n/vi.po                    |    6 +-
 addons/base_vat/i18n/zh_CN.po                 |    6 +-
 addons/base_vat/i18n/zh_TW.po                 |    6 +-
 addons/board/i18n/ar.po                       |    6 +-
 addons/board/i18n/bg.po                       |    6 +-
 addons/board/i18n/br.po                       |    6 +-
 addons/board/i18n/bs.po                       |    6 +-
 addons/board/i18n/ca.po                       |    6 +-
 addons/board/i18n/cs.po                       |    6 +-
 addons/board/i18n/da.po                       |    6 +-
 addons/board/i18n/de.po                       |    4 +-
 addons/board/i18n/el.po                       |    6 +-
 addons/board/i18n/es.po                       |    6 +-
 addons/board/i18n/es_AR.po                    |    6 +-
 addons/board/i18n/es_CL.po                    |    6 +-
 addons/board/i18n/es_CR.po                    |    6 +-
 addons/board/i18n/es_EC.po                    |    6 +-
 addons/board/i18n/es_PY.po                    |    6 +-
 addons/board/i18n/et.po                       |    6 +-
 addons/board/i18n/fa.po                       |    6 +-
 addons/board/i18n/fi.po                       |    6 +-
 addons/board/i18n/fr.po                       |    4 +-
 addons/board/i18n/gl.po                       |    6 +-
 addons/board/i18n/gu.po                       |    6 +-
 addons/board/i18n/hr.po                       |    6 +-
 addons/board/i18n/hu.po                       |    6 +-
 addons/board/i18n/id.po                       |    6 +-
 addons/board/i18n/it.po                       |    6 +-
 addons/board/i18n/ja.po                       |    6 +-
 addons/board/i18n/ko.po                       |    6 +-
 addons/board/i18n/ln.po                       |    6 +-
 addons/board/i18n/lt.po                       |    6 +-
 addons/board/i18n/lv.po                       |    6 +-
 addons/board/i18n/mn.po                       |    6 +-
 addons/board/i18n/nb.po                       |    6 +-
 addons/board/i18n/nl.po                       |    6 +-
 addons/board/i18n/nl_BE.po                    |    6 +-
 addons/board/i18n/pl.po                       |    6 +-
 addons/board/i18n/pt.po                       |    6 +-
 addons/board/i18n/pt_BR.po                    |    6 +-
 addons/board/i18n/ro.po                       |    6 +-
 addons/board/i18n/ru.po                       |    6 +-
 addons/board/i18n/sk.po                       |    6 +-
 addons/board/i18n/sl.po                       |    6 +-
 addons/board/i18n/sq.po                       |    6 +-
 addons/board/i18n/sr.po                       |    6 +-
 addons/board/i18n/sr@latin.po                 |    6 +-
 addons/board/i18n/sv.po                       |    6 +-
 addons/board/i18n/th.po                       |    6 +-
 addons/board/i18n/tlh.po                      |    6 +-
 addons/board/i18n/tr.po                       |    6 +-
 addons/board/i18n/uk.po                       |    6 +-
 addons/board/i18n/vi.po                       |    6 +-
 addons/board/i18n/zh_CN.po                    |    6 +-
 addons/board/i18n/zh_TW.po                    |    6 +-
 addons/claim_from_delivery/i18n/ar.po         |    6 +-
 addons/claim_from_delivery/i18n/bg.po         |    6 +-
 addons/claim_from_delivery/i18n/ca.po         |    6 +-
 addons/claim_from_delivery/i18n/cs.po         |    6 +-
 addons/claim_from_delivery/i18n/da.po         |    6 +-
 addons/claim_from_delivery/i18n/de.po         |    6 +-
 addons/claim_from_delivery/i18n/en_GB.po      |    6 +-
 addons/claim_from_delivery/i18n/es.po         |    6 +-
 addons/claim_from_delivery/i18n/es_AR.po      |    6 +-
 addons/claim_from_delivery/i18n/es_CL.po      |    6 +-
 addons/claim_from_delivery/i18n/es_CR.po      |    6 +-
 addons/claim_from_delivery/i18n/es_EC.po      |    6 +-
 addons/claim_from_delivery/i18n/es_PY.po      |    6 +-
 addons/claim_from_delivery/i18n/fa.po         |    6 +-
 addons/claim_from_delivery/i18n/fi.po         |    6 +-
 addons/claim_from_delivery/i18n/fr.po         |    4 +-
 addons/claim_from_delivery/i18n/gl.po         |    6 +-
 addons/claim_from_delivery/i18n/gu.po         |    6 +-
 addons/claim_from_delivery/i18n/hr.po         |    6 +-
 addons/claim_from_delivery/i18n/hu.po         |    6 +-
 addons/claim_from_delivery/i18n/id.po         |    6 +-
 addons/claim_from_delivery/i18n/it.po         |    6 +-
 addons/claim_from_delivery/i18n/ja.po         |    6 +-
 addons/claim_from_delivery/i18n/lo.po         |    6 +-
 addons/claim_from_delivery/i18n/lt.po         |    6 +-
 addons/claim_from_delivery/i18n/mn.po         |    6 +-
 addons/claim_from_delivery/i18n/nb.po         |    6 +-
 addons/claim_from_delivery/i18n/nl.po         |    6 +-
 addons/claim_from_delivery/i18n/nl_BE.po      |    6 +-
 addons/claim_from_delivery/i18n/oc.po         |    6 +-
 addons/claim_from_delivery/i18n/pl.po         |    6 +-
 addons/claim_from_delivery/i18n/pt.po         |    6 +-
 addons/claim_from_delivery/i18n/pt_BR.po      |    6 +-
 addons/claim_from_delivery/i18n/ro.po         |    6 +-
 addons/claim_from_delivery/i18n/ru.po         |    6 +-
 addons/claim_from_delivery/i18n/sl.po         |    6 +-
 addons/claim_from_delivery/i18n/sq.po         |    6 +-
 addons/claim_from_delivery/i18n/sr.po         |    6 +-
 addons/claim_from_delivery/i18n/sr@latin.po   |    6 +-
 addons/claim_from_delivery/i18n/sv.po         |    6 +-
 addons/claim_from_delivery/i18n/ta.po         |    6 +-
 addons/claim_from_delivery/i18n/tr.po         |    6 +-
 addons/claim_from_delivery/i18n/zh_CN.po      |    6 +-
 addons/claim_from_delivery/i18n/zh_TW.po      |    6 +-
 addons/contacts/i18n/ar.po                    |    6 +-
 addons/contacts/i18n/de.po                    |    6 +-
 addons/contacts/i18n/es.po                    |    6 +-
 addons/contacts/i18n/et.po                    |    6 +-
 addons/contacts/i18n/fr.po                    |    4 +-
 addons/contacts/i18n/hr.po                    |    6 +-
 addons/contacts/i18n/hu.po                    |    6 +-
 addons/contacts/i18n/it.po                    |    6 +-
 addons/contacts/i18n/nl.po                    |    6 +-
 addons/contacts/i18n/pl.po                    |    6 +-
 addons/contacts/i18n/pt.po                    |    6 +-
 addons/contacts/i18n/pt_BR.po                 |    6 +-
 addons/contacts/i18n/ro.po                    |    6 +-
 addons/contacts/i18n/ru.po                    |    6 +-
 addons/contacts/i18n/tr.po                    |    6 +-
 addons/contacts/i18n/zh_CN.po                 |    6 +-
 addons/contacts/i18n/zh_TW.po                 |   37 +
 addons/crm/i18n/ar.po                         |  811 ++--
 addons/crm/i18n/bg.po                         |  735 ++--
 addons/crm/i18n/bs.po                         |  700 ++-
 addons/crm/i18n/ca.po                         |  807 ++--
 addons/crm/i18n/cs.po                         |  785 ++--
 addons/crm/i18n/da.po                         |  700 ++-
 addons/crm/i18n/de.po                         |  903 ++--
 addons/crm/i18n/el.po                         |  800 ++--
 addons/crm/i18n/es.po                         |  894 ++--
 addons/crm/i18n/es_AR.po                      |  712 ++-
 addons/crm/i18n/es_CR.po                      |  831 ++--
 addons/crm/i18n/es_EC.po                      |  807 ++--
 addons/crm/i18n/es_PY.po                      |  804 ++--
 addons/crm/i18n/et.po                         |  734 ++--
 addons/crm/i18n/fi.po                         |  805 ++--
 addons/crm/i18n/fr.po                         |  862 ++--
 addons/crm/i18n/gl.po                         |  712 ++-
 addons/crm/i18n/gu.po                         |  706 ++-
 addons/crm/i18n/hr.po                         |  812 ++--
 addons/crm/i18n/hu.po                         |  769 ++--
 addons/crm/i18n/id.po                         |  700 ++-
 addons/crm/i18n/it.po                         |  898 ++--
 addons/crm/i18n/ja.po                         |  819 ++--
 addons/crm/i18n/ko.po                         |  712 ++-
 addons/crm/i18n/lo.po                         |  702 ++-
 addons/crm/i18n/lt.po                         |  814 ++--
 addons/crm/i18n/lv.po                         |  809 ++--
 addons/crm/i18n/mn.po                         |  824 ++--
 addons/crm/i18n/nb.po                         |  849 ++--
 addons/crm/i18n/nl.po                         |  905 ++--
 addons/crm/i18n/nl_BE.po                      |  821 ++--
 addons/crm/i18n/pl.po                         |  875 ++--
 addons/crm/i18n/pt.po                         |  837 ++--
 addons/crm/i18n/pt_BR.po                      |  942 ++--
 addons/crm/i18n/ro.po                         |  832 ++--
 addons/crm/i18n/ru.po                         |  851 ++--
 addons/crm/i18n/sk.po                         |  779 ++--
 addons/crm/i18n/sl.po                         |  702 ++-
 addons/crm/i18n/sq.po                         |  700 ++-
 addons/crm/i18n/sr.po                         |  810 ++--
 addons/crm/i18n/sr@latin.po                   |  802 ++--
 addons/crm/i18n/sv.po                         |  829 ++--
 addons/crm/i18n/th.po                         |  708 ++-
 addons/crm/i18n/tlh.po                        |  700 ++-
 addons/crm/i18n/tr.po                         |  833 ++--
 addons/crm/i18n/uk.po                         |  702 ++-
 addons/crm/i18n/vi.po                         |  740 ++--
 addons/crm/i18n/zh_CN.po                      |  851 ++--
 addons/crm/i18n/zh_TW.po                      |  819 ++--
 addons/crm_claim/i18n/ar.po                   |   48 +-
 addons/crm_claim/i18n/bg.po                   |   44 +-
 addons/crm_claim/i18n/ca.po                   |   50 +-
 addons/crm_claim/i18n/da.po                   |   44 +-
 addons/crm_claim/i18n/de.po                   |   52 +-
 addons/crm_claim/i18n/el.po                   |   46 +-
 addons/crm_claim/i18n/es.po                   |   52 +-
 addons/crm_claim/i18n/es_CR.po                |   50 +-
 addons/crm_claim/i18n/es_EC.po                |   46 +-
 addons/crm_claim/i18n/es_PY.po                |   50 +-
 addons/crm_claim/i18n/fi.po                   |   50 +-
 addons/crm_claim/i18n/fr.po                   |   48 +-
 addons/crm_claim/i18n/gl.po                   |   50 +-
 addons/crm_claim/i18n/gu.po                   |   44 +-
 addons/crm_claim/i18n/hr.po                   |   46 +-
 addons/crm_claim/i18n/hu.po                   |   44 +-
 addons/crm_claim/i18n/it.po                   |   48 +-
 addons/crm_claim/i18n/ja.po                   |   48 +-
 addons/crm_claim/i18n/lt.po                   |   44 +-
 addons/crm_claim/i18n/mn.po                   |   44 +-
 addons/crm_claim/i18n/nb.po                   |   46 +-
 addons/crm_claim/i18n/nl.po                   |   54 +-
 addons/crm_claim/i18n/pl.po                   |   48 +-
 addons/crm_claim/i18n/pt.po                   |   50 +-
 addons/crm_claim/i18n/pt_BR.po                |   52 +-
 addons/crm_claim/i18n/ro.po                   |   50 +-
 addons/crm_claim/i18n/ru.po                   |   50 +-
 addons/crm_claim/i18n/sq.po                   |   44 +-
 addons/crm_claim/i18n/sr.po                   |   46 +-
 addons/crm_claim/i18n/sr@latin.po             |   46 +-
 addons/crm_claim/i18n/sv.po                   |   50 +-
 addons/crm_claim/i18n/tr.po                   |   50 +-
 addons/crm_claim/i18n/zh_CN.po                |   48 +-
 addons/crm_claim/i18n/zh_TW.po                |   48 +-
 addons/crm_helpdesk/i18n/ar.po                |   20 +-
 addons/crm_helpdesk/i18n/bg.po                |   20 +-
 addons/crm_helpdesk/i18n/ca.po                |   20 +-
 addons/crm_helpdesk/i18n/da.po                |   20 +-
 addons/crm_helpdesk/i18n/de.po                |   20 +-
 addons/crm_helpdesk/i18n/el.po                |   20 +-
 addons/crm_helpdesk/i18n/es.po                |   20 +-
 addons/crm_helpdesk/i18n/es_CR.po             |   20 +-
 addons/crm_helpdesk/i18n/es_PY.po             |   20 +-
 addons/crm_helpdesk/i18n/fi.po                |   20 +-
 addons/crm_helpdesk/i18n/fr.po                |   20 +-
 addons/crm_helpdesk/i18n/gl.po                |   20 +-
 addons/crm_helpdesk/i18n/gu.po                |   20 +-
 addons/crm_helpdesk/i18n/hr.po                |   20 +-
 addons/crm_helpdesk/i18n/hu.po                |   20 +-
 addons/crm_helpdesk/i18n/it.po                |   20 +-
 addons/crm_helpdesk/i18n/ja.po                |   20 +-
 addons/crm_helpdesk/i18n/lt.po                |   20 +-
 addons/crm_helpdesk/i18n/lv.po                |   20 +-
 addons/crm_helpdesk/i18n/mn.po                |   20 +-
 addons/crm_helpdesk/i18n/nb.po                |   20 +-
 addons/crm_helpdesk/i18n/nl.po                |   20 +-
 addons/crm_helpdesk/i18n/pl.po                |   20 +-
 addons/crm_helpdesk/i18n/pt.po                |   20 +-
 addons/crm_helpdesk/i18n/pt_BR.po             |   20 +-
 addons/crm_helpdesk/i18n/ro.po                |   20 +-
 addons/crm_helpdesk/i18n/ru.po                |   20 +-
 addons/crm_helpdesk/i18n/sl.po                |   20 +-
 addons/crm_helpdesk/i18n/sq.po                |   20 +-
 addons/crm_helpdesk/i18n/sr.po                |   20 +-
 addons/crm_helpdesk/i18n/sr@latin.po          |   20 +-
 addons/crm_helpdesk/i18n/sv.po                |   20 +-
 addons/crm_helpdesk/i18n/tr.po                |   20 +-
 addons/crm_helpdesk/i18n/zh_CN.po             |   20 +-
 addons/crm_helpdesk/i18n/zh_TW.po             |   20 +-
 addons/crm_partner_assign/i18n/ar.po          |   44 +-
 addons/crm_partner_assign/i18n/bg.po          |   44 +-
 addons/crm_partner_assign/i18n/ca.po          |   44 +-
 addons/crm_partner_assign/i18n/da.po          |   44 +-
 addons/crm_partner_assign/i18n/de.po          |   49 +-
 addons/crm_partner_assign/i18n/el.po          |   44 +-
 addons/crm_partner_assign/i18n/es.po          |   54 +-
 addons/crm_partner_assign/i18n/es_CR.po       |   44 +-
 addons/crm_partner_assign/i18n/es_PY.po       |   44 +-
 addons/crm_partner_assign/i18n/fi.po          |   44 +-
 addons/crm_partner_assign/i18n/fr.po          |   44 +-
 addons/crm_partner_assign/i18n/gl.po          |   44 +-
 addons/crm_partner_assign/i18n/hr.po          |   44 +-
 addons/crm_partner_assign/i18n/hu.po          |   44 +-
 addons/crm_partner_assign/i18n/it.po          |   44 +-
 addons/crm_partner_assign/i18n/ja.po          |   44 +-
 addons/crm_partner_assign/i18n/lt.po          |   44 +-
 addons/crm_partner_assign/i18n/lv.po          |   44 +-
 addons/crm_partner_assign/i18n/nb.po          |   48 +-
 addons/crm_partner_assign/i18n/nl.po          |   49 +-
 addons/crm_partner_assign/i18n/pl.po          |   45 +-
 addons/crm_partner_assign/i18n/pt.po          |   44 +-
 addons/crm_partner_assign/i18n/pt_BR.po       |   51 +-
 addons/crm_partner_assign/i18n/ro.po          |   44 +-
 addons/crm_partner_assign/i18n/ru.po          |   44 +-
 addons/crm_partner_assign/i18n/sq.po          |   44 +-
 addons/crm_partner_assign/i18n/sr@latin.po    |   44 +-
 addons/crm_partner_assign/i18n/sv.po          |   44 +-
 addons/crm_partner_assign/i18n/tr.po          |   44 +-
 addons/crm_partner_assign/i18n/zh_CN.po       |   44 +-
 addons/crm_partner_assign/i18n/zh_TW.po       |   44 +-
 addons/crm_profiling/i18n/ar.po               |    6 +-
 addons/crm_profiling/i18n/bg.po               |    6 +-
 addons/crm_profiling/i18n/bs.po               |    6 +-
 addons/crm_profiling/i18n/ca.po               |    6 +-
 addons/crm_profiling/i18n/cs.po               |    6 +-
 addons/crm_profiling/i18n/da.po               |    6 +-
 addons/crm_profiling/i18n/de.po               |    6 +-
 addons/crm_profiling/i18n/el.po               |    6 +-
 addons/crm_profiling/i18n/en_GB.po            |    6 +-
 addons/crm_profiling/i18n/es.po               |    6 +-
 addons/crm_profiling/i18n/es_AR.po            |    6 +-
 addons/crm_profiling/i18n/es_CR.po            |    6 +-
 addons/crm_profiling/i18n/es_EC.po            |    6 +-
 addons/crm_profiling/i18n/es_PY.po            |    6 +-
 addons/crm_profiling/i18n/et.po               |    6 +-
 addons/crm_profiling/i18n/fi.po               |    6 +-
 addons/crm_profiling/i18n/fr.po               |    4 +-
 addons/crm_profiling/i18n/gl.po               |    6 +-
 addons/crm_profiling/i18n/gu.po               |    6 +-
 addons/crm_profiling/i18n/hr.po               |    6 +-
 addons/crm_profiling/i18n/hu.po               |    6 +-
 addons/crm_profiling/i18n/id.po               |    6 +-
 addons/crm_profiling/i18n/it.po               |    6 +-
 addons/crm_profiling/i18n/ja.po               |    6 +-
 addons/crm_profiling/i18n/ko.po               |    6 +-
 addons/crm_profiling/i18n/lt.po               |    6 +-
 addons/crm_profiling/i18n/lv.po               |    6 +-
 addons/crm_profiling/i18n/mn.po               |    6 +-
 addons/crm_profiling/i18n/nb.po               |    6 +-
 addons/crm_profiling/i18n/nl.po               |    6 +-
 addons/crm_profiling/i18n/nl_BE.po            |    6 +-
 addons/crm_profiling/i18n/pl.po               |    6 +-
 addons/crm_profiling/i18n/pt.po               |    6 +-
 addons/crm_profiling/i18n/pt_BR.po            |    6 +-
 addons/crm_profiling/i18n/ro.po               |    6 +-
 addons/crm_profiling/i18n/ru.po               |    6 +-
 addons/crm_profiling/i18n/sk.po               |    6 +-
 addons/crm_profiling/i18n/sl.po               |    6 +-
 addons/crm_profiling/i18n/sq.po               |    6 +-
 addons/crm_profiling/i18n/sr.po               |    6 +-
 addons/crm_profiling/i18n/sr@latin.po         |    6 +-
 addons/crm_profiling/i18n/sv.po               |    6 +-
 addons/crm_profiling/i18n/tlh.po              |    6 +-
 addons/crm_profiling/i18n/tr.po               |    6 +-
 addons/crm_profiling/i18n/uk.po               |    6 +-
 addons/crm_profiling/i18n/vi.po               |    6 +-
 addons/crm_profiling/i18n/zh_CN.po            |    6 +-
 addons/crm_profiling/i18n/zh_TW.po            |    6 +-
 addons/crm_todo/i18n/ar.po                    |    6 +-
 addons/crm_todo/i18n/de.po                    |    6 +-
 addons/crm_todo/i18n/en_GB.po                 |    6 +-
 addons/crm_todo/i18n/es.po                    |    6 +-
 addons/crm_todo/i18n/es_CR.po                 |    6 +-
 addons/crm_todo/i18n/fi.po                    |    6 +-
 addons/crm_todo/i18n/fr.po                    |    4 +-
 addons/crm_todo/i18n/gu.po                    |    6 +-
 addons/crm_todo/i18n/hr.po                    |    6 +-
 addons/crm_todo/i18n/it.po                    |    6 +-
 addons/crm_todo/i18n/ja.po                    |    6 +-
 addons/crm_todo/i18n/lt.po                    |    6 +-
 addons/crm_todo/i18n/mn.po                    |    6 +-
 addons/crm_todo/i18n/nb.po                    |    6 +-
 addons/crm_todo/i18n/nl.po                    |    6 +-
 addons/crm_todo/i18n/pl.po                    |    6 +-
 addons/crm_todo/i18n/pt.po                    |    6 +-
 addons/crm_todo/i18n/pt_BR.po                 |    6 +-
 addons/crm_todo/i18n/ro.po                    |    6 +-
 addons/crm_todo/i18n/ru.po                    |    6 +-
 addons/crm_todo/i18n/sr@latin.po              |    6 +-
 addons/crm_todo/i18n/sv.po                    |    6 +-
 addons/crm_todo/i18n/tr.po                    |    6 +-
 addons/crm_todo/i18n/zh_CN.po                 |    6 +-
 addons/crm_todo/i18n/zh_TW.po                 |    6 +-
 addons/decimal_precision/i18n/ar.po           |    6 +-
 addons/decimal_precision/i18n/bg.po           |    6 +-
 addons/decimal_precision/i18n/ca.po           |    6 +-
 addons/decimal_precision/i18n/cs.po           |    6 +-
 addons/decimal_precision/i18n/da.po           |    6 +-
 addons/decimal_precision/i18n/de.po           |    6 +-
 addons/decimal_precision/i18n/el.po           |    6 +-
 addons/decimal_precision/i18n/en_GB.po        |    6 +-
 addons/decimal_precision/i18n/es.po           |    6 +-
 addons/decimal_precision/i18n/es_CR.po        |    6 +-
 addons/decimal_precision/i18n/es_EC.po        |    6 +-
 addons/decimal_precision/i18n/es_MX.po        |    6 +-
 addons/decimal_precision/i18n/es_PY.po        |    6 +-
 addons/decimal_precision/i18n/fi.po           |    6 +-
 addons/decimal_precision/i18n/fr.po           |    6 +-
 addons/decimal_precision/i18n/gl.po           |    6 +-
 addons/decimal_precision/i18n/gu.po           |    6 +-
 addons/decimal_precision/i18n/hr.po           |    6 +-
 addons/decimal_precision/i18n/hu.po           |    6 +-
 addons/decimal_precision/i18n/id.po           |    6 +-
 addons/decimal_precision/i18n/it.po           |    6 +-
 addons/decimal_precision/i18n/ja.po           |    6 +-
 addons/decimal_precision/i18n/lt.po           |    6 +-
 addons/decimal_precision/i18n/lv.po           |    6 +-
 addons/decimal_precision/i18n/mn.po           |    6 +-
 addons/decimal_precision/i18n/nb.po           |    6 +-
 addons/decimal_precision/i18n/nl.po           |    6 +-
 addons/decimal_precision/i18n/nl_BE.po        |    6 +-
 addons/decimal_precision/i18n/pl.po           |    6 +-
 addons/decimal_precision/i18n/pt.po           |    6 +-
 addons/decimal_precision/i18n/pt_BR.po        |    6 +-
 addons/decimal_precision/i18n/ro.po           |    6 +-
 addons/decimal_precision/i18n/ru.po           |    6 +-
 addons/decimal_precision/i18n/sk.po           |    6 +-
 addons/decimal_precision/i18n/sl.po           |    6 +-
 addons/decimal_precision/i18n/sr.po           |    6 +-
 addons/decimal_precision/i18n/sr@latin.po     |    6 +-
 addons/decimal_precision/i18n/sv.po           |    6 +-
 addons/decimal_precision/i18n/tr.po           |    6 +-
 addons/decimal_precision/i18n/vi.po           |    6 +-
 addons/decimal_precision/i18n/zh_CN.po        |    6 +-
 addons/decimal_precision/i18n/zh_TW.po        |    6 +-
 addons/delivery/i18n/ar.po                    |   86 +-
 addons/delivery/i18n/bg.po                    |   86 +-
 addons/delivery/i18n/bs.po                    |   83 +-
 addons/delivery/i18n/ca.po                    |   86 +-
 addons/delivery/i18n/cs.po                    |   86 +-
 addons/delivery/i18n/da.po                    |   86 +-
 addons/delivery/i18n/de.po                    |  103 +-
 addons/delivery/i18n/el.po                    |   86 +-
 addons/delivery/i18n/es.po                    |   99 +-
 addons/delivery/i18n/es_AR.po                 |   86 +-
 addons/delivery/i18n/es_CR.po                 |   86 +-
 addons/delivery/i18n/es_EC.po                 |   86 +-
 addons/delivery/i18n/es_PY.po                 |   86 +-
 addons/delivery/i18n/et.po                    |   86 +-
 addons/delivery/i18n/fi.po                    |   86 +-
 addons/delivery/i18n/fr.po                    |  102 +-
 addons/delivery/i18n/gl.po                    |   86 +-
 addons/delivery/i18n/hi.po                    |   83 +-
 addons/delivery/i18n/hr.po                    |   86 +-
 addons/delivery/i18n/hu.po                    |   86 +-
 addons/delivery/i18n/id.po                    |   83 +-
 addons/delivery/i18n/it.po                    |   84 +-
 addons/delivery/i18n/ja.po                    |   86 +-
 addons/delivery/i18n/ko.po                    |   86 +-
 addons/delivery/i18n/lt.po                    |   83 +-
 addons/delivery/i18n/lv.po                    |   83 +-
 addons/delivery/i18n/mn.po                    |   86 +-
 addons/delivery/i18n/nb.po                    |   86 +-
 addons/delivery/i18n/nl.po                    |  106 +-
 addons/delivery/i18n/nl_BE.po                 |   83 +-
 addons/delivery/i18n/pl.po                    |   99 +-
 addons/delivery/i18n/pt.po                    |   86 +-
 addons/delivery/i18n/pt_BR.po                 |  121 +-
 addons/delivery/i18n/ro.po                    |   86 +-
 addons/delivery/i18n/ru.po                    |   86 +-
 addons/delivery/i18n/sl.po                    |   86 +-
 addons/delivery/i18n/sq.po                    |   83 +-
 addons/delivery/i18n/sr.po                    |   86 +-
 addons/delivery/i18n/sr@latin.po              |   86 +-
 addons/delivery/i18n/sv.po                    |   86 +-
 addons/delivery/i18n/th.po                    |   83 +-
 addons/delivery/i18n/tlh.po                   |   83 +-
 addons/delivery/i18n/tr.po                    |   86 +-
 addons/delivery/i18n/uk.po                    |   83 +-
 addons/delivery/i18n/vi.po                    |   83 +-
 addons/delivery/i18n/zh_CN.po                 |  111 +-
 addons/delivery/i18n/zh_TW.po                 |   83 +-
 addons/document/i18n/ar.po                    |  285 +-
 addons/document/i18n/bg.po                    |  252 +-
 addons/document/i18n/bs.po                    |  205 +-
 addons/document/i18n/ca.po                    |  293 +-
 addons/document/i18n/cs.po                    |  291 +-
 addons/document/i18n/da.po                    |  205 +-
 addons/document/i18n/de.po                    |  295 +-
 addons/document/i18n/el.po                    |  257 +-
 addons/document/i18n/es.po                    |  295 +-
 addons/document/i18n/es_AR.po                 |  227 +-
 addons/document/i18n/es_CR.po                 |  293 +-
 addons/document/i18n/es_EC.po                 |  227 +-
 addons/document/i18n/es_PY.po                 |  293 +-
 addons/document/i18n/et.po                    |  231 +-
 addons/document/i18n/fi.po                    |  289 +-
 addons/document/i18n/fr.po                    |  291 +-
 addons/document/i18n/gl.po                    |  293 +-
 addons/document/i18n/gu.po                    |  219 +-
 addons/document/i18n/hi.po                    |  207 +-
 addons/document/i18n/hr.po                    |  246 +-
 addons/document/i18n/hu.po                    |  253 +-
 addons/document/i18n/id.po                    |  205 +-
 addons/document/i18n/it.po                    |  291 +-
 addons/document/i18n/ja.po                    |  283 +-
 addons/document/i18n/ko.po                    |  227 +-
 addons/document/i18n/lt.po                    |  231 +-
 addons/document/i18n/lv.po                    |  278 +-
 addons/document/i18n/mn.po                    |  291 +-
 addons/document/i18n/nb.po                    |  272 +-
 addons/document/i18n/nl.po                    |  293 +-
 addons/document/i18n/nl_BE.po                 |  205 +-
 addons/document/i18n/pl.po                    |  261 +-
 addons/document/i18n/pt.po                    |  293 +-
 addons/document/i18n/pt_BR.po                 |  298 +-
 addons/document/i18n/ro.po                    |  293 +-
 addons/document/i18n/ru.po                    |  289 +-
 addons/document/i18n/sk.po                    |  205 +-
 addons/document/i18n/sl.po                    |  227 +-
 addons/document/i18n/sq.po                    |  205 +-
 addons/document/i18n/sr.po                    |  290 +-
 addons/document/i18n/sr@latin.po              |  290 +-
 addons/document/i18n/sv.po                    |  295 +-
 addons/document/i18n/tlh.po                   |  205 +-
 addons/document/i18n/tr.po                    |  285 +-
 addons/document/i18n/uk.po                    |  208 +-
 addons/document/i18n/vi.po                    |  209 +-
 addons/document/i18n/zh_CN.po                 |  283 +-
 addons/document/i18n/zh_HK.po                 |  205 +-
 addons/document/i18n/zh_TW.po                 |  283 +-
 addons/document_ftp/i18n/ar.po                |    6 +-
 addons/document_ftp/i18n/bg.po                |    6 +-
 addons/document_ftp/i18n/ca.po                |    6 +-
 addons/document_ftp/i18n/cs.po                |    6 +-
 addons/document_ftp/i18n/da.po                |    6 +-
 addons/document_ftp/i18n/de.po                |    4 +-
 addons/document_ftp/i18n/el.po                |    6 +-
 addons/document_ftp/i18n/en_GB.po             |    6 +-
 addons/document_ftp/i18n/es.po                |    6 +-
 addons/document_ftp/i18n/es_CR.po             |    6 +-
 addons/document_ftp/i18n/es_EC.po             |    6 +-
 addons/document_ftp/i18n/es_PY.po             |    6 +-
 addons/document_ftp/i18n/et.po                |    6 +-
 addons/document_ftp/i18n/fi.po                |    6 +-
 addons/document_ftp/i18n/fr.po                |    6 +-
 addons/document_ftp/i18n/gl.po                |    6 +-
 addons/document_ftp/i18n/hr.po                |    6 +-
 addons/document_ftp/i18n/hu.po                |    6 +-
 addons/document_ftp/i18n/it.po                |    6 +-
 addons/document_ftp/i18n/ja.po                |    6 +-
 addons/document_ftp/i18n/mn.po                |    6 +-
 addons/document_ftp/i18n/nb.po                |    6 +-
 addons/document_ftp/i18n/nl.po                |    6 +-
 addons/document_ftp/i18n/pl.po                |    6 +-
 addons/document_ftp/i18n/pt.po                |    6 +-
 addons/document_ftp/i18n/pt_BR.po             |    6 +-
 addons/document_ftp/i18n/ro.po                |    6 +-
 addons/document_ftp/i18n/ru.po                |    6 +-
 addons/document_ftp/i18n/sk.po                |    6 +-
 addons/document_ftp/i18n/sl.po                |    6 +-
 addons/document_ftp/i18n/sr.po                |    6 +-
 addons/document_ftp/i18n/sr@latin.po          |    6 +-
 addons/document_ftp/i18n/sv.po                |    6 +-
 addons/document_ftp/i18n/tr.po                |    6 +-
 addons/document_ftp/i18n/zh_CN.po             |    6 +-
 addons/document_ftp/i18n/zh_TW.po             |    6 +-
 addons/document_page/i18n/ar.po               |    6 +-
 addons/document_page/i18n/bg.po               |    6 +-
 addons/document_page/i18n/bs.po               |    6 +-
 addons/document_page/i18n/ca.po               |    6 +-
 addons/document_page/i18n/cs.po               |    6 +-
 addons/document_page/i18n/da.po               |    6 +-
 addons/document_page/i18n/de.po               |    4 +-
 addons/document_page/i18n/el.po               |    6 +-
 addons/document_page/i18n/es.po               |    6 +-
 addons/document_page/i18n/et.po               |    6 +-
 addons/document_page/i18n/fi.po               |    6 +-
 addons/document_page/i18n/fr.po               |    4 +-
 addons/document_page/i18n/gl.po               |    6 +-
 addons/document_page/i18n/hr.po               |    6 +-
 addons/document_page/i18n/hu.po               |    6 +-
 addons/document_page/i18n/id.po               |    6 +-
 addons/document_page/i18n/it.po               |    4 +-
 addons/document_page/i18n/ja.po               |    6 +-
 addons/document_page/i18n/ko.po               |    6 +-
 addons/document_page/i18n/lt.po               |    6 +-
 addons/document_page/i18n/lv.po               |    6 +-
 addons/document_page/i18n/mn.po               |    6 +-
 addons/document_page/i18n/nb.po               |    6 +-
 addons/document_page/i18n/nl.po               |    6 +-
 addons/document_page/i18n/pl.po               |    6 +-
 addons/document_page/i18n/pt.po               |    6 +-
 addons/document_page/i18n/pt_BR.po            |    6 +-
 addons/document_page/i18n/ro.po               |    6 +-
 addons/document_page/i18n/ru.po               |    6 +-
 addons/document_page/i18n/sk.po               |    6 +-
 addons/document_page/i18n/sl.po               |    6 +-
 addons/document_page/i18n/sq.po               |    6 +-
 addons/document_page/i18n/sr.po               |    6 +-
 addons/document_page/i18n/sr@latin.po         |    6 +-
 addons/document_page/i18n/sv.po               |    6 +-
 addons/document_page/i18n/tlh.po              |    6 +-
 addons/document_page/i18n/tr.po               |    6 +-
 addons/document_page/i18n/uk.po               |    6 +-
 addons/document_page/i18n/vi.po               |    6 +-
 addons/document_page/i18n/zh_CN.po            |    6 +-
 addons/document_page/i18n/zh_TW.po            |    6 +-
 addons/document_webdav/i18n/ar.po             |   38 +-
 addons/document_webdav/i18n/bg.po             |   21 +-
 addons/document_webdav/i18n/ca.po             |   38 +-
 addons/document_webdav/i18n/cs.po             |   21 +-
 addons/document_webdav/i18n/da.po             |   21 +-
 addons/document_webdav/i18n/de.po             |   36 +-
 addons/document_webdav/i18n/el.po             |   21 +-
 addons/document_webdav/i18n/en_GB.po          |   38 +-
 addons/document_webdav/i18n/es.po             |   38 +-
 addons/document_webdav/i18n/es_CR.po          |   38 +-
 addons/document_webdav/i18n/es_EC.po          |   21 +-
 addons/document_webdav/i18n/es_PY.po          |   38 +-
 addons/document_webdav/i18n/et.po             |   21 +-
 addons/document_webdav/i18n/eu.po             |   21 +-
 addons/document_webdav/i18n/fi.po             |   38 +-
 addons/document_webdav/i18n/fr.po             |   46 +-
 addons/document_webdav/i18n/gl.po             |   38 +-
 addons/document_webdav/i18n/gu.po             |   21 +-
 addons/document_webdav/i18n/hr.po             |   21 +-
 addons/document_webdav/i18n/hu.po             |   21 +-
 addons/document_webdav/i18n/id.po             |   21 +-
 addons/document_webdav/i18n/it.po             |   38 +-
 addons/document_webdav/i18n/ja.po             |   38 +-
 addons/document_webdav/i18n/mn.po             |   21 +-
 addons/document_webdav/i18n/nb.po             |   38 +-
 addons/document_webdav/i18n/nl.po             |   38 +-
 addons/document_webdav/i18n/pl.po             |   25 +-
 addons/document_webdav/i18n/pt.po             |   38 +-
 addons/document_webdav/i18n/pt_BR.po          |   38 +-
 addons/document_webdav/i18n/ro.po             |   38 +-
 addons/document_webdav/i18n/ru.po             |   38 +-
 addons/document_webdav/i18n/sl.po             |   21 +-
 addons/document_webdav/i18n/sr.po             |   21 +-
 addons/document_webdav/i18n/sr@latin.po       |   21 +-
 addons/document_webdav/i18n/sv.po             |   38 +-
 addons/document_webdav/i18n/tr.po             |   38 +-
 addons/document_webdav/i18n/zh_CN.po          |   38 +-
 addons/document_webdav/i18n/zh_TW.po          |   36 +-
 addons/edi/i18n/ar.po                         |    6 +-
 addons/edi/i18n/de.po                         |    6 +-
 addons/edi/i18n/es.po                         |    6 +-
 addons/edi/i18n/es_CR.po                      |    6 +-
 addons/edi/i18n/fi.po                         |    6 +-
 addons/edi/i18n/fr.po                         |    4 +-
 addons/edi/i18n/hr.po                         |    6 +-
 addons/edi/i18n/it.po                         |    6 +-
 addons/edi/i18n/ja.po                         |    6 +-
 addons/edi/i18n/mn.po                         |    6 +-
 addons/edi/i18n/nb.po                         |    6 +-
 addons/edi/i18n/nl.po                         |    6 +-
 addons/edi/i18n/nl_BE.po                      |    6 +-
 addons/edi/i18n/pl.po                         |    6 +-
 addons/edi/i18n/pt.po                         |    6 +-
 addons/edi/i18n/pt_BR.po                      |    6 +-
 addons/edi/i18n/ro.po                         |    6 +-
 addons/edi/i18n/ru.po                         |    6 +-
 addons/edi/i18n/sv.po                         |    6 +-
 addons/edi/i18n/tr.po                         |    6 +-
 addons/edi/i18n/zh_CN.po                      |    6 +-
 addons/edi/i18n/zh_TW.po                      |    6 +-
 addons/email_template/i18n/ar.po              |   14 +-
 addons/email_template/i18n/bg.po              |   14 +-
 addons/email_template/i18n/ca.po              |   14 +-
 addons/email_template/i18n/da.po              |   14 +-
 addons/email_template/i18n/de.po              |   14 +-
 addons/email_template/i18n/es.po              |   14 +-
 addons/email_template/i18n/es_CL.po           |   14 +-
 addons/email_template/i18n/es_CR.po           |   14 +-
 addons/email_template/i18n/es_EC.po           |   14 +-
 addons/email_template/i18n/et.po              |   14 +-
 addons/email_template/i18n/fi.po              |   14 +-
 addons/email_template/i18n/fr.po              |   12 +-
 addons/email_template/i18n/hr.po              |   14 +-
 addons/email_template/i18n/hu.po              |   14 +-
 addons/email_template/i18n/it.po              |   14 +-
 addons/email_template/i18n/ja.po              |   14 +-
 addons/email_template/i18n/mn.po              |   16 +-
 addons/email_template/i18n/nb.po              |   14 +-
 addons/email_template/i18n/nl.po              |   14 +-
 addons/email_template/i18n/pl.po              |   14 +-
 addons/email_template/i18n/pt.po              |   14 +-
 addons/email_template/i18n/pt_BR.po           |   12 +-
 addons/email_template/i18n/ro.po              |   14 +-
 addons/email_template/i18n/ru.po              |   14 +-
 addons/email_template/i18n/sr.po              |   14 +-
 addons/email_template/i18n/sr@latin.po        |   14 +-
 addons/email_template/i18n/sv.po              |   14 +-
 addons/email_template/i18n/tr.po              |   14 +-
 addons/email_template/i18n/zh_CN.po           |   14 +-
 addons/email_template/i18n/zh_TW.po           |   14 +-
 addons/event/i18n/ar.po                       |  180 +-
 addons/event/i18n/bg.po                       |  180 +-
 addons/event/i18n/bs.po                       |  170 +-
 addons/event/i18n/ca.po                       |  180 +-
 addons/event/i18n/cs.po                       |  180 +-
 addons/event/i18n/da.po                       |  176 +-
 addons/event/i18n/de.po                       |  188 +-
 addons/event/i18n/el.po                       |  170 +-
 addons/event/i18n/es.po                       |  188 +-
 addons/event/i18n/es_AR.po                    |  170 +-
 addons/event/i18n/es_CR.po                    |  180 +-
 addons/event/i18n/es_EC.po                    |  170 +-
 addons/event/i18n/et.po                       |  170 +-
 addons/event/i18n/fi.po                       |  180 +-
 addons/event/i18n/fr.po                       |  302 +-
 addons/event/i18n/gu.po                       |  178 +-
 addons/event/i18n/hi.po                       |  170 +-
 addons/event/i18n/hr.po                       |  170 +-
 addons/event/i18n/hu.po                       |  180 +-
 addons/event/i18n/id.po                       |  170 +-
 addons/event/i18n/it.po                       |  178 +-
 addons/event/i18n/ja.po                       |  180 +-
 addons/event/i18n/ko.po                       |  170 +-
 addons/event/i18n/lt.po                       |  170 +-
 addons/event/i18n/mn.po                       |  180 +-
 addons/event/i18n/nb.po                       |  186 +-
 addons/event/i18n/nl.po                       |  184 +-
 addons/event/i18n/nl_BE.po                    |  170 +-
 addons/event/i18n/pl.po                       |  178 +-
 addons/event/i18n/pt.po                       |  180 +-
 addons/event/i18n/pt_BR.po                    |  180 +-
 addons/event/i18n/ro.po                       |  180 +-
 addons/event/i18n/ru.po                       |  180 +-
 addons/event/i18n/sk.po                       |  170 +-
 addons/event/i18n/sl.po                       |  170 +-
 addons/event/i18n/sq.po                       |  170 +-
 addons/event/i18n/sr.po                       |  180 +-
 addons/event/i18n/sr@latin.po                 |  180 +-
 addons/event/i18n/sv.po                       |  180 +-
 addons/event/i18n/tlh.po                      |  170 +-
 addons/event/i18n/tr.po                       |  180 +-
 addons/event/i18n/uk.po                       |  170 +-
 addons/event/i18n/vi.po                       |  176 +-
 addons/event/i18n/zh_CN.po                    |  186 +-
 addons/event/i18n/zh_TW.po                    |  180 +-
 addons/event_moodle/i18n/de.po                |    6 +-
 addons/event_moodle/i18n/es.po                |    6 +-
 addons/event_moodle/i18n/fr.po                |   61 +-
 addons/event_moodle/i18n/hr.po                |    6 +-
 addons/event_moodle/i18n/nl.po                |    6 +-
 addons/event_sale/i18n/ar.po                  |   33 +-
 addons/event_sale/i18n/de.po                  |   37 +-
 addons/event_sale/i18n/es.po                  |   36 +-
 addons/event_sale/i18n/fr.po                  |   33 +-
 addons/event_sale/i18n/hr.po                  |   33 +-
 addons/event_sale/i18n/it.po                  |   33 +-
 addons/event_sale/i18n/nl.po                  |   33 +-
 addons/event_sale/i18n/pl.po                  |   35 +-
 addons/event_sale/i18n/pt.po                  |   33 +-
 addons/event_sale/i18n/pt_BR.po               |   37 +-
 addons/event_sale/i18n/zh_CN.po               |   37 +-
 addons/fetchmail/i18n/ar.po                   |   23 +-
 addons/fetchmail/i18n/bg.po                   |   23 +-
 addons/fetchmail/i18n/ca.po                   |   23 +-
 addons/fetchmail/i18n/da.po                   |   19 +-
 addons/fetchmail/i18n/de.po                   |   21 +-
 addons/fetchmail/i18n/el.po                   |   19 +-
 addons/fetchmail/i18n/en_GB.po                |   23 +-
 addons/fetchmail/i18n/es.po                   |   25 +-
 addons/fetchmail/i18n/es_CR.po                |   23 +-
 addons/fetchmail/i18n/et.po                   |   23 +-
 addons/fetchmail/i18n/fi.po                   |   23 +-
 addons/fetchmail/i18n/fr.po                   |   21 +-
 addons/fetchmail/i18n/gl.po                   |   23 +-
 addons/fetchmail/i18n/hr.po                   |   23 +-
 addons/fetchmail/i18n/hu.po                   |   23 +-
 addons/fetchmail/i18n/it.po                   |   23 +-
 addons/fetchmail/i18n/ja.po                   |   23 +-
 addons/fetchmail/i18n/lt.po                   |   23 +-
 addons/fetchmail/i18n/lv.po                   |   23 +-
 addons/fetchmail/i18n/mk.po                   |   23 +-
 addons/fetchmail/i18n/mn.po                   |   25 +-
 addons/fetchmail/i18n/nb.po                   |   23 +-
 addons/fetchmail/i18n/nl.po                   |   25 +-
 addons/fetchmail/i18n/pl.po                   |   19 +-
 addons/fetchmail/i18n/pt.po                   |   23 +-
 addons/fetchmail/i18n/pt_BR.po                |   23 +-
 addons/fetchmail/i18n/ro.po                   |   23 +-
 addons/fetchmail/i18n/ru.po                   |   23 +-
 addons/fetchmail/i18n/sl.po                   |   23 +-
 addons/fetchmail/i18n/sr.po                   |   19 +-
 addons/fetchmail/i18n/sr@latin.po             |   19 +-
 addons/fetchmail/i18n/sv.po                   |   23 +-
 addons/fetchmail/i18n/tr.po                   |   23 +-
 addons/fetchmail/i18n/vi.po                   |   23 +-
 addons/fetchmail/i18n/zh_CN.po                |   27 +-
 addons/fleet/i18n/es.po                       |  155 +-
 addons/fleet/i18n/fr.po                       |  155 +-
 addons/fleet/i18n/hr.po                       |  133 +-
 addons/fleet/i18n/it.po                       |  135 +-
 addons/fleet/i18n/nl.po                       |  159 +-
 addons/fleet/i18n/pl.po                       |  133 +-
 addons/fleet/i18n/pt.po                       |  137 +-
 addons/fleet/i18n/ru.po                       |  129 +-
 addons/fleet/i18n/zh_CN.po                    |  171 +-
 addons/google_base_account/i18n/ar.po         |    6 +-
 addons/google_base_account/i18n/de.po         |    4 +-
 addons/google_base_account/i18n/es.po         |    6 +-
 addons/google_base_account/i18n/es_CR.po      |    6 +-
 addons/google_base_account/i18n/fi.po         |    6 +-
 addons/google_base_account/i18n/fr.po         |    6 +-
 addons/google_base_account/i18n/hr.po         |    6 +-
 addons/google_base_account/i18n/it.po         |    6 +-
 addons/google_base_account/i18n/ja.po         |    6 +-
 addons/google_base_account/i18n/mn.po         |    6 +-
 addons/google_base_account/i18n/nb.po         |    6 +-
 addons/google_base_account/i18n/nl.po         |    6 +-
 addons/google_base_account/i18n/pl.po         |    6 +-
 addons/google_base_account/i18n/pt.po         |    6 +-
 addons/google_base_account/i18n/pt_BR.po      |    6 +-
 addons/google_base_account/i18n/ro.po         |    6 +-
 addons/google_base_account/i18n/ru.po         |    6 +-
 addons/google_base_account/i18n/sl.po         |    6 +-
 addons/google_base_account/i18n/sr@latin.po   |    6 +-
 addons/google_base_account/i18n/sv.po         |    6 +-
 addons/google_base_account/i18n/tr.po         |    6 +-
 addons/google_base_account/i18n/zh_CN.po      |    6 +-
 addons/google_docs/i18n/de.po                 |   22 +-
 addons/google_docs/i18n/es.po                 |   22 +-
 addons/google_docs/i18n/fr.po                 |   24 +-
 addons/google_docs/i18n/hr.po                 |   22 +-
 addons/google_docs/i18n/it.po                 |   20 +-
 addons/google_docs/i18n/nl.po                 |   22 +-
 addons/google_docs/i18n/pl.po                 |   22 +-
 addons/google_docs/i18n/pt.po                 |   22 +-
 addons/google_docs/i18n/pt_BR.po              |   22 +-
 addons/hr/i18n/ar.po                          |   27 +-
 addons/hr/i18n/bg.po                          |   27 +-
 addons/hr/i18n/bn.po                          |   24 +-
 addons/hr/i18n/bs.po                          |   27 +-
 addons/hr/i18n/ca.po                          |   27 +-
 addons/hr/i18n/cs.po                          |   27 +-
 addons/hr/i18n/da.po                          |   24 +-
 addons/hr/i18n/de.po                          |   29 +-
 addons/hr/i18n/el.po                          |   27 +-
 addons/hr/i18n/en_AU.po                       |   24 +-
 addons/hr/i18n/en_GB.po                       |   27 +-
 addons/hr/i18n/es.po                          |   35 +-
 addons/hr/i18n/es_AR.po                       |   27 +-
 addons/hr/i18n/es_CL.po                       |   27 +-
 addons/hr/i18n/es_CR.po                       |   27 +-
 addons/hr/i18n/es_EC.po                       |   31 +-
 addons/hr/i18n/et.po                          |   24 +-
 addons/hr/i18n/fi.po                          |   27 +-
 addons/hr/i18n/fr.po                          |   27 +-
 addons/hr/i18n/fr_BE.po                       |   24 +-
 addons/hr/i18n/gl.po                          |   27 +-
 addons/hr/i18n/gu.po                          |   24 +-
 addons/hr/i18n/hi.po                          |   24 +-
 addons/hr/i18n/hr.po                          |   31 +-
 addons/hr/i18n/hu.po                          |   27 +-
 addons/hr/i18n/id.po                          |   27 +-
 addons/hr/i18n/it.po                          |   31 +-
 addons/hr/i18n/ja.po                          |   27 +-
 addons/hr/i18n/ko.po                          |   27 +-
 addons/hr/i18n/lo.po                          |   24 +-
 addons/hr/i18n/lt.po                          |   27 +-
 addons/hr/i18n/lv.po                          |   27 +-
 addons/hr/i18n/mk.po                          |   27 +-
 addons/hr/i18n/mn.po                          |   27 +-
 addons/hr/i18n/nb.po                          |   27 +-
 addons/hr/i18n/nl.po                          |   29 +-
 addons/hr/i18n/nl_BE.po                       |   24 +-
 addons/hr/i18n/pl.po                          |   26 +-
 addons/hr/i18n/pt.po                          |   29 +-
 addons/hr/i18n/pt_BR.po                       |   29 +-
 addons/hr/i18n/ro.po                          |   27 +-
 addons/hr/i18n/ru.po                          |   27 +-
 addons/hr/i18n/sk.po                          |   27 +-
 addons/hr/i18n/sl.po                          |   27 +-
 addons/hr/i18n/sq.po                          |   24 +-
 addons/hr/i18n/sr.po                          |   35 +-
 addons/hr/i18n/sr@latin.po                    |   27 +-
 addons/hr/i18n/sv.po                          |   31 +-
 addons/hr/i18n/th.po                          |   24 +-
 addons/hr/i18n/tlh.po                         |   24 +-
 addons/hr/i18n/tr.po                          |   27 +-
 addons/hr/i18n/uk.po                          |   24 +-
 addons/hr/i18n/vi.po                          |   27 +-
 addons/hr/i18n/zh_CN.po                       |   29 +-
 addons/hr/i18n/zh_TW.po                       |   24 +-
 addons/hr_attendance/i18n/ar.po               |   20 +-
 addons/hr_attendance/i18n/bg.po               |   20 +-
 addons/hr_attendance/i18n/bs.po               |   20 +-
 addons/hr_attendance/i18n/ca.po               |   20 +-
 addons/hr_attendance/i18n/cs.po               |   20 +-
 addons/hr_attendance/i18n/da.po               |   20 +-
 addons/hr_attendance/i18n/de.po               |   20 +-
 addons/hr_attendance/i18n/el.po               |   20 +-
 addons/hr_attendance/i18n/es.po               |   20 +-
 addons/hr_attendance/i18n/es_AR.po            |   20 +-
 addons/hr_attendance/i18n/es_CL.po            |   20 +-
 addons/hr_attendance/i18n/es_CR.po            |   20 +-
 addons/hr_attendance/i18n/es_EC.po            |   20 +-
 addons/hr_attendance/i18n/es_PY.po            |   20 +-
 addons/hr_attendance/i18n/et.po               |   20 +-
 addons/hr_attendance/i18n/fi.po               |   20 +-
 addons/hr_attendance/i18n/fr.po               |   20 +-
 addons/hr_attendance/i18n/gl.po               |   20 +-
 addons/hr_attendance/i18n/he.po               |   20 +-
 addons/hr_attendance/i18n/hr.po               |   20 +-
 addons/hr_attendance/i18n/hu.po               |   20 +-
 addons/hr_attendance/i18n/id.po               |   20 +-
 addons/hr_attendance/i18n/it.po               |   20 +-
 addons/hr_attendance/i18n/ja.po               |   20 +-
 addons/hr_attendance/i18n/ko.po               |   20 +-
 addons/hr_attendance/i18n/lt.po               |   20 +-
 addons/hr_attendance/i18n/lv.po               |   20 +-
 addons/hr_attendance/i18n/mk.po               |   20 +-
 addons/hr_attendance/i18n/mn.po               |   20 +-
 addons/hr_attendance/i18n/nb.po               |   20 +-
 addons/hr_attendance/i18n/nl.po               |   18 +-
 addons/hr_attendance/i18n/nl_BE.po            |   20 +-
 addons/hr_attendance/i18n/pl.po               |   20 +-
 addons/hr_attendance/i18n/pt.po               |   20 +-
 addons/hr_attendance/i18n/pt_BR.po            |   20 +-
 addons/hr_attendance/i18n/ro.po               |   20 +-
 addons/hr_attendance/i18n/ru.po               |   20 +-
 addons/hr_attendance/i18n/sl.po               |   20 +-
 addons/hr_attendance/i18n/sq.po               |   20 +-
 addons/hr_attendance/i18n/sr.po               |   20 +-
 addons/hr_attendance/i18n/sr@latin.po         |   38 +-
 addons/hr_attendance/i18n/sv.po               |   20 +-
 addons/hr_attendance/i18n/tlh.po              |   20 +-
 addons/hr_attendance/i18n/tr.po               |   20 +-
 addons/hr_attendance/i18n/uk.po               |   20 +-
 addons/hr_attendance/i18n/vi.po               |   20 +-
 addons/hr_attendance/i18n/zh_CN.po            |   20 +-
 addons/hr_attendance/i18n/zh_TW.po            |   20 +-
 addons/hr_contract/i18n/ar.po                 |    6 +-
 addons/hr_contract/i18n/bg.po                 |    6 +-
 addons/hr_contract/i18n/bs.po                 |    6 +-
 addons/hr_contract/i18n/ca.po                 |    6 +-
 addons/hr_contract/i18n/cs.po                 |    6 +-
 addons/hr_contract/i18n/da.po                 |    6 +-
 addons/hr_contract/i18n/de.po                 |    6 +-
 addons/hr_contract/i18n/el.po                 |    6 +-
 addons/hr_contract/i18n/es.po                 |    6 +-
 addons/hr_contract/i18n/es_AR.po              |    6 +-
 addons/hr_contract/i18n/es_CR.po              |    6 +-
 addons/hr_contract/i18n/es_EC.po              |    6 +-
 addons/hr_contract/i18n/es_PY.po              |    6 +-
 addons/hr_contract/i18n/et.po                 |    6 +-
 addons/hr_contract/i18n/fi.po                 |    6 +-
 addons/hr_contract/i18n/fr.po                 |    6 +-
 addons/hr_contract/i18n/gl.po                 |    6 +-
 addons/hr_contract/i18n/gu.po                 |    6 +-
 addons/hr_contract/i18n/hi.po                 |    6 +-
 addons/hr_contract/i18n/hr.po                 |    6 +-
 addons/hr_contract/i18n/hu.po                 |    6 +-
 addons/hr_contract/i18n/id.po                 |    6 +-
 addons/hr_contract/i18n/it.po                 |    6 +-
 addons/hr_contract/i18n/ja.po                 |    6 +-
 addons/hr_contract/i18n/ko.po                 |    6 +-
 addons/hr_contract/i18n/lo.po                 |    6 +-
 addons/hr_contract/i18n/lt.po                 |    6 +-
 addons/hr_contract/i18n/lv.po                 |    6 +-
 addons/hr_contract/i18n/mk.po                 |    6 +-
 addons/hr_contract/i18n/mn.po                 |    6 +-
 addons/hr_contract/i18n/nb.po                 |    6 +-
 addons/hr_contract/i18n/nl.po                 |    6 +-
 addons/hr_contract/i18n/nl_BE.po              |    6 +-
 addons/hr_contract/i18n/pl.po                 |    6 +-
 addons/hr_contract/i18n/pt.po                 |    6 +-
 addons/hr_contract/i18n/pt_BR.po              |    6 +-
 addons/hr_contract/i18n/ro.po                 |    6 +-
 addons/hr_contract/i18n/ru.po                 |    6 +-
 addons/hr_contract/i18n/sl.po                 |    6 +-
 addons/hr_contract/i18n/sq.po                 |    6 +-
 addons/hr_contract/i18n/sr.po                 |    6 +-
 addons/hr_contract/i18n/sr@latin.po           |    6 +-
 addons/hr_contract/i18n/sv.po                 |    6 +-
 addons/hr_contract/i18n/tlh.po                |    6 +-
 addons/hr_contract/i18n/tr.po                 |    6 +-
 addons/hr_contract/i18n/uk.po                 |    6 +-
 addons/hr_contract/i18n/vi.po                 |    6 +-
 addons/hr_contract/i18n/zh_CN.po              |    6 +-
 addons/hr_contract/i18n/zh_TW.po              |    6 +-
 addons/hr_evaluation/i18n/ar.po               |   58 +-
 addons/hr_evaluation/i18n/bg.po               |   58 +-
 addons/hr_evaluation/i18n/ca.po               |   58 +-
 addons/hr_evaluation/i18n/da.po               |   58 +-
 addons/hr_evaluation/i18n/de.po               |   69 +-
 addons/hr_evaluation/i18n/es.po               |   68 +-
 addons/hr_evaluation/i18n/es_CR.po            |   58 +-
 addons/hr_evaluation/i18n/es_EC.po            |   58 +-
 addons/hr_evaluation/i18n/et.po               |   58 +-
 addons/hr_evaluation/i18n/fi.po               |   58 +-
 addons/hr_evaluation/i18n/fr.po               |   58 +-
 addons/hr_evaluation/i18n/gl.po               |   58 +-
 addons/hr_evaluation/i18n/hr.po               |   58 +-
 addons/hr_evaluation/i18n/hu.po               |   58 +-
 addons/hr_evaluation/i18n/id.po               |   58 +-
 addons/hr_evaluation/i18n/it.po               |   58 +-
 addons/hr_evaluation/i18n/ja.po               |   58 +-
 addons/hr_evaluation/i18n/mn.po               |   58 +-
 addons/hr_evaluation/i18n/nl.po               |   58 +-
 addons/hr_evaluation/i18n/pt.po               |   58 +-
 addons/hr_evaluation/i18n/pt_BR.po            |   58 +-
 addons/hr_evaluation/i18n/ro.po               |   58 +-
 addons/hr_evaluation/i18n/ru.po               |   58 +-
 addons/hr_evaluation/i18n/sr.po               |   58 +-
 addons/hr_evaluation/i18n/sr@latin.po         |   66 +-
 addons/hr_evaluation/i18n/sv.po               |   58 +-
 addons/hr_evaluation/i18n/tr.po               |   58 +-
 addons/hr_evaluation/i18n/zh_CN.po            |   65 +-
 addons/hr_expense/i18n/ar.po                  |   71 +-
 addons/hr_expense/i18n/bg.po                  |   71 +-
 addons/hr_expense/i18n/bs.po                  |   71 +-
 addons/hr_expense/i18n/ca.po                  |   71 +-
 addons/hr_expense/i18n/cs.po                  |   71 +-
 addons/hr_expense/i18n/da.po                  |   71 +-
 addons/hr_expense/i18n/de.po                  |   73 +-
 addons/hr_expense/i18n/el.po                  |   71 +-
 addons/hr_expense/i18n/es.po                  |   73 +-
 addons/hr_expense/i18n/es_AR.po               |   71 +-
 addons/hr_expense/i18n/es_CR.po               |   71 +-
 addons/hr_expense/i18n/es_EC.po               |   71 +-
 addons/hr_expense/i18n/et.po                  |   71 +-
 addons/hr_expense/i18n/fi.po                  |   71 +-
 addons/hr_expense/i18n/fr.po                  |   71 +-
 addons/hr_expense/i18n/hr.po                  |   73 +-
 addons/hr_expense/i18n/hu.po                  |   71 +-
 addons/hr_expense/i18n/id.po                  |   71 +-
 addons/hr_expense/i18n/it.po                  |   71 +-
 addons/hr_expense/i18n/ja.po                  |   71 +-
 addons/hr_expense/i18n/ko.po                  |   71 +-
 addons/hr_expense/i18n/lt.po                  |   71 +-
 addons/hr_expense/i18n/lv.po                  |   71 +-
 addons/hr_expense/i18n/mn.po                  |   71 +-
 addons/hr_expense/i18n/nb.po                  |   73 +-
 addons/hr_expense/i18n/nl.po                  |   79 +-
 addons/hr_expense/i18n/nl_BE.po               |   71 +-
 addons/hr_expense/i18n/pl.po                  |   71 +-
 addons/hr_expense/i18n/pt.po                  |   73 +-
 addons/hr_expense/i18n/pt_BR.po               |   71 +-
 addons/hr_expense/i18n/ro.po                  |   71 +-
 addons/hr_expense/i18n/ru.po                  |   71 +-
 addons/hr_expense/i18n/sl.po                  |   71 +-
 addons/hr_expense/i18n/sq.po                  |   71 +-
 addons/hr_expense/i18n/sr.po                  |   71 +-
 addons/hr_expense/i18n/sr@latin.po            |   71 +-
 addons/hr_expense/i18n/sv.po                  |   71 +-
 addons/hr_expense/i18n/tlh.po                 |   71 +-
 addons/hr_expense/i18n/tr.po                  |   71 +-
 addons/hr_expense/i18n/uk.po                  |   71 +-
 addons/hr_expense/i18n/vi.po                  |   71 +-
 addons/hr_expense/i18n/zh_CN.po               |   71 +-
 addons/hr_expense/i18n/zh_TW.po               |   71 +-
 addons/hr_holidays/i18n/ar.po                 |  115 +-
 addons/hr_holidays/i18n/bg.po                 |  113 +-
 addons/hr_holidays/i18n/bs.po                 |  111 +-
 addons/hr_holidays/i18n/ca.po                 |  115 +-
 addons/hr_holidays/i18n/cs.po                 |  115 +-
 addons/hr_holidays/i18n/da.po                 |  111 +-
 addons/hr_holidays/i18n/de.po                 |  119 +-
 addons/hr_holidays/i18n/el.po                 |  115 +-
 addons/hr_holidays/i18n/es.po                 |  120 +-
 addons/hr_holidays/i18n/es_AR.po              |  115 +-
 addons/hr_holidays/i18n/es_CR.po              |  115 +-
 addons/hr_holidays/i18n/es_EC.po              |  115 +-
 addons/hr_holidays/i18n/et.po                 |  115 +-
 addons/hr_holidays/i18n/fi.po                 |  115 +-
 addons/hr_holidays/i18n/fr.po                 |  115 +-
 addons/hr_holidays/i18n/gu.po                 |  111 +-
 addons/hr_holidays/i18n/hi.po                 |  111 +-
 addons/hr_holidays/i18n/hr.po                 |  111 +-
 addons/hr_holidays/i18n/hu.po                 |  115 +-
 addons/hr_holidays/i18n/id.po                 |  115 +-
 addons/hr_holidays/i18n/it.po                 |  113 +-
 addons/hr_holidays/i18n/ja.po                 |  115 +-
 addons/hr_holidays/i18n/ko.po                 |  111 +-
 addons/hr_holidays/i18n/lt.po                 |  111 +-
 addons/hr_holidays/i18n/lv.po                 |  111 +-
 addons/hr_holidays/i18n/mk.po                 |  113 +-
 addons/hr_holidays/i18n/mn.po                 |  115 +-
 addons/hr_holidays/i18n/nb.po                 |  111 +-
 addons/hr_holidays/i18n/nl.po                 |  115 +-
 addons/hr_holidays/i18n/nl_BE.po              |  111 +-
 addons/hr_holidays/i18n/pl.po                 |  118 +-
 addons/hr_holidays/i18n/pt.po                 |  115 +-
 addons/hr_holidays/i18n/pt_BR.po              |  115 +-
 addons/hr_holidays/i18n/ro.po                 |  115 +-
 addons/hr_holidays/i18n/ru.po                 |  115 +-
 addons/hr_holidays/i18n/sl.po                 |  111 +-
 addons/hr_holidays/i18n/sq.po                 |  111 +-
 addons/hr_holidays/i18n/sr.po                 |  111 +-
 addons/hr_holidays/i18n/sr@latin.po           |  111 +-
 addons/hr_holidays/i18n/sv.po                 |  131 +-
 addons/hr_holidays/i18n/th.po                 |  113 +-
 addons/hr_holidays/i18n/tlh.po                |  111 +-
 addons/hr_holidays/i18n/tr.po                 |  111 +-
 addons/hr_holidays/i18n/uk.po                 |  111 +-
 addons/hr_holidays/i18n/vi.po                 |  111 +-
 addons/hr_holidays/i18n/zh_CN.po              |  115 +-
 addons/hr_holidays/i18n/zh_TW.po              |  111 +-
 addons/hr_payroll/i18n/ar.po                  |    6 +-
 addons/hr_payroll/i18n/bg.po                  |    6 +-
 addons/hr_payroll/i18n/ca.po                  |    6 +-
 addons/hr_payroll/i18n/cs.po                  |    6 +-
 addons/hr_payroll/i18n/da.po                  |    6 +-
 addons/hr_payroll/i18n/de.po                  |    6 +-
 addons/hr_payroll/i18n/en_GB.po               |    6 +-
 addons/hr_payroll/i18n/es.po                  |    6 +-
 addons/hr_payroll/i18n/es_CR.po               |    6 +-
 addons/hr_payroll/i18n/es_EC.po               |    6 +-
 addons/hr_payroll/i18n/es_MX.po               |    6 +-
 addons/hr_payroll/i18n/et.po                  |    6 +-
 addons/hr_payroll/i18n/fi.po                  |    6 +-
 addons/hr_payroll/i18n/fr.po                  |    6 +-
 addons/hr_payroll/i18n/gl.po                  |    6 +-
 addons/hr_payroll/i18n/gu.po                  |    6 +-
 addons/hr_payroll/i18n/he.po                  |    6 +-
 addons/hr_payroll/i18n/hr.po                  |    6 +-
 addons/hr_payroll/i18n/hu.po                  |    6 +-
 addons/hr_payroll/i18n/id.po                  |    6 +-
 addons/hr_payroll/i18n/it.po                  |    6 +-
 addons/hr_payroll/i18n/ja.po                  |    6 +-
 addons/hr_payroll/i18n/lo.po                  |    6 +-
 addons/hr_payroll/i18n/lt.po                  |    6 +-
 addons/hr_payroll/i18n/lv.po                  |    6 +-
 addons/hr_payroll/i18n/mn.po                  |    6 +-
 addons/hr_payroll/i18n/nb.po                  |    6 +-
 addons/hr_payroll/i18n/nl.po                  |    6 +-
 addons/hr_payroll/i18n/pl.po                  |    6 +-
 addons/hr_payroll/i18n/pt.po                  |    6 +-
 addons/hr_payroll/i18n/pt_BR.po               |    6 +-
 addons/hr_payroll/i18n/ro.po                  |    6 +-
 addons/hr_payroll/i18n/ru.po                  |    6 +-
 addons/hr_payroll/i18n/sr.po                  |    6 +-
 addons/hr_payroll/i18n/sr@latin.po            |    6 +-
 addons/hr_payroll/i18n/sv.po                  |    6 +-
 addons/hr_payroll/i18n/tr.po                  |    6 +-
 addons/hr_payroll/i18n/vi.po                  |    6 +-
 addons/hr_payroll/i18n/zh_CN.po               |    6 +-
 addons/hr_payroll_account/i18n/ar.po          |    6 +-
 addons/hr_payroll_account/i18n/bg.po          |    6 +-
 addons/hr_payroll_account/i18n/ca.po          |    6 +-
 addons/hr_payroll_account/i18n/da.po          |    6 +-
 addons/hr_payroll_account/i18n/de.po          |    6 +-
 addons/hr_payroll_account/i18n/en_GB.po       |    6 +-
 addons/hr_payroll_account/i18n/es.po          |    6 +-
 addons/hr_payroll_account/i18n/es_CR.po       |    6 +-
 addons/hr_payroll_account/i18n/es_EC.po       |    6 +-
 addons/hr_payroll_account/i18n/es_PY.po       |    6 +-
 addons/hr_payroll_account/i18n/fr.po          |    6 +-
 addons/hr_payroll_account/i18n/gl.po          |    6 +-
 addons/hr_payroll_account/i18n/gu.po          |    6 +-
 addons/hr_payroll_account/i18n/hr.po          |    6 +-
 addons/hr_payroll_account/i18n/hu.po          |    6 +-
 addons/hr_payroll_account/i18n/id.po          |    6 +-
 addons/hr_payroll_account/i18n/it.po          |    6 +-
 addons/hr_payroll_account/i18n/ja.po          |    6 +-
 addons/hr_payroll_account/i18n/lv.po          |    6 +-
 addons/hr_payroll_account/i18n/mn.po          |    6 +-
 addons/hr_payroll_account/i18n/nb.po          |    6 +-
 addons/hr_payroll_account/i18n/nl.po          |    6 +-
 addons/hr_payroll_account/i18n/pl.po          |    6 +-
 addons/hr_payroll_account/i18n/pt.po          |    6 +-
 addons/hr_payroll_account/i18n/pt_BR.po       |    6 +-
 addons/hr_payroll_account/i18n/ro.po          |    6 +-
 addons/hr_payroll_account/i18n/ru.po          |    6 +-
 addons/hr_payroll_account/i18n/sr@latin.po    |    6 +-
 addons/hr_payroll_account/i18n/sv.po          |    6 +-
 addons/hr_payroll_account/i18n/tr.po          |    6 +-
 addons/hr_payroll_account/i18n/zh_CN.po       |    6 +-
 addons/hr_recruitment/i18n/ar.po              |  244 +-
 addons/hr_recruitment/i18n/bg.po              |  230 +-
 addons/hr_recruitment/i18n/ca.po              |  234 +-
 addons/hr_recruitment/i18n/da.po              |  210 +-
 addons/hr_recruitment/i18n/de.po              |  255 +-
 addons/hr_recruitment/i18n/es.po              |  252 +-
 addons/hr_recruitment/i18n/es_CR.po           |  244 +-
 addons/hr_recruitment/i18n/fr.po              |  244 +-
 addons/hr_recruitment/i18n/hi.po              |  218 +-
 addons/hr_recruitment/i18n/hr.po              |  244 +-
 addons/hr_recruitment/i18n/hu.po              |  234 +-
 addons/hr_recruitment/i18n/id.po              |  226 +-
 addons/hr_recruitment/i18n/it.po              |  232 +-
 addons/hr_recruitment/i18n/ja.po              |  244 +-
 addons/hr_recruitment/i18n/mk.po              |  232 +-
 addons/hr_recruitment/i18n/mn.po              |  244 +-
 addons/hr_recruitment/i18n/nb.po              |  232 +-
 addons/hr_recruitment/i18n/nl.po              |  244 +-
 addons/hr_recruitment/i18n/pl.po              |  210 +-
 addons/hr_recruitment/i18n/pt.po              |  244 +-
 addons/hr_recruitment/i18n/pt_BR.po           |  244 +-
 addons/hr_recruitment/i18n/ro.po              |  244 +-
 addons/hr_recruitment/i18n/ru.po              |  226 +-
 addons/hr_recruitment/i18n/sr.po              |  210 +-
 addons/hr_recruitment/i18n/sr@latin.po        |  210 +-
 addons/hr_recruitment/i18n/sv.po              |  244 +-
 addons/hr_recruitment/i18n/tr.po              |  210 +-
 addons/hr_recruitment/i18n/vi.po              |  234 +-
 addons/hr_recruitment/i18n/zh_CN.po           |  244 +-
 addons/hr_timesheet/i18n/ar.po                |   24 +-
 addons/hr_timesheet/i18n/bg.po                |   24 +-
 addons/hr_timesheet/i18n/bs.po                |   24 +-
 addons/hr_timesheet/i18n/ca.po                |   24 +-
 addons/hr_timesheet/i18n/cs.po                |   24 +-
 addons/hr_timesheet/i18n/da.po                |   24 +-
 addons/hr_timesheet/i18n/de.po                |   22 +-
 addons/hr_timesheet/i18n/el.po                |   24 +-
 addons/hr_timesheet/i18n/es.po                |   24 +-
 addons/hr_timesheet/i18n/es_AR.po             |   24 +-
 addons/hr_timesheet/i18n/es_CR.po             |   24 +-
 addons/hr_timesheet/i18n/es_EC.po             |   24 +-
 addons/hr_timesheet/i18n/et.po                |   24 +-
 addons/hr_timesheet/i18n/fi.po                |   24 +-
 addons/hr_timesheet/i18n/fr.po                |   24 +-
 addons/hr_timesheet/i18n/gl.po                |   24 +-
 addons/hr_timesheet/i18n/hr.po                |   24 +-
 addons/hr_timesheet/i18n/hu.po                |   24 +-
 addons/hr_timesheet/i18n/id.po                |   24 +-
 addons/hr_timesheet/i18n/it.po                |   24 +-
 addons/hr_timesheet/i18n/ja.po                |   24 +-
 addons/hr_timesheet/i18n/ko.po                |   24 +-
 addons/hr_timesheet/i18n/lt.po                |   24 +-
 addons/hr_timesheet/i18n/lv.po                |   24 +-
 addons/hr_timesheet/i18n/mk.po                |   24 +-
 addons/hr_timesheet/i18n/mn.po                |   24 +-
 addons/hr_timesheet/i18n/nb.po                |   24 +-
 addons/hr_timesheet/i18n/nl.po                |   30 +-
 addons/hr_timesheet/i18n/pl.po                |   24 +-
 addons/hr_timesheet/i18n/pt.po                |   24 +-
 addons/hr_timesheet/i18n/pt_BR.po             |   24 +-
 addons/hr_timesheet/i18n/ro.po                |   24 +-
 addons/hr_timesheet/i18n/ru.po                |   24 +-
 addons/hr_timesheet/i18n/sl.po                |   24 +-
 addons/hr_timesheet/i18n/sq.po                |   24 +-
 addons/hr_timesheet/i18n/sr@latin.po          |   24 +-
 addons/hr_timesheet/i18n/sv.po                |   24 +-
 addons/hr_timesheet/i18n/tlh.po               |   24 +-
 addons/hr_timesheet/i18n/tr.po                |   24 +-
 addons/hr_timesheet/i18n/uk.po                |   24 +-
 addons/hr_timesheet/i18n/vi.po                |   24 +-
 addons/hr_timesheet/i18n/zh_CN.po             |   22 +-
 addons/hr_timesheet/i18n/zh_TW.po             |   24 +-
 addons/hr_timesheet_invoice/i18n/ar.po        |  114 +-
 addons/hr_timesheet_invoice/i18n/bg.po        |  105 +-
 addons/hr_timesheet_invoice/i18n/bs.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/ca.po        |  114 +-
 addons/hr_timesheet_invoice/i18n/cs.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/da.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/de.po        |  119 +-
 addons/hr_timesheet_invoice/i18n/el.po        |  106 +-
 addons/hr_timesheet_invoice/i18n/es.po        |  127 +-
 addons/hr_timesheet_invoice/i18n/es_AR.po     |  102 +-
 addons/hr_timesheet_invoice/i18n/es_CR.po     |  114 +-
 addons/hr_timesheet_invoice/i18n/es_EC.po     |  114 +-
 addons/hr_timesheet_invoice/i18n/et.po        |  106 +-
 addons/hr_timesheet_invoice/i18n/fi.po        |  104 +-
 addons/hr_timesheet_invoice/i18n/fr.po        |  112 +-
 addons/hr_timesheet_invoice/i18n/hr.po        |  121 +-
 addons/hr_timesheet_invoice/i18n/hu.po        |  111 +-
 addons/hr_timesheet_invoice/i18n/id.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/it.po        |  214 +-
 addons/hr_timesheet_invoice/i18n/ja.po        |  114 +-
 addons/hr_timesheet_invoice/i18n/ko.po        |  106 +-
 addons/hr_timesheet_invoice/i18n/lt.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/lv.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/mn.po        |  114 +-
 addons/hr_timesheet_invoice/i18n/nl.po        |  114 +-
 addons/hr_timesheet_invoice/i18n/nl_BE.po     |  102 +-
 addons/hr_timesheet_invoice/i18n/pl.po        |  120 +-
 addons/hr_timesheet_invoice/i18n/pt.po        |  116 +-
 addons/hr_timesheet_invoice/i18n/pt_BR.po     |  114 +-
 addons/hr_timesheet_invoice/i18n/ro.po        |  114 +-
 addons/hr_timesheet_invoice/i18n/ru.po        |  109 +-
 addons/hr_timesheet_invoice/i18n/sl.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/sq.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/sr@latin.po  |  102 +-
 addons/hr_timesheet_invoice/i18n/sv.po        |  105 +-
 addons/hr_timesheet_invoice/i18n/tlh.po       |  102 +-
 addons/hr_timesheet_invoice/i18n/tr.po        |  106 +-
 addons/hr_timesheet_invoice/i18n/uk.po        |  106 +-
 addons/hr_timesheet_invoice/i18n/vi.po        |  102 +-
 addons/hr_timesheet_invoice/i18n/zh_CN.po     |  114 +-
 addons/hr_timesheet_invoice/i18n/zh_TW.po     |  102 +-
 addons/hr_timesheet_sheet/i18n/ar.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/bg.po          |   54 +-
 addons/hr_timesheet_sheet/i18n/bs.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/ca.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/cs.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/da.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/de.po          |   54 +-
 addons/hr_timesheet_sheet/i18n/el.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/es.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/es_AR.po       |   48 +-
 addons/hr_timesheet_sheet/i18n/es_CR.po       |   56 +-
 addons/hr_timesheet_sheet/i18n/es_EC.po       |   48 +-
 addons/hr_timesheet_sheet/i18n/et.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/fi.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/fr.po          |   54 +-
 addons/hr_timesheet_sheet/i18n/hr.po          |   52 +-
 addons/hr_timesheet_sheet/i18n/hu.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/id.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/it.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/ja.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/ko.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/lt.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/lv.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/mk.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/mn.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/nl.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/nl_BE.po       |   48 +-
 addons/hr_timesheet_sheet/i18n/pl.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/pt.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/pt_BR.po       |   56 +-
 addons/hr_timesheet_sheet/i18n/ro.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/ru.po          |   52 +-
 addons/hr_timesheet_sheet/i18n/sl.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/sq.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/sv.po          |   56 +-
 addons/hr_timesheet_sheet/i18n/tlh.po         |   48 +-
 addons/hr_timesheet_sheet/i18n/tr.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/uk.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/vi.po          |   48 +-
 addons/hr_timesheet_sheet/i18n/zh_CN.po       |   56 +-
 addons/hr_timesheet_sheet/i18n/zh_TW.po       |   48 +-
 addons/knowledge/i18n/ar.po                   |    6 +-
 addons/knowledge/i18n/bg.po                   |    6 +-
 addons/knowledge/i18n/ca.po                   |    6 +-
 addons/knowledge/i18n/cs.po                   |    6 +-
 addons/knowledge/i18n/da.po                   |    6 +-
 addons/knowledge/i18n/de.po                   |    6 +-
 addons/knowledge/i18n/en_GB.po                |    6 +-
 addons/knowledge/i18n/es.po                   |    6 +-
 addons/knowledge/i18n/es_AR.po                |    6 +-
 addons/knowledge/i18n/es_CR.po                |    6 +-
 addons/knowledge/i18n/et.po                   |    6 +-
 addons/knowledge/i18n/fi.po                   |    6 +-
 addons/knowledge/i18n/fr.po                   |    6 +-
 addons/knowledge/i18n/gl.po                   |    6 +-
 addons/knowledge/i18n/hi.po                   |    6 +-
 addons/knowledge/i18n/hr.po                   |    6 +-
 addons/knowledge/i18n/hu.po                   |    6 +-
 addons/knowledge/i18n/it.po                   |    4 +-
 addons/knowledge/i18n/ja.po                   |    6 +-
 addons/knowledge/i18n/lo.po                   |    6 +-
 addons/knowledge/i18n/lv.po                   |    6 +-
 addons/knowledge/i18n/mn.po                   |    6 +-
 addons/knowledge/i18n/nb.po                   |    6 +-
 addons/knowledge/i18n/nl.po                   |    4 +-
 addons/knowledge/i18n/nl_BE.po                |    6 +-
 addons/knowledge/i18n/pl.po                   |    6 +-
 addons/knowledge/i18n/pt.po                   |    6 +-
 addons/knowledge/i18n/pt_BR.po                |    6 +-
 addons/knowledge/i18n/ro.po                   |    6 +-
 addons/knowledge/i18n/ru.po                   |    6 +-
 addons/knowledge/i18n/sk.po                   |    6 +-
 addons/knowledge/i18n/sr.po                   |    6 +-
 addons/knowledge/i18n/sr@latin.po             |    6 +-
 addons/knowledge/i18n/sv.po                   |    6 +-
 addons/knowledge/i18n/tr.po                   |    6 +-
 addons/knowledge/i18n/zh_CN.po                |    6 +-
 addons/knowledge/i18n/zh_TW.po                |    6 +-
 addons/lunch/i18n/ar.po                       |   26 +-
 addons/lunch/i18n/bg.po                       |   26 +-
 addons/lunch/i18n/ca.po                       |   26 +-
 addons/lunch/i18n/cs.po                       |   26 +-
 addons/lunch/i18n/da.po                       |   26 +-
 addons/lunch/i18n/de.po                       |   26 +-
 addons/lunch/i18n/es.po                       |   28 +-
 addons/lunch/i18n/es_CR.po                    |   26 +-
 addons/lunch/i18n/es_PY.po                    |   26 +-
 addons/lunch/i18n/fi.po                       |   26 +-
 addons/lunch/i18n/fr.po                       |   26 +-
 addons/lunch/i18n/gl.po                       |   26 +-
 addons/lunch/i18n/hr.po                       |   26 +-
 addons/lunch/i18n/hu.po                       |   26 +-
 addons/lunch/i18n/it.po                       |   26 +-
 addons/lunch/i18n/ja.po                       |   26 +-
 addons/lunch/i18n/nl.po                       |   26 +-
 addons/lunch/i18n/pt.po                       |   26 +-
 addons/lunch/i18n/pt_BR.po                    |   26 +-
 addons/lunch/i18n/ro.po                       |   26 +-
 addons/lunch/i18n/ru.po                       |   26 +-
 addons/lunch/i18n/sr@latin.po                 |   26 +-
 addons/lunch/i18n/sv.po                       |   26 +-
 addons/lunch/i18n/tr.po                       |   26 +-
 addons/lunch/i18n/zh_CN.po                    |   26 +-
 addons/lunch/i18n/zh_TW.po                    |   26 +-
 addons/mail/i18n/ar.po                        |  410 +-
 addons/mail/i18n/bg.po                        |  410 +-
 addons/mail/i18n/ca.po                        |  410 +-
 addons/mail/i18n/da.po                        |  408 +-
 addons/mail/i18n/de.po                        |  438 +-
 addons/mail/i18n/es.po                        |  461 +-
 addons/mail/i18n/es_CR.po                     |  414 +-
 addons/mail/i18n/es_PY.po                     |  408 +-
 addons/mail/i18n/et.po                        |  408 +-
 addons/mail/i18n/fi.po                        |  414 +-
 addons/mail/i18n/fr.po                        |  420 +-
 addons/mail/i18n/gl.po                        |  410 +-
 addons/mail/i18n/hr.po                        |  414 +-
 addons/mail/i18n/hu.po                        |  426 +-
 addons/mail/i18n/it.po                        |  447 +-
 addons/mail/i18n/ja.po                        |  414 +-
 addons/mail/i18n/lt.po                        |  410 +-
 addons/mail/i18n/lv.po                        |  414 +-
 addons/mail/i18n/mn.po                        |  414 +-
 addons/mail/i18n/nl.po                        |  428 +-
 addons/mail/i18n/pl.po                        |  447 +-
 addons/mail/i18n/pt.po                        |  420 +-
 addons/mail/i18n/pt_BR.po                     |  463 +-
 addons/mail/i18n/ro.po                        |  414 +-
 addons/mail/i18n/ru.po                        |  432 +-
 addons/mail/i18n/sl.po                        |  408 +-
 addons/mail/i18n/sr@latin.po                  |  408 +-
 addons/mail/i18n/sv.po                        |  414 +-
 addons/mail/i18n/tr.po                        |  414 +-
 addons/mail/i18n/zh_CN.po                     |  463 +-
 addons/mail/i18n/zh_TW.po                     | 1683 +++++++
 addons/marketing/i18n/ar.po                   |    7 +-
 addons/marketing/i18n/bg.po                   |    7 +-
 addons/marketing/i18n/ca.po                   |    7 +-
 addons/marketing/i18n/cs.po                   |    7 +-
 addons/marketing/i18n/da.po                   |    7 +-
 addons/marketing/i18n/de.po                   |    5 +-
 addons/marketing/i18n/el.po                   |    7 +-
 addons/marketing/i18n/es.po                   |    7 +-
 addons/marketing/i18n/es_CR.po                |    7 +-
 addons/marketing/i18n/fi.po                   |    7 +-
 addons/marketing/i18n/fr.po                   |    7 +-
 addons/marketing/i18n/gl.po                   |    7 +-
 addons/marketing/i18n/hr.po                   |    7 +-
 addons/marketing/i18n/hu.po                   |    7 +-
 addons/marketing/i18n/id.po                   |    7 +-
 addons/marketing/i18n/it.po                   |    7 +-
 addons/marketing/i18n/ja.po                   |    7 +-
 addons/marketing/i18n/lt.po                   |    7 +-
 addons/marketing/i18n/lv.po                   |    7 +-
 addons/marketing/i18n/mn.po                   |    7 +-
 addons/marketing/i18n/nb.po                   |    7 +-
 addons/marketing/i18n/nl.po                   |    5 +-
 addons/marketing/i18n/pl.po                   |    7 +-
 addons/marketing/i18n/pt.po                   |    5 +-
 addons/marketing/i18n/pt_BR.po                |    5 +-
 addons/marketing/i18n/ro.po                   |    7 +-
 addons/marketing/i18n/ru.po                   |    7 +-
 addons/marketing/i18n/sk.po                   |    7 +-
 addons/marketing/i18n/sl.po                   |    7 +-
 addons/marketing/i18n/sr.po                   |    7 +-
 addons/marketing/i18n/sr@latin.po             |    7 +-
 addons/marketing/i18n/sv.po                   |    7 +-
 addons/marketing/i18n/th.po                   |    7 +-
 addons/marketing/i18n/tr.po                   |    7 +-
 addons/marketing/i18n/zh_CN.po                |    7 +-
 addons/marketing/i18n/zh_TW.po                |    7 +-
 addons/marketing_campaign/i18n/ar.po          |    6 +-
 addons/marketing_campaign/i18n/bg.po          |    6 +-
 addons/marketing_campaign/i18n/ca.po          |    6 +-
 addons/marketing_campaign/i18n/da.po          |    6 +-
 addons/marketing_campaign/i18n/de.po          |    4 +-
 addons/marketing_campaign/i18n/el.po          |    6 +-
 addons/marketing_campaign/i18n/es.po          |    6 +-
 addons/marketing_campaign/i18n/es_CR.po       |    6 +-
 addons/marketing_campaign/i18n/fi.po          |    6 +-
 addons/marketing_campaign/i18n/fr.po          |    6 +-
 addons/marketing_campaign/i18n/hi.po          |    6 +-
 addons/marketing_campaign/i18n/hr.po          |    6 +-
 addons/marketing_campaign/i18n/hu.po          |    6 +-
 addons/marketing_campaign/i18n/it.po          |    6 +-
 addons/marketing_campaign/i18n/ja.po          |    6 +-
 addons/marketing_campaign/i18n/lv.po          |    6 +-
 addons/marketing_campaign/i18n/mn.po          |    8 +-
 addons/marketing_campaign/i18n/nl.po          |    6 +-
 addons/marketing_campaign/i18n/pl.po          |    6 +-
 addons/marketing_campaign/i18n/pt.po          |    6 +-
 addons/marketing_campaign/i18n/pt_BR.po       |    4 +-
 addons/marketing_campaign/i18n/ro.po          |    6 +-
 addons/marketing_campaign/i18n/ru.po          |    6 +-
 addons/marketing_campaign/i18n/sr@latin.po    |    6 +-
 addons/marketing_campaign/i18n/sv.po          |    6 +-
 addons/marketing_campaign/i18n/tr.po          |    6 +-
 addons/marketing_campaign/i18n/zh_CN.po       |    6 +-
 addons/marketing_campaign_crm_demo/i18n/ar.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/bg.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/ca.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/da.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/de.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/es.po |    6 +-
 .../marketing_campaign_crm_demo/i18n/es_CR.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/fr.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/gl.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/hr.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/hu.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/it.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/ja.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/nb.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/nl.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/pt.po |    6 +-
 .../marketing_campaign_crm_demo/i18n/pt_BR.po |    4 +-
 addons/marketing_campaign_crm_demo/i18n/ro.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/ru.po |    6 +-
 addons/marketing_campaign_crm_demo/i18n/sr.po |    6 +-
 .../i18n/sr@latin.po                          |    6 +-
 addons/marketing_campaign_crm_demo/i18n/tr.po |    6 +-
 .../marketing_campaign_crm_demo/i18n/zh_CN.po |    6 +-
 addons/membership/i18n/ar.po                  |   32 +-
 addons/membership/i18n/bg.po                  |   43 +-
 addons/membership/i18n/bs.po                  |   43 +-
 addons/membership/i18n/ca.po                  |   43 +-
 addons/membership/i18n/cs.po                  |   43 +-
 addons/membership/i18n/da.po                  |   32 +-
 addons/membership/i18n/de.po                  |   43 +-
 addons/membership/i18n/es.po                  |   45 +-
 addons/membership/i18n/es_AR.po               |   43 +-
 addons/membership/i18n/es_CR.po               |   43 +-
 addons/membership/i18n/et.po                  |   43 +-
 addons/membership/i18n/fi.po                  |   38 +-
 addons/membership/i18n/fr.po                  |   41 +-
 addons/membership/i18n/gl.po                  |   43 +-
 addons/membership/i18n/hr.po                  |   32 +-
 addons/membership/i18n/hu.po                  |   43 +-
 addons/membership/i18n/id.po                  |   32 +-
 addons/membership/i18n/it.po                  |   43 +-
 addons/membership/i18n/ja.po                  |   43 +-
 addons/membership/i18n/ko.po                  |   43 +-
 addons/membership/i18n/lt.po                  |   32 +-
 addons/membership/i18n/mn.po                  |   43 +-
 addons/membership/i18n/nl.po                  |   53 +-
 addons/membership/i18n/nl_BE.po               |   32 +-
 addons/membership/i18n/pl.po                  |   43 +-
 addons/membership/i18n/pt.po                  |   43 +-
 addons/membership/i18n/pt_BR.po               |   43 +-
 addons/membership/i18n/ro.po                  |   43 +-
 addons/membership/i18n/ru.po                  |   43 +-
 addons/membership/i18n/sk.po                  |   37 +-
 addons/membership/i18n/sl.po                  |   35 +-
 addons/membership/i18n/sq.po                  |   32 +-
 addons/membership/i18n/sr@latin.po            |   32 +-
 addons/membership/i18n/sv.po                  |   35 +-
 addons/membership/i18n/tlh.po                 |   32 +-
 addons/membership/i18n/tr.po                  |   43 +-
 addons/membership/i18n/uk.po                  |   35 +-
 addons/membership/i18n/vi.po                  |   32 +-
 addons/membership/i18n/zh_CN.po               |   43 +-
 addons/membership/i18n/zh_TW.po               |   32 +-
 addons/mrp/i18n/ar.po                         |  233 +-
 addons/mrp/i18n/bg.po                         |  233 +-
 addons/mrp/i18n/bs.po                         |  231 +-
 addons/mrp/i18n/ca.po                         |  233 +-
 addons/mrp/i18n/cs.po                         |  233 +-
 addons/mrp/i18n/da.po                         |  231 +-
 addons/mrp/i18n/de.po                         |  273 +-
 addons/mrp/i18n/el.po                         |  233 +-
 addons/mrp/i18n/es.po                         |  296 +-
 addons/mrp/i18n/es_AR.po                      |  233 +-
 addons/mrp/i18n/es_CL.po                      |  233 +-
 addons/mrp/i18n/es_CR.po                      |  233 +-
 addons/mrp/i18n/es_EC.po                      |  233 +-
 addons/mrp/i18n/et.po                         |  231 +-
 addons/mrp/i18n/fi.po                         |  233 +-
 addons/mrp/i18n/fr.po                         |  249 +-
 addons/mrp/i18n/gl.po                         |  233 +-
 addons/mrp/i18n/hi.po                         |  231 +-
 addons/mrp/i18n/hr.po                         |  233 +-
 addons/mrp/i18n/hu.po                         |  241 +-
 addons/mrp/i18n/id.po                         |  231 +-
 addons/mrp/i18n/it.po                         |  276 +-
 addons/mrp/i18n/ja.po                         |  233 +-
 addons/mrp/i18n/ko.po                         |  233 +-
 addons/mrp/i18n/lt.po                         |  233 +-
 addons/mrp/i18n/lv.po                         |  231 +-
 addons/mrp/i18n/mn.po                         |  233 +-
 addons/mrp/i18n/nb.po                         |  233 +-
 addons/mrp/i18n/nl.po                         |  369 +-
 addons/mrp/i18n/nl_BE.po                      |  231 +-
 addons/mrp/i18n/pl.po                         |  244 +-
 addons/mrp/i18n/pt.po                         |  233 +-
 addons/mrp/i18n/pt_BR.po                      |  572 ++-
 addons/mrp/i18n/ro.po                         |  233 +-
 addons/mrp/i18n/ru.po                         |  233 +-
 addons/mrp/i18n/sk.po                         |  231 +-
 addons/mrp/i18n/sl.po                         |  232 +-
 addons/mrp/i18n/sq.po                         |  231 +-
 addons/mrp/i18n/sr@latin.po                   |  231 +-
 addons/mrp/i18n/sv.po                         |  233 +-
 addons/mrp/i18n/tlh.po                        |  231 +-
 addons/mrp/i18n/tr.po                         |  233 +-
 addons/mrp/i18n/uk.po                         |  231 +-
 addons/mrp/i18n/vi.po                         |  231 +-
 addons/mrp/i18n/zh_CN.po                      |  261 +-
 addons/mrp/i18n/zh_HK.po                      |  231 +-
 addons/mrp/i18n/zh_TW.po                      |  231 +-
 addons/mrp_byproduct/i18n/ab.po               |   10 +-
 addons/mrp_byproduct/i18n/ar.po               |   10 +-
 addons/mrp_byproduct/i18n/bg.po               |   10 +-
 addons/mrp_byproduct/i18n/bs.po               |   10 +-
 addons/mrp_byproduct/i18n/ca.po               |   10 +-
 addons/mrp_byproduct/i18n/cs.po               |   10 +-
 addons/mrp_byproduct/i18n/da.po               |   10 +-
 addons/mrp_byproduct/i18n/de.po               |   10 +-
 addons/mrp_byproduct/i18n/es.po               |   10 +-
 addons/mrp_byproduct/i18n/es_AR.po            |   10 +-
 addons/mrp_byproduct/i18n/es_CR.po            |   10 +-
 addons/mrp_byproduct/i18n/es_EC.po            |   10 +-
 addons/mrp_byproduct/i18n/et.po               |   10 +-
 addons/mrp_byproduct/i18n/fi.po               |   10 +-
 addons/mrp_byproduct/i18n/fr.po               |   10 +-
 addons/mrp_byproduct/i18n/gl.po               |   10 +-
 addons/mrp_byproduct/i18n/hr.po               |   10 +-
 addons/mrp_byproduct/i18n/hu.po               |   10 +-
 addons/mrp_byproduct/i18n/id.po               |   10 +-
 addons/mrp_byproduct/i18n/it.po               |   10 +-
 addons/mrp_byproduct/i18n/ja.po               |   10 +-
 addons/mrp_byproduct/i18n/ko.po               |   10 +-
 addons/mrp_byproduct/i18n/lt.po               |   10 +-
 addons/mrp_byproduct/i18n/mn.po               |   10 +-
 addons/mrp_byproduct/i18n/nb.po               |   10 +-
 addons/mrp_byproduct/i18n/nl.po               |   10 +-
 addons/mrp_byproduct/i18n/nl_BE.po            |   10 +-
 addons/mrp_byproduct/i18n/oc.po               |   10 +-
 addons/mrp_byproduct/i18n/pl.po               |   10 +-
 addons/mrp_byproduct/i18n/pt.po               |    8 +-
 addons/mrp_byproduct/i18n/pt_BR.po            |   37 +-
 addons/mrp_byproduct/i18n/ro.po               |   10 +-
 addons/mrp_byproduct/i18n/ru.po               |   10 +-
 addons/mrp_byproduct/i18n/sk.po               |   10 +-
 addons/mrp_byproduct/i18n/sl.po               |   10 +-
 addons/mrp_byproduct/i18n/sq.po               |   10 +-
 addons/mrp_byproduct/i18n/sr.po               |   10 +-
 addons/mrp_byproduct/i18n/sr@latin.po         |   10 +-
 addons/mrp_byproduct/i18n/sv.po               |   10 +-
 addons/mrp_byproduct/i18n/tlh.po              |   10 +-
 addons/mrp_byproduct/i18n/tr.po               |   10 +-
 addons/mrp_byproduct/i18n/uk.po               |   10 +-
 addons/mrp_byproduct/i18n/vi.po               |   10 +-
 addons/mrp_byproduct/i18n/zh_CN.po            |   10 +-
 addons/mrp_byproduct/i18n/zh_TW.po            |   10 +-
 addons/mrp_operations/i18n/ar.po              |   86 +-
 addons/mrp_operations/i18n/bg.po              |   86 +-
 addons/mrp_operations/i18n/bs.po              |   83 +-
 addons/mrp_operations/i18n/ca.po              |   86 +-
 addons/mrp_operations/i18n/cs.po              |   86 +-
 addons/mrp_operations/i18n/da.po              |   83 +-
 addons/mrp_operations/i18n/de.po              |   92 +-
 addons/mrp_operations/i18n/es.po              |   97 +-
 addons/mrp_operations/i18n/es_AR.po           |   83 +-
 addons/mrp_operations/i18n/es_CR.po           |   86 +-
 addons/mrp_operations/i18n/es_EC.po           |   86 +-
 addons/mrp_operations/i18n/et.po              |   86 +-
 addons/mrp_operations/i18n/fi.po              |   86 +-
 addons/mrp_operations/i18n/fr.po              |   93 +-
 addons/mrp_operations/i18n/hi.po              |   86 +-
 addons/mrp_operations/i18n/hr.po              |   86 +-
 addons/mrp_operations/i18n/hu.po              |   86 +-
 addons/mrp_operations/i18n/id.po              |   83 +-
 addons/mrp_operations/i18n/it.po              |   88 +-
 addons/mrp_operations/i18n/ja.po              |   86 +-
 addons/mrp_operations/i18n/ko.po              |   83 +-
 addons/mrp_operations/i18n/lt.po              |   83 +-
 addons/mrp_operations/i18n/mn.po              |   86 +-
 addons/mrp_operations/i18n/nl.po              |  101 +-
 addons/mrp_operations/i18n/nl_BE.po           |   83 +-
 addons/mrp_operations/i18n/pl.po              |   93 +-
 addons/mrp_operations/i18n/pt.po              |   86 +-
 addons/mrp_operations/i18n/pt_BR.po           |  138 +-
 addons/mrp_operations/i18n/ro.po              |   86 +-
 addons/mrp_operations/i18n/ru.po              |   83 +-
 addons/mrp_operations/i18n/sl.po              |   86 +-
 addons/mrp_operations/i18n/sq.po              |   83 +-
 addons/mrp_operations/i18n/sr.po              |   86 +-
 addons/mrp_operations/i18n/sr@latin.po        |   86 +-
 addons/mrp_operations/i18n/sv.po              |   86 +-
 addons/mrp_operations/i18n/tlh.po             |   83 +-
 addons/mrp_operations/i18n/tr.po              |   86 +-
 addons/mrp_operations/i18n/uk.po              |   83 +-
 addons/mrp_operations/i18n/vi.po              |   83 +-
 addons/mrp_operations/i18n/zh_CN.po           |   90 +-
 addons/mrp_operations/i18n/zh_TW.po           |   83 +-
 addons/mrp_repair/i18n/ar.po                  |  100 +-
 addons/mrp_repair/i18n/bg.po                  |   98 +-
 addons/mrp_repair/i18n/bs.po                  |   96 +-
 addons/mrp_repair/i18n/ca.po                  |  100 +-
 addons/mrp_repair/i18n/cs.po                  |   96 +-
 addons/mrp_repair/i18n/da.po                  |   96 +-
 addons/mrp_repair/i18n/de.po                  |  104 +-
 addons/mrp_repair/i18n/es.po                  |  104 +-
 addons/mrp_repair/i18n/es_AR.po               |  100 +-
 addons/mrp_repair/i18n/es_CR.po               |  100 +-
 addons/mrp_repair/i18n/es_EC.po               |  100 +-
 addons/mrp_repair/i18n/et.po                  |  100 +-
 addons/mrp_repair/i18n/fi.po                  |  100 +-
 addons/mrp_repair/i18n/fr.po                  |  100 +-
 addons/mrp_repair/i18n/hi.po                  |   96 +-
 addons/mrp_repair/i18n/hr.po                  |  104 +-
 addons/mrp_repair/i18n/hu.po                  |   98 +-
 addons/mrp_repair/i18n/id.po                  |   96 +-
 addons/mrp_repair/i18n/it.po                  |  100 +-
 addons/mrp_repair/i18n/ja.po                  |  100 +-
 addons/mrp_repair/i18n/ko.po                  |  100 +-
 addons/mrp_repair/i18n/lt.po                  |   96 +-
 addons/mrp_repair/i18n/mn.po                  |  100 +-
 addons/mrp_repair/i18n/nl.po                  |  108 +-
 addons/mrp_repair/i18n/nl_BE.po               |   96 +-
 addons/mrp_repair/i18n/pl.po                  |  104 +-
 addons/mrp_repair/i18n/pt.po                  |  100 +-
 addons/mrp_repair/i18n/pt_BR.po               |  136 +-
 addons/mrp_repair/i18n/ro.po                  |  100 +-
 addons/mrp_repair/i18n/ru.po                  |   96 +-
 addons/mrp_repair/i18n/sl.po                  |   98 +-
 addons/mrp_repair/i18n/sq.po                  |   96 +-
 addons/mrp_repair/i18n/sr.po                  |  100 +-
 addons/mrp_repair/i18n/sr@latin.po            |  100 +-
 addons/mrp_repair/i18n/sv.po                  |  100 +-
 addons/mrp_repair/i18n/tlh.po                 |   96 +-
 addons/mrp_repair/i18n/tr.po                  |  100 +-
 addons/mrp_repair/i18n/uk.po                  |   96 +-
 addons/mrp_repair/i18n/vi.po                  |   96 +-
 addons/mrp_repair/i18n/zh_CN.po               |  102 +-
 addons/mrp_repair/i18n/zh_TW.po               |   96 +-
 addons/multi_company/i18n/ar.po               |    6 +-
 addons/multi_company/i18n/bg.po               |    6 +-
 addons/multi_company/i18n/bs.po               |    6 +-
 addons/multi_company/i18n/ca.po               |    6 +-
 addons/multi_company/i18n/cs.po               |    6 +-
 addons/multi_company/i18n/da.po               |    6 +-
 addons/multi_company/i18n/de.po               |    6 +-
 addons/multi_company/i18n/es.po               |    4 +-
 addons/multi_company/i18n/es_CR.po            |    6 +-
 addons/multi_company/i18n/es_EC.po            |    6 +-
 addons/multi_company/i18n/et.po               |    6 +-
 addons/multi_company/i18n/fi.po               |    6 +-
 addons/multi_company/i18n/fr.po               |    6 +-
 addons/multi_company/i18n/gl.po               |    6 +-
 addons/multi_company/i18n/hr.po               |    6 +-
 addons/multi_company/i18n/hu.po               |    6 +-
 addons/multi_company/i18n/id.po               |    6 +-
 addons/multi_company/i18n/it.po               |    6 +-
 addons/multi_company/i18n/ja.po               |    6 +-
 addons/multi_company/i18n/lo.po               |    6 +-
 addons/multi_company/i18n/lt.po               |    6 +-
 addons/multi_company/i18n/lv.po               |    6 +-
 addons/multi_company/i18n/mn.po               |    6 +-
 addons/multi_company/i18n/nb.po               |    6 +-
 addons/multi_company/i18n/nl.po               |    6 +-
 addons/multi_company/i18n/oc.po               |    6 +-
 addons/multi_company/i18n/pl.po               |    6 +-
 addons/multi_company/i18n/pt.po               |    6 +-
 addons/multi_company/i18n/pt_BR.po            |   23 +-
 addons/multi_company/i18n/ro.po               |    6 +-
 addons/multi_company/i18n/ru.po               |    6 +-
 addons/multi_company/i18n/sl.po               |    6 +-
 addons/multi_company/i18n/sr.po               |    6 +-
 addons/multi_company/i18n/sr@latin.po         |    6 +-
 addons/multi_company/i18n/sv.po               |    6 +-
 addons/multi_company/i18n/tr.po               |    6 +-
 addons/multi_company/i18n/uk.po               |    6 +-
 addons/multi_company/i18n/vi.po               |    6 +-
 addons/multi_company/i18n/zh_CN.po            |   18 +-
 addons/multi_company/i18n/zh_TW.po            |    6 +-
 addons/note/i18n/de.po                        |   26 +-
 addons/note/i18n/es.po                        |   26 +-
 addons/note/i18n/fr.po                        |   24 +-
 addons/note/i18n/hr.po                        |   24 +-
 addons/note/i18n/it.po                        |   26 +-
 addons/note/i18n/nl.po                        |   26 +-
 addons/note/i18n/pl.po                        |   26 +-
 addons/note/i18n/pt.po                        |   22 +-
 addons/note/i18n/pt_BR.po                     |   24 +-
 addons/note/i18n/ro.po                        |   24 +-
 addons/note/i18n/zh_CN.po                     |   26 +-
 addons/note_pad/i18n/es.po                    |    6 +-
 addons/note_pad/i18n/hr.po                    |    6 +-
 addons/note_pad/i18n/it.po                    |    6 +-
 addons/note_pad/i18n/nl.po                    |    6 +-
 addons/note_pad/i18n/pl.po                    |    4 +-
 addons/note_pad/i18n/pt.po                    |    6 +-
 addons/note_pad/i18n/pt_BR.po                 |    6 +-
 addons/note_pad/i18n/zh_CN.po                 |    6 +-
 addons/pad/i18n/ar.po                         |   22 +-
 addons/pad/i18n/bg.po                         |   22 +-
 addons/pad/i18n/ca.po                         |   22 +-
 addons/pad/i18n/cs.po                         |   22 +-
 addons/pad/i18n/da.po                         |   22 +-
 addons/pad/i18n/de.po                         |   24 +-
 addons/pad/i18n/es.po                         |   32 +-
 addons/pad/i18n/es_CR.po                      |   22 +-
 addons/pad/i18n/fi.po                         |   22 +-
 addons/pad/i18n/fr.po                         |   22 +-
 addons/pad/i18n/gl.po                         |   22 +-
 addons/pad/i18n/hr.po                         |   26 +-
 addons/pad/i18n/hu.po                         |   22 +-
 addons/pad/i18n/it.po                         |   28 +-
 addons/pad/i18n/ja.po                         |   22 +-
 addons/pad/i18n/mn.po                         |   22 +-
 addons/pad/i18n/nb.po                         |   22 +-
 addons/pad/i18n/nl.po                         |   22 +-
 addons/pad/i18n/pl.po                         |   20 +-
 addons/pad/i18n/pt.po                         |   24 +-
 addons/pad/i18n/pt_BR.po                      |   28 +-
 addons/pad/i18n/ro.po                         |   22 +-
 addons/pad/i18n/ru.po                         |   22 +-
 addons/pad/i18n/sl.po                         |   22 +-
 addons/pad/i18n/sr@latin.po                   |   22 +-
 addons/pad/i18n/sv.po                         |   22 +-
 addons/pad/i18n/tr.po                         |   22 +-
 addons/pad/i18n/zh_CN.po                      |   30 +-
 addons/pad_project/i18n/ar.po                 |    6 +-
 addons/pad_project/i18n/cs.po                 |    6 +-
 addons/pad_project/i18n/de.po                 |    4 +-
 addons/pad_project/i18n/es.po                 |    6 +-
 addons/pad_project/i18n/es_CR.po              |    6 +-
 addons/pad_project/i18n/fi.po                 |    6 +-
 addons/pad_project/i18n/fr.po                 |    6 +-
 addons/pad_project/i18n/hr.po                 |    6 +-
 addons/pad_project/i18n/it.po                 |    6 +-
 addons/pad_project/i18n/ja.po                 |    6 +-
 addons/pad_project/i18n/mn.po                 |    6 +-
 addons/pad_project/i18n/nb.po                 |    6 +-
 addons/pad_project/i18n/nl.po                 |    6 +-
 addons/pad_project/i18n/pl.po                 |    4 +-
 addons/pad_project/i18n/pt.po                 |    6 +-
 addons/pad_project/i18n/pt_BR.po              |    6 +-
 addons/pad_project/i18n/ro.po                 |    6 +-
 addons/pad_project/i18n/ru.po                 |    6 +-
 addons/pad_project/i18n/sl.po                 |    6 +-
 addons/pad_project/i18n/sv.po                 |    6 +-
 addons/pad_project/i18n/tr.po                 |    6 +-
 addons/pad_project/i18n/zh_CN.po              |    6 +-
 addons/plugin/i18n/ar.po                      |    6 +-
 addons/plugin/i18n/cs.po                      |    6 +-
 addons/plugin/i18n/de.po                      |    6 +-
 addons/plugin/i18n/es.po                      |    6 +-
 addons/plugin/i18n/es_CR.po                   |    6 +-
 addons/plugin/i18n/fi.po                      |    6 +-
 addons/plugin/i18n/fr.po                      |    6 +-
 addons/plugin/i18n/hr.po                      |    6 +-
 addons/plugin/i18n/it.po                      |    6 +-
 addons/plugin/i18n/ja.po                      |    6 +-
 addons/plugin/i18n/mn.po                      |    6 +-
 addons/plugin/i18n/nb.po                      |    6 +-
 addons/plugin/i18n/nl.po                      |    6 +-
 addons/plugin/i18n/pt.po                      |    6 +-
 addons/plugin/i18n/pt_BR.po                   |    6 +-
 addons/plugin/i18n/ro.po                      |    6 +-
 addons/plugin/i18n/ru.po                      |    6 +-
 addons/plugin/i18n/sv.po                      |    6 +-
 addons/plugin/i18n/tr.po                      |    6 +-
 addons/plugin/i18n/zh_CN.po                   |    6 +-
 addons/plugin/i18n/zh_TW.po                   |    6 +-
 addons/plugin_outlook/i18n/ar.po              |    6 +-
 addons/plugin_outlook/i18n/bg.po              |    6 +-
 addons/plugin_outlook/i18n/ca.po              |    6 +-
 addons/plugin_outlook/i18n/da.po              |    6 +-
 addons/plugin_outlook/i18n/de.po              |    4 +-
 addons/plugin_outlook/i18n/el.po              |    6 +-
 addons/plugin_outlook/i18n/es.po              |    6 +-
 addons/plugin_outlook/i18n/es_CR.po           |    6 +-
 addons/plugin_outlook/i18n/et.po              |    6 +-
 addons/plugin_outlook/i18n/fi.po              |    6 +-
 addons/plugin_outlook/i18n/fr.po              |    6 +-
 addons/plugin_outlook/i18n/gl.po              |    6 +-
 addons/plugin_outlook/i18n/hr.po              |    6 +-
 addons/plugin_outlook/i18n/hu.po              |    6 +-
 addons/plugin_outlook/i18n/id.po              |    6 +-
 addons/plugin_outlook/i18n/it.po              |    6 +-
 addons/plugin_outlook/i18n/ja.po              |    6 +-
 addons/plugin_outlook/i18n/mn.po              |    6 +-
 addons/plugin_outlook/i18n/nb.po              |    6 +-
 addons/plugin_outlook/i18n/nl.po              |   25 +-
 addons/plugin_outlook/i18n/pl.po              |    6 +-
 addons/plugin_outlook/i18n/pt.po              |    6 +-
 addons/plugin_outlook/i18n/pt_BR.po           |    4 +-
 addons/plugin_outlook/i18n/ro.po              |    6 +-
 addons/plugin_outlook/i18n/ru.po              |    6 +-
 addons/plugin_outlook/i18n/sl.po              |    6 +-
 addons/plugin_outlook/i18n/sr@latin.po        |    6 +-
 addons/plugin_outlook/i18n/sv.po              |    6 +-
 addons/plugin_outlook/i18n/tr.po              |    6 +-
 addons/plugin_outlook/i18n/zh_CN.po           |    6 +-
 addons/plugin_thunderbird/i18n/ar.po          |    6 +-
 addons/plugin_thunderbird/i18n/bg.po          |    6 +-
 addons/plugin_thunderbird/i18n/ca.po          |    6 +-
 addons/plugin_thunderbird/i18n/cs.po          |    6 +-
 addons/plugin_thunderbird/i18n/da.po          |    6 +-
 addons/plugin_thunderbird/i18n/de.po          |    4 +-
 addons/plugin_thunderbird/i18n/en_GB.po       |    6 +-
 addons/plugin_thunderbird/i18n/en_US.po       |    6 +-
 addons/plugin_thunderbird/i18n/es.po          |    6 +-
 addons/plugin_thunderbird/i18n/es_CR.po       |    6 +-
 addons/plugin_thunderbird/i18n/et.po          |    6 +-
 addons/plugin_thunderbird/i18n/eu.po          |    6 +-
 addons/plugin_thunderbird/i18n/fi.po          |    6 +-
 addons/plugin_thunderbird/i18n/fr.po          |   31 +-
 addons/plugin_thunderbird/i18n/gl.po          |    6 +-
 addons/plugin_thunderbird/i18n/hr.po          |    6 +-
 addons/plugin_thunderbird/i18n/hu.po          |    6 +-
 addons/plugin_thunderbird/i18n/is.po          |    6 +-
 addons/plugin_thunderbird/i18n/it.po          |    6 +-
 addons/plugin_thunderbird/i18n/ja.po          |    6 +-
 addons/plugin_thunderbird/i18n/mn.po          |    6 +-
 addons/plugin_thunderbird/i18n/nb.po          |    6 +-
 addons/plugin_thunderbird/i18n/nl.po          |    6 +-
 addons/plugin_thunderbird/i18n/pl.po          |    6 +-
 addons/plugin_thunderbird/i18n/pt.po          |    6 +-
 addons/plugin_thunderbird/i18n/pt_BR.po       |    4 +-
 addons/plugin_thunderbird/i18n/ro.po          |    6 +-
 addons/plugin_thunderbird/i18n/ru.po          |    6 +-
 addons/plugin_thunderbird/i18n/sk.po          |    6 +-
 addons/plugin_thunderbird/i18n/sl.po          |    6 +-
 addons/plugin_thunderbird/i18n/sr.po          |    6 +-
 addons/plugin_thunderbird/i18n/sr@latin.po    |    6 +-
 addons/plugin_thunderbird/i18n/sv.po          |    6 +-
 addons/plugin_thunderbird/i18n/tr.po          |    6 +-
 addons/plugin_thunderbird/i18n/zh_CN.po       |    6 +-
 addons/point_of_sale/i18n/ar.po               |  112 +-
 addons/point_of_sale/i18n/bg.po               |  112 +-
 addons/point_of_sale/i18n/bs.po               |  112 +-
 addons/point_of_sale/i18n/ca.po               |  112 +-
 addons/point_of_sale/i18n/cs.po               |  112 +-
 addons/point_of_sale/i18n/da.po               |  112 +-
 addons/point_of_sale/i18n/de.po               |  110 +-
 addons/point_of_sale/i18n/el.po               |  112 +-
 addons/point_of_sale/i18n/es.po               |  112 +-
 addons/point_of_sale/i18n/es_AR.po            |  112 +-
 addons/point_of_sale/i18n/es_CR.po            |  112 +-
 addons/point_of_sale/i18n/es_EC.po            |  112 +-
 addons/point_of_sale/i18n/et.po               |  112 +-
 addons/point_of_sale/i18n/fi.po               |  112 +-
 addons/point_of_sale/i18n/fr.po               |  112 +-
 addons/point_of_sale/i18n/hi.po               |  112 +-
 addons/point_of_sale/i18n/hr.po               |  112 +-
 addons/point_of_sale/i18n/hu.po               |  112 +-
 addons/point_of_sale/i18n/id.po               |  114 +-
 addons/point_of_sale/i18n/it.po               |  112 +-
 addons/point_of_sale/i18n/ja.po               |  112 +-
 addons/point_of_sale/i18n/ko.po               |  112 +-
 addons/point_of_sale/i18n/lt.po               |  112 +-
 addons/point_of_sale/i18n/lv.po               |  112 +-
 addons/point_of_sale/i18n/mn.po               |  112 +-
 addons/point_of_sale/i18n/nb.po               |  112 +-
 addons/point_of_sale/i18n/nl.po               |  112 +-
 addons/point_of_sale/i18n/nl_BE.po            |  112 +-
 addons/point_of_sale/i18n/pl.po               |  110 +-
 addons/point_of_sale/i18n/pt.po               |  112 +-
 addons/point_of_sale/i18n/pt_BR.po            |  112 +-
 addons/point_of_sale/i18n/ro.po               |  112 +-
 addons/point_of_sale/i18n/ru.po               |  112 +-
 addons/point_of_sale/i18n/sl.po               |  112 +-
 addons/point_of_sale/i18n/sq.po               |  112 +-
 addons/point_of_sale/i18n/sr.po               |  112 +-
 addons/point_of_sale/i18n/sr@latin.po         |  112 +-
 addons/point_of_sale/i18n/sv.po               |  112 +-
 addons/point_of_sale/i18n/tlh.po              |  112 +-
 addons/point_of_sale/i18n/tr.po               |  112 +-
 addons/point_of_sale/i18n/uk.po               |  112 +-
 addons/point_of_sale/i18n/vi.po               |  112 +-
 addons/point_of_sale/i18n/zh_CN.po            |  112 +-
 addons/point_of_sale/i18n/zh_HK.po            |  112 +-
 addons/point_of_sale/i18n/zh_TW.po            |  112 +-
 addons/portal/i18n/ar.po                      |  102 +-
 addons/portal/i18n/bg.po                      |   96 +-
 addons/portal/i18n/bs.po                      |   96 +-
 addons/portal/i18n/ca.po                      |  102 +-
 addons/portal/i18n/cs.po                      |  102 +-
 addons/portal/i18n/da.po                      |   96 +-
 addons/portal/i18n/de.po                      |  118 +-
 addons/portal/i18n/es.po                      |  127 +-
 addons/portal/i18n/es_CR.po                   |  102 +-
 addons/portal/i18n/et.po                      |   96 +-
 addons/portal/i18n/fi.po                      |  102 +-
 addons/portal/i18n/fr.po                      |  102 +-
 addons/portal/i18n/hr.po                      |   98 +-
 addons/portal/i18n/hu.po                      |   96 +-
 addons/portal/i18n/id.po                      |   96 +-
 addons/portal/i18n/it.po                      |  110 +-
 addons/portal/i18n/ja.po                      |  102 +-
 addons/portal/i18n/lo.po                      |   98 +-
 addons/portal/i18n/lt.po                      |   96 +-
 addons/portal/i18n/mn.po                      |  497 +++
 addons/portal/i18n/nl.po                      |  108 +-
 addons/portal/i18n/pl.po                      |  114 +-
 addons/portal/i18n/pt.po                      |  100 +-
 addons/portal/i18n/pt_BR.po                   |  128 +-
 addons/portal/i18n/ro.po                      |  102 +-
 addons/portal/i18n/ru.po                      |   96 +-
 addons/portal/i18n/sl.po                      |   96 +-
 addons/portal/i18n/sr.po                      |  497 +++
 addons/portal/i18n/sv.po                      |   98 +-
 addons/portal/i18n/tr.po                      |  102 +-
 addons/portal/i18n/uk.po                      |   96 +-
 addons/portal/i18n/zh_CN.po                   |  106 +-
 addons/portal/i18n/zh_TW.po                   |   96 +-
 addons/portal_claim/i18n/de.po                |    6 +-
 addons/portal_claim/i18n/es.po                |    6 +-
 addons/portal_claim/i18n/fr.po                |    6 +-
 addons/portal_claim/i18n/hr.po                |    6 +-
 addons/portal_claim/i18n/it.po                |    6 +-
 addons/portal_claim/i18n/nl.po                |    6 +-
 addons/portal_claim/i18n/pl.po                |    6 +-
 addons/portal_claim/i18n/pt.po                |    4 +-
 addons/portal_claim/i18n/pt_BR.po             |    6 +-
 addons/portal_claim/i18n/zh_CN.po             |    6 +-
 addons/portal_crm/i18n/de.po                  |   12 +-
 addons/portal_crm/i18n/es.po                  |   12 +-
 addons/portal_crm/i18n/hr.po                  |   12 +-
 addons/portal_crm/i18n/nl.po                  |   12 +-
 addons/portal_crm/i18n/pl.po                  |   12 +-
 addons/portal_crm/i18n/pt.po                  |   12 +-
 addons/portal_crm/i18n/pt_BR.po               |   12 +-
 addons/portal_crm/i18n/zh_CN.po               |   12 +-
 addons/portal_event/i18n/de.po                |    6 +-
 addons/portal_event/i18n/es.po                |    6 +-
 addons/portal_event/i18n/hr.po                |    6 +-
 addons/portal_event/i18n/nl.po                |    6 +-
 addons/portal_event/i18n/pt.po                |    6 +-
 addons/portal_event/i18n/pt_BR.po             |    6 +-
 addons/portal_event/i18n/zh_CN.po             |    6 +-
 addons/portal_hr_employees/i18n/de.po         |   20 +-
 addons/portal_hr_employees/i18n/es.po         |   22 +-
 addons/portal_hr_employees/i18n/hr.po         |   20 +-
 addons/portal_hr_employees/i18n/nl.po         |   20 +-
 addons/portal_hr_employees/i18n/pl.po         |   20 +-
 addons/portal_hr_employees/i18n/pt.po         |   18 +-
 addons/portal_hr_employees/i18n/pt_BR.po      |   25 +-
 addons/portal_hr_employees/i18n/zh_CN.po      |   20 +-
 addons/portal_project/i18n/de.po              |    6 +-
 addons/portal_project/i18n/es.po              |    6 +-
 addons/portal_project/i18n/fr.po              |    6 +-
 addons/portal_project/i18n/hr.po              |    6 +-
 addons/portal_project/i18n/it.po              |    6 +-
 addons/portal_project/i18n/nl.po              |    6 +-
 addons/portal_project/i18n/pl.po              |    6 +-
 addons/portal_project/i18n/pt_BR.po           |    6 +-
 addons/portal_project/i18n/sv.po              |    6 +-
 addons/portal_project/i18n/zh_CN.po           |    6 +-
 addons/portal_project_issue/i18n/de.po        |    6 +-
 addons/portal_project_issue/i18n/es.po        |    6 +-
 addons/portal_project_issue/i18n/hr.po        |    6 +-
 addons/portal_project_issue/i18n/it.po        |    6 +-
 addons/portal_project_issue/i18n/nl.po        |    4 +-
 addons/portal_project_issue/i18n/pl.po        |    6 +-
 addons/portal_project_issue/i18n/pt_BR.po     |    6 +-
 addons/portal_project_issue/i18n/zh_CN.po     |    6 +-
 addons/portal_sale/i18n/de.po                 |  189 +-
 addons/portal_sale/i18n/es.po                 |  332 +-
 addons/portal_sale/i18n/fi.po                 |  177 +-
 addons/portal_sale/i18n/fr.po                 |  177 +-
 addons/portal_sale/i18n/hr.po                 |  177 +-
 addons/portal_sale/i18n/nl.po                 |  183 +-
 addons/portal_sale/i18n/pl.po                 |  187 +-
 addons/portal_sale/i18n/pt.po                 |  183 +-
 addons/portal_sale/i18n/pt_BR.po              |  447 +-
 addons/portal_sale/i18n/sv.po                 |  177 +-
 addons/portal_sale/i18n/zh_CN.po              |  181 +-
 addons/process/i18n/ar.po                     |    6 +-
 addons/process/i18n/bg.po                     |    6 +-
 addons/process/i18n/bs.po                     |    6 +-
 addons/process/i18n/ca.po                     |    6 +-
 addons/process/i18n/cs.po                     |    6 +-
 addons/process/i18n/da.po                     |    6 +-
 addons/process/i18n/de.po                     |    6 +-
 addons/process/i18n/el.po                     |    6 +-
 addons/process/i18n/es.po                     |    6 +-
 addons/process/i18n/es_AR.po                  |    6 +-
 addons/process/i18n/es_CL.po                  |    6 +-
 addons/process/i18n/es_CR.po                  |    6 +-
 addons/process/i18n/et.po                     |    6 +-
 addons/process/i18n/fi.po                     |    6 +-
 addons/process/i18n/fr.po                     |    6 +-
 addons/process/i18n/gl.po                     |    6 +-
 addons/process/i18n/hi.po                     |    6 +-
 addons/process/i18n/hr.po                     |    6 +-
 addons/process/i18n/hu.po                     |    6 +-
 addons/process/i18n/id.po                     |    6 +-
 addons/process/i18n/it.po                     |    6 +-
 addons/process/i18n/ja.po                     |    6 +-
 addons/process/i18n/ko.po                     |    6 +-
 addons/process/i18n/lt.po                     |    6 +-
 addons/process/i18n/mn.po                     |    6 +-
 addons/process/i18n/nl.po                     |    6 +-
 addons/process/i18n/nl_BE.po                  |    6 +-
 addons/process/i18n/pl.po                     |    6 +-
 addons/process/i18n/pt.po                     |    6 +-
 addons/process/i18n/pt_BR.po                  |   10 +-
 addons/process/i18n/ro.po                     |    6 +-
 addons/process/i18n/ru.po                     |    6 +-
 addons/process/i18n/sk.po                     |    6 +-
 addons/process/i18n/sl.po                     |    6 +-
 addons/process/i18n/sq.po                     |    6 +-
 addons/process/i18n/sr.po                     |    6 +-
 addons/process/i18n/sr@latin.po               |    6 +-
 addons/process/i18n/sv.po                     |    6 +-
 addons/process/i18n/tlh.po                    |    6 +-
 addons/process/i18n/tr.po                     |    6 +-
 addons/process/i18n/uk.po                     |    6 +-
 addons/process/i18n/vi.po                     |    6 +-
 addons/process/i18n/zh_CN.po                  |    6 +-
 addons/process/i18n/zh_TW.po                  |    6 +-
 addons/procurement/i18n/ar.po                 |  184 +-
 addons/procurement/i18n/bg.po                 |  149 +-
 addons/procurement/i18n/ca.po                 |  166 +-
 addons/procurement/i18n/cs.po                 |  166 +-
 addons/procurement/i18n/da.po                 |  140 +-
 addons/procurement/i18n/de.po                 |  181 +-
 addons/procurement/i18n/es.po                 |  166 +-
 addons/procurement/i18n/es_CL.po              |  148 +-
 addons/procurement/i18n/es_CR.po              |  166 +-
 addons/procurement/i18n/es_EC.po              |  148 +-
 addons/procurement/i18n/et.po                 |  129 +-
 addons/procurement/i18n/fi.po                 |  166 +-
 addons/procurement/i18n/fr.po                 |  166 +-
 addons/procurement/i18n/gl.po                 |  166 +-
 addons/procurement/i18n/hr.po                 |  140 +-
 addons/procurement/i18n/hu.po                 |  149 +-
 addons/procurement/i18n/id.po                 |  155 +-
 addons/procurement/i18n/it.po                 |  158 +-
 addons/procurement/i18n/ja.po                 |  166 +-
 addons/procurement/i18n/mn.po                 |  166 +-
 addons/procurement/i18n/nb.po                 |  131 +-
 addons/procurement/i18n/nl.po                 |  168 +-
 addons/procurement/i18n/pl.po                 |  166 +-
 addons/procurement/i18n/pt.po                 |  166 +-
 addons/procurement/i18n/pt_BR.po              |  164 +-
 addons/procurement/i18n/ro.po                 |  166 +-
 addons/procurement/i18n/ru.po                 |  166 +-
 addons/procurement/i18n/sr.po                 |  160 +-
 addons/procurement/i18n/sr@latin.po           |  160 +-
 addons/procurement/i18n/sv.po                 |  166 +-
 addons/procurement/i18n/tr.po                 |  166 +-
 addons/procurement/i18n/vi.po                 |  144 +-
 addons/procurement/i18n/zh_CN.po              |  166 +-
 addons/product/i18n/ar.po                     |  141 +-
 addons/product/i18n/bg.po                     |  137 +-
 addons/product/i18n/bs.po                     |  128 +-
 addons/product/i18n/ca.po                     |  140 +-
 addons/product/i18n/cs.po                     |  137 +-
 addons/product/i18n/da.po                     |  122 +-
 addons/product/i18n/de.po                     |  194 +-
 addons/product/i18n/el.po                     |  140 +-
 addons/product/i18n/es.po                     |  154 +-
 addons/product/i18n/es_AR.po                  |  128 +-
 addons/product/i18n/es_CL.po                  |  140 +-
 addons/product/i18n/es_CR.po                  |  146 +-
 addons/product/i18n/es_EC.po                  |  146 +-
 addons/product/i18n/es_PY.po                  |  137 +-
 addons/product/i18n/et.po                     |  130 +-
 addons/product/i18n/eu.po                     |  125 +-
 addons/product/i18n/fi.po                     |  146 +-
 addons/product/i18n/fr.po                     |  351 +-
 addons/product/i18n/gl.po                     |  122 +-
 addons/product/i18n/hr.po                     |  140 +-
 addons/product/i18n/hu.po                     |  143 +-
 addons/product/i18n/id.po                     |  137 +-
 addons/product/i18n/it.po                     |  152 +-
 addons/product/i18n/ja.po                     |  143 +-
 addons/product/i18n/ko.po                     |  128 +-
 addons/product/i18n/lt.po                     |  128 +-
 addons/product/i18n/lv.po                     |  137 +-
 addons/product/i18n/mn.po                     |  146 +-
 addons/product/i18n/nb.po                     |  143 +-
 addons/product/i18n/nl.po                     |  156 +-
 addons/product/i18n/nl_BE.po                  |  143 +-
 addons/product/i18n/pl.po                     |  150 +-
 addons/product/i18n/pt.po                     |  146 +-
 addons/product/i18n/pt_BR.po                  |  154 +-
 addons/product/i18n/ro.po                     |  146 +-
 addons/product/i18n/ru.po                     |  150 +-
 addons/product/i18n/sk.po                     |  140 +-
 addons/product/i18n/sl.po                     |  143 +-
 addons/product/i18n/sq.po                     |  122 +-
 addons/product/i18n/sr.po                     |  140 +-
 addons/product/i18n/sr@latin.po               |  140 +-
 addons/product/i18n/sv.po                     |  146 +-
 addons/product/i18n/th.po                     |  125 +-
 addons/product/i18n/tlh.po                    |  122 +-
 addons/product/i18n/tr.po                     |  146 +-
 addons/product/i18n/uk.po                     |  125 +-
 addons/product/i18n/vi.po                     |  136 +-
 addons/product/i18n/zh_CN.po                  |  150 +-
 addons/product/i18n/zh_TW.po                  |  133 +-
 addons/product_expiry/i18n/ar.po              |    6 +-
 addons/product_expiry/i18n/ca.po              |    6 +-
 addons/product_expiry/i18n/da.po              |    6 +-
 addons/product_expiry/i18n/de.po              |    6 +-
 addons/product_expiry/i18n/el.po              |    6 +-
 addons/product_expiry/i18n/es.po              |    6 +-
 addons/product_expiry/i18n/es_CR.po           |    6 +-
 addons/product_expiry/i18n/es_EC.po           |    6 +-
 addons/product_expiry/i18n/et.po              |    6 +-
 addons/product_expiry/i18n/fi.po              |    6 +-
 addons/product_expiry/i18n/fr.po              |    8 +-
 addons/product_expiry/i18n/gl.po              |    6 +-
 addons/product_expiry/i18n/hr.po              |    6 +-
 addons/product_expiry/i18n/hu.po              |    6 +-
 addons/product_expiry/i18n/it.po              |    6 +-
 addons/product_expiry/i18n/ja.po              |    6 +-
 addons/product_expiry/i18n/mn.po              |    8 +-
 addons/product_expiry/i18n/nl.po              |    6 +-
 addons/product_expiry/i18n/pl.po              |    6 +-
 addons/product_expiry/i18n/pt.po              |    6 +-
 addons/product_expiry/i18n/pt_BR.po           |    4 +-
 addons/product_expiry/i18n/ro.po              |    6 +-
 addons/product_expiry/i18n/ru.po              |    6 +-
 addons/product_expiry/i18n/sl.po              |    6 +-
 addons/product_expiry/i18n/sr.po              |    6 +-
 addons/product_expiry/i18n/sr@latin.po        |    6 +-
 addons/product_expiry/i18n/sv.po              |    6 +-
 addons/product_expiry/i18n/tr.po              |    6 +-
 addons/product_expiry/i18n/vi.po              |    6 +-
 addons/product_expiry/i18n/zh_CN.po           |    6 +-
 addons/product_manufacturer/i18n/ar.po        |    6 +-
 addons/product_manufacturer/i18n/bg.po        |    6 +-
 addons/product_manufacturer/i18n/ca.po        |    6 +-
 addons/product_manufacturer/i18n/da.po        |    6 +-
 addons/product_manufacturer/i18n/de.po        |    6 +-
 addons/product_manufacturer/i18n/el.po        |    6 +-
 addons/product_manufacturer/i18n/es.po        |    6 +-
 addons/product_manufacturer/i18n/es_CR.po     |    6 +-
 addons/product_manufacturer/i18n/es_EC.po     |    6 +-
 addons/product_manufacturer/i18n/et.po        |    6 +-
 addons/product_manufacturer/i18n/fi.po        |    6 +-
 addons/product_manufacturer/i18n/fr.po        |    6 +-
 addons/product_manufacturer/i18n/gl.po        |    6 +-
 addons/product_manufacturer/i18n/hr.po        |    6 +-
 addons/product_manufacturer/i18n/hu.po        |    6 +-
 addons/product_manufacturer/i18n/it.po        |    6 +-
 addons/product_manufacturer/i18n/ja.po        |    6 +-
 addons/product_manufacturer/i18n/mn.po        |    6 +-
 addons/product_manufacturer/i18n/nb.po        |    6 +-
 addons/product_manufacturer/i18n/nl.po        |    6 +-
 addons/product_manufacturer/i18n/pl.po        |    6 +-
 addons/product_manufacturer/i18n/pt.po        |    6 +-
 addons/product_manufacturer/i18n/pt_BR.po     |    6 +-
 addons/product_manufacturer/i18n/ro.po        |    6 +-
 addons/product_manufacturer/i18n/ru.po        |    6 +-
 addons/product_manufacturer/i18n/sl.po        |    6 +-
 addons/product_manufacturer/i18n/sr.po        |    6 +-
 addons/product_manufacturer/i18n/sr@latin.po  |    6 +-
 addons/product_manufacturer/i18n/sv.po        |    6 +-
 addons/product_manufacturer/i18n/tr.po        |    6 +-
 addons/product_manufacturer/i18n/zh_CN.po     |    6 +-
 addons/product_margin/i18n/ar.po              |  118 +-
 addons/product_margin/i18n/bg.po              |  116 +-
 addons/product_margin/i18n/bs.po              |   90 +-
 addons/product_margin/i18n/ca.po              |  120 +-
 addons/product_margin/i18n/cs.po              |  114 +-
 addons/product_margin/i18n/da.po              |   90 +-
 addons/product_margin/i18n/de.po              |  120 +-
 addons/product_margin/i18n/el.po              |  120 +-
 addons/product_margin/i18n/es.po              |  124 +-
 addons/product_margin/i18n/es_AR.po           |  116 +-
 addons/product_margin/i18n/es_CR.po           |  120 +-
 addons/product_margin/i18n/es_EC.po           |  116 +-
 addons/product_margin/i18n/et.po              |  116 +-
 addons/product_margin/i18n/fi.po              |  120 +-
 addons/product_margin/i18n/fr.po              |  120 +-
 addons/product_margin/i18n/gl.po              |  120 +-
 addons/product_margin/i18n/gu.po              |   90 +-
 addons/product_margin/i18n/hr.po              |  118 +-
 addons/product_margin/i18n/hu.po              |  118 +-
 addons/product_margin/i18n/id.po              |   90 +-
 addons/product_margin/i18n/it.po              |  124 +-
 addons/product_margin/i18n/ja.po              |  120 +-
 addons/product_margin/i18n/ko.po              |  108 +-
 addons/product_margin/i18n/lt.po              |   90 +-
 addons/product_margin/i18n/nl.po              |  120 +-
 addons/product_margin/i18n/nl_BE.po           |   90 +-
 addons/product_margin/i18n/pl.po              |  116 +-
 addons/product_margin/i18n/pt.po              |  120 +-
 addons/product_margin/i18n/pt_BR.po           |  124 +-
 addons/product_margin/i18n/ro.po              |  120 +-
 addons/product_margin/i18n/ru.po              |  120 +-
 addons/product_margin/i18n/sl.po              |   98 +-
 addons/product_margin/i18n/sq.po              |   90 +-
 addons/product_margin/i18n/sr.po              |  120 +-
 addons/product_margin/i18n/sr@latin.po        |  120 +-
 addons/product_margin/i18n/sv.po              |  102 +-
 addons/product_margin/i18n/tlh.po             |   90 +-
 addons/product_margin/i18n/tr.po              |  120 +-
 addons/product_margin/i18n/uk.po              |   90 +-
 addons/product_margin/i18n/vi.po              |   90 +-
 addons/product_margin/i18n/zh_CN.po           |  120 +-
 addons/product_margin/i18n/zh_TW.po           |   90 +-
 addons/product_visible_discount/i18n/ar.po    |    6 +-
 addons/product_visible_discount/i18n/bg.po    |    6 +-
 addons/product_visible_discount/i18n/ca.po    |    6 +-
 addons/product_visible_discount/i18n/da.po    |    6 +-
 addons/product_visible_discount/i18n/de.po    |    6 +-
 addons/product_visible_discount/i18n/el.po    |    6 +-
 addons/product_visible_discount/i18n/es.po    |    6 +-
 addons/product_visible_discount/i18n/es_CR.po |    6 +-
 addons/product_visible_discount/i18n/es_EC.po |    6 +-
 addons/product_visible_discount/i18n/et.po    |    6 +-
 addons/product_visible_discount/i18n/fi.po    |    6 +-
 addons/product_visible_discount/i18n/fr.po    |    6 +-
 addons/product_visible_discount/i18n/gl.po    |    6 +-
 addons/product_visible_discount/i18n/hr.po    |    6 +-
 addons/product_visible_discount/i18n/hu.po    |    6 +-
 addons/product_visible_discount/i18n/it.po    |    6 +-
 addons/product_visible_discount/i18n/ja.po    |    6 +-
 addons/product_visible_discount/i18n/lt.po    |    6 +-
 addons/product_visible_discount/i18n/mn.po    |    6 +-
 addons/product_visible_discount/i18n/nl.po    |    6 +-
 addons/product_visible_discount/i18n/pl.po    |    6 +-
 addons/product_visible_discount/i18n/pt.po    |    6 +-
 addons/product_visible_discount/i18n/pt_BR.po |    6 +-
 addons/product_visible_discount/i18n/ro.po    |    6 +-
 addons/product_visible_discount/i18n/ru.po    |    6 +-
 addons/product_visible_discount/i18n/sl.po    |    6 +-
 addons/product_visible_discount/i18n/sr.po    |    6 +-
 .../product_visible_discount/i18n/sr@latin.po |    6 +-
 addons/product_visible_discount/i18n/sv.po    |    6 +-
 addons/product_visible_discount/i18n/tr.po    |    6 +-
 addons/product_visible_discount/i18n/vi.po    |    6 +-
 addons/product_visible_discount/i18n/zh_CN.po |    6 +-
 addons/project/i18n/ar.po                     |  256 +-
 addons/project/i18n/bg.po                     |  245 +-
 addons/project/i18n/bs.po                     |  245 +-
 addons/project/i18n/ca.po                     |  251 +-
 addons/project/i18n/cs.po                     |  251 +-
 addons/project/i18n/da.po                     |  245 +-
 addons/project/i18n/de.po                     |  297 +-
 addons/project/i18n/el.po                     |  245 +-
 addons/project/i18n/es.po                     |  270 +-
 addons/project/i18n/es_AR.po                  |  245 +-
 addons/project/i18n/es_CR.po                  |  256 +-
 addons/project/i18n/es_EC.po                  |  256 +-
 addons/project/i18n/es_MX.po                  |  258 +-
 addons/project/i18n/es_PY.po                  |  245 +-
 addons/project/i18n/et.po                     |  245 +-
 addons/project/i18n/eu.po                     |  245 +-
 addons/project/i18n/fi.po                     |  256 +-
 addons/project/i18n/fr.po                     |  256 +-
 addons/project/i18n/gl.po                     |  245 +-
 addons/project/i18n/gu.po                     |  245 +-
 addons/project/i18n/hr.po                     |  245 +-
 addons/project/i18n/hu.po                     |  253 +-
 addons/project/i18n/id.po                     |  245 +-
 addons/project/i18n/it.po                     |  258 +-
 addons/project/i18n/ja.po                     |  256 +-
 addons/project/i18n/ko.po                     |  245 +-
 addons/project/i18n/lt.po                     |  251 +-
 addons/project/i18n/lv.po                     |  251 +-
 addons/project/i18n/mn.po                     |  256 +-
 addons/project/i18n/nb.po                     |  251 +-
 addons/project/i18n/nl.po                     |  254 +-
 addons/project/i18n/nl_BE.po                  |  251 +-
 addons/project/i18n/pl.po                     |  259 +-
 addons/project/i18n/pt.po                     |  258 +-
 addons/project/i18n/pt_BR.po                  |  347 +-
 addons/project/i18n/ro.po                     |  256 +-
 addons/project/i18n/ru.po                     |  256 +-
 addons/project/i18n/sk.po                     |  245 +-
 addons/project/i18n/sl.po                     |  245 +-
 addons/project/i18n/sq.po                     |  245 +-
 addons/project/i18n/sv.po                     |  256 +-
 addons/project/i18n/tlh.po                    |  245 +-
 addons/project/i18n/tr.po                     |  245 +-
 addons/project/i18n/uk.po                     |  245 +-
 addons/project/i18n/vi.po                     |  249 +-
 addons/project/i18n/zh_CN.po                  |  258 +-
 addons/project/i18n/zh_TW.po                  |  245 +-
 addons/project_gtd/i18n/ar.po                 |    6 +-
 addons/project_gtd/i18n/bg.po                 |    6 +-
 addons/project_gtd/i18n/bs.po                 |    6 +-
 addons/project_gtd/i18n/ca.po                 |    6 +-
 addons/project_gtd/i18n/cs.po                 |    6 +-
 addons/project_gtd/i18n/da.po                 |    6 +-
 addons/project_gtd/i18n/de.po                 |    4 +-
 addons/project_gtd/i18n/el.po                 |    6 +-
 addons/project_gtd/i18n/es.po                 |    6 +-
 addons/project_gtd/i18n/es_AR.po              |    6 +-
 addons/project_gtd/i18n/es_CR.po              |    6 +-
 addons/project_gtd/i18n/es_EC.po              |    6 +-
 addons/project_gtd/i18n/et.po                 |    6 +-
 addons/project_gtd/i18n/fi.po                 |    6 +-
 addons/project_gtd/i18n/fr.po                 |    6 +-
 addons/project_gtd/i18n/gl.po                 |    6 +-
 addons/project_gtd/i18n/hr.po                 |    6 +-
 addons/project_gtd/i18n/hu.po                 |    6 +-
 addons/project_gtd/i18n/id.po                 |    6 +-
 addons/project_gtd/i18n/it.po                 |    6 +-
 addons/project_gtd/i18n/ja.po                 |    6 +-
 addons/project_gtd/i18n/ko.po                 |    6 +-
 addons/project_gtd/i18n/lt.po                 |    6 +-
 addons/project_gtd/i18n/lv.po                 |    6 +-
 addons/project_gtd/i18n/mn.po                 |    6 +-
 addons/project_gtd/i18n/nl.po                 |    6 +-
 addons/project_gtd/i18n/nl_BE.po              |    6 +-
 addons/project_gtd/i18n/pl.po                 |    6 +-
 addons/project_gtd/i18n/pt.po                 |    6 +-
 addons/project_gtd/i18n/pt_BR.po              |   29 +-
 addons/project_gtd/i18n/ro.po                 |    6 +-
 addons/project_gtd/i18n/ru.po                 |    6 +-
 addons/project_gtd/i18n/sl.po                 |    6 +-
 addons/project_gtd/i18n/sq.po                 |    6 +-
 addons/project_gtd/i18n/sv.po                 |    6 +-
 addons/project_gtd/i18n/tlh.po                |    6 +-
 addons/project_gtd/i18n/tr.po                 |    6 +-
 addons/project_gtd/i18n/uk.po                 |    6 +-
 addons/project_gtd/i18n/vi.po                 |    6 +-
 addons/project_gtd/i18n/zh_CN.po              |    6 +-
 addons/project_gtd/i18n/zh_TW.po              |    6 +-
 addons/project_issue/i18n/ar.po               |  175 +-
 addons/project_issue/i18n/ca.po               |  175 +-
 addons/project_issue/i18n/da.po               |  162 +-
 addons/project_issue/i18n/de.po               |  192 +-
 addons/project_issue/i18n/es.po               |  185 +-
 addons/project_issue/i18n/es_CR.po            |  175 +-
 addons/project_issue/i18n/fi.po               |  175 +-
 addons/project_issue/i18n/fr.po               |  175 +-
 addons/project_issue/i18n/hr.po               |  164 +-
 addons/project_issue/i18n/hu.po               |  173 +-
 addons/project_issue/i18n/it.po               |  175 +-
 addons/project_issue/i18n/ja.po               |  175 +-
 addons/project_issue/i18n/lt.po               |  162 +-
 addons/project_issue/i18n/lv.po               |  175 +-
 addons/project_issue/i18n/mn.po               |  175 +-
 addons/project_issue/i18n/nb.po               |  175 +-
 addons/project_issue/i18n/nl.po               |  177 +-
 addons/project_issue/i18n/nl_BE.po            |  175 +-
 addons/project_issue/i18n/pl.po               |  173 +-
 addons/project_issue/i18n/pt.po               |  175 +-
 addons/project_issue/i18n/pt_BR.po            |  197 +-
 addons/project_issue/i18n/ro.po               |  175 +-
 addons/project_issue/i18n/ru.po               |  175 +-
 addons/project_issue/i18n/sv.po               |  175 +-
 addons/project_issue/i18n/tr.po               |  162 +-
 addons/project_issue/i18n/zh_CN.po            |  175 +-
 addons/project_issue_sheet/i18n/ar.po         |    6 +-
 addons/project_issue_sheet/i18n/ca.po         |    6 +-
 addons/project_issue_sheet/i18n/da.po         |    6 +-
 addons/project_issue_sheet/i18n/de.po         |    6 +-
 addons/project_issue_sheet/i18n/es.po         |    6 +-
 addons/project_issue_sheet/i18n/es_CR.po      |    6 +-
 addons/project_issue_sheet/i18n/fi.po         |    6 +-
 addons/project_issue_sheet/i18n/fr.po         |    6 +-
 addons/project_issue_sheet/i18n/gl.po         |    6 +-
 addons/project_issue_sheet/i18n/hr.po         |    6 +-
 addons/project_issue_sheet/i18n/hu.po         |    6 +-
 addons/project_issue_sheet/i18n/it.po         |    6 +-
 addons/project_issue_sheet/i18n/ja.po         |    6 +-
 addons/project_issue_sheet/i18n/lv.po         |    6 +-
 addons/project_issue_sheet/i18n/mn.po         |    6 +-
 addons/project_issue_sheet/i18n/nl.po         |    6 +-
 addons/project_issue_sheet/i18n/pl.po         |    6 +-
 addons/project_issue_sheet/i18n/pt.po         |    6 +-
 addons/project_issue_sheet/i18n/pt_BR.po      |   19 +-
 addons/project_issue_sheet/i18n/ro.po         |    6 +-
 addons/project_issue_sheet/i18n/ru.po         |    6 +-
 addons/project_issue_sheet/i18n/sv.po         |    6 +-
 addons/project_issue_sheet/i18n/tr.po         |    6 +-
 addons/project_issue_sheet/i18n/zh_CN.po      |    6 +-
 addons/project_long_term/i18n/ar.po           |   51 +-
 addons/project_long_term/i18n/ca.po           |   46 +-
 addons/project_long_term/i18n/da.po           |   40 +-
 addons/project_long_term/i18n/de.po           |   49 +-
 addons/project_long_term/i18n/es.po           |   53 +-
 addons/project_long_term/i18n/es_CR.po        |   51 +-
 addons/project_long_term/i18n/es_EC.po        |   51 +-
 addons/project_long_term/i18n/fi.po           |   51 +-
 addons/project_long_term/i18n/fr.po           |   51 +-
 addons/project_long_term/i18n/hr.po           |   46 +-
 addons/project_long_term/i18n/hu.po           |   46 +-
 addons/project_long_term/i18n/it.po           |   49 +-
 addons/project_long_term/i18n/ja.po           |   51 +-
 addons/project_long_term/i18n/lv.po           |   46 +-
 addons/project_long_term/i18n/mn.po           |   51 +-
 addons/project_long_term/i18n/nl.po           |   55 +-
 addons/project_long_term/i18n/pl.po           |   51 +-
 addons/project_long_term/i18n/pt.po           |   51 +-
 addons/project_long_term/i18n/pt_BR.po        |   84 +-
 addons/project_long_term/i18n/ro.po           |   51 +-
 addons/project_long_term/i18n/ru.po           |   40 +-
 addons/project_long_term/i18n/sv.po           |   51 +-
 addons/project_long_term/i18n/tr.po           |   40 +-
 addons/project_long_term/i18n/zh_CN.po        |   51 +-
 addons/project_mrp/i18n/ar.po                 |   78 +-
 addons/project_mrp/i18n/bg.po                 |   64 +-
 addons/project_mrp/i18n/bs.po                 |   62 +-
 addons/project_mrp/i18n/ca.po                 |   72 +-
 addons/project_mrp/i18n/cs.po                 |   78 +-
 addons/project_mrp/i18n/da.po                 |   62 +-
 addons/project_mrp/i18n/de.po                 |   83 +-
 addons/project_mrp/i18n/el.po                 |   70 +-
 addons/project_mrp/i18n/es.po                 |   84 +-
 addons/project_mrp/i18n/es_AR.po              |   70 +-
 addons/project_mrp/i18n/es_CR.po              |   78 +-
 addons/project_mrp/i18n/es_EC.po              |   70 +-
 addons/project_mrp/i18n/et.po                 |   65 +-
 addons/project_mrp/i18n/fi.po                 |   78 +-
 addons/project_mrp/i18n/fr.po                 |   78 +-
 addons/project_mrp/i18n/gl.po                 |   72 +-
 addons/project_mrp/i18n/gu.po                 |   62 +-
 addons/project_mrp/i18n/hr.po                 |   72 +-
 addons/project_mrp/i18n/hu.po                 |   72 +-
 addons/project_mrp/i18n/id.po                 |   62 +-
 addons/project_mrp/i18n/it.po                 |   81 +-
 addons/project_mrp/i18n/ja.po                 |   78 +-
 addons/project_mrp/i18n/ko.po                 |   70 +-
 addons/project_mrp/i18n/lt.po                 |   62 +-
 addons/project_mrp/i18n/lv.po                 |   72 +-
 addons/project_mrp/i18n/mn.po                 |   78 +-
 addons/project_mrp/i18n/nb.po                 |   72 +-
 addons/project_mrp/i18n/nl.po                 |   78 +-
 addons/project_mrp/i18n/nl_BE.po              |   62 +-
 addons/project_mrp/i18n/pl.po                 |   78 +-
 addons/project_mrp/i18n/pt.po                 |   78 +-
 addons/project_mrp/i18n/pt_BR.po              |  108 +-
 addons/project_mrp/i18n/ro.po                 |   78 +-
 addons/project_mrp/i18n/ru.po                 |   67 +-
 addons/project_mrp/i18n/sl.po                 |   70 +-
 addons/project_mrp/i18n/sq.po                 |   62 +-
 addons/project_mrp/i18n/sv.po                 |   78 +-
 addons/project_mrp/i18n/tlh.po                |   62 +-
 addons/project_mrp/i18n/tr.po                 |   78 +-
 addons/project_mrp/i18n/uk.po                 |   62 +-
 addons/project_mrp/i18n/vi.po                 |   62 +-
 addons/project_mrp/i18n/zh_CN.po              |   81 +-
 addons/project_mrp/i18n/zh_TW.po              |   62 +-
 addons/project_timesheet/i18n/ar.po           |   34 +-
 addons/project_timesheet/i18n/bg.po           |   28 +-
 addons/project_timesheet/i18n/bs.po           |   28 +-
 addons/project_timesheet/i18n/ca.po           |   34 +-
 addons/project_timesheet/i18n/cs.po           |   28 +-
 addons/project_timesheet/i18n/da.po           |   28 +-
 addons/project_timesheet/i18n/de.po           |   32 +-
 addons/project_timesheet/i18n/el.po           |   28 +-
 addons/project_timesheet/i18n/es.po           |   36 +-
 addons/project_timesheet/i18n/es_AR.po        |   28 +-
 addons/project_timesheet/i18n/es_CR.po        |   34 +-
 addons/project_timesheet/i18n/et.po           |   28 +-
 addons/project_timesheet/i18n/fi.po           |   34 +-
 addons/project_timesheet/i18n/fr.po           |   34 +-
 addons/project_timesheet/i18n/gl.po           |   28 +-
 addons/project_timesheet/i18n/hr.po           |   34 +-
 addons/project_timesheet/i18n/hu.po           |   34 +-
 addons/project_timesheet/i18n/id.po           |   28 +-
 addons/project_timesheet/i18n/it.po           |   32 +-
 addons/project_timesheet/i18n/ja.po           |   34 +-
 addons/project_timesheet/i18n/ko.po           |   28 +-
 addons/project_timesheet/i18n/lt.po           |   28 +-
 addons/project_timesheet/i18n/lv.po           |   34 +-
 addons/project_timesheet/i18n/mn.po           |   34 +-
 addons/project_timesheet/i18n/nl.po           |   34 +-
 addons/project_timesheet/i18n/nl_BE.po        |   28 +-
 addons/project_timesheet/i18n/pl.po           |   34 +-
 addons/project_timesheet/i18n/pt.po           |   34 +-
 addons/project_timesheet/i18n/pt_BR.po        |   57 +-
 addons/project_timesheet/i18n/ro.po           |   34 +-
 addons/project_timesheet/i18n/ru.po           |   28 +-
 addons/project_timesheet/i18n/sl.po           |   28 +-
 addons/project_timesheet/i18n/sq.po           |   28 +-
 addons/project_timesheet/i18n/sv.po           |   34 +-
 addons/project_timesheet/i18n/tlh.po          |   28 +-
 addons/project_timesheet/i18n/tr.po           |   28 +-
 addons/project_timesheet/i18n/uk.po           |   28 +-
 addons/project_timesheet/i18n/vi.po           |   28 +-
 addons/project_timesheet/i18n/zh_CN.po        |   34 +-
 addons/project_timesheet/i18n/zh_TW.po        |   28 +-
 addons/purchase/i18n/ar.po                    |  452 +-
 addons/purchase/i18n/bg.po                    |  438 +-
 addons/purchase/i18n/bs.po                    |  434 +-
 addons/purchase/i18n/ca.po                    |  452 +-
 addons/purchase/i18n/cs.po                    |  443 +-
 addons/purchase/i18n/da.po                    |  432 +-
 addons/purchase/i18n/de.po                    |  558 +--
 addons/purchase/i18n/el.po                    |  434 +-
 addons/purchase/i18n/en_GB.po                 |  452 +-
 addons/purchase/i18n/es.po                    |  641 ++-
 addons/purchase/i18n/es_AR.po                 |  434 +-
 addons/purchase/i18n/es_CL.po                 |  454 +-
 addons/purchase/i18n/es_CR.po                 |  452 +-
 addons/purchase/i18n/es_EC.po                 |  452 +-
 addons/purchase/i18n/et.po                    |  502 +--
 addons/purchase/i18n/fi.po                    |  452 +-
 addons/purchase/i18n/fr.po                    |  454 +-
 addons/purchase/i18n/gl.po                    |  432 +-
 addons/purchase/i18n/hr.po                    |  456 +-
 addons/purchase/i18n/hu.po                    |  454 +-
 addons/purchase/i18n/id.po                    |  454 +-
 addons/purchase/i18n/it.po                    |  554 +--
 addons/purchase/i18n/ja.po                    |  448 +-
 addons/purchase/i18n/ko.po                    |  434 +-
 addons/purchase/i18n/lt.po                    |  434 +-
 addons/purchase/i18n/lv.po                    |  443 +-
 addons/purchase/i18n/mn.po                    |  454 +-
 addons/purchase/i18n/nb.po                    |  452 +-
 addons/purchase/i18n/nl.po                    |  478 +-
 addons/purchase/i18n/nl_BE.po                 |  454 +-
 addons/purchase/i18n/pl.po                    |  481 +-
 addons/purchase/i18n/pt.po                    |  452 +-
 addons/purchase/i18n/pt_BR.po                 |  646 ++-
 addons/purchase/i18n/ro.po                    |  454 +-
 addons/purchase/i18n/ru.po                    |  468 +-
 addons/purchase/i18n/sk.po                    |  434 +-
 addons/purchase/i18n/sl.po                    |  455 +-
 addons/purchase/i18n/sq.po                    |  432 +-
 addons/purchase/i18n/sr.po                    |  434 +-
 addons/purchase/i18n/sr@latin.po              |  434 +-
 addons/purchase/i18n/sv.po                    |  511 ++-
 addons/purchase/i18n/th.po                    |  450 +-
 addons/purchase/i18n/tlh.po                   |  432 +-
 addons/purchase/i18n/tr.po                    |  452 +-
 addons/purchase/i18n/uk.po                    |  432 +-
 addons/purchase/i18n/vi.po                    |  432 +-
 addons/purchase/i18n/zh_CN.po                 |  460 +-
 addons/purchase/i18n/zh_TW.po                 |  432 +-
 addons/purchase_analytic_plans/i18n/ar.po     |    6 +-
 addons/purchase_analytic_plans/i18n/bg.po     |    6 +-
 addons/purchase_analytic_plans/i18n/bs.po     |    6 +-
 addons/purchase_analytic_plans/i18n/ca.po     |    6 +-
 addons/purchase_analytic_plans/i18n/cs.po     |    6 +-
 addons/purchase_analytic_plans/i18n/da.po     |    6 +-
 addons/purchase_analytic_plans/i18n/de.po     |    6 +-
 addons/purchase_analytic_plans/i18n/el.po     |    6 +-
 addons/purchase_analytic_plans/i18n/es.po     |    6 +-
 addons/purchase_analytic_plans/i18n/es_AR.po  |    6 +-
 addons/purchase_analytic_plans/i18n/es_CR.po  |    6 +-
 addons/purchase_analytic_plans/i18n/et.po     |    6 +-
 addons/purchase_analytic_plans/i18n/fi.po     |    6 +-
 addons/purchase_analytic_plans/i18n/fr.po     |    6 +-
 addons/purchase_analytic_plans/i18n/gl.po     |    6 +-
 addons/purchase_analytic_plans/i18n/hr.po     |    6 +-
 addons/purchase_analytic_plans/i18n/hu.po     |    6 +-
 addons/purchase_analytic_plans/i18n/id.po     |    6 +-
 addons/purchase_analytic_plans/i18n/it.po     |    6 +-
 addons/purchase_analytic_plans/i18n/ja.po     |    6 +-
 addons/purchase_analytic_plans/i18n/ko.po     |    6 +-
 addons/purchase_analytic_plans/i18n/lt.po     |    6 +-
 addons/purchase_analytic_plans/i18n/mn.po     |    6 +-
 addons/purchase_analytic_plans/i18n/nl.po     |    6 +-
 addons/purchase_analytic_plans/i18n/nl_BE.po  |    6 +-
 addons/purchase_analytic_plans/i18n/pl.po     |    6 +-
 addons/purchase_analytic_plans/i18n/pt.po     |    6 +-
 addons/purchase_analytic_plans/i18n/pt_BR.po  |    6 +-
 addons/purchase_analytic_plans/i18n/ro.po     |    6 +-
 addons/purchase_analytic_plans/i18n/ru.po     |    6 +-
 addons/purchase_analytic_plans/i18n/sl.po     |    6 +-
 addons/purchase_analytic_plans/i18n/sq.po     |    6 +-
 addons/purchase_analytic_plans/i18n/sr.po     |    6 +-
 .../purchase_analytic_plans/i18n/sr@latin.po  |    6 +-
 addons/purchase_analytic_plans/i18n/sv.po     |    6 +-
 addons/purchase_analytic_plans/i18n/tlh.po    |    6 +-
 addons/purchase_analytic_plans/i18n/tr.po     |    6 +-
 addons/purchase_analytic_plans/i18n/uk.po     |    6 +-
 addons/purchase_analytic_plans/i18n/ur.po     |    6 +-
 addons/purchase_analytic_plans/i18n/vi.po     |    6 +-
 addons/purchase_analytic_plans/i18n/zh_CN.po  |    6 +-
 addons/purchase_analytic_plans/i18n/zh_TW.po  |    6 +-
 addons/purchase_double_validation/i18n/ar.po  |    6 +-
 addons/purchase_double_validation/i18n/bg.po  |    6 +-
 addons/purchase_double_validation/i18n/ca.po  |    6 +-
 addons/purchase_double_validation/i18n/da.po  |    6 +-
 addons/purchase_double_validation/i18n/de.po  |    6 +-
 addons/purchase_double_validation/i18n/es.po  |    6 +-
 .../purchase_double_validation/i18n/es_CR.po  |    6 +-
 .../purchase_double_validation/i18n/es_EC.po  |    6 +-
 addons/purchase_double_validation/i18n/fi.po  |    6 +-
 addons/purchase_double_validation/i18n/fr.po  |    6 +-
 addons/purchase_double_validation/i18n/gl.po  |    6 +-
 addons/purchase_double_validation/i18n/hr.po  |    6 +-
 addons/purchase_double_validation/i18n/hu.po  |    6 +-
 addons/purchase_double_validation/i18n/it.po  |    6 +-
 addons/purchase_double_validation/i18n/ja.po  |    6 +-
 addons/purchase_double_validation/i18n/nl.po  |    6 +-
 addons/purchase_double_validation/i18n/pl.po  |    6 +-
 addons/purchase_double_validation/i18n/pt.po  |    6 +-
 .../purchase_double_validation/i18n/pt_BR.po  |    4 +-
 addons/purchase_double_validation/i18n/ro.po  |    6 +-
 addons/purchase_double_validation/i18n/ru.po  |    6 +-
 addons/purchase_double_validation/i18n/sv.po  |    6 +-
 addons/purchase_double_validation/i18n/tr.po  |    6 +-
 .../purchase_double_validation/i18n/zh_CN.po  |    6 +-
 addons/purchase_requisition/i18n/ar.po        |  628 ++-
 addons/purchase_requisition/i18n/bg.po        |  614 ++-
 addons/purchase_requisition/i18n/ca.po        |  638 ++-
 addons/purchase_requisition/i18n/da.po        |  646 ++-
 addons/purchase_requisition/i18n/de.po        |  656 ++-
 addons/purchase_requisition/i18n/es.po        |  650 ++-
 addons/purchase_requisition/i18n/es_CR.po     |  632 ++-
 addons/purchase_requisition/i18n/fi.po        |  620 ++-
 addons/purchase_requisition/i18n/fr.po        |  640 ++-
 addons/purchase_requisition/i18n/hr.po        |  636 ++-
 addons/purchase_requisition/i18n/hu.po        |  636 ++-
 addons/purchase_requisition/i18n/id.po        |  632 ++-
 addons/purchase_requisition/i18n/it.po        |  636 ++-
 addons/purchase_requisition/i18n/ja.po        |  624 ++-
 addons/purchase_requisition/i18n/nb.po        |  620 ++-
 addons/purchase_requisition/i18n/nl.po        |  692 ++-
 addons/purchase_requisition/i18n/pl.po        |  652 ++-
 addons/purchase_requisition/i18n/pt.po        |  686 ++-
 addons/purchase_requisition/i18n/pt_BR.po     |  650 ++-
 addons/purchase_requisition/i18n/ro.po        |  634 ++-
 addons/purchase_requisition/i18n/ru.po        |  694 ++-
 addons/purchase_requisition/i18n/sv.po        |  614 ++-
 addons/purchase_requisition/i18n/tr.po        |  632 ++-
 addons/purchase_requisition/i18n/zh_CN.po     |  680 ++-
 addons/report_intrastat/i18n/ar.po            |    6 +-
 addons/report_intrastat/i18n/bg.po            |    6 +-
 addons/report_intrastat/i18n/bs.po            |    6 +-
 addons/report_intrastat/i18n/ca.po            |    6 +-
 addons/report_intrastat/i18n/cs.po            |    6 +-
 addons/report_intrastat/i18n/da.po            |    6 +-
 addons/report_intrastat/i18n/de.po            |    6 +-
 addons/report_intrastat/i18n/es.po            |    6 +-
 addons/report_intrastat/i18n/es_AR.po         |    6 +-
 addons/report_intrastat/i18n/es_CR.po         |    6 +-
 addons/report_intrastat/i18n/et.po            |    6 +-
 addons/report_intrastat/i18n/fi.po            |    6 +-
 addons/report_intrastat/i18n/fr.po            |    6 +-
 addons/report_intrastat/i18n/hr.po            |    6 +-
 addons/report_intrastat/i18n/hu.po            |    6 +-
 addons/report_intrastat/i18n/id.po            |    6 +-
 addons/report_intrastat/i18n/it.po            |    6 +-
 addons/report_intrastat/i18n/ja.po            |    6 +-
 addons/report_intrastat/i18n/ko.po            |    6 +-
 addons/report_intrastat/i18n/lt.po            |    6 +-
 addons/report_intrastat/i18n/nl.po            |   18 +-
 addons/report_intrastat/i18n/nl_BE.po         |    6 +-
 addons/report_intrastat/i18n/pl.po            |    6 +-
 addons/report_intrastat/i18n/pt.po            |    6 +-
 addons/report_intrastat/i18n/pt_BR.po         |    6 +-
 addons/report_intrastat/i18n/ro.po            |    6 +-
 addons/report_intrastat/i18n/ru.po            |    6 +-
 addons/report_intrastat/i18n/sl.po            |    6 +-
 addons/report_intrastat/i18n/sq.po            |    6 +-
 addons/report_intrastat/i18n/sv.po            |    6 +-
 addons/report_intrastat/i18n/tlh.po           |    6 +-
 addons/report_intrastat/i18n/tr.po            |    6 +-
 addons/report_intrastat/i18n/uk.po            |    6 +-
 addons/report_intrastat/i18n/vi.po            |    6 +-
 addons/report_intrastat/i18n/zh_CN.po         |    6 +-
 addons/report_intrastat/i18n/zh_TW.po         |    6 +-
 addons/report_webkit/i18n/ar.po               |   49 +-
 addons/report_webkit/i18n/bg.po               |   51 +-
 addons/report_webkit/i18n/ca.po               |   54 +-
 addons/report_webkit/i18n/da.po               |   49 +-
 addons/report_webkit/i18n/de.po               |   64 +-
 addons/report_webkit/i18n/es.po               |   66 +-
 addons/report_webkit/i18n/es_CR.po            |   66 +-
 addons/report_webkit/i18n/fi.po               |   54 +-
 addons/report_webkit/i18n/fr.po               |   66 +-
 addons/report_webkit/i18n/hr.po               |   54 +-
 addons/report_webkit/i18n/hu.po               |   51 +-
 addons/report_webkit/i18n/it.po               |   66 +-
 addons/report_webkit/i18n/ja.po               |   62 +-
 addons/report_webkit/i18n/nl.po               |   66 +-
 addons/report_webkit/i18n/pl.po               |   52 +-
 addons/report_webkit/i18n/pt.po               |   51 +-
 addons/report_webkit/i18n/pt_BR.po            |   51 +-
 addons/report_webkit/i18n/ro.po               |   66 +-
 addons/report_webkit/i18n/ru.po               |   66 +-
 addons/report_webkit/i18n/sv.po               |   51 +-
 addons/report_webkit/i18n/tr.po               |   49 +-
 addons/report_webkit/i18n/zh_CN.po            |   60 +-
 addons/resource/i18n/ar.po                    |   12 +-
 addons/resource/i18n/bg.po                    |   12 +-
 addons/resource/i18n/ca.po                    |   12 +-
 addons/resource/i18n/cs.po                    |   12 +-
 addons/resource/i18n/da.po                    |   12 +-
 addons/resource/i18n/de.po                    |   12 +-
 addons/resource/i18n/es.po                    |   12 +-
 addons/resource/i18n/es_CR.po                 |   12 +-
 addons/resource/i18n/es_EC.po                 |   12 +-
 addons/resource/i18n/et.po                    |   12 +-
 addons/resource/i18n/fi.po                    |   12 +-
 addons/resource/i18n/fr.po                    |   12 +-
 addons/resource/i18n/gl.po                    |   12 +-
 addons/resource/i18n/hr.po                    |   12 +-
 addons/resource/i18n/hu.po                    |   12 +-
 addons/resource/i18n/it.po                    |   12 +-
 addons/resource/i18n/ja.po                    |   12 +-
 addons/resource/i18n/lt.po                    |   12 +-
 addons/resource/i18n/mn.po                    |   12 +-
 addons/resource/i18n/nl.po                    |   10 +-
 addons/resource/i18n/pl.po                    |   12 +-
 addons/resource/i18n/pt.po                    |   12 +-
 addons/resource/i18n/pt_BR.po                 |   10 +-
 addons/resource/i18n/ro.po                    |   12 +-
 addons/resource/i18n/ru.po                    |   12 +-
 addons/resource/i18n/sl.po                    |   12 +-
 addons/resource/i18n/sv.po                    |   12 +-
 addons/resource/i18n/tr.po                    |   12 +-
 addons/resource/i18n/vi.po                    |   12 +-
 addons/resource/i18n/zh_CN.po                 |   12 +-
 addons/sale/i18n/ar.po                        | 3151 +++++++------
 addons/sale/i18n/bg.po                        | 3126 +++++++------
 addons/sale/i18n/bs.po                        | 3084 +++++++------
 addons/sale/i18n/ca.po                        | 3166 +++++++------
 addons/sale/i18n/cs.po                        | 3129 +++++++------
 addons/sale/i18n/da.po                        | 3089 +++++++------
 addons/sale/i18n/de.po                        | 3741 ++++++++--------
 addons/sale/i18n/el.po                        | 3114 +++++++------
 addons/sale/i18n/es.po                        | 3495 +++++++--------
 addons/sale/i18n/es_AR.po                     | 3149 +++++++------
 addons/sale/i18n/es_CL.po                     | 3164 +++++++------
 addons/sale/i18n/es_CR.po                     | 3208 +++++++-------
 addons/sale/i18n/es_EC.po                     | 3122 +++++++------
 addons/sale/i18n/es_MX.po                     | 3212 +++++++-------
 addons/sale/i18n/et.po                        | 3085 +++++++------
 addons/sale/i18n/fi.po                        | 3172 +++++++-------
 addons/sale/i18n/fr.po                        | 3204 +++++++-------
 addons/sale/i18n/gl.po                        | 3075 +++++++------
 addons/sale/i18n/hr.po                        | 3685 ++++++++--------
 addons/sale/i18n/hu.po                        | 3164 +++++++------
 addons/sale/i18n/id.po                        | 3157 +++++++------
 addons/sale/i18n/is.po                        | 3082 +++++++------
 addons/sale/i18n/it.po                        | 3902 ++++++++---------
 addons/sale/i18n/ja.po                        | 3167 +++++++------
 addons/sale/i18n/ko.po                        | 3084 +++++++------
 addons/sale/i18n/lo.po                        | 3067 +++++++------
 addons/sale/i18n/lt.po                        | 3105 +++++++------
 addons/sale/i18n/lv.po                        | 3118 +++++++------
 addons/sale/i18n/mn.po                        | 3202 +++++++-------
 addons/sale/i18n/nb.po                        | 3192 +++++++-------
 addons/sale/i18n/nl.po                        | 3290 +++++++-------
 addons/sale/i18n/nl_BE.po                     | 3536 ++++++++-------
 addons/sale/i18n/oc.po                        | 3071 +++++++------
 addons/sale/i18n/pl.po                        | 3543 ++++++++-------
 addons/sale/i18n/pt.po                        | 3251 +++++++-------
 addons/sale/i18n/pt_BR.po                     | 3718 ++++++++--------
 addons/sale/i18n/ro.po                        | 3212 +++++++-------
 addons/sale/i18n/ru.po                        | 3441 +++++++--------
 addons/sale/i18n/sk.po                        | 3129 +++++++------
 addons/sale/i18n/sl.po                        | 3390 +++++++-------
 addons/sale/i18n/sq.po                        | 3067 +++++++------
 addons/sale/i18n/sr.po                        | 3124 +++++++------
 addons/sale/i18n/sr@latin.po                  | 3124 +++++++------
 addons/sale/i18n/sv.po                        | 3192 +++++++-------
 addons/sale/i18n/th.po                        | 3103 +++++++------
 addons/sale/i18n/tlh.po                       | 3067 +++++++------
 addons/sale/i18n/tr.po                        | 3214 +++++++-------
 addons/sale/i18n/uk.po                        | 3080 +++++++------
 addons/sale/i18n/vi.po                        | 3118 +++++++------
 addons/sale/i18n/zh_CN.po                     | 3277 +++++++-------
 addons/sale/i18n/zh_TW.po                     | 3084 +++++++------
 addons/sale_analytic_plans/i18n/ar.po         |    6 +-
 addons/sale_analytic_plans/i18n/bg.po         |    6 +-
 addons/sale_analytic_plans/i18n/bs.po         |    6 +-
 addons/sale_analytic_plans/i18n/ca.po         |    6 +-
 addons/sale_analytic_plans/i18n/cs.po         |    6 +-
 addons/sale_analytic_plans/i18n/da.po         |    6 +-
 addons/sale_analytic_plans/i18n/de.po         |    4 +-
 addons/sale_analytic_plans/i18n/el.po         |    6 +-
 addons/sale_analytic_plans/i18n/es.po         |    6 +-
 addons/sale_analytic_plans/i18n/es_AR.po      |    6 +-
 addons/sale_analytic_plans/i18n/es_CL.po      |    6 +-
 addons/sale_analytic_plans/i18n/es_CR.po      |    6 +-
 addons/sale_analytic_plans/i18n/et.po         |    6 +-
 addons/sale_analytic_plans/i18n/fi.po         |    6 +-
 addons/sale_analytic_plans/i18n/fr.po         |    6 +-
 addons/sale_analytic_plans/i18n/gl.po         |    6 +-
 addons/sale_analytic_plans/i18n/hr.po         |    6 +-
 addons/sale_analytic_plans/i18n/hu.po         |    6 +-
 addons/sale_analytic_plans/i18n/id.po         |    6 +-
 addons/sale_analytic_plans/i18n/it.po         |    6 +-
 addons/sale_analytic_plans/i18n/ja.po         |    6 +-
 addons/sale_analytic_plans/i18n/ko.po         |    6 +-
 addons/sale_analytic_plans/i18n/lt.po         |    6 +-
 addons/sale_analytic_plans/i18n/mn.po         |    6 +-
 addons/sale_analytic_plans/i18n/nb.po         |    6 +-
 addons/sale_analytic_plans/i18n/nl.po         |    6 +-
 addons/sale_analytic_plans/i18n/nl_BE.po      |    6 +-
 addons/sale_analytic_plans/i18n/oc.po         |    6 +-
 addons/sale_analytic_plans/i18n/pl.po         |    6 +-
 addons/sale_analytic_plans/i18n/pt.po         |    6 +-
 addons/sale_analytic_plans/i18n/pt_BR.po      |    6 +-
 addons/sale_analytic_plans/i18n/ro.po         |    6 +-
 addons/sale_analytic_plans/i18n/ru.po         |    6 +-
 addons/sale_analytic_plans/i18n/sk.po         |    6 +-
 addons/sale_analytic_plans/i18n/sl.po         |    6 +-
 addons/sale_analytic_plans/i18n/sq.po         |    6 +-
 addons/sale_analytic_plans/i18n/sr.po         |    6 +-
 addons/sale_analytic_plans/i18n/sr@latin.po   |    6 +-
 addons/sale_analytic_plans/i18n/sv.po         |    6 +-
 addons/sale_analytic_plans/i18n/tlh.po        |    6 +-
 addons/sale_analytic_plans/i18n/tr.po         |    6 +-
 addons/sale_analytic_plans/i18n/uk.po         |    6 +-
 addons/sale_analytic_plans/i18n/vi.po         |    6 +-
 addons/sale_analytic_plans/i18n/zh_CN.po      |    6 +-
 addons/sale_analytic_plans/i18n/zh_TW.po      |    6 +-
 addons/sale_crm/i18n/ar.po                    |   24 +-
 addons/sale_crm/i18n/bg.po                    |   26 +-
 addons/sale_crm/i18n/bs.po                    |   18 +-
 addons/sale_crm/i18n/ca.po                    |   26 +-
 addons/sale_crm/i18n/cs.po                    |   26 +-
 addons/sale_crm/i18n/da.po                    |   18 +-
 addons/sale_crm/i18n/de.po                    |   24 +-
 addons/sale_crm/i18n/el.po                    |   26 +-
 addons/sale_crm/i18n/es.po                    |   30 +-
 addons/sale_crm/i18n/es_AR.po                 |   18 +-
 addons/sale_crm/i18n/es_CL.po                 |   26 +-
 addons/sale_crm/i18n/es_CR.po                 |   26 +-
 addons/sale_crm/i18n/et.po                    |   18 +-
 addons/sale_crm/i18n/fi.po                    |   26 +-
 addons/sale_crm/i18n/fr.po                    |   26 +-
 addons/sale_crm/i18n/gl.po                    |   26 +-
 addons/sale_crm/i18n/hr.po                    |   22 +-
 addons/sale_crm/i18n/hu.po                    |   24 +-
 addons/sale_crm/i18n/id.po                    |   24 +-
 addons/sale_crm/i18n/it.po                    |   24 +-
 addons/sale_crm/i18n/ja.po                    |   24 +-
 addons/sale_crm/i18n/ko.po                    |   18 +-
 addons/sale_crm/i18n/lt.po                    |   18 +-
 addons/sale_crm/i18n/lv.po                    |   18 +-
 addons/sale_crm/i18n/mn.po                    |   24 +-
 addons/sale_crm/i18n/nb.po                    |   18 +-
 addons/sale_crm/i18n/nl.po                    |   24 +-
 addons/sale_crm/i18n/nl_BE.po                 |   26 +-
 addons/sale_crm/i18n/pl.po                    |   24 +-
 addons/sale_crm/i18n/pt.po                    |   26 +-
 addons/sale_crm/i18n/pt_BR.po                 |   27 +-
 addons/sale_crm/i18n/ro.po                    |   24 +-
 addons/sale_crm/i18n/ru.po                    |   24 +-
 addons/sale_crm/i18n/sk.po                    |   18 +-
 addons/sale_crm/i18n/sl.po                    |   24 +-
 addons/sale_crm/i18n/sq.po                    |   18 +-
 addons/sale_crm/i18n/sv.po                    |   24 +-
 addons/sale_crm/i18n/tlh.po                   |   18 +-
 addons/sale_crm/i18n/tr.po                    |   24 +-
 addons/sale_crm/i18n/uk.po                    |   18 +-
 addons/sale_crm/i18n/vi.po                    |   18 +-
 addons/sale_crm/i18n/zh_CN.po                 |   26 +-
 addons/sale_crm/i18n/zh_TW.po                 |   18 +-
 addons/sale_journal/i18n/ar.po                |    6 +-
 addons/sale_journal/i18n/bg.po                |    6 +-
 addons/sale_journal/i18n/bs.po                |    6 +-
 addons/sale_journal/i18n/ca.po                |    6 +-
 addons/sale_journal/i18n/cs.po                |    6 +-
 addons/sale_journal/i18n/da.po                |    6 +-
 addons/sale_journal/i18n/de.po                |    6 +-
 addons/sale_journal/i18n/el.po                |    6 +-
 addons/sale_journal/i18n/es.po                |    6 +-
 addons/sale_journal/i18n/es_AR.po             |    6 +-
 addons/sale_journal/i18n/es_CL.po             |    6 +-
 addons/sale_journal/i18n/es_CR.po             |    6 +-
 addons/sale_journal/i18n/et.po                |    6 +-
 addons/sale_journal/i18n/fi.po                |    6 +-
 addons/sale_journal/i18n/fr.po                |    6 +-
 addons/sale_journal/i18n/gl.po                |    6 +-
 addons/sale_journal/i18n/hr.po                |    4 +-
 addons/sale_journal/i18n/hu.po                |    6 +-
 addons/sale_journal/i18n/id.po                |    6 +-
 addons/sale_journal/i18n/it.po                |    6 +-
 addons/sale_journal/i18n/ja.po                |    6 +-
 addons/sale_journal/i18n/ko.po                |    6 +-
 addons/sale_journal/i18n/lt.po                |    6 +-
 addons/sale_journal/i18n/lv.po                |    6 +-
 addons/sale_journal/i18n/mn.po                |    6 +-
 addons/sale_journal/i18n/nb.po                |    6 +-
 addons/sale_journal/i18n/nl.po                |    6 +-
 addons/sale_journal/i18n/nl_BE.po             |    6 +-
 addons/sale_journal/i18n/pl.po                |    6 +-
 addons/sale_journal/i18n/pt.po                |    6 +-
 addons/sale_journal/i18n/pt_BR.po             |    6 +-
 addons/sale_journal/i18n/ro.po                |    6 +-
 addons/sale_journal/i18n/ru.po                |    6 +-
 addons/sale_journal/i18n/sk.po                |    6 +-
 addons/sale_journal/i18n/sl.po                |    6 +-
 addons/sale_journal/i18n/sq.po                |    6 +-
 addons/sale_journal/i18n/sv.po                |    6 +-
 addons/sale_journal/i18n/tlh.po               |    6 +-
 addons/sale_journal/i18n/tr.po                |    6 +-
 addons/sale_journal/i18n/uk.po                |    6 +-
 addons/sale_journal/i18n/vi.po                |    6 +-
 addons/sale_journal/i18n/zh_CN.po             |    6 +-
 addons/sale_journal/i18n/zh_TW.po             |    6 +-
 addons/sale_margin/i18n/ar.po                 |    6 +-
 addons/sale_margin/i18n/bg.po                 |    6 +-
 addons/sale_margin/i18n/ca.po                 |    6 +-
 addons/sale_margin/i18n/da.po                 |    6 +-
 addons/sale_margin/i18n/de.po                 |    4 +-
 addons/sale_margin/i18n/el.po                 |    6 +-
 addons/sale_margin/i18n/es.po                 |    6 +-
 addons/sale_margin/i18n/es_CL.po              |    6 +-
 addons/sale_margin/i18n/es_CR.po              |    6 +-
 addons/sale_margin/i18n/et.po                 |    6 +-
 addons/sale_margin/i18n/fi.po                 |    6 +-
 addons/sale_margin/i18n/fr.po                 |    6 +-
 addons/sale_margin/i18n/hr.po                 |    6 +-
 addons/sale_margin/i18n/hu.po                 |    6 +-
 addons/sale_margin/i18n/it.po                 |    6 +-
 addons/sale_margin/i18n/ja.po                 |    6 +-
 addons/sale_margin/i18n/mn.po                 |    6 +-
 addons/sale_margin/i18n/nb.po                 |    6 +-
 addons/sale_margin/i18n/nl.po                 |    6 +-
 addons/sale_margin/i18n/pl.po                 |    6 +-
 addons/sale_margin/i18n/pt.po                 |    6 +-
 addons/sale_margin/i18n/pt_BR.po              |    4 +-
 addons/sale_margin/i18n/ro.po                 |    6 +-
 addons/sale_margin/i18n/ru.po                 |    6 +-
 addons/sale_margin/i18n/sk.po                 |    6 +-
 addons/sale_margin/i18n/sl.po                 |    6 +-
 addons/sale_margin/i18n/sv.po                 |    6 +-
 addons/sale_margin/i18n/tr.po                 |    6 +-
 addons/sale_margin/i18n/zh_CN.po              |    6 +-
 addons/sale_mrp/i18n/ar.po                    |    6 +-
 addons/sale_mrp/i18n/bg.po                    |    6 +-
 addons/sale_mrp/i18n/ca.po                    |    6 +-
 addons/sale_mrp/i18n/da.po                    |    6 +-
 addons/sale_mrp/i18n/de.po                    |    4 +-
 addons/sale_mrp/i18n/es.po                    |    6 +-
 addons/sale_mrp/i18n/es_CL.po                 |    6 +-
 addons/sale_mrp/i18n/es_CR.po                 |    6 +-
 addons/sale_mrp/i18n/et.po                    |    6 +-
 addons/sale_mrp/i18n/fi.po                    |    6 +-
 addons/sale_mrp/i18n/fr.po                    |    6 +-
 addons/sale_mrp/i18n/gl.po                    |    6 +-
 addons/sale_mrp/i18n/hr.po                    |    4 +-
 addons/sale_mrp/i18n/hu.po                    |    6 +-
 addons/sale_mrp/i18n/it.po                    |    6 +-
 addons/sale_mrp/i18n/ja.po                    |    6 +-
 addons/sale_mrp/i18n/mn.po                    |    6 +-
 addons/sale_mrp/i18n/nb.po                    |    6 +-
 addons/sale_mrp/i18n/nl.po                    |    6 +-
 addons/sale_mrp/i18n/nl_BE.po                 |    6 +-
 addons/sale_mrp/i18n/pl.po                    |    6 +-
 addons/sale_mrp/i18n/pt.po                    |    6 +-
 addons/sale_mrp/i18n/pt_BR.po                 |    4 +-
 addons/sale_mrp/i18n/ro.po                    |    6 +-
 addons/sale_mrp/i18n/ru.po                    |    6 +-
 addons/sale_mrp/i18n/sl.po                    |    6 +-
 addons/sale_mrp/i18n/sr@latin.po              |    6 +-
 addons/sale_mrp/i18n/sv.po                    |    6 +-
 addons/sale_mrp/i18n/tr.po                    |    6 +-
 addons/sale_mrp/i18n/zh_CN.po                 |    6 +-
 addons/sale_order_dates/i18n/ar.po            |    6 +-
 addons/sale_order_dates/i18n/bg.po            |    6 +-
 addons/sale_order_dates/i18n/ca.po            |    6 +-
 addons/sale_order_dates/i18n/da.po            |    6 +-
 addons/sale_order_dates/i18n/de.po            |    4 +-
 addons/sale_order_dates/i18n/el.po            |    6 +-
 addons/sale_order_dates/i18n/es.po            |    6 +-
 addons/sale_order_dates/i18n/es_CL.po         |    6 +-
 addons/sale_order_dates/i18n/es_CR.po         |    6 +-
 addons/sale_order_dates/i18n/fi.po            |    6 +-
 addons/sale_order_dates/i18n/fr.po            |    6 +-
 addons/sale_order_dates/i18n/gl.po            |    6 +-
 addons/sale_order_dates/i18n/hr.po            |    4 +-
 addons/sale_order_dates/i18n/hu.po            |    6 +-
 addons/sale_order_dates/i18n/id.po            |    6 +-
 addons/sale_order_dates/i18n/it.po            |    6 +-
 addons/sale_order_dates/i18n/ja.po            |    6 +-
 addons/sale_order_dates/i18n/mn.po            |    6 +-
 addons/sale_order_dates/i18n/nb.po            |    6 +-
 addons/sale_order_dates/i18n/nl.po            |    6 +-
 addons/sale_order_dates/i18n/pl.po            |    6 +-
 addons/sale_order_dates/i18n/pt.po            |    6 +-
 addons/sale_order_dates/i18n/pt_BR.po         |    4 +-
 addons/sale_order_dates/i18n/ro.po            |    6 +-
 addons/sale_order_dates/i18n/ru.po            |    6 +-
 addons/sale_order_dates/i18n/sk.po            |    6 +-
 addons/sale_order_dates/i18n/sl.po            |    6 +-
 addons/sale_order_dates/i18n/sr@latin.po      |    6 +-
 addons/sale_order_dates/i18n/sv.po            |    6 +-
 addons/sale_order_dates/i18n/tr.po            |    6 +-
 addons/sale_order_dates/i18n/zh_CN.po         |    6 +-
 addons/sale_stock/i18n/ar.po                  |   96 +-
 addons/sale_stock/i18n/bg.po                  |   92 +-
 addons/sale_stock/i18n/bs.po                  |   92 +-
 addons/sale_stock/i18n/ca.po                  |   96 +-
 addons/sale_stock/i18n/cs.po                  |   96 +-
 addons/sale_stock/i18n/da.po                  |   92 +-
 addons/sale_stock/i18n/de.po                  |  104 +-
 addons/sale_stock/i18n/el.po                  |   92 +-
 addons/sale_stock/i18n/es.po                  |  112 +-
 addons/sale_stock/i18n/et.po                  |   92 +-
 addons/sale_stock/i18n/fi.po                  |   96 +-
 addons/sale_stock/i18n/fr.po                  |   96 +-
 addons/sale_stock/i18n/gl.po                  |   92 +-
 addons/sale_stock/i18n/hr.po                  |   98 +-
 addons/sale_stock/i18n/hu.po                  |   96 +-
 addons/sale_stock/i18n/id.po                  |   96 +-
 addons/sale_stock/i18n/is.po                  |   92 +-
 addons/sale_stock/i18n/it.po                  |  170 +-
 addons/sale_stock/i18n/ja.po                  |   96 +-
 addons/sale_stock/i18n/ko.po                  |   92 +-
 addons/sale_stock/i18n/lo.po                  |   92 +-
 addons/sale_stock/i18n/lt.po                  |   92 +-
 addons/sale_stock/i18n/lv.po                  |   92 +-
 addons/sale_stock/i18n/mn.po                  |   96 +-
 addons/sale_stock/i18n/nb.po                  |   96 +-
 addons/sale_stock/i18n/nl.po                  |  106 +-
 addons/sale_stock/i18n/oc.po                  |   92 +-
 addons/sale_stock/i18n/pl.po                  |  102 +-
 addons/sale_stock/i18n/pt.po                  |   96 +-
 addons/sale_stock/i18n/pt_BR.po               |  112 +-
 addons/sale_stock/i18n/ro.po                  |   96 +-
 addons/sale_stock/i18n/ru.po                  |   96 +-
 addons/sale_stock/i18n/sk.po                  |   92 +-
 addons/sale_stock/i18n/sl.po                  |   96 +-
 addons/sale_stock/i18n/sq.po                  |   92 +-
 addons/sale_stock/i18n/sr.po                  |   96 +-
 addons/sale_stock/i18n/sr@latin.po            |   96 +-
 addons/sale_stock/i18n/sv.po                  |   96 +-
 addons/sale_stock/i18n/th.po                  |   92 +-
 addons/sale_stock/i18n/tlh.po                 |   92 +-
 addons/sale_stock/i18n/tr.po                  |   96 +-
 addons/sale_stock/i18n/uk.po                  |   92 +-
 addons/sale_stock/i18n/vi.po                  |   92 +-
 addons/sale_stock/i18n/zh_CN.po               |   98 +-
 addons/sale_stock/i18n/zh_TW.po               |   92 +-
 addons/share/i18n/ar.po                       |   94 +-
 addons/share/i18n/bg.po                       |   94 +-
 addons/share/i18n/ca.po                       |   94 +-
 addons/share/i18n/cs.po                       |   94 +-
 addons/share/i18n/da.po                       |   94 +-
 addons/share/i18n/de.po                       |   94 +-
 addons/share/i18n/es.po                       |   96 +-
 addons/share/i18n/es_CR.po                    |   94 +-
 addons/share/i18n/et.po                       |   92 +-
 addons/share/i18n/fi.po                       |   94 +-
 addons/share/i18n/fr.po                       |   94 +-
 addons/share/i18n/gl.po                       |   94 +-
 addons/share/i18n/hr.po                       |   94 +-
 addons/share/i18n/hu.po                       |   94 +-
 addons/share/i18n/it.po                       |   94 +-
 addons/share/i18n/ja.po                       |   94 +-
 addons/share/i18n/mn.po                       |   94 +-
 addons/share/i18n/nl.po                       |   94 +-
 addons/share/i18n/pl.po                       |   94 +-
 addons/share/i18n/pt.po                       |   94 +-
 addons/share/i18n/pt_BR.po                    |   99 +-
 addons/share/i18n/ro.po                       |   94 +-
 addons/share/i18n/ru.po                       |   94 +-
 addons/share/i18n/sv.po                       |   94 +-
 addons/share/i18n/tr.po                       |   94 +-
 addons/share/i18n/zh_CN.po                    |   94 +-
 addons/stock/i18n/ar.po                       |  609 ++-
 addons/stock/i18n/bg.po                       |  570 +--
 addons/stock/i18n/bs.po                       |  543 +--
 addons/stock/i18n/ca.po                       |  609 ++-
 addons/stock/i18n/cs.po                       |  597 ++-
 addons/stock/i18n/da.po                       |  541 +--
 addons/stock/i18n/de.po                       |  643 ++-
 addons/stock/i18n/el.po                       |  597 ++-
 addons/stock/i18n/es.po                       |  625 ++-
 addons/stock/i18n/es_AR.po                    |  543 +--
 addons/stock/i18n/es_CL.po                    |  615 ++-
 addons/stock/i18n/es_CR.po                    |  615 ++-
 addons/stock/i18n/es_DO.po                    |  524 +--
 addons/stock/i18n/es_EC.po                    |  615 ++-
 addons/stock/i18n/es_MX.po                    |  524 +--
 addons/stock/i18n/es_VE.po                    |  526 +--
 addons/stock/i18n/et.po                       |  581 +--
 addons/stock/i18n/fi.po                       |  609 ++-
 addons/stock/i18n/fr.po                       |  615 ++-
 addons/stock/i18n/gl.po                       |  524 +--
 addons/stock/i18n/hr.po                       |  609 ++-
 addons/stock/i18n/hu.po                       |  592 ++-
 addons/stock/i18n/id.po                       |  574 +--
 addons/stock/i18n/it.po                       |  593 ++-
 addons/stock/i18n/ja.po                       |  611 ++-
 addons/stock/i18n/ko.po                       |  543 +--
 addons/stock/i18n/lt.po                       |  543 +--
 addons/stock/i18n/lv.po                       |  605 ++-
 addons/stock/i18n/mk.po                       |  524 +--
 addons/stock/i18n/mn.po                       |  611 ++-
 addons/stock/i18n/nb.po                       |  611 ++-
 addons/stock/i18n/nl.po                       |  627 ++-
 addons/stock/i18n/nl_BE.po                    |  534 +--
 addons/stock/i18n/pl.po                       |  655 ++-
 addons/stock/i18n/pt.po                       |  615 ++-
 addons/stock/i18n/pt_BR.po                    |  617 ++-
 addons/stock/i18n/ro.po                       |  615 ++-
 addons/stock/i18n/ru.po                       |  615 ++-
 addons/stock/i18n/sl.po                       |  638 ++-
 addons/stock/i18n/sq.po                       |  524 +--
 addons/stock/i18n/sr.po                       |  541 +--
 addons/stock/i18n/sr@latin.po                 |  541 +--
 addons/stock/i18n/sv.po                       |  557 +--
 addons/stock/i18n/th.po                       |  524 +--
 addons/stock/i18n/tlh.po                      |  524 +--
 addons/stock/i18n/tr.po                       |  615 ++-
 addons/stock/i18n/uk.po                       |  534 +--
 addons/stock/i18n/vi.po                       |  565 +--
 addons/stock/i18n/zh_CN.po                    |  617 ++-
 addons/stock/i18n/zh_TW.po                    |  588 ++-
 addons/stock_invoice_directly/i18n/ar.po      |    6 +-
 addons/stock_invoice_directly/i18n/bg.po      |    6 +-
 addons/stock_invoice_directly/i18n/bs.po      |    6 +-
 addons/stock_invoice_directly/i18n/ca.po      |    6 +-
 addons/stock_invoice_directly/i18n/cs.po      |    6 +-
 addons/stock_invoice_directly/i18n/da.po      |    6 +-
 addons/stock_invoice_directly/i18n/de.po      |    6 +-
 addons/stock_invoice_directly/i18n/el.po      |    6 +-
 addons/stock_invoice_directly/i18n/es.po      |    6 +-
 addons/stock_invoice_directly/i18n/es_AR.po   |    6 +-
 addons/stock_invoice_directly/i18n/es_CL.po   |    6 +-
 addons/stock_invoice_directly/i18n/es_CR.po   |    6 +-
 addons/stock_invoice_directly/i18n/et.po      |    6 +-
 addons/stock_invoice_directly/i18n/fi.po      |    6 +-
 addons/stock_invoice_directly/i18n/fr.po      |    6 +-
 addons/stock_invoice_directly/i18n/gl.po      |    6 +-
 addons/stock_invoice_directly/i18n/hr.po      |    6 +-
 addons/stock_invoice_directly/i18n/hu.po      |    6 +-
 addons/stock_invoice_directly/i18n/id.po      |    6 +-
 addons/stock_invoice_directly/i18n/it.po      |    6 +-
 addons/stock_invoice_directly/i18n/ja.po      |    6 +-
 addons/stock_invoice_directly/i18n/ko.po      |    6 +-
 addons/stock_invoice_directly/i18n/lt.po      |    6 +-
 addons/stock_invoice_directly/i18n/lv.po      |    6 +-
 addons/stock_invoice_directly/i18n/mk.po      |    6 +-
 addons/stock_invoice_directly/i18n/mn.po      |    6 +-
 addons/stock_invoice_directly/i18n/nb.po      |    6 +-
 addons/stock_invoice_directly/i18n/nl.po      |    6 +-
 addons/stock_invoice_directly/i18n/nl_BE.po   |    6 +-
 addons/stock_invoice_directly/i18n/oc.po      |    6 +-
 addons/stock_invoice_directly/i18n/pl.po      |    6 +-
 addons/stock_invoice_directly/i18n/pt.po      |    6 +-
 addons/stock_invoice_directly/i18n/pt_BR.po   |    6 +-
 addons/stock_invoice_directly/i18n/ro.po      |    6 +-
 addons/stock_invoice_directly/i18n/ru.po      |    6 +-
 addons/stock_invoice_directly/i18n/sl.po      |    6 +-
 addons/stock_invoice_directly/i18n/sq.po      |    6 +-
 addons/stock_invoice_directly/i18n/sr.po      |    6 +-
 .../stock_invoice_directly/i18n/sr@latin.po   |    6 +-
 addons/stock_invoice_directly/i18n/sv.po      |    6 +-
 addons/stock_invoice_directly/i18n/tr.po      |    6 +-
 addons/stock_invoice_directly/i18n/uk.po      |    6 +-
 addons/stock_invoice_directly/i18n/vi.po      |    6 +-
 addons/stock_invoice_directly/i18n/zh_CN.po   |    6 +-
 addons/stock_invoice_directly/i18n/zh_TW.po   |    6 +-
 addons/stock_location/i18n/ar.po              |   16 +-
 addons/stock_location/i18n/bg.po              |   16 +-
 addons/stock_location/i18n/bs.po              |   16 +-
 addons/stock_location/i18n/ca.po              |   16 +-
 addons/stock_location/i18n/cs.po              |   16 +-
 addons/stock_location/i18n/da.po              |   16 +-
 addons/stock_location/i18n/de.po              |   14 +-
 addons/stock_location/i18n/el.po              |   16 +-
 addons/stock_location/i18n/es.po              |   18 +-
 addons/stock_location/i18n/es_AR.po           |   16 +-
 addons/stock_location/i18n/es_CL.po           |   16 +-
 addons/stock_location/i18n/es_CR.po           |   16 +-
 addons/stock_location/i18n/et.po              |   16 +-
 addons/stock_location/i18n/fi.po              |   16 +-
 addons/stock_location/i18n/fr.po              |   16 +-
 addons/stock_location/i18n/gl.po              |   16 +-
 addons/stock_location/i18n/hr.po              |   16 +-
 addons/stock_location/i18n/hu.po              |   16 +-
 addons/stock_location/i18n/id.po              |   16 +-
 addons/stock_location/i18n/it.po              |   16 +-
 addons/stock_location/i18n/ja.po              |   16 +-
 addons/stock_location/i18n/ko.po              |   16 +-
 addons/stock_location/i18n/lt.po              |   16 +-
 addons/stock_location/i18n/lv.po              |   16 +-
 addons/stock_location/i18n/mk.po              |   16 +-
 addons/stock_location/i18n/mn.po              |   16 +-
 addons/stock_location/i18n/nb.po              |   16 +-
 addons/stock_location/i18n/nl.po              |   18 +-
 addons/stock_location/i18n/nl_BE.po           |   16 +-
 addons/stock_location/i18n/pl.po              |   16 +-
 addons/stock_location/i18n/pt.po              |   16 +-
 addons/stock_location/i18n/pt_BR.po           |   16 +-
 addons/stock_location/i18n/ro.po              |   16 +-
 addons/stock_location/i18n/ru.po              |   16 +-
 addons/stock_location/i18n/sl.po              |   16 +-
 addons/stock_location/i18n/sq.po              |   16 +-
 addons/stock_location/i18n/sv.po              |   16 +-
 addons/stock_location/i18n/tlh.po             |   16 +-
 addons/stock_location/i18n/tr.po              |   16 +-
 addons/stock_location/i18n/uk.po              |   16 +-
 addons/stock_location/i18n/vi.po              |   16 +-
 addons/stock_location/i18n/zh_CN.po           |   16 +-
 addons/stock_location/i18n/zh_TW.po           |   16 +-
 addons/stock_no_autopicking/i18n/ar.po        |    6 +-
 addons/stock_no_autopicking/i18n/bg.po        |    6 +-
 addons/stock_no_autopicking/i18n/bs.po        |    6 +-
 addons/stock_no_autopicking/i18n/ca.po        |    6 +-
 addons/stock_no_autopicking/i18n/cs.po        |    6 +-
 addons/stock_no_autopicking/i18n/da.po        |    6 +-
 addons/stock_no_autopicking/i18n/de.po        |    6 +-
 addons/stock_no_autopicking/i18n/el.po        |    6 +-
 addons/stock_no_autopicking/i18n/es.po        |    6 +-
 addons/stock_no_autopicking/i18n/es_AR.po     |    6 +-
 addons/stock_no_autopicking/i18n/es_CL.po     |    6 +-
 addons/stock_no_autopicking/i18n/es_CR.po     |    6 +-
 addons/stock_no_autopicking/i18n/et.po        |    6 +-
 addons/stock_no_autopicking/i18n/fi.po        |    6 +-
 addons/stock_no_autopicking/i18n/fr.po        |    6 +-
 addons/stock_no_autopicking/i18n/gl.po        |    6 +-
 addons/stock_no_autopicking/i18n/hr.po        |    6 +-
 addons/stock_no_autopicking/i18n/hu.po        |    6 +-
 addons/stock_no_autopicking/i18n/id.po        |    6 +-
 addons/stock_no_autopicking/i18n/it.po        |    6 +-
 addons/stock_no_autopicking/i18n/ja.po        |    6 +-
 addons/stock_no_autopicking/i18n/ko.po        |    6 +-
 addons/stock_no_autopicking/i18n/lt.po        |    6 +-
 addons/stock_no_autopicking/i18n/lv.po        |    6 +-
 addons/stock_no_autopicking/i18n/mk.po        |    6 +-
 addons/stock_no_autopicking/i18n/mn.po        |    6 +-
 addons/stock_no_autopicking/i18n/nl.po        |    6 +-
 addons/stock_no_autopicking/i18n/nl_BE.po     |    6 +-
 addons/stock_no_autopicking/i18n/oc.po        |    6 +-
 addons/stock_no_autopicking/i18n/pl.po        |    6 +-
 addons/stock_no_autopicking/i18n/pt.po        |    6 +-
 addons/stock_no_autopicking/i18n/pt_BR.po     |    6 +-
 addons/stock_no_autopicking/i18n/ro.po        |    6 +-
 addons/stock_no_autopicking/i18n/ru.po        |    6 +-
 addons/stock_no_autopicking/i18n/sl.po        |    6 +-
 addons/stock_no_autopicking/i18n/sq.po        |    6 +-
 addons/stock_no_autopicking/i18n/sr@latin.po  |    6 +-
 addons/stock_no_autopicking/i18n/sv.po        |    6 +-
 addons/stock_no_autopicking/i18n/tlh.po       |    6 +-
 addons/stock_no_autopicking/i18n/tr.po        |    6 +-
 addons/stock_no_autopicking/i18n/uk.po        |    6 +-
 addons/stock_no_autopicking/i18n/vi.po        |    6 +-
 addons/stock_no_autopicking/i18n/zh_CN.po     |    6 +-
 addons/stock_no_autopicking/i18n/zh_TW.po     |    6 +-
 addons/subscription/i18n/ar.po                |    6 +-
 addons/subscription/i18n/bg.po                |    6 +-
 addons/subscription/i18n/bs.po                |    6 +-
 addons/subscription/i18n/ca.po                |    6 +-
 addons/subscription/i18n/cs.po                |    6 +-
 addons/subscription/i18n/da.po                |    6 +-
 addons/subscription/i18n/de.po                |    4 +-
 addons/subscription/i18n/es.po                |    6 +-
 addons/subscription/i18n/es_AR.po             |    6 +-
 addons/subscription/i18n/es_CR.po             |    6 +-
 addons/subscription/i18n/et.po                |    6 +-
 addons/subscription/i18n/fi.po                |    6 +-
 addons/subscription/i18n/fr.po                |    6 +-
 addons/subscription/i18n/gl.po                |    6 +-
 addons/subscription/i18n/hr.po                |    6 +-
 addons/subscription/i18n/hu.po                |    6 +-
 addons/subscription/i18n/id.po                |    6 +-
 addons/subscription/i18n/it.po                |    6 +-
 addons/subscription/i18n/ja.po                |    6 +-
 addons/subscription/i18n/ko.po                |    6 +-
 addons/subscription/i18n/lt.po                |    6 +-
 addons/subscription/i18n/nl.po                |    6 +-
 addons/subscription/i18n/nl_BE.po             |    6 +-
 addons/subscription/i18n/pl.po                |    6 +-
 addons/subscription/i18n/pt.po                |    6 +-
 addons/subscription/i18n/pt_BR.po             |    4 +-
 addons/subscription/i18n/ro.po                |    6 +-
 addons/subscription/i18n/ru.po                |    6 +-
 addons/subscription/i18n/sl.po                |    6 +-
 addons/subscription/i18n/sq.po                |    6 +-
 addons/subscription/i18n/sv.po                |    6 +-
 addons/subscription/i18n/tlh.po               |    6 +-
 addons/subscription/i18n/tr.po                |    6 +-
 addons/subscription/i18n/uk.po                |    6 +-
 addons/subscription/i18n/vi.po                |    6 +-
 addons/subscription/i18n/zh_CN.po             |    6 +-
 addons/subscription/i18n/zh_TW.po             |    6 +-
 addons/survey/i18n/ar.po                      |  164 +-
 addons/survey/i18n/bg.po                      |  164 +-
 addons/survey/i18n/ca.po                      |  164 +-
 addons/survey/i18n/cs.po                      |  164 +-
 addons/survey/i18n/da.po                      |  164 +-
 addons/survey/i18n/de.po                      |  162 +-
 addons/survey/i18n/es.po                      |  164 +-
 addons/survey/i18n/es_CR.po                   |  164 +-
 addons/survey/i18n/et.po                      |  164 +-
 addons/survey/i18n/fi.po                      |  164 +-
 addons/survey/i18n/fr.po                      |  164 +-
 addons/survey/i18n/gl.po                      |  164 +-
 addons/survey/i18n/hr.po                      |  164 +-
 addons/survey/i18n/hu.po                      |  164 +-
 addons/survey/i18n/it.po                      |  164 +-
 addons/survey/i18n/ja.po                      |  164 +-
 addons/survey/i18n/mn.po                      |  164 +-
 addons/survey/i18n/nl.po                      |  164 +-
 addons/survey/i18n/pl.po                      |  164 +-
 addons/survey/i18n/pt.po                      |  164 +-
 addons/survey/i18n/pt_BR.po                   |  164 +-
 addons/survey/i18n/ro.po                      |  164 +-
 addons/survey/i18n/ru.po                      |  164 +-
 addons/survey/i18n/sl.po                      |  164 +-
 addons/survey/i18n/sr.po                      |  164 +-
 addons/survey/i18n/sr@latin.po                |  164 +-
 addons/survey/i18n/sv.po                      |  164 +-
 addons/survey/i18n/tr.po                      |  164 +-
 addons/survey/i18n/zh_CN.po                   |  164 +-
 addons/warning/i18n/ar.po                     |   79 +-
 addons/warning/i18n/bg.po                     |   79 +-
 addons/warning/i18n/bs.po                     |   62 +-
 addons/warning/i18n/ca.po                     |   79 +-
 addons/warning/i18n/cs.po                     |   62 +-
 addons/warning/i18n/da.po                     |   62 +-
 addons/warning/i18n/de.po                     |   77 +-
 addons/warning/i18n/el.po                     |   76 +-
 addons/warning/i18n/es.po                     |   81 +-
 addons/warning/i18n/es_AR.po                  |   79 +-
 addons/warning/i18n/es_CR.po                  |   79 +-
 addons/warning/i18n/et.po                     |   79 +-
 addons/warning/i18n/fi.po                     |   79 +-
 addons/warning/i18n/fr.po                     |   79 +-
 addons/warning/i18n/gl.po                     |   79 +-
 addons/warning/i18n/hr.po                     |   79 +-
 addons/warning/i18n/hu.po                     |   79 +-
 addons/warning/i18n/id.po                     |   62 +-
 addons/warning/i18n/it.po                     |   79 +-
 addons/warning/i18n/ja.po                     |   79 +-
 addons/warning/i18n/ko.po                     |   79 +-
 addons/warning/i18n/lt.po                     |   76 +-
 addons/warning/i18n/mn.po                     |   79 +-
 addons/warning/i18n/nb.po                     |   79 +-
 addons/warning/i18n/nl.po                     |   83 +-
 addons/warning/i18n/nl_BE.po                  |   62 +-
 addons/warning/i18n/pl.po                     |   79 +-
 addons/warning/i18n/pt.po                     |   79 +-
 addons/warning/i18n/pt_BR.po                  |   86 +-
 addons/warning/i18n/ro.po                     |   79 +-
 addons/warning/i18n/ru.po                     |   79 +-
 addons/warning/i18n/sl.po                     |   79 +-
 addons/warning/i18n/sq.po                     |   62 +-
 addons/warning/i18n/sr.po                     |   79 +-
 addons/warning/i18n/sr@latin.po               |   79 +-
 addons/warning/i18n/sv.po                     |   79 +-
 addons/warning/i18n/tlh.po                    |   62 +-
 addons/warning/i18n/tr.po                     |   79 +-
 addons/warning/i18n/uk.po                     |   62 +-
 addons/warning/i18n/vi.po                     |   62 +-
 addons/warning/i18n/zh_CN.po                  |   79 +-
 addons/warning/i18n/zh_TW.po                  |   62 +-
 addons/web_linkedin/i18n/de.po                |    6 +-
 addons/web_linkedin/i18n/es.po                |    6 +-
 addons/web_linkedin/i18n/fr.po                |    6 +-
 addons/web_linkedin/i18n/hr.po                |    6 +-
 addons/web_linkedin/i18n/it.po                |    6 +-
 addons/web_linkedin/i18n/nl.po                |    6 +-
 addons/web_linkedin/i18n/pl.po                |    6 +-
 addons/web_linkedin/i18n/pt.po                |    8 +-
 addons/web_linkedin/i18n/pt_BR.po             |    6 +-
 addons/web_linkedin/i18n/ro.po                |    4 +-
 addons/web_linkedin/i18n/zh_CN.po             |    6 +-
 addons/web_shortcuts/i18n/de.po               |    6 +-
 addons/web_shortcuts/i18n/es.po               |    6 +-
 addons/web_shortcuts/i18n/fr.po               |    6 +-
 addons/web_shortcuts/i18n/hr.po               |    6 +-
 addons/web_shortcuts/i18n/it.po               |    6 +-
 addons/web_shortcuts/i18n/nl.po               |    6 +-
 addons/web_shortcuts/i18n/pl.po               |    6 +-
 addons/web_shortcuts/i18n/pt.po               |    6 +-
 addons/web_shortcuts/i18n/pt_BR.po            |    8 +-
 addons/web_shortcuts/i18n/ro.po               |    6 +-
 addons/web_shortcuts/i18n/sl.po               |    4 +-
 addons/web_shortcuts/i18n/zh_CN.po            |    6 +-
 4650 files changed, 300575 insertions(+), 336349 deletions(-)
 create mode 100644 addons/auth_oauth/i18n/it.po
 create mode 100644 addons/contacts/i18n/zh_TW.po
 create mode 100644 addons/mail/i18n/zh_TW.po
 create mode 100644 addons/portal/i18n/mn.po
 create mode 100644 addons/portal/i18n/sr.po

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index ed10b5d35ea..aa393244680 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 22:53+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "إلغاء تسوية المعاملات"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "إستيراد من فاتورة أو دفعة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "حساب غير صالح!"
@@ -93,15 +88,6 @@ msgstr "حساب غير صالح!"
 msgid "Total Debit"
 msgstr "مجموع المدين"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
-"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +100,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +130,19 @@ msgstr ""
 "إزالتها."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +154,7 @@ msgid "Warning!"
 msgstr "تحذير!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "يومية ممتنوعة"
@@ -240,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "قوالب الضريبة"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -260,6 +240,11 @@ msgstr "سيتم استخدام القيود المحاسبية أثناء ال
 msgid "Belgian Reports"
 msgstr "تقارير دولة بلجيكا"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -391,11 +376,6 @@ msgstr "يسمح لك باستخدام المحاسبة التحليلية"
 msgid "Salesperson"
 msgstr "موظف مبيعات"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -450,6 +430,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -465,6 +450,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "قالب مخطط"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -626,15 +616,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "ربع سنوي"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"إذا قمت إلغاء تسوية العمليات، عليك أيضاً التحقق من كل الإجراءات المتعلقة لكل "
-"هذه المعاملات لأنهم لن يتم إيقافها"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -683,7 +664,7 @@ msgid "Profit Account"
 msgstr "حساب الأرباح"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "لا توجد نقطة فاصلة في التاريخ أو توجد أكثر من نقطة."
@@ -694,13 +675,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "تقرير المبيعات حسب نوع الحساب"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "شباب العمال الاشتراكي."
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "لا يمكن التحريك بعملة غير .."
@@ -763,6 +744,11 @@ msgstr "حسابات مدينة"
 msgid "Configure your company bank accounts"
 msgstr "قم بضبط الحسابات البنكية للشركة"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -787,6 +773,12 @@ msgstr "إعادة فتح"
 msgid "Are you sure you want to create entries?"
 msgstr "هل أنت متأكد من إنشاء القيد؟"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -809,6 +801,7 @@ msgstr "عرض الفرعي و المرتبة"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "النسبة"
 
@@ -851,7 +844,7 @@ msgid "Type"
 msgstr "نوع"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -876,24 +869,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "فواتير المورد و المردودات المالية"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "تم تسوية المدخل"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "إلغاء التسوية"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "عند 14 يوم صافي 2%، والمبلغ المتبقي عند 30 يوم نهاية الشهر"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -925,11 +912,6 @@ msgstr "نقل اسم/ j.c."
 msgid "Account Code and Name"
 msgstr "رمز واسم الحساب"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -960,7 +942,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -975,6 +957,7 @@ msgstr "اشتراك جديد"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "أحسب/حساب"
 
@@ -1006,11 +989,8 @@ msgid "Purchase journal"
 msgstr "يومية المشتريات"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1046,7 +1026,7 @@ msgid "Liability"
 msgstr "الخصوم"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "من فضلك حدد تسلسل دفاتير اليومية التي لها علاقة بهذه الفاتورة"
@@ -1120,10 +1100,10 @@ msgid "Features"
 msgstr "مزايا"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1203,9 +1183,10 @@ msgid "Refund "
 msgstr "استرداد "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "حسابات البنك كما هو مطبوع على أسفل الوثائق المطبوعة"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
@@ -1250,7 +1231,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "مصرف"
@@ -1550,9 +1531,9 @@ msgid "Account Receivable"
 msgstr "المدينون"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1566,7 +1547,7 @@ msgid "With balance is not equal to 0"
 msgstr "برصيد لا يساوي صفر"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1625,7 +1606,7 @@ msgstr "تخطي حالة \"المسودة\" للقيود اليدوية"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "غير مطبّق."
@@ -1668,6 +1649,12 @@ msgstr "جدول م}قت يستخدم لعرض اللوحة الرئيسية"
 msgid "Supplier Refunds"
 msgstr "رد مال للمورد"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "رمز الحالة"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1705,7 +1692,6 @@ msgid "Groups"
 msgstr "مجموعات"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "معفي من الضريبة"
@@ -1838,6 +1824,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "المبيعات حسب نوع الحساب"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1858,115 +1850,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "بعض القيود قد تم تسويتها مسبقا."
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2075,6 +1963,11 @@ msgstr "هذه الفترات يمكن أن تتداخل."
 msgid "Draft statement"
 msgstr "قائمة مؤقتة"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2103,26 +1996,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2130,16 +2022,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2150,8 +2042,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2196,7 +2088,7 @@ msgid "period close"
 msgstr "غلق الفترة"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2298,7 +2190,7 @@ msgid "Product Category"
 msgstr "فئة المنتج"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2664,7 +2556,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "اتركه فارغ لجميع السنوات المالية المفتوحة"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2682,7 +2574,7 @@ msgid "Create an Account Based on this Template"
 msgstr "انشأ حساب مبنيًا على هذا القالب"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2707,7 +2599,7 @@ msgid "Main Sequence"
 msgstr "المسلسل الرئيسي"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2716,14 +2608,12 @@ msgstr ""
 "لكي يتم مسح كشف حساب بنكي, عليك أولا إلغائه لمسح البنود المتعلفة في السجل"
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "شروط السداد"
 
@@ -2749,18 +2639,6 @@ msgstr "علم هذا الربع"
 msgid "Filters"
 msgstr "مرشحات الفرز"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "فتح"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2772,6 +2650,11 @@ msgstr "حالة مسودة من الفاتورة"
 msgid "Account Properties"
 msgstr "خصائص الحساب"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2849,25 +2732,20 @@ msgid "Account Model Entries"
 msgstr "إدخالات نماذج الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "أنشئ إشعار رصيد"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "ضرائب المورد"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "المدخلات"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "تفاصيل البنك"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2890,7 +2768,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2904,10 +2781,9 @@ msgstr ""
 "الأن  و 50 ٪ في شهر واحد."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "الفاتورة قد تم تسويتها مسبقا"
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2936,6 +2812,7 @@ msgstr "سطر حركة حساب التسوية (إلغاء)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "ضريبة"
 
@@ -2971,14 +2848,14 @@ msgid "Accounts"
 msgstr "حسابات"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3075,6 +2952,12 @@ msgstr "مدفوع/مسّوي"
 msgid "Refund Base Code"
 msgstr "الرمز الرئيسي للرد"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "كشوف حساب البنك"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3127,11 +3010,6 @@ msgstr "رصيد الشريك العمري"
 msgid "Accounting entries"
 msgstr "قيود المحاسبة"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "نوع الاتصال"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3176,7 +3054,7 @@ msgid ""
 msgstr "لا يمكن تأكيد الفواتير لأنهم ليس بحالة 'مسودة' أو 'فاتورة مبدأية'"
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "يجب اختيار الفترات التي تنتمي لنفس الشركة"
@@ -3189,7 +3067,7 @@ msgid "Sales by Account"
 msgstr "المبيعات بعرض الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3205,15 +3083,15 @@ msgid "Sale journal"
 msgstr "يومية البيع"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3221,7 +3099,7 @@ msgid ""
 msgstr "اليومية تحتوي على أصناف, لذا لا يمكن تعديل حقول الشركة الخاصة بها"
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3285,9 +3163,10 @@ msgstr ""
 "الكمية ليست مطلب قانوني لكنه مفيد لبعض التقارير."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "خط 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3333,12 +3212,6 @@ msgstr "مبلغ الرمز الرئيسي"
 msgid "Default Sale Tax"
 msgstr "ضريبة البيع الإفتراضية"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "يتم التحقق من صحة الفاتورة '%s'"
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3374,7 +3247,7 @@ msgid "Fiscal Position"
 msgstr "الوضع المالي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3403,7 +3276,7 @@ msgid "Trial Balance"
 msgstr "ميزان المراجعة"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3474,7 +3347,7 @@ msgstr ""
 "تستخدم المعاملات القادمة المعدل عند التاريخ."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3486,9 +3359,9 @@ msgid "No. of Digits to use for account code"
 msgstr "أعداد الوحدة لرمز الحساب"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "اسم الخط"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3537,7 +3410,7 @@ msgid "View"
 msgstr "عرض"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3558,15 +3431,20 @@ msgstr "الفواتير المفترضة"
 msgid "Electronic File"
 msgstr "ملف إالكتروني"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "الشركة لديها دليل الحسابات"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  يوم من الشهر"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "قالب رمز الضريبة"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3574,9 +3452,88 @@ msgid "Account Partner Ledger"
 msgstr "حساب أستاذ الشريك"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3713,12 +3670,17 @@ msgid "Account Tax Declaration"
 msgstr "الإقرار الضريبي للحساب"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  قيمة الرصيد:0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"اذا اعطيت اسم لاخر بعد / , فهي تنشأ تحرك مدخلات محاسبية  ستكون مع نفس الاسم "
+"كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3733,7 +3695,7 @@ msgid "Starting Balance"
 msgstr "رصيد أول المدة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "لا يوجد شريك معرف !"
@@ -3937,7 +3899,7 @@ msgid "Period Length (days)"
 msgstr "طول الفترة (أيام)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3961,7 +3923,7 @@ msgid "Category of Product"
 msgstr "فئة المنتج"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4099,7 +4061,7 @@ msgid "Chart of Accounts Template"
 msgstr "قالب شجرة الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4191,9 +4153,14 @@ msgid "Qty"
 msgstr "الكمية"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "تقاضي"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"هنا يمكنك تحديد المعامل التي سيتم استخدامها عند توطيد كمية من هذه الحالة في "
+"الأصل. على سبيل المثال، وضع 1/-1 إذا كنت ترغب في إضافة / طرح ذلك."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4276,11 +4243,6 @@ msgstr "لا يوجد شركات لم يتم إعدادها!"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "مدفوعة"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4298,11 +4260,6 @@ msgstr "اليومة يجب ان تحتوي على حساب الدائن وال
 msgid "Setup your Bank Accounts"
 msgstr "اعداد الحسابات المصرفية الخاصة بك"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr "تعديل: إنشاء إشعار الرصيد، تسوية وإنشاء فاتورة 'مسودة' جديدة."
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4350,8 +4307,8 @@ msgstr ""
 "على الفاتورة."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "لا يمكنك استخدام حساب غير مغعل."
@@ -4381,7 +4338,7 @@ msgid "Consolidated Children"
 msgstr "فرعي موحد"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4418,11 +4375,6 @@ msgstr ""
 msgid "title"
 msgstr "الاسم"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "إنشاء إشعار رصيد 'مسودة'"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4512,6 +4464,13 @@ msgstr "نهاية الشهر 30 يوم"
 msgid "Analytic Balance"
 msgstr "رصيد تحليلي"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4531,6 +4490,11 @@ msgstr "اذا تم وضع الحقل النشط لخطأ, ستسمح لك بإ
 msgid "Posted Journal Items"
 msgstr "نشر عناصر اليومية"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4541,11 +4505,6 @@ msgstr "بحث قوالب الضريبة"
 msgid "Draft Entries"
 msgstr "مسودة المدخلات"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  يوم في الشهر = -١"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4554,11 +4513,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  عدد الأيام: ٣٠"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4582,20 +4536,9 @@ msgid "Account Type"
 msgstr "نوع الحساب"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "غلق خزينة النقدية"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4618,9 +4561,20 @@ msgstr ""
 "التحليلية. وهي تنتج سحب فواتير المزود."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "غلق خزينة النقدية"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4652,7 +4606,7 @@ msgid "Month"
 msgstr "شهر"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4663,8 +4617,8 @@ msgid "Supplier invoice sequence"
 msgstr "تسلسل فاتورة المورد/الشريك"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4688,6 +4642,11 @@ msgstr "حساب باي بال"
 msgid "Acc.Type"
 msgstr "نوع الحساب"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4700,7 +4659,7 @@ msgstr "عكس علامة التوازن"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "الميزانية العامة (حسابات الخصوم)"
@@ -4722,7 +4681,7 @@ msgid "Account Base Code"
 msgstr "رمز حساب الأساس"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4779,11 +4738,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr "آخر تسوية:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "المعالجة الدورية"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4813,10 +4767,9 @@ msgid "Account chart"
 msgstr "خريطة الحساب"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "فاتورة المورد"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4884,10 +4837,14 @@ msgstr "أوراق دائنة"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4939,7 +4896,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4954,7 +4911,7 @@ msgid "Based On"
 msgstr "بناءًا على"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4979,11 +4936,6 @@ msgstr "ضرائب فرعية"
 msgid "Change"
 msgstr "تغيير"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "البنك و الشيكات المصرفية"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5006,11 +4958,6 @@ msgstr "اشرح لماذا قمت بأخد نقود من الماكينة:"
 msgid "Cancelled"
 msgstr "ملغي"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "مثال"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5021,11 +4968,6 @@ msgstr "يسمح لك بوضع الفواتير في حالة 'فاتورة مب
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "لإستخدام حساب الدخل اتركه فارغ"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5037,7 +4979,7 @@ msgstr ""
 "الافتراضية للشركة."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "ضريبة الشراء %0.2f%%"
@@ -5111,17 +5053,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "متفرقات"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-"$(الموضوع-معرف_الشركة.الاسم)الفاتورة$(المرجع$(الموضوع.الرقم او 'n/a'))"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5234,6 +5170,7 @@ msgstr "إضافة"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "مدفوع"
 
@@ -5262,7 +5199,7 @@ msgstr ""
 "فارغا لاستخدام حساب المصاريف."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "افتتاح الفترة"
@@ -5277,14 +5214,6 @@ msgstr "لاستعراض قيود اليومية"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "التعليقات و البريد الالكتروني"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5297,7 +5226,7 @@ msgid "Tax Application"
 msgstr "التطبيق الضريبي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5330,9 +5259,9 @@ msgid "End of period"
 msgstr "نهاية الفترة"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "تفاصيل البنك"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "فواتير الدفع"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5429,16 +5358,6 @@ msgstr "وصف الضريبة"
 msgid "Child Tax Accounts"
 msgstr "الحسابات الضريبية للانتاج"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"لا يوجد هناك فترة معرفة لهذا التاريخ: %s.\n"
-"الرجاء إنشاء فترة لهذا التاريخ"
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5485,7 +5404,7 @@ msgid "Target Moves"
 msgstr "تحركات الهدف"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5521,6 +5440,7 @@ msgid "Python Code (reverse)"
 msgstr "كود بايثنو (عكسي)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5537,12 +5457,6 @@ msgstr ""
 "يقوم بتشفير معدلات البيع والشراء او يختار من قائمة الضرائب . الاختيار الاخير "
 " يفترض  ان مجموعه من الضرائب المحدده  في هذا النموذج  تكون قد اكتملت."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5568,18 +5482,13 @@ msgstr "سنة"
 msgid "It indicates that the invoice has been sent."
 msgstr "هذا يشير أن الفاتورة قد تم ارسالها."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "الخط 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "اسم داخلي"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5620,7 +5529,7 @@ msgstr "الميزانية العمومية"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "الأرباح و الخسائر(حساب الدخل)"
@@ -5653,7 +5562,7 @@ msgid "Compute Code (if type=code)"
 msgstr "رمز الحساب (إذا كان النوع = الرمز)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5680,6 +5589,7 @@ msgstr "تسوية آلية"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5783,7 +5693,7 @@ msgid "Recompute taxes and total"
 msgstr "أعد حساب الضريبة والمجموع الكلي."
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr "لا يمكنك تعديل/حذف يومية لها قيود لهذه الفترة."
@@ -5813,7 +5723,7 @@ msgid "Amount Computation"
 msgstr "حساب المبلغ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr "لا يمكنك اضافة/تعديل قيود لفترة قد تم اغلاقها %s لليومية %s."
@@ -5849,10 +5759,16 @@ msgid "Account Common Account Report"
 msgstr "تقرير الحساب/الحساب المشترك"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "إتصالات"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "فتح"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5882,9 +5798,7 @@ msgstr "رموز الضريبة"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "رد مال للعميل"
 
@@ -5901,11 +5815,6 @@ msgstr "علامة الكود الضريبي"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "أُنشأ تقرير الفواتير في خلال اخر 15 يومًا"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  عدد الايام:14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5922,6 +5831,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "المبلغ للدفع"
@@ -6012,8 +5922,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6036,6 +5944,13 @@ msgstr "نص عادي"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "قيود المدفوعات هي الإدخل الثاني للتسوية."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6045,15 +5960,6 @@ msgstr ""
 "يمكن لعدد من المبالغ الجزئية ان تُتحد لإيجاد نقطة توازن يمكن اختيارها  "
 "كصلاحية للتسوية التلقائية"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"يُستخدم حقل المتتابعة لترتيب خطوط مصطلح الدفع من المتتابعات المنخفضة إلى "
-"أعلاها"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6111,12 +6017,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "مبلغ ثابت"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr "لا يمكنك تغيير الضريبة، يجب أن تحذف وتنشئ أصناف(خطوط) جديدة."
@@ -6140,7 +6045,6 @@ msgstr "إنشاء القيود الإفتتاحية"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "منهج المحاسبة للمبلغ الضريبي."
 
@@ -6168,18 +6072,23 @@ msgid "Child Accounts"
 msgstr "حسابات فرعية"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "نقل اسم(معرف):%s(%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "إلغاء"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "المدخلات"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6196,7 +6105,7 @@ msgstr "الدخل"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "مورِّد"
@@ -6216,16 +6125,11 @@ msgid "Account n°"
 msgstr "الحساب"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "مرجع حر"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "تقييم"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6340,7 +6244,7 @@ msgid "Filter by"
 msgstr "ترشيح بـ"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "لديك تعبير خاطئ\"%(...)s\"في نموذجك"
@@ -6387,6 +6291,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "عدد الأيام"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6527,7 +6439,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6705,7 +6617,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6736,12 +6648,6 @@ msgstr ""
 msgid "Current"
 msgstr "الحالي"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6766,7 +6672,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "النسبة"
 
@@ -6786,7 +6691,7 @@ msgid "Power"
 msgstr "طاقة"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "لا يمكن انشاء رمز قيد يوميه غير مستخدم"
@@ -6833,12 +6738,17 @@ msgid "Applicable Type"
 msgstr "نوع قابل للتطبيق"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "مرجع الفاتورة"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6857,12 +6767,12 @@ msgstr ""
 "الحالة، ترتيب التقييم يصبح مهمًا."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6935,7 +6845,7 @@ msgid "Optional create"
 msgstr "إنشاء إختياري"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6946,9 +6856,7 @@ msgstr "لا يمكنك تغيير شركة مالكة لحساب يحتوي ب
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "رد للمورد"
 
@@ -6986,9 +6894,14 @@ msgid "Group By..."
 msgstr "تجميع حسب..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  تقييم: الميزانية"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"لا يوجد هناك فترة معرفة لهذا التاريخ: %s.\n"
+"الرجاء إنشاء فترة لهذا التاريخ"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7066,6 +6979,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "معاملات النقدية"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7083,7 +7003,7 @@ msgstr "إحصائيات  القيود التحليلية"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "القيود: "
@@ -7101,14 +7021,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "صحيح"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "الميزانية العمومية(حساب الاصول)"
@@ -7124,10 +7043,9 @@ msgid "Total debit"
 msgstr "إجمالي الخصم"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "المدخل \"%s\" غير صالح !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "قيود اليوميه للشريك القادمه للتطابق"
 
 #. module: account
 #: report:account.invoice:0
@@ -7180,7 +7098,7 @@ msgstr "إنشاء قيد"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "الأرباح و الخسائر (حساب المصاريف)"
@@ -7191,13 +7109,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "خطأ !"
@@ -7234,6 +7153,11 @@ msgstr "خط المشروع"
 msgid "Manual"
 msgstr "يدوي"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7338,8 +7262,8 @@ msgstr "اختيار اليومية"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "رصيد أول المدة"
@@ -7421,7 +7345,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7434,6 +7358,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7487,7 +7416,7 @@ msgid "Done"
 msgstr "تم"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7524,10 +7453,9 @@ msgid "Source Document"
 msgstr "مستند المصدر"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "حسابات البنك كما هو مطبوع على أسفل الوثائق المطبوعة"
 
 #. module: account
 #: constraint:account.account:0
@@ -7553,7 +7481,7 @@ msgid "Taxes:"
 msgstr "ضرائب:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7749,6 +7677,12 @@ msgstr ""
 "ويستخدم هذا الحقل فقط إذا كنت في وضع الوحدة الخاصة بك مما يسمح للمطورين "
 "لإنشاء ضرائب محددة في مجال مخصص."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "مرجع الفاتورة"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7840,7 +7774,7 @@ msgid "Use model"
 msgstr "استخدم النموذج"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7891,7 +7825,7 @@ msgid "Root/View"
 msgstr "جذور / عرض او نظره"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7960,7 +7894,7 @@ msgid "Maturity Date"
 msgstr "تاريخ الاستحقاق"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "يومية المبيعات"
@@ -7971,7 +7905,7 @@ msgid "Invoice Tax"
 msgstr "ضريبة الفاتورة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "لا يوجد رقم للقطعة !"
@@ -8014,7 +7948,7 @@ msgid "Sales Properties"
 msgstr "خصائص المبيعات"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8039,7 +7973,7 @@ msgstr "إلى"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "تعديل العملة"
@@ -8073,7 +8007,7 @@ msgid "May"
 msgstr "مايو"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "الضرائب العلميه المحدده لكنها لا تكون في اسطر الفاتوره"
@@ -8091,10 +8025,9 @@ msgid ""
 msgstr "تسلسل الحقل يستخدم لترتيب الموارد من ادني تسلسل الي الاعلي منها"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "رمز الحالة"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8110,17 +8043,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "سجل المدخلات اليومية"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "عميل"
@@ -8136,7 +8064,7 @@ msgstr "اسم التقرير"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "نقدي"
@@ -8148,9 +8076,11 @@ msgid "Account Destination"
 msgstr "وجهة الحساب"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "فواتير الدفع"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8158,7 +8088,6 @@ msgstr "فواتير الدفع"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8296,15 +8225,14 @@ msgid "Partner Ledger"
 msgstr "دفتر الشركاء"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "ثابت"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "تحذير !"
@@ -8372,7 +8300,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "اختر عملة للفاتورة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "لا سطور للفاتورة !"
@@ -8448,7 +8376,7 @@ msgid "Associated Partner"
 msgstr "شريك متحد"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "يجب عليك اولاً اختيار شريك !"
@@ -8530,13 +8458,13 @@ msgstr ""
 "التالية."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "يومية تسديد الشراء"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8609,7 +8537,7 @@ msgid "Net Total:"
 msgstr "صافي الإجمالي:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8629,13 +8557,6 @@ msgstr "تقرير شامل"
 msgid "Write-Off Journal"
 msgstr "شطب اليومية"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "سيُستخدم فترة الدفع هذا بدلاً من الفترة الافتراضية للشريك الحالي"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8662,11 +8583,6 @@ msgstr "ادخل النوع"
 msgid "Tax/Base Amount"
 msgstr "المبلغ الاساسي/الضريبة"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  تقييم: النسبة المئوية"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8720,6 +8636,11 @@ msgstr "نتيجة التسوية"
 msgid "Ending Balance"
 msgstr "رصيد ختامي"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8762,7 +8683,7 @@ msgid "Automatic import of the bank sta"
 msgstr "الاستيراد التلقائي للبنك"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8785,7 +8706,12 @@ msgid "Account Types"
 msgstr "أنواع الحساب"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8793,9 +8719,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  قيمة المبلغ: غير معروف"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "فئة P&L / BS"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8812,10 +8738,9 @@ msgid "Reconciliation"
 msgstr "التسوية"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "حساب المدينون"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "لإستخدام حساب الدخل اتركه فارغ"
 
 #. module: account
 #: view:account.invoice:0
@@ -8887,7 +8812,7 @@ msgid "The partner account used for this invoice."
 msgstr "يستخدم حساب الشريك لهذه الفاتورة."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "ضرائب  %.2f%%"
@@ -8905,13 +8830,13 @@ msgid "Payment Term Line"
 msgstr "سطر شروط السداد"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "يومية المشتريات"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "المجموع الفرعي"
 
@@ -8940,11 +8865,6 @@ msgstr "تاريخ الإستحقاق"
 msgid "Suppliers"
 msgstr "المورّدون"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "صحيح"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9080,9 +9000,10 @@ msgid "Journal Name"
 msgstr "اسم اليومية"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "قيود اليوميه للشريك القادمه للتطابق"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "المدخل \"%s\" غير صالح !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9127,7 +9048,7 @@ msgid ""
 msgstr "تم التعبير عن المبلغ في عملة اخرى اختيارية اذا كانت مدخل عملة متعدد."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9188,7 +9109,7 @@ msgid "Reconciled entries"
 msgstr "قيود مسواه"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "نموذج خاطئ !"
@@ -9210,7 +9131,7 @@ msgid "Print Account Partner Balance"
 msgstr "طباعة رصيد حساب الشريك"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9249,7 +9170,7 @@ msgstr "مجهول"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "يومية القيود الإفتتاحية"
@@ -9296,7 +9217,7 @@ msgstr ""
 "المبلغ الإجمالي."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9311,20 +9232,9 @@ msgstr "معطي بلغة البايثون"
 msgid "Journal Code"
 msgstr "رمز اليومية"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"هنا يمكنك تحديد المعامل التي سيتم استخدامها عند توطيد كمية من هذه الحالة في "
-"الأصل. على سبيل المثال، وضع 1/-1 إذا كنت ترغب في إضافة / طرح ذلك."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "المبلغ المتبقي"
 
@@ -9357,7 +9267,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "يومية رد المبيعات"
@@ -9423,7 +9333,7 @@ msgid "Purchase Tax(%)"
 msgstr "ضريبة المشتريات (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "قم بإنشاء سطور للفاتورة."
@@ -9442,7 +9352,7 @@ msgid "Display Detail"
 msgstr "عرض التفاصيل"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9559,21 +9469,11 @@ msgstr "يتحقق المحاسب من صلاحية المدخلات المحا
 msgid "Number of Periods"
 msgstr "عدد الفترات"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "قالب رمز الضريبة"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "مستند:  كشف حساب عميل"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "فئة P&L / BS"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9585,9 +9485,10 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr ""
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "الفاتورة قد تم تسويتها مسبقا"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9606,14 +9507,14 @@ msgid "Document"
 msgstr "مستند"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "كشوف حساب البنك"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "حساب المدينون"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9714,8 +9615,8 @@ msgid "Move"
 msgstr "نقل"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9794,11 +9695,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "إلغاء تسوية المعاملات"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9816,11 +9712,16 @@ msgid "Balance :"
 msgstr "رصيد:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9857,13 +9758,6 @@ msgstr "الإشتراك"
 msgid "Account Analytic Balance"
 msgstr "رصيد الحساب التحليلي"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9903,7 +9797,13 @@ msgid "Due date"
 msgstr "تاريخ الإستحقاق"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9998,7 +9898,7 @@ msgid "Unreconciled"
 msgstr "غير مسوي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "إجمالي سئ!"
@@ -10087,7 +9987,7 @@ msgid "Comparison"
 msgstr "مقارنة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10105,6 +10005,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10159,11 +10064,6 @@ msgstr "دائن"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10175,7 +10075,7 @@ msgid "Journal Entry Model"
 msgstr "نموذج قيد اليومية"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10260,7 +10160,7 @@ msgid "Profit (Loss) to report"
 msgstr "تقرير للربح (الخسارة) المقدم"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10587,7 +10487,14 @@ msgid "Empty Accounts ? "
 msgstr "حسابات فارغة؟ "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10712,7 +10619,7 @@ msgid "Receivable accounts"
 msgstr "حسابات مدينة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10839,7 +10746,7 @@ msgid "Entries Sorted by"
 msgstr "قيود يوميه مصنفه حسب"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10945,7 +10852,7 @@ msgid "Accounting Documents"
 msgstr "مستندات المحاسبة"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10990,7 +10897,7 @@ msgid "Manual Invoice Taxes"
 msgstr "ضرائب الفاتورة يدوياً"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11071,16 +10978,6 @@ msgstr ""
 msgid "February"
 msgstr "فبراير"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"اذا اعطيت اسم لاخر بعد / , فهي تنشأ تحرك مدخلات محاسبية  ستكون مع نفس الاسم "
-"كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11139,6 +11036,11 @@ msgstr "حساب تعيين المالية"
 msgid "Expense Account on Product Template"
 msgstr "حساب المصروفات من قالب المنتجات"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11268,6 +11170,13 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "يرجى تحديد تسلسل على الفاتورة"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
+#~ "ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
+
 #~ msgid "Children Definition"
 #~ msgstr "تعريف فروع"
 
@@ -11344,6 +11253,9 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "إضافة السجلات المسواه"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 يوم   "
 
@@ -11420,6 +11332,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "رقم المرجع"
 
+#~ msgid "Line 2:"
+#~ msgstr "خط 2:"
+
 #~ msgid "Required"
 #~ msgstr "مطلوب"
 
@@ -11567,6 +11482,9 @@ msgstr ""
 #~ msgid "Some entries are already reconciled !"
 #~ msgstr "بعض القيود تمت تسويتها من قبل !"
 
+#~ msgid "Litigation"
+#~ msgstr "تقاضي"
+
 #~ msgid "Account balance"
 #~ msgstr "رصيد الحساب"
 
@@ -11649,6 +11567,9 @@ msgstr ""
 #~ msgid "No period found !"
 #~ msgstr "لم يتمكن من إيجاد فترة !"
 
+#~ msgid "Communication"
+#~ msgstr "إتصالات"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "دفتر يومية البنك "
@@ -11691,6 +11612,13 @@ msgstr ""
 #~ msgid "Centralised counterpart"
 #~ msgstr "النظير المركزي"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "إذا قمت إلغاء تسوية العمليات، عليك أيضاً التحقق من كل الإجراءات المتعلقة لكل "
+#~ "هذه المعاملات لأنهم لن يتم إيقافها"
+
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "رصيد الإغلاق من محقق النقدية"
 
@@ -11972,6 +11900,9 @@ msgstr ""
 #~ msgid "CashBox Balance"
 #~ msgstr "رصيد صندوق النقدية"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Separated Journal Sequences"
 #~ msgstr "مسلسلات اليومية منفصلة"
 
@@ -11987,6 +11918,9 @@ msgstr ""
 #~ msgid "Tax Declaration: Invoices"
 #~ msgstr "الإعلان الضريبي: الفواتير"
 
+#~ msgid "Line Name"
+#~ msgstr "اسم الخط"
+
 #~ msgid "  value amount: n.a"
 #~ msgstr "  قيمة المبلغ: غير متاحة"
 
@@ -12033,9 +11967,6 @@ msgstr ""
 #~ msgid "Line"
 #~ msgstr "سطر"
 
-#~ msgid "Fixed"
-#~ msgstr "ثابت"
-
 #~ msgid ":"
 #~ msgstr ":"
 
@@ -12083,6 +12014,9 @@ msgstr ""
 #~ msgid "Bank Account Owner"
 #~ msgstr "مالِك الحساب المصرفي"
 
+#~ msgid "Example"
+#~ msgstr "مثال"
+
 #~ msgid "Contacts"
 #~ msgstr "جهات الاتصال"
 
@@ -12144,6 +12078,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "اختبار رمز الضريبة"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "البنك و الشيكات المصرفية"
+
 #~ msgid "Check Date not in the Period"
 #~ msgstr "التحقق من تاريخ في غير الفترة"
 
@@ -12250,6 +12187,9 @@ msgstr ""
 #~ msgid "Compute Code"
 #~ msgstr "رمز العملية الحسابية"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "المعالجة الدورية"
+
 #~ msgid "Unreconciliate transactions"
 #~ msgstr "إلغاء تسوية المعاملات"
 
@@ -12284,6 +12224,9 @@ msgstr ""
 #~ msgid "You can not use an inactive account!"
 #~ msgstr "لا يمكنك إستخدام حساب غير نشط!"
 
+#~ msgid "Valuation"
+#~ msgstr "تقييم"
+
 #~ msgid "Value Amount"
 #~ msgstr "قيمة المبلغ"
 
@@ -12537,6 +12480,9 @@ msgstr ""
 #~ "لايمكنك تعديل المدخل المسجل لهذه اليومية !\n"
 #~ "يجب ان تخصص اليومية لتسمح بإالغاء المدخلات اذا كنت تريد ذلك."
 
+#~ msgid "Line 1:"
+#~ msgstr "الخط 1:"
+
 #~ msgid ""
 #~ "This report gives you an overview of the situation of your general journals"
 #~ msgstr "يعطيك هذا التقرير لمحة عامة للموقف من اليوميات العامة"
@@ -12578,6 +12524,13 @@ msgstr ""
 #~ msgid "Lines to reconcile"
 #~ msgstr "خطوط التسوية"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "يُستخدم حقل المتتابعة لترتيب خطوط مصطلح الدفع من المتتابعات المنخفضة إلى "
+#~ "أعلاها"
+
 #, python-format
 #~ msgid "Entries are not of the same account or already reconciled ! "
 #~ msgstr "المدخلات ليست من نفس الحساب او تم تسويتها بالفعل ! "
@@ -12777,6 +12730,11 @@ msgstr ""
 #~ msgid "Accounting and Financial Management"
 #~ msgstr "إدارة  الملية والمحاسبة"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "سيُستخدم فترة الدفع هذا بدلاً من الفترة الافتراضية للشريك الحالي"
+
 #~ msgid "Journal Views"
 #~ msgstr "لمحات عامة عن اليومية"
 
@@ -13397,6 +13355,9 @@ msgstr ""
 #~ msgid "I can not locate a parent code for the template account!"
 #~ msgstr "لا أستطيع تحديد النرميز الأصلي للحساب النموذجي!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "عند 14 يوم صافي 2%، والمبلغ المتبقي عند 30 يوم نهاية الشهر"
+
 #, python-format
 #~ msgid "New currency is not configured properly !"
 #~ msgstr "لم يتم تكوين العملة الجديدة بشكل صحيح"
@@ -13404,9 +13365,16 @@ msgstr ""
 #~ msgid "Configure Your Chart of Accounts"
 #~ msgstr "تكوين مخططاتك الحسابية"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  يوم من الشهر"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "هذه شهور المبيعات وفقا لنوع"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "يتم التحقق من صحة الفاتورة '%s'"
+
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "رمز العملة يجب ان يكون فريدا لكل شركة"
 
@@ -13417,6 +13385,9 @@ msgstr ""
 #~ msgid "Quantity :"
 #~ msgstr "الكمية"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  قيمة الرصيد:0.02"
+
 #, python-format
 #~ msgid "You can not create journal items on a closed account %s %s"
 #~ msgstr "لا يمكن انشاء عناصر اليومية لحساب مغلق%s%s"
@@ -13443,9 +13414,16 @@ msgstr ""
 #~ msgid "You can not create journal items on a \"view\" account %s %s"
 #~ msgstr "لا يمكن انشاء وحدات يوميه علي \"عرض \"الحساب%s%s"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr ""
+#~ "$(الموضوع-معرف_الشركة.الاسم)الفاتورة$(المرجع$(الموضوع.الرقم او 'n/a'))"
+
 #~ msgid "Sale journal in this month"
 #~ msgstr "مبيع اليومية لهذا الشهر"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  عدد الايام:14"
+
 #~ msgid "Analytic Entries during last 7 days"
 #~ msgstr "قيود تحليلية خلال اخر 7 أيام"
 
@@ -13464,6 +13442,12 @@ msgstr ""
 #~ msgid "Current currency is not configured properly !"
 #~ msgstr "العملة الحالية غير معرفة بشكل صحيح"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  عدد الأيام: ٣٠"
+
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  يوم في الشهر = -١"
+
 #~ msgid "My invoices"
 #~ msgstr "الفواتير"
 
@@ -13546,6 +13530,9 @@ msgstr ""
 #~ msgid "This Months Sales by type"
 #~ msgstr "مبيعات هذه الشهور وفقا للنوع"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  تقييم: النسبة المئوية"
+
 #, python-format
 #~ msgid ""
 #~ "No opening/closing period defined, please create one to set the initial "
@@ -13587,6 +13574,9 @@ msgstr ""
 #~ "المبلغ الاجمالي في الفاتوره. أخر سطر من شروط الدفع يجب ان يكون من نوع \" "
 #~ "المتوازن\" لتجنب مشاكل تقريب الأرقام."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  تقييم: الميزانية"
+
 #, python-format
 #~ msgid ""
 #~ "You can not remove/desactivate an account which is set on a customer or "
@@ -13605,6 +13595,9 @@ msgstr ""
 #~ "Can not find a chart of accounts for this company, you should create one."
 #~ msgstr "لم نستطع ايجاد اي دليل محاسبي لحسابات هذه الشركة، يجب انشاء واحدة."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  قيمة المبلغ: غير معروف"
+
 #~ msgid "Generate Your Chart of Accounts from a Chart Template"
 #~ msgstr "انشاء دليل الحسابات من قالب للدليل"
 
@@ -13748,3 +13741,7 @@ msgstr ""
 #~ msgstr ""
 #~ "خطأ في الإعدادات!\n"
 #~ " لاتستطيع تعريف أطفال لحساب من نوع داخلي مختلف ل\"العرض\"! "
+
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "فاتورة المورد"
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index f0db0ff407a..8e0ad9f5d23 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:28+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Импортиране от фактура или плащане"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -93,16 +88,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Общ дебит"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"В случай че анулирате съответствието на транзакции,моля да проверите всички "
-"действия свързани с тези транзакции, тъй като тези действия няма да бъдат "
-"премахнати автоматично"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -113,7 +98,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -144,19 +128,19 @@ msgstr ""
 "без да го изтривате."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -168,7 +152,7 @@ msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Различни дневници"
@@ -240,11 +224,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Шаблони на данъци"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -260,6 +239,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr "Белгийски отчети"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +379,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -454,6 +433,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -469,6 +453,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Шаблон на графика"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -630,16 +619,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Тримесечно"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"В случай че анулирате изравняване на транзакции трябва да проверите всички "
-"действия свързани с тези транзакции тъй като те няма да бъдат автоматично "
-"спрени"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -688,7 +667,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Липса на период или множество намерени периоди за тази дата."
@@ -699,13 +678,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -768,6 +747,11 @@ msgstr "Приходни сметки"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -792,6 +776,12 @@ msgstr "Отвори отново"
 msgid "Are you sure you want to create entries?"
 msgstr "Сигурни ли сте че искате да създадете записи?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -812,6 +802,7 @@ msgstr "Показва елементи от тип 'дете' в йерархи
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
 
@@ -854,7 +845,7 @@ msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -879,24 +870,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Анулиране на съответствие между транзакции"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -927,11 +912,6 @@ msgstr "Код на дневник / име на движение"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -963,7 +943,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -978,6 +958,7 @@ msgstr "Нов абонамент"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Изчисление"
 
@@ -1009,11 +990,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1049,7 +1027,7 @@ msgid "Liability"
 msgstr "Пасив"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1120,10 +1098,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1201,8 +1179,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1248,7 +1227,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Банка"
@@ -1545,9 +1524,9 @@ msgid "Account Receivable"
 msgstr "Приходна сметка"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1561,7 +1540,7 @@ msgid "With balance is not equal to 0"
 msgstr "С баланс различен от 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1616,7 +1595,7 @@ msgstr "Пропускане на етап 'проект' за ръчни зап
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1659,6 +1638,12 @@ msgstr "Временна таблица използвана за изглед 
 msgid "Supplier Refunds"
 msgstr "Обезщетения на доставчик"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Код на казус"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1696,7 +1681,6 @@ msgid "Groups"
 msgstr "Групи"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Необложен с данък"
@@ -1829,6 +1813,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Продажби по вид сметка"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1849,115 +1839,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2066,6 +1952,11 @@ msgstr "Периодите могат да се препокрият"
 msgid "Draft statement"
 msgstr "Проект на извлечение"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2094,26 +1985,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2121,16 +2011,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2141,8 +2031,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2187,7 +2077,7 @@ msgid "period close"
 msgstr "затворен период"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2287,7 +2177,7 @@ msgid "Product Category"
 msgstr "Продуктова категория"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2646,7 +2536,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Запази празно за цялата отчетна година"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2664,7 +2554,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Създаване на сметка според този шаблон"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2685,7 +2575,7 @@ msgid "Main Sequence"
 msgstr "Основна последователност"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2693,14 +2583,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Условие за плащане"
 
@@ -2726,18 +2614,6 @@ msgstr "Отметнете"
 msgid "Filters"
 msgstr "Филтри"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Отваряне"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2749,6 +2625,11 @@ msgstr "Състояние чернова на фактура"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2826,25 +2707,20 @@ msgid "Account Model Entries"
 msgstr "Запис на модела на сметка"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Данъци за доставчици"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Детайли за банката"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2867,7 +2743,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2882,9 +2757,8 @@ msgstr ""
 "например 50% сега и 50% след месец."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2914,6 +2788,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Данък"
 
@@ -2949,14 +2824,14 @@ msgid "Accounts"
 msgstr "Сметки"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3054,6 +2929,12 @@ msgstr "Платен/Обединен"
 msgid "Refund Base Code"
 msgstr "Базов код на обезщетение"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Банкови извлечения"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3106,11 +2987,6 @@ msgstr "Стар партньорски баланс"
 msgid "Accounting entries"
 msgstr "Счетоводни записи"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3151,7 +3027,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3164,7 +3040,7 @@ msgid "Sales by Account"
 msgstr "Продажби по сметка"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3180,15 +3056,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Трябва да зададете аналитичен дневник в '%s' дневник!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3196,7 +3072,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3258,9 +3134,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Ред 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3306,12 +3183,6 @@ msgstr "Сума по основен код"
 msgid "Default Sale Tax"
 msgstr "Данък продажба по подразбиране"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3348,7 +3219,7 @@ msgid "Fiscal Position"
 msgstr "Фискална позиция"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3375,7 +3246,7 @@ msgid "Trial Balance"
 msgstr "Пробен баланс"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3446,7 +3317,7 @@ msgstr ""
 "използват курса за датата."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3458,9 +3329,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Бр. цифри, които да се ползват за код на сметка"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Име на ред"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3509,7 +3380,7 @@ msgid "View"
 msgstr "Изглед"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3530,15 +3401,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Електронен файл"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Шаблон за код на данък"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3546,9 +3422,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3674,12 +3629,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3694,7 +3652,7 @@ msgid "Starting Balance"
 msgstr "Начален баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Не е зададен партньор !"
@@ -3894,7 +3852,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3918,7 +3876,7 @@ msgid "Category of Product"
 msgstr "Продуктова категория"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4056,7 +4014,7 @@ msgid "Chart of Accounts Template"
 msgstr "Диаграма на шаблони на сметка"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4143,9 +4101,12 @@ msgid "Qty"
 msgstr "К-во"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Жалба"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4229,11 +4190,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4251,11 +4207,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4300,8 +4251,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4331,7 +4282,7 @@ msgid "Consolidated Children"
 msgstr "Косолидирани подчинени сметки"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4363,11 +4314,6 @@ msgstr ""
 msgid "title"
 msgstr "обръщение"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4457,6 +4403,13 @@ msgstr "30 дена за край на месеца"
 msgid "Analytic Balance"
 msgstr "Аналитичен баланс"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4476,6 +4429,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4486,11 +4444,6 @@ msgstr "Търсене в данъчни шаблони"
 msgid "Draft Entries"
 msgstr "Записи чернови"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4499,11 +4452,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4527,19 +4475,8 @@ msgid "Account Type"
 msgstr "Вид сметка"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4561,8 +4498,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4591,7 +4539,7 @@ msgid "Month"
 msgstr "Месец"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4602,8 +4550,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4627,6 +4575,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Вид сметка"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4639,7 +4592,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4661,7 +4614,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4716,11 +4669,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Периодични обработки"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4750,10 +4698,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Фактура за доставчик"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4821,10 +4768,14 @@ msgstr "кредитни известия"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4873,7 +4824,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4888,7 +4839,7 @@ msgid "Based On"
 msgstr "Базирано на"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4913,11 +4864,6 @@ msgstr ""
 msgid "Change"
 msgstr "Промяна"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4940,11 +4886,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Отменено"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4955,11 +4896,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Запазете празно за да изпозвате сметката за приходи"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4969,7 +4905,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5043,16 +4979,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5163,6 +5094,7 @@ msgstr "Добавяне"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Платено"
 
@@ -5189,7 +5121,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5204,14 +5136,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5224,7 +5148,7 @@ msgid "Tax Application"
 msgstr "Бланка за данък"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5257,9 +5181,9 @@ msgid "End of period"
 msgstr "Край на периода"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Детайли за банката"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Плащане на фактури"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5352,14 +5276,6 @@ msgstr "Описание на данък"
 msgid "Child Tax Accounts"
 msgstr "Подчинени сметки за данъци"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5406,7 +5322,7 @@ msgid "Target Moves"
 msgstr "Целеви движения"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5442,6 +5358,7 @@ msgid "Python Code (reverse)"
 msgstr "Python код (обратно)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5455,12 +5372,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5486,18 +5397,13 @@ msgstr "Година"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Ред 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Вътрешно име"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5536,7 +5442,7 @@ msgstr "Баланс"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5569,7 +5475,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Изчисли кода (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5596,6 +5502,7 @@ msgstr "Автоматично равняване"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5696,7 +5603,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5726,7 +5633,7 @@ msgid "Amount Computation"
 msgstr "Пресмятане на количество"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5762,10 +5669,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Комуникация"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Отваряне"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5795,9 +5708,7 @@ msgstr "Кодове на данъци"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Обезщетение на клиент"
 
@@ -5814,11 +5725,6 @@ msgstr "Знак на кода на данъка"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Справка за фактурите издадени през последните 15 дена"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5835,6 +5741,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5923,8 +5830,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5947,6 +5852,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5954,15 +5866,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Полето за последователност се използва за да се подредят условията за "
-"плащане от най-маловажното до най-важното"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6020,12 +5923,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Фиксирана сметка"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6049,7 +5951,6 @@ msgstr "Създаване на начални записи"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Метода на изчисление на сумата на данъка"
 
@@ -6077,18 +5978,23 @@ msgid "Child Accounts"
 msgstr "Подчинени сметки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Отписване"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6105,7 +6011,7 @@ msgstr "Приход"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Доставчик"
@@ -6125,16 +6031,11 @@ msgid "Account n°"
 msgstr "Сметка n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Свободна отпратка"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Оценяване"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6244,7 +6145,7 @@ msgid "Filter by"
 msgstr "Подреждане по"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6291,6 +6192,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Брой дни"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6430,7 +6339,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6606,7 +6515,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6637,12 +6546,6 @@ msgstr ""
 msgid "Current"
 msgstr "Текущ"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6667,7 +6570,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Процентно"
 
@@ -6687,7 +6589,7 @@ msgid "Power"
 msgstr "Степенуване"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6734,12 +6636,17 @@ msgid "Applicable Type"
 msgstr "Приложими видове"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Отпратка на фактура"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6758,12 +6665,12 @@ msgstr ""
 "В този случай реда на изчисление е важен."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6830,7 +6737,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6841,9 +6748,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
@@ -6881,8 +6786,11 @@ msgid "Group By..."
 msgstr "Групиране по..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6961,6 +6869,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Касови плащания"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6978,7 +6893,7 @@ msgstr "Статистика на аналитични записи"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Записи: "
@@ -6996,14 +6911,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Истина"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7019,10 +6933,9 @@ msgid "Total debit"
 msgstr "Общ дебит"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Запис \"%s\" е невалиден !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7073,7 +6986,7 @@ msgstr "Създаване на запис"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7084,13 +6997,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Грешка!"
@@ -7127,6 +7041,11 @@ msgstr "Ред от проект"
 msgid "Manual"
 msgstr "Ръчно"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7225,8 +7144,8 @@ msgstr "Избор на дневник"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Начален баланс"
@@ -7306,7 +7225,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7327,6 +7246,11 @@ msgstr ""
 "\n"
 "Напр. Мой модел от %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7380,7 +7304,7 @@ msgid "Done"
 msgstr "Готово"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7412,9 +7336,8 @@ msgid "Source Document"
 msgstr "Документ източник"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7441,7 +7364,7 @@ msgid "Taxes:"
 msgstr "Данъци:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7638,6 +7561,12 @@ msgstr ""
 "Това поле се използва само ако притежавате модул който позволява "
 "програмистите да създадат специфичен данък в потребителски домейн."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Отпратка на фактура"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7727,7 +7656,7 @@ msgid "Use model"
 msgstr "Използвай модел"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7778,7 +7707,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7847,7 +7776,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Дневник продажби"
@@ -7858,7 +7787,7 @@ msgid "Invoice Tax"
 msgstr "Данък на фактура"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Няма номер на цена !"
@@ -7897,7 +7826,7 @@ msgid "Sales Properties"
 msgstr "Характеристики на продажбите"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7922,7 +7851,7 @@ msgstr "До"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7954,7 +7883,7 @@ msgid "May"
 msgstr "Май"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7972,10 +7901,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Код на казус"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7991,17 +7919,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Публикуване на дневникови записи"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Клиент"
@@ -8017,7 +7940,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "В брой"
@@ -8029,9 +7952,11 @@ msgid "Account Destination"
 msgstr "Предназначение на Сметката"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Плащане на фактури"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8039,7 +7964,6 @@ msgstr "Плащане на фактури"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8177,15 +8101,14 @@ msgid "Partner Ledger"
 msgstr "Счетоводна книга-Партньори"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Фиксиран"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Предупреждение !"
@@ -8253,7 +8176,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Изберете валута за фактурата"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Няма фактурни редове!"
@@ -8328,7 +8251,7 @@ msgid "Associated Partner"
 msgstr "Асоцииран партньор"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Първо трябва да изберете партньор !"
@@ -8410,13 +8333,13 @@ msgstr ""
 "изчисляването на следващите данъци."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Дневник обезщетения за покупки"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8487,7 +8410,7 @@ msgid "Net Total:"
 msgstr "Общо нето:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8507,15 +8430,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Отписване от дневник"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"За текущия партньор ще бъде използвано това плащане вместо това по "
-"подразбиране"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8542,11 +8456,6 @@ msgstr "Вътр. тип"
 msgid "Tax/Base Amount"
 msgstr "Данък/Основна сметка"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8600,6 +8509,11 @@ msgstr "Резултат от изравняване"
 msgid "Ending Balance"
 msgstr "Краен баланс"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8642,7 +8556,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8665,7 +8579,12 @@ msgid "Account Types"
 msgstr "Видове сметки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8673,8 +8592,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8692,10 +8611,9 @@ msgid "Reconciliation"
 msgstr "Обединяване"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Приходна сметка"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Запазете празно за да изпозвате сметката за приходи"
 
 #. module: account
 #: view:account.invoice:0
@@ -8767,7 +8685,7 @@ msgid "The partner account used for this invoice."
 msgstr "Партньорска сметка използвана за тази фактура"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8785,13 +8703,13 @@ msgid "Payment Term Line"
 msgstr "Ред на условие за плащане"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Дневник за поръчки"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Междинна сума"
 
@@ -8820,11 +8738,6 @@ msgstr "Насрочена дата"
 msgid "Suppliers"
 msgstr "Доставчици"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Истина"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8959,9 +8872,10 @@ msgid "Journal Name"
 msgstr "Име на дневник"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Запис \"%s\" е невалиден !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9008,7 +8922,7 @@ msgstr ""
 "Сумата изразена във възможна друга валута ако записа е в повече валути"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9069,7 +8983,7 @@ msgid "Reconciled entries"
 msgstr "Обединени записи"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9091,7 +9005,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9125,7 +9039,7 @@ msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Отваряне на Журнал със записи"
@@ -9172,7 +9086,7 @@ msgstr ""
 "подчинените данъци вместо върху общата сума"
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9187,18 +9101,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Код на дневник"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9231,7 +9136,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Дневник обезщетения за продажби"
@@ -9297,7 +9202,7 @@ msgid "Purchase Tax(%)"
 msgstr "Данък покупка (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9316,7 +9221,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9431,21 +9336,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Брой периоди"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Шаблон за код на данък"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Документ: счетоводен отчет за клиент"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9457,8 +9352,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9478,14 +9374,14 @@ msgid "Document"
 msgstr "Документ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Банкови извлечения"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Приходна сметка"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9586,8 +9482,8 @@ msgid "Move"
 msgstr "Преместване"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9666,11 +9562,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Транзакции за връщане на приравняване"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9688,11 +9579,16 @@ msgid "Balance :"
 msgstr "Баланс :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9729,13 +9625,6 @@ msgstr "Абонамент"
 msgid "Account Analytic Balance"
 msgstr "Баланс на аналитична сметка"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9775,7 +9664,13 @@ msgid "Due date"
 msgstr "Падежна дата"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9864,7 +9759,7 @@ msgid "Unreconciled"
 msgstr "Неприравнен"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Грешна обща сума !"
@@ -9947,7 +9842,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9965,6 +9860,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10020,11 +9920,6 @@ msgstr "Кредит"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10036,7 +9931,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10121,7 +10016,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10444,7 +10339,14 @@ msgid "Empty Accounts ? "
 msgstr "Празни сметки? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10569,7 +10471,7 @@ msgid "Receivable accounts"
 msgstr "Сметки вземания"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10696,7 +10598,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10802,7 +10704,7 @@ msgid "Accounting Documents"
 msgstr "Счетоводни документи"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10847,7 +10749,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ръчно фактуриране на данъци"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10926,14 +10828,6 @@ msgstr ""
 msgid "February"
 msgstr "Февруари"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10992,6 +10886,11 @@ msgstr "Планиране на шаблон за дан. сметка"
 msgid "Expense Account on Product Template"
 msgstr "Сметка разходи в шаблона за продукт"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11046,9 +10945,6 @@ msgstr ""
 #~ msgid "Aged Trial Balance"
 #~ msgstr "Стар пробен баланс"
 
-#~ msgid "Fixed"
-#~ msgstr "Фиксиран"
-
 #~ msgid "Origin"
 #~ msgstr "Произход"
 
@@ -11070,12 +10966,22 @@ msgstr ""
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Неплатени обезщетения на доставчици"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Периодични обработки"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Статистика за аналитичните записи"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Фактура за доставчик"
+
 #~ msgid "Line"
 #~ msgstr "Ред"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Contact"
 #~ msgstr "Контакт"
 
@@ -11139,6 +11045,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Номер на ваучер"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Полето за последователност се използва за да се подредят условията за "
+#~ "плащане от най-маловажното до най-важното"
+
 #~ msgid "Total write-off"
 #~ msgstr "Общо отписване"
 
@@ -11157,6 +11070,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Данъци на поръчка"
 
+#~ msgid "Line Name"
+#~ msgstr "Име на ред"
+
 #~ msgid "Value"
 #~ msgstr "Стойност"
 
@@ -11295,6 +11211,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Използвай този код за ДДС декларация"
 
+#~ msgid "Litigation"
+#~ msgstr "Жалба"
+
 #~ msgid "Dear Sir/Madam,"
 #~ msgstr "Уважаеми г-н/г-жо,"
 
@@ -11621,6 +11540,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Пропускане на състоянието 'проект' за създадените записи"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "List of Accounts"
 #~ msgstr "Списък със сметки"
 
@@ -11891,6 +11813,13 @@ msgstr ""
 #~ msgid "Compute Taxes"
 #~ msgstr "Изчисляване на данъци"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "За текущия партньор ще бъде използвано това плащане вместо това по "
+#~ "подразбиране"
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -12288,6 +12217,9 @@ msgstr ""
 #~ msgid "No sequence defined on the journal !"
 #~ msgstr "Не са зададени последоватености за този дневник !"
 
+#~ msgid "Line 2:"
+#~ msgstr "Ред 2:"
+
 #~ msgid "Starts on"
 #~ msgstr "Започва на"
 
@@ -12348,6 +12280,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Този доклад ви дава представа за състоянието на вашите главни дневници"
 
+#~ msgid "Line 1:"
+#~ msgstr "Ред 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Артикул на дневник\"%s\" не е валиден"
@@ -12358,6 +12293,9 @@ msgstr ""
 #~ msgid "Debit/Credit"
 #~ msgstr "Дебит/Кредит"
 
+#~ msgid "Communication"
+#~ msgstr "Комуникация"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Грешка при настройване!"
@@ -12378,6 +12316,9 @@ msgstr ""
 #~ msgid "Already Reconciled!"
 #~ msgstr "Вече равнено!"
 
+#~ msgid "Valuation"
+#~ msgstr "Оценяване"
+
 #, python-format
 #~ msgid "New currency is not confirured properly !"
 #~ msgstr "Новата валута не е настроена правилно!"
@@ -12698,6 +12639,14 @@ msgstr ""
 #~ msgid "last month"
 #~ msgstr "предходен месец"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "В случай че анулирате съответствието на транзакции,моля да проверите всички "
+#~ "действия свързани с тези транзакции, тъй като тези действия няма да бъдат "
+#~ "премахнати автоматично"
+
 #~ msgid "Children Definition"
 #~ msgstr "Определяне на елементи тип \"дете\""
 
@@ -12754,6 +12703,14 @@ msgstr ""
 #~ "отпечатване на справка състоянието се променя на \"Отпечатан/а\". Когато "
 #~ "всички транзакции са завършени, състоянието става \"Готов/а\"."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "В случай че анулирате изравняване на транзакции трябва да проверите всички "
+#~ "действия свързани с тези транзакции тъй като те няма да бъдат автоматично "
+#~ "спрени"
+
 #~ msgid "Sale journal in this year"
 #~ msgstr "Дневник Продажби текуща година"
 
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index a5735080965..e6b1badd999 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-12 09:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Breton <br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Patromoù tailhoù"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 9facef48adf..01752a664d8 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -93,13 +88,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Ukupan dug"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -110,7 +98,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -139,19 +126,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -163,7 +150,7 @@ msgid "Warning!"
 msgstr "Upozorenje!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -232,11 +219,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Predlošci poreza"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -252,6 +234,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -378,11 +365,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -437,6 +419,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -452,6 +439,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Predložak plana"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -613,15 +605,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Ako želite poništiti usklađivanje transakcija, morate također provjeriti sve "
-"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -670,7 +653,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -681,13 +664,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -750,6 +733,11 @@ msgstr "Potražni računi"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -772,6 +760,12 @@ msgstr "Ponovno otvori"
 msgid "Are you sure you want to create entries?"
 msgstr "Jeste sigurni da želite stvortiti stavke?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -792,6 +786,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procenat"
 
@@ -834,7 +829,7 @@ msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -857,24 +852,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Poništavanje usklađivanja"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -905,11 +894,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -940,7 +924,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -955,6 +939,7 @@ msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Izračun"
 
@@ -986,11 +971,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1008,7 @@ msgid "Liability"
 msgstr "Obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1097,10 +1079,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1176,8 +1158,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1223,7 +1206,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1519,9 +1502,9 @@ msgid "Account Receivable"
 msgstr "Potražni konto"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1535,7 +1518,7 @@ msgid "With balance is not equal to 0"
 msgstr "Sa saldom različit od 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1590,7 +1573,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1633,6 +1616,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Povrat dobavljaču"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Šifra pretinca"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1670,7 +1659,6 @@ msgid "Groups"
 msgstr "Grupe"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Neoporezivo"
@@ -1803,6 +1791,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1823,115 +1817,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2040,6 +1930,11 @@ msgstr "Ova razdoblja se mogu preklapati."
 msgid "Draft statement"
 msgstr "Izvod u pripremi"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2068,26 +1963,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2095,16 +1989,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2115,8 +2009,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2161,7 +2055,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2261,7 +2155,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2620,7 +2514,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Ostavite prazno za sve otvorene fiskalne godine"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2638,7 +2532,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2659,7 +2553,7 @@ msgid "Main Sequence"
 msgstr "Glavna Sekvenca"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2667,14 +2561,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
@@ -2700,18 +2592,6 @@ msgstr "Označite ovu kućicu"
 msgid "Filters"
 msgstr "Filteri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Otvori"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2723,6 +2603,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2800,25 +2685,20 @@ msgid "Account Model Entries"
 msgstr "Stavke računa modela"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Porezi Dobavljača"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalji banke"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2841,7 +2721,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2856,9 +2735,8 @@ msgstr ""
 "30 dana."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2888,6 +2766,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Porez"
 
@@ -2923,14 +2802,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3027,6 +2906,12 @@ msgstr "Plaćeno/Usklađeno"
 msgid "Refund Base Code"
 msgstr "Šifra osnovice povrata"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3079,11 +2964,6 @@ msgstr "Zreli saldo partnera"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3124,7 +3004,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3137,7 +3017,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3153,15 +3033,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3169,7 +3049,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3231,8 +3111,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3279,12 +3160,6 @@ msgstr "Iznos osnovne šifre"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3318,7 +3193,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalna pozicija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3345,7 +3220,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3416,7 +3291,7 @@ msgstr ""
 "transakcije uvijek koriste dnevni kurs."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3428,9 +3303,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Broj znamenki za upotrebu u šifri računa"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Naziv redka"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3479,7 +3354,7 @@ msgid "View"
 msgstr "Prikaz"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3500,15 +3375,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektronska datoteka"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Predložak šifre poreza"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3516,9 +3396,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3644,12 +3603,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3664,7 +3626,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3864,7 +3826,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3888,7 +3850,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4025,7 +3987,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4112,9 +4074,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Parnica"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4198,11 +4163,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4220,11 +4180,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4269,8 +4224,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4300,7 +4255,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirani potomci"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4332,11 +4287,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4426,6 +4376,13 @@ msgstr "30 dana kraj mjeseca"
 msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4445,6 +4402,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4455,11 +4417,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4468,11 +4425,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4496,19 +4448,8 @@ msgid "Account Type"
 msgstr "Tip konta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4530,8 +4471,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4560,7 +4512,7 @@ msgid "Month"
 msgstr "Mjesec"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4571,8 +4523,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4596,6 +4548,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4608,7 +4565,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4630,7 +4587,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4685,11 +4642,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodička obrada"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4719,10 +4671,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Ulazna faktura"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4790,10 +4741,14 @@ msgstr "Knjižna odobrenja"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4842,7 +4797,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4857,7 +4812,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4882,11 +4837,6 @@ msgstr ""
 msgid "Change"
 msgstr "Promjeni"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4909,11 +4859,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4924,11 +4869,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Ne popunjavati za upotrebu računa za prihod"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4938,7 +4878,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5012,16 +4952,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5132,6 +5067,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Plaćeno"
 
@@ -5158,7 +5094,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5173,14 +5109,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5193,7 +5121,7 @@ msgid "Tax Application"
 msgstr "Porezna prijava"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5226,9 +5154,9 @@ msgid "End of period"
 msgstr "Kraj razdoblja"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalji banke"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5321,14 +5249,6 @@ msgstr "Opis poreza"
 msgid "Child Tax Accounts"
 msgstr "Konta potporeza."
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5375,7 +5295,7 @@ msgid "Target Moves"
 msgstr "Cilj prijenosa"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5411,6 +5331,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Kod (obrnuti)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5424,12 +5345,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5455,18 +5370,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interni naziv"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5505,7 +5415,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5538,7 +5448,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Kod za izračunavanje (ako je tip=Python kod)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5565,6 +5475,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5665,7 +5576,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5695,7 +5606,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5731,10 +5642,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Otvori"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5764,9 +5681,7 @@ msgstr "Šifre poreza"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Povrat kupcu"
 
@@ -5783,11 +5698,6 @@ msgstr "Predznak šifre poreza"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Izvještaj o fakturama unesenim u zadnjih 15 dana"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5804,6 +5714,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5892,8 +5803,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5916,6 +5825,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5923,15 +5839,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Polje redoslijed se upotrebljava za redanje redaka uvjeta plaćanja od "
-"najmanjeg do najvećeg"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5989,12 +5896,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fiksni iznos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6018,7 +5924,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Način izračuna iznosa poreza"
 
@@ -6046,18 +5951,23 @@ msgid "Child Accounts"
 msgstr "Podkonta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6074,7 +5984,7 @@ msgstr "Prihod"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -6094,16 +6004,11 @@ msgid "Account n°"
 msgstr "Broj računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6213,7 +6118,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6260,6 +6165,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Broj dana"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6399,7 +6312,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6575,7 +6488,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6606,12 +6519,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6636,7 +6543,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Postotak"
 
@@ -6656,7 +6562,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6701,12 +6607,17 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referenca Fakture"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6725,12 +6636,12 @@ msgstr ""
 "slućaju, redosljed evaluacije je bitan."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6797,7 +6708,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6808,9 +6719,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Povrat dobavljaču"
 
@@ -6848,8 +6757,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6928,6 +6840,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6945,7 +6864,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6963,14 +6882,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Tačno"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6986,9 +6904,8 @@ msgid "Total debit"
 msgstr "Ukupan dug"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7040,7 +6957,7 @@ msgstr "Kreiraj stavku"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7051,13 +6968,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7094,6 +7012,11 @@ msgstr "Redak projekta"
 msgid "Manual"
 msgstr "Ručno"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7192,8 +7115,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7273,7 +7196,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7286,6 +7209,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7339,7 +7267,7 @@ msgid "Done"
 msgstr "Završeno"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7371,9 +7299,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7400,7 +7327,7 @@ msgid "Taxes:"
 msgstr "Porezi:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7597,6 +7524,12 @@ msgstr ""
 "Ovo polje se upotrebljava samo ako razvijate vlastiti modul te dozvoljava "
 "razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referenca Fakture"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7686,7 +7619,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7737,7 +7670,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7804,7 +7737,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7815,7 +7748,7 @@ msgid "Invoice Tax"
 msgstr "Porez fakture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7854,7 +7787,7 @@ msgid "Sales Properties"
 msgstr "Svojstva prodaje"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7879,7 +7812,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7911,7 +7844,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7929,10 +7862,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Šifra pretinca"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7948,17 +7880,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -7974,7 +7901,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7986,8 +7913,10 @@ msgid "Account Destination"
 msgstr "Ciljni konto"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7996,7 +7925,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8134,15 +8062,14 @@ msgid "Partner Ledger"
 msgstr "Knjiga salda partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8210,7 +8137,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8285,7 +8212,7 @@ msgid "Associated Partner"
 msgstr "Vezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8367,13 +8294,13 @@ msgstr ""
 "narednih poreza."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8444,7 +8371,7 @@ msgid "Net Total:"
 msgstr "Ukupno netto:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8464,15 +8391,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Nalog za otpis"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Ovi uvjeti plaćanja će se koristiti umjesto podrazumijevanih za trenutnog "
-"partnera."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8499,11 +8417,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Iznos poreza/osnovice"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8557,6 +8470,11 @@ msgstr "Rezultat poravnjavanja"
 msgid "Ending Balance"
 msgstr "Završni saldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8597,7 +8515,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8620,7 +8538,12 @@ msgid "Account Types"
 msgstr "Tipovi konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8628,8 +8551,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8647,10 +8570,9 @@ msgid "Reconciliation"
 msgstr "Usklađivanje"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto Potraživanja"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Ne popunjavati za upotrebu računa za prihod"
 
 #. module: account
 #: view:account.invoice:0
@@ -8722,7 +8644,7 @@ msgid "The partner account used for this invoice."
 msgstr "Račun partnera korišten za ovu fakturu"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8740,13 +8662,13 @@ msgid "Payment Term Line"
 msgstr "Redak uvjeta plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8775,11 +8697,6 @@ msgstr "Datum dospijeća"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Tačno"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8914,8 +8831,9 @@ msgid "Journal Name"
 msgstr "Naziv naloga za knjiženje"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8962,7 +8880,7 @@ msgid ""
 msgstr "Iznos izražen u opcionalnoj drugoj valuti ako je viševalutni unos."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9023,7 +8941,7 @@ msgid "Reconciled entries"
 msgstr "Usklađene stavke"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9045,7 +8963,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9079,7 +8997,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Nalog za knjiženje otvarajućih stavaka"
@@ -9126,7 +9044,7 @@ msgstr ""
 "ukupnom iznosu."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9141,18 +9059,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Šifra knjiženja"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9185,7 +9094,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9251,7 +9160,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9270,7 +9179,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9385,21 +9294,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Broj perioda"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Predložak šifre poreza"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Izvještaj konta kupca"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9411,8 +9310,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9432,14 +9332,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto Potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9540,8 +9440,8 @@ msgid "Move"
 msgstr "Prijenos"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9618,11 +9518,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transakcije poništavanja usklađivanja"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9640,11 +9535,16 @@ msgid "Balance :"
 msgstr "Saldo"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9681,13 +9581,6 @@ msgstr "Pretplata"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9727,7 +9620,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9816,7 +9715,7 @@ msgid "Unreconciled"
 msgstr "Neusklađen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9899,7 +9798,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9917,6 +9816,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9972,11 +9876,6 @@ msgstr "Potražuje"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9988,7 +9887,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10073,7 +9972,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10396,7 +10295,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10521,7 +10427,7 @@ msgid "Receivable accounts"
 msgstr "Konta potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10648,7 +10554,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10754,7 +10660,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10799,7 +10705,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ručni porezi fakture"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10878,14 +10784,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10944,6 +10842,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr "Račun troškova na predlošku proizvoda"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11018,9 +10921,6 @@ msgstr ""
 #~ msgid "Recurrent Entries"
 #~ msgstr "Ponavljajuće stavke"
 
-#~ msgid "Fixed"
-#~ msgstr "Fiksno"
-
 #~ msgid "Accounting Entries-"
 #~ msgstr "Računovodstvene stavke-"
 
@@ -11074,6 +10974,10 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "otvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Ulazna faktura"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statistika analitičkih stavki"
 
@@ -11083,6 +10987,9 @@ msgstr ""
 #~ msgid "Line"
 #~ msgstr "Redak"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Printing Date"
 #~ msgstr "Datum ispisa"
 
@@ -11182,6 +11089,13 @@ msgstr ""
 #~ msgid "Fiscal Position Taxes Mapping"
 #~ msgstr "Mapiranje poreza fiskalne pozicije"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Polje redoslijed se upotrebljava za redanje redaka uvjeta plaćanja od "
+#~ "najmanjeg do najvećeg"
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Ispist analitičkih naloga za knjiženje"
 
@@ -11236,6 +11150,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Porezi nabave"
 
+#~ msgid "Line Name"
+#~ msgstr "Naziv redka"
+
 #~ msgid "Entries Reconcile"
 #~ msgstr "Uskladi stavke"
 
@@ -11260,6 +11177,9 @@ msgstr ""
 #~ msgid "Taxes Reports"
 #~ msgstr "Porezna izvješća"
 
+#~ msgid "Litigation"
+#~ msgstr "Parnica"
+
 #~ msgid "From analytic accounts, Create invoice."
 #~ msgstr "Iz analitičkog konta, stvori fakturu."
 
@@ -11281,6 +11201,13 @@ msgstr ""
 #~ msgid "Customer Credit"
 #~ msgstr "Potraživanja za kupca"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Ako želite poništiti usklađivanje transakcija, morate također provjeriti sve "
+#~ "radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
+
 #~ msgid "Close states"
 #~ msgstr "Zatvori stanja"
 
@@ -11889,6 +11816,9 @@ msgstr ""
 #~ msgid "Subscription Entries"
 #~ msgstr "Stavke pretplate"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Definicija naloga za knjiženje analitike"
 
@@ -12215,6 +12145,9 @@ msgstr ""
 #~ msgid "Payment date"
 #~ msgstr "Datum plaćanja"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodička obrada"
+
 #~ msgid "Entries Encoding"
 #~ msgstr "Kodiranje unosa"
 
@@ -12260,6 +12193,13 @@ msgstr ""
 #~ msgid "Import Invoice"
 #~ msgstr "Uvezi fakturu"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Ovi uvjeti plaćanja će se koristiti umjesto podrazumijevanih za trenutnog "
+#~ "partnera."
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index d52f8167ca3..570ca0c04c3 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:27+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Transaccions no conciliades"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "Importa des de factura o pagament"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,15 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total deure"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si desconcileu transaccions, heu de verificar totes les accions relacionades "
-"amb aquestes perquè no es desactivaran."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -110,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -141,19 +126,19 @@ msgstr ""
 "eliminar-ho."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -165,7 +150,7 @@ msgid "Warning!"
 msgstr "Avís!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -237,11 +222,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantilles impostos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -257,6 +237,11 @@ msgstr "Els assentaments comptables són una entrada de la conciliació."
 msgid "Belgian Reports"
 msgstr "Informes Belgues"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -385,11 +370,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -444,6 +424,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -459,6 +444,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plantilla pla comptable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -620,16 +610,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si trenqueu la conciliació de les transaccions, haureu de comprovar també "
-"totes les accions relacionades amb aquestes transaccions degut a que no "
-"seran deshabilitades."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -678,7 +658,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -689,13 +669,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Informe de les vendes per tipus de compte"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VENDA"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -758,6 +738,11 @@ msgstr "Comptes a cobrar"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -780,6 +765,12 @@ msgstr "Reobre"
 msgid "Are you sure you want to create entries?"
 msgstr "Esteu segurs que voleu crear els assentaments?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -800,6 +791,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentatge"
 
@@ -842,7 +834,7 @@ msgid "Type"
 msgstr "Tipus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -865,24 +857,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "No conciliació"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -913,11 +899,6 @@ msgstr "C.Diari / Nom mov."
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -948,7 +929,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -963,6 +944,7 @@ msgstr "Subscripció nova"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Càlcul"
 
@@ -994,11 +976,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1034,7 +1013,7 @@ msgid "Liability"
 msgstr "Passiu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1108,10 +1087,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1190,8 +1169,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1237,7 +1217,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banc"
@@ -1533,9 +1513,9 @@ msgid "Account Receivable"
 msgstr "Compte a cobrar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1549,7 +1529,7 @@ msgid "With balance is not equal to 0"
 msgstr "Amb balanç si no és igual a 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1604,7 +1584,7 @@ msgstr "Omet estat 'Esborrany' pels assentaments manuals."
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1647,6 +1627,12 @@ msgstr "Una taula temporal utilitzada per a la vista de taulell"
 msgid "Supplier Refunds"
 msgstr "Factures rectificatives (abonament) de proveïdor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Codi"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1684,7 +1670,6 @@ msgid "Groups"
 msgstr "Grups"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Base"
@@ -1817,6 +1802,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Vendes per tipus de compte"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1837,115 +1828,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2056,6 +1943,11 @@ msgstr "Aquests períodes es poden superposar."
 msgid "Draft statement"
 msgstr "Extracte esborrany"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2084,26 +1976,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2111,16 +2002,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2131,8 +2022,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2177,7 +2068,7 @@ msgid "period close"
 msgstr "tancament del període"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2277,7 +2168,7 @@ msgid "Product Category"
 msgstr "Categoria del producte"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2644,7 +2535,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Deixeu-lo buit per a tots els exercicis fiscals oberts"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2662,7 +2553,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Crea un compte basat en aquesta plantilla"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2683,7 +2574,7 @@ msgid "Main Sequence"
 msgstr "Seqüència principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2691,14 +2582,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Termini de pagament"
 
@@ -2724,18 +2613,6 @@ msgstr "Marqueu aquesta casella"
 msgid "Filters"
 msgstr "Filtres"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Obert"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2747,6 +2624,11 @@ msgstr "Estat esborrany d'una factura"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2825,25 +2707,20 @@ msgid "Account Model Entries"
 msgstr "Líniees de model d'assentament"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "DESPESA"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impostos proveïdor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalls del banc"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2866,7 +2743,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2881,9 +2757,8 @@ msgstr ""
 "venciment, per exemple, 50% ara, 50% en un mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2913,6 +2788,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impost"
 
@@ -2948,14 +2824,14 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3054,6 +2930,12 @@ msgstr "Pagat/Conciliat"
 msgid "Refund Base Code"
 msgstr "Codi base reintegrament"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extractes bancaris"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3106,11 +2988,6 @@ msgstr "Balanç d'empresa anterior"
 msgid "Accounting entries"
 msgstr "Assentaments comptables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3156,7 +3033,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3169,7 +3046,7 @@ msgid "Sales by Account"
 msgstr "Vendes per compte"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3185,15 +3062,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Heu de definir un diari analític al diari '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3201,7 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3266,9 +3143,10 @@ msgstr ""
 "per a alguns informes."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Línia 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3317,12 +3195,6 @@ msgstr "Import codi base"
 msgid "Default Sale Tax"
 msgstr "Impost de venda per defecte"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factura '%s' és validada."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3359,7 +3231,7 @@ msgid "Fiscal Position"
 msgstr "Posició fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3386,7 +3258,7 @@ msgid "Trial Balance"
 msgstr "Balanç de sumes i saldos"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3457,7 +3329,7 @@ msgstr ""
 "transaccions d'entrada sempre utilitzen el tipus a una data."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3469,9 +3341,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Núm. de dígits a utilitzar per a codi de compte"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nom línia"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3520,7 +3392,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3541,15 +3413,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Fitxer electrònic"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla codis d'impostos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3557,9 +3434,88 @@ msgid "Account Partner Ledger"
 msgstr "Llibre major de l'empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3698,12 +3654,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"si li doneu un nom diferent de /, l'assentament comptable tindrà el mateix "
+"nom que l'extracte. Això permet que els assentaments de l'extracte tinguin "
+"les mateixes referències que el propi extracte"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3718,7 +3680,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No s'ha definit empresa!"
@@ -3922,7 +3884,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3946,7 +3908,7 @@ msgid "Category of Product"
 msgstr "Categoria del producte"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4085,7 +4047,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del pla comptable"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4175,9 +4137,15 @@ msgid "Qty"
 msgstr "Qtat"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litigi"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Podeu indicar aquí el coeficient que s'utilitzarà quan es consolidi l'import "
+"d'aquest codi dins del seu pare. Per exemple, indiqueu 1/-1 si desitgeu "
+"sumar/restar l'import."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4262,11 +4230,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4284,11 +4247,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4333,8 +4291,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4364,7 +4322,7 @@ msgid "Consolidated Children"
 msgstr "Fills consolidats"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4400,11 +4358,6 @@ msgstr ""
 msgid "title"
 msgstr "títol"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4494,6 +4447,13 @@ msgstr "30 dies fi de mes"
 msgid "Analytic Balance"
 msgstr "Saldo analític"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4514,6 +4474,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4524,11 +4489,6 @@ msgstr "Cerca plantilles d'impostos"
 msgid "Draft Entries"
 msgstr "Assentaments en esborrany"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4537,11 +4497,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4565,20 +4520,9 @@ msgid "Account Type"
 msgstr "Tipus de compte"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Tanca caixa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4602,9 +4546,20 @@ msgstr ""
 "proveïdor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Tanca caixa"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4632,7 +4587,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4643,8 +4598,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4668,6 +4623,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Tipus de compte"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4680,7 +4640,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4702,7 +4662,7 @@ msgid "Account Base Code"
 msgstr "Codi base del compte"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4757,11 +4717,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Processament periòdic"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4791,10 +4746,9 @@ msgid "Account chart"
 msgstr "Pla comptable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura de proveïdor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4862,10 +4816,14 @@ msgstr "Factures rectificatives (abonament)"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4914,7 +4872,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4929,7 +4887,7 @@ msgid "Based On"
 msgstr "Basat en"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4954,11 +4912,6 @@ msgstr ""
 msgid "Change"
 msgstr "Canvia"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banc i xecs"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4981,11 +4934,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4996,11 +4944,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Deixar buit pel compte d'ingressos"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5010,7 +4953,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5084,16 +5027,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5204,6 +5142,7 @@ msgstr "Afegeix"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagat"
 
@@ -5230,7 +5169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5245,14 +5184,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5265,7 +5196,7 @@ msgid "Tax Application"
 msgstr "Aplicació impost"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5298,9 +5229,9 @@ msgid "End of period"
 msgstr "Fi del període"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalls del banc"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pagament de factures"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5393,14 +5324,6 @@ msgstr "Descripció impost"
 msgid "Child Tax Accounts"
 msgstr "Comptes impostos filles"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5447,7 +5370,7 @@ msgid "Target Moves"
 msgstr "Moviments destí"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5483,6 +5406,7 @@ msgid "Python Code (reverse)"
 msgstr "Codi Python (invers)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5496,12 +5420,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5527,18 +5445,13 @@ msgstr "Any"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Línia 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nom intern"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5577,7 +5490,7 @@ msgstr "Balanç de situació"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5610,7 +5523,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Codi per calcular (si tipus=codi)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5637,6 +5550,7 @@ msgstr "Conciliació automàtica"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5740,7 +5654,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5770,7 +5684,7 @@ msgid "Amount Computation"
 msgstr "Càlcul del import"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5806,10 +5720,16 @@ msgid "Account Common Account Report"
 msgstr "Informe comptable comú"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicació"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Obert"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5839,9 +5759,7 @@ msgstr "Codis impostos"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Factura rectificativa (abonament) de client"
 
@@ -5858,11 +5776,6 @@ msgstr "Signe codi impost"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Informe de factures creades en els últims 15 dies"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5879,6 +5792,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5970,8 +5884,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5994,6 +5906,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6003,15 +5922,6 @@ msgstr ""
 "La potència de la conciliació automàtica a seleccionar és el número dels "
 "imports parcials que es poden combinar per trobar un saldo a zero."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"El camp seqüència és utilitzat per ordenar les línies de terminis de "
-"pagament en ordre ascendent."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6069,12 +5979,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Import fix"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6098,7 +6007,6 @@ msgstr "Genera assentaments d'obertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "El mètodo de càlcul de l'import de l'impost."
 
@@ -6126,18 +6034,23 @@ msgid "Child Accounts"
 msgstr "Comptes fills"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Desajust"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6154,7 +6067,7 @@ msgstr "Ingrés"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveïdor"
@@ -6174,16 +6087,11 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referència lliure"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valoració"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6298,7 +6206,7 @@ msgid "Filter by"
 msgstr "Filtra per"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6345,6 +6253,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Número de dies"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6486,7 +6402,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6661,7 +6577,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6692,12 +6608,6 @@ msgstr ""
 msgid "Current"
 msgstr "Actiu"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6722,7 +6632,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentatge"
 
@@ -6742,7 +6651,7 @@ msgid "Power"
 msgstr "Força"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6789,12 +6698,17 @@ msgid "Applicable Type"
 msgstr "Tipus aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referència factura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6813,12 +6727,12 @@ msgstr ""
 "impostos fills. En aquest cas, l'ordre d'avaluació és important."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6893,7 +6807,7 @@ msgid "Optional create"
 msgstr "Crea opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6904,9 +6818,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Factura rectificativa (abonament) de proveïdor"
 
@@ -6944,8 +6856,11 @@ msgid "Group By..."
 msgstr "Agrupa per..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -7024,6 +6939,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Transaccions en efectiur"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7041,7 +6963,7 @@ msgstr "Estadístiques d'assentaments analítics"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Assentaments: "
@@ -7059,14 +6981,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Cert"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7082,10 +7003,9 @@ msgid "Total debit"
 msgstr "Total deure"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "L'assentament \"%s\" no és vàlid!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7138,7 +7058,7 @@ msgstr "Crea assentament"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7149,13 +7069,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Error!"
@@ -7192,6 +7113,11 @@ msgstr "Línia del projecte"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7296,8 +7222,8 @@ msgstr "Seleccioneu diari"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo d'obertura"
@@ -7379,7 +7305,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7399,6 +7325,11 @@ msgstr ""
 "%(date)s: Data actual\n"
 "Exemple: El meu model a %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7452,7 +7383,7 @@ msgid "Done"
 msgstr "Realitzat"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7492,9 +7423,8 @@ msgid "Source Document"
 msgstr "Document d'origen"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7521,7 +7451,7 @@ msgid "Taxes:"
 msgstr "Impostos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7719,6 +7649,12 @@ msgstr ""
 "als programadors crear impostos específics en una configuració "
 "personalitzada."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referència factura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7811,7 +7747,7 @@ msgid "Use model"
 msgstr "Utilitza el model"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7862,7 +7798,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7931,7 +7867,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diari de vendes"
@@ -7942,7 +7878,7 @@ msgid "Invoice Tax"
 msgstr "Impost de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Cap tros de número!"
@@ -7981,7 +7917,7 @@ msgid "Sales Properties"
 msgstr "Propietats de venda"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8006,7 +7942,7 @@ msgstr "Fins"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8038,7 +7974,7 @@ msgid "May"
 msgstr "Maig"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8056,10 +7992,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Codi"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8075,17 +8010,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Assentar assentaments"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Client"
@@ -8101,7 +8031,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Caixa"
@@ -8113,9 +8043,11 @@ msgid "Account Destination"
 msgstr "Compte destí"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pagament de factures"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8123,7 +8055,6 @@ msgstr "Pagament de factures"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8261,15 +8192,14 @@ msgid "Partner Ledger"
 msgstr "Llibre major d'empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fix"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Atenció!"
@@ -8337,7 +8267,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccioneu una moneda per aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No hi ha línies de factura!"
@@ -8416,7 +8346,7 @@ msgid "Associated Partner"
 msgstr "Empresa associada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primer heu de seleccionar una empresa!"
@@ -8498,13 +8428,13 @@ msgstr ""
 "calcular els següents impostos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diari d'abonament de compres"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8576,7 +8506,7 @@ msgid "Net Total:"
 msgstr "Base:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8596,15 +8526,6 @@ msgstr "Informes genèrics"
 msgid "Write-Off Journal"
 msgstr "Diari de desajust"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Aquest termini de pagament es farà servir en lloc del termini per defecte "
-"per a l'empresa actual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8631,11 +8552,6 @@ msgstr "Tipus intern"
 msgid "Tax/Base Amount"
 msgstr "Import impostos/base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8689,6 +8605,11 @@ msgstr "Resultat de conciliació"
 msgid "Ending Balance"
 msgstr "Saldo final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8731,7 +8652,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Importació automàtica de l'extracte bancari"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8754,7 +8675,12 @@ msgid "Account Types"
 msgstr "Tipus de comptes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8762,9 +8688,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr ""
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoria Balanç / PiG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8781,10 +8707,9 @@ msgid "Reconciliation"
 msgstr "Conciliació"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Compte a cobrar"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Deixar buit pel compte d'ingressos"
 
 #. module: account
 #: view:account.invoice:0
@@ -8856,7 +8781,7 @@ msgid "The partner account used for this invoice."
 msgstr "El compte de l'empresa utilitzat per aquesta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8874,13 +8799,13 @@ msgid "Payment Term Line"
 msgstr "Línia de termini de pagament"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diari de compres"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8909,11 +8834,6 @@ msgstr "Data venciment"
 msgid "Suppliers"
 msgstr "Proveïdors"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Cert"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9050,9 +8970,10 @@ msgid "Journal Name"
 msgstr "Nom diari"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "L'assentament \"%s\" no és vàlid!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9100,7 +9021,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9164,7 +9085,7 @@ msgid "Reconciled entries"
 msgstr "Assentaments conciliats"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9186,7 +9107,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprimeix balanç comptable de l'empresa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9220,7 +9141,7 @@ msgstr "Desconegut"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diari assentaments d'obertura"
@@ -9267,7 +9188,7 @@ msgstr ""
 "comptes de l'import total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9282,21 +9203,9 @@ msgstr "Calculat per codi Python"
 msgid "Journal Code"
 msgstr "Codi diari"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Podeu indicar aquí el coeficient que s'utilitzarà quan es consolidi l'import "
-"d'aquest codi dins del seu pare. Per exemple, indiqueu 1/-1 si desitgeu "
-"sumar/restar l'import."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Import residual"
 
@@ -9329,7 +9238,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diari d'abonament de vendes"
@@ -9395,7 +9304,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impost de la compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Creeu algunes línies de factura"
@@ -9414,7 +9323,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9532,21 +9441,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de períodes"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla codis d'impostos"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Estat comptable del client"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoria Balanç / PiG"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9558,8 +9457,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9579,14 +9479,14 @@ msgid "Document"
 msgstr "Document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractes bancaris"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Compte a cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9688,8 +9588,8 @@ msgid "Move"
 msgstr "Assent."
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9769,11 +9669,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transaccions de no conciliació"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9791,11 +9686,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9832,13 +9732,6 @@ msgstr "Assentament periòdic"
 msgid "Account Analytic Balance"
 msgstr "Balanç del saldo analític"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9878,7 +9771,13 @@ msgid "Due date"
 msgstr "Data de venciment"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9967,7 +9866,7 @@ msgid "Unreconciled"
 msgstr "No conciliat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Total erroni!"
@@ -10059,7 +9958,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10077,6 +9976,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10132,11 +10036,6 @@ msgstr "Haver"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10148,7 +10047,7 @@ msgid "Journal Entry Model"
 msgstr "Model d'assentament"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10233,7 +10132,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10564,7 +10463,14 @@ msgid "Empty Accounts ? "
 msgstr "Comptes buits? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10689,7 +10595,7 @@ msgid "Receivable accounts"
 msgstr "Comptes a cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10818,7 +10724,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10925,7 +10831,7 @@ msgid "Accounting Documents"
 msgstr "Documents comptables"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10970,7 +10876,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Impostos factura manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11051,17 +10957,6 @@ msgstr ""
 msgid "February"
 msgstr "Febrer"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"si li doneu un nom diferent de /, l'assentament comptable tindrà el mateix "
-"nom que l'extracte. Això permet que els assentaments de l'extracte tinguin "
-"les mateixes referències que el propi extracte"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11120,6 +11015,11 @@ msgstr "Plantilla d'assignació de comptes fiscals"
 msgid "Expense Account on Product Template"
 msgstr "Compte de despeses en plantilla producte"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11208,9 +11108,6 @@ msgstr ""
 #~ "requerits o només lectura i en quin ordre. Podeu crear la vostra pròpia "
 #~ "vista per codificar més ràpid en cada diari."
 
-#~ msgid "Fixed"
-#~ msgstr "Fix"
-
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "No podeu eliminar el moviment fixat: \"%s\"!"
@@ -11257,15 +11154,25 @@ msgstr ""
 #~ "Confirma extracte bancari amb/sense conciliació a partir de l'extracte "
 #~ "esborrany"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Processament periòdic"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Estad. d'entrades analítiques"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de proveïdor"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Pagament conciliat"
 
 #~ msgid "Line"
 #~ msgstr "Línia"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Diari bancari "
@@ -11402,6 +11309,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Núm. de justificat"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "El camp seqüència és utilitzat per ordenar les línies de terminis de "
+#~ "pagament en ordre ascendent."
+
 #~ msgid "Total write-off"
 #~ msgstr "Desajust total"
 
@@ -11437,6 +11351,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Impostos de compres"
 
+#~ msgid "Line Name"
+#~ msgstr "Nom línia"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Haver analític"
 
@@ -11454,6 +11371,14 @@ msgstr ""
 #~ "No podeu fer aquesta modificació en un assentament confirmat! ¡Observeu que "
 #~ "només podeu canviar alguns camps no importants!"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Si trenqueu la conciliació de les transaccions, haureu de comprovar també "
+#~ "totes les accions relacionades amb aquestes transaccions degut a que no "
+#~ "seran deshabilitades."
+
 #~ msgid "Customer Credit"
 #~ msgstr "Haver del client"
 
@@ -11709,6 +11634,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Utilitzeu aquest codi per a la declaració de l'IVA."
 
+#~ msgid "Litigation"
+#~ msgstr "Litigi"
+
 #~ msgid "Taxes Reports"
 #~ msgstr "Informes d'impostos"
 
@@ -12366,6 +12294,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Saltar-se l'estat 'Esborrany ' en els assentaments"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field allow you to choose the accounting journals you want for "
 #~ "filtering the invoices. If you left this field empty, it will search on all "
@@ -12582,6 +12513,13 @@ msgstr ""
 #~ msgid "You can not change the tax, you should remove and recreate lines !"
 #~ msgstr "No es pot canviar l'impost, ha d'eliminar i recrear les línies!"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Aquest termini de pagament es farà servir en lloc del termini per defecte "
+#~ "per a l'empresa actual."
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -13295,6 +13233,9 @@ msgstr ""
 #~ msgid "New Company Financial Setting"
 #~ msgstr "Configuració financera per una nova companyia"
 
+#~ msgid "Line 2:"
+#~ msgstr "Línia 2:"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -13393,6 +13334,9 @@ msgstr ""
 #~ "Data en què els assentaments comptables de l'empresa van ser conciliats per "
 #~ "última vegada."
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banc i xecs"
+
 #~ msgid "Fill this if the journal is to be used for refunds of invoices."
 #~ msgstr ""
 #~ "Marqueu aquesta opció si el diari s'utilitzarà per a factures rectificatives "
@@ -13407,6 +13351,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Obertura de caixa"
 
+#~ msgid "Line 1:"
+#~ msgstr "Línia 1:"
+
 #~ msgid ""
 #~ "This report gives you an overview of the situation of your general journals"
 #~ msgstr ""
@@ -13436,6 +13383,9 @@ msgstr ""
 #~ msgid "Debit/Credit"
 #~ msgstr "Deure/Haver"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicació"
+
 #~ msgid "Sort By"
 #~ msgstr "Ordena per"
 
@@ -13480,6 +13430,9 @@ msgstr ""
 #~ "Agilita el pagament de factures i crea interfícies per connectar sistemes de "
 #~ "pagament automatitzats."
 
+#~ msgid "Valuation"
+#~ msgstr "Valoració"
+
 #, python-format
 #~ msgid "New currency is not confirured properly !"
 #~ msgstr "La nova moneda no està configurada correctament!"
@@ -13865,6 +13818,13 @@ msgstr ""
 #~ msgid "Manager"
 #~ msgstr "Director"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si desconcileu transaccions, heu de verificar totes les accions relacionades "
+#~ "amb aquestes perquè no es desactivaran."
+
 #~ msgid ""
 #~ "Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
 #~ "tax codes) and shows the current tax situation. The tax chart represents the "
@@ -14602,3 +14562,7 @@ msgstr ""
 
 #~ msgid "Balance:"
 #~ msgstr "Balanç:"
+
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factura '%s' és validada."
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 5f848d5fdce..38d2681170a 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-20 16:14+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Nevyrovnané transakce"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Importovat z faktury nebo platby"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,15 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Celkový dluh"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, "
-"které se k nim váží, protože tyto nebudou zrušeny"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -111,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -142,19 +127,19 @@ msgstr ""
 "jeho odebrání."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -166,7 +151,7 @@ msgid "Warning!"
 msgstr "Varování!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Různý"
@@ -238,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Šablony daní"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -258,6 +238,11 @@ msgstr "Účetní záznamy jsou vstupem likvidace"
 msgid "Belgian Reports"
 msgstr "Belgické výkazy"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -386,11 +371,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -445,6 +425,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -460,6 +445,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Šablona grafu"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -621,15 +611,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Kvartální"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, "
-"které s nimi souvisejí, protože tyto nebudou zrušeny"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -678,7 +659,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -689,13 +670,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Výkaz prodejů podle typu účtu"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "KFV"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -758,6 +739,11 @@ msgstr "Pohledávky"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -780,6 +766,12 @@ msgstr "Znovu otevřít"
 msgid "Are you sure you want to create entries?"
 msgstr "Opravdu chcete vytvořit záznamy?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -800,6 +792,7 @@ msgstr "Zobrazit podřízené s hierarchií"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procenta"
 
@@ -842,7 +835,7 @@ msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -865,25 +858,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Faktury dodavatele a dobropisy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Zrušení likvidace"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"V 14 čistých dnů 2 procenta, zbývající částka v 30 dnech na konci měsíce."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -914,11 +900,6 @@ msgstr "J.C./Název pohybu"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -950,7 +931,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -965,6 +946,7 @@ msgstr "Nové předplatné"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Výpočet"
 
@@ -996,11 +978,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1036,7 +1015,7 @@ msgid "Liability"
 msgstr "Pasiva"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1107,10 +1086,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1188,8 +1167,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1235,7 +1215,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1531,9 +1511,9 @@ msgid "Account Receivable"
 msgstr "Účet pohledávek"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1547,7 +1527,7 @@ msgid "With balance is not equal to 0"
 msgstr "Se zůstatkem nerovným nule"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1602,7 +1582,7 @@ msgstr "Přeskočit stav 'Koncept' pro ruční záznamy"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1645,6 +1625,12 @@ msgstr "Dočasná tabulka použitá pro zobrazení nástěnky"
 msgid "Supplier Refunds"
 msgstr "Dobropisy dodavatelů"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Kód případu"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1682,7 +1668,6 @@ msgid "Groups"
 msgstr "Skupiny"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Nezdaněné"
@@ -1815,6 +1800,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Prodeje dle typu účtu"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1835,115 +1826,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2054,6 +1941,11 @@ msgstr "Tyto období se mohou překrývat."
 msgid "Draft statement"
 msgstr "Rozpracovaný výpis"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2082,26 +1974,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2109,16 +2000,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2129,8 +2020,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2175,7 +2066,7 @@ msgid "period close"
 msgstr "ukončení období"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2275,7 +2166,7 @@ msgid "Product Category"
 msgstr "Kategorie výrobku"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2638,7 +2529,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Pro vybrání všech účetních období nechte pole prázdné"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2656,7 +2547,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Vytvořit účet založený na šabloně"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2677,7 +2568,7 @@ msgid "Main Sequence"
 msgstr "Hlavní číselná řada"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2685,14 +2576,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Platební období"
 
@@ -2718,18 +2607,6 @@ msgstr "Zaškrtněte tento box"
 msgid "Filters"
 msgstr "Filtry"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Otevřít"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2741,6 +2618,11 @@ msgstr "Návrhový stav faktury"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2818,25 +2700,20 @@ msgid "Account Model Entries"
 msgstr "Položky modelu účtu"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Daně dodavatele"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "položky"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankovní podrobnosti"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2859,7 +2736,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2869,9 +2745,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2901,6 +2776,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Daň"
 
@@ -2936,14 +2812,14 @@ msgid "Accounts"
 msgstr "Účty"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3040,6 +2916,12 @@ msgstr "Zaplaceno/Vyrovnáno"
 msgid "Refund Base Code"
 msgstr "Základní kód dobropisu"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bankovní výpisy"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3092,11 +2974,6 @@ msgstr "Starý zůstatek partnera"
 msgid "Accounting entries"
 msgstr "Účetní položky"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Typ komunikace"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3137,7 +3014,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3150,7 +3027,7 @@ msgid "Sales by Account"
 msgstr "Prodeje dle účtu"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3166,15 +3043,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Vytvořili jste analytický deník na deníku '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3182,7 +3059,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3244,9 +3121,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Řádek 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3292,12 +3170,6 @@ msgstr "Částka základního kódu"
 msgid "Default Sale Tax"
 msgstr "Výchozí prodejní daň"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Faktura '%s' je ověřena."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3331,7 +3203,7 @@ msgid "Fiscal Position"
 msgstr "Finanční pozice"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3358,7 +3230,7 @@ msgid "Trial Balance"
 msgstr "Zkušební zůstatek"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3424,7 +3296,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3436,9 +3308,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Počet cifer pro použití pro kód účtu"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Název řádku"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3487,7 +3359,7 @@ msgid "View"
 msgstr "Pohled"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3508,15 +3380,20 @@ msgstr "Proforma faktura"
 msgid "Electronic File"
 msgstr "Elektronický soubor"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Den v měsíci: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Šablona kódu daně"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3524,9 +3401,88 @@ msgid "Account Partner Ledger"
 msgstr "Nadřazená účetní kniha účtu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3654,12 +3610,17 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Částka hodnoty: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Jestliže zadáte název jiný než \"/\", budou se stejně jmenovat i vytvořené "
+"účetní záznamy."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3674,7 +3635,7 @@ msgid "Starting Balance"
 msgstr "Počáteční zůstatek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nebyl definován partner !"
@@ -3876,7 +3837,7 @@ msgid "Period Length (days)"
 msgstr "Délka období (dny)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3900,7 +3861,7 @@ msgid "Category of Product"
 msgstr "Kategorie výrobku"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4037,7 +3998,7 @@ msgid "Chart of Accounts Template"
 msgstr "Šablona Účetní osnovy"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4122,9 +4083,15 @@ msgid "Qty"
 msgstr "Množ."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Spor"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Můžete zde určit koeficient, který bude použit, při konsolidaci částek "
+"tohoto případu do jeho rodiče. Například, nastavte 1/-1 pokud chcete hodnotu "
+"přičíst/odečíst."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4209,11 +4176,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4231,11 +4193,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Nastavit vaše bankovní účty"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4280,8 +4237,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4311,7 +4268,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidovaný potomek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4343,11 +4300,6 @@ msgstr ""
 msgid "title"
 msgstr "nadpis"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4437,6 +4389,13 @@ msgstr "30 den v měsíci"
 msgid "Analytic Balance"
 msgstr "Analytický zůstatek"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4457,6 +4416,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Zaúčtované položky deníku"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4467,11 +4431,6 @@ msgstr "Hledat daňovou šablonu"
 msgid "Draft Entries"
 msgstr "Položky návrhu"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Den v měsíci= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4480,11 +4439,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Počet dní: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4508,20 +4462,9 @@ msgid "Account Type"
 msgstr "Typ účtu"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Uzevření pokladny"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4542,9 +4485,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Uzevření pokladny"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4572,7 +4526,7 @@ msgid "Month"
 msgstr "Měsíc"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4583,8 +4537,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4608,6 +4562,11 @@ msgstr "Účet Paypal"
 msgid "Acc.Type"
 msgstr "Typ učtu"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4620,7 +4579,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4642,7 +4601,7 @@ msgid "Account Base Code"
 msgstr "Základní kód účtu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4697,11 +4656,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Pravidelné zpracování"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4731,10 +4685,9 @@ msgid "Account chart"
 msgstr "Graf účtu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Dodavatele uvedený na faktuře"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4802,10 +4755,14 @@ msgstr "Poznámky Dal"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4854,7 +4811,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4869,7 +4826,7 @@ msgid "Based On"
 msgstr "Založeno na"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4894,11 +4851,6 @@ msgstr ""
 msgid "Change"
 msgstr "Změnit"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banka a šeky"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4921,11 +4873,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Příklad"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4936,11 +4883,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Nechejte prázdné pro použití příjmového účtu"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4950,7 +4892,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5024,16 +4966,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "Různé"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5144,6 +5081,7 @@ msgstr "Přidat"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Placeno"
 
@@ -5170,7 +5108,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5185,14 +5123,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5205,7 +5135,7 @@ msgid "Tax Application"
 msgstr "Daňová aplikace"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5238,9 +5168,9 @@ msgid "End of period"
 msgstr "Konec období"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankovní podrobnosti"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Placení faktůr"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5333,14 +5263,6 @@ msgstr "Popis daně"
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5387,7 +5309,7 @@ msgid "Target Moves"
 msgstr "Cílové pohyby"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5423,6 +5345,7 @@ msgid "Python Code (reverse)"
 msgstr "Kód Pythonu (opačný)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5436,12 +5359,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5467,18 +5384,13 @@ msgstr "Rok"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Řádek 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Vnitřní jméno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5517,7 +5429,7 @@ msgstr "Rozvaha"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Zisk & ztráty (Příjmový účet)"
@@ -5550,7 +5462,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Vypočítat kód (pokud typ = kód)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5577,6 +5489,7 @@ msgstr "Automatické vyrovnání"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5677,7 +5590,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5707,7 +5620,7 @@ msgid "Amount Computation"
 msgstr "Výpočet částky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5743,10 +5656,16 @@ msgid "Account Common Account Report"
 msgstr "Obecný výkaz účtu"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Komunikace"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Otevřít"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5776,9 +5695,7 @@ msgstr "Daňové kódy"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Dobropis vystavený"
 
@@ -5795,11 +5712,6 @@ msgstr "Znak kódu daně"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Výkaz faktur vytvořených za posledních 15 dnů"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Počet dnů: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5816,6 +5728,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Částka k zaplacení"
@@ -5904,8 +5817,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5928,6 +5839,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Platební položky jsou druhý vstup pro vyrovnání."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5937,13 +5855,6 @@ msgstr ""
 "Počet dílčích částek, které mohou být sloučeny k nalezení zůstatkového bodu "
 "mohou být vybrány jako mocnina automatického vyrovnání"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6001,12 +5912,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Pevná částka"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6030,7 +5940,6 @@ msgstr "Generovat počáteční položky"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Výpočetní metoda pro částku daně."
 
@@ -6058,18 +5967,23 @@ msgid "Child Accounts"
 msgstr "Dětské účty"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "položky"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6086,7 +6000,7 @@ msgstr "Příjem"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dodavatel"
@@ -6106,16 +6020,11 @@ msgid "Account n°"
 msgstr "Účet n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Ohodnocení"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6228,7 +6137,7 @@ msgid "Filter by"
 msgstr "Filtrovat podle"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Máte nesprávný výraz \"%(...)s\" ve vašem modelu !"
@@ -6275,6 +6184,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Počet dní"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6414,7 +6331,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6589,7 +6506,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6620,12 +6537,6 @@ msgstr ""
 msgid "Current"
 msgstr "Aktuální"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6650,7 +6561,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procenta"
 
@@ -6670,7 +6580,7 @@ msgid "Power"
 msgstr "Síla"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6715,12 +6625,17 @@ msgid "Applicable Type"
 msgstr "Typ platnosti"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Reference faktury"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6739,12 +6654,12 @@ msgstr ""
 "daňových potomků. V tomto případě je vyhodnocení pořadí důležité."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6811,7 +6726,7 @@ msgid "Optional create"
 msgstr "Volitelné vytvoření"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6822,9 +6737,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Dobropis dodavatele"
 
@@ -6862,9 +6775,12 @@ msgid "Group By..."
 msgstr "Seskupit podle..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Ocenění: Zůstatek"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6942,6 +6858,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Hotovostní transakce"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6959,7 +6882,7 @@ msgstr "Statistika analytických účtů"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Položky: "
@@ -6977,14 +6900,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Pravda"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7000,10 +6922,9 @@ msgid "Total debit"
 msgstr "Celkový dluh"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Položka \"%s\" není platná !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Další zápisy partnera k likvidaci"
 
 #. module: account
 #: report:account.invoice:0
@@ -7056,7 +6977,7 @@ msgstr "Vytvořit položku"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Zisk & ztráty (Výdajový účet)"
@@ -7067,13 +6988,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Chyba !"
@@ -7110,6 +7032,11 @@ msgstr "Řádek projektu"
 msgid "Manual"
 msgstr "Ruční"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7208,8 +7135,8 @@ msgstr "Vybrat deník"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Počáteční zůstatek"
@@ -7289,7 +7216,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7302,6 +7229,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7355,7 +7287,7 @@ msgid "Done"
 msgstr "Dokončeno"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7387,9 +7319,8 @@ msgid "Source Document"
 msgstr "Zdrojový dokument"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7416,7 +7347,7 @@ msgid "Taxes:"
 msgstr "Daně:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7608,6 +7539,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Reference faktury"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7700,7 +7637,7 @@ msgid "Use model"
 msgstr "Použít model"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7751,7 +7688,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Maturity Date"
 msgstr "Datum splatnosti"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Deník tržeb"
@@ -7829,7 +7766,7 @@ msgid "Invoice Tax"
 msgstr "Daň faktury"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Žádné číslo kusu !"
@@ -7868,7 +7805,7 @@ msgid "Sales Properties"
 msgstr "Vlastnosti obchodu"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7893,7 +7830,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Úprava měny"
@@ -7925,7 +7862,7 @@ msgid "May"
 msgstr "Květen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7944,10 +7881,9 @@ msgstr ""
 "Pole pořadí je použito pro řazení záznamů od nejnižšího čísla k nejvyššímu."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Kód případu"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7963,17 +7899,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Zaúčtovat položky deníku"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Zákazník"
@@ -7989,7 +7920,7 @@ msgstr "Jméno výkazu"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Hotovost"
@@ -8001,9 +7932,11 @@ msgid "Account Destination"
 msgstr "Cíl účtu"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Placení faktůr"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8011,7 +7944,6 @@ msgstr "Placení faktůr"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8146,15 +8078,14 @@ msgid "Partner Ledger"
 msgstr "Účetní kniha partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Pevné"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Varování !"
@@ -8222,7 +8153,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Vyberte měnu pro použití na faktuře"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Žádné řádky faktury !"
@@ -8299,7 +8230,7 @@ msgid "Associated Partner"
 msgstr "Přidruženého partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Musíte nejdříve vybrat partnera !"
@@ -8379,13 +8310,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Deník nákupních dobropisů"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8456,7 +8387,7 @@ msgid "Net Total:"
 msgstr "Čistého celkem:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8476,13 +8407,6 @@ msgstr "Obecné vykazování"
 msgid "Write-Off Journal"
 msgstr "Odpisový deník"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8509,11 +8433,6 @@ msgstr "Vnitř.typ"
 msgid "Tax/Base Amount"
 msgstr "Daňová/základní částka"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Ocenění: Procenta"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8567,6 +8486,11 @@ msgstr "Výsledek vyrovnání"
 msgid "Ending Balance"
 msgstr "Konečný zůstatek"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8607,7 +8531,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatický import bankovního výpisu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8630,7 +8554,12 @@ msgid "Account Types"
 msgstr "Typy účtů"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8638,9 +8567,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Částka hodnoty: není"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8657,10 +8586,9 @@ msgid "Reconciliation"
 msgstr "Vyrovnanost"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Účet pohledávek"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Nechejte prázdné pro použití příjmového účtu"
 
 #. module: account
 #: view:account.invoice:0
@@ -8734,7 +8662,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8752,13 +8680,13 @@ msgid "Payment Term Line"
 msgstr "Řádek platebního období"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Deník nákupů"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Mezivýsledek"
 
@@ -8787,11 +8715,6 @@ msgstr "Do data"
 msgid "Suppliers"
 msgstr "Dodavatelé"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Pravda"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8928,9 +8851,10 @@ msgid "Journal Name"
 msgstr "Název deníku"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Další zápisy partnera k likvidaci"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Položka \"%s\" není platná !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8977,7 +8901,7 @@ msgstr ""
 "Částka vyjádřena ve volitelné jiné měně, pokud je položka více-měnová."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9038,7 +8962,7 @@ msgid "Reconciled entries"
 msgstr "Položky vyrovnání"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Nesprávný model !"
@@ -9060,7 +8984,7 @@ msgid "Print Account Partner Balance"
 msgstr "Vytisknout zůstatek účtu partnera"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9094,7 +9018,7 @@ msgstr "neznámé"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Počáteční položky deníku"
@@ -9139,7 +9063,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9154,21 +9078,9 @@ msgstr "Daný kódem Pythonu"
 msgid "Journal Code"
 msgstr "Kód deníku"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Můžete zde určit koeficient, který bude použit, při konsolidaci částek "
-"tohoto případu do jeho rodiče. Například, nastavte 1/-1 pokud chcete hodnotu "
-"přičíst/odečíst."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Zbytková částka"
 
@@ -9201,7 +9113,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Kniha dobropisů prodeje"
@@ -9267,7 +9179,7 @@ msgid "Purchase Tax(%)"
 msgstr "Daň nákupu(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Prosíme vytvořete nějaké řádky faktury."
@@ -9286,7 +9198,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9401,21 +9313,11 @@ msgstr "Učetní ověří účetní položky přicházející z faktury "
 msgid "Number of Periods"
 msgstr "Počet období"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Šablona kódu daně"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Výpis účtu zákazníka"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9427,8 +9329,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9448,14 +9351,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bankovní výpisy"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Účet pohledávek"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9556,8 +9459,8 @@ msgid "Move"
 msgstr "Pohyb"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9636,11 +9539,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Nezlikvidované transakce"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9658,11 +9556,16 @@ msgid "Balance :"
 msgstr "Zůstatek :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9699,13 +9602,6 @@ msgstr "Předplatné"
 msgid "Account Analytic Balance"
 msgstr "Analytický zůstatek účtu"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9745,7 +9641,13 @@ msgid "Due date"
 msgstr "Do data"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9834,7 +9736,7 @@ msgid "Unreconciled"
 msgstr "Nevyrovnaný"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Špatný součet !"
@@ -9917,7 +9819,7 @@ msgid "Comparison"
 msgstr "Porovnání"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9935,6 +9837,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9990,11 +9897,6 @@ msgstr "Úvěr"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10006,7 +9908,7 @@ msgid "Journal Entry Model"
 msgstr "Model položek deníku"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10091,7 +9993,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10414,7 +10316,14 @@ msgid "Empty Accounts ? "
 msgstr "Vyprázdnit účty ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10539,7 +10448,7 @@ msgid "Receivable accounts"
 msgstr "Pohledávkové účty"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10666,7 +10575,7 @@ msgid "Entries Sorted by"
 msgstr "Položky řazené dle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10772,7 +10681,7 @@ msgid "Accounting Documents"
 msgstr "Účetní dokumenty"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10817,7 +10726,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ruční daně faktury"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10896,16 +10805,6 @@ msgstr ""
 msgid "February"
 msgstr "Únor"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Jestliže zadáte název jiný než \"/\", budou se stejně jmenovat i vytvořené "
-"účetní záznamy."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10964,6 +10863,11 @@ msgstr "Fiskální mapování šablony účtu"
 msgid "Expense Account on Product Template"
 msgstr "Účet útrat na šabloně výrobku"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11027,9 +10931,6 @@ msgstr ""
 #~ msgid "Charts of Account"
 #~ msgstr "Grafy účtu"
 
-#~ msgid "Fixed"
-#~ msgstr "Pevné"
-
 #~ msgid "Origin"
 #~ msgstr "Původ"
 
@@ -11104,6 +11005,10 @@ msgstr ""
 #~ msgid "Confirm statement from draft"
 #~ msgstr "Potvrdit výpis z návrhu"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Dodavatele uvedený na faktuře"
+
 #~ msgid "Printing Date"
 #~ msgstr "Datum vydání"
 
@@ -11179,6 +11084,9 @@ msgstr ""
 #~ msgid "Bank Receipt"
 #~ msgstr "Bankovní Příjem"
 
+#~ msgid "Line Name"
+#~ msgstr "Název řádku"
+
 #~ msgid "Parent Analytic Account"
 #~ msgstr "Parent Analytická účtu"
 
@@ -11222,9 +11130,15 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Záporné"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Configure"
 #~ msgstr "Nastavit"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Positive"
 #~ msgstr "Kladný"
 
@@ -11386,6 +11300,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Referenční číslo"
 
+#~ msgid "Line 2:"
+#~ msgstr "Řádek 2:"
+
 #~ msgid "Required"
 #~ msgstr "Požadovano"
 
@@ -11462,6 +11379,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Výchozí daně"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Pravidelné zpracování"
+
 #~ msgid "Display Mode"
 #~ msgstr "Režim zobrazení"
 
@@ -11499,6 +11419,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Ne"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banka a šeky"
+
 #, python-format
 #~ msgid "Taxes missing !"
 #~ msgstr "Chybí daně !"
@@ -11509,6 +11432,9 @@ msgstr ""
 #~ msgid "5"
 #~ msgstr "5"
 
+#~ msgid "Line 1:"
+#~ msgstr "Řádek 1:"
+
 #~ msgid "UoM"
 #~ msgstr "UoM"
 
@@ -11522,6 +11448,9 @@ msgstr ""
 #~ msgid "Bank Journal "
 #~ msgstr "Bankovní deník "
 
+#~ msgid "Communication"
+#~ msgstr "Komunikace"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Chyb nastavení !"
@@ -11877,6 +11806,13 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Zahrnout zlikvidované záznamy"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, "
+#~ "které se k nim váží, protože tyto nebudou zrušeny"
+
 #~ msgid ""
 #~ "The Profit and Loss report gives you an overview of your company profit and "
 #~ "loss in a single document"
@@ -12003,6 +11939,13 @@ msgstr ""
 #~ "report, stav se změní na \"Printed\". Když jsou hotovy všechny transakce, "
 #~ "záznam přejde do stavu \"Done\"."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, "
+#~ "které s nimi souvisejí, protože tyto nebudou zrušeny"
+
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Stav pokladny neodpovídá vypočtenému zůstatku!"
@@ -12179,6 +12122,9 @@ msgstr ""
 #~ msgid "Contact Address Name"
 #~ msgstr "Jméno kontaktu adresy"
 
+#~ msgid "Litigation"
+#~ msgstr "Spor"
+
 #, python-format
 #~ msgid ""
 #~ "You selected an Unit of Measure which is not compatible with the product."
@@ -12304,6 +12250,9 @@ msgstr ""
 #~ "Tento modul bude podporovat Anglo-saskou účetní metodologii pomocí změny "
 #~ "účetní logiky se skladovými transakcemi."
 
+#~ msgid "Valuation"
+#~ msgstr "Ohodnocení"
+
 #, python-format
 #~ msgid "Entries are not of the same account or already reconciled ! "
 #~ msgstr "Záznamy nejsou ze stejného účtu nebo jsou již zlikvidovány ! "
@@ -12316,6 +12265,10 @@ msgstr ""
 #~ msgid "(keep empty to use the current period)"
 #~ msgstr "(nechejte prázdné pro použití aktuálního období)"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Faktura '%s' je ověřena."
+
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Vytvořit účet založený na šabloně"
 
@@ -12517,6 +12470,10 @@ msgstr ""
 #~ msgid "Sale journal in this year"
 #~ msgstr "Deník prodeje v tomto roce"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "V 14 čistých dnů 2 procenta, zbývající částka v 30 dnech na konci měsíce."
+
 #, python-format
 #~ msgid ""
 #~ "Can not %s invoice which is already reconciled, invoice should be "
@@ -12600,9 +12557,15 @@ msgstr ""
 #~ msgid "Month-1"
 #~ msgstr "Měsíc -1"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Den v měsíci: 0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Tyto prodejní měsíce podle typu"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Částka hodnoty: 0.02"
+
 #~ msgid "Quantity :"
 #~ msgstr "Množství :"
 
@@ -12612,9 +12575,18 @@ msgstr ""
 #~ msgid "Create a draft Refund"
 #~ msgstr "Vytvořit koncept dobropisu"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Den v měsíci= -1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Počet dní: 30"
+
 #~ msgid "Bank Account Owner"
 #~ msgstr "Vlastník bankovního účtu"
 
+#~ msgid "Example"
+#~ msgstr "Příklad"
+
 #~ msgid "My invoices"
 #~ msgstr "Moje faktury"
 
@@ -12628,6 +12600,9 @@ msgstr ""
 #~ "Pokud to chcete udělat, měli byste nastavit deník, aby bylo povoleno zrušení "
 #~ "položek."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Počet dnů: 14"
+
 #, python-format
 #~ msgid "Current currency is not configured properly !"
 #~ msgstr "Aktuální měna není správně nastavena !"
@@ -12635,6 +12610,9 @@ msgstr ""
 #~ msgid "Review your Financial Journals"
 #~ msgstr "Prohlédnout vaše finanční deníky"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Ocenění: Zůstatek"
+
 #, python-format
 #~ msgid "Error :"
 #~ msgstr "Chyba"
@@ -12668,6 +12646,9 @@ msgstr ""
 #~ msgid "This Months Sales by type"
 #~ msgstr "Tyto prodejní měsíce podle typu"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Ocenění: Procenta"
+
 #~ msgid "current month"
 #~ msgstr "aktuální měsíc"
 
@@ -12679,6 +12660,9 @@ msgstr ""
 #~ "Nezadáno období pro tento datum: %s !\n"
 #~ "Prosíme vytvořte nějaké."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Částka hodnoty: není"
+
 #~ msgid "Contacts"
 #~ msgstr "Kontakty"
 
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 6400f068fd5..a867a5d6a71 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Importér fra faktura eller betaling"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total Debet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "Advarsel!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr "Belgiske rapporter"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -379,11 +366,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -438,6 +420,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -453,6 +440,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -614,13 +606,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -669,7 +654,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -680,13 +665,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -749,6 +734,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -771,6 +761,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -791,6 +787,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -833,7 +830,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -856,24 +853,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -904,11 +895,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -939,7 +925,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -954,6 +940,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -985,11 +972,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1025,7 +1009,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1096,10 +1080,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1175,8 +1159,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1222,7 +1207,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1518,9 +1503,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1534,7 +1519,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1589,7 +1574,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1632,6 +1617,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1669,7 +1660,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1802,6 +1792,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1822,115 +1818,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2039,6 +1931,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2067,26 +1964,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2094,16 +1990,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2114,8 +2010,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2160,7 +2056,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2260,7 +2156,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2619,7 +2515,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2637,7 +2533,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2658,7 +2554,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2666,14 +2562,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2699,18 +2593,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2722,6 +2604,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2799,24 +2686,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Leverandør moms"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2840,7 +2722,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2855,9 +2736,8 @@ msgstr ""
 "dag, 50% om en måned."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2887,6 +2767,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2922,14 +2803,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3026,6 +2907,12 @@ msgstr "Betalt / Afstemt"
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3078,11 +2965,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3123,7 +3005,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3136,7 +3018,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3152,15 +3034,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3168,7 +3050,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3230,8 +3112,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3278,12 +3161,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3317,7 +3194,7 @@ msgid "Fiscal Position"
 msgstr "Nuværende position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3344,7 +3221,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3416,7 +3293,7 @@ msgstr ""
 "altid altuelle sats for dagen."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3428,9 +3305,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Antal decimaler til brug for konto koden"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Linie navn"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3479,7 +3356,7 @@ msgid "View"
 msgstr "Vis"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3500,14 +3377,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3516,9 +3398,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3644,12 +3605,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3664,7 +3628,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3864,7 +3828,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3888,7 +3852,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4024,7 +3988,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4109,8 +4073,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4194,11 +4161,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4216,11 +4178,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4265,8 +4222,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4296,7 +4253,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4328,11 +4285,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4422,6 +4374,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4441,6 +4400,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4451,11 +4415,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4464,11 +4423,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4492,19 +4446,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4526,8 +4469,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4556,7 +4510,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4567,8 +4521,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4592,6 +4546,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4604,7 +4563,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4626,7 +4585,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4681,11 +4640,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periode behandling"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4715,10 +4669,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Leverandør faktura"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4786,10 +4739,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4838,7 +4795,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4853,7 +4810,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4878,11 +4835,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4905,11 +4857,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4920,11 +4867,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4934,7 +4876,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5008,16 +4950,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5128,6 +5065,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5154,7 +5092,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5169,14 +5107,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5189,7 +5119,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5222,8 +5152,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5317,14 +5247,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5369,7 +5291,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5405,6 +5327,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5418,12 +5341,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5449,18 +5366,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Internt navn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5499,7 +5411,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5532,7 +5444,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Beregn kode (når type = kode)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5559,6 +5471,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5659,7 +5572,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5687,7 +5600,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5723,9 +5636,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5756,9 +5675,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5775,11 +5692,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5796,6 +5708,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5884,8 +5797,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5908,6 +5819,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5915,13 +5833,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5979,12 +5890,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fast beløb"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6008,7 +5918,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6036,18 +5945,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6064,7 +5978,7 @@ msgstr "Indtægt"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Leverandør"
@@ -6084,16 +5998,11 @@ msgid "Account n°"
 msgstr "Konto no."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Fri Reference"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6203,7 +6112,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6250,6 +6159,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6389,7 +6306,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6564,7 +6481,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6595,12 +6512,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6625,7 +6536,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6645,7 +6555,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6690,12 +6600,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6711,12 +6626,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6783,7 +6698,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6794,9 +6709,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6834,8 +6747,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6912,6 +6828,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6929,7 +6852,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6947,14 +6870,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Sandt"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6970,9 +6892,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7022,7 +6943,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7033,13 +6954,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7076,6 +6998,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7174,8 +7101,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7255,7 +7182,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7268,6 +7195,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7321,7 +7253,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7353,9 +7285,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7382,7 +7313,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7574,6 +7505,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7663,7 +7600,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7714,7 +7651,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7781,7 +7718,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7792,7 +7729,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7831,7 +7768,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7856,7 +7793,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7888,7 +7825,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7906,9 +7843,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7925,17 +7861,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7951,7 +7882,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7963,8 +7894,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7973,7 +7906,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8108,15 +8040,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fast"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -8184,7 +8115,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8259,7 +8190,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Du må først vælge en partner"
@@ -8341,13 +8272,13 @@ msgstr ""
 "af de følgende afgifter"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8418,7 +8349,7 @@ msgid "Net Total:"
 msgstr "Net Total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8438,13 +8369,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8471,11 +8395,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8529,6 +8448,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8569,7 +8493,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8592,7 +8516,12 @@ msgid "Account Types"
 msgstr "Kontotyper"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8600,8 +8529,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8619,9 +8548,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8694,7 +8622,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8712,13 +8640,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8747,11 +8675,6 @@ msgstr "Forfaldsdato"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Sandt"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8886,8 +8809,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8933,7 +8857,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8994,7 +8918,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9016,7 +8940,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9050,7 +8974,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9095,7 +9019,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9110,18 +9034,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9154,7 +9069,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9220,7 +9135,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9239,7 +9154,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9354,21 +9269,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9380,8 +9285,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9401,14 +9307,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9509,8 +9415,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9587,11 +9493,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9609,11 +9510,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9650,13 +9556,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9696,7 +9595,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9785,7 +9690,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9868,7 +9773,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9886,6 +9791,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9939,11 +9849,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9955,7 +9860,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10040,7 +9945,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10363,7 +10268,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10488,7 +10400,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10615,7 +10527,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10721,7 +10633,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10766,7 +10678,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10845,14 +10757,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10911,6 +10815,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10943,9 +10852,6 @@ msgstr ""
 #~ msgid "No Period found on Invoice!"
 #~ msgstr "Ingen Periode fundet på faktura!"
 
-#~ msgid "Fixed"
-#~ msgstr "Fast"
-
 #, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
@@ -10973,6 +10879,10 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negativ"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Leverandør faktura"
+
 #~ msgid "Line"
 #~ msgstr "Linje"
 
@@ -11068,6 +10978,9 @@ msgstr ""
 #~ msgid "Value"
 #~ msgstr "Værdi"
 
+#~ msgid "Line Name"
+#~ msgstr "Linie navn"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Vælg fakturaer, du ønsker at betale og administrere"
 
@@ -11118,6 +11031,9 @@ msgstr ""
 #~ msgid "All Analytic Entries"
 #~ msgstr "Alle analytiske poster"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periode behandling"
+
 #~ msgid "Error ! The duration of the Period(s) is/are invalid. "
 #~ msgstr "Fejl! Varigheden af den periode(r) er ugyldige. "
 
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 6b51dce4f50..c999cdf13cb 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 01:59+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr "Eine Steuerzuordnung muss eindeutig sein."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Storno von Ausgleichen"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importiere Rechnungen oder Zahlungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Falsches Konto!"
@@ -94,16 +89,6 @@ msgstr "Falsches Konto!"
 msgid "Total Debit"
 msgstr "Summe Soll"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Wenn Sie Zahlungen stornieren, müssen Sie alle zugehörigen Belege und "
-"Buchungen prüfen, da diese nicht automatisch mit gelöscht oder deaktiviert "
-"werden."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -116,7 +101,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -147,19 +131,19 @@ msgstr ""
 "Entfernung einfach ausgeblendet werden."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -171,7 +155,7 @@ msgid "Warning!"
 msgstr "Achtung!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "\"verschiedenes\" Journal"
@@ -257,11 +241,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Umsatzsteuer Vorlagen"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -277,6 +256,11 @@ msgstr "Buchungen sind auszuwählen für den Ausgleich von Offenen Posten"
 msgid "Belgian Reports"
 msgstr "Auswertungen für Belgien"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -426,11 +410,6 @@ msgstr "Buchen auf Kostenstellen aktivieren"
 msgid "Salesperson"
 msgstr "Verkäufer"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -492,6 +471,11 @@ msgstr ""
 "abrechnen und  die Zahlungen managen, und somit keine vollständige "
 "Buchhaltung installieren (Buchungssätze im Journal, Kontenpläne, etc.)"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -507,6 +491,11 @@ msgstr "Periode:"
 msgid "Chart Template"
 msgstr "Kontenplan Vorlage"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -676,16 +665,6 @@ msgstr "Dezimalstellen für dieses Journal"
 msgid "3 Monthly"
 msgstr "Vierteljährlich"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Falls Sie einen Ausgleich von Offenen Posten stornieren müssen, prüfen Sie "
-"auch alle vorgelagerten Vorgänge, da diese nicht automatisch mit "
-"zurückgesetzt werden."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -737,7 +716,7 @@ msgid "Profit Account"
 msgstr "Erlöskonto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Keine oder meherere Perioden für dieses Datum gefunden."
@@ -748,13 +727,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Auswertung Verkauf nach Kontentyp"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VK"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Es kann nicht gebucht werden in anderer Währung als .."
@@ -823,6 +802,11 @@ msgstr "Debitorenkonten"
 msgid "Configure your company bank accounts"
 msgstr "Konfigurieren Sie Ihre Hausbanken"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -847,6 +831,12 @@ msgstr "Wiedereröffnen"
 msgid "Are you sure you want to create entries?"
 msgstr "Möchten Sie diese Buchungen erzeugen?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -870,6 +860,7 @@ msgstr "Zeige Hierarchie der Kinder"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Prozent"
 
@@ -912,7 +903,7 @@ msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -937,24 +928,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Lieferantenrechnungen und -gutschriften"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "Der Posten wurde bereits ausgeglichen."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Stornierung des OP-Ausgleichs"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "14 Tage 2%, Rest 30 Tage zum Ende des Monats"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -987,11 +972,6 @@ msgstr "Buchungssatz"
 msgid "Account Code and Name"
 msgstr "Konto und Bezeichnung"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "erstellt"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1027,7 +1007,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1044,6 +1024,7 @@ msgstr "Neue automatische Buchung"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Berechnung"
 
@@ -1075,14 +1056,9 @@ msgid "Purchase journal"
 msgstr "Einkauf Journal"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
-"Es kann keine Journalbuchung erfolgen, da das Konto \"%s\" bislang nicht zum "
-"Kontoplan \"%s\" zugewiesen wurde."
 
 #. module: account
 #: view:validate.account.move:0
@@ -1117,7 +1093,7 @@ msgid "Liability"
 msgstr "Verbindlichkeit"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1193,10 +1169,10 @@ msgid "Features"
 msgstr "Funktionen"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1290,9 +1266,10 @@ msgid "Refund "
 msgstr "Gutschrift "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "In der Fußzeile der Geschäftsformulare angezeigte Bankverbindung"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr "Es gibt kein Aufwandskonto für dieses Produkt: \"%s (id:%d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1349,7 +1326,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1654,9 +1631,9 @@ msgid "Account Receivable"
 msgstr "Debitorenkonto"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
@@ -1670,7 +1647,7 @@ msgid "With balance is not equal to 0"
 msgstr "Mit Saldo ungleich 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1731,7 +1708,7 @@ msgstr "Überspringe Entwurf bei manuellen Buchungen"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Nicht implementiert."
@@ -1776,6 +1753,12 @@ msgstr "Eine temporäre Tabelle für Anzeigetafeln"
 msgid "Supplier Refunds"
 msgstr "Lieferanten Gutschriften"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Vorgang Nummer"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1813,7 +1796,6 @@ msgid "Groups"
 msgstr "Gruppen"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Nicht versteuert"
@@ -1966,6 +1948,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Verkäufe nach Kontotypen"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1988,215 +1976,11 @@ msgstr ""
 "Entwurf bei manuellen Buchungen\" deaktiviert sein."
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Einige Positionen wurden bereits ausgeglichen."
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Guten Tag ${object.partner_id.name and ' ' or "
-"''}${object.partner_id.name or ''},</p>\n"
-"\n"
-"    <p>Es gibt eine neue Rechnung: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>NUMMERN</strong><br />\n"
-"       &nbsp;&nbsp;Rechnungsnumer: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Betrag: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Rechnungsdatum: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Auftrag: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Ihr Ansprechpartner: <a "
-"href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>Sie können auch direkt via Paypal bezahlen:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>Bei Fragen sprechen Sie uns bitte ans.</p>\n"
-"    <p>Danke für Ihre Auswahl ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Webpage :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2309,6 +2093,11 @@ msgstr "Diese Perioden können sich überschneiden"
 msgid "Draft statement"
 msgstr "Beleg Entwurf"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2344,26 +2133,25 @@ msgstr ""
 "Steuervoranmeldung zu Beginn und Ende eines Monats oder Quartals."
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2371,16 +2159,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2391,8 +2179,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2448,7 +2236,7 @@ msgid "period close"
 msgstr "beende Periode"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2568,7 +2356,7 @@ msgid "Product Category"
 msgstr "Produkt Kategorie"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2945,7 +2733,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Lasse leer für alle offenen Geschäftsjahre"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2965,7 +2753,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Erstelle ein Konto auf Basis der Vorlage"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2991,7 +2779,7 @@ msgid "Main Sequence"
 msgstr "Haupt Sequenz"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -3001,14 +2789,12 @@ msgstr ""
 "dazugehörigen Buchungen zu löschen."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Zahlungsbedingung"
 
@@ -3034,18 +2820,6 @@ msgstr "Setze Haken zur Auswahl"
 msgid "Filters"
 msgstr "Filter"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Offen"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -3057,6 +2831,11 @@ msgstr "Entwurfsstatus einer Rechnung"
 msgid "Account Properties"
 msgstr "Einstellungen Finanzbuchhaltung"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -3135,25 +2914,20 @@ msgid "Account Model Entries"
 msgstr "Buchungsvorlage"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EK"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Erstelle Gutschrift"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Steuern des Einkaufs (Vorsteuer)"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "Buchungen"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankkonto Details"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -3190,7 +2964,6 @@ msgstr ""
 "            "
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3204,10 +2977,9 @@ msgstr ""
 "jetzt und 50% in einem Monat"
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "Rechnung ist bereits ausgeglichen"
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Nächste Eingangsrechnung"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3236,6 +3008,7 @@ msgstr "OP-Ausgleich (Abschreibung)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Steuer"
 
@@ -3271,14 +3044,14 @@ msgid "Accounts"
 msgstr "Finanzkonten"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3377,6 +3150,12 @@ msgstr "Bezahlt/Beglichen"
 msgid "Refund Base Code"
 msgstr "Gutschrift Steuergrundlage"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bankauszüge"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3444,11 +3223,6 @@ msgstr "Saldo Partner nach Alter"
 msgid "Accounting entries"
 msgstr "Buchungen"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Betreffzeile Typ"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3497,7 +3271,7 @@ msgstr ""
 "Forma' validiert werden."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3512,7 +3286,7 @@ msgid "Sales by Account"
 msgstr "Verkäufe nach Konten"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "Sie können die gebuchte Position \"%s\" nicht einfach löschen."
@@ -3528,15 +3302,15 @@ msgid "Sale journal"
 msgstr "Verkauf Journal"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Sie müssen ein Kostenstellen Journal im '%s' Journal definieren!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3546,7 +3320,7 @@ msgstr ""
 "mehr geändert werden."
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3613,9 +3387,10 @@ msgstr ""
 "vorgeschrieben, ist allerdings sehr nützlich für einige Berichte."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Zeile 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3664,12 +3439,6 @@ msgstr "Steuergrundlage Betrag"
 msgid "Default Sale Tax"
 msgstr "Standard Steuer Verkauf"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Rechnung  '%s' ist validiert."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3706,7 +3475,7 @@ msgid "Fiscal Position"
 msgstr "Steuerzuordnung"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3735,7 +3504,7 @@ msgid "Trial Balance"
 msgstr "Summen und Salden"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr "Die Eröffnungsbilanz kann nicht übernommen werden (negativer Saldo)"
@@ -3806,7 +3575,7 @@ msgstr ""
 "jedenfalls den Tageskurs."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "Es existiert kein Stammkonto für diese Kontovorlage"
@@ -3818,9 +3587,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Anzahl Stellen für Konto"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Zeile Bezeichnung"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3871,7 +3640,7 @@ msgid "View"
 msgstr "Ansicht"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3892,15 +3661,20 @@ msgstr "Proforma Rechnungen"
 msgid "Electronic File"
 msgstr "Elektronische Datei"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "Das Unternehmen hat einen Kontenplan"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Tage des Monats: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Steuergrundlage Vorlagen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3908,10 +3682,89 @@ msgid "Account Partner Ledger"
 msgstr "Partner Kontoauszug"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>eröffnet</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -4051,12 +3904,18 @@ msgid "Account Tax Declaration"
 msgstr "Umsatzsteuererklärung"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Betrag: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Wenn Sie einen anderen Buchungstext als '/' angeben, wird die erzeugte "
+"Buchung die gleiche Nummer / Buchungstext erhalten wie der Bankauszug "
+"selbst. Dieses ermöglicht dann dieselbe Belegnummern wie beim Auszug selbst."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -4074,7 +3933,7 @@ msgid "Starting Balance"
 msgstr "Anfangssaldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Kein Partner festgelegt!"
@@ -4313,7 +4172,7 @@ msgid "Period Length (days)"
 msgstr "Periodendauer (Tage)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4340,7 +4199,7 @@ msgid "Category of Product"
 msgstr "Produktkategorie"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4482,7 +4341,7 @@ msgid "Chart of Accounts Template"
 msgstr "Vorlage Kontenplan"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4574,9 +4433,15 @@ msgid "Qty"
 msgstr "Anzahl"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Rechtsstreit"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Sie können hier den Koeffizienten für die Konsolidierung auf der nächsten "
+"Ebene definieren. Zum Beispiel definieren Sie 1/-1 wenn Sie "
+"addieren/subtrahieren wollen."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4663,11 +4528,6 @@ msgstr "Kein nicht konfiguriertes Unternehmen!"
 msgid "Expects a Chart of Accounts"
 msgstr "Erwartet wird ein Kontenplan"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "bezahlt"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4687,13 +4547,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Einrichten der Bankkonten"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-"Storno mit Neuberechnung: Gutschrifterstellung, Ausgleich offener Posten und "
-"neuer Rechnungsentwurf"
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4742,8 +4595,8 @@ msgstr ""
 "Rechnung angezeigt werden soll."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Es sollte kein inaktives Konto benutzt werden."
@@ -4773,7 +4626,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidierte Konten"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4812,11 +4665,6 @@ msgstr ""
 msgid "title"
 msgstr "Titel"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Erstelle eine Gutschrift im Entwurf"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4908,6 +4756,13 @@ msgstr "30 Tage bis zum Ende des Monats"
 msgid "Analytic Balance"
 msgstr "Saldo Kostenstelle"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4931,6 +4786,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Quittierte Buchungen"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4941,11 +4801,6 @@ msgstr "Durchsuche Steuervorlagen"
 msgid "Draft Entries"
 msgstr "Buchungsentwürfe"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Tage des Monats = -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4957,11 +4812,6 @@ msgstr ""
 "Stellen auf- oder abgerundeten Beträgen wie z.B. 9,99 EUR, eine "
 "Nachkommastellen Genauigkeit von 4 ermöglicht Buchungen wie z.B.: 0,0231 EUR."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Anzahl der Tage: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4984,6 +4834,33 @@ msgstr "Tastenkombination (Shortcut)"
 msgid "Account Type"
 msgstr "Kontoart"
 
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Kasse abschließen"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Storniere die ausgewählten Rechnungen"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:423
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+"Sie müssen ein Kostenstellen Journal für das Journal '%s' hinterlegen!"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Zu analysierende Kosten (Stundenzettel, eingekaufte Produkte, ...) werden "
+"verursacht durch Kostenstellen.  Diese erzeugen Lieferantenrechnungen im "
+"Entwurf."
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
 msgid ""
@@ -5012,33 +4889,6 @@ msgstr ""
 "          </p>\n"
 "        "
 
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr "Storniere die ausgewählten Rechnungen"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:423
-#, python-format
-msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
-"Sie müssen ein Kostenstellen Journal für das Journal '%s' hinterlegen!"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid ""
-"Analytic costs (timesheets, some purchased products, ...) come from analytic "
-"accounts. These generate draft supplier invoices."
-msgstr ""
-"Zu analysierende Kosten (Stundenzettel, eingekaufte Produkte, ...) werden "
-"verursacht durch Kostenstellen.  Diese erzeugen Lieferantenrechnungen im "
-"Entwurf."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Kasse abschließen"
-
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid ""
@@ -5069,7 +4919,7 @@ msgid "Month"
 msgstr "Monat"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -5082,8 +4932,8 @@ msgid "Supplier invoice sequence"
 msgstr "Eingangsrechnungen Nummernfolge"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -5109,6 +4959,11 @@ msgstr "PayPal Konto"
 msgid "Acc.Type"
 msgstr "Kontoart"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -5121,7 +4976,7 @@ msgstr "Saldo mit umgekehrtem Vorzeichen"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Bilanz (Verbindlichkeiten)"
@@ -5143,7 +4998,7 @@ msgid "Account Base Code"
 msgstr "Bemessungsgrundlage"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -5204,11 +5059,6 @@ msgstr "Ausgleich Vortragsbuchungen"
 msgid "Last Reconciliation:"
 msgstr "Letzter Ausgleich:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodische Buchungen"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -5240,10 +5090,9 @@ msgid "Account chart"
 msgstr "Kontenplan Finanzkonten"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Eingangsrechnung"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5311,10 +5160,14 @@ msgstr "Gutschriften"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr "Auszugleichende Buchungszeilen"
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -5370,7 +5223,7 @@ msgstr ""
 "Unternehmen gehört."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5389,7 +5242,7 @@ msgid "Based On"
 msgstr "Basierend auf"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "GSE"
@@ -5414,11 +5267,6 @@ msgstr "Steuerverbindung"
 msgid "Change"
 msgstr "Wechselgeld"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank und Schecks"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5441,11 +5289,6 @@ msgstr "Begründen Sie hier die Bargeldentnahme"
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Beispiel"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5456,11 +5299,6 @@ msgstr "Ermöglicht Pro-Forma Abrechnung"
 msgid "Unit Of Currency Definition"
 msgstr "Festlegen der Währung"
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Leer lassen um das Erlöskonto zu nutzen"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5472,7 +5310,7 @@ msgstr ""
 "vom Standard abweicht."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Vorsteuer %.2f%%"
@@ -5548,16 +5386,11 @@ msgstr ""
 "dadurch der Status."
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "DIV"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Rechnung (Ref ${object.number or 'NV' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5672,6 +5505,7 @@ msgstr "Hinzufügen"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Bezahlt"
 
@@ -5700,7 +5534,7 @@ msgstr ""
 "hier nichts ein zur Nutzung des Aufwandskonto."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Eröffnungsperiode"
@@ -5715,14 +5549,6 @@ msgstr "Zu prüfende Buchungen"
 msgid "Round Globally"
 msgstr "Global runden"
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5735,7 +5561,7 @@ msgid "Tax Application"
 msgstr "Steuer Anwendung"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5771,9 +5597,9 @@ msgid "End of period"
 msgstr "Ende Periode"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankkonto Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Ausgleich von Eingangsrechnungen"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5870,16 +5696,6 @@ msgstr "Steuerbezeichnung"
 msgid "Child Tax Accounts"
 msgstr "Untergeordnete Steuerkonten"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"Für das folgende Datum wurde noch keine Periode angelegt: %s.\n"
-"Bitte erstellen Sie jetzt unbedingt eine."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5925,7 +5741,7 @@ msgid "Target Moves"
 msgstr "Filter Buchungen"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5963,6 +5779,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5979,12 +5796,6 @@ msgstr ""
 "einrichten wollen oder aus einer Liste auswählen. Letzeres setzt voraus, "
 "dass die Vorlage komplett ist."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>bezahlt</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -6010,18 +5821,13 @@ msgstr "Jahr"
 msgid "It indicates that the invoice has been sent."
 msgstr "Unter der Annahme Rechnung gesendet wurde"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Zeile 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interne Bezeichnung"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -6063,7 +5869,7 @@ msgstr "Bilanz"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Gewinn & Verlust (Erträge)"
@@ -6096,7 +5902,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Berechne Quellcode (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -6125,6 +5931,7 @@ msgstr "Automatischer Ausgleich"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -6236,7 +6043,7 @@ msgid "Recompute taxes and total"
 msgstr "Steuern und Gesamtbeträge neu berechnen"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -6271,7 +6078,7 @@ msgid "Amount Computation"
 msgstr "Betragsberechnung"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -6309,10 +6116,16 @@ msgid "Account Common Account Report"
 msgstr "Standardauswertung Finanzen"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Verwendungszweck"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Offen"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6346,9 +6159,7 @@ msgstr "Umsatzsteuererklärung"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Kundengutschrift"
 
@@ -6365,11 +6176,6 @@ msgstr "Steuer Vorzeichen"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Rechnungen der letzten 15 Tage"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Anzahl der Tage: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6387,6 +6193,7 @@ msgstr ""
 "Füllen Sie dieses Formular aus, wenn Sie Geld in Ihre Barkasse einlegen"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Zahlbetrag"
@@ -6477,8 +6284,6 @@ msgstr "Runden in Zeile"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6502,6 +6307,13 @@ msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 "Die Erfassung der Zahlung ist der zweite Schritt beim Zahlungsausgleich."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6512,15 +6324,6 @@ msgstr ""
 "Rechnungen und Zahlungen  kombiniert werden dürfen, um automatisch eine "
 "Saldenausgleich für das ausgewählte Konto herbeizuführen."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Das Nummernfolge wird benutzt, um in diesem Fall die Zahlungsbedingungen von "
-"der geringsten laufenden Nummer zur höheren Nummer sukzessiv durchzuführen."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6578,12 +6381,11 @@ msgstr "Es darf nicht auf Ansicht Konten gebucht werden."
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fester Betrag"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6609,7 +6411,6 @@ msgstr "Erstelle Vortragsbuchungen"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Die Berechnungsmethode für die Höhe der Steuern."
 
@@ -6637,18 +6438,23 @@ msgid "Child Accounts"
 msgstr "untergeordnete Konten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Buchung Bezeichnung (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Abschreibung"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "Buchungen"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6665,7 +6471,7 @@ msgstr "Erlöse"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Lieferant"
@@ -6685,16 +6491,11 @@ msgid "Account n°"
 msgstr "Kontonummer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Freie Referenz"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Berechnungsform"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6826,7 +6627,7 @@ msgid "Filter by"
 msgstr "Filter durch"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Sie haben einen falschen Ausdruck \"%(...)s\" in Ihrem  Modell!"
@@ -6878,6 +6679,16 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Anzahl Tage"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"Es kann keine Journalbuchung erfolgen, da das Konto \"%s\" bislang nicht zum "
+"Kontoplan \"%s\" zugewiesen wurde."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -7020,7 +6831,7 @@ msgid "Models"
 msgstr "Modelle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -7211,7 +7022,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "Sie können keine bereits abgeschlossene Konten buchen."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -7244,13 +7055,6 @@ msgstr "Benutzerdefiniert"
 msgid "Current"
 msgstr "Aktuell"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-"Die Rechnung '%s' ist teilbezahlt: %s%s von %s%s (%s%s bleiben offen)"
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -7275,7 +7079,6 @@ msgstr "Bitte prüfen Sie, ob im Bankauszug das Journal eingetragen wurde"
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Prozentsatz"
 
@@ -7295,7 +7098,7 @@ msgid "Power"
 msgstr "Maximum Ausgleichspositionen"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kann keinen nicht verwendeten Journal Code erzeugen."
@@ -7342,12 +7145,17 @@ msgid "Applicable Type"
 msgstr "Anwendbarer Typ"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Rechnungsreferenz"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -7368,12 +7176,12 @@ msgstr ""
 "vorliegen."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7448,7 +7256,7 @@ msgid "Optional create"
 msgstr "Erzeuge optional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7461,9 +7269,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Lieferantengutschrift"
 
@@ -7501,9 +7307,14 @@ msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Berechnungsform: Saldo"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Für das folgende Datum wurde noch keine Periode angelegt: %s.\n"
+"Bitte erstellen Sie jetzt unbedingt eine."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7581,6 +7392,13 @@ msgstr "Steuerbezeichnung muss je Unternehmen eindeutig sein"
 msgid "Cash Transactions"
 msgstr "Barzahlungen"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7598,7 +7416,7 @@ msgstr "Statistik Kostenstellen Buchungen"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Buchungen: "
@@ -7618,14 +7436,13 @@ msgstr ""
 "Hauswährung ist."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Ausgangsrechnung"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Wahr"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Bilanz (Anlagenkonto)"
@@ -7641,10 +7458,9 @@ msgid "Total debit"
 msgstr "Summe Soll"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Buchung \"%s\" ist ungültig !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "OP-Ausgleich des nächsten Partners"
 
 #. module: account
 #: report:account.invoice:0
@@ -7697,7 +7513,7 @@ msgstr "Erzeuge Buchung"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Gewinn & Verlust ( Aufwandskonto )"
@@ -7708,14 +7524,15 @@ msgid "Total Transactions"
 msgstr "Gesamtbetrag Transaktionen"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 "Sie können nicht einfach ein Konto mit existierenden Buchungen löschen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Fehler!"
@@ -7752,6 +7569,11 @@ msgstr "Budget Projekt"
 msgid "Manual"
 msgstr "Manuell"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7859,8 +7681,8 @@ msgstr "Wähle Journal"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Anfangssaldo"
@@ -7946,7 +7768,7 @@ msgstr ""
 "zugelassen werden."
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7967,6 +7789,11 @@ msgstr ""
 "\n"
 "z. B.  Meine Buchungsvorlage am %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -8023,7 +7850,7 @@ msgid "Done"
 msgstr "Erledigt"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -8067,10 +7894,9 @@ msgid "Source Document"
 msgstr "Referenzbeleg"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr "Es gibt kein Aufwandskonto für dieses Produkt: \"%s (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "In der Fußzeile der Geschäftsformulare angezeigte Bankverbindung"
 
 #. module: account
 #: constraint:account.account:0
@@ -8099,7 +7925,7 @@ msgid "Taxes:"
 msgstr "Steuern:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -8301,6 +8127,12 @@ msgstr ""
 "Dieses Feld wird nur gebraucht, wenn eine Eigenentwicklung für spezifische "
 "Steuerberechnung gebraucht werden."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Rechnungsreferenz"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -8397,7 +8229,7 @@ msgid "Use model"
 msgstr "Benutze Buchungsvorlage"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8470,7 +8302,7 @@ msgid "Root/View"
 msgstr "Stamm/Sicht"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "EB"
@@ -8540,7 +8372,7 @@ msgid "Maturity Date"
 msgstr "Fälligkeitsdatum"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Verkauf Journal"
@@ -8551,7 +8383,7 @@ msgid "Invoice Tax"
 msgstr "Umsatzsteuer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Keine Stückzahl!"
@@ -8597,7 +8429,7 @@ msgid "Sales Properties"
 msgstr "Verkaufseinstellungen"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8624,7 +8456,7 @@ msgstr "Bis"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Währungsanpassung"
@@ -8658,7 +8490,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8678,10 +8510,9 @@ msgid ""
 msgstr "Die Einträge werden entsprechend Ihrer Sequenz aufsteigend sortiert"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Vorgang Nummer"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8697,17 +8528,12 @@ msgstr "Gutschrift Nummernfolge"
 msgid "Post Journal Entries"
 msgstr "Quittiere Buchungen"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr "Zentralisiertes Gegenkonto"
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kunde"
@@ -8723,7 +8549,7 @@ msgstr "Berichtsbezeichnung"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Barkasse"
@@ -8735,9 +8561,11 @@ msgid "Account Destination"
 msgstr "Kontozuordnung"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Ausgleich von Eingangsrechnungen"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8745,7 +8573,6 @@ msgstr "Ausgleich von Eingangsrechnungen"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8886,15 +8713,14 @@ msgid "Partner Ledger"
 msgstr "Partner Kontoauszug"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>abgebrochen</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fix"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Warnung!"
@@ -8962,7 +8788,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Wähle eine Währung für diese Rechnung"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Keine Rechnungspositionen!"
@@ -9041,7 +8867,7 @@ msgid "Associated Partner"
 msgstr "Zugehöriger Partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sie müssen zuerst einen Partner wählen!"
@@ -9123,13 +8949,13 @@ msgstr ""
 "sein muss"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Journal zu Gutschriften aus Eingangsrechnungen"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Bitte definieren Sie eine Nummernfolge für das Journal."
@@ -9207,7 +9033,7 @@ msgid "Net Total:"
 msgstr "Nettosumme:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr "Wählen Sie eine Start- und Endeperiode."
@@ -9227,14 +9053,6 @@ msgstr "Standard Auswertungen"
 msgid "Write-Off Journal"
 msgstr "Journal Abschreibungen"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Diese Zahlungskonditionen werden statt der Standard Konditionen verwendet"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -9261,11 +9079,6 @@ msgstr "Kontotyp"
 msgid "Tax/Base Amount"
 msgstr "Grundbetrag für Steuerberechnung"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Berechnungsform: Prozent"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -9322,6 +9135,11 @@ msgstr "Ergebnis Zahlungsausgleich"
 msgid "Ending Balance"
 msgstr "Endsaldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -9368,7 +9186,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Auto Import Bankauszug"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Unbekannter Fehler !"
@@ -9391,7 +9209,12 @@ msgid "Account Types"
 msgstr "Kontoartkonfiguration"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -9401,9 +9224,9 @@ msgstr ""
 "Aktenreiter 'Kontierungsrichtlinie'."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Betrag: NV"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "GuV & Bilanz Positionen"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9420,10 +9243,9 @@ msgid "Reconciliation"
 msgstr "Ausgleichen offener Posten"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Debitorenkonto"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Leer lassen um das Erlöskonto zu nutzen"
 
 #. module: account
 #: view:account.invoice:0
@@ -9514,7 +9336,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partner Finanzkonto dieser Rechnung."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Steuer %.2f%%"
@@ -9532,13 +9354,13 @@ msgid "Payment Term Line"
 msgstr "Zahlungsbedingungen"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Journal Einkauf"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Zwischensumme"
 
@@ -9567,11 +9389,6 @@ msgstr "Fälligkeit"
 msgid "Suppliers"
 msgstr "Lieferanten"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Wahr"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9725,9 +9542,10 @@ msgid "Journal Name"
 msgstr "Journal Bezeichnung"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "OP-Ausgleich des nächsten Partners"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Buchung \"%s\" ist ungültig !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9778,7 +9596,7 @@ msgstr ""
 "handelt"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9843,7 +9661,7 @@ msgid "Reconciled entries"
 msgstr "Auszugleichende Buchungen"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Falsches Modell!"
@@ -9865,7 +9683,7 @@ msgid "Print Account Partner Balance"
 msgstr "Drucke Partner-Saldenliste"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9905,7 +9723,7 @@ msgstr "unbekannt"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Start Buchungsjournal"
@@ -9955,7 +9773,7 @@ msgstr ""
 "nicht auf dem Gesamtbetrag"
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr "Sie können kein Konto mit vorhandenen Buchungssätzen deaktivieren."
@@ -9970,21 +9788,9 @@ msgstr "Hinterlegt durch Python Code"
 msgid "Journal Code"
 msgstr "Journal Kürzel"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Sie können hier den Koeffizienten für die Konsolidierung auf der nächsten "
-"Ebene definieren. Zum Beispiel definieren Sie 1/-1 wenn Sie "
-"addieren/subtrahieren wollen."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Restbetrag"
 
@@ -10017,7 +9823,7 @@ msgid "Unit of Currency"
 msgstr "Währungseinheit"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Gutschriften Journal"
@@ -10087,7 +9893,7 @@ msgid "Purchase Tax(%)"
 msgstr "Steuer Einkauf (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Bitte erstellen Sie Rechnungspositionen"
@@ -10108,7 +9914,7 @@ msgid "Display Detail"
 msgstr "Zeige Detail"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "GSV"
@@ -10236,21 +10042,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Anzahl der Perioden"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Steuergrundlage Vorlagen"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Kundenkontoauszug"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "GuV & Bilanz Positionen"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -10262,9 +10058,10 @@ msgid "Supplier credit note sequence"
 msgstr "Nummernfolge Lieferantengutschrift"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Nächste Eingangsrechnung"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "Rechnung ist bereits ausgeglichen"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10289,14 +10086,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bankauszüge"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Debitorenkonto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -10400,8 +10197,8 @@ msgid "Move"
 msgstr "Buchung"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -10490,11 +10287,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Gesendet"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Auszugleichende Transaktionen"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -10512,12 +10304,17 @@ msgid "Balance :"
 msgstr "Saldo:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 "Es können keine Buchungen für verschiedene Unternehmen generiert werden."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10554,15 +10351,6 @@ msgstr "Wiederkehrende Buchung"
 msgid "Account Analytic Balance"
 msgstr "Kostenstelle Saldo"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-"Gutschrift für diesen Typ. Es können keine Änderungen oder Stornierungen "
-"vorgenommen werden, wenn die Rechnungen bereits ausgeglichen wurde."
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10602,7 +10390,13 @@ msgid "Due date"
 msgstr "Fälligkeitsdatum"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr " Zusammenfassung"
@@ -10699,7 +10493,7 @@ msgid "Unreconciled"
 msgstr "Offene Posten"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Falsche Summe!"
@@ -10793,7 +10587,7 @@ msgid "Comparison"
 msgstr "Vergleich"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10824,6 +10618,11 @@ msgstr ""
 "installieren Sie hier \n"
 "das Modul account_budget."
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10879,11 +10678,6 @@ msgstr "Haben"
 msgid "Draft Invoice "
 msgstr "Entwurf Rechnung "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr "Abbrechen: Erstelle Gutschrift und Ausgleich"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10895,7 +10689,7 @@ msgid "Journal Entry Model"
 msgstr "Wiederkehrende Buchungen Journal"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "Start Periode die auf die Ende Periode folgen soll."
@@ -10980,7 +10774,7 @@ msgid "Profit (Loss) to report"
 msgstr "Gewinn & Verlust Übertrag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr "Es wurde noch kein Journal für Verkauf / Einkauf angelegt."
@@ -11312,7 +11106,14 @@ msgid "Empty Accounts ? "
 msgstr "Konten ohne Buchung? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Eine Änderung der Steuer ist nicht möglich"
@@ -11443,7 +11244,7 @@ msgid "Receivable accounts"
 msgstr "Debitoren"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Bereits ausgeglichen."
@@ -11579,7 +11380,7 @@ msgid "Entries Sorted by"
 msgstr "Buchungen sortiert nach"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11711,7 +11512,7 @@ msgid "Accounting Documents"
 msgstr "Finanzen Belege"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11761,7 +11562,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manuelle Berechnung Steuer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11843,17 +11644,6 @@ msgstr "Verlust"
 msgid "February"
 msgstr "Februar"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Wenn Sie einen anderen Buchungstext als '/' angeben, wird die erzeugte "
-"Buchung die gleiche Nummer / Buchungstext erhalten wie der Bankauszug "
-"selbst. Dieses ermöglicht dann dieselbe Belegnummern wie beim Auszug selbst."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11912,6 +11702,11 @@ msgstr "Konten Steuerumschlüsselung Vorlagen"
 msgid "Expense Account on Product Template"
 msgstr "Aufwandskonto für Produktvorlage"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -12022,12 +11817,22 @@ msgstr ""
 #~ msgstr ""
 #~ "Bestätige Kontoauszug mit oder ohne Ausgleich (ausgehend vom Stadium Entwurf)"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodische Buchungen"
+
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Eingangsrechnung"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Offene Posten Zahlung"
 
 #~ msgid "Line"
 #~ msgstr "Zeile"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Bank Journal "
@@ -12189,6 +11994,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Steuern Einkauf"
 
+#~ msgid "Line Name"
+#~ msgstr "Zeile Bezeichnung"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "(Analyt.) Haben"
 
@@ -12455,6 +12263,9 @@ msgstr ""
 #~ msgid "Acc. Type Name"
 #~ msgstr "Kontoart Bezeichnung"
 
+#~ msgid "Litigation"
+#~ msgstr "Rechtsstreit"
+
 #~ msgid "Taxes Reports"
 #~ msgstr "Auswertung Umsatzsteuer"
 
@@ -13103,6 +12914,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Überspringe Entwurf für Buchungserzeugung"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field allow you to choose the accounting journals you want for "
 #~ "filtering the invoices. If you left this field empty, it will search on all "
@@ -13278,6 +13092,12 @@ msgstr ""
 #~ msgid "Invoice is already reconciled"
 #~ msgstr "Die Rechnung ist bereits ausgeglichen"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Diese Zahlungskonditionen werden statt der Standard Konditionen verwendet"
+
 #~ msgid "Fiscal Position Template Tax Mapping"
 #~ msgstr "Steuerliche Position Vorlage Steuerzuordnung"
 
@@ -13755,6 +13575,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Automatische Erstellung von Buchungen für Vorgänge vor einem bestimmten Datum"
 
+#~ msgid "Line 2:"
+#~ msgstr "Zeile 2:"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -13911,6 +13734,9 @@ msgstr ""
 #~ "Datum an dem die Buchungen auf dem Partnerkonto letztmalig automatisch "
 #~ "ausgeglichen wurden"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank und Schecks"
+
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Bilanz (Vermögen)"
 
@@ -13936,6 +13762,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Öffne Kassenbuch"
 
+#~ msgid "Line 1:"
+#~ msgstr "Zeile 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Journal Buchung \"%s\" ist ungültig"
@@ -14001,6 +13830,9 @@ msgstr ""
 #~ "Buchhaltungsmethodik, insbesondere bei der Buchungslogik der "
 #~ "Lagerbuchhaltung."
 
+#~ msgid "Valuation"
+#~ msgstr "Berechnungsform"
+
 #, python-format
 #~ msgid "New currency is not confirured properly !"
 #~ msgstr "Neue Währung wurde nicht vollständig konfiguriert !"
@@ -14446,6 +14278,14 @@ msgstr ""
 #~ "Sie können kein Konto löschen, ohne dabei auch vorher die jeweiligen "
 #~ "Buchungszeilen zu löschen, wenn dieses vor dem neuen Sinnvoll ist. "
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Falls Sie einen Ausgleich von Offenen Posten stornieren müssen, prüfen Sie "
+#~ "auch alle vorgelagerten Vorgänge, da diese nicht automatisch mit "
+#~ "zurückgesetzt werden."
+
 #, python-format
 #~ msgid "To reconcile the entries company should be the same for all entries"
 #~ msgstr ""
@@ -14847,6 +14687,10 @@ msgstr ""
 #~ msgid "Accounting and Financial Management"
 #~ msgstr "Finanzbuchhaltung"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Rechnung  '%s' ist validiert."
+
 #~ msgid ""
 #~ "Gives the view used when writing or browsing entries in this journal. The "
 #~ "view tell Open ERP which fields should be visible, required or readonly and "
@@ -14897,6 +14741,9 @@ msgstr ""
 #~ msgid "last month"
 #~ msgstr "letzten Monat"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "14 Tage 2%, Rest 30 Tage zum Ende des Monats"
+
 #, python-format
 #~ msgid "I can not locate a parent code for the template account!"
 #~ msgstr "Finde keinen Code für das übergeordnete Vorlagekonto"
@@ -14955,6 +14802,9 @@ msgstr ""
 #~ msgid "Configure Your Chart of Accounts"
 #~ msgstr "Konfigurieren Sie Ihren Kontenplan"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Tage des Monats: 0"
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -14972,6 +14822,15 @@ msgstr ""
 #~ msgid "Quantity :"
 #~ msgstr "Menge:"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Betrag: 0.02"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Anzahl der Tage: 30"
+
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Tage des Monats = -1"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -15003,9 +14862,18 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Kodierungsfehler"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Rechnung (Ref ${object.number or 'NV' })"
+
+#~ msgid "Example"
+#~ msgstr "Beispiel"
+
 #~ msgid "Sale journal in this month"
 #~ msgstr "Verkaufsjournal in diesem Monat"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Anzahl der Tage: 14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
@@ -15070,6 +14938,9 @@ msgstr ""
 #~ "Keine Periode für dieses Datum: %s!\n"
 #~ "Bitte legen Sie eine Periode an."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Betrag: NV"
+
 #~ msgid "Contacts"
 #~ msgstr "Kontakte"
 
@@ -15249,6 +15120,14 @@ msgstr ""
 #~ msgid "Account currency"
 #~ msgstr "Währung des Kontos"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Wenn Sie Zahlungen stornieren, müssen Sie alle zugehörigen Belege und "
+#~ "Buchungen prüfen, da diese nicht automatisch mit gelöscht oder deaktiviert "
+#~ "werden."
+
 #~ msgid ""
 #~ "Configuration error! The currency chosen should be shared by the default "
 #~ "accounts too."
@@ -15827,9 +15706,6 @@ msgstr ""
 #~ msgid "UserError"
 #~ msgstr "UserError"
 
-#~ msgid "Fixed"
-#~ msgstr "Fix"
-
 #, python-format
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "Kann Entwurf/Proforma/Storno für Rechnung %s nicht durchführen"
@@ -16049,3 +15925,19 @@ msgstr ""
 #~ "${object.company_id.website or ''}\n"
 #~ "% endif\n"
 #~ "            "
+
+#~ msgid "Communication"
+#~ msgstr "Verwendungszweck"
+
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Das Nummernfolge wird benutzt, um in diesem Fall die Zahlungsbedingungen von "
+#~ "der geringsten laufenden Nummer zur höheren Nummer sukzessiv durchzuführen."
+
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Berechnungsform: Saldo"
+
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Berechnungsform: Prozent"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 80e5291f9ce..1c07fb1d77e 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Εισαγωγή από τιμολόγιο ή πληρωμή"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,13 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Χρεωστικό Σύνολο"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -111,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -142,19 +129,19 @@ msgstr ""
 "πληρωμής χωρίς να τον διαγράψετε."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -166,7 +153,7 @@ msgid "Warning!"
 msgstr "Προειδοποίηση"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Ημερολόγιο διαφόρων συμβάντων"
@@ -238,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Πρότυπα Φόρων"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -258,6 +240,11 @@ msgstr "Οι Εγγραφές Λογιστικής είναι μέθοδος σ
 msgid "Belgian Reports"
 msgstr "Αναφορές Βελγίου"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -389,11 +376,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -448,6 +430,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -463,6 +450,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Πρότυπο Σχεδίου"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -624,15 +616,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Τρίμηνη"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Αν ακυρώσετε συμφωνημένες συναλλαγές θα πρέπει να ελέγξετε όλες τις "
-"ενέργειες που συνδέονται με αυτές διότι δεν θα διαγραφούν."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -681,7 +664,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -692,13 +675,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -761,6 +744,11 @@ msgstr "Λογαριασμοί Εισπρακτέοι"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -783,6 +771,12 @@ msgstr "Άνοιγμα ξανά"
 msgid "Are you sure you want to create entries?"
 msgstr "Είστε σίγουροι ότι θέλετε να δημιουργήσετε εγγραφές;"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -803,6 +797,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Ποσοστό"
 
@@ -845,7 +840,7 @@ msgid "Type"
 msgstr "Τύπος"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -868,24 +863,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Ακύρωση Συμφωνίας"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -916,11 +905,6 @@ msgstr "J.C./Όνομα Κίνησης"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -953,7 +937,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -968,6 +952,7 @@ msgstr "Νέα Προεγγραφή"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Υπολογισμός"
 
@@ -999,11 +984,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1039,7 +1021,7 @@ msgid "Liability"
 msgstr "Παθητικό"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1110,10 +1092,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1189,8 +1171,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1236,7 +1219,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -1532,9 +1515,9 @@ msgid "Account Receivable"
 msgstr "Λογαριασμός Εισπρακτέος"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1548,7 +1531,7 @@ msgid "With balance is not equal to 0"
 msgstr "Με υπόλοιπο δάιφορο του 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1603,7 +1586,7 @@ msgstr "Παράβλεψη κατάστασης 'Πρόχειρου' για Χε
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1646,6 +1629,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Επιστροφές Προμηθευτών"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Κωδικός Θέματος"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1683,7 +1672,6 @@ msgid "Groups"
 msgstr "Ομάδες"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Αφορολόγητο"
@@ -1816,6 +1804,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Πωλήσεις Τύπο Λογαριασμού"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1836,115 +1830,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2053,6 +1943,11 @@ msgstr "Αυτές οι περίοδοι μπορεί να συγχέονται"
 msgid "Draft statement"
 msgstr "Πρόχειρη κίνηση"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2081,26 +1976,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2108,16 +2002,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2128,8 +2022,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2174,7 +2068,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2274,7 +2168,7 @@ msgid "Product Category"
 msgstr "Κατηγορία Προϊόντος"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2633,7 +2527,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Αφήστε το κενό για όλες τις ανοικτές Λογιστικές Χρήσεις"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2651,7 +2545,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2672,7 +2566,7 @@ msgid "Main Sequence"
 msgstr "Κύρια Ιεράρχηση"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2680,14 +2574,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Όρος Πληρωμής"
 
@@ -2713,18 +2605,6 @@ msgstr "Διαλέξτε αυτό το κουτί"
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Ανοικτά"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2736,6 +2616,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2813,25 +2698,20 @@ msgid "Account Model Entries"
 msgstr "Εγγραφές Μοντέλου Λογαριασμού"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Φόροι Προμηθευτή"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Στοιχεία Τράπεζας"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2854,7 +2734,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2869,9 +2748,8 @@ msgstr ""
 "50% τώρα και 50% σε έναν μήνα."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2901,6 +2779,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Φόρος"
 
@@ -2936,14 +2815,14 @@ msgid "Accounts"
 msgstr "Λογαριασμοί"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3040,6 +2919,12 @@ msgstr "Πληρωμένο/Συμφωνημένο"
 msgid "Refund Base Code"
 msgstr "Επιστροφή Βασικού Κώδικα"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3092,11 +2977,6 @@ msgstr "Ενηλικιωμένο ισοζύγιο Συνεργάτη"
 msgid "Accounting entries"
 msgstr "Λογιστικές Εγγραφές"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3137,7 +3017,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3150,7 +3030,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3166,15 +3046,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Πρέπει να ορίσετε το αναλυτικό ημερολόγιο για το '%s' ημερολόγιο!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3182,7 +3062,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3244,9 +3124,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Γραμμή 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3293,12 +3174,6 @@ msgstr "Ποσό Βασικού Κώδικα"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3332,7 +3207,7 @@ msgid "Fiscal Position"
 msgstr "Φορολογική Θέση"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3359,7 +3234,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3431,7 +3306,7 @@ msgstr ""
 "ισοτιμίες."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3443,9 +3318,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Αριθμός Ψηφίων που θα χρησιμοποιηθούν στον κωδικό λογαριασμού"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Όνομα Γραμμής"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3494,7 +3369,7 @@ msgid "View"
 msgstr "Όψη"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3515,15 +3390,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Ηλεκτρονικό Αρχείο"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Πρότυπο Κωδικού Φόρου"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3531,9 +3411,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3659,12 +3618,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3679,7 +3641,7 @@ msgid "Starting Balance"
 msgstr "Ισοζύγιο Έναρξης"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Δεν ορίστηκε Συνεργάτης!"
@@ -3879,7 +3841,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3903,7 +3865,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4041,7 +4003,7 @@ msgid "Chart of Accounts Template"
 msgstr "Πρότυπα Λογιστικών Σχεδίων"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4128,9 +4090,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Αντιδικία"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4215,11 +4180,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4237,11 +4197,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4286,8 +4241,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4317,7 +4272,7 @@ msgid "Consolidated Children"
 msgstr "Ενοποιημένες Υποκατηγορίες"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4349,11 +4304,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4444,6 +4394,13 @@ msgstr "30 Ημέρες Τέλος Μήνα"
 msgid "Analytic Balance"
 msgstr "Αναλυτικό Ισοζύγιο"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4463,6 +4420,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4473,11 +4435,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4486,11 +4443,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4514,19 +4466,8 @@ msgid "Account Type"
 msgstr "Τύπος Λογαριασμού"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4548,8 +4489,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4578,7 +4530,7 @@ msgid "Month"
 msgstr "Μήνας"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4589,8 +4541,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4614,6 +4566,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4626,7 +4583,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4648,7 +4605,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4703,11 +4660,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Περιοδική Επεξεργασία"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4737,10 +4689,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Τιμολόγιο Προμηθευτή"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4808,10 +4759,14 @@ msgstr "Πιστωτικά Τιμολόγια"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4860,7 +4815,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4875,7 +4830,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4900,11 +4855,6 @@ msgstr ""
 msgid "Change"
 msgstr "Αλλαγή"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4927,11 +4877,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4942,11 +4887,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Διατηρήστε το κενό για να χρησιμοποιηθεί ο λογαριασμός εσόδων"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4956,7 +4896,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5030,16 +4970,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5150,6 +5085,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Εξοφλημένο"
 
@@ -5178,7 +5114,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5193,14 +5129,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5213,7 +5141,7 @@ msgid "Tax Application"
 msgstr "Εφαρμογή Φόρου"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5246,9 +5174,9 @@ msgid "End of period"
 msgstr "Τέλος Περιόδου"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Στοιχεία Τράπεζας"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5341,14 +5269,6 @@ msgstr "Περιγραφή Φόρου"
 msgid "Child Tax Accounts"
 msgstr "Λογαριασμοί Υπο-φόρων"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5393,7 +5313,7 @@ msgid "Target Moves"
 msgstr "Επιλεγμένες Κινήσεις"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5429,6 +5349,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5442,12 +5363,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5473,18 +5388,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Εσωτερικό Όνομα"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5523,7 +5433,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5556,7 +5466,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Υπολογισμός Κώδικα (αν τύπος=κώδικας)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5583,6 +5493,7 @@ msgstr "Αυτόματος Συμψηφισμός"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5683,7 +5594,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5714,7 +5625,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5750,10 +5661,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Ανοικτά"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5783,9 +5700,7 @@ msgstr "Κώδικες Φόρων"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Επιστροφή Χρημάτων Πελάτη"
 
@@ -5802,11 +5717,6 @@ msgstr "Πρόσημο Κώδικα Φόρου"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Αναφορά τιμολογίων των τελευταίων 15 ημερών"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5823,6 +5733,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5911,8 +5822,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5935,6 +5844,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5942,15 +5858,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Το πεδίο Ιεράρχησης χρησιμοποιείται για να κατατάξει τις γραμμές των τρόπων "
-"πληρωμής απο τη χαμηλότερη στην υψηλότερη"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6008,12 +5915,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Σταθερό Ποσό"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6037,7 +5943,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Η μέθοδος υπολογισμού για το ποσό του φόρου"
 
@@ -6065,18 +5970,23 @@ msgid "Child Accounts"
 msgstr "Ελαχιστοβάθμιοι Λογαριασμοί"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Παραγραφή"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6093,7 +6003,7 @@ msgstr "Έσοδα"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Προμηθευτής"
@@ -6113,16 +6023,11 @@ msgid "Account n°"
 msgstr "Αρ. Λογαριασμού"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Ελεύθερη Παραπομπή"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6232,7 +6137,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6279,6 +6184,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Αριθμός Ημερών"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6418,7 +6331,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6593,7 +6506,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6624,12 +6537,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6654,7 +6561,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Ποσοστό"
 
@@ -6674,7 +6580,7 @@ msgid "Power"
 msgstr "Δύναμη"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6719,12 +6625,17 @@ msgid "Applicable Type"
 msgstr "Εφαρμόσιμος Τύπος"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Παραπομπή Τιμολογίου"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6743,12 +6654,12 @@ msgstr ""
 "έχετε φόρους που περιέχεουν άλλους φόρους σαν υποκατηγορίες."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6815,7 +6726,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6826,9 +6737,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Επιστροφή Χρημάτων από Προμηθευτή"
 
@@ -6866,8 +6775,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6946,6 +6858,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6963,7 +6882,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Εγγραφές: "
@@ -6981,14 +6900,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Αληθές"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7004,10 +6922,9 @@ msgid "Total debit"
 msgstr "Σύνολο Χρεώσεων"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Η εγγραφή \"%s\" δεν είναι έγκυρη!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7058,7 +6975,7 @@ msgstr "Δημιουργία εγγραφής"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7069,13 +6986,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Σφάλμα !"
@@ -7112,6 +7030,11 @@ msgstr "Γραμμή έργου"
 msgid "Manual"
 msgstr "Χειροκίνητα"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7210,8 +7133,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7291,7 +7214,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7304,6 +7227,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7357,7 +7285,7 @@ msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7389,9 +7317,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7418,7 +7345,7 @@ msgid "Taxes:"
 msgstr "Φόροι:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7616,6 +7543,12 @@ msgstr ""
 "επιτρέποντας σε προγραμματιστές να δημιουργήσουν συγκεκριμένους φόρους σε "
 "προσαρμοσμένο περιβάλλον."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Παραπομπή Τιμολογίου"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7705,7 +7638,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7756,7 +7689,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7823,7 +7756,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Ημερολόγιο Πωλήσεων"
@@ -7834,7 +7767,7 @@ msgid "Invoice Tax"
 msgstr "Φόρος Τιμολογίου"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7873,7 +7806,7 @@ msgid "Sales Properties"
 msgstr "Χαρακτηριστικά Πωλήσεων"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7898,7 +7831,7 @@ msgstr "Σε"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7930,7 +7863,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7948,10 +7881,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Κωδικός Θέματος"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7967,17 +7899,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Πελάτης"
@@ -7993,7 +7920,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Μετρητά"
@@ -8005,8 +7932,10 @@ msgid "Account Destination"
 msgstr "Λογαριασμός Προορισμού"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -8015,7 +7944,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8153,15 +8081,14 @@ msgid "Partner Ledger"
 msgstr "Βιβλίο Συνεργατών"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Σταθερό"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Προσοχή!"
@@ -8229,7 +8156,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8305,7 +8232,7 @@ msgid "Associated Partner"
 msgstr "Συσχετιζόμενος Συνεργάτης"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Θα πρέπει πρώτα να επιλέξετε συνεργάτη!"
@@ -8387,13 +8314,13 @@ msgstr ""
 "πριν υπολογιστούν οι επόμενοι φόροι."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8464,7 +8391,7 @@ msgid "Net Total:"
 msgstr "Καθαρό Σύνολο:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8484,15 +8411,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Ημερολόγιο Παραγραφών"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Αυτός ο όρος πληρωμής θα χρησιμοποιηθεί για το συγκεκριμένο συνεργάτη αντί "
-"του προεπιλεγμένου."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8519,11 +8437,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Ποσό Φόρου/Βάσης"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8577,6 +8490,11 @@ msgstr "Αποτελέσματα Εκκαθάρισης"
 msgid "Ending Balance"
 msgstr "Ισοζύγιο Τέλους"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8617,7 +8535,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8640,7 +8558,12 @@ msgid "Account Types"
 msgstr "Τύποι Λογαριασμών"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8648,8 +8571,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8667,10 +8590,9 @@ msgid "Reconciliation"
 msgstr "Συμφωνία"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Εισπρακτέος Λογαριασμός"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Διατηρήστε το κενό για να χρησιμοποιηθεί ο λογαριασμός εσόδων"
 
 #. module: account
 #: view:account.invoice:0
@@ -8742,7 +8664,7 @@ msgid "The partner account used for this invoice."
 msgstr "Ο λογαριασμός συνεργάτη που χρησιμοποιήθηκε στο τιμολόγιο αυτό."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8760,13 +8682,13 @@ msgid "Payment Term Line"
 msgstr "Γραμμή Όρων Πληρωμής"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Ημερολόγιο Αγορών"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8795,11 +8717,6 @@ msgstr "Ημερομηνία Λήξης"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Αληθές"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8935,9 +8852,10 @@ msgid "Journal Name"
 msgstr "Όνομα Ημερολογίου"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Η εγγραφή \"%s\" δεν είναι έγκυρη!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8986,7 +8904,7 @@ msgstr ""
 "για εγγαρφή πολλαπλών νομισμάτων."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9047,7 +8965,7 @@ msgid "Reconciled entries"
 msgstr "Συμφωνημένες εγγραφές"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9069,7 +8987,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9103,7 +9021,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Ημερολόγιο Εγγραφών Ανοίγματος"
@@ -9150,7 +9068,7 @@ msgstr ""
 "αντί για το γενικό σύνολο."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9165,18 +9083,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Κωδικός Ημερολογίου"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9209,7 +9118,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9275,7 +9184,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9294,7 +9203,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9409,21 +9318,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Αριθμός Περιόδων"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Πρότυπο Κωδικού Φόρου"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Έγγραφο: Λογιστική κατάσταση πελάτη"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9435,8 +9334,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9456,14 +9356,14 @@ msgid "Document"
 msgstr "Έγγραφο"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Εισπρακτέος Λογαριασμός"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9564,8 +9464,8 @@ msgid "Move"
 msgstr "Μετακίνηση"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9644,11 +9544,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Συναλλαγές ακύρωσης συμφωνιών"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9666,11 +9561,16 @@ msgid "Balance :"
 msgstr "Υπόλοιπο:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9707,13 +9607,6 @@ msgstr "Προεγγραφή"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9753,7 +9646,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9842,7 +9741,7 @@ msgid "Unreconciled"
 msgstr "Μη συμφωνημένα"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Λάθος Σύνολο!"
@@ -9925,7 +9824,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9943,6 +9842,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9998,11 +9902,6 @@ msgstr "Πίστωση"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10014,7 +9913,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10099,7 +9998,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10422,7 +10321,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10547,7 +10453,7 @@ msgid "Receivable accounts"
 msgstr "Εισπρακτέοι λογαριασμοί"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10675,7 +10581,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10782,7 +10688,7 @@ msgid "Accounting Documents"
 msgstr "Εντυπα Λογιστικής"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10827,7 +10733,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Μη Αυτόματοι Φόροι Τιμολόγησης"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10906,14 +10812,6 @@ msgstr ""
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10972,6 +10870,11 @@ msgstr "Πρότυπο Οικονομικής Απεικόνισης Λογαρ
 msgid "Expense Account on Product Template"
 msgstr "Λογαριασμός Εξόδων στο Πρότυπο Προϊόντος"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11063,9 +10966,16 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Κατάσταση"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Περιοδική Επεξεργασία"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Στατιστικά εγγραφών αναλυτικής"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Τιμολόγιο Προμηθευτή"
+
 #~ msgid "Line"
 #~ msgstr "Γραμμή"
 
@@ -11168,6 +11078,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Φόροι Αγορών"
 
+#~ msgid "Line Name"
+#~ msgstr "Όνομα Γραμμής"
+
 #, python-format
 #~ msgid ""
 #~ "You can not do this modification on a confirmed entry ! Please note that you "
@@ -11457,9 +11370,6 @@ msgstr ""
 #~ msgid "Aged Trial Balance"
 #~ msgstr "Δοκιμαστικό Ισοζύγιο Χρονολογικά"
 
-#~ msgid "Fixed"
-#~ msgstr "Σταθερό"
-
 #~ msgid "Recurrent Entries"
 #~ msgstr "Περιοδικές Εγγραφές"
 
@@ -11497,6 +11407,9 @@ msgstr ""
 #~ msgid "Reconcile Paid"
 #~ msgstr "Συμφωνία Πληρωμένων"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "J.C. or Move name"
 #~ msgstr "Καμπύλη J ή Όνομα κίνησης"
 
@@ -11565,6 +11478,13 @@ msgstr ""
 #~ "Το πεδίο Ιεράρχησης χρησιμοποιείται για να κατατάξει τους πόρους απο τη "
 #~ "χαμηλότερη Ιεράρχηση στην υψηλότερη"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Το πεδίο Ιεράρχησης χρησιμοποιείται για να κατατάξει τις γραμμές των τρόπων "
+#~ "πληρωμής απο τη χαμηλότερη στην υψηλότερη"
+
 #~ msgid "Gives the sequence order when displaying a list of account types."
 #~ msgstr ""
 #~ "Δίνει την κατάταξη Ιεράρχησης όταν προβάλλεται η λίστα των τύπων λογαριασμών."
@@ -11681,6 +11601,13 @@ msgstr ""
 #~ msgid "Centralised counterpart"
 #~ msgstr "Συγκεντροποιημένη εγγραφή"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Αν ακυρώσετε συμφωνημένες συναλλαγές θα πρέπει να ελέγξετε όλες τις "
+#~ "ενέργειες που συνδέονται με αυτές διότι δεν θα διαγραφούν."
+
 #, python-format
 #~ msgid "Cannot create invoice move on centralised journal"
 #~ msgstr ""
@@ -11834,6 +11761,9 @@ msgstr ""
 #~ msgid "Taxes Reports"
 #~ msgstr "Αναφορές Φόρων"
 
+#~ msgid "Litigation"
+#~ msgstr "Αντιδικία"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Εισαγωγή Τιμολογίων στη Δήλωση"
 
@@ -12042,6 +11972,13 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Κωδικός Ημερολογίου"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Αυτός ο όρος πληρωμής θα χρησιμοποιηθεί για το συγκεκριμένο συνεργάτη αντί "
+#~ "του προεπιλεγμένου."
+
 #~ msgid "Entry Name"
 #~ msgstr "Όνομα Εγγραφής"
 
@@ -12531,6 +12468,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Παράλειψη Προσωρινού Σταδίου  για Δημιουργημένες Εγγραφές"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field allow you to choose the accounting journals you want for "
 #~ "filtering the invoices. If you left this field empty, it will search on all "
@@ -12923,6 +12863,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Σφάλμα! Υπάρχει κατηγορία με την ίδια περιγραφή."
 
+#~ msgid "Line 2:"
+#~ msgstr "Γραμμή 2:"
+
 #~ msgid "Configure"
 #~ msgstr "Παραμετροποίηση"
 
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
index 329f4d7bcc7..f0ab1461c4b 100644
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:25+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:28+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Import from invoice or payment"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,15 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total Debit"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all actions linked "
-"to those transactions as they will not be disabled"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -111,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -142,19 +127,19 @@ msgstr ""
 "without removing it."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -166,7 +151,7 @@ msgid "Warning!"
 msgstr "Warning!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -238,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Tax Templates"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -258,6 +238,11 @@ msgstr "Accounting entries are an input of the reconciliation."
 msgid "Belgian Reports"
 msgstr "Belgian Reports"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -386,11 +371,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -445,6 +425,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -460,6 +445,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Chart Template"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -621,15 +611,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3 Monthly"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all actions linked "
-"to those transactions as they will not be disabled"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -678,7 +659,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -689,13 +670,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -758,6 +739,11 @@ msgstr "Accounts Receivable"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -780,6 +766,12 @@ msgstr "Re-Open"
 msgid "Are you sure you want to create entries?"
 msgstr "Are you sure you want to create entries?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -800,6 +792,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percent"
 
@@ -842,7 +835,7 @@ msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -865,24 +858,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Unreconciliation"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -913,11 +900,6 @@ msgstr "J.C./Move name"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -948,7 +930,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -963,6 +945,7 @@ msgstr "New Subscription"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Computation"
 
@@ -994,11 +977,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1034,7 +1014,7 @@ msgid "Liability"
 msgstr "Liability"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1105,10 +1085,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1184,8 +1164,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1231,7 +1212,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1527,9 +1508,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1543,7 +1524,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1598,7 +1579,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1641,6 +1622,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1678,7 +1665,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Untaxed"
@@ -1811,6 +1797,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1831,115 +1823,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2048,6 +1936,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2076,26 +1969,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2103,16 +1995,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2123,8 +2015,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2169,7 +2061,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2269,7 +2161,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2628,7 +2520,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2646,7 +2538,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2667,7 +2559,7 @@ msgid "Main Sequence"
 msgstr "Main Sequence"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2675,14 +2567,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2708,18 +2598,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2731,6 +2609,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2808,24 +2691,19 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Supplier Taxes"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2849,7 +2727,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2863,9 +2740,8 @@ msgstr ""
 "due dates, for example 50% now, 50% in one month."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2895,6 +2771,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Tax"
 
@@ -2930,14 +2807,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3034,6 +2911,12 @@ msgstr "Paid/Reconciled"
 msgid "Refund Base Code"
 msgstr "Refund Base Code"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3086,11 +2969,6 @@ msgstr "Aged Partner Balance"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3131,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3144,7 +3022,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3160,15 +3038,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3176,7 +3054,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3238,8 +3116,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3286,12 +3165,6 @@ msgstr "Base Code Amount"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3325,7 +3198,7 @@ msgid "Fiscal Position"
 msgstr "Fiscal Position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3352,7 +3225,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3423,7 +3296,7 @@ msgstr ""
 "always use the rate at date."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3435,9 +3308,9 @@ msgid "No. of Digits to use for account code"
 msgstr "No. of Digits to use for account code"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3486,7 +3359,7 @@ msgid "View"
 msgstr "View"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3507,15 +3380,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Electronic File"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Tax Code Template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3523,9 +3401,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3651,12 +3608,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3671,7 +3631,7 @@ msgid "Starting Balance"
 msgstr "Starting Balance"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No Partner Defined !"
@@ -3871,7 +3831,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3895,7 +3855,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4032,7 +3992,7 @@ msgid "Chart of Accounts Template"
 msgstr "Chart of Accounts Template"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4119,9 +4079,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4205,11 +4168,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4227,11 +4185,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4276,8 +4229,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4307,7 +4260,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4339,11 +4292,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4433,6 +4381,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4452,6 +4407,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4462,11 +4422,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4475,11 +4430,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4503,19 +4453,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4537,8 +4476,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4567,7 +4517,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4578,8 +4528,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4603,6 +4553,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4615,7 +4570,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4637,7 +4592,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4692,11 +4647,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodical Processing"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4726,9 +4676,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4797,10 +4746,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4849,7 +4802,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4864,7 +4817,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4889,11 +4842,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4916,11 +4864,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4931,11 +4874,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Keep empty to use the income account"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4945,7 +4883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5019,16 +4957,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5139,6 +5072,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5165,7 +5099,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5180,14 +5114,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5200,7 +5126,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5233,8 +5159,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5328,14 +5254,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5380,7 +5298,7 @@ msgid "Target Moves"
 msgstr "Target Moves"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5416,6 +5334,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5429,12 +5348,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5460,18 +5373,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Internal Name"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5510,7 +5418,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5543,7 +5451,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Compute Code (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5570,6 +5478,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5670,7 +5579,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5700,7 +5609,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5736,9 +5645,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5769,9 +5684,7 @@ msgstr "Tax Codes"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Customer Refund"
 
@@ -5788,11 +5701,6 @@ msgstr "Tax Code Sign"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5809,6 +5717,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5897,8 +5806,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5921,6 +5828,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5928,15 +5842,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5994,12 +5899,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fixed Amount"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6023,7 +5927,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "The computation method for the tax amount."
 
@@ -6051,18 +5954,23 @@ msgid "Child Accounts"
 msgstr "Child Accounts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Write-Off"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6079,7 +5987,7 @@ msgstr "Income"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Supplier"
@@ -6099,16 +6007,11 @@ msgid "Account n°"
 msgstr "Account n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Free Reference"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6218,7 +6121,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6265,6 +6168,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Number of Days"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6404,7 +6315,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6579,7 +6490,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6610,12 +6521,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6640,7 +6545,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6660,7 +6564,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6705,12 +6609,17 @@ msgid "Applicable Type"
 msgstr "Applicable Type"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6729,12 +6638,12 @@ msgstr ""
 "children. In this case, the evaluation order is important."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6801,7 +6710,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6812,9 +6721,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6852,8 +6759,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6932,6 +6842,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6949,7 +6866,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6967,14 +6884,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "True"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6990,9 +6906,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7042,7 +6957,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7053,13 +6968,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7096,6 +7012,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7194,8 +7115,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7275,7 +7196,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7288,6 +7209,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7341,7 +7267,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7373,9 +7299,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7402,7 +7327,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7594,6 +7519,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Invoice Reference"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7683,7 +7614,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7734,7 +7665,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7801,7 +7732,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Sales Journal"
@@ -7812,7 +7743,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7851,7 +7782,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7876,7 +7807,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7908,7 +7839,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7926,9 +7857,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7945,17 +7875,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7971,7 +7896,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7983,8 +7908,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7993,7 +7920,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8131,15 +8057,14 @@ msgid "Partner Ledger"
 msgstr "Partner Ledger"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fixed"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8207,7 +8132,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8282,7 +8207,7 @@ msgid "Associated Partner"
 msgstr "Associated Partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -8364,13 +8289,13 @@ msgstr ""
 "computing the next taxes."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8441,7 +8366,7 @@ msgid "Net Total:"
 msgstr "Net Total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8461,13 +8386,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Write-Off Journal"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8494,11 +8412,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Tax/Base Amount"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8552,6 +8465,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr "Ending Balance"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8592,7 +8510,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8615,7 +8533,12 @@ msgid "Account Types"
 msgstr "Account Types"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8623,8 +8546,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8642,10 +8565,9 @@ msgid "Reconciliation"
 msgstr "Reconciliation"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Keep empty to use the income account"
 
 #. module: account
 #: view:account.invoice:0
@@ -8717,7 +8639,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8735,13 +8657,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Purchase Journal"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8770,11 +8692,6 @@ msgstr "Due Date"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "True"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8909,8 +8826,9 @@ msgid "Journal Name"
 msgstr "Journal Name"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8958,7 +8876,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9019,7 +8937,7 @@ msgid "Reconciled entries"
 msgstr "Reconciled entries"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9041,7 +8959,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9075,7 +8993,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -9122,7 +9040,7 @@ msgstr ""
 "than on the total amount."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9137,18 +9055,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Journal Code"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9181,7 +9090,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9247,7 +9156,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9266,7 +9175,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9381,21 +9290,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Tax Code Template"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Customer account statement"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9407,8 +9306,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9428,14 +9328,14 @@ msgid "Document"
 msgstr "Document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Receivable Account"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9536,8 +9436,8 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9614,11 +9514,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Unreconciliation Transactions"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9636,11 +9531,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9677,13 +9577,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9723,7 +9616,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9812,7 +9711,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9895,7 +9794,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9913,6 +9812,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9966,11 +9870,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9982,7 +9881,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10067,7 +9966,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10390,7 +10289,14 @@ msgid "Empty Accounts ? "
 msgstr "Empty Accounts ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10515,7 +10421,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10642,7 +10548,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10748,7 +10654,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10793,7 +10699,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10872,14 +10778,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10938,6 +10836,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10991,6 +10894,13 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Include Reconciled Entries"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all actions linked "
+#~ "to those transactions as they will not be disabled"
+
 #~ msgid "Children Definition"
 #~ msgstr "Children Definition"
 
@@ -11024,6 +10934,9 @@ msgstr ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid "Journal: %s"
 #~ msgstr "Journal: %s"
@@ -11066,6 +10979,9 @@ msgstr ""
 #~ msgid "Configure"
 #~ msgstr "Configure"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #, python-format
 #~ msgid ""
 #~ "Can't find any account journal of %s type for this company.\n"
@@ -11126,6 +11042,13 @@ msgstr ""
 #~ "it changes to 'Printed' state. When all transactions are done, it changes to "
 #~ "'Done' state."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all actions linked "
+#~ "to those transactions as they will not be disabled"
+
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "CashBox Balance is not matching with Calculated Balance !"
@@ -11241,9 +11164,6 @@ msgstr ""
 #~ msgid "Aged Trial Balance"
 #~ msgstr "Aged Trial Balance"
 
-#~ msgid "Fixed"
-#~ msgstr "Fixed"
-
 #~ msgid ""
 #~ "Gives the view used when writing or browsing entries in this journal. The "
 #~ "view tell Open ERP which fields should be visible, required or readonly and "
@@ -11317,6 +11237,9 @@ msgstr ""
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodical Processing"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Analytic Entries Stats"
 
@@ -11493,6 +11416,13 @@ msgstr ""
 #~ msgid "You must select accounts to reconcile"
 #~ msgstr "You must select accounts to reconcile"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Print Analytic Journals"
 
@@ -11541,6 +11471,9 @@ msgstr ""
 #~ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 
+#~ msgid "Line Name"
+#~ msgstr "Line Name"
+
 #~ msgid "Parent Analytic Account"
 #~ msgstr "Parent Analytic Account"
 
@@ -11892,6 +11825,9 @@ msgstr ""
 #~ msgid "Entries Encoding by Line"
 #~ msgstr "Entries Encoding by Line"
 
+#~ msgid "Litigation"
+#~ msgstr "Litigation"
+
 #~ msgid "Entries Reconcile"
 #~ msgstr "Entries Reconcile"
 
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index 8addab9fd5c..1e1f71a527a 100644
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-09 14:42+0000\n"
 "Last-Translator: Raphaël Valyi - http://www.akretion.com <Unknown>\n"
 "Language-Team: English (United States) <en_US@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 1dbeeb5b85f..3fed803ac4f 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 15:38+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-20 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -28,11 +28,6 @@ msgid ""
 msgstr ""
 "Una posición fiscal solo puede estar definida una vez en las mismas cuentas."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Romper conciliación de transacciones"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Cuenta erronea."
@@ -94,16 +89,6 @@ msgstr "Cuenta erronea."
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -116,7 +101,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -147,19 +131,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -171,7 +155,7 @@ msgid "Warning!"
 msgstr "¡Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -257,11 +241,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "contabilidad.impuesto"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -277,6 +256,11 @@ msgstr "Los asientos contables son una entrada de la conciliación."
 msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -424,11 +408,6 @@ msgstr "Le permite usar la contabilidad analítica"
 msgid "Salesperson"
 msgstr "Comercial"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "cuenta.impuesto.plantilla"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -489,6 +468,11 @@ msgstr ""
 "Si no marca esta casilla, podrá realizar facturas y pagos, pero no "
 "contabilidad (asientos contables, plan de cuentas, ...)"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -504,6 +488,11 @@ msgstr "Período :"
 msgid "Chart Template"
 msgstr "Plantilla plan contable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -674,16 +663,6 @@ msgstr "Precisión decimal en movimientos contables"
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si rompe la conciliación de las transacciones, también debe verificar todas "
-"las acciones que están relacionadas con estas transacciones, ya que no se "
-"desactivarán."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -734,7 +713,7 @@ msgid "Profit Account"
 msgstr "Cuenta de ganancias"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -746,13 +725,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Informe de las ventas por tipo de cuenta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VEN"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "No se puede crear un movimiento con divisa distinta de .."
@@ -821,6 +800,11 @@ msgstr "Cuentas a cobrar"
 msgid "Configure your company bank accounts"
 msgstr "Configure los números de cuenta bancaria de su compañía"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -845,6 +829,12 @@ msgstr "Reabrir"
 msgid "Are you sure you want to create entries?"
 msgstr "¿Está seguro que desea crear los asientos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -867,6 +857,7 @@ msgstr "Mostrar hijos con jerarquía"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaje"
 
@@ -909,7 +900,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -932,25 +923,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Facturas y abonos de proveedor"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "El apunte ya está conciliado"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "No conciliación"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"2 por ciento en 14 días netos, la cantidad restante a 30 días fin de mes"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -982,11 +966,6 @@ msgstr "C.Diario / Nombre mov."
 msgid "Account Code and Name"
 msgstr "Código y nombre de cuenta"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "creado"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1021,7 +1000,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1038,6 +1017,7 @@ msgstr "Nueva suscripción"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Cálculo"
 
@@ -1069,14 +1049,9 @@ msgid "Purchase journal"
 msgstr "Diario de compra"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
-"No puede validar este asiento porque la cuenta \"%s\" no pertenece al árbol "
-"de cuentas \"%s\"."
 
 #. module: account
 #: view:validate.account.move:0
@@ -1111,7 +1086,7 @@ msgid "Liability"
 msgstr "Pasivo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1186,10 +1161,10 @@ msgid "Features"
 msgstr "Características"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1279,10 +1254,11 @@ msgid "Refund "
 msgstr "Devolución "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
-"Números de cuenta para imprimir en el pie de página de cada documento impreso"
+"No hay cuenta de gastos definida para este producto: \"%s\" (id: %d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1337,7 +1313,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1639,9 +1615,9 @@ msgid "Account Receivable"
 msgstr "Cuenta a cobrar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copiar)"
@@ -1655,7 +1631,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con balance si no es igual a 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1714,7 +1690,7 @@ msgstr "Omitir estado 'Borrador' para asientos manuales."
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "No implementado."
@@ -1758,6 +1734,12 @@ msgstr "Una tabla temporal utilizada para la vista de tablero"
 msgid "Supplier Refunds"
 msgstr "Facturas rectificativas de proveedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1795,7 +1777,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Base"
@@ -1946,6 +1927,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Ventas por tipo de cuenta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1968,214 +1955,11 @@ msgstr ""
 "estado borrador"
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Algunos apuntes ya han sido conciliados"
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>Tiene una nueva factura disponible: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Nº factura: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Total factura: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Fecha factura: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Referencia pedido: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>También es posibe pagar directamente mediante Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>Para cualquier aclaración, no dude en contactar con nosotros.</p>\n"
-"    <p>Gracias por confiar en ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Teléfono:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2288,6 +2072,11 @@ msgstr "Estos períodos se pueden solapar."
 msgid "Draft statement"
 msgstr "Extracto borrador"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2323,26 +2112,25 @@ msgstr ""
 "trimestre."
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2350,16 +2138,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2370,8 +2158,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2424,7 +2212,7 @@ msgid "period close"
 msgstr "cierre periodo"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2537,7 +2325,7 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2912,7 +2700,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2932,7 +2720,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Crear una cuenta basada en esta plantilla"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2958,7 +2746,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2968,14 +2756,12 @@ msgstr ""
 "los apuntes contables relacionados."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
@@ -3001,18 +2787,6 @@ msgstr "Marque esta opción"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Abierto/a"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -3024,6 +2798,11 @@ msgstr "Estado borrador de una factura"
 msgid "Account Properties"
 msgstr "Propiedades de la cuenta"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -3103,25 +2882,20 @@ msgid "Account Model Entries"
 msgstr "Contabilidad. Líneas de modelo"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "COMPRA"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Crear factura rectificativa"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impuestos proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "entradas"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -3156,7 +2930,6 @@ msgstr ""
 "            "
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3171,10 +2944,9 @@ msgstr ""
 "ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "La factura ya está conciliada"
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Siguiente número de factura de proveedor"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3203,6 +2975,7 @@ msgstr "Reconcilia linea de asiento (desajuste)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -3238,14 +3011,14 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3344,6 +3117,12 @@ msgstr "Pagado/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código base reintegro"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extractos bancarios"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3407,11 +3186,6 @@ msgstr "Saldos vencidos de empresa"
 msgid "Accounting entries"
 msgstr "Asientos contables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tipo de comunicación"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3459,7 +3233,7 @@ msgstr ""
 "'Borrador' o 'Pro-forma'"
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "Debería escoger los periodos que pertenezcan a la misma compañía"
@@ -3472,7 +3246,7 @@ msgid "Sales by Account"
 msgstr "Ventas por cuenta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "No pude borrar un asiento asentado \"%s\"."
@@ -3488,15 +3262,15 @@ msgid "Sale journal"
 msgstr "Diario de venta"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3506,7 +3280,7 @@ msgstr ""
 "compañía"
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3573,9 +3347,10 @@ msgstr ""
 "para algunos informes."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Línea 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3624,12 +3399,6 @@ msgstr "Importe código base"
 msgid "Default Sale Tax"
 msgstr "Impuesto de venta por defecto"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factura '%s' es validada."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3666,7 +3435,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3693,7 +3462,7 @@ msgid "Trial Balance"
 msgstr "Balance de sumas y saldos"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr "Imposible adaptar el balance inicial (valor negativo)"
@@ -3765,7 +3534,7 @@ msgstr ""
 "transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "No hay código padre para la plantilla de cuentas"
@@ -3777,9 +3546,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Núm. de dígitos a usar para código de cuenta."
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nombre línea"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3830,7 +3599,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3851,15 +3620,20 @@ msgstr "Facturas proforma"
 msgid "Electronic File"
 msgstr "Archivo electrónico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "La compañía tiene un árbol de cuentas"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Día del mes: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3867,10 +3641,89 @@ msgid "Account Partner Ledger"
 msgstr "Contabilidad. Libro mayor empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>creado</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -4007,12 +3860,18 @@ msgid "Account Tax Declaration"
 msgstr "Declaración de cuentas de impuestos"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Importe: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
+"que el extracto. Esto permite que los asientos del extracto tengan las "
+"mismas referencias que el extracto en sí"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -4030,7 +3889,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡No se ha definido empresa!"
@@ -4260,7 +4119,7 @@ msgid "Period Length (days)"
 msgstr "Longitud del periodo (días)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4286,7 +4145,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4428,7 +4287,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4520,9 +4379,15 @@ msgid "Qty"
 msgstr "Cantidad"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Desacuerdo"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
+"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
+"desea sumar/restar el importe."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4607,11 +4472,6 @@ msgstr "¡No hay compañías sin configurar!"
 msgid "Expects a Chart of Accounts"
 msgstr "Se esperaba un plan de cuentas"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "pagado"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4629,13 +4489,6 @@ msgstr "El diario debe teneruna cuenta del debe y del haber por defecto."
 msgid "Setup your Bank Accounts"
 msgstr "Configurar sus cuentas bancarias"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-"Modificar: crea una factura rectificativa, la concilia y crea un nueva "
-"factura en borrador"
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4684,8 +4537,8 @@ msgstr ""
 "código de impuesto aparezca en las facturas."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "No puede usar una cuenta inactiva."
@@ -4715,7 +4568,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4753,11 +4606,6 @@ msgstr ""
 msgid "title"
 msgstr "título"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Crear una factura rectificativa en borrador"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4847,6 +4695,13 @@ msgstr "30 días fin de mes"
 msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4868,6 +4723,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Asientos validados/asentados"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4878,11 +4738,6 @@ msgstr "Buscar plantillas impuestos"
 msgid "Draft Entries"
 msgstr "Asientos borrador"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dia del mes = -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4893,11 +4748,6 @@ msgstr ""
 "Como ejemplo, un precisión decimal de 2 permite al diario entradas como: "
 "9.99 EUR, y una precisión decimal de 4 permitiría entradas como: 0.0231 EUR."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Número de días: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4920,6 +4770,32 @@ msgstr "Abreviación"
 msgid "Account Type"
 msgstr "Tipo de cuenta"
 
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Cerrar caja"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Cancelar las facturas seleccionadas"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:423
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "¡Debes asignar un diario analítico en el último '%s' diario!"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Los costes analíticos (hojas de servicios, algunos productos comprados, ...) "
+"provienen de las cuentas analíticas. Estos generan facturas borrador de "
+"proveedor."
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
 msgid ""
@@ -4946,32 +4822,6 @@ msgstr ""
 "</p>\n"
 "        "
 
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr "Cancelar las facturas seleccionadas"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:423
-#, python-format
-msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr "¡Debes asignar un diario analítico en el último '%s' diario!"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid ""
-"Analytic costs (timesheets, some purchased products, ...) come from analytic "
-"accounts. These generate draft supplier invoices."
-msgstr ""
-"Los costes analíticos (hojas de servicios, algunos productos comprados, ...) "
-"provienen de las cuentas analíticas. Estos generan facturas borrador de "
-"proveedor."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Cerrar caja"
-
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid ""
@@ -5002,7 +4852,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr "¡No puede cambiar el código de una cuenta que contiene apuntes!"
@@ -5013,8 +4863,8 @@ msgid "Supplier invoice sequence"
 msgstr "Secuencia de factura de proveedor"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -5040,6 +4890,11 @@ msgstr "Cuenta Paypal"
 msgid "Acc.Type"
 msgstr "Tipo cuenta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -5052,7 +4907,7 @@ msgstr "Invertir signo del balance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balance (Cuenta de pasivo)"
@@ -5074,7 +4929,7 @@ msgid "Account Base Code"
 msgstr "Código base cuenta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -5129,11 +4984,6 @@ msgstr "Conciliación del asiento de apertura"
 msgid "Last Reconciliation:"
 msgstr "Última conciliación:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -5165,10 +5015,9 @@ msgid "Account chart"
 msgstr "Plan contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura de proveedor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5236,10 +5085,14 @@ msgstr "Facturas rectificativas"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr "Apuntes a conciliar"
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -5294,7 +5147,7 @@ msgstr ""
 "No puede crear una cuenta cuya cuenta padre es de otra compañía."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5312,7 +5165,7 @@ msgid "Based On"
 msgstr "Basado en"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ACOMPRA"
@@ -5337,11 +5190,6 @@ msgstr "Impuestos hijos"
 msgid "Change"
 msgstr "Cambiar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5364,11 +5212,6 @@ msgstr "Indique por qué retira dinero de la caja registradora:"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Ejemplo"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5379,11 +5222,6 @@ msgstr "Permite poner las facturas es estado pro-forma."
 msgid "Unit Of Currency Definition"
 msgstr "Unidad de definición de la moneda"
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5395,7 +5233,7 @@ msgstr ""
 "de la compañía."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impuesto de compra %2f%%"
@@ -5472,16 +5310,11 @@ msgstr ""
 "hecho, cambia a 'Realizado'."
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "Varios"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/d' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5595,6 +5428,7 @@ msgstr "Añadir"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagado"
 
@@ -5623,7 +5457,7 @@ msgstr ""
 "facturas. Dejar vacío para usar la cuenta de gastos."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Periodo de apertura"
@@ -5638,14 +5472,6 @@ msgstr "Asientos a revisar"
 msgid "Round Globally"
 msgstr "Redondear globalmente"
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos electrónicos"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5658,7 +5484,7 @@ msgid "Tax Application"
 msgstr "Aplicación impuesto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5693,9 +5519,9 @@ msgid "End of period"
 msgstr "Fin del período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles del banco"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pago de facturas"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5793,16 +5619,6 @@ msgstr "Descripción impuesto"
 msgid "Child Tax Accounts"
 msgstr "Cuentas impuestos hijas"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"No hay periodo definido para esta fecha: %s.\n"
-"Por favor, cree uno."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5849,7 +5665,7 @@ msgid "Target Moves"
 msgstr "Movimientos destino"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5887,6 +5703,7 @@ msgid "Python Code (reverse)"
 msgstr "Código Python (inverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5904,12 +5721,6 @@ msgstr ""
 "selección asume que el conjunto de impuestos definido en esta plantilla está "
 "completo."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>pagado</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5935,18 +5746,13 @@ msgstr "Año"
 msgid "It indicates that the invoice has been sent."
 msgstr "Indica que la factura ha sido enviada."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Línea 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nombre interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5988,7 +5794,7 @@ msgstr "Balance de situación"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Pérdidas y ganancias (Cuenta de ingresos)"
@@ -6021,7 +5827,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Código para calcular (si tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -6050,6 +5856,7 @@ msgstr "Conciliación automática"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -6161,7 +5968,7 @@ msgid "Recompute taxes and total"
 msgstr "Recalcular total e impuestos"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -6192,7 +5999,7 @@ msgid "Amount Computation"
 msgstr "Calculo importe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -6229,10 +6036,16 @@ msgid "Account Common Account Report"
 msgstr "Contabilidad. Informe contable común"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicación"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Abierto/a"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6265,9 +6078,7 @@ msgstr "Códigos de impuestos"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Factura rectificativa de cliente"
 
@@ -6284,11 +6095,6 @@ msgstr "Signo código impuesto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Informe de facturas creadas en los últimos 15 días"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Numero de días: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6305,6 +6111,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Rellene este formulario si pone dinero en la caja registradora:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Cantidad a pagar"
@@ -6396,8 +6203,6 @@ msgstr "Redondear por línea"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6420,6 +6225,13 @@ msgstr "Texto normal"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Asientos de pago son la segunda entrada para la conciliación."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6429,15 +6241,6 @@ msgstr ""
 "La potencia de la conciliación automática a seleccionar es el número de los "
 "importes parciales que se pueden combinar para encontrar un saldo a cero."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"El campo secuencia es usado para ordenar las líneas de plazos de pago en "
-"orden ascendente."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6495,12 +6298,11 @@ msgstr "No puede crear asientos en una cuenta de tipo vista."
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Importe fijo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr "No puede cambiar el impuesto. Debería eliminar y recrear las líneas."
@@ -6524,7 +6326,6 @@ msgstr "Generar asientos apertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "El método de cálculo del importe del impuesto."
 
@@ -6552,18 +6353,23 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nombre del movimiento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "entradas"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6580,7 +6386,7 @@ msgstr "Ingreso"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -6600,16 +6406,11 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre / Nº Fact. Proveedor"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valoración"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6734,7 +6535,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "¡Tiene una expressión errónea \"%(...)s\" en su modelo!"
@@ -6787,6 +6588,16 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Número de días"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"No puede validar este asiento porque la cuenta \"%s\" no pertenece al árbol "
+"de cuentas \"%s\"."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6930,7 +6741,7 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -7120,7 +6931,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "No puede crear asiento en una cuenta cerrada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -7153,13 +6964,6 @@ msgstr "Personalizado"
 msgid "Current"
 msgstr "Actual"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-"La factura '%s' se ha pago parcialmente: %s %s de %s %s (%s %s pendiente)."
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -7186,7 +6990,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -7206,7 +7009,7 @@ msgid "Power"
 msgstr "Fuerza"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "No puede generar un código de diario que no ha sido usado"
@@ -7253,12 +7056,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referencia factura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -7279,12 +7087,12 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7359,7 +7167,7 @@ msgid "Optional create"
 msgstr "Crear opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7372,9 +7180,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Factura rectificativa de proveedor"
 
@@ -7412,9 +7218,14 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Evaluación: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"No hay periodo definido para esta fecha: %s.\n"
+"Por favor, cree uno."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7494,6 +7305,13 @@ msgstr "¡El nombre del impuesto debe ser único por compañía!"
 msgid "Cash Transactions"
 msgstr "Transacciones de caja"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7511,7 +7329,7 @@ msgstr "Estadísticas asientos analíticos"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -7530,14 +7348,13 @@ msgstr ""
 "No puede proveer una moneda secundaria si es la misma que la de principal."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Factura de proveedor"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balance (Cuenta activos)"
@@ -7553,10 +7370,9 @@ msgid "Total debit"
 msgstr "Total debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "¡El asiento \"%s\" no es válido!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Próximos asientos de cliente para conciliar"
 
 #. module: account
 #: report:account.invoice:0
@@ -7609,7 +7425,7 @@ msgstr "Crear asiento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Pérdidas y ganancias (cuenta de gastos)"
@@ -7620,13 +7436,14 @@ msgid "Total Transactions"
 msgstr "Transacciones totales"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr "No puede eliminar una cuenta que contiene asientos."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -7663,6 +7480,11 @@ msgstr "Línea de proyecto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7769,8 +7591,8 @@ msgstr "Seleccionar diario"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo de apertura"
@@ -7856,7 +7678,7 @@ msgstr ""
 "defecto."
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7876,6 +7698,11 @@ msgstr ""
 "%(date)s: Fecha actual\n"
 "Ejemplo: Mi modelo del %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7931,7 +7758,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7973,11 +7800,10 @@ msgid "Source Document"
 msgstr "Documento origen"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
-"No hay cuenta de gastos definida para este producto: \"%s\" (id: %d)."
+"Números de cuenta para imprimir en el pie de página de cada documento impreso"
 
 #. module: account
 #: constraint:account.account:0
@@ -8005,7 +7831,7 @@ msgid "Taxes:"
 msgstr "Impuestos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -8205,6 +8031,12 @@ msgstr ""
 "desarrolladores crear impuestos específicos en una configuración "
 "personalizada."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referencia factura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -8300,7 +8132,7 @@ msgid "Use model"
 msgstr "Usar modelo"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8364,7 +8196,7 @@ msgid "Root/View"
 msgstr "Raiz/vista"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -8433,7 +8265,7 @@ msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -8444,7 +8276,7 @@ msgid "Invoice Tax"
 msgstr "Impuesto de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "¡Ningún trozo de número!"
@@ -8490,7 +8322,7 @@ msgid "Sales Properties"
 msgstr "Propiedades de venta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8517,7 +8349,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustes de moneda"
@@ -8551,7 +8383,7 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8572,10 +8404,9 @@ msgstr ""
 "baja a la más alta"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Código"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8591,17 +8422,12 @@ msgstr "Secuena de las facturas rectificativas"
 msgid "Post Journal Entries"
 msgstr "Asentar asientos"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr "Contrapartida centralizada"
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8617,7 +8443,7 @@ msgstr "Nombre del informe"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -8629,9 +8455,11 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pago de facturas"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8639,7 +8467,6 @@ msgstr "Pago de facturas"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8779,15 +8606,14 @@ msgid "Partner Ledger"
 msgstr "Libro mayor de empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>cancelado</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -8855,7 +8681,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda a aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "¡No hay líneas de factura!"
@@ -8937,7 +8763,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "¡Primero debe seleccionar una empresa!"
@@ -9019,13 +8845,13 @@ msgstr ""
 "de calcular los siguientes impuestos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de abono de compras"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Defina por favor una secuencia en el diario."
@@ -9101,7 +8927,7 @@ msgid "Net Total:"
 msgstr "Base:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr "Seleccione un periodo de inicio y de fin."
@@ -9121,15 +8947,6 @@ msgstr "Informes genéricos"
 msgid "Write-Off Journal"
 msgstr "Diario de desajuste"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
-"empresa actual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -9156,11 +8973,6 @@ msgstr "Tipo interno"
 msgid "Tax/Base Amount"
 msgstr "Importe impuestos/base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Valoración: Porcentaje"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -9217,6 +9029,11 @@ msgstr "Resultado de conciliación"
 msgid "Ending Balance"
 msgstr "Saldo final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -9262,7 +9079,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Importación automática del extracto bancario"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "¡Error desconocido!"
@@ -9285,7 +9102,12 @@ msgid "Account Types"
 msgstr "Tipos de cuentas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -9295,9 +9117,9 @@ msgstr ""
 "'Controles de asiento' en el diario relacionado."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Valor del importe: n.d."
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoría Balance / PyG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9314,10 +9136,9 @@ msgid "Reconciliation"
 msgstr "Conciliación"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cuenta a cobrar"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
 #: view:account.invoice:0
@@ -9407,7 +9228,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Impuestox %.2f%%"
@@ -9425,13 +9246,13 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -9460,11 +9281,6 @@ msgstr "Fecha vencimiento"
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadero"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9614,9 +9430,10 @@ msgid "Journal Name"
 msgstr "Nombre del diario"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Próximos asientos de cliente para conciliar"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "¡El asiento \"%s\" no es válido!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9667,7 +9484,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr "El apunte contable (%s) para centralización ha sido confirmado."
@@ -9734,7 +9551,7 @@ msgid "Reconciled entries"
 msgstr "Asientos conciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "¡Modelo erroneo!"
@@ -9756,7 +9573,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprimir balance contable de empresa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9797,7 +9614,7 @@ msgstr "desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -9847,7 +9664,7 @@ msgstr ""
 "hijos en lugar del importe total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr "No puede desactivar una cuenta que contiene apuntes."
@@ -9862,21 +9679,9 @@ msgstr "Calculado por código Python"
 msgid "Journal Code"
 msgstr "Código diario"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
-"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
-"desea sumar/restar el importe."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Importe residual"
 
@@ -9909,7 +9714,7 @@ msgid "Unit of Currency"
 msgstr "Unidad de moneda"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de abono de ventas"
@@ -9978,7 +9783,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impuesto compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Cree algunas líneas de factura"
@@ -9999,7 +9804,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalles"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "AVENTA"
@@ -10127,21 +9932,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de periodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría Balance / PyG"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -10153,9 +9948,10 @@ msgid "Supplier credit note sequence"
 msgstr "Secuencia de factura rectificativa de proveedor"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Siguiente número de factura de proveedor"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "La factura ya está conciliada"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10179,14 +9975,14 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta a cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -10289,8 +10085,8 @@ msgid "Move"
 msgstr "Asiento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -10377,11 +10173,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Enviado"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transacciones no conciliadas"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -10399,11 +10190,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr "No se pueden crear apuntes de compañías diferentes."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10440,15 +10236,6 @@ msgstr "Asientos periódicos"
 msgid "Account Analytic Balance"
 msgstr "Contabilidad. Saldo analítico"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-"Factura rectificativa basada en este tipo. No puede realizar las operaciones "
-"de modificar o cancelar si la factura ya ha sido conciliada."
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10488,7 +10275,13 @@ msgid "Due date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr " Centralización"
@@ -10585,7 +10378,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "¡Total erróneo!"
@@ -10679,7 +10472,7 @@ msgid "Comparison"
 msgstr "Comparación"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10704,6 +10497,11 @@ msgstr ""
 "analítica.\n"
 "Esto instala el módulo 'account_budget'."
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10759,11 +10557,6 @@ msgstr "Haber"
 msgid "Draft Invoice "
 msgstr "Factura borrador "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr "Cancelar: crea un factura rectificativa y la concilia"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10775,7 +10568,7 @@ msgid "Journal Entry Model"
 msgstr "Modelo de asiento"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "El periodo de inicio debe preceder al periodo final."
@@ -10860,7 +10653,7 @@ msgid "Profit (Loss) to report"
 msgstr "Beneficio (pérdida) para informe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr "No hay diario(s) de Ventas/Compras definido(s)."
@@ -11191,7 +10984,14 @@ msgid "Empty Accounts ? "
 msgstr "¿Cuentas vacías? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "¡No se ha podido cambiar el impuesto!"
@@ -11321,7 +11121,7 @@ msgid "Receivable accounts"
 msgstr "Cuentas a cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Ya conciliado."
@@ -11458,7 +11258,7 @@ msgid "Entries Sorted by"
 msgstr "Entradas ordenadas por"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11586,7 +11386,7 @@ msgid "Accounting Documents"
 msgstr "Documentos contables"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11635,7 +11435,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Impuestos factura manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr "El plazo de pago del proveedor no tiene ninguna línea de plazo."
@@ -11716,17 +11516,6 @@ msgstr "Pérdidas"
 msgid "February"
 msgstr "Febrero"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
-"que el extracto. Esto permite que los asientos del extracto tengan las "
-"mismas referencias que el extracto en sí"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11785,6 +11574,11 @@ msgstr "Mapeo fiscal de modelo de cuenta"
 msgid "Expense Account on Product Template"
 msgstr "Cuenta de gastos en plantilla producto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11912,9 +11706,6 @@ msgstr ""
 #~ "sólo lectura y en qué orden. Puede crear su propia vista para codificar más "
 #~ "rápido en cada diario."
 
-#~ msgid "Fixed"
-#~ msgstr "Fijo"
-
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
@@ -11957,9 +11748,16 @@ msgstr ""
 #~ "Confirmar extracto bancario con/sin conciliación a partir del extracto "
 #~ "borrador"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesamiento periódico"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Estadística de asientos analíticos"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de proveedor"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Pago conciliado"
 
@@ -12100,6 +11898,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Núm. de bono"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "El campo secuencia es usado para ordenar las líneas de plazos de pago en "
+#~ "orden ascendente."
+
 #~ msgid "Total write-off"
 #~ msgstr "Desajuste total"
 
@@ -12135,6 +11940,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Impuestos de compras"
 
+#~ msgid "Line Name"
+#~ msgstr "Nombre línea"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Haber analítico"
 
@@ -12406,6 +12214,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Utilice este código para la declaración del IVA."
 
+#~ msgid "Litigation"
+#~ msgstr "Desacuerdo"
+
 #~ msgid "Taxes Reports"
 #~ msgstr "Informes de impuestos"
 
@@ -13294,6 +13105,13 @@ msgstr ""
 #~ msgstr ""
 #~ "¡Impuestos globales definidos, pero no están en líneas de la factura!"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Este plazo de pago se utilizará en lugar del plazo por defecto para la "
+#~ "empresa actual."
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category"
@@ -13927,6 +13745,9 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Transición de caja"
 
+#~ msgid "Line 2:"
+#~ msgstr "Línea 2:"
+
 #~ msgid "Gives the sequence order to journal column."
 #~ msgstr "Indica el orden de secuencia de la columna del diario."
 
@@ -14036,6 +13857,9 @@ msgstr ""
 #~ "la cuenta \"%s - %s\". Borrar el campo de moneda secundaria de la definición "
 #~ "de la cuenta si desea aceptar todas las monedas."
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco y cheques"
+
 #~ msgid ""
 #~ "All draft account entries in this journal and period will be validated. It "
 #~ "means you won't be able to modify their accounting fields anymore."
@@ -14088,6 +13912,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Apertura caja"
 
+#~ msgid "Line 1:"
+#~ msgstr "Línea 1:"
+
 #~ msgid "Balance Sheet (Liability Accounts)"
 #~ msgstr "Balance de situación (cuentas de riesgos)"
 
@@ -14104,6 +13931,9 @@ msgstr ""
 #~ msgid "Debit/Credit"
 #~ msgstr "Debe/Haber"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
+
 #~ msgid "Transaction"
 #~ msgstr "Transacción"
 
@@ -14143,6 +13973,9 @@ msgstr ""
 #~ "Agiliza el pago de facturas y crea interfaces para conectar sistemas de pago "
 #~ "automatizados."
 
+#~ msgid "Valuation"
+#~ msgstr "Valoración"
+
 #, python-format
 #~ msgid "not implemented"
 #~ msgstr "no implementado"
@@ -14448,6 +14281,14 @@ msgstr ""
 #~ "Este informe le proporciona una visión global sobre la situación de un "
 #~ "diario específico"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porqué no serán "
+#~ "deshabilitadas."
+
 #~ msgid ""
 #~ "When new move line is created the state will be 'Draft'.\n"
 #~ "* When all the payments are done it will be in 'Valid' state."
@@ -14523,6 +14364,9 @@ msgstr ""
 #~ "El campo secuencia se utiliza para ordenar los recursos secuencialmente de "
 #~ "menor a mayor."
 
+#~ msgid "account.tax"
+#~ msgstr "contabilidad.impuesto"
+
 #, python-format
 #~ msgid ""
 #~ "You selected an Unit of Measure which is not compatible with the product."
@@ -14824,6 +14668,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "¡No puede eliminar el movimiento asentado: \"%s\"!"
 
+#~ msgid "account.tax.template"
+#~ msgstr "cuenta.impuesto.plantilla"
+
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "¡El saldo de caja no coincide con el saldo calculado!"
@@ -14831,6 +14678,14 @@ msgstr ""
 #~ msgid "account.installer.modules"
 #~ msgstr "cuenta.instalador.módulos"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Si rompe la conciliación de las transacciones, también debe verificar todas "
+#~ "las acciones que están relacionadas con estas transacciones, ya que no se "
+#~ "desactivarán."
+
 #, python-format
 #~ msgid "Journal: %s"
 #~ msgstr "Diario: %s"
@@ -15256,6 +15111,10 @@ msgstr ""
 #~ msgid "Liabilities"
 #~ msgstr "Pasivos"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factura '%s' es validada."
+
 #~ msgid "Balance:"
 #~ msgstr "Balance:"
 
@@ -15277,6 +15136,10 @@ msgstr ""
 #~ "¡No puede cambiar el tipo de cuenta de '%s' a '%s', ya que contiene apuntes "
 #~ "contables!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "2 por ciento en 14 días netos, la cantidad restante a 30 días fin de mes"
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -15342,6 +15205,12 @@ msgstr ""
 #~ "¡Necesita un diario de apertura con la casilla 'Centralización' marcada para "
 #~ "establecer el balance inicial!"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Importe: 0.02"
+
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Día del mes: 0"
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -15389,9 +15258,15 @@ msgstr ""
 #~ "herramienta 'Configurar sus cuentas de banco' que creará automáticamente las "
 #~ "cuentas y los diarios por usted."
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Número de días: 30"
+
 #~ msgid "Create a draft Refund"
 #~ msgstr "Crear una devolución en borrador"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dia del mes = -1"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -15431,6 +15306,9 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Error de codificación"
 
+#~ msgid "Example"
+#~ msgstr "Ejemplo"
+
 #~ msgid "Sale journal in this month"
 #~ msgstr "Diario ventas en este mes"
 
@@ -15472,6 +15350,9 @@ msgstr ""
 #~ msgid "Analytic Entries during last 7 days"
 #~ msgstr "Asientos analíticos en los últimos 7 días."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Numero de días: 14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Esta acción borrará impuestos"
 
@@ -15622,6 +15503,9 @@ msgstr ""
 #~ "La cuenta bancaria definida en el árbol de cuentas seleccionado no tiene "
 #~ "código"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Valoración: Porcentaje"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -15774,6 +15658,15 @@ msgstr ""
 #~ msgstr ""
 #~ "Modificar: Factura devolución, reconcilia y crea una nueva factura borrador."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Evaluación: Balance"
+
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Valor del importe: n.d."
+
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/d' })"
+
 #~ msgid ""
 #~ "\n"
 #~ "Hello${object.address_invoice_id.name and ' ' or "
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 84848f6d36b..2d7643f81fe 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-13 15:01+0000\n"
 "Last-Translator: jpdborgna <Unknown>\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: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,13 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -108,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -137,19 +124,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -161,7 +148,7 @@ msgid "Warning!"
 msgstr "¡Advertencia!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -230,11 +217,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas de impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -250,6 +232,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -376,11 +363,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -435,6 +417,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -450,6 +437,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plantilla del Plan de cuentas"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -611,15 +603,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si se desconcilian transacciones, se deben verificar que todas las acciones "
-"que están enlazadas a dichas transacciones, porque no se han desactivado"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -668,7 +651,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -679,13 +662,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VENTA"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -748,6 +731,11 @@ msgstr "Cuentas a cobrar"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -770,6 +758,12 @@ msgstr "Reabrir"
 msgid "Are you sure you want to create entries?"
 msgstr "¿Está seguro que desea crear los asientos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -790,6 +784,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaje"
 
@@ -832,7 +827,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -855,24 +850,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Desconciliación"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -903,11 +892,6 @@ msgstr "C.Diario / Nombre mov."
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -938,7 +922,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -953,6 +937,7 @@ msgstr "Nueva suscripción"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Cálculo"
 
@@ -984,11 +969,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1024,7 +1006,7 @@ msgid "Liability"
 msgstr "Pasivo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1095,10 +1077,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1174,8 +1156,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1221,7 +1204,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1517,9 +1500,9 @@ msgid "Account Receivable"
 msgstr "Cuenta a cobrar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1533,7 +1516,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con balance distinto a 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1588,7 +1571,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1631,6 +1614,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Reembolso del proveedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código de caso"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1668,7 +1657,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Sin impuestos"
@@ -1801,6 +1789,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1821,115 +1815,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2038,6 +1928,11 @@ msgstr "Estos periodos se pueden superponer."
 msgid "Draft statement"
 msgstr "Extracto en borrador"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2066,26 +1961,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2093,16 +1987,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2113,8 +2007,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2159,7 +2053,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2259,7 +2153,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2618,7 +2512,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Dejar vacío para todos los años fiscales abiertos"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2636,7 +2530,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2657,7 +2551,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2665,14 +2559,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Términos de Pago"
 
@@ -2698,18 +2590,6 @@ msgstr "Tilde esta casilla"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Abierto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2721,6 +2601,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2798,25 +2683,20 @@ msgid "Account Model Entries"
 msgstr "Asientos Modelo de Cuenta"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "GASTO"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impuestos del proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2839,7 +2719,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2854,9 +2733,8 @@ msgstr ""
 "vencimiento, por ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2886,6 +2764,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impuestos"
 
@@ -2921,14 +2800,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3025,6 +2904,12 @@ msgstr "Pagado/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código de reintegro base"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3077,11 +2962,6 @@ msgstr "Balance de comprobación de partner"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3122,7 +3002,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3135,7 +3015,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3151,15 +3031,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3167,7 +3047,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3229,8 +3109,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3278,12 +3159,6 @@ msgstr "Importe de código base"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3317,7 +3192,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3344,7 +3219,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3416,7 +3291,7 @@ msgstr ""
 "Las transacciones entrantes siempre utilizan el tipo de cambio a la fecha."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3428,9 +3303,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Núm. de dígitos a usar para el código de cuenta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nombre de línea"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3479,11 +3354,11 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
-msgstr "BANCO"
+msgstr "BNC"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -3500,15 +3375,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Archivo electrónico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3516,9 +3396,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3644,12 +3603,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3664,7 +3626,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No hay partner definido !"
@@ -3864,7 +3826,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3888,7 +3850,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4026,7 +3988,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan de cuentas"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4113,9 +4075,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "En Litigio"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4200,11 +4165,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4222,11 +4182,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4271,8 +4226,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4302,7 +4257,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4334,11 +4289,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4428,6 +4378,13 @@ msgstr "30 días fin de mes"
 msgid "Analytic Balance"
 msgstr "Balance analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4447,6 +4404,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4457,11 +4419,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4470,11 +4427,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4498,19 +4450,8 @@ msgid "Account Type"
 msgstr "Tipo de Cuenta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4532,8 +4473,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4562,7 +4514,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4573,8 +4525,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4598,6 +4550,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4610,7 +4567,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4632,7 +4589,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4687,11 +4644,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4721,10 +4673,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura de proveedor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4792,10 +4743,14 @@ msgstr "Notas de Crédito"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4844,7 +4799,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4859,7 +4814,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4884,11 +4839,6 @@ msgstr ""
 msgid "Change"
 msgstr "Cambiar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4911,11 +4861,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4926,11 +4871,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejar vacío para usar la cuenta de ingresos"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4940,7 +4880,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5014,16 +4954,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5134,6 +5069,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagado"
 
@@ -5160,7 +5096,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5175,14 +5111,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5195,7 +5123,7 @@ msgid "Tax Application"
 msgstr "Aplicación de impuesto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5228,9 +5156,9 @@ msgid "End of period"
 msgstr "Fin del período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles del banco"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5323,14 +5251,6 @@ msgstr "Descripción del Impuesto"
 msgid "Child Tax Accounts"
 msgstr "Cuentas de impuestos hijas"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5377,7 +5297,7 @@ msgid "Target Moves"
 msgstr "Movimientos destino"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5413,6 +5333,7 @@ msgid "Python Code (reverse)"
 msgstr "Código Python (inverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5426,12 +5347,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5457,18 +5372,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nombre interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5507,7 +5417,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5540,7 +5450,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Código de Cálculo (si tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5567,6 +5477,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5667,7 +5578,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5698,7 +5609,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5734,10 +5645,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Abierto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5767,9 +5684,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Reembolso al Cliente"
 
@@ -5786,11 +5701,6 @@ msgstr "Signo del código de impuesto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5807,6 +5717,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5895,8 +5806,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5919,6 +5828,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5926,15 +5842,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"El campo secuencia se utiliza para ordenar las líneas de términos de pago en "
-"orden ascendente."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5992,12 +5899,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Monto fijo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6021,7 +5927,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "El método de cálculo para el importe impositivo"
 
@@ -6049,18 +5954,23 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Cancelación"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6077,7 +5987,7 @@ msgstr "Ingresos"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -6097,16 +6007,11 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6216,7 +6121,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6263,6 +6168,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Cantidad de días"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6402,7 +6315,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6577,7 +6490,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6608,12 +6521,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6638,7 +6545,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6658,7 +6564,7 @@ msgid "Power"
 msgstr "Potencia"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6703,12 +6609,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referencia de Factura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6727,12 +6638,12 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6799,7 +6710,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6810,9 +6721,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Reembolso de proveedor"
 
@@ -6850,8 +6759,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6930,6 +6842,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6947,7 +6866,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -6965,14 +6884,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6988,10 +6906,9 @@ msgid "Total debit"
 msgstr "Total Debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "El asiento \"%s\" no es válido !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7042,7 +6959,7 @@ msgstr "Crear asiento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7053,13 +6970,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -7096,6 +7014,11 @@ msgstr "Línea de Proyecto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7194,8 +7117,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7275,7 +7198,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7288,6 +7211,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7341,7 +7269,7 @@ msgid "Done"
 msgstr "Finalizado"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7373,9 +7301,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7402,7 +7329,7 @@ msgid "Taxes:"
 msgstr "Impuestos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7599,6 +7526,12 @@ msgstr ""
 "Este campo sólo se usará si desarrolla su propio módulo permitiendo a los "
 "desarrolladores crear impuestos específicos en un dominio a medida"
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referencia de Factura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7688,7 +7621,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7739,7 +7672,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7806,7 +7739,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7817,7 +7750,7 @@ msgid "Invoice Tax"
 msgstr "Impuestos sobre Factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "No hay número de pieza !"
@@ -7856,7 +7789,7 @@ msgid "Sales Properties"
 msgstr "Propiedades de venta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7881,7 +7814,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7913,7 +7846,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7931,10 +7864,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Código de caso"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7950,17 +7882,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -7976,7 +7903,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -7988,8 +7915,10 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7998,7 +7927,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8136,15 +8064,14 @@ msgid "Partner Ledger"
 msgstr "Libro del Partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -8212,7 +8139,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8287,7 +8214,7 @@ msgid "Associated Partner"
 msgstr "Partner asociado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primero debe seleccionar un partner !"
@@ -8369,13 +8296,13 @@ msgstr ""
 "antes de calcular los siguientes impuestos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8446,7 +8373,7 @@ msgid "Net Total:"
 msgstr "Total Neto:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8466,15 +8393,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Diario de cancelación"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Este término de pago se utilizará en lugar del predeterminado para el "
-"partner actual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8501,11 +8419,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Importe impuesto/base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8559,6 +8472,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr "Saldo Final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8599,7 +8517,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8622,7 +8540,12 @@ msgid "Account Types"
 msgstr "Tipos de cuentas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8630,8 +8553,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8649,10 +8572,9 @@ msgid "Reconciliation"
 msgstr "Conciliación"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cuenta a cobrar"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Dejar vacío para usar la cuenta de ingresos"
 
 #. module: account
 #: view:account.invoice:0
@@ -8724,7 +8646,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta del partner utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8742,13 +8664,13 @@ msgid "Payment Term Line"
 msgstr "Línea de término de pago"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8777,11 +8699,6 @@ msgstr "Fecha de vencimiento"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadero"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8916,9 +8833,10 @@ msgid "Journal Name"
 msgstr "Nombre del diario"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "El asiento \"%s\" no es válido !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8967,7 +8885,7 @@ msgstr ""
 "moneda."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9028,7 +8946,7 @@ msgid "Reconciled entries"
 msgstr "Asientos conciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9050,7 +8968,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9084,7 +9002,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -9131,7 +9049,7 @@ msgstr ""
 "hijos en lugar del importe total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9146,18 +9064,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Código del diario"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9190,7 +9099,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9256,7 +9165,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9275,7 +9184,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9390,21 +9299,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de períodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: Estado de cuenta del cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9416,8 +9315,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9437,14 +9337,14 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta a cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9545,8 +9445,8 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9625,11 +9525,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9647,11 +9542,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9688,13 +9588,6 @@ msgstr "Suscripción"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9734,7 +9627,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9823,7 +9722,7 @@ msgid "Unreconciled"
 msgstr "Desconciliada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Total erróneo !"
@@ -9906,7 +9805,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9924,6 +9823,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9979,11 +9883,6 @@ msgstr "Crédito"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9995,7 +9894,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10080,7 +9979,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10403,7 +10302,14 @@ msgid "Empty Accounts ? "
 msgstr "¿Cuentas vacías? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10528,7 +10434,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10655,7 +10561,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10762,7 +10668,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10807,7 +10713,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Impuestos de factura manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10886,14 +10792,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10952,6 +10850,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr "Cuenta de gastos en plantilla producto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11016,9 +10919,6 @@ msgstr ""
 #~ "¡Compruebe el importe de la factura!\n"
 #~ "El importe total real no concuerda con el total calculado."
 
-#~ msgid "Fixed"
-#~ msgstr "Fijo"
-
 #~ msgid "Accounting Entries-"
 #~ msgstr "Asientos contables-"
 
@@ -11073,6 +10973,10 @@ msgstr ""
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de proveedor"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Estadística de asientos analíticos"
 
@@ -11085,6 +10989,9 @@ msgstr ""
 #~ msgid "Line"
 #~ msgstr "Línea"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Mvt"
 #~ msgstr "Movimiento"
 
@@ -11200,6 +11107,13 @@ msgstr ""
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Código del cálculo para precios con impuestos incluídos"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "El campo secuencia se utiliza para ordenar las líneas de términos de pago en "
+#~ "orden ascendente."
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Imprimir diarios analíticos"
 
@@ -11235,6 +11149,9 @@ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
 
+#~ msgid "Line Name"
+#~ msgstr "Nombre de línea"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Seleccionar facturas que desea pagar y gestionar anticipos"
 
@@ -11252,6 +11169,13 @@ msgstr ""
 #~ msgid "Customer Credit"
 #~ msgstr "Crédito del cliente"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Si se desconcilian transacciones, se deben verificar que todas las acciones "
+#~ "que están enlazadas a dichas transacciones, porque no se han desactivado"
+
 #~ msgid "Value Amount"
 #~ msgstr "Importe"
 
@@ -12120,6 +12044,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Omitir el estado 'Borrador ' para los asientos creados"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Definición de diario analítico"
 
@@ -12230,6 +12157,9 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesamiento periódico"
+
 #~ msgid "Contact"
 #~ msgstr "Contacto"
 
@@ -12275,6 +12205,9 @@ msgstr ""
 #~ msgid "Date Invoiced"
 #~ msgstr "Fecha de facturación"
 
+#~ msgid "Litigation"
+#~ msgstr "En Litigio"
+
 #~ msgid "Readonly"
 #~ msgstr "Sólo-Lectura"
 
@@ -12441,6 +12374,13 @@ msgstr ""
 #~ msgstr ""
 #~ "¡Impuestos globales definidos, pero no están en líneas de la factura!"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Este término de pago se utilizará en lugar del predeterminado para el "
+#~ "partner actual."
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index acdc640b9e7..0c186ad0c37 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-30 18:55+0000\n"
 "Last-Translator: doingit translator <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:28+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,16 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +129,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +153,7 @@ msgid "Warning!"
 msgstr "¡Atención!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -241,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -261,6 +240,11 @@ msgstr "Los asientos contables son una entrada de la conciliación."
 msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -390,11 +374,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -449,6 +428,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -464,6 +448,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -625,13 +614,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "cada tres meses"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -680,7 +662,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -691,13 +673,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -760,6 +742,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -782,6 +769,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -802,6 +795,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -844,7 +838,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -867,24 +861,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -915,11 +903,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -950,7 +933,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -965,6 +948,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -996,11 +980,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1036,7 +1017,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1107,10 +1088,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1186,8 +1167,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1233,7 +1215,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1529,9 +1511,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1545,7 +1527,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1600,7 +1582,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1643,6 +1625,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1680,7 +1668,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1813,6 +1800,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1833,115 +1826,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2050,6 +1939,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2078,26 +1972,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2105,16 +1998,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2125,8 +2018,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2171,7 +2064,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2271,7 +2164,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2630,7 +2523,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2648,7 +2541,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2669,7 +2562,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2677,14 +2570,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2710,18 +2601,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2733,6 +2612,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2810,24 +2694,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impuestos proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2851,7 +2730,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2861,9 +2739,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2893,6 +2770,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2928,14 +2806,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3032,6 +2910,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3084,11 +2968,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3129,7 +3008,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3142,7 +3021,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3158,15 +3037,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3174,7 +3053,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3236,8 +3115,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3284,12 +3164,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3323,7 +3197,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3350,7 +3224,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3416,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3428,8 +3302,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3479,7 +3353,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3500,14 +3374,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3516,9 +3395,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3644,12 +3602,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3664,7 +3625,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3864,7 +3825,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3888,7 +3849,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4024,7 +3985,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4109,8 +4070,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4194,11 +4158,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4216,11 +4175,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4265,8 +4219,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4296,7 +4250,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4328,11 +4282,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4422,6 +4371,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4441,6 +4397,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4451,11 +4412,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4464,11 +4420,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4492,19 +4443,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4526,8 +4466,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4556,7 +4507,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4567,8 +4518,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4592,6 +4543,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4604,7 +4560,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4626,7 +4582,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4681,11 +4637,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4715,9 +4666,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4786,10 +4736,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4838,7 +4792,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4853,7 +4807,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4878,11 +4832,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4905,11 +4854,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4920,11 +4864,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4934,7 +4873,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5008,16 +4947,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5128,6 +5062,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5154,7 +5089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5169,14 +5104,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5189,7 +5116,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5222,8 +5149,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5317,14 +5244,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5369,7 +5288,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5405,6 +5324,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5418,12 +5338,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5449,18 +5363,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5499,7 +5408,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5532,7 +5441,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5559,6 +5468,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5659,7 +5569,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5687,7 +5597,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5723,9 +5633,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5756,9 +5672,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5775,11 +5689,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5796,6 +5705,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5884,8 +5794,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5908,6 +5816,13 @@ msgstr "Texto normal"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5915,13 +5830,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5979,12 +5887,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6008,7 +5915,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6036,18 +5942,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6064,7 +5975,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6084,16 +5995,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6203,7 +6109,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6250,6 +6156,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6389,7 +6303,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6565,7 +6479,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6596,12 +6510,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6626,7 +6534,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6646,7 +6553,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6693,12 +6600,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6714,12 +6626,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6786,7 +6698,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6797,9 +6709,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6837,8 +6747,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6915,6 +6828,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6932,7 +6852,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6950,14 +6870,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6973,9 +6892,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7025,7 +6943,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7036,13 +6954,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7079,6 +6998,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7177,8 +7101,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7258,7 +7182,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7271,6 +7195,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7324,7 +7253,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7356,9 +7285,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7385,7 +7313,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7577,6 +7505,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7666,7 +7600,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7717,7 +7651,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7784,7 +7718,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7795,7 +7729,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7834,7 +7768,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7859,7 +7793,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7891,7 +7825,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7909,9 +7843,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7928,17 +7861,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7954,7 +7882,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7966,8 +7894,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7976,7 +7906,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8108,15 +8037,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8184,7 +8112,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8259,7 +8187,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8341,13 +8269,13 @@ msgstr ""
 "de calcular los siguientes impuestos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8418,7 +8346,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8438,13 +8366,6 @@ msgstr "Informes genéricos"
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8471,11 +8392,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8529,6 +8445,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8569,7 +8490,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8592,7 +8513,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8600,8 +8526,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8619,9 +8545,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8701,7 +8626,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8719,13 +8644,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8754,11 +8679,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8893,8 +8813,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8940,7 +8861,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9001,7 +8922,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9023,7 +8944,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9057,7 +8978,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9102,7 +9023,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9117,18 +9038,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9161,7 +9073,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9227,7 +9139,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9246,7 +9158,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9361,21 +9273,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9387,8 +9289,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9408,14 +9311,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9516,8 +9419,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9594,11 +9497,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9616,11 +9514,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9657,13 +9560,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9703,7 +9599,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9792,7 +9694,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9875,7 +9777,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9893,6 +9795,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9946,11 +9853,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9962,7 +9864,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10047,7 +9949,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10370,7 +10272,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10495,7 +10404,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10622,7 +10531,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10728,7 +10637,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10773,7 +10682,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10852,14 +10761,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10918,6 +10819,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10946,9 +10852,15 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negativo"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Field Name"
 #~ msgstr "Nombre del Campo"
 
@@ -10971,6 +10883,14 @@ msgstr ""
 #~ msgid "Account currency"
 #~ msgstr "Moneda contable"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porqué no serán "
+#~ "deshabilitadas."
+
 #~ msgid "Choose Fiscal Year "
 #~ msgstr "Seleccione el ejercicio fiscal "
 
diff --git a/addons/account/i18n/es_CR.po b/addons/account/i18n/es_CR.po
index c3599a81548..61f2c741ed8 100644
--- a/addons/account/i18n/es_CR.po
+++ b/addons/account/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 15:33+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:28+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,16 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +129,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +153,7 @@ msgid "Warning!"
 msgstr "¡Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -241,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "contabilidad.impuesto"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -261,6 +240,11 @@ msgstr "Los asientos contables son una entrada de la conciliación."
 msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +379,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "cuenta.impuesto.plantilla"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -454,6 +433,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -469,6 +453,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plantilla plan contable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -630,16 +619,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si rompe la conciliación de las transacciones, también debe verificar todas "
-"las acciones que están relacionadas con estas transacciones, ya que no se "
-"desactivarán."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -688,7 +667,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -700,13 +679,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Informe de las ventas por tipo de cuenta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VEN"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -769,6 +748,11 @@ msgstr "Cuentas por Cobrar"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -793,6 +777,12 @@ msgstr "Reabrir"
 msgid "Are you sure you want to create entries?"
 msgstr "¿Está seguro que desea crear los asientos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -813,6 +803,7 @@ msgstr "Mostrar hijos con jerarquía"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaje"
 
@@ -855,7 +846,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -878,25 +869,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Facturas y abonos de proveedor"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "No conciliación"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"2 por ciento en 14 días netos, la cantidad restante a 30 días fin de mes"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -927,11 +911,6 @@ msgstr "C.Diario / Nombre mov."
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -962,7 +941,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -977,6 +956,7 @@ msgstr "Nueva suscripción"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Cálculo"
 
@@ -1008,11 +988,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1048,7 +1025,7 @@ msgid "Liability"
 msgstr "Pasivo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1123,10 +1100,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1204,8 +1181,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1251,7 +1229,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1549,9 +1527,9 @@ msgid "Account Receivable"
 msgstr "Cuenta por Cobrar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1565,7 +1543,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con balance si no es igual a 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1620,7 +1598,7 @@ msgstr "Omitir estado 'Borrador' para asientos manuales."
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1664,6 +1642,12 @@ msgstr "Una tabla temporal utilizada para la vista de tablero"
 msgid "Supplier Refunds"
 msgstr "Facturas rectificativas de proveedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1701,7 +1685,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Base"
@@ -1834,6 +1817,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Ventas por tipo de cuenta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1854,115 +1843,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2073,6 +1958,11 @@ msgstr "Estos períodos se pueden solapar."
 msgid "Draft statement"
 msgstr "Extracto borrador"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2101,26 +1991,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2128,16 +2017,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2148,8 +2037,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2194,7 +2083,7 @@ msgid "period close"
 msgstr "cierre periodo"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2294,7 +2183,7 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2665,7 +2554,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2683,7 +2572,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2704,7 +2593,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2714,14 +2603,12 @@ msgstr ""
 "los apuntes contables relacionados."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
@@ -2747,18 +2634,6 @@ msgstr "Marque esta opción"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Abierto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2770,6 +2645,11 @@ msgstr "Estado borrador de una factura"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2849,25 +2729,20 @@ msgid "Account Model Entries"
 msgstr "Contabilidad. Líneas de modelo"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "COMPRA"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impuestos proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "entradas"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2890,7 +2765,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2905,9 +2779,8 @@ msgstr ""
 "ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2937,6 +2810,7 @@ msgstr "Reconcilia linea de asiento (desajuste)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -2972,14 +2846,14 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3078,6 +2952,12 @@ msgstr "Pagado/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código base reintegro"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extractos bancarios"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3130,11 +3010,6 @@ msgstr "Saldos vencidos de empresa"
 msgid "Accounting entries"
 msgstr "Asientos contables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tipo de comunicación"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3180,7 +3055,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3193,7 +3068,7 @@ msgid "Sales by Account"
 msgstr "Ventas por cuenta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3209,15 +3084,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3225,7 +3100,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3290,9 +3165,10 @@ msgstr ""
 "para algunos informes."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Línea 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3341,12 +3217,6 @@ msgstr "Importe código base"
 msgid "Default Sale Tax"
 msgstr "Impuesto de venta por defecto"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factura '%s' es validada."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3383,7 +3253,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3410,7 +3280,7 @@ msgid "Trial Balance"
 msgstr "Balance de sumas y saldos"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3482,7 +3352,7 @@ msgstr ""
 "transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3494,9 +3364,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Núm. de dígitos a usar para código de cuenta."
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nombre línea"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3545,7 +3415,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3566,15 +3436,20 @@ msgstr "Facturas proforma"
 msgid "Electronic File"
 msgstr "Archivo electrónico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Día del mes: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3582,9 +3457,88 @@ msgid "Account Partner Ledger"
 msgstr "Contabilidad. Libro mayor empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3722,12 +3676,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Importe: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
+"que el extracto. Esto permite que los asientos del extracto tengan las "
+"mismas referencias que el extracto en sí"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3742,7 +3702,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡No se ha definido empresa!"
@@ -3946,7 +3906,7 @@ msgid "Period Length (days)"
 msgstr "Longitud del periodo (días)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3970,7 +3930,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4108,7 +4068,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4198,9 +4158,15 @@ msgid "Qty"
 msgstr "Cantidad"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Desacuerdo"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
+"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
+"desea sumar/restar el importe."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4284,11 +4250,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4306,11 +4267,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Configurar sus cuentas bancarias"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4357,8 +4313,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4388,7 +4344,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4426,11 +4382,6 @@ msgstr ""
 msgid "title"
 msgstr "título"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4520,6 +4471,13 @@ msgstr "30 días fin de mes"
 msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4540,6 +4498,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Asientos validados/asentados"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4550,11 +4513,6 @@ msgstr "Buscar plantillas impuestos"
 msgid "Draft Entries"
 msgstr "Asientos borrador"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dia del mes = -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4563,11 +4521,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Número de días: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4591,20 +4544,9 @@ msgid "Account Type"
 msgstr "Tipo de cuenta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Cerrar caja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4628,9 +4570,20 @@ msgstr ""
 "proveedor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Cerrar caja"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4658,7 +4611,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4669,8 +4622,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4694,6 +4647,11 @@ msgstr "Cuenta Paypal"
 msgid "Acc.Type"
 msgstr "Tipo cuenta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4706,7 +4664,7 @@ msgstr "Invertir signo del balance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balance (Cuenta de pasivo)"
@@ -4728,7 +4686,7 @@ msgid "Account Base Code"
 msgstr "Código base cuenta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4783,11 +4741,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4817,10 +4770,9 @@ msgid "Account chart"
 msgstr "Plan contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura de proveedor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4888,10 +4840,14 @@ msgstr "Abonos"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4944,7 +4900,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4959,7 +4915,7 @@ msgid "Based On"
 msgstr "Basado en"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ACOMPRA"
@@ -4984,11 +4940,6 @@ msgstr ""
 msgid "Change"
 msgstr "Cambiar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5011,11 +4962,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Ejemplo"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5026,11 +4972,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5040,7 +4981,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impuesto de compra %2f%%"
@@ -5114,16 +5055,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "Varios"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5237,6 +5173,7 @@ msgstr "Añadir"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagado"
 
@@ -5263,7 +5200,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Periodo de apertura"
@@ -5278,14 +5215,6 @@ msgstr "Asientos a revisar"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5298,7 +5227,7 @@ msgid "Tax Application"
 msgstr "Aplicación impuesto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5331,9 +5260,9 @@ msgid "End of period"
 msgstr "Fin del período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles del banco"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pago de facturas"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5429,14 +5358,6 @@ msgstr "Descripción impuesto"
 msgid "Child Tax Accounts"
 msgstr "Cuentas impuestos hijas"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5483,7 +5404,7 @@ msgid "Target Moves"
 msgstr "Movimientos destino"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5519,6 +5440,7 @@ msgid "Python Code (reverse)"
 msgstr "Código Python (inverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5536,12 +5458,6 @@ msgstr ""
 "selección asume que el conjunto de impuestos definido en esta plantilla está "
 "completo."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5567,18 +5483,13 @@ msgstr "Año"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Línea 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nombre interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5617,7 +5528,7 @@ msgstr "Balance de situación"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Pérdidas y ganancias (Cuenta de ingresos)"
@@ -5650,7 +5561,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Código para calcular (si tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5677,6 +5588,7 @@ msgstr "Conciliación automática"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5780,7 +5692,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5810,7 +5722,7 @@ msgid "Amount Computation"
 msgstr "Calculo importe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5846,10 +5758,16 @@ msgid "Account Common Account Report"
 msgstr "Contabilidad. Informe contable común"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicación"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Abierto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5879,9 +5797,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Factura rectificativa de cliente"
 
@@ -5898,11 +5814,6 @@ msgstr "Signo código impuesto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Informe de facturas creadas en los últimos 15 días"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Numero de días: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5919,6 +5830,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Cantidad a pagar"
@@ -6010,8 +5922,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6034,6 +5944,13 @@ msgstr "Texto normal"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Asientos de pago son la segunda entrada para la conciliación."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6043,15 +5960,6 @@ msgstr ""
 "La potencia de la conciliación automática a seleccionar es el número de los "
 "importes parciales que se pueden combinar para encontrar un saldo a cero."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"El campo secuencia es usado para ordenar las líneas de plazos de pago en "
-"orden ascendente."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6109,12 +6017,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Importe fijo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6138,7 +6045,6 @@ msgstr "Generar asientos apertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "El método de cálculo del importe del impuesto."
 
@@ -6166,18 +6072,23 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nombre del movimiento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "entradas"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6194,7 +6105,7 @@ msgstr "Ingreso"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -6214,16 +6125,11 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valoración"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6338,7 +6244,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "¡Tiene una expressión errónea \"%(...)s\" en su modelo!"
@@ -6386,6 +6292,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Número de días"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6529,7 +6443,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6709,7 +6623,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6740,12 +6654,6 @@ msgstr ""
 msgid "Current"
 msgstr "Actual"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6770,7 +6678,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -6790,7 +6697,7 @@ msgid "Power"
 msgstr "Fuerza"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "No puede generar un código de diario que no ha sido usado"
@@ -6837,12 +6744,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referencia factura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6861,12 +6773,12 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6941,7 +6853,7 @@ msgid "Optional create"
 msgstr "Crear opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6954,9 +6866,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Factura rectificativa de proveedor"
 
@@ -6994,9 +6904,12 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Valoración: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7074,6 +6987,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Transacciones de caja"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7091,7 +7011,7 @@ msgstr "Estadísticas asientos analíticos"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -7109,14 +7029,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balance (Cuenta activos)"
@@ -7132,10 +7051,9 @@ msgid "Total debit"
 msgstr "Total debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "¡El asiento \"%s\" no es válido!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Próximos asientos de cliente para conciliar"
 
 #. module: account
 #: report:account.invoice:0
@@ -7188,7 +7106,7 @@ msgstr "Crear asiento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Pérdidas y ganancias (cuenta de gastos)"
@@ -7199,13 +7117,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -7242,6 +7161,11 @@ msgstr "Línea de proyecto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7348,8 +7272,8 @@ msgstr "Seleccionar diario"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo de apertura"
@@ -7431,7 +7355,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7451,6 +7375,11 @@ msgstr ""
 "%(date)s: Fecha actual\n"
 "Ejemplo: Mi modelo del %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7504,7 +7433,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7543,9 +7472,8 @@ msgid "Source Document"
 msgstr "Documento origen"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7572,7 +7500,7 @@ msgid "Taxes:"
 msgstr "Impuestos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7770,6 +7698,12 @@ msgstr ""
 "desarrolladores crear impuestos específicos en una configuración "
 "personalizada."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referencia factura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7862,7 +7796,7 @@ msgid "Use model"
 msgstr "Usar modelo"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7913,7 +7847,7 @@ msgid "Root/View"
 msgstr "Raíz/Vista"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7982,7 +7916,7 @@ msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7993,7 +7927,7 @@ msgid "Invoice Tax"
 msgstr "Impuesto de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "¡Ningún trozo de número!"
@@ -8037,7 +7971,7 @@ msgid "Sales Properties"
 msgstr "Propiedades de venta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8062,7 +7996,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustes de moneda"
@@ -8096,7 +8030,7 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8117,10 +8051,9 @@ msgstr ""
 "baja a la más alta"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Código"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8136,17 +8069,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Asentar asientos"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8162,7 +8090,7 @@ msgstr "Nombre del informe"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -8174,9 +8102,11 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pago de facturas"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8184,7 +8114,6 @@ msgstr "Pago de facturas"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8322,15 +8251,14 @@ msgid "Partner Ledger"
 msgstr "Libro mayor de empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -8398,7 +8326,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda a aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "¡No hay líneas de factura!"
@@ -8478,7 +8406,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "¡Primero debe seleccionar una empresa!"
@@ -8560,13 +8488,13 @@ msgstr ""
 "de calcular los siguientes impuestos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de abono de compras"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8639,7 +8567,7 @@ msgid "Net Total:"
 msgstr "Base:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8659,15 +8587,6 @@ msgstr "Informes genéricos"
 msgid "Write-Off Journal"
 msgstr "Diario de desajuste"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
-"empresa actual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8694,11 +8613,6 @@ msgstr "Tipo interno"
 msgid "Tax/Base Amount"
 msgstr "Importe impuestos/base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Valoración: Porcentaje"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8752,6 +8666,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr "Saldo final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8794,7 +8713,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Importación automática del extracto bancario"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8817,7 +8736,12 @@ msgid "Account Types"
 msgstr "Tipos de cuentas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8825,9 +8749,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoría Balance / PyG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8844,10 +8768,9 @@ msgid "Reconciliation"
 msgstr "Conciliación"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cuenta por Cobrar"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
 #: view:account.invoice:0
@@ -8926,7 +8849,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Tax %.2f%%"
@@ -8944,13 +8867,13 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8979,11 +8902,6 @@ msgstr "Fecha vencimiento"
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadero"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9120,9 +9038,10 @@ msgid "Journal Name"
 msgstr "Nombre del diario"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Próximos asientos de cliente para conciliar"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "¡El asiento \"%s\" no es válido!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9171,7 +9090,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9235,7 +9154,7 @@ msgid "Reconciled entries"
 msgstr "Asientos conciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "¡Modelo erroneo!"
@@ -9257,7 +9176,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprimir balance contable de empresa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9296,7 +9215,7 @@ msgstr "desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -9343,7 +9262,7 @@ msgstr ""
 "hijos en lugar del importe total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9358,21 +9277,9 @@ msgstr "Calculado por código Python"
 msgid "Journal Code"
 msgstr "Código diario"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
-"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
-"desea sumar/restar el importe."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Importe residual"
 
@@ -9405,7 +9312,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de abono de ventas"
@@ -9471,7 +9378,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impuesto compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Cree algunas líneas de factura"
@@ -9490,7 +9397,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalles"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "AVENTA"
@@ -9608,21 +9515,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de periodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría Balance / PyG"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9634,8 +9531,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9655,14 +9553,14 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta por Cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9763,8 +9661,8 @@ msgid "Move"
 msgstr "Asiento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9844,11 +9742,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9866,11 +9759,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9907,13 +9805,6 @@ msgstr "Asientos periódicos"
 msgid "Account Analytic Balance"
 msgstr "Contabilidad. Saldo analítico"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9953,7 +9844,13 @@ msgid "Due date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10050,7 +9947,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "¡Total erróneo!"
@@ -10142,7 +10039,7 @@ msgid "Comparison"
 msgstr "Comparación"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10160,6 +10057,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10215,11 +10117,6 @@ msgstr "Haber"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10231,7 +10128,7 @@ msgid "Journal Entry Model"
 msgstr "Modelo de asiento"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10316,7 +10213,7 @@ msgid "Profit (Loss) to report"
 msgstr "Beneficio (pérdida) para informe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10645,7 +10542,14 @@ msgid "Empty Accounts ? "
 msgstr "¿Cuentas vacías? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10771,7 +10675,7 @@ msgid "Receivable accounts"
 msgstr "Cuentas por Cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10905,7 +10809,7 @@ msgid "Entries Sorted by"
 msgstr "Entradas ordenadas por"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11012,7 +10916,7 @@ msgid "Accounting Documents"
 msgstr "Documentos contables"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11058,7 +10962,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Impuestos factura manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11139,17 +11043,6 @@ msgstr ""
 msgid "February"
 msgstr "Febrero"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
-"que el extracto. Esto permite que los asientos del extracto tengan las "
-"mismas referencias que el extracto en sí"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11208,6 +11101,11 @@ msgstr "Mapeo fiscal de modelo de cuenta"
 msgid "Expense Account on Product Template"
 msgstr "Cuenta de gastos en plantilla producto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11246,6 +11144,14 @@ msgstr ""
 #~ msgid "Children Definition"
 #~ msgstr "Definición hijos"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porqué no serán "
+#~ "deshabilitadas."
+
 #~ msgid ""
 #~ "Configuration error! The currency chosen should be shared by the default "
 #~ "accounts too."
@@ -11266,6 +11172,9 @@ msgstr ""
 #~ msgid "Journal: %s"
 #~ msgstr "Diario: %s"
 
+#~ msgid "account.tax"
+#~ msgstr "contabilidad.impuesto"
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -11321,6 +11230,9 @@ msgstr ""
 #~ "OpenERP. Cuando utiliza los extractos bancarios, registros de caja, o pagos "
 #~ "de cliente/proveedor OpenERP crea automáticamente apuntes contables."
 
+#~ msgid "account.tax.template"
+#~ msgstr "cuenta.impuesto.plantilla"
+
 #~ msgid "Fiscal Year to Open"
 #~ msgstr "Ejercicio fiscal a abrir"
 
@@ -11362,6 +11274,14 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Nombre dirección factura"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Si rompe la conciliación de las transacciones, también debe verificar todas "
+#~ "las acciones que están relacionadas con estas transacciones, ya que no se "
+#~ "desactivarán."
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 Días   "
 
@@ -11378,6 +11298,10 @@ msgstr ""
 #~ msgid "You can only change currency for Draft Invoice !"
 #~ msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "2 por ciento en 14 días netos, la cantidad restante a 30 días fin de mes"
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -11721,6 +11645,9 @@ msgstr ""
 #~ "¡Necesita un diario de apertura con la casilla 'Centralización' marcada para "
 #~ "establecer el balance inicial!"
 
+#~ msgid "Line 2:"
+#~ msgstr "Línea 2:"
+
 #~ msgid "Required"
 #~ msgstr "Requerido"
 
@@ -11732,18 +11659,28 @@ msgstr ""
 #~ "No puede borrar una factura que está abierta o pagada. Le sugerimos que la "
 #~ "abone en su lugar."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factura '%s' es validada."
+
 #~ msgid "Cash Transaction"
 #~ msgstr "Transición de caja"
 
 #~ msgid "Bank account"
 #~ msgstr "Cuenta bancaria"
 
+#~ msgid "Line Name"
+#~ msgstr "Nombre línea"
+
 #~ msgid "Month-1"
 #~ msgstr "Mes-1"
 
 #~ msgid "Customer Credit"
 #~ msgstr "Haber del cliente"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Día del mes: 0"
+
 #~ msgid "Starts on"
 #~ msgstr "Empieza en"
 
@@ -11760,6 +11697,9 @@ msgstr ""
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "No hay ningún diario de cierre definido para el ejercicio fiscal"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Importe: 0.02"
+
 #~ msgid "Accounting Dashboard"
 #~ msgstr "Tablero de contabilidad"
 
@@ -11796,6 +11736,9 @@ msgstr ""
 #~ msgid "Contact Address Name"
 #~ msgstr "Nombre dirección contacto"
 
+#~ msgid "Litigation"
+#~ msgstr "Desacuerdo"
+
 #~ msgid "Account balance"
 #~ msgstr "Balance contable"
 
@@ -11826,6 +11769,12 @@ msgstr ""
 #~ "Imprime informe con la columna de la moneda si la moneda es distinta de la "
 #~ "moneda de la compañía."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dia del mes = -1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Número de días: 30"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Error! La fecha de inicio del año fiscal debe ser anterior a la fecha final "
@@ -11872,6 +11821,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Impuestos por defecto"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesamiento periódico"
+
 #~ msgid "You can not create analytic line on view account."
 #~ msgstr "No puede crear una línea analítica en una cuenta vista"
 
@@ -11912,9 +11864,15 @@ msgstr ""
 #~ msgid "4"
 #~ msgstr "4"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco y cheques"
+
 #~ msgid "Closing balance based on cashBox"
 #~ msgstr "Saldo de cierre basado en la caja."
 
+#~ msgid "Example"
+#~ msgstr "Ejemplo"
+
 #, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
@@ -12023,6 +11981,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Apertura caja"
 
+#~ msgid "Line 1:"
+#~ msgstr "Línea 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "¡Error de integridad!"
@@ -12046,6 +12007,9 @@ msgstr ""
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Estadística de asientos analíticos"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "¡Error de configuración!"
@@ -12064,6 +12028,13 @@ msgstr ""
 #~ msgid "Refund Invoice Options"
 #~ msgstr "Opciones factura rectificativa (abono)"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "El campo secuencia es usado para ordenar las líneas de plazos de pago en "
+#~ "orden ascendente."
+
 #~ msgid ""
 #~ "If no additional entries should be recorded on a fiscal year, you can close "
 #~ "it from here. It will close all opened periods in this year that will make "
@@ -12092,6 +12063,9 @@ msgstr ""
 #~ msgid "VAT"
 #~ msgstr "IVA"
 
+#~ msgid "Valuation"
+#~ msgstr "Valoración"
+
 #~ msgid "Invoice Address"
 #~ msgstr "Dirección de factura"
 
@@ -12354,9 +12328,6 @@ msgstr ""
 #~ msgid "    7 Days    "
 #~ msgstr "    7 Días    "
 
-#~ msgid "Fixed"
-#~ msgstr "Fijo"
-
 #, python-format
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "No se puede %s factura borrador/proforma/cancelada."
@@ -12397,6 +12368,13 @@ msgstr ""
 #~ "Modificar factura: Cancela la factura actual y crea una nueva copia "
 #~ "preparada para editar."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Este plazo de pago se utilizará en lugar del plazo por defecto para la "
+#~ "empresa actual."
+
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Código para el cálculo de los impuestos en precios incluidos"
 
@@ -12807,6 +12785,10 @@ msgstr ""
 #~ "Confirmar extracto bancario con/sin conciliación a partir del extracto "
 #~ "borrador"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de proveedor"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Pago conciliado"
 
@@ -14884,6 +14866,9 @@ msgstr ""
 #~ "¡No puede realizaar esto en un asiento confirmado! ¡Solo puede cambiar "
 #~ "algunos campos no legales o debe primero pasar a borrador el asiento! %s"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+
 #~ msgid "Analytic Accounts with a past deadline."
 #~ msgstr "Cuentas analíticas con fecha de fin en el pasado"
 
@@ -14893,6 +14878,9 @@ msgstr ""
 #~ msgid "Analytic Entries during last 7 days"
 #~ msgstr "Asientos analíticos en los últimos 7 días."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Numero de días: 14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Esta acción borrará impuestos"
 
@@ -14928,6 +14916,9 @@ msgstr ""
 #~ "No puede borrar/desactivar una cuenta que está asociada a un cliente o un "
 #~ "proveedor"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Valoración: Balance"
+
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
 
@@ -15068,6 +15059,12 @@ msgstr ""
 #~ "¡No hay periodo definido para esta fecha: %s!\n"
 #~ "Por favor cree uno."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Value amount: n.a"
+
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Valoración: Porcentaje"
+
 #, python-format
 #~ msgid ""
 #~ "You can not cancel an invoice which is partially paid! You need to "
diff --git a/addons/account/i18n/es_DO.po b/addons/account/i18n/es_DO.po
index 83509bddcf4..01f7d165273 100644
--- a/addons/account/i18n/es_DO.po
+++ b/addons/account/i18n/es_DO.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 20:54+0000\n"
 "Last-Translator: Jose Ernesto Mendez <tecnologia@obsdr.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:28+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,16 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total Debito"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porque no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +129,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +153,7 @@ msgid "Warning!"
 msgstr "¡Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -238,11 +222,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -258,6 +237,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -384,11 +368,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -443,6 +422,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -458,6 +442,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -619,13 +608,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -674,7 +656,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -685,13 +667,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -754,6 +736,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -776,6 +763,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -796,6 +789,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -838,7 +832,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -861,24 +855,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -909,11 +897,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -944,7 +927,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -959,6 +942,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -990,11 +974,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1030,7 +1011,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1101,10 +1082,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1180,8 +1161,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1227,7 +1209,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1523,9 +1505,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1539,7 +1521,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1594,7 +1576,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1637,6 +1619,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1674,7 +1662,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1807,6 +1794,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1827,115 +1820,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2044,6 +1933,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2072,26 +1966,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2099,16 +1992,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2119,8 +2012,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2165,7 +2058,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2265,7 +2158,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2624,7 +2517,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2642,7 +2535,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2663,7 +2556,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2671,14 +2564,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2704,18 +2595,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2727,6 +2606,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2804,24 +2688,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2845,7 +2724,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2855,9 +2733,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2887,6 +2764,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2922,14 +2800,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3026,6 +2904,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3078,11 +2962,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3123,7 +3002,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3136,7 +3015,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3152,15 +3031,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3168,7 +3047,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3230,8 +3109,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3278,12 +3158,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3317,7 +3191,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3344,7 +3218,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3410,7 +3284,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3422,8 +3296,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3473,7 +3347,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3494,14 +3368,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3510,9 +3389,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3638,12 +3596,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3658,7 +3619,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3858,7 +3819,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3882,7 +3843,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4018,7 +3979,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4103,8 +4064,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4188,11 +4152,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4210,11 +4169,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4259,8 +4213,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4290,7 +4244,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4322,11 +4276,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4416,6 +4365,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4435,6 +4391,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4445,11 +4406,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4458,11 +4414,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4486,19 +4437,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4520,8 +4460,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4550,7 +4501,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4561,8 +4512,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4586,6 +4537,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4598,7 +4554,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4620,7 +4576,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4675,11 +4631,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4709,9 +4660,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4780,10 +4730,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4832,7 +4786,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4847,7 +4801,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4872,11 +4826,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4899,11 +4848,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4914,11 +4858,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4928,7 +4867,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5002,16 +4941,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5122,6 +5056,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5148,7 +5083,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5163,14 +5098,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5183,7 +5110,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5216,8 +5143,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5311,14 +5238,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5363,7 +5282,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5399,6 +5318,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5412,12 +5332,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5443,18 +5357,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5493,7 +5402,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5526,7 +5435,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5553,6 +5462,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5653,7 +5563,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5681,7 +5591,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5717,9 +5627,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5750,9 +5666,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5769,11 +5683,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5790,6 +5699,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5878,8 +5788,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5902,6 +5810,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5909,13 +5824,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5973,12 +5881,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6002,7 +5909,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6030,18 +5936,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6058,7 +5969,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6078,16 +5989,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6197,7 +6103,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6244,6 +6150,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6383,7 +6297,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6558,7 +6472,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6589,12 +6503,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6619,7 +6527,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6639,7 +6546,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6684,12 +6591,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6705,12 +6617,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6777,7 +6689,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6788,9 +6700,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6828,8 +6738,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6906,6 +6819,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6923,7 +6843,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6941,14 +6861,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6964,9 +6883,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7016,7 +6934,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7027,13 +6945,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7070,6 +6989,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7168,8 +7092,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7249,7 +7173,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7262,6 +7186,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7315,7 +7244,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7347,9 +7276,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7376,7 +7304,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7568,6 +7496,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7657,7 +7591,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7708,7 +7642,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7775,7 +7709,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7786,7 +7720,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7825,7 +7759,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7850,7 +7784,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7882,7 +7816,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7900,9 +7834,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7919,17 +7852,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7945,7 +7873,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7957,8 +7885,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7967,7 +7897,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8099,15 +8028,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8175,7 +8103,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8250,7 +8178,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8330,13 +8258,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8407,7 +8335,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8427,13 +8355,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8460,11 +8381,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8518,6 +8434,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8558,7 +8479,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8581,7 +8502,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8589,8 +8515,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8608,9 +8534,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8683,7 +8608,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8701,13 +8626,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8736,11 +8661,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8875,8 +8795,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8922,7 +8843,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8983,7 +8904,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9005,7 +8926,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9039,7 +8960,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9084,7 +9005,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9099,18 +9020,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9143,7 +9055,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9209,7 +9121,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9228,7 +9140,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9343,21 +9255,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9369,8 +9271,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9390,14 +9293,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9498,8 +9401,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9576,11 +9479,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9598,11 +9496,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9639,13 +9542,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9685,7 +9581,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9774,7 +9676,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9857,7 +9759,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9875,6 +9777,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9928,11 +9835,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9944,7 +9846,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10029,7 +9931,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10352,7 +10254,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10477,7 +10386,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10604,7 +10513,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10710,7 +10619,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10755,7 +10664,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10834,14 +10743,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10900,6 +10801,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10941,6 +10847,14 @@ msgstr ""
 #~ msgid "Journal: %s"
 #~ msgstr "Diario: %s"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porque no serán "
+#~ "deshabilitadas."
+
 #~ msgid "Account currency"
 #~ msgstr "Moneda contable"
 
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 3d319e403a0..dafda7ff4ba 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 05:27+0000\n"
 "Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
 "<chris.ormaza@gmail.com>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:37+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -32,11 +32,6 @@ msgid ""
 msgstr ""
 "Una posición fiscal solo puede estar definida una vez en las mismas cuentas."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Transacciones no conciliadas"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -85,9 +80,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Cuenta erronea."
@@ -98,15 +93,6 @@ msgstr "Cuenta erronea."
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -119,7 +105,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -150,19 +135,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -174,7 +159,7 @@ msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario General"
@@ -260,11 +245,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "Impuesto"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -280,6 +260,11 @@ msgstr "Lineas contables son la entrada para la conciliación"
 msgid "Belgian Reports"
 msgstr "Reportes de Bélgica"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -417,11 +402,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "Plantilla de Impuestos"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -476,6 +456,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -491,6 +476,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plantilla plan contable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -652,15 +642,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -709,7 +690,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -721,13 +702,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Reporte de ventas por tipo de cuentas"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "DV"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -790,6 +771,11 @@ msgstr "Cuentas por Cobrar"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -814,6 +800,12 @@ msgstr "Reabrir"
 msgid "Are you sure you want to create entries?"
 msgstr "Seguro que quiere crear estos asientos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -834,6 +826,7 @@ msgstr "Mostrar los hijos con herencia"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaje"
 
@@ -876,7 +869,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -899,25 +892,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Factura de Proveedor y Facturas Rectificativas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Romper conciliación"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"2 por ciento en 14 días netos, la cantidad restante a 30 días fin de mes"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -948,11 +934,6 @@ msgstr "J.C./ASiento"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -984,7 +965,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -999,6 +980,7 @@ msgstr "Nueva suscripción"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Cálculo"
 
@@ -1030,11 +1012,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1070,7 +1049,7 @@ msgid "Liability"
 msgstr "Pasivo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Por favor defina la secuencia de diario relacionado ."
@@ -1144,10 +1123,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1225,8 +1204,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1272,7 +1252,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1570,9 +1550,9 @@ msgid "Account Receivable"
 msgstr "Cuenta a cobrar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1586,7 +1566,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con saldo diferente de 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1641,7 +1621,7 @@ msgstr "Saltar estado 'Borrador' para asientos manuales"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1686,6 +1666,12 @@ msgstr "Tabla temporal para vista de tablero"
 msgid "Supplier Refunds"
 msgstr "Nota de Debito"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Codigo de caso"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1723,7 +1709,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Base Imponible"
@@ -1856,6 +1841,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Sales by Account Type"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1876,115 +1867,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2095,6 +1982,11 @@ msgstr "Estos períodos se pueden solapar."
 msgid "Draft statement"
 msgstr "Extractos en borrador"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2123,26 +2015,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2150,16 +2041,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2170,8 +2061,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2216,7 +2107,7 @@ msgid "period close"
 msgstr "Período de Cierre"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2316,7 +2207,7 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2687,7 +2578,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Dejar vacío para todo el ejercicio fiscal"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2705,7 +2596,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Crear una cuenta basada en esta plantilla"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2726,7 +2617,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2736,14 +2627,12 @@ msgstr ""
 "los apuntes contables relacionados."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Término de pago"
 
@@ -2769,18 +2658,6 @@ msgstr "Revisar este cuadro"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Abierto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2792,6 +2669,11 @@ msgstr "Estado borrador de una factura"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2869,25 +2751,20 @@ msgid "Account Model Entries"
 msgstr "Línea de modelo de asiento"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "VENTA"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impuestos proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "entradas"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles de banco"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2910,7 +2787,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2925,9 +2801,8 @@ msgstr ""
 "ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2957,6 +2832,7 @@ msgstr "Reconcilia linea de asiento (desajuste)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -2992,14 +2868,14 @@ msgid "Accounts"
 msgstr "Cuentas contables"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3096,6 +2972,12 @@ msgstr "Pagado/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código base reembolso"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extracto Bancario"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3148,11 +3030,6 @@ msgstr "Saldo de Empresa Vencido"
 msgid "Accounting entries"
 msgstr "Asientos contables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tipo de comunicación"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3198,7 +3075,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3211,7 +3088,7 @@ msgid "Sales by Account"
 msgstr "Ventas por Cuenta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3227,15 +3104,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "You have to define an analytic journal on the '%s' journal!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3243,7 +3120,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3307,9 +3184,10 @@ msgstr ""
 "The quantity is not a legal requirement but is very useful for some reports."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Linea 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3357,12 +3235,6 @@ msgstr "Importe código base"
 msgid "Default Sale Tax"
 msgstr "Impuestos por Defecto en Venta"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factura '%s' es validada."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3399,7 +3271,7 @@ msgid "Fiscal Position"
 msgstr "Tipos de Contribuyentes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3426,7 +3298,7 @@ msgid "Trial Balance"
 msgstr "Balance de Cuenta"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3498,7 +3370,7 @@ msgstr ""
 "Transacciones de entrada siempre utilizan la tasa a una fecha."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3510,9 +3382,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Núm. de dígitos a usar para código de cuenta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nombre línea"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3561,7 +3433,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3582,15 +3454,20 @@ msgstr "Facturas proforma"
 msgid "Electronic File"
 msgstr "Archivo electrónico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Día del mes: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3598,9 +3475,88 @@ msgid "Account Partner Ledger"
 msgstr "Mayor de Cuenta de Empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3737,12 +3693,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Importe: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3757,7 +3719,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No hay Empresa Definida !"
@@ -3961,7 +3923,7 @@ msgid "Period Length (days)"
 msgstr "Longitud del período (días)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3985,7 +3947,7 @@ msgid "Category of Product"
 msgstr "Categoría de Producto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4122,7 +4084,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4212,9 +4174,15 @@ msgid "Qty"
 msgstr "Cant."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Desacuerdo"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4298,11 +4266,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4320,11 +4283,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Configurar sus cuentas bancarias"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4371,8 +4329,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4402,7 +4360,7 @@ msgid "Consolidated Children"
 msgstr "Hijos Consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4440,11 +4398,6 @@ msgstr ""
 msgid "title"
 msgstr "titulo"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4534,6 +4487,13 @@ msgstr "30 días fin de mes"
 msgid "Analytic Balance"
 msgstr "Saldo Analitico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4554,6 +4514,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Asientos validados/asentados"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4564,11 +4529,6 @@ msgstr "Search Tax Templates"
 msgid "Draft Entries"
 msgstr "Asientos en Borrador"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dia del mes = -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4577,11 +4537,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Número de días: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4605,20 +4560,9 @@ msgid "Account Type"
 msgstr "Tipo de Cuenta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Cerrar Cajas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4641,9 +4585,20 @@ msgstr ""
 "accounts. These generate draft supplier invoices."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Cerrar Cajas"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4671,7 +4626,7 @@ msgid "Month"
 msgstr "Month"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4682,8 +4637,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4707,6 +4662,11 @@ msgstr "Cuenta Paypal"
 msgid "Acc.Type"
 msgstr "Cta. Tipo"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4719,7 +4679,7 @@ msgstr "Invertir signo del balance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balance (Cuenta de pasivo)"
@@ -4741,7 +4701,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4796,11 +4756,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamiento Periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4830,10 +4785,9 @@ msgid "Account chart"
 msgstr "Account chart"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura de proveedor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4901,10 +4855,14 @@ msgstr "Notas de Crédito"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4957,7 +4915,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4972,7 +4930,7 @@ msgid "Based On"
 msgstr "Based On"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4997,11 +4955,6 @@ msgstr ""
 msgid "Change"
 msgstr "Cambiar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y Cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5024,11 +4977,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Ejemplo"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5039,11 +4987,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5053,7 +4996,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impuesto de compra %2f%%"
@@ -5127,16 +5070,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "Varios"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/d' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5250,6 +5188,7 @@ msgstr "Agregar"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagado"
 
@@ -5276,7 +5215,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Periodo de apertura"
@@ -5291,14 +5230,6 @@ msgstr "Asientos a revisar"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5311,7 +5242,7 @@ msgid "Tax Application"
 msgstr "Aplicacion de impuesto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5344,9 +5275,9 @@ msgid "End of period"
 msgstr "Fin de período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles de banco"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Payment of invoices"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5441,14 +5372,6 @@ msgstr "Descripción de Impuesto"
 msgid "Child Tax Accounts"
 msgstr "Cuentas de impuesto hijas"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5494,7 +5417,7 @@ msgid "Target Moves"
 msgstr "Seleccionar Asientos"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5530,6 +5453,7 @@ msgid "Python Code (reverse)"
 msgstr "Código Python"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5547,12 +5471,6 @@ msgstr ""
 "selección asume que el conjunto de impuestos definido en esta plantilla está "
 "completo."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5578,18 +5496,13 @@ msgstr "Año"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linea 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nombre interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5628,7 +5541,7 @@ msgstr "Hoja de Balance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Pérdidas y ganancias (Cuenta de ingresos)"
@@ -5661,7 +5574,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Código para calcular (si tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5688,6 +5601,7 @@ msgstr "Conciliación Automatica"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5791,7 +5705,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5821,7 +5735,7 @@ msgid "Amount Computation"
 msgstr "Amount Computation"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5857,10 +5771,16 @@ msgid "Account Common Account Report"
 msgstr "Cuenta Comun de Reporte Contable"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicación"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Abierto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5890,9 +5810,7 @@ msgstr "Códigos de impuestos"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Nota de Debito"
 
@@ -5909,11 +5827,6 @@ msgstr "Signo código impuesto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Reporte de facturas creadas en los útimos 15 días"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Numero de días: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5930,6 +5843,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Monto a Pagar"
@@ -6021,8 +5935,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6045,6 +5957,13 @@ msgstr "Texto normal"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Payment entries are the second input of the reconciliation."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6054,15 +5973,6 @@ msgstr ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"El campo secuencia es usado para ordenar las líneas de plazos de pago de "
-"menor a mayor secuencia."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6120,12 +6030,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Importe fijo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6149,7 +6058,6 @@ msgstr "Generar Asientos de Apertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "El método de cálculo del importe del impuesto."
 
@@ -6177,18 +6085,23 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Movimiento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Ajuste"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "entradas"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6205,7 +6118,7 @@ msgstr "Ingreso"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -6225,16 +6138,11 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Free Reference"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valuation"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6349,7 +6257,7 @@ msgid "Filter by"
 msgstr "Filter by"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "¡Tiene una expressión errónea \"%(...)s\" en su modelo!"
@@ -6397,6 +6305,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Número de días"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6540,7 +6456,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6720,7 +6636,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6751,12 +6667,6 @@ msgstr ""
 msgid "Current"
 msgstr "Current"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6781,7 +6691,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -6801,7 +6710,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "No puede generar un código de diario que no ha sido usado"
@@ -6848,12 +6757,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referencia factura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6872,12 +6786,12 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6951,7 +6865,7 @@ msgid "Optional create"
 msgstr "Creación Opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6964,9 +6878,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Nota de Credito"
 
@@ -7004,9 +6916,12 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Evaluación: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7084,6 +6999,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Cash Transactions"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7101,7 +7023,7 @@ msgstr "Analytic Entries Statistics"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Entries: "
@@ -7119,14 +7041,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balance General (Cuenta activos)"
@@ -7142,10 +7063,9 @@ msgid "Total debit"
 msgstr "Total debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Próximos asientos de cliente para conciliar"
 
 #. module: account
 #: report:account.invoice:0
@@ -7198,7 +7118,7 @@ msgstr "Crear asiento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Pérdidas y ganancias (cuenta de gastos)"
@@ -7209,13 +7129,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -7252,6 +7173,11 @@ msgstr "Línea de proyecto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7358,8 +7284,8 @@ msgstr "Seleccione Diario"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo Inicial"
@@ -7441,7 +7367,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7462,6 +7388,11 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7515,7 +7446,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7553,9 +7484,8 @@ msgid "Source Document"
 msgstr "Doc. Fuente"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7582,7 +7512,7 @@ msgid "Taxes:"
 msgstr "Impuestos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7780,6 +7710,12 @@ msgstr ""
 "desarrolladores para crear impuestos especificos con una clausula "
 "personalizada."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referencia factura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7872,7 +7808,7 @@ msgid "Use model"
 msgstr "Usar modelo"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7923,7 +7859,7 @@ msgid "Root/View"
 msgstr "Raíz/Vista"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7992,7 +7928,7 @@ msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de Ventas"
@@ -8003,7 +7939,7 @@ msgid "Invoice Tax"
 msgstr "Impuestos de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -8047,7 +7983,7 @@ msgid "Sales Properties"
 msgstr "Propiedades de Venta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8072,7 +8008,7 @@ msgstr "Para"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustes de moneda"
@@ -8106,7 +8042,7 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8127,10 +8063,9 @@ msgstr ""
 "baja a la más alta"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Codigo de caso"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8146,17 +8081,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Validar Asientos Contables"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8172,7 +8102,7 @@ msgstr "Nombre del informe"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -8184,9 +8114,11 @@ msgid "Account Destination"
 msgstr "Cuenta de destino"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8194,7 +8126,6 @@ msgstr "Payment of invoices"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8332,15 +8263,14 @@ msgid "Partner Ledger"
 msgstr "Mayor de Empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
@@ -8408,7 +8338,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda para aplicar a la factura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No hay detalle de Factura !"
@@ -8488,7 +8418,7 @@ msgid "Associated Partner"
 msgstr "Empresa Asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primero debe seleccionar una empresa !"
@@ -8570,13 +8500,13 @@ msgstr ""
 "de calcular los siguientes impuestos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de Reembolso de Compras"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8649,7 +8579,7 @@ msgid "Net Total:"
 msgstr "Net Total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8669,15 +8599,6 @@ msgstr "Reportes Comunes"
 msgid "Write-Off Journal"
 msgstr "Diario de Ajuste"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
-"empresa actual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8704,11 +8625,6 @@ msgstr "Tipo Int."
 msgid "Tax/Base Amount"
 msgstr "Importe impuestos/base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Valoración: Porcentaje"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8762,6 +8678,11 @@ msgstr "Resultado de conciliación"
 msgid "Ending Balance"
 msgstr "Saldo final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8804,7 +8725,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Carga automática de extracto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8827,7 +8748,12 @@ msgid "Account Types"
 msgstr "Tipos de cuentas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8835,9 +8761,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Valor del importe: n.d."
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoría para PYG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8854,10 +8780,9 @@ msgid "Reconciliation"
 msgstr "Conciliación"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cuenta por Cobrar"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
 #: view:account.invoice:0
@@ -8937,7 +8862,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Impuestox %.2f%%"
@@ -8955,13 +8880,13 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de Compra"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8990,11 +8915,6 @@ msgstr "Fecha de Vencimiento"
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadero"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9131,9 +9051,10 @@ msgid "Journal Name"
 msgstr "Nombre de Diario"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Próximos asientos de cliente para conciliar"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Entry \"%s\" is not valid !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9181,7 +9102,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9243,7 +9164,7 @@ msgid "Reconciled entries"
 msgstr "Asientos conciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "¡Modelo erróneo!"
@@ -9265,7 +9186,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprimir Balance de Empresa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9304,7 +9225,7 @@ msgstr "Desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario de Asiento de Apertura"
@@ -9351,7 +9272,7 @@ msgstr ""
 "hijos en lugar del importe total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9366,21 +9287,9 @@ msgstr "Por Código Python"
 msgid "Journal Code"
 msgstr "Código de Diario"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Saldo Pendiente"
 
@@ -9413,7 +9322,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
@@ -9479,7 +9388,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imp. de Compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor crear algun detalle."
@@ -9498,7 +9407,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalles"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9616,21 +9525,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de Períodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Customer account statement"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría para PYG"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9642,8 +9541,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9663,14 +9563,14 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extracto Bancario"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta por Cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9771,8 +9671,8 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9852,11 +9752,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Desconcialiación de Transacciones"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9874,11 +9769,16 @@ msgid "Balance :"
 msgstr "saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9915,13 +9815,6 @@ msgstr "Subscripción"
 msgid "Account Analytic Balance"
 msgstr "Balance de Costos"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9961,7 +9854,13 @@ msgid "Due date"
 msgstr "Fecha Límite"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10058,7 +9957,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Total erróneo !"
@@ -10148,7 +10047,7 @@ msgid "Comparison"
 msgstr "Comparación"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10166,6 +10065,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10221,11 +10125,6 @@ msgstr "Crédito"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10237,7 +10136,7 @@ msgid "Journal Entry Model"
 msgstr "Modelo de Asiento Contable"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10322,7 +10221,7 @@ msgid "Profit (Loss) to report"
 msgstr "Ganacias (Pérdida) para informe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10652,7 +10551,14 @@ msgid "Empty Accounts ? "
 msgstr "Cuentas Vacías? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10778,7 +10684,7 @@ msgid "Receivable accounts"
 msgstr "Cuentas por Cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10911,7 +10817,7 @@ msgid "Entries Sorted by"
 msgstr "Entradas ordenadas por"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11017,7 +10923,7 @@ msgid "Accounting Documents"
 msgstr "Documentos Contables"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11062,7 +10968,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Impuestos Manuales"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11143,17 +11049,6 @@ msgstr ""
 msgid "February"
 msgstr "Febrero"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11212,6 +11107,11 @@ msgstr "Plantillas de Mapeo de Cuentas"
 msgid "Expense Account on Product Template"
 msgstr "Cuenta de Egresos para Plantilla de Producto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11282,9 +11182,6 @@ msgstr ""
 #~ msgid "Account Entry Line"
 #~ msgstr "Línea del asiento contable"
 
-#~ msgid "Fixed"
-#~ msgstr "Fijo"
-
 #~ msgid ""
 #~ "Gives the view used when writing or browsing entries in this journal. The "
 #~ "view tell Open ERP which fields should be visible, required or readonly and "
@@ -11332,6 +11229,10 @@ msgstr ""
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Estadística de asientos analíticos"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de proveedor"
+
 #~ msgid "Line"
 #~ msgstr "Línea"
 
@@ -11406,6 +11307,13 @@ msgstr ""
 #~ msgid "analytic Invoice"
 #~ msgstr "Factura analítica"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "El campo secuencia es usado para ordenar las líneas de plazos de pago de "
+#~ "menor a mayor secuencia."
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Imprimir diarios analíticos"
 
@@ -11436,6 +11344,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Impuestos de compras"
 
+#~ msgid "Line Name"
+#~ msgstr "Nombre línea"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Seleccionar facturas que desea pagar y gestionar anticipos"
 
@@ -11559,6 +11470,9 @@ msgstr ""
 #~ "El campo secuencia es usado para ordenar los recursos secuencialmente de "
 #~ "menor a mayor"
 
+#~ msgid "account.tax"
+#~ msgstr "Impuesto"
+
 #~ msgid "J.C. or Move name"
 #~ msgstr "Cód. diario o asiento"
 
@@ -11792,6 +11706,9 @@ msgstr ""
 #~ msgid "Acc. Type Name"
 #~ msgstr "Nombre tipo cuenta"
 
+#~ msgid "Litigation"
+#~ msgstr "Desacuerdo"
+
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Utilice este código para la declaración del IVA."
 
@@ -11993,6 +11910,13 @@ msgstr ""
 #~ msgid "New Supplier Refund"
 #~ msgstr "Nueva factura rectificativa (abono) de proveedor"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Este plazo de pago se utilizará en lugar del plazo por defecto para la "
+#~ "empresa actual."
+
 #~ msgid "Journal code"
 #~ msgstr "Código del diario"
 
@@ -12636,6 +12560,9 @@ msgstr ""
 #~ msgid "Account Data"
 #~ msgstr "Datos de Cuenta"
 
+#~ msgid "account.tax.template"
+#~ msgstr "Plantilla de Impuestos"
+
 #~ msgid ""
 #~ "Invalid period ! Some periods overlap or the date period is not in the scope "
 #~ "of the fiscal year. "
@@ -12683,6 +12610,13 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Incluir Asientos conciliados"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+
 #~ msgid "Accounting Entries-"
 #~ msgstr "Asientos Contables-"
 
@@ -12742,6 +12676,13 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Dirección de Facturación"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 Días   "
 
@@ -12969,6 +12910,9 @@ msgstr ""
 #~ msgid "Refund Invoice Options"
 #~ msgstr "Opciones de Reembolso de Factura"
 
+#~ msgid "Line 2:"
+#~ msgstr "Linea 2:"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -13110,6 +13054,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Default taxes"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesamiento Periódico"
+
 #~ msgid ""
 #~ "When new move line is created the state will be 'Draft'.\n"
 #~ "* When all the payments are done it will be in 'Valid' state."
@@ -13234,6 +13181,9 @@ msgstr ""
 #~ "Streamlines invoice payment and creates hooks to plug automated payment "
 #~ "systems in."
 
+#~ msgid "Valuation"
+#~ msgstr "Valuation"
+
 #~ msgid ""
 #~ "Select here the kind of valuation related to this payment term line. Note "
 #~ "that you should have your last line with the type 'Balance' to ensure that "
@@ -13819,6 +13769,9 @@ msgstr ""
 #~ msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 #~ msgstr "Error en credito o debito"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
+
 #, python-format
 #~ msgid ""
 #~ "Couldn't create move with currency different from the secondary currency of "
@@ -14284,6 +14237,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Vendedor"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco y Cheques"
+
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Hoja de Balance (Cuentas de Activo)"
 
@@ -14294,6 +14250,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Abrir Cajas"
 
+#~ msgid "Line 1:"
+#~ msgstr "Linea 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Error de Integridad !"
@@ -14642,6 +14601,10 @@ msgstr ""
 #~ "¡ No puede validar este asiento porque la cuenta \"%s\" no pertenece a la "
 #~ "plantilla de cuentas \"%s\" !"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "2 por ciento en 14 días netos, la cantidad restante a 30 días fin de mes"
+
 #, python-format
 #~ msgid ""
 #~ "Can not create an automatic sequence for this piece!\n"
@@ -14678,6 +14641,10 @@ msgstr ""
 #~ msgid "Configure Your Chart of Accounts"
 #~ msgstr "Configure su plan de cuentas"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factura '%s' es validada."
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -14704,9 +14671,15 @@ msgstr ""
 #~ msgid "Quantity :"
 #~ msgstr "Cantidad:"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Importe: 0.02"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Ventas de este mes por tipo"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Día del mes: 0"
+
 #, python-format
 #~ msgid ""
 #~ "Can not create the invoice !\n"
@@ -14740,6 +14713,9 @@ msgstr ""
 #~ "\"Homólogo centralizado\" en el diario relacionado, desde el menú de "
 #~ "configuración"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Número de días: 30"
+
 #, python-format
 #~ msgid ""
 #~ "You haven't supplied enough argument to compute the initial balance, please "
@@ -14748,6 +14724,9 @@ msgstr ""
 #~ "No ha ofrecido suficientes datos para calcular el balance inicial, por favor "
 #~ "selecciones un periodo y diario en el contexto"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dia del mes = -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Error! La fecha de inicio del año fiscal debe ser anterior a la fecha final "
@@ -14775,6 +14754,9 @@ msgstr ""
 #~ "No puede modificar la compañía de este periodo porque existen asientos "
 #~ "asociados"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/d' })"
+
 #~ msgid "My invoices"
 #~ msgstr "Mis facturas"
 
@@ -14782,6 +14764,9 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Error de codificación"
 
+#~ msgid "Example"
+#~ msgstr "Ejemplo"
+
 #~ msgid ""
 #~ "Configuration Error!\n"
 #~ "You can not define children to an account with internal type different of "
@@ -14794,6 +14779,9 @@ msgstr ""
 #~ msgid "Sale journal in this month"
 #~ msgstr "Diario ventas en este mes"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Numero de días: 14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
@@ -14839,6 +14827,9 @@ msgstr ""
 #~ "No puede borrar/desactivar una cuenta que está asociada a un cliente o un "
 #~ "proveedor"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Evaluación: Balance"
+
 #, python-format
 #~ msgid "You can not desactivate an account that contains some journal items."
 #~ msgstr "No puede desactivar una cuenta que contiene asientos"
@@ -14964,6 +14955,9 @@ msgstr ""
 #~ msgstr ""
 #~ "No pued encontrar un plan de cuentas para esta compañía, debería crear una."
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Valoración: Porcentaje"
+
 #, python-format
 #~ msgid ""
 #~ "You can not cancel an invoice which is partially paid! You need to "
@@ -14986,6 +14980,9 @@ msgstr ""
 #~ "¡No hay periodo definido para esta fecha: %s!\n"
 #~ "Por favor crear uno."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Valor del importe: n.d."
+
 #~ msgid "Contacts"
 #~ msgstr "Contactos"
 
diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po
index 630d1e0ba64..30da5b9ac7e 100644
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-15 22:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index 35a0a6eb7e3..fd7dc879d78 100644
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 18:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,16 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -143,19 +127,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -167,7 +151,7 @@ msgid "Warning!"
 msgstr "¡Cuidado!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -239,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "contabilidad.impuesto"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -259,6 +238,11 @@ msgstr "Los asientos contables son una entrada de la conciliación."
 msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -387,11 +371,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "cuenta.impuesto.plantilla"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -446,6 +425,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -461,6 +445,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plantilla plan contable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -622,16 +611,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si rompe la conciliación de las transacciones, también debe verificar todas "
-"las acciones que están relacionadas con estas transacciones, ya que no se "
-"desactivarán."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -680,7 +659,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -691,13 +670,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Informe de las ventas por tipo de cuenta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VENTA"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -760,6 +739,11 @@ msgstr "Cuentas por cobrar"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -782,6 +766,12 @@ msgstr "Reabrir"
 msgid "Are you sure you want to create entries?"
 msgstr "¿Está seguro que desea crear los asientos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -802,6 +792,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaje"
 
@@ -844,7 +835,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -867,24 +858,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Romper conciliación"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -915,11 +900,6 @@ msgstr "C.Diario / Nombre mov."
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -950,7 +930,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -965,6 +945,7 @@ msgstr "Nueva suscripción"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Cálculo"
 
@@ -996,11 +977,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1036,7 +1014,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1110,10 +1088,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1191,8 +1169,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1238,7 +1217,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1534,9 +1513,9 @@ msgid "Account Receivable"
 msgstr "Cuenta a cobrar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1550,7 +1529,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con saldo distinto a 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1605,7 +1584,7 @@ msgstr "Omitir estado 'Borrador' para asientos manuales."
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1648,6 +1627,12 @@ msgstr "Una tabla temporal utilizada para la vista de tablero"
 msgid "Supplier Refunds"
 msgstr "Facturas rectificativas (abono) de proveedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código del Caso"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1685,7 +1670,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Sin impuestos"
@@ -1818,6 +1802,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Ventas por tipo de cuenta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1838,115 +1828,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2057,6 +1943,11 @@ msgstr "Estos períodos se pueden solapar."
 msgid "Draft statement"
 msgstr "Extracto borrador"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2085,26 +1976,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2112,16 +2002,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2132,8 +2022,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2178,7 +2068,7 @@ msgid "period close"
 msgstr "cierre periodo"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2278,7 +2168,7 @@ msgid "Product Category"
 msgstr "Categoría de Producto"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2646,7 +2536,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2664,7 +2554,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2685,7 +2575,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2693,14 +2583,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Forma de pago"
 
@@ -2726,18 +2614,6 @@ msgstr "Marque esta opción"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Abierto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2749,6 +2625,11 @@ msgstr "Estado borrador de una factura"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2828,25 +2709,20 @@ msgid "Account Model Entries"
 msgstr "Contabilidad. Líneas de modelo"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "COMPRA"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impuestos proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles bancarios"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2869,7 +2745,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2884,9 +2759,8 @@ msgstr ""
 "ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2916,6 +2790,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impuestos"
 
@@ -2951,14 +2826,14 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3057,6 +2932,12 @@ msgstr "Pagado/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código base reintegro"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extractos bancarios"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3109,11 +2990,6 @@ msgstr "Saldos vencidos de empresa"
 msgid "Accounting entries"
 msgstr "Asientos contables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3159,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3172,7 +3048,7 @@ msgid "Sales by Account"
 msgstr "Ventas por cuenta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3188,15 +3064,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3204,7 +3080,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3269,9 +3145,10 @@ msgstr ""
 "para algunos informes."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Línea 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3320,12 +3197,6 @@ msgstr "Importe código base"
 msgid "Default Sale Tax"
 msgstr "Impuesto de venta por defecto"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3362,7 +3233,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3389,7 +3260,7 @@ msgid "Trial Balance"
 msgstr "Balance de sumas y saldos"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3461,7 +3332,7 @@ msgstr ""
 "transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3473,9 +3344,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Núm. de dígitos a usar para código de cuenta."
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nombre línea"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3524,7 +3395,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3545,15 +3416,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Archivo electrónico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3561,9 +3437,88 @@ msgid "Account Partner Ledger"
 msgstr "Contabilidad. Libro mayor empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3701,12 +3656,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
+"que el extracto. Esto permite que los asientos del extracto tengan las "
+"mismas referencias que el extracto en sí"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3721,7 +3682,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡No se ha definido empresa!"
@@ -3925,7 +3886,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3949,7 +3910,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4087,7 +4048,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4177,9 +4138,15 @@ msgid "Qty"
 msgstr "Cant."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litigio"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
+"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
+"desea sumar/restar el importe."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4263,11 +4230,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4285,11 +4247,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4334,8 +4291,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4365,7 +4322,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4401,11 +4358,6 @@ msgstr ""
 msgid "title"
 msgstr "título"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4495,6 +4447,13 @@ msgstr "30 días fin de mes"
 msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4515,6 +4474,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4525,11 +4489,6 @@ msgstr "Buscar plantillas impuestos"
 msgid "Draft Entries"
 msgstr "Asientos borrador"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4538,11 +4497,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4566,20 +4520,9 @@ msgid "Account Type"
 msgstr "Tipo de cuenta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Cerrar caja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4603,9 +4546,20 @@ msgstr ""
 "proveedor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Cerrar caja"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4633,7 +4587,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4644,8 +4598,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4669,6 +4623,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Tipo cuenta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4681,7 +4640,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4703,7 +4662,7 @@ msgid "Account Base Code"
 msgstr "Código base cuenta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4758,11 +4717,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4792,9 +4746,8 @@ msgid "Account chart"
 msgstr "Plan contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4863,10 +4816,14 @@ msgstr "Notas de Crédito"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4915,7 +4872,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4930,7 +4887,7 @@ msgid "Based On"
 msgstr "Basado en"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ACOMPRA"
@@ -4955,11 +4912,6 @@ msgstr ""
 msgid "Change"
 msgstr "Modificar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4982,11 +4934,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4997,11 +4944,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5011,7 +4953,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5085,16 +5027,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5205,6 +5142,7 @@ msgstr "Añadir"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagado"
 
@@ -5231,7 +5169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5246,14 +5184,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5266,7 +5196,7 @@ msgid "Tax Application"
 msgstr "Aplicación impuesto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5299,9 +5229,9 @@ msgid "End of period"
 msgstr "Fin del período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles bancarios"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pago de facturas"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5394,14 +5324,6 @@ msgstr "Descripción impuesto"
 msgid "Child Tax Accounts"
 msgstr "Cuentas impuestos hijas"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5448,7 +5370,7 @@ msgid "Target Moves"
 msgstr "Movimientos destino"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5484,6 +5406,7 @@ msgid "Python Code (reverse)"
 msgstr "Código Python (inverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5497,12 +5420,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5528,18 +5445,13 @@ msgstr "Año"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Línea 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nombre interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5578,7 +5490,7 @@ msgstr "Hoja de balance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5611,7 +5523,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Código para calcular (si tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5638,6 +5550,7 @@ msgstr "Conciliación automática"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5741,7 +5654,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5772,7 +5685,7 @@ msgid "Amount Computation"
 msgstr "Calculo importe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5808,10 +5721,16 @@ msgid "Account Common Account Report"
 msgstr "Contabilidad. Informe contable común"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicación"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Abierto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5841,9 +5760,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Factura de Crédito de cliente"
 
@@ -5860,11 +5777,6 @@ msgstr "Signo código impuesto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Informe de facturas creadas en los últimos 15 días"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5881,6 +5793,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5972,8 +5885,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5996,6 +5907,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Asientos de pago son la segunda entrada para la conciliación."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6005,15 +5923,6 @@ msgstr ""
 "La potencia de la conciliación automática a seleccionar es el número de los "
 "importes parciales que se pueden combinar para encontrar un saldo a cero."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"El campo secuencia es usado para ordenar las líneas de plazos de pago en "
-"orden ascendente."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6071,12 +5980,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Importe fijo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6100,7 +6008,6 @@ msgstr "Generar asientos apertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "El método de cálculo del importe del impuesto."
 
@@ -6128,18 +6035,23 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Cancelar Dividas"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6156,7 +6068,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -6176,16 +6088,11 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valoración"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6300,7 +6207,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6347,6 +6254,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Número de Días"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6488,7 +6403,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6664,7 +6579,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6695,12 +6610,6 @@ msgstr ""
 msgid "Current"
 msgstr "Actual"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6725,7 +6634,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -6745,7 +6653,7 @@ msgid "Power"
 msgstr "Fuerza"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6792,12 +6700,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referencia factura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6816,12 +6729,12 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6896,7 +6809,7 @@ msgid "Optional create"
 msgstr "Crear opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6907,9 +6820,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Reembolso del Proveedor:"
 
@@ -6947,8 +6858,11 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -7027,6 +6941,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Transacciones de caja"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7044,7 +6965,7 @@ msgstr "Estadísticas asientos analíticos"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -7062,14 +6983,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7085,10 +7005,9 @@ msgid "Total debit"
 msgstr "Total Debito"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "¡El asiento \"%s\" no es válido!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7141,7 +7060,7 @@ msgstr "Crear asiento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7152,13 +7071,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -7195,6 +7115,11 @@ msgstr "Línea de proyecto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7298,8 +7223,8 @@ msgstr "Seleccionar diario"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo de apertura"
@@ -7381,7 +7306,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7401,6 +7326,11 @@ msgstr ""
 "%(date)s: Fecha actual\n"
 "Ejemplo: Mi modelo del %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7454,7 +7384,7 @@ msgid "Done"
 msgstr "Hecho"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7493,9 +7423,8 @@ msgid "Source Document"
 msgstr "Documento origen"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7522,7 +7451,7 @@ msgid "Taxes:"
 msgstr "Impuestos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7720,6 +7649,12 @@ msgstr ""
 "desarrolladores crear impuestos específicos en una configuración "
 "personalizada."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referencia factura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7812,7 +7747,7 @@ msgid "Use model"
 msgstr "Usar modelo"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7863,7 +7798,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7932,7 +7867,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7943,7 +7878,7 @@ msgid "Invoice Tax"
 msgstr "Impuesto de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "¡Ningún trozo de número!"
@@ -7982,7 +7917,7 @@ msgid "Sales Properties"
 msgstr "Propiedades de venta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8007,7 +7942,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8039,7 +7974,7 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8057,10 +7992,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Código del Caso"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8076,17 +8010,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Asentar apuntes"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8102,7 +8031,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Dinero en efectivo"
@@ -8114,9 +8043,11 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pago de facturas"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8124,7 +8055,6 @@ msgstr "Pago de facturas"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8262,15 +8192,14 @@ msgid "Partner Ledger"
 msgstr "Libro mayor de empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -8338,7 +8267,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda a aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "¡No hay líneas de factura!"
@@ -8415,7 +8344,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "¡Primero debe seleccionar una empresa!"
@@ -8497,13 +8426,13 @@ msgstr ""
 "de calcular los siguientes impuestos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de abono de compras"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8574,7 +8503,7 @@ msgid "Net Total:"
 msgstr "Total Neto:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8594,15 +8523,6 @@ msgstr "Informes genéricos"
 msgid "Write-Off Journal"
 msgstr "Diario de desajuste"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
-"empresa actual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8629,11 +8549,6 @@ msgstr "Tipo interno"
 msgid "Tax/Base Amount"
 msgstr "Importe impuestos/base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8687,6 +8602,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8729,7 +8649,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Importación automática del extracto bancario"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8752,7 +8672,12 @@ msgid "Account Types"
 msgstr "Tipos de cuentas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8760,9 +8685,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr ""
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoría Balance / PyG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8779,10 +8704,9 @@ msgid "Reconciliation"
 msgstr "Conciliación"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cuenta por cobrar"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
 #: view:account.invoice:0
@@ -8854,7 +8778,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8872,13 +8796,13 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Sub-Total"
 
@@ -8907,11 +8831,6 @@ msgstr "Fecha de Vencimiento"
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadero"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9048,9 +8967,10 @@ msgid "Journal Name"
 msgstr "Nombre del diario"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "¡El asiento \"%s\" no es válido!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9099,7 +9019,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9163,7 +9083,7 @@ msgid "Reconciled entries"
 msgstr "Asientos conciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9185,7 +9105,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprimir balance contable de empresa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9219,7 +9139,7 @@ msgstr "desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -9266,7 +9186,7 @@ msgstr ""
 "hijos en lugar del importe total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9281,21 +9201,9 @@ msgstr "Calculado por código Python"
 msgid "Journal Code"
 msgstr "Código diario"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
-"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
-"desea sumar/restar el importe."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Importe residual"
 
@@ -9328,7 +9236,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de abono de ventas"
@@ -9394,7 +9302,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impuesto compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Cree algunas líneas de factura"
@@ -9413,7 +9321,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "AVENTA"
@@ -9531,21 +9439,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de periodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría Balance / PyG"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9557,8 +9455,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9578,14 +9477,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta por cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9686,8 +9585,8 @@ msgid "Move"
 msgstr "Asiento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9767,11 +9666,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9789,11 +9683,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9830,13 +9729,6 @@ msgstr "Asientos periódicos"
 msgid "Account Analytic Balance"
 msgstr "Contabilidad. Saldo analítico"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9876,7 +9768,13 @@ msgid "Due date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9965,7 +9863,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "¡Total erróneo!"
@@ -10057,7 +9955,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10075,6 +9973,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10130,11 +10033,6 @@ msgstr "Crédito"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10146,7 +10044,7 @@ msgid "Journal Entry Model"
 msgstr "Modelo de asiento"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10231,7 +10129,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10560,7 +10458,14 @@ msgid "Empty Accounts ? "
 msgstr "¿Cuentas vacías? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10685,7 +10590,7 @@ msgid "Receivable accounts"
 msgstr "Cuentas por cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10814,7 +10719,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10921,7 +10826,7 @@ msgid "Accounting Documents"
 msgstr "Documentos contables"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10967,7 +10872,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Impuestos factura manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11048,17 +10953,6 @@ msgstr ""
 msgid "February"
 msgstr "Febrero"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
-"que el extracto. Esto permite que los asientos del extracto tengan las "
-"mismas referencias que el extracto en sí"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11117,6 +11011,11 @@ msgstr "Mapeo fiscal de modelo de cuenta"
 msgid "Expense Account on Product Template"
 msgstr "Cuenta de gastos en plantilla producto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11168,6 +11067,14 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Incluir asientos conciliados"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porqué no serán "
+#~ "deshabilitadas."
+
 #~ msgid "Account currency"
 #~ msgstr "Moneda contable"
 
@@ -11214,6 +11121,9 @@ msgstr ""
 #~ "¡No se ha definido un periodo para esta fecha: %s !\n"
 #~ "Cree un ejercicio fiscal."
 
+#~ msgid "account.tax"
+#~ msgstr "contabilidad.impuesto"
+
 #, python-format
 #~ msgid "Journal: %s"
 #~ msgstr "Diario: %s"
@@ -11246,6 +11156,9 @@ msgstr ""
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "account.tax.template"
+#~ msgstr "cuenta.impuesto.plantilla"
+
 #, python-format
 #~ msgid ""
 #~ "Can't find any account journal of %s type for this company.\n"
@@ -11321,6 +11234,14 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Nombre dirección factura"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Si rompe la conciliación de las transacciones, también debe verificar todas "
+#~ "las acciones que están relacionadas con estas transacciones, ya que no se "
+#~ "desactivarán."
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 Días   "
 
@@ -11737,6 +11658,9 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Transición de caja"
 
+#~ msgid "Line Name"
+#~ msgstr "Nombre línea"
+
 #~ msgid "Starts on"
 #~ msgstr "Empieza en"
 
@@ -11823,6 +11747,9 @@ msgstr ""
 #~ msgid "Account balance"
 #~ msgstr "Balance Contable"
 
+#~ msgid "Litigation"
+#~ msgstr "Litigio"
+
 #~ msgid "Contact Address Name"
 #~ msgstr "Nombre dirección contacto"
 
@@ -11854,6 +11781,9 @@ msgstr ""
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Configuración plan contable"
 
+#~ msgid "Line 2:"
+#~ msgstr "Línea 2:"
+
 #~ msgid ""
 #~ "Print Report with the currency column if the currency is different then the "
 #~ "company currency"
@@ -11934,6 +11864,9 @@ msgstr ""
 #~ msgid "Compute Code"
 #~ msgstr "Código cálculo"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesamiento periódico"
+
 #~ msgid "Display Mode"
 #~ msgstr "Modo de visualización"
 
@@ -12046,6 +11979,9 @@ msgstr ""
 #~ msgid "Are you sure ?"
 #~ msgstr "¿Estás seguro?"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco y cheques"
+
 #~ msgid "Third Party (Country)"
 #~ msgstr "Tercera parte (país)"
 
@@ -12117,6 +12053,9 @@ msgstr ""
 #~ msgid "Integrity Error !"
 #~ msgstr "¡Error de integridad!"
 
+#~ msgid "Line 1:"
+#~ msgstr "Línea 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Registro del diario \"%s\" no es válido"
@@ -12169,6 +12108,13 @@ msgstr ""
 #~ msgid "Lines to reconcile"
 #~ msgstr "Líneas a conciliar"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "El campo secuencia es usado para ordenar las líneas de plazos de pago en "
+#~ "orden ascendente."
+
 #, python-format
 #~ msgid ""
 #~ "There is no default default credit account defined \n"
@@ -12194,6 +12140,9 @@ msgstr ""
 #~ "Este módulo soporta la metodología contable anglosajón, cambiando la lógica "
 #~ "contable en las transacciones de stock."
 
+#~ msgid "Valuation"
+#~ msgstr "Valoración"
+
 #~ msgid ""
 #~ "Streamlines invoice payment and creates hooks to plug automated payment "
 #~ "systems in."
@@ -12567,6 +12516,9 @@ msgstr ""
 #~ "¡No puede hacer esta modificación en un asiento conciliado! ¡Observe que "
 #~ "sólo puede cambiar algunos campos no importantes!"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Diario bancario "
@@ -12741,9 +12693,6 @@ msgstr ""
 #~ msgid "Year :"
 #~ msgstr "Ejercicio :"
 
-#~ msgid "Fixed"
-#~ msgstr "Fijo"
-
 #~ msgid "State"
 #~ msgstr "Departamento"
 
@@ -12814,6 +12763,13 @@ msgstr ""
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Código para el cálculo de precios con impuestos incluidos"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Este plazo de pago se utilizará en lugar del plazo por defecto para la "
+#~ "empresa actual."
+
 #~ msgid ""
 #~ "This Account is used for transfering Profit/Loss (Profit: Amount will be "
 #~ "added, Loss: Amount will be duducted), which is calculated from Profilt & "
diff --git a/addons/account/i18n/es_UY.po b/addons/account/i18n/es_UY.po
index ea4b79f7cc1..6b41f60614b 100644
--- a/addons/account/i18n/es_UY.po
+++ b/addons/account/i18n/es_UY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-14 15:07+0000\n"
 "Last-Translator: Juan Andres Martinez Chaine <Unknown>\n"
 "Language-Team: Spanish (Uruguay) <es_UY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,16 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +129,19 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +153,7 @@ msgid "Warning!"
 msgstr "¡Cuidado!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -241,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas de impuestos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -261,6 +240,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +379,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -454,6 +433,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -469,6 +453,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -630,13 +619,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -685,7 +667,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -696,13 +678,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -765,6 +747,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -787,6 +774,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -807,6 +800,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -849,7 +843,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -872,24 +866,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Facturas y reembolsos de proveedor"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -920,11 +908,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -955,7 +938,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -970,6 +953,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -1001,11 +985,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1041,7 +1022,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1112,10 +1093,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1191,8 +1172,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1238,7 +1220,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1534,9 +1516,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1550,7 +1532,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1605,7 +1587,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1648,6 +1630,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Nota de Crédito de proveedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1685,7 +1673,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1818,6 +1805,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1838,115 +1831,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2055,6 +1944,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2083,26 +1977,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2110,16 +2003,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2130,8 +2023,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2176,7 +2069,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2276,7 +2169,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2635,7 +2528,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2653,7 +2546,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2674,7 +2567,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2682,14 +2575,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2715,18 +2606,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2738,6 +2617,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2815,24 +2699,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2856,7 +2735,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2866,9 +2744,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2898,6 +2775,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2933,14 +2811,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3037,6 +2915,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr "Código base reintegro"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3089,11 +2973,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3134,7 +3013,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3147,7 +3026,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3163,15 +3042,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3179,7 +3058,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3241,8 +3120,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3289,12 +3169,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3328,7 +3202,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3355,7 +3229,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3427,7 +3301,7 @@ msgstr ""
 "transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3439,8 +3313,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3490,7 +3364,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3511,14 +3385,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3527,9 +3406,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3655,12 +3613,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3675,7 +3636,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3875,7 +3836,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3899,7 +3860,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4035,7 +3996,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4120,8 +4081,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4205,11 +4169,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4227,11 +4186,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4276,8 +4230,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4307,7 +4261,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4339,11 +4293,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4433,6 +4382,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4452,6 +4408,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4462,11 +4423,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4475,11 +4431,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4503,19 +4454,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4537,8 +4477,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4567,7 +4518,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4578,8 +4529,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4603,6 +4554,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4615,7 +4571,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4637,7 +4593,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4692,11 +4648,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4726,9 +4677,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4797,10 +4747,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4849,7 +4803,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4864,7 +4818,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4889,11 +4843,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4916,11 +4865,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4931,11 +4875,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4945,7 +4884,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5019,16 +4958,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5142,6 +5076,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5168,7 +5103,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5183,14 +5118,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5203,7 +5130,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5236,8 +5163,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5331,14 +5258,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5383,7 +5302,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5419,6 +5338,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5432,12 +5352,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5463,18 +5377,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5513,7 +5422,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5546,7 +5455,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5573,6 +5482,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5673,7 +5583,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5701,7 +5611,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5737,9 +5647,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5770,9 +5686,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Nota de Crédito de cliente"
 
@@ -5789,11 +5703,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5810,6 +5719,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5898,8 +5808,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5922,6 +5830,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5929,13 +5844,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5993,12 +5901,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6022,7 +5929,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6050,18 +5956,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6078,7 +5989,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6098,16 +6009,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6217,7 +6123,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6264,6 +6170,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6403,7 +6317,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6578,7 +6492,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6609,12 +6523,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6639,7 +6547,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6659,7 +6566,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6704,12 +6611,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6725,12 +6637,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6797,7 +6709,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6808,9 +6720,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Nota de Crédito de proveedor"
 
@@ -6848,8 +6758,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6926,6 +6839,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6943,7 +6863,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6961,14 +6881,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6984,9 +6903,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7036,7 +6954,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7047,13 +6965,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7090,6 +7009,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7188,8 +7112,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7269,7 +7193,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7282,6 +7206,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7335,7 +7264,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7367,9 +7296,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7396,7 +7324,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7588,6 +7516,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7677,7 +7611,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7728,7 +7662,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7795,7 +7729,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7806,7 +7740,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7845,7 +7779,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7870,7 +7804,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7902,7 +7836,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7920,9 +7854,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7939,17 +7872,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7965,7 +7893,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7977,8 +7905,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7987,7 +7917,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8119,15 +8048,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8195,7 +8123,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8270,7 +8198,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8350,13 +8278,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de reembolso de compras"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8427,7 +8355,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8447,13 +8375,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8480,11 +8401,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8538,6 +8454,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8578,7 +8499,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8601,7 +8522,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8609,8 +8535,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8628,9 +8554,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8703,7 +8628,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8721,13 +8646,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8756,11 +8681,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8895,8 +8815,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8942,7 +8863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9003,7 +8924,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9025,7 +8946,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9059,7 +8980,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9104,7 +9025,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9119,18 +9040,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9163,7 +9075,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de reembolso de ventas"
@@ -9229,7 +9141,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9248,7 +9160,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9363,21 +9275,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9389,8 +9291,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9410,14 +9313,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9518,8 +9421,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9596,11 +9499,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9618,11 +9516,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9659,13 +9562,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9705,7 +9601,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9794,7 +9696,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9877,7 +9779,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9895,6 +9797,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9948,11 +9855,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9964,7 +9866,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10049,7 +9951,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10372,7 +10274,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10497,7 +10406,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10624,7 +10533,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10730,7 +10639,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10775,7 +10684,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10854,14 +10763,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10920,6 +10821,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10951,6 +10857,14 @@ msgstr ""
 #~ msgid "Account currency"
 #~ msgstr "Moneda contable"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porqué no serán "
+#~ "deshabilitadas."
+
 #~ msgid "Children Definition"
 #~ msgstr "Definición hijos"
 
diff --git a/addons/account/i18n/es_VE.po b/addons/account/i18n/es_VE.po
index 23dfc0ad30b..a956dcdfe96 100644
--- a/addons/account/i18n/es_VE.po
+++ b/addons/account/i18n/es_VE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-08 02:23+0000\n"
-"Last-Translator: Nhomar Hernandez (Vauxoo) <nhomar@gmail.com>\n"
+"Last-Translator: Nhomar - Vauxoo <nhomar@gmail.com>\n"
 "Language-Team: Spanish (Venezuela) <es_VE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar desde factura o pago"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,16 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total debe"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -141,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -165,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -234,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -254,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -380,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -439,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -454,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -615,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -670,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -681,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -750,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -772,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -792,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -834,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -857,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -905,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -940,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -955,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -986,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1026,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1097,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1176,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1223,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1519,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1535,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1590,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1633,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1670,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1803,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1823,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2040,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2068,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2095,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2115,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2161,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2261,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2620,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2638,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2659,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2667,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2700,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2723,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2800,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2841,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2851,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2883,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2918,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3022,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3074,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3119,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3132,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3148,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3164,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3226,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3274,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3313,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3340,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3406,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3418,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3469,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3490,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3506,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3634,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3654,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3854,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3878,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4014,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4099,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4184,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4206,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4255,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4286,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4318,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4412,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4431,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4441,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4454,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4482,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4516,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4546,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4557,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4582,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4594,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4616,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4671,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4705,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4776,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4828,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4843,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4868,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4895,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4910,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4924,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4998,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5118,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5144,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5159,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5179,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5212,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5307,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5359,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5395,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5408,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5439,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5489,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5522,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5549,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5649,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5677,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5713,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5746,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5765,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5786,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5874,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5898,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5905,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5969,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5998,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6026,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6054,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6074,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6193,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6240,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6379,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6554,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6585,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6615,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6635,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6680,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6701,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6773,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6784,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6824,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6902,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6919,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6937,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6960,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7012,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7023,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7066,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7164,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7245,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7258,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7311,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7343,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7372,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7564,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7653,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7704,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7771,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7782,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7821,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7846,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7878,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7896,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7915,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7941,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7953,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7963,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8095,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8171,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8246,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8326,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8403,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8423,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8456,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8514,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8554,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8577,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8585,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8604,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8679,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8697,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8732,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8871,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8918,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8979,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9001,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9035,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9080,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9095,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9139,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9205,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9224,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9339,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9365,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9386,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9494,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9572,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9594,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9635,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9681,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9770,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9853,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9871,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9924,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9940,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10025,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10348,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10473,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10600,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10706,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10751,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10830,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10896,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10931,6 +10837,14 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "Defina una secuencia en el diario de facturación"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si rompe la conciliación de transacciones, también debe verificar todas la "
+#~ "acciones que están relacionadas con esas transacciones porqué no serán "
+#~ "deshabilitadas."
+
 #~ msgid "Children Definition"
 #~ msgstr "Definición hijos"
 
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index b5afc5a87de..b643854392a 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 19:34+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 20:57+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "Impordi arvetest või maksetest"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,13 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Kogu deebet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -108,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -139,19 +126,19 @@ msgstr ""
 "maksetähtaeg seda kustutamata."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -163,7 +150,7 @@ msgid "Warning!"
 msgstr "Hoiatus!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -232,11 +219,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Maksude mallid"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "konto.maks"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -252,6 +234,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -378,11 +365,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "konto.maksu.mall"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -437,6 +419,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -452,6 +439,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plaani mall"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -613,13 +605,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Iga 3 kuu tagant"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -668,7 +653,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -679,13 +664,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -748,6 +733,11 @@ msgstr "Nõuete kontod"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -770,6 +760,12 @@ msgstr "Ava uuesti"
 msgid "Are you sure you want to create entries?"
 msgstr "Kas olete kindel, et soovite kirjed luua?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -790,6 +786,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Protsent"
 
@@ -832,7 +829,7 @@ msgid "Type"
 msgstr "Tüüp"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -855,24 +852,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -903,11 +894,6 @@ msgstr "J.C./liiguta nime"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -938,7 +924,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -953,6 +939,7 @@ msgstr "Uus tellimus"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Arvutus"
 
@@ -984,11 +971,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1024,7 +1008,7 @@ msgid "Liability"
 msgstr "Kohustus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1095,10 +1079,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1174,8 +1158,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1221,7 +1206,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Pank"
@@ -1517,9 +1502,9 @@ msgid "Account Receivable"
 msgstr "Nõuete konto"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1533,7 +1518,7 @@ msgid "With balance is not equal to 0"
 msgstr "Bilanss pole 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1588,7 +1573,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1601,7 +1586,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eArveldus ja maksed"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1631,6 +1616,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Tarnija hüvitised"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1668,7 +1659,6 @@ msgid "Groups"
 msgstr "Grupid"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Maksuta"
@@ -1801,6 +1791,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Müügid konto järgi"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1821,115 +1817,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2040,6 +1932,11 @@ msgstr "Need perioodid võivad kattuda"
 msgid "Draft statement"
 msgstr "Mustandteatis"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2068,26 +1965,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2095,16 +1991,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2115,8 +2011,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2161,7 +2057,7 @@ msgid "period close"
 msgstr "Periood suletud"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2261,7 +2157,7 @@ msgid "Product Category"
 msgstr "Toote kategooria"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2620,7 +2516,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Jäta tühjaks kõigi avatud majandusaastate joks"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2638,7 +2534,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2659,7 +2555,7 @@ msgid "Main Sequence"
 msgstr "Peajärjestus"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2667,14 +2563,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Maksetingimus"
 
@@ -2700,18 +2594,6 @@ msgstr "Märgi see kast"
 msgid "Filters"
 msgstr "Filtrid"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Lahtine"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2723,6 +2605,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2800,25 +2687,20 @@ msgid "Account Model Entries"
 msgstr "Konto mudeli kirjed"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Ostumaksud"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Pangadetailid"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2841,7 +2723,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2851,9 +2732,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2883,6 +2763,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Maksud"
 
@@ -2918,14 +2799,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3022,6 +2903,12 @@ msgstr "Makstud/võrreldud"
 msgid "Refund Base Code"
 msgstr "Hüvitise aluse kood"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3074,11 +2961,6 @@ msgstr "Aegunud partneri bilanss"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3119,7 +3001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3132,7 +3014,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3148,15 +3030,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3164,7 +3046,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3226,8 +3108,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3274,12 +3157,6 @@ msgstr "Aluse koodi summa"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3313,7 +3190,7 @@ msgid "Fiscal Position"
 msgstr "Finantspositsioon"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3340,7 +3217,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3406,7 +3283,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3418,9 +3295,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Numbrite arv kontokoodi jaoks"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Reanimi"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3469,7 +3346,7 @@ msgid "View"
 msgstr "Vaade"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3490,15 +3367,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektrooniline fail"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Maksukoodi mall"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3506,9 +3388,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3634,12 +3595,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3654,7 +3618,7 @@ msgid "Starting Balance"
 msgstr "Algbilanss"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Partner ei ole määratud !"
@@ -3854,7 +3818,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3878,7 +3842,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4014,7 +3978,7 @@ msgid "Chart of Accounts Template"
 msgstr "Kontoplaani mall"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4099,8 +4063,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4184,11 +4151,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4206,11 +4168,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4255,8 +4212,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4286,7 +4243,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4318,11 +4275,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4412,6 +4364,13 @@ msgstr "30 päeva Kuu lõpus"
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4431,6 +4390,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4441,11 +4405,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4454,11 +4413,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4482,19 +4436,8 @@ msgid "Account Type"
 msgstr "Konto tüüp"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4516,8 +4459,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4546,7 +4500,7 @@ msgid "Month"
 msgstr "Kuu"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4557,8 +4511,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4575,13 +4529,18 @@ msgstr ""
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal konto"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4594,7 +4553,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4616,7 +4575,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4671,11 +4630,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Perioodiline töötlemine"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4705,10 +4659,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Ostuarve"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4776,10 +4729,14 @@ msgstr "Krediidi Märkused"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4828,7 +4785,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4843,7 +4800,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4868,11 +4825,6 @@ msgstr ""
 msgid "Change"
 msgstr "Muuda"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4895,11 +4847,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Tühistatud"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4910,11 +4857,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Hoia tühjana, et kasutada tulude kontot"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4924,7 +4866,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4998,16 +4940,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5118,6 +5055,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Makstud"
 
@@ -5144,7 +5082,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5159,14 +5097,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5179,7 +5109,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5212,9 +5142,9 @@ msgid "End of period"
 msgstr "Perioodi lõpp"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Pangadetailid"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5307,14 +5237,6 @@ msgstr "Maksu Kirjeldus"
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5360,7 +5282,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5396,6 +5318,7 @@ msgid "Python Code (reverse)"
 msgstr "Python kood (vastupidine)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5409,12 +5332,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5440,18 +5357,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Sisemine nimi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5490,7 +5402,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5523,7 +5435,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Arvuta kood (kui tüüp=kood)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5550,6 +5462,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5650,7 +5563,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5678,7 +5591,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5714,10 +5627,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Lahtine"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5747,9 +5666,7 @@ msgstr "Maksukoodid"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Kliendi hüvitis"
 
@@ -5766,11 +5683,6 @@ msgstr "Maksukoodi märk"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Viimase 15 päeva jooksul loodud arvete aruanne"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5787,6 +5699,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5875,8 +5788,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5899,6 +5810,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5906,13 +5824,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5970,12 +5881,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Kindel summa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5999,7 +5909,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Arvutusmeetod maksu summa jaoks."
 
@@ -6027,18 +5936,23 @@ msgid "Child Accounts"
 msgstr "Alamkontod"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Mahakandmine"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6055,7 +5969,7 @@ msgstr "Tulu"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Tarnija"
@@ -6075,16 +5989,11 @@ msgid "Account n°"
 msgstr "Konto nr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6194,7 +6103,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6241,6 +6150,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Päevade arv"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6380,7 +6297,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6555,7 +6472,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6586,12 +6503,6 @@ msgstr "Kohandatud"
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6616,7 +6527,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6636,7 +6546,7 @@ msgid "Power"
 msgstr "Aste"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6681,12 +6591,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6702,12 +6617,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6774,7 +6689,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6785,9 +6700,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Tarnija hüvitis"
 
@@ -6825,8 +6738,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6903,6 +6819,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6920,7 +6843,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6938,14 +6861,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Müügiarve"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Tõene"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6961,9 +6883,8 @@ msgid "Total debit"
 msgstr "Deebetsumma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7013,7 +6934,7 @@ msgstr "Loo kirje"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7024,13 +6945,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7067,6 +6989,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7165,8 +7092,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7246,7 +7173,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7259,6 +7186,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7312,7 +7244,7 @@ msgid "Done"
 msgstr "Valmis"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7344,9 +7276,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7373,7 +7304,7 @@ msgid "Taxes:"
 msgstr "Maksud:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7565,6 +7496,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7654,7 +7591,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7705,7 +7642,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7772,7 +7709,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Müügipäevik"
@@ -7783,7 +7720,7 @@ msgid "Invoice Tax"
 msgstr "Arve Maks"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7822,7 +7759,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7847,7 +7784,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7879,7 +7816,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7897,9 +7834,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7916,17 +7852,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Klient"
@@ -7942,7 +7873,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Kassa"
@@ -7954,8 +7885,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7964,7 +7897,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -7975,7 +7907,7 @@ msgstr "Järjekord"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal konto"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8099,15 +8031,14 @@ msgid "Partner Ledger"
 msgstr "Partneri pearaamat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fikseeritud"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Ettevaatust !"
@@ -8175,7 +8106,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8250,7 +8181,7 @@ msgid "Associated Partner"
 msgstr "Seotud partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sa pead esmalt valima partneri !"
@@ -8330,13 +8261,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8407,7 +8338,7 @@ msgid "Net Total:"
 msgstr "Netosumma:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8427,13 +8358,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Mahakandmise päevik"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8460,11 +8384,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8505,7 +8424,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr ""
+msgstr "Makse"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8518,6 +8437,11 @@ msgstr "Võrdluse tulemus"
 msgid "Ending Balance"
 msgstr "Lõppbilanss"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8558,7 +8482,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8581,7 +8505,12 @@ msgid "Account Types"
 msgstr "Konto tüübid"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8589,8 +8518,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8608,10 +8537,9 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Nõuete konto"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Hoia tühjana, et kasutada tulude kontot"
 
 #. module: account
 #: view:account.invoice:0
@@ -8683,7 +8611,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8701,13 +8629,13 @@ msgid "Payment Term Line"
 msgstr "Maksetingimuste Rida"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Ostupäevik"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Vahesumma"
 
@@ -8736,11 +8664,6 @@ msgstr "Tähtaeg"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Tõene"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8875,8 +8798,9 @@ msgid "Journal Name"
 msgstr "Päeviku nimi"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8894,7 +8818,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Arveldamine ja maksed"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8922,7 +8846,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8983,7 +8907,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9005,7 +8929,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9039,7 +8963,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9084,7 +9008,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9099,18 +9023,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Päeviku kood"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9143,7 +9058,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9209,7 +9124,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9228,7 +9143,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9326,7 +9241,7 @@ msgstr "Ettevõtted, mis viidavad partnerile"
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "Küsi hüvitust"
 
 #. module: account
 #: view:account.move.line:0
@@ -9343,21 +9258,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Perioodide arv"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Maksukoodi mall"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9369,8 +9274,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9390,14 +9296,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Nõuete konto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9498,8 +9404,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9576,11 +9482,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Mittesobivad tehingud"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9598,11 +9499,16 @@ msgid "Balance :"
 msgstr "Bilanss :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9639,13 +9545,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9685,7 +9584,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9774,7 +9679,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9857,7 +9762,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9875,6 +9780,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9928,11 +9838,6 @@ msgstr "Kreedit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9944,7 +9849,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10029,7 +9934,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10352,7 +10257,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10477,7 +10389,7 @@ msgid "Receivable accounts"
 msgstr "Laekumiskontod"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10604,7 +10516,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10710,7 +10622,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10755,7 +10667,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Käsitsi Arve Maksud"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10834,14 +10746,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10900,6 +10804,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10919,6 +10828,10 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Ostuarve"
+
 #~ msgid "Subscription Periods"
 #~ msgstr "Tellimusperioodid"
 
@@ -11052,6 +10965,9 @@ msgstr ""
 #~ msgid "Line"
 #~ msgstr "Rida"
 
+#~ msgid "account.tax"
+#~ msgstr "konto.maks"
+
 #~ msgid "Printing Date"
 #~ msgstr "Printimise kuupäev"
 
@@ -11112,6 +11028,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Ostumaksud"
 
+#~ msgid "Line Name"
+#~ msgstr "Reanimi"
+
 #~ msgid "Value"
 #~ msgstr "Väärtus"
 
@@ -11273,6 +11192,9 @@ msgstr ""
 #~ msgid "Taxes missing !"
 #~ msgstr "Maks puudub !"
 
+#~ msgid "account.tax.template"
+#~ msgstr "konto.maksu.mall"
+
 #~ msgid "Current Date"
 #~ msgstr "Tänane kuupäev"
 
@@ -11448,6 +11370,9 @@ msgstr ""
 #~ msgid "Select Chart"
 #~ msgstr "Vali plaan"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Perioodiline töötlemine"
+
 #~ msgid "By Date and Period"
 #~ msgstr "Kuupäeva ja perioodi järgi"
 
@@ -11648,9 +11573,6 @@ msgstr ""
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Arvuta kood maksuga hindadele"
 
-#~ msgid "Fixed"
-#~ msgstr "Fikseeritud"
-
 #~ msgid "Debit Trans."
 #~ msgstr "Deebet tehing"
 
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index d5bdbfea15e..d4bd7a1b6c1 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Zerga"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Barne Izena"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr "Emaitzen adiskidetza"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 7bbb07dcd07..9ed89889800 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 14:12+0000\n"
 "Last-Translator: Samarian <a.samarian@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:24+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "مالیات"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "ثابت"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "هشدار!"
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10921,9 +10830,6 @@ msgstr ""
 #~ "The real total does not match the computed total."
 #~ msgstr "لطفا قيمت فاكتور را تاييد كنيد!"
 
-#~ msgid "Fixed"
-#~ msgstr "ثابت"
-
 #~ msgid "Origin"
 #~ msgstr "مبداء"
 
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index 932a0c58725..2baf54198be 100644
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-10 07:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dari Persian <fa_AF@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 64d26f9763b..2047c426a01 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:55+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Pura tapahtumien täsmäytys"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Tuo laskulta tai maksulta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,16 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Summa debet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Jos poistat täsmäytyksen tapahtumilta, sinun pitää myös tarkistaa kaikki "
-"toiminnot jotka on linkitetty näihin tapahtumiin, koska niitä ei oteta pois "
-"käytöstä"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -143,19 +127,19 @@ msgstr ""
 "poistamatta sitä."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -167,7 +151,7 @@ msgid "Warning!"
 msgstr "Varoitus!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -239,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Veromallit"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "tili.vero"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -259,6 +238,11 @@ msgstr "Kirjanpitoviennit ovat syötteenä täsmäytykselle"
 msgid "Belgian Reports"
 msgstr "Belgialaiset raportit"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -385,11 +369,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -444,6 +423,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -459,6 +443,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Tilikarttamalli"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -620,15 +609,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "neljännesvuosittainen"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Jos poistat suorituksia tapahtumista, sinun tulee myös varmistaa kaikki "
-"tapahtumiin liittyvät toiminnot koska niitä ei poisteta"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -677,7 +657,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -688,13 +668,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Myyntiraportti tilityypeittäin"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -757,6 +737,11 @@ msgstr "Saatavat tilit"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -779,6 +764,12 @@ msgstr "Uudelleen avaus"
 msgid "Are you sure you want to create entries?"
 msgstr "Oletko varma että haluat luoda merkinnät?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -799,6 +790,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Prosentti"
 
@@ -841,7 +833,7 @@ msgid "Type"
 msgstr "Tyyppi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -864,24 +856,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Suoritusten poisto"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -912,11 +898,6 @@ msgstr "J.C. / Siirron nimi"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -947,7 +928,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -962,6 +943,7 @@ msgstr "Uusi ennakkomaksu"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Laskenta"
 
@@ -993,11 +975,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1033,7 +1012,7 @@ msgid "Liability"
 msgstr "Vastuu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1104,10 +1083,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1183,8 +1162,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1230,7 +1210,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Pankki"
@@ -1526,9 +1506,9 @@ msgid "Account Receivable"
 msgstr "Tili saatavat"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1542,7 +1522,7 @@ msgid "With balance is not equal to 0"
 msgstr "Saldo ei ole tasan 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1597,7 +1577,7 @@ msgstr "Ohita 'luonnos' tila käsinsyötetyissä vienneissä"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1640,6 +1620,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Toimittajan hyvitykset"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Asiakoodi"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1677,7 +1663,6 @@ msgid "Groups"
 msgstr "Ryhmät"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Veroton"
@@ -1810,6 +1795,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Myynti tilityypeittäin"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1830,115 +1821,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2047,6 +1934,11 @@ msgstr "Nämä jaksot voivat olla päällekkäisiä."
 msgid "Draft statement"
 msgstr "Luonnostiliote"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2075,26 +1967,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2102,16 +1993,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2122,8 +2013,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2168,7 +2059,7 @@ msgid "period close"
 msgstr "Sulje jakso"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2268,7 +2159,7 @@ msgid "Product Category"
 msgstr "Tuotteen kategoria"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2631,7 +2522,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2649,7 +2540,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Luo tili tämän mallin pohjalta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2670,7 +2561,7 @@ msgid "Main Sequence"
 msgstr "Pääjakso"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2678,14 +2569,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Maksuehto"
 
@@ -2711,18 +2600,6 @@ msgstr "Valitse tämä laatikko"
 msgid "Filters"
 msgstr "Suodattimet"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Avoin"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2734,6 +2611,11 @@ msgstr "Laskun luonnostila"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2811,25 +2693,20 @@ msgid "Account Model Entries"
 msgstr "Tilimallin merkinnät"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Toimittajan verot"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "tapahtumat"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Pankkitiedot"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2852,7 +2729,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2866,9 +2742,8 @@ msgstr ""
 "useampi eräpäivä, esimerkiksi 50% nyt ja 50% kuukauden kuluttua."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2898,6 +2773,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Vero"
 
@@ -2933,14 +2809,14 @@ msgid "Accounts"
 msgstr "Tilit"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3037,6 +2913,12 @@ msgstr "Maksettu/Suoritettu"
 msgid "Refund Base Code"
 msgstr "Hyvityksen peruskoodi"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Pankin tiliotteet"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3089,11 +2971,6 @@ msgstr "Tase kumppanien erääntyvistä"
 msgid "Accounting entries"
 msgstr "Tiliviennit"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Yhteystapa"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3134,7 +3011,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3147,7 +3024,7 @@ msgid "Sales by Account"
 msgstr "Myynnit tileittäin"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3163,15 +3040,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Päiväkirjaan '%s' täytyy määritellä analyyttinen päiväkirja!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3179,7 +3056,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3241,9 +3118,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Rivi 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3289,12 +3167,6 @@ msgstr "Peruskoodin määrä"
 msgid "Default Sale Tax"
 msgstr "Oletus myyntivero"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3328,7 +3200,7 @@ msgid "Fiscal Position"
 msgstr "Talouskanta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3355,7 +3227,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3426,7 +3298,7 @@ msgstr ""
 "rahasiirrot käyttävät aina päivän kurssia."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3438,9 +3310,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Numeroiden määrä tilikoodissa"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Rivinimi"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3489,7 +3361,7 @@ msgid "View"
 msgstr "Näkymä"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3510,15 +3382,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Sähköinen tiedosto"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Verokoodimalli"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3526,9 +3403,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3656,12 +3612,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3676,7 +3635,7 @@ msgid "Starting Balance"
 msgstr "Aloitus balanssi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Ei kumppania määriteltynä!"
@@ -3876,7 +3835,7 @@ msgid "Period Length (days)"
 msgstr "Jakson pituus (päivää)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3900,7 +3859,7 @@ msgid "Category of Product"
 msgstr "Tuotteen Luokka"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4036,7 +3995,7 @@ msgid "Chart of Accounts Template"
 msgstr "Tilikarttamalli"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4122,9 +4081,12 @@ msgid "Qty"
 msgstr "Määrä"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Oikeudenkäynti"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4208,11 +4170,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4230,11 +4187,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Määrittele pankkitilit"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4279,8 +4231,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4310,7 +4262,7 @@ msgid "Consolidated Children"
 msgstr "Yhdistetyt alatilit"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4342,11 +4294,6 @@ msgstr ""
 msgid "title"
 msgstr "otsikko"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4436,6 +4383,13 @@ msgstr "30 päivää kuunloppu"
 msgid "Analytic Balance"
 msgstr "Analyyttinen saldo"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4455,6 +4409,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4465,11 +4424,6 @@ msgstr "Hae veropohjia"
 msgid "Draft Entries"
 msgstr "Viennit luonnostilassa"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4478,11 +4432,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4506,20 +4455,9 @@ msgid "Account Type"
 msgstr "Tilityyppi"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Sulje kassakone"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4540,9 +4478,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Sulje kassakone"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4570,7 +4519,7 @@ msgid "Month"
 msgstr "Kuukausi"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4581,8 +4530,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4606,6 +4555,11 @@ msgstr "PayPal tili"
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4618,7 +4572,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4640,7 +4594,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4695,11 +4649,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Säännöllisesti toistuva käsittely"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4729,10 +4678,9 @@ msgid "Account chart"
 msgstr "Tilikartta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Toimittajan lasku"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4800,10 +4748,14 @@ msgstr "Luottotiedot"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4852,7 +4804,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4867,7 +4819,7 @@ msgid "Based On"
 msgstr "Perustuen"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Change"
 msgstr "Muuta"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Pankki ja shekit"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4919,11 +4866,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Esim."
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4934,11 +4876,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Jätä tyhjäksi käyttääksesi tulotiliä"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4948,7 +4885,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5022,16 +4959,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5142,6 +5074,7 @@ msgstr "LIsää"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Maksettu"
 
@@ -5168,7 +5101,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5183,14 +5116,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5203,7 +5128,7 @@ msgid "Tax Application"
 msgstr "Verosovellus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5236,9 +5161,9 @@ msgid "End of period"
 msgstr "Jakson loppu"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Pankkitiedot"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Laskujen maksu"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5331,14 +5256,6 @@ msgstr "Veron kuvaus"
 msgid "Child Tax Accounts"
 msgstr "Alemmat verotilit"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5383,7 +5300,7 @@ msgid "Target Moves"
 msgstr "Kohteen liikkeet"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5419,6 +5336,7 @@ msgid "Python Code (reverse)"
 msgstr "Python -koodi (vastakohta)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5432,12 +5350,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5463,18 +5375,13 @@ msgstr "Vuosi"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Rivi 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Sisäinen nimi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5513,7 +5420,7 @@ msgstr "Tilinpäätös"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5546,7 +5453,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Suorita koodi (jos tyyppi=koodi)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5573,6 +5480,7 @@ msgstr "Automaattitäsmäytys"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5673,7 +5581,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5704,7 +5612,7 @@ msgid "Amount Computation"
 msgstr "Määrän laskenta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5740,10 +5648,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Viestintä"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Avoin"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5773,9 +5687,7 @@ msgstr "Varokoodit"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Asiakashyvitys"
 
@@ -5792,11 +5704,6 @@ msgstr "Verokoodin merkki"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Laskuraportti viimeisimmän 15 päivän ajalta"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5813,6 +5720,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Maksettava määrä"
@@ -5901,8 +5809,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5925,6 +5831,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5932,15 +5845,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Järjestys-kenttää käytetään maksuehtorivien järjestämiseen pienimmästä "
-"arvosta isoimpaan"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5998,12 +5902,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Korjattu määrä"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6027,7 +5930,6 @@ msgstr "Luo avausviennit"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Laskentatavat veromäärälle"
 
@@ -6055,18 +5957,23 @@ msgid "Child Accounts"
 msgstr "Alemmat tilit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Arvonalennus"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "tapahtumat"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6083,7 +5990,7 @@ msgstr "Tulo"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Toimittaja"
@@ -6103,16 +6010,11 @@ msgid "Account n°"
 msgstr "Tilinro."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Avoin viite"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Arvostus"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6222,7 +6124,7 @@ msgid "Filter by"
 msgstr "Suodata"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6269,6 +6171,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Päivien lukumäärä"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6408,7 +6318,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6583,7 +6493,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6614,12 +6524,6 @@ msgstr ""
 msgid "Current"
 msgstr "Nykyinen"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6644,7 +6548,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Prosenttiosuus"
 
@@ -6664,7 +6567,7 @@ msgid "Power"
 msgstr "Voima"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6709,12 +6612,17 @@ msgid "Applicable Type"
 msgstr "Sovellettava tyyppi"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Laskuviite"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6733,12 +6641,12 @@ msgstr ""
 "tapauksessa hankkimisen arviointi on tärkeää."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6805,7 +6713,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6816,9 +6724,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Toimittajan hyvitys"
 
@@ -6856,8 +6762,11 @@ msgid "Group By..."
 msgstr "Ryhmittely.."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6936,6 +6845,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Käteistapahtumat"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6953,7 +6869,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Merkinnät: "
@@ -6971,14 +6887,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Tosi"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6994,10 +6909,9 @@ msgid "Total debit"
 msgstr "Kokonais debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Merkintä \"%s\" ei ole kelvollinen!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7046,7 +6960,7 @@ msgstr "Luo merkintä"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7057,13 +6971,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Virhe!"
@@ -7100,6 +7015,11 @@ msgstr "Projektirivi"
 msgid "Manual"
 msgstr "Manuaalinen"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7198,8 +7118,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Alkusaldo"
@@ -7279,7 +7199,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7292,6 +7212,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7345,7 +7270,7 @@ msgid "Done"
 msgstr "Valmis"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7377,9 +7302,8 @@ msgid "Source Document"
 msgstr "Lähdedokumentti"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7406,7 +7330,7 @@ msgid "Taxes:"
 msgstr "Verot:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7603,6 +7527,12 @@ msgstr ""
 "Tätä kenttää käytetään vain jos kehität oman moduulin joka sallii "
 "kehittäjien luoda tiettyjä veroja muokatulla toimialueella."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Laskuviite"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7692,7 +7622,7 @@ msgid "Use model"
 msgstr "Käytä mallia"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7743,7 +7673,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7810,7 +7740,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Myyntipäiväkirja"
@@ -7821,7 +7751,7 @@ msgid "Invoice Tax"
 msgstr "Laskuta vero"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Ei osan numeroa!"
@@ -7860,7 +7790,7 @@ msgid "Sales Properties"
 msgstr "Myynnin ominaisuudet"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7885,7 +7815,7 @@ msgstr "päättyen"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7917,7 +7847,7 @@ msgid "May"
 msgstr "Toukokuu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7935,10 +7865,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Asiakoodi"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7954,17 +7883,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Asiakas"
@@ -7980,7 +7904,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Käteinen"
@@ -7992,9 +7916,11 @@ msgid "Account Destination"
 msgstr "Kirjanpidon kohde"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Laskujen maksu"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8002,7 +7928,6 @@ msgstr "Laskujen maksu"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8140,15 +8065,14 @@ msgid "Partner Ledger"
 msgstr "Kumppanin tilikirja"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Kiinteä"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Varoitus!"
@@ -8216,7 +8140,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Valitse laskun valuutta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Ei laskurivejä !"
@@ -8291,7 +8215,7 @@ msgid "Associated Partner"
 msgstr "Yhteistyökumppani"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sinun täytyy ensiksi valita yhteistyökumppani!"
@@ -8373,13 +8297,13 @@ msgstr ""
 "verojen laskemista."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8450,7 +8374,7 @@ msgid "Net Total:"
 msgstr "Netto:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8470,13 +8394,6 @@ msgstr "Yleisraportointi"
 msgid "Write-Off Journal"
 msgstr "Arvonalennuspäiväkirja"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "Tätä maksuehtoa käytetään oletuksen sijaan nykyiselle kumppanille"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8503,11 +8420,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Vero/Perus määrä"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8561,6 +8473,11 @@ msgstr "Suoritusajon tulos"
 msgid "Ending Balance"
 msgstr "Loppusaldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8601,7 +8518,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8624,7 +8541,12 @@ msgid "Account Types"
 msgstr "Tilityypit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8632,8 +8554,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8651,10 +8573,9 @@ msgid "Reconciliation"
 msgstr "Suoritusmerkinnät"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Saatavat tili"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Jätä tyhjäksi käyttääksesi tulotiliä"
 
 #. module: account
 #: view:account.invoice:0
@@ -8726,7 +8647,7 @@ msgid "The partner account used for this invoice."
 msgstr "Kumppanitiliä käytetään tälle laskulle."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8744,13 +8665,13 @@ msgid "Payment Term Line"
 msgstr "Maksuehtorivi"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Ostopäiväkirja"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Välisumma"
 
@@ -8779,11 +8700,6 @@ msgstr "Eräpäivä"
 msgid "Suppliers"
 msgstr "Toimittajat"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Tosi"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8918,9 +8834,10 @@ msgid "Journal Name"
 msgstr "Päiväkirjan nimi"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Merkintä \"%s\" ei ole kelvollinen!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8967,7 +8884,7 @@ msgstr ""
 "monivaluuttainen merkintä."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9028,7 +8945,7 @@ msgid "Reconciled entries"
 msgstr "Suoritetut merkinnät"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9050,7 +8967,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9084,7 +9001,7 @@ msgstr "Tuntematon"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Avauspäiväkirja"
@@ -9130,7 +9047,7 @@ msgstr ""
 "Määritä perustuuko verojen laskenta alemmille veroille vai loppusummaan."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9145,18 +9062,9 @@ msgstr "Syötetään Python koodina"
 msgid "Journal Code"
 msgstr "Päiväkirjakoodi"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9189,7 +9097,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9255,7 +9163,7 @@ msgid "Purchase Tax(%)"
 msgstr "Oston vero (%9"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Ole hyvä ja luo laskurivejä"
@@ -9274,7 +9182,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9389,21 +9297,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Jaksojen määrä"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Verokoodimalli"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokumentti: Asiakkaan tiliote"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9415,8 +9313,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9436,14 +9335,14 @@ msgid "Document"
 msgstr "Dokumentti"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Pankin tiliotteet"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Saatavat tili"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9544,8 +9443,8 @@ msgid "Move"
 msgstr "Siirto"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9624,11 +9523,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Suoritusten poiston tapahtumat"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9646,11 +9540,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9687,13 +9586,6 @@ msgstr "Ennakkomaksu"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9733,7 +9625,13 @@ msgid "Due date"
 msgstr "Eräpäivä"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9822,7 +9720,7 @@ msgid "Unreconciled"
 msgstr "Suorittamaton"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Epäkelpo loppusumma!"
@@ -9905,7 +9803,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9923,6 +9821,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9977,11 +9880,6 @@ msgstr "Kredit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9993,7 +9891,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10078,7 +9976,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10401,7 +10299,14 @@ msgid "Empty Accounts ? "
 msgstr "Tyhjennä tilit? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10526,7 +10431,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10653,7 +10558,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10759,7 +10664,7 @@ msgid "Accounting Documents"
 msgstr "Kirjanpitodokumentit"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10804,7 +10709,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Laskuta verot manuaalisesti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10883,14 +10788,6 @@ msgstr ""
 msgid "February"
 msgstr "Helmikuu"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10949,6 +10846,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr "Tuotemallin kustannustili"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10999,6 +10901,9 @@ msgstr ""
 #~ msgid "Printing Date"
 #~ msgstr "Tulostuspäivämäärä"
 
+#~ msgid "account.tax"
+#~ msgstr "tili.vero"
+
 #~ msgid "Field Name"
 #~ msgstr "Kentän nimi"
 
@@ -11085,6 +10990,9 @@ msgstr ""
 #~ msgid "Value"
 #~ msgstr "Arvo"
 
+#~ msgid "Line Name"
+#~ msgstr "Rivinimi"
+
 #~ msgid "Display History"
 #~ msgstr "Näkymähistoria"
 
@@ -11267,9 +11175,6 @@ msgstr ""
 #~ msgid "Entry label"
 #~ msgstr "Merkintänimike"
 
-#~ msgid "Fixed"
-#~ msgstr "Kiinteä"
-
 #~ msgid "Accounting Entries-"
 #~ msgstr "Kirjanpitomerkinnät"
 
@@ -11291,9 +11196,16 @@ msgstr ""
 #~ msgid "Journal de frais"
 #~ msgstr "Kulupäiväkirja"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Säännöllisesti toistuva käsittely"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Analyyttisten merkintöjen tilastot"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Toimittajan lasku"
+
 #~ msgid "Journal Voucher"
 #~ msgstr "Kirjanpitoaineisto"
 
@@ -11306,6 +11218,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Tosite nro."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Järjestys-kenttää käytetään maksuehtorivien järjestämiseen pienimmästä "
+#~ "arvosta isoimpaan"
+
 #, python-format
 #~ msgid "You must enter a period length that cannot be 0 or below !"
 #~ msgstr "Ajanjakson lukumäärä tulee olla suurempi kuin 0"
@@ -11442,6 +11361,9 @@ msgstr ""
 #~ msgid "End of Year Treatments"
 #~ msgstr "Loppuvuoden käsittelyt"
 
+#~ msgid "Litigation"
+#~ msgstr "Oikeudenkäynti"
+
 #~ msgid "Generic Reports"
 #~ msgstr "Yleiset raportit"
 
@@ -11506,6 +11428,11 @@ msgstr ""
 #~ msgid "Compute Taxes"
 #~ msgstr "Laske verot"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "Tätä maksuehtoa käytetään oletuksen sijaan nykyiselle kumppanille"
+
 #~ msgid "Standard entries"
 #~ msgstr "Normikohdat"
 
@@ -12442,6 +12369,9 @@ msgstr ""
 #~ msgid "Bad account !"
 #~ msgstr "Virheellinen tili!"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #, python-format
 #~ msgid "Error"
 #~ msgstr "Virhe"
@@ -12717,6 +12647,13 @@ msgstr ""
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Avaa suoritusten poistolle"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Jos poistat suorituksia tapahtumista, sinun tulee myös varmistaa kaikki "
+#~ "tapahtumiin liittyvät toiminnot koska niitä ei poisteta"
+
 #~ msgid "Account balance"
 #~ msgstr "Tili balanssi"
 
@@ -12756,6 +12693,14 @@ msgstr ""
 #~ msgid "Voucher Management"
 #~ msgstr "Kuponkien hallinta"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Jos poistat täsmäytyksen tapahtumilta, sinun pitää myös tarkistaa kaikki "
+#~ "toiminnot jotka on linkitetty näihin tapahtumiin, koska niitä ei oteta pois "
+#~ "käytöstä"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot remove/deactivate an account which is set as a property to any "
@@ -12898,6 +12843,9 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Käteistapahtuma"
 
+#~ msgid "Line 2:"
+#~ msgstr "Rivi 2:"
+
 #~ msgid "Starts on"
 #~ msgstr "Alkaa"
 
@@ -12953,6 +12901,9 @@ msgstr ""
 #~ msgid "Closing balance based on cashBox"
 #~ msgstr "Loppusaldo kassakoneessa"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Pankki ja shekit"
+
 #~ msgid "Salesman"
 #~ msgstr "Myyjä"
 
@@ -12962,6 +12913,12 @@ msgstr ""
 #~ msgid "Third Party (Country)"
 #~ msgstr "Kolmas osapuoli (maa)"
 
+#~ msgid "Line 1:"
+#~ msgstr "Rivi 1:"
+
+#~ msgid "Communication"
+#~ msgstr "Viestintä"
+
 #~ msgid "Transaction"
 #~ msgstr "Transaktio"
 
@@ -12971,6 +12928,9 @@ msgstr ""
 #~ msgid "Aged Receivables"
 #~ msgstr "Ikääntyneet saatavat"
 
+#~ msgid "Valuation"
+#~ msgstr "Arvostus"
+
 #~ msgid "  365 Days  "
 #~ msgstr "  365 päivää  "
 
@@ -13283,3 +13243,6 @@ msgstr ""
 
 #~ msgid "You can not create analytic line on view account."
 #~ msgstr "Et voi luoda analyyttistä riviä näkymätilille"
+
+#~ msgid "Example"
+#~ msgstr "Esim."
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 7642fa1a8ad..8754efae5b4 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-19 15:40+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 14:36+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -94,11 +93,6 @@ msgstr ""
 "La position fiscale d'un compte peut être définie seulement une seule fois "
 "pour ce compte"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Annuler le lettrage"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -147,9 +141,9 @@ msgid "Import from invoice or payment"
 msgstr "Importer depuis une facture ou un règlement"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Mauvais compte!"
@@ -160,15 +154,6 @@ msgstr "Mauvais compte!"
 msgid "Total Debit"
 msgstr "Total débit"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Si vous annulez le lettrage de ces écritures, vous devez également vérifier "
-"toutes les actions liées car elles ne seront pas désactivées"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -181,7 +166,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -212,19 +196,19 @@ msgstr ""
 "règlement sans les supprimer."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -236,7 +220,7 @@ msgid "Warning!"
 msgstr "Attention !"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Journal des opérations diverses"
@@ -319,11 +303,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Modèles de taxe"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -339,6 +318,11 @@ msgstr "Les écritures comptables sont une entrée du rapprochement."
 msgid "Belgian Reports"
 msgstr "Rapports belges"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -486,11 +470,6 @@ msgstr "Vous permet d'utiliser la comptabilité analytique"
 msgid "Salesperson"
 msgstr "Vendeur"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -545,6 +524,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -560,6 +544,11 @@ msgstr "Période:"
 msgid "Chart Template"
 msgstr "Modèle de plan comptable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -572,6 +561,14 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Si vous choisissez \"Arrondir par ligne\" : le montant de chaque taxe sera "
+"calculé pour chaque ligne d'un bon de commande, d'un devis, ou d'une "
+"facture, et les montants arrondis seront sommés pour obtenir la taxe totale. "
+"Si vous choisissez \"Arrondir le total\" : le montant de chaque taxe sera "
+"calculé pour chaque ligne, puis ces montants seront sommés, et seul la taxe "
+"totale sera arrondie. Si les prix de ventes incluent les taxes, vous devriez "
+"choisir \"Arrondir par ligne\" afin que les sous-totaux des lignes taxes "
+"comprises correspondent au total des taxes."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -721,15 +718,6 @@ msgstr "Précision décimale pour les entrées de journal"
 msgid "3 Monthly"
 msgstr "Trimestrielle"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si vous délettrez des écritures, vous devrez vérifier toutes les actions qui "
-"y sont liées."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -779,7 +767,7 @@ msgid "Profit Account"
 msgstr "Compte de résultat"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -791,13 +779,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "État des ventes par type de compte"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -862,6 +850,11 @@ msgstr "Comptes clients"
 msgid "Configure your company bank accounts"
 msgstr "Configurez les comptes bancaires de votre société"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -886,6 +879,12 @@ msgstr "Rouvrir"
 msgid "Are you sure you want to create entries?"
 msgstr "Etes vous sûr de vouloir saisir des écritures ?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -906,6 +905,7 @@ msgstr "Affiche les enregistrements enfants dans une vue hiérarchique"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Pourcentage"
 
@@ -948,7 +948,7 @@ msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -973,24 +973,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Factures et avoirs fournisseurs"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Délettrage"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "2% à 15 jours net, le solde à 30 jours fin de mois"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -1021,11 +1015,6 @@ msgstr "J.C. / description de l'écriture"
 msgid "Account Code and Name"
 msgstr "Code et Nom du Compte"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "créé"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1058,7 +1047,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1073,6 +1062,7 @@ msgstr "Nouvel abonnement"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Calcul"
 
@@ -1101,14 +1091,11 @@ msgstr "Due"
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Journal d'achat"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1127,7 +1114,7 @@ msgstr "Montant Total"
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
 msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "La référence de la facture fournie par le fournisseur"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1144,7 +1131,7 @@ msgid "Liability"
 msgstr "Passif"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1219,10 +1206,10 @@ msgid "Features"
 msgstr "Fonctionnalités"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1300,9 +1287,11 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Aucun compte de dépense n'a été défini pour cet article : \"%s\" ( id. : %d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1324,7 +1313,7 @@ msgstr "Caisses"
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Journal des avoirs de vente"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1347,7 +1336,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banque"
@@ -1645,9 +1634,9 @@ msgid "Account Receivable"
 msgstr "Compte client"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -1661,7 +1650,7 @@ msgid "With balance is not equal to 0"
 msgstr "Avec la balance qui n'est pas égale à 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1716,7 +1705,7 @@ msgstr "Sauter l'état \"Brouillon\" pour les écritures manuelles"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Non implémenté."
@@ -1729,7 +1718,7 @@ msgstr "Avoir"
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eFacturation & Règlements"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1761,6 +1750,12 @@ msgstr "Une table temporaire utilisée dans la vue Tableau de Bord"
 msgid "Supplier Refunds"
 msgstr "Avoirs fournisseurs"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Code de la case"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1798,7 +1793,6 @@ msgid "Groups"
 msgstr "Groupes"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Hors-taxe"
@@ -1905,7 +1899,7 @@ msgstr "Séquence pour exercice comptable"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Compte analytique"
 
 #. module: account
 #: report:account.overdue:0
@@ -1924,6 +1918,14 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Si vous choisissez \"Arrondir par ligne\" : le montant de chaque taxe sera "
+"calculé pour chaque ligne d'un bon de commande, d'un devis, ou d'une "
+"facture, et les montants arrondis seront sommés pour obtenir la taxe totale. "
+"Si vous choisissez \"Arrondir le total\" : le montant de chaque taxe sera "
+"calculé pour chaque ligne, puis ces montants seront sommés, et seul la taxe "
+"totale sera arrondie. Si les prix de ventes incluent les taxes, vous devriez "
+"choisir \"Arrondir par ligne\" afin que les sous-totaux des lignes taxes "
+"comprises correspondent au total des taxes."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1931,6 +1933,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Ventes par type de compte"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1951,114 +1959,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
-
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
+msgstr "Plusieurs entrées sont déjà réconciliées"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -2170,6 +2074,11 @@ msgstr "Ces périodes peuvent se chevaucher."
 msgid "Draft statement"
 msgstr "Relevé en brouillon"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2198,26 +2107,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2225,16 +2133,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2245,8 +2153,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2291,7 +2199,7 @@ msgid "period close"
 msgstr "Fermeture de période"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2329,7 +2237,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Devise par défaut"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2391,7 +2299,7 @@ msgid "Product Category"
 msgstr "Catégorie d'articles"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2430,12 +2338,12 @@ msgstr "Définition de la taxe"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Paramètrage de la comptabilité"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure de réference"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2456,7 +2364,7 @@ msgstr "Bon travail !"
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Gestion des immobilisation"
 
 #. module: account
 #: view:account.account:0
@@ -2552,7 +2460,7 @@ msgstr "Écritures Ouvertes"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_next:0
 msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Prochain numéro d'avoir fournisseur"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2598,7 +2506,7 @@ msgstr "30 jours nets"
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Vous n'avez pas les droits d'ouvrir ce %s journal"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
@@ -2762,7 +2670,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Laisser vide pour tous les exercices fiscaux ouverts"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2780,7 +2688,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Créer un compte à partir de ce modèle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2801,7 +2709,7 @@ msgid "Main Sequence"
 msgstr "Séquence principale"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2809,14 +2717,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Condition de règlement"
 
@@ -2842,18 +2748,6 @@ msgstr "Cocher cette case"
 msgid "Filters"
 msgstr "Filtres"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Ouverte"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2865,6 +2759,11 @@ msgstr "État brouillon d'une facture"
 msgid "Account Properties"
 msgstr "Propriétés du compte"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2944,25 +2843,20 @@ msgid "Account Model Entries"
 msgstr "Modèle d'écriture comptable"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Taxes fournisseurs"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "écritures"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Coordonnées bancaires"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2985,7 +2879,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3001,10 +2894,9 @@ msgstr ""
 "un mois."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr ""
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Prochain numéro de facture fournisseur"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3033,6 +2925,7 @@ msgstr "Ligne d'écriture lettrée (écriture d'écart)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Taxes"
 
@@ -3068,14 +2961,14 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3138,7 +3031,7 @@ msgstr "Réf."
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "Taxe d'achat"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -3176,6 +3069,12 @@ msgstr "Payée/Rapprochée"
 msgid "Refund Base Code"
 msgstr "Code pour base de l'avoir"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Relevés bancaires"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3228,15 +3127,10 @@ msgstr "Balance agée des tiers"
 msgid "Accounting entries"
 msgstr "Écritures comptables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Type de communication"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Le compte et la période doivent appartenir à la même société"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -3276,9 +3170,11 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"Les factures sélectionnées ne peuvent pas être confirmées car elles ne sont "
+"pas en état \"brouillon\" ou \"proforma\"."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3291,7 +3187,7 @@ msgid "Sales by Account"
 msgstr "Ventes par compte"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3304,18 +3200,18 @@ msgstr "Période comptable"
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Journal des ventes"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Vous devez définir un journal analytique sur le journal '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3323,7 +3219,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3388,9 +3284,10 @@ msgstr ""
 "très utile dans certains rapports."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Ligne 2 :"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3438,12 +3335,6 @@ msgstr "Montant Hors Taxe"
 msgid "Default Sale Tax"
 msgstr "Taxe de vente par défaut"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "La facture '%s' est validée."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3480,7 +3371,7 @@ msgid "Fiscal Position"
 msgstr "Position fiscale"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3509,7 +3400,7 @@ msgid "Trial Balance"
 msgstr "Balance générale"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3581,7 +3472,7 @@ msgstr ""
 "utilisent toujours le taux à la date courante."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3593,9 +3484,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Nombre de chiffres dans les numéros des comptes"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nom de ligne"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3644,7 +3535,7 @@ msgid "View"
 msgstr "Vue"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3666,14 +3557,19 @@ msgid "Electronic File"
 msgstr "Fichier électronique"
 
 #. module: account
-#: field:account.config.settings,has_chart_of_accounts:0
-msgid "Company has a chart of accounts"
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Jour du mois:0"
+#: field:account.config.settings,has_chart_of_accounts:0
+msgid "Company has a chart of accounts"
+msgstr "La société a un plan comptable"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Modèle de code de taxe"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3681,15 +3577,94 @@ msgid "Account Partner Ledger"
 msgstr "Livre des tiers"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Période comptable"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3718,7 +3693,7 @@ msgstr "Modèles de plans de comptes"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Opérations"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3819,15 +3794,20 @@ msgstr "Paramétrage de l'application de comptabilité"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
+msgstr "Déclaration de TVA"
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"En donnant un Nom différent de /, les écritures comptables porteront le même "
+"Nom."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Valeur : 0.02"
-
-#. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3842,7 +3822,7 @@ msgid "Starting Balance"
 msgstr "Solde initial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Pas de partenaire défini !"
@@ -3981,7 +3961,7 @@ msgstr "Transferts"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Cette société a son propre plan comptable"
 
 #. module: account
 #: view:account.chart:0
@@ -3992,7 +3972,7 @@ msgstr "Plan comptable"
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Retirer de l'argent"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4022,6 +4002,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquer pour créer une facture client.\n"
+"              </p><p>\n"
+"                La gestion électronique des factures d'OpenERP facilite le "
+"suivi des\n"
+"                paiements des clients.\n"
+"                Vos clients reçoivent la facture par courriel, et peuvent "
+"payer en ligne\n"
+"                et/ou importer la facture dans leur propre système.\n"
+"              </p><p>\n"
+"                Les discussions avec chaque client apparaissent "
+"automatiquement\n"
+"                au pied de chaque facture.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -4047,7 +4042,7 @@ msgid "Period Length (days)"
 msgstr "Durée de la période (jours)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4071,7 +4066,7 @@ msgid "Category of Product"
 msgstr "Catégorie d'article"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4212,7 +4207,7 @@ msgid "Chart of Accounts Template"
 msgstr "Modèle de plan comptable"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4280,7 +4275,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Vérifiez le total des factures fournisseur"
 
 #. module: account
 #: view:account.tax:0
@@ -4294,6 +4289,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Lorsque les périodes mensuelles sont créées. L'état est en \"Brouillon\". A "
+"la fin d'une période mensuelle, l'état passe en \"Fait\""
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4302,9 +4299,15 @@ msgid "Qty"
 msgstr "Qté"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litige"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Vous pouvez indiquer ici le coefficient qui sera utilisé pour consolider les "
+"montants de cas à son parent. Par exemple, mettez 1/-1 si vous voulez "
+"l'ajouter/le soustraire."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4389,11 +4392,6 @@ msgstr "Pas de société non configurée !"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4403,7 +4401,7 @@ msgstr "Date"
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "Le journal doit avoir un compte de crédit et crédit par défaut"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
@@ -4411,11 +4409,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Configurer les compte bancaires"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4462,11 +4455,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Vous ne pouvez pas utiliser un compte inactif"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4493,11 +4486,11 @@ msgid "Consolidated Children"
 msgstr "Enfants consolidés"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Données insuffisantes !"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4529,11 +4522,6 @@ msgstr ""
 msgid "title"
 msgstr "titre"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4564,7 +4552,7 @@ msgstr "Actif"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Comptabilité & Finance"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4623,6 +4611,13 @@ msgstr "30 Jours fin de mois"
 msgid "Analytic Balance"
 msgstr "Balance analytique"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4644,6 +4639,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Ecritures validées"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4654,11 +4654,6 @@ msgstr "Chercher un modèle de taxes"
 msgid "Draft Entries"
 msgstr "Écritures brouillon"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Jour du mois=-1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4666,11 +4661,9 @@ msgid ""
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Nombre de jours: 30"
+"Par exemple, une précision décimale de 2 permet une entrée du type : "
+"9,99EUR, alors qu'une précision décimale de 4 permet une entrée du type : "
+"0,0231€"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4695,20 +4688,9 @@ msgid "Account Type"
 msgstr "Type de compte"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Fermer la caisse"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4732,9 +4714,20 @@ msgstr ""
 "fournisseurs en état \"brouillon\"."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Fermer la caisse"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4749,6 +4742,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Erreur\n"
+"La durée de la/les période(s) est/sont invalide(s)"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4762,7 +4757,7 @@ msgid "Month"
 msgstr "Mois"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4773,8 +4768,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4798,6 +4793,11 @@ msgstr "Compte Paypal"
 msgid "Acc.Type"
 msgstr "Type de cpte."
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4810,7 +4810,7 @@ msgstr "Inverser le signe du solde"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Bilan (compte de passif)"
@@ -4832,7 +4832,7 @@ msgid "Account Base Code"
 msgstr "Code de base de compte"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4889,12 +4889,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
 msgid "Last Reconciliation:"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Traitements périodiques"
+msgstr "Dernier lettrage"
 
 #. module: account
 #: selection:account.move.line,state:0
@@ -4917,7 +4912,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Configurer vos options comptables"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4925,10 +4920,9 @@ msgid "Account chart"
 msgstr "Plan comptable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Facture fournisseur"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4996,8 +4990,12 @@ msgstr "Avoirs"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
+msgstr "Écritures comptables à lettrer"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
 msgstr ""
 
 #. module: account
@@ -5051,7 +5049,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5066,7 +5064,7 @@ msgid "Based On"
 msgstr "Basé sur"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -5091,11 +5089,6 @@ msgstr ""
 msgid "Change"
 msgstr "Change"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banques et chèques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5109,7 +5102,7 @@ msgstr "Sert de compte par défaut pour le crédit"
 #. module: account
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Motif du retrait de liquide de la caisse"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5118,26 +5111,16 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Annulée"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Exemple"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Vous permet de placer des factures dans l'état proforma."
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Laisser vide pour utiliser le compte de revenu"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5147,7 +5130,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Taxe sur les achats %.2f%%"
@@ -5184,7 +5167,7 @@ msgstr "Facture annulée"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Mes factures"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5194,7 +5177,7 @@ msgstr "Nouveau"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Taxe de vente"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5221,16 +5204,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "OD"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Facture (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5298,7 +5276,7 @@ msgstr "Chèque"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5344,6 +5322,7 @@ msgstr "Ajouter"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Payé"
 
@@ -5370,7 +5349,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Période d'ouverture"
@@ -5383,15 +5362,7 @@ msgstr "Écritures à vérifier"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
-
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+msgstr "Arrondir le total"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5405,7 +5376,7 @@ msgid "Tax Application"
 msgstr "Application de la Taxe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5438,9 +5409,9 @@ msgid "End of period"
 msgstr "Fin de la période"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Coordonnées bancaires"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Règlement des factures"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5476,7 +5447,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Responsable des finances"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5536,14 +5507,6 @@ msgstr "Nom de la taxe"
 msgid "Child Tax Accounts"
 msgstr "Comptes de taxe enfant"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5590,7 +5553,7 @@ msgid "Target Moves"
 msgstr "Mouvements Cibles"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5626,6 +5589,7 @@ msgid "Python Code (reverse)"
 msgstr "Code Python (TVA Incl)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5643,12 +5607,6 @@ msgstr ""
 "liste des taxes. Ce dernier choix suppose que les taxes définies sur ce "
 "modèle sont paramétrées"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5672,12 +5630,7 @@ msgstr "Année"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Ligne 1 :"
+msgstr "Cela indique que la facture a été envoyée"
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -5685,7 +5638,7 @@ msgid "Internal Name"
 msgstr "Nom interne"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5696,7 +5649,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Facture proforma "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5724,7 +5677,7 @@ msgstr "Bilan"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Produits & charges (Comptes de produit)"
@@ -5757,7 +5710,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Mode de Calcul (si type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5784,6 +5737,7 @@ msgstr "Lettrage automatique"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5881,10 +5835,12 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
+"Vous ne pouvez pas modifier/supprimer un journal contenant des écritures "
+"pour cette période"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5912,7 +5868,7 @@ msgid "Amount Computation"
 msgstr "Calcul du montant"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5948,10 +5904,16 @@ msgid "Account Common Account Report"
 msgstr "Rapports de comptabilité courants"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Ouverte"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5981,9 +5943,7 @@ msgstr "Codes de taxe"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Avoirs clients"
 
@@ -6000,11 +5960,6 @@ msgstr "Coefficient multiplicateur"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Rapport des factures créées depuis 15 jours"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Nombre de jours: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6021,6 +5976,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Montant à payer"
@@ -6102,7 +6058,7 @@ msgstr "Devise"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Arrondir à la ligne"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -6112,8 +6068,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6136,6 +6090,13 @@ msgstr "Texte standard"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Les écritures de règlement sont la deuxième partie du lettrage."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6146,15 +6107,6 @@ msgstr ""
 "comptables pour un montant équivalent afin de pouvoir les lettrer ensemble "
 "(puissance du lettrage automatique)"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Le champ séquence est utilisé pour classer les lignes des conditions de "
-"règlement des plus basses séquences vers les plus hautes."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6208,19 +6160,21 @@ msgstr "Rapprocher avec un ajustement"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Vous ne pouvez pas créer d'écritures comptables sur un compte de type \"vue\""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Montant fixe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Vous ne pouvez pas changer de taxe, vous devez supprimer et recréer les "
+"lignes."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6241,7 +6195,6 @@ msgstr "Générer l'écriture d'ouverture"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Méthode de calcul du montant"
 
@@ -6269,18 +6222,23 @@ msgid "Child Accounts"
 msgstr "Comptes fils"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Description de l'écriture (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustement"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "écritures"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6297,7 +6255,7 @@ msgstr "Produits"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Fournisseur"
@@ -6317,16 +6275,11 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Référence libre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valorisation"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6345,7 +6298,7 @@ msgstr "Correspondance fiscale"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Sélectionnez la société"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6442,7 +6395,7 @@ msgid "Filter by"
 msgstr "Filtrer par"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Vous avez une expression incorrecte \"%(...)s\" dans votre modèle !"
@@ -6489,6 +6442,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Nombre de jours"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6629,10 +6590,10 @@ msgstr "Ligne analytique"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modèles"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6722,7 +6683,7 @@ msgstr "Afficher les enfants"
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Banque et liquidités"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6808,10 +6769,10 @@ msgstr "Compte client"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Vous ne pouvez pas créer d'écriture sur un compte clos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6843,12 +6804,6 @@ msgstr ""
 msgid "Current"
 msgstr "Actuel"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6873,14 +6828,13 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Pourcentage"
 
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Arrondir le total"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6893,7 +6847,7 @@ msgid "Power"
 msgstr "Puissance"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Impossible de générer un code de journal inutilisé."
@@ -6940,12 +6894,17 @@ msgid "Applicable Type"
 msgstr "Applicable ?"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Référence de la facture"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6965,12 +6924,12 @@ msgstr ""
 "important."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7044,7 +7003,7 @@ msgid "Optional create"
 msgstr "Création facultative"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7057,9 +7016,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Avoir fournisseur"
 
@@ -7097,9 +7054,14 @@ msgid "Group By..."
 msgstr "Regrouper par..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  valorisation : Solde"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Il n'y a pas de période définie pour cette date : %s\n"
+"Merci d'en créer une."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7177,6 +7139,13 @@ msgstr "Le nom d'une taxe doit être unique par société !"
 msgid "Cash Transactions"
 msgstr "Transactions en liquide"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7194,7 +7163,7 @@ msgstr "Statistiques sur les écritures analytiques"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Écritures : "
@@ -7212,14 +7181,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Vrai"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Bilan (compte actif)"
@@ -7235,10 +7203,9 @@ msgid "Total debit"
 msgstr "Total débit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "L'écriture \"%s\" n'est pas valide !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Écritures du partenaire suivant à lettrer"
 
 #. module: account
 #: report:account.invoice:0
@@ -7289,7 +7256,7 @@ msgstr "Créer une écriture"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Produits & charges (Comptes de charges)"
@@ -7300,13 +7267,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -7343,6 +7311,11 @@ msgstr "Ligne de projet"
 msgid "Manual"
 msgstr "Manuel"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7449,8 +7422,8 @@ msgstr "Sélection du journal"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7532,7 +7505,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7552,10 +7525,15 @@ msgstr ""
 "\n"
 "par exmple : Mon modèle du %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Gérer les paiements clients"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7589,7 +7567,7 @@ msgstr "Factures clients"
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Divers"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7605,7 +7583,7 @@ msgid "Done"
 msgstr "Clôturé"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7644,11 +7622,9 @@ msgid "Source Document"
 msgstr "Document d'origine"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
-"Aucun compte de dépense n'a été défini pour cet article : \"%s\" ( id. : %d)."
 
 #. module: account
 #: constraint:account.account:0
@@ -7674,7 +7650,7 @@ msgid "Taxes:"
 msgstr "Taxes :"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7855,7 +7831,7 @@ msgstr "Compte de produit pour l'écriture d'ouverture"
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Autoriser les factures proforma"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7873,6 +7849,12 @@ msgstr ""
 "permettant ainsi aux développeurs de créer des taxes spécifiques dans un "
 "domaine spécifique."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Référence de la facture"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7919,7 +7901,7 @@ msgstr "Journal des comptes"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Mode d'arrondi pour le calcul des taxes"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7965,7 +7947,7 @@ msgid "Use model"
 msgstr "Utiliser le modèle"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8016,7 +7998,7 @@ msgid "Root/View"
 msgstr "Racine/vue"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "AN"
@@ -8085,7 +8067,7 @@ msgid "Maturity Date"
 msgstr "Date d'échéance"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Journal des ventes"
@@ -8096,7 +8078,7 @@ msgid "Invoice Tax"
 msgstr "Taxe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Pas de numéro de pièce !"
@@ -8140,7 +8122,7 @@ msgid "Sales Properties"
 msgstr "Propriétés des Ventes"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8165,7 +8147,7 @@ msgstr "au"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Écarts de change"
@@ -8199,7 +8181,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8220,10 +8202,9 @@ msgstr ""
 "la plus basse à  la plus élevée."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Code de la case"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8239,17 +8220,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Valider les écritures"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Client"
@@ -8265,7 +8241,7 @@ msgstr "Nom du rapport"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Liquidités"
@@ -8277,9 +8253,11 @@ msgid "Account Destination"
 msgstr "Compte de destination"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Règlement des factures"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8287,7 +8265,6 @@ msgstr "Règlement des factures"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8298,7 +8275,7 @@ msgstr "Séquence"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Compte Paypal"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8427,15 +8404,14 @@ msgid "Partner Ledger"
 msgstr "Livre des tiers"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fixe"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -8449,7 +8425,7 @@ msgstr ""
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Mode d'arrondi pour le calcul des taxes"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8503,7 +8479,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Choisissez une devise à appliquer à la facture"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Aucune ligne de facture !"
@@ -8582,7 +8558,7 @@ msgid "Associated Partner"
 msgstr "Partenaire Associé"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Vous devez d'abord sélectionner un partenaire !"
@@ -8664,13 +8640,13 @@ msgstr ""
 "avant le calcul des autres taxes."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Journal des avoirs d'achats"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8743,7 +8719,7 @@ msgid "Net Total:"
 msgstr "Total net :"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8751,7 +8727,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Numéro de facture suivant"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8763,15 +8739,6 @@ msgstr "Autres rapports financiers"
 msgid "Write-Off Journal"
 msgstr "Journal des pertes et profits"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Cette condition de règlement sera utilisée à la place de celle fixée par "
-"défaut pour le partenaire courant."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8798,11 +8765,6 @@ msgstr "Int.Type"
 msgid "Tax/Base Amount"
 msgstr "Montant"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Valorisation : Pourcentage"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8856,6 +8818,11 @@ msgstr "Résultat du lettrage"
 msgid "Ending Balance"
 msgstr "Solde final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8898,7 +8865,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Import automatique du rel. bancaire"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8921,7 +8888,12 @@ msgid "Account Types"
 msgstr "Types de compte"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8929,9 +8901,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Montant : n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS Category"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8948,10 +8920,9 @@ msgid "Reconciliation"
 msgstr "Lettrage"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Compte client"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Laisser vide pour utiliser le compte de revenu"
 
 #. module: account
 #: view:account.invoice:0
@@ -9031,7 +9002,7 @@ msgid "The partner account used for this invoice."
 msgstr "Le compte partenaire utilisé pour cette facture"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Taxe %.2f%%"
@@ -9049,13 +9020,13 @@ msgid "Payment Term Line"
 msgstr "Détail des conditions de règlement"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Journal des achats"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Sous-total"
 
@@ -9084,11 +9055,6 @@ msgstr "Date d'échéance"
 msgid "Suppliers"
 msgstr "Fournisseurs"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Vrai"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9225,9 +9191,10 @@ msgid "Journal Name"
 msgstr "Nom du journal"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Écritures du partenaire suivant à lettrer"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "L'écriture \"%s\" n'est pas valide !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9276,7 +9243,7 @@ msgstr ""
 "multi devise."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9339,7 +9306,7 @@ msgid "Reconciled entries"
 msgstr "Écritures rapprochées"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Modèle non cohérent !"
@@ -9361,7 +9328,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprimer le solde du partenaire"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9401,7 +9368,7 @@ msgstr "inconnu"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Journal d'ouverture"
@@ -9448,7 +9415,7 @@ msgstr ""
 "plutôt que sur le montant total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9463,21 +9430,9 @@ msgstr "Donné par le code Python"
 msgid "Journal Code"
 msgstr "Code du journal"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Vous pouvez indiquer ici le coefficient qui sera utilisé pour consolider les "
-"montants de cas à son parent. Par exemple, mettez 1/-1 si vous voulez "
-"l'ajouter/le soustraire."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Montant résiduel"
 
@@ -9510,7 +9465,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Journal des avoirs de ventes"
@@ -9576,7 +9531,7 @@ msgid "Purchase Tax(%)"
 msgstr "Taxe à l'achat (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Créer quelques lignes de facture SVP."
@@ -9595,7 +9550,7 @@ msgid "Display Detail"
 msgstr "Afficher le détail"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9713,21 +9668,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Nombre de périodes"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Modèle de code de taxe"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document : Relevé de compte client"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS Category"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9739,9 +9684,10 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Prochain numéro de facture fournisseur"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr ""
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9760,14 +9706,14 @@ msgid "Document"
 msgstr "Ref. document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Relevés bancaires"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Compte client"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9869,8 +9815,8 @@ msgid "Move"
 msgstr "N° d'écriture"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9897,7 +9843,7 @@ msgid ""
 "Error!\n"
 "The period is invalid. Either some periods are overlapping or the period's "
 "dates are not matching the scope of the fiscal year."
-msgstr ""
+msgstr "Erreur !"
 
 #. module: account
 #: report:account.overdue:0
@@ -9939,11 +9885,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Envoyé"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Ecritures non lettrées"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9961,11 +9902,16 @@ msgid "Balance :"
 msgstr "Balance :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10002,13 +9948,6 @@ msgstr "Abonnement"
 msgid "Account Analytic Balance"
 msgstr "Solde analytique"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10048,7 +9987,13 @@ msgid "Due date"
 msgstr "Date d'échéance"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10145,7 +10090,7 @@ msgid "Unreconciled"
 msgstr "Non lettré"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Total incorrect !"
@@ -10239,7 +10184,7 @@ msgid "Comparison"
 msgstr "Comparaison"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10261,6 +10206,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10314,11 +10264,6 @@ msgstr "Crédit"
 msgid "Draft Invoice "
 msgstr "Facture brouillon "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10330,7 +10275,7 @@ msgid "Journal Entry Model"
 msgstr "Modèle de pièce comptable"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "La période de début doit précéder la période de fin."
@@ -10415,7 +10360,7 @@ msgid "Profit (Loss) to report"
 msgstr "Bénéfice (perte) à reporter"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr "Il n'y a pas de journal(s) de vente ou d'achat de défini."
@@ -10746,7 +10691,14 @@ msgid "Empty Accounts ? "
 msgstr "Comptes vides ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Impossible de changer la taxe!"
@@ -10874,7 +10826,7 @@ msgid "Receivable accounts"
 msgstr "Compte client"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Déjà lettré."
@@ -11011,7 +10963,7 @@ msgid "Entries Sorted by"
 msgstr "Écritures triées par"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11119,7 +11071,7 @@ msgid "Accounting Documents"
 msgstr "Documents comptables"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11168,7 +11120,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Taxes manuelle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11249,16 +11201,6 @@ msgstr "Pertes"
 msgid "February"
 msgstr "Février"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"En donnant un Nom différent de /, les écritures comptables porteront le même "
-"Nom."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11317,6 +11259,11 @@ msgstr "Modèle de correspondance fiscale de compte"
 msgid "Expense Account on Product Template"
 msgstr "Compte de dépense sur les modèles d'article"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11346,6 +11293,9 @@ msgstr ""
 #~ msgid "Print Journal"
 #~ msgstr "Imprimer le journal"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "New Analytic Account"
 #~ msgstr "Nouveau compte analytique"
 
@@ -11440,9 +11390,6 @@ msgstr ""
 #~ "leurs propriétés. Vous pouvez créer votre propre vue pour accélérer votre "
 #~ "saisie dans les journaux."
 
-#~ msgid "Fixed"
-#~ msgstr "Fixe"
-
 #~ msgid "Origin"
 #~ msgstr "Origine"
 
@@ -11488,9 +11435,16 @@ msgstr ""
 #~ "Veuillez confirmer le relevé d'opérations avec/sans rapprochement du relevé "
 #~ "brouillon"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Traitements périodiques"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statistiques des ventilations analytiques"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Facture fournisseur"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Payé et lettré"
 
@@ -11616,6 +11570,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Taxes à l'achat"
 
+#~ msgid "Line Name"
+#~ msgstr "Nom de ligne"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Crédit Analytique"
 
@@ -11628,6 +11585,13 @@ msgstr ""
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Sélectionnez les factures que vous souhaitez régler"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Si vous délettrez des écritures, vous devrez vérifier toutes les actions qui "
+#~ "y sont liées."
+
 #~ msgid "Customer Credit"
 #~ msgstr "Crédit client"
 
@@ -11843,6 +11807,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Utilisez ce code pour la déclaration de TVA"
 
+#~ msgid "Litigation"
+#~ msgstr "Litige"
+
 #~ msgid "Taxes Reports"
 #~ msgstr "Rapport de taxes"
 
@@ -12423,6 +12390,9 @@ msgstr ""
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Définition du Journal Analytique"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "List of Accounts"
 #~ msgstr "Liste des Comptes"
 
@@ -13235,6 +13205,9 @@ msgstr ""
 #~ msgid "New Company Financial Setting"
 #~ msgstr "Paramétrage financier de la nouvelle société"
 
+#~ msgid "Line 2:"
+#~ msgstr "Ligne 2 :"
+
 #~ msgid "Cash Transaction"
 #~ msgstr "Transaction en liquide"
 
@@ -13301,6 +13274,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Vendeur"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banques et chèques"
+
 #~ msgid "Third Party (Country)"
 #~ msgstr "Tiers (pays)"
 
@@ -13310,6 +13286,9 @@ msgstr ""
 #~ msgid "Debit/Credit"
 #~ msgstr "Débit/Crédit"
 
+#~ msgid "Communication"
+#~ msgstr "Communication"
+
 #~ msgid "Transaction"
 #~ msgstr "Transaction"
 
@@ -13334,6 +13313,9 @@ msgstr ""
 #~ msgid "Move journal"
 #~ msgstr "Journal d'écriture"
 
+#~ msgid "Valuation"
+#~ msgstr "Valorisation"
+
 #, python-format
 #~ msgid ""
 #~ "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
@@ -13508,6 +13490,9 @@ msgstr ""
 #~ "Vous devez permettre l'annulation des écritures sur le journal pour "
 #~ "effectuer cette opération."
 
+#~ msgid "Line 1:"
+#~ msgstr "Ligne 1 :"
+
 #~ msgid "Valid Up to"
 #~ msgstr "Valide jusqu'à"
 
@@ -14328,6 +14313,10 @@ msgstr ""
 #~ msgid "Aged Receivables"
 #~ msgstr "Créances agées"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "La facture '%s' est validée."
+
 #~ msgid ""
 #~ "The fiscal position will determine taxes and the accounts used for the "
 #~ "partner."
@@ -14378,6 +14367,9 @@ msgstr ""
 #~ msgid "The company name must be unique !"
 #~ msgstr "Le nom de la société doit être unique !"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "2% à 15 jours net, le solde à 30 jours fin de mois"
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -14611,6 +14603,12 @@ msgstr ""
 #~ msgid "Quantity :"
 #~ msgstr "Quantité :"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Valeur : 0.02"
+
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Jour du mois:0"
+
 #, python-format
 #~ msgid ""
 #~ "Can not create the invoice !\n"
@@ -14641,10 +14639,16 @@ msgstr ""
 #~ "Vous ne pouvez pas créer une facture sur un journal centralisateur. Décochez "
 #~ "'Centralisation' dans les paramétrages du journal correspondant."
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Nombre de jours: 30"
+
 #, python-format
 #~ msgid "You can not create journal items on a closed account %s %s"
 #~ msgstr "Vous ne pouvez pas saisir d'écritures dans un compte clôturé %s %s"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Jour du mois=-1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Erreur! La date de début de l'exercice fiscal doit être antérieure à celle "
@@ -14667,9 +14671,18 @@ msgstr ""
 #~ msgid "My invoices"
 #~ msgstr "Mes factures"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Facture (Ref ${object.number or 'n/a' })"
+
+#~ msgid "Example"
+#~ msgstr "Exemple"
+
 #~ msgid "Analytic Entries during last 7 days"
 #~ msgstr "Imputations analytiques des 7 derniers jours"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Nombre de jours: 14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Cette action va effacer les taxes"
 
@@ -14990,6 +15003,13 @@ msgstr ""
 #~ msgid "Generate Your Chart of Accounts from a Chart Template"
 #~ msgstr "Générer votre plan comptable à partir d'un modèle"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Si vous annulez le lettrage de ces écritures, vous devez également vérifier "
+#~ "toutes les actions liées car elles ne seront pas désactivées"
+
 #~ msgid ""
 #~ "Date on which the partner accounting entries were reconciled last time"
 #~ msgstr ""
@@ -15224,6 +15244,13 @@ msgstr ""
 #~ "C'est très utile car cela permet de prévoir à tout moment les taxes dues en "
 #~ "début et en fin de mois ou du trimestre."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Le champ séquence est utilisé pour classer les lignes des conditions de "
+#~ "règlement des plus basses séquences vers les plus hautes."
+
 #~ msgid ""
 #~ "Payment terms define the conditions to pay a customer or supplier invoice in "
 #~ "one or several payments. Customers periodic reminders will use the payment "
@@ -15235,6 +15262,13 @@ msgstr ""
 #~ "périodiques seront établies à partir de ces informations. Les conditions de "
 #~ "règlement peuvent être attribuées à chaque client ou fournisseur."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Cette condition de règlement sera utilisée à la place de celle fixée par "
+#~ "défaut pour le partenaire courant."
+
 #, python-format
 #~ msgid "The payment term of supplier does not have a payment term line!"
 #~ msgstr ""
@@ -15287,6 +15321,15 @@ msgstr ""
 #~ msgstr ""
 #~ "Vous devez fournir un compte pour l'écriture d'écart/l'écart de change !"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  valorisation : Solde"
+
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Valorisation : Pourcentage"
+
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Montant : n.a"
+
 #~ msgid ""
 #~ "With Supplier Refunds you can manage the credit notes you receive from your "
 #~ "suppliers. A refund is a document that credits an invoice completely or "
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index ad984d0691f..fc046bcc080 100644
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-29 11:36+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: French (Belgium) <fr_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Notes de crédit (Fournisseurs)"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr "Case pour base de note de crédit"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Note de Crédit Client"
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Note de Crédit Fournisseur"
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Journal Remboursements Achats"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 69b8747c4e5..bb41350c810 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Romper conciliación das transaccións"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar da factura ou do pagamento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,16 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Débito Total"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Se desfas a conciliación de transaccións, tamén debe comprobar todas as "
-"accións que están vinculados a esas transaccións porque non van ser "
-"desactivadas"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -143,19 +127,19 @@ msgstr ""
 "sen eliminalo."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -167,7 +151,7 @@ msgid "Warning!"
 msgstr "¡Atención!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -239,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Plantillas de impostos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -259,6 +238,11 @@ msgstr "Os asentos contables son unha entrada da conciliación."
 msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -387,11 +371,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -446,6 +425,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -461,6 +445,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Plantilla de Plan Contable"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -622,15 +611,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Se desfai a transacción de conciliación, tamén debe comprobar as accións que "
-"están ligadas a estas operacións, porque non serán desactivadas"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -679,7 +659,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -690,13 +670,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Informe das vendas por tipo de conta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -759,6 +739,11 @@ msgstr "Contas de Ventas"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -781,6 +766,12 @@ msgstr "Re-Abrir"
 msgid "Are you sure you want to create entries?"
 msgstr "¿Seguro que queres crear os asentos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -801,6 +792,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaxe"
 
@@ -843,7 +835,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -866,24 +858,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Desfacer Conciliación"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -914,11 +900,6 @@ msgstr "J.C./Nome do Movemento"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -949,7 +930,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -964,6 +945,7 @@ msgstr "Nova subscripción"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Cálculo"
 
@@ -995,11 +977,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1035,7 +1014,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1109,10 +1088,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1190,8 +1169,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1237,7 +1217,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1533,9 +1513,9 @@ msgid "Account Receivable"
 msgstr "Conta de Ventas"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1549,7 +1529,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con saldo non é igual a 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1604,7 +1584,7 @@ msgstr "Omitir o Estado 'Borrador' para os Asentos Manuais"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1647,6 +1627,12 @@ msgstr "Unha táboa Temporal usada para a vista do Tableriro"
 msgid "Supplier Refunds"
 msgstr "Abono de proveedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1684,7 +1670,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Base"
@@ -1817,6 +1802,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Ventas por Tipo de Conta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1837,115 +1828,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2056,6 +1943,11 @@ msgstr "Estes períodos poden superpoñerse."
 msgid "Draft statement"
 msgstr "Extracto en borrador"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2084,26 +1976,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2111,16 +2002,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2131,8 +2022,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2177,7 +2068,7 @@ msgid "period close"
 msgstr "Peche de período"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2277,7 +2168,7 @@ msgid "Product Category"
 msgstr "Categoría de Producto"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2645,7 +2536,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Manter baleiro para tódolos anos fiscais abertos"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2663,7 +2554,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Crear unha conta baseada en esta plantilla"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2684,7 +2575,7 @@ msgid "Main Sequence"
 msgstr "Secuencia Principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2692,14 +2583,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Prazos de Pago"
 
@@ -2725,18 +2614,6 @@ msgstr "Marcar esta casilla"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Aberto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2748,6 +2625,11 @@ msgstr "Estado Borrador dunha factura"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2826,25 +2708,20 @@ msgid "Account Model Entries"
 msgstr "Modelos de Apuntes Contables"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impostos de Proveedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles bancarios"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2867,7 +2744,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2881,9 +2757,8 @@ msgstr ""
 "vencemento, por exemplo, 50% agora e 50% nun mes."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2913,6 +2788,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Imposto"
 
@@ -2948,14 +2824,14 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3053,6 +2929,12 @@ msgstr "Pago/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código Base Rectificativo"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extractos Bancarios"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3105,11 +2987,6 @@ msgstr "Saldos Vencidos de Empresa"
 msgid "Accounting entries"
 msgstr "Apuntes Contables"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3155,7 +3032,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3168,7 +3045,7 @@ msgid "Sales by Account"
 msgstr "Ventas por Conta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3184,15 +3061,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "¡Ten que definir un diario analítico no diario '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3200,7 +3077,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3264,9 +3141,10 @@ msgstr ""
 "A cantidade non é un requerimento legal pero é útil para algúns informes."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Liña 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3314,12 +3192,6 @@ msgstr "Importe Código Base"
 msgid "Default Sale Tax"
 msgstr "Imposto de Venta por Defecto"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3356,7 +3228,7 @@ msgid "Fiscal Position"
 msgstr "Posición Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3383,7 +3255,7 @@ msgid "Trial Balance"
 msgstr "Balance de Comprobación"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3455,7 +3327,7 @@ msgstr ""
 "empregan a tasa \"En data\"."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3467,9 +3339,9 @@ msgid "No. of Digits to use for account code"
 msgstr "No. de Díxitos a usar para o código de conta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nome da Liña"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3518,7 +3390,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3539,15 +3411,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Arquivo electrónico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla de Código de Imposto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3555,9 +3432,88 @@ msgid "Account Partner Ledger"
 msgstr "Libro de contas de empresa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3695,12 +3651,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"Se lle da un nome distinto de '/', os movementos contables creados terán o "
+"mesmo nome que o do extracto. Esto permite que as entradas do extracto teñan "
+"as mesmas referencias cas do propio extracto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3715,7 +3677,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡Non hai empresa definida!"
@@ -3919,7 +3881,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3943,7 +3905,7 @@ msgid "Category of Product"
 msgstr "Categoría do Produto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4080,7 +4042,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla de Plan de contas"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4170,9 +4132,12 @@ msgid "Qty"
 msgstr "Cantidade"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litixio"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4256,11 +4221,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4278,11 +4238,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4327,8 +4282,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4358,7 +4313,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4394,11 +4349,6 @@ msgstr ""
 msgid "title"
 msgstr "título"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4488,6 +4438,13 @@ msgstr "30 días fin de mes"
 msgid "Analytic Balance"
 msgstr "Saldo Analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4508,6 +4465,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4518,11 +4480,6 @@ msgstr "Buscar pantillas de impuestos"
 msgid "Draft Entries"
 msgstr "Asentos borrador"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4531,11 +4488,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4559,20 +4511,9 @@ msgid "Account Type"
 msgstr "Tipo de Conta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Peche de Caixa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4595,9 +4536,20 @@ msgstr ""
 "proveñen das contas analíticias. Estos xeran facturas borrador de proveedor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Peche de Caixa"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4625,7 +4577,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4636,8 +4588,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4661,6 +4613,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Tipo conta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4673,7 +4630,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4695,7 +4652,7 @@ msgid "Account Base Code"
 msgstr "Código base conta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4750,11 +4707,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamento periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4784,9 +4736,8 @@ msgid "Account chart"
 msgstr "Plan contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4855,10 +4806,14 @@ msgstr "Abonos"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4907,7 +4862,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4922,7 +4877,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4947,11 +4902,6 @@ msgstr ""
 msgid "Change"
 msgstr "Cambiar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco e cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4974,11 +4924,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4989,11 +4934,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5003,7 +4943,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5077,16 +5017,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5197,6 +5132,7 @@ msgstr "Engadir"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagado"
 
@@ -5223,7 +5159,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5238,14 +5174,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5258,7 +5186,7 @@ msgid "Tax Application"
 msgstr "Aplicación de impostos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5291,9 +5219,9 @@ msgid "End of period"
 msgstr "Fin do período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles bancarios"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5386,14 +5314,6 @@ msgstr "Descripción do imposto"
 msgid "Child Tax Accounts"
 msgstr "Contas impuestos fillas"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5438,7 +5358,7 @@ msgid "Target Moves"
 msgstr "Movementos destino"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5474,6 +5394,7 @@ msgid "Python Code (reverse)"
 msgstr "Código Python (inverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5487,12 +5408,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5518,18 +5433,13 @@ msgstr "Ano"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Liña 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nome interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5568,7 +5478,7 @@ msgstr "Balance de situación"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5601,7 +5511,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Código para calcular (se tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5628,6 +5538,7 @@ msgstr "Conciliación automática"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5728,7 +5639,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5758,7 +5669,7 @@ msgid "Amount Computation"
 msgstr "Cálculo importe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5794,10 +5705,16 @@ msgid "Account Common Account Report"
 msgstr "Contabilidade. Informe contable común"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicación"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Aberto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5827,9 +5744,7 @@ msgstr "Códigos de impostos"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Factura rectificativa (abono) de cliente"
 
@@ -5846,11 +5761,6 @@ msgstr "Signo código imposto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Informe de facturas creadas nos últimos 15 días"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5867,6 +5777,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5957,8 +5868,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5981,6 +5890,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Os apuntes de pago son a segunda entrada da conciliación."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5990,15 +5906,6 @@ msgstr ""
 "A potencia da conciliación automática a seleccionar e o número dos importes "
 "parciais que se poden combinar para atopar un saldo a cero."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"O campo secuencia e empregado para ordear as liñas de plazos de pago en "
-"orden ascendente."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6056,12 +5963,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Cantidade fixa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6085,7 +5991,6 @@ msgstr "Xerar asentos de apertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "O método de cálculo do importe do imposto."
 
@@ -6113,18 +6018,23 @@ msgid "Child Accounts"
 msgstr "Contas Fillas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Desaxuste"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6141,7 +6051,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -6161,16 +6071,11 @@ msgid "Account n°"
 msgstr "Conta nº"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valoración"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6285,7 +6190,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6332,6 +6237,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Número de Días"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6471,7 +6384,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6646,7 +6559,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6677,12 +6590,6 @@ msgstr ""
 msgid "Current"
 msgstr "Corrente"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6707,7 +6614,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Porcentaxe"
 
@@ -6727,7 +6633,7 @@ msgid "Power"
 msgstr "Enerxía"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6774,12 +6680,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6795,12 +6706,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6867,7 +6778,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6878,9 +6789,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6918,8 +6827,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6996,6 +6908,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7013,7 +6932,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -7031,14 +6950,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadeiro"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7054,9 +6972,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7106,7 +7023,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7117,13 +7034,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7160,6 +7078,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7258,8 +7181,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7339,7 +7262,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7352,6 +7275,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7405,7 +7333,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7437,9 +7365,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7466,7 +7393,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7658,6 +7585,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7747,7 +7680,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7798,7 +7731,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7865,7 +7798,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7876,7 +7809,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7915,7 +7848,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7940,7 +7873,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7972,7 +7905,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7990,9 +7923,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -8009,17 +7941,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Asertar asentos"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8035,7 +7962,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -8047,8 +7974,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -8057,7 +7986,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8189,15 +8117,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fixo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
@@ -8265,7 +8192,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8340,7 +8267,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8422,13 +8349,13 @@ msgstr ""
 "calcular os seguintes impostos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8499,7 +8426,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8519,13 +8446,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8552,11 +8472,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8610,6 +8525,11 @@ msgstr "Resultado da conciliación"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8650,7 +8570,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8673,7 +8593,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8681,8 +8606,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8700,9 +8625,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8775,7 +8699,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8793,13 +8717,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8828,11 +8752,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadeiro"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8967,8 +8886,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -9014,7 +8934,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9075,7 +8995,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9097,7 +9017,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9131,7 +9051,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9176,7 +9096,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9191,18 +9111,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9235,7 +9146,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9301,7 +9212,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9320,7 +9231,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9435,21 +9346,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla de Código de Imposto"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9461,8 +9362,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9482,14 +9384,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos Bancarios"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9590,8 +9492,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9668,11 +9570,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transaccións Desfacer conciliación"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9690,11 +9587,16 @@ msgid "Balance :"
 msgstr "Saldo:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9731,13 +9633,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9777,7 +9672,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9866,7 +9767,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9949,7 +9850,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9967,6 +9868,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10020,11 +9926,6 @@ msgstr "Crédito"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10036,7 +9937,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10121,7 +10022,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10444,7 +10345,14 @@ msgid "Empty Accounts ? "
 msgstr "¿Contas vacías? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10569,7 +10477,7 @@ msgid "Receivable accounts"
 msgstr "Contas a cobrar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10696,7 +10604,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10802,7 +10710,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10847,7 +10755,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10926,17 +10834,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Se lle da un nome distinto de '/', os movementos contables creados terán o "
-"mesmo nome que o do extracto. Esto permite que as entradas do extracto teñan "
-"as mesmas referencias cas do propio extracto."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10995,6 +10892,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11020,9 +10922,6 @@ msgstr ""
 #~ msgid "Charts of Account"
 #~ msgstr "Gráficas da conta"
 
-#~ msgid "Fixed"
-#~ msgstr "Fixo"
-
 #~ msgid "Account Num."
 #~ msgstr "Conta núm."
 
@@ -11111,6 +11010,14 @@ msgstr ""
 #~ "O informe de Perdas e Ganancias lle dá unha visión xeral das ganancias e "
 #~ "perdas da empresa nun único documento"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Se desfas a conciliación de transaccións, tamén debe comprobar todas as "
+#~ "accións que están vinculados a esas transaccións porque non van ser "
+#~ "desactivadas"
+
 #~ msgid "Accounting Entries-"
 #~ msgstr "Asentos contables-"
 
@@ -11128,6 +11035,9 @@ msgstr ""
 #~ msgid "Journal: %s"
 #~ msgstr "Diario:% s"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11200,6 +11110,9 @@ msgstr ""
 #~ "OpenERP. Os elementos de diario son creados por OpenERP se usa Extractos "
 #~ "bancarios, Rexistros de efectivo, ou os pagamentos do Cliente/Provedor"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Fiscal Year to Open"
 #~ msgstr "Ano Fiscal para abrir"
 
@@ -11247,6 +11160,13 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Nome do Enderezo da Factura"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Se desfai a transacción de conciliación, tamén debe comprobar as accións que "
+#~ "están ligadas a estas operacións, porque non serán desactivadas"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 Días   "
 
@@ -11402,6 +11322,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Diario"
 
+#~ msgid "Line 2:"
+#~ msgstr "Liña 2:"
+
 #~ msgid "Required"
 #~ msgstr "Obrigatorio"
 
@@ -11688,6 +11611,9 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Transacción en Efectivo"
 
+#~ msgid "Line Name"
+#~ msgstr "Nome da Liña"
+
 #~ msgid "Accounting Dashboard"
 #~ msgstr "Taboleiro de Contas"
 
@@ -11756,6 +11682,9 @@ msgstr ""
 #~ msgid "The journal must have default credit and debit account"
 #~ msgstr "O diario debe tener conta de débito e crédito por defecto"
 
+#~ msgid "Litigation"
+#~ msgstr "Litixio"
+
 #~ msgid "Contact Address Name"
 #~ msgstr "Nome da Dirección do Contacto"
 
@@ -11843,6 +11772,9 @@ msgstr ""
 #~ msgid "Customer Accounting Properties"
 #~ msgstr "Propiedades de contabilidade do cliente"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesamento periódico"
+
 #, python-format
 #~ msgid "Statement %s is confirmed, journal items are created."
 #~ msgstr "Confirmouse o extracto %s, crearonse os asientos contables."
@@ -11945,6 +11877,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Non"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco e cheques"
+
 #~ msgid "Are you sure ?"
 #~ msgstr "¿Estás seguro?"
 
@@ -12023,6 +11958,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Apertura da ciaxa"
 
+#~ msgid "Line 1:"
+#~ msgstr "Liña 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "O apunte \"%s\" non é válido"
@@ -12065,6 +12003,9 @@ msgstr ""
 #~ "¡Non pode facer esta modificación nun asento conciliado! ¡Observer que so "
 #~ "pode cambiar algúns campos non importantes!"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Diario bancario "
@@ -12105,6 +12046,13 @@ msgstr ""
 #~ "O diario indicado non ten asentos contables en estado borrador para este "
 #~ "período"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "O campo secuencia e empregado para ordear as liñas de plazos de pago en "
+#~ "orden ascendente."
+
 #~ msgid ""
 #~ "If no additional entries should be recorded on a fiscal year, you can close "
 #~ "it from here. It will close all opened periods in this year that will make "
@@ -12146,6 +12094,9 @@ msgstr ""
 #~ "Axiliza o pago de facturas e crea interfaces para conectar sistemas de pago "
 #~ "automatizados."
 
+#~ msgid "Valuation"
+#~ msgstr "Valoración"
+
 #, python-format
 #~ msgid "You can not use an inactive account!"
 #~ msgstr "¡Non pode empregar unha conta inactiva!"
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 53089974fba..55fd208b636 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 04:15+0000\n"
 "Last-Translator: Amit Rasmiya (OpenERP) <Unknown>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "કુલ ઉધાર"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "ચેતવણી!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "ટેક્સ નમૂનાઓ"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "ખાતુ.વેરો"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "ત્રિમાસીક"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "ટકાવારી"
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr "પ્રકાર"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr "સમૂહો"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr "ફિલ્ટરો"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "ખોલો"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr "ખાતાઓ"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr "જુઓ"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  રકમ:0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr "મહિનો"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr "બદલો"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "રદ કરેલ છે"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "આંતરિક નામ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,10 +5623,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "ખોલો"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "ચૂકવવાની રકમ"
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr "ઘાતાંક"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "ખરુ"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr "કુલ ઉધાર"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr "મદદપત્રિકા"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr "પુર્ણ થયુ"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr "પ્રતિ"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "ચોક્કસ"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "ચેતવણી"
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,9 +8511,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  રકમ: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "ખરુ"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "બાકી નીકળતી રકમ"
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr "દસ્તાવેજ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr "ખસેડો"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr "ઉમેદવારી"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr "જમા"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10912,9 +10821,6 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Fixed"
-#~ msgstr "ચોક્કસ"
-
 #~ msgid "OK"
 #~ msgstr "બરાબર"
 
@@ -11018,6 +10924,12 @@ msgstr ""
 #~ msgid "   30 Days   "
 #~ msgstr "   માસીક   "
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  રકમ:0.02"
+
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  રકમ: n.a"
+
 #~ msgid "Configure Fiscal Year"
 #~ msgstr "નાણાંકીય વર્ષ રેખાંકન"
 
@@ -11039,3 +10951,6 @@ msgstr ""
 
 #~ msgid "All Analytic Entries"
 #~ msgstr "તમામ વિશ્લેષક મુલ્યો"
+
+#~ msgid "account.tax"
+#~ msgstr "ખાતુ.વેરો"
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 96a158e08a9..b87fd28ebaf 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-19 07:00+0000\n"
 "Last-Translator: Natan Alter <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index d437f1f7ff5..5eee6464116 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-03 07:14+0000\n"
 "Last-Translator: Vibhav Pant <vibhavp@gmail.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "कुल जमा"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "चेतावनी!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "विविध जर्नल"
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "टैक्स टेम्पलेट्स"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr "बेल्जियम रिपोर्ट"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 0e0da3a14ca..8a427dd3a06 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 14:32+0000\n"
 "Last-Translator: Velimir Valjetic <velimir.valjetic@procudo.hr>\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: 2012-12-14 05:37+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Nepodmirene transakcije"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Uvezi iz računa ili plaćanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Nepostojeći račun!"
@@ -93,15 +88,6 @@ msgstr "Nepostojeći račun!"
 msgid "Total Debit"
 msgstr "Ukupno duguje"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Ako otvarate stavke, morate provjeriti/provesti i sve ostale vezane akcije i "
-"stanja."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +98,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -141,19 +126,19 @@ msgid ""
 msgstr "Omogućuje skrivanje neaktivnih uvjeta plaćanja."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -165,7 +150,7 @@ msgid "Warning!"
 msgstr "Upozorenje!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Ostali dokumenti"
@@ -239,11 +224,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Predlošci poreza"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -259,6 +239,11 @@ msgstr "Accounting entries are an input of the reconciliation."
 msgid "Belgian Reports"
 msgstr "Belgian Reports"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -386,11 +371,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "račun.porez.predložak"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -445,6 +425,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -460,6 +445,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Predložak kontnog plana"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -621,15 +611,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "tromjesečno"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
-"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -678,7 +659,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -689,13 +670,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Izvještaj o prodaji po vrsti konta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "IRA"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -758,6 +739,11 @@ msgstr "Potražna konta"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -780,6 +766,12 @@ msgstr "Ponovno otvori"
 msgid "Are you sure you want to create entries?"
 msgstr "Sigurno želite kreirati stavke?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -800,6 +792,7 @@ msgstr "Hijerahijski prikaz podređenih"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Postotak"
 
@@ -842,7 +835,7 @@ msgid "Type"
 msgstr "Vrsta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -865,24 +858,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Ulazni računi i povrati"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Poništavanje zatvaranja IOS-a"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -913,11 +900,6 @@ msgstr "J.C./Move name"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -948,7 +930,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -963,6 +945,7 @@ msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Izračun"
 
@@ -994,11 +977,8 @@ msgid "Purchase journal"
 msgstr "Dokument nabave"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1034,7 +1014,7 @@ msgid "Liability"
 msgstr "Obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1105,10 +1085,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1186,8 +1166,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1233,7 +1214,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1529,9 +1510,9 @@ msgid "Account Receivable"
 msgstr "Konto potraživanja"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1545,7 +1526,7 @@ msgid "With balance is not equal to 0"
 msgstr "Sa saldom različitim od 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1600,7 +1581,7 @@ msgstr "Preskoči stanje 'Nacrt' za ručni upis"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1643,6 +1624,12 @@ msgstr "Privremena tablica za kontrolnu ploču"
 msgid "Supplier Refunds"
 msgstr "Povrat dobavljaču"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Šifra"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1680,7 +1667,6 @@ msgid "Groups"
 msgstr "Grupe"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Osnovica"
@@ -1813,6 +1799,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Prodaja po tipu konta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1833,115 +1825,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2052,6 +1940,11 @@ msgstr "Ova razdoblja se mogu preklapati."
 msgid "Draft statement"
 msgstr "Izvod u pripremi"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2080,26 +1973,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2107,16 +1999,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2127,8 +2019,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2173,7 +2065,7 @@ msgid "period close"
 msgstr "zatvori period"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2273,7 +2165,7 @@ msgid "Product Category"
 msgstr "Grupa proizvoda"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2637,7 +2529,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Ostavite prazno za sve otvorene fiskalne godine"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2655,7 +2547,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Kreiraj  konto prema ovom predlošku"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2676,7 +2568,7 @@ msgid "Main Sequence"
 msgstr "Glavna br. serija"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2684,14 +2576,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Uvjet plaćanja"
 
@@ -2717,18 +2607,6 @@ msgstr "Označite ovu kućicu"
 msgid "Filters"
 msgstr "Filtri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Otvoreno"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2740,6 +2618,11 @@ msgstr "Stanje računa 'Nacrt'"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2817,25 +2700,20 @@ msgid "Account Model Entries"
 msgstr "Stavke modela"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "URA"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Pretporez"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalji banke"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2858,7 +2736,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2872,9 +2749,8 @@ msgstr ""
 "plaćanja mogu izračunati više uplata, npr. 50% odmah, 50% za mjesec dana."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2904,6 +2780,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Porez"
 
@@ -2939,14 +2816,14 @@ msgid "Accounts"
 msgstr "Konta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3043,6 +2920,12 @@ msgstr "Plaćeno/Usklađeno"
 msgid "Refund Base Code"
 msgstr "Porezna grupa za osnovicu"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Izvodi banke"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3095,11 +2978,6 @@ msgstr "Struktura IOS-a partnera"
 msgid "Accounting entries"
 msgstr "Knjigovodstveni unosi"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3145,7 +3023,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3158,7 +3036,7 @@ msgid "Sales by Account"
 msgstr "Prodaje po kontu"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3174,15 +3052,15 @@ msgid "Sale journal"
 msgstr "Dokument prodaje"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Morate definirati analitički dnevnik na dnevniku '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3190,7 +3068,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3254,9 +3132,10 @@ msgstr ""
 "The quantity is not a legal requirement but is very useful for some reports."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Redak 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3303,12 +3182,6 @@ msgstr "Iznos osnovice"
 msgid "Default Sale Tax"
 msgstr "Uobičajeni porezi prodaje"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "račun  '%s' je validiran."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3344,7 +3217,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalna pozicija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3371,7 +3244,7 @@ msgid "Trial Balance"
 msgstr "Bilanca"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3442,7 +3315,7 @@ msgstr ""
 "always use the rate at date."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3454,9 +3327,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Broj znamenki za upotrebu u šifri konta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Naziv stavke"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3505,7 +3378,7 @@ msgid "View"
 msgstr "Pogled"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3526,15 +3399,20 @@ msgstr "Proforma računi"
 msgid "Electronic File"
 msgstr "Elektronska datoteka"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Predložak PDV obrasca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3542,9 +3420,88 @@ msgid "Account Partner Ledger"
 msgstr "Saldo konti partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3679,12 +3636,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3699,7 +3662,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nije definiran partner !"
@@ -3903,7 +3866,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3927,7 +3890,7 @@ msgid "Category of Product"
 msgstr "Grupa proizvoda"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4063,7 +4026,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4153,9 +4116,14 @@ msgid "Qty"
 msgstr "Kol."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Sporno"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Koeficijent zbrajanja na nadređenu grupu. Npr.  1/-1 za zbrajanje/oduzimanje "
+"ili 0 za izostavljanje."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4239,11 +4207,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4261,11 +4224,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Upišite vaše bankovne račune"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4310,8 +4268,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4341,7 +4299,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirana konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4377,11 +4335,6 @@ msgstr ""
 msgid "title"
 msgstr "naslov"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4471,6 +4424,13 @@ msgstr "30 dana kraj mjeseca"
 msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4490,6 +4450,11 @@ msgstr "Neaktivna konta se neće prikazivati u listama odabira."
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4500,11 +4465,6 @@ msgstr "Traži predloške poreza"
 msgid "Draft Entries"
 msgstr "Stavke u stanju \"Nacrt\""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4513,11 +4473,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4541,20 +4496,9 @@ msgid "Account Type"
 msgstr "Vrsta konta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Zatvori blagajnu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4577,9 +4521,20 @@ msgstr ""
 "mogu kreirati nacrte ulaznih računa."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Zatvori blagajnu"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4607,7 +4562,7 @@ msgid "Month"
 msgstr "Mjesec"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4618,8 +4573,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4643,6 +4598,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Tip konta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4655,7 +4615,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4677,7 +4637,7 @@ msgid "Account Base Code"
 msgstr "Porezna grupa osnovice"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4732,11 +4692,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodična obrada"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4766,10 +4721,9 @@ msgid "Account chart"
 msgstr "Kontni plan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Ulazni račun"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4837,10 +4791,14 @@ msgstr "Odobrenja"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4889,7 +4847,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4904,7 +4862,7 @@ msgid "Based On"
 msgstr "Na osnovu"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4929,11 +4887,6 @@ msgstr ""
 msgid "Change"
 msgstr "Promjeni"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banka i čekovi"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4956,11 +4909,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Otkazani"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Primjer"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4971,11 +4919,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Ostavite prazno za konto prihoda"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4985,7 +4928,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5059,16 +5002,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5179,6 +5117,7 @@ msgstr "Dodaj"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Plaćeno"
 
@@ -5205,7 +5144,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5220,14 +5159,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5240,7 +5171,7 @@ msgid "Tax Application"
 msgstr "Porez se primjenjuje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5273,9 +5204,9 @@ msgid "End of period"
 msgstr "Završetak perioda"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalji banke"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Plaćanje računa"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5368,14 +5299,6 @@ msgstr "Opis poreza"
 msgid "Child Tax Accounts"
 msgstr "Podređeni porezi"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5420,7 +5343,7 @@ msgid "Target Moves"
 msgstr "Ciljna knjiženja"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5456,6 +5379,7 @@ msgid "Python Code (reverse)"
 msgstr "Python kod (obrnuti)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5469,12 +5393,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5500,18 +5418,13 @@ msgstr "Godina"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linija 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interni naziv"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5550,7 +5463,7 @@ msgstr "Bilanca stanja"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5583,7 +5496,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Programski kod (ako je tip=Python kod)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5610,6 +5523,7 @@ msgstr "Automatsko zatvaranje"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5712,7 +5626,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5742,7 +5656,7 @@ msgid "Amount Computation"
 msgstr "Izračun iznosa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5778,10 +5692,16 @@ msgid "Account Common Account Report"
 msgstr "Account Common Account Report"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Veza"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Otvoreno"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5811,9 +5731,7 @@ msgstr "Porezne grupe"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Odobrenje kupcu"
 
@@ -5830,11 +5748,6 @@ msgstr "Koef. poreza"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Izvještaj o računima kreiranima u zadnjih 15 dana"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Broj dana: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5851,6 +5764,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Za uplatu"
@@ -5942,8 +5856,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5966,6 +5878,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Payment entries are the second input of the reconciliation."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5975,15 +5894,6 @@ msgstr ""
 "Višekratnik automatskog zatvaranja je broj pojedinačnih iznosa koji će se "
 "kombinirati kod traženja odgovarajućeg iznosa"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Polje redoslijed se upotrebljava za redanje redaka uvjeta plaćanja od "
-"najmanjeg do najvećeg"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6041,12 +5951,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fiksni iznos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6070,7 +5979,6 @@ msgstr "Kreiraj početno stanje"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Način izračuna iznosa poreza"
 
@@ -6098,18 +6006,23 @@ msgid "Child Accounts"
 msgstr "Podređena konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Naziv knjiženja (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6126,7 +6039,7 @@ msgstr "Prihod"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -6146,16 +6059,11 @@ msgid "Account n°"
 msgstr "Konto br."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Slobodna vezna oznaka"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Vrijednost"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6270,7 +6178,7 @@ msgid "Filter by"
 msgstr "Filtriraj po"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6317,6 +6225,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Broj dana"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6457,7 +6373,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6632,7 +6548,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6663,12 +6579,6 @@ msgstr ""
 msgid "Current"
 msgstr "Trenutno"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6693,7 +6603,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Postotak"
 
@@ -6713,7 +6622,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6759,12 +6668,17 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Poziv na br."
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6784,12 +6698,12 @@ msgstr ""
 "je vazan."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6862,7 +6776,7 @@ msgid "Optional create"
 msgstr "Opcionalno kreiranje"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6873,9 +6787,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Odobrenje dobavljača"
 
@@ -6913,8 +6825,11 @@ msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6993,6 +6908,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Transakcije blagajne"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7010,7 +6932,7 @@ msgstr "Statistike analitike"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Stavke: "
@@ -7028,14 +6950,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Točno"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7051,10 +6972,9 @@ msgid "Total debit"
 msgstr "Total debit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Stavka \"%s\" nije ispravna !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7107,7 +7027,7 @@ msgstr "Stvori stavku"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7118,13 +7038,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Greška !"
@@ -7161,6 +7082,11 @@ msgstr "Redak projekta"
 msgid "Manual"
 msgstr "Ručno"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7263,8 +7189,8 @@ msgstr "Odabir dnevnika"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Početni saldo"
@@ -7346,7 +7272,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7366,6 +7292,11 @@ msgstr ""
 "\n"
 "npr. Knjiženje troškova plaće za %(month)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7419,7 +7350,7 @@ msgid "Done"
 msgstr "Izvršeno"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7456,9 +7387,8 @@ msgid "Source Document"
 msgstr "Izvorni dokument"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7485,7 +7415,7 @@ msgid "Taxes:"
 msgstr "Porezi:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7684,6 +7614,12 @@ msgstr ""
 "Ovo polje se upotrebljava samo ako razvijate vlastiti modul te dozvoljava "
 "razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Poziv na br."
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7775,7 +7711,7 @@ msgid "Use model"
 msgstr "Koristi model"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7826,7 +7762,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7894,7 +7830,7 @@ msgid "Maturity Date"
 msgstr "Datum dospijeća"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Dnevnik prodaje"
@@ -7905,7 +7841,7 @@ msgid "Invoice Tax"
 msgstr "Porezi računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Ne postoji broj dijela !"
@@ -7944,7 +7880,7 @@ msgid "Sales Properties"
 msgstr "Svojstva prodaje"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7969,7 +7905,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8001,7 +7937,7 @@ msgid "May"
 msgstr "Svibanj"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8019,10 +7955,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Šifra"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8038,17 +7973,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Knjiži temeljnicu"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -8064,7 +7994,7 @@ msgstr "Naziv izvještaja"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -8076,9 +8006,11 @@ msgid "Account Destination"
 msgstr "Ciljni konto"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Plaćanje računa"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8086,7 +8018,6 @@ msgstr "Plaćanje računa"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8224,15 +8155,14 @@ msgid "Partner Ledger"
 msgstr "Salda konti partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -8300,7 +8230,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Odaberite valutu računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nema stavaka računa !"
@@ -8379,7 +8309,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Morate prvo odabrati partnera !"
@@ -8459,13 +8389,13 @@ msgid ""
 msgstr "Iznos ovog poreza dodati osnovici prije izračuna slijedećeg poreza."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Knjiga odobrenja dobavljača"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8537,7 +8467,7 @@ msgid "Net Total:"
 msgstr "Osnovica:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8557,13 +8487,6 @@ msgstr "Generički izvještaji"
 msgid "Write-Off Journal"
 msgstr "Dnevnik otpisa"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "Ovaj uvjet plaćanja će se koristiti kao uobičajeni za ovog partnera."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8590,11 +8513,6 @@ msgstr "Int.tip"
 msgid "Tax/Base Amount"
 msgstr "Iznos poreza/osnovice"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8648,6 +8566,11 @@ msgstr "Rezultat zatvaranja"
 msgid "Ending Balance"
 msgstr "Ending Balance"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8690,7 +8613,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatski uvoz bankovnih izvoda"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8713,7 +8636,12 @@ msgid "Account Types"
 msgstr "Account Types"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8721,9 +8649,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr ""
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "RDG / Bilanca"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8740,10 +8668,9 @@ msgid "Reconciliation"
 msgstr "Zatvaranje"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto potraživanja"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
 #: view:account.invoice:0
@@ -8815,7 +8742,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera za ovaj račun"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8833,13 +8760,13 @@ msgid "Payment Term Line"
 msgstr "Redak uvjeta plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Dnevnik URA"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Podzbroj"
 
@@ -8868,11 +8795,6 @@ msgstr "Datum dospijeća"
 msgid "Suppliers"
 msgstr "Dobavljači"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Točno"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9007,9 +8929,10 @@ msgid "Journal Name"
 msgstr "Naziv dnevnika"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Stavka \"%s\" nije ispravna !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9055,7 +8978,7 @@ msgid ""
 msgstr "Iznos u drugoj valuti ."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9117,7 +9040,7 @@ msgid "Reconciled entries"
 msgstr "Zatvorene stavke"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9139,7 +9062,7 @@ msgid "Print Account Partner Balance"
 msgstr "Print Account Partner Balance"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9173,7 +9096,7 @@ msgstr "nepoznato"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik početnog stanja"
@@ -9220,7 +9143,7 @@ msgstr ""
 "ukupnog iznosa."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9235,20 +9158,9 @@ msgstr "Pytkon programski kod"
 msgid "Journal Code"
 msgstr "Šifra dnevnika"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Koeficijent zbrajanja na nadređenu grupu. Npr.  1/-1 za zbrajanje/oduzimanje "
-"ili 0 za izostavljanje."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Preostali iznos"
 
@@ -9281,7 +9193,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Dnevnik odobrenja kupcima"
@@ -9347,7 +9259,7 @@ msgid "Purchase Tax(%)"
 msgstr "Porez nabave(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Molim upišite stavke računa."
@@ -9366,7 +9278,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9483,21 +9395,11 @@ msgstr "Knjigovođa potvrđuje temeljnicu nastalu potvrdom računa. "
 msgid "Number of Periods"
 msgstr "Broj perioda"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Predložak PDV obrasca"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Izvod konta kupca"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "RDG / Bilanca"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9509,8 +9411,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9530,14 +9433,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Izvodi banke"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9638,8 +9541,8 @@ msgid "Move"
 msgstr "Temeljnica"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9719,11 +9622,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transakcije poništavanja zatvaranja"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9741,11 +9639,16 @@ msgid "Balance :"
 msgstr "Saldo"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9782,13 +9685,6 @@ msgstr "Pretplata"
 msgid "Account Analytic Balance"
 msgstr "Saldo Analitike"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9828,7 +9724,13 @@ msgid "Due date"
 msgstr "Datum dospijeća"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9917,7 +9819,7 @@ msgid "Unreconciled"
 msgstr "Otvoren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Pogrešan ukupni iznos !"
@@ -10007,7 +9909,7 @@ msgid "Comparison"
 msgstr "Usporedba"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10025,6 +9927,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10080,11 +9987,6 @@ msgstr "Potražuje"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10096,7 +9998,7 @@ msgid "Journal Entry Model"
 msgstr "Model temeljnice"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10181,7 +10083,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10510,7 +10412,14 @@ msgid "Empty Accounts ? "
 msgstr "Prazna konta ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10635,7 +10544,7 @@ msgid "Receivable accounts"
 msgstr "Konta potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10762,7 +10671,7 @@ msgid "Entries Sorted by"
 msgstr "Sortirano po"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10868,7 +10777,7 @@ msgid "Accounting Documents"
 msgstr "Dokumenti računovodstva"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10913,7 +10822,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ručni porezi računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10994,17 +10903,6 @@ msgstr ""
 msgid "February"
 msgstr "Veljača"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11063,6 +10961,11 @@ msgstr "Predlozak  mapiranja konta"
 msgid "Expense Account on Product Template"
 msgstr "Zadani konto troška za proizvode"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11093,9 +10996,6 @@ msgstr ""
 #~ msgid "Entry label"
 #~ msgstr "Oznaka stavke"
 
-#~ msgid "Fixed"
-#~ msgstr "Fiksno"
-
 #~ msgid "Accounting Entries-"
 #~ msgstr "Računovodstvene stavke-"
 
@@ -11114,6 +11014,9 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Stanje"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodična obrada"
+
 #~ msgid "Printing Date"
 #~ msgstr "Datum ispisa"
 
@@ -11603,6 +11506,9 @@ msgstr ""
 #~ msgid "Subscription Entries"
 #~ msgstr "Stavke pretplate"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Can be draft or validated"
 #~ msgstr "Može biti u pripremi ili potvrđen"
 
@@ -11713,6 +11619,13 @@ msgstr ""
 #~ msgid "Move Lines Created."
 #~ msgstr "Stvoreni retci prijenosa."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Polje redoslijed se upotrebljava za redanje redaka uvjeta plaćanja od "
+#~ "najmanjeg do najvećeg"
+
 #~ msgid ""
 #~ "The optional quantity expressed by this line, eg: number of product sold. "
 #~ "The quantity is not a legal requirement but is very usefull for some reports."
@@ -11817,6 +11730,10 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Ukupno"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Ulazni račun"
+
 #~ msgid "Bank Reconciliation"
 #~ msgstr "Usklađivanje (zatvaranje) izvoda banke"
 
@@ -11880,6 +11797,13 @@ msgstr ""
 #~ msgid "Fiscal Position Template Account Mapping"
 #~ msgstr "Predložak mapiranja konta za fiskalnu poziciju"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+#~ "radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Odaberite račune koje želite platiti i omogućuje avanse"
 
@@ -12015,6 +11939,9 @@ msgstr ""
 #~ msgid "Entries Encoding by Line"
 #~ msgstr "Direktan unos stavki"
 
+#~ msgid "Litigation"
+#~ msgstr "Sporno"
+
 #~ msgid "Acc. Type Name"
 #~ msgstr "Naziv vrste konta"
 
@@ -12613,6 +12540,9 @@ msgstr ""
 #~ msgid "No sequence defined on the journal !"
 #~ msgstr "Nije definiran brojač na dnevniku!"
 
+#~ msgid "Line 2:"
+#~ msgstr "Redak 2:"
+
 #~ msgid "Cash Transaction"
 #~ msgstr "Uk. transakcije"
 
@@ -12705,6 +12635,9 @@ msgstr ""
 #~ msgid "Starting Date"
 #~ msgstr "Početni datum"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banka i čekovi"
+
 #, python-format
 #~ msgid "Error"
 #~ msgstr "Greška"
@@ -12725,6 +12658,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Otvaranje blagajne"
 
+#~ msgid "Line 1:"
+#~ msgstr "Linija 1:"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Dnevnik banke "
@@ -12743,6 +12679,9 @@ msgstr ""
 #~ msgid "Transaction"
 #~ msgstr "Transakcija"
 
+#~ msgid "Communication"
+#~ msgstr "Veza"
+
 #~ msgid "Sort By"
 #~ msgstr "Sortiraj po"
 
@@ -12770,6 +12709,9 @@ msgstr ""
 #~ msgid "You can not use an inactive account!"
 #~ msgstr "Ne mozete koristiti neaktivan konto!"
 
+#~ msgid "Valuation"
+#~ msgstr "Vrijednost"
+
 #, python-format
 #~ msgid "not implemented"
 #~ msgstr "nije implementirano"
@@ -12998,6 +12940,13 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "Definirajte brojčanu seriju na dnevniku računa"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Ako otvarate stavke, morate provjeriti/provesti i sve ostale vezane akcije i "
+#~ "stanja."
+
 #, python-format
 #~ msgid "Invoice line account company does not match with invoice company."
 #~ msgstr "Konto na stavci računa ne pripada organizaciji sa zaglavlja računa."
@@ -13023,6 +12972,9 @@ msgstr ""
 #~ "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 #~ "Cash Registers, or Customer/Supplier payments."
 
+#~ msgid "account.tax.template"
+#~ msgstr "račun.porez.predložak"
+
 #~ msgid ""
 #~ "This field contains the informatin related to the numbering of the journal "
 #~ "entries of this journal."
@@ -13268,6 +13220,9 @@ msgstr ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
 
+#~ msgid "Line Name"
+#~ msgstr "Naziv stavke"
+
 #~ msgid "Customer Credit"
 #~ msgstr "Potraživanja od kupca"
 
@@ -13867,6 +13822,11 @@ msgstr ""
 #~ "Promjeni račun: Kreira storno/odobrenje cijelog računa, zatvara ga i kreira "
 #~ "novu kopiju spremnu za izmjene."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "Ovaj uvjet plaćanja će se koristiti kao uobičajeni za ovog partnera."
+
 #~ msgid ""
 #~ "With Customer Refunds you can manage the credit notes for your customers. A "
 #~ "refund is a document that credits an invoice completely or partially. You "
@@ -14180,6 +14140,10 @@ msgstr ""
 #~ "Ovaj konto će se koristiti za vrednovanje izlaza sa zalihe za trenutnu "
 #~ "kategoriju artikla koristeći prodajnu cijenu"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "račun  '%s' je validiran."
+
 #~ msgid "Liabilities"
 #~ msgstr "Pasiva"
 
@@ -14201,6 +14165,12 @@ msgstr ""
 #~ msgid "My invoices"
 #~ msgstr "Moji računi"
 
+#~ msgid "Example"
+#~ msgstr "Primjer"
+
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Broj dana: 14"
+
 #, python-format
 #~ msgid "Error :"
 #~ msgstr "Greška :"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 31d16dc52dd..ffd1d893f84 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-23 10:35+0000\n"
 "Last-Translator: Juhász Krisztián <Unknown>\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: 2012-12-04 05:22+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Párosítás visszavonása"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "Importálás számlából vagy pénzügyi rendezésből"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,15 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Tartozik összesen"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Ha visszavonja a tranzakciók párosítását, ellenőriznie kell a tranzakciókhoz "
-"kapcsolt minden műveletet, mert azok nem kerülnek visszavonásra."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -110,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -140,19 +125,19 @@ msgstr ""
 "Ha az aktív mező nincs bejelölve, nem használható a fizetési feltétel."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -164,7 +149,7 @@ msgid "Warning!"
 msgstr "Figyelem!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -236,11 +221,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Adósablonok"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -256,6 +236,11 @@ msgstr "A könyvelési tételek a párosítás bemenetei."
 msgid "Belgian Reports"
 msgstr "Belga kimutatások"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -384,11 +369,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -443,6 +423,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -458,6 +443,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Számlatükör sablon"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -619,15 +609,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Negyedéves"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Ha visszavonja a tranzakciók párosítását, ellenőriznie kell a tranzakciókhoz "
-"kapcsolt minden műveletet, mert azok nem kerülnek visszavonásra."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -676,7 +657,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -687,13 +668,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Számlatípusonkénti értékesítési kimutatás"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -756,6 +737,11 @@ msgstr "Vevő számlák"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -778,6 +764,12 @@ msgstr "Visszanyitás"
 msgid "Are you sure you want to create entries?"
 msgstr "Biztos benne, hogy létre akarja hozni a tételeket?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -798,6 +790,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Százalék"
 
@@ -840,7 +833,7 @@ msgid "Type"
 msgstr "Típus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -863,24 +856,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Párosítás visszavonása"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -911,11 +898,6 @@ msgstr "Naplókód/Megnevezés"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -947,7 +929,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -962,6 +944,7 @@ msgstr "Új előjegyzés"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Számítás"
 
@@ -993,11 +976,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1033,7 +1013,7 @@ msgid "Liability"
 msgstr "Kötelezettség"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1106,10 +1086,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1187,8 +1167,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1234,7 +1215,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1530,9 +1511,9 @@ msgid "Account Receivable"
 msgstr "Vevő számla"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1546,7 +1527,7 @@ msgid "With balance is not equal to 0"
 msgstr "Nem 0 egyenlegűek"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1601,7 +1582,7 @@ msgstr "Azonnali könyvelés"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1644,6 +1625,12 @@ msgstr "Vezérlőpult nézet ideiglenes táblázata"
 msgid "Supplier Refunds"
 msgstr "Bejövő jóváíró számlák"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Adógyűjtő kód"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1681,7 +1668,6 @@ msgid "Groups"
 msgstr "Csoportok"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Nettó érték"
@@ -1814,6 +1800,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Számlatípusonkénti értékesítés"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1834,115 +1826,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2052,6 +1940,11 @@ msgstr "Ezek az időszakok egybeeshetnek."
 msgid "Draft statement"
 msgstr "Tervezet állapotú kivonat"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2080,26 +1973,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2107,16 +1999,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2127,8 +2019,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2173,7 +2065,7 @@ msgid "period close"
 msgstr "Időszak zárása"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2274,7 +2166,7 @@ msgid "Product Category"
 msgstr "Termék kategória"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2640,7 +2532,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Hagyja üresen, ha minden nyitott évre akarja listázni"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2658,7 +2550,7 @@ msgid "Create an Account Based on this Template"
 msgstr "A sablon alapján főkönyvi számla létrehozása"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2679,7 +2571,7 @@ msgid "Main Sequence"
 msgstr "Fő sorszám"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2687,14 +2579,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Fizetési feltétel"
 
@@ -2720,18 +2610,6 @@ msgstr "Jelölje meg ezt a négyzetet"
 msgid "Filters"
 msgstr "Szűrők"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Nyitott"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2743,6 +2621,11 @@ msgstr "A számla tervezet állapota"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2820,25 +2703,20 @@ msgid "Account Model Entries"
 msgstr "Modelltételek"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Beszerzési adók"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankadatok"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2861,7 +2739,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2876,9 +2753,8 @@ msgstr ""
 "azonnal, 50% 1 hónap múlva."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2908,6 +2784,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "ÁFA"
 
@@ -2943,14 +2820,14 @@ msgid "Accounts"
 msgstr "Főkönyvi számlák"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3047,6 +2924,12 @@ msgstr "Kifizetett/párosított"
 msgid "Refund Base Code"
 msgstr "Adóalapgyűjtő kód (jóváíró szlák)"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bankkivonatok"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3099,11 +2982,6 @@ msgstr "Korosított folyószámla kivonat"
 msgid "Accounting entries"
 msgstr "Könyvelési tételek"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3149,7 +3027,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3162,7 +3040,7 @@ msgid "Sales by Account"
 msgstr "Főkönyvi számlánkénti értékesítés"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3178,15 +3056,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "A(z) '%s' naplóhoz meg kell határoznia egy gyűjtőnaplót!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3194,7 +3072,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3259,9 +3137,10 @@ msgstr ""
 "kimutatásban nagyon hasznos."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "2. sor:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3307,12 +3186,6 @@ msgstr "Adóalapgyűjtő összege"
 msgid "Default Sale Tax"
 msgstr "Alapértelmezett fizetendő ÁFA"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "'%s' számla jóváhagyásra került."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3349,7 +3222,7 @@ msgid "Fiscal Position"
 msgstr "ÁFA pozíció"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3376,7 +3249,7 @@ msgid "Trial Balance"
 msgstr "Főkönyvi kivonat"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3444,7 +3317,7 @@ msgstr ""
 "csökkenéseit. A növekedéseknél mindig a napi árfolyamot használja a rendszer."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3456,9 +3329,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Számjegyek száma a főkönyvi számla számában"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Sor neve"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3507,7 +3380,7 @@ msgid "View"
 msgstr "Gyűjtő"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3528,15 +3401,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektronikus file"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Adógyűjtő sablon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3544,9 +3422,88 @@ msgid "Account Partner Ledger"
 msgstr "Folyószámla karton"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3682,12 +3639,17 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"Ha a névnek nem a / jelet adja meg, akkor a könyvelési tételeknek ugyanaz "
+"lesz a bizonylatszáma, mint a kivonatnak."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3702,7 +3664,7 @@ msgid "Starting Balance"
 msgstr "Nyitó egyenleg"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nem adott meg partnert!"
@@ -3904,7 +3866,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3928,7 +3890,7 @@ msgid "Category of Product"
 msgstr "Termék katerógia"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4065,7 +4027,7 @@ msgid "Chart of Accounts Template"
 msgstr "Számlatükör sablon"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4155,9 +4117,15 @@ msgid "Qty"
 msgstr "Menny."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Peresített"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Itt megadhatja az együtthatót, amelyet a fölérendelt adógyűjtőben való "
+"összevonásnál használ a rendszer. Állítson be 1-et, ha hozzá akarja adni az "
+"összeget, és -1-et, ha le akarja vonni."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4240,11 +4208,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4262,11 +4225,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4311,8 +4269,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4342,7 +4300,7 @@ msgid "Consolidated Children"
 msgstr "Konszolidált számlák"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4377,11 +4335,6 @@ msgstr ""
 msgid "title"
 msgstr "Megnevezés"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4472,6 +4425,13 @@ msgstr "30 nap, hó vége"
 msgid "Analytic Balance"
 msgstr "Gyűjtőkód kivonat"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4491,6 +4451,11 @@ msgstr "Ha az aktív mező nincs bejelölve, nem használható a főkönyvi szá
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4501,11 +4466,6 @@ msgstr "Adósablonok keresése"
 msgid "Draft Entries"
 msgstr "Könyveletlen tételek"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4514,11 +4474,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4542,20 +4497,9 @@ msgid "Account Type"
 msgstr "Számlatípus"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Pénzkazetta zárása"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4578,9 +4522,20 @@ msgstr ""
 "állapotú bejövő számlákat."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Pénzkazetta zárása"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4608,7 +4563,7 @@ msgid "Month"
 msgstr "Hónap"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4619,8 +4574,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4644,6 +4599,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Számlatípus"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4656,7 +4616,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4678,7 +4638,7 @@ msgid "Account Base Code"
 msgstr "Adóalapgyűjtő kód"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4733,11 +4693,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Időszaki feldolgozás"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4767,10 +4722,9 @@ msgid "Account chart"
 msgstr "Számlatükör"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Szállítói számla"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4838,10 +4792,14 @@ msgstr "Jóváíró számlák"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4890,7 +4848,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4905,7 +4863,7 @@ msgid "Based On"
 msgstr "Alapján"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4930,11 +4888,6 @@ msgstr ""
 msgid "Change"
 msgstr "Átváltás"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4957,11 +4910,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Érvénytelenített"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4972,11 +4920,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "-"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4986,7 +4929,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5060,16 +5003,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5180,6 +5118,7 @@ msgstr "Hozzáadás"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Rendezett"
 
@@ -5206,7 +5145,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5221,14 +5160,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5241,7 +5172,7 @@ msgid "Tax Application"
 msgstr "Alkalmazási terület"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5274,9 +5205,9 @@ msgid "End of period"
 msgstr "Időszak vége"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankadatok"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Számlák átutalása"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5369,14 +5300,6 @@ msgstr "Adótípus"
 msgid "Child Tax Accounts"
 msgstr "Alárendelt adószámlák"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5421,7 +5344,7 @@ msgid "Target Moves"
 msgstr "Figyelembe vett tételek"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5457,6 +5380,7 @@ msgid "Python Code (reverse)"
 msgstr "Python kód (fordított)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5470,12 +5394,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5501,18 +5419,13 @@ msgstr "Év"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "1. sor:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Belső név"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5551,7 +5464,7 @@ msgstr "Mérleg"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5584,7 +5497,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Számítási kód (ha a típus = Python kód)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5611,6 +5524,7 @@ msgstr "Automatikus párosítás"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5714,7 +5628,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5745,7 +5659,7 @@ msgid "Amount Computation"
 msgstr "Összeg kiszámítása"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5781,10 +5695,16 @@ msgid "Account Common Account Report"
 msgstr "Általános főkönyvi számla kimutatás"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Kommunikáció"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Nyitott"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5814,9 +5734,7 @@ msgstr "Adógyűjtők"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Kimenő jóváíró számla"
 
@@ -5833,11 +5751,6 @@ msgstr "Adógyűjtő előjel"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Kimutatás az elmúlt 15 napban készített számlákról"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5854,6 +5767,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5944,8 +5858,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5968,6 +5880,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "A pénzügyi rendezés tételei a párosítás második bemenetei."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5975,15 +5894,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr "Maximálisan párosítható tételek száma"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"A sorszám mező rakja sorba a fizetési feltétel sorokat a legalacsonyabb "
-"sorszámútól a legmagasabbig."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6041,12 +5951,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fix összeg"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6070,7 +5979,6 @@ msgstr "Nyitó tételek előállítása"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Az adóösszeg kiszámítási módszere."
 
@@ -6098,18 +6006,23 @@ msgid "Child Accounts"
 msgstr "Alárendelt számlák"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Különbözet leírása"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6126,7 +6039,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Szállító"
@@ -6146,16 +6059,11 @@ msgid "Account n°"
 msgstr "Számla száma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Szabad hivatkozás"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Értékelés"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6271,7 +6179,7 @@ msgid "Filter by"
 msgstr "Szűrés"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6318,6 +6226,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Napok száma"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6459,7 +6375,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6634,7 +6550,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6665,12 +6581,6 @@ msgstr ""
 msgid "Current"
 msgstr "Folyamatban lévő"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6695,7 +6605,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Százalék"
 
@@ -6715,7 +6624,7 @@ msgid "Power"
 msgstr "Max. tételszám"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6762,12 +6671,17 @@ msgid "Applicable Type"
 msgstr "Alkalmazható típus"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Számlahivatkozás"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6786,12 +6700,12 @@ msgstr ""
 "rendelkező adók esetében. Ebben az esetben az értékelési sorrend lényeges."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6863,7 +6777,7 @@ msgid "Optional create"
 msgstr "Választható létrehozás"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6874,9 +6788,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Bejövő jóváíró számla"
 
@@ -6914,8 +6826,11 @@ msgid "Group By..."
 msgstr "Csoportosítás"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6994,6 +6909,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Pénztári tranzakciók"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7011,7 +6933,7 @@ msgstr "Gyűjtőkód tétel statisztika"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Tételek: "
@@ -7029,14 +6951,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Igaz"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7052,10 +6973,9 @@ msgid "Total debit"
 msgstr "Tartozik összesen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "A(z) \"%s\" tétel nem érvényes!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7108,7 +7028,7 @@ msgstr "Tétel létrehozása"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7119,13 +7039,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Hiba!"
@@ -7162,6 +7083,11 @@ msgstr "Projektsor"
 msgid "Manual"
 msgstr "Kézi"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7264,8 +7190,8 @@ msgstr "Napló kiválasztása"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Nyitó egyenleg"
@@ -7347,7 +7273,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7368,6 +7294,11 @@ msgstr ""
 "\n"
 "pl. %(date)s-i modell"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7421,7 +7352,7 @@ msgid "Done"
 msgstr "Kész"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7461,9 +7392,8 @@ msgid "Source Document"
 msgstr "Forrásbizonylat"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7490,7 +7420,7 @@ msgid "Taxes:"
 msgstr "Adók:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7687,6 +7617,12 @@ msgstr ""
 "Ezt a mezőt csak akkor használja, ha saját modult fejleszt, amely speciális "
 "adók létrehozását teszi lehetővé."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Számlahivatkozás"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7778,7 +7714,7 @@ msgid "Use model"
 msgstr "Modell használata"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7829,7 +7765,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7898,7 +7834,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Kimenő számla napló"
@@ -7909,7 +7845,7 @@ msgid "Invoice Tax"
 msgstr "Adó"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Nem adott meg darabszámot!"
@@ -7948,7 +7884,7 @@ msgid "Sales Properties"
 msgstr "Értékesítés könyvelési beállítások"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7973,7 +7909,7 @@ msgstr "Záró dátum"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8005,7 +7941,7 @@ msgid "May"
 msgstr "Május"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8023,10 +7959,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Adógyűjtő kód"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8042,17 +7977,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Tételek könyvelése"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Vevő"
@@ -8068,7 +7998,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Pénztár"
@@ -8080,9 +8010,11 @@ msgid "Account Destination"
 msgstr "Eredeti számla helyébe lépő számla"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Számlák átutalása"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8090,7 +8022,6 @@ msgstr "Számlák átutalása"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8228,15 +8159,14 @@ msgid "Partner Ledger"
 msgstr "Folyószámla karton"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fix összeg"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Figyelem!"
@@ -8304,7 +8234,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Válassza ki az alkalmazandó új pénznemet"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nincsenek számlasorok!"
@@ -8381,7 +8311,7 @@ msgid "Associated Partner"
 msgstr "Társult partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Először partnert kell választani!"
@@ -8463,13 +8393,13 @@ msgstr ""
 "adó kiszámításánál."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Bejövő jóváíró számla napló"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8540,7 +8470,7 @@ msgid "Net Total:"
 msgstr "Nettó érték:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8560,15 +8490,6 @@ msgstr "Általános kimutatások"
 msgid "Write-Off Journal"
 msgstr "Leírás naplója"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"A rendszer az alapértelmezett helyett ezt a fizetési feltételt fogja "
-"használni a partnerre."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8595,11 +8516,6 @@ msgstr "Belső típus"
 msgid "Tax/Base Amount"
 msgstr "Adó/adóalap összege"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8653,6 +8569,11 @@ msgstr "Párosítás eredménye"
 msgid "Ending Balance"
 msgstr "Záró egyenleg"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8693,7 +8614,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Bankkivonat automatikus importálása"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8716,7 +8637,12 @@ msgid "Account Types"
 msgstr "Főkönyvi számlatípusok"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8724,9 +8650,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr ""
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Mérleg/eredménykimutatás kategória"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8743,10 +8669,9 @@ msgid "Reconciliation"
 msgstr "Párosítás"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Vevő főkönyvi számla"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "-"
 
 #. module: account
 #: view:account.invoice:0
@@ -8818,7 +8743,7 @@ msgid "The partner account used for this invoice."
 msgstr "Vevő/szállító főkönyvi számla"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8836,13 +8761,13 @@ msgid "Payment Term Line"
 msgstr "Fizetési feltétel sor"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Bejövő számla napló"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Nettó érték"
 
@@ -8871,11 +8796,6 @@ msgstr "Fizetési határidő"
 msgid "Suppliers"
 msgstr "Szállítók"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Igaz"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9012,9 +8932,10 @@ msgid "Journal Name"
 msgstr "Napló neve"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "A(z) \"%s\" tétel nem érvényes!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9062,7 +8983,7 @@ msgstr ""
 "Szabadon választott más pénznemben kifejezett összeg, ha a tétel devizás."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9123,7 +9044,7 @@ msgid "Reconciled entries"
 msgstr "Párosított tételek"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9145,7 +9066,7 @@ msgid "Print Account Partner Balance"
 msgstr "Folyószámla kivonat nyomtatása"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9179,7 +9100,7 @@ msgstr "Ismeretlen"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Nyitó tételek naplója"
@@ -9226,7 +9147,7 @@ msgstr ""
 "Jelölje be, ha az adó kiszámítása az alárendelt adók kiszámításán alapul."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9241,21 +9162,9 @@ msgstr "Python kód alapján számítódik"
 msgid "Journal Code"
 msgstr "Naplókód"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Itt megadhatja az együtthatót, amelyet a fölérendelt adógyűjtőben való "
-"összevonásnál használ a rendszer. Állítson be 1-et, ha hozzá akarja adni az "
-"összeget, és -1-et, ha le akarja vonni."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Rendezetlen összeg"
 
@@ -9288,7 +9197,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Kimenő jóváíró számla napló"
@@ -9354,7 +9263,7 @@ msgid "Purchase Tax(%)"
 msgstr "Előzetesen felszámított ÁFA(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Kérem, hozzon létre számlasorokat!"
@@ -9373,7 +9282,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9490,21 +9399,11 @@ msgstr "A könyvelő jóváhagyja a számlából jövő könyvelési tételeket.
 msgid "Number of Periods"
 msgstr "Időszakok száma"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Adógyűjtő sablon"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Bizonylat: vevő folyószámla kivonat"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Mérleg/eredménykimutatás kategória"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9516,8 +9415,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9537,14 +9437,14 @@ msgid "Document"
 msgstr "Dokumentum"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bankkivonatok"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Vevő főkönyvi számla"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9645,8 +9545,8 @@ msgid "Move"
 msgstr "Bizonylat száma"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9727,11 +9627,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Párosítás visszavonása"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9749,11 +9644,16 @@ msgid "Balance :"
 msgstr "Egyenleg :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9790,13 +9690,6 @@ msgstr "Előjegyzés"
 msgid "Account Analytic Balance"
 msgstr "Gyűjtőkód kivonat"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9836,7 +9729,13 @@ msgid "Due date"
 msgstr "Fizetési határidő"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9925,7 +9824,7 @@ msgid "Unreconciled"
 msgstr "Rendezetlen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Hibás összesen!"
@@ -10014,7 +9913,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10032,6 +9931,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10087,11 +9991,6 @@ msgstr "Követel"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10103,7 +10002,7 @@ msgid "Journal Entry Model"
 msgstr "Kontírozási modell"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10188,7 +10087,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10516,7 +10415,14 @@ msgid "Empty Accounts ? "
 msgstr "Üres számlák ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10641,7 +10547,7 @@ msgid "Receivable accounts"
 msgstr "Vevő számlák"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10768,7 +10674,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10875,7 +10781,7 @@ msgid "Accounting Documents"
 msgstr "Könyvelési bizonylatok"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10920,7 +10826,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Adók"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10999,16 +10905,6 @@ msgstr ""
 msgid "February"
 msgstr "Február"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Ha a névnek nem a / jelet adja meg, akkor a könyvelési tételeknek ugyanaz "
-"lesz a bizonylatszáma, mint a kivonatnak."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11067,6 +10963,11 @@ msgstr "Sablon főkönyvi számla ÁFA pozíció leképezés"
 msgid "Expense Account on Product Template"
 msgstr "Beszerzés főkönyvi számla a terméksablonban"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11088,6 +10989,10 @@ msgstr ""
 "A könyvelési tételben lévő vevőkövetelés vagy szállítói tartozás rendezetlen "
 "devizaösszege (eltérhet a vállalat pénznemétől)."
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Szállítói számla"
+
 #~ msgid "New Supplier Invoice"
 #~ msgstr "Új szállítói számla"
 
@@ -11300,12 +11205,18 @@ msgstr ""
 #~ msgid "Print Taxes Report"
 #~ msgstr "Adó kimutatás nyomtatás"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Időszaki feldolgozás"
+
 #~ msgid "Contact"
 #~ msgstr "Kapcsolat"
 
 #~ msgid "Delta Debit"
 #~ msgstr "Tartozik forgalom"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "6"
 #~ msgstr "6"
 
@@ -11481,6 +11392,13 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Rendezett tételek megjelenítése"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Ha visszavonja a tranzakciók párosítását, ellenőriznie kell a tranzakciókhoz "
+#~ "kapcsolt minden műveletet, mert azok nem kerülnek visszavonásra."
+
 #~ msgid "Children Definition"
 #~ msgstr "Alárendelt adó meghatározása"
 
@@ -11525,6 +11443,9 @@ msgstr ""
 #~ msgid "Configure"
 #~ msgstr "Beállítás"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "When journal period is created. The state is 'Draft'. If a report is printed "
 #~ "it comes to 'Printed' state. When all transactions are done, it comes in "
@@ -11693,6 +11614,9 @@ msgstr ""
 #~ msgid "Bank account"
 #~ msgstr "Bankszámla"
 
+#~ msgid "Line Name"
+#~ msgstr "Sor neve"
+
 #~ msgid "Starts on"
 #~ msgstr "Kezdés"
 
@@ -11742,6 +11666,9 @@ msgstr ""
 #~ "A naplóhoz alapértelmezett tartozik és követel főkönyvi számlának kell "
 #~ "tartozni"
 
+#~ msgid "Litigation"
+#~ msgstr "Peresített"
+
 #~ msgid "Contact Address Name"
 #~ msgstr "Cím"
 
@@ -11842,6 +11769,9 @@ msgstr ""
 #~ "Date on which the partner accounting entries were reconciled last time"
 #~ msgstr "A partnert érintő utolsó párosítás dátuma"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank"
+
 #, python-format
 #~ msgid "Taxes missing !"
 #~ msgstr "Az adók hiányoznak!"
@@ -11875,6 +11805,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Pénzkazetta nyitó egyenleg"
 
+#~ msgid "Line 1:"
+#~ msgstr "1. sor:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "A(z) \"%s\" könyvelési tétel nem érvényes."
@@ -11909,6 +11842,9 @@ msgstr ""
 #~ msgid "You cannot remove an account which has account entries!. "
 #~ msgstr "Nem törölhet egy főkönyvi számlát, amelyre már könyveltek. "
 
+#~ msgid "Communication"
+#~ msgstr "Kommunikáció"
+
 #~ msgid "Sort By"
 #~ msgstr "Sorbarendezés alapja"
 
@@ -11936,6 +11872,9 @@ msgstr ""
 #~ "Korszerűsíti a számlák kifizetését és kapcsokat hoz létre automatizált "
 #~ "átutalási rendszerekhez való kapcsolódáshoz."
 
+#~ msgid "Valuation"
+#~ msgstr "Értékelés"
+
 #, python-format
 #~ msgid "Entries are not of the same account or already reconciled ! "
 #~ msgstr ""
@@ -12101,9 +12040,6 @@ msgstr ""
 #~ msgid "Year :"
 #~ msgstr "Év :"
 
-#~ msgid "Fixed"
-#~ msgstr "Fix összeg"
-
 #~ msgid "Open for bank reconciliation"
 #~ msgstr "Megnyitás a bank egyeztetéshez"
 
@@ -12472,6 +12408,13 @@ msgstr ""
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Pénzkazetta egyenlege nem egyezik a számított egyenleggel!"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Ha visszavonja a tranzakciók párosítását, ellenőriznie kell a tranzakciókhoz "
+#~ "kapcsolt minden műveletet, mert azok nem kerülnek visszavonásra."
+
 #~ msgid "Total With Tax"
 #~ msgstr "Bruttó érték"
 
@@ -12502,6 +12445,9 @@ msgstr ""
 #~ "Létrehozhatja az alábbi menüpontból: \n"
 #~ "Beállítások/Pénzügyi számvitel/Főkönyvi számlák/Naplók."
 
+#~ msgid "Line 2:"
+#~ msgstr "2. sor:"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -12807,6 +12753,13 @@ msgstr ""
 #~ "\"%s\" naplóra nem határoztak meg alapértelmezett \n"
 #~ "követel főkönyvi számlát"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "A sorszám mező rakja sorba a fizetési feltétel sorokat a legalacsonyabb "
+#~ "sorszámútól a legmagasabbig."
+
 #, python-format
 #~ msgid ""
 #~ "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
@@ -12843,6 +12796,13 @@ msgstr ""
 #~ "Amikor a rendszer létrehozza a havi időszakokat, nyitott állapotban vannak. "
 #~ "Zárás után lezárt állapotba kerülnek."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "A rendszer az alapértelmezett helyett ezt a fizetési feltételt fogja "
+#~ "használni a partnerre."
+
 #, python-format
 #~ msgid "Cannot create invoice move on centralised journal"
 #~ msgstr "Központi naplóban nem készíthet számlát."
@@ -13473,6 +13433,10 @@ msgstr ""
 #~ msgid "A/c Code"
 #~ msgstr "Főkönyvi számla"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "'%s' számla jóváhagyásra került."
+
 #~ msgid "last month"
 #~ msgstr "előző hónap"
 
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index f53bb9f3be4..903ae3dcfbe 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 11:28+0000\n"
-"Last-Translator: riza Kurniawan <Unknown>\n"
+"Last-Translator: Riza Kurniawan <rizabisnis@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr "Posisi Tahun Fiskal didefinisikan sekali saja untuk akun yang sama"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Transaksi Belum Di-rekonsiliasi"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Impor dari tagihan atau pembayaran"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,16 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Total Debit"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Jika anda merekonsiliasi transaksi-transaksi, anda juga harus memeriksa "
-"seluruh kegiatan yang terkait karena seluruh transaksi tersebut tidak "
-"dibatalkan"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -116,7 +101,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -147,19 +131,19 @@ msgstr ""
 "menyembunyikan syarat pembayaran tanpa menghapusnya"
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -171,7 +155,7 @@ msgid "Warning!"
 msgstr "Perhatian!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Jurnal Lain-lain"
@@ -243,11 +227,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Lembar Contoh Pajak"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "akun.pajak"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -263,6 +242,11 @@ msgstr "Catatan akuntansi adalah sebuah masukan dari rekonsiliasi"
 msgid "Belgian Reports"
 msgstr "Laporan menurut standar Belgia"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -397,11 +381,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "salinan.akun.pajak"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -456,6 +435,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -471,6 +455,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Salinan Bagan Akun"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -632,16 +621,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Triwulan"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Jika anda membatalkan rekonsiliasi dari berbagai transaksi, anda juga harus "
-"memeriksa seluruh kegiatan yang berhubungan dengannya, karena transaksi-"
-"transaksi tersebut tidak langsung dibatalkan"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -690,7 +669,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -703,13 +682,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -772,6 +751,11 @@ msgstr "Akun Piutang"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -796,6 +780,12 @@ msgstr "Buka Kembali"
 msgid "Are you sure you want to create entries?"
 msgstr "Apakah anda yakin untuk membuat catatan baru?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -816,6 +806,7 @@ msgstr "Tampilkan anak dengan terstruktur"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Persen"
 
@@ -858,7 +849,7 @@ msgid "Type"
 msgstr "Jenis"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -883,25 +874,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Faktur Pemasok dan Faktur Pengembalian Uang"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Pembatalan rekonsiliasi"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Pada hari ke 14 sebesar 2 %, sisanya pada dibayar 30 hari pada akhir bulan."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -932,11 +916,6 @@ msgstr "Nama J.C/Move"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -969,7 +948,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -984,6 +963,7 @@ msgstr "Berlangganan Baru"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Penghitungan"
 
@@ -1015,11 +995,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1055,7 +1032,7 @@ msgid "Liability"
 msgstr "Hutang"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1129,10 +1106,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1210,8 +1187,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1257,7 +1235,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1555,9 +1533,9 @@ msgid "Account Receivable"
 msgstr "Akun Piutang"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1571,7 +1549,7 @@ msgid "With balance is not equal to 0"
 msgstr "Dengan saldo tidak sama dengan 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1626,7 +1604,7 @@ msgstr "Lewati Status 'Konsep' untuk Catatan-catatan Manual"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1671,6 +1649,12 @@ msgstr "Tabel sementara yang digunakan untuk tampilan Dashboard"
 msgid "Supplier Refunds"
 msgstr "Pengembalian Pemasok"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1708,7 +1692,6 @@ msgid "Groups"
 msgstr "Kelompok"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Tidak kena pajak"
@@ -1841,6 +1824,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Sales Berdasarkan tipe akun"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1861,115 +1850,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2080,6 +1965,11 @@ msgstr "Periode ini bisa overlap."
 msgid "Draft statement"
 msgstr "Draft pernyataan"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2108,26 +1998,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2135,16 +2024,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2155,8 +2044,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2201,7 +2090,7 @@ msgid "period close"
 msgstr "periode dekat"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2301,7 +2190,7 @@ msgid "Product Category"
 msgstr "Kategori Produk"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2669,7 +2558,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Tetap kosongkan untuk semua tahun fiskal yang terbuka"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2687,7 +2576,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2708,7 +2597,7 @@ msgid "Main Sequence"
 msgstr "Urutan Utama"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2716,14 +2605,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Termin Pembayaran"
 
@@ -2749,18 +2636,6 @@ msgstr "Centang Box ini"
 msgid "Filters"
 msgstr "Filter"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Buka"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2772,6 +2647,11 @@ msgstr "Draft Status invoice"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2850,24 +2730,19 @@ msgid "Account Model Entries"
 msgstr "Catatan Contoh Akun"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Pajak Pemasok"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2891,7 +2766,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2906,9 +2780,8 @@ msgstr ""
 "tanggal jatuh tempo, misalnya 50% sekarang, 50% dalam satu bulan."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2938,6 +2811,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Pajak"
 
@@ -2973,14 +2847,14 @@ msgid "Accounts"
 msgstr "Akun"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3077,6 +2951,12 @@ msgstr "Terbayar/ Terekonsiliasi"
 msgid "Refund Base Code"
 msgstr "Pengembalian dana beradasarkan kode"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Pernyataan Bank"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3129,11 +3009,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr "Entri Akunting"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3179,7 +3054,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3192,7 +3067,7 @@ msgid "Sales by Account"
 msgstr "Penjualan menurut Akun"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3208,15 +3083,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Anda harus mendefinisikan jurnal analitik di jurnal '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3224,7 +3099,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3289,8 +3164,9 @@ msgstr ""
 "untuk beberapa laporan."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3340,12 +3216,6 @@ msgstr "Dasar pengenakan pajak"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3379,7 +3249,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3406,7 +3276,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3472,7 +3342,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3484,9 +3354,9 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nama Baris"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3535,7 +3405,7 @@ msgid "View"
 msgstr "Tampilan"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3556,14 +3426,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3572,9 +3447,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3700,12 +3654,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"jika Anda memberikan Nama yang lain maka /, Akuntansi Entries Move dibuat "
+"dengan nama sama dengan nama laporan. Hal ini memungkinkan entri pernyataan "
+"untuk memiliki referensi yang sama dari pernyataan itu sendiri"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3720,7 +3680,7 @@ msgid "Starting Balance"
 msgstr "Saldo Awal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3920,7 +3880,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3944,7 +3904,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4080,7 +4040,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4168,8 +4128,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4253,11 +4216,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4275,11 +4233,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4324,8 +4277,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4355,7 +4308,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4387,11 +4340,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4481,6 +4429,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr "Saldo Analitik"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4500,6 +4455,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4510,11 +4470,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4523,11 +4478,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4551,19 +4501,8 @@ msgid "Account Type"
 msgstr "Jenis Akun"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4585,8 +4524,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4615,7 +4565,7 @@ msgid "Month"
 msgstr "Bulan"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4626,8 +4576,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4651,6 +4601,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4663,7 +4618,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4685,7 +4640,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4740,11 +4695,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4774,10 +4724,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Faktur Pembelian"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4845,10 +4794,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4897,7 +4850,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4912,7 +4865,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4937,11 +4890,6 @@ msgstr ""
 msgid "Change"
 msgstr "Ubah"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4964,11 +4912,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4979,11 +4922,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Biarkan kosong untuk menggunkan akun pendapatan"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4993,7 +4931,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5067,16 +5005,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5187,6 +5120,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Terbayar"
 
@@ -5213,7 +5147,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5228,14 +5162,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5248,7 +5174,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5281,8 +5207,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5376,14 +5302,6 @@ msgstr "Keterangan Pajak"
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5428,7 +5346,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5464,6 +5382,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5477,12 +5396,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5508,18 +5421,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nama Internal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5558,7 +5466,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5591,7 +5499,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Kode Program (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5618,6 +5526,7 @@ msgstr "Rekonsiliasi Otomatis"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5721,7 +5630,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5749,7 +5658,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5785,10 +5694,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Buka"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5818,9 +5733,7 @@ msgstr "Kode-kode pajak"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5837,11 +5750,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5858,6 +5766,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5946,8 +5855,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5970,6 +5877,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "entri Pembayaran adalah input kedua dari rekonsiliasi"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5977,13 +5891,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6041,12 +5948,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6070,7 +5976,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6098,18 +6003,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Menghapus"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6126,7 +6036,7 @@ msgstr "Pendapatan"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Pemasok"
@@ -6146,16 +6056,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6265,7 +6170,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6312,6 +6217,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Jumlah Hari"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6451,7 +6364,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6626,7 +6539,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6657,12 +6570,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6687,7 +6594,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6707,7 +6613,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6752,12 +6658,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6773,12 +6684,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6845,7 +6756,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6856,9 +6767,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6896,8 +6805,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6974,6 +6886,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6991,7 +6910,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -7009,14 +6928,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Benar"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7032,10 +6950,9 @@ msgid "Total debit"
 msgstr "Total debit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Catatan \"%s\" tidak sah !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7084,7 +7001,7 @@ msgstr "Buat Pembukuan"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7095,13 +7012,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7138,6 +7056,11 @@ msgstr "Baris Proyek"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7236,8 +7159,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7319,7 +7242,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7332,6 +7255,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7385,7 +7313,7 @@ msgid "Done"
 msgstr "Selesai"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7417,9 +7345,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7446,7 +7373,7 @@ msgid "Taxes:"
 msgstr "Pajak-pajak :"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7643,6 +7570,12 @@ msgstr ""
 "Kolom ini hanya digunakan jika anda membuat perumusan tentang perhitungan "
 "pajak sendiri"
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7732,7 +7665,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7783,7 +7716,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7850,7 +7783,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Jurnal Penjualan"
@@ -7861,7 +7794,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7900,7 +7833,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7925,7 +7858,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7957,7 +7890,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7975,9 +7908,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7994,17 +7926,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -8020,7 +7947,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -8032,8 +7959,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -8042,7 +7971,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8174,15 +8102,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Baku"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8250,7 +8177,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8325,7 +8252,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8405,13 +8332,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8482,7 +8409,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8502,13 +8429,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8535,11 +8455,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Jumlah Pajak/Dasar"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8593,6 +8508,11 @@ msgstr "Hasil rekonsiliasi"
 msgid "Ending Balance"
 msgstr "Saldo Akhir"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8633,7 +8553,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8656,7 +8576,12 @@ msgid "Account Types"
 msgstr "Tipe Akun"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8664,8 +8589,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8683,10 +8608,9 @@ msgid "Reconciliation"
 msgstr "Rekonsiliasi"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Akun Piutang"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Biarkan kosong untuk menggunkan akun pendapatan"
 
 #. module: account
 #: view:account.invoice:0
@@ -8758,7 +8682,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8776,13 +8700,13 @@ msgid "Payment Term Line"
 msgstr "Detail Termin Pembayaran"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8811,11 +8735,6 @@ msgstr "Tanggal Jatuh Tempo"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Benar"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8952,9 +8871,10 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Catatan \"%s\" tidak sah !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9001,7 +8921,7 @@ msgstr ""
 "catatan dengan beberapa mata uang."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9062,7 +8982,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9084,7 +9004,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9118,7 +9038,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9163,7 +9083,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9178,18 +9098,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9222,7 +9133,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9288,7 +9199,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9307,7 +9218,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9422,21 +9333,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9448,8 +9349,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9469,14 +9371,14 @@ msgid "Document"
 msgstr "Dokumen"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Pernyataan Bank"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Akun Piutang"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9577,8 +9479,8 @@ msgid "Move"
 msgstr "memindahkan"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9655,11 +9557,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transaksi belum Rekonsoliasi"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9677,11 +9574,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9718,13 +9620,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9764,7 +9659,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9853,7 +9754,7 @@ msgid "Unreconciled"
 msgstr "Belum direkonsoliasi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9936,7 +9837,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9954,6 +9855,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10007,11 +9913,6 @@ msgstr "Kredit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10023,7 +9924,7 @@ msgid "Journal Entry Model"
 msgstr "Contoh Ayat Jurnal"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10108,7 +10009,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10434,7 +10335,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10559,7 +10467,7 @@ msgid "Receivable accounts"
 msgstr "Akun Piutang"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10688,7 +10596,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10794,7 +10702,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10839,7 +10747,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10918,17 +10826,6 @@ msgstr ""
 msgid "February"
 msgstr "Februari"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"jika Anda memberikan Nama yang lain maka /, Akuntansi Entries Move dibuat "
-"dengan nama sama dengan nama laporan. Hal ini memungkinkan entri pernyataan "
-"untuk memiliki referensi yang sama dari pernyataan itu sendiri"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10987,6 +10884,11 @@ msgstr "Template Akun Pemetaan Fiskal"
 msgid "Expense Account on Product Template"
 msgstr "Beban Account pada Template Produk"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11029,9 +10931,6 @@ msgstr ""
 #~ msgid "Account Entry Line"
 #~ msgstr "Baris Entri Rekening"
 
-#~ msgid "Fixed"
-#~ msgstr "Baku"
-
 #~ msgid "Origin"
 #~ msgstr "Asal"
 
@@ -11047,9 +10946,16 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Status"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Faktur Pembelian"
+
 #~ msgid "Line"
 #~ msgstr "Baris"
 
+#~ msgid "account.tax"
+#~ msgstr "akun.pajak"
+
 #~ msgid "Contact"
 #~ msgstr "Kontak"
 
@@ -11104,6 +11010,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Pajak-pajak Pembelian"
 
+#~ msgid "Line Name"
+#~ msgstr "Nama Baris"
+
 #~ msgid "Value"
 #~ msgstr "Nilai"
 
@@ -11427,6 +11336,14 @@ msgstr ""
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Saldo Kas Kecil tidak sesuai dengan Saldo Terhitung !"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Jika anda membatalkan rekonsiliasi dari berbagai transaksi, anda juga harus "
+#~ "memeriksa seluruh kegiatan yang berhubungan dengannya, karena transaksi-"
+#~ "transaksi tersebut tidak langsung dibatalkan"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 Hari   "
 
@@ -11837,6 +11754,14 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Termasuk Ayat-ayat yang telah direkonsiliasi"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Jika anda merekonsiliasi transaksi-transaksi, anda juga harus memeriksa "
+#~ "seluruh kegiatan yang terkait karena seluruh transaksi tersebut tidak "
+#~ "dibatalkan"
+
 #~ msgid ""
 #~ "The Profit and Loss report gives you an overview of your company profit and "
 #~ "loss in a single document"
@@ -12107,6 +12032,9 @@ msgstr ""
 #~ msgid "last month"
 #~ msgstr "bulan terakhir"
 
+#~ msgid "account.tax.template"
+#~ msgstr "salinan.akun.pajak"
+
 #~ msgid "You can not create journal items on an account of type view."
 #~ msgstr "Anda tidak dapat membuat item jurnal pada akun dengan tipe View"
 
@@ -12157,6 +12085,10 @@ msgstr ""
 #~ msgid "All Months Sales by type"
 #~ msgstr "Total Penjualan dalam bulan ini oleh tipe"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Pada hari ke 14 sebesar 2 %, sisanya pada dibayar 30 hari pada akhir bulan."
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index cb474e0c4a9..97448b07648 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:58+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -28,11 +28,6 @@ msgid ""
 msgstr ""
 "Una posizione fiscale può essere definita una sola volta per lo stesso conto."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Transazioni non riconciliate"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importa da fatture o pagamenti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Conto Errato!"
@@ -94,16 +89,6 @@ msgstr "Conto Errato!"
 msgid "Total Debit"
 msgstr "Debito Totale"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Se si elimina la riconciliazione delle transazioni, si devono anche "
-"verificare che tutte le azioni collegate a queste transizioni, poichè non "
-"non vengono disabilitate automaticamente."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -116,7 +101,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -147,19 +131,19 @@ msgstr ""
 "pagamento senza eliminarli."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -171,7 +155,7 @@ msgid "Warning!"
 msgstr "Attenzione!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Sezionali vari"
@@ -257,11 +241,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Template Fiscali"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -277,6 +256,11 @@ msgstr "Le registrazioni contabili sono un input per la riconciliazione."
 msgid "Belgian Reports"
 msgstr "Reports belgi"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -426,11 +410,6 @@ msgstr "Abilita la contabilità analitica."
 msgid "Salesperson"
 msgstr "Commerciale"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -493,6 +472,11 @@ msgstr ""
 "               ma non contabilizzarli (Registrazioni nel Sezionale, Piano "
 "dei Conti, ...)"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -508,6 +492,11 @@ msgstr "Periodo :"
 msgid "Chart Template"
 msgstr "Template del piano dei conti"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -680,15 +669,6 @@ msgstr "Accuratezza decimale nelle registrazioni sezionale"
 msgid "3 Monthly"
 msgstr "Trimestrale"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Se le transazioni vengono annullate è necessario inoltre verificare tutte le "
-"azioni collegate siccome non verranno disabilitate"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -739,7 +719,7 @@ msgid "Profit Account"
 msgstr "Conto Profitti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -751,13 +731,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Report delle vendite per tipo di conto"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Non è possibile creare movimenti con valute differenti da .."
@@ -827,6 +807,11 @@ msgstr "Conti di Credito"
 msgid "Configure your company bank accounts"
 msgstr "Configura i conti bancari per la tua azienda"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -851,6 +836,12 @@ msgstr "Riapri"
 msgid "Are you sure you want to create entries?"
 msgstr "Sei sicuro di voler creare la voce?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -874,6 +865,7 @@ msgstr "Mostra dettagli con gerarchia"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentuale"
 
@@ -916,7 +908,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -941,24 +933,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Fatture e Note di Credito Fornitori"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "La registrazione è già riconciliata"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Annulla riconciliazione"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "2% dopo 14 giorni, saldo 30 giorni fine mese."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -991,11 +977,6 @@ msgstr "Nome G.C/Movimento"
 msgid "Account Code and Name"
 msgstr "Codice e Nome Conto"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "creato"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1031,7 +1012,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1048,6 +1029,7 @@ msgstr "Nuova sottoscrizione"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Calcolo"
 
@@ -1079,14 +1061,9 @@ msgid "Purchase journal"
 msgstr "Sezionale Acquisti"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
-"Non è possibile validate questa registrazione perchè il conto \"%s\" non "
-"appartiene al piano dei conti \"%s\"."
 
 #. module: account
 #: view:validate.account.move:0
@@ -1121,7 +1098,7 @@ msgid "Liability"
 msgstr "Passività"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1196,10 +1173,10 @@ msgid "Features"
 msgstr "Caratteristiche"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1293,9 +1270,11 @@ msgid "Refund "
 msgstr "Rimborso "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "Conti bancari come stampati nel piede di ogni documento stampato"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Non c'è un conto di costo definito per questo prodotto: \"%s\" (id:%d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1354,7 +1333,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banca"
@@ -1657,9 +1636,9 @@ msgid "Account Receivable"
 msgstr "Conto di credito"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -1673,7 +1652,7 @@ msgid "With balance is not equal to 0"
 msgstr "Con chiusura diversa da zero"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1733,7 +1712,7 @@ msgstr "Salta lo stato 'Bozza' per le registrazioni manuali"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Non implementato."
@@ -1778,6 +1757,12 @@ msgstr "Una tavola temporanea utilizzata per la Dashboard"
 msgid "Supplier Refunds"
 msgstr "Note di Credito"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Codice"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1815,7 +1800,6 @@ msgid "Groups"
 msgstr "Gruppi"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Imponibile"
@@ -1972,6 +1956,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Vendite per tipo di conto"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1994,217 +1984,11 @@ msgstr ""
 "stato bozza attivata."
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Alcune registrazioni sono già riconciliate."
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"\\n\n"
-"<div style=\\\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \\\">\\n\n"
-"\\n\n"
-"    <p>Buongiorno${object.partner_id.name and ' ' or "
-"''}${object.partner_id.name or ''},</p>\\n\n"
-"\\n\n"
-"    <p>E' disponibile una nuova fattura: </p>\\n\n"
-"    \\n\n"
-"    <p style=\\\"border-left: 1px solid #8e0000; margin-left: 30px;\\\">\\n\n"
-"       &nbsp;&nbsp;<strong>RIFERIMENTO</strong><br />\\n\n"
-"       &nbsp;&nbsp;Numero fattura: <strong>${object.number}</strong><br />\\"
-"n\n"
-"       &nbsp;&nbsp;Totale fattura: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\\n\n"
-"       &nbsp;&nbsp;Data fattura: ${object.date_invoice}<br />\\n\n"
-"       % if object.origin:\\n\n"
-"       &nbsp;&nbsp;Rif. ordine: ${object.origin}<br />\\n\n"
-"       % endif\\n\n"
-"       % if object.user_id:\\n\n"
-"       &nbsp;&nbsp;Vs. contatto: <a href=\\\"mailto:${object.user_id.email "
-"or ''}?subject=Invoice%20${object.number}\\\">${object.user_id.name}</a>\\n\n"
-"       % endif\\n\n"
-"    </p>  \\n\n"
-"    \\n\n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\\n\n"
-"    <% \\n\n"
-"    comp_name = quote(object.company_id.name)\\n\n"
-"    inv_number = quote(object.number)\\n\n"
-"    paypal_account = quote(object.company_id.paypal_account)\\n\n"
-"    inv_amount = quote(str(object.residual))\\n\n"
-"    cur_name = quote(object.currency_id.name)\\n\n"
-"    paypal_url = \\\"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\\\" \\\\\\n\n"
-"                 \\"
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\\\" % \\\\\\n\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\\n\n"
-"    %>\\n\n"
-"    <br/>\\n\n"
-"    <p>E' possibile anche pagare direttamente con Paypal:</p>\\n\n"
-"        <a style=\\\"margin-left: 120px;\\\" href=\\\"${paypal_url}\\\">\\n\n"
-"            <img class=\\\"oe_edi_paypal_button\\\" src=\\"
-"\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\\\"/>\\n\n"
-"        </a>\\n\n"
-"    % endif\\n\n"
-"    \\n\n"
-"    <br/>\\n\n"
-"    <p>Per qualsiasi informazione, non  esitate a contattarci.</p>\\n\n"
-"    <p>Grazie per aver scelto ${object.company_id.name or 'us'}!</p>\\n\n"
-"    <br/>\\n\n"
-"    <br/>\\n\n"
-"    <div style=\\\"width: 375px; margin: 0px; padding: 0px; background-"
-"color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: "
-"5px 5px; background-repeat: repeat no-repeat;\\\">\\n\n"
-"        <h3 style=\\\"margin: 0px; padding: 2px 14px; font-size: 12px; "
-"color: #FFF;\\\">\\n\n"
-"            <strong style=\\\"text-transform:uppercase;\\"
-"\">${object.company_id.name}</strong></h3>\\n\n"
-"    </div>\\n\n"
-"    <div style=\\\"width: 347px; margin: 0px; padding: 5px 14px; line-"
-"height: 16px; background-color: #F2F2F2;\\\">\\n\n"
-"        <span style=\\\"color: #222; margin-bottom: 5px; display: block; \\"
-"\">\\n\n"
-"        % if object.company_id.street:\\n\n"
-"            ${object.company_id.street}<br/>\\n\n"
-"        % endif\\n\n"
-"        % if object.company_id.street2:\\n\n"
-"            ${object.company_id.street2}<br/>\\n\n"
-"        % endif\\n\n"
-"        % if object.company_id.city or object.company_id.zip:\\n\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\\n\n"
-"        % endif\\n\n"
-"        % if object.company_id.country_id:\\n\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\\n\n"
-"        % endif\\n\n"
-"        </span>\\n\n"
-"        % if object.company_id.phone:\\n\n"
-"            <div style=\\\"margin-top: 0px; margin-right: 0px; margin-"
-"bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-"
-"bottom: 0px; padding-left: 0px; \\\">\\n\n"
-"                Tel.:&nbsp; ${object.company_id.phone}\\n\n"
-"            </div>\\n\n"
-"        % endif\\n\n"
-"        % if object.company_id.website:\\n\n"
-"            <div>\\n\n"
-"                Web :&nbsp;<a href=\\\"${object.company_id.website}\\"
-"\">${object.company_id.website}</a>\\n\n"
-"            </div>\\n\n"
-"        %endif\\n\n"
-"        <p></p>\\n\n"
-"    </div>\\n\n"
-"</div>\\n\n"
-"            "
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2318,6 +2102,11 @@ msgstr "Questi periodi possono sovrapporsi."
 msgid "Draft statement"
 msgstr "Registrazione in 'Bozza'"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2353,26 +2142,25 @@ msgstr ""
 "fine del mese o quadrimestre."
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2380,16 +2168,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2400,8 +2188,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2455,7 +2243,7 @@ msgid "period close"
 msgstr "Chiusura periodo"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2573,7 +2361,7 @@ msgid "Product Category"
 msgstr "Categoria prodotto"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2950,7 +2738,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Lasciare vuoto per tutti gli esercizi fiscali aperti"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2970,7 +2758,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Creare un conto basandosi su questo template"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2996,7 +2784,7 @@ msgid "Main Sequence"
 msgstr "Sequenza principale"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -3006,14 +2794,12 @@ msgstr ""
 "registrazioni contabili."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Termine di pagamento"
 
@@ -3040,18 +2826,6 @@ msgstr "Seleziona questa casella"
 msgid "Filters"
 msgstr "Filtri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Aperto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -3063,6 +2837,11 @@ msgstr "Stato 'bozza' di una fattura"
 msgid "Account Properties"
 msgstr "Proprietà dell'account"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -3140,25 +2919,20 @@ msgid "Account Model Entries"
 msgstr "Modello voci di bilancio"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Crea Nota di Credito"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Imposte fornitore"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "voci"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Dettagli anagrafiche bancarie"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -3197,7 +2971,6 @@ msgstr ""
 "            "
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3212,10 +2985,9 @@ msgstr ""
 "di diverse scadenze, per esempio 50% subito e 50% dopo un mese."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "La fattura è già riconciliata."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Numero fattura fornitore successivo"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3244,6 +3016,7 @@ msgstr "Movimento contabile di riconciliazione (storno)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Imposta"
 
@@ -3279,14 +3052,14 @@ msgid "Accounts"
 msgstr "Conti"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3387,6 +3160,12 @@ msgstr "Pagato/ Riconciliato"
 msgid "Refund Base Code"
 msgstr "Conto imponibile note di credito"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Estratti Conto Bancari"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3453,11 +3232,6 @@ msgstr "Estratto Conto Partner Periodico"
 msgid "Accounting entries"
 msgstr "Registrazioni contabili"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tipo di comunicazione"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3503,7 +3277,7 @@ msgstr ""
 "stato 'Bozza' o 'Proforma'."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "I periodi dovrebbero appartenere alla stessa azienda."
@@ -3516,7 +3290,7 @@ msgid "Sales by Account"
 msgstr "Vendite per conto"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "Non è possibile cancellare una registrazione contabilizzata \"%s\"."
@@ -3532,15 +3306,15 @@ msgid "Sale journal"
 msgstr "Sezionale Vendite"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Occorre definire un giornale analitico per il Sezionale: '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3550,7 +3324,7 @@ msgstr ""
 "modificare i campi aziendali."
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3616,9 +3390,10 @@ msgstr ""
 "legali, ma e' utile nei report."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Linea 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3666,12 +3441,6 @@ msgstr "Importo codice base"
 msgid "Default Sale Tax"
 msgstr "Imposta di default per le vendite"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Fattura '%s' validata."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3707,7 +3476,7 @@ msgid "Fiscal Position"
 msgstr "Posizione fiscale"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3736,7 +3505,7 @@ msgid "Trial Balance"
 msgstr "Bilancino"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr "Non è possibile adattare il saldo iniziale (importo negativo)."
@@ -3807,7 +3576,7 @@ msgstr ""
 "transazioni in entrata usano sempre il tasso alla data."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "Manca il codice padre del template del conto."
@@ -3819,9 +3588,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Quantità di cifre da usare per il codice di conto"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nome linea"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3872,7 +3641,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3893,15 +3662,20 @@ msgstr "Fattura Proforma"
 msgid "Electronic File"
 msgstr "File elettronico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "L'azienda ha un piano dei conti"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Giorno del Mese: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Template di codici tassa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3909,10 +3683,89 @@ msgid "Account Partner Ledger"
 msgstr "Mastrino  partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>creato</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -4050,12 +3903,18 @@ msgid "Account Tax Declaration"
 msgstr "Dichiarazione Imposte"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Valore importo: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"se inserisci un Nome diverso da /, la relativa registrazione contabile sarà "
+"identificata con lo stesso nome. Questo consente alle registrazioni "
+"contabili di avere lo stesso nome del movimento."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -4073,7 +3932,7 @@ msgid "Starting Balance"
 msgstr "Bilancio di apertura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Non è stato definito alcun Partner!"
@@ -4310,7 +4169,7 @@ msgid "Period Length (days)"
 msgstr "Lunghezza periodo (giorni)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4338,7 +4197,7 @@ msgid "Category of Product"
 msgstr "Categoria del prodotto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4481,7 +4340,7 @@ msgid "Chart of Accounts Template"
 msgstr "Template di piano dei conti"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4572,9 +4431,15 @@ msgid "Qty"
 msgstr "Qtà"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Causa"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Quì è possibile specificare il coefficiente che verrà usato per il "
+"consolidamento dell'importonel mastro. Per esempio, impostare 1/-1 se si "
+"vuole aggiungere/sottrarre l'importo."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4659,11 +4524,6 @@ msgstr "Nessuna azienda non configurata !"
 msgid "Expects a Chart of Accounts"
 msgstr "Necessario un Piano dei Conti"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "pagato"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4681,13 +4541,6 @@ msgstr "Il sezionale deve avere un conto di credito e di debito di default."
 msgid "Setup your Bank Accounts"
 msgstr "Configurazione conti bancari"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-"Modificare: crea una nota di credito, riconcilia e crea una nuova bozza di "
-"fattura"
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4736,8 +4589,8 @@ msgstr ""
 "questo Codice imposta nelle fatture."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Non è possibile utilizzare un conto disattivo."
@@ -4767,7 +4620,7 @@ msgid "Consolidated Children"
 msgstr "Sottoconti consolidati"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4805,11 +4658,6 @@ msgstr ""
 msgid "title"
 msgstr "titolo"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Creare una bozza di nota di credito"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4899,6 +4747,13 @@ msgstr "30 giorni Fine Mese"
 msgid "Analytic Balance"
 msgstr "Bilancio analitico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4922,6 +4777,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Registrazioni contabili validate"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4932,11 +4792,6 @@ msgstr "Ricerca del template per le imposte"
 msgid "Draft Entries"
 msgstr "Registrazioni in stato Bozza"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Giorno del mese= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4948,11 +4803,6 @@ msgstr ""
 "come: 9,99 EURO, mentre una precisione decimale di 4 permette registrazioni "
 "contabili come: 0,0231 EURO."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Numero di giorni: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4975,6 +4825,31 @@ msgstr "Scorciatoia"
 msgid "Account Type"
 msgstr "Tipo conto"
 
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Chiude la cassa"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Annulla le fatture selezionate"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:423
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "Occorre definire un giornale analitico per il Sezionale: '%s'!"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Costi analitici (schede attività, prodotti acquistati, ...) provengono dai "
+"conti analitici. Questi generano le bozze delle fatture dei fornitori."
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
 msgid ""
@@ -5003,31 +4878,6 @@ msgstr ""
 "          </p>\n"
 "        "
 
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr "Annulla le fatture selezionate"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:423
-#, python-format
-msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr "Occorre definire un giornale analitico per il Sezionale: '%s'!"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid ""
-"Analytic costs (timesheets, some purchased products, ...) come from analytic "
-"accounts. These generate draft supplier invoices."
-msgstr ""
-"Costi analitici (schede attività, prodotti acquistati, ...) provengono dai "
-"conti analitici. Questi generano le bozze delle fatture dei fornitori."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Chiude la cassa"
-
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid ""
@@ -5058,7 +4908,7 @@ msgid "Month"
 msgstr "Mese"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -5071,8 +4921,8 @@ msgid "Supplier invoice sequence"
 msgstr "Sequenza delle fatture fornitori"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -5098,6 +4948,11 @@ msgstr "Conto Paypal"
 msgid "Acc.Type"
 msgstr "Tipo di conto"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -5110,7 +4965,7 @@ msgstr "Invertire segno di bilancio"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Stato patrimoniale (Passività)"
@@ -5132,7 +4987,7 @@ msgid "Account Base Code"
 msgstr "Conto imponibile"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -5189,11 +5044,6 @@ msgstr "Riconciliazione Apertura Contabile"
 msgid "Last Reconciliation:"
 msgstr "Ultima Riconciliazione:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Elaborazioni periodiche"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -5225,10 +5075,9 @@ msgid "Account chart"
 msgstr "Piano dei conti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Fattura fornitore"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5296,10 +5145,14 @@ msgstr "Note di credito"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr "Voci Sezionale da Riconciliare"
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -5354,7 +5207,7 @@ msgstr ""
 "Non è possibile creare un conto con un conto-padre di un'altra azienda."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5373,7 +5226,7 @@ msgid "Based On"
 msgstr "Basato su"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -5398,11 +5251,6 @@ msgstr "Imposte Figlie/Sottoimposte"
 msgid "Change"
 msgstr "Modifica"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banca e Assegni"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5425,11 +5273,6 @@ msgstr "Descrivere la causale di prelievo dal registro di cassa:"
 msgid "Cancelled"
 msgstr "Annullato"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Esempio"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5440,11 +5283,6 @@ msgstr "Permette di impostare fatture nello stato proforma."
 msgid "Unit Of Currency Definition"
 msgstr "Definizione della Pezzatura della Valuta"
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Lasciare vuoto per usare il conto di ricavo"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5456,7 +5294,7 @@ msgstr ""
 "aziendale."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Imposta su acquisti %.2f%%"
@@ -5533,16 +5371,11 @@ msgstr ""
 "transazioni sono fatte, lo stato diventa 'Completato'."
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "MISC"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Fattura (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5657,6 +5490,7 @@ msgstr "Aggiungi"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pagato"
 
@@ -5685,7 +5519,7 @@ msgstr ""
 "fatture. Lasciare vuoto per usare il conto di costo."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Periodo di apertura"
@@ -5700,14 +5534,6 @@ msgstr "Scritture da rivedere"
 msgid "Round Globally"
 msgstr "Arrotondamento sul Totale"
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5720,7 +5546,7 @@ msgid "Tax Application"
 msgstr "Applicazione imposta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5755,9 +5581,9 @@ msgid "End of period"
 msgstr "Fine Periodo"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Dettagli anagrafiche bancarie"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pagamento fatture"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5856,16 +5682,6 @@ msgstr "Descrizione imposta"
 msgid "Child Tax Accounts"
 msgstr "Conti imposta figli"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"Non c'è alcun periodo definito per questa data: %s.\n"
-"Crearne uno."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5911,7 +5727,7 @@ msgid "Target Moves"
 msgstr "Registrazioni:"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5949,6 +5765,7 @@ msgid "Python Code (reverse)"
 msgstr "Codice Python"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5966,12 +5783,6 @@ msgstr ""
 "imposte. Quest'ultima scelta presuppone che l'insieme delle imposte definite "
 "su questo template sia completo"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>pagato</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5997,18 +5808,13 @@ msgstr "Anno"
 msgid "It indicates that the invoice has been sent."
 msgstr "Indica che la fattura è stata spedita."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linea 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nome Interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -6050,7 +5856,7 @@ msgstr "Stato Patrimoniale"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Conto Economico (Ricavi)"
@@ -6083,7 +5889,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Codice calcolo (se tipo=codice)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -6112,6 +5918,7 @@ msgstr "Riconciliazione automatica"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -6224,7 +6031,7 @@ msgid "Recompute taxes and total"
 msgstr "Ricalcola imposte e totale"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -6257,7 +6064,7 @@ msgid "Amount Computation"
 msgstr "Calcolo ammontare"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -6295,10 +6102,16 @@ msgid "Account Common Account Report"
 msgstr "Account Common Account Report"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicazione"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Aperto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6331,9 +6144,7 @@ msgstr "Conti Imposte"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Note di Credito"
 
@@ -6350,11 +6161,6 @@ msgstr "Segno Tassa"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Rapporto delle fatture create negli ultimi 15 giorni"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Numero di giorni: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6371,6 +6177,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Compilare questo form se viene immesso contante nel registro cassa:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Importo da pagare"
@@ -6461,8 +6268,6 @@ msgstr "Arrotondamento per Riga"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6486,6 +6291,13 @@ msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 "Le registrazioni di pagamento sono il secondo input nella riconciliazione."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6495,15 +6307,6 @@ msgstr ""
 "Numero di ammontari parziali che possono essere combinati per trovare un "
 "totale che possa essere scelto per la riconciliazione automatica"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Il campo sequenza è usato per ordinare i termini di pagamento dal più breve "
-"al più lungo."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6563,12 +6366,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Importo fissato"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6594,7 +6396,6 @@ msgstr "Genera scritture di apertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Il metodo di calcolo per l'importo delle imposte"
 
@@ -6622,18 +6423,23 @@ msgid "Child Accounts"
 msgstr "Conto figlio"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Movimento nome (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Storno"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "voci"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6650,7 +6456,7 @@ msgstr "Ricavi"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Fornitore"
@@ -6670,16 +6476,11 @@ msgid "Account n°"
 msgstr "Conto n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Riferimenti vari"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valorizzazione"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6808,7 +6609,7 @@ msgid "Filter by"
 msgstr "Filtra per"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "L'espressione \"%(...)s\" nel modello è errata!"
@@ -6862,6 +6663,16 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Numero di Giorni"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"Non è possibile validate questa registrazione perchè il conto \"%s\" non "
+"appartiene al piano dei conti \"%s\"."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -7005,7 +6816,7 @@ msgid "Models"
 msgstr "Modelli"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -7196,7 +7007,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "Non è possibile creare registrazioni contabili su conti chiusi."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -7229,12 +7040,6 @@ msgstr "Personalizzazioni"
 msgid "Current"
 msgstr "Correnti"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr "La fattura '%s' è parzialmente pagata: %s%s di %s%s (%s%s residuo)."
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -7260,7 +7065,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentuale"
 
@@ -7280,7 +7084,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Non è possibile generare un codice sezionale inutilizzato."
@@ -7327,12 +7131,17 @@ msgid "Applicable Type"
 msgstr "Tipi applicabili"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "riferimento fattura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -7354,12 +7163,12 @@ msgstr ""
 "vendono valutate è importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7434,7 +7243,7 @@ msgid "Optional create"
 msgstr "Creazione Opzionale"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7447,9 +7256,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Note di Credito"
 
@@ -7487,9 +7294,14 @@ msgid "Group By..."
 msgstr "Raggruppa per..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Valutazione: Bilancio"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Non c'è alcun periodo definito per questa data: %s.\n"
+"Crearne uno."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7569,6 +7381,13 @@ msgstr "Il nome dell'imposta deve essere unico per azienda!"
 msgid "Cash Transactions"
 msgstr "Movimenti in contante"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7586,7 +7405,7 @@ msgstr "Statistiche scritture analitiche"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Registrazioni: "
@@ -7606,14 +7425,13 @@ msgstr ""
 "principale."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Fattura cliente"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Vero"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Stato Patrimoniale (Attività)"
@@ -7629,10 +7447,9 @@ msgid "Total debit"
 msgstr "Totale debiti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "La voce \"%s\" non è valida !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Registrazioni partner successivo da riconciliare"
 
 #. module: account
 #: report:account.invoice:0
@@ -7686,7 +7503,7 @@ msgstr "Crea registrazione"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Conto Economico (Costi)"
@@ -7697,13 +7514,14 @@ msgid "Total Transactions"
 msgstr "Transazioni Totali"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr "Non è possibile eliminare un conto con registrazioni contabili."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Errore !"
@@ -7740,6 +7558,11 @@ msgstr "LInea di Progetto"
 msgid "Manual"
 msgstr "Manuale"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7849,8 +7672,8 @@ msgstr "Selezione sezionale"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Bilancio d'apertura"
@@ -7936,7 +7759,7 @@ msgstr ""
 "La valuta scelta dovrebbe essere condivisa anche dai conti di default."
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7955,6 +7778,11 @@ msgstr ""
 "\n"
 "Esempio: Il mio modello del %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -8010,7 +7838,7 @@ msgid "Done"
 msgstr "Completato"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -8055,11 +7883,9 @@ msgid "Source Document"
 msgstr "Documento di origine"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"Non c'è un conto di costo definito per questo prodotto: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "Conti bancari come stampati nel piede di ogni documento stampato"
 
 #. module: account
 #: constraint:account.account:0
@@ -8088,7 +7914,7 @@ msgid "Taxes:"
 msgstr "Imposte:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -8288,6 +8114,12 @@ msgstr ""
 "modulo permettendo agli sviluppatori di creare imposte specifiche in un "
 "dominio personalizzato."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "riferimento fattura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -8385,7 +8217,7 @@ msgid "Use model"
 msgstr "Utilizza il Modello"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8457,7 +8289,7 @@ msgid "Root/View"
 msgstr "Radice/Vista"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -8527,7 +8359,7 @@ msgid "Maturity Date"
 msgstr "Data di scadenza"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Sezionale Vendite"
@@ -8538,7 +8370,7 @@ msgid "Invoice Tax"
 msgstr "Imposta della fattura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Nessun numero pezzo!"
@@ -8584,7 +8416,7 @@ msgid "Sales Properties"
 msgstr "Proprietà Vendite"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8611,7 +8443,7 @@ msgstr "A"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Rettifica Valuta"
@@ -8645,7 +8477,7 @@ msgid "May"
 msgstr "Maggio"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Imposte globali definite ma non presenti nelle voci fattura!"
@@ -8665,10 +8497,9 @@ msgstr ""
 "più basse a quelle più alte."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Codice"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8684,17 +8515,12 @@ msgstr "Sequenza note di credito"
 msgid "Post Journal Entries"
 msgstr "Conferma le scritture contabili"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr "Contropartita Centralizzata"
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8710,7 +8536,7 @@ msgstr "Nome Report"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Contante"
@@ -8722,9 +8548,11 @@ msgid "Account Destination"
 msgstr "Conto di Destinazione"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pagamento fatture"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8732,7 +8560,6 @@ msgstr "Pagamento fatture"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8873,15 +8700,14 @@ msgid "Partner Ledger"
 msgstr "Mastro del partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>annullato</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fisso"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione !"
@@ -8949,7 +8775,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Scegliere una valuta da applicare alla fattura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Mancano voci nella fattura !"
@@ -9031,7 +8857,7 @@ msgid "Associated Partner"
 msgstr "Partner associato"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Bisogna prima selezionare un partner!"
@@ -9113,13 +8939,13 @@ msgstr ""
 "prima di calcolare le prossime imposte"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Sezionale Note di Credito Fornitori"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "E' necessario definire una sequenza per il sezionale."
@@ -9195,7 +9021,7 @@ msgid "Net Total:"
 msgstr "Totale imponibile"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr "Selezionare un periodo iniziale e uno finale."
@@ -9215,15 +9041,6 @@ msgstr "Reporting  Generico"
 msgid "Write-Off Journal"
 msgstr "Sezionale Storni"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Questo termine di pagamento sara' usato per questo partner al posto del "
-"default"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -9250,11 +9067,6 @@ msgstr "int.Tipo"
 msgid "Tax/Base Amount"
 msgstr "Imponibile"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Valutazione: Percentuale"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -9311,6 +9123,11 @@ msgstr "Risultato riconciliato"
 msgid "Ending Balance"
 msgstr "Bilancio finale"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -9358,7 +9175,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Import automatico dei movimenti bancari"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Errore Sconosciuto!"
@@ -9381,7 +9198,12 @@ msgid "Account Types"
 msgstr "Tipi di conto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -9391,9 +9213,9 @@ msgstr ""
 "la sezione 'Voci di controllo' nel relativo sezionale."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Valore importo: n.d."
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoria CE / SP"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9410,10 +9232,9 @@ msgid "Reconciliation"
 msgstr "Riconciliazione"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Conto di Credito"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Lasciare vuoto per usare il conto di ricavo"
 
 #. module: account
 #: view:account.invoice:0
@@ -9509,7 +9330,7 @@ msgid "The partner account used for this invoice."
 msgstr "Il conto del partner utilizzato per questa fattura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Imposta %.2f%%"
@@ -9527,13 +9348,13 @@ msgid "Payment Term Line"
 msgstr "Riga termine di pagamento"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Sezionale Acquisti"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotale"
 
@@ -9562,11 +9383,6 @@ msgstr "Data scadenza"
 msgid "Suppliers"
 msgstr "Fornitori"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Vero"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9720,9 +9536,10 @@ msgid "Journal Name"
 msgstr "Nome sezionale"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Registrazioni partner successivo da riconciliare"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "La voce \"%s\" non è valida !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9772,7 +9589,7 @@ msgstr ""
 "L'importo espresso in un'altra valuta opzionale, se c'è una voce multivaluta."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9841,7 +9658,7 @@ msgid "Reconciled entries"
 msgstr "Entrate riconciliate"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Modello errato !"
@@ -9863,7 +9680,7 @@ msgid "Print Account Partner Balance"
 msgstr "Stampa Estratto Conto Partner"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9906,7 +9723,7 @@ msgstr "sconosciuto"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Sezionale delle voci di apertura"
@@ -9957,7 +9774,7 @@ msgstr ""
 "\"figlio\" invece che sul totale importo."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9973,21 +9790,9 @@ msgstr "Calcolato con codice Python"
 msgid "Journal Code"
 msgstr "Codice sezionale"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Quì è possibile specificare il coefficiente che verrà usato per il "
-"consolidamento dell'importonel mastro. Per esempio, impostare 1/-1 se si "
-"vuole aggiungere/sottrarre l'importo."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Ammontare residuo"
 
@@ -10020,7 +9825,7 @@ msgid "Unit of Currency"
 msgstr "Pezzatura Valuta"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sezionale Note di Credito"
@@ -10090,7 +9895,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposta acquisti (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Creare voci della fattura"
@@ -10111,7 +9916,7 @@ msgid "Display Detail"
 msgstr "Mostra dettagli"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -10239,21 +10044,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Numero di periodi"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Template di codici tassa"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: Scheda Conto Cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoria CE / SP"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -10265,9 +10060,10 @@ msgid "Supplier credit note sequence"
 msgstr "Sequenza nota di credito fornitore"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Numero fattura fornitore successivo"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "La fattura è già riconciliata."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10292,14 +10088,14 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Estratti Conto Bancari"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Conto di Credito"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -10402,8 +10198,8 @@ msgid "Move"
 msgstr "Movimento contabile"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -10489,11 +10285,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Spedito"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transazioni non riconciliate"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -10511,11 +10302,16 @@ msgid "Balance :"
 msgstr "Saldo:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr "Non è possibile creare movimenti per diverse aziende."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10552,13 +10348,6 @@ msgstr "Abbonamento"
 msgid "Account Analytic Balance"
 msgstr "Bilancio Contabilità Analitica"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr "Impossibile modificare o annullare la fattura se è riconciliata."
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10598,7 +10387,13 @@ msgid "Due date"
 msgstr "Data scadenza"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr " Centralizzazione"
@@ -10695,7 +10490,7 @@ msgid "Unreconciled"
 msgstr "Non riconciliate"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Totale errato !"
@@ -10789,7 +10584,7 @@ msgid "Comparison"
 msgstr "Confronto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10816,6 +10611,11 @@ msgstr ""
 "ogni conto analitico.\n"
 "                Installa il modulo account_budget."
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10871,11 +10671,6 @@ msgstr "Avere"
 msgid "Draft Invoice "
 msgstr "Bozza Fattura "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr "Annulla: crea e riconcilia note di credito"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10887,7 +10682,7 @@ msgid "Journal Entry Model"
 msgstr "Modello di  Registrazione"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "Il periodo di inizio deve essere antecedente a quello finale"
@@ -10972,7 +10767,7 @@ msgid "Profit (Loss) to report"
 msgstr "Utile (Perdita) da visualizzare"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr "Non c'è un Sezionale(/i) di Vendita/Acquisto definito."
@@ -11304,7 +11099,14 @@ msgid "Empty Accounts ? "
 msgstr "Conti vuoti ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Impossibile cambiare l'imposta!"
@@ -11433,7 +11235,7 @@ msgid "Receivable accounts"
 msgstr "Conti di credito"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Già riconciliato."
@@ -11573,7 +11375,7 @@ msgid "Entries Sorted by"
 msgstr "Voci ordinate per"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11704,7 +11506,7 @@ msgid "Accounting Documents"
 msgstr "Documenti contabili"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11753,7 +11555,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Imposte fattura manuali"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11836,17 +11638,6 @@ msgstr "Perdita"
 msgid "February"
 msgstr "Febbraio"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"se inserisci un Nome diverso da /, la relativa registrazione contabile sarà "
-"identificata con lo stesso nome. Questo consente alle registrazioni "
-"contabili di avere lo stesso nome del movimento."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11905,6 +11696,11 @@ msgstr "Template mappatura fiscale conto"
 msgid "Expense Account on Product Template"
 msgstr "Conto spese per il prodotto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -12079,9 +11875,6 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "Registrazioni contabili-"
 
-#~ msgid "Fixed"
-#~ msgstr "Fisso"
-
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Non è possibile cancellare il movimento registrato \"%s\"!"
@@ -12123,12 +11916,22 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Conferma documento con/senza riconciliazione da bozza"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Elaborazioni periodiche"
+
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Fattura fornitore"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Pagamento Riconciliato"
 
 #~ msgid "Line"
 #~ msgstr "Linea"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Contact"
 #~ msgstr "Contatto"
 
@@ -12200,6 +12003,13 @@ msgstr ""
 #~ msgid "Amount paid"
 #~ msgstr "Importo pagato"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Il campo sequenza è usato per ordinare i termini di pagamento dal più breve "
+#~ "al più lungo."
+
 #~ msgid "New Analytic Account"
 #~ msgstr "Nuovo conto analitico"
 
@@ -12218,6 +12028,9 @@ msgstr ""
 #~ msgid "Invoice import"
 #~ msgstr "Importo fattura"
 
+#~ msgid "Line Name"
+#~ msgstr "Nome linea"
+
 #~ msgid "Value"
 #~ msgstr "Valore"
 
@@ -12607,6 +12420,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Salta lo stato \"Bozza\" per le voci create"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "List of Accounts"
 #~ msgstr "Piano dei conti"
 
@@ -12791,6 +12607,9 @@ msgstr ""
 #~ msgid "Taxes Reports"
 #~ msgstr "Stampa Tasse"
 
+#~ msgid "Litigation"
+#~ msgstr "Causa"
+
 #~ msgid "From analytic accounts, Create invoice."
 #~ msgstr "Dai conti analitici, Crea fattura."
 
@@ -12989,6 +12808,13 @@ msgstr ""
 #~ msgid "Journal de vente"
 #~ msgstr "Giornale Vendite"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Se le transazioni vengono annullate è necessario inoltre verificare tutte le "
+#~ "azioni collegate siccome non verranno disabilitate"
+
 #~ msgid "Statement reconcile line"
 #~ msgstr "Documento di riconciliazione"
 
@@ -13066,6 +12892,9 @@ msgstr ""
 #~ "Genera automaticamente le voci basandosi su cosa è stato inserito nel "
 #~ "sistema prima di una specifica data."
 
+#~ msgid "Line 2:"
+#~ msgstr "Linea 2:"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -13110,6 +12939,9 @@ msgstr ""
 #~ msgid "Start period should be smaller then End period"
 #~ msgstr "Inizio periodo deve essere minore di fine periodo"
 
+#~ msgid "Line 1:"
+#~ msgstr "Linea 1:"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Errore di configurazione!"
@@ -13158,6 +12990,14 @@ msgstr ""
 #~ msgid "Account currency"
 #~ msgstr "Valuta del Conto"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Se si elimina la riconciliazione delle transazioni, si devono anche "
+#~ "verificare che tutte le azioni collegate a queste transizioni, poichè non "
+#~ "non vengono disabilitate automaticamente."
+
 #~ msgid "Children Definition"
 #~ msgstr "Definizione sottoconti"
 
@@ -13454,6 +13294,9 @@ msgstr ""
 #~ msgid "Transaction"
 #~ msgstr "Transazione"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicazione"
+
 #~ msgid "Lines to reconcile"
 #~ msgstr "Voci da riconciliare"
 
@@ -13574,6 +13417,13 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive Tax Codes."
 #~ msgstr "Errore! Non puoi creare un Codice di imposta ricorsivo"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Questo termine di pagamento sara' usato per questo partner al posto del "
+#~ "default"
+
 #, python-format
 #~ msgid "Bad account!"
 #~ msgstr "Conto sbagliato !"
@@ -13859,6 +13709,9 @@ msgstr ""
 #~ "automaticamente la tassazione legata a questo conto e la sua controparte "
 #~ "\"Conti Debito\"."
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banca e Assegni"
+
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Bilancio (Attività)"
 
@@ -14555,9 +14408,15 @@ msgstr ""
 #~ "Non è possibile cancellare una fattura in stato aperto o pagato. È "
 #~ "preferibile eseguire un rimborso."
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Valore importo: 0.02"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Vendite per tipo di questo mese"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Giorno del Mese: 0"
+
 #, python-format
 #~ msgid ""
 #~ "You need an Opening journal with centralisation checked to set the initial "
@@ -14598,11 +14457,17 @@ msgstr ""
 #~ "Deselezionare la casella di spunta nel relativo sezionale  dal menu di "
 #~ "configurazione."
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Numero di giorni: 30"
+
 #, python-format
 #~ msgid "You can not create journal items on a closed account %s %s"
 #~ msgstr ""
 #~ "Non è possibile creare registrazioni contabili su di un conto chiuso %s %s"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Giorno del mese= -1"
+
 #, python-format
 #~ msgid ""
 #~ "You haven't supplied enough argument to compute the initial balance, please "
@@ -14641,6 +14506,9 @@ msgstr ""
 #~ "Non è possibile definire sottoconti appartenenti ad un conto con tipo "
 #~ "interno diverso da \"Vista\"! "
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Fattura (Ref ${object.number or 'n/a' })"
+
 #~ msgid ""
 #~ "To print an analytics (or costs) journal for a given period. The report give "
 #~ "code, move name, account number, general amount and analytic amount."
@@ -14665,6 +14533,9 @@ msgstr ""
 #~ "Errore! La data di partenza dell'anno fiscale deve essere antecedente la "
 #~ "data di fine."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Numero di giorni: 14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
@@ -14680,6 +14551,13 @@ msgstr ""
 #~ msgid "Sale journal in this year"
 #~ msgstr "Sezionale vendite in questo anno"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Fattura '%s' validata."
+
+#~ msgid "Valuation"
+#~ msgstr "Valorizzazione"
+
 #~ msgid ""
 #~ "Select here the kind of valuation related to this payment term line. Note "
 #~ "that you should have your last line with the type 'Balance' to ensure that "
@@ -14799,6 +14677,9 @@ msgstr ""
 #~ "Non è possibile validare questa registrazione contabile in quanto il conto "
 #~ "\"%s\" non appartiene al piano dei conti \"%s\"!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "2% dopo 14 giorni, saldo 30 giorni fine mese."
+
 #~ msgid "Cancel: refund invoice and reconcile"
 #~ msgstr "Annulla: Nota di Credito e riconciliazione"
 
@@ -14824,6 +14705,9 @@ msgstr ""
 #~ msgid "My invoices"
 #~ msgstr "Le mie fatture"
 
+#~ msgid "Example"
+#~ msgstr "Esempio"
+
 #~ msgid "Analytic Entries during last 7 days"
 #~ msgstr "Registrazioni analitiche degli ultimi 7 giorni"
 
@@ -14864,6 +14748,9 @@ msgstr ""
 #~ "Non è possibile rimuovere/disattivare un conto impostato come cliente o "
 #~ "fornitore."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Valutazione: Bilancio"
+
 #, python-format
 #~ msgid "You can not desactivate an account that contains some journal items."
 #~ msgstr ""
@@ -15074,6 +14961,12 @@ msgstr ""
 #~ "La maggior parte delle operazioni di OpenERP (fatture, schede attività, "
 #~ "spese, ecc) generano registrazioni analitiche sul relativo conto."
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Valutazione: Percentuale"
+
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Valore importo: n.d."
+
 #~ msgid "Contacts"
 #~ msgstr "Contatti"
 
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 3585018341d..c598f88dc30 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-06 02:41+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "未消し込み取引"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "請求書や支払いからインポート"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "借方合計"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr "取引を消し込みしない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr "アクティブ項目がFalseに設定されている場合、支払条件を削除することなく非表示にできます。"
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "警告"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "その他の仕訳帳"
@@ -233,11 +220,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "税金テンプレート"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -253,6 +235,11 @@ msgstr "会計エントリーは消し込みの入力です。"
 msgid "Belgian Reports"
 msgstr "ベルギーのレポート"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -383,11 +370,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -442,6 +424,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -457,6 +444,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "チャートテンプレート"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -618,13 +610,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "３ヶ月毎"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr "取引を消し込みしない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -673,7 +658,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "所定の日付のために期間が見つからないか、複数の期間が見つかりました。"
@@ -684,13 +669,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "アカウントタイプ別売上レポート"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -753,6 +738,11 @@ msgstr "売掛金"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -775,6 +765,12 @@ msgstr "再度開く"
 msgid "Are you sure you want to create entries?"
 msgstr "本当にエントリーを作成しますか？"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -795,6 +791,7 @@ msgstr "階層とともに子を表示"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "パーセント"
 
@@ -837,7 +834,7 @@ msgid "Type"
 msgstr "タイプ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -862,24 +859,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "仕入先請求書と返金"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "未消し込み"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "14日間で２パーセント、月末の30日間で残量"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -910,11 +901,6 @@ msgstr "J.C. / Move 名前"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -945,7 +931,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -960,6 +946,7 @@ msgstr "新しいサブスクリプション"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "計算"
 
@@ -991,11 +978,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1031,7 +1015,7 @@ msgid "Liability"
 msgstr "負債"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "この請求書と関連する仕訳帳上に順序を定義して下さい。"
@@ -1104,10 +1088,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1183,8 +1167,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1230,7 +1215,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "銀行"
@@ -1526,9 +1511,9 @@ msgid "Account Receivable"
 msgstr "売掛金"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1542,7 +1527,7 @@ msgid "With balance is not equal to 0"
 msgstr "残高が0ではありません。"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1597,7 +1582,7 @@ msgstr "手動入力のため、ドラフト状態をスキップします。"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1640,6 +1625,12 @@ msgstr "ダッシュボードビューのために使われる一時的なテー
 msgid "Supplier Refunds"
 msgstr "仕入先返金"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "事例コード"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1677,7 +1668,6 @@ msgid "Groups"
 msgstr "グループ"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "非課税"
@@ -1810,6 +1800,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "アカウントタイプ別売上"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1830,115 +1826,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2047,6 +1939,11 @@ msgstr "これらの期間は重なることができます。"
 msgid "Draft statement"
 msgstr "ドラフト取引明細書"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2075,26 +1972,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2102,16 +1998,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2122,8 +2018,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2168,7 +2064,7 @@ msgid "period close"
 msgstr "期間終了"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2268,7 +2164,7 @@ msgid "Product Category"
 msgstr "製品分類"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2630,7 +2526,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "全ての開いている会計年度を空に保ちます。"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2648,7 +2544,7 @@ msgid "Create an Account Based on this Template"
 msgstr "このテンプレートに基づくアカウントの作成"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2669,7 +2565,7 @@ msgid "Main Sequence"
 msgstr "主順序"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2677,14 +2573,12 @@ msgid ""
 msgstr "銀行口座明細書を削除するには、関連する仕訳帳項目を削除するために最初にそれをキャンセルする必要があります。"
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "支払条件"
 
@@ -2710,18 +2604,6 @@ msgstr "このボックスをチェック"
 msgid "Filters"
 msgstr "フィルタ"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "開く"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2733,6 +2615,11 @@ msgstr "請求書のドラフト状態"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2810,25 +2697,20 @@ msgid "Account Model Entries"
 msgstr "アカウントモデルエントリー"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "仕入先税金"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "エントリー"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "銀行詳細"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2851,7 +2733,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2863,9 +2744,8 @@ msgstr ""
 "支払条件は幾つかの期日が計算されるかもしれません。例えば、50％を現在、50％を1ヶ月以内といったように。"
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2895,6 +2775,7 @@ msgstr "アカウント移動行の消し込み（償却）"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "税金"
 
@@ -2930,14 +2811,14 @@ msgid "Accounts"
 msgstr "アカウント"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3034,6 +2915,12 @@ msgstr "支払済 / 消し込み済"
 msgid "Refund Base Code"
 msgstr "基本コードの返金"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "銀行取引明細書"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3086,11 +2973,6 @@ msgstr "パートナ残高年齢表"
 msgid "Accounting entries"
 msgstr "会計エントリー"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "通信タイプ"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3133,7 +3015,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3146,7 +3028,7 @@ msgid "Sales by Account"
 msgstr "アカウント別売上"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3162,15 +3044,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "%s 仕訳帳に分析仕訳を定義しなければなりません。"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3178,7 +3060,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3241,9 +3123,10 @@ msgstr ""
 "オプションの数量はこの行で、例えば、販売された製品の数を表します。数量は法的には要求されませんが、幾つかのレポートのためにはとても役立ちます。"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "行２："
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3289,12 +3172,6 @@ msgstr "基本コードの金額"
 msgid "Default Sale Tax"
 msgstr "デフォルト消費税（売上）"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "請求書 %s は検証されます。"
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3328,7 +3205,7 @@ msgid "Fiscal Position"
 msgstr "会計ポジション"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3357,7 +3234,7 @@ msgid "Trial Balance"
 msgstr "試算表"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3425,7 +3302,7 @@ msgstr ""
 "ソフトウェアシステムからインポートした場合は、日付レートを使用しなければならないかも知れません。被仕向取引は常に日付レートを使用します。"
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3437,9 +3314,9 @@ msgid "No. of Digits to use for account code"
 msgstr "アカウントコードのために使用される数字の桁数"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "行名称"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3488,7 +3365,7 @@ msgid "View"
 msgstr "ビュー"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3509,15 +3386,20 @@ msgstr "プロフォーマ請求書"
 msgid "Electronic File"
 msgstr "電子ファイル"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  月における通算日：0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "税金コードテンプレート"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3525,9 +3407,88 @@ msgid "Account Partner Ledger"
 msgstr "アカウントパートナ元帳"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3659,12 +3620,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  値の量：0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"名前として / "
+"以外を与えた場合は、作成された会計エントリーの移動は取引明細書の名前として同じ名前になります。これによって取引明細書のエントリーはそれ自身の取引明細書と同"
+"じ参照を持つことができます。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3679,7 +3646,7 @@ msgid "Starting Balance"
 msgstr "期首残高"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "パートナが定義されていません。"
@@ -3879,7 +3846,7 @@ msgid "Period Length (days)"
 msgstr "期間の長さ（日数）"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3903,7 +3870,7 @@ msgid "Category of Product"
 msgstr "製品分類"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4039,7 +4006,7 @@ msgid "Chart of Accounts Template"
 msgstr "勘定科目表テンプレート"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4126,9 +4093,13 @@ msgid "Qty"
 msgstr "数量"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "訴訟"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"この事例の金額を親に統合する時に使用される係数をここで定義できます。例えば、それを加算 / 減算したい場合は、1 / -1 を設定します。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4211,11 +4182,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4233,11 +4199,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "銀行口座の設定"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4282,8 +4243,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4313,7 +4274,7 @@ msgid "Consolidated Children"
 msgstr "統合された子"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4347,11 +4308,6 @@ msgstr ""
 msgid "title"
 msgstr "タイトル"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4441,6 +4397,13 @@ msgstr "30日月末"
 msgid "Analytic Balance"
 msgstr "分析的な残高"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4460,6 +4423,11 @@ msgstr "アクティブ項目がFalseに設定されている場合、それを
 msgid "Posted Journal Items"
 msgstr "記帳済仕訳帳項目"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4470,11 +4438,6 @@ msgstr "税金テンプレート検索"
 msgid "Draft Entries"
 msgstr "ドラフトエントリー"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  月の通算日＝-1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4483,11 +4446,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  日数：30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4511,20 +4469,9 @@ msgid "Account Type"
 msgstr "アカウントタイプ"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "現金箱を閉じる"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4545,9 +4492,20 @@ msgid ""
 msgstr "分析コスト（勤務表、幾つかの仕入済製品など）は分析アカウントから来ています。これらはドラフトの仕入先請求書を生成します。"
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "現金箱を閉じる"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4575,7 +4533,7 @@ msgid "Month"
 msgstr "月"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4586,8 +4544,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4611,6 +4569,11 @@ msgstr "PayPalアカウント"
 msgid "Acc.Type"
 msgstr "アカウントタイプ"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4623,7 +4586,7 @@ msgstr "残高符号の反転"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "貸借対照表（負債勘定）"
@@ -4645,7 +4608,7 @@ msgid "Account Base Code"
 msgstr "アカウント基本コード"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4700,11 +4663,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "定期的処理"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4734,9 +4692,8 @@ msgid "Account chart"
 msgstr "会計表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4805,10 +4762,14 @@ msgstr "クレジットノート"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4859,7 +4820,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4874,7 +4835,7 @@ msgid "Based On"
 msgstr "基準"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4899,11 +4860,6 @@ msgstr ""
 msgid "Change"
 msgstr "変更"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "銀行と小切手"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4926,11 +4882,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "キャンセル済"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "例"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4941,11 +4892,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "収益勘定を使うためは空のままとします。"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4955,7 +4901,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "消費税（仕入） %.2f%%"
@@ -5029,16 +4975,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "その他"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} 請求書（参照 ${object.number or 'n/a' }）"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5149,6 +5090,7 @@ msgstr "追加"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "支払済"
 
@@ -5175,7 +5117,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "期首日"
@@ -5190,14 +5132,6 @@ msgstr "レビューすべき仕訳帳エントリー"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5210,7 +5144,7 @@ msgid "Tax Application"
 msgstr "税金アプリケーション"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5243,9 +5177,9 @@ msgid "End of period"
 msgstr "期末日"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "銀行詳細"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "請求書の支払"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5338,14 +5272,6 @@ msgstr "税金説明"
 msgid "Child Tax Accounts"
 msgstr "子税金アカウント"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5390,7 +5316,7 @@ msgid "Target Moves"
 msgstr "ターゲットの移動"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5426,6 +5352,7 @@ msgid "Python Code (reverse)"
 msgstr "Pythonコード（リバース）"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5441,12 +5368,6 @@ msgstr ""
 "このブール値はユーザに売上と仕入レートのコード化を提案する、あるいは税金のリストから選択するかのどちらを望むかの選択を助けます。この最終選択はこのテンプレ"
 "ート上に定義された税金のセットが完全であると想定しています。"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5472,18 +5393,13 @@ msgstr "年"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "行１："
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "内部名称"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5522,7 +5438,7 @@ msgstr "貸借対照表"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "損益（損益勘定）"
@@ -5555,7 +5471,7 @@ msgid "Compute Code (if type=code)"
 msgstr "計算コード（タイプがコードの場合）"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5582,6 +5498,7 @@ msgstr "自動消し込み"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5684,7 +5601,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5712,7 +5629,7 @@ msgid "Amount Computation"
 msgstr "金額計算"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5748,10 +5665,16 @@ msgid "Account Common Account Report"
 msgstr "アカウント共通アカウントレポート"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "通信"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "開く"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5781,9 +5704,7 @@ msgstr "税金コード"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "顧客返金"
 
@@ -5800,11 +5721,6 @@ msgstr "税金コード記号"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "過去15日以内に作成した請求書のレポート"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  日数：14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5821,6 +5737,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "支払金額"
@@ -5910,8 +5827,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5934,6 +5849,13 @@ msgstr "通常のテキスト"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "支払いエントリーは消し込みの第２の入力です。"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5941,13 +5863,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr "バランスポイントを見つけるために組み合わせることのできる部分的な量の数は、自動消し込みの能力として選択されます。"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr "順序項目は低い順序から高いものへ支払条件行を並べるために使われます。"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6005,12 +5920,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "固定金額"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6034,7 +5948,6 @@ msgstr "開始エントリーの生成"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "税額の計算方法"
 
@@ -6062,18 +5975,23 @@ msgid "Child Accounts"
 msgstr "子アカウント"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "移動名（ID）：%s（%s）"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "償却"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "エントリー"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6090,7 +6008,7 @@ msgstr "収入"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "仕入先"
@@ -6110,16 +6028,11 @@ msgid "Account n°"
 msgstr "アカウント番号"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "自由参照"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "評価"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6232,7 +6145,7 @@ msgid "Filter by"
 msgstr "フィルタ"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "モデルの中に誤った式があります：%(...)s"
@@ -6279,6 +6192,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "日数"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6418,7 +6339,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6595,7 +6516,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6626,12 +6547,6 @@ msgstr ""
 msgid "Current"
 msgstr "現在"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6656,7 +6571,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "パーセンテージ"
 
@@ -6676,7 +6590,7 @@ msgid "Power"
 msgstr "電力"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6721,12 +6635,17 @@ msgid "Applicable Type"
 msgstr "適切なタイプ"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "請求書参照"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6744,12 +6663,12 @@ msgstr ""
 "となります。"
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6820,7 +6739,7 @@ msgid "Optional create"
 msgstr "作成オプション"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6831,9 +6750,7 @@ msgstr "既に仕訳帳項目に含めれるアカウントの所有会社を変
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "仕入先返金"
 
@@ -6871,9 +6788,12 @@ msgid "Group By..."
 msgstr "グループ化…"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  評価：バランス"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6949,6 +6869,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "現金取引"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6966,7 +6893,7 @@ msgstr "分析エントリーの統計情報"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "エントリー： "
@@ -6984,14 +6911,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "貸借対照表（資産勘定）"
@@ -7007,10 +6933,9 @@ msgid "Total debit"
 msgstr "借方合計"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "エントリー %s は有効ではありません。"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "消し込みする次のパートナエントリー"
 
 #. module: account
 #: report:account.invoice:0
@@ -7059,7 +6984,7 @@ msgstr "エントリー作成"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "損益計算書（費用勘定）"
@@ -7070,13 +6995,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "エラー"
@@ -7113,6 +7039,11 @@ msgstr "プロジェクト行"
 msgid "Manual"
 msgstr "手動"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7214,8 +7145,8 @@ msgstr "仕訳帳選択"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "期首残高"
@@ -7295,7 +7226,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7316,6 +7247,11 @@ msgstr ""
 "\n"
 "例えば、%(date)s の私のモデル"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7369,7 +7305,7 @@ msgid "Done"
 msgstr "完了"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7404,9 +7340,8 @@ msgid "Source Document"
 msgstr "基となるドキュメント"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7433,7 +7368,7 @@ msgid "Taxes:"
 msgstr "税金："
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7626,6 +7561,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr "この項目は、カスタムドメイン内に特別な税金を作成することを許された開発者によって、あなた自身のモジュールを開発する場合にのみ使われます"
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "請求書参照"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7715,7 +7656,7 @@ msgid "Use model"
 msgstr "モデルの使用"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7766,7 +7707,7 @@ msgid "Root/View"
 msgstr "ルート / ビュー"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7833,7 +7774,7 @@ msgid "Maturity Date"
 msgstr "満期日"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "売上仕訳帳"
@@ -7844,7 +7785,7 @@ msgid "Invoice Tax"
 msgstr "請求書税金"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "ピース番号がありません。"
@@ -7886,7 +7827,7 @@ msgid "Sales Properties"
 msgstr "売上属性"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7911,7 +7852,7 @@ msgstr "まで"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "通貨調整"
@@ -7943,7 +7884,7 @@ msgid "May"
 msgstr "5月"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "全体的な税金は定義されていますが、請求書行にそれらが存在しません。"
@@ -7961,10 +7902,9 @@ msgid ""
 msgstr "重所項目は低い順序から高い順序にリソースを並べるのに使われます。"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "事例コード"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7980,17 +7920,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "仕訳帳エントリーの記帳"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "顧客"
@@ -8006,7 +7941,7 @@ msgstr "レポート名"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "現金"
@@ -8018,9 +7953,11 @@ msgid "Account Destination"
 msgstr "アカウントの宛先"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "請求書の支払"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8028,7 +7965,6 @@ msgstr "請求書の支払"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8163,15 +8099,14 @@ msgid "Partner Ledger"
 msgstr "パートナ元帳"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "固定"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "警告"
@@ -8239,7 +8174,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "請求書に適用する通貨の選択"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "請求書行がありません。"
@@ -8316,7 +8251,7 @@ msgid "Associated Partner"
 msgstr "関連パートナ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "最初にパートナを選択して下さい。"
@@ -8396,13 +8331,13 @@ msgid ""
 msgstr "次の税金を計算する前に、税金額が基準額に含まれていなければならない時に設定します。"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "仕入返金仕訳帳"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8473,7 +8408,7 @@ msgid "Net Total:"
 msgstr "正味合計："
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8493,13 +8428,6 @@ msgstr "一般的なレポート"
 msgid "Write-Off Journal"
 msgstr "償却仕訳帳"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "この支払条件は現在のパートナのためにデフォルト条件の代わりに使用されます。"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8526,11 +8454,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "課税基準金額"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  評価：パーセント"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8584,6 +8507,11 @@ msgstr "消し込み結果"
 msgid "Ending Balance"
 msgstr "期末残高"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8624,7 +8552,7 @@ msgid "Automatic import of the bank sta"
 msgstr "銀行取引明細書の自動インポート"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8647,7 +8575,12 @@ msgid "Account Types"
 msgstr "アカウントタイプ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8655,9 +8588,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  値の金額：取引なし"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "損益計算書 / 貸借対照表分類"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8674,10 +8607,9 @@ msgid "Reconciliation"
 msgstr "調整"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "売掛金"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "収益勘定を使うためは空のままとします。"
 
 #. module: account
 #: view:account.invoice:0
@@ -8752,7 +8684,7 @@ msgid "The partner account used for this invoice."
 msgstr "パートナアカウントはこの請求書に使用されています。"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "税金 %.2f%%"
@@ -8770,13 +8702,13 @@ msgid "Payment Term Line"
 msgstr "支払条件行"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "仕入仕訳帳"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "小計"
 
@@ -8805,11 +8737,6 @@ msgstr "期日"
 msgid "Suppliers"
 msgstr "仕入先"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8944,9 +8871,10 @@ msgid "Journal Name"
 msgstr "仕訳帳名"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "消し込みする次のパートナエントリー"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "エントリー %s は有効ではありません。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8991,7 +8919,7 @@ msgid ""
 msgstr "多通貨エントリーの場合は金額はオプションである他の通貨により表わされます。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9052,7 +8980,7 @@ msgid "Reconciled entries"
 msgstr "消し込み済エントリー"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "誤ったモデルです。"
@@ -9074,7 +9002,7 @@ msgid "Print Account Partner Balance"
 msgstr "パートナ残高アカウントの印刷"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9110,7 +9038,7 @@ msgstr "不明"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "仕訳帳の開始エントリー"
@@ -9155,7 +9083,7 @@ msgid ""
 msgstr "税金計算が合計金額より、むしろ、子の税金の計算に基づく場合は設定して下さい。"
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9170,19 +9098,9 @@ msgstr "Pythonコードによる指定"
 msgid "Journal Code"
 msgstr "仕訳帳コード"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"この事例の金額を親に統合する時に使用される係数をここで定義できます。例えば、それを加算 / 減算したい場合は、1 / -1 を設定します。"
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "残差金額"
 
@@ -9215,7 +9133,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "売上返金仕訳帳"
@@ -9281,7 +9199,7 @@ msgid "Purchase Tax(%)"
 msgstr "消費税（仕入）（%）"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "いくらかの請求書行を作成して下さい。"
@@ -9300,7 +9218,7 @@ msgid "Display Detail"
 msgstr "詳細情報の表示"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9415,21 +9333,11 @@ msgstr "会計士は請求書から来る会計エントリーを検証します
 msgid "Number of Periods"
 msgstr "期間数"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "税金コードテンプレート"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "ドキュメント：顧客アカウント取引明細書"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "損益計算書 / 貸借対照表分類"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9441,8 +9349,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9462,14 +9371,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "銀行取引明細書"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "売掛金"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9570,8 +9479,8 @@ msgid "Move"
 msgstr "移動"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9650,11 +9559,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "未消し込み取引"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9672,11 +9576,16 @@ msgid "Balance :"
 msgstr "残高："
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9713,13 +9622,6 @@ msgstr "サブスクリプション"
 msgid "Account Analytic Balance"
 msgstr "アカウント分析残高"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9759,7 +9661,13 @@ msgid "Due date"
 msgstr "期日"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9852,7 +9760,7 @@ msgid "Unreconciled"
 msgstr "未消し込み"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "合計が誤っています。"
@@ -9938,7 +9846,7 @@ msgid "Comparison"
 msgstr "比較"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9956,6 +9864,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10009,11 +9922,6 @@ msgstr "貸方"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10025,7 +9933,7 @@ msgid "Journal Entry Model"
 msgstr "仕訳帳エントリーのモデル"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10110,7 +10018,7 @@ msgid "Profit (Loss) to report"
 msgstr "損益計算書"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10433,7 +10341,14 @@ msgid "Empty Accounts ? "
 msgstr "空のアカウントですか？ "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10558,7 +10473,7 @@ msgid "Receivable accounts"
 msgstr "売掛金"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10688,7 +10603,7 @@ msgid "Entries Sorted by"
 msgstr "エントリー並び順"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10794,7 +10709,7 @@ msgid "Accounting Documents"
 msgstr "会計ドキュメント"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10839,7 +10754,7 @@ msgid "Manual Invoice Taxes"
 msgstr "手動請求書税金"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10918,17 +10833,6 @@ msgstr ""
 msgid "February"
 msgstr "2月"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"名前として / "
-"以外を与えた場合は、作成された会計エントリーの移動は取引明細書の名前として同じ名前になります。これによって取引明細書のエントリーはそれ自身の取引明細書と同"
-"じ参照を持つことができます。"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10987,6 +10891,11 @@ msgstr "テンプレートアカウントの会計マッピング"
 msgid "Expense Account on Product Template"
 msgstr "製品テンプレート上の経費勘定"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11131,6 +11040,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Unreconciliation transactions"
 #~ msgstr "不一致取引"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "14日間で２パーセント、月末の30日間で残量"
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -11408,15 +11320,25 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "No sequence defined on the journal !"
 #~ msgstr "この仕訳帳には順序が定義されていません。"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "請求書 %s は検証されます。"
+
 #~ msgid "Required"
 #~ msgstr "必須"
 
+#~ msgid "Line 2:"
+#~ msgstr "行２："
+
 #~ msgid "Bank account"
 #~ msgstr "銀行口座"
 
 #~ msgid "Cash Transaction"
 #~ msgstr "現金取引"
 
+#~ msgid "Line Name"
+#~ msgstr "行名称"
+
 #~ msgid "Month-1"
 #~ msgstr "月-1"
 
@@ -11426,6 +11348,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Customer Credit"
 #~ msgstr "顧客クレジット"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  月における通算日：0"
+
 #~ msgid "Gives the sequence order to journal column."
 #~ msgstr "仕訳帳カラムに並び順を与えます。"
 
@@ -11436,6 +11361,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Generate Chart of Accounts from a Chart Template"
 #~ msgstr "チャートテンプレートから勘定科目表を生成"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  値の量：0.02"
+
 #~ msgid "Accounting Dashboard"
 #~ msgstr "会計ダッシュボード"
 
@@ -11478,6 +11406,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Centralised counterpart"
 #~ msgstr "相手方の一元化"
 
+#~ msgid "Litigation"
+#~ msgstr "訴訟"
+
 #~ msgid "Account balance"
 #~ msgstr "アカウント残高"
 
@@ -11502,11 +11433,17 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ "single report"
 #~ msgstr "このレポートは１枚のレポートでアカウントのそれぞれの残高をすばやくチェックできる試算表であり、印刷、あるいはPDFの作成ができます。"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  日数：30"
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category using sale price"
 #~ msgstr "このアカウントは現在の製品分類において販売価格を使って出荷される在庫の価値のために使われます。"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  月の通算日＝-1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr "エラー。会計年度の開始日はその終了日より前でなければなりません。"
 
@@ -11552,6 +11489,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Overdue Account"
 #~ msgstr "期限切れアカウント"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "定期的処理"
+
 #~ msgid "You can not create analytic line on view account."
 #~ msgstr "ビューアカウントでは分析行を作ることはできません。"
 
@@ -11611,6 +11551,12 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ "請求書の価格を検証して下さい。\n"
 #~ "実際の合計が計算された合計と一致しません。"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "銀行と小切手"
+
+#~ msgid "Example"
+#~ msgstr "例"
+
 #, python-format
 #~ msgid ""
 #~ "Couldn't create move with currency different from the secondary currency of "
@@ -11631,6 +11577,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Starting Date"
 #~ msgstr "開始日"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} 請求書（参照 ${object.number or 'n/a' }）"
+
 #~ msgid "Salesman"
 #~ msgstr "販売員"
 
@@ -11687,6 +11636,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Integrity Error !"
 #~ msgstr "整合性エラー。"
 
+#~ msgid "Line 1:"
+#~ msgstr "行１："
+
 #, python-format
 #~ msgid "No Period found on Invoice!"
 #~ msgstr "請求書に期間が見つかりません。"
@@ -11700,6 +11652,12 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "分析エントリーの統計値"
 
+#~ msgid "Communication"
+#~ msgstr "通信"
+
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  日数：14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr "一元化仕訳帳上では期間毎に１回以上の移動を作成することは出来ません。"
@@ -11747,6 +11705,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Invoice Address"
 #~ msgstr "請求書住所"
 
+#~ msgid "Valuation"
+#~ msgstr "評価"
+
 #, python-format
 #~ msgid "You can not use an inactive account!"
 #~ msgstr "非アクティブなアカウントを使うことはできません。"
@@ -11979,9 +11940,6 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "    7 Days    "
 #~ msgstr "    7日    "
 
-#~ msgid "Fixed"
-#~ msgstr "固定"
-
 #~ msgid "State"
 #~ msgstr "状態"
 
@@ -12031,6 +11989,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ "ready for editing."
 #~ msgstr "請求書の変更：現在の請求書のキャンセルし、編集準備ができた新しいコピーを作成"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  評価：パーセント"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -12045,6 +12006,14 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "current month"
 #~ msgstr "今月"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  値の金額：取引なし"
+
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr "順序項目は低い順序から高いものへ支払条件行を並べるために使われます。"
+
 #~ msgid ""
 #~ "Payment terms define the conditions to pay a customer or supplier invoice in "
 #~ "one or several payments. Customers periodic reminders will use the payment "
@@ -12068,6 +12037,11 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "The payment term of supplier does not have a payment term line!"
 #~ msgstr "仕入先の支払条件は支払条件行を持っていません。"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "この支払条件は現在のパートナのためにデフォルト条件の代わりに使用されます。"
+
 #~ msgid "Contacts"
 #~ msgstr "コンタクト"
 
@@ -12096,6 +12070,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ "ここではこの支払条件行に関連する評価の種類を選択して下さい。全体の金額が扱われることを保証するために、最終行がバランスタイプを持つべきであることに注意して"
 #~ "下さい。"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  評価：バランス"
+
 #, python-format
 #~ msgid "Unable to adapt the initial balance (negative value)!"
 #~ msgstr "期首残高（負値）に適応できません。"
@@ -12340,6 +12317,16 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "You must enter a period length that cannot be 0 or below !"
 #~ msgstr "0でもそれ以下でもない期間の長さを入力する必要があります。"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr "取引を消し込みしない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
+
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr "取引を消し込みしない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
+
 #, python-format
 #~ msgid "To reconcile the entries company should be the same for all entries"
 #~ msgstr "エントリーを消し込みするために、会社は全てのエントリーに対して同じであるべきです。"
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 7242d0bd921..e17b32246d9 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-29 10:25+0000\n"
 "Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
 "Language-Team: Kabyle <kab@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr "Isem n uɣmis"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
index c5807dbdd89..2633c63b0eb 100644
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-02 10:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Пайыз"
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr "Түрі"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr "Топтар"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr "Сүзгілер"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Ашу"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Салық"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr "Тіркелгілер"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,10 +5623,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Ашу"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 4571084969f..84ef24fef88 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr "채권 계정"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr "밸런스가 0이 아닌"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "내부 명칭"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "퍼센트"
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "현금"
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr "재조정 결과"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr "다중 통화 엔트리의 경우, 선택적인 다른 통화로 표현된 금액"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr "대변"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr "채권 계정"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index a839b185578..ea07e2027ad 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 18:21+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "ລວມເດບິຕ"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "ລະວັງ !"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "ເເບບຢ່າງອາກອນ"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "ເເບບຢ່າງຜັງ"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index e6b6ecec1e1..f06d94fa82c 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 15:27+0000\n"
 "Last-Translator: Andrius Preimantas <andrius.preimantas@gmail.com>\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: 2012-12-13 04:43+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "Importuoti iš sąskaitos ar mokėjimo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,15 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Iš viso debeto"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Jeigu Jūs nesuderinote transakcijų, Jūs taip pat turėtumėte patikrinti visus "
-"veiksmus kurie yra susiję su šiomis transakcijomis, nes jos nebus išjungtos"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -110,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -141,19 +126,19 @@ msgstr ""
 "terminą jo nepašalinus."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -165,7 +150,7 @@ msgid "Warning!"
 msgstr "Įspėjimas!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -234,11 +219,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Mokesčių šablonai"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "Mokesčių sąskaita"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -254,6 +234,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -380,11 +365,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -439,6 +419,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -454,6 +439,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Sąskaitų plano šablonas"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -615,15 +605,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Jeigu Jūs norite atšaukti įrašų sugretinimą, Jūs turite atšaukti susijusius "
-"veiksmus su šiais įrašais."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -672,7 +653,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -683,13 +664,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -752,6 +733,11 @@ msgstr "Debetinės sąskaitos"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -774,6 +760,12 @@ msgstr "Iš naujo atverti"
 msgid "Are you sure you want to create entries?"
 msgstr "Ar Jūs tikrai norite sukurti įrašus?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -794,6 +786,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procentų"
 
@@ -836,7 +829,7 @@ msgid "Type"
 msgstr "Tipas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -859,24 +852,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Išgretinimas"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -907,11 +894,6 @@ msgstr "Analitinio įrašo pavadinimas"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -942,7 +924,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -957,6 +939,7 @@ msgstr "Naujas periodinis įrašas"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Apskaičiavimas"
 
@@ -988,11 +971,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1028,7 +1008,7 @@ msgid "Liability"
 msgstr "Įsipareigojimai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1099,10 +1079,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1178,8 +1158,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1225,7 +1206,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1521,9 +1502,9 @@ msgid "Account Receivable"
 msgstr "Debitorių sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1537,7 +1518,7 @@ msgid "With balance is not equal to 0"
 msgstr "Kurių balansas nelygus nuliui"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1592,7 +1573,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1635,6 +1616,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Tiekėjo grąžinimai"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Įvykio kodas"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1672,7 +1659,6 @@ msgid "Groups"
 msgstr "Grupės"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Suma be mokesčių"
@@ -1805,6 +1791,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1825,115 +1817,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2042,6 +1930,11 @@ msgstr "Šie periodai gali persikloti."
 msgid "Draft statement"
 msgstr "Dokumento juodraštis"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2070,26 +1963,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2097,16 +1989,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2117,8 +2009,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2163,7 +2055,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2263,7 +2155,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2627,7 +2519,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Palikite tuščią visiems atviriems fiskaliniams metams."
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2645,7 +2537,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2666,7 +2558,7 @@ msgid "Main Sequence"
 msgstr "Pagrindinė seka"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2674,14 +2566,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Mokėjimo terminas"
 
@@ -2707,18 +2597,6 @@ msgstr "Pažymėkite patvirtinimui"
 msgid "Filters"
 msgstr "Filtrai"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Atidaryta"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2730,6 +2608,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2807,25 +2690,20 @@ msgid "Account Model Entries"
 msgstr "Sąskaitos modelio įrašai"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Tiekėjo mokesčiai"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Banko rekvizitai"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2848,7 +2726,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2858,9 +2735,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2890,6 +2766,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Mokestis"
 
@@ -2925,14 +2802,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3029,6 +2906,12 @@ msgstr "Apmokėta/Sugretinta"
 msgid "Refund Base Code"
 msgstr "Grąžinimo bazės kodas"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Banko sąskaitos išrašai"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3081,11 +2964,6 @@ msgstr "Partnerio skolų balansas"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3126,7 +3004,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3139,7 +3017,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3155,15 +3033,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Jūs turite pasirinkti analitinį žurnalą '%s' žurnale!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3171,7 +3049,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3233,8 +3111,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3281,12 +3160,6 @@ msgstr "Bazės suma"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3320,7 +3193,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalinė pozicija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3347,7 +3220,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3413,7 +3286,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3425,9 +3298,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Sąskaitos kodo skaitmenų skaičius"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Eilutės pavadinimas"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3476,7 +3349,7 @@ msgid "View"
 msgstr "Žiūrėti"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3497,15 +3370,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektroninis failas"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Mokesčių kodų šablonas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3513,9 +3391,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3641,12 +3598,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3661,7 +3621,7 @@ msgid "Starting Balance"
 msgstr "Pradinis likutis"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nėra nurodyta partnerio !"
@@ -3861,7 +3821,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3885,7 +3845,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4023,7 +3983,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sąskaitų plano šablonas"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4108,9 +4068,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Ginčytinas"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4195,11 +4158,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4217,11 +4175,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4266,8 +4219,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4297,7 +4250,7 @@ msgid "Consolidated Children"
 msgstr "Konsoliduotos sąskaitos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4329,11 +4282,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4424,6 +4372,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr "Analitinis balansas"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4443,6 +4398,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Patvirtintos įrašų eilutės"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4453,11 +4413,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4466,11 +4421,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4494,19 +4444,8 @@ msgid "Account Type"
 msgstr "Sąskaitos tipas"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4528,8 +4467,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4558,7 +4508,7 @@ msgid "Month"
 msgstr "Mėnuo"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4569,8 +4519,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4594,6 +4544,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4606,7 +4561,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4628,7 +4583,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4683,11 +4638,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodinės operacijos"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4717,10 +4667,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Tiekėjo sąskaita faktūra"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4788,10 +4737,14 @@ msgstr "Grąžinimas"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4840,7 +4793,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4855,7 +4808,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4880,11 +4833,6 @@ msgstr ""
 msgid "Change"
 msgstr "Keisti"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4907,11 +4855,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Atšauktas"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4922,11 +4865,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4936,7 +4874,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5010,16 +4948,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5130,6 +5063,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Apmokėta"
 
@@ -5156,7 +5090,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5171,14 +5105,6 @@ msgstr "Įrašai peržiūrai"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5191,7 +5117,7 @@ msgid "Tax Application"
 msgstr "Mokesčio taikymas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5224,9 +5150,9 @@ msgid "End of period"
 msgstr "Periodo pabaiga"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Banko rekvizitai"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5319,14 +5245,6 @@ msgstr "Mokesčių aprašymas"
 msgid "Child Tax Accounts"
 msgstr "Vaikinė mokesčio sąskaita"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5373,7 +5291,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5409,6 +5327,7 @@ msgid "Python Code (reverse)"
 msgstr "Python kodas (atvirkščias)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5422,12 +5341,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5453,18 +5366,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Vidinis vardas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5503,7 +5411,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5536,7 +5444,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Apskaičiuoti Kodą (jei tipas=kodas)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5563,6 +5471,7 @@ msgstr "Automatinis sugretinimas"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5663,7 +5572,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5693,7 +5602,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5729,10 +5638,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Komunikacija"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Atidaryta"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5762,9 +5677,7 @@ msgstr "Mokesčių kodai"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Kliento grąžinimas"
 
@@ -5781,11 +5694,6 @@ msgstr "Mokesčio kodo ženklas"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5802,6 +5710,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5890,8 +5799,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5914,6 +5821,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5921,15 +5835,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Šis sekos laukas naudojamas rikiuoti mokėjimo terminų eilutes nuo žemiausio "
-"iki aukščiausio"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5987,12 +5892,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fiksuota suma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6016,7 +5920,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Mokesčio skaičiavimo metodas"
 
@@ -6044,18 +5947,23 @@ msgid "Child Accounts"
 msgstr "Vaikinės sąskaitos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Nurašymas"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6072,7 +5980,7 @@ msgstr "Pajamos"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Tiekėjas"
@@ -6092,16 +6000,11 @@ msgid "Account n°"
 msgstr "Sąskaitos Nr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Nuoroda"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6211,7 +6114,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6258,6 +6161,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Dienų skaičius"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6397,7 +6308,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6572,7 +6483,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6603,12 +6514,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6633,7 +6538,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6653,7 +6557,7 @@ msgid "Power"
 msgstr "Galia"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6698,12 +6602,17 @@ msgid "Applicable Type"
 msgstr "Taikomas tipas"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Sąskaitos faktūros nuoroda"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6719,12 +6628,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6791,7 +6700,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6802,9 +6711,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Grąžinimas tiekėjui"
 
@@ -6842,8 +6749,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6920,6 +6830,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6937,7 +6854,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Įrašai: "
@@ -6955,14 +6872,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Taip"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6978,10 +6894,9 @@ msgid "Total debit"
 msgstr "Iš viso debeto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Įrašas \"%s\" yra nepatvirtintas !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7031,7 +6946,7 @@ msgstr "Sukurti įrašą"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7042,13 +6957,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Klaida !"
@@ -7085,6 +7001,11 @@ msgstr "Projekto eilutė"
 msgid "Manual"
 msgstr "Rankinis"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7183,8 +7104,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7264,7 +7185,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7277,6 +7198,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7330,7 +7256,7 @@ msgid "Done"
 msgstr "Atlikta"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7362,9 +7288,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7391,7 +7316,7 @@ msgid "Taxes:"
 msgstr "Mokesčiai:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7583,6 +7508,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Sąskaitos faktūros nuoroda"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7672,7 +7603,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7723,7 +7654,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7790,7 +7721,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Pardavimų žurnalas"
@@ -7801,7 +7732,7 @@ msgid "Invoice Tax"
 msgstr "Sąskaitos faktūros mokesčiai"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Nenurodytas numeris !"
@@ -7840,7 +7771,7 @@ msgid "Sales Properties"
 msgstr "Pardavimų nustatymai"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7865,7 +7796,7 @@ msgstr "Iki"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7897,7 +7828,7 @@ msgid "May"
 msgstr "Gegužė"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7915,10 +7846,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Įvykio kodas"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7934,17 +7864,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Patvirtinti įrašus"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Klientas"
@@ -7960,7 +7885,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Grynieji"
@@ -7972,8 +7897,10 @@ msgid "Account Destination"
 msgstr "Sąskaita tikslas"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7982,7 +7909,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8117,15 +8043,14 @@ msgid "Partner Ledger"
 msgstr "Partnerio knyga"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fiksuotas"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Įspėjimas!"
@@ -8193,7 +8118,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8268,7 +8193,7 @@ msgid "Associated Partner"
 msgstr "Susijęs partneris"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Visų pirma turite pasirinkti partnerį !"
@@ -8348,13 +8273,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8425,7 +8350,7 @@ msgid "Net Total:"
 msgstr "Iš viso be mokesčių:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8445,13 +8370,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Nurašymų žurnalas"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "Šis mokėjimo terminas bus naudojamas vietoj numatytojo."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8478,11 +8396,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Mokesčio/Bazės suma"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8536,6 +8449,11 @@ msgstr "Sugretinimo rezultatas"
 msgid "Ending Balance"
 msgstr "Pabaigos likutis"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8576,7 +8494,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8599,7 +8517,12 @@ msgid "Account Types"
 msgstr "Sąskaitų tipai"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8607,8 +8530,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8626,10 +8549,9 @@ msgid "Reconciliation"
 msgstr "Gretinimas"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Debitorių sąskaita"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 
 #. module: account
 #: view:account.invoice:0
@@ -8701,7 +8623,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partnerio sąskaita naudojama šioje sąskaitoje faktūroje."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8719,13 +8641,13 @@ msgid "Payment Term Line"
 msgstr "Mokėjimo terminų eilutės"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Pirkimo žurnalas"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8754,11 +8676,6 @@ msgstr "Mokėjimo terminas"
 msgid "Suppliers"
 msgstr "Tiekėjai"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Taip"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8893,9 +8810,10 @@ msgid "Journal Name"
 msgstr "Žurnalo pavadinimas"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Įrašas \"%s\" yra nepatvirtintas !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8944,7 +8862,7 @@ msgstr ""
 "valiutų įrašai."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9005,7 +8923,7 @@ msgid "Reconciled entries"
 msgstr "Sugretinti įrašai"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9027,7 +8945,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9061,7 +8979,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Atviri žurnalo įrašai"
@@ -9108,7 +9026,7 @@ msgstr ""
 "apskaičiuotąja verte ar remiantis bendrąją suma."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9123,18 +9041,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Žurnalo kodas"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9167,7 +9076,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9233,7 +9142,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9252,7 +9161,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9367,21 +9276,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Periodų skaičius"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Mokesčių kodų šablonas"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9393,8 +9292,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9414,14 +9314,14 @@ msgid "Document"
 msgstr "Dokumentas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Banko sąskaitos išrašai"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Debitorių sąskaita"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9522,8 +9422,8 @@ msgid "Move"
 msgstr "DK įrašas"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9600,11 +9500,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Sugretinimo atšaukimo transakcijos"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9622,11 +9517,16 @@ msgid "Balance :"
 msgstr "Balansas :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9663,13 +9563,6 @@ msgstr "Įrašai"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9709,7 +9602,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9798,7 +9697,7 @@ msgid "Unreconciled"
 msgstr "Nesugretinta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Bloga suma !"
@@ -9881,7 +9780,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9899,6 +9798,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9954,11 +9858,6 @@ msgstr "Kreditas"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9970,7 +9869,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10055,7 +9954,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10378,7 +10277,14 @@ msgid "Empty Accounts ? "
 msgstr "Tuščios sąskaitos? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10503,7 +10409,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10630,7 +10536,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10736,7 +10642,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10781,7 +10687,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Rankinis mokesčių registravimas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10860,14 +10766,6 @@ msgstr ""
 msgid "February"
 msgstr "Vasaris"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10926,6 +10824,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr "Išlaidų sąskaita produkto šablonui"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10975,6 +10878,9 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Iš viso įrašų"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodinės operacijos"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Analitinių įrašų būsenos"
 
@@ -11275,6 +11181,13 @@ msgstr ""
 #~ msgid "Charts of Account"
 #~ msgstr "Sąskaitų planai"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Tiekėjo sąskaita faktūra"
+
+#~ msgid "account.tax"
+#~ msgstr "Mokesčių sąskaita"
+
 #~ msgid "Printing Date"
 #~ msgstr "Spausdinimo data"
 
@@ -11460,9 +11373,6 @@ msgstr ""
 #~ msgid "PRO-FORMA Customer Invoices"
 #~ msgstr "Išankstinė sąskaita klientui"
 
-#~ msgid "Fixed"
-#~ msgstr "Fiksuotas"
-
 #~ msgid "Negative"
 #~ msgstr "Neigiamas"
 
@@ -11478,6 +11388,9 @@ msgstr ""
 #~ msgid "Bank account"
 #~ msgstr "Banko sąskaita"
 
+#~ msgid "Line Name"
+#~ msgstr "Eilutės pavadinimas"
+
 #~ msgid "Value"
 #~ msgstr "Reikšmė"
 
@@ -11601,6 +11514,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Dokumento numeris"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Šis sekos laukas naudojamas rikiuoti mokėjimo terminų eilutes nuo žemiausio "
+#~ "iki aukščiausio"
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Spausdinti analitinius žurnalus"
 
@@ -11638,6 +11558,13 @@ msgstr ""
 #~ msgid "Customer Credit"
 #~ msgstr "Kliento kreditas"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Jeigu Jūs norite atšaukti įrašų sugretinimą, Jūs turite atšaukti susijusius "
+#~ "veiksmus su šiais įrašais."
+
 #, python-format
 #~ msgid "Cannot create invoice move on centralised journal"
 #~ msgstr ""
@@ -11891,6 +11818,11 @@ msgstr ""
 #~ "Visi šio periodo ir žurnalo juodraščio būsenos įrašai bus patvirtinti. Tai "
 #~ "reiškia, kad Jūs nebegalėsite jų keisti."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "Šis mokėjimo terminas bus naudojamas vietoj numatytojo."
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -12252,6 +12184,9 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Toliau"
 
+#~ msgid "Litigation"
+#~ msgstr "Ginčytinas"
+
 #~ msgid "Subscription Periods"
 #~ msgstr "Pasikartojančių įrašų periodas"
 
@@ -12455,6 +12390,13 @@ msgstr ""
 #~ msgid "Children Definition"
 #~ msgstr "Žemesnio lygio apibrėžimas"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Jeigu Jūs nesuderinote transakcijų, Jūs taip pat turėtumėte patikrinti visus "
+#~ "veiksmus kurie yra susiję su šiomis transakcijomis, nes jos nebus išjungtos"
+
 #~ msgid "Choose Fiscal Year "
 #~ msgstr "Pasirinkite finansinius metus "
 
@@ -12486,3 +12428,6 @@ msgstr ""
 
 #~ msgid "Post Journal Entries of a Journal"
 #~ msgstr "Patvirtinti žurnalo įrašus"
+
+#~ msgid "Communication"
+#~ msgstr "Komunikacija"
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 57a3ededa93..2ea15ca3808 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 13:50+0000\n"
 "Last-Translator: Normunds (Alistek) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Importēt no rēķina vai maksājuma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,15 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Kopējais Debets"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Pie darījumu atsaistes ir nepieciešams pārbaudīt arī citas saistītās "
-"darbības, jo tās automātiski netiek atceltas."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -111,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -142,19 +127,19 @@ msgstr ""
 "objektu to neizdzēšot."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -166,7 +151,7 @@ msgid "Warning!"
 msgstr "Uzmanību!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -238,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Nodokļu Šabloni"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -260,6 +240,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr "Beļģijas atskaites"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -388,11 +373,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -447,6 +427,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -462,6 +447,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Kontu Plāna Sagatave"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -623,15 +613,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Ik pēc trim mēn."
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Atceļot kontējumu sasaisti, jāpārbauda arī saistītās darbības, jo tās "
-"automātiski netiek atceltas."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -680,7 +661,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -691,13 +672,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Pārdošanas atskaites pēc Konta Tipa."
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "REL"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -760,6 +741,11 @@ msgstr "Debitoru Konti"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -782,6 +768,12 @@ msgstr "Atvērt"
 msgid "Are you sure you want to create entries?"
 msgstr "Vai esat pārliecināti, ka vēlaties izveidot ierakstus?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -802,6 +794,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procenti"
 
@@ -844,7 +837,7 @@ msgid "Type"
 msgstr "Veids"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -867,24 +860,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Atsaiste"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -915,11 +902,6 @@ msgstr "J.C./Pārvietošanas vārds"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -952,7 +934,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -967,6 +949,7 @@ msgstr "Jauna Parakstīšanās"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Aprēķins"
 
@@ -998,11 +981,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1038,7 +1018,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1111,10 +1091,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1192,8 +1172,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1239,7 +1220,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1535,9 +1516,9 @@ msgid "Account Receivable"
 msgstr "Debitoru Konts"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1551,7 +1532,7 @@ msgid "With balance is not equal to 0"
 msgstr "Kur bilance nav vienāda ar 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1606,7 +1587,7 @@ msgstr "Izlaist stāvokli \"Neapstiprināts\" manuālai ievadei"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1649,6 +1630,12 @@ msgstr "Pagaidu tabula, kas tiek izmantota Kopsavilkuma skatījumam"
 msgid "Supplier Refunds"
 msgstr "Ienākošie Kredītrēķini"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Piemērošanas Kods"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1686,7 +1673,6 @@ msgid "Groups"
 msgstr "Grupas"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Bez nodokļa"
@@ -1819,6 +1805,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Pārdošana pēc Konta tipa"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1839,115 +1831,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2058,6 +1946,11 @@ msgstr "Šie periodi var pārklāties."
 msgid "Draft statement"
 msgstr "Neapstiprināts Izraksts"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2086,26 +1979,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2113,16 +2005,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2133,8 +2025,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2179,7 +2071,7 @@ msgid "period close"
 msgstr "perioda slēgšana"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2279,7 +2171,7 @@ msgid "Product Category"
 msgstr "Produkta Kategorija"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2641,7 +2533,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Atstāt tukšu visiem nenoslēgtajiem fiskālajiem gadiem"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2659,7 +2551,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2680,7 +2572,7 @@ msgid "Main Sequence"
 msgstr "Galvenā Secība"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2688,14 +2580,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Apmaksas Termiņš"
 
@@ -2721,18 +2611,6 @@ msgstr "Atzīmēt"
 msgid "Filters"
 msgstr "Filtri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Atvērts"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2744,6 +2622,11 @@ msgstr "Neapstiprināts Rēķins"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2821,25 +2704,20 @@ msgid "Account Model Entries"
 msgstr "Tipveida ieraksti"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "IEP"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Piegādātāju Nodokļi"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankas Rekvizīti"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2862,7 +2740,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2877,9 +2754,8 @@ msgstr ""
 "piemēram, 50% tagad, 50% mēneša laikā."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2909,6 +2785,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Nodoklis"
 
@@ -2944,14 +2821,14 @@ msgid "Accounts"
 msgstr "Konti"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3048,6 +2925,12 @@ msgstr "Apmaksāts / Sasaistīts"
 msgid "Refund Base Code"
 msgstr "Atmaksas Bāzes Kods"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bankas Izraksti"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3100,11 +2983,6 @@ msgstr "Savstarpējo Norēķinu Bilance"
 msgid "Accounting entries"
 msgstr "Kontējumi"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3148,7 +3026,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3161,7 +3039,7 @@ msgid "Sales by Account"
 msgstr "Pārdošanas dati pēc Konta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3177,15 +3055,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Žurnālam '%s'  ir jādefinē atbilstošs analītiskais žurnāls!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3193,7 +3071,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3257,9 +3135,10 @@ msgstr ""
 "obligāts, bet tas ir noderīgs atsevišķām atskaitēm."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Rinda 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3305,12 +3184,6 @@ msgstr "Bāzes Koda Summa"
 msgid "Default Sale Tax"
 msgstr "Noklusējuma Pārdošanas Nodoklis"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3346,7 +3219,7 @@ msgid "Fiscal Position"
 msgstr "Nodokļu Profils"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3373,7 +3246,7 @@ msgid "Trial Balance"
 msgstr "Operatīvā Bilance"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3444,7 +3317,7 @@ msgstr ""
 "datuma valūtas kursu."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3456,9 +3329,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Ciparu skaits konta kodam"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Rindas Nosaukums"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3507,7 +3380,7 @@ msgid "View"
 msgstr "Skatījums"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3528,15 +3401,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektronisks Fails"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Nodokļa Kodu Veidne/Paraugs"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3544,9 +3422,88 @@ msgid "Account Partner Ledger"
 msgstr "Partnera Reģistrs"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3682,12 +3639,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"ja Nosaukums nav \"/\", tā izveidotajam Grāmatojumam būs tāds pats nosaukums "
+"kā izrakstam. Tādā veidā izraksta rindām var būt tāda pati atsauce kā pašam "
+"izrakstam."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3702,7 +3665,7 @@ msgid "Starting Balance"
 msgstr "Sākuma Bilance"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nav definēts Partneris!"
@@ -3905,7 +3868,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3929,7 +3892,7 @@ msgid "Category of Product"
 msgstr "Produkta Kategorija"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4066,7 +4029,7 @@ msgid "Chart of Accounts Template"
 msgstr "Kontu Plāns (Veidne)"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4153,9 +4116,12 @@ msgid "Qty"
 msgstr "Sk."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Diskusijas statusā"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4238,11 +4204,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4260,11 +4221,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4309,8 +4265,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4340,7 +4296,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidētie Konti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4372,11 +4328,6 @@ msgstr ""
 msgid "title"
 msgstr "nosaukums"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4466,6 +4417,13 @@ msgstr "Mēnesis"
 msgid "Analytic Balance"
 msgstr "Analītiskā Bilance"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4485,6 +4443,11 @@ msgstr "Noņemot lauka aktīvs atzīmi, iespējams noslēpt kontu to nedzēšot.
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4495,11 +4458,6 @@ msgstr "Meklēt Nodokļu Veidnēs"
 msgid "Draft Entries"
 msgstr "Neapstiprināti Grāmatojumi"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4508,11 +4466,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4536,19 +4489,8 @@ msgid "Account Type"
 msgstr "Konta Veids"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4573,8 +4515,19 @@ msgstr ""
 "rēķinus."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4603,7 +4556,7 @@ msgid "Month"
 msgstr "Mēnesis"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4614,8 +4567,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4639,6 +4592,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Konta Tips"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4651,7 +4609,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4673,7 +4631,7 @@ msgid "Account Base Code"
 msgstr "Konta Bāzes Kods"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4728,11 +4686,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodiskās Darbības"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4762,10 +4715,9 @@ msgid "Account chart"
 msgstr "Kontu plāns"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Piegādātāja rēķins"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4833,10 +4785,14 @@ msgstr "Kredītrēķini"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4885,7 +4841,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4900,7 +4856,7 @@ msgid "Based On"
 msgstr "Bāzēts Uz"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4925,11 +4881,6 @@ msgstr ""
 msgid "Change"
 msgstr "Mainīt"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banka un Čeki"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4952,11 +4903,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Atcelts"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4967,11 +4913,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Atstāt tukšu, lai izmantotu ieņēmumu kontu"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4981,7 +4922,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5055,16 +4996,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5175,6 +5111,7 @@ msgstr "Pievienot"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Apmaksāts"
 
@@ -5201,7 +5138,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5216,14 +5153,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5236,7 +5165,7 @@ msgid "Tax Application"
 msgstr "Nodokļa Pielietojums"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5269,9 +5198,9 @@ msgid "End of period"
 msgstr "Perioda beigas"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankas Rekvizīti"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Rēķinu Apmaksa"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5364,14 +5293,6 @@ msgstr "Nodokļa Apraksts"
 msgid "Child Tax Accounts"
 msgstr "Apakšnodokļu Konti"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5416,7 +5337,7 @@ msgid "Target Moves"
 msgstr "Mērķa Grāmatojumi"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5452,6 +5373,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Kods (reversais)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5465,12 +5387,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5496,18 +5412,13 @@ msgstr "Gads"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Rinda nr.1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Iekšējais Nosaukums"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5546,7 +5457,7 @@ msgstr "Bilance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5579,7 +5490,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Aprēķināt kodu (ja tips=kods)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5606,6 +5517,7 @@ msgstr "Automātiska Grāmatošana"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5706,7 +5618,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5736,7 +5648,7 @@ msgid "Amount Computation"
 msgstr "Vērtības Aprēķins"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5772,10 +5684,16 @@ msgid "Account Common Account Report"
 msgstr "Grāmatvedības Vispārējās Atskaites"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Saziņa"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Atvērts"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5805,9 +5723,7 @@ msgstr "Nodokļu kodi"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Atgrieztie maksājumi Klientiem"
 
@@ -5824,11 +5740,6 @@ msgstr "Nodokļa Koda Zīme"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Rēķinu Atskaišu skaits Pēdējo 15 dienu laikā"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5845,6 +5756,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5933,8 +5845,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5957,6 +5867,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Maksājumu rindas kontu savienošanai."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5964,15 +5881,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Kārtas lauks tiek lietots, lai sakārtotu maksājumu nosacījumus no zemākās "
-"secības līdz augstākai"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6030,12 +5938,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fiksēta Summa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6059,7 +5966,6 @@ msgstr "Grāmatot Sākuma Atlikumus"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Nodokļa daudzuma aprēķina metode."
 
@@ -6087,18 +5993,23 @@ msgid "Child Accounts"
 msgstr "Apakškonti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Norakstīšana"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6115,7 +6026,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Piegādātājs"
@@ -6135,16 +6046,11 @@ msgid "Account n°"
 msgstr "Konta numurs"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Atsauce"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Novērtēšana"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6260,7 +6166,7 @@ msgid "Filter by"
 msgstr "Filtrēt pēc"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6307,6 +6213,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Dienu Skaits"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6448,7 +6362,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6623,7 +6537,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6654,12 +6568,6 @@ msgstr ""
 msgid "Current"
 msgstr "Pašreizējais"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6684,7 +6592,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procentuālā attiecība"
 
@@ -6704,7 +6611,7 @@ msgid "Power"
 msgstr "Pakāpe:"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6751,12 +6658,17 @@ msgid "Applicable Type"
 msgstr "Pielietojamais Tips"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Rēķina Atsauce"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6772,12 +6684,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6847,7 +6759,7 @@ msgid "Optional create"
 msgstr "Izveide (nav obligāta)"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6858,9 +6770,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Ienākošie Kredītrēķini"
 
@@ -6898,8 +6808,11 @@ msgid "Group By..."
 msgstr "Grupēt Pēc..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6978,6 +6891,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Skaidras Naudas Darījumi"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6995,7 +6915,7 @@ msgstr "Analītisko Ierakstu Statistika"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Ieraksti: "
@@ -7013,14 +6933,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Jā"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7036,10 +6955,9 @@ msgid "Total debit"
 msgstr "Debeta summa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Ieraksts \"%s\" nav derīgs!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7090,7 +7008,7 @@ msgstr "Apstiprināt ierakstu"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7101,13 +7019,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Kļūda!"
@@ -7144,6 +7063,11 @@ msgstr "Projekta rinda"
 msgid "Manual"
 msgstr "Rokas"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7247,8 +7171,8 @@ msgstr "Izvēlēties Žurnālu"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Sākuma Bilance"
@@ -7330,7 +7254,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7351,6 +7275,11 @@ msgstr ""
 "\n"
 "piem., Mans %(date)s modelis"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7404,7 +7333,7 @@ msgid "Done"
 msgstr "Apstiprināts"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7436,9 +7365,8 @@ msgid "Source Document"
 msgstr "Pamatojuma Dokuments"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7465,7 +7393,7 @@ msgid "Taxes:"
 msgstr "Nodokļi:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7660,6 +7588,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Rēķina Atsauce"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7751,7 +7685,7 @@ msgid "Use model"
 msgstr "Lietot modeli"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7802,7 +7736,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7871,7 +7805,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Realizācijas Žurnāls"
@@ -7882,7 +7816,7 @@ msgid "Invoice Tax"
 msgstr "Rēķina Nodoklis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Vienībai nav definēts numurs!"
@@ -7921,7 +7855,7 @@ msgid "Sales Properties"
 msgstr "Pārdošanas Parametri"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7946,7 +7880,7 @@ msgstr "Līdz"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7978,7 +7912,7 @@ msgid "May"
 msgstr "Maijs"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7996,10 +7930,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Piemērošanas Kods"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8015,17 +7948,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Veikt Grāmatojumus"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Klients"
@@ -8041,7 +7969,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Skaidrā nauda"
@@ -8053,9 +7981,11 @@ msgid "Account Destination"
 msgstr "Mērķa Kontējums"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Rēķinu Apmaksa"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8063,7 +7993,6 @@ msgstr "Rēķinu Apmaksa"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8198,15 +8127,14 @@ msgid "Partner Ledger"
 msgstr "Partnera kontu pārskats"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fiksēts"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Uzmanību!"
@@ -8274,7 +8202,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Izvēlēties rēķina valūtu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nav Rēķina Rindu!"
@@ -8350,7 +8278,7 @@ msgid "Associated Partner"
 msgstr "Saistītais Partneris"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Vispirms jāizvēlas partneris!"
@@ -8432,13 +8360,13 @@ msgstr ""
 "citi nodokļi."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Iepirkumu Kredītrēķinu Žurnāls"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8509,7 +8437,7 @@ msgid "Net Total:"
 msgstr "Neto Summa:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8529,13 +8457,6 @@ msgstr "Standarta Atskaites"
 msgid "Write-Off Journal"
 msgstr "Norakstīšanas Žurnāls"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "Apmaksas noteikumi partnerim,  kas tiks izmantoti noklusēto vietā."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8562,11 +8483,6 @@ msgstr "Int. Tips"
 msgid "Tax/Base Amount"
 msgstr "Nodokļu/Bāzes Summa"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8620,6 +8536,11 @@ msgstr "Saistīšanas rezultāts"
 msgid "Ending Balance"
 msgstr "Noslēdzošā Bilance"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8660,7 +8581,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8683,7 +8604,12 @@ msgid "Account Types"
 msgstr "Kontu Veidi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8691,8 +8617,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8710,10 +8636,9 @@ msgid "Reconciliation"
 msgstr "Sasaiste"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Debitoru saistību konts"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Atstāt tukšu, lai izmantotu ieņēmumu kontu"
 
 #. module: account
 #: view:account.invoice:0
@@ -8785,7 +8710,7 @@ msgid "The partner account used for this invoice."
 msgstr "Rēķinā izmantotais partnera konts."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8803,13 +8728,13 @@ msgid "Payment Term Line"
 msgstr "Apmaksas Noteikumu Rinda"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Iepirkuma Žurnāls"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Apakšsumma kopā"
 
@@ -8838,11 +8763,6 @@ msgstr "Apmaksas termiņš"
 msgid "Suppliers"
 msgstr "Piegādātāji"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Jā"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8977,9 +8897,10 @@ msgid "Journal Name"
 msgstr "Žurnāla Nosaukums"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Ieraksts \"%s\" nav derīgs!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9025,7 +8946,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9086,7 +9007,7 @@ msgid "Reconciled entries"
 msgstr "Sasaistītie kontējumi"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9108,7 +9029,7 @@ msgid "Print Account Partner Balance"
 msgstr "Drukāt Partnera Bilanci"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9142,7 +9063,7 @@ msgstr "nezināms"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Sākuma Atlikumu Kontējumu Žurnāls"
@@ -9187,7 +9108,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9202,18 +9123,9 @@ msgstr "Python Kods"
 msgid "Journal Code"
 msgstr "Žurnāla Kods"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Summa Apmaksai"
 
@@ -9246,7 +9158,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Realizācija. Kredītrēķinu Žurnāls"
@@ -9312,7 +9224,7 @@ msgid "Purchase Tax(%)"
 msgstr "Iepirkumu Nodoklis(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Ievadiet rēķina rindas"
@@ -9331,7 +9243,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9448,21 +9360,11 @@ msgstr "Grāmatvedis apstiprina no rēķina grāmatvedības ierakstus. "
 msgid "Number of Periods"
 msgstr "Periodu Skaits"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Nodokļa Kodu Veidne/Paraugs"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokuments: Klienta konta izraksts"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9474,8 +9376,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9495,14 +9398,14 @@ msgid "Document"
 msgstr "Dokuments"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bankas Izraksti"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Debitoru saistību konts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9603,8 +9506,8 @@ msgid "Move"
 msgstr "Grāmatojums"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9683,11 +9586,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Darbības, kas jāveic, lai veiktu kontējumu atsaisti"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9705,11 +9603,16 @@ msgid "Balance :"
 msgstr "Bilance"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9746,13 +9649,6 @@ msgstr "Regulārie kontējumi"
 msgid "Account Analytic Balance"
 msgstr "Analītiskā Konta Bilance"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9792,7 +9688,13 @@ msgid "Due date"
 msgstr "Apmaksas termiņš"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9881,7 +9783,7 @@ msgid "Unreconciled"
 msgstr "Nesaistīts"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Kļūdaina kopsumma!"
@@ -9964,7 +9866,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9982,6 +9884,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10035,11 +9942,6 @@ msgstr "Kredīts"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10051,7 +9953,7 @@ msgid "Journal Entry Model"
 msgstr "Grāmatojuma Modelis"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10136,7 +10038,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10459,7 +10361,14 @@ msgid "Empty Accounts ? "
 msgstr "Nav ierakstu Kontos? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10584,7 +10493,7 @@ msgid "Receivable accounts"
 msgstr "Ieņēmumu konti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10711,7 +10620,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10817,7 +10726,7 @@ msgid "Accounting Documents"
 msgstr "Grāmatvedības Dokumenti"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10862,7 +10771,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manuāli Rēķina Nodokļi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10941,17 +10850,6 @@ msgstr ""
 msgid "February"
 msgstr "Februāris"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"ja Nosaukums nav \"/\", tā izveidotajam Grāmatojumam būs tāds pats nosaukums "
-"kā izrakstam. Tādā veidā izraksta rindām var būt tāda pati atsauce kā pašam "
-"izrakstam."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11010,6 +10908,11 @@ msgstr "Nodokļu Profilu Sasaistes Veidnes"
 msgid "Expense Account on Product Template"
 msgstr "Izdevumu Konts Preces Veidnē"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11069,12 +10972,19 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Maksājumu Sasaiste"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodiskās Darbības"
+
 #~ msgid "State"
 #~ msgstr "Statuss"
 
 #~ msgid "Line"
 #~ msgstr "Rinda"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Piegādātāja rēķins"
+
 #~ msgid "Printing Date"
 #~ msgstr "Drukāšanas Datums"
 
@@ -11137,12 +11047,18 @@ msgstr ""
 #~ msgid "New Analytic Account"
 #~ msgstr "Jauns Analītiskais Konts"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "1cm 27.7cm 20cm 27.7cm"
 #~ msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #~ msgid "account.analytic.journal"
 #~ msgstr "account.analytic.journal"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Analytic Journal -"
 #~ msgstr "Analītiskais Žurnāls -"
 
@@ -11235,9 +11151,6 @@ msgstr ""
 #~ "Lūdzu pārbaudiet cenu uz rēķina !\n"
 #~ "Aprēķinātā kopsumma nesakrīt ar ievadīto kopsummu."
 
-#~ msgid "Fixed"
-#~ msgstr "Fiksēts"
-
 #~ msgid "Delta Debit"
 #~ msgstr "Delta debets"
 
@@ -11691,6 +11604,13 @@ msgstr ""
 #~ msgid "Voucher Management"
 #~ msgstr "Maksājumu Orderi"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Pie darījumu atsaistes ir nepieciešams pārbaudīt arī citas saistītās "
+#~ "darbības, jo tās automātiski netiek atceltas."
+
 #~ msgid "Children Definition"
 #~ msgstr "Apakšdefinīcija"
 
@@ -11753,6 +11673,13 @@ msgstr ""
 #~ msgid "Accounting Properties"
 #~ msgstr "Grāmatvedības Uzstādījumi"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Atceļot kontējumu sasaisti, jāpārbauda arī saistītās darbības, jo tās "
+#~ "automātiski netiek atceltas."
+
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Kases Bilance nesakrīt ar aprēķināto Bilanci!"
@@ -11917,6 +11844,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Atsauces Nr."
 
+#~ msgid "Line 2:"
+#~ msgstr "Rinda 2:"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -12119,6 +12049,9 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Skaidras Naudas Darījums"
 
+#~ msgid "Line Name"
+#~ msgstr "Rindas Nosaukums"
+
 #~ msgid "Contact Address Name"
 #~ msgstr "Kontaktadrese"
 
@@ -12180,6 +12113,9 @@ msgstr ""
 #~ msgid "Operation date"
 #~ msgstr "Operācijas datums"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banka un Čeki"
+
 #~ msgid "Third Party (Country)"
 #~ msgstr "Trešā Persona (Valsts)"
 
@@ -12198,6 +12134,9 @@ msgstr ""
 #~ msgid "Transaction"
 #~ msgstr "Darījums"
 
+#~ msgid "Communication"
+#~ msgstr "Saziņa"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Konfigurācijas Kļūda !"
@@ -12361,6 +12300,9 @@ msgstr ""
 #~ msgid "Already Reconciled!"
 #~ msgstr "Sasaiste ir jau veikta!"
 
+#~ msgid "Valuation"
+#~ msgstr "Novērtēšana"
+
 #, python-format
 #~ msgid "No Filter"
 #~ msgstr "Nav Filtru"
@@ -12454,6 +12396,9 @@ msgstr ""
 #~ "Date on which the partner accounting entries were reconciled last time"
 #~ msgstr "Pēdējās sasaistes datums"
 
+#~ msgid "Line 1:"
+#~ msgstr "Rinda nr.1:"
+
 #~ msgid "Debit/Credit"
 #~ msgstr "Debets/Kredīts"
 
@@ -12906,6 +12851,9 @@ msgstr ""
 #~ "Palīdz veidot atgādinājuma vēstules par kavētiem rēķiniem, tajā skaitā "
 #~ "vairāku līmeņu atgādinājumus - pielāgotus attiecīgajai klienta politikai."
 
+#~ msgid "Litigation"
+#~ msgstr "Diskusijas statusā"
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category using sale price"
@@ -13010,6 +12958,13 @@ msgstr ""
 #~ "%s\" valūtas. Dzēst sekundārās valūtas lauku konta definīcijā, ja vēlaties "
 #~ "pieņemt visas valūtas."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Kārtas lauks tiek lietots, lai sakārtotu maksājumu nosacījumus no zemākās "
+#~ "secības līdz augstākai"
+
 #~ msgid ""
 #~ "To print an analytics (or costs) journal for a given period. The report give "
 #~ "code, move name, account number, general amount and analytic amount."
@@ -13088,6 +13043,11 @@ msgstr ""
 #~ "vai pilnīgi tiek dzēsts piestādītais rēķins. Iespējams veidot kredītrēķinus "
 #~ "un tos tieši sasaistīt caur rēķina formu."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "Apmaksas noteikumi partnerim,  kas tiks izmantoti noklusēto vietā."
+
 #~ msgid ""
 #~ "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
 #~ "will be added, Loss: Amount will be deducted.), Which is calculated from "
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index 4a5006be06a..c7b94192082 100644
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-07 08:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:24+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Увези од фактура или плаќање"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,15 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Вкупно задолжување"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Доколку не ги порамните трансакциите, мора да ги потврдите сите акции кои се "
-"поврзани со овие трансакции бидејќи тие нема да бидат исклучени"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -113,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -144,19 +129,19 @@ msgstr ""
 "рокот за плаќање без да го отстраните."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -168,7 +153,7 @@ msgid "Warning!"
 msgstr "Внимание!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Картица разно"
@@ -240,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Урнеци за данок"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -260,6 +240,11 @@ msgstr "Сметководствените записи се инпут од п
 msgid "Belgian Reports"
 msgstr "Белгиски извештаи"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -396,11 +381,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -455,6 +435,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -470,6 +455,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Урнек на графикон"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -631,15 +621,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3 месечно"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Доколку не ги порамните трансакциите, мора да ги верификувате сите акции кои "
-"се поврзани со овие трансакции бидејќи тие нема да бидат исклучени"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -688,7 +669,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Не е пронајден период или има повеќе од еден период за даден датум."
@@ -699,13 +680,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Извештај за продажби по тип на конто"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -768,6 +749,11 @@ msgstr "Конта за побарувања"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -792,6 +778,12 @@ msgstr "Повторно отварање"
 msgid "Are you sure you want to create entries?"
 msgstr "Дали сте сигурни дека сакате да креирате записи?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -812,6 +804,7 @@ msgstr "Прикажи подкатегории со хиерархија"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
 
@@ -854,7 +847,7 @@ msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,26 +870,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Фактури и поврати на добавувач"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Непорамнување"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"На 14 нето денови 2 проценти, преостанатиот износ на 30 денови до крај на "
-"месецот."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -927,11 +912,6 @@ msgstr "J.C./Име на движење"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -963,7 +943,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -978,6 +958,7 @@ msgstr "Нова претплата"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Пресметка"
 
@@ -1009,11 +990,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1049,7 +1027,7 @@ msgid "Liability"
 msgstr "Обврска"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Дефинирајте секвенца на картицата поврзана со оваа фактура."
@@ -1120,10 +1098,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1201,8 +1179,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1248,7 +1227,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Банка"
@@ -1546,9 +1525,9 @@ msgid "Account Receivable"
 msgstr "Конто на побарувања"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1562,7 +1541,7 @@ msgid "With balance is not equal to 0"
 msgstr "Со билансот не е еднакво на 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1617,7 +1596,7 @@ msgstr "Прескокни 'Нацрт' Состојба за рачни зап
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1662,6 +1641,12 @@ msgstr "Привремена табела која се користи за пр
 msgid "Supplier Refunds"
 msgstr "Повлекувања на добавувач"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Case Code"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1699,7 +1684,6 @@ msgid "Groups"
 msgstr "Групи"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Без данок"
@@ -1832,6 +1816,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Продажби по тип на конто"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1852,115 +1842,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2071,6 +1957,11 @@ msgstr "Овие периоди може да се преклопат."
 msgid "Draft statement"
 msgstr "Нацрт изјава"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2099,26 +1990,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2126,16 +2016,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2146,8 +2036,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2192,7 +2082,7 @@ msgid "period close"
 msgstr "Затвори период"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2292,7 +2182,7 @@ msgid "Product Category"
 msgstr "Категорија на производ"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2658,7 +2548,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Чувај празно за целата отворена фискална година"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2676,7 +2566,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2697,7 +2587,7 @@ msgid "Main Sequence"
 msgstr "Главна секвенца"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2707,14 +2597,12 @@ msgstr ""
 "ставките на поврзаната картица."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Рок за плаќање"
 
@@ -2740,18 +2628,6 @@ msgstr "Обележете го ова поле"
 msgid "Filters"
 msgstr "Филтри"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Отвори"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2763,6 +2639,11 @@ msgstr "Нацрт состојба на фактура"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2840,25 +2721,20 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Даноци на добавувачот"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "записи"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Банкарски детали"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2881,7 +2757,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2896,9 +2771,8 @@ msgstr ""
 "за еден месец."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2928,6 +2802,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Данок"
 
@@ -2963,14 +2838,14 @@ msgid "Accounts"
 msgstr "Конта"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3069,6 +2944,12 @@ msgstr "Платено/Порамнето"
 msgid "Refund Base Code"
 msgstr "Повлечи основен код"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Банкарски изводи"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3121,11 +3002,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr "Сметководствени записи"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3171,7 +3047,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3184,7 +3060,7 @@ msgid "Sales by Account"
 msgstr "Продажби по конто"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3200,15 +3076,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Треба да дефинирате аналитичка картица на  '%s' картица!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3216,7 +3092,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3281,9 +3157,10 @@ msgstr ""
 "извештаи."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Ставка 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3331,12 +3208,6 @@ msgstr "Износ на основен код"
 msgid "Default Sale Tax"
 msgstr "Стандарден данок на продажба"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Фактурата  '%s' е потврдена."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3373,7 +3244,7 @@ msgid "Fiscal Position"
 msgstr "Фискална позиција"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3402,7 +3273,7 @@ msgid "Trial Balance"
 msgstr "Пробен биланс"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3473,7 +3344,7 @@ msgstr ""
 "Влезните трансакции секогаш го користат курсот на датумот."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3485,9 +3356,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Број на цифри ки треба да се употребат за кодот на сметката"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Име на ставка"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3536,7 +3407,7 @@ msgid "View"
 msgstr "Преглед"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3557,15 +3428,20 @@ msgstr "Про-фактури"
 msgid "Electronic File"
 msgstr "Електронски фајл"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Ден од месецот: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Урнек за даночен код"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3573,9 +3449,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3705,12 +3660,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Износ на вредност: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3725,7 +3686,7 @@ msgid "Starting Balance"
 msgstr "Почетен биланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Нема дефинирано партнер !"
@@ -3930,7 +3891,7 @@ msgid "Period Length (days)"
 msgstr "Должина на периодот (денови)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3954,7 +3915,7 @@ msgid "Category of Product"
 msgstr "Категорија на производ"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4092,7 +4053,7 @@ msgid "Chart of Accounts Template"
 msgstr "Урнек за контен план"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4179,9 +4140,15 @@ msgid "Qty"
 msgstr "Количина"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Судски спор"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4266,11 +4233,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4288,11 +4250,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Подесете ги вашите банкарски сметки"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4339,8 +4296,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4370,7 +4327,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4404,11 +4361,6 @@ msgstr ""
 msgid "title"
 msgstr "наслов"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4498,6 +4450,13 @@ msgstr "30 дена Крај на месец"
 msgid "Analytic Balance"
 msgstr "Аналитички биланс"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4519,6 +4478,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Објавени ставки од картица"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4529,11 +4493,6 @@ msgstr "Барај урнеци за данок"
 msgid "Draft Entries"
 msgstr "Нацрт записи"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Ден од месецот= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4542,11 +4501,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Број на денови: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4570,20 +4524,9 @@ msgid "Account Type"
 msgstr "Тип на конто"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Затвори каса"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4606,9 +4549,20 @@ msgstr ""
 "аналитичките конта. Овие генерираат нацрт фактури на добавувачот.)"
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Затвори каса"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4636,7 +4590,7 @@ msgid "Month"
 msgstr "Месец"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4647,8 +4601,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4672,6 +4626,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Тип на конто"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4684,7 +4643,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Биланс на состојба (Конто за обврски)"
@@ -4706,7 +4665,7 @@ msgid "Account Base Code"
 msgstr "Основен код на контото"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4761,11 +4720,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Периодично обработување"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4795,9 +4749,8 @@ msgid "Account chart"
 msgstr "Контен план"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4866,10 +4819,14 @@ msgstr "Кредитни белешки"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4918,7 +4875,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4933,7 +4890,7 @@ msgid "Based On"
 msgstr "Засновано на"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4959,11 +4916,6 @@ msgstr ""
 msgid "Change"
 msgstr "Промени"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Банка и чекови"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4986,11 +4938,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Откажано"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Пример"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5001,11 +4948,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Оставете празно за да употребите конто за приходи"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5015,7 +4957,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Данок на набавка %.2f%%"
@@ -5089,16 +5031,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "MISC"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5212,6 +5149,7 @@ msgstr "Додади"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Платено"
 
@@ -5238,7 +5176,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Период на отварање"
@@ -5253,14 +5191,6 @@ msgstr "Записи во картица за преглед"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5273,7 +5203,7 @@ msgid "Tax Application"
 msgstr "Даночна пријава"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5306,9 +5236,9 @@ msgid "End of period"
 msgstr "Крај на период"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Банкарски детали"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Плаќање на фактури"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5401,14 +5331,6 @@ msgstr "Опис на данок"
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5455,7 +5377,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5491,6 +5413,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5504,12 +5427,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5535,18 +5452,13 @@ msgstr "Година"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Линија 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Внатрешно име"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5585,7 +5497,7 @@ msgstr "Биланс"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Профит & Загуба (Приходна сметка)"
@@ -5618,7 +5530,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Код за пресметка (доколку тип=код)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5645,6 +5557,7 @@ msgstr "Автоматско порамнување"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5748,7 +5661,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5779,7 +5692,7 @@ msgid "Amount Computation"
 msgstr "Пресметување на износ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5815,10 +5728,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Комуникација"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Отвори"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5848,9 +5767,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Повлекување на клиент"
 
@@ -5867,11 +5784,6 @@ msgstr "Знак за даночен код"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Извештај за фактурите креирани во последните 15 дена"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Број на денови: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5888,6 +5800,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Износ за плаќање"
@@ -5979,8 +5892,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6003,6 +5914,13 @@ msgstr "Нормален текст"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Записите за плаќање се вториот инпут од порамнувањето."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6010,15 +5928,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Полето секвенца се користи за да се наредат ставките за роковите за плаќање "
-"од најниските секвенци до највисоките"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6076,12 +5985,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Фиксен износ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6105,7 +6013,6 @@ msgstr "Генерирај записи за отварање"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Метод на пресметување за износот на данокот."
 
@@ -6133,18 +6040,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Премести име (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Отпиши"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "записи"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6161,7 +6073,7 @@ msgstr "Приход"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Добавувач"
@@ -6181,16 +6093,11 @@ msgid "Account n°"
 msgstr "Бр. на конто"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Слободна референца"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Проценка"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6303,7 +6210,7 @@ msgid "Filter by"
 msgstr "Филтрирај по"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Имате погрешен израз \"%(...)s\" во вашиот модел !"
@@ -6352,6 +6259,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Број на денови"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6495,7 +6410,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6670,7 +6585,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6701,12 +6616,6 @@ msgstr ""
 msgid "Current"
 msgstr "Тековен"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6731,7 +6640,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Процент"
 
@@ -6751,7 +6659,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Не може да генерира неупотребен код на картица."
@@ -6798,12 +6706,17 @@ msgid "Applicable Type"
 msgstr "Тип кој може да се примени"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Референца на фактура"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6819,12 +6732,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6891,7 +6804,7 @@ msgid "Optional create"
 msgstr "Креирај опционо"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6904,9 +6817,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Поврати на добавувач"
 
@@ -6944,9 +6855,12 @@ msgid "Group By..."
 msgstr "Групирај по..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Проценка: Биланс"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7024,6 +6938,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Готовински трансакции"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7041,7 +6962,7 @@ msgstr "Статистики на аналитички записи"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Записи: "
@@ -7059,14 +6980,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Точно"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Биланс на состојба (Конто за средства)"
@@ -7082,10 +7002,9 @@ msgid "Total debit"
 msgstr "Вкупно задолжување"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Записот \"%s\" не е валиден !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Next Partner Entries to reconcile"
 
 #. module: account
 #: report:account.invoice:0
@@ -7138,7 +7057,7 @@ msgstr "Креирај запис"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Профит & Загуба (Конто за трошоци)"
@@ -7149,13 +7068,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Грешка !"
@@ -7192,6 +7112,11 @@ msgstr "Проектна ставка"
 msgid "Manual"
 msgstr "Рачно"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7293,8 +7218,8 @@ msgstr "Избери картица"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Отварање на биланс"
@@ -7377,7 +7302,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7390,6 +7315,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7443,7 +7373,7 @@ msgid "Done"
 msgstr "Завршено"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7475,9 +7405,8 @@ msgid "Source Document"
 msgstr "Изворен документ"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7504,7 +7433,7 @@ msgid "Taxes:"
 msgstr "Даноци:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7696,6 +7625,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Референца на фактура"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7788,7 +7723,7 @@ msgid "Use model"
 msgstr "Употреби модел"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7839,7 +7774,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7906,7 +7841,7 @@ msgid "Maturity Date"
 msgstr "Датум на доспевање"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Продажна картица"
@@ -7917,7 +7852,7 @@ msgid "Invoice Tax"
 msgstr "Данок на фактура"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7956,7 +7891,7 @@ msgid "Sales Properties"
 msgstr "Својства на продажби"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7981,7 +7916,7 @@ msgstr "До"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Подесување на валута"
@@ -8015,7 +7950,7 @@ msgid "May"
 msgstr "Мај"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8034,10 +7969,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8053,17 +7987,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Објави записи на картица"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Клиент"
@@ -8079,7 +8008,7 @@ msgstr "Име на извештај"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Готовина"
@@ -8091,9 +8020,11 @@ msgid "Account Destination"
 msgstr "Дестинација на конто"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Плаќање на фактури"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8101,7 +8032,6 @@ msgstr "Плаќање на фактури"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8233,15 +8163,14 @@ msgid "Partner Ledger"
 msgstr "Главна книга на партнер"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Фиксно"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Внимание !"
@@ -8309,7 +8238,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Изберете валута за да ја примените на фактурата"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нема ставки во фактурата !"
@@ -8390,7 +8319,7 @@ msgid "Associated Partner"
 msgstr "Поврзан партнер"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Мора првин да изберете партнер !"
@@ -8472,13 +8401,13 @@ msgstr ""
 "пред пресметување на следните даноци."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Картица повлечи нарачка"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8551,7 +8480,7 @@ msgid "Net Total:"
 msgstr "Вкупно нето:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8571,14 +8500,6 @@ msgstr "Генеричко известување"
 msgid "Write-Off Journal"
 msgstr "Картица отпиши"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Овој рок за плаќање ќе биде употребен наместо стандардниот за тековен партнер"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8605,11 +8526,6 @@ msgstr "Основен тип"
 msgid "Tax/Base Amount"
 msgstr "Данок/Основен износ"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Вреднување: Процент"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8663,6 +8579,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr "Завршен биланс"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8705,7 +8626,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Автоматско увезување на банкарски извод"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8728,7 +8649,12 @@ msgid "Account Types"
 msgstr "Типови на сметки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8736,9 +8662,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS Category"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8755,10 +8681,9 @@ msgid "Reconciliation"
 msgstr "Порамнување"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Оставете празно за да употребите конто за приходи"
 
 #. module: account
 #: view:account.invoice:0
@@ -8838,7 +8763,7 @@ msgid "The partner account used for this invoice."
 msgstr "Сметка на партнерот употребена за оваа фактура."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Данок %.2f%%"
@@ -8856,13 +8781,13 @@ msgid "Payment Term Line"
 msgstr "Ставка рок на плаќање"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Картица за набавки"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Вкупно"
 
@@ -8891,11 +8816,6 @@ msgstr "Краен датум"
 msgid "Suppliers"
 msgstr "Добавувачи"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Точно"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9032,9 +8952,10 @@ msgid "Journal Name"
 msgstr "Име на картица"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Записот \"%s\" не е валиден !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9083,7 +9004,7 @@ msgstr ""
 "entry."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9147,7 +9068,7 @@ msgid "Reconciled entries"
 msgstr "Порамнети записи"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Погрешен модел !"
@@ -9169,7 +9090,7 @@ msgid "Print Account Partner Balance"
 msgstr "Print Account Partner Balance"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9208,7 +9129,7 @@ msgstr "непознато"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -9255,7 +9176,7 @@ msgstr ""
 "than on the total amount."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9270,21 +9191,9 @@ msgstr "Given by Python Code"
 msgid "Journal Code"
 msgstr "Код на картица"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Residual Amount"
 
@@ -9317,7 +9226,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Картица повлечи продажби"
@@ -9383,7 +9292,7 @@ msgid "Purchase Tax(%)"
 msgstr "Данок на нарачки(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Креирајте ставки на фактурата."
@@ -9402,7 +9311,7 @@ msgid "Display Detail"
 msgstr "Прикажи детали"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9521,21 +9430,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Број на периоди"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Урнек за даночен код"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Customer account statement"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS Category"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9547,8 +9446,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9568,14 +9468,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Банкарски изводи"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Receivable Account"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9676,8 +9576,8 @@ msgid "Move"
 msgstr "Премести"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9755,11 +9655,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9777,11 +9672,16 @@ msgid "Balance :"
 msgstr "Биланс :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9818,13 +9718,6 @@ msgstr "Subscription"
 msgid "Account Analytic Balance"
 msgstr "Аналитички биланс на конто"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9864,7 +9757,13 @@ msgid "Due date"
 msgstr "Краен датум"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9960,7 +9859,7 @@ msgid "Unreconciled"
 msgstr "Непорамнето"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Грешка вкупно !"
@@ -10050,7 +9949,7 @@ msgid "Comparison"
 msgstr "Споредување"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10068,6 +9967,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10123,11 +10027,6 @@ msgstr "Кредит"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10139,7 +10038,7 @@ msgid "Journal Entry Model"
 msgstr "Journal Entry Model"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10224,7 +10123,7 @@ msgid "Profit (Loss) to report"
 msgstr "Профит (Загуба) за известување"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10554,7 +10453,14 @@ msgid "Empty Accounts ? "
 msgstr "Празни сметки ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10679,7 +10585,7 @@ msgid "Receivable accounts"
 msgstr "Receivable accounts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10812,7 +10718,7 @@ msgid "Entries Sorted by"
 msgstr "Записи сортирани по"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10918,7 +10824,7 @@ msgid "Accounting Documents"
 msgstr "Сметководствени документи"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10963,7 +10869,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manual Invoice Taxes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11044,17 +10950,6 @@ msgstr ""
 msgid "February"
 msgstr "Февруари"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11113,6 +11008,11 @@ msgstr "Template Account Fiscal Mapping"
 msgid "Expense Account on Product Template"
 msgstr "Expense Account on Product Template"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11177,6 +11077,13 @@ msgstr ""
 #~ msgid "Children Definition"
 #~ msgstr "Дефиниција на подкатегорија"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Доколку не ги порамните трансакциите, мора да ги потврдите сите акции кои се "
+#~ "поврзани со овие трансакции бидејќи тие нема да бидат исклучени"
+
 #~ msgid ""
 #~ "Configuration error! The currency chosen should be shared by the default "
 #~ "accounts too."
@@ -11188,6 +11095,9 @@ msgstr ""
 #~ msgid "Journal: %s"
 #~ msgstr "Картица: %s"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -11234,6 +11144,9 @@ msgstr ""
 #~ msgid "You can not create journal items on an account of type view."
 #~ msgstr "Не може да креирате ставки на картица на конто од тип прегледај."
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field contains the informatin related to the numbering of the journal "
 #~ "entries of this journal."
@@ -11259,6 +11172,13 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Адреса за фактурирање"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Доколку не ги порамните трансакциите, мора да ги верификувате сите акции кои "
+#~ "се поврзани со овие трансакции бидејќи тие нема да бидат исклучени"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 денови   "
 
@@ -11274,6 +11194,11 @@ msgstr ""
 #~ msgid "You can only change currency for Draft Invoice !"
 #~ msgstr "Можете да ја промените единствено валутата за Нацрт фактурата !"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "На 14 нето денови 2 проценти, преостанатиот износ на 30 денови до крај на "
+#~ "месецот."
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -11623,6 +11548,9 @@ msgstr ""
 #~ "Потребна ви е отворена картица со означена централизација за да го подесите "
 #~ "почетнио биланс!"
 
+#~ msgid "Line 2:"
+#~ msgstr "Ставка 2:"
+
 #~ msgid "Required"
 #~ msgstr "Се бара"
 
@@ -11634,18 +11562,28 @@ msgstr ""
 #~ "Не можете да избришете фактура која е отворена или платена. Ви сугерираме "
 #~ "наместо тоа да ја повлечете."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Фактурата  '%s' е потврдена."
+
 #~ msgid "Cash Transaction"
 #~ msgstr "Готовински трансакции"
 
 #~ msgid "Bank account"
 #~ msgstr "Банкарска сметка"
 
+#~ msgid "Line Name"
+#~ msgstr "Име на ставка"
+
 #~ msgid "Month-1"
 #~ msgstr "Месец-1"
 
 #~ msgid "Customer Credit"
 #~ msgstr "Кредит на клиентот"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Ден од месецот: 0"
+
 #~ msgid "Starts on"
 #~ msgstr "Започнува на"
 
@@ -11659,6 +11597,9 @@ msgstr ""
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "Нема дефинирано картица крај на година за фискалната година"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Износ на вредност: 0.02"
+
 #~ msgid "Accounting Dashboard"
 #~ msgstr "Сметководствена контролна табла"
 
@@ -11712,6 +11653,9 @@ msgstr ""
 #~ msgid "Contact Address Name"
 #~ msgstr "Име на адреса на контакт"
 
+#~ msgid "Litigation"
+#~ msgstr "Судски спор"
+
 #~ msgid "Account balance"
 #~ msgstr "Биланс на конто"
 
@@ -11736,6 +11680,12 @@ msgstr ""
 #~ "Печати извештај со колона за валута доколку валутата е различна од валутата "
 #~ "на компанијата"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Ден од месецот= -1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Број на денови: 30"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Грешка! Почетниот датум на фискалната година мора да биде пред нејзиниот "
@@ -11786,6 +11736,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Стандардни даноци"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Периодично обработување"
+
 #~ msgid "You can not create analytic line on view account."
 #~ msgstr "Не може да креирате аналитичка ставка на конто преглед."
 
@@ -11826,9 +11779,15 @@ msgstr ""
 #~ msgid "4"
 #~ msgstr "4"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Банка и чекови"
+
 #~ msgid "Closing balance based on cashBox"
 #~ msgstr "Завршен биланс заснован на каса"
 
+#~ msgid "Example"
+#~ msgstr "Пример"
+
 #, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
@@ -11861,6 +11820,9 @@ msgstr ""
 #~ "Тоа значи дека повеќе нема да може да ги менувате нивните сметководствени "
 #~ "полиња."
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+
 #~ msgid ""
 #~ "Date on which the partner accounting entries were reconciled last time"
 #~ msgstr ""
@@ -11924,6 +11886,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Отварање на каса"
 
+#~ msgid "Line 1:"
+#~ msgstr "Линија 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Грешка интегритет !"
@@ -11950,12 +11915,18 @@ msgstr ""
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Статистика на аналитички записи"
 
+#~ msgid "Communication"
+#~ msgstr "Комуникација"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
 #~ "Не може да креирате повеќе оод едно движење по период на централизирана "
 #~ "картица"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Број на денови: 14"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Грешка конфигурација !"
@@ -11980,6 +11951,13 @@ msgstr ""
 #~ msgid "Refund Invoice Options"
 #~ msgstr "Опции за повлекување фактура"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Полето секвенца се користи за да се наредат ставките за роковите за плаќање "
+#~ "од најниските секвенци до највисоките"
+
 #~ msgid ""
 #~ "If no additional entries should be recorded on a fiscal year, you can close "
 #~ "it from here. It will close all opened periods in this year that will make "
@@ -12016,6 +11994,9 @@ msgstr ""
 #~ msgid "VAT"
 #~ msgstr "ДДВ"
 
+#~ msgid "Valuation"
+#~ msgstr "Проценка"
+
 #~ msgid "Invoice Address"
 #~ msgstr "Адреса на фактура"
 
@@ -12099,6 +12080,9 @@ msgstr ""
 #~ msgid "Readonly"
 #~ msgstr "Може само да се чита"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Проценка: Биланс"
+
 #~ msgid ""
 #~ "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 #~ "2% "
@@ -12281,9 +12265,6 @@ msgstr ""
 #~ msgid "    7 Days    "
 #~ msgstr "    7 Денови    "
 
-#~ msgid "Fixed"
-#~ msgstr "Фиксно"
-
 #, python-format
 #~ msgid ""
 #~ "The bank account defined on the selected chart of accounts hasn't a code."
@@ -12374,6 +12355,12 @@ msgstr ""
 #~ "Измени фактура: Ја откажува тековната фактура и креира нова копија од неа "
 #~ "готова за изменување"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Овој рок за плаќање ќе биде употребен наместо стандардниот за тековен партнер"
+
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Compute Code for Taxes included prices"
 
@@ -12385,6 +12372,9 @@ msgstr ""
 #~ "You can not cancel an invoice which is partially paid! You need to "
 #~ "unreconcile related payment entries first!"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Вреднување: Процент"
+
 #~ msgid ""
 #~ "With Customer Refunds you can manage the credit notes for your customers. A "
 #~ "refund is a document that credits an invoice completely or partially. You "
@@ -12426,6 +12416,9 @@ msgstr ""
 #~ msgid "Journal Views"
 #~ msgstr "Прегледи на картици"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Value amount: n.a"
+
 #~ msgid ""
 #~ "With Customer Invoices you can create and manage sales invoices issued to "
 #~ "your customers. OpenERP can also generate draft invoices automatically from "
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index ddd57683296..fd411c956d0 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-07 07:42+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:24+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Unreconciliate Transactions"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Нэхэмжлэх эсвэл төлбөрөөс импортлох"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,15 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Нийт дебит"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -113,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -144,19 +129,19 @@ msgstr ""
 "устгалгүйгээр нуух боломжийг олгоно."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -168,7 +153,7 @@ msgid "Warning!"
 msgstr "Анхааруулга!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Бусад Журнал"
@@ -240,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Татварын загвар"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "Татвар"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -260,6 +240,11 @@ msgstr "Санхүүгийн бичилтүүд нь тулгалтын орол
 msgid "Belgian Reports"
 msgstr "Белги тайлан"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +380,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -454,6 +434,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -469,6 +454,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Загвар дансны мод"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -630,15 +620,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3 сараар"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Хэрвээ гүйлгээг үл нийцүүлэх бол тэдгээр гүйлгээтэй холбоотой бүх үйлдэлийг "
-"хягтлах ёстой."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -687,7 +668,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -700,13 +681,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Борлуулалт Дансны төрлөөрх тайлан"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -769,6 +750,11 @@ msgstr "Авлагын данс"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -793,6 +779,12 @@ msgstr "Дахин нээх"
 msgid "Are you sure you want to create entries?"
 msgstr "Та гүйлгээ үүсгэхдээ итгэлтэй байна уу?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -813,6 +805,7 @@ msgstr "Мод хэлбэрийн харагдац"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Хувь"
 
@@ -855,7 +848,7 @@ msgid "Type"
 msgstr "Төрөл"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,24 +873,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Ханган Нийлүүлэгчийн Нэхэмжлэх болон Зарлага (Буцаалт)"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Тулгалтыг арилгах"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "Цэвэр 14 хоногт 2 хувь, үлдэгдэл нь сарын төгсгөлийн 30 дахь хоногт"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -928,11 +915,6 @@ msgstr "J.C./Гүйлгээний нэр"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -964,7 +946,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -979,6 +961,7 @@ msgstr "шинэ захиалга"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Тооцоололт"
 
@@ -1010,11 +993,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1050,7 +1030,7 @@ msgid "Liability"
 msgstr "Эх үүсвэр"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Энэ нэхэмжлэлд холбогдох журналын дарааллыг тодорхойлно уу."
@@ -1124,10 +1104,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1205,8 +1185,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1252,7 +1233,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Банк"
@@ -1548,9 +1529,9 @@ msgid "Account Receivable"
 msgstr "Авлагын данс"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1564,7 +1545,7 @@ msgid "With balance is not equal to 0"
 msgstr "Баланс нь тэгээс ялгаатай"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1619,7 +1600,7 @@ msgstr "Гараар үүсгэх үед 'Ноорог' төлвийг алга
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1664,6 +1645,12 @@ msgstr "Хяналтын самбарыг харахад түр хэрэглэг
 msgid "Supplier Refunds"
 msgstr "Нийлүүлэгчийн буцаалт"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Ангилалын код"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1701,7 +1688,6 @@ msgid "Groups"
 msgstr "Бүлгүүд"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Татваргүй"
@@ -1834,6 +1820,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Борлуулалт дансны төрлөөр"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1854,115 +1846,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2073,6 +1961,11 @@ msgstr "Энэ мөчлөг дахин ашиглагдах эсэх."
 msgid "Draft statement"
 msgstr "Ноорог ордер"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2101,26 +1994,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2128,16 +2020,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2148,8 +2040,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2194,7 +2086,7 @@ msgid "period close"
 msgstr "мөчлөг хаах"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2294,7 +2186,7 @@ msgid "Product Category"
 msgstr "Барааны ангилал"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2665,7 +2557,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Хоосон орхивол бүх нээлттэй жил хэрэглэгдэнэ"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2683,7 +2575,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2704,7 +2596,7 @@ msgid "Main Sequence"
 msgstr "Үндсэн дараалал"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2714,14 +2606,12 @@ msgstr ""
 "устгана."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Төлбөрийн нөхцөл"
 
@@ -2747,18 +2637,6 @@ msgstr "Үүнийг сонго"
 msgid "Filters"
 msgstr "Шүүлтүүр"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Нээлттэй"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2770,6 +2648,11 @@ msgstr "Ноорог төлөвтэй нэхэмжлэл"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2847,25 +2730,20 @@ msgid "Account Model Entries"
 msgstr "Дансны загвар гүйлгээ"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Нийлүүлэгчийн татвар"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "бичилтүүд"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Банкны харилцах дансууд"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2888,7 +2766,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2902,9 +2779,8 @@ msgstr ""
 "тогтоосон хугацаатай байж болно, жишээ нь 50% нь одоо, 50% нь сарын дотор."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2934,6 +2810,7 @@ msgstr "Дансны тулгалтын мөрийн хөдөлгөөн (най
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Татвар"
 
@@ -2969,14 +2846,14 @@ msgid "Accounts"
 msgstr "Данс"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3075,6 +2952,12 @@ msgstr "Төлсөн/Тулгагдсан"
 msgid "Refund Base Code"
 msgstr "Буцаалтын суурь ангилал"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Банкны хуулгууд"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3127,11 +3010,6 @@ msgstr "Харилцагчийн балансын насжилт"
 msgid "Accounting entries"
 msgstr "Ажил гүйлгээ"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Харилцах төрөл"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3176,7 +3054,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3189,7 +3067,7 @@ msgid "Sales by Account"
 msgstr "Борлуулалт дансаар"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3205,15 +3083,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "'%s' журналд аналитик журнал тодорхойлогдоогүй байна!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3221,7 +3099,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3286,9 +3164,10 @@ msgstr ""
 "хэрэглэгдэнэ."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Мөр 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3335,12 +3214,6 @@ msgstr "Суурь ангилалын дүн"
 msgid "Default Sale Tax"
 msgstr "Борлуулалтын Татварын Анхны Утга"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "'%s' нэхэмжлэл шалгагдлаа."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3377,7 +3250,7 @@ msgid "Fiscal Position"
 msgstr "Санхүүгийн харгалзаа"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3406,7 +3279,7 @@ msgid "Trial Balance"
 msgstr "Шалгах баланс"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3477,7 +3350,7 @@ msgstr ""
 "өдрийн ханшаар тооцоологдоно."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3489,9 +3362,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Дансны дугаарт хэрэглэх тэмдэгтийн хэмжээ (оронгийн хэмжээ)"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Мөрийн нэр"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3540,7 +3413,7 @@ msgid "View"
 msgstr "Харах"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3561,15 +3434,20 @@ msgstr "Урьдчилсан Нэхэмжлэх"
 msgid "Electronic File"
 msgstr "Электроник файл"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Сарын өдөр: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Татварын кодны загвар"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3577,9 +3455,88 @@ msgid "Account Partner Ledger"
 msgstr "Харилцагчийн дэвтэр хэвлэлт"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3717,12 +3674,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Үнийн дүн:0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Хэрэв та нэр оноовол уг нэр нь ажил гүйлгээ үүсэхдээ ордертэй ижил "
+"нэртэйгээр үүснэ. Ингэснээр ордерийн ажил гүйлгээ тухайн ордертойгоо ижил "
+"таних тэмдэгтэй болно"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3737,7 +3700,7 @@ msgid "Starting Balance"
 msgstr "Нээлтийн үлдэгдэл"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Харилцагч алга !"
@@ -3939,7 +3902,7 @@ msgid "Period Length (days)"
 msgstr "Мөчлөгийн урт (өдөрөөр)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3963,7 +3926,7 @@ msgid "Category of Product"
 msgstr "Барааны ангилал"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4101,7 +4064,7 @@ msgid "Chart of Accounts Template"
 msgstr "Загвар дансны мод"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4191,9 +4154,14 @@ msgid "Qty"
 msgstr "Тоо хэмжээ"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Маргаантай"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Энэ хэрэгийн дүнг түүний эцэгтэй нийлүүлэхэд хэрэглэх коэфициентийг энд "
+"тодорхойлох боломжтой. Жижээлбэл, 1/-1 нь нэмнэ/хасна."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4278,11 +4246,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4300,11 +4263,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Банкы дансдаа тохируулах"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4350,8 +4308,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4381,7 +4339,7 @@ msgid "Consolidated Children"
 msgstr "Нэгтгэсэн дэд дансууд"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4418,11 +4376,6 @@ msgstr ""
 msgid "title"
 msgstr "гарчиг"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4512,6 +4465,13 @@ msgstr "Сарын төгөсгөл 30 өдөр"
 msgid "Analytic Balance"
 msgstr "Аналитик баланс"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4532,6 +4492,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Батлагдсан журналын бичилтүүд"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4542,11 +4507,6 @@ msgstr "Татварын загвар хайх"
 msgid "Draft Entries"
 msgstr "Ноорог бичилтүүд"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Сарын өдөр= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4555,11 +4515,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Өдрийн тоо: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4583,20 +4538,9 @@ msgid "Account Type"
 msgstr "Дансны төрөл"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Касс хаах"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4619,9 +4563,20 @@ msgstr ""
 "accounts. These generate draft supplier invoices."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Касс хаах"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4649,7 +4604,7 @@ msgid "Month"
 msgstr "Сар"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4660,8 +4615,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4685,6 +4640,11 @@ msgstr "Paypal Данс"
 msgid "Acc.Type"
 msgstr "Дансны төрөл"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4697,7 +4657,7 @@ msgstr "Урвуу балансын тэмдэг"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Баланс тайлан (Эх үүсвэрийн данс)"
@@ -4719,7 +4679,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4775,11 +4735,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Тогтмол хугацааны боловсруулалт"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4809,10 +4764,9 @@ msgid "Account chart"
 msgstr "Дансны мод"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Нийлүүлэгчийн нэхэмжлэл"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4880,10 +4834,14 @@ msgstr "Орлогын тэмдэглэл"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4935,7 +4893,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4950,7 +4908,7 @@ msgid "Based On"
 msgstr "Суурь"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4975,11 +4933,6 @@ msgstr ""
 msgid "Change"
 msgstr "Солих"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Банк болон чек"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5002,11 +4955,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Жишээ"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5017,12 +4965,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-"Татварын дүнг орлогын дансанд бичих бол татварын дансыг хоосон орхино"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5032,7 +4974,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Худалдан авалтын Татвар %.2f%%"
@@ -5106,16 +5048,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "БУСАД"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Нэхэмжлэл (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5229,6 +5166,7 @@ msgstr "Нэмэх"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Төлсөн"
 
@@ -5255,7 +5193,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Нээлтийн Мөчлөг"
@@ -5270,14 +5208,6 @@ msgstr "Үзлэг хийх шаардлагатай журналын бичил
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5290,7 +5220,7 @@ msgid "Tax Application"
 msgstr "Татварын хэрэглээ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5323,9 +5253,9 @@ msgid "End of period"
 msgstr "Мөчлөгийн төгсгөл"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Банкны харилцах дансууд"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Нэхэмжлэлийн Төлбөр"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5421,14 +5351,6 @@ msgstr "Татварын тайлбар"
 msgid "Child Tax Accounts"
 msgstr "Дэд татварууд"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5476,7 +5398,7 @@ msgid "Target Moves"
 msgstr "Хэрэглэх гүйлгээ"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5512,6 +5434,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5529,12 +5452,6 @@ msgstr ""
 "болгоход энэ тохиргоог хэрэглэнэ. Энэ сүүлийн сонголт нь энэ үлгэрт "
 "тодорхойлсон татварын олонлог нь гүйцсэнийг илэрхийлнэ."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5560,18 +5477,13 @@ msgstr "Жил"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Мөр 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Дотоод нэр"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5610,7 +5522,7 @@ msgstr "Баланс тайлан"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Ашиг-Алдагдал (Орлогын данс)"
@@ -5643,7 +5555,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Тооцоолох програмчлалын код (хэрэв төрөл = програмчлал)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5670,6 +5582,7 @@ msgstr "Автомат тулгалт"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5773,7 +5686,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5803,7 +5716,7 @@ msgid "Amount Computation"
 msgstr "Дүн тооцоолол"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5839,10 +5752,16 @@ msgid "Account Common Account Report"
 msgstr "Дансны Ерөнхий Дансны Тайлан"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Гүйлгээний утга"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Нээлттэй"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5872,9 +5791,7 @@ msgstr "Татварын ангилал"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Захиалагчийн буцаалт"
 
@@ -5891,11 +5808,6 @@ msgstr "Татварын ангилалын тэмдэг"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Сүүлийн 15 хоногт үүсгэгдсэн Нэхэмжлэлүүдийн Тайлан"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Хоногийн тоо: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5912,6 +5824,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Төлөх дүн"
@@ -6003,8 +5916,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6027,6 +5938,13 @@ msgstr "Энгийн текст"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Төлбөрийн бичилт нь тулгалтын хоёр дахь оролт байдаг"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6036,15 +5954,6 @@ msgstr ""
 "Хэсэгчилсэн дүнгүүдийг нэгтгэгдэж автомат гүйцээлтээр баланстай тулах "
 "цэгүүдийг олж болдог нь автомат тулгалтын давуу тал юм."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Дараалалын талбар нь төлбөрийн нөхцөлийн цувааг бага дарааллаас ихрүү нь эмх "
-"цэгцтэй болгоход ашиглагддаг."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6102,12 +6011,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Тогтмол дүн"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6131,7 +6039,6 @@ msgstr "Санхүүгийн жилийн нээлтийн гүйлгээ тох
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Татварын дүнг тооцоолох арга хэлбэр."
 
@@ -6159,18 +6066,23 @@ msgid "Child Accounts"
 msgstr "Дэд дансууд"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Гүйлгээний нэр (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Зөрүү"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "бичилтүүд"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6187,7 +6099,7 @@ msgstr "Орлого"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Нийлүүлэгч"
@@ -6207,16 +6119,11 @@ msgid "Account n°"
 msgstr "Данс n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Бусад холбогдол"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Үнэлгээ"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6331,7 +6238,7 @@ msgid "Filter by"
 msgstr "Шүүлтүүр"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Танын илэрхийлэл таны моделд буруу байна \"%(...)s\" !"
@@ -6379,6 +6286,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Өдрийн дугаар"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6520,7 +6435,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6699,7 +6614,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6730,12 +6645,6 @@ msgstr ""
 msgid "Current"
 msgstr "Одоогийн"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6760,7 +6669,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Хувь"
 
@@ -6780,7 +6688,7 @@ msgid "Power"
 msgstr "Хүч"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Хэрэглэгдээгүй журналын кодыг үүсгэж чадахгүй."
@@ -6827,12 +6735,17 @@ msgid "Applicable Type"
 msgstr "Хэрэглэх төрөл"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Нэхэмжлэлийн дугаарлалт"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6851,12 +6764,12 @@ msgstr ""
 "тооцоологдоно."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6929,7 +6842,7 @@ msgid "Optional create"
 msgstr "Заавал биш үүсгэх"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6940,9 +6853,7 @@ msgstr "Журналын бичилтүүд агуулж байгаа дансн
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Нийлүүлэгчийн буцаалт"
 
@@ -6980,9 +6891,12 @@ msgid "Group By..."
 msgstr "Бүлэглэх..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Үнэлгээ: Баланс"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7060,6 +6974,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Кассын гүйлгээ"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7077,7 +6998,7 @@ msgstr "Аналитик бичилт статистик"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Гүйлгээ: "
@@ -7095,14 +7016,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Үнэн"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Баланс тайлан (Хөрөнгийн данс)"
@@ -7118,10 +7038,9 @@ msgid "Total debit"
 msgstr "Нийт дебит"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "\"%s\" гүйлгээ алга !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Тулгах дараагийн харилцагчдын бичлэгүүд"
 
 #. module: account
 #: report:account.invoice:0
@@ -7172,7 +7091,7 @@ msgstr "Бичилт хийх"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Ашиг-Алдагдал (Зардлын данс)"
@@ -7183,13 +7102,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Алдаа !"
@@ -7226,6 +7146,11 @@ msgstr "Төсөл"
 msgid "Manual"
 msgstr "Гараар"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7331,8 +7256,8 @@ msgstr "Журнал сонгох"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Нээлтийн үлдэгдэл"
@@ -7414,7 +7339,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7435,6 +7360,11 @@ msgstr ""
 "\n"
 "ө.х. миний модель %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7488,7 +7418,7 @@ msgid "Done"
 msgstr "Дууссан"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7524,9 +7454,8 @@ msgid "Source Document"
 msgstr "Эх баримт"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7553,7 +7482,7 @@ msgid "Taxes:"
 msgstr "Татвар:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7750,6 +7679,12 @@ msgstr ""
 "Энэ талбарын тусламжтайгаар татварыг сонгож хэрэглэх дэлгэцүүдаас хамаарч "
 "ялгаатай татварын жагсаалтууд гарах боломжтой."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Нэхэмжлэлийн дугаарлалт"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7841,7 +7776,7 @@ msgid "Use model"
 msgstr "Модел хэрэлгэх"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7892,7 +7827,7 @@ msgid "Root/View"
 msgstr "Язгуур/Харагдац"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7961,7 +7896,7 @@ msgid "Maturity Date"
 msgstr "Боловсорч гүйцэх огноо"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Борлуулалтын журнал"
@@ -7972,7 +7907,7 @@ msgid "Invoice Tax"
 msgstr "Татварын нэхэмжлэл"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Хэсгийн Дугаар Алга !"
@@ -8015,7 +7950,7 @@ msgid "Sales Properties"
 msgstr "Борлуулалтын талбарууд"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8040,7 +7975,7 @@ msgstr "Хүртэл"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Валютын Тохиргоо"
@@ -8074,7 +8009,7 @@ msgid "May"
 msgstr "5 сар"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8096,10 +8031,9 @@ msgstr ""
 "хэрэглэгддэг."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Ангилалын код"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8115,17 +8049,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Журналын бичилтүүдийг батлах"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Захиалагч"
@@ -8141,7 +8070,7 @@ msgstr "Тайлангийн нэр"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Бэлэн мөнгө"
@@ -8153,9 +8082,11 @@ msgid "Account Destination"
 msgstr "Солих данс"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Нэхэмжлэлийн Төлбөр"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8163,7 +8094,6 @@ msgstr "Нэхэмжлэлийн Төлбөр"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8301,15 +8231,14 @@ msgid "Partner Ledger"
 msgstr "Харилцагчийн дэвтэр"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Тогтмол утга"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Анхааруулга !"
@@ -8377,7 +8306,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Нэхэмжлэлд хэрэглэх валютаа сонго"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нэхэмжлэлийн мөр алга !"
@@ -8457,7 +8386,7 @@ msgid "Associated Partner"
 msgstr "Холбогдох харилцагч"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Та эхлээд харилцагч сонгох хэрэгтэй !"
@@ -8539,13 +8468,13 @@ msgstr ""
 "эсэх."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Худалдан авалтын буцаалтын журнал"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8619,7 +8548,7 @@ msgid "Net Total:"
 msgstr "Цэвэр нийлбэр:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8639,13 +8568,6 @@ msgstr "Ерөнхий тайлан"
 msgid "Write-Off Journal"
 msgstr "Цуцлалтын журнал"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "Тухайн харилцагчид хэрэглэгдэх тогтсон төлбөрийн нөхцөл"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8672,11 +8594,6 @@ msgstr "Дотоод төрөл"
 msgid "Tax/Base Amount"
 msgstr "Татвар/Үндсэн дүн"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Үнэлгээ: Хувь"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8730,6 +8647,11 @@ msgstr "Гүйцээлтийн үр дүн"
 msgid "Ending Balance"
 msgstr "Төгсгөлийн баланс"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8772,7 +8694,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Банкны хуулгыг автоматаар импортлох"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8795,7 +8717,12 @@ msgid "Account Types"
 msgstr "Дансны төрөл"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8803,9 +8730,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Утгын дүн: байхгүй"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS ангилал"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8822,10 +8749,10 @@ msgid "Reconciliation"
 msgstr "Тулгалт"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Авлагын данс"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+"Татварын дүнг орлогын дансанд бичих бол татварын дансыг хоосон орхино"
 
 #. module: account
 #: view:account.invoice:0
@@ -8906,7 +8833,7 @@ msgid "The partner account used for this invoice."
 msgstr "Уг нэхэмжлэл дээр хэрэглэгдэх харилцагчийн данс"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Татвар %.2f%%"
@@ -8924,13 +8851,13 @@ msgid "Payment Term Line"
 msgstr "төлбөрийн нөхцөлийн шугам"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Худалдан авалтын журнал"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Нийлбэр"
 
@@ -8959,11 +8886,6 @@ msgstr "Эцсийн огноо"
 msgid "Suppliers"
 msgstr "Нийлүүлэгч"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Үнэн"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9100,9 +9022,10 @@ msgid "Journal Name"
 msgstr "Журналын нэр"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Тулгах дараагийн харилцагчдын бичлэгүүд"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "\"%s\" гүйлгээ алга !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9151,7 +9074,7 @@ msgstr ""
 "дүн бичнэ."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9212,7 +9135,7 @@ msgid "Reconciled entries"
 msgstr "Тулгагдсан бичилтүүд"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Буруу модел !"
@@ -9234,7 +9157,7 @@ msgid "Print Account Partner Balance"
 msgstr "Харилцагчийн баланс тайлан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9273,7 +9196,7 @@ msgstr "үл мэдэх"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Нээлтийн гүйлгээний журнал"
@@ -9320,7 +9243,7 @@ msgstr ""
 "эсэх. Үгүй бол үндсэн дүн дээр тооцоолно."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9335,20 +9258,9 @@ msgstr "Python кодоор өгөгддөг"
 msgid "Journal Code"
 msgstr "Журналын код"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Энэ хэрэгийн дүнг түүний эцэгтэй нийлүүлэхэд хэрэглэх коэфициентийг энд "
-"тодорхойлох боломжтой. Жижээлбэл, 1/-1 нь нэмнэ/хасна."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Үлдэгдэл дүн"
 
@@ -9381,7 +9293,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Борлуулалтын буцаалтын журнал"
@@ -9447,7 +9359,7 @@ msgid "Purchase Tax(%)"
 msgstr "Худалдан авалтын татвар(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Нэхэмжлэлийн мөр үүсгэнэ үү."
@@ -9466,7 +9378,7 @@ msgid "Display Detail"
 msgstr "Дэлгэрэнгүйг харуулах"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9583,21 +9495,11 @@ msgstr "Нягтлан нь нэхэмжлэлээс ирсэн бичилтүү
 msgid "Number of Periods"
 msgstr "Мөчлөгийн тоо"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Татварын кодны загвар"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Баримт: Захиалагчийн дансны хуулга"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS ангилал"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9609,8 +9511,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9630,14 +9533,14 @@ msgid "Document"
 msgstr "Баримт бичиг"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Банкны хуулгууд"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Авлагын данс"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9738,8 +9641,8 @@ msgid "Move"
 msgstr "Ажил гүйлгээ"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9818,11 +9721,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Тулгагдаагүй гүйлгээнүүд"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9840,11 +9738,16 @@ msgid "Balance :"
 msgstr "Үлдэгдэл"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9881,13 +9784,6 @@ msgstr "захиалга"
 msgid "Account Analytic Balance"
 msgstr "Дансны аналитик баланс"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9927,7 +9823,13 @@ msgid "Due date"
 msgstr "Эцсийн огноо"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10023,7 +9925,7 @@ msgid "Unreconciled"
 msgstr "Тулгагдаагүй"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Нийлбэр буруу !"
@@ -10112,7 +10014,7 @@ msgid "Comparison"
 msgstr "Харьцуулалт"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10130,6 +10032,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10183,11 +10090,6 @@ msgstr "Кредит"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10199,7 +10101,7 @@ msgid "Journal Entry Model"
 msgstr "Журналын Бичилтийн Модель"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10284,7 +10186,7 @@ msgid "Profit (Loss) to report"
 msgstr "Ашиг (Алдагдалт) тайланд"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10611,7 +10513,14 @@ msgid "Empty Accounts ? "
 msgstr "Хоосон данс ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10737,7 +10646,7 @@ msgid "Receivable accounts"
 msgstr "Авлагын данс"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10869,7 +10778,7 @@ msgid "Entries Sorted by"
 msgstr "Бичилтүүдийн эрэмбэлсэн талбар"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10975,7 +10884,7 @@ msgid "Accounting Documents"
 msgstr "Санхүүгийн баримт"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11020,7 +10929,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Нэхэмжлэлийг Гар Татварууд"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11101,17 +11010,6 @@ msgstr ""
 msgid "February"
 msgstr "2 сар"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Хэрэв та нэр оноовол уг нэр нь ажил гүйлгээ үүсэхдээ ордертэй ижил "
-"нэртэйгээр үүснэ. Ингэснээр ордерийн ажил гүйлгээ тухайн ордертойгоо ижил "
-"таних тэмдэгтэй болно"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11172,6 +11070,11 @@ msgstr "Санхүүгийн харгалзуулалтын загвар"
 msgid "Expense Account on Product Template"
 msgstr "Барааны загвар дээрх зарлагын данс"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11239,6 +11142,12 @@ msgstr ""
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Нийлүүлэгчийн төлөгдөөгүй буцаалт"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Тогтмол хугацааны боловсруулалт"
+
+#~ msgid "account.tax"
+#~ msgstr "Татвар"
+
 #~ msgid "Printing Date"
 #~ msgstr "Хэвлэсэн огноо"
 
@@ -11312,6 +11221,9 @@ msgstr ""
 #~ msgid "Analytic Credit"
 #~ msgstr "Аналитик кредит"
 
+#~ msgid "Line Name"
+#~ msgstr "Мөрийн нэр"
+
 #~ msgid "Validated accounting entries."
 #~ msgstr "Батлагдсан гүйлгээнүүд."
 
@@ -11593,6 +11505,11 @@ msgstr ""
 #~ msgid "Entry Name"
 #~ msgstr "Гүйлгээний нэр"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "Тухайн харилцагчид хэрэглэгдэх тогтсон төлбөрийн нөхцөл"
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -11691,9 +11608,6 @@ msgstr ""
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "Та хасах бүртгэлд баримтыг оруулж өгөх хэрэгтэй"
 
-#~ msgid "Fixed"
-#~ msgstr "Тогтмол утга"
-
 #, python-format
 #~ msgid "No analytic journal !"
 #~ msgstr "Аналитик журнал алга !"
@@ -11983,6 +11897,10 @@ msgstr ""
 #~ msgid "Line"
 #~ msgstr "Мөр"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Нийлүүлэгчийн нэхэмжлэл"
+
 #~ msgid "Contact"
 #~ msgstr "Холбоо барих"
 
@@ -12152,6 +12070,13 @@ msgstr ""
 #~ msgid "8"
 #~ msgstr "8"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Дараалалын талбар нь төлбөрийн нөхцөлийн цувааг бага дарааллаас ихрүү нь эмх "
+#~ "цэгцтэй болгоход ашиглагддаг."
+
 #~ msgid "Value Amount"
 #~ msgstr "үнийн дүн"
 
@@ -12195,6 +12120,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "шинэ тэнцэлийн бичиг"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Хэрвээ гүйлгээг үл нийцүүлэх бол тэдгээр гүйлгээтэй холбоотой бүх үйлдэлийг "
+#~ "хягтлах ёстой."
+
 #~ msgid "to :"
 #~ msgstr "хүртэл"
 
@@ -12544,6 +12476,13 @@ msgstr ""
 #~ msgid "Children Definition"
 #~ msgstr "Дэд татвар тодорхойлолт"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+
 #~ msgid "Accounting Entries-"
 #~ msgstr "Ажил гүйлгээ-"
 
@@ -12852,6 +12791,9 @@ msgstr ""
 #~ msgid "Contact Address Name"
 #~ msgstr "Холбоо барих хаяг"
 
+#~ msgid "Litigation"
+#~ msgstr "Маргаантай"
+
 #, python-format
 #~ msgid "Unable to change tax !"
 #~ msgstr "Татварыг солих боломжгүй !"
@@ -12928,6 +12870,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Борлуулагч"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Банк болон чек"
+
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Баланс тайлан (Хөрөнгө)"
 
@@ -12960,6 +12905,9 @@ msgstr ""
 #~ msgid "Start period should be smaller then End period"
 #~ msgstr "Эхлэх мөчлөг нь дуусах мөчлөгөөс өмнөх хугацааных байх ёстой"
 
+#~ msgid "Line 1:"
+#~ msgstr "Мөр 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Өгөгдлийн алдаа !"
@@ -13483,6 +13431,9 @@ msgstr ""
 #~ "Энэ нь тайлан нь шалгах балансыг хэвлэх буюу pdf-р гаргаж ерөнхий дэвтэрийг "
 #~ "бүх журналийн дэлгэрэнгүйгээр гаргадаг."
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Sale journal in this year"
 #~ msgstr "Энэ жилийн Борлуулалтын Журнал"
 
@@ -13593,12 +13544,21 @@ msgstr ""
 #~ msgid "Sale journal in this month"
 #~ msgstr "Энэ сарын борлуулалтын журнал"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Өдрийн тоо: 30"
+
 #~ msgid "Month-1"
 #~ msgstr "Сар-1"
 
 #~ msgid "My invoices"
 #~ msgstr "Миний нэхэмжлэлүүд"
 
+#~ msgid "Line 2:"
+#~ msgstr "Мөр 2:"
+
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Үнийн дүн:0.02"
+
 #, python-format
 #~ msgid "I can not locate a parent code for the template account!"
 #~ msgstr "Үлгэр дансны эцэг кодыг олж чадсангүй!"
@@ -13611,6 +13571,9 @@ msgstr ""
 #~ "Та дансны төрөлийг '%s'-с '%s'-рүү өөрчилж чадахгүй. Энэ нь журналын "
 #~ "бичилтүүдийг агуулж байна!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "Цэвэр 14 хоногт 2 хувь, үлдэгдэл нь сарын төгсгөлийн 30 дахь хоногт"
+
 #~ msgid ""
 #~ "Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
 #~ "tax codes) and shows the current tax situation. The tax chart represents the "
@@ -13697,6 +13660,10 @@ msgstr ""
 #~ msgid "Configure Your Chart of Accounts"
 #~ msgstr "Өөрийн дансны модыг тохируулах"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "'%s' нэхэмжлэл шалгагдлаа."
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -13722,6 +13689,9 @@ msgstr ""
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "Энэ санхүүгийн жилд Жилийн төгсгөлийн журнал алга байна"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Сарын өдөр: 0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Энэ сарын Борлуулалт төрөлөөр"
 
@@ -13781,6 +13751,9 @@ msgstr ""
 #~ "Эхлэлийн балансыг тооцоолоход хангалттай аргумент өгөгдөөгүй байна. Мөчлөг, "
 #~ "журналыг сонгоно уу."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Сарын өдөр= -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Алдаа! Санхүүгийн жилийн эхлэх огноо нь төгсөх огнооноосоо урд байх ёстой."
@@ -13878,6 +13851,12 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Кассын Нээлтийн мөнгө"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Нэхэмжлэл (Ref ${object.number or 'n/a' })"
+
+#~ msgid "Example"
+#~ msgstr "Жишээ"
+
 #~ msgid ""
 #~ "This report is analysis by partner. It is a PDF report containing one line "
 #~ "per partner representing the cumulative credit balance."
@@ -14044,6 +14023,9 @@ msgstr ""
 #~ "% endif\n"
 #~ "            "
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Хоногийн тоо: 14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
@@ -14062,6 +14044,9 @@ msgstr ""
 #~ "хамаарна. OpenERP нь татварын бүтэцийг энэ менюгээс тодорхойлж үүсгэх "
 #~ "боломжийг олгодог. Тоон болон тоо үсэг оролцсон кодыг үүсгэх боломжтой."
 
+#~ msgid "Valuation"
+#~ msgstr "Үнэлгээ"
+
 #~ msgid ""
 #~ "Select here the kind of valuation related to this payment term line. Note "
 #~ "that you should have your last line with the type 'Balance' to ensure that "
@@ -14119,6 +14104,9 @@ msgstr ""
 #~ msgid "This action will erase taxes"
 #~ msgstr "Энэ үйлдэл нь татваруудыг устгана"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Үнэлгээ: Баланс"
+
 #~ msgid ""
 #~ "If no additional entries should be recorded on a fiscal year, you can close "
 #~ "it from here. It will close all opened periods in this year that will make "
@@ -14314,6 +14302,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Сонгосон дансны мод дээр тодорхойлогдсон банкны данс нь кодгүй байна."
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Үнэлгээ: Хувь"
+
 #, python-format
 #~ msgid ""
 #~ "Can not find a chart of accounts for this company, you should create one."
@@ -14335,6 +14326,9 @@ msgstr ""
 #~ "Энэ огноонд зориулагдсан мөчлөг алга: %s !\n"
 #~ "Үүсгэнэ үү."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Утгын дүн: байхгүй"
+
 #~ msgid ""
 #~ "This menu print a VAT declaration based on invoices or payments. You can "
 #~ "select one or several periods of the fiscal year. Information required for a "
@@ -14774,6 +14768,9 @@ msgstr ""
 #~ "Дотоод төрөл нь \"Өглөг/Авлага\" төрөлтэй дансдын хувьд хойшлогдсон аргатай "
 #~ "дансанд \"Тулгахгүй\"-с өөр төрлийг сонгож болохгүй! "
 
+#~ msgid "Communication"
+#~ msgstr "Гүйлгээний утга"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 949a1dd5865..abeb9ac0dab 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 13:31+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:24+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importer fra fakturaer eller betalinger"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Dårlig konto!"
@@ -94,15 +89,6 @@ msgstr "Dårlig konto!"
 msgid "Total Debit"
 msgstr "Total debet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Hvis du omgjør avstemte transaksjoner må du også kontrollere samtlige "
-"handlinger som er koblet til transaksjonene fordi de ikke vil bli deaktivert"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -115,7 +101,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -146,19 +131,19 @@ msgstr ""
 "betalingsbetingelsene uten å fjerne dem."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -170,7 +155,7 @@ msgid "Warning!"
 msgstr "Advarsel!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diverse journal"
@@ -242,11 +227,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Avgiftsmaler"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -262,6 +242,11 @@ msgstr "Regnskaps oppføringer er en input fra avstemmingen."
 msgid "Belgian Reports"
 msgstr "Belgiske rapporter"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -396,11 +381,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr "Salgsman."
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -455,6 +435,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -470,6 +455,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Kontoplanmal"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -631,15 +621,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3 månedlig"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Hvis du omgjør avstemmte transaksjoner må du også kontrollere samtlige "
-"handlinger som er koblet til transaksjonene fordi de ikke er deaktivert"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -688,7 +669,7 @@ msgid "Profit Account"
 msgstr "Fortjeneste konto."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -700,13 +681,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Salgsrapport etter kontotype"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Kan ikke opprette trekk med annen valuta enn .."
@@ -769,6 +750,11 @@ msgstr "Debitorkonti"
 msgid "Configure your company bank accounts"
 msgstr "Konfigurer bedriftens bankkonto."
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -793,6 +779,12 @@ msgstr "Gjenåpne"
 msgid "Are you sure you want to create entries?"
 msgstr "Er du sikker på du ønsker å opprette posteringer?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -813,6 +805,7 @@ msgstr "Vis underliggende med hierarki"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Prosent"
 
@@ -855,7 +848,7 @@ msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,24 +873,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Leverandørfakturaer og kreditnotaer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Tilbakestill avstemte posteringer"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "Pr. 14 dager netto 2 prosent, resterende beløp innen 30 dager."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -928,11 +915,6 @@ msgstr "J.C./Move name"
 msgid "Account Code and Name"
 msgstr "Konto kode og navn."
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "Opprettet."
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -967,7 +949,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -982,6 +964,7 @@ msgstr "Nytt abonnement"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Beregning"
 
@@ -1013,11 +996,8 @@ msgid "Purchase journal"
 msgstr "Kjøp journal."
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1053,7 +1033,7 @@ msgid "Liability"
 msgstr "Gjeld"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1129,10 +1109,10 @@ msgid "Features"
 msgstr "Funksjoner."
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1210,8 +1190,9 @@ msgid "Refund "
 msgstr "Tilbakebetaling. "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1257,7 +1238,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1555,9 +1536,9 @@ msgid "Account Receivable"
 msgstr "Debitorposter"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1571,7 +1552,7 @@ msgid "With balance is not equal to 0"
 msgstr "Hvor saldo ikke er lik 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1626,7 +1607,7 @@ msgstr "Dropp 'Utkast' status for manuelle posteringer"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1671,6 +1652,12 @@ msgstr "En midlertidig tabell for konsollvisning"
 msgid "Supplier Refunds"
 msgstr "Leverandør kreditnota"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Kontantkode"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1708,7 +1695,6 @@ msgid "Groups"
 msgstr "Grupper"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Uten avg."
@@ -1841,6 +1827,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Salg pr kontotype"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1861,115 +1853,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2080,6 +1968,11 @@ msgstr "Disse periodene kan overlappe hverandre"
 msgid "Draft statement"
 msgstr "Utkast kontoutdrag"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2108,26 +2001,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2135,16 +2027,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2155,8 +2047,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2201,7 +2093,7 @@ msgid "period close"
 msgstr "Periode til"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2301,7 +2193,7 @@ msgid "Product Category"
 msgstr "Produktkategori"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2672,7 +2564,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "La felt være blankt for å vise alle åpne regnskapsår"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2690,7 +2582,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Opprett en konto basert på denne malen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2711,7 +2603,7 @@ msgid "Main Sequence"
 msgstr "Hovedsekvens"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2721,14 +2613,12 @@ msgstr ""
 "tidsskriftet elementer."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Betalingsbetingelser"
 
@@ -2754,18 +2644,6 @@ msgstr "Kryss av her"
 msgid "Filters"
 msgstr "Filtere"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Åpne"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2777,6 +2655,11 @@ msgstr "Kunde fakturakladd"
 msgid "Account Properties"
 msgstr "Konto egenskaper."
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2854,25 +2737,20 @@ msgid "Account Model Entries"
 msgstr "Konto Modell oppføringer"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Opprett kredit notat."
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Leverandøravgifter"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "oppføringer"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detaljer om bankforbindelse"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2895,7 +2773,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2909,9 +2786,8 @@ msgstr ""
 "kan beregne flere forfallsdatoer, for eksempel 50 % np og 50 % om en måned."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2941,6 +2817,7 @@ msgstr "Konto trekk linje forsonet (writeoff)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Avgift"
 
@@ -2976,14 +2853,14 @@ msgid "Accounts"
 msgstr "Konto"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3080,6 +2957,12 @@ msgstr "Betalt/avstemt"
 msgid "Refund Base Code"
 msgstr "Tilbakebetaling Base kode."
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bankbekreftelse"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3132,11 +3015,6 @@ msgstr "Aldersfordelt partnersaldo"
 msgid "Accounting entries"
 msgstr "Regnskapsregistreringer"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Kommuniksjonstype"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3184,7 +3062,7 @@ msgstr ""
 "forma 'tilstand."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "Du bør velge de periodene som tilhører samme selskap."
@@ -3197,7 +3075,7 @@ msgid "Sales by Account"
 msgstr "Salg pr. konto"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "Du kan ikke slette en publisert bilagsregistrering \"% s\"."
@@ -3213,15 +3091,15 @@ msgid "Sale journal"
 msgstr "Salgs journal."
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Du må definere en analytisk journal på '% s' dagbok!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3229,7 +3107,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3294,9 +3172,10 @@ msgstr ""
 "rapporter."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Linje 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3343,12 +3222,6 @@ msgstr "Basiskode beløp"
 msgid "Default Sale Tax"
 msgstr "Standard salgsavgift"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Faktura '%s' er godkjent."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3385,7 +3258,7 @@ msgid "Fiscal Position"
 msgstr "Regnskapsstatus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3414,7 +3287,7 @@ msgid "Trial Balance"
 msgstr "Råbalanse"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3485,7 +3358,7 @@ msgstr ""
 "bruker alltid dagens valutakurs."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "Det er ingen overordnede kode for denne malen kontoen."
@@ -3497,9 +3370,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Ant. siffer til bruk for kontokode"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Linjenavn"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3548,7 +3421,7 @@ msgid "View"
 msgstr "Vis"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3569,15 +3442,20 @@ msgstr "Proformafakturaer"
 msgid "Electronic File"
 msgstr "Elektonisk fil"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "Selskapet har en konto plan."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dagen i måneden: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Avgiftskodemal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3585,10 +3463,89 @@ msgid "Account Partner Ledger"
 msgstr "Konto Partner ledger"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>Opprettet</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -3716,12 +3673,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Verdi beløp: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3736,7 +3696,7 @@ msgid "Starting Balance"
 msgstr "Inngående saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Ingen partner er definert!"
@@ -3944,7 +3904,7 @@ msgid "Period Length (days)"
 msgstr "Periodelengde (dager)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3968,7 +3928,7 @@ msgid "Category of Product"
 msgstr "Produktkategori"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4104,7 +4064,7 @@ msgid "Chart of Accounts Template"
 msgstr "Kontoplanmal"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4194,9 +4154,12 @@ msgid "Qty"
 msgstr "Ant"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Rettstvist"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4281,11 +4244,6 @@ msgstr "Ingen ukonfigurerte selskap!"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "Betalt."
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4303,11 +4261,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Sett opp dine bankkonti"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4354,8 +4307,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Du kan ikke bruke en inaktiv konto."
@@ -4385,7 +4338,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4423,11 +4376,6 @@ msgstr ""
 msgid "title"
 msgstr "tittel"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Opprett en kladd kredit notat."
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4517,6 +4465,13 @@ msgstr "30 dager slutten av måneden"
 msgid "Analytic Balance"
 msgstr "Analytisk saldo"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4538,6 +4493,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Posterte journaloppføringer"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4548,11 +4508,6 @@ msgstr "Søk avgiftsmaler"
 msgid "Draft Entries"
 msgstr "utkastene"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dag i måneden=-1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4561,11 +4516,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Antall dager: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4589,20 +4539,9 @@ msgid "Account Type"
 msgstr "Kontotype"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Lukk Cash Box"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4625,9 +4564,20 @@ msgstr ""
 "analytiske kontoer. Disse genererer utkast leverandørfakturaer."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Lukk Cash Box"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4659,7 +4609,7 @@ msgid "Month"
 msgstr "Måned"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4670,8 +4620,8 @@ msgid "Supplier invoice sequence"
 msgstr "Leverandør faktura sekvens."
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4695,6 +4645,11 @@ msgstr "Paypal-konto"
 msgid "Acc.Type"
 msgstr "Kto.type"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4707,7 +4662,7 @@ msgstr "Omvendt balanse tegn"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balanse (Ansvar konto)"
@@ -4729,7 +4684,7 @@ msgid "Account Base Code"
 msgstr "Konto Base kode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4785,11 +4740,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodevis kjøring"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4819,10 +4769,9 @@ msgid "Account chart"
 msgstr "Kontoplan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Leverandøfaktura"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4890,10 +4839,14 @@ msgstr "Kreditnotaer"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4947,7 +4900,7 @@ msgstr ""
 "Du kan ikke opprette en konto som har overordnede hensyn til ulike selskap."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4962,7 +4915,7 @@ msgid "Based On"
 msgstr "Basert på"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4987,11 +4940,6 @@ msgstr ""
 msgid "Change"
 msgstr "Endre"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank og sjekker"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5014,11 +4962,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Kansellert"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Eksempel"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5029,11 +4972,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Beholdes blankt til bruk for inntektskonto"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5043,7 +4981,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5117,16 +5055,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "DIV"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${objekt.firma_id.navn} faktura(Ref ${objekt.nummer or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5240,6 +5173,7 @@ msgstr "Legg til"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Betalt"
 
@@ -5266,7 +5200,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "åpningsperioden"
@@ -5281,14 +5215,6 @@ msgstr "Bilagsregistreringer til gjennomsyn"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5301,7 +5227,7 @@ msgid "Tax Application"
 msgstr "Tax Application"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5334,9 +5260,9 @@ msgid "End of period"
 msgstr "Periodeslutt"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detaljer om bankforbindelse"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Betaling av fakturaer"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5431,16 +5357,6 @@ msgstr "Avgiftsbeskrivelse"
 msgid "Child Tax Accounts"
 msgstr "Underordnede avgiftskonti"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"Det er ingen periode definert for denne datoen:% s.\n"
-"Vennligst opprette en."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5485,7 +5401,7 @@ msgid "Target Moves"
 msgstr "målet beveger seg"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5521,6 +5437,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5537,12 +5454,6 @@ msgstr ""
 "salg og kjøp priser eller velge fra listen over skatter. Denne siste valg "
 "forutsetter at mengden av skatt er definert på denne malen er ferdig"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>Betalt</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5568,18 +5479,13 @@ msgstr "År"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linje 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Internt navn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5618,7 +5524,7 @@ msgstr "Balanse"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Gevinst og tap (Inntektsregnskap)"
@@ -5651,7 +5557,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Beregningskode (dersom type=kode)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5678,6 +5584,7 @@ msgstr "Automatisk avstemming"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5778,7 +5685,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5808,7 +5715,7 @@ msgid "Amount Computation"
 msgstr "Beregning"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5846,10 +5753,16 @@ msgid "Account Common Account Report"
 msgstr "Felles konto Rapporter"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Kommunikasjon"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Åpne"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5879,9 +5792,7 @@ msgstr "Avgiftskoder"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Kreditnota"
 
@@ -5898,11 +5809,6 @@ msgstr "Avgiftkode tegn"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Rapport på fakturaer laget de siste 15 dagene"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Antall dager: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5919,6 +5825,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Fyll ut dette skjemaet hvis du setter penger i kasse apparatet:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Beløp å betale"
@@ -6010,8 +5917,6 @@ msgstr "Runde per. linje."
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6034,6 +5939,13 @@ msgstr "Normal tekst"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Betaling oppføringer er den andre inngangen på forsoning."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6043,15 +5955,6 @@ msgstr ""
 "Antall delvise beløp som kan kombineres for å finne en balanse punkt kan "
 "velges som kraften i den automatiske forsoning"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Sekvensfeltet benyttes til å sortere linjene fra den laveste til den høyeste "
-"seksvensen"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6109,12 +6012,11 @@ msgstr "Du kan ikke opprette journal elementer på en konto av typen visning."
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fast beløp"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6138,7 +6040,6 @@ msgstr "Opprett inngående registreringer"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Beregningsmetode for avgiftsbeløpet"
 
@@ -6166,18 +6067,23 @@ msgid "Child Accounts"
 msgstr "Underordnede konti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Flytt navn (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Nedskrivning"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "oppføringer"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6194,7 +6100,7 @@ msgstr "Inntekt"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Leverandør"
@@ -6214,16 +6120,11 @@ msgid "Account n°"
 msgstr "Kontonr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Fri referanse"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Vurdering"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6338,7 +6239,7 @@ msgid "Filter by"
 msgstr "Filtrer etter"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6387,6 +6288,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Antall dager"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6530,7 +6439,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6708,7 +6617,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "Du kan ikke opprette journal enmer i en lukker konto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6739,12 +6648,6 @@ msgstr ""
 msgid "Current"
 msgstr "Nåværende"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6769,7 +6672,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Prosentdel"
 
@@ -6789,7 +6691,7 @@ msgid "Power"
 msgstr "Styrke"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kan ikke lage en ubenyttet journalkode"
@@ -6836,12 +6738,17 @@ msgid "Applicable Type"
 msgstr "Gjeldende type"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Fakturareferanse"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6860,12 +6767,12 @@ msgstr ""
 "avgifter. I slike tilfeller er vurderingsrekkefølge viktig."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6940,7 +6847,7 @@ msgid "Optional create"
 msgstr "Opprett valgfritt"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6953,9 +6860,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Kreditnota"
 
@@ -6993,9 +6898,14 @@ msgid "Group By..."
 msgstr "Grupper etter..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Validiering: Balanse"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Det er ingen periode definert for denne datoen:% s.\n"
+"Vennligst opprette en."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7073,6 +6983,13 @@ msgstr "Skatt navnet må være unikt per selskap!"
 msgid "Cash Transactions"
 msgstr "Kontant transaksjoner"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7090,7 +7007,7 @@ msgstr "Analytisk Innlegg Statistikk"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Regsitreringer: "
@@ -7108,14 +7025,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Sann"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7131,10 +7047,9 @@ msgid "Total debit"
 msgstr "Total debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Registrering \"%s\" er ikke gyldig"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Neste partner innlegg til å avstemme."
 
 #. module: account
 #: report:account.invoice:0
@@ -7183,7 +7098,7 @@ msgstr "Opprett postering"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Resultatregnskap (kostnadskonti)"
@@ -7194,13 +7109,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Feil!"
@@ -7237,6 +7153,11 @@ msgstr "Prosjektlinje"
 msgid "Manual"
 msgstr "Manuell"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7338,8 +7259,8 @@ msgstr "Velg journal"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Åpningsbalanse"
@@ -7419,7 +7340,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7432,6 +7353,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7485,7 +7411,7 @@ msgid "Done"
 msgstr "Fullført"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7517,9 +7443,8 @@ msgid "Source Document"
 msgstr "Kildedokument"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7546,7 +7471,7 @@ msgid "Taxes:"
 msgstr "Avgifter:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7740,6 +7665,12 @@ msgstr ""
 "Dette feltet brukes bare dersom du utvikler din egen modul som tillater "
 "utviklere å opprette spesifikke avgifter innenfor et spesielt område"
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Fakturareferanse"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7832,7 +7763,7 @@ msgid "Use model"
 msgstr "Bruk modell"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7883,7 +7814,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7952,7 +7883,7 @@ msgid "Maturity Date"
 msgstr "Forfallsdato"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Salgsjournal"
@@ -7963,7 +7894,7 @@ msgid "Invoice Tax"
 msgstr "Faktura avgift"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Ikke noe antallsnummer!"
@@ -8002,7 +7933,7 @@ msgid "Sales Properties"
 msgstr "Instillinger for Salg"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8027,7 +7958,7 @@ msgstr "Til"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Valutajustering"
@@ -8060,7 +7991,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Global skatter definert, men de er ikke i fakturalinjer!"
@@ -8080,10 +8011,9 @@ msgstr ""
 "høyere."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Kontantkode"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8099,17 +8029,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Total journalregistreringer"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kunde"
@@ -8125,7 +8050,7 @@ msgstr "Rapportnavn"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Kontant"
@@ -8137,9 +8062,11 @@ msgid "Account Destination"
 msgstr "Account Destination"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Betaling av fakturaer"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8147,7 +8074,6 @@ msgstr "Betaling av fakturaer"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8285,15 +8211,14 @@ msgid "Partner Ledger"
 msgstr "Partner Ledger"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fast"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -8361,7 +8286,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Velg en valuta for fakturaen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Ingen fakturalinjer!"
@@ -8438,7 +8363,7 @@ msgid "Associated Partner"
 msgstr "Samarbeidspartner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Du må først velge en partner!"
@@ -8520,13 +8445,13 @@ msgstr ""
 "neste skattene."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Leverandør kreditnota-journal"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8597,7 +8522,7 @@ msgid "Net Total:"
 msgstr "Netto total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8617,15 +8542,6 @@ msgstr "Generiske rapporter"
 msgid "Write-Off Journal"
 msgstr "Nedskrivningsjournal"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Denne betalingen begrepet vil bli brukt i stedet for en standard for "
-"nåværende partner."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8652,11 +8568,6 @@ msgstr "Int. type"
 msgid "Tax/Base Amount"
 msgstr "Avgift/basisbeløp"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Validering: Prosent"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8710,6 +8621,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr "Sluttbalanse"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8752,7 +8668,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Autom.import av bankustkrift"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8775,7 +8691,12 @@ msgid "Account Types"
 msgstr "Kontotyper"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8783,9 +8704,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Verdi beløp: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS Kategorier."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8802,10 +8723,9 @@ msgid "Reconciliation"
 msgstr "Nyavstemming"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Fordring konto."
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Beholdes blankt til bruk for inntektskonto"
 
 #. module: account
 #: view:account.invoice:0
@@ -8878,7 +8798,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partnerkonto benyttet for denne faktura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Skatt %.2f%%"
@@ -8896,13 +8816,13 @@ msgid "Payment Term Line"
 msgstr "Betalingsbet.linje"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Innkjøpsjournal"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8931,11 +8851,6 @@ msgstr "Forfallsdato"
 msgid "Suppliers"
 msgstr "Leverandører"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Sann"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9072,9 +8987,10 @@ msgid "Journal Name"
 msgstr "Journalnavn"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Neste partner innlegg til å avstemme."
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Registrering \"%s\" er ikke gyldig"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9122,7 +9038,7 @@ msgstr ""
 "flervaluta."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9183,7 +9099,7 @@ msgid "Reconciled entries"
 msgstr "Avstemte posteringer"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Feil modell!"
@@ -9205,7 +9121,7 @@ msgid "Print Account Partner Balance"
 msgstr "Skriv ut konto partner balanse."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9239,7 +9155,7 @@ msgstr "unknown"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9284,7 +9200,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9299,18 +9215,9 @@ msgstr "Python kode"
 msgid "Journal Code"
 msgstr "Journalkode"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Gjenværende beløp"
 
@@ -9343,7 +9250,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Refusjonsjournal"
@@ -9409,7 +9316,7 @@ msgid "Purchase Tax(%)"
 msgstr "Innkjøpsavgift(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Vennligst opprett fakturalinje(er)"
@@ -9428,7 +9335,7 @@ msgid "Display Detail"
 msgstr "Vis Detalj."
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9543,21 +9450,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Antall perioder"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Avgiftskodemal"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Kunde kontoutskrift."
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS Kategorier."
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9569,8 +9466,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9590,14 +9488,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bankbekreftelse"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Fordring konto."
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9698,8 +9596,8 @@ msgid "Move"
 msgstr "Bevegelse"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9779,11 +9677,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Ikke-avstemte transaksjoner"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9801,11 +9694,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9842,13 +9740,6 @@ msgstr "Abonnement"
 msgid "Account Analytic Balance"
 msgstr "Analytisk saldo"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9888,7 +9779,13 @@ msgid "Due date"
 msgstr "Forfallsdato"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9977,7 +9874,7 @@ msgid "Unreconciled"
 msgstr "Ikke avstemt"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Feil sum !"
@@ -10060,7 +9957,7 @@ msgid "Comparison"
 msgstr "Sammenligning"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10078,6 +9975,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10133,11 +10035,6 @@ msgstr "Kredit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10149,7 +10046,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10234,7 +10131,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10557,7 +10454,14 @@ msgid "Empty Accounts ? "
 msgstr "Tomme konti? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10682,7 +10586,7 @@ msgid "Receivable accounts"
 msgstr "Debitor konti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10809,7 +10713,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10915,7 +10819,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10960,7 +10864,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manuell fakturaavgift"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11039,14 +10943,6 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11105,6 +11001,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11279,6 +11180,13 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Inkluder avstemte posteringer"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Hvis du omgjør avstemte transaksjoner må du også kontrollere samtlige "
+#~ "handlinger som er koblet til transaksjonene fordi de ikke vil bli deaktivert"
+
 #~ msgid "Accounting Entries-"
 #~ msgstr "Konteringsregistreringer"
 
@@ -11292,6 +11200,9 @@ msgstr ""
 #~ msgid "All Analytic Entries"
 #~ msgstr "Alle analytiske registreringer"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid "You can not add/modify entries in a closed journal."
 #~ msgstr "Du kan ikke legge til/endre registreringer i en lukket journal"
@@ -11305,6 +11216,9 @@ msgstr ""
 #~ msgid "St."
 #~ msgstr "St."
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Fiscal Year to Open"
 #~ msgstr "Regnskapsår som skal åpnes"
 
@@ -11314,6 +11228,13 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Navn fakturaadresse"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Hvis du omgjør avstemmte transaksjoner må du også kontrollere samtlige "
+#~ "handlinger som er koblet til transaksjonene fordi de ikke er deaktivert"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 dager   "
 
@@ -11442,6 +11363,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Referansenummer"
 
+#~ msgid "Line 2:"
+#~ msgstr "Linje 2:"
+
 #~ msgid "Required"
 #~ msgstr "Obligatorisk"
 
@@ -11451,6 +11375,9 @@ msgstr ""
 #~ msgid "Bank account"
 #~ msgstr "Bankkonto"
 
+#~ msgid "Line Name"
+#~ msgstr "Linjenavn"
+
 #~ msgid "Customer Credit"
 #~ msgstr "Kundekreditt"
 
@@ -11513,6 +11440,9 @@ msgstr ""
 #~ msgid "Contact Address Name"
 #~ msgstr "Kontaktadresse"
 
+#~ msgid "Litigation"
+#~ msgstr "Rettstvist"
+
 #~ msgid "Account balance"
 #~ msgstr "Kontosaldo"
 
@@ -11560,6 +11490,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Standard avgifter"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodevis kjøring"
+
 #~ msgid "Display Mode"
 #~ msgstr "Vis modus"
 
@@ -11651,6 +11584,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Inngående kontantbeholdning"
 
+#~ msgid "Line 1:"
+#~ msgstr "Linje 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Integritetsfeil!"
@@ -11694,6 +11630,9 @@ msgstr ""
 #~ "Du kan ikke gjøre denne endringen på en avstemt registrering! Merk at du "
 #~ "bare kan endre noen ikke viktige felter!"
 
+#~ msgid "Communication"
+#~ msgstr "Kommunikasjon"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Konfigurasjonsfeil!"
@@ -11704,6 +11643,13 @@ msgstr ""
 #~ msgid "Sort By"
 #~ msgstr "Sorter etter"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Sekvensfeltet benyttes til å sortere linjene fra den laveste til den høyeste "
+#~ "seksvensen"
+
 #~ msgid "Valid Up to"
 #~ msgstr "Gyldig inntil"
 
@@ -11714,6 +11660,9 @@ msgstr ""
 #~ msgid "Already Reconciled!"
 #~ msgstr "Allerede avstemt!"
 
+#~ msgid "Valuation"
+#~ msgstr "Vurdering"
+
 #~ msgid "Invoice Address"
 #~ msgstr "Faktura addresse"
 
@@ -11867,9 +11816,6 @@ msgstr ""
 #~ msgid "Year :"
 #~ msgstr "År :"
 
-#~ msgid "Fixed"
-#~ msgstr "Fast"
-
 #, python-format
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "Kan ikke %s utkast/proforma/kansellere faktura"
@@ -12441,6 +12387,10 @@ msgstr ""
 #~ msgid "Name of the fiscal year as displayed in reports."
 #~ msgstr "Navn på regnskapsåret som blir vist i rapporter."
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Leverandøfaktura"
+
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Ubetalte kundefakturaer"
 
@@ -12638,6 +12588,9 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Feil ! Du kan ikke lage rekursive firmaer."
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "Pr. 14 dager netto 2 prosent, resterende beløp innen 30 dager."
+
 #~ msgid "Cancel: refund invoice and reconcile"
 #~ msgstr "Kanseller: krediter faktura og avstem"
 
@@ -12654,6 +12607,10 @@ msgstr ""
 #~ msgid "New currency is not configured properly !"
 #~ msgstr "Ny valuta er ikke konfigurert!"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Faktura '%s' er godkjent."
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -12682,6 +12639,12 @@ msgstr ""
 #~ msgid "Create a draft Refund"
 #~ msgstr "Lag utkast til kreditnota"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dag i måneden=-1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Antall dager: 30"
+
 #~ msgid "Bank Account Owner"
 #~ msgstr "Bankkontoeier"
 
@@ -12692,6 +12655,12 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Kodefeil"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank og sjekker"
+
+#~ msgid "Example"
+#~ msgstr "Eksempel"
+
 #, python-format
 #~ msgid "You can not create journal items on a closed account %s %s"
 #~ msgstr "Du kan ikke lage journaloppføringer på en lukket konto %s %s"
@@ -12708,6 +12677,9 @@ msgstr ""
 #~ msgid "Reconciliation result"
 #~ msgstr "Resultat av avstemminger"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Antall dager: 14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Denne handlingen vil slett avgifter"
 
@@ -12721,6 +12693,9 @@ msgstr ""
 #~ msgid "You can not remove an account containing journal items."
 #~ msgstr "Du kan ikke fjerne en konto som har journalføringer"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Validiering: Balanse"
+
 #, python-format
 #~ msgid "Error :"
 #~ msgstr "Feil :"
@@ -12743,6 +12718,9 @@ msgstr ""
 #~ msgid "This Months Sales by type"
 #~ msgstr "Månedens salg etter type"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Validering: Prosent"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -12990,6 +12968,9 @@ msgstr ""
 #~ "Du trenger en åpning tidsskrift med sentralisering sjekket for å sette den "
 #~ "innledende balanse!"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dagen i måneden: 0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Denne måneds Salgssentral etter type"
 
@@ -13034,6 +13015,9 @@ msgstr ""
 #~ "Valgte fakturaer) kan ikke kanselleres som de er allerede i \"Avlyst\" eller "
 #~ "\"ferdig\" stat!"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Verdi beløp: 0.02"
+
 #, python-format
 #~ msgid ""
 #~ "Can not create the invoice !\n"
@@ -13189,6 +13173,9 @@ msgstr ""
 #~ msgid "My invoices"
 #~ msgstr "Mine fakturaer."
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${objekt.firma_id.navn} faktura(Ref ${objekt.nummer or 'n/a' })"
+
 #~ msgid "Reverse Compute Code"
 #~ msgstr "Reversere Beregn kode"
 
@@ -13378,6 +13365,9 @@ msgstr ""
 #~ "Endre Faktura: Avbryter gjeldende faktura og skap en ny kopi av den som er "
 #~ "klar for redigering."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Verdi beløp: n.a"
+
 #, python-format
 #~ msgid "The payment term of supplier does not have a payment term line!"
 #~ msgstr "Betalingen sikt av leverandør har ikke en betalingsfrist linje!"
@@ -13429,6 +13419,13 @@ msgstr ""
 #~ "Når månedlige perioder er opprettet. Staten er \"Kladd\". På slutten av "
 #~ "månedlige perioden er det i 'Ferdig' tilstand."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Denne betalingen begrepet vil bli brukt i stedet for en standard for "
+#~ "nåværende partner."
+
 #, python-format
 #~ msgid ""
 #~ "You can not validate a non-balanced entry !\n"
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 41255b0dc0d..24fb1d8944b 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 20:11+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #, python-format
@@ -33,11 +33,6 @@ msgstr ""
 "Een fiscale positie kan maar één keer worden gedefinieerd voor dezelfde "
 "rekening."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Afletteren transacties ongedaan maken"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -86,9 +81,9 @@ msgid "Import from invoice or payment"
 msgstr "Importeer van factuur of betaling"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Onjuiste grootboekrekening"
@@ -99,16 +94,6 @@ msgstr "Onjuiste grootboekrekening"
 msgid "Total Debit"
 msgstr "Totaal debet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Als u transacties aflettert, dan moet u ook alle handelingen verifiëren die "
-"gelinkt zijn aan deze transacties. Deze handelingen kunnen namelijk niet "
-"meer ongedaan worden gemaakt."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -120,7 +105,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -151,19 +135,19 @@ msgstr ""
 "deze te verwijderen."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -175,7 +159,7 @@ msgid "Warning!"
 msgstr "Waarschuwing!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Memoriaal"
@@ -261,11 +245,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Belasting sjablonen"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account-tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -281,6 +260,11 @@ msgstr "Boekingen dienen als invoer van het afletteren."
 msgid "Belgian Reports"
 msgstr "Belgische overzichten"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -431,11 +415,6 @@ msgstr "stelt u in staat kostenplaatsen te gebruiken"
 msgid "Salesperson"
 msgstr "Verkoper"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -497,6 +476,11 @@ msgstr ""
 "                    registreren, maar geen financiële administratie voeren "
 "(Rekeningschema, Journaalboekingen, ....)"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -512,6 +496,11 @@ msgstr "Periode:"
 msgid "Chart Template"
 msgstr "Grootboekschema sjabloon"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -685,15 +674,6 @@ msgstr "Aantal decimalen van journaalposten"
 msgid "3 Monthly"
 msgstr "3 maandelijks"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Als het afletteren van transacties ongedaan moet worden gemaakt, verifieer "
-"dan al de acties welke gelinkt zijn aan deze transacties."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -742,7 +722,7 @@ msgid "Profit Account"
 msgstr "Winst & Verlies rekeneing"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -754,13 +734,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Overzicht van de verkopen per rekeningsoort"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VKB"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "U kunt geen boeking doen met een andere valuta dan ..."
@@ -828,6 +808,11 @@ msgstr "Debiteuren"
 msgid "Configure your company bank accounts"
 msgstr "Bankrekeningen van het bedrijf instellen"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -852,6 +837,12 @@ msgstr "Open opnieuw"
 msgid "Are you sure you want to create entries?"
 msgstr "Weet u zeker dat u boekingen wilt maken?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -874,6 +865,7 @@ msgstr "Weergave kinderen met hiërarchie"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
 
@@ -916,7 +908,7 @@ msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -941,25 +933,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Leveranciers facturen en teruggaves"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "Boeking is reeds afgeletterd."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Maak afletteren ongedaan"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Op 14 dagen netto 2 procent, het resterende bedrag 30 dagen einde maand."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -992,11 +977,6 @@ msgstr "Dagboek code / Mutatienaam"
 msgid "Account Code and Name"
 msgstr "Naam en nummer grootboekrekening"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "aangemaakt"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1032,7 +1012,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1049,6 +1029,7 @@ msgstr "Nieuwe verdeelboeking"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Berekening"
 
@@ -1080,14 +1061,9 @@ msgid "Purchase journal"
 msgstr "Inkoopboek"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
-"U kunt deze journaalpost niet valideren omdat rekening \"%s\" niet tot het "
-"rekeningschema \"%s\" behoort."
 
 #. module: account
 #: view:validate.account.move:0
@@ -1122,7 +1098,7 @@ msgid "Liability"
 msgstr "Passiva"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Geef de volgorde weer bij het dagboek gerelateerd aan deze factuur."
@@ -1197,10 +1173,10 @@ msgid "Features"
 msgstr "Opties"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1291,11 +1267,10 @@ msgid "Refund "
 msgstr "Crediteer "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
-"Rekeninginformatie die afgedrukt wordt in de voettekst van ieder afgedrukt "
-"document"
 
 #. module: account
 #: view:account.tax:0
@@ -1340,7 +1315,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1638,9 +1613,9 @@ msgid "Account Receivable"
 msgstr "Debiteuren"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -1654,7 +1629,7 @@ msgid "With balance is not equal to 0"
 msgstr "Met saldo ongelijk aan 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1713,7 +1688,7 @@ msgstr "Sla 'Concept' status over voor handmatige boekingen"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Niet geïmplementeerd."
@@ -1758,6 +1733,12 @@ msgstr "Een tijdelijke tabel gebruikt voor de dashboard-weergave"
 msgid "Supplier Refunds"
 msgstr "Credit inkoopfacturen"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Code"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1795,7 +1776,6 @@ msgid "Groups"
 msgstr "Groepen"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Onbelast"
@@ -1928,6 +1908,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Verkopen per rekeningtype"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1948,115 +1934,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Een aantal regels zijns afgeltterd."
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2167,6 +2049,11 @@ msgstr "Deze perioden mogen overlappen."
 msgid "Draft statement"
 msgstr "Voorlopige overzicht"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2195,26 +2082,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2222,16 +2108,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2242,8 +2128,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2288,7 +2174,7 @@ msgid "period close"
 msgstr "Periode afsluiten"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2401,7 +2287,7 @@ msgid "Product Category"
 msgstr "Productcategorie"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2773,7 +2659,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Laat leeg voor alle open boekjaren"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2791,7 +2677,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Maak een rekening gebaseerd op dit sjabloon"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2812,7 +2698,7 @@ msgid "Main Sequence"
 msgstr "Hoofdreeks"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2822,14 +2708,12 @@ msgstr ""
 "item te annuleren."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Betalingsconditie"
 
@@ -2855,18 +2739,6 @@ msgstr "Vink dit vakje aan"
 msgid "Filters"
 msgstr "Filters"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Open"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2878,6 +2750,11 @@ msgstr "Concept status van een factuur"
 msgid "Account Properties"
 msgstr "Rekening instellingen"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2955,25 +2832,20 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "IKB"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Credit factuur aanmaken"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Inkoopbelastingen"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "boekingen"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankrekeningen"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2996,7 +2868,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3011,10 +2882,9 @@ msgstr ""
 "vervaldata berekenen, bijvoorbeeld 50% nu en 50% over een maand."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "Factuur is l afgeletterd."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3043,6 +2913,7 @@ msgstr "Afletteren journaalboeking (met afschrijven)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Belasting"
 
@@ -3078,14 +2949,14 @@ msgid "Accounts"
 msgstr "Grootboekrekeningen"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3185,6 +3056,12 @@ msgstr "Betaald/Afgeletterd"
 msgid "Refund Base Code"
 msgstr "Credit grondslag"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bankafschriften"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3237,11 +3114,6 @@ msgstr "Ouderdomsanalyse per relatie"
 msgid "Accounting entries"
 msgstr "Financiële boekingen"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Communicatietype"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3287,7 +3159,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3300,7 +3172,7 @@ msgid "Sales by Account"
 msgstr "Verkopen per grootboekrekening"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3316,15 +3188,15 @@ msgid "Sale journal"
 msgstr "Verkoopboek"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "U moet een een kostenplaatsdagboek definiëren bij het '%s' dagboek!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3332,7 +3204,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3397,9 +3269,10 @@ msgstr ""
 "nuttig zijn voor bepaalde rapportages."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Regel 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3447,12 +3320,6 @@ msgstr "Grondslag"
 msgid "Default Sale Tax"
 msgstr "Standaard belasting op verkopen"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factuur '%s' is gevalideerd."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3489,7 +3356,7 @@ msgid "Fiscal Position"
 msgstr "Fiscale positie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3518,7 +3385,7 @@ msgid "Trial Balance"
 msgstr "Proefbalans"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3589,7 +3456,7 @@ msgstr ""
 "Binnenkomende transacties gebruiken altijd de dagkoers."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3601,9 +3468,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Aantal cijfers voor gebruik in rekeningcode"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Regel naam"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3652,7 +3519,7 @@ msgid "View"
 msgstr "Aanzicht"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3673,15 +3540,20 @@ msgstr "Proforma facturen"
 msgid "Electronic File"
 msgstr "Digitaal bestand"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dag van de maand: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Belastingrubriek sjabloon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3689,10 +3561,89 @@ msgid "Account Partner Ledger"
 msgstr "Relatie grootboek/saldi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>aangemaakt</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -3827,12 +3778,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Waarde hoeveelheid: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Wanneer u een andere waarde voor Naam opgeeft dan /, dan krijgen de "
+"aangemaakte boekingen dezelfde waarde voor naam. Hierdoor zullen referenties "
+"makkelijker terug te vinden zijn."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3847,7 +3804,7 @@ msgid "Starting Balance"
 msgstr "Beginsaldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Geen relatie gedefinieerd!"
@@ -4051,7 +4008,7 @@ msgid "Period Length (days)"
 msgstr "Periode lengte (dagen)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4075,7 +4032,7 @@ msgid "Category of Product"
 msgstr "Productcategorie"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4213,7 +4170,7 @@ msgid "Chart of Accounts Template"
 msgstr "Template grootboekschema"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4303,9 +4260,15 @@ msgid "Qty"
 msgstr "Hoeveelheid"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Betwist"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"U kunt hier aangeven van de coëfficiënt die wordt gebruikt bij de "
+"consolidatie van het bedrag van dit geval naar de bovenliggende. Stel "
+"bijvoorbeeld 1/-1 in als u wilt toevoegen/aftrekken."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4389,11 +4352,6 @@ msgstr "Geen ongeconfigureerd bedrijf!"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "Betaald"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4411,11 +4369,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Bankrekeningen"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4462,8 +4415,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "U kunt een inactieve rekening niet gebruiken."
@@ -4493,7 +4446,7 @@ msgid "Consolidated Children"
 msgstr "Geconsolideerde dochters"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4531,11 +4484,6 @@ msgstr ""
 msgid "title"
 msgstr "titel"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Concept credit factuur aanmaken"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4625,6 +4573,13 @@ msgstr "30 Dagen einde van de maand"
 msgid "Analytic Balance"
 msgstr "Kostenplaatsbalans (kostenplaats-rekening)"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4646,6 +4601,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Geboekte journaalposten"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4656,11 +4616,6 @@ msgstr "Belasting-sjablonen zoeken"
 msgid "Draft Entries"
 msgstr "Conceptboekingen"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dag van de maand= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4669,11 +4624,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Aantal dagen: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4697,20 +4647,9 @@ msgid "Account Type"
 msgstr "Rekening categorie"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Sluit Cashregister"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4733,9 +4672,20 @@ msgstr ""
 "van kostenplaatsen. Deze genereren concept facturen van leveranciers"
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Sluit Cashregister"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4763,7 +4713,7 @@ msgid "Month"
 msgstr "Maand"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4774,8 +4724,8 @@ msgid "Supplier invoice sequence"
 msgstr "Inkoopfactuur nummer reeks"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4799,6 +4749,11 @@ msgstr "Paypal rekening"
 msgid "Acc.Type"
 msgstr "Rek. type"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4811,7 +4766,7 @@ msgstr "Balans +/- teken omdraaien"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balans (Passiva rekening)"
@@ -4833,7 +4788,7 @@ msgid "Account Base Code"
 msgstr "Grondslag"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4890,11 +4845,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr "Laatste aflettering"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodieke verwerking"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4924,10 +4874,9 @@ msgid "Account chart"
 msgstr "Rekeningstelsel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Inkoopfactuur"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4995,10 +4944,14 @@ msgstr "Creditfacturen"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -5051,7 +5004,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5066,7 +5019,7 @@ msgid "Based On"
 msgstr "Gebaseerd op"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "CIKB"
@@ -5091,11 +5044,6 @@ msgstr "Onderliggende/sub belastingen"
 msgid "Change"
 msgstr "Verander"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank en cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5118,11 +5066,6 @@ msgstr "Beschrijf wat de reden is waarom u geld uit de kassa haalt:"
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Voorbeeld"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5133,11 +5076,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr "Maateenheid definitie"
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Laat leeg om de omzetrekening te gebruiken"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5147,7 +5085,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Inkoop belastigen %.2f%%"
@@ -5221,16 +5159,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "MEM"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Factuur (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5344,6 +5277,7 @@ msgstr "Toevoegen"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Betaald"
 
@@ -5370,7 +5304,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Openingsperiode"
@@ -5385,14 +5319,6 @@ msgstr "Journaalposten te beoordelen"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5405,7 +5331,7 @@ msgid "Tax Application"
 msgstr "Belastingstoepassing"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5438,9 +5364,9 @@ msgid "End of period"
 msgstr "Einde van periode"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankrekeningen"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Betaling van facturen"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5535,14 +5461,6 @@ msgstr "Belasting Omschrijving"
 msgid "Child Tax Accounts"
 msgstr "Onderliggende belastingrekeningen"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5589,7 +5507,7 @@ msgid "Target Moves"
 msgstr "Doelrekening"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5625,6 +5543,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5642,12 +5561,6 @@ msgstr ""
 "belastingen te kiezen. Bij de laatste keuze wordt ervan uitgegaan dat de set "
 "van de belasting gedefinieerd op dit sjabloon is voltooid"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>betaald</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5673,18 +5586,13 @@ msgstr "Jaar"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Lijn 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interne naam"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5723,7 +5631,7 @@ msgstr "Balans"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Winst & verlies (Omzetrekening)"
@@ -5756,7 +5664,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Bereken code (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5783,6 +5691,7 @@ msgstr "Automatisch afletteren"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5889,7 +5798,7 @@ msgid "Recompute taxes and total"
 msgstr "BeLasti gen en totalen opnieuw berekenen"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5920,7 +5829,7 @@ msgid "Amount Computation"
 msgstr "Bedrag berekening"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5956,10 +5865,16 @@ msgid "Account Common Account Report"
 msgstr "Algemeen grootboekrekening rapport"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Communicatie"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Open"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5989,9 +5904,7 @@ msgstr "Belastingcodes"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Credit verkoopfactuur"
 
@@ -6008,11 +5921,6 @@ msgstr "Belastingrubriek teken (+/-)"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Overzicht van facturen gemaakt binnen de laatste 15 dagen"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Aantal dagen: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6029,6 +5937,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Vul dit formulier in als u geld in de kassa stopt."
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Te betalen bedrag"
@@ -6119,8 +6028,6 @@ msgstr "Afronden per regel"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6143,6 +6050,13 @@ msgstr "Normale tekst"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Betalingen vormen de tweede invoer voor het afletteren."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6153,15 +6067,6 @@ msgstr ""
 "bedrag te vinden, kan worden gekozen als kracht van het automatische "
 "afletter proces."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Het volgorde vel wordt gebruikt om de regels van de betalingscondities te "
-"ordenen."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6219,12 +6124,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Vast Bedrag"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6248,7 +6152,6 @@ msgstr "Genereer openingbalans"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Berekeningsmethode voor het belastingbedrag."
 
@@ -6276,18 +6179,23 @@ msgid "Child Accounts"
 msgstr "Subrekeningen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Mutatienaam (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Boek af"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "boekingen"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6304,7 +6212,7 @@ msgstr "Opbrengst"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@@ -6324,16 +6232,11 @@ msgid "Account n°"
 msgstr "Rekening n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Vrije referentie"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Soort"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6449,7 +6352,7 @@ msgid "Filter by"
 msgstr "Filter op"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "U heeft een ongeldinge expressie \"%(...)s\" in uw model!"
@@ -6496,6 +6399,16 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Aantal Dagen"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"U kunt deze journaalpost niet valideren omdat rekening \"%s\" niet tot het "
+"rekeningschema \"%s\" behoort."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6639,7 +6552,7 @@ msgid "Models"
 msgstr "Modellen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6818,7 +6731,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6850,12 +6763,6 @@ msgstr "Aangepast"
 msgid "Current"
 msgstr "Huidig"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6880,7 +6787,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentage"
 
@@ -6900,7 +6806,7 @@ msgid "Power"
 msgstr "Kracht"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Het is niet mogelijk een ongebruikte rekeningcode te genereren"
@@ -6947,12 +6853,17 @@ msgid "Applicable Type"
 msgstr "Van toepassing zijnde type"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Factuurreferentie"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6971,12 +6882,12 @@ msgstr ""
 "belastingen. In dat geval bepaalt het de volgorde van berekeningen."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7050,7 +6961,7 @@ msgid "Optional create"
 msgstr "Optioneel aanmaken"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7063,9 +6974,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Credit inkoopfactuur"
 
@@ -7103,9 +7012,12 @@ msgid "Group By..."
 msgstr "Groepeer op..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Waardering: Balans"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7183,6 +7095,13 @@ msgstr "BTW naam moet uniek zijn per bedrijf!"
 msgid "Cash Transactions"
 msgstr "Kas transacties"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7200,7 +7119,7 @@ msgstr "Kostenplaats boekingen analyses"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Boekingen: "
@@ -7218,14 +7137,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Klant factuur"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Waar"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balans (Activa rekening)"
@@ -7241,10 +7159,9 @@ msgid "Total debit"
 msgstr "Totaal debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Invoer \"%s\" is ongeldig !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Volgende relatieboekingen om af te letteren"
 
 #. module: account
 #: report:account.invoice:0
@@ -7298,7 +7215,7 @@ msgstr "Maak boeking"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Winst & verlies (Kosten rekening)"
@@ -7309,13 +7226,14 @@ msgid "Total Transactions"
 msgstr "Totaal aantal teansacties"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Fout !"
@@ -7352,6 +7270,11 @@ msgstr "Project regel"
 msgid "Manual"
 msgstr "Handmatig"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7458,8 +7381,8 @@ msgstr "Selecteer dagboek"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Openingsbalans"
@@ -7541,7 +7464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7562,6 +7485,11 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7615,7 +7543,7 @@ msgid "Done"
 msgstr "Verwerkt"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7654,10 +7582,11 @@ msgid "Source Document"
 msgstr "Bron document"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
+"Rekeninginformatie die afgedrukt wordt in de voettekst van ieder afgedrukt "
+"document"
 
 #. module: account
 #: constraint:account.account:0
@@ -7683,7 +7612,7 @@ msgid "Taxes:"
 msgstr "Belasting:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7882,6 +7811,12 @@ msgstr ""
 "ontwikkelaars in staat stelt om specifieke belastingen in een aangepast "
 "domein aan te maken."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Factuurreferentie"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7974,7 +7909,7 @@ msgid "Use model"
 msgstr "Gebruik model"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8025,7 +7960,7 @@ msgid "Root/View"
 msgstr "Basis/Weergave"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEN"
@@ -8094,7 +8029,7 @@ msgid "Maturity Date"
 msgstr "Vervaldatum"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Verkoopboek"
@@ -8105,7 +8040,7 @@ msgid "Invoice Tax"
 msgstr "Invoice Tax"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Geen onderdeelnummer !"
@@ -8150,7 +8085,7 @@ msgid "Sales Properties"
 msgstr "Verkoop instellingen"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8175,7 +8110,7 @@ msgstr "Aan"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Valuta aaanpassing"
@@ -8209,7 +8144,7 @@ msgid "May"
 msgstr "Mei"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8229,10 +8164,9 @@ msgid ""
 msgstr "Het volgorde veld wordt gebruikt om te sorteren van laag naar hoog."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8248,17 +8182,12 @@ msgstr "Credit factuur reeks"
 msgid "Post Journal Entries"
 msgstr "Journaalposten boeken"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr "Centrale tegenrekening"
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Klant"
@@ -8274,7 +8203,7 @@ msgstr "Rapportnaam"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Kas"
@@ -8286,9 +8215,11 @@ msgid "Account Destination"
 msgstr "Bestemming"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Betaling van facturen"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8296,7 +8227,6 @@ msgstr "Betaling van facturen"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8435,15 +8365,14 @@ msgid "Partner Ledger"
 msgstr "Saldilijst per relatie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>geannuleerd</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Vastgezet"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing!"
@@ -8511,7 +8440,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "selectere een valuta. welke wordt toegepast op de factuur"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Geen factuurregels!"
@@ -8593,7 +8522,7 @@ msgid "Associated Partner"
 msgstr "Gekoppelde relatie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Selecteer eerst een relatie"
@@ -8675,13 +8604,13 @@ msgstr ""
 "toegevoegd in de berekening van de volgende belastingen."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Credit inkoopboek"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8754,7 +8683,7 @@ msgid "Net Total:"
 msgstr "Netto totaal"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8774,15 +8703,6 @@ msgstr "Algemene rapporten"
 msgid "Write-Off Journal"
 msgstr "Afboekingsdagboek"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Deze betalingsvoorwaarde zal worden gebruikt in plaats van de standaard- "
-"voor de huidige relatie"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8809,11 +8729,6 @@ msgstr "Int.Type"
 msgid "Tax/Base Amount"
 msgstr "Belasting grondslag"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Waardering: Percentage"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8867,6 +8782,11 @@ msgstr "Afletterresultaat"
 msgid "Ending Balance"
 msgstr "Eindsaldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8909,7 +8829,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatische import van bankafschriften"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Onbekende fout!"
@@ -8932,7 +8852,12 @@ msgid "Account Types"
 msgstr "Grootboekrekeningen categorieën"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8940,9 +8865,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  waarde hoeveelheid: n/b"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "W&V / BS Categorie"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8959,10 +8884,9 @@ msgid "Reconciliation"
 msgstr "Aflettering"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Debiteurenkaart"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Laat leeg om de omzetrekening te gebruiken"
 
 #. module: account
 #: view:account.invoice:0
@@ -9041,7 +8965,7 @@ msgid "The partner account used for this invoice."
 msgstr "De gebruikte relatie voor deze factuur"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Belasting %.2f%%"
@@ -9059,13 +8983,13 @@ msgid "Payment Term Line"
 msgstr "Betalingsconditie regel"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Inkoopboek"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotaal"
 
@@ -9094,11 +9018,6 @@ msgstr "Vervaldatum"
 msgid "Suppliers"
 msgstr "Leveranciers"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Waar"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9235,9 +9154,10 @@ msgid "Journal Name"
 msgstr "Naam dagboek"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Volgende relatieboekingen om af te letteren"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Invoer \"%s\" is ongeldig !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9286,7 +9206,7 @@ msgstr ""
 "valuta boeking is."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9348,7 +9268,7 @@ msgid "Reconciled entries"
 msgstr "Afgeletterde boekingen"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Verkeerde model!"
@@ -9370,7 +9290,7 @@ msgid "Print Account Partner Balance"
 msgstr "Afdrukken relatie rekeningen balans"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9410,7 +9330,7 @@ msgstr "onbekend"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Openingsbalans"
@@ -9457,7 +9377,7 @@ msgstr ""
 "van de onderliggende belastingen in plaats van op het totaalbedrag."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9472,21 +9392,9 @@ msgstr "Gegeven door Python code"
 msgid "Journal Code"
 msgstr "Dagboek code"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"U kunt hier aangeven van de coëfficiënt die wordt gebruikt bij de "
-"consolidatie van het bedrag van dit geval naar de bovenliggende. Stel "
-"bijvoorbeeld 1/-1 in als u wilt toevoegen/aftrekken."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Restbedrag"
 
@@ -9519,7 +9427,7 @@ msgid "Unit of Currency"
 msgstr "Valuta eenheid"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Credit verkoopboek"
@@ -9585,7 +9493,7 @@ msgid "Purchase Tax(%)"
 msgstr "Inkoop belastingen (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Maak factuurregels aan."
@@ -9604,7 +9512,7 @@ msgid "Display Detail"
 msgstr "Details weergeven"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "CVKB"
@@ -9722,21 +9630,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Aantal periodes"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Belastingrubriek sjabloon"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Rekeningoverzicht klant"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "W&V / BS Categorie"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9748,9 +9646,10 @@ msgid "Supplier credit note sequence"
 msgstr "Inkoopfactuur nummer reeks"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr ""
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "Factuur is l afgeletterd."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9769,14 +9668,14 @@ msgid "Document"
 msgstr "Document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bankafschriften"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Debiteurenkaart"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9877,8 +9776,8 @@ msgid "Move"
 msgstr "Mutatie"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9957,11 +9856,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Verzonden"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Niet-afgeletterde transacties"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9979,11 +9873,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10020,13 +9919,6 @@ msgstr "Verdeling"
 msgid "Account Analytic Balance"
 msgstr "Kostenplaatsbalans (kostenplaats-rekening)"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10066,7 +9958,13 @@ msgid "Due date"
 msgstr "Vervaldatum"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10163,7 +10061,7 @@ msgid "Unreconciled"
 msgstr "Onafgeletterd"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Fout totaal !"
@@ -10253,7 +10151,7 @@ msgid "Comparison"
 msgstr "Vergelijking"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10271,6 +10169,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10327,11 +10230,6 @@ msgstr "Credit"
 msgid "Draft Invoice "
 msgstr "Concept factuur "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10343,7 +10241,7 @@ msgid "Journal Entry Model"
 msgstr "Journaalpost model"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "Start periode dient voor de eindproduct te liggen"
@@ -10428,7 +10326,7 @@ msgid "Profit (Loss) to report"
 msgstr "Winst (verlies) te rapporteren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10757,7 +10655,14 @@ msgid "Empty Accounts ? "
 msgstr "Lege rekeningen? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Niet ongeluk om belasting te wijzigen"
@@ -10882,7 +10787,7 @@ msgid "Receivable accounts"
 msgstr "Debiteuren"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Al afgeletterd"
@@ -11016,7 +10921,7 @@ msgid "Entries Sorted by"
 msgstr "Boekingen gesorteerd op"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11123,7 +11028,7 @@ msgid "Accounting Documents"
 msgstr "Boekstukken"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11168,7 +11073,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Handmatige Factuur Belasting"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11249,17 +11154,6 @@ msgstr "Verlies"
 msgid "February"
 msgstr "Februari"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Wanneer u een andere waarde voor Naam opgeeft dan /, dan krijgen de "
-"aangemaakte boekingen dezelfde waarde voor naam. Hierdoor zullen referenties "
-"makkelijker terug te vinden zijn."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11318,6 +11212,11 @@ msgstr "Sjabloon fiscale toewijzing grootboekrekening"
 msgid "Expense Account on Product Template"
 msgstr "Kostenrekening op product sjabloon"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11436,9 +11335,6 @@ msgstr ""
 #~ "verplicht of alleen lezen moeten zijn en in welke volgorde. U kunt uw eigen "
 #~ "weergave aanmaken voor een snellere codering in elk dagboek."
 
-#~ msgid "Fixed"
-#~ msgstr "Vastgezet"
-
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Een definitieve boeking kan niet worden verwijderd; \"%s\"!"
@@ -11486,12 +11382,19 @@ msgstr ""
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Kostenplaatsstatistieken"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Inkoopfactuur"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Letter betaling af"
 
 #~ msgid "Line"
 #~ msgstr "Regel"
 
+#~ msgid "account.tax"
+#~ msgstr "account-tax"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Bank dagboek "
@@ -11622,6 +11525,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Vouchernr"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Het volgorde vel wordt gebruikt om de regels van de betalingscondities te "
+#~ "ordenen."
+
 #~ msgid "Total write-off"
 #~ msgstr "Totaal afgeboekt"
 
@@ -11663,6 +11573,13 @@ msgstr ""
 #~ "Bevestigde boekingen kunnen niet worden aangepast! Er kunnen slechts enkele "
 #~ "niet-belangrijke velden worden aangepast."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Als het afletteren van transacties ongedaan moet worden gemaakt, verifieer "
+#~ "dan al de acties welke gelinkt zijn aan deze transacties."
+
 #~ msgid "Customer Credit"
 #~ msgstr "Openstaand saldo verkopen"
 
@@ -11897,6 +11814,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Gebruik deze code voor de BTW-aangifte"
 
+#~ msgid "Litigation"
+#~ msgstr "Betwist"
+
 #, python-format
 #~ msgid "Already Reconciled"
 #~ msgstr "Reeds afgeletterd"
@@ -12515,6 +12435,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Direct definitief"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field allow you to choose the accounting journals you want for "
 #~ "filtering the invoices. If you left this field empty, it will search on all "
@@ -12871,6 +12794,13 @@ msgstr ""
 #~ msgid "Invoice Sequence"
 #~ msgstr "Factuurnummering"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Deze betalingsvoorwaarde zal worden gebruikt in plaats van de standaard- "
+#~ "voor de huidige relatie"
+
 #, python-format
 #~ msgid "Data Insufficient !"
 #~ msgstr "Onvoldoende gegevens !"
@@ -13338,6 +13268,17 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Fout ! U kunt geen recursieve categorieën maken."
 
+#~ msgid "Line 2:"
+#~ msgstr "Regel 2:"
+
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Als u transacties aflettert, dan moet u ook alle handelingen verifiëren die "
+#~ "gelinkt zijn aan deze transacties. Deze handelingen kunnen namelijk niet "
+#~ "meer ongedaan worden gemaakt."
+
 #~ msgid ""
 #~ "This field contains the informatin related to the numbering of the journal "
 #~ "entries of this journal."
@@ -13629,6 +13570,9 @@ msgstr ""
 #~ msgid "Closing balance based on cashBox"
 #~ msgstr "Eindbalans gebaseerd op cashregister"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank en cheques"
+
 #~ msgid "Salesman"
 #~ msgstr "Verkoper"
 
@@ -13647,6 +13591,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Open cashregister"
 
+#~ msgid "Line 1:"
+#~ msgstr "Lijn 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Journaalpost \"%s\" is niet geldig"
@@ -13655,6 +13602,9 @@ msgstr ""
 #~ "This report gives you an overview of the situation of your general journals"
 #~ msgstr "Dit rapport geeft een overzicht van de algemene boekhouding"
 
+#~ msgid "Communication"
+#~ msgstr "Communicatie"
+
 #~ msgid "Transaction"
 #~ msgstr "Transactie"
 
@@ -13742,18 +13692,31 @@ msgstr ""
 #~ msgid "I can not locate a parent code for the template account!"
 #~ msgstr "Ik kan een ouder code voor de sjabloon account niet vinden!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Op 14 dagen netto 2 procent, het resterende bedrag 30 dagen einde maand."
+
 #~ msgid "All Months Sales by type"
 #~ msgstr "Alle maandverkopen op type"
 
 #~ msgid "You can not create move line on view account."
 #~ msgstr "U kunt geen boekingsregel creëren op een zichtrekening"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dag van de maand: 0"
+
 #~ msgid "Month-1"
 #~ msgstr "Maand-1"
 
 #~ msgid "Quantity :"
 #~ msgstr "Hoeveelheid:"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Aantal dagen: 30"
+
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dag van de maand= -1"
+
 #~ msgid "Bank Account Owner"
 #~ msgstr "Rekeninghouder"
 
@@ -13761,13 +13724,23 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Coderingsfout"
 
+#~ msgid "Example"
+#~ msgstr "Voorbeeld"
+
 #~ msgid "My invoices"
 #~ msgstr "Mijn rekeningen"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Aantal dagen: 14"
+
 #, python-format
 #~ msgid "New currency is not configured properly !"
 #~ msgstr "De nieuwe valuta is niet correct geconfigureerd !"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factuur '%s' is gevalideerd."
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Foutmelding! De startdatum van het fiscale jaar moet vroeger zijn dan z'n "
@@ -13783,14 +13756,17 @@ msgstr ""
 #~ msgid "VAT Declaration"
 #~ msgstr "BTW declaratie"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Waarde hoeveelheid: 0.02"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Verkopen van deze maand per"
 
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "De valutacode moet uniek zijn per bedrijf!"
 
-#~ msgid "This action will erase taxes"
-#~ msgstr "Dit zal de belastingen wissen"
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Factuur (Ref ${object.number or 'n/a' })"
 
 #~ msgid "Valid Up to"
 #~ msgstr "Geldig t/m"
@@ -13859,6 +13835,9 @@ msgstr ""
 #~ "Geen periode gedefinieerd voor deze datum: %s!\n"
 #~ "Maak er een aan."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  waarde hoeveelheid: n/b"
+
 #~ msgid "current month"
 #~ msgstr "huidige maand"
 
@@ -13884,11 +13863,6 @@ msgstr ""
 #~ msgid "Description On Invoices"
 #~ msgstr "Omschrijving op facturen"
 
-#~ msgid "You can not create analytic line on view account."
-#~ msgstr ""
-#~ "Het is niet mogelijk een kostenplaats te maken op een rekening van het type "
-#~ "'aanzicht'"
-
 #~ msgid "You can not create journal items on an account of type view."
 #~ msgstr ""
 #~ "Het is niet mogelijk om journaal boekingen te doen op een rekening van het "
@@ -14055,6 +14029,9 @@ msgstr ""
 #~ msgid "Post Journal Entries of a Journal"
 #~ msgstr "Boek de journaalposten van een dagboek"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Waardering: Percentage"
+
 #, python-format
 #~ msgid ""
 #~ "You can not cancel an invoice which is partially paid! You need to "
@@ -14277,6 +14254,9 @@ msgstr ""
 #~ msgid "You can not use an inactive account!"
 #~ msgstr "Een niet-actieve grootboekrekening kan niet worden gebruikt!"
 
+#~ msgid "Line Name"
+#~ msgstr "Regel naam"
+
 #~ msgid "Supplier Accounting Properties"
 #~ msgstr "Boekhoudkundige instellingen leverancier"
 
@@ -14405,6 +14385,9 @@ msgstr ""
 #~ "Het is niet mogelijk om een rekening te deactiveren als er al journaalposten "
 #~ "aanwezig zijn."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Waardering: Balans"
+
 #, python-format
 #~ msgid "You should have chosen periods that belongs to the same company"
 #~ msgstr "U moet periodes kiezen welke behoren tot hetzelfde bedrijf"
@@ -14473,6 +14456,9 @@ msgstr ""
 #~ msgid "Tax Declaration: Credit Notes"
 #~ msgstr "Belastingaangifte: Credit facturen"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodieke verwerking"
+
 #~ msgid "Invoicing Data"
 #~ msgstr "Facturatie gegevens"
 
@@ -15199,6 +15185,9 @@ msgstr ""
 #~ msgid "New Company Financial Setting"
 #~ msgstr "Nieuwe financiële administratie configureren voor dit bedrijf"
 
+#~ msgid "Valuation"
+#~ msgstr "Soort"
+
 #, python-format
 #~ msgid "The payment term of supplier does not have a payment term line!"
 #~ msgstr ""
@@ -15299,3 +15288,11 @@ msgstr ""
 
 #~ msgid "Reference UoM"
 #~ msgstr "Referentie maateenheid"
+
+#~ msgid "You can not create analytic line on view account."
+#~ msgstr ""
+#~ "Het is niet mogelijk een kostenplaats boekingen te maken op een kostenplaats "
+#~ "van het type 'aanzicht'"
+
+#~ msgid "This action will erase taxes"
+#~ msgstr "Hiermee berekend u de belastingen opnieuw uit."
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 4daebc9fb17..976a24c4d48 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 18:03+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: nl\n"
 
@@ -30,11 +30,6 @@ msgstr ""
 "Een fiscale positie voor rekening kan maar een keer voor dezelfde rekeningen "
 "worden ingesteld."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Afpuntingen ongedaan maken"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -83,9 +78,9 @@ msgid "Import from invoice or payment"
 msgstr "Importeren van factuur of betaling"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Verkeerde rekening"
@@ -96,15 +91,6 @@ msgstr "Verkeerde rekening"
 msgid "Total Debit"
 msgstr "Totaal debet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
-"nakijken, want deze worden niet ongedaan gemaakt."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -115,7 +101,6 @@ msgstr "U kunt niet dezelfde rekeningsjablonen maken."
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -146,19 +131,19 @@ msgstr ""
 "zonder dat u deze verwijdert."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -170,7 +155,7 @@ msgid "Warning!"
 msgstr "Waarschuwing!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diversendagboek"
@@ -256,11 +241,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Btw-sjablonen"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -276,6 +256,11 @@ msgstr "Boekingen dienen als invoer voor het afpunten."
 msgid "Belgian Reports"
 msgstr "Belgische rapporten"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -425,11 +410,6 @@ msgstr "Hiermee kunt u analytisch boeken."
 msgid "Salesperson"
 msgstr "Verkoper"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -491,6 +471,11 @@ msgstr ""
 "                maar geen effectieve boekhouding voeren (boekingen, "
 "boekhoudplan, ...)"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -506,6 +491,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Boekhoudplansjabloon"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -675,15 +665,6 @@ msgstr "Decimale precisie voor boekingen"
 msgid "3 Monthly"
 msgstr "3-maandelijks"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
-"nakijken, want deze worden niet ongedaan gemaakt."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -732,7 +713,7 @@ msgid "Profit Account"
 msgstr "Opbrengstenrekening"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -744,13 +725,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Verkopen per rekeningtype"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "VK"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Kan geen boeking maken met een munt verschillend van .."
@@ -820,6 +801,11 @@ msgstr "Klanten"
 msgid "Configure your company bank accounts"
 msgstr "Stel de bankrekeningen van uw bedrijf in"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -844,6 +830,12 @@ msgstr "Heropenen"
 msgid "Are you sure you want to create entries?"
 msgstr "Bent u zeker dat u de boeking wilt uitvoeren?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -866,6 +858,7 @@ msgstr "Onderliggende records met hiërarchie tonen"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
 
@@ -908,7 +901,7 @@ msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -933,25 +926,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Aankoopfacturen en -creditnota's"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "De boeking is al afgepunt."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Afpunten ongedaan maken"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Twee procent netto binnen 14 dagen, restbedrag binnen 30 dagen einde maand."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -982,11 +968,6 @@ msgstr "J.C. / Naam beweging"
 msgid "Account Code and Name"
 msgstr "Rekeningcode en -naam"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "gemaakt"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1022,7 +1003,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1037,6 +1018,7 @@ msgstr "Nieuw abonnement"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Berekening"
 
@@ -1068,14 +1050,9 @@ msgid "Purchase journal"
 msgstr "Aankoopjournaal"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
-"U kunt deze boeking niet valideren omdat \"%s\" niet tot het boekhoudplan "
-"\"%s\" behoort."
 
 #. module: account
 #: view:validate.account.move:0
@@ -1111,7 +1088,7 @@ msgid "Liability"
 msgstr "Passiva"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Stel een reeks in voor het journaal van deze factuur."
@@ -1185,10 +1162,10 @@ msgid "Features"
 msgstr "Mogelijkheden"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1279,9 +1256,11 @@ msgid "Refund "
 msgstr "Creditnota "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "Bankrekeningen afgedrukt in de voettekst van elk gedrukt document."
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: account
 #: view:account.tax:0
@@ -1339,7 +1318,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1640,9 +1619,9 @@ msgid "Account Receivable"
 msgstr "Te ontvangen"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -1656,7 +1635,7 @@ msgid "With balance is not equal to 0"
 msgstr "Met saldo verschillend van 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1715,7 +1694,7 @@ msgstr "Status 'Voorlopig' overslaan voor manuele boekingen"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Niet geïmplementeerd."
@@ -1760,6 +1739,12 @@ msgstr "Een tijdelijke tabel gebruikt voor de dashboardweergave"
 msgid "Supplier Refunds"
 msgstr "Aankoopcreditnota's"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Vak"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1797,7 +1782,6 @@ msgid "Groups"
 msgstr "Groepen"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Onbelast"
@@ -1951,6 +1935,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Verkopen per rekeningtype"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1973,215 +1963,11 @@ msgstr ""
 "optie Status 'Voorlopig' overslaan mag niet zijn ingeschakeld."
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Bepaalde boekingen zijn al afgepunt."
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hallo${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>Er is een nieuwe factuur voor u: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENTIES</strong><br />\n"
-"       &nbsp;&nbsp;Factuurnummer: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Factuurtotaal: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Factuurdatum: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Orderreferentie: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Uw contactpersoon: <a "
-"href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Factuur%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>U kunt ook rechtstreeks betalen via Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>Neem gerust contact met ons op als u vragen heeft.</p>\n"
-"    <p>Bedankt dat u kiest voor ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Tel.:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2294,6 +2080,11 @@ msgstr "Deze perioden mogen overlappen."
 msgid "Draft statement"
 msgstr "Voorlopig rekeninguittreksel"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2328,26 +2119,25 @@ msgstr ""
 "moet betalen aan het begin en einde van een maand of kwartaal."
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2355,16 +2145,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2375,8 +2165,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2431,7 +2221,7 @@ msgid "period close"
 msgstr "periode sluiten"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2545,7 +2335,7 @@ msgid "Product Category"
 msgstr "Productcategorie"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2921,7 +2711,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Leeg laten voor alle geopende boekjaren"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2939,7 +2729,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Maak een rekening op basis van deze sjabloon"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2965,7 +2755,7 @@ msgid "Main Sequence"
 msgstr "Hoofdvolgorde"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2975,14 +2765,12 @@ msgstr ""
 "boekingslijnen verwijderen."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Betalingstermijn"
 
@@ -3008,18 +2796,6 @@ msgstr "Schakel dit vakje in"
 msgid "Filters"
 msgstr "Filters"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Open"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -3031,6 +2807,11 @@ msgstr "Voorlopige status van factuur"
 msgid "Account Properties"
 msgstr "Rekeningeigenschappen"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -3108,25 +2889,20 @@ msgid "Account Model Entries"
 msgstr "Rekeningmodelboekingen"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "AK"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Creditnota maken"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Leveranciersbtw"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "Boekingen"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankdetails"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -3163,7 +2939,6 @@ msgstr ""
 "            "
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3178,10 +2953,9 @@ msgstr ""
 "binnen een maand."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "De factuur is al afgepunt"
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Volgende aankoopfactuurnummer"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3210,6 +2984,7 @@ msgstr "Afpunten boekingslijnen (afschrijving)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Btw"
 
@@ -3245,14 +3020,14 @@ msgid "Accounts"
 msgstr "Rekeningen"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3349,6 +3124,12 @@ msgstr "Betaald/afgepunt"
 msgid "Refund Base Code"
 msgstr "Basisvak creditnota"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Rekeninguittreksels"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3416,11 +3197,6 @@ msgstr "Ageingbalans relaties"
 msgid "Accounting entries"
 msgstr "Boekingen"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Communicatietype"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3468,7 +3244,7 @@ msgstr ""
 "niet Voorlopig of Pro forma is."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "U moet perioden van dezelfde firma kiezen."
@@ -3481,7 +3257,7 @@ msgid "Sales by Account"
 msgstr "Verkopen per rekening"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "U kunt de bevestigde boeking \"%s\" niet verwijderen."
@@ -3497,15 +3273,15 @@ msgid "Sale journal"
 msgstr "Verkoopjournaal"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "U moet een analytisch journaal instellen voor journaal '%s'."
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3513,7 +3289,7 @@ msgid ""
 msgstr "Dit journaal bevat al boekingen. U kunt de firma dus niet wijzigen."
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3580,9 +3356,10 @@ msgstr ""
 "rapportering."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Lijn 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3630,12 +3407,6 @@ msgstr "Basisbedrag"
 msgid "Default Sale Tax"
 msgstr "Standaard verkoop-btw"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factuur '%s' is goedgekeurd."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3672,7 +3443,7 @@ msgid "Fiscal Position"
 msgstr "Fiscale positie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3701,7 +3472,7 @@ msgid "Trial Balance"
 msgstr "Proef– en saldibalans"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr "Kan het beginsaldo niet aanpassen (negatief)"
@@ -3772,7 +3543,7 @@ msgstr ""
 "transacties gebeuren altijd volgens de dagkoers."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "Er is geen hoofdcode voor de sjabloonrekening."
@@ -3784,9 +3555,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Aantal cijfers voor de rekeningcode"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Lijnnaam"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3837,7 +3608,7 @@ msgid "View"
 msgstr "Weergave"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3858,15 +3629,20 @@ msgstr "Proformafacturen"
 msgid "Electronic File"
 msgstr "Elektronisch bestand"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "De firma heeft een boekhoudplan"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dag van de maand: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Sjablonen btw-codes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3874,10 +3650,89 @@ msgid "Account Partner Ledger"
 msgstr "Relatiehistoriek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>gemaakt</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -4013,12 +3868,18 @@ msgid "Account Tax Declaration"
 msgstr "Btw-aangifte"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Waarde bedrag: 0,02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Als u een andere Naam invult dan /, krijgt de boeking dezelfde naam als het "
+"uittreksel. Hiermee krijgen de uittrekselboekingen dezelfde referentie als "
+"het uittreksel zelf."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -4036,7 +3897,7 @@ msgid "Starting Balance"
 msgstr "Beginbalans"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Geen relatie gedefinieerd"
@@ -4267,7 +4128,7 @@ msgid "Period Length (days)"
 msgstr "Lengte periode (dagen)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4294,7 +4155,7 @@ msgid "Category of Product"
 msgstr "Productcategorie"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4433,7 +4294,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sjablonen boekhoudplan"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4525,9 +4386,15 @@ msgid "Qty"
 msgstr "Hvh"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Betwist"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"U kunt hier de coëfficiënt opgeven die wordt gebruikt om het bedrag in dit "
+"vak te consolideren in het hoofdvak. Stel dit bijvoorbeeld in op 1/-1 om op "
+"te tellen/af te trekken."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4610,11 +4477,6 @@ msgstr "Alle firma's zijn ingesteld."
 msgid "Expects a Chart of Accounts"
 msgstr "Er is een boekhoudplan nodig."
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "Betaald"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4632,12 +4494,6 @@ msgstr "Het journaal moet een standaard debet– en creditrekening hebben."
 msgid "Setup your Bank Accounts"
 msgstr "Uw bankrekeningen instellen"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-"Wijzigen: factuur crediteren, afpunten en een nieuwe conceptfactuur maken"
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4685,8 +4541,8 @@ msgstr ""
 "afdrukken op facturen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Een niet-actieve rekening kan niet worden gebruikt."
@@ -4716,7 +4572,7 @@ msgid "Consolidated Children"
 msgstr "Afhankelijke consolidatierekeningen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4753,11 +4609,6 @@ msgstr ""
 msgid "title"
 msgstr "titel"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Een voorlopige creditnota maken"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4847,6 +4698,13 @@ msgstr "30 dagen einde maand"
 msgid "Analytic Balance"
 msgstr "Analytische balans"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4870,6 +4728,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Geboekte lijnen"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4880,11 +4743,6 @@ msgstr "Zoeken in de btw-sjablonen"
 msgid "Draft Entries"
 msgstr "Voorlopige boekingen"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dag van de maand= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4895,11 +4753,6 @@ msgstr ""
 "Een decimale precisie van 2 laat bijvoorbeeld boekingen toe in de vorm 9,99 "
 "EUR. Met een decimale precisie van 4 boekt u 0,0231 EUR."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Aantal dagen: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4922,6 +4775,31 @@ msgstr "Snelkoppeling"
 msgid "Account Type"
 msgstr "Rekeningtype"
 
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Kas sluiten"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "De geselecteerde facturen annuleren"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:423
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "U moet een analytisch dagboek toekennen aan het '%s' journaal."
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Analytische kosten (uurroosters, aankopen, ...) komen van analytische "
+"rekeningen. Hiermee worden voorlopige aankoopfacturen gemaakt."
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
 msgid ""
@@ -4950,31 +4828,6 @@ msgstr ""
 "          </p>\n"
 "        "
 
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr "De geselecteerde facturen annuleren"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:423
-#, python-format
-msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr "U moet een analytisch dagboek toekennen aan het '%s' journaal."
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid ""
-"Analytic costs (timesheets, some purchased products, ...) come from analytic "
-"accounts. These generate draft supplier invoices."
-msgstr ""
-"Analytische kosten (uurroosters, aankopen, ...) komen van analytische "
-"rekeningen. Hiermee worden voorlopige aankoopfacturen gemaakt."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Kas sluiten"
-
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid ""
@@ -5001,7 +4854,7 @@ msgid "Month"
 msgstr "Maand"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -5012,8 +4865,8 @@ msgid "Supplier invoice sequence"
 msgstr "Nummering aankoopfacturen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -5039,6 +4892,11 @@ msgstr "Paypal-rekening"
 msgid "Acc.Type"
 msgstr "Rek.type"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -5051,7 +4909,7 @@ msgstr "Balansteken omdraaien"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balans (passief)"
@@ -5073,7 +4931,7 @@ msgid "Account Base Code"
 msgstr "Rekening basisvak"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -5128,11 +4986,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr "Laatste afpunting:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodieke verwerking"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -5163,10 +5016,9 @@ msgid "Account chart"
 msgstr "Boekhoudplan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Leverancierfactuur"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5234,10 +5086,14 @@ msgstr "Creditnota's"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr "Af te punten boekingen"
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -5290,7 +5146,7 @@ msgstr ""
 "U kunt geen rekening maken met een hoofdrekening van een andere firma."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5309,7 +5165,7 @@ msgid "Based On"
 msgstr "Op basis van"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "AKCN"
@@ -5334,11 +5190,6 @@ msgstr "Onderliggende btw"
 msgid "Change"
 msgstr "Wijzigen"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank en cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5361,11 +5212,6 @@ msgstr "Geef aan waarom u geld uit kas haalt:"
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Voorbeeld"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5376,11 +5222,6 @@ msgstr "Hiermee kunt u pro-formafacturen maken."
 msgid "Unit Of Currency Definition"
 msgstr "Instellen munteenheid"
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Leeg laten voor opbrengstenrekening"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5391,7 +5232,7 @@ msgstr ""
 "Voegt een kolom toe met de munt, indien deze verschilt van de firmamunt."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Aankoop-btw %.2f%%"
@@ -5468,16 +5309,11 @@ msgstr ""
 "zijn voltooid, wordt de status 'Voltooid'."
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "DIV"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Factuur (Ref. ${object.number or 'nvt' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5591,6 +5427,7 @@ msgstr "Toevoegen"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Betaald"
 
@@ -5619,7 +5456,7 @@ msgstr ""
 "een kostenrekening wilt gebruiken."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Openingsperiode"
@@ -5634,14 +5471,6 @@ msgstr "Te bekijken boekingen"
 msgid "Round Globally"
 msgstr "Globaal afronden"
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaar en e-mails"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5654,7 +5483,7 @@ msgid "Tax Application"
 msgstr "Btw-toepassing"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5689,9 +5518,9 @@ msgid "End of period"
 msgstr "Einde periode"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankdetails"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Betaling van facturen"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5788,16 +5617,6 @@ msgstr "Btw-omschrijving"
 msgid "Child Tax Accounts"
 msgstr "Afhankelijke btw-rekeningen"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"Geen periode gedefinieerd voor deze datum: %s!\n"
-"Gelieve er een te maken."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5843,7 +5662,7 @@ msgid "Target Moves"
 msgstr "Doelbewegingen"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5879,6 +5698,7 @@ msgid "Python Code (reverse)"
 msgstr "Python-code (omkeren)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5895,12 +5715,6 @@ msgstr ""
 "kiezen uit een lijst van btw-codes. Voor de laatste optie moeten de btw-"
 "instellingen voor deze sjabloon volledig zijn."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>betaald</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5926,18 +5740,13 @@ msgstr "Jaar"
 msgid "It indicates that the invoice has been sent."
 msgstr "Geeft aan dat de factuur is verstuurd."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Lijn 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interne naam"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5979,7 +5788,7 @@ msgstr "Balans"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Winst en verlies (opbrengstenrekening)"
@@ -6012,7 +5821,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Berekende code (als type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -6039,6 +5848,7 @@ msgstr "Automatisch afpunten"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -6150,7 +5960,7 @@ msgid "Recompute taxes and total"
 msgstr "Btw en totaal herberekenen."
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -6181,7 +5991,7 @@ msgid "Amount Computation"
 msgstr "Berekend bedrag"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -6219,10 +6029,16 @@ msgid "Account Common Account Report"
 msgstr "Gemeenschappelijke rekening"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Communicatie"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Open"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6255,9 +6071,7 @@ msgstr "Btw-codes"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Verkoopcreditnota"
 
@@ -6274,11 +6088,6 @@ msgstr "Teken btw-bedrag"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Facturen van de afgelopen 15 dagen"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Aantal dagen: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6295,6 +6104,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Vul dit formulier als u geld wilt overmaken naar het kasboek:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Te betalen bedrag"
@@ -6386,8 +6196,6 @@ msgstr "Afronding per lijn"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6410,6 +6218,13 @@ msgstr "Normale tekst"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Betalingen vormen de tweede invoer voor het afpunten."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6419,15 +6234,6 @@ msgstr ""
 "Het aantal deelbedragen dat kan worden gecombineerd om het saldo te bepalen, "
 "kunt u instellen als Macht voor automatisch afpunten."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Volgorde wordt gebruikt om de betalingsvoorwaarden te sorteren van laag naar "
-"hoog."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6486,12 +6292,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Vast bedrag"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6516,7 +6321,6 @@ msgstr "Openingsboekingen maken"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "De berekeningsmethode voor het btw-bedrag."
 
@@ -6544,18 +6348,23 @@ msgid "Child Accounts"
 msgstr "Afhankelijke rekeningen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Boekingsnaam (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Afschrijving"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "Boekingen"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6572,7 +6381,7 @@ msgstr "Inkomsten"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@@ -6592,16 +6401,11 @@ msgid "Account n°"
 msgstr "Rekeningnr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Vrije referentie"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Waardering"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6728,7 +6532,7 @@ msgid "Filter by"
 msgstr "Filteren op"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "U heeft een verkeerde expressie \"%(...)s\" in uw model."
@@ -6779,6 +6583,16 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Aantal dagen"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"U kunt deze boeking niet valideren omdat \"%s\" niet tot het boekhoudplan "
+"\"%s\" behoort."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6922,7 +6736,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -7111,7 +6925,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "U kunt niet boeken op een afgesloten rekening."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -7144,13 +6958,6 @@ msgstr "Aangepast"
 msgid "Current"
 msgstr "Huidig"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-"Factuur '%s' is gedeeltelijk betaald: %s%s of %s%s (%s%s blijft open)"
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -7176,7 +6983,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentage"
 
@@ -7196,7 +7002,7 @@ msgid "Power"
 msgstr "Kracht"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kan geen ongebruikte journaalcode maken."
@@ -7243,12 +7049,17 @@ msgid "Applicable Type"
 msgstr "Van toepassing zijnde type"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Factuurreferentie"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -7268,12 +7079,12 @@ msgstr ""
 "volgorde is belangrijk als u btw hebt met onderliggende btw-berekeningen."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7344,7 +7155,7 @@ msgid "Optional create"
 msgstr "Optioneel aanmaken"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7356,9 +7167,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Aankoopcreditnota"
 
@@ -7396,9 +7205,14 @@ msgid "Group By..."
 msgstr "Groeperen op..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Waardering: saldo"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Geen periode gedefinieerd voor deze datum: %s!\n"
+"Gelieve er een te maken."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7478,6 +7292,13 @@ msgstr "Het btw-nummer moet uniek zijn per bedrijf"
 msgid "Cash Transactions"
 msgstr "Kastransacties"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7495,7 +7316,7 @@ msgstr "Statistieken analytische boekingen"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Boekingen: "
@@ -7513,14 +7334,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Verkoopfactuur"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Waar"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balans (actief)"
@@ -7536,10 +7356,9 @@ msgid "Total debit"
 msgstr "Totaal debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Boeking \"%s\" is ongeldig."
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Volgende af te punten relatie"
 
 #. module: account
 #: report:account.invoice:0
@@ -7592,7 +7411,7 @@ msgstr "Boeking maken"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Winst en verlies (kostenrekening)"
@@ -7603,13 +7422,14 @@ msgid "Total Transactions"
 msgstr "Totaal verrichtingen"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr "U kunt een rekening met boekingen niet verwijderen."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Fout"
@@ -7646,6 +7466,11 @@ msgstr "Projectlijn"
 msgid "Manual"
 msgstr "Manueel"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7750,8 +7575,8 @@ msgstr "Journaal kiezen"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Beginbalans"
@@ -7835,7 +7660,7 @@ msgstr ""
 "gedeeld."
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7856,6 +7681,11 @@ msgstr ""
 "\n"
 "vb. Mijn model van %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7910,7 +7740,7 @@ msgid "Done"
 msgstr "Voltooid"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7951,11 +7781,9 @@ msgid "Source Document"
 msgstr "Brondocument"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "Bankrekeningen afgedrukt in de voettekst van elk gedrukt document."
 
 #. module: account
 #: constraint:account.account:0
@@ -7984,7 +7812,7 @@ msgid "Taxes:"
 msgstr "Btw:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -8183,6 +8011,12 @@ msgstr ""
 "Dit veld wordt alleen gebruikt als u uw eigen module gebruikt. Zo kunnen "
 "ontwikkelaars specifieke btw maken in een aangepast domein."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Factuurreferentie"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -8280,7 +8114,7 @@ msgid "Use model"
 msgstr "Model gebruiken"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8351,7 +8185,7 @@ msgid "Root/View"
 msgstr "Root/weergave"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEN"
@@ -8420,7 +8254,7 @@ msgid "Maturity Date"
 msgstr "Vervaldatum"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Verkoopjournaal"
@@ -8431,7 +8265,7 @@ msgid "Invoice Tax"
 msgstr "Factuur-btw"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Geen stuknummer"
@@ -8477,7 +8311,7 @@ msgid "Sales Properties"
 msgstr "Verkoopeigenschappen"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8503,7 +8337,7 @@ msgstr "Tot"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Muntaanpassing"
@@ -8536,7 +8370,7 @@ msgid "May"
 msgstr "Mei"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Globale btw gedefinieerd, maar niet op de factuurlijnen."
@@ -8555,10 +8389,9 @@ msgstr ""
 "Volgorde wordt gebruikt om de elementen te sorteren van laag naar hoog"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Vak"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8574,17 +8407,12 @@ msgstr "Creditnotanummering"
 msgid "Post Journal Entries"
 msgstr "Boekingen definitief maken"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr "Gecentraliseerde tegenboeking"
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Klant"
@@ -8600,7 +8428,7 @@ msgstr "Rapportnaam"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Kas"
@@ -8612,9 +8440,11 @@ msgid "Account Destination"
 msgstr "Doelrekening"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Betaling van facturen"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8622,7 +8452,6 @@ msgstr "Betaling van facturen"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8759,15 +8588,14 @@ msgid "Partner Ledger"
 msgstr "Relatiehistoriek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>geannuleerd</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Vast"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing"
@@ -8836,7 +8664,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Kies de munt voor de factuur"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Geen factuurlijnen"
@@ -8916,7 +8744,7 @@ msgid "Associated Partner"
 msgstr "Gekoppelde relatie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "U moet eerst een relatie kiezen."
@@ -8998,13 +8826,13 @@ msgstr ""
 "de volgende btw wordt berekend."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Aankoopcreditnotajournaal"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Gelieve een reeks in te stellen voor het journaal."
@@ -9080,7 +8908,7 @@ msgid "Net Total:"
 msgstr "Nettototaal:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr "Begin- en eindperiode kiezen"
@@ -9100,15 +8928,6 @@ msgstr "Algemene rapportering"
 msgid "Write-Off Journal"
 msgstr "Afschrijvingsjournaal"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Deze betalingsvoorwaarde vervangt de standaardvoorwaarde van de huidige "
-"relatie."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -9135,11 +8954,6 @@ msgstr "Int.type"
 msgid "Tax/Base Amount"
 msgstr "Btw-/basisbedrag"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Waardering: percentage"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -9195,6 +9009,11 @@ msgstr "Afpuntresultaat"
 msgid "Ending Balance"
 msgstr "Eindbalans"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -9236,7 +9055,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatische import van uittreksel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Onbekende fout"
@@ -9259,7 +9078,12 @@ msgid "Account Types"
 msgstr "Rekeningtypen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -9269,9 +9093,9 @@ msgstr ""
 "tabblad 'Boekingscontrole' na voor het journaal."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Waarde bedrag: n.v.t."
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "W&V / Balanscategorie"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9288,10 +9112,9 @@ msgid "Reconciliation"
 msgstr "Afpunting"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Klanten"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Leeg laten voor opbrengstenrekening"
 
 #. module: account
 #: view:account.invoice:0
@@ -9370,7 +9193,7 @@ msgid "The partner account used for this invoice."
 msgstr "De centralisatierekening voor deze factuur."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Btw %.2f%%"
@@ -9388,13 +9211,13 @@ msgid "Payment Term Line"
 msgstr "Betalingslijn"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Aankoopjournaal"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotaal"
 
@@ -9423,11 +9246,6 @@ msgstr "Vervaldatum"
 msgid "Suppliers"
 msgstr "Leveranciers"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Waar"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9563,9 +9381,10 @@ msgid "Journal Name"
 msgstr "Journaalnaam"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Volgende af te punten relatie"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Boeking \"%s\" is ongeldig."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9614,7 +9433,7 @@ msgstr ""
 "in meerdere munten."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr "De beweging (%s) voor de centralisering is bevestigd."
@@ -9678,7 +9497,7 @@ msgid "Reconciled entries"
 msgstr "Afgepunte boekingen"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Verkeerde model"
@@ -9700,7 +9519,7 @@ msgid "Print Account Partner Balance"
 msgstr "Relatiebalans afdrukken"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9743,7 +9562,7 @@ msgstr "onbekend"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Openingsjournaal"
@@ -9793,7 +9612,7 @@ msgstr ""
 "onderliggende btw in plaats van op het totaal bedrag."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr "U kunt een rekening met boekingen niet op inactief zetten."
@@ -9808,21 +9627,9 @@ msgstr "Berekend door Python-code"
 msgid "Journal Code"
 msgstr "Journaalcode"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"U kunt hier de coëfficiënt opgeven die wordt gebruikt om het bedrag in dit "
-"vak te consolideren in het hoofdvak. Stel dit bijvoorbeeld in op 1/-1 om op "
-"te tellen/af te trekken."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Restbedrag"
 
@@ -9855,7 +9662,7 @@ msgid "Unit of Currency"
 msgstr "Munteenheid"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Verkoopcreditnotajournaal"
@@ -9921,7 +9728,7 @@ msgid "Purchase Tax(%)"
 msgstr "Aankoop-btw (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Gelieve factuurlijnen toe te voegen."
@@ -9942,7 +9749,7 @@ msgid "Display Detail"
 msgstr "Details tonen"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "VKCN"
@@ -10069,21 +9876,11 @@ msgstr "De boekhouder keurt de factuurboekingen goed. "
 msgid "Number of Periods"
 msgstr "Aantal perioden"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Sjablonen btw-codes"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Rekeninguittreksel"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "W&V / Balanscategorie"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -10095,9 +9892,10 @@ msgid "Supplier credit note sequence"
 msgstr "Nummering aankoopcreditnota's"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Volgende aankoopfactuurnummer"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "De factuur is al afgepunt"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10116,14 +9914,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Rekeninguittreksels"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Klanten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -10226,8 +10024,8 @@ msgid "Move"
 msgstr "Beweging"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -10311,11 +10109,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Verzonden"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Afpuntingen ongedaan maken"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -10333,11 +10126,16 @@ msgid "Balance :"
 msgstr "Saldo:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr "Kan geen boekingen maken tussen verschillende firma's."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10374,15 +10172,6 @@ msgstr "Abonnement"
 msgid "Account Analytic Balance"
 msgstr "Analytische balans"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-"Creditnota voor dit type. U kunt niet wijzigen of annuleren als de factuur "
-"al is afgepunt."
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10422,7 +10211,13 @@ msgid "Due date"
 msgstr "Vervaldatum"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr " Centralisering"
@@ -10517,7 +10312,7 @@ msgid "Unreconciled"
 msgstr "Niet afgepunt"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Verkeerd totaal"
@@ -10608,7 +10403,7 @@ msgid "Comparison"
 msgstr "Vergelijking"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10630,6 +10425,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10685,11 +10485,6 @@ msgstr "Credit"
 msgid "Draft Invoice "
 msgstr "Voorlopige factuur "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr "Annuleren: maak een creditnota en punt af"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10701,7 +10496,7 @@ msgid "Journal Entry Model"
 msgstr "Boekingsmodel"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "De beginperiode moet voor de eindperiode liggen"
@@ -10786,7 +10581,7 @@ msgid "Profit (Loss) to report"
 msgstr "Te rapporteren winst (verlies)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr "Er is geen aankoop/verkoopdagboek ingesteld."
@@ -11116,7 +10911,14 @@ msgid "Empty Accounts ? "
 msgstr "Lege rekeningen? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Kan btw niet veranderen"
@@ -11241,7 +11043,7 @@ msgid "Receivable accounts"
 msgstr "Klanten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Al afgepunt"
@@ -11376,7 +11178,7 @@ msgid "Entries Sorted by"
 msgstr "Boekingen gesorteerd op"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11483,7 +11285,7 @@ msgid "Accounting Documents"
 msgstr "Boekhoudkundige documenten"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11532,7 +11334,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manuele factuur-btw"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr "De betalingsvoorwaarde van de leverancier heeft geen betalingslijn."
@@ -11613,17 +11415,6 @@ msgstr ""
 msgid "February"
 msgstr "Februari"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Als u een andere Naam invult dan /, krijgt de boeking dezelfde naam als het "
-"uittreksel. Hiermee krijgen de uittrekselboekingen dezelfde referentie als "
-"het uittreksel zelf."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11682,6 +11473,11 @@ msgstr "Sjabloon fiscale posities"
 msgid "Expense Account on Product Template"
 msgstr "Kostenrekening van productsjabloon"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11779,9 +11575,6 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "Journaalposten-"
 
-#~ msgid "Fixed"
-#~ msgstr "Vast"
-
 #~ msgid "Delta Debit"
 #~ msgstr "Delta debet"
 
@@ -11822,6 +11615,13 @@ msgstr ""
 #~ msgid "Contra"
 #~ msgstr "Tegenover"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodieke verwerking"
+
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Leverancierfactuur"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statistieken analyt. boekingen"
 
@@ -11953,6 +11753,13 @@ msgstr ""
 #~ msgid "New Analytic Account"
 #~ msgstr "Nieuwe analytische rekening"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Volgorde wordt gebruikt om de betalingsvoorwaarden te sorteren van laag naar "
+#~ "hoog."
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Analytische journalen afdrukken"
 
@@ -11992,6 +11799,9 @@ msgstr ""
 #~ msgid "Analytic Credit"
 #~ msgstr "Analytisch credit"
 
+#~ msgid "Line Name"
+#~ msgstr "Lijnnaam"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Kies de facturen die u wilt betalen en verwerk voorschotten"
 
@@ -12234,6 +12044,9 @@ msgstr ""
 #~ msgid "Date End"
 #~ msgstr "Einddatum"
 
+#~ msgid "Litigation"
+#~ msgstr "Betwist"
+
 #~ msgid "Entries Reconcile"
 #~ msgstr "Boekingen afpunten"
 
@@ -12462,6 +12275,13 @@ msgstr ""
 #~ "Het Winst– en verliesrapport geeft een overzicht van winst en verlies van uw "
 #~ "bedrijf."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
+#~ "nakijken, want deze worden niet ongedaan gemaakt."
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "U kunt de bevestigde boeking \"%s\" niet verwijderen."
@@ -12470,6 +12290,9 @@ msgstr ""
 #~ msgid "Journal: %s"
 #~ msgstr "Journaal: %s"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -12522,6 +12345,9 @@ msgstr ""
 #~ "OpenERP. OpenERP maakt automatisch boekingslijnen vanuit "
 #~ "Rekeninguittreksels, kasboekingen of betalingen."
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field contains the informatin related to the numbering of the journal "
 #~ "entries of this journal."
@@ -12561,6 +12387,13 @@ msgstr ""
 #~ msgid "Invoice Address Name"
 #~ msgstr "Factuur Adres Naam"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
+#~ "nakijken, want deze worden niet ongedaan gemaakt."
+
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "eindsaldo ingegeven door de persoon die de kas controleert"
 
@@ -12823,6 +12656,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Referentienummer"
 
+#~ msgid "Line 2:"
+#~ msgstr "Lijn 2:"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -13124,6 +12960,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Nee"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank en cheques"
+
 #~ msgid "Are you sure ?"
 #~ msgstr "Weet u het zeker?"
 
@@ -13194,6 +13033,9 @@ msgstr ""
 #~ msgid "Opening Cashbox"
 #~ msgstr "Kas openen"
 
+#~ msgid "Line 1:"
+#~ msgstr "Lijn 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Integriteitsfout"
@@ -13238,6 +13080,9 @@ msgstr ""
 #~ "Afgepunte boekingen kunnen niet worden aangepast. Er kunnen slechts enkele "
 #~ "onbelangrijke velden worden gewijzigd."
 
+#~ msgid "Communication"
+#~ msgstr "Communicatie"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "Configuratiefout"
@@ -13308,6 +13153,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Vereenvoudigt betalingen en laat toe om automatische betalingen te koppelen."
 
+#~ msgid "Valuation"
+#~ msgstr "Waardering"
+
 #~ msgid "Invoice Address"
 #~ msgstr "Factuuradres"
 
@@ -13818,6 +13666,13 @@ msgstr ""
 #~ msgid "Accounting and Financial Management"
 #~ msgstr "Boekhouding en financieel beheer"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Deze betalingsvoorwaarde vervangt de standaardvoorwaarde van de huidige "
+#~ "relatie."
+
 #~ msgid ""
 #~ "With Customer Refunds you can manage the credit notes for your customers. A "
 #~ "refund is a document that credits an invoice completely or partially. You "
@@ -14298,6 +14153,10 @@ msgstr ""
 #~ msgid "Sale journal in this year"
 #~ msgstr "Verkoopdagboek huidig jaar"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Twee procent netto binnen 14 dagen, restbedrag binnen 30 dagen einde maand."
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -14413,12 +14272,22 @@ msgstr ""
 #~ "U kunt een openstaande of betaalde factuur niet verwijderen. U maakt het "
 #~ "best een creditnota."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factuur '%s' is goedgekeurd."
+
 #~ msgid "Month-1"
 #~ msgstr "Maand-1"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dag van de maand: 0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Verkopen van deze maand per type"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Waarde bedrag: 0,02"
+
 #, python-format
 #~ msgid "The closing balance should be the same than the computed balance!"
 #~ msgstr "Het eindsaldo moet gelijk zijn aan het berekende saldo."
@@ -14463,6 +14332,12 @@ msgstr ""
 #~ msgid "You can not create journal items on a closed account %s %s"
 #~ msgstr "U kunt niet boeken op een afgesloten rekening %s %s."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dag van de maand= -1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Aantal dagen: 30"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr "De begindatum van het boekjaar moet voor de einddatum liggen."
 
@@ -14501,6 +14376,12 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Coderingsfout"
 
+#~ msgid "Example"
+#~ msgstr "Voorbeeld"
+
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Factuur (Ref. ${object.number or 'nvt' })"
+
 #~ msgid "My invoices"
 #~ msgstr "Mijn facturen"
 
@@ -14525,6 +14406,9 @@ msgstr ""
 #~ "U kunt niet meer dan een beweging maken per periode in een "
 #~ "centralisatiedagboek."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Aantal dagen: 14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Deze actie wist de btw"
 
@@ -14566,6 +14450,9 @@ msgstr ""
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "De firma moet dezelfde zijn voor de rekening en de periode."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Waardering: saldo"
+
 #, python-format
 #~ msgid "You can not desactivate an account that contains some journal items."
 #~ msgstr "U kunt een rekening met boekingen niet op inactief zetten."
@@ -14702,6 +14589,9 @@ msgstr ""
 #~ "U kunt een gedeeltelijk betaalde factuur niet annuleren. U moet eerst de "
 #~ "afpunting ongedaan maken."
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Waardering: percentage"
+
 #~ msgid "current month"
 #~ msgstr "huidige maand"
 
@@ -14713,6 +14603,9 @@ msgstr ""
 #~ "Geen periode gedefinieerd voor deze datum: %s!\n"
 #~ "Gelieve er een te maken."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Waarde bedrag: n.v.t."
+
 #~ msgid "Contacts"
 #~ msgstr "Contactpersonen"
 
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index bfe72492f60..110a385f98b 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:53+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:24+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Debit Total"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "per cent"
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr "Tipe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Calcul"
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr "Compte de client"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr "Gropes"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr "Modèl d'escritura comptabla"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Taxas provesidors"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Impòstes e taxas"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,9 +3292,9 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nom de linha"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr "Afichatge"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,9 +4060,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litigi"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr "Enfants consolidats"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr "Tipe de compte"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Tractaments periodics"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,10 +4656,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura del provesidor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nom intèrne"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Còde de Calcul (se tipe=còde)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Montant fixe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr "Comptes enfant"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustament"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr "Produches"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentatge"
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr "Poténcia"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr "Aplicable ?"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verai"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr "Debit total"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Liquiditats"
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr "Grand Libre"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr "Total net :"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Montant"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr "Resultat del letratge"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr "Tipes de compte"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,10 +8530,9 @@ msgid "Reconciliation"
 msgstr "Letratge"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Compte clients"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr "Data d'escasença"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verai"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr "Nom del jornal"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr "Document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Compte clients"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr "Desplaçar"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr "Balança :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr "Credit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10978,6 +10887,9 @@ msgstr ""
 #~ msgid "Bank account"
 #~ msgstr "Compte bancari"
 
+#~ msgid "Line Name"
+#~ msgstr "Nom de linha"
+
 #~ msgid "Centralised counterpart"
 #~ msgstr "Centralizacion"
 
@@ -11035,6 +10947,9 @@ msgstr ""
 #~ msgid "Date End"
 #~ msgstr "Data de fin"
 
+#~ msgid "Litigation"
+#~ msgstr "Litigi"
+
 #~ msgid "-"
 #~ msgstr "-"
 
@@ -11146,6 +11061,13 @@ msgstr ""
 #~ msgid "Recurrent Entries"
 #~ msgstr "Escrituras recurentas"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Tractaments periodics"
+
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura del provesidor"
+
 #~ msgid "Account balance"
 #~ msgstr "Balança dels comptes"
 
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index a8b967a3d1d..8af01f49409 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-19 17:42+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 12:46+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-20 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr "Obszar podatkowy może być definiowany tylko raz na tym samym koncie."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Skasuj uzgodnienie transakcji"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Importuj z faktur lub płatności"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Niepoprawne konto!"
@@ -93,15 +88,6 @@ msgstr "Niepoprawne konto!"
 msgid "Total Debit"
 msgstr "Suma Winien"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Jeśli skasujesz uzgodnienie transakcji, to musisz również sprawdzić akcje "
-"związane z tymi transakcjami, ponieważ one nie będą usunięte."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +100,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +130,19 @@ msgstr ""
 "jej wtedy usuwać)."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +154,7 @@ msgid "Warning!"
 msgstr "Uwaga!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Dziennik PK"
@@ -244,11 +229,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Szablony podatków"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -264,6 +244,11 @@ msgstr "Zapisy są elementem uzgodnień"
 msgid "Belgian Reports"
 msgstr "Raporty belgijskie"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr "Zatwierdzone"
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -408,11 +393,6 @@ msgstr "Pozwala stosować konta analityczne"
 msgid "Salesperson"
 msgstr "Sprzedawca"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -467,6 +447,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "odnośnik dla informacji beneficjenta"
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -482,6 +467,13 @@ msgstr "Okres :"
 msgid "Chart Template"
 msgstr "Szablon planu kont"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+"Modyfikacja: utworzy korektę do zera, uzgodni ją i utworzy projekt faktury "
+"jako kopię poprzedniej."
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -494,6 +486,14 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Jeśli wybierzesz 'Zaokrąglaj pozycje', to dla każdego podatku, każda wartość "
+"będzie obliczona i zaokrąglona w każdej pozycji zamówienia sprzedaży, "
+"zamówienia zakupu lub faktury i dopiero zaokrąglone wartości będą zsumowane. "
+"Jeśli wybierzesz 'Zaokrąglaj globalnie', to podatki i pozycje zostaną "
+"najpierw zsumowane i dopiero ewentualnie zaokrąglone. Jeśli stosujesz "
+"sprzedaż z podatkami wliczonymi w cenę, to powinieneś wybrać 'Zaokrąglaj "
+"pozycje' ponieważ zapewne chcesz, aby suma wartości z podatkami była równa "
+"sumie wartości brutto."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -643,15 +643,6 @@ msgstr "Zaokrąglenie zapisów księgowych"
 msgid "3 Monthly"
 msgstr "3 miesięczne"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Jeśli skasujesz uzgodnienie transakcji, to musisz sprawdzić wszystkie akcje "
-"powiązane z tymi transakcjami, ponieważ one nie zostaną zdezaktywowane."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -700,7 +691,7 @@ msgid "Profit Account"
 msgstr "Konto zysków"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Nie znaleziono żadnego lub znaleziono kilka okresów dla tej daty."
@@ -711,13 +702,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "raport sprzedaży wg typu konta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "DS"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Nie mozna utworzyć zapisu w walucie innej niż .."
@@ -765,6 +756,9 @@ msgid ""
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Ustaw konto analityczne, które będzie domyślnie stosowane na pozycjach "
+"podatków w korektach. Pozostaw puste, jeśli nie chcesz stosować domyślnych "
+"kont analitycznych na pozycjach podatkowych w fakturach."
 
 #. module: account
 #: view:account.account:0
@@ -782,6 +776,11 @@ msgstr "Konta należności"
 msgid "Configure your company bank accounts"
 msgstr "Konfiguruj konta bankowe dla firmy"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr "Utwórz korektę"
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -806,6 +805,12 @@ msgstr "Otwórz ponownie"
 msgid "Are you sure you want to create entries?"
 msgstr "Jesteś pewna, że chcesz utworzyć zapisy?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr "Faktura częściowo zapłacona: %s%s of %s%s (pozostało %s%s)."
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -828,6 +833,7 @@ msgstr "Wyświetla podrzędne w hierarchii"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procentowo"
 
@@ -870,7 +876,7 @@ msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -895,24 +901,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Faktury i korekty od dostawców"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "Zapis jest już usgodniony."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Kasowanie uzgodnień"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "2 procent upustu do 14 dni i pozostałość 30 dni od końca miesiąca"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -944,11 +944,6 @@ msgstr "J.C./Zmień nazwę"
 msgid "Account Code and Name"
 msgstr "Kod i nazwa konta"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "utworzone"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -985,7 +980,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1000,6 +995,7 @@ msgstr "Nowa Subskrypcja"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Obliczenia"
 
@@ -1031,14 +1027,9 @@ msgid "Purchase journal"
 msgstr "Dziennik zakupów"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
-msgstr ""
-"Nie możesz zatwierdzić tego zapisu ponieważ konto \"%s\" nie należy do planu "
-"kont \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr "Faktua zapłacona"
 
 #. module: account
 #: view:validate.account.move:0
@@ -1073,7 +1064,7 @@ msgid "Liability"
 msgstr "Pasywa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Zdefiniuj kolejność w dzienniku dla tej faktury."
@@ -1147,10 +1138,10 @@ msgid "Features"
 msgstr "Funkcjonalności"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1242,9 +1233,10 @@ msgid "Refund "
 msgstr "Korekta "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "Konto bankowe do drukowania w stopce każdego dokumentu"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr "Brak konta rozchodów dla produktu: \"%s\" (id:%d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1299,7 +1291,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1599,9 +1591,9 @@ msgid "Account Receivable"
 msgstr "Konto należności"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -1615,7 +1607,7 @@ msgid "With balance is not equal to 0"
 msgstr "Z saldem różnym od zera"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1674,7 +1666,7 @@ msgstr "Pomiń stan \"Projekt\" przy ręcznych zapisach"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Nie zaimplementowane"
@@ -1717,6 +1709,12 @@ msgstr "Tymczasowa tabela stosowana przez widok konsoli"
 msgid "Supplier Refunds"
 msgstr "Faktury korygujące od dostawców"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Kod rejestru"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1754,7 +1752,6 @@ msgid "Groups"
 msgstr "Grupy"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Netto"
@@ -1895,6 +1892,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Sprzedaż wg typów kont"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr "15 Dni"
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1917,115 +1920,11 @@ msgstr ""
 "stanu projekt."
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Część zapisów jest juz uzgodnionych."
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2138,6 +2037,11 @@ msgstr "Te okresy mogą na siebie zachodzić."
 msgid "Draft statement"
 msgstr "Projekt wyciągu"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr "Faktua zatwierdzona"
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2166,26 +2070,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2193,16 +2096,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2213,8 +2116,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2268,7 +2171,7 @@ msgid "period close"
 msgstr "zamknięcie okresu"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2306,7 +2209,8 @@ msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
 "                Kliknij, aby zarejestrować wyciąg bankowy.\n"
 "              </p><p>\n"
-"                Wyciąg jest listę transakcji banko dla konkretnego konta\n"
+"                Wyciąg jest listę transakcji bankowych dla konkretnego "
+"konta\n"
 "                w określonym czasie.\n"
 "              </p><p>\n"
 "                OpenERP pozwala uzgadniać pozycje wyciągu bezpośrednio\n"
@@ -2379,7 +2283,7 @@ msgid "Product Category"
 msgstr "Kategoria Produktu"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2749,7 +2653,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Pozostaw puste dla wszystkich otwartych lat podatkowych"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2769,7 +2673,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Utwórz konto według tego szablonu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2794,7 +2698,7 @@ msgid "Main Sequence"
 msgstr "Sekwencja główna"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2802,14 +2706,12 @@ msgid ""
 msgstr "Aby usunąć wyciąg, musisz najpierw go anulować, aby usunąć zapisy."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Warunki płatności"
 
@@ -2835,18 +2737,6 @@ msgstr "Zaznacz tę opcję"
 msgid "Filters"
 msgstr "Filtry"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Otwarte"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2858,6 +2748,11 @@ msgstr "Stan projekt faktury"
 msgid "Account Properties"
 msgstr "Właściwości konta"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr "Utwórz projekt korekty"
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2935,25 +2830,20 @@ msgid "Account Model Entries"
 msgstr "Zapisy modelu kont"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "DZ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Utwórz korektę"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Podatki dostawcy"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "zapisów"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Szczegóły banku"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2991,7 +2881,6 @@ msgstr ""
 "            "
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -3006,10 +2895,9 @@ msgstr ""
 "teraz i 50% w ciągu miesiąca."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "Faktura jest już uzgodniona"
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Następny numer  faktury od dostawcy"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -3038,6 +2926,7 @@ msgstr "Uzgodnienie pozycji zapisu (odpis)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Podatek"
 
@@ -3073,14 +2962,14 @@ msgid "Accounts"
 msgstr "Konta"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3177,6 +3066,12 @@ msgstr "Zapłacone/Uzgodnione"
 msgid "Refund Base Code"
 msgstr "Rejestr podstawy dla korekt"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Wyciąg bankowy"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3229,11 +3124,6 @@ msgstr "Saldo przeterminowanych płatności partnera"
 msgid "Accounting entries"
 msgstr "Zapisy księgowe"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Typ komunikacji"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3280,7 +3170,7 @@ msgstr ""
 "lub 'Pro-Forma'."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "Musisz wybrać okres należący do tej samej firmy."
@@ -3293,7 +3183,7 @@ msgid "Sales by Account"
 msgstr "Sprzedaż wg kont"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "Nie można usuwać zaksięgowanego zapisu \"%s\"."
@@ -3309,15 +3199,15 @@ msgid "Sale journal"
 msgstr "Dziennik sprzedaży"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Musisz zdefiniować dziennik analityczny dla dziennika '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3325,7 +3215,7 @@ msgid ""
 msgstr "Nie można modyfikować firmy, bo dziennik zawiera zapisy."
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3391,9 +3281,10 @@ msgstr ""
 "Ilość nie jest formalnie wymagana, ale może być bardzo wygodna w raportach."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Pozycja 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr "Skasuj uzgodnienie transakcji"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3440,12 +3331,6 @@ msgstr "Kwota do rejestru podstawy"
 msgid "Default Sale Tax"
 msgstr "Domyślny podatek sprzedaży"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Faktura  '%s' jest zatwierdzona."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3481,7 +3366,7 @@ msgid "Fiscal Position"
 msgstr "Obszar podatkowy"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3510,7 +3395,7 @@ msgid "Trial Balance"
 msgstr "Bilans Próbny"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr "Nie można zinterpretować salda początkowego (wartość ujemna)."
@@ -3581,7 +3466,7 @@ msgstr ""
 "zawsze stosują kurs dnia."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "Brak kodu nadrzędnego dla szblonu konta."
@@ -3593,9 +3478,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Liczba cyfr stosowana do numeru konta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nazwa pozycji"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr "Warunki płatności dostawcy"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3644,7 +3529,7 @@ msgid "View"
 msgstr "Widok"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3665,15 +3550,20 @@ msgstr "Faktury proforma"
 msgid "Electronic File"
 msgstr "Plik"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr "Odnośnik korekty"
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "Firma ma plan kont"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dzień miesiąca: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Szablon rejestru podatkowego"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3681,10 +3571,89 @@ msgid "Account Partner Ledger"
 msgstr "Konto rejestru partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>utworzone</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -3811,12 +3780,17 @@ msgid "Account Tax Declaration"
 msgstr "Deklaracja podatkowa"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Kowta: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Jeśli nadasz nazwę (numer) inną niż /, to zapis księgowy będzie miał ten sam "
+"numer (nazwę) co wyciąg. To pozwala mieć te same numery wyciągów i zapisów."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3833,7 +3807,7 @@ msgid "Starting Balance"
 msgstr "Saldo początkowe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nie zdefiniowano partnera !"
@@ -4061,7 +4035,7 @@ msgid "Period Length (days)"
 msgstr "Długość okresu w dniach"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4087,7 +4061,7 @@ msgid "Category of Product"
 msgstr "Kategoria produktu"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4230,7 +4204,7 @@ msgid "Chart of Accounts Template"
 msgstr "Szablon planów kont"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4320,9 +4294,15 @@ msgid "Qty"
 msgstr "Il."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Spór sądowy"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Podaj współczynnik, który będzie zastosowany do doliczenia wartości tego "
+"rejestru do rejestru nadrzędnego. Podaj 1 jeśli chcesz dodać do innych "
+"wartości w nadrzędnym rejestrze lub -1, jeśli chcesz odjąć."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4407,11 +4387,6 @@ msgstr "Nie ma nieskonfigurowanych firm"
 msgid "Expects a Chart of Accounts"
 msgstr "Spodziewany plan kont"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4429,11 +4404,6 @@ msgstr "Dziennik musi mieć domyślne konto Winien i Ma"
 msgid "Setup your Bank Accounts"
 msgstr "Ustaw konta bankowe"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr "Modyfikuj: utwórz korektę, uzgodnij i utwórz nowy projekt faktury"
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4480,8 +4450,8 @@ msgstr ""
 "Zaznacz tę opcję, jeśli nie chcesz aby podatki drukowały się na fakturach."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Nie można stosować niekatywnych kont."
@@ -4511,7 +4481,7 @@ msgid "Consolidated Children"
 msgstr "Skonsolidowane podrzędne"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4545,11 +4515,6 @@ msgstr ""
 msgid "title"
 msgstr "tytuł"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Utwórz projekt korekty"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4639,6 +4604,15 @@ msgstr "30 dni od końca miesiąca"
 msgid "Analytic Balance"
 msgstr "Bilans analityczny"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+"Te warunki płatności będą stosowane zamiast domyślnych do zamówień sprzedaży "
+"i faktur dla klientów."
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4660,6 +4634,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Zapisy zaksięgowane"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr "Bez windykacji"
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4670,11 +4649,6 @@ msgstr "Przeszukaj szablony kont."
 msgid "Draft Entries"
 msgstr "Projekty zapisów"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dzień miesiąca= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4683,11 +4657,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Liczba dni: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4711,20 +4680,9 @@ msgid "Account Type"
 msgstr "Typ konta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Zamknij kasę"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4747,9 +4705,20 @@ msgstr ""
 "pochodzące z kont analitycznych. To wygeneruje projekty faktur dostawcy."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Zamknij kasę"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4779,7 +4748,7 @@ msgid "Month"
 msgstr "Miesiąc"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr "Nie można zmieniać kodu konta zawierającego zapisy!"
@@ -4790,8 +4759,8 @@ msgid "Supplier invoice sequence"
 msgstr "Numeracja faktur od dostawcy"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4817,6 +4786,11 @@ msgstr "Konto Paypal"
 msgid "Acc.Type"
 msgstr "Typ konta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr "Banki i Czeki"
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4829,7 +4803,7 @@ msgstr "Odwróć znak salda"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Bilans (konta zobowiązań)"
@@ -4851,7 +4825,7 @@ msgid "Account Base Code"
 msgstr "Rejstr główny"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4906,11 +4880,6 @@ msgstr "Uzgodnienie zapisów początkowych"
 msgid "Last Reconciliation:"
 msgstr "Ostatnie uzgodnienie"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesy okresowe"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4940,10 +4909,9 @@ msgid "Account chart"
 msgstr "Plan kont"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Faktura od dostawcy"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr "Odnośnik płatności"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5011,10 +4979,14 @@ msgstr "Korekty"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr "Pozycje zapisów do uzgodnienia"
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr "Szablony podatków"
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -5033,7 +5005,7 @@ msgstr "Obliczenie podatku"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -5068,7 +5040,7 @@ msgstr ""
 "Nie możesz utworzyć konta, którego konto nadrzędne ma inną firmę.."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -5087,7 +5059,7 @@ msgid "Based On"
 msgstr "Bazując na"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "FZK"
@@ -5112,11 +5084,6 @@ msgstr "Podrzędne/Podpodatki"
 msgid "Change"
 msgstr "Zmień"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank i czeki"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5139,11 +5106,6 @@ msgstr "Opisz jak pobierasz pieniądze z kasy"
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Przykład"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5154,11 +5116,6 @@ msgstr "Pozwal przestawić fakturę w stan pro-forma"
 msgid "Unit Of Currency Definition"
 msgstr "Jednostka definicji waluty"
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Pozostaw puste, aby stosować konto dochodowe"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5170,7 +5127,7 @@ msgstr ""
 "waluta firmy."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Podatek zakupowy %.2f%%"
@@ -5244,16 +5201,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Faktura (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5367,6 +5319,7 @@ msgstr "Dodaj"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Zapłacono"
 
@@ -5395,7 +5348,7 @@ msgstr ""
 "stosować konto wydatków."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Okres otwierający"
@@ -5410,14 +5363,6 @@ msgstr "Zapisy do przeglądu"
 msgid "Round Globally"
 msgstr "Zaokrąglaj globalnie"
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5430,7 +5375,7 @@ msgid "Tax Application"
 msgstr "Zastosowanie podatku"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5465,9 +5410,9 @@ msgid "End of period"
 msgstr "Koniec okresu"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Szczegóły banku"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Płatności faktur"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5564,16 +5509,6 @@ msgstr "Podatek"
 msgid "Child Tax Accounts"
 msgstr "Podatki podrzędne"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-"Nie ma okresu dla tej daty: %s.\n"
-"Utwórz okres."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5619,7 +5554,7 @@ msgid "Target Moves"
 msgstr "Zapisy docelowe"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5656,6 +5591,7 @@ msgid "Python Code (reverse)"
 msgstr "Kod Pythona (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5672,12 +5608,6 @@ msgstr ""
 "sprzedaży lub zakupów lub wybierać z listy. Ten drugi wybór wymaga "
 "zdefiniowania stawek podatkowych."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>zapłacone</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5703,18 +5633,13 @@ msgstr "Rok"
 msgid "It indicates that the invoice has been sent."
 msgstr "To oznacza, że faktura została wysłana."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Pozycja 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nazwa wewnętrzna"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5756,7 +5681,7 @@ msgstr "Bilans"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Zyski i straty (Konta przychodowe)"
@@ -5789,7 +5714,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Oblicz kod (jeśli typ = kod)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5816,6 +5741,7 @@ msgstr "Automatyczne uzgodnienie"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5922,7 +5848,7 @@ msgid "Recompute taxes and total"
 msgstr "Przelicz podatki i sumę"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr "Nie możesz modyfikować/usuwać dziennika z zapisami w tym okresie."
@@ -5952,7 +5878,7 @@ msgid "Amount Computation"
 msgstr "Obliczanie kwoty"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5989,10 +5915,16 @@ msgid "Account Common Account Report"
 msgstr "Raport księgowy ogólny"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Komunikacja"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Otwarte"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6025,9 +5957,7 @@ msgstr "Rejestry podatkowe"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Korekta dla klienta"
 
@@ -6044,11 +5974,6 @@ msgstr "Znak dla rejestru podatku"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Raport faktur z ostatnich 15. miesięcy."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Liczba dni: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -6065,6 +5990,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Wypełnij ten formularz, aby włożyć gotówkę do kasy:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Kwota do zapłacenia"
@@ -6155,8 +6081,6 @@ msgstr "Zaokraglaj w pozycjach"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6179,6 +6103,15 @@ msgstr "Zwykły tekst"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Płatność jest drugą stroną uagodnienia"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+"Te warunki płatności będą stosowane zamiast domyślnych w zamówieniach zakupu "
+"i fakturach od dostawców."
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6186,15 +6119,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Pole sekwencji jest stosowane do porządkowania warunków płatności od "
-"sekwencji najniższej do najwyższej."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6252,12 +6176,11 @@ msgstr "Nie można księgować na koncie typu widok."
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Kwota stała"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6283,7 +6206,6 @@ msgstr "Generuj zapisy otwarcia"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Metoda obliczeń dla podatku"
 
@@ -6311,18 +6233,23 @@ msgid "Child Accounts"
 msgstr "Konta podrzędne"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nazwa zapisu (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "zapisów"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6339,7 +6266,7 @@ msgstr "Dochody"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dostawca"
@@ -6359,16 +6286,11 @@ msgid "Account n°"
 msgstr "Nr konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Odnośnik"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Wycena"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6483,7 +6405,7 @@ msgid "Filter by"
 msgstr "Filtruj wg"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Masz błędne wyrażenie \"%(...)s\" w twoim modelu !"
@@ -6534,6 +6456,16 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Liczba dni"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"Nie możesz zatwierdzić tego zapisu ponieważ konto \"%s\" nie należy do planu "
+"kont \"%s\"."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6677,7 +6609,7 @@ msgid "Models"
 msgstr "Modele"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6748,6 +6680,9 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"To pole pozwala wybrać, czy użytkownik może wpisać podatki ręcznie, czy musi "
+"skorzystać z relacji do uprzednio skonfigurowanych podatków. Druga możliwość "
+"zakłada, że odpowiednie podatki sa wprowadzone do systemu."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6767,7 +6702,7 @@ msgstr "Faktury otwarte lub zapłacone"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Wyświetl podrzędne płasko"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6788,7 +6723,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
 msgid "IntraCom"
-msgstr ""
+msgstr "IntraCom"
 
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
@@ -6862,7 +6797,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "Nie możesz tworzyć zapisów na zamknietym koncie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr "Firma z pozycji nie odpowiada firmie z faktury"
@@ -6893,12 +6828,6 @@ msgstr "Własne"
 msgid "Current"
 msgstr "Bieżące"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr "Faktura '%s' jest zapłacona częściowo: %s%s z %s%s (%s%s pozostało)."
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6923,7 +6852,6 @@ msgstr "Sprawdź, czy pole 'Dziennik' jest ustawione w wyciągu"
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procentowo"
 
@@ -6943,7 +6871,7 @@ msgid "Power"
 msgstr "Moc"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6990,12 +6918,23 @@ msgid "Applicable Type"
 msgstr "Dozwolony typ"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Odnośnik faktury"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+"Jeśli stosujesz warunki zapłaty, to termin płatności zostanie obliczony "
+"automatycznie w trakcie generowania zapisów księgowych (przy zatwierdzaniu "
+"faktury). Warunki płatności mogą zawierać kilka terminów (np. 50% teraz i "
+"50% w ciągu 30dni), ale jeśli chcesz wymusić termin płatności, to upewnij "
+"się, że warunki płatności nie są ustawione na fakturze. Jeśli nie ma ani "
+"warunków płatności, ani terminu zapłaty, to oznacza płatność natychmiastową."
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -7014,12 +6953,12 @@ msgstr ""
 "wieloma podrzędnymi. W takim przypadku kolejność obliczeń ma znaczenie."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -7051,7 +6990,7 @@ msgstr "Zapisy analityczne"
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Ma domyślną firmę"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7091,7 +7030,7 @@ msgid "Optional create"
 msgstr "Opcjonalne tworzenie"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -7102,9 +7041,7 @@ msgstr "Nie możesz zmienić firmy konta, jeśli są na nim zapisy."
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
@@ -7142,9 +7079,14 @@ msgid "Group By..."
 msgstr "Grupuj wg..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Wartość: Saldo"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Nie ma okresu dla tej daty: %s.\n"
+"Utwórz okres."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7224,6 +7166,15 @@ msgstr "Nazwa podatku musi być unikalna w firmie!"
 msgid "Cash Transactions"
 msgstr "Transakcje gotówkowe"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+"Jeśli kasujesz uzgodnienia, to musisz również zweryfikować akcje zależne od "
+"tych transakcji, bo one mogą być ciągle aktywne."
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7241,7 +7192,7 @@ msgstr "Statystyka zapisów analitycznych"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Zapisy: "
@@ -7256,17 +7207,16 @@ msgstr "Waluta dziennika"
 msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
-msgstr ""
+msgstr "Nie możesz podać drugie waluty takiej samej jak pierwotna w firmie."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Faktura dla klienta"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Prawda"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Bilans (konta aktywów)"
@@ -7282,10 +7232,9 @@ msgid "Total debit"
 msgstr "Suma Winien"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Zapis \"%s\" jest niedozwolony !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Następny zapis do uzgodnienia"
 
 #. module: account
 #: report:account.invoice:0
@@ -7338,7 +7287,7 @@ msgstr "Utwórz zapis"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Rachunek zysków i strat (konta wydatków)"
@@ -7349,13 +7298,14 @@ msgid "Total Transactions"
 msgstr "Suma transakcji"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr "Nie możesz usunąć konta, na którym sa zapisy."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
@@ -7392,6 +7342,11 @@ msgstr "Pozycja projektu"
 msgid "Manual"
 msgstr "Ręcznie"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr "Anuluj: Utwórz korektę do zera i uzgodnij"
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7490,8 +7445,8 @@ msgstr "Wybierz dziennik"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Bilans otwarcia"
@@ -7573,7 +7528,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7586,6 +7541,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7641,7 +7601,7 @@ msgid "Done"
 msgstr "Wykonano"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7681,10 +7641,9 @@ msgid "Source Document"
 msgstr "Dokument źródłowy"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr "Brak konta rozchodów dla produktu: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "Konto bankowe do drukowania w stopce każdego dokumentu"
 
 #. module: account
 #: constraint:account.account:0
@@ -7710,7 +7669,7 @@ msgid "Taxes:"
 msgstr "Podatki:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7727,7 +7686,7 @@ msgstr "Dla podatków typu procentowego wpisz współczynnik od 0 do 1."
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Hierarchia raportów finansowych"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7764,7 +7723,7 @@ msgstr "Jesteś pewna(wien), że chcesz otworzyć tę fakturę ?"
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Konto dla sald początkowych wydatków"
 
 #. module: account
 #: view:account.invoice:0
@@ -7909,6 +7868,12 @@ msgstr ""
 "To pole jest stosowane, jeśli tworzysz własny moduł pozwalający tworzyć "
 "specyficzne podatki we własnej domenie."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Odnośnik faktury"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7972,6 +7937,11 @@ msgid ""
 "                                    with the invoice. You will not be able "
 "to modify the credit note."
 msgstr ""
+"Stosuj tę opcję, jeśli chcesz anulować obciążenie siebie lub klienta.\n"
+"                                    Zostanie utworzona faktura korygująca, "
+"która będzie uzgodniona\n"
+"                                    z faktura pierwotną. Nie będzie można "
+"modyfikować korekty."
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -8001,7 +7971,7 @@ msgid "Use model"
 msgstr "Stosuj model"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -8066,7 +8036,7 @@ msgid "Root/View"
 msgstr "Widok/Korzeń"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "DO"
@@ -8135,7 +8105,7 @@ msgid "Maturity Date"
 msgstr "Termin płatności"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Dziennik sprzedaży"
@@ -8146,7 +8116,7 @@ msgid "Invoice Tax"
 msgstr "Podatek faktury"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Brak ilości !"
@@ -8155,7 +8125,7 @@ msgstr "Brak ilości !"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Hierarchia raportów księgowych"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -8187,7 +8157,7 @@ msgid "Sales Properties"
 msgstr "Właściwości sprzedaży"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8212,7 +8182,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Poprawka walutowa"
@@ -8244,7 +8214,7 @@ msgid "May"
 msgstr "Maj"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Zdefiniowano globalne podatki ale ich nie ma w pozycjach !"
@@ -8264,10 +8234,9 @@ msgstr ""
 "największej."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Kod rejestru"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr "Wartośc pozostała w walucie"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8283,17 +8252,12 @@ msgstr "Numeracja korekt"
 msgid "Post Journal Entries"
 msgstr "Zaksięguj zapisy dziennika"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr "Centralizacja strony przeciwnej"
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Klient"
@@ -8309,7 +8273,7 @@ msgstr "Nazwa raportu"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Gotówka"
@@ -8321,9 +8285,11 @@ msgid "Account Destination"
 msgstr "Konto docelowe"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Płatności faktur"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8331,7 +8297,6 @@ msgstr "Płatności faktur"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8471,15 +8436,14 @@ msgid "Partner Ledger"
 msgstr "Księga partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>anulowane</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Stały"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
@@ -8547,7 +8511,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Wybierz walutę dla faktury"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Brak pozycji faktury"
@@ -8627,7 +8591,7 @@ msgid "Associated Partner"
 msgstr "Przypisany partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Musisz najpierw wybrać partnera"
@@ -8709,13 +8673,13 @@ msgstr ""
 "następnych podatków."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Dziennik korekt zakupu"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Zdefiniuj numerację w dzienniku"
@@ -8787,7 +8751,7 @@ msgid "Net Total:"
 msgstr "Suma netto:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr "Wybierz okres początkowy i końcowy"
@@ -8807,14 +8771,6 @@ msgstr "Raportowanie podstawowe"
 msgid "Write-Off Journal"
 msgstr "Dziennik odpisów"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Te warunki płatności będą stosowane zamiast domyślnych dla bieżącego partnera"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8841,11 +8797,6 @@ msgstr "Typ wew."
 msgid "Tax/Base Amount"
 msgstr "Kwota podstawy podatkowej"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Oszacowanie: Procent"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8901,6 +8852,11 @@ msgstr "Rezultat uzgodnienia"
 msgid "Ending Balance"
 msgstr "Saldo końcowe"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr "Centralizacja strony przeciwnej"
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8934,6 +8890,14 @@ msgid ""
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Stosuj tę opcję, aby anulować należności i utworzyć nową\n"
+"                                    fakturę. Korekta do zera zostanie "
+"utworzona i zatwierdzona.\n"
+"                                    oraz uzgodniona z pierwotnymi "
+"należnościami. Poz czym \n"
+"                                    zostanie utworzony projekt nowej faktury "
+"na podstawie\n"
+"                                    pierwotnej."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8941,7 +8905,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatyczny import wyciągu bankowego"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Nieznany błąd!"
@@ -8964,7 +8928,12 @@ msgid "Account Types"
 msgstr "Typy kont"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8974,9 +8943,9 @@ msgstr ""
 "zapisów' w dzienniku."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Wartość: nd."
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Kategoria ZiS/Bilans"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8993,10 +8962,9 @@ msgid "Reconciliation"
 msgstr "Uzgodnienie"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto należności"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Pozostaw puste, aby stosować konto dochodowe"
 
 #. module: account
 #: view:account.invoice:0
@@ -9073,7 +9041,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera stosowane dla tej faktury"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Podatek %.2f%%"
@@ -9091,13 +9059,13 @@ msgid "Payment Term Line"
 msgstr "Pozycja warunków płatności"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Dziennik zakupów"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Wartość"
 
@@ -9126,11 +9094,6 @@ msgstr "Termin płatności"
 msgid "Suppliers"
 msgstr "Dostawcy"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Prawda"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9267,9 +9230,10 @@ msgid "Journal Name"
 msgstr "Nazwa dziennika"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Następny zapis do uzgodnienia"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Zapis \"%s\" jest niedozwolony !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9314,7 +9278,7 @@ msgid ""
 msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9378,7 +9342,7 @@ msgid "Reconciled entries"
 msgstr "Zapisy uzgodnione"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Niepoprawny model!"
@@ -9400,7 +9364,7 @@ msgid "Print Account Partner Balance"
 msgstr "Drukuj bilans partnera"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9440,7 +9404,7 @@ msgstr "nieznany"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dziennik zapisów otwarcia"
@@ -9487,7 +9451,7 @@ msgstr ""
 "podatku, a nie na sumie końcowej."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr "Nie możesz deaktywować konta, które ma zapisy."
@@ -9502,21 +9466,9 @@ msgstr "Podane jako kod Python"
 msgid "Journal Code"
 msgstr "Kod dziennika"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Podaj współczynnik, który będzie zastosowany do doliczenia wartości tego "
-"rejestru do rejestru nadrzędnego. Podaj 1 jeśli chcesz dodać do innych "
-"wartości w nadrzędnym rejestrze lub -1, jeśli chcesz odjąć."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Kwota pozostała"
 
@@ -9549,7 +9501,7 @@ msgid "Unit of Currency"
 msgstr "Jednostka waluty"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Dziennik korekt sprzedaży"
@@ -9619,7 +9571,7 @@ msgid "Purchase Tax(%)"
 msgstr "Podatek zakupu (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Utwórz pozycje faktury."
@@ -9638,7 +9590,7 @@ msgid "Display Detail"
 msgstr "Wyświetl szczegóły"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "FZK"
@@ -9671,6 +9623,17 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * Stan 'Projekt' jest ustawiany w po utworzeniu faktury i w trakcie jej "
+"wprowadzania.             \n"
+"* Stan 'Pro-forma' jest ustawiany, kiedy użytkownik chce wysłać fakturę bez "
+"numeru.             \n"
+"* Stan 'Otwarte' jest ustawiany po zatwierdzeniu faktury (nadaniu jej "
+"numeru) i oczekiwaniu na zapłatę.             \n"
+"* Stan 'Zapłacone' jest ustawiany automatycznie kiedy nadejdzie płatność. "
+"Następuje to po uzgodnieniu pozycji zapisów faktury z pozycjami zapisów "
+"płatności..             \n"
+"* Stan 'Anulowano' jest nadawany po rezygnacji użytkownika z wprowadzania "
+"faktury."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -9755,21 +9718,11 @@ msgstr "Księgowa zatwierdza zapisy z faktury. "
 msgid "Number of Periods"
 msgstr "Liczba okresów"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Szablon rejestru podatkowego"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Zestawienie kont klienta"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Kategoria ZiS/Bilans"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9781,9 +9734,10 @@ msgid "Supplier credit note sequence"
 msgstr "Numeracja korekt od dostawcy"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Następny numer  faktury od dostawcy"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "Faktura jest już uzgodniona"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9802,14 +9756,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Wyciąg bankowy"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto należności"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr "Do uzgodnień wszystkie zapisy muszą być z tej samej firmy."
@@ -9910,8 +9864,8 @@ msgid "Move"
 msgstr "Zapis"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9989,17 +9943,14 @@ msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"To pole zawiera informacje związane z numeracją zapisów księgowych danego "
+"dziennika."
 
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
 msgstr "Wysłane"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transakcje kasowania uzgodnień"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -10017,11 +9968,16 @@ msgid "Balance :"
 msgstr "Saldo :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr "Nie można tworzyć pozycji z różnych firm."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr "Operacje okresowe"
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -10058,15 +10014,6 @@ msgstr "Subskrypcja"
 msgid "Account Analytic Balance"
 msgstr "Bilans analityczny"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-"Utwórz korektę. Nie możesz modyfikować albo anulować faktury, która jest już "
-"uzgodniona."
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -10106,7 +10053,13 @@ msgid "Due date"
 msgstr "Termin płatności"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr "Płatność natychmiastowa"
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr " Centralizacja"
@@ -10201,7 +10154,7 @@ msgid "Unreconciled"
 msgstr "Skasowano uzgodnienie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Zła suma !"
@@ -10286,7 +10239,7 @@ msgid "Comparison"
 msgstr "Porównanie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10307,6 +10260,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10362,11 +10320,6 @@ msgstr "Ma"
 msgid "Draft Invoice "
 msgstr "Projekt faktury "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr "Anuluj: utwórz korektę do zera i uzgodnij"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10378,7 +10331,7 @@ msgid "Journal Entry Model"
 msgstr "Model zapisów"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr "Okres początkowy musi poprzedzać końcowy."
@@ -10463,7 +10416,7 @@ msgid "Profit (Loss) to report"
 msgstr "Zysk (strata) do raportu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr "Brak dziennika Sprzedaży/Zakupu."
@@ -10790,7 +10743,16 @@ msgid "Empty Accounts ? "
 msgstr "Puste konta ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+"Jeśli kasujesz uzgodnienia, to musisz również zweryfikować akcje zależne od "
+"tych transakcji, bo one mogą być ciągle aktywne."
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Nie można zmieniac podatku!"
@@ -10822,6 +10784,9 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Z tego raportu możesz dowiedzieć się o kwotach zafakturowanych klientom. "
+"Narzędzie do wyszukiwania może być stosowane do dostosowania tej analizy do "
+"konkretnych twoich potrzeb."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -10915,7 +10880,7 @@ msgid "Receivable accounts"
 msgstr "Konta należności"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "Już uzgodnione"
@@ -11046,7 +11011,7 @@ msgid "Entries Sorted by"
 msgstr "Sortowanie zapisów"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11152,7 +11117,7 @@ msgid "Accounting Documents"
 msgstr "Dokumenty księgowe"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11199,7 +11164,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ręczne podatki faktur"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr "Warunki płatności dostawcy nie mają pozycji."
@@ -11280,16 +11245,6 @@ msgstr "Strata"
 msgid "February"
 msgstr "Luty"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Jeśli nadasz nazwę (numer) inną niż /, to zapis księgowy będzie miał ten sam "
-"numer (nazwę) co wyciąg. To pozwala mieć te same numery wyciągów i zapisów."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11348,6 +11303,11 @@ msgstr "Szablon mapowania fiskalnego konta"
 msgid "Expense Account on Product Template"
 msgstr "Konto wydatków dla szablonu produktu"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr "Warunki płatności dla klienta"
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11464,6 +11424,9 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Uzgadnianie płatności"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesy okresowe"
+
 #~ msgid "Line"
 #~ msgstr "Pozycja"
 
@@ -11519,6 +11482,13 @@ msgstr ""
 #~ msgid "You must select accounts to reconcile"
 #~ msgstr "Musisz wybrać konta do uzgodnienia"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Pole sekwencji jest stosowane do porządkowania warunków płatności od "
+#~ "sekwencji najniższej do najwyższej."
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Drukuj dzienniki analityczne"
 
@@ -11640,6 +11610,9 @@ msgstr ""
 #~ msgid "Taxes Reports"
 #~ msgstr "Raporty podatkowe"
 
+#~ msgid "Litigation"
+#~ msgstr "Spór sądowy"
+
 #, python-format
 #~ msgid "Already Reconciled"
 #~ msgstr "Już uzgodnione"
@@ -11750,6 +11723,12 @@ msgstr ""
 #~ msgid "Compute Taxes"
 #~ msgstr "Oblicz podatki"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Te warunki płatności będą stosowane zamiast domyślnych dla bieżącego partnera"
+
 #~ msgid "Entry encoding"
 #~ msgstr "Wprowadzanie zapisów"
 
@@ -12113,6 +12092,10 @@ msgstr ""
 #~ msgid "Description on invoices"
 #~ msgstr "Opis do faktur"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Faktura od dostawcy"
+
 #~ msgid "New Supplier Invoice"
 #~ msgstr "Nowa faktura od dostawcy"
 
@@ -12282,6 +12265,9 @@ msgstr ""
 #~ msgid "Amount paid"
 #~ msgstr "Kwota zapłacona"
 
+#~ msgid "Line Name"
+#~ msgstr "Nazwa pozycji"
+
 #~ msgid "Fiscal Position Template Account Mapping"
 #~ msgstr "Mapowanie szablonów kont obszarów podatkowych"
 
@@ -12693,9 +12679,6 @@ msgstr ""
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
 
-#~ msgid "Fixed"
-#~ msgstr "Stały"
-
 #~ msgid "Negative"
 #~ msgstr "Ujemne"
 
@@ -12948,6 +12931,13 @@ msgstr ""
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statystyka zapisów analitycznych"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Jeśli skasujesz uzgodnienie transakcji, to musisz sprawdzić wszystkie akcje "
+#~ "powiązane z tymi transakcjami, ponieważ one nie zostaną zdezaktywowane."
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Analityka Ma"
 
@@ -13153,6 +13143,9 @@ msgstr ""
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. lub przenieś nazwę"
 
@@ -13165,6 +13158,13 @@ msgstr ""
 #~ msgid "Other Configuration"
 #~ msgstr "Inna konfiguracja"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Jeśli skasujesz uzgodnienie transakcji, to musisz również sprawdzić akcje "
+#~ "związane z tymi transakcjami, ponieważ one nie będą usunięte."
+
 #~ msgid "Account currency"
 #~ msgstr "Waluta konta"
 
@@ -13371,6 +13371,9 @@ msgstr ""
 #~ msgid "Starting Date"
 #~ msgstr "Data początkowa"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank i czeki"
+
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Bilans (konta aktywów)"
 
@@ -13393,6 +13396,9 @@ msgstr ""
 #~ msgid "Sort By"
 #~ msgstr "Sortuj wg"
 
+#~ msgid "Communication"
+#~ msgstr "Komunikacja"
+
 #~ msgid "Invoicing Data"
 #~ msgstr "Dane fakturowane"
 
@@ -13409,6 +13415,9 @@ msgstr ""
 #~ msgid "Move journal"
 #~ msgstr "Dziennik zapisu"
 
+#~ msgid "Valuation"
+#~ msgstr "Wycena"
+
 #, python-format
 #~ msgid "New currency is not confirured properly !"
 #~ msgstr "Nowa waluta jest niepoprawnie skonfigurowana !"
@@ -13776,6 +13785,9 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Transakcje gotówkowe"
 
+#~ msgid "Line 2:"
+#~ msgstr "Pozycja 2:"
+
 #~ msgid "Gives the sequence order to journal column."
 #~ msgstr "Ustala kolejność kolumn w dzienniku"
 
@@ -13854,6 +13866,9 @@ msgstr ""
 #~ "Zapis faktury został całkowicie uzgodniony z jednym lub kilkoma zapisami "
 #~ "płatności."
 
+#~ msgid "Line 1:"
+#~ msgstr "Pozycja 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Pozycja \"%s\" jest niepoprawna"
@@ -14130,6 +14145,9 @@ msgstr ""
 #~ msgid "You can not modify/delete a journal with entries for this period !"
 #~ msgstr "Nie możesz modyfikować/usuwać dziennika z zapisami dla tego okresu !"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "-"
 #~ msgstr "-"
 
@@ -14159,6 +14177,9 @@ msgstr ""
 #~ msgid "Sale journal in this year"
 #~ msgstr "Dziennik sprzedaży w tym roku"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "2 procent upustu do 14 dni i pozostałość 30 dni od końca miesiąca"
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -14201,9 +14222,16 @@ msgstr ""
 #~ msgid "Configure Your Chart of Accounts"
 #~ msgstr "Konfiguruj plan kont"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Faktura  '%s' jest zatwierdzona."
+
 #~ msgid "Month-1"
 #~ msgstr "Miesiąc-1"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dzień miesiąca: 0"
+
 #~ msgid "Quantity :"
 #~ msgstr "Ilość:"
 
@@ -14216,9 +14244,18 @@ msgstr ""
 #~ msgid "Reference UoM"
 #~ msgstr "Referencyjna JM"
 
+#~ msgid "Example"
+#~ msgstr "Przykład"
+
 #~ msgid "My invoices"
 #~ msgstr "Moje faktury"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Faktura (Ref ${object.number or 'n/a' })"
+
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Liczba dni: 14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Ta akcja usunie podatki"
 
@@ -14293,6 +14330,9 @@ msgstr ""
 #~ "wydziały. Większość operacji OpenERP (faktury, karty czasu pracy, wydatki, "
 #~ "itp) generują zapisy na kontach analitycznych."
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Oszacowanie: Procent"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -14619,6 +14659,9 @@ msgstr ""
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "Nie zdefiniowano dziennika końca roku dla tego roku podatkowego"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Kowta: 0.02"
+
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "Kod waluty musi być unikalny w firmie !"
 
@@ -14659,6 +14702,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Drukuj raport z kolumną waluty, jeśli waluta jest inna niż waluta firmy."
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Liczba dni: 30"
+
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dzień miesiąca= -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr "Błąd! data początku roku musi być przed datą końca roku."
 
@@ -14839,3 +14888,9 @@ msgstr ""
 
 #~ msgid "."
 #~ msgstr "."
+
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Wartość: Saldo"
+
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Wartość: nd."
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index d8e8d89743a..67140c94bb0 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 15:21+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-19 05:16+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Desreconciliar transacções"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Importar da fatura ou pagamento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -93,15 +88,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Débito Total"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Se desconciliar as transações, também deve verificar todas as ações ligadas "
-"a essas transações pois elas não serão desativadas"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +100,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +130,19 @@ msgstr ""
 "pagamento sem o remover."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +154,7 @@ msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diário Diverso"
@@ -241,11 +226,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Templates de Impostos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -261,6 +241,11 @@ msgstr "Os movimentos contabilísticos são uma das entradas da reconciliação.
 msgid "Belgian Reports"
 msgstr "Relatórios belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +380,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr "Vendedor"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -454,6 +434,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -469,6 +454,11 @@ msgstr "Período"
 msgid "Chart Template"
 msgstr "Template de plano de contas"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -630,15 +620,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestralmente"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Se desconciliar transações, deve também verificar todas as ações que estão "
-"ligadas a essas transações porque estas não ficarão desativadas"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -687,7 +668,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -700,13 +681,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Relatório de Vendas por Tipo de Conta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -769,6 +750,11 @@ msgstr "Contas a Receber"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -793,6 +779,12 @@ msgstr "Reabrir"
 msgid "Are you sure you want to create entries?"
 msgstr "De certeza que quer criar os movimentos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -813,6 +805,7 @@ msgstr "Mostrar hierarquia descendente"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentagem"
 
@@ -855,7 +848,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,26 +873,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Faturas de fornecedores e Reembolsos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Anular reconciliação"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Aos 14 dias 2 por cento do valor líquido, e o montante restante em 30 dias "
-"no final do mês."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -930,11 +915,6 @@ msgstr "J.C./Nome do movimento"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -970,7 +950,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -985,6 +965,7 @@ msgstr "Nova Subscrição"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Processamento"
 
@@ -1016,11 +997,8 @@ msgid "Purchase journal"
 msgstr "Diário de compras"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1056,7 +1034,7 @@ msgid "Liability"
 msgstr "Responsabilidade"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Por favor, defina sequência no diário relacionado a esta fatura."
@@ -1130,10 +1108,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1211,8 +1189,9 @@ msgid "Refund "
 msgstr "Reembolso "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1258,7 +1237,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1556,9 +1535,9 @@ msgid "Account Receivable"
 msgstr "Conta a receber"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1572,7 +1551,7 @@ msgid "With balance is not equal to 0"
 msgstr "Com saldo diferente de 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1627,7 +1606,7 @@ msgstr "Saltar o estado \"Rascunho\" para lançamentos manuais"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1672,6 +1651,12 @@ msgstr "Tabela temporária usada para o painel"
 msgid "Supplier Refunds"
 msgstr "Notas de crédito de fornecedores"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código do caso"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1709,7 +1694,6 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Sem imposto"
@@ -1842,6 +1826,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Vendas por tipo de conta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1862,115 +1852,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2081,6 +1967,11 @@ msgstr "Estes períodos podem sobrepor-se."
 msgid "Draft statement"
 msgstr "Estado de rascunho"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2109,26 +2000,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2136,16 +2026,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2156,8 +2046,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2202,7 +2092,7 @@ msgid "period close"
 msgstr "Fechar período"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2302,7 +2192,7 @@ msgid "Product Category"
 msgstr "Categoria do Artigo"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2673,7 +2563,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Mantenha vazio para o ano fiscal"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2691,7 +2581,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Criar uma conta baseada neste modelo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2712,7 +2602,7 @@ msgid "Main Sequence"
 msgstr "Sequência principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2722,14 +2612,12 @@ msgstr ""
 "de periodos relacionados."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Prazo de pagamento"
 
@@ -2755,18 +2643,6 @@ msgstr "Assinale esta caixa"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Em aberto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2778,6 +2654,11 @@ msgstr "Estado de rascunho de uma fatura"
 msgid "Account Properties"
 msgstr "Propriedades da conta"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2855,25 +2736,20 @@ msgid "Account Model Entries"
 msgstr "Modelo de Movimentos da Conta"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Criar nota de crédito"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impostos do Fornecedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "entradas"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalhes bancários"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2896,7 +2772,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2910,9 +2785,8 @@ msgstr ""
 "várias datas de vendimento- ex: 50% a pronto e 50% num mês."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2942,6 +2816,7 @@ msgstr "Conciliar movimento da linha da conta (eliminar)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Imposto"
 
@@ -2977,14 +2852,14 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3082,6 +2957,12 @@ msgstr "Pago/Conciliado"
 msgid "Refund Base Code"
 msgstr "Código base de nota de crédito"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extratos bancários"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3134,11 +3015,6 @@ msgstr "Antiguidade saldos de parceiros"
 msgid "Accounting entries"
 msgstr "Lançamentos contabilísticos"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tipo de comunicação"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3184,7 +3060,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3197,7 +3073,7 @@ msgid "Sales by Account"
 msgstr "Vendas por conta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3213,15 +3089,15 @@ msgid "Sale journal"
 msgstr "Diário de vendas"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Tem que definir um diário analítico no diário '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3229,7 +3105,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3294,9 +3170,10 @@ msgstr ""
 "em certos relatórios."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Linha 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3344,12 +3221,6 @@ msgstr "Montante de código base"
 msgid "Default Sale Tax"
 msgstr "Taxa pré-definida para vendas"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Fatura '% s' está validada."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3386,7 +3257,7 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3415,7 +3286,7 @@ msgid "Trial Balance"
 msgstr "Balancete de Verificação"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3485,7 +3356,7 @@ msgstr ""
 "ter de usar o câmbio do dia. Nas compras é sempre usado o câmbio do dia."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3497,9 +3368,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Nº de dígitos para usar no código da conta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nome da linha"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3548,7 +3419,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3569,15 +3440,20 @@ msgstr "Faturas proforma"
 msgid "Electronic File"
 msgstr "Ficheiro eletrônico"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dia do mês: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Template do Código de Imposto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3585,9 +3461,88 @@ msgid "Account Partner Ledger"
 msgstr "Balancete de Contas do Parceiro"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3724,12 +3679,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Montante do valor: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Se der outro nome além de  /, serão criados movimentos contabilísticos com o "
+"mesmo nome do extrato. Isto permite que os movimentos do extrato tenham as "
+"mesmas referências que o extracto em si."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3744,7 +3705,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nenhum parceiro definido!"
@@ -3947,7 +3908,7 @@ msgid "Period Length (days)"
 msgstr "Duração do período (dias)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3971,7 +3932,7 @@ msgid "Category of Product"
 msgstr "Categoria de artigo"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4108,7 +4069,7 @@ msgid "Chart of Accounts Template"
 msgstr "Template do Plano de Contas"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4198,9 +4159,15 @@ msgid "Qty"
 msgstr "Quantidade"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litígio"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Pode especificar aqui o coeficiente que será utilizado quando consolidando o "
+"montante deste caso no seu ascendente. Por exemplo, defina 1/-1 se quer "
+"adicionar/subtrai-lo."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4284,11 +4251,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4306,11 +4268,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Configurar as suas contas bancárias"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4357,8 +4314,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Não se pode usar uma conta inativa."
@@ -4388,7 +4345,7 @@ msgid "Consolidated Children"
 msgstr "Dependentes consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4426,11 +4383,6 @@ msgstr ""
 msgid "title"
 msgstr "título"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Criar um rascunho de nota de crédito"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4520,6 +4472,13 @@ msgstr "30 dias fim do mês"
 msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4541,6 +4500,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Postados Items do Diário"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4551,11 +4515,6 @@ msgstr "Pesquisar Templates de Imposto"
 msgid "Draft Entries"
 msgstr "Lançamentos rascunho"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dia do mês=  -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4564,11 +4523,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Número de dias: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4592,20 +4546,9 @@ msgid "Account Type"
 msgstr "Tipo de Conta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Fechar a caixa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4628,9 +4571,20 @@ msgstr ""
 "contas analíticas, Estes geram rascunhos de faturas do fornecedor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Fechar a caixa"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4662,7 +4616,7 @@ msgid "Month"
 msgstr "Mês"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4673,8 +4627,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4698,6 +4652,11 @@ msgstr "Conta Paypal"
 msgid "Acc.Type"
 msgstr "Tipo de conta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4710,7 +4669,7 @@ msgstr "Inverter equilíbrio  do sinal"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Folha de Balanços (Conta do passivo)"
@@ -4732,7 +4691,7 @@ msgid "Account Base Code"
 msgstr "Código de Conta Base"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4787,11 +4746,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Processamento periódico"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4821,10 +4775,9 @@ msgid "Account chart"
 msgstr "Plano de contas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factura de Fornecedor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4892,10 +4845,14 @@ msgstr "Notas de crédito"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4951,7 +4908,7 @@ msgstr ""
 "outra empresa."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4966,7 +4923,7 @@ msgid "Based On"
 msgstr "Baseado em"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4991,11 +4948,6 @@ msgstr ""
 msgid "Change"
 msgstr "Alterar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco e cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5018,11 +4970,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado(a)"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Exemplo"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5033,11 +4980,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Manter vazia para usar a conta de despesas"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5047,7 +4989,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Imposto da Compra %.2f%%"
@@ -5121,16 +5063,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "MISC"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} fatura (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5244,6 +5181,7 @@ msgstr "Adicionar"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pago"
 
@@ -5270,7 +5208,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Período da abertura"
@@ -5285,14 +5223,6 @@ msgstr "Lançamentos a rever"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5305,7 +5235,7 @@ msgid "Tax Application"
 msgstr "Aplicação do imposto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5338,9 +5268,9 @@ msgid "End of period"
 msgstr "Fim do período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalhes bancários"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pagamento de faturas"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5436,14 +5366,6 @@ msgstr "Descrição do imposto"
 msgid "Child Tax Accounts"
 msgstr "Contas de imposto dependentes"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5490,7 +5412,7 @@ msgid "Target Moves"
 msgstr "Movimentos alvo"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5526,6 +5448,7 @@ msgid "Python Code (reverse)"
 msgstr "Código python (reverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5542,12 +5465,6 @@ msgstr ""
 "a venda e as taxas de compra ou escolher uma lista de impostos. Esta última "
 "opção pressupõe que o conjunto de impostos definido neste template é completo"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5573,18 +5490,13 @@ msgstr "Ano"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linha 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nome Interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5623,7 +5535,7 @@ msgstr "Balanço"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Lucro & prejuízo (Rendimento da conta)"
@@ -5656,7 +5568,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Processar código (se tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5683,6 +5595,7 @@ msgstr "Reconciliação automática"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5786,7 +5699,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5816,7 +5729,7 @@ msgid "Amount Computation"
 msgstr "Processamento de Conta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5852,10 +5765,16 @@ msgid "Account Common Account Report"
 msgstr "Relatório de Contas Comum"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicação"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Em aberto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5885,9 +5804,7 @@ msgstr "Códigos de imposto"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Nota de crédito a cliente"
 
@@ -5904,11 +5821,6 @@ msgstr "Sinal do código de imposto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Relatório de Faturas Criadas nos últimos 15 dias"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Número de dias: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5925,6 +5837,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Valor a pagar"
@@ -6016,8 +5929,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6040,6 +5951,13 @@ msgstr "Texto Normal"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Movimentos de pagamento são a segunda entrada para a reconciliação."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6049,15 +5967,6 @@ msgstr ""
 "Numero de montantes parciais que podem ser combinados para encontrar um "
 "saldo podem ser escolhidos com o poder da reconciliação automática"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"O campo de sequência é usado para ordenar as linhas de termos de pagamento "
-"das sequências mais baixas para as mais altas"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6115,12 +6024,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Montante Fixo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6144,7 +6052,6 @@ msgstr "Gerar lançamento de abertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "O método de cálculo do imposto."
 
@@ -6172,18 +6079,23 @@ msgid "Child Accounts"
 msgstr "Conta-filha"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nome movimento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Fechar"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "entradas"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6200,7 +6112,7 @@ msgstr "Receita"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -6220,16 +6132,11 @@ msgid "Account n°"
 msgstr "Conta nº"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referência livre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Avaliação"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6345,7 +6252,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Tem um erro de expressão \"%(...)s\" no seu modelo!"
@@ -6392,6 +6299,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Numero de dias"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6535,7 +6450,7 @@ msgid "Models"
 msgstr "Modelos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6715,7 +6630,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "Não se pode criar entradas em diário numa conta já fechada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6746,12 +6661,6 @@ msgstr ""
 msgid "Current"
 msgstr "Atual"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6776,7 +6685,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentagem"
 
@@ -6796,7 +6704,7 @@ msgid "Power"
 msgstr "Energia"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Não é possível gerar um código Diário não utilizado."
@@ -6843,12 +6751,17 @@ msgid "Applicable Type"
 msgstr "Tipo aplicável"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referência da Fatura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6867,12 +6780,12 @@ msgstr ""
 "vários impostos dependentes. Neste caso a ordem de avaliação é importante."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6947,7 +6860,7 @@ msgid "Optional create"
 msgstr "Criar Opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6959,9 +6872,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Nota de crédito de fornecedores"
 
@@ -6999,9 +6910,12 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Avaliação: Balanço"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7079,6 +6993,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Transações a dinheiro"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7096,7 +7017,7 @@ msgstr "Estatísticas de Movimentos Analíticos"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Movimentos: "
@@ -7114,14 +7035,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadeiro"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Folha de balanços (conta ativa)"
@@ -7137,10 +7057,9 @@ msgid "Total debit"
 msgstr "Total debito"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "A entada \"%s\" não é valida !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Próximas entradas de parceiros a conciliar"
 
 #. module: account
 #: report:account.invoice:0
@@ -7193,7 +7112,7 @@ msgstr "Criar movimento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Lucro & Prejuízo (conta de Despesa)"
@@ -7204,13 +7123,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -7247,6 +7167,11 @@ msgstr "Linha do projecto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7353,8 +7278,8 @@ msgstr "Seleção de diário"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo de abertura"
@@ -7436,7 +7361,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7457,6 +7382,11 @@ msgstr ""
 "\n"
 "Ex. Meu modelo em %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7512,7 +7442,7 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7550,9 +7480,8 @@ msgid "Source Document"
 msgstr "Documento de origem"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7579,7 +7508,7 @@ msgid "Taxes:"
 msgstr "Impostos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7776,6 +7705,12 @@ msgstr ""
 "Este campo é usado apenas se desenvolver o seu próprio módulo permitindo aos "
 "desenvolvedores criar impostos específicos num domínio personalizado."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referência da Fatura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7868,7 +7803,7 @@ msgid "Use model"
 msgstr "Usar modelo"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7919,7 +7854,7 @@ msgid "Root/View"
 msgstr "Origem / Vista"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7988,7 +7923,7 @@ msgid "Maturity Date"
 msgstr "Data de vencimento"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diário de Vendas"
@@ -7999,7 +7934,7 @@ msgid "Invoice Tax"
 msgstr "Taxa de faturação"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Nenhum número à parte !"
@@ -8043,7 +7978,7 @@ msgid "Sales Properties"
 msgstr "Propriedades da venda"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8068,7 +8003,7 @@ msgstr "Para"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustar Moeda"
@@ -8102,7 +8037,7 @@ msgid "May"
 msgstr "Maio"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8123,10 +8058,9 @@ msgstr ""
 "sequências mais baixas às mais altas."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Código do caso"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8142,17 +8076,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Movimentos de diário publicados"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8168,7 +8097,7 @@ msgstr "Nome do relatório"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Dinheiro"
@@ -8180,9 +8109,11 @@ msgid "Account Destination"
 msgstr "Destino da conta"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pagamento de faturas"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8190,7 +8121,6 @@ msgstr "Pagamento de faturas"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8330,15 +8260,14 @@ msgid "Partner Ledger"
 msgstr "Balancete de Paceiros"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fixo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -8406,7 +8335,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Selecione uma Moeda a aplicar à fatura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Não há linhas na fatura!"
@@ -8486,7 +8415,7 @@ msgid "Associated Partner"
 msgstr "Parceiro associado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primeiro deve selecionar um parceiro !"
@@ -8568,13 +8497,13 @@ msgstr ""
 "antes processar os próximos impostos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diário de retorno de compras"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8647,7 +8576,7 @@ msgid "Net Total:"
 msgstr "Total Líquido:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8667,15 +8596,6 @@ msgstr "Relatórios Genéricos"
 msgid "Write-Off Journal"
 msgstr "Diário de Regularizações"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Estas condições de pagamento são usadas no lugar das pré-definidas para o "
-"parceiro atual."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8702,11 +8622,6 @@ msgstr "Tipo de int."
 msgid "Tax/Base Amount"
 msgstr "Montante base/imposto"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Validação: Percentagem"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8760,6 +8675,11 @@ msgstr "Resultado da reconciliação"
 msgid "Ending Balance"
 msgstr "Balancete Final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8802,7 +8722,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Importação automática do extrato bancário"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Erro desconhecido!"
@@ -8825,7 +8745,12 @@ msgid "Account Types"
 msgstr "Tipos de Conta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8833,9 +8758,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Quantidade Valor: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / Categoria BS"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8852,10 +8777,9 @@ msgid "Reconciliation"
 msgstr "Reconciliação"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Conta a Receber"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Manter vazia para usar a conta de despesas"
 
 #. module: account
 #: view:account.invoice:0
@@ -8935,7 +8859,7 @@ msgid "The partner account used for this invoice."
 msgstr "A conta do parceiro usada para esta fatura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Imposto %.2f%%"
@@ -8953,13 +8877,13 @@ msgid "Payment Term Line"
 msgstr "Linha de prazos de pagamento"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diário de Compra"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8988,11 +8912,6 @@ msgstr "Data de Vencimento"
 msgid "Suppliers"
 msgstr "Fornecedores"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadeiro"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9129,9 +9048,10 @@ msgid "Journal Name"
 msgstr "Nome do Diário"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Próximas entradas de parceiros a conciliar"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "A entada \"%s\" não é valida !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9179,7 +9099,7 @@ msgstr ""
 "moeda."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9242,7 +9162,7 @@ msgid "Reconciled entries"
 msgstr "Movimentos reconciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Modelo errado !"
@@ -9264,7 +9184,7 @@ msgid "Print Account Partner Balance"
 msgstr "Imprima o Saldo de Conta do Terceiro"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9304,7 +9224,7 @@ msgstr "desconhecido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diário de Abertura"
@@ -9351,7 +9271,7 @@ msgstr ""
 "valor total."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9366,21 +9286,9 @@ msgstr "Dado por Código Python"
 msgid "Journal Code"
 msgstr "Código do Diário"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Pode especificar aqui o coeficiente que será utilizado quando consolidando o "
-"montante deste caso no seu ascendente. Por exemplo, defina 1/-1 se quer "
-"adicionar/subtrai-lo."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Valor residual"
 
@@ -9413,7 +9321,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diário de notas de crédito de vendas"
@@ -9479,7 +9387,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposto para compras (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor, crie primeiro algumas linhas na fatura"
@@ -9498,7 +9406,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalhes"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9616,21 +9524,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Número de períodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Template do Código de Imposto"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: Extrato de conta do cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / Categoria BS"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9642,8 +9540,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9663,14 +9562,14 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extratos bancários"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Conta a Receber"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9773,8 +9672,8 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9854,11 +9753,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transacções não reconciliadas"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9876,11 +9770,16 @@ msgid "Balance :"
 msgstr "Saldo:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9917,13 +9816,6 @@ msgstr "Subscrição"
 msgid "Account Analytic Balance"
 msgstr "Saldo da conta analítica"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9963,7 +9855,13 @@ msgid "Due date"
 msgstr "Data de vencimento"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10059,7 +9957,7 @@ msgid "Unreconciled"
 msgstr "Desconciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Mau total !"
@@ -10151,7 +10049,7 @@ msgid "Comparison"
 msgstr "Comparação"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10169,6 +10067,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10224,11 +10127,6 @@ msgstr "Crédito"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10240,7 +10138,7 @@ msgid "Journal Entry Model"
 msgstr "Modelo de Movimento de Diário"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10325,7 +10223,7 @@ msgid "Profit (Loss) to report"
 msgstr "Lucro (Prejuízo) para relatar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10655,7 +10553,14 @@ msgid "Empty Accounts ? "
 msgstr "Contas vazias? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10780,7 +10685,7 @@ msgid "Receivable accounts"
 msgstr "Contas que se pode receber"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10913,7 +10818,7 @@ msgid "Entries Sorted by"
 msgstr "Entradas classificadas por"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11019,7 +10924,7 @@ msgid "Accounting Documents"
 msgstr "Documentos Contabilísticos"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11065,7 +10970,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Imposto de faturação manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11146,17 +11051,6 @@ msgstr ""
 msgid "February"
 msgstr "Fevereiro"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Se der outro nome além de  /, serão criados movimentos contabilísticos com o "
-"mesmo nome do extrato. Isto permite que os movimentos do extrato tenham as "
-"mesmas referências que o extracto em si."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11215,6 +11109,11 @@ msgstr "Template de Mapeamento Fiscal de Conta"
 msgid "Expense Account on Product Template"
 msgstr "Conta de Gastos no Template do Artigo"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11267,9 +11166,6 @@ msgstr ""
 #~ msgid "Reconciliation result"
 #~ msgstr "Resultado da reconciliação"
 
-#~ msgid "Fixed"
-#~ msgstr "Fixo"
-
 #~ msgid "Origin"
 #~ msgstr "Origem"
 
@@ -11289,9 +11185,16 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Estado"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Processamento periódico"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Estat. Mov. Analíticos"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de Fornecedor"
+
 #~ msgid "Line"
 #~ msgstr "Linha"
 
@@ -11391,6 +11294,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Impostos de compras"
 
+#~ msgid "Line Name"
+#~ msgstr "Nome da linha"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Credito analítico"
 
@@ -11543,6 +11449,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Use este código para a declaração de IVA"
 
+#~ msgid "Litigation"
+#~ msgstr "Litígio"
+
 #, python-format
 #~ msgid "Already Reconciled"
 #~ msgstr "Já foi reconciliado"
@@ -11900,6 +11809,9 @@ msgstr ""
 #~ msgid "No period found !"
 #~ msgstr "Nenhum período encontrado!"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. ou nome do movimento."
 
@@ -12130,6 +12042,9 @@ msgstr ""
 #~ msgid "Cash Receipt"
 #~ msgstr "Recibo"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Account Code"
 #~ msgstr "Código da Conta"
 
@@ -12343,6 +12258,13 @@ msgstr ""
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Imprimir Diários Analíticos"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "O campo de sequência é usado para ordenar as linhas de termos de pagamento "
+#~ "das sequências mais baixas para as mais altas"
+
 #~ msgid "Total write-off"
 #~ msgstr "Valor Regularizado Total"
 
@@ -13017,6 +12939,9 @@ msgstr ""
 #~ msgid "Configure Fiscal Year"
 #~ msgstr "Configurar o ano fiscal"
 
+#~ msgid "Line 2:"
+#~ msgstr "Linha 2:"
+
 #, python-format
 #~ msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 #~ msgstr "A fatura '%s' está parcialmente paga: %s%s de %s%s (falta %s%s)"
@@ -13047,6 +12972,9 @@ msgstr ""
 #~ msgid "  day of the month: 0"
 #~ msgstr "  dia do mês: 0"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco e cheques"
+
 #~ msgid "Salesman"
 #~ msgstr "Vendedor"
 
@@ -13196,6 +13124,9 @@ msgstr ""
 #~ msgid "Starting Date"
 #~ msgstr "Data de início"
 
+#~ msgid "Line 1:"
+#~ msgstr "Linha 1:"
+
 #, python-format
 #~ msgid ""
 #~ "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
@@ -13239,9 +13170,15 @@ msgstr ""
 #~ msgid "Check Date not in the Period"
 #~ msgstr "Verificar datas fora do período"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicação"
+
 #~ msgid "Valid Up to"
 #~ msgstr "Valido até"
 
+#~ msgid "Valuation"
+#~ msgstr "Avaliação"
+
 #, python-format
 #~ msgid "not implemented"
 #~ msgstr "não implementado"
@@ -14324,12 +14261,19 @@ msgstr ""
 #~ "Precisa de um diário de abertura com a centralização marcada para definir o "
 #~ "saldo inicial!"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Fatura '% s' está validada."
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Tipos de vendas destes meses"
 
 #~ msgid "Month-1"
 #~ msgstr "Mês-1"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dia do mês: 0"
+
 #, python-format
 #~ msgid "The closing balance should be the same than the computed balance!"
 #~ msgstr ""
@@ -14339,6 +14283,9 @@ msgstr ""
 #~ msgid "Quantity :"
 #~ msgstr "Quantidade :"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Montante do valor: 0.02"
+
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "O código da moeda deve ser único por empresa!"
 
@@ -14355,6 +14302,9 @@ msgstr ""
 #~ "contrapartida centralizado no diário relacionado a partir do menu de "
 #~ "configuração."
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Número de dias: 30"
+
 #, python-format
 #~ msgid ""
 #~ "You haven't supplied enough argument to compute the initial balance, please "
@@ -14363,6 +14313,9 @@ msgstr ""
 #~ "Não forneceu argumentos suficientes para calcular o saldo inicial, selecione "
 #~ "um período e diário no contexto."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dia do mês=  -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Erro! A data de início do ano fiscal deve ser anterior da data de fim."
@@ -14395,6 +14348,9 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Erro de codificação"
 
+#~ msgid "Example"
+#~ msgstr "Exemplo"
+
 #~ msgid ""
 #~ "Configuration Error!\n"
 #~ "You can not define children to an account with internal type different of "
@@ -14407,6 +14363,9 @@ msgstr ""
 #~ msgid "My invoices"
 #~ msgstr "As minhas faturas"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} fatura (Ref ${object.number or 'n/a' })"
+
 #~ msgid "Analytic Accounts with a past deadline."
 #~ msgstr "Contas Analíticas com um prazo limite passado."
 
@@ -14429,6 +14388,9 @@ msgstr ""
 #~ "No ano fiscal definido para esta data!\n"
 #~ "Por favor criar um a partir da configuração do menu da contabilidade."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Número de dias: 14"
+
 #, python-format
 #~ msgid "Current currency is not configured properly !"
 #~ msgstr "Moeda atual não está configurada corretamente!"
@@ -14450,6 +14412,9 @@ msgstr ""
 #~ "Não pode remover / desactivar uma conta que é definida num cliente ou "
 #~ "fornecedor."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Avaliação: Balanço"
+
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "A empresa deve ser a mesma para sua conta relacionada e período."
 
@@ -14568,9 +14533,15 @@ msgstr ""
 #~ "No período definido para esta data: %s \n"
 #~ "Por favor, crie uma."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Quantidade Valor: n.a"
+
 #~ msgid "current month"
 #~ msgstr "mês atual"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Validação: Percentagem"
+
 #~ msgid "Contacts"
 #~ msgstr "Contactos"
 
@@ -14642,6 +14613,11 @@ msgstr ""
 #~ "Não pode cancelar uma fatura que é parcialmente paga! Precisa desreconciliar "
 #~ "as entradas de pagamento e afins em primeiro lugar!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Aos 14 dias 2 por cento do valor líquido, e o montante restante em 30 dias "
+#~ "no final do mês."
+
 #~ msgid "Modify: refund invoice, reconcile and create a new draft invoice"
 #~ msgstr ""
 #~ "Modificar: fatura reembolso, conciliar e criar um novo projeto de fatura"
@@ -14918,6 +14894,13 @@ msgstr ""
 #~ msgid "Unreconciliate transactions"
 #~ msgstr "Desconciliar transações"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Se desconciliar as transações, também deve verificar todas as ações ligadas "
+#~ "a essas transações pois elas não serão desativadas"
+
 #~ msgid ""
 #~ "When journal period is created. The state is 'Draft'. If a report is printed "
 #~ "it comes to 'Printed' state. When all transactions are done, it comes in "
@@ -15179,6 +15162,13 @@ msgstr ""
 #~ "Os lançamentos no diário são criados pelo OpenERP se usar os Extratos "
 #~ "Bancários, Registos de Caixa ou pagamentos de Clientes ou a Fornecedores."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Se desconciliar transações, deve também verificar todas as ações que estão "
+#~ "ligadas a essas transações porque estas não ficarão desativadas"
+
 #, python-format
 #~ msgid ""
 #~ "You selected an Unit of Measure which is not compatible with the product."
@@ -15207,6 +15197,13 @@ msgstr ""
 #~ msgid "(keep empty to use the current period)"
 #~ msgstr "(manter vazio para usar o período atual)"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Estas condições de pagamento são usadas no lugar das pré-definidas para o "
+#~ "parceiro atual."
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category using cost price"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 50888a84c26..a077517551c 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-21 00:30+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 23:17+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -27,13 +27,8 @@ msgstr "Sistema de pagamento"
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
-"Uma posição fiscal contábil pode ser definida apenas uma vez sobre as contas "
-"contábeis."
-
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Desconciliar transações"
+"Uma posição fiscal contábil pode ser definida apenas uma vez sobre as mesmas "
+"contas contábeis."
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -70,7 +65,7 @@ msgstr "Residual"
 #: code:addons/account/account_bank_statement.py:368
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "Item do jornal \"%s\" inválido."
+msgstr "Item do diário \"%s\" inválido."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -83,12 +78,12 @@ msgid "Import from invoice or payment"
 msgstr "Importar da fatura ou do pagamento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
-msgstr "Conta Inválida"
+msgstr "Conta Inválida!"
 
 #. module: account
 #: view:account.move:0
@@ -96,15 +91,6 @@ msgstr "Conta Inválida"
 msgid "Total Debit"
 msgstr "Débito Total"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Se você não reconciliar essas transações, você também deve verificar todas "
-"as ações ligadas a estas transações pois elas não serão desativadas"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -117,7 +103,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -148,19 +133,19 @@ msgstr ""
 "exclui-las."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -172,7 +157,7 @@ msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diário Diversos"
@@ -236,9 +221,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Dá o tipo de diário analítico. Quando precisar de criar lançamentos "
-"analíticos, para um documento (ex: fatura) o OpenERP vai procurar um diário "
-"deste tipo."
+"Dá o tipo de diário analítico. Quando um documento necessitar de "
+"contabilidade analítica (ex: fatura) o OpenERP vai procurar um diário deste "
+"tipo."
 
 #. module: account
 #: help:account.tax,account_analytic_collected_id:0
@@ -247,7 +232,7 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
-"Define a conta analítica que será utilizada como padrão para o registro das "
+"Define a conta analítica que será utilizada como padrão para os impostos nas "
 "linhas da fatura. Deixe em branco se você não pretende utilizar contas "
 "analíticas para cada linha da fatura."
 
@@ -257,11 +242,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Modelo de Impostos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -277,6 +257,11 @@ msgstr "Os lançamentos contábeis são uma entrada da reconciliação."
 msgid "Belgian Reports"
 msgstr "Relatórios Belgas"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr "Validado"
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -340,13 +325,13 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para criar uma restituição ao cliente. \n"
+"                Clique para criar um reembolso ao cliente. \n"
 "              </p><p>\n"
-"                Uma restituição é um documento que credita (-) uma fatura "
+"                Um reembolso é um documento que credita (-) uma fatura "
 "completamente ou\n"
 "                parcialmente.\n"
 "              </p><p>\n"
-"                Ao invés de criar uma restituição manualmente, você\n"
+"                Ao invés de criar um  reembolso manualmente, você\n"
 "                pode gerá-la diretamente a partir da fatura relacionada ao "
 "cliente.\n"
 "              </p>\n"
@@ -427,11 +412,6 @@ msgstr "Permite o uso de contabilidade analítica"
 msgid "Salesperson"
 msgstr "Vendedor"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -485,6 +465,17 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Isto permite-lhe gerenciar os bens detidos por uma empresa ou uma pessoa.\n"
+"                 Ele mantém o controle da depreciação que ocorreu nesses "
+"bens, e cria movimentos nas contas para essas linhas de depreciação.\n"
+"                 Isso instala o account_asset módulo. Se você não marcar "
+"esta caixa, você será capaz de fazer o faturamento e pagamentos,\n"
+"                 mas não a contabilidade (Itens diário, plano de contas, ...)"
+
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Informação de Origem para Beneficiário"
 
 #. module: account
 #. openerp-web
@@ -501,6 +492,12 @@ msgstr "Período:"
 msgid "Chart Template"
 msgstr "Modelo de Plano"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+"Modificar: criar reembolso, reconciliar e criar uma nova fatura provisória."
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -513,6 +510,15 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Se você selecionar 'Arredondar por linha': para cada imposto, o valor do "
+"imposto será primeiro calculado e arredondado para cada OC / PV / fatura e, "
+"em seguida, estes valores arredondados serão somados, levando ao total deste "
+"imposto. Se você selecionar 'Arredondar globalmente': para cada imposto, o "
+"valor do imposto será calculado para cada OC / PV / fatura, então estes "
+"valores serão somados e, eventualmente, este valor de imposto total será "
+"arredondado. Se você vender com impostos incluídos, você deve escolher "
+"'Arredondar por linha', porque você certamente quer a soma de seus impostos "
+"incluído nas linha de subtotais para ser igual ao valor total com impostos."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -580,7 +586,7 @@ msgstr "Alvo Superior"
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Fornece a sequência dessa linha quando exibir a fatura"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -649,12 +655,12 @@ msgstr "O Contador confirma o extrato."
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing to reconcile"
-msgstr ""
+msgstr "Nada a reconciliar"
 
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Precisão decimas nas entradas de diário"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -662,16 +668,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestral"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Se você desfazer a reconciliação de transações, você deve também verificar "
-"todas as ações que estão ligadas a essas operações, porque elas não serão "
-"desfeitas pelo sistema"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -690,6 +686,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
+"O diário especificado não tem nenhuma movimentação provisória para este "
+"período."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -705,22 +703,22 @@ msgstr "Diário Centralizado"
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr "Sequência Principal deve ser diferente da corrente !"
+msgstr "A Sequência Principal deve ser diferente da atual!"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "A moeda atual não está configurada corretamente"
 
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr ""
+msgstr "Conta de Resultados"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -733,16 +731,16 @@ msgid "Report of the Sales by Account Type"
 msgstr "Relatório de vendas por tipo de conta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "DV"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Não é possível criar movimento com moeda diferente .."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -779,6 +777,8 @@ msgstr "Período do Diário"
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"Você não pode criar mais de um movimento por período em um diário "
+"centralizado."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -787,6 +787,9 @@ msgid ""
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Defina a conta analítica que será usado por padrão nas linhas de fatura para "
+"reembolso. Deixe em branco se você não quiser usar uma conta analítica sobre "
+"as linhas de fatura por padrão."
 
 #. module: account
 #: view:account.account:0
@@ -802,7 +805,12 @@ msgstr "Contas de Recebíveis"
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Configure as contas bancárias da sua empresa"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr "Criar Reembolso"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -828,6 +836,12 @@ msgstr "Re-abrir"
 msgid "Are you sure you want to create entries?"
 msgstr "Voce tem certeza que deseja criar lançamentos?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr "Fatura parcialmente paga: %s%s de %s%s (%s%s restantes)."
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -840,6 +854,8 @@ msgid ""
 "Cannot %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only refund this invoice."
 msgstr ""
+"Não é possivel %s fatura que já está reconciliada, primeiro você deve "
+"desconciliar. Você somente poderá fazer um reembolso dessa fatura."
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -848,6 +864,7 @@ msgstr "Visualiza subnível com a hierarquia"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentual"
 
@@ -890,7 +907,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -915,25 +932,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Faturas de Fornecedores e Reembolsos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "Entrada já reconciliada"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Desconciliação"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Aos 14 dias líquidos de 2%, mantendo-se a quantia em final do mês de 30 dias."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -953,6 +963,8 @@ msgid ""
 "Print Report with the currency column if the currency differs from the "
 "company currency."
 msgstr ""
+"Imprimir relatório com a coluna de moeda, se a moeda for diferente da moeda "
+"da empresa."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -962,12 +974,7 @@ msgstr "J.C./Nome do movimento"
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
-
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
+msgstr "Código e Nome da Conta"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -997,15 +1004,21 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Nenhum item de diário encontrado.\n"
+"                </p>\n"
+"            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
 "                                                  opening/closing fiscal "
 "year process."
 msgstr ""
+"Você não pode desconciliar itens de diário se eles foram gerados pelos "
+"processos de abertura/fechamento de ano fiscal."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -1014,6 +1027,7 @@ msgstr "Nova inscrição"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Calcular"
 
@@ -1027,7 +1041,7 @@ msgstr "Valores"
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr "Plano de taxas"
+msgstr "Plano de Impostos"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -1042,15 +1056,12 @@ msgstr "Vencimento"
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Diário de Compras"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
-msgstr ""
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr "Fatura paga"
 
 #. module: account
 #: view:validate.account.move:0
@@ -1068,7 +1079,7 @@ msgstr "Valor Total"
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
 msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "A referencia dessa fatura pelo fornecedor."
 
 #. module: account
 #: selection:account.account,type:0
@@ -1085,7 +1096,7 @@ msgid "Liability"
 msgstr "Responsabilidade"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Defina a sequencia do diário referente a essa fatura."
@@ -1113,7 +1124,7 @@ msgstr "Extrato Bancário"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Mover linha"
+msgstr "Linha de Movimento"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1124,7 +1135,7 @@ msgid ""
 msgstr ""
 "Se a conta de Impostos é uma conta de códigos de impostos, este campo "
 "conterá o valor tributado. Se a conta de Impostos for código de imposto "
-"base, esse campo conterá a quantia básica (sem impostos)."
+"base, esse campo conterá o valor sem impostos."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1156,13 +1167,13 @@ msgstr "Código"
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Recursos"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1192,6 +1203,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar uma conta.\n"
+"              </p><p>\n"
+"                Ao fazer transações multi-moedas, você pode perder ou ganhar "
+"algum valor \n"
+"devido a taxa de câmbio. Este menu fornece uma previsão do Lucro ou Perda se "
+"as transações\n"
+"fossem realizadas hoje. Apenas para contas que possuem uma segunda moeda "
+"definida.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1201,7 +1223,7 @@ msgstr "Nome da Conta."
 #. module: account
 #: field:account.journal,with_last_closing_balance:0
 msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Abertura com o Saldo do Último Fechamento"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -1209,6 +1231,8 @@ msgid ""
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
 msgstr ""
+"Marque esta caixa se você não quiser que qualquer imposto relacionado a este "
+"código tributário para apareca nas faturas"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1237,12 +1261,14 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Reembolso "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Não há conta de despesas definida para este produto: \"% s\" (id:% d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1264,7 +1290,7 @@ msgstr "Caixa Registradoras"
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Diário de Reembolso de Vendas"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1283,11 +1309,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Clique para criar um novo registro de caixa.\n"
+"              </p><p>\n"
+"                Uma Caixa Registradora te permite gerenciar as entradas nos "
+"diários de caixa.\n"
+"Este recurso fornece uma maneira fácil de acompanhar pagamentos em dinheiro\n"
+"                 diariamente. Você pode inserir as moedas que estão em seu "
+"caixa, e em seguida,\n"
+"fazer os lançamentos quando o dinheiro entra ou sai do caixa.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1300,7 +1337,7 @@ msgstr "Início do Período"
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Reembolso"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1310,7 +1347,7 @@ msgstr "Confirme o extrato"
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr "Conta da taxa"
+msgstr "Conta de Imposto"
 
 #. module: account
 #: help:account.account,foreign_balance:0
@@ -1344,6 +1381,8 @@ msgid ""
 "The amount expressed in the secondary currency must be positif when journal "
 "item are debit and negatif when journal item are credit."
 msgstr ""
+"O valor expresso em moeda secundária deve ser positivo quando o item do "
+"diário são de débito e negativo quando o item do diário for de crédito."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1367,7 +1406,7 @@ msgstr "Impostos Usados em Compras"
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "Código da taxa"
+msgstr "Código do Imposto"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -1377,7 +1416,7 @@ msgstr "Taxa de moedas correntes de saida"
 #. module: account
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Modelo"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1450,7 +1489,7 @@ msgstr "Conta"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr "Incluído na quantia base"
+msgstr "Incluído no valor base"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1469,7 +1508,7 @@ msgstr "Nível"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Você só pode modificar a moeda em Faturas provisórias."
 
 #. module: account
 #: report:account.invoice:0
@@ -1483,7 +1522,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr "Taxas"
+msgstr "Impostos"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:70
@@ -1540,12 +1579,12 @@ msgstr "Opções de Relatório"
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Ano Fiscal a ser Fechado"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
 msgid "Invoice sequence"
-msgstr ""
+msgstr "Sequencia da Fatura"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
@@ -1564,11 +1603,13 @@ msgid ""
 "And after getting confirmation from the bank it will be in 'Confirmed' "
 "status."
 msgstr ""
+"Quando um novo demonstrativo é criado a situação será 'Provisório'.\n"
+"E depois de receber a confirmação do banco será 'Confirmado'."
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Situação da Fatura"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1577,7 +1618,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Extrato bancário"
+msgstr "Extrato Bancário"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -1585,12 +1626,12 @@ msgid "Account Receivable"
 msgstr "Conta de Recebimento"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1601,12 +1642,12 @@ msgid "With balance is not equal to 0"
 msgstr "Com saldo diferente de zero"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
 "on journal \"%s\"."
-msgstr ""
+msgstr "Não tem uma conta de débito padrão definida no diário \"%s\"."
 
 #. module: account
 #: view:account.tax:0
@@ -1641,6 +1682,8 @@ msgid ""
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
 msgstr ""
+"Não há nada para conciliar. Todas as faturas e pagamentos\n"
+"                     foram reconciliados, o seu saldo parceiro está em ordem."
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -1656,20 +1699,20 @@ msgstr "Ignorar situação 'Provisório para entradas manuais"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Não implementado."
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Credit Note"
-msgstr "Anotação de crédito"
+msgstr "Nota de Crédito"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eFaturamento & Pagamentos"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1693,7 +1736,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr "Uma tabela temporária usada para a visão do Dashboard"
+msgstr "Uma tabela temporária usada para a visão do Painel"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1701,10 +1744,16 @@ msgstr "Uma tabela temporária usada para a visão do Dashboard"
 msgid "Supplier Refunds"
 msgstr "Reembolsos de Fornecedor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Codigo do caso"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Previsualização do rodapé das Contas Bancárias"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1725,7 +1774,7 @@ msgstr "Registros Recorrentes"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "Modelo para posição fiscal"
+msgstr "Modelo para Posição Fiscal"
 
 #. module: account
 #: view:account.subscription:0
@@ -1738,15 +1787,14 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Não taxado"
+msgstr "Sem impostos"
 
 #. module: account
 #: view:account.journal:0
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Configurações Avançadas"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1756,7 +1804,7 @@ msgstr "Pesquisar Extratos Bancários"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr "Itens não postados no diário"
+msgstr "Itens de diário não lançados"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1815,6 +1863,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo tipo de conta.\n"
+"              </p><p>\n"
+"                Um tipo de conta é usado para determinar como uma conta deve "
+"ser usada\n"
+"                em cada diário. O método de diferimento de um tipo de conta "
+"determina o \n"
+"                processo para o fechamento anual. Relatórios como a Folha de "
+"Balanço\n"
+"               e o Relatório de Perdas e Lucros usa a categoria "
+"(perdas/lucros ou folha de balanço).\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: report:account.invoice:0
@@ -1845,7 +1906,7 @@ msgstr "Sequência de Ano Fiscal"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Contabilidade Analítica"
 
 #. module: account
 #: report:account.overdue:0
@@ -1864,6 +1925,15 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Se você selecionar 'Arredondar por linha': para cada imposto, o valor do "
+"imposto será primeiro calculado e arredondado para cada OC / PV / fatura e, "
+"em seguida, estes valores arredondados serão somados, levando ao total deste "
+"imposto. Se você selecionar 'Arredondar globalmente': para cada imposto, o "
+"valor do imposto será calculado para cada OC / PV / fatura, então estes "
+"valores serão somados e, eventualmente, este valor de imposto total será "
+"arredondado. Se você vender com impostos incluídos, você deve escolher "
+"'Arredondar por linha', porque você certamente quer a soma de seus impostos "
+"incluído nas linha de subtotais para ser igual ao valor total com impostos."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1871,6 +1941,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Vendas por Tipo de Conta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr "15 Dias"
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1889,116 +1965,14 @@ msgid ""
 "The journal must have centralized counterpart without the Skipping draft "
 "state option checked."
 msgstr ""
+"O diário precisa ter uma contrapartida centralizada sem a opção pular estado "
+"provisório marcado."
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
-
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
+msgstr "Algumas entradas já estão reconciliadas"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -2016,6 +1990,9 @@ msgid ""
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Escolha o pacote de configuração para configurar o plano de contas \n"
+"                                                                             "
+"                                        e impostos automaticamente"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2025,7 +2002,7 @@ msgstr "Contas Pendentes"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Cancelar lançamentos de Abertura de Ano Fiscal"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -2055,18 +2032,18 @@ msgstr "Recebíveis & Pagáveis"
 #. module: account
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
-msgstr ""
+msgstr "Gerenciar ordens de pagamento"
 
 #. module: account
 #: view:account.period:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
-msgstr ""
+msgstr "Último Balanço Fechado"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -2098,7 +2075,7 @@ msgstr "Ref. Cliente:"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Use este código para a declaração de impostos."
 
 #. module: account
 #: help:account.period,special:0
@@ -2110,10 +2087,15 @@ msgstr "Estes períodos podem sobrepor."
 msgid "Draft statement"
 msgstr "Demonstrativo provisório"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr "Fatura validada"
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Pagar seus fornecedores com cheque"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2124,7 +2106,7 @@ msgstr "Valor do crédito"
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2136,28 +2118,34 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menu imprime uma declaração de impostos com base em faturas ou "
+"pagamentos. Selecione um ou vários períodos do ano fiscal. As informações "
+"necessárias para a declaração de imposto é gerado automaticamente pelo "
+"OpenERP das faturas (ou pagamentos, em alguns países). Estes dados são "
+"atualizados em tempo real. Isso é muito útil, pois permite que você "
+"visualize a qualquer momento o imposto que você deve no início e no final do "
+"mês ou trimestre."
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2165,16 +2153,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2185,8 +2173,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2207,6 +2195,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar uma nova fatura de fornecedor.\n"
+"              </p><p>\n"
+"                Você pode controlar a fatura de seu fornecedor de acordo "
+"com\n"
+"                 o que você comprou ou recebeu. O OpenERP também pode gerar\n"
+"                 faturas automaticamente a partir de projetos de ordens de "
+"compra ou recibos.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -2223,20 +2221,22 @@ msgstr "Análise de Faturas"
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente de composição de Email"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr "Período de Fechamento"
+msgstr "fechar período"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
 "modify its company field."
 msgstr ""
+"Este diário já contém itens para este período, portanto, você não pode "
+"modificar seu campo empresa."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -2265,11 +2265,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar um extrato bancário.\n"
+"              </p><p>\n"
+"                Um extrato bancário é um resumo de todas as transações "
+"financeiras\n"
+"                 ocorridas ao longo de um período de tempo em uma conta "
+"bancária. você\n"
+"                 deve receber um periodicamente do seu banco.\n"
+"              </p><p>\n"
+"             O OpenERP permite conciliar uma linha do demonstrativo "
+"diretamente com\n"
+"                 a fatura da venda ou compra relacionada.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Moeda padrão da empresa"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2300,7 +2314,7 @@ msgstr "Diário de Venda/Compra"
 #: view:account.analytic.account:0
 #: field:account.invoice.tax,account_analytic_id:0
 msgid "Analytic account"
-msgstr "Centro de Custo"
+msgstr "Conta analítica"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:405
@@ -2317,7 +2331,7 @@ msgstr "Válido"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -2331,12 +2345,14 @@ msgid "Product Category"
 msgstr "Categoria de Produtos"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"Você não pode alterar o tipo de conta para '%s' por que ela já contém itens "
+"de diário!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2346,19 +2362,21 @@ msgstr "Relatório dos Balancetes das Contas Antigas"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Fechar Ano Fiscal"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Diário:"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
 msgid "A tax fiscal position could be defined only once time on same taxes."
 msgstr ""
+"Uma posição fiscal de imposto pode ser definido apenas uma vez em alguns "
+"impostos."
 
 #. module: account
 #: view:account.tax:0
@@ -2370,12 +2388,12 @@ msgstr "Definição do Imposto"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Configurar Contabilidade"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida referencial"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2391,12 +2409,12 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Bom trabalho!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Gestão Patrimonial"
 
 #. module: account
 #: view:account.account:0
@@ -2452,6 +2470,8 @@ msgid ""
 "If you want the journal should be control at opening/closing, check this "
 "option"
 msgstr ""
+"Se você quiser que o diário seja controlado na abertura/fechamento, marque "
+"esta opção"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2492,7 +2512,7 @@ msgstr "Abrir Lançamentos"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_next:0
 msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Próximo número da nota de crédito de fornecedor"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2526,7 +2546,7 @@ msgstr "Este Ano Fiscal"
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr "Conta de tabela de impostos"
+msgstr "Plano de Impostos"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
@@ -2538,12 +2558,12 @@ msgstr "30 Dias Líquidos"
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Você não tem permissão de abrir o diário %s !"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Verificar o Total nas faturas de fornecedor"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2600,7 +2620,7 @@ msgstr "Descrição"
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr "Taxa incluida no preço"
+msgstr "Imposto incluído no preço"
 
 #. module: account
 #: view:account.subscription:0
@@ -2618,7 +2638,7 @@ msgstr "Conta de Receita"
 #. module: account
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
-msgstr ""
+msgstr "Este imposto de venda será atribuído por padrão em novos produtos."
 
 #. module: account
 #: report:account.general.ledger_landscape:0
@@ -2702,12 +2722,14 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Mantenha vazia para todos os anos fiscais abertos"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
 msgstr ""
+"Você não pode mudar o tipo de conta de 'Fechado' para nenhum outro tipo já "
+"que possui itens no diário!"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2720,7 +2742,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Criar uma Conta baseada neste modelo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2728,6 +2750,11 @@ msgid ""
 "amount greater than the total invoiced amount. In order to avoid rounding "
 "issues, the latest line of your payment term must be of type 'balance'."
 msgstr ""
+"Não é possível criar a fatura.\n"
+"O prazo de pagamento deve estar configurado incorretamente, pois o valor "
+"calculado é maior do que o valor da fatura. Para evitar problemas de "
+"arredondamento, a última linha de seu prazo de pagamento deve ser de do tipo "
+"\"saldo\"."
 
 #. module: account
 #: view:account.move:0
@@ -2741,7 +2768,7 @@ msgid "Main Sequence"
 msgstr "Sequencia Principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2751,14 +2778,12 @@ msgstr ""
 "excluir itens relacionados no diário."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Condições de Pagamento"
 
@@ -2772,7 +2797,7 @@ msgstr "Posições fiscais"
 #: code:addons/account/account_move_line.py:578
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Não é possível criar um item de diário em uma conta fechada %s %s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2784,18 +2809,6 @@ msgstr "Marque esta caixa"
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Aberto"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2805,7 +2818,12 @@ msgstr "Situação provisória da fatura"
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Propriedades da Conta"
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr "Criar um reembolso provisório"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2815,7 +2833,7 @@ msgstr "Reconciliação de Parceiro"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Conta Fin."
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2844,7 +2862,7 @@ msgstr "Código base"
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
 msgstr ""
-"Dê a ordem da sequencia quando exibir uma lista de impostos da fatura."
+"Define a ordem da sequencia quando exibir uma lista de impostos da fatura."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2885,25 +2903,20 @@ msgid "Account Model Entries"
 msgstr "Modelo de Entrada de Contas"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "DC"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Impostos do Fornecedor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "entradas"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalhes Bancário"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2924,9 +2937,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma entrada de diário.\n"
+"              </p><p>\n"
+"                Uma entrada de diário consiste em diversos itens de diário, "
+"cada um\n"
+"                sendo uma transação de débito ou crédito.\n"
+"              </p><p>\n"
+"                O OpenERP cria automaticamente uma entrada de diário por "
+"documento\n"
+"                contábil: fatura, reembolso, pagamento a fornecedor, "
+"demonstrativos\n"
+"                bancários, etc Então você pode registrar lançamentos de "
+"diário manualmente\n"
+"                somente / geralmente para operações diversas.\n"
+"              </p>\n"
+"            "
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2941,10 +2969,9 @@ msgstr ""
 "exemplo 50% agora, 50% daqui um mês."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr ""
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Próximo número de fatura de fornecedor"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2954,7 +2981,7 @@ msgstr "Selecione o período"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr "Extratos"
+msgstr "Demonstrativos"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2973,6 +3000,7 @@ msgstr "Reconciliar linha de movimentação de conta (baixa)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Imposto"
 
@@ -2992,7 +3020,7 @@ msgstr "Conta Analítica"
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Imposto Padrão de compra"
 
 #. module: account
 #: view:account.account:0
@@ -3008,14 +3036,14 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3025,7 +3053,7 @@ msgstr "Erro de Configuração!"
 #: code:addons/account/account_bank_statement.py:433
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "Demonstrativo %s confirmado, itens de diário foram criados."
 
 #. module: account
 #: field:account.invoice.report,price_average:0
@@ -3078,7 +3106,7 @@ msgstr "Ref"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "Imposto de Compras"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -3114,6 +3142,12 @@ msgstr "Pago/Reconciliado"
 msgid "Refund Base Code"
 msgstr "Código Base para Reembolso"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extratos Bancários"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3133,6 +3167,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para iniciar um novo ano fiscal.\n"
+"              </p><p>\n"
+"                 Defina ano financeiro de sua empresa de acordo com suas "
+"necessidades.\n"
+"                 Um exercício é um período no final do qual as contas de uma "
+"empresa\n"
+"                 compostos (geralmente 12 meses). O exercício é normalmente "
+"referido\n"
+"                 pela data em que termina. Por exemplo, a se o ano "
+"financeiro de uma empresa\n"
+"                 termina 30 de novembro de 2011, em seguida, tudo entre 1 de "
+"dezembro de 2010\n"
+"                 e 30 novembro de 2011 seria conhecido como o ano fiscal de "
+"2011.                .\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.common.report:0
@@ -3166,15 +3217,10 @@ msgstr "Saldo anterior do Parceiro"
 msgid "Accounting entries"
 msgstr "Lançamentos Contábeis"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tipo de Comunicação"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Conta e Período devem pertencer a mesma empresa."
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -3205,7 +3251,7 @@ msgstr "Valor da baixa"
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3214,12 +3260,14 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"A Fatura selecionada(s) não pode ser confirmada, pois não está em situação "
+"'Provisória' ou 'Pro-Forma'."
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Você deve escolher os períodos que pertencem à mesma empresa."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3229,44 +3277,48 @@ msgid "Sales by Account"
 msgstr "Vendas por Conta"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Você não pode excluir uma entrada de diário postada \"%s\"."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Accounting Period"
-msgstr ""
+msgstr "Período Contábil"
 
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Diário de Vendas"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Você deve definir um diário analítico no diário '%s'!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
 "field."
 msgstr ""
+"Este diário já contém itens, portanto, você não pode modificar seu campo "
+"empresa."
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
+"Você precisa de um Diário de Abertura com centralização marcada para definir "
+"o balanço inicial."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3326,14 +3378,15 @@ msgstr ""
 "alguns relatórios."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Linha 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr "Transações não conciliadas"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Somente um Modelo de Contas Disponível"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3346,7 +3399,7 @@ msgstr "Conta de Despesas"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3374,13 +3427,7 @@ msgstr "Valor do código básico"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "Taxa de vendas padrão"
-
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "A fatura '%s' está validada."
+msgstr "Imposto de vendas padrão"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3418,7 +3465,7 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3447,10 +3494,10 @@ msgid "Trial Balance"
 msgstr "Balancete"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
-msgstr ""
+msgstr "Não foi possível adaptar o saldo inicial (valor negativo)."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3469,7 +3516,7 @@ msgstr "Escolha o Ano Fiscal"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Intervalo de Datas"
 
 #. module: account
 #: view:account.period:0
@@ -3518,10 +3565,10 @@ msgstr ""
 "de entrada sempre usam a taxa do dia."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Não há código de pai para o modelo de conta."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3530,9 +3577,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Nro de digitos a ser usado no codigo da conta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nome da linha"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr "Condições de Pagamento do Fornecedor"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3549,6 +3596,8 @@ msgstr "Sempre"
 msgid ""
 "Full accounting features: journals, legal statements, chart of accounts, etc."
 msgstr ""
+"Recursos de contabilidade totais: diários, declarações legais, plano de "
+"contas, etc"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3581,7 +3630,7 @@ msgid "View"
 msgstr "Visualizar"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3603,14 +3652,19 @@ msgid "Electronic File"
 msgstr "Arquivo eletrônico"
 
 #. module: account
-#: field:account.config.settings,has_chart_of_accounts:0
-msgid "Company has a chart of accounts"
-msgstr ""
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr "Ref do Reconciliamento"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dia do mês: 0"
+#: field:account.config.settings,has_chart_of_accounts:0
+msgid "Company has a chart of accounts"
+msgstr "a empresa possui um plano de contas"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Modelo do Código do Imposto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3618,15 +3672,176 @@ msgid "Account Partner Ledger"
 msgstr "Livro-razão Conta Parceiros"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Olá ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Uma nova fatura está disponível a você: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIA</strong><br />\n"
+"       &nbsp;&nbsp;Número da Fatura: <strong>${object.number}</strong><br "
+"/>\n"
+"       &nbsp;&nbsp;Total da Fatura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data da Fatura: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referência do Pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu Contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Também é possivel pagar diretamente através do Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Se você tiver alguma dúvida, não deixe de entrar em contato "
+"conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Fone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Período da conta"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3642,9 +3857,9 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
-"Este assistente vai validar todas as entradas de diário de um diário e "
-"período particular. Uma vez que os lançamentos do diário estão validados, "
-"você não pode atualizá-los mais."
+"Este assistente vai validar todas as entradas de um diário e período em "
+"particular. Uma vez que os lançamentos forem validados, você não pode mais "
+"atualizá-los."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3655,7 +3870,7 @@ msgstr "Modelo de Plano de Contas"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transações"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3688,7 +3903,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Deixe vazio para usar a conta de despesas"
+msgstr "Deixe em branco para usar a conta de despesas"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -3756,21 +3971,30 @@ msgstr "Configuração do modulo de contabilidade"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
+msgstr "Declaração de Imposto da conta"
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"Se você dá ao Nome outro que não seja /, o movimento de lançamentos "
+"contábeis criado terá o mesmo nome do nome no extrato. Isto permite aos "
+"lançamentos no extrato terem as mesmas referências que os extrato em si"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Quantia de valor: 0,02"
-
-#. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
 "centralized counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Você não pode criar uma fatura em um diário centralizado. Desmarque a caixa "
+"contrapartida centralizada no diário relacionada a partir do menu de "
+"configuração."
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3779,7 +4003,7 @@ msgid "Starting Balance"
 msgstr "Saldo Inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nenhum Parceiro definido!"
@@ -3795,7 +4019,7 @@ msgstr "Fechar um período"
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_opening:0
 msgid "Opening Subtotal"
-msgstr ""
+msgstr "Subtotal de Abertura"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -3803,6 +4027,8 @@ msgid ""
 "You cannot create journal items with a secondary currency without recording "
 "both 'currency' and 'amount currency' field."
 msgstr ""
+"Você não pode criar itens de diário com uma moeda secundária sem gravar "
+"tanto no campo 'moeda' e 'valor monetário'."
 
 #. module: account
 #: field:account.financial.report,display_detail:0
@@ -3820,7 +4046,7 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
-"O montante expresso na moeda da conta relacionada, se não igual ao de uma "
+"O valor expresso na moeda da conta relacionada, se não for igual ao da "
 "empresa."
 
 #. module: account
@@ -3831,6 +4057,10 @@ msgid ""
 "quotations with a button \"Pay with  Paypal\" in automated emails or through "
 "the OpenERP portal."
 msgstr ""
+"Conta do paypal (e-mail) para receber pagamentos on-line (cartão de crédito, "
+"etc) Se você definir uma conta do paypal, o cliente será capaz de pagar as "
+"suas faturas ou cotações com um botão \"Pague com Paypal\" em e-mails "
+"automáticos ou através do portal do OpenERP ."
 
 #. module: account
 #: code:addons/account/account_move_line.py:535
@@ -3841,6 +4071,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Journals/Journals."
 msgstr ""
+"Não é possível encontrar um diário do tipo %s para esta empresa.\n"
+"\n"
+"Você pode criar um no menu:\n"
+"Configuração / Diários / Diários."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3859,7 +4093,7 @@ msgstr "Não mostrar na Fatura"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr "Plano de taxas"
+msgstr "Plano de Impostos"
 
 #. module: account
 #: view:account.journal:0
@@ -3869,7 +4103,7 @@ msgstr "Procurar Diário de Conta"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr "Nota fiscal em progresso"
+msgstr "Faturas Pendentes"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3891,6 +4125,12 @@ msgid ""
 "by\n"
 "                                    your supplier/customer."
 msgstr ""
+"Você será capaz de editar e validar esta\n"
+"                                     nota de crédito diretamente ou mantê-la "
+"provisória,\n"
+"                                     esperando o documento a ser emitido "
+"pelo\n"
+"                                     seu fornecedor / cliente."
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3908,6 +4148,8 @@ msgid ""
 "You have not supplied enough arguments to compute the initial balance, "
 "please select a period and a journal in the context."
 msgstr ""
+"Você não forneceu argumentos suficientes para calcular o saldo inicial, "
+"selecione um período e um diário no contexto."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3917,7 +4159,7 @@ msgstr "Transferências"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Esta empresa possui seu próprio plano de contas"
 
 #. module: account
 #: view:account.chart:0
@@ -3928,7 +4170,7 @@ msgstr "Plano de contas"
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Efetuar um Saque"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3958,6 +4200,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma fatura de cliente.\n"
+"              </p><p>\n"
+"                Faturação electronica no OpenERP permite facilitar e fixar "
+"os\n"
+"                pagamentos de clientes. Seu cliente recebe a fatura por e-"
+"mail\n"
+"                e ele pode pagar on-line e / ou importá-lo em seu próprio "
+"sistema.\n"
+"              </p><p>\n"
+"A conversação com o seu cliente são automaticamente exibidas no\n"
+"                 rodapé de cada fatura.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3983,12 +4239,15 @@ msgid "Period Length (days)"
 msgstr "Duração do período (dias)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Você não pode modificar uma entrada lançada neste diário.\n"
+"Primeiro você deve configurar no diário para permitir cancelar entradas de "
+"diário."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -4007,12 +4266,14 @@ msgid "Category of Product"
 msgstr "Categoria do Produto"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Não existe ano fiscal definido para esta data.\n"
+"Por favor crie um a partir da configuração do menu de contabilidade."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4024,7 +4285,7 @@ msgstr "Criar Conta"
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "The entries to reconcile should belong to the same company."
-msgstr ""
+msgstr "As entradas para reconciliar deve pertencer à mesma empresa."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -4044,7 +4305,7 @@ msgstr "Detalhe"
 #. module: account
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
-msgstr ""
+msgstr "Este imposto de compra será atribuído por padrão em novos produtos."
 
 #. module: account
 #: report:account.invoice:0
@@ -4073,7 +4334,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4138,7 +4399,7 @@ msgstr "Lançar"
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr "Não concilidado"
+msgstr "Desconciliar"
 
 #. module: account
 #: view:account.chart.template:0
@@ -4146,15 +4407,15 @@ msgid "Chart of Accounts Template"
 msgstr "Modelo de Plano de Contas"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"A data de vencimento da linha de lançamento gerado pela linha modelo '% s'  "
-"do modelo '% s' é baseado no prazo de pagamento do parceiro!\n"
+"A data de vencimento da linha de lançamento gerado pelo modelo '%s'  do "
+"modelo '%s' é baseado no prazo de pagamento do parceiro!\n"
 "Por favor, defina o parceiro sobre ela!"
 
 #. module: account
@@ -4214,7 +4475,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Verifique o total de faturas de fornecedores"
 
 #. module: account
 #: view:account.tax:0
@@ -4228,6 +4489,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Quando os períodos mensais são criados. O estado é 'Provisório'. No final do "
+"período mensal o estado é 'Concluído'."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4236,9 +4499,15 @@ msgid "Qty"
 msgstr "Qtde"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litígio"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Você pode especificar o coeficiente que será usado para consolidação do "
+"valor desta taxa no seu item pai. Por exemplo, defina 1/-1 se quiser "
+"adicionar/subtrair o valor."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4254,7 +4523,7 @@ msgstr "Conta de Pagamento"
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Os períodos para gerar entradas de abertura não pode ser encontrado."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4298,7 +4567,7 @@ msgstr "Fator de Multiplicação do Código Tributário"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Um conjunto completo de impostos"
 
 #. module: account
 #: field:account.account,name:0
@@ -4321,12 +4590,7 @@ msgstr "Nenhuma empresa sem configuração!"
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
-
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
+msgstr "Espera um Plano de Contas"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4337,7 +4601,7 @@ msgstr "Data efetiva"
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "O diário precisa ter uma conta padrão de débito e crédito."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
@@ -4345,11 +4609,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Configuração de suas Contas Bancárias"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4359,12 +4618,12 @@ msgstr "ID do Parceiro"
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr "Diário para escrituras analíticas"
+msgstr "Diário para lançamentos analíticos"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -4394,13 +4653,15 @@ msgid ""
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Marque esta caixa se você não quiser que qualquer imposto relacionado a este "
+"Código de imposto apareça nas faturas."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Você não pode usar uma conta inativa."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4427,11 +4688,11 @@ msgid "Consolidated Children"
 msgstr "Dependentes consolidados"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dados insuficientes!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4439,8 +4700,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
-"Valor de perda ou ganho devido a mudanças na taxa de câmbio ao fazer multi-"
-"moeda transações."
+"Valor de perda ou ganho devido a taxa de câmbio ao fazer transações multi-"
+"moeda."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4465,11 +4726,6 @@ msgstr ""
 msgid "title"
 msgstr "título"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4500,7 +4756,7 @@ msgstr "Patrimônio"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilidade e Finanças"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4527,7 +4783,7 @@ msgstr "(Fatura deve ser desconciliada se você quiser abri-la)"
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Conta Analítica de Impostos da Fatura"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4559,12 +4815,22 @@ msgstr "30 Dias Fim do Mês"
 msgid "Analytic Balance"
 msgstr "Saldo Analítico"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+"Este prazo de pagamento será usado em vez do padrão nos pedidos de venda e "
+"faturas dos clientes"
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
 "year."
 msgstr ""
+"Se você colocar \"%(year)s\" no prefixo, ele será substituído pelo ano atual."
 
 #. module: account
 #: help:account.account,active:0
@@ -4578,7 +4844,12 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "Itens do Diário Postados"
+msgstr "Itens do Diário Lançados"
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr "Sem Cobrança"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4590,11 +4861,6 @@ msgstr "Pesquisar Modelos de Impostos"
 msgid "Draft Entries"
 msgstr "Lançamentos Provisórios"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dia do mês= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4602,11 +4868,9 @@ msgid ""
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Número de dias: 30"
+"Como exemplo, uma precisão decimal de 2 permitirá entradas de diário como: "
+"9,99 reais, enquanto que uma precisão decimal de 4 irá permitir entradas de "
+"diário como: 0,0231 reais."
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4630,6 +4894,31 @@ msgstr "Atalho"
 msgid "Account Type"
 msgstr "Tipo de Conta"
 
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Fechar Caixa"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Cancelar as Faturas Selecionadas"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:423
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "Você tem que atribuir um diário analítico no diário '%s' !"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Custos analíticos (apontamento de horas, alguns produtos comprados, ...) vem "
+"das contas analíticas. Isto gera faturas provisórias de fornecedores."
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
 msgid ""
@@ -4645,31 +4934,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr "Cancelar as Faturas Selecionadas"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:423
-#, python-format
-msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr "Você tem que atribuir um diário analítico sobre a '%s' diário!"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid ""
-"Analytic costs (timesheets, some purchased products, ...) come from analytic "
-"accounts. These generate draft supplier invoices."
-msgstr ""
-"Custos analíticos (apontamento de horas, alguns produtos comprados, ...) vem "
-"das contas analíticas. Isto gera faturas provisórias de fornecedores."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Fechar Caixa"
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para configurar uma nova conta bancária. \n"
+"          </p><p>\n"
+"            Configurar a conta bancária de sua empresa e selecionar aquelas "
+"que devem\n"
+"             aparecer no rodapé dos relatórios.\n"
+"          </p><p>\n"
+"Se você usar a aplicação de contabilidade do OpenERP, diários e\n"
+"             contas serão criados automaticamente com base nesses dados.\n"
+"          </p>\n"
+"        "
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4677,6 +4952,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Erro!\n"
+"Você não pode criar códigos de imposto recursivos."
 
 #. module: account
 #: constraint:account.period:0
@@ -4684,6 +4961,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Erro!\n"
+"A duração do período(s) é / são inválidas."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4697,31 +4976,33 @@ msgid "Month"
 msgstr "Mês"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Você não pode alterar o código de conta que contém itens de diário!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Seqüência de fatura do fornecedor"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
 "Configuration\\Accounting menu."
 msgstr ""
+"Não é possível encontrar um plano de contas, você deve criar um a partir de "
+"Configurações \\ Configuração \\ Menu Contabilidade \\."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida do Produto"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -4733,6 +5014,11 @@ msgstr "Conta do Paypal"
 msgid "Acc.Type"
 msgstr "Tipo de Conta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr "Banco e Cheques"
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4745,7 +5031,7 @@ msgstr "Inverter sinal do balanço"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balanço Patrimonial (conta do passivo)"
@@ -4759,7 +5045,7 @@ msgstr "Deixe em branco para usar a data atual"
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_closing:0
 msgid "Closing Subtotal"
-msgstr ""
+msgstr "Subtotal de Fechamento"
 
 #. module: account
 #: field:account.tax,base_code_id:0
@@ -4767,11 +5053,11 @@ msgid "Account Base Code"
 msgstr "Código Base da Conta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
-msgstr ""
+msgstr "Você tem que fornecer uma conta para os ajustes / diferença cambial."
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -4815,24 +5101,19 @@ msgstr "Marque se você deseja exibir Contas com saldo 0 também."
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Reconciliação de Lancamentos de Abertura"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
 msgid "Last Reconciliation:"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Processamento periódico"
+msgstr "Última Reconciliação:"
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Equilibrado"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4846,6 +5127,8 @@ msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
 msgstr ""
+"Não existe empresa sem plano de contas. O assistente, portanto, não será "
+"executado."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -4858,10 +5141,9 @@ msgid "Account chart"
 msgstr "Plano de Conta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Fatura de fornecedor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr "Referencia de Pagamento"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4929,9 +5211,13 @@ msgstr "Notas de Crédito"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Itens de Diário a Reconciliar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr "Modelos para Impostos"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -4941,12 +5227,12 @@ msgstr "O nome do período deve ser único por empresa!"
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Moeda por país da empresa."
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Cálculo de Impostos"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4983,9 +5269,11 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Erro!\n"
+"Você não pode criar uma conta que tem conta-pai de empresa diferente."
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4993,6 +5281,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Journals\\Journals."
 msgstr ""
+"Não é possível encontrar um diário do tipo %s para esta empresa.\n"
+"\n"
+"Você pode criar um no menu:\n"
+"Configurações \\ Diários \\ Diários."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -5000,7 +5292,7 @@ msgid "Based On"
 msgstr "Baseado Em"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "DRC"
@@ -5018,18 +5310,13 @@ msgstr "Modelos Recorrentes"
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Filhos / Sub Impostos"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Change"
 msgstr "Alterar"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco e Cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5043,7 +5330,7 @@ msgstr "Atua como uma conta padrão para o valor do crédito"
 #. module: account
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Descreva por que você está tirando dinheiro do caixa:"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5052,25 +5339,15 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Exemplo"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Permite que você coloque as faturas em um estado pro-forma."
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
-msgstr ""
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Manter vazio para usar a conta de receita"
+msgstr "Unidade de definição das moedas"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -5079,9 +5356,11 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Ele adiciona a coluna de moeda nos relatórios se a moeda for diferente da "
+"moeda da empresa."
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impostos de Compra %.2f%%"
@@ -5118,7 +5397,7 @@ msgstr "Fatura Cancelada"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Minhas Faturas"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5128,7 +5407,7 @@ msgstr "Novo"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Imposto de Vendas"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5153,17 +5432,15 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Quando o período no diário é criado. A situação é 'Provisório'. Se um "
+"relatório for impresso a situação fica 'Impresso'. Quando todas as "
+"transações são feitas, a situação muda para 'Concluído'."
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
-msgstr "MISC"
-
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Fatura (Ref ${object.number ou 'n/a' })"
+msgstr "DIVER"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -5186,7 +5463,7 @@ msgstr "Faturas"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Marque esta caixa se esta empresa é uma entidade legal."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5232,7 +5509,7 @@ msgstr "Verificar"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5278,6 +5555,7 @@ msgstr "Incluir"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Pago"
 
@@ -5302,9 +5580,11 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr ""
+"Defina a conta que será definida por padrão para Impostos em linhas de "
+"faturas. Deixe em branco para usar a conta de despesa."
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Abertura do Período"
@@ -5317,15 +5597,7 @@ msgstr "Lançamento do Diário para Revisão"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
-
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+msgstr "Arredondamento Global"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5339,12 +5611,14 @@ msgid "Tax Application"
 msgstr "Aplicação de Impostos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"Por favor, verifique o valor da fatura!\n"
+"O total codificado não corresponde ao total calculado."
 
 #. module: account
 #: field:account.account,active:0
@@ -5360,7 +5634,7 @@ msgstr "Ativo"
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Controle de Caixa"
 
 #. module: account
 #: field:account.analytic.balance,date2:0
@@ -5372,9 +5646,9 @@ msgid "End of period"
 msgstr "Fim de período"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalhes Bancário"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pagamento de faturas"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5390,7 +5664,7 @@ msgstr "Saldo por Tipo de Conta"
 #: code:addons/account/account_cash_statement.py:301
 #, python-format
 msgid "There is no %s Account on the journal %s."
-msgstr ""
+msgstr "Não existe uma conta %s no diário %s."
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
@@ -5403,14 +5677,14 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
-"A partir deste ponto de vista, tem uma análise da sua tesouraria. Ela resume "
-"o balanço de cada lançamentos contábeis feitas em contas de liquidez por "
+"A partir desta visão, você tem uma análise da sua tesouraria. Ela resume o "
+"balanço de cada lançamentos contábeis feitas em contas de liquidez por "
 "período."
 
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Gerente Financeiro"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5431,7 +5705,7 @@ msgstr "Movimentos"
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Linhas do Caixa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5444,6 +5718,8 @@ msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Se você não marcar esta caixa, você será capaz de fazer o faturamento e "
+"pagamentos, mas não a contabilidade (Itens de diário, plano de contas, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5470,14 +5746,6 @@ msgstr "Descrição do Imposto"
 msgid "Child Tax Accounts"
 msgstr "Contas de impostos derivados (subcontas)"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5524,17 +5792,19 @@ msgid "Target Moves"
 msgstr "Movimentos de destino"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"O movimento não pode ser excluído se associado a uma fatura. (Fatura: %s - "
+"ID do Movimento: %s)"
 
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_opening:0
 msgid "Opening Unit Numbers"
-msgstr ""
+msgstr "Números de Unidades de Abertura"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5560,6 +5830,7 @@ msgid "Python Code (reverse)"
 msgstr "Código python (reverso)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5577,12 +5848,6 @@ msgstr ""
 " Esta última escolha pressupõe que o conjunto de imposto definido para o "
 "modelo escolhido está completa"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5606,12 +5871,7 @@ msgstr "Ano"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linha 1:"
+msgstr "Ele indica que a fatura foi enviada."
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -5619,18 +5879,21 @@ msgid "Internal Name"
 msgstr "Nome Interno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Não é possível criar uma seqüência automática para esta peça.\n"
+"Coloque uma seqüência na definição do diário para numeração automática ou "
+"crie uma seqüência manualmente para esta peça."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Fatura Pro Forma "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5658,7 +5921,7 @@ msgstr "Balancete"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Lucros & Perdas (conta de receitas)"
@@ -5691,11 +5954,13 @@ msgid "Compute Code (if type=code)"
 msgstr "Computar Código (se tipo=código)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"Não é possível encontrar um plano de contas para esta empresa, você deve "
+"criar um."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5718,6 +5983,7 @@ msgstr "Reconciliação Automática"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5755,6 +6021,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5772,6 +6041,12 @@ msgid ""
 "entry was reconciled, either the user pressed the button \"Fully "
 "Reconciled\" in the manual reconciliation process"
 msgstr ""
+"Data em que os lançamentos contábeis do parceiro foram totalmente "
+"reconciliado pela última vez. Ela difere da data da última reconciliação "
+"feita para este parceiro, pois aqui nós retratam o fato de que nada mais era "
+"de se reconciliar nesta data. Isto pode ser conseguido em duas formas: ou a "
+"data da última reconciliação de débito / crédito, ou definida pelo usuário "
+"no botão \"totalmente reconciliado\" no processo de reconciliação manual"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5818,13 +6093,14 @@ msgstr "account.installer"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Recalcular impostos e total"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
+"Você não pode modificar/excluir um diário com entradas para este período."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5834,7 +6110,7 @@ msgstr "Incluir no Valor Base"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Número de Fatura de Fornecedor"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5852,10 +6128,12 @@ msgid "Amount Computation"
 msgstr "Calcular Valor"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Você não pode adicionar/modificar entradas no diário %s em um período %s já "
+"fechado."
 
 #. module: account
 #: view:account.journal:0
@@ -5880,7 +6158,7 @@ msgstr "Início do período"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Visualizar Patrimônio"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -5888,10 +6166,16 @@ msgid "Account Common Account Report"
 msgstr "Relatório de Contas da Contabilidade Geral"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicação"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Aberto"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5906,6 +6190,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Selecione aqui o tipo de valorização relacionada com esta linha de prazo de "
+"pagamento. Note que você deve ter sua última linha com o tipo \"Saldo\" que "
+"todo o valor será calculado."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -5921,9 +6208,7 @@ msgstr "Códigos de imposto"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Reembolso a Cliente"
 
@@ -5940,11 +6225,6 @@ msgstr "Sinal do Código do Imposto"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Relatório de faturas criadas nos últimos 15 dias"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Números de Dias: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5953,14 +6233,16 @@ msgstr "Diário de Lançamentos do Fim do Ano"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Reembolso Provisório "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
+"Preencha o formulário, se você colocar dinheiro na caixa registradora:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Valor a Pagar"
@@ -6017,7 +6299,7 @@ msgstr "Data de Pagamento"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,opening_details_ids:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Linhas de Abertura do Caixa"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6042,7 +6324,7 @@ msgstr "Moeda do valor"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Rodada por linha"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -6052,8 +6334,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6076,6 +6356,15 @@ msgstr "Texto Normal"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Entradas de pagamento são a segunda entrada da reconciliação."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+"Este prazo de pagamento será usado em vez do padrão de ordens de compra e "
+"faturas de fornecedores"
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6085,20 +6374,11 @@ msgstr ""
 "Número de valores parciais que podem ser combinados para encontrar um ponto "
 "de equilíbrio. Pode ser escolhido como ponto para reconciliação automática"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"O campo seqüência é utilizado para ordenar as linhas das formas de pagamento "
-"a partir do menor prazo para os maiores"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Você deve definir a duração do período superior a 0."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6109,7 +6389,7 @@ msgstr "Modelo de Posição Fiscal"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Reembolso Provisório"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6147,19 +6427,20 @@ msgstr "Reconciliar com Baixa"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Você não pode criar itens de diário em uma conta do tipo visualização."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
-msgstr "Quantidade fixa"
+msgstr "Valor fixo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Você não pode mudar o imposto, você deve remover e recriar as linhas."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6180,7 +6461,6 @@ msgstr "Gerar Lançamentos de Abertura"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "O método de cálculo para o valor do imposto."
 
@@ -6208,18 +6488,23 @@ msgid "Child Accounts"
 msgstr "Sub-contas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nome da movimentação (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Ajuste"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "entradas"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6236,7 +6521,7 @@ msgstr "Receita"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -6256,16 +6541,11 @@ msgid "Account n°"
 msgstr "Conta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia livre"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valorização"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6284,7 +6564,7 @@ msgstr "Mapeamento Fiscal"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Escolha a Empresa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6301,7 +6581,7 @@ msgstr "Qtd máx:"
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund Invoice"
-msgstr "Fatura de Reembolso"
+msgstr "Reembolso de Fatura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -6349,6 +6629,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar uma conta.\n"
+"              </p><p>\n"
+"               Uma conta é parte de um livro que permite a sua empresa\n"
+"                registrar todos os tipos de transações de débito e crédito.\n"
+"\n"
+"                Empresas apresentam as suas contas anuais em duas partes "
+"principais: o\n"
+"                 balanço patrimonial e demonstração do resultado do "
+"exercício (DRE).\n"
+"                 As contas anuais de uma empresa são obrigados por lei\n"
+"                 para revelar uma determinada quantidade de informação.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.invoice.report:0
@@ -6359,7 +6653,7 @@ msgstr "# de Linhas"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(atualizar)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6381,7 +6675,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Você tem um erro de expressão \"%(...) s\" no seu modelo!"
@@ -6399,7 +6693,7 @@ msgstr "Saldo é calculado com base no balanço inicial e linhas de transação"
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Conta de Perdas"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6422,12 +6716,27 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' status."
 msgstr ""
+"Todas as entradas de diário criadas manualmente estão no estado \"não "
+"lançada\", mas você pode definir a opção de pular essa fase no diário "
+"relacionado. Nesse caso, elas irão se comportar como entradas de diário "
+"criadas automaticamente pelo sistema na validação de documentos (faturas, "
+"extratos bancários ...) e será criado como 'Lançado'."
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
 msgstr "Numero de dias"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+"Você não pode validar esta entrada porque a conta \"%s\" não pertence ao "
+"plano de contas \"%s\"."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6485,7 +6794,7 @@ msgstr "Empresa relacionada a este diário"
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Permite ambiente multi moeda"
 
 #. module: account
 #: view:account.subscription:0
@@ -6568,15 +6877,17 @@ msgstr "Linha Analítica"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modelos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"Você não pode cancelar uma fatura que está parcialmente paga. Você precisa "
+"desconciliar as entradas de pagamento relacionados antes."
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -6611,6 +6922,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar um reembolso que você recebeu de um "
+"fornecedor.\n"
+"              </p><p>\n"
+"                Em vez de criar o reembolso do fornecedor manualmente, você "
+"pode gerar\n"
+"                 reembolsos e reconciliar-los diretamente na fatura do "
+"fornecedor relacionada.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax,type:0
@@ -6661,7 +6982,7 @@ msgstr "Mostrar plano filho"
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Banco & Caixa"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6747,13 +7068,13 @@ msgstr "Recebimento"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Você não pode criar itens de diário em uma conta fechada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
-msgstr ""
+msgstr "A empresa da linha da fatura e a empresa da fatura são diferentes"
 
 #. module: account
 #: view:account.invoice:0
@@ -6774,19 +7095,13 @@ msgstr "A moeda da conta relacionada é diferente da moeda da empresa."
 #: code:addons/account/installer.py:48
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
 msgstr "Atual"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6801,24 +7116,24 @@ msgstr "Patrimônio Líquido"
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Conta de Transferência Interna"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:33
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
 msgstr ""
+"Por favor, verifique se o campo 'Diário' está definido no extrato bancário"
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Porcentagem"
 
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Arredondar Globalmente"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6828,10 +7143,10 @@ msgstr "Diário & Parceiro"
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr "Energia"
+msgstr "Potência"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Não é possível gerar um código de diário não utilizado."
@@ -6850,7 +7165,7 @@ msgstr "Número da Fatura"
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Diferença"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6878,17 +7193,30 @@ msgid "Applicable Type"
 msgstr "Tipo aplicável"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referência da Fatura"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+"Se você usar os termos de pagamento, a data de vencimento será calculado "
+"automaticamente a geração de lançamentos contábeis. O prazo de pagamento "
+"pode calcular várias datas de vencimento, por exemplo, 50% agora e 50% em um "
+"mês, mas se você quiser forçar uma data de vencimento, certifique-se que o "
+"prazo de pagamento não está definido na fatura. Se você manter o prazo de "
+"pagamento e a data de vencimento vazio, significa pagamento a vista."
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"Não há período de abertura / fechamento definido, por favor, crie um para "
+"definir o saldo inicial."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6902,12 +7230,12 @@ msgstr ""
 "dependentes/derivados."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6916,12 +7244,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Erro de Usuário!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Descartar"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6939,7 +7267,7 @@ msgstr "Itens de Diário Analítico"
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Possui uma empresa padrão"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6982,7 +7310,7 @@ msgid "Optional create"
 msgstr "Criação opcional"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6995,11 +7323,9 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
-msgstr "Devolução para Fornecedor"
+msgstr "Reembolso de Fornecedor"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -7035,9 +7361,14 @@ msgid "Group By..."
 msgstr "Agrupar Por..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Avaliação: Balanço"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+"Não há prazo definido para esta data: %s.\n"
+"Por favor, crie um."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7088,6 +7419,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"Percentagens para Linha prazo de pagamento deve estar entre 0 e 1, exemplo: "
+"0,02 para 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -7108,13 +7441,22 @@ msgstr "Conta da categoria de despesas"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "O Nome do Imposto deve ser único por empresa!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
 msgstr "Transações do Caixa"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+"Se você desconciliar as transações, você também deve verificar todas as "
+"ações que estão associadas a essas operações, porque não serão desativadas"
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7132,7 +7474,7 @@ msgstr "Estatísticas de Lançamentos Analíticos"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Lancamentos: "
@@ -7148,16 +7490,17 @@ msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"Você não pode fornecer uma moeda secundária, se é a mesmo da principal da "
+"empresa."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadeiro"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balanço Patrimonial (Conta de Ativos)"
@@ -7173,10 +7516,9 @@ msgid "Total debit"
 msgstr "Débito Total"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Lançamento \"%s\" não é válido"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Próxima entrada de parceiro a reconciliar"
 
 #. module: account
 #: report:account.invoice:0
@@ -7229,7 +7571,7 @@ msgstr "Criar lançamento"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Lucros e Perdas (Conta de Despesa)"
@@ -7237,16 +7579,17 @@ msgstr "Lucros e Perdas (Conta de Despesa)"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Transações Totais"
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Você não pode remover uma conta que contém itens de diário."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -7283,11 +7626,16 @@ msgstr "Linha do projeto"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr "Cancelar: criar o reembolso e reconcilia"
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Você precisa definir uma data inicial."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7319,8 +7667,8 @@ msgid ""
 "you've set."
 msgstr ""
 "Se você selecionou para filtrar por data ou período, este campo permite que "
-"você adicione uma linha para exibir a quantidade de débito / crédito / "
-"equilíbrio que precede o filtro que você definiu."
+"você adicione uma linha para exibir a quantidade de débito / crédito / saldo "
+"que precede o filtro que você definiu."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7335,7 +7683,7 @@ msgstr "Lançamentos de Diário"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Nenhum período encontrado na fatura."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7381,6 +7729,7 @@ msgstr "Todos os lançamentos"
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
 msgstr ""
+"Você só pode reconciliar itens de diário que pertencem ao mesmo parceiro."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7389,8 +7738,8 @@ msgstr "Selecionar Diário"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Saldo de Abertura"
@@ -7441,6 +7790,8 @@ msgstr "Conjunto Completo de Impostos"
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state."
 msgstr ""
+"Os lançamentos selecionados não possuem movimentação contábil na situação "
+"provisória."
 
 #. module: account
 #: view:account.chart.template:0
@@ -7470,9 +7821,11 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Erro de configuração!\n"
+"A moeda escolhida deve ser partilhada pelas contas padrão também."
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7492,10 +7845,15 @@ msgstr ""
 "\n"
 "Ex.: Meu modelo em %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr "Url do Paypal"
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Gerenciar os pagamentos de clientes"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7514,6 +7872,8 @@ msgid ""
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Erro!\n"
+"A data de início do ano fiscal deve preceder a data de término."
 
 #. module: account
 #: view:account.tax.template:0
@@ -7529,7 +7889,7 @@ msgstr "Faturas de Clientes"
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Diversos"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7545,13 +7905,16 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
 "Make sure you have configured payment terms properly.\n"
 "The latest payment term line should be of the \"Balance\" type."
 msgstr ""
+"Você não pode validar uma entrada não balanceada.\n"
+"Certifique-se de que você configurou condições de pagamento corretamente.\n"
+"A última linha do prazo de pagamento deve ser do tipo \"Saldo\"."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -7583,10 +7946,9 @@ msgid "Source Document"
 msgstr "Documento de Origem"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "Contas bancárias como exibidas no rodapé de cada documento impresso"
 
 #. module: account
 #: constraint:account.account:0
@@ -7595,6 +7957,9 @@ msgid ""
 "You cannot define children to an account with internal type different of "
 "\"View\"."
 msgstr ""
+"Erro de configuração!\n"
+"Você não pode definir as contas filhas a uma conta com tipo interno "
+"diferente de \"Visualização\"."
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -7604,7 +7969,7 @@ msgstr "Relatório Contábil"
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Moeda da Conta"
 
 #. module: account
 #: report:account.invoice:0
@@ -7612,12 +7977,14 @@ msgid "Taxes:"
 msgstr "Impostos:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
 msgstr ""
+"Você não pode excluir uma fatura que não foi cancelada. Você deve fazer o "
+"reembolso."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7670,7 +8037,7 @@ msgstr "Abertura de Contas de Despesas"
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Referência do Cliente"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -7686,7 +8053,7 @@ msgstr "Preço"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,closing_details_ids:0
 msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Linhas de Fechamento do Caixa"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7727,7 +8094,7 @@ msgstr "Agrupar por ano da Data da Fatura"
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Impostos de Compra (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7737,12 +8104,12 @@ msgstr "Valor total que este cliente deve a você."
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr "Itens de Diário Desequilibrados"
+msgstr "Itens de Diário não balanceados"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "Modelos de Gráficos"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7778,7 +8145,7 @@ msgstr "Fechado Em"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Linha do Extrato Bancário"
+msgstr "Linha do Demonstrativo Bancário"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
@@ -7793,7 +8160,7 @@ msgstr "Entradas de Abertura da Conta de Receitas"
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Permite faturas pro-forma"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7811,6 +8178,12 @@ msgstr ""
 "permitindo aos desenvolvedores criar impostos específicos num domínio "
 "personalizado."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referência da Fatura"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7824,12 +8197,12 @@ msgstr "Criar lançamentos"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Moeda principal da empresa"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7857,7 +8230,7 @@ msgstr "Diário de Conta"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Método de aredondamento de imposto"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7874,6 +8247,11 @@ msgid ""
 "                                    with the invoice. You will not be able "
 "to modify the credit note."
 msgstr ""
+"Use esta opção se você deseja cancelar uma fatura que não deveria\n"
+"                                     ter sido emitida. A nota de crédito "
+"será criada, validada e reconciliada\n"
+"                                     com a fatura. Você não será capaz de "
+"alterar a nota de crédito."
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7903,12 +8281,14 @@ msgid "Use model"
 msgstr "Usar modelo"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Não há conta de crédito padrão definido\n"
+"no diário \"%s\"."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7947,6 +8327,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Clique para adicionar uma nova conta analítica.\n"
+"              </p><p>\n"
+"                O plano de contas possui uma estrutura definida pela\n"
+"                 exigência legal do país. O plano de contas analítico \n"
+"                 deve refletir suas necessidades da empresa em\n"
+"                 termo de relatórios de custos / receitas.\n"
+"              </p><p>\n"
+"Eles geralmente são estruturados por contratos, projetos, produtos ou\n"
+"                 departamentos. A maioria das operações do OpenERP "
+"(faturas,\n"
+"                 quadros de horários, despesas, etc) geram entradas "
+"analíticas sobre o\n"
+"                 conta relacionada.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7954,7 +8350,7 @@ msgid "Root/View"
 msgstr "Origem/Visualização"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -8023,7 +8419,7 @@ msgid "Maturity Date"
 msgstr "Data de Vencimento"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Diário de Vendas"
@@ -8034,7 +8430,7 @@ msgid "Invoice Tax"
 msgstr "Impostos da Fatura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Nenhum número da parte!"
@@ -8071,6 +8467,8 @@ msgid ""
 "This date will be used as the invoice date for credit note and period will "
 "be chosen accordingly!"
 msgstr ""
+"Esta data será usado como a data da fatura para a nota de crédito e o "
+"período será escolhido de acordo!"
 
 #. module: account
 #: view:product.template:0
@@ -8078,12 +8476,14 @@ msgid "Sales Properties"
 msgstr "Propriedades da Venda"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"Você tem que definir um código para a conta bancária definida no plano de "
+"contas selecionado."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8103,7 +8503,7 @@ msgstr "Para"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajuste de Moeda"
@@ -8136,7 +8536,7 @@ msgid "May"
 msgstr "Maio"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Impostos globais definido, mas não se encontram em linhas de fatura!"
@@ -8152,19 +8552,17 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
 msgstr ""
-"O campo de seqüência é usado para ordenar os recursos a partir de seqüências "
-"mais baixos aos mais altos."
+"O campo de seqüência é usado para ordenar os recursos do menor ao maior."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Codigo do caso"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr "Valor residual em Moeda"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Seqüência de nota de crédito"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8175,17 +8573,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Postar Lançamentos de Diário"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -8201,7 +8594,7 @@ msgstr "Nome do Relatório"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Dinheiro"
@@ -8213,9 +8606,13 @@ msgid "Account Destination"
 msgstr "Destino da conta"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pagamento de faturas"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
+"Reembolso baseados neste tipo. Você não pode modificar e cancelar se a "
+"fatura já está reconciliada"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8223,7 +8620,6 @@ msgstr "Pagamento de faturas"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8234,7 +8630,7 @@ msgstr "Seqüência"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Conta do Paypal"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8253,11 +8649,13 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Erro!\n"
+"Você não pode criar contas recursivas."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8267,7 +8665,7 @@ msgstr "Relaciona ao item de diário gerado automaticamente."
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -8290,7 +8688,7 @@ msgstr "Balanço Calculado"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "Você deve escolher pelo menos um registro."
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8302,7 +8700,7 @@ msgstr "Superior (Conta-pai)"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Profit"
-msgstr ""
+msgstr "Lucro"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -8349,7 +8747,7 @@ msgstr "Linha do Caixa Físico"
 #. module: account
 #: field:account.installer,charts:0
 msgid "Accounting Package"
-msgstr ""
+msgstr "Pacote de Contabilidade"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -8361,15 +8759,14 @@ msgid "Partner Ledger"
 msgstr "Livro-razão de Parceiro"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fixo"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -8378,12 +8775,12 @@ msgstr "Aviso!"
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Método de Arredondamento de Imposto"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8437,10 +8834,10 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Selecione uma moeda para ser usada na fatura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
-msgstr "Sem Linhas na Fatura !"
+msgstr "Sem Linhas na Fatura!"
 
 #. module: account
 #: view:account.financial.report:0
@@ -8504,6 +8901,7 @@ msgstr "Balanço analítico invertido -"
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
 msgstr ""
+"Esta é umareconciliação produzida pela abertura de um novo ano fiscal?."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8517,10 +8915,10 @@ msgid "Associated Partner"
 msgstr "Parceiro Associado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
-msgstr "Voce precisa selecionar um parceiro primeiro !"
+msgstr "Voce precisa primeiro selecionar um parceiro!"
 
 #. module: account
 #: field:account.invoice,comment:0
@@ -8537,7 +8935,7 @@ msgstr "Total Residual"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Cash Control"
-msgstr ""
+msgstr "Controle de Abertura de Caixa"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -8564,7 +8962,7 @@ msgstr "A situação da fatura é Aberto"
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "Status"
-msgstr "Posição"
+msgstr "Situação"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -8577,7 +8975,7 @@ msgstr "Livro-razão de Custo"
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Nenhum Ano Fiscal definido para esta empresa"
 
 #. module: account
 #: view:account.invoice:0
@@ -8599,16 +8997,16 @@ msgstr ""
 "antes do cálculo dos próximos impostos."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diário de Devolução de Compra"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Por favor defina a sequência no diário."
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8638,6 +9036,9 @@ msgid ""
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Isto permite automatizar cartas de cobrança para faturas não pagas, com "
+"lembretes multi-nível.\n"
+"                 Isso instala o módulo account_followup."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8679,15 +9080,15 @@ msgid "Net Total:"
 msgstr "Total líquido:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Selecione um período inicial e final"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Próximo número de fatura"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8699,14 +9100,6 @@ msgstr "Relatório Genérico"
 msgid "Write-Off Journal"
 msgstr "Diário de Ajustes"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Esta forma de pagamento será usada em vez da padrão para o parceiro atual"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8733,17 +9126,15 @@ msgstr "Tipo Int."
 msgid "Tax/Base Amount"
 msgstr "Valor do Imposto/Base"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Avaliação: Percentual"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
 "This wizard will remove the end of year journal entries of selected fiscal "
 "year. Note that you can run this wizard many times for the same fiscal year."
 msgstr ""
+"Este assistente irá remover as entradas de diário do final do ano do ano "
+"fiscal selecionado. Note que você pode executar este assistente muitas vezes "
+"para o mesmo ano fiscal."
 
 #. module: account
 #: report:account.invoice:0
@@ -8791,6 +9182,11 @@ msgstr "Resultado da conciliação"
 msgid "Ending Balance"
 msgstr "Saldo Final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr "Contrapartida Centralizada"
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8826,6 +9222,12 @@ msgid ""
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Use esta opção se você deseja cancelar uma fatura e criar uma nova.\n"
+"                                     A nota de crédito será criada, validada "
+"e reconciliada\n"
+"                                     com a fatura atual. A nova fatura, "
+"provisória, será criada\n"
+"                                     para que você possa editá-la."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8833,10 +9235,10 @@ msgid "Automatic import of the bank sta"
 msgstr "Importação automática de extrato de banco"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
-msgstr ""
+msgstr "Erro Desconhecido!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -8846,7 +9248,7 @@ msgstr "Reconciliar movimento bancário"
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8856,17 +9258,24 @@ msgid "Account Types"
 msgstr "Tipos de Conta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr "${object.company_id.name} Fatura (Ref ${object.number or 'n/a'})"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal."
 msgstr ""
+"Você não pode usar esta conta geral neste diário, verifique a aba 'Controles "
+"de Entrada' no diário relacionado."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Valor total: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoria P&L / BS"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8880,13 +9289,12 @@ msgstr "  Valor total: n.a"
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr "Conciliação"
+msgstr "Reconciliação"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Conta de Recebimento"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Deixe em branco para usar a conta de receita"
 
 #. module: account
 #: view:account.invoice:0
@@ -8923,6 +9331,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um diário.\n"
+"              </p><p>\n"
+"                Um diário é usado para registrar as transações de todos os "
+"dados\n"
+"                contábeis relacionados ao dia-a-dia da empresa.\n"
+"              </p><p>\n"
+"                Uma empresa pode criar um diário por meio de pagamento "
+"(dinheiro,\n"
+"                 contas bancárias, cheques), um diário de compras, um diário "
+"de vendas\n"
+"                 e um para informações diversas.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8966,7 +9388,7 @@ msgid "The partner account used for this invoice."
 msgstr "A conta do parceiro usada para esta fatura"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Imposto %.2f%%"
@@ -8984,13 +9406,13 @@ msgid "Payment Term Line"
 msgstr "Linha da condição de pagamento"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diário de Compras"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -9019,15 +9441,10 @@ msgstr "Data de Vencimento"
 msgid "Suppliers"
 msgstr "Fornecedores"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadeiro"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Tipos de contas permitidas (vazio para não controlar)"
+msgstr "Tipos de contas permitidas (em branco para não controlar)"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -9056,6 +9473,9 @@ msgid ""
 "computed. Because it is space consuming, we do not allow to use it while "
 "doing a comparison."
 msgstr ""
+"Esta opção permite-lhe obter mais detalhes sobre a forma como os seus saldos "
+"são calculados. Porque ele está consumindo espaço, nós não permitimos a usá-"
+"lo ao fazer uma comparação."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
@@ -9065,13 +9485,15 @@ msgstr "Fechar Ano Fiscal"
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "O código da conta deve ser único por empresa !"
+msgstr "O código da conta deve ser único por empresa!"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
 msgstr ""
+"Essa conta será usada para valorização da saída de estoque usando o preço de "
+"custo."
 
 #. module: account
 #: view:account.invoice:0
@@ -9109,7 +9531,7 @@ msgstr "Contas permitidas (Vazio para não controlar)"
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Impostos de Vendas (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9134,6 +9556,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir uma nova entrada recorrente.\n"
+"              </p><p>\n"
+"                 Lançamentos recorrentes ocorre com base em uma data "
+"específica\n"
+"                 ou seja, data que corresponde à assinatura de um contrato "
+"ou um\n"
+"                 acordo com um cliente ou de um fornecedor. Você pode criar "
+"tal\n"
+"                 entradas para automatizar os lançamentos no sistema.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.journal:0
@@ -9160,9 +9594,10 @@ msgid "Journal Name"
 msgstr "Nome do Diário"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Próxima entrada de parceiro a reconciliar"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Lançamento \"%s\" não é válido"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9175,6 +9610,8 @@ msgid ""
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Isso permite que você escreva e imprima cheques.\n"
+"                 Isso instala o módulo account_check_writing."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -9210,10 +9647,10 @@ msgstr ""
 "moeda"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
-msgstr ""
+msgstr "O movimento da conta (%s) para a centralização foi confirmada."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9252,6 +9689,9 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Você pode selecionar aqui o diário usar para a nota de crédito que será "
+"criada. Se você deixar esse campo vazio, ele vai usar o mesmo diário da "
+"fatura atual."
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -9272,7 +9712,7 @@ msgid "Reconciled entries"
 msgstr "Lançamentos reconciliados"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Modelo errado!"
@@ -9281,7 +9721,7 @@ msgstr "Modelo errado!"
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Modelo de Imposto"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -9294,13 +9734,17 @@ msgid "Print Account Partner Balance"
 msgstr "Imprime o Saldo da Conta de Parceiro"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
 "some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
+"Você não pode fazer esta modificação em uma entrada reconciliada. Você pode "
+"apenas alterar alguns campos não legais ou você deve desconciliar primeiro. "
+"\n"
+"%s."
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9333,7 +9777,7 @@ msgstr "desconhecido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diário de Abertura de Lançamentos"
@@ -9347,14 +9791,14 @@ msgstr "As faturas provisórias são conferidas, validadas e impressas."
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,narration:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr "Nota Interna"
+msgstr "Anotação Interna"
 
 #. module: account
 #: constraint:account.account:0
@@ -9363,11 +9807,15 @@ msgid ""
 "You cannot select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
 msgstr ""
+"Erro de configuração!\n"
+"Você não pode selecionar um tipo de conta com um método de diferimento "
+"diferente de \"Não conciliadas\" para contas com tipo interno \"a Pagar / "
+"Receber\"."
 
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
 msgid "Company has a fiscal year"
-msgstr ""
+msgstr "A empresa possui um ano fiscal"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9380,10 +9828,10 @@ msgstr ""
 "vez do valor total"
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "Você não pode desativar uma conta que possui lançamentos de diário."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9395,21 +9843,9 @@ msgstr "Fornecido por Código Python"
 msgid "Journal Code"
 msgstr "Código do Diário"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Você pode especificar o coeficiente que será usado para consolidação do "
-"valor desta taxa no seu item pai. Por exemplo, defina 1/-1 se quiser "
-"adicionar/subtrair o valor."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Valor Residual"
 
@@ -9439,10 +9875,10 @@ msgstr "Período de"
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Unit of Currency"
-msgstr ""
+msgstr "Unidade da Moeda"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diário de Devolução de Vendas"
@@ -9462,6 +9898,10 @@ msgid ""
 "chart\n"
 "                        of accounts."
 msgstr ""
+"Uma vez que as faturas provisórias são confirmados, você não será capaz de\n"
+"                         modificá-las. A fatura receberá um número exclusivo "
+"e itens de\n"
+"                         diário serão criados em seu plano de contas."
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -9476,7 +9916,7 @@ msgstr "Situação do fechamento de Ano Fiscal e períodos"
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "Diário de Devolução de Vendas"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9500,7 +9940,7 @@ msgstr "Criar Fatura"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Configurar dados Contábeis"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@@ -9508,7 +9948,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposto de Compra(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor, crie algumas linhas da fatura."
@@ -9520,6 +9960,8 @@ msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
 "payment method '%s'."
 msgstr ""
+"Por favor, verifique se no campo 'Conta de transferência interna' é definido "
+"no método de pagamento '%s'."
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
@@ -9527,7 +9969,7 @@ msgid "Display Detail"
 msgstr "Mostrar Detalhes"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "DRV"
@@ -9560,6 +10002,14 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * 'Provisório' é quando o usuário cria uma fatura não confirmada.\n"
+"* 'Pro-forma' é quando a fatura está em pronta mas não tem um número de "
+"fatura.\n"
+"* 'Aberto' é usado quando o usuário cria a fatura, um número de fatura é "
+"gerado e permanece aberto até o pagamento.\n"
+"* 'Pago' é definido automaticamente quando a fatura é paga. As entradas de "
+"diário relacionadas podem ou não ser reconciliadas.\n"
+"* 'Cancelada' é usado quando o usuário cancelar a fatura."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -9579,7 +10029,7 @@ msgstr "Relatórios Financeiros"
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "Ver Passivo"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9627,7 +10077,7 @@ msgstr "Empresas que referenciam o parceiro"
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "Solicitar Reembolso"
 
 #. module: account
 #: view:account.move.line:0
@@ -9644,21 +10094,11 @@ msgstr "O Contador valida os lançamentos contábeis vindos da fatura. "
 msgid "Number of Periods"
 msgstr "Número de Períodos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Modelo do Código do Imposto"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Documento: demonstrativo da conta cliente"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoria P&L / BS"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9667,12 +10107,13 @@ msgstr "Contas a Receber"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Seqüência da nota de crédito do Fornecedor"
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr ""
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "Fatura já reconciliada."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9684,6 +10125,12 @@ msgid ""
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Isso permite que você crie e gerencie suas ordens de pagamento, para\n"
+"                     * Servir como base para um plug-in fácil de vários "
+"mecanismos eletrônicos de pagamento, e\n"
+"                     * Fornecer uma maneira mais eficiente de gerenciar o "
+"pagamentos de faturas.\n"
+"                 Isso instala o módulo account_payment."
 
 #. module: account
 #: xsl:account.transfer:0
@@ -9691,17 +10138,17 @@ msgid "Document"
 msgstr "Documento"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extratos Bancários"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Conta de Recebimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
-msgstr ""
+msgstr "Para reconciliar, a empresa deve ser a mesma para todas as entradas."
 
 #. module: account
 #: field:account.account,balance:0
@@ -9773,13 +10220,13 @@ msgstr "Gerar Lançamentos Iniciais de Abertura do Ano Fiscal"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr "Filtros Por"
+msgstr "Filtrar Por"
 
 #. module: account
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Número de Unidades"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -9799,17 +10246,17 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "Data / Período"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9828,11 +10275,14 @@ msgid ""
 "The period is invalid. Either some periods are overlapping or the period's "
 "dates are not matching the scope of the fiscal year."
 msgstr ""
+"Erro!\n"
+"O período é inválido. Ou alguns períodos estão sobrepostos ou datas do "
+"período estão fora do ano fiscal."
 
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Não há nada em atraso com este cliente."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -9840,6 +10290,8 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "refunds. Leave empty to use the expense account."
 msgstr ""
+"Defina a conta que será usada por padrão em linhas de fatura para reembolso. "
+"Deixe em branco para usar a conta de despesa."
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -9850,7 +10302,7 @@ msgstr "Cria uma conta com o modelo selecionado abaixo desta conta pai."
 #. module: account
 #: report:account.invoice:0
 msgid "Source"
-msgstr ""
+msgstr "Origem"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9873,16 +10325,13 @@ msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Este campo contém a informação relacionada com a numeração dos lançamentos "
+"neste diário."
 
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
-msgstr ""
-
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transações não conciliadas"
+msgstr "Enviada"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9893,7 +10342,7 @@ msgstr "Relatório Comum"
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Imposto padrão de vendas"
 
 #. module: account
 #: report:account.overdue:0
@@ -9901,10 +10350,15 @@ msgid "Balance :"
 msgstr "Saldo:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Não é possível criar movimentos para empresas diferentes."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr "Processamento Periódico"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9942,13 +10396,6 @@ msgstr "Inscrição"
 msgid "Account Analytic Balance"
 msgstr "Balanço de Conta Analítica"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9980,7 +10427,7 @@ msgstr "Finalizar Período"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Visualizar Despesa"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -9988,10 +10435,16 @@ msgid "Due date"
 msgstr "Data de vencimento"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr "Pagamento Imediato"
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
-msgstr ""
+msgstr " Centralização"
 
 #. module: account
 #: help:account.journal,type:0
@@ -10012,7 +10465,7 @@ msgstr ""
 #: view:account.subscription:0
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "Inscriçãoda conta"
+msgstr "Conta de Assinatura"
 
 #. module: account
 #: report:account.overdue:0
@@ -10074,17 +10527,17 @@ msgstr "Faturas Provisórias"
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "Colocar dinheiro em"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "Não conciliado"
+msgstr "Não Conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Total inválido!"
@@ -10133,7 +10586,7 @@ msgstr "A partir de contas analíticas"
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Configure seu Ano Fiscal"
 
 #. module: account
 #: field:account.period,name:0
@@ -10147,6 +10600,8 @@ msgid ""
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
+"As fatura selecionada(s) não podem ser canceladas pois já estão como "
+"'Cancelado' ou 'Concluído'."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10174,13 +10629,17 @@ msgid "Comparison"
 msgstr "Comparação"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
 "some non legal fields or you must unconfirm the journal entry first.\n"
 "%s."
 msgstr ""
+"Você não pode fazer esta modificação em uma entrada confirmada. Você pode "
+"apenas alterar alguns campos não legais ou você deve desconfirmar a entrada "
+"de diário primeiro.\n"
+"%s."
 
 #. module: account
 #: help:account.config.settings,module_account_budget:0
@@ -10191,6 +10650,17 @@ msgid ""
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Isso permite aos contadores gerenciar orçamentos analíticos e cruzados.\n"
+"                 Uma vez que os orçamentos mestre e os orçamentos são "
+"definidos,\n"
+"                 os gerentes de projeto pode definir o valor planejado em "
+"cada conta analítica.\n"
+"                 Isso instala o módulo account_budget."
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10245,12 +10715,7 @@ msgstr "Crédito"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Invoice "
-msgstr ""
-
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
+msgstr "Fatura Provisória "
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -10263,10 +10728,10 @@ msgid "Journal Entry Model"
 msgstr "Modelo de Lançamento de Diário"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
-msgstr ""
+msgstr "O período inicial deve vir antes do período final."
 
 #. module: account
 #: field:account.invoice,number:0
@@ -10348,10 +10813,10 @@ msgid "Profit (Loss) to report"
 msgstr "Lucro (Prejuízo) para relatório"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Não existe diário de Venda/Compra definido."
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -10430,7 +10895,7 @@ msgstr "Tipo interno"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Gerar lançamentos antes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -10530,6 +10995,8 @@ msgstr "Situações"
 #: help:product.template,property_account_income:0
 msgid "This account will be used to value outgoing stock using sale price."
 msgstr ""
+"Essa conta será usada para valorizar o estoque de saída usando o preço de "
+"venda."
 
 #. module: account
 #: field:account.invoice,check_total:0
@@ -10552,12 +11019,12 @@ msgstr "Total"
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Não é possível %s provisória/proforma/cancelar a fatura."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Conta Analítica de Reembolso de Imposto"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -10624,7 +11091,7 @@ msgstr "Data de Vencimento"
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -10653,7 +11120,7 @@ msgstr "Criar Períodos Mensais"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr "Sinal Para o Pai"
+msgstr "Registro para o superior"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
@@ -10676,13 +11143,23 @@ msgstr ""
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr "Esvaziar as contas ? "
+msgstr "Esvaziar as contas? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+"Se você desconciliar as transações, você também deve verificar se todas as "
+"ações que estão associadas a essas operações, porque não vai ser desativar "
+"automaticamente"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Não é possível alterar o imposto!"
 
 #. module: account
 #: constraint:account.bank.statement:0
@@ -10711,6 +11188,10 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"A partir deste relatório, você pode ter uma visão geral do valor faturado "
+"para o seu cliente. A ferramenta de busca também pode ser usado para "
+"personalizar seus relatórios de faturas e assim, combinar esta análise de "
+"acordo com suas necessidades."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -10731,7 +11212,7 @@ msgstr "A situação da fatura é Concluída"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Gerenciar o acompanhamento de cobrança ao clientes"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -10804,10 +11285,10 @@ msgid "Receivable accounts"
 msgstr "Contas de recebimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
-msgstr ""
+msgstr "Já reconciliada"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -10861,6 +11342,7 @@ msgstr "Manualmente"
 msgid ""
 "This is a field only used for internal purpose and shouldn't be displayed"
 msgstr ""
+"Este é um campo utilizado apenas para uso interno e não deve ser mostrado"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10881,6 +11363,7 @@ msgstr "Agrupar por mês da fatura"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Não existe conta de entrada definida para este produto: \"%s\" (id:%d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10938,12 +11421,14 @@ msgid "Entries Sorted by"
 msgstr "Entradas classificadas por"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
 msgstr ""
+"A unidade de medida seleccionada não é compatível com a unidade de medida do "
+"produto."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -10967,6 +11452,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo código de imposto.\n"
+"              </p><p>\n"
+"Dependendo do país, um código fiscal é geralmente uma célula para preencher\n"
+"                 em sua declaração de imposto legal. O OpenERP permite que "
+"você defina a\n"
+"                 estrutura tributária e cada cálculo do imposto será "
+"registrado em \n"
+"                 uma ou vários código tributário.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10993,6 +11489,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Escolha o período e o diário que deseja preencher.\n"
+"              </p><p>\n"
+"               Esta visualização pode ser usado por contadores de forma a "
+"registrar rapidamente\n"
+"               entradas no OpenERP. Se você quiser registrar uma fatura do "
+"fornecedor,\n"
+"               começe a gravação da linha de conta da despesa. O OpenERP irá "
+"propor a você\n"
+"               o Imposto relacionado com esta conta e a contrapartida "
+"\"Conta a Pagar\".\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -11002,7 +11511,7 @@ msgstr "A conta de receita ou despesa relacionada ao produto selecionado."
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Instalar mais modelos de gráfico"
 
 #. module: account
 #: report:account.general.journal:0
@@ -11044,12 +11553,14 @@ msgid "Accounting Documents"
 msgstr "Documentos Contábeis"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Você não pode remover/desativar uma conta que está definida em um cliente ou "
+"fornecedor."
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -11061,6 +11572,7 @@ msgstr "Validar Linhas de Movimento de Contas"
 msgid ""
 "The fiscal position will determine taxes and accounts used for the partner."
 msgstr ""
+"A posição fiscal irá determinar os impostos e contas usadas para o parceiro."
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -11076,7 +11588,7 @@ msgstr "Assim que a reconciliação é feita, a fatura pode ser paga."
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly."
-msgstr ""
+msgstr "A nova moeda não está configurada corretamente."
 
 #. module: account
 #: view:account.account.template:0
@@ -11089,10 +11601,11 @@ msgid "Manual Invoice Taxes"
 msgstr "Impostos de fatura manual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
+"A condição de pagamento do fornecedor não possui uma linha de pagamento."
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -11105,7 +11618,7 @@ msgstr "Superior a direita"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Nunca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -11126,7 +11639,7 @@ msgstr "Do parceiro"
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Anotações Internas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11159,7 +11672,7 @@ msgstr "Modelo de Conta"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Perda"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11170,22 +11683,11 @@ msgstr ""
 msgid "February"
 msgstr "Fevereiro"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Se você dá ao Nome outro que não seja /, o movimento de lançamentos "
-"contábeis criado terá o mesmo nome do nome no extrato. Isto permite aos "
-"lançamentos no extrato terem as mesmas referências que os extrato em si"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
 msgid "Closing Unit Numbers"
-msgstr ""
+msgstr "Números da Unidade de Fechamento"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -11239,6 +11741,11 @@ msgstr "Modelo para Mapeamento de Conta Fiscal"
 msgid "Expense Account on Product Template"
 msgstr "Contas de despesas no modelo do produto"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr "Condições de Pagamento do Cliente"
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11251,7 +11758,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr ""
+msgstr "Arredondamento por linha"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -11281,6 +11788,10 @@ msgstr ""
 #~ msgid "O_k"
 #~ msgstr "O_k"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Fatura de fornecedor"
+
 #~ msgid "OK"
 #~ msgstr "OK"
 
@@ -11353,6 +11864,9 @@ msgstr ""
 #~ msgid "Account No."
 #~ msgstr "Conta nro."
 
+#~ msgid "Litigation"
+#~ msgstr "Litígio"
+
 #~ msgid "Select Period and Journal for Validation"
 #~ msgstr "Selecone período e diário para validação"
 
@@ -11770,9 +12284,15 @@ msgstr ""
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Reembolsos a fornecedores não pagos"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Processamento periódico"
+
 #~ msgid "Line"
 #~ msgstr "Linha"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Fiscal Position Accounts Mapping"
 #~ msgstr "Mapa da posição fiscal das contas"
 
@@ -11839,6 +12359,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Impostos de compra"
 
+#~ msgid "Line Name"
+#~ msgstr "Nome da linha"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Crédito analítico"
 
@@ -12174,6 +12697,9 @@ msgstr ""
 #~ msgid "Error"
 #~ msgstr "Erro"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "List of Accounts"
 #~ msgstr "Lista de contas"
 
@@ -12370,6 +12896,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Número do Vale"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "O campo seqüência é utilizado para ordenar as linhas das formas de pagamento "
+#~ "a partir do menor prazo para os maiores"
+
 #~ msgid "Total write-off"
 #~ msgstr "Total da baixa"
 
@@ -12395,6 +12928,14 @@ msgstr ""
 #~ "Voce não pode fazer essa modificação em um lançamento confirmado ! Voce pode "
 #~ "apenas trocar alguns campos sem importância !"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Se você desfazer a reconciliação de transações, você deve também verificar "
+#~ "todas as ações que estão ligadas a essas operações, porque elas não serão "
+#~ "desfeitas pelo sistema"
+
 #, python-format
 #~ msgid "Cannot create invoice move on centralised journal"
 #~ msgstr "Não é possível criar um movimento de fatura no diário centralizado"
@@ -12852,6 +13393,12 @@ msgstr ""
 #~ msgid "Fiscal Position Template Tax Mapping"
 #~ msgstr "Modelo para Mapeamento do Imposto na Posição Fiscal"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Esta forma de pagamento será usada em vez da padrão para o parceiro atual"
+
 #~ msgid "Overdue Payment Report Message"
 #~ msgstr "Mensagem para o Relatório de Pagamentos em Atraso"
 
@@ -12906,9 +13453,6 @@ msgstr ""
 #~ msgid "To Be Verified"
 #~ msgstr "Pendente de Verificação"
 
-#~ msgid "Fixed"
-#~ msgstr "Fixo"
-
 #~ msgid "Account Num."
 #~ msgstr "Número da conta"
 
@@ -12987,6 +13531,13 @@ msgstr ""
 #~ msgid "Voucher Management"
 #~ msgstr "Gerenciamento de Voucher"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Se você não reconciliar essas transações, você também deve verificar todas "
+#~ "as ações ligadas a estas transações pois elas não serão desativadas"
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Você não pode excluir o movimento postado: \"%s\"!"
@@ -13342,6 +13893,9 @@ msgstr ""
 #~ msgid "No sequence defined on the journal !"
 #~ msgstr "Nenhuma seqüência definida no diário !"
 
+#~ msgid "Line 2:"
+#~ msgstr "Linha 2:"
+
 #~ msgid "Cash Transaction"
 #~ msgstr "Transaçao em dinheiro"
 
@@ -13540,6 +14094,12 @@ msgstr ""
 #~ "conta \"%s - %s\". Apague o campo da moeda secundária na definição da Conta "
 #~ "se você quiser aceitar todas as moedas."
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banco e Cheques"
+
+#~ msgid "Line 1:"
+#~ msgstr "Linha 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Item \"%s\" do Livro não é valido"
@@ -13557,6 +14117,9 @@ msgstr ""
 #~ msgid "Transaction"
 #~ msgstr "Transação"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicação"
+
 #~ msgid "Sort By"
 #~ msgstr "Ordenar Por"
 
@@ -13570,6 +14133,9 @@ msgstr ""
 #~ msgid "Already Reconciled!"
 #~ msgstr "Já Reconciliado"
 
+#~ msgid "Valuation"
+#~ msgstr "Valorização"
+
 #~ msgid "Accounting Properties"
 #~ msgstr "Propriedades da Conta"
 
@@ -14347,6 +14913,10 @@ msgstr ""
 #~ "A faturas de devolução é baseada neste tipo. Você não pode Modificar e "
 #~ "Cancelar se a fatura já estiver reconciliada"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "A fatura '%s' está validada."
+
 #~ msgid ""
 #~ "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
 #~ "will be added, Loss : Amount will be deducted.), Which is calculated from "
@@ -14381,6 +14951,12 @@ msgstr ""
 #~ "Colocar uma sequência na definição do diário para numeração automática ou "
 #~ "manualmente criar uma sequência para esta peça."
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Quantia de valor: 0,02"
+
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dia do mês: 0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Vendas do mês por tipo"
 
@@ -14390,6 +14966,12 @@ msgstr ""
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "O código da moeda deve ser único por empresa!"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Número de dias: 30"
+
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dia do mês= -1"
+
 #~ msgid "Sale journal in this year"
 #~ msgstr "Diário de vendas deste ano"
 
@@ -14404,6 +14986,10 @@ msgstr ""
 #~ msgid "New currency is not configured properly !"
 #~ msgstr "Nova moeda não está configurada corretamente!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Aos 14 dias líquidos de 2%, mantendo-se a quantia em final do mês de 30 dias."
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "O nome da empresa deve ser exclusivo!"
 
@@ -14466,6 +15052,9 @@ msgstr ""
 #~ "Este relatório é a análise por parceiro. É um relatório em PDF que contém "
 #~ "uma linha para cada parceiro e representa o saldo do crédito acumulado."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Números de Dias: 14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
@@ -14486,6 +15075,9 @@ msgstr ""
 #~ "Você não pode remover / desativar uma conta que é definido em um cliente ou "
 #~ "fornecedor."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Avaliação: Balanço"
+
 #, python-format
 #~ msgid "You can not desactivate an account that contains some journal items."
 #~ msgstr "Você não pode desativar uma conta que contém alguns itens do diário."
@@ -14551,10 +15143,16 @@ msgstr ""
 #~ msgid "Bank Account Owner"
 #~ msgstr "Titular da Conta Bancária"
 
+#~ msgid "Example"
+#~ msgstr "Exemplo"
+
 #, python-format
 #~ msgid "Encoding error"
 #~ msgstr "Erro de codificação"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Fatura (Ref ${object.number ou 'n/a' })"
+
 #~ msgid "Sale journal in this month"
 #~ msgstr "Diário de vendas deste mês"
 
@@ -14588,6 +15186,9 @@ msgstr ""
 #~ "Você não pode mudar o tipo de conta de '%s' para o tipo '%s' porque este "
 #~ "último já contém lançamentos!"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Avaliação: Percentual"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -14665,6 +15266,9 @@ msgstr ""
 #~ "Você não pode cancelar uma fatura que foi parcialmente paga! Você precisa "
 #~ "desconciliar as entradas de pagamento primeiro!"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Valor total: n.a"
+
 #~ msgid "Analytic Entries of last 365 days"
 #~ msgstr "Entradas analíticas dos últimos 365 dias"
 
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 5abdbc7ce98..8fb75c664c8 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 07:21+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\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: 2012-12-11 04:47+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 msgstr ""
 "O poziție fiscal poate fi definită o singură dată pe aceleași tip de cont."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Nereconciliere tranzactii"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Importati din factura sau din plata"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Contul nu este bun!"
@@ -94,16 +89,6 @@ msgstr "Contul nu este bun!"
 msgid "Total Debit"
 msgstr "Total debit"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Daca dezactivati reconcilierea tranzactiilor trebuie, de asemenea, sa "
-"verificati toate actiunile care sunt legate de acele tranzactii pentru ca "
-"acestea nu vor fi dezactivate"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -114,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -145,19 +129,19 @@ msgstr ""
 "ascundeti termenul plata fara a-l sterge."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -169,7 +153,7 @@ msgid "Warning!"
 msgstr "Avertizare!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Jurnal Diverse"
@@ -241,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Sabloane taxe"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "taxa.cont"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -261,6 +240,11 @@ msgstr "Inregistrarile contabile sunt un input al reconcilierii"
 msgid "Belgian Reports"
 msgstr "Rapoarte belgiene"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +379,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "sablon.taxa.cont"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -454,6 +433,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -469,6 +453,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Sablon Plan de Conturi"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -630,15 +619,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Trimestrial"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Daca nu reconciliati tranzactiile, trebuie, de asemenea, sa verificati toate "
-"actiunile relationate acestor tranzactii deoarece nu vor fi dezactivate."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -687,7 +667,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -700,13 +680,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Raport Vanzari dupa Tipul Contului"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -769,6 +749,11 @@ msgstr "Conturi Incasari"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -793,6 +778,12 @@ msgstr "Redeschideti"
 msgid "Are you sure you want to create entries?"
 msgstr "Sunteti sigur(a) ca doriti sa creati inregistrari ?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -813,6 +804,7 @@ msgstr "Afisati conturi secundare ierarhic"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
 
@@ -855,7 +847,7 @@ msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,25 +872,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Facturi Furnizor si Rambursari"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Nereconciliere"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"La 14 zile net 2 la suta, suma ramasa la sfarsitul lunii din 30 de zile."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -929,11 +914,6 @@ msgstr "J.C. / Nume miscare"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -965,7 +945,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -980,6 +960,7 @@ msgstr "Abonament nou"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Calcul"
 
@@ -1011,11 +992,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1051,7 +1029,7 @@ msgid "Liability"
 msgstr "Raspundere"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Va rugam sa definiti secventa din jurnalul asociat acestei facturi."
@@ -1125,10 +1103,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1206,8 +1184,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1253,7 +1232,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banca"
@@ -1551,9 +1530,9 @@ msgid "Account Receivable"
 msgstr "Cont Incasari"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1567,7 +1546,7 @@ msgid "With balance is not equal to 0"
 msgstr "Cu soldul diferit de zero"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1622,7 +1601,7 @@ msgstr "Omiteti stadiul 'Ciorna' pentru Inregistrarile Manuale"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1667,6 +1646,12 @@ msgstr "Un Tabel temporar folosit pentru vizualizarea Tabloului de bord"
 msgid "Supplier Refunds"
 msgstr "Rambursare Furnizor"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Cod caz"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1704,7 +1689,6 @@ msgid "Groups"
 msgstr "Grupuri"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Neimpozitat"
@@ -1837,6 +1821,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Vanzari dupa Tipul de cont"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1857,115 +1847,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2076,6 +1962,11 @@ msgstr "Aceste perioade se pot suprapune."
 msgid "Draft statement"
 msgstr "Extras ciorna"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2104,26 +1995,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2131,16 +2021,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2151,8 +2041,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2198,7 +2088,7 @@ msgid "period close"
 msgstr "incheierea perioadei"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2298,7 +2188,7 @@ msgid "Product Category"
 msgstr "Categoria Produsului"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2669,7 +2559,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Lasati necompletat pentru toti anii fiscali deschisi"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2687,7 +2577,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Creare Cont bazat pe acest sablon"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2708,7 +2598,7 @@ msgid "Main Sequence"
 msgstr "Secventa Principala"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2718,14 +2608,12 @@ msgstr ""
 "sterge elementele asociate jurnalului."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Termen de plata"
 
@@ -2751,18 +2639,6 @@ msgstr "Bifati casuaa aceasta"
 msgid "Filters"
 msgstr "Filtre"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Deschis"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2774,6 +2650,11 @@ msgstr "Starea ciorna a unei facturi"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2852,25 +2733,20 @@ msgid "Account Model Entries"
 msgstr "Inregistrari Model Cont"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Taxe Furnizor"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "inregistrari"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalii bancare"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2893,7 +2769,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2907,9 +2782,8 @@ msgstr ""
 "poate calcula mai multe date scadente, de exemplu 50% acum, 50% peste o luna."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2939,6 +2813,7 @@ msgstr "Reconciliere linie miscare cont (pierdere)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Taxa"
 
@@ -2974,14 +2849,14 @@ msgid "Accounts"
 msgstr "Conturi"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3080,6 +2955,12 @@ msgstr "Platit/Reconciliat"
 msgid "Refund Base Code"
 msgstr "Cod baza restituire"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extrase de cont"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3132,11 +3013,6 @@ msgstr "Solduri restante partener"
 msgid "Accounting entries"
 msgstr "Inregistrari contabile"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tip de comunicare"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3181,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3194,7 +3070,7 @@ msgid "Sales by Account"
 msgstr "Vanzari dupa Cont"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3210,15 +3086,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Trebuie sa definiti un jurnal analitic in jurnalul '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3226,7 +3102,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3291,9 +3167,10 @@ msgstr ""
 "folositoare pentru unele rapoarte."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Linia 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3342,12 +3219,6 @@ msgstr "Cuantum Cod Baza"
 msgid "Default Sale Tax"
 msgstr "Taxa de vanzare Implicita"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factura '%s' este validata."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3384,7 +3255,7 @@ msgid "Fiscal Position"
 msgstr "Pozitie fiscala"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3413,7 +3284,7 @@ msgid "Trial Balance"
 msgstr "Balanta de verificare"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3485,7 +3356,7 @@ msgstr ""
 "cursul zilei."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3497,9 +3368,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Nr. de Cifre care va fi folosit pentru codul contului"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nume linie"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3548,7 +3419,7 @@ msgid "View"
 msgstr "Vizualizare"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3569,15 +3440,20 @@ msgstr "Facturi Proforma"
 msgid "Electronic File"
 msgstr "Fisier electronic"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Ziua din luna: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Sablon Cod Fiscal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3585,9 +3461,88 @@ msgid "Account Partner Ledger"
 msgstr "Registru Cont Partener"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3724,12 +3679,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Valoare suma: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Daca dati un alt Nume decat /, atunci Miscarea Inregistrarilor Contabile "
+"creata va avea acelasi nume ca si numele extrasului. Acest lucru permite "
+"inregistrarilor extrasului sa aiba aceleasi referinte ca si extrasul insusi."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3744,7 +3705,7 @@ msgid "Starting Balance"
 msgstr "Soldul initial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nici un partener definit !"
@@ -3948,7 +3909,7 @@ msgid "Period Length (days)"
 msgstr "Durata Perioada (zile)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3972,7 +3933,7 @@ msgid "Category of Product"
 msgstr "Categoria Produsului"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4112,7 +4073,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sablon Plan de Conturi"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4202,9 +4163,15 @@ msgid "Qty"
 msgstr "Cantitate"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litigiu"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Puteti specifica aici coeficientul care va fi folosit la consolidarea sumei "
+"acestui caz in contul principal. De exemplu, setati 1/-1 daca doriti sa o "
+"adunati/scadeti."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4289,11 +4256,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4311,11 +4273,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Configurati-va Conturile Bancare"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4362,8 +4319,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4393,7 +4350,7 @@ msgid "Consolidated Children"
 msgstr "Subordonati reuniti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4431,11 +4388,6 @@ msgstr ""
 msgid "title"
 msgstr "titlu"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4525,6 +4477,13 @@ msgstr "Sfarsit de luna de 30 zile"
 msgid "Analytic Balance"
 msgstr "Sold Analitic"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4546,6 +4505,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Elemente Afisate ale Jurnalului"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4556,11 +4520,6 @@ msgstr "Cautati Sabloane Fiscale"
 msgid "Draft Entries"
 msgstr "Inregistrari Ciorna"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Ziua din Luna= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4569,11 +4528,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Numar de Zile: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4597,20 +4551,9 @@ msgid "Account Type"
 msgstr "Tipul de cont"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Inchideti Casa de Bani"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4633,9 +4576,20 @@ msgstr ""
 "din conturile analitice. Acestea genereaza facturi ciorna ale furnizorilor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Inchideti Casa de Bani"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4663,7 +4617,7 @@ msgid "Month"
 msgstr "Luna"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4674,8 +4628,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4699,6 +4653,11 @@ msgstr "Cont Paypal"
 msgid "Acc.Type"
 msgstr "Tipul de cont"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4711,7 +4670,7 @@ msgstr "Semn stornare sold"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Bilant (Cont pasive)"
@@ -4733,7 +4692,7 @@ msgid "Account Base Code"
 msgstr "Cod de baza cont"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4789,11 +4748,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesare periodica"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4823,10 +4777,9 @@ msgid "Account chart"
 msgstr "Plan de conturi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Factură furnizor"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4894,10 +4847,14 @@ msgstr "Note de credit"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4950,7 +4907,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4965,7 +4922,7 @@ msgid "Based On"
 msgstr "Bazat pe"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4990,11 +4947,6 @@ msgstr ""
 msgid "Change"
 msgstr "Modificati"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banca si Cecuri"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -5017,11 +4969,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Anulat(a)"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Exemplu"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5032,11 +4979,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Lasati necompletat pentru a utiliza contul de venituri"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5046,7 +4988,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Taxa Achizitie %.2f%%"
@@ -5120,16 +5062,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "DIVERSE"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/a'})"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5243,6 +5180,7 @@ msgstr "Adaugati"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Platit(a)"
 
@@ -5269,7 +5207,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Deschidere Perioada"
@@ -5284,14 +5222,6 @@ msgstr "Inregistrari in Jurnal de Revizuit"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5304,7 +5234,7 @@ msgid "Tax Application"
 msgstr "Aplicare Taxa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5337,9 +5267,9 @@ msgid "End of period"
 msgstr "Sfarsitul perioadei"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalii bancare"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Plata facturilor"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5435,14 +5365,6 @@ msgstr "Descriere taxa"
 msgid "Child Tax Accounts"
 msgstr "Conturi taxe subordonate"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5489,7 +5411,7 @@ msgid "Target Moves"
 msgstr "Miscari tinta"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5525,6 +5447,7 @@ msgid "Python Code (reverse)"
 msgstr "Cod Python (inversare)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5542,12 +5465,6 @@ msgstr ""
 "sau sa aleaga din lista de taxe. Ultima alegere presupune faptul ca setul de "
 "taxe definit in acest sablon este complet"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5573,18 +5490,13 @@ msgstr "Anul"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Linia 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Nume intern"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5623,7 +5535,7 @@ msgstr "Bilant"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Profit & Pierdere (Contul de venituri)"
@@ -5656,7 +5568,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Cod Calcul (daca tip=cod)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5683,6 +5595,7 @@ msgstr "Reconciliere Automata"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5786,7 +5699,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5817,7 +5730,7 @@ msgid "Amount Computation"
 msgstr "Calcul Suma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5853,10 +5766,16 @@ msgid "Account Common Account Report"
 msgstr "Cont Comun Raport Cont"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Comunicare"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Deschis"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5886,9 +5805,7 @@ msgstr "Coduri taxe"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Rambursare client"
 
@@ -5905,11 +5822,6 @@ msgstr "Semn Cod Fiscal"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Raportul Facturilor create in ultimele 15 zile"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Numar de zile: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5926,6 +5838,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Suma de Plata"
@@ -6017,8 +5930,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6041,6 +5952,13 @@ msgstr "Text obisnuit"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Inregistrarile platii reprezinta al doilea input al reconcilierii."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6050,15 +5968,6 @@ msgstr ""
 "Numarul sumelor partiale care pot fi combinate pentru a gasi un punct al "
 "soldului poate fi ales drept puterea reconcilierii automate"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Campul secventa este utilizat pentru ordonarea ascendenta a liniilor "
-"termenelor de plata"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6116,12 +6025,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Suma fixa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6145,7 +6053,6 @@ msgstr "Generati Inregistrari Deschise"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Metoda de calcul pentru valoarea impozitului."
 
@@ -6173,18 +6080,23 @@ msgid "Child Accounts"
 msgstr "Conturi subordonate"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nume miscare (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Pierdere"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "inregistrari"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6201,7 +6113,7 @@ msgstr "Venit"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Furnizor"
@@ -6221,16 +6133,11 @@ msgid "Account n°"
 msgstr "Nr. de cont"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referinta gratuita"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Evaluare"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6347,7 +6254,7 @@ msgid "Filter by"
 msgstr "Filtrati dupa"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Aveti o expresie \"%(...)s\" gresita in modelul dumneavoastra !"
@@ -6394,6 +6301,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Numarul de zile"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6537,7 +6452,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6716,7 +6631,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6747,12 +6662,6 @@ msgstr ""
 msgid "Current"
 msgstr "Actual(a)"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6777,7 +6686,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procentaj"
 
@@ -6797,7 +6705,7 @@ msgid "Power"
 msgstr "Putere"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Nu se poate crea un cod de jurnal nefolosit."
@@ -6844,12 +6752,17 @@ msgid "Applicable Type"
 msgstr "Tipul aplicabil"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referinta facturii"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6868,12 +6781,12 @@ msgstr ""
 "subordonate. In acest caz, ordinea evaluarii este importanta."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6948,7 +6861,7 @@ msgid "Optional create"
 msgstr "Creare Optionala"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6961,9 +6874,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Restituire furnizor"
 
@@ -7001,9 +6912,12 @@ msgid "Group By..."
 msgstr "Grupati dupa..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Evaluare: Sold"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7081,6 +6995,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Tranzactii cu numerar"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7098,7 +7019,7 @@ msgstr "Statistica Inregistrari Analitice"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Inregistrari: "
@@ -7116,14 +7037,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Adevarat"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Bilant (Cont Active)"
@@ -7139,10 +7059,9 @@ msgid "Total debit"
 msgstr "Total debit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Inregistrarea \"%s\" nu este valida !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Urmatoarele Inregistrari Partener de reconciliat"
 
 #. module: account
 #: report:account.invoice:0
@@ -7195,7 +7114,7 @@ msgstr "Creati inregistrarea"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Profit & Pierdere (Contul de cheltuieli)"
@@ -7206,13 +7125,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Eroare !"
@@ -7249,6 +7169,11 @@ msgstr "Linia proiectului"
 msgid "Manual"
 msgstr "Manual"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7355,8 +7280,8 @@ msgstr "Selectare Jurnal"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Soldul la deschidere"
@@ -7439,7 +7364,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7460,6 +7385,11 @@ msgstr ""
 "\n"
 "ex. Modelul meu in %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7513,7 +7443,7 @@ msgid "Done"
 msgstr "Efectuat"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7552,9 +7482,8 @@ msgid "Source Document"
 msgstr "Document sursa"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7581,7 +7510,7 @@ msgid "Taxes:"
 msgstr "Taxe:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7778,6 +7707,12 @@ msgstr ""
 "Acest camp este utilizat numai daca dezvoltati un modul propriu care sa le "
 "permita dezvoltatorilor sa creeze taxe specifice intr-un domeniu particular."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referinta facturii"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7870,7 +7805,7 @@ msgid "Use model"
 msgstr "Utilizati modelul"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7921,7 +7856,7 @@ msgid "Root/View"
 msgstr "Baza/Vizualizare"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7990,7 +7925,7 @@ msgid "Maturity Date"
 msgstr "Data scadenta"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Jurnal Vanzari"
@@ -8001,7 +7936,7 @@ msgid "Invoice Tax"
 msgstr "Factură fiscală"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Lipsă număr bucăţi !"
@@ -8045,7 +7980,7 @@ msgid "Sales Properties"
 msgstr "Proprietati Vanzari"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8070,7 +8005,7 @@ msgstr "Catre"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustare Moneda"
@@ -8104,7 +8039,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8124,10 +8059,9 @@ msgid ""
 msgstr "Campul secventa este utilizat pentru a ordona resursele ascendent."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Cod caz"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8143,17 +8077,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Afisati Inregistrarile in Jurnal"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Client"
@@ -8169,7 +8098,7 @@ msgstr "Nume raport"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Numerar"
@@ -8181,9 +8110,11 @@ msgid "Account Destination"
 msgstr "Destinatie Cont"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Plata facturilor"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8191,7 +8122,6 @@ msgstr "Plata facturilor"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8329,15 +8259,14 @@ msgid "Partner Ledger"
 msgstr "Registru Partener"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fix"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Avertizare !"
@@ -8405,7 +8334,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Selectati o valuta pentru a o aplica pe factura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nici o Linie a Facturii !"
@@ -8486,7 +8415,7 @@ msgid "Associated Partner"
 msgstr "Partener asociat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Mai intai trebuie sa selectati un partener !"
@@ -8568,13 +8497,13 @@ msgstr ""
 "calcula urmatoarele taxe."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Jurnal Rambursare Achizitii"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8647,7 +8576,7 @@ msgid "Net Total:"
 msgstr "Net Total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8667,15 +8596,6 @@ msgstr "Raportare Generala"
 msgid "Write-Off Journal"
 msgstr "Jurnal pierderi"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Acest termen de plata va fi folosit in locul celui implicit pentru "
-"partenerul curent"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8702,11 +8622,6 @@ msgstr "Tip Int."
 msgid "Tax/Base Amount"
 msgstr "Suma Taxa/Baza"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Evaluare: Procent"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8760,6 +8675,11 @@ msgstr "Resultatul reconcilierii"
 msgid "Ending Balance"
 msgstr "Sold final"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8802,7 +8722,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Import automat al extrasului de cont"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8825,7 +8745,12 @@ msgid "Account Types"
 msgstr "Tipuri de Conturi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8833,9 +8758,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Cuantum suma: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoria P&L / BS"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8852,10 +8777,9 @@ msgid "Reconciliation"
 msgstr "Reconciliere"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cont Incasari"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Lasati necompletat pentru a utiliza contul de venituri"
 
 #. module: account
 #: view:account.invoice:0
@@ -8936,7 +8860,7 @@ msgid "The partner account used for this invoice."
 msgstr "Contul partener folosit pentru aceasta factura."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Taxa %.2f%%"
@@ -8954,13 +8878,13 @@ msgid "Payment Term Line"
 msgstr "Linie Termeni de plata"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Jurnal Achizitii"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8989,11 +8913,6 @@ msgstr "Data scadentei"
 msgid "Suppliers"
 msgstr "Furnizori"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Adevarat"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9130,9 +9049,10 @@ msgid "Journal Name"
 msgstr "Numele Jurnalului"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Urmatoarele Inregistrari Partener de reconciliat"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Inregistrarea \"%s\" nu este valida !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9180,7 +9100,7 @@ msgstr ""
 "multi-moneda."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9243,7 +9163,7 @@ msgid "Reconciled entries"
 msgstr "Inregistrari reconciliate"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Model gresit !"
@@ -9265,7 +9185,7 @@ msgid "Print Account Partner Balance"
 msgstr "Tipariti Soldul Contului Partener"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9305,7 +9225,7 @@ msgstr "necunoscut(a)"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Jurnalul Inregistrarilor de deschidere"
@@ -9352,7 +9272,7 @@ msgstr ""
 "nu pe suma totala."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9367,21 +9287,9 @@ msgstr "Dat de Codul Python"
 msgid "Journal Code"
 msgstr "Codul Jurnalului"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Puteti specifica aici coeficientul care va fi folosit la consolidarea sumei "
-"acestui caz in contul principal. De exemplu, setati 1/-1 daca doriti sa o "
-"adunati/scadeti."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Suma Reziduala"
 
@@ -9414,7 +9322,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Jurnal Rambursare Vanzari"
@@ -9480,7 +9388,7 @@ msgid "Purchase Tax(%)"
 msgstr "Taxa de cumparare(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Va rugam sa creati niste linii ale facturii."
@@ -9499,7 +9407,7 @@ msgid "Display Detail"
 msgstr "Afisati Detaliile"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9617,21 +9525,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Numarul de Perioade"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Sablon Cod Fiscal"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Extras cont client"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoria P&L / BS"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9643,8 +9541,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9664,14 +9563,14 @@ msgid "Document"
 msgstr "Document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extrase de cont"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cont Incasari"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9772,8 +9671,8 @@ msgid "Move"
 msgstr "Miscare"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9853,11 +9752,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Nereconciliere tranzacţii"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9875,11 +9769,16 @@ msgid "Balance :"
 msgstr "Sold :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9916,13 +9815,6 @@ msgstr "Abonament"
 msgid "Account Analytic Balance"
 msgstr "Sold Cont Analitic"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9962,7 +9854,13 @@ msgid "Due date"
 msgstr "Data scadenta"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10060,7 +9958,7 @@ msgid "Unreconciled"
 msgstr "Nereconciliat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Total gresit !"
@@ -10152,7 +10050,7 @@ msgid "Comparison"
 msgstr "Comparatie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10170,6 +10068,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10225,11 +10128,6 @@ msgstr "Credit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10241,7 +10139,7 @@ msgid "Journal Entry Model"
 msgstr "Model Inregistrare in Jurnal"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10326,7 +10224,7 @@ msgid "Profit (Loss) to report"
 msgstr "Profit (Pierdere) de raportat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10656,7 +10554,14 @@ msgid "Empty Accounts ? "
 msgstr "Goliti Conturile ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10781,7 +10686,7 @@ msgid "Receivable accounts"
 msgstr "Conturi de Incasari"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10915,7 +10820,7 @@ msgid "Entries Sorted by"
 msgstr "Inregistrari Clasificate dupa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -11021,7 +10926,7 @@ msgid "Accounting Documents"
 msgstr "Documente Contabile"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11066,7 +10971,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Taxe factura manuala"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11147,17 +11052,6 @@ msgstr ""
 msgid "February"
 msgstr "Februarie"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Daca dati un alt Nume decat /, atunci Miscarea Inregistrarilor Contabile "
-"creata va avea acelasi nume ca si numele extrasului. Acest lucru permite "
-"inregistrarilor extrasului sa aiba aceleasi referinte ca si extrasul insusi."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11216,6 +11110,11 @@ msgstr "Sablon Cont Reprezentare Fiscala"
 msgid "Expense Account on Product Template"
 msgstr "Cont de cheltuieli definit in Sablonul Produsului"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11239,9 +11138,6 @@ msgstr ""
 "Suma reziduala dintr-un cont de incasari sau plati ale unei inregistrari in "
 "jurnal exprimata in moneda ei (poate fi diferita de moneda companiei)."
 
-#~ msgid "Fixed"
-#~ msgstr "Fix"
-
 #~ msgid "Origin"
 #~ msgstr "Origine"
 
@@ -11254,6 +11150,10 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Stare"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Factură furnizor"
+
 #~ msgid "Cancel Invoice"
 #~ msgstr "Anulare facură"
 
@@ -11281,6 +11181,9 @@ msgstr ""
 #~ msgid "Journal de frais"
 #~ msgstr "Jurnal cheltuieli"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesare periodica"
+
 #~ msgid "Line"
 #~ msgstr "Linie"
 
@@ -11348,6 +11251,9 @@ msgstr ""
 #~ msgid "Account No."
 #~ msgstr "Nr. cont"
 
+#~ msgid "Litigation"
+#~ msgstr "Litigiu"
+
 #~ msgid "Acc. Type Name"
 #~ msgstr "Denumire tip cont"
 
@@ -12432,6 +12338,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Jurnal"
 
+#~ msgid "Line 2:"
+#~ msgstr "Linia 2:"
+
 #~ msgid "Your Reference"
 #~ msgstr "Referinţa d-voastră"
 
@@ -12710,6 +12619,9 @@ msgstr ""
 #~ "Data la care inregistrarile contabile ale partenerului au fost reconciliate "
 #~ "ultima data"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banca si Cecuri"
+
 #~ msgid "Third Party (Country)"
 #~ msgstr "Partea Terta (Tara)"
 
@@ -12726,6 +12638,9 @@ msgstr ""
 #~ "Acest raport va ofera o privire de ansamblu asupra situatiei jurnalelor "
 #~ "dumneavoastra generale"
 
+#~ msgid "Line 1:"
+#~ msgstr "Linia 1:"
+
 #, python-format
 #~ msgid "Journal Item \"%s\" is not valid"
 #~ msgstr "Element Jurnal \"%s\" nu este valid"
@@ -12810,6 +12725,9 @@ msgstr ""
 #~ "Eficientizeaza plata facturii si creeaza hook-uri pentru conectarea "
 #~ "sistemelor platii automate."
 
+#~ msgid "Valuation"
+#~ msgstr "Evaluare"
+
 #~ msgid ""
 #~ "Select here the kind of valuation related to this payment term line. Note "
 #~ "that you should have your last line with the type 'Balance' to ensure that "
@@ -12844,6 +12762,10 @@ msgstr ""
 #~ "Codul va fi folosit pentru a genera numerele inregistrarilor in jurnal ale "
 #~ "acestui jurnal."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Factura '%s' este validata."
+
 #~ msgid "Company must be same for its related account and period."
 #~ msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociate."
 
@@ -13603,6 +13525,14 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Reconciliere extrase bancare"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Daca dezactivati reconcilierea tranzactiilor trebuie, de asemenea, sa "
+#~ "verificati toate actiunile care sunt legate de acele tranzactii pentru ca "
+#~ "acestea nu vor fi dezactivate"
+
 #~ msgid "Purchase Taxes"
 #~ msgstr "Taxe achizitii"
 
@@ -13804,6 +13734,9 @@ msgstr ""
 #~ msgid "You can not add/modify entries in a closed journal."
 #~ msgstr "Nu puteti adauga/modifica inregistrarile dintr-un jurnal inchis."
 
+#~ msgid "account.tax"
+#~ msgstr "taxa.cont"
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -13838,6 +13771,9 @@ msgstr ""
 #~ msgid "Configure"
 #~ msgstr "Configurati"
 
+#~ msgid "account.tax.template"
+#~ msgstr "sablon.taxa.cont"
+
 #~ msgid "You can not create journal items on an account of type view."
 #~ msgstr ""
 #~ "Nu puteti crea elemente ale jurnalului intr-un cont de tipul vizualizare."
@@ -13886,6 +13822,13 @@ msgstr ""
 #~ "raport este tiparit, stadiul devine 'Tiparit'. Atunci cand toate "
 #~ "tranzactiile sunt efectuate, stadiul devine 'Efectuat'."
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Daca nu reconciliati tranzactiile, trebuie, de asemenea, sa verificati toate "
+#~ "actiunile relationate acestor tranzactii deoarece nu vor fi dezactivate."
+
 #~ msgid "Mapping"
 #~ msgstr "Mapare"
 
@@ -13899,6 +13842,10 @@ msgstr ""
 #~ msgid "You can only change currency for Draft Invoice !"
 #~ msgstr "Puteti schimba moneda doar pentru Factura Ciorna!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "La 14 zile net 2 la suta, suma ramasa la sfarsitul lunii din 30 de zile."
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -14199,12 +14146,18 @@ msgstr ""
 #~ msgid "Cash Transaction"
 #~ msgstr "Tranzactie numerar"
 
+#~ msgid "Line Name"
+#~ msgstr "Nume linie"
+
 #~ msgid "Month-1"
 #~ msgstr "Luna-1"
 
 #~ msgid "Customer Credit"
 #~ msgstr "Credit Client"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Ziua din luna: 0"
+
 #, python-format
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "Nu exista niciun jurnal de sfarsit de an definit pentru anul fiscal"
@@ -14215,6 +14168,9 @@ msgstr ""
 #~ msgid "This months' Sales by type"
 #~ msgstr "Vanzarile din luna aceasta dupa tip"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Valoare suma: 0.02"
+
 #~ msgid "Accounting Dashboard"
 #~ msgstr "Tablou de bord Contabilitate"
 
@@ -14287,6 +14243,9 @@ msgstr ""
 #~ "Tipariti Raportul cu coloana monedei daca moneda este diferita de cea a "
 #~ "companiei"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Numar de Zile: 30"
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category using sale price"
@@ -14294,6 +14253,9 @@ msgstr ""
 #~ "Acest cont va fi folosit la evaluarea stocului de iesire pentru categoria "
 #~ "produsului actual folosind pretul de vanzare"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Ziua din Luna= -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Eroare! Data de inceput a anului fiscal trebuie sa fie inaintea datei de "
@@ -14371,6 +14333,9 @@ msgstr ""
 #~ "Va rugam sa verificati pretul de pe factura !\n"
 #~ "Totalul specificat este diferit de totalul calculat."
 
+#~ msgid "Example"
+#~ msgstr "Exemplu"
+
 #, python-format
 #~ msgid ""
 #~ "Couldn't create move with currency different from the secondary currency of "
@@ -14464,6 +14429,12 @@ msgstr ""
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statistici Inregistrari Analitice"
 
+#~ msgid "Communication"
+#~ msgstr "Comunicare"
+
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Numar de zile: 14"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr ""
@@ -14487,6 +14458,13 @@ msgstr ""
 #~ "Jurnalul specificat nu contine nici o inregistrare contabila in stadiul de "
 #~ "ciorna pentru aceasta perioada"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Campul secventa este utilizat pentru ordonarea ascendenta a liniilor "
+#~ "termenelor de plata"
+
 #~ msgid "Valid Up to"
 #~ msgstr "Valabil pana la"
 
@@ -14557,6 +14535,9 @@ msgstr ""
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociata."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Evaluare: Sold"
+
 #, python-format
 #~ msgid "Enter a Start date !"
 #~ msgstr "Introduceti o Data de inceput !"
@@ -14874,6 +14855,16 @@ msgstr ""
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Calculati Codul pentru Preturi cu taxele incluse"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Acest termen de plata va fi folosit in locul celui implicit pentru "
+#~ "partenerul curent"
+
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Evaluare: Procent"
+
 #~ msgid ""
 #~ "With Customer Refunds you can manage the credit notes for your customers. A "
 #~ "refund is a document that credits an invoice completely or partially. You "
@@ -14912,6 +14903,9 @@ msgstr ""
 #~ msgid "current month"
 #~ msgstr "luna curenta"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Cuantum suma: n.a"
+
 #~ msgid "Contacts"
 #~ msgstr "Contacte"
 
@@ -15201,6 +15195,9 @@ msgstr ""
 #~ "Nu puteti defini conturi subordonate unui cont cu tipul intern diferit de "
 #~ "\"Vizualizare\"! "
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/a'})"
+
 #~ msgid ""
 #~ "\n"
 #~ "Hello${object.address_invoice_id.name and ' ' or "
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index fe48637365a..6db31803dc2 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-31 10:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:25+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Отмена сверки транзакций"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Импорт из счета или платежного поручения"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -93,15 +88,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Итого Дебет"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Если вы отмените сверку транзакций, то вы должны проверить все действия, "
-"связанные с этими транзакциями так, как они не будут отключены"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +98,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -143,19 +128,19 @@ msgstr ""
 "не удаляя его."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -167,7 +152,7 @@ msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Смешанный журнал"
@@ -238,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Шаблоны налогов"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -258,6 +238,11 @@ msgstr "Бухгалтерские проводки - входные данны
 msgid "Belgian Reports"
 msgstr "Бельгийские отчеты"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -391,11 +376,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -450,6 +430,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -465,6 +450,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Шаблона плана счетов"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -626,15 +616,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Квартально"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Если вы отменили сверку операций, вы должны также проверить все действия, "
-"которые связаны с этими операциями, потому что они не будут отключены."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -683,7 +664,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Для заданной даты период не найден или найдено более одного периода."
@@ -694,13 +675,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Отчет о продажах по типу счета"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "КнП"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -763,6 +744,11 @@ msgstr "Счета к получению"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -787,6 +773,12 @@ msgstr "Открыть повторно"
 msgid "Are you sure you want to create entries?"
 msgstr "Вы действительно хотите создать проводки?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -807,6 +799,7 @@ msgstr "Показ подчинённость с иерархией"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
 
@@ -849,7 +842,7 @@ msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -874,26 +867,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Счета поставщиков и возмещения"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Отмена сверки"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"За 14 рабочих дней 2 процента, оставшуюся сумму в течение 30 дней в конце "
-"месяца."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -924,11 +909,6 @@ msgstr "Код журн./Операция"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -959,7 +939,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -974,6 +954,7 @@ msgstr "Новая подписка"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Вычисления"
 
@@ -1005,11 +986,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1045,7 +1023,7 @@ msgid "Liability"
 msgstr "Обязательства"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1119,10 +1097,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1200,8 +1178,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1247,7 +1226,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Банковский"
@@ -1545,9 +1524,9 @@ msgid "Account Receivable"
 msgstr "Счет к получению"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1561,7 +1540,7 @@ msgid "With balance is not equal to 0"
 msgstr "С балансом не равным 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1616,7 +1595,7 @@ msgstr "Пропускать состояние \"Черновик\" при ру
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1660,6 +1639,12 @@ msgstr "Временная таблица, используемая для Ин
 msgid "Supplier Refunds"
 msgstr "Возвраты поставщику"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1697,7 +1682,6 @@ msgid "Groups"
 msgstr "Группы"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Без налога"
@@ -1830,6 +1814,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Продажи по типу счета"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1850,115 +1840,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2069,6 +1955,11 @@ msgstr "Эти периоды могут перекрываться."
 msgid "Draft statement"
 msgstr "Черновик документа"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2097,26 +1988,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2124,16 +2014,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2144,8 +2034,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2190,7 +2080,7 @@ msgid "period close"
 msgstr "закрытие периода"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2290,7 +2180,7 @@ msgid "Product Category"
 msgstr "Категория ТМЦ"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2659,7 +2549,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Keep empty for all open fiscal year"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2677,7 +2567,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Создать счет на основе этого шаблона"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2698,7 +2588,7 @@ msgid "Main Sequence"
 msgstr "Основная Последовательность"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2708,14 +2598,12 @@ msgstr ""
 "удаления связанных элементов журнала."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Условие оплаты"
 
@@ -2741,18 +2629,6 @@ msgstr "Установите этот флажок"
 msgid "Filters"
 msgstr "Фильтры"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Открыт"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2764,6 +2640,11 @@ msgstr "Состояние счета - \"Черновик\""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2841,25 +2722,20 @@ msgid "Account Model Entries"
 msgstr "Проводки модели счета"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "ЖР"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Налоги поставщиков"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "проводки"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Банковская информация"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2882,7 +2758,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2896,9 +2771,8 @@ msgstr ""
 "несколько сроков, например 50% сразу, 50% в этом месяце."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2928,6 +2802,7 @@ msgstr "Сверка операций по счёту (списание)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Налог"
 
@@ -2963,14 +2838,14 @@ msgid "Accounts"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3068,6 +2943,12 @@ msgstr "Оплаченный/сверенный"
 msgid "Refund Base Code"
 msgstr "Базовый код возмещения"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Банковские выписки"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3120,11 +3001,6 @@ msgstr "Баланс партнера по периодам"
 msgid "Accounting entries"
 msgstr "Бухгалтерские проводки"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3169,7 +3045,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3182,7 +3058,7 @@ msgid "Sales by Account"
 msgstr "Продажи по бух. счетам"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3198,15 +3074,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Вы должны определить журнал аналитики для журнала '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3214,7 +3090,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3279,9 +3155,10 @@ msgstr ""
 "для некоторых отчетов."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Строка 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3330,12 +3207,6 @@ msgstr "Сумма по основному коду"
 msgid "Default Sale Tax"
 msgstr "Налог с продаж по умолчанию"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Счет  '%s' утвержден."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3371,7 +3242,7 @@ msgid "Fiscal Position"
 msgstr "Система налогообложения"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3400,7 +3271,7 @@ msgid "Trial Balance"
 msgstr "Оборотно-сальдовая ведомость"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3471,7 +3342,7 @@ msgstr ""
 "дату. Входящие сделки всегда используют ставку на сегодняшний день."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3483,9 +3354,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Кол-во цифр для использования в коде счета"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Название строки"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3534,7 +3405,7 @@ msgid "View"
 msgstr "Вид"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3555,15 +3426,20 @@ msgstr "Проформы счетов"
 msgid "Electronic File"
 msgstr "Электронный файл"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  День месяца: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Шаблон налогового кода"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3571,9 +3447,88 @@ msgid "Account Partner Ledger"
 msgstr "Книга счёта партнёра"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3710,12 +3665,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Значение суммы: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Если вы вводите название отличное от \"/\", то созданные операции проводок "
+"будут иметь названия как у документа. Это позволяет проводкам в документе "
+"иметь названия как и у самого документа"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3730,7 +3691,7 @@ msgid "Starting Balance"
 msgstr "Начальный баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Партнер не определен!"
@@ -3933,7 +3894,7 @@ msgid "Period Length (days)"
 msgstr "Длина периода (в днях)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3957,7 +3918,7 @@ msgid "Category of Product"
 msgstr "Категория продукции"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4096,7 +4057,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон плана счетов"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4184,9 +4145,12 @@ msgid "Qty"
 msgstr "Кол-во"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Судебный спор"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4270,11 +4234,6 @@ msgstr "Нет ненастроенной компании!"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4292,11 +4251,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Настройка банковских счетов"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4343,8 +4297,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4374,7 +4328,7 @@ msgid "Consolidated Children"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4412,11 +4366,6 @@ msgstr ""
 msgid "title"
 msgstr "title"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4506,6 +4455,13 @@ msgstr "30 дней на конец месяца"
 msgid "Analytic Balance"
 msgstr "Аналитический баланс"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4527,6 +4483,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Проведенные элементы журнала"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4537,11 +4498,6 @@ msgstr "Искать шаблоны налогов"
 msgid "Draft Entries"
 msgstr "Черновые проводки"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  День месяца= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4550,11 +4506,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Количество дней: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4578,20 +4529,9 @@ msgid "Account Type"
 msgstr "Тип счета"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Закрыть кассу"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4614,9 +4554,20 @@ msgstr ""
 "берется из счетов аналитики. Генерирует черновик счетов поставщика."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Закрыть кассу"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4644,7 +4595,7 @@ msgid "Month"
 msgstr "Месяц"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4655,8 +4606,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4680,6 +4631,11 @@ msgstr "Счет PayPal"
 msgid "Acc.Type"
 msgstr "Тип счета"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4692,7 +4648,7 @@ msgstr "Сменить знак баланса"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Баланс (счёт обязательств)"
@@ -4714,7 +4670,7 @@ msgid "Account Base Code"
 msgstr "Основной код счёта"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4770,11 +4726,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Периодическая обработка"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4804,10 +4755,9 @@ msgid "Account chart"
 msgstr "План счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Счет-фактура поставщика"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4875,10 +4825,14 @@ msgstr "Кредит-ноты"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4931,7 +4885,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4946,7 +4900,7 @@ msgid "Based On"
 msgstr "Основан на"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4971,11 +4925,6 @@ msgstr ""
 msgid "Change"
 msgstr "Изменить"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Банк и чеки"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4998,11 +4947,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Отменено"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Пример"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5013,11 +4957,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Оставьте пустым для использования доходного счета"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5027,7 +4966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5101,16 +5040,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5221,6 +5155,7 @@ msgstr "Добавить"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Оплачено"
 
@@ -5247,7 +5182,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Период открытия"
@@ -5262,14 +5197,6 @@ msgstr "Проводки журнала для проверки"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5282,7 +5209,7 @@ msgid "Tax Application"
 msgstr "Применение налога"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5315,9 +5242,9 @@ msgid "End of period"
 msgstr "Конец периода"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Банковская информация"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Оплата счетов"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5410,14 +5337,6 @@ msgstr "Описание налога"
 msgid "Child Tax Accounts"
 msgstr "Счета субналогов"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5462,7 +5381,7 @@ msgid "Target Moves"
 msgstr "Цель операции"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5498,6 +5417,7 @@ msgid "Python Code (reverse)"
 msgstr "Код на Python (реверс)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5511,12 +5431,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5542,18 +5456,13 @@ msgstr "Год"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Строка 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Внутреннее название"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5592,7 +5501,7 @@ msgstr "Балансовая ведомость"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5625,7 +5534,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Вычислить код (если тип=код)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5652,6 +5561,7 @@ msgstr "Автоматическая сверка"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5755,7 +5665,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5785,7 +5695,7 @@ msgid "Amount Computation"
 msgstr "Расчет суммы"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5821,10 +5731,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Назначение"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Открыт"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5854,9 +5770,7 @@ msgstr "Коды налогов"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Возврат денег клиенту"
 
@@ -5873,11 +5787,6 @@ msgstr "Символ кода налога"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Отчет по счетам созданным за последние 15 дней"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5894,6 +5803,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Сумма к оплате"
@@ -5982,8 +5892,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6006,6 +5914,13 @@ msgstr "Обычный текст"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Записи о платеже - вторая часть сверяемого."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6015,15 +5930,6 @@ msgstr ""
 "Ряд частичных сумм, которые могут быть объединены для нахождения баланса, "
 "могут быть выбраны в процессе автоматической сверки."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Поле \"последовательность\" используется для упорядочения строк в условии "
-"оплаты от наименьшего номера к наибольшему"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6081,12 +5987,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Фиксированная величина"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6110,7 +6015,6 @@ msgstr "Генерировать открывающие проводки"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Метод расчета суммы налога."
 
@@ -6138,18 +6042,23 @@ msgid "Child Accounts"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "проводки"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6166,7 +6075,7 @@ msgstr "Доход"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Поставщик"
@@ -6186,16 +6095,11 @@ msgid "Account n°"
 msgstr "№ счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Свободная Ссылка"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Оценка"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6310,7 +6214,7 @@ msgid "Filter by"
 msgstr "Фильтровать по"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6357,6 +6261,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Кол-во дней"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6498,7 +6410,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6673,7 +6585,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6704,12 +6616,6 @@ msgstr ""
 msgid "Current"
 msgstr "Текущий"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6734,7 +6640,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Процент"
 
@@ -6754,7 +6659,7 @@ msgid "Power"
 msgstr "Мощность"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6799,12 +6704,17 @@ msgid "Applicable Type"
 msgstr "Применимый тип"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Ссылка на счет"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6823,12 +6733,12 @@ msgstr ""
 "таком случае важна последовательность вычислений."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6903,7 +6813,7 @@ msgid "Optional create"
 msgstr "Создать дополнительно"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6914,9 +6824,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
@@ -6954,8 +6862,11 @@ msgid "Group By..."
 msgstr "Объединять по..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -7034,6 +6945,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Операции по кассе"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7051,7 +6969,7 @@ msgstr "Статистика аналитических проводок"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Проводки: "
@@ -7069,14 +6987,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Истина"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7092,10 +7009,9 @@ msgid "Total debit"
 msgstr "Всего по дебету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Проводка \"%s\" не верна !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7148,7 +7064,7 @@ msgstr "Создать проводку"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7159,13 +7075,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -7202,6 +7119,11 @@ msgstr "Строка проекта"
 msgid "Manual"
 msgstr "Вручную"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7304,8 +7226,8 @@ msgstr "Выбор журнала"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Начальное сальдо"
@@ -7387,7 +7309,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7408,6 +7330,11 @@ msgstr ""
 "\n"
 "пример: Моя модель на %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7461,7 +7388,7 @@ msgid "Done"
 msgstr "Сделано"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7493,9 +7420,8 @@ msgid "Source Document"
 msgstr "Документ-источник"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7522,7 +7448,7 @@ msgid "Taxes:"
 msgstr "Налоги"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7720,6 +7646,12 @@ msgstr ""
 "позволяющий разработчикам создавать специальные налоги для пользовательского "
 "домена."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Ссылка на счет"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7811,7 +7743,7 @@ msgid "Use model"
 msgstr "Использовать модель"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7862,7 +7794,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7931,7 +7863,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Журнал продаж"
@@ -7942,7 +7874,7 @@ msgid "Invoice Tax"
 msgstr "Налог по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Нет номера части !"
@@ -7981,7 +7913,7 @@ msgid "Sales Properties"
 msgstr "Свойства продаж"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8006,7 +7938,7 @@ msgstr "По"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8038,7 +7970,7 @@ msgid "May"
 msgstr "Май"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8056,9 +7988,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -8075,17 +8006,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Провести записи журнала"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Заказчик"
@@ -8101,7 +8027,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Наличные"
@@ -8113,9 +8039,11 @@ msgid "Account Destination"
 msgstr "Счет назначения"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Оплата счетов"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8123,7 +8051,6 @@ msgstr "Оплата счетов"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8262,15 +8189,14 @@ msgid "Partner Ledger"
 msgstr "Книга партнера"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Фиксированный"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8338,7 +8264,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Выбрать валюту применяемую в счете"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нет позиций в счете !"
@@ -8414,7 +8340,7 @@ msgid "Associated Partner"
 msgstr "Связанный контрагент"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Сначала вы должны выбрать партнера !"
@@ -8496,13 +8422,13 @@ msgstr ""
 "расчетом других налогов."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Журнал возврата покупок"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8573,7 +8499,7 @@ msgid "Net Total:"
 msgstr "Чистый итог:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8593,14 +8519,6 @@ msgstr "Общие отчеты"
 msgid "Write-Off Journal"
 msgstr "Журнал списаний"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Это условие оплаты будет использовано, вместо условий оплаты по умолчанию."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8627,11 +8545,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Налоговые / базовая сумма"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8685,6 +8598,11 @@ msgstr "Результат сверки"
 msgid "Ending Balance"
 msgstr "Конечный баланс"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8727,7 +8645,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8750,7 +8668,12 @@ msgid "Account Types"
 msgstr "Типы счетов"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8758,9 +8681,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr ""
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Категория: баланс / прибыль и убыток"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8777,10 +8700,9 @@ msgid "Reconciliation"
 msgstr "Сверка"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Счет к получению"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Оставьте пустым для использования доходного счета"
 
 #. module: account
 #: view:account.invoice:0
@@ -8852,7 +8774,7 @@ msgid "The partner account used for this invoice."
 msgstr "Бух. счет партнера будет использоваться для этого счета."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8870,13 +8792,13 @@ msgid "Payment Term Line"
 msgstr "Позиция условий оплаты"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Журнал покупок"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Подитог"
 
@@ -8905,11 +8827,6 @@ msgstr "Срок"
 msgid "Suppliers"
 msgstr "Поставщики"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Истина"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9045,9 +8962,10 @@ msgid "Journal Name"
 msgstr "Название журнала"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Проводка \"%s\" не верна !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9093,7 +9011,7 @@ msgstr ""
 "Сумма выражается в дополнительный валюте, если эта проводка мульти-валютная."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9155,7 +9073,7 @@ msgid "Reconciled entries"
 msgstr "Сверенные проводки"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9177,7 +9095,7 @@ msgid "Print Account Partner Balance"
 msgstr "Печать баланс счета партнера"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9211,7 +9129,7 @@ msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Журнал проводок открытия"
@@ -9258,7 +9176,7 @@ msgstr ""
 "от общей суммы."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9273,18 +9191,9 @@ msgstr "Задается кодом на Python"
 msgid "Journal Code"
 msgstr "Код журнала"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Остаток суммы"
 
@@ -9317,7 +9226,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Журнал возврата продаж"
@@ -9383,7 +9292,7 @@ msgid "Purchase Tax(%)"
 msgstr "Налог на покупку(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Пожалуйста, создайте позиции счета"
@@ -9402,7 +9311,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9517,21 +9426,11 @@ msgstr "Бухгалтер утверждает проводки созданн
 msgid "Number of Periods"
 msgstr "Количество периодов"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Шаблон налогового кода"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Документ: выписка клиенту со счета"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Категория: баланс / прибыль и убыток"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9543,8 +9442,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9564,14 +9464,14 @@ msgid "Document"
 msgstr "Документ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Банковские выписки"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Счет к получению"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9672,8 +9572,8 @@ msgid "Move"
 msgstr "Операция"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9752,11 +9652,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Не сверенные транзакции"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9774,11 +9669,16 @@ msgid "Balance :"
 msgstr "Баланс :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9815,13 +9715,6 @@ msgstr "Подписка"
 msgid "Account Analytic Balance"
 msgstr "Аналитический баланс"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9861,7 +9754,13 @@ msgid "Due date"
 msgstr "Срок оплаты"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9950,7 +9849,7 @@ msgid "Unreconciled"
 msgstr "Не сверенные"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Плохой итог !"
@@ -10033,7 +9932,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10051,6 +9950,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10106,11 +10010,6 @@ msgstr "Кредит"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10122,7 +10021,7 @@ msgid "Journal Entry Model"
 msgstr "Модель записи журнала"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10207,7 +10106,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10536,7 +10435,14 @@ msgid "Empty Accounts ? "
 msgstr "Пустые счета ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10661,7 +10567,7 @@ msgid "Receivable accounts"
 msgstr "Дебиторская задолженность"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10789,7 +10695,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10895,7 +10801,7 @@ msgid "Accounting Documents"
 msgstr "Бухгалтерские документы"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10940,7 +10846,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11021,17 +10927,6 @@ msgstr ""
 msgid "February"
 msgstr "Февраль"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Если вы вводите название отличное от \"/\", то созданные операции проводок "
-"будут иметь названия как у документа. Это позволяет проводкам в документе "
-"иметь названия как и у самого документа"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11090,6 +10985,11 @@ msgstr "Шаблон счета финансового отображения"
 msgid "Expense Account on Product Template"
 msgstr "Счет расходов по шаблону ТМЦ"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11135,9 +11035,6 @@ msgstr ""
 #~ msgid "Account Entry Line"
 #~ msgstr "Проводка по счету"
 
-#~ msgid "Fixed"
-#~ msgstr "Фиксированный"
-
 #~ msgid "Origin"
 #~ msgstr "Происхождение"
 
@@ -11150,6 +11047,9 @@ msgstr ""
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Невыплаченные возвраты средств от поставщика"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Периодическая обработка"
+
 #~ msgid "Line"
 #~ msgstr "Строка"
 
@@ -11216,6 +11116,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Налоги на закупки"
 
+#~ msgid "Line Name"
+#~ msgstr "Название строки"
+
 #~ msgid "Value"
 #~ msgstr "Значение"
 
@@ -11846,6 +11749,10 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Подтвердите платеж по счету (с согласованием или без)"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Счет-фактура поставщика"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Состояние проводок аналитического учета"
 
@@ -11938,6 +11845,9 @@ msgstr ""
 #~ msgid "2"
 #~ msgstr "2"
 
+#~ msgid "Litigation"
+#~ msgstr "Судебный спор"
+
 #~ msgid "Entries Reconcile"
 #~ msgstr "Согласование проводок"
 
@@ -12147,6 +12057,12 @@ msgstr ""
 #~ msgid "New Supplier Refund"
 #~ msgstr "Возврат новому поставщику"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Это условие оплаты будет использовано, вместо условий оплаты по умолчанию."
+
 #~ msgid "Filter on Periods"
 #~ msgstr "Фильтр по периодам"
 
@@ -12159,6 +12075,9 @@ msgstr ""
 #~ msgid "Account currency"
 #~ msgstr "Валюта счета"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "   30 Days   "
 #~ msgstr "   30 Дней   "
 
@@ -12307,6 +12226,9 @@ msgstr ""
 #~ msgid "You must define an analytic journal of type '%s' !"
 #~ msgstr "Вы должны определить журнал аналитики типа '%s' !"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Банк и чеки"
+
 #~ msgid "Salesman"
 #~ msgstr "Менеджер продаж"
 
@@ -12326,6 +12248,9 @@ msgstr ""
 #~ msgid "Transaction"
 #~ msgstr "Операция"
 
+#~ msgid "Valuation"
+#~ msgstr "Оценка"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Счета по типу"
 
@@ -12557,6 +12482,9 @@ msgstr ""
 #~ "Нельзя изменить подтвержденную запись! Обратите внимание, можно изменить "
 #~ "только второстепенные поля!"
 
+#~ msgid "Communication"
+#~ msgstr "Назначение"
+
 #~ msgid "Narration"
 #~ msgstr "Пояснение"
 
@@ -12833,6 +12761,9 @@ msgstr ""
 #~ "Позволяет позициям счета влиять на несколько аналитических счетов "
 #~ "одновременно."
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Manager"
 #~ msgstr "Руководитель"
 
@@ -12965,6 +12896,13 @@ msgstr ""
 #~ msgid "Journal: All"
 #~ msgstr "Журнал: Все"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Если вы отменили сверку операций, вы должны также проверить все действия, "
+#~ "которые связаны с этими операциями, потому что они не будут отключены."
+
 #~ msgid ""
 #~ "When journal period is created. The state is 'Draft'. If a report is printed "
 #~ "it comes to 'Printed' state. When all transactions are done, it comes in "
@@ -13015,6 +12953,10 @@ msgstr ""
 #~ "Вы не можете утвердить запись в журнале, если не все элементы журнала в "
 #~ "одном плане счетов!"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Счет  '%s' утвержден."
+
 #, python-format
 #~ msgid "Invoice '%s' is waiting for validation."
 #~ msgstr "Счет '%s' ожидает утверждения."
@@ -13082,6 +13024,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Проверка налогового кода"
 
+#~ msgid "Line 2:"
+#~ msgstr "Строка 2:"
+
 #~ msgid "Starts on"
 #~ msgstr "Начинается с"
 
@@ -13093,6 +13038,9 @@ msgstr ""
 #~ msgid "Third Party (Country)"
 #~ msgstr "Третье лицо (Страна)"
 
+#~ msgid "Line 1:"
+#~ msgstr "Строка 1:"
+
 #~ msgid "Reserve and Profit/Loss Account"
 #~ msgstr "Счет резервов и прибылей/убытков"
 
@@ -13379,6 +13327,13 @@ msgstr ""
 #~ "последняя строка должна быть с типом \"Баланс\" для проверки обработки всей "
 #~ "суммы."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Поле \"последовательность\" используется для упорядочения строк в условии "
+#~ "оплаты от наименьшего номера к наибольшему"
+
 #, python-format
 #~ msgid ""
 #~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -13448,6 +13403,13 @@ msgstr ""
 #~ msgid "  valuation: balance"
 #~ msgstr "  расчет: баланс"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Если вы отмените сверку транзакций, то вы должны проверить все действия, "
+#~ "связанные с этими транзакциями так, как они не будут отключены"
+
 #~ msgid "Children Definition"
 #~ msgstr "Определение наследников"
 
@@ -13658,6 +13620,11 @@ msgstr ""
 #~ "Вы не можете сменить тип счёта с '%s' на '%s' так как он содержит элементы "
 #~ "журнала!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "За 14 рабочих дней 2 процента, оставшуюся сумму в течение 30 дней в конце "
+#~ "месяца."
+
 #~ msgid "Cancel: refund invoice and reconcile"
 #~ msgstr "Отмена: возврат счёта и сверка"
 
@@ -13787,6 +13754,12 @@ msgstr ""
 #~ msgid "The closing balance should be the same than the computed balance!"
 #~ msgstr "Баланс закрытия должен быть таким же, как и подсчитанный баланс!"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Значение суммы: 0.02"
+
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  День месяца: 0"
+
 #~ msgid "Quantity :"
 #~ msgstr "Количество:"
 
@@ -13831,6 +13804,9 @@ msgstr ""
 #~ "Нельзя создать счёт по централизованному журналу. Снимите в меню настройки "
 #~ "флажок централизованной корреспонденции в связанном журнале."
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Количество дней: 30"
+
 #, python-format
 #~ msgid ""
 #~ "You haven't supplied enough argument to compute the initial balance, please "
@@ -13839,6 +13815,9 @@ msgstr ""
 #~ "Вы не предоставили достаточно параметров для подсчёта начального баланса, "
 #~ "выберите, пожалуйста, в контексте период и журнал."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  День месяца= -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr "Ошибка! Дата начала финансового года, должны быть до его окончания."
 
@@ -13875,6 +13854,9 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Ошибка кодирования"
 
+#~ msgid "Example"
+#~ msgstr "Пример"
+
 #~ msgid "Sale journal in this month"
 #~ msgstr "Журнал продаж а этом месяце"
 
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 7346b071368..2679af1bf80 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 12:02+0000\n"
 "Last-Translator: Arunoda Susiripala <arunoda@mit2007.com>\n"
 "Language-Team: Sinhalese <si@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:25+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 0a393ff2020..01ee3647c76 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-09 10:27+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:25+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Import z faktúry alebo platby"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "Varovanie!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Daňové Šablóny"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr "Účty pohľadávok"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr "Účet pohľadávky"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Termín úhrady"
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Daň"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interný názov"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8095,15 +8027,14 @@ msgid "Partner Ledger"
 msgstr "Účtovná kniha partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8171,7 +8102,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8246,7 +8177,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8326,13 +8257,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8403,7 +8334,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8423,13 +8354,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8456,11 +8380,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8514,6 +8433,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8554,7 +8478,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8577,7 +8501,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8585,8 +8514,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8604,9 +8533,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8679,7 +8607,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8697,13 +8625,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8732,11 +8660,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8871,8 +8794,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8918,7 +8842,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8979,7 +8903,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9001,7 +8925,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9035,7 +8959,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9080,7 +9004,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9095,18 +9019,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9139,7 +9054,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9205,7 +9120,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9224,7 +9139,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9339,21 +9254,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9365,8 +9270,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9386,14 +9292,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9494,8 +9400,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9572,11 +9478,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9594,11 +9495,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9635,13 +9541,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9681,7 +9580,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9770,7 +9675,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9853,7 +9758,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9871,6 +9776,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9924,11 +9834,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9940,7 +9845,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10025,7 +9930,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10348,7 +10253,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10473,7 +10385,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10600,7 +10512,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10706,7 +10618,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10751,7 +10663,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10830,14 +10742,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10896,6 +10800,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10984,6 +10893,12 @@ msgstr ""
 #~ msgid "Account currency"
 #~ msgstr "Mena účtu"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "account.installer.modules"
 #~ msgstr "account.installer.modules"
 
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index de950028c6b..ac66adad19c 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:02+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr "Davčno območje mora biti enoznačno"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Neusklajene postavke"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Uvozi iz računa ali plačila"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Napačen konto!"
@@ -93,13 +88,6 @@ msgstr "Napačen konto!"
 msgid "Total Debit"
 msgstr "Skupaj breme"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr "Če odpirate postavke, morate preveriti tudi vse povezane transakcije"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +100,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -143,19 +130,19 @@ msgstr ""
 "skrijete plačilni rok brez da ga odstranite."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -167,7 +154,7 @@ msgid "Warning!"
 msgstr "Opozorilo!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Razni dnevniki"
@@ -244,11 +231,6 @@ msgstr "Privzeti analitični konto za davek na računih. Lahko pustite prazno."
 msgid "Tax Templates"
 msgstr "Predloge davka"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "konto.davek"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -264,6 +246,11 @@ msgstr "Postavke so vhod za usklajevanje"
 msgid "Belgian Reports"
 msgstr "Belgijska poročila"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -400,11 +387,6 @@ msgstr "Omogoči uporabo analitičnega računovodstva"
 msgid "Salesperson"
 msgstr "Prodajalec"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "konto.davek.predloga"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -459,6 +441,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr "Vodenje osnovnih sredstev"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -474,6 +461,11 @@ msgstr "Obdobje:"
 msgid "Chart Template"
 msgstr "Predloga kontnega načrta"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -637,15 +629,6 @@ msgstr "Število decimalk na postavkah dnevnika"
 msgid "3 Monthly"
 msgstr "3 Mesečno"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
-"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -694,7 +677,7 @@ msgid "Profit Account"
 msgstr "Konto prihodkov"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -706,13 +689,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Poročilo o prodaji po vrsti konta"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Valuta se razlikuje od .."
@@ -777,6 +760,11 @@ msgstr "Konti terjatev"
 msgid "Configure your company bank accounts"
 msgstr "Nastavite bančne račune za svoje podjetje"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -801,6 +789,12 @@ msgstr "Znova odpri"
 msgid "Are you sure you want to create entries?"
 msgstr "Ali res želite ustavriti vnose ?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -821,6 +815,7 @@ msgstr "Hierarhično prikazovanje otrok"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Odstotek"
 
@@ -863,7 +858,7 @@ msgid "Type"
 msgstr "Vrsta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -886,25 +881,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Dobaviteljevi računi in nadomestila"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "Postavka je že usklajena"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Preklic uskladitve"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Na 14 dni neto 2 odstotka, preostali znesek v 30 dneh do konca meseca."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -935,11 +923,6 @@ msgstr "J.C./Premakni ime"
 msgid "Account Code and Name"
 msgstr "Koda in ime konta"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "ustvarjeno"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -974,7 +957,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -991,6 +974,7 @@ msgstr "Nova naročnina"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Izračun"
 
@@ -1022,12 +1006,9 @@ msgid "Purchase journal"
 msgstr "Dnevnik nabav"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
-msgstr "Konto \"%s\" ne pripada kontnemu načrtu  \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr ""
 
 #. module: account
 #: view:validate.account.move:0
@@ -1062,7 +1043,7 @@ msgid "Liability"
 msgstr "Odgovornost"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Določiti morate zaporedje v povezanem dnevniku."
@@ -1133,10 +1114,10 @@ msgid "Features"
 msgstr "Možnosti"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1221,9 +1202,10 @@ msgid "Refund "
 msgstr "Dobropis "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "Bančni računi , kot se bodo pojavili v nogi tiskanih dokumentov"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
@@ -1268,7 +1250,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1566,9 +1548,9 @@ msgid "Account Receivable"
 msgstr "Konto terjatev"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -1582,7 +1564,7 @@ msgid "With balance is not equal to 0"
 msgstr "S stanjem različnim od 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1639,7 +1621,7 @@ msgstr "Preskoči  stanje \"Osnutek\" za ročno vnašanje"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "Ni vgrajeno."
@@ -1684,6 +1666,12 @@ msgstr "Začasna tabela, ki se uporablja za nadzorno ploščo"
 msgid "Supplier Refunds"
 msgstr "Vračila dobaviteljev"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Oznaka davka"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1721,7 +1709,6 @@ msgid "Groups"
 msgstr "Skupine"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Neobdavčeno"
@@ -1855,6 +1842,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Prodaja glede na vrsto konta"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1875,115 +1868,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Nekatere postavke so že usklajene"
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2094,6 +1983,11 @@ msgstr "Ta obdobja se lahko prekrivajo."
 msgid "Draft statement"
 msgstr "Osnutek"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2122,26 +2016,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2149,16 +2042,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2169,8 +2062,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2215,7 +2108,7 @@ msgid "period close"
 msgstr "Zapiranje obdobja"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2315,7 +2208,7 @@ msgid "Product Category"
 msgstr "Skupina izdelkov"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2680,7 +2573,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Obdrži prazno za odprto poslovno leto"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2698,7 +2591,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Ustvarite konto na osnovi te predloge"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2719,7 +2612,7 @@ msgid "Main Sequence"
 msgstr "Glavno zaporedje"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2729,14 +2622,12 @@ msgstr ""
 "izbrisali povezane postavke v dnevniku"
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Plačilni pogoji"
 
@@ -2762,18 +2653,6 @@ msgstr "Okljukaj to polje"
 msgid "Filters"
 msgstr "Filtri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Odpri"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2785,6 +2664,11 @@ msgstr "Stanje računa 'Osnutek'"
 msgid "Account Properties"
 msgstr "Lastnosti konta"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2862,25 +2746,20 @@ msgid "Account Model Entries"
 msgstr "Postavke modela konta"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "Nov dobropis"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Davki dobavitelja"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "vnosi"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Podatki banke"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2903,7 +2782,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2913,10 +2791,9 @@ msgid ""
 msgstr "Če uporabljate plačilne pogoje, se bo valuta izračunala avtomatsko."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "Račun je že zaprt."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "Naslednja številka dobaviteljevega računa"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2945,6 +2822,7 @@ msgstr "Uskladitev/odpis"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Davek"
 
@@ -2980,14 +2858,14 @@ msgid "Accounts"
 msgstr "Konti"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3084,6 +2962,12 @@ msgstr "Plačano/usklajeno"
 msgid "Refund Base Code"
 msgstr "Oznaka osnove za vračilo"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Bančni izpisek"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3136,11 +3020,6 @@ msgstr "Zapadle odprte postavke"
 msgid "Accounting entries"
 msgstr "Vknjižbe"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Tip komunikacije"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3183,7 +3062,7 @@ msgid ""
 msgstr "Izbrani računi nimajo statusa \"Osnutek\" ali \"Predračun\""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "Izbrati morate obdobja , ki pripadajo istemu podetju"
@@ -3196,7 +3075,7 @@ msgid "Sales by Account"
 msgstr "Prodaja po kontih"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "Ni možno brisati potrjene vknjižbe \"%s\"."
@@ -3212,15 +3091,15 @@ msgid "Sale journal"
 msgstr "Dnevnik prodaje"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "Morate definirati analitični dnevnik na dnevniku '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3228,7 +3107,7 @@ msgid ""
 msgstr "Ta dnevnik že vsebuje vknjižbe in ne morete spremeniti podjetja"
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3290,9 +3169,10 @@ msgid ""
 msgstr "Opcijska količina. Uporabno za nekatera poročila."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Vrstica 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3339,12 +3219,6 @@ msgstr "Znesek osnove"
 msgid "Default Sale Tax"
 msgstr "Privzeti davek prodaje"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "račun  '%s' je potrjen."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3380,7 +3254,7 @@ msgid "Fiscal Position"
 msgstr "Davčno območje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3409,7 +3283,7 @@ msgid "Trial Balance"
 msgstr "Bruto bilanca"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3477,7 +3351,7 @@ msgstr ""
 "transakcije se vedno uporablja devizni tečaj na dan nastanka transakcije."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3489,9 +3363,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Število mest za konto"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Naziv postavke"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3540,7 +3414,7 @@ msgid "View"
 msgstr "Pogled:"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3561,15 +3435,20 @@ msgstr "Predračuni"
 msgid "Electronic File"
 msgstr "Elektronska datoteka"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dan v mesecu:0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Davčna predloga"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3577,10 +3456,89 @@ msgid "Account Partner Ledger"
 msgstr "Saldakonti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>ustvarjeno</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -3711,12 +3669,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Vrednost: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr "Če vpišete opis , bodo vse postavke imele isti opis."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3731,7 +3692,7 @@ msgid "Starting Balance"
 msgstr "Začetni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Partner ni izbran!"
@@ -3931,7 +3892,7 @@ msgid "Period Length (days)"
 msgstr "Dolžina obdobja (dni)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3955,7 +3916,7 @@ msgid "Category of Product"
 msgstr "Skupina izdelka"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4091,7 +4052,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predloge kontnih načrtov"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4179,9 +4140,12 @@ msgid "Qty"
 msgstr "Kol."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Pravdanje"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr "Predznak s katerim se vrednost prenaša v nadrejeni konto."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4265,11 +4229,6 @@ msgstr "Ni podjetja brez nastavitev !"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr "plačano"
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4287,11 +4246,6 @@ msgstr "Dnevnik mora imeti privzeti debetni in kreditni konto."
 msgid "Setup your Bank Accounts"
 msgstr "Nastavite bančne račune"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4337,8 +4291,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Ne morete uporabiti de aktiviranega konta."
@@ -4368,7 +4322,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidacija podrejenih postavk"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4402,11 +4356,6 @@ msgstr ""
 msgid "title"
 msgstr "Naziv"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr "Ustvari osnutek dobropisa"
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4496,6 +4445,13 @@ msgstr "30 dni Zakjluček meseca"
 msgid "Analytic Balance"
 msgstr "Stanje analitike"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4515,6 +4471,11 @@ msgstr "Neaktivni konti bodo skriti"
 msgid "Posted Journal Items"
 msgstr "Zaključene postavke"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4525,11 +4486,6 @@ msgstr "Iskanje davčnih predlog"
 msgid "Draft Entries"
 msgstr "Osnutki"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dan v mesecu=-1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4538,11 +4494,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Število dni:30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4566,20 +4517,9 @@ msgid "Account Type"
 msgstr "Vrsta konta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Zapiranje blagajne"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4602,9 +4542,20 @@ msgstr ""
 "in lahko ustvarijo osnutek vhodnega računa."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Zapiranje blagajne"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4632,7 +4583,7 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr "Ne morete spremeniti kode konta , ki vsebuje vknjižbe"
@@ -4643,8 +4594,8 @@ msgid "Supplier invoice sequence"
 msgstr "Številčno zaporedje dobaviteljevih računov"
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4668,6 +4619,11 @@ msgstr "Paypal račun"
 msgid "Acc.Type"
 msgstr "Vrsta konta"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4680,7 +4636,7 @@ msgstr "Stanje z nasprotnim predznakom"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Bilanca stanja (obveznosti)"
@@ -4702,7 +4658,7 @@ msgid "Account Base Code"
 msgstr "Konto osnove"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4757,11 +4713,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr "Zadnje usklajevanje:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodična obdelava"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4791,10 +4742,9 @@ msgid "Account chart"
 msgstr "Kontni načrt"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Račun dobavitelja"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4862,10 +4812,14 @@ msgstr "Dobropis"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr "Odprte postavke"
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4917,7 +4871,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4932,7 +4886,7 @@ msgid "Based On"
 msgstr "Na osnovi"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4957,11 +4911,6 @@ msgstr ""
 msgid "Change"
 msgstr "Spremeni"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banka in čeki"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4984,11 +4933,6 @@ msgstr "Razlog za dvig gotovine"
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Primer"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4999,11 +4943,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Pustite prazno v primeru konta prihodkov"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5013,7 +4952,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Davek   %.2f%%"
@@ -5087,16 +5026,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "Razl."
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5207,6 +5141,7 @@ msgstr "Dodaj"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Plačano"
 
@@ -5233,7 +5168,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Otvoritev"
@@ -5248,14 +5183,6 @@ msgstr "Postavke za pregled"
 msgid "Round Globally"
 msgstr "Skupno zaokroževanje"
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Pripombe in e-pošta"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5268,7 +5195,7 @@ msgid "Tax Application"
 msgstr "Uporaba davka"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5301,9 +5228,9 @@ msgid "End of period"
 msgstr "Konec obdobja"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Podatki banke"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Plačila računov"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5396,14 +5323,6 @@ msgstr "Opis davka"
 msgid "Child Tax Accounts"
 msgstr "Podrejeni konti davkov"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr "Obračunsko obdobje za : %s ni določeno."
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5448,7 +5367,7 @@ msgid "Target Moves"
 msgstr "Ciljni premik"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5484,6 +5403,7 @@ msgid "Python Code (reverse)"
 msgstr "Python koda (obratno)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5499,12 +5419,6 @@ msgstr ""
 "Tu se lahko odločite ali laho uporabnik sam vpiše davek ali ga mora obvezno "
 "izbrati iz seznama."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr "%s <b>plačano</b>."
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5530,18 +5444,13 @@ msgstr "Leto"
 msgid "It indicates that the invoice has been sent."
 msgstr "Oznaka , da je bil račun poslan."
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Vrstica 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interni naziv"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5580,7 +5489,7 @@ msgstr "Bilanca stanja"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Konto prihodkov"
@@ -5613,7 +5522,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Izračunaj oznako (tip=koda)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5640,6 +5549,7 @@ msgstr "Samodejno usklajevanje"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5742,7 +5652,7 @@ msgid "Recompute taxes and total"
 msgstr "Ponovni izračun davkov in salda"
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5773,7 +5683,7 @@ msgid "Amount Computation"
 msgstr "Izračun zneska"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5809,10 +5719,16 @@ msgid "Account Common Account Report"
 msgstr "Standardno finančno poročilo"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Komunikacija"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Odpri"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5842,9 +5758,7 @@ msgstr "Davčne stopnje"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Vrnitev kupcu"
 
@@ -5861,11 +5775,6 @@ msgstr "Predznak davčne stopnje"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Poročilo o računih narejenih v zadnjih 15-ih dneh"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Število dni:14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5882,6 +5791,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr "Izpolnite ta obrazec za polog gotovine:"
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Znesek za plačilo"
@@ -5971,8 +5881,6 @@ msgstr "Zaokroževanje na vrstico"
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5995,6 +5903,13 @@ msgstr "Normalni tekst"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Plačila so drugi vhod za usklajevanje."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6004,15 +5919,6 @@ msgstr ""
 "Število delnih zneskov , ki se jih lahko kombinira za avtomatično "
 "usklajevanje."
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Polje zaporedne številke se uporablja za naraščajoče razvrstitev postavk "
-"plačilnih pogojev"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6070,12 +5976,11 @@ msgstr "No možno knjižiti na konto vrste \"Pogled\"."
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Določen znesek"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6099,7 +6004,6 @@ msgstr "Kreiranje začetnih stanj"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Metoda izračuna za znesek davka"
 
@@ -6127,18 +6031,23 @@ msgid "Child Accounts"
 msgstr "Podrejeni konti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Naziv : %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "vnosi"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6155,7 +6064,7 @@ msgstr "Prihodki"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dobavitelj"
@@ -6175,16 +6084,11 @@ msgid "Account n°"
 msgstr "Konto št."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Prosta referenca"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Potrjevanje"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6294,7 +6198,7 @@ msgid "Filter by"
 msgstr "Filtriraj po"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Vnesli ste napačen izraz \"%(...)s\" v vaš model!"
@@ -6341,6 +6245,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Število dni"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr "Konto \"%s\" ne pripada kontnemu načrtu  \"%s\"."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6483,7 +6395,7 @@ msgid "Models"
 msgstr "Modeli"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6660,7 +6572,7 @@ msgid "You cannot create journal items on closed account."
 msgstr "Ni možno knjižiti na konto,ki je zaprt."
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6691,12 +6603,6 @@ msgstr "Po meni"
 msgid "Current"
 msgstr "Trenutno"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6721,7 +6627,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Odstotek"
 
@@ -6741,7 +6646,7 @@ msgid "Power"
 msgstr "Napajanje"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Ni možno generirati neuporabljene šifre dnevnika."
@@ -6787,12 +6692,17 @@ msgid "Applicable Type"
 msgstr "Predvidena vrsta"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Sklic računa"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6810,12 +6720,12 @@ msgstr ""
 "podrejene davke."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6884,7 +6794,7 @@ msgid "Optional create"
 msgstr "Ustvari-opcijsko"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6895,9 +6805,7 @@ msgstr "Ne morete spremeniti podjetja , za konto , ki že ima vknjižbe."
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Vrnitev dobavitelju"
 
@@ -6935,9 +6843,12 @@ msgid "Group By..."
 msgstr "Združeno po..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Nadzor:Saldo"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr "Obračunsko obdobje za : %s ni določeno."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7015,6 +6926,13 @@ msgstr "Ime davka mora biti enolično"
 msgid "Cash Transactions"
 msgstr "Gotovinske transakcije"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7032,7 +6950,7 @@ msgstr "Statistika analitičnih vnosov"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Postavke: "
@@ -7050,14 +6968,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr "Račun kupca"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Da"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Bilanca stanja (sredstva)"
@@ -7073,10 +6990,9 @@ msgid "Total debit"
 msgstr "Skupaj v breme"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Vnos   \"%s\" ni veljaven!"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Naslednje postavke za usklajevanje"
 
 #. module: account
 #: report:account.invoice:0
@@ -7128,7 +7044,7 @@ msgstr "Ustvari vnos"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Dobiček&Izguba"
@@ -7139,13 +7055,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr "Ne morete odstraniti konta , ki vsebuje vknjižbe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Napaka!"
@@ -7182,6 +7099,11 @@ msgstr "Vrstica projekta"
 msgid "Manual"
 msgstr "Ročno"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7282,8 +7204,8 @@ msgstr "Izberite dnevnik"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Začetno stanje"
@@ -7365,7 +7287,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7383,6 +7305,11 @@ msgstr ""
 "%(month)s: za mesec \n"
 "%(date)s: tenutni datum"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7436,7 +7363,7 @@ msgid "Done"
 msgstr "Končano"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7468,10 +7395,9 @@ msgid "Source Document"
 msgstr "Izvorni dokument"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "Bančni računi , kot se bodo pojavili v nogi tiskanih dokumentov"
 
 #. module: account
 #: constraint:account.account:0
@@ -7497,7 +7423,7 @@ msgid "Taxes:"
 msgstr "Davki:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7694,6 +7620,12 @@ msgstr ""
 "To polje se uporablja samo, če razvijate svoj lasten modul. Omogoča vam, da "
 "ustvarite posebne davka za določene namene."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Sklic računa"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7783,7 +7715,7 @@ msgid "Use model"
 msgstr "Model uporabe"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7834,7 +7766,7 @@ msgid "Root/View"
 msgstr "Osnova/Pogled"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7903,7 +7835,7 @@ msgid "Maturity Date"
 msgstr "Datum zapadlosti"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Dnevnik prodaje"
@@ -7914,7 +7846,7 @@ msgid "Invoice Tax"
 msgstr "Davek računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Ni številke kosa"
@@ -7955,7 +7887,7 @@ msgid "Sales Properties"
 msgstr "Lastnosti prodaje"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7980,7 +7912,7 @@ msgstr "Za"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Nastavitev valute"
@@ -8013,7 +7945,7 @@ msgid "May"
 msgstr "Maj"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Davki so določeni , vendar jih ni na postavkah računa!"
@@ -8031,10 +7963,9 @@ msgid ""
 msgstr "Polje zaporedja razvršča objekte po rastočem zaporedju."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Oznaka davka"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8050,17 +7981,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Vknjiži temeljnico"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kupec"
@@ -8076,7 +8002,7 @@ msgstr "Naziv poročila"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -8088,9 +8014,11 @@ msgid "Account Destination"
 msgstr "Ciljni konto"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Plačila računov"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8098,7 +8026,6 @@ msgstr "Plačila računov"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8233,15 +8160,14 @@ msgid "Partner Ledger"
 msgstr "Saldakonti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr "%s <b>preklican</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Stalno"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Opozorilo!"
@@ -8309,7 +8235,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Izberite valuto na računu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Račun nima postavk!"
@@ -8386,7 +8312,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Najprej morate izbrati partnerja!"
@@ -8468,13 +8394,13 @@ msgstr ""
 "davkov."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Dnevnik vračil dobaviteljem"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8545,7 +8471,7 @@ msgid "Net Total:"
 msgstr "Skupaj (brez davkov):"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr "Izberite začetno in zaključno obdobje"
@@ -8565,15 +8491,6 @@ msgstr "Splošna poročila"
 msgid "Write-Off Journal"
 msgstr "Dnevnik odpisov"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Ti plačilni pogoji se bodo uporabljali namesto privzetih za trenutnega "
-"partnerja"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8600,11 +8517,6 @@ msgstr "Int.tip"
 msgid "Tax/Base Amount"
 msgstr "Znesek davka/osnove"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Ovrednotenej:procent"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8658,6 +8570,11 @@ msgstr "Izid usklajevanja"
 msgid "Ending Balance"
 msgstr "Končni saldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8700,7 +8617,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Avtomatski uvoz banke"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr "Neznana napaka!"
@@ -8723,7 +8640,12 @@ msgid "Account Types"
 msgstr "Vrste kontov"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8731,9 +8653,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Vrednost : n.a."
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS Category"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8750,10 +8672,9 @@ msgid "Reconciliation"
 msgstr "Uskladitev"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto terjatev"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Pustite prazno v primeru konta prihodkov"
 
 #. module: account
 #: view:account.invoice:0
@@ -8829,7 +8750,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partner na računu"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Davek %.2f%%"
@@ -8847,13 +8768,13 @@ msgid "Payment Term Line"
 msgstr "Postavka plačilnih pogojev"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Dnevnik nakupov"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Delni seštevek"
 
@@ -8882,11 +8803,6 @@ msgstr "Zapade dne"
 msgid "Suppliers"
 msgstr "Dobavitelji"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Da"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9021,9 +8937,10 @@ msgid "Journal Name"
 msgstr "Naziv dnevnika"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Naslednje postavke za usklajevanje"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Vnos   \"%s\" ni veljaven!"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9069,7 +8986,7 @@ msgid ""
 msgstr "Vrednost v drugi valuti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9130,7 +9047,7 @@ msgid "Reconciled entries"
 msgstr "Usklajene postavke"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Napačen model!"
@@ -9152,7 +9069,7 @@ msgid "Print Account Partner Balance"
 msgstr "Izpis stanja partnerja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9186,7 +9103,7 @@ msgstr "neznano"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik otvoritev"
@@ -9233,7 +9150,7 @@ msgstr ""
 "celotnem znesku."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr "Ni možno de aktivirati konta , ki ima vknjižbe"
@@ -9248,18 +9165,9 @@ msgstr "Python programska koda"
 msgid "Journal Code"
 msgstr "Oznaka dnevnika"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr "Predznak s katerim se vrednost prenaša v nadrejeni konto."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Preostali znesek"
 
@@ -9292,7 +9200,7 @@ msgid "Unit of Currency"
 msgstr "Enota valute"
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Dnevnik vračil kupcem"
@@ -9358,7 +9266,7 @@ msgid "Purchase Tax(%)"
 msgstr "Nabavni davek(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Ustvarite postavke računa"
@@ -9377,7 +9285,7 @@ msgid "Display Detail"
 msgstr "Podrobnosti"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9494,21 +9402,11 @@ msgstr "Knjigovodja mora potrdi kontiranje računov. "
 msgid "Number of Periods"
 msgstr "Število obdobij"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Davčna predloga"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument:Kartica kupca"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS Category"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9520,9 +9418,10 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr "Naslednja številka dobaviteljevega računa"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "Račun je že zaprt."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9541,14 +9440,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Bančni izpisek"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto terjatev"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9649,8 +9548,8 @@ msgid "Move"
 msgstr "Prenos"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9727,11 +9626,6 @@ msgstr ""
 msgid "Sent"
 msgstr "Poslano"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Naknadno odprte postavke"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9749,11 +9643,16 @@ msgid "Balance :"
 msgstr "Stanje:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9790,13 +9689,6 @@ msgstr "Naročnina"
 msgid "Account Analytic Balance"
 msgstr "Saldo Analitike"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9836,7 +9728,13 @@ msgid "Due date"
 msgstr "Datum zapadlosti"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9925,7 +9823,7 @@ msgid "Unreconciled"
 msgstr "Neusklajeno"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Napačna skupna vsota!"
@@ -10008,7 +9906,7 @@ msgid "Comparison"
 msgstr "Primerjava"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10026,6 +9924,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10079,11 +9982,6 @@ msgstr "Dobro"
 msgid "Draft Invoice "
 msgstr "Osnutek računa "
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10095,7 +9993,7 @@ msgid "Journal Entry Model"
 msgstr "Model dnevnika"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10180,7 +10078,7 @@ msgid "Profit (Loss) to report"
 msgstr "Prihodek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10504,7 +10402,14 @@ msgid "Empty Accounts ? "
 msgstr "Konti brez vknjižb ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Ni možno spremeniti davka!"
@@ -10629,7 +10534,7 @@ msgid "Receivable accounts"
 msgstr "Konti terjatev"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr "že usklajeno."
@@ -10756,7 +10661,7 @@ msgid "Entries Sorted by"
 msgstr "Urejeno po"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10862,7 +10767,7 @@ msgid "Accounting Documents"
 msgstr "Računovodski dokumenti"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10907,7 +10812,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ročno zaračunan davek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10986,14 +10891,6 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr "Če vpišete opis , bodo vse postavke imele isti opis."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11052,6 +10949,11 @@ msgstr "Mapiranje predloge konta"
 msgid "Expense Account on Product Template"
 msgstr "Konto stroškov za izdelek"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11092,9 +10994,6 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Entry label"
 #~ msgstr "Označba vknjižbe"
 
-#~ msgid "Fixed"
-#~ msgstr "Stalno"
-
 #~ msgid "Origin"
 #~ msgstr "Izvor"
 
@@ -11110,6 +11009,13 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Neplačani dobropisi dobaviteljev"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodična obdelava"
+
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Račun dobavitelja"
+
 #~ msgid "Contact"
 #~ msgstr "Stik"
 
@@ -11152,6 +11058,13 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Amount paid"
 #~ msgstr "Plačan znesek"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Polje zaporedne številke se uporablja za naraščajoče razvrstitev postavk "
+#~ "plačilnih pogojev"
+
 #~ msgid "Total write-off"
 #~ msgstr "Odpis skupaj"
 
@@ -11167,12 +11080,22 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Bank account"
 #~ msgstr "Bančni račun"
 
+#~ msgid "Line Name"
+#~ msgstr "Naziv postavke"
+
 #~ msgid "Value"
 #~ msgstr "Vrednost"
 
 #~ msgid "Centralised counterpart"
 #~ msgstr "Skupen protikonto"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
+#~ "povezane s temi transakcijami, kajti le te ne bodo onemogočene."
+
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Izračunaj datume vknjižb"
 
@@ -11272,6 +11195,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Uporabi to stonjo za davčno napoved."
 
+#~ msgid "Litigation"
+#~ msgstr "Pravdanje"
+
 #~ msgid "Dear Sir/Madam,"
 #~ msgstr "Dragi gospod/gospa,"
 
@@ -12155,6 +12081,10 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Sale journal in this year"
 #~ msgstr "Prodaja v letošnjem letu"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Na 14 dni neto 2 odstotka, preostali znesek v 30 dneh do konca meseca."
+
 #~ msgid "Cancel: refund invoice and reconcile"
 #~ msgstr "Prekliči: vračilo računa in usklajevanje"
 
@@ -12353,6 +12283,11 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Voucher Management"
 #~ msgstr "Upravljanje plačil"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr "Če odpirate postavke, morate preveriti tudi vse povezane transakcije"
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Ne morete izbrisati potrjene temeljnice: \"%s\"!"
@@ -12360,6 +12295,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "All Analytic Entries"
 #~ msgstr "Vse analitične postavke"
 
+#~ msgid "account.tax"
+#~ msgstr "konto.davek"
+
 #, python-format
 #~ msgid "Journal: %s"
 #~ msgstr "Dnevnik: %s"
@@ -12376,6 +12314,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "St."
 #~ msgstr "St."
 
+#~ msgid "account.tax.template"
+#~ msgstr "konto.davek.predloga"
+
 #, python-format
 #~ msgid ""
 #~ "Can't find any account journal of %s type for this company.\n"
@@ -12681,12 +12622,19 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ "Potrebujete otvoritveni dnevnik z označeno centralizacijo , da lahko "
 #~ "nastavite začetno stanje."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "račun  '%s' je potrjen."
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
 #~ "refund it instead."
 #~ msgstr "Ne morete izbrisati plačanega ali delno plačanega računa."
 
+#~ msgid "Line 2:"
+#~ msgstr "Vrstica 2:"
+
 #~ msgid "Cash Transaction"
 #~ msgstr "Denarne transaklcije"
 
@@ -12696,6 +12644,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Starts on"
 #~ msgstr "Začetek"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dan v mesecu:0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Prodaja tekočega meseca po vrstah prodaje"
 
@@ -12710,6 +12661,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "Zaključni dnevnik ni določen za to poslovno leto"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Vrednost: 0.02"
+
 #~ msgid "Invoice State"
 #~ msgstr "Status računa"
 
@@ -12754,12 +12708,18 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ "Na ta konto se bo vrednotila zaloga izdanega blaga za vrsto izdelka po "
 #~ "prodajni ceni"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Število dni:30"
+
 #, python-format
 #~ msgid ""
 #~ "You haven't supplied enough argument to compute the initial balance, please "
 #~ "select a period and journal in the context."
 #~ msgstr "Ni dovolj podatkov.Izbrati morate obdobje in dnevnik."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dan v mesecu=-1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr ""
 #~ "Napaka! Začetni datum poslovnega leta mora biti pred zaključnim datumom."
@@ -12800,6 +12760,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Encoding error"
 #~ msgstr "Napaka kodiranja"
 
+#~ msgid "Example"
+#~ msgstr "Primer"
+
 #~ msgid "Operation date"
 #~ msgstr "Datum dogodka"
 
@@ -12835,6 +12798,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "You can not create journal items on a \"view\" account %s %s"
 #~ msgstr "Na zbirni %s %s  konto  ni možno knjižiti"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Banka in čeki"
+
 #, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
@@ -12872,6 +12838,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Opening Cashbox"
 #~ msgstr "Odpiranje blagajne"
 
+#~ msgid "Line 1:"
+#~ msgstr "Vrstica 1:"
+
 #, python-format
 #~ msgid "Start period should be smaller then End period"
 #~ msgstr "Začetno obdobje mora biti pred končnim!"
@@ -12879,6 +12848,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Transaction"
 #~ msgstr "Transakcija"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Število dni:14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "Brisanje davkov"
 
@@ -12970,6 +12942,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ "Napaka!\n"
 #~ "Ta vrsta konta ne more imeti podrejenih kontov. "
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+
 #~ msgid ""
 #~ "To print an analytics (or costs) journal for a given period. The report give "
 #~ "code, move name, account number, general amount and analytic amount."
@@ -12985,12 +12960,18 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ "This report gives you an overview of the situation of your general journals"
 #~ msgstr "Pregled stanja splošnih dnevnikov"
 
+#~ msgid "Communication"
+#~ msgstr "Komunikacija"
+
 #~ msgid "Refund Invoice Options"
 #~ msgstr "Možnosti računa za vračilo"
 
 #~ msgid "Move journal"
 #~ msgstr "Dnevnik premikov"
 
+#~ msgid "Valuation"
+#~ msgstr "Potrjevanje"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -13084,6 +13065,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Invoice is already reconciled"
 #~ msgstr "Račun je že usklajen"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Nadzor:Saldo"
+
 #, python-format
 #~ msgid "You can not desactivate an account that contains some journal items."
 #~ msgstr "Ni možno de-aktivirati konta , ki ima vknjižbe!"
@@ -13259,6 +13243,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Journal Views"
 #~ msgstr "Pogledi dnevnika"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Ovrednotenej:procent"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -13387,6 +13374,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ "* \"Plačano\" račun je plačan    \n"
 #~ "* \"Storno\" račun je bil preklican"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Vrednost : n.a."
+
 #~ msgid ""
 #~ "With Customer Refunds you can manage the credit notes for your customers. A "
 #~ "refund is a document that credits an invoice completely or partially. You "
@@ -13410,6 +13400,13 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ "Sprememba računa : Prekličite obstoječi račun in napravite kopijo , ki jo "
 #~ "lahko spremenite."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Ti plačilni pogoji se bodo uporabljali namesto privzetih za trenutnega "
+#~ "partnerja"
+
 #~ msgid ""
 #~ "With Customer Invoices you can create and manage sales invoices issued to "
 #~ "your customers. OpenERP can also generate draft invoices automatically from "
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 1ec7653383e..352f9f8afce 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:42+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Debiti Total"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Shabllonet e Taksave"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr "Shënimet e Modelit të Llogarisë"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Taksat e Furnizuesit"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2853,9 +2734,8 @@ msgstr ""
 "muaji."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2885,6 +2765,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Taksa"
 
@@ -2920,14 +2801,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3024,6 +2905,12 @@ msgstr "Paguar/Prapambetur"
 msgid "Refund Base Code"
 msgstr "Kodi Bazik i kthimit të fondeve"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3076,11 +2963,6 @@ msgstr "Balansi i partnerit të vjetëruar"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3121,7 +3003,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3134,7 +3016,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3150,15 +3032,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3166,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3228,8 +3110,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3277,12 +3160,6 @@ msgstr "Vlera Kodit Bazik"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3316,7 +3193,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3343,7 +3220,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3409,7 +3286,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3421,8 +3298,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3472,7 +3349,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3493,14 +3370,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3509,9 +3391,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3637,12 +3598,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3657,7 +3621,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3857,7 +3821,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3881,7 +3845,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4017,7 +3981,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4102,8 +4066,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4187,11 +4154,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4209,11 +4171,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4258,8 +4215,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4289,7 +4246,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4321,11 +4278,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4415,6 +4367,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4434,6 +4393,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4444,11 +4408,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4457,11 +4416,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4485,19 +4439,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4519,8 +4462,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4549,7 +4503,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4560,8 +4514,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4585,6 +4539,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4597,7 +4556,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4619,7 +4578,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4674,11 +4633,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesimi Periodik"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4708,10 +4662,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Fatura e furnizuesit"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4779,10 +4732,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4831,7 +4788,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4846,7 +4803,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4871,11 +4828,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4898,11 +4850,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4913,11 +4860,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4927,7 +4869,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5001,16 +4943,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5121,6 +5058,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5147,7 +5085,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5162,14 +5100,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5182,7 +5112,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5215,8 +5145,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5310,14 +5240,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5362,7 +5284,7 @@ msgid "Target Moves"
 msgstr "Lëvizjet e Drejtuara"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5398,6 +5320,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5411,12 +5334,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5442,18 +5359,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Emri i Brendshëm"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5492,7 +5404,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5525,7 +5437,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Kodi kompjuterik (nëse type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5552,6 +5464,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5652,7 +5565,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5683,7 +5596,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5719,9 +5632,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5752,9 +5671,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Fondet kthyese për Klientin"
 
@@ -5771,11 +5688,6 @@ msgstr "Nënshkrimi i Kodit të Taksës"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5792,6 +5704,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5880,8 +5793,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5904,6 +5815,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5911,13 +5829,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5975,12 +5886,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6004,7 +5914,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6032,18 +5941,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6060,7 +5974,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6080,16 +5994,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6199,7 +6108,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6246,6 +6155,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6385,7 +6302,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6560,7 +6477,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6591,12 +6508,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6621,7 +6532,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6641,7 +6551,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6686,12 +6596,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6707,12 +6622,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6779,7 +6694,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6790,9 +6705,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6830,8 +6743,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6908,6 +6824,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6925,7 +6848,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6943,14 +6866,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Saktë"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6966,9 +6888,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7018,7 +6939,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7029,13 +6950,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7072,6 +6994,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7170,8 +7097,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7251,7 +7178,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7264,6 +7191,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7317,7 +7249,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7349,9 +7281,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7378,7 +7309,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7570,6 +7501,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7659,7 +7596,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7710,7 +7647,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7777,7 +7714,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7788,7 +7725,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7827,7 +7764,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7852,7 +7789,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7884,7 +7821,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7902,9 +7839,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7921,17 +7857,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7947,7 +7878,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7959,8 +7890,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7969,7 +7902,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8104,15 +8036,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fikse"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8180,7 +8111,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8255,7 +8186,7 @@ msgid "Associated Partner"
 msgstr "Partneri i Bashkuar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8337,13 +8268,13 @@ msgstr ""
 "llogaritjes së taksave të ardhshme."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8414,7 +8345,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8434,13 +8365,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Journal i anulimit"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8467,11 +8391,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8525,6 +8444,11 @@ msgstr "Rezultati i pajtimit"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8565,7 +8489,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8588,7 +8512,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8596,8 +8525,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8615,9 +8544,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8690,7 +8618,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8708,13 +8636,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8743,11 +8671,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Saktë"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8882,8 +8805,9 @@ msgid "Journal Name"
 msgstr "Emri i Journal"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8929,7 +8853,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8990,7 +8914,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9012,7 +8936,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9046,7 +8970,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9091,7 +9015,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9106,18 +9030,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9150,7 +9065,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9216,7 +9131,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9235,7 +9150,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9350,21 +9265,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9376,8 +9281,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9397,14 +9303,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9505,8 +9411,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9583,11 +9489,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9605,11 +9506,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9646,13 +9552,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9692,7 +9591,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9781,7 +9686,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9864,7 +9769,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9882,6 +9787,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9935,11 +9845,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9951,7 +9856,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10036,7 +9941,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10359,7 +10264,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10484,7 +10396,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10611,7 +10523,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10717,7 +10629,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10762,7 +10674,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10841,14 +10753,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10907,6 +10811,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10998,9 +10907,6 @@ msgstr ""
 #~ "çfarë renditje. Ju mund të krijoni shikimet tuaja vetanake për enkodim më të "
 #~ "shpejtë në secilin journal."
 
-#~ msgid "Fixed"
-#~ msgstr "Fikse"
-
 #~ msgid "Origin"
 #~ msgstr "Origjina"
 
@@ -11040,9 +10946,16 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Konfirmo deklaratn me/pa pajtim nga deklarata draft"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Procesimi Periodik"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statistikat e Hyrjeve Analitike"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Fatura e furnizuesit"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Paguar prapambetja"
 
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index ec16b11e7bd..ab600ed0225 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 21:58+0000\n"
 "Last-Translator: Vlado Zvijer <vlado.zvijer@iinet.rs>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -29,11 +29,6 @@ msgid ""
 msgstr ""
 "Фискална позиција рачуна може бити дефинисана само једном на истим рачунима."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Несравњиве трансакције"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -82,9 +77,9 @@ msgid "Import from invoice or payment"
 msgstr "Преузимање из рачуна или плаћања"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -95,13 +90,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Укупно дугује"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -112,7 +100,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -141,19 +128,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -165,7 +152,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -234,11 +221,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Poreski obrasci"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -254,6 +236,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -380,11 +367,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "predlozak.poreske.taxe"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -439,6 +421,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -454,6 +441,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Predložak kontnog plana"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -615,15 +607,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
-"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -672,7 +655,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -683,13 +666,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -752,6 +735,11 @@ msgstr "Konta potraživanja"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -774,6 +762,12 @@ msgstr "Ponovno otvori"
 msgid "Are you sure you want to create entries?"
 msgstr "Jeste sigurni da želite kreirati stavke?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -794,6 +788,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procenat"
 
@@ -836,7 +831,7 @@ msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -859,24 +854,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Poništavanje zatvaranja"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -907,11 +896,6 @@ msgstr "J.C./Pomeri ime"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -942,7 +926,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -957,6 +941,7 @@ msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Proračun"
 
@@ -988,11 +973,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1028,7 +1010,7 @@ msgid "Liability"
 msgstr "Obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1099,10 +1081,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1178,8 +1160,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1225,7 +1208,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1521,9 +1504,9 @@ msgid "Account Receivable"
 msgstr "Konto potraživanja"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1537,7 +1520,7 @@ msgid "With balance is not equal to 0"
 msgstr "Sa saldom različitim od 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1592,7 +1575,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1635,6 +1618,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Povrat dobavljaču"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Šifra"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1672,7 +1661,6 @@ msgid "Groups"
 msgstr "Grupe"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Bez poreza"
@@ -1805,6 +1793,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1825,115 +1819,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2042,6 +1932,11 @@ msgstr "Ova razdoblja se mogu preklapati."
 msgid "Draft statement"
 msgstr "Izvod u pripremi"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2070,26 +1965,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2097,16 +1991,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2117,8 +2011,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2163,7 +2057,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2263,7 +2157,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2622,7 +2516,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Ostavite prazno za sve otvorene fiskalne godine"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2640,7 +2534,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2661,7 +2555,7 @@ msgid "Main Sequence"
 msgstr "Glavna sekvenca"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2669,14 +2563,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
@@ -2702,18 +2594,6 @@ msgstr "Označite ovu kućicu"
 msgid "Filters"
 msgstr "Filteri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Otvori"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2725,6 +2605,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2802,25 +2687,20 @@ msgid "Account Model Entries"
 msgstr "Stavke modela"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Porezi od dobavljača"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalji Banke"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2843,7 +2723,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2858,9 +2737,8 @@ msgstr ""
 "dana."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2890,6 +2768,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Porez"
 
@@ -2925,14 +2804,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3029,6 +2908,12 @@ msgstr "Plaćeno/Usklađeno"
 msgid "Refund Base Code"
 msgstr "Šifra osnovice povrata"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3081,11 +2966,6 @@ msgstr "Godisnja potraživanja/obaveze partnera"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3126,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3139,7 +3019,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3155,15 +3035,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3171,7 +3051,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3233,8 +3113,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3281,12 +3162,6 @@ msgstr "Iznos osnvice"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3320,7 +3195,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3347,7 +3222,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3418,7 +3293,7 @@ msgstr ""
 "kurs na datum. Dolazece transakcije uvek koriste vazeci kurs toga dana."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3430,9 +3305,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Broj oznaka( brojeva) za upotrebu u šifri konta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Naziv reda"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3481,7 +3356,7 @@ msgid "View"
 msgstr "Pregled"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3502,15 +3377,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektronska datoteka"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Predložak PDV obrasca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3518,9 +3398,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3646,12 +3605,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3666,7 +3628,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3866,7 +3828,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3890,7 +3852,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4028,7 +3990,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4115,9 +4077,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Sporno"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4201,11 +4166,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4223,11 +4183,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4272,8 +4227,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4303,7 +4258,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirana konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4335,11 +4290,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4429,6 +4379,13 @@ msgstr "30 dana kraj mjeseca"
 msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4448,6 +4405,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4458,11 +4420,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4471,11 +4428,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4499,19 +4451,8 @@ msgid "Account Type"
 msgstr "Vrsta konta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4533,8 +4474,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4563,7 +4515,7 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4574,8 +4526,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4599,6 +4551,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4611,7 +4568,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4633,7 +4590,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4688,11 +4645,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodična obrada"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4722,10 +4674,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Račun dobavljača"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4793,10 +4744,14 @@ msgstr "Knjižna odobrenja"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4845,7 +4800,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4860,7 +4815,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4885,11 +4840,6 @@ msgstr ""
 msgid "Change"
 msgstr "Izmeni"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4912,11 +4862,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Отказано"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4927,11 +4872,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Ostavite prazno za konto prihoda"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4941,7 +4881,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5015,16 +4955,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5135,6 +5070,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Plaćeno"
 
@@ -5161,7 +5097,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5176,14 +5112,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5196,7 +5124,7 @@ msgid "Tax Application"
 msgstr "Poreska Aplikacija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5229,9 +5157,9 @@ msgid "End of period"
 msgstr "Završetak perioda"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalji Banke"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5324,14 +5252,6 @@ msgstr "Opis poreza"
 msgid "Child Tax Accounts"
 msgstr "Podredjeni Poreski nalozi"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5376,7 +5296,7 @@ msgid "Target Moves"
 msgstr "Ciljna knjiženja"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5412,6 +5332,7 @@ msgid "Python Code (reverse)"
 msgstr "Python kod (obrnuti)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5425,12 +5346,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5456,18 +5371,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interno ime"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5506,7 +5416,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5539,7 +5449,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Izracunaj Kod ( if type= code) *programiranje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5566,6 +5476,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5666,7 +5577,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5696,7 +5607,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5732,10 +5643,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Otvori"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5765,9 +5682,7 @@ msgstr "Šifre poreza"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Povrat novca kupcu"
 
@@ -5784,11 +5699,6 @@ msgstr "Predznak Poreznog koda"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Izvestaj računa kreiranih u zadnjih 15 dana"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5805,6 +5715,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5893,8 +5804,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5917,6 +5826,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5924,15 +5840,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
-"najmanjeg do najvećeg"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5990,12 +5897,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fiksni iznos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6019,7 +5925,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Način izračuna iznosa poreza"
 
@@ -6047,18 +5952,23 @@ msgid "Child Accounts"
 msgstr "Podređena konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6075,7 +5985,7 @@ msgstr "Prihod"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -6095,16 +6005,11 @@ msgid "Account n°"
 msgstr "Br. računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6214,7 +6119,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6261,6 +6166,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Broj Dana"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6400,7 +6313,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6575,7 +6488,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6606,12 +6519,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6636,7 +6543,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procenat"
 
@@ -6656,7 +6562,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6701,12 +6607,17 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referenca računa"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6726,12 +6637,12 @@ msgstr ""
 "je vazan."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6798,7 +6709,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6809,9 +6720,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
@@ -6849,8 +6758,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6929,6 +6841,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6946,7 +6865,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6964,14 +6883,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Tačno"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6987,9 +6905,8 @@ msgid "Total debit"
 msgstr "Ukupno duguje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7041,7 +6958,7 @@ msgstr "Kreiraj stavku"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7052,13 +6969,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7095,6 +7013,11 @@ msgstr "Red projekta"
 msgid "Manual"
 msgstr "Ručno"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7193,8 +7116,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7274,7 +7197,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7287,6 +7210,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7340,7 +7268,7 @@ msgid "Done"
 msgstr "Gotovo"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7372,9 +7300,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7401,7 +7328,7 @@ msgid "Taxes:"
 msgstr "Porezi:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7598,6 +7525,12 @@ msgstr ""
 "Ovo polje se upotrebljava samo ako razvijate vlastiti modul i dozvoljava "
 "programerima da stvaraju posebne poreze u vlastitom domenu."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referenca računa"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7687,7 +7620,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7738,7 +7671,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7805,7 +7738,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7816,7 +7749,7 @@ msgid "Invoice Tax"
 msgstr "Porezi računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7855,7 +7788,7 @@ msgid "Sales Properties"
 msgstr "Karakteristike prodaje"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7880,7 +7813,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7912,7 +7845,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7930,10 +7863,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Šifra"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7949,17 +7881,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -7975,7 +7902,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7987,8 +7914,10 @@ msgid "Account Destination"
 msgstr "Ciljni račun"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7997,7 +7926,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8135,15 +8063,14 @@ msgid "Partner Ledger"
 msgstr "Salda konti partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -8211,7 +8138,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8286,7 +8213,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8368,13 +8295,13 @@ msgstr ""
 "izračuna sledećeg poreza."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8445,7 +8372,7 @@ msgid "Net Total:"
 msgstr "Neto Ukupno"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8465,14 +8392,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Dnevnik otpisa"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Ovaj uslov placanje ce biti koristen umesto osnovnog za datog partnera"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8499,11 +8418,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Iznos poreza/osnovice"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8557,6 +8471,11 @@ msgstr "Rezultat zatvaranja"
 msgid "Ending Balance"
 msgstr "Završni saldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8597,7 +8516,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8620,7 +8539,12 @@ msgid "Account Types"
 msgstr "Tipovi konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8628,8 +8552,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8647,10 +8571,9 @@ msgid "Reconciliation"
 msgstr "Zatvaranje"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto potraživanja"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
 #: view:account.invoice:0
@@ -8722,7 +8645,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera za ovu fakturu"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8740,13 +8663,13 @@ msgid "Payment Term Line"
 msgstr "Red uslova plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8775,11 +8698,6 @@ msgstr "Datum dospeća"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Tačno"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8914,8 +8832,9 @@ msgid "Journal Name"
 msgstr "Naziv dnevnika"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8963,7 +8882,7 @@ msgstr ""
 "Iznos troskova u drugoj opcionoj valuti ako je ovo multi-valutni sadrzaj"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9024,7 +8943,7 @@ msgid "Reconciled entries"
 msgstr "Zatvorene stavke"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9046,7 +8965,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9080,7 +8999,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik početnog stanja"
@@ -9127,7 +9046,7 @@ msgstr ""
 "ukupnog iznosa."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9142,18 +9061,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Šifra dnevnika"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9186,7 +9096,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9252,7 +9162,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9271,7 +9181,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9386,21 +9296,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Broj perioda"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Predložak PDV obrasca"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Izvod konta kupca"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9412,8 +9312,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9433,14 +9334,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9541,8 +9442,8 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9619,11 +9520,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Neponistene transakcije"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9641,11 +9537,16 @@ msgid "Balance :"
 msgstr "Saldo"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9682,13 +9583,6 @@ msgstr "Pretplata"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9728,7 +9622,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9817,7 +9717,7 @@ msgid "Unreconciled"
 msgstr "Otvoren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9900,7 +9800,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9918,6 +9818,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9973,11 +9878,6 @@ msgstr "Kredit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9989,7 +9889,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10074,7 +9974,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10397,7 +10297,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10522,7 +10429,7 @@ msgid "Receivable accounts"
 msgstr "Konta Potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10649,7 +10556,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10755,7 +10662,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10800,7 +10707,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ručni porezi računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10879,14 +10786,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10945,6 +10844,11 @@ msgstr "Predlozak poreskog mapiranja konta"
 msgid "Expense Account on Product Template"
 msgstr "Konto troškova na predlošku proizvoda"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11017,6 +10921,10 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negativno"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Račun dobavljača"
+
 #~ msgid "Printing Date"
 #~ msgstr "Datum štampe"
 
@@ -11063,9 +10971,6 @@ msgstr ""
 #~ msgid "Account Entry Line"
 #~ msgstr "Stavke knjiženja"
 
-#~ msgid "Fixed"
-#~ msgstr "Fiksno"
-
 #~ msgid ""
 #~ "Gives the view used when writing or browsing entries in this journal. The "
 #~ "view tell Open ERP which fields should be visible, required or readonly and "
@@ -11098,6 +11003,9 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Stanje"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodična obrada"
+
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Neplaćeni povrati dobavljaču"
 
@@ -11204,6 +11112,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Nbr Vaucera"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
+#~ "najmanjeg do najvećeg"
+
 #~ msgid "Print Analytic Journals"
 #~ msgstr "Stampaj analitičke dnevnike"
 
@@ -11255,6 +11170,9 @@ msgstr ""
 #~ msgid "Value"
 #~ msgstr "Vrednost"
 
+#~ msgid "Line Name"
+#~ msgstr "Naziv reda"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Odaberite račune koje želite da platite i unapredite ih"
 
@@ -11264,6 +11182,13 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "Poruka"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+#~ "radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
+
 #~ msgid "Validated accounting entries."
 #~ msgstr "Potvrđene računovodstvene stavke"
 
@@ -11517,6 +11442,9 @@ msgstr ""
 #~ msgid "Taxes Reports"
 #~ msgstr "Poreski izvestaji"
 
+#~ msgid "Litigation"
+#~ msgstr "Sporno"
+
 #~ msgid "From analytic accounts, Create invoice."
 #~ msgstr "Iz konta analitike, kreiraj račun."
 
@@ -11724,6 +11652,12 @@ msgstr ""
 #~ msgid "Entry encoding"
 #~ msgstr "Unos stavki"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Ovaj uslov placanje ce biti koristen umesto osnovnog za datog partnera"
+
 #~ msgid "Entry Name"
 #~ msgstr "Ime stavke"
 
@@ -12222,6 +12156,9 @@ msgstr ""
 #~ msgid "Subscription Entries"
 #~ msgstr "Stavke pretplate"
 
+#~ msgid "account.tax.template"
+#~ msgstr "predlozak.poreske.taxe"
+
 #~ msgid "PRO-FORMA Customer Invoices"
 #~ msgstr "Predračuni kupcu"
 
@@ -12380,6 +12317,9 @@ msgstr ""
 #~ msgid "St."
 #~ msgstr "St."
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. ili pomeri ime"
 
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index df5fe38538f..fab9b752b6e 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr "Uvezi iz računa ili plaćanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,15 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Ukupno duguje"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Ako otvarate stavke, morate proveriti i sve ostale akcije vezane za ove "
-"transakcije inače one neće biti onemogućene"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -111,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -140,19 +125,19 @@ msgid ""
 msgstr "Omogućuje skrivanje neaktivnih uslova plaćanja."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -164,7 +149,7 @@ msgid "Warning!"
 msgstr "Upozorenje !"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -235,11 +220,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Poreski obrasci"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -255,6 +235,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr "Belgijski Izveštaji"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -382,11 +367,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "predlozak.poreske.taxe"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -441,6 +421,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -456,6 +441,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Predložak kontnog plana"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -617,15 +607,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "tromesečno"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
-"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -674,7 +655,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -685,13 +666,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -754,6 +735,11 @@ msgstr "Konta potraživanja"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -776,6 +762,12 @@ msgstr "Ponovno otvori"
 msgid "Are you sure you want to create entries?"
 msgstr "Jeste sigurni da želite kreirati stavke?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -796,6 +788,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procenat"
 
@@ -838,7 +831,7 @@ msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -861,24 +854,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Poništavanje zatvaranja"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -909,11 +896,6 @@ msgstr "J.C./Pomeri ime"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -944,7 +926,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -959,6 +941,7 @@ msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Proračun"
 
@@ -990,11 +973,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1030,7 +1010,7 @@ msgid "Liability"
 msgstr "Obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1101,10 +1081,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1180,8 +1160,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1227,7 +1208,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1523,9 +1504,9 @@ msgid "Account Receivable"
 msgstr "Konto potraživanja"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1539,7 +1520,7 @@ msgid "With balance is not equal to 0"
 msgstr "Sa saldom različitim od 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1594,7 +1575,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1637,6 +1618,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Povrat dobavljaču"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Šifra"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1674,7 +1661,6 @@ msgid "Groups"
 msgstr "Grupe"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Bez poreza"
@@ -1807,6 +1793,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1827,115 +1819,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2044,6 +1932,11 @@ msgstr "Ova razdoblja se mogu preklapati."
 msgid "Draft statement"
 msgstr "Izvod u pripremi"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2072,26 +1965,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2099,16 +1991,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2119,8 +2011,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2165,7 +2057,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2265,7 +2157,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2624,7 +2516,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Ostavite prazno za sve otvorene fiskalne godine"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2642,7 +2534,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2663,7 +2555,7 @@ msgid "Main Sequence"
 msgstr "Glavna sekvenca"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2671,14 +2563,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
@@ -2704,18 +2594,6 @@ msgstr "Označite ovu kućicu"
 msgid "Filters"
 msgstr "Filteri"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Otvori"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2727,6 +2605,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2804,25 +2687,20 @@ msgid "Account Model Entries"
 msgstr "Stavke modela"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Porezi od dobavljača"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalji Banke"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2845,7 +2723,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2860,9 +2737,8 @@ msgstr ""
 "dana."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2892,6 +2768,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Porez"
 
@@ -2927,14 +2804,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3031,6 +2908,12 @@ msgstr "Plaćeno/Usklađeno"
 msgid "Refund Base Code"
 msgstr "Šifra osnovice povrata"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3083,11 +2966,6 @@ msgstr "Godisnja potraživanja/obaveze partnera"
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3128,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3141,7 +3019,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3157,15 +3035,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3173,7 +3051,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3235,8 +3113,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3283,12 +3162,6 @@ msgstr "Iznos osnvice"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3322,7 +3195,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3349,7 +3222,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3420,7 +3293,7 @@ msgstr ""
 "kurs na datum. Dolazece transakcije uvek koriste vazeci kurs toga dana."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3432,9 +3305,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Broj oznaka( brojeva) za upotrebu u šifri konta"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Naziv reda"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3483,7 +3356,7 @@ msgid "View"
 msgstr "Pregled"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3504,15 +3377,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Elektronska datoteka"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Predložak PDV obrasca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3520,9 +3398,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3648,12 +3605,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3668,7 +3628,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3868,7 +3828,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3892,7 +3852,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4030,7 +3990,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4117,9 +4077,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Sporno"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4203,11 +4166,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4225,11 +4183,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4274,8 +4227,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4305,7 +4258,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirana konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4337,11 +4290,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4431,6 +4379,13 @@ msgstr "30 dana kraj mjeseca"
 msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4450,6 +4405,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4460,11 +4420,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4473,11 +4428,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4501,19 +4451,8 @@ msgid "Account Type"
 msgstr "Vrsta konta"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4535,8 +4474,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4565,7 +4515,7 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4576,8 +4526,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4601,6 +4551,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4613,7 +4568,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4635,7 +4590,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4690,11 +4645,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodična obrada"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4724,10 +4674,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Račun dobavljača"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4795,10 +4744,14 @@ msgstr "Knjižna odobrenja"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4847,7 +4800,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4862,7 +4815,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4887,11 +4840,6 @@ msgstr ""
 msgid "Change"
 msgstr "Izmeni"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4914,11 +4862,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Отказано"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4929,11 +4872,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Ostavite prazno za konto prihoda"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4943,7 +4881,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5017,16 +4955,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5137,6 +5070,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Plaćeno"
 
@@ -5163,7 +5097,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5178,14 +5112,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5198,7 +5124,7 @@ msgid "Tax Application"
 msgstr "Poreska Aplikacija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5231,9 +5157,9 @@ msgid "End of period"
 msgstr "Završetak perioda"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalji Banke"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5326,14 +5252,6 @@ msgstr "Opis poreza"
 msgid "Child Tax Accounts"
 msgstr "Podredjeni Poreski nalozi"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5378,7 +5296,7 @@ msgid "Target Moves"
 msgstr "Ciljna knjiženja"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5414,6 +5332,7 @@ msgid "Python Code (reverse)"
 msgstr "Python kod (obrnuti)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5427,12 +5346,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5458,18 +5371,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Interno ime"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5508,7 +5416,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5541,7 +5449,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Izracunaj Kod ( if type= code) *programiranje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5568,6 +5476,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5668,7 +5577,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5698,7 +5607,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5734,10 +5643,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Otvori"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5767,9 +5682,7 @@ msgstr "Šifre poreza"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Povrat novca kupcu"
 
@@ -5786,11 +5699,6 @@ msgstr "Predznak Poreznog koda"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Izvestaj računa kreiranih u zadnjih 15 dana"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5807,6 +5715,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5895,8 +5804,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5919,6 +5826,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5926,15 +5840,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
-"najmanjeg do najvećeg"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5992,12 +5897,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fiksni iznos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6021,7 +5925,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Način izračuna iznosa poreza"
 
@@ -6049,18 +5952,23 @@ msgid "Child Accounts"
 msgstr "Podređena konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6077,7 +5985,7 @@ msgstr "Prihod"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -6097,16 +6005,11 @@ msgid "Account n°"
 msgstr "Br. računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6216,7 +6119,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6263,6 +6166,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Broj Dana"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6402,7 +6313,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6577,7 +6488,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6608,12 +6519,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6638,7 +6543,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procenat"
 
@@ -6658,7 +6562,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6703,12 +6607,17 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referenca računa"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6728,12 +6637,12 @@ msgstr ""
 "je vazan."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6800,7 +6709,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6811,9 +6720,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
@@ -6851,8 +6758,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6931,6 +6841,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6948,7 +6865,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6966,14 +6883,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Tačno"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6989,9 +6905,8 @@ msgid "Total debit"
 msgstr "Ukupno duguje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7043,7 +6958,7 @@ msgstr "Kreiraj stavku"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7054,13 +6969,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7097,6 +7013,11 @@ msgstr "Red projekta"
 msgid "Manual"
 msgstr "Ručno"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7195,8 +7116,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7276,7 +7197,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7289,6 +7210,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7342,7 +7268,7 @@ msgid "Done"
 msgstr "Gotovo"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7374,9 +7300,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7403,7 +7328,7 @@ msgid "Taxes:"
 msgstr "Porezi:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7600,6 +7525,12 @@ msgstr ""
 "Ovo polje se upotrebljava samo ako razvijate vlastiti modul i dozvoljava "
 "programerima da stvaraju posebne poreze u vlastitom domenu."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Referenca računa"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7689,7 +7620,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7740,7 +7671,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7807,7 +7738,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7818,7 +7749,7 @@ msgid "Invoice Tax"
 msgstr "Porezi računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7857,7 +7788,7 @@ msgid "Sales Properties"
 msgstr "Karakteristike prodaje"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7882,7 +7813,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7914,7 +7845,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7932,10 +7863,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Šifra"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7951,17 +7881,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -7977,7 +7902,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7989,8 +7914,10 @@ msgid "Account Destination"
 msgstr "Ciljni račun"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7999,7 +7926,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8137,15 +8063,14 @@ msgid "Partner Ledger"
 msgstr "Salda konti partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -8213,7 +8138,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8288,7 +8213,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8370,13 +8295,13 @@ msgstr ""
 "izračuna sledećeg poreza."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8447,7 +8372,7 @@ msgid "Net Total:"
 msgstr "Neto Ukupno"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8467,14 +8392,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Dnevnik otpisa"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Ovaj uslov placanje ce biti koristen umesto osnovnog za datog partnera"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8501,11 +8418,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Iznos poreza/osnovice"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8559,6 +8471,11 @@ msgstr "Rezultat zatvaranja"
 msgid "Ending Balance"
 msgstr "Završni saldo"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8599,7 +8516,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8622,7 +8539,12 @@ msgid "Account Types"
 msgstr "Tipovi konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8630,8 +8552,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8649,10 +8571,9 @@ msgid "Reconciliation"
 msgstr "Zatvaranje"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto potraživanja"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
 #: view:account.invoice:0
@@ -8724,7 +8645,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera za ovu fakturu"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8742,13 +8663,13 @@ msgid "Payment Term Line"
 msgstr "Red uslova plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8777,11 +8698,6 @@ msgstr "Datum dospeća"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Tačno"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8916,8 +8832,9 @@ msgid "Journal Name"
 msgstr "Naziv dnevnika"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8965,7 +8882,7 @@ msgstr ""
 "Iznos troskova u drugoj opcionoj valuti ako je ovo multi-valutni sadrzaj"
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9026,7 +8943,7 @@ msgid "Reconciled entries"
 msgstr "Zatvorene stavke"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9048,7 +8965,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9082,7 +8999,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik početnog stanja"
@@ -9129,7 +9046,7 @@ msgstr ""
 "ukupnog iznosa."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9144,18 +9061,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr "Šifra dnevnika"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9188,7 +9096,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9254,7 +9162,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9273,7 +9181,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9388,21 +9296,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Broj perioda"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Predložak PDV obrasca"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Dokument: Izvod konta kupca"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9414,8 +9312,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9435,14 +9334,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9543,8 +9442,8 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9621,11 +9520,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Neponistene transakcije"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9643,11 +9537,16 @@ msgid "Balance :"
 msgstr "Saldo"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9684,13 +9583,6 @@ msgstr "Pretplata"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9730,7 +9622,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9819,7 +9717,7 @@ msgid "Unreconciled"
 msgstr "Otvoren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9902,7 +9800,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9920,6 +9818,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9975,11 +9878,6 @@ msgstr "Kredit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9991,7 +9889,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10076,7 +9974,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10399,7 +10297,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10524,7 +10429,7 @@ msgid "Receivable accounts"
 msgstr "Konta Potraživanja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10651,7 +10556,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10757,7 +10662,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10802,7 +10707,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ručni porezi računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10881,14 +10786,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10947,6 +10844,11 @@ msgstr "Predlozak poreskog mapiranja konta"
 msgid "Expense Account on Product Template"
 msgstr "Konto troškova na predlošku proizvoda"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11050,9 +10952,6 @@ msgstr ""
 #~ "samo za čitanje i u kojem redosledu. Možete kreirati vlastiti pogled za brži "
 #~ "unos stavki ovog dnevnika."
 
-#~ msgid "Fixed"
-#~ msgstr "Fiksno"
-
 #~ msgid "Origin"
 #~ msgstr "Poreklo"
 
@@ -11098,9 +10997,16 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Potvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Periodična obrada"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Statistika analitičkih stavki"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Račun dobavljača"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Zatvori plaćene"
 
@@ -11110,6 +11016,9 @@ msgstr ""
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. ili pomeri ime"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Printing Date"
 #~ msgstr "Datum štampe"
 
@@ -11229,6 +11138,13 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Nbr Vaucera"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
+#~ "najmanjeg do najvećeg"
+
 #~ msgid "Total write-off"
 #~ msgstr "Ukupni otpis"
 
@@ -11268,6 +11184,9 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Porezi nabavke"
 
+#~ msgid "Line Name"
+#~ msgstr "Naziv reda"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Analitika potraživanja"
 
@@ -11286,6 +11205,13 @@ msgstr ""
 #~ msgid "Validated accounting entries."
 #~ msgstr "Potvrđene računovodstvene stavke"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+#~ "radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
+
 #~ msgid "Customer Credit"
 #~ msgstr "Potraživanja kupca"
 
@@ -11542,6 +11468,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Koristi ovo za dekleraciju u PDV-a."
 
+#~ msgid "Litigation"
+#~ msgstr "Sporno"
+
 #~ msgid "Taxes Reports"
 #~ msgstr "Poreski izvestaji"
 
@@ -11756,6 +11685,12 @@ msgstr ""
 #~ msgid "Compute Taxes"
 #~ msgstr "Izračunaj poreze"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Ovaj uslov placanje ce biti koristen umesto osnovnog za datog partnera"
+
 #~ msgid "Entry Name"
 #~ msgstr "Ime stavke"
 
@@ -12282,6 +12217,9 @@ msgstr ""
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Definicija analitičkog dnevnika"
 
+#~ msgid "account.tax.template"
+#~ msgstr "predlozak.poreske.taxe"
+
 #~ msgid ""
 #~ "Invalid period ! Some periods overlap or the date period is not in the scope "
 #~ "of the fiscal year. "
@@ -12438,6 +12376,13 @@ msgstr ""
 #~ msgid "last month"
 #~ msgstr "prošlog meseca"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Ako otvarate stavke, morate proveriti i sve ostale akcije vezane za ove "
+#~ "transakcije inače one neće biti onemogućene"
+
 #~ msgid "Children Definition"
 #~ msgstr "Definicija podređenih"
 
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index ce85e0905f3..feed5d4df49 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-20 16:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -80,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Importera från fakturor eller betalningar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -93,16 +88,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Summa Debet"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Om du upphäver avstämningar måste du också verifiera alla åtgärder som är "
-"kopplade till dessa transaktioner, därför dessa kommer inte att bli "
-"inaktiverade."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -113,7 +98,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -143,19 +127,19 @@ msgstr ""
 "Du kan gömma ett betalningsvillkor genom att sätta det aktiv till falskt."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -167,7 +151,7 @@ msgid "Warning!"
 msgstr "Varning!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Övrig journal"
@@ -239,11 +223,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Momsmallar"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -259,6 +238,11 @@ msgstr "Bokföringsposter är en inmatning på balanseringen."
 msgid "Belgian Reports"
 msgstr "Belgiska rapporter"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -392,11 +376,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -451,6 +430,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -466,6 +450,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Mall för kontoplan"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -627,16 +616,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3 månader"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Om du upphäver avstämningar måste du också verifiera alla åtgärder som är "
-"kopplade till dessa transaktioner, därför dessa kommer inte att bli "
-"inaktiverade."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -685,7 +664,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Period saknas eller flera perioder finns för det givna datumet."
@@ -696,13 +675,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Försäljningskonto per kontotyp"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -765,6 +744,11 @@ msgstr "Kundfordringskonton"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -789,6 +773,12 @@ msgstr "Reaktivera"
 msgid "Are you sure you want to create entries?"
 msgstr "Är du säker på att du vill skapa verifikat?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -809,6 +799,7 @@ msgstr "Visa barn i hierarkin"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
 
@@ -851,7 +842,7 @@ msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -876,26 +867,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Leverantörsfakturor och öppna transaktioner"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Unreconciliation"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-"Vid 14 nettodagar 2 procent, återstående belopp vid 30 dagar i slutet av "
-"månaden."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -926,11 +909,6 @@ msgstr "JC/Affärshändelse"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -961,7 +939,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -976,6 +954,7 @@ msgstr "Ny prenumeration"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Beräkning"
 
@@ -1007,11 +986,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1047,7 +1023,7 @@ msgid "Liability"
 msgstr "Skuld"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Vänligen definiera ordningen på journalen knuten till fakturan."
@@ -1121,10 +1097,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1202,8 +1178,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1249,7 +1226,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1547,9 +1524,9 @@ msgid "Account Receivable"
 msgstr "Fordringar"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1563,7 +1540,7 @@ msgid "With balance is not equal to 0"
 msgstr "Med balans skilt från 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1618,7 +1595,7 @@ msgstr "Hoppa över preliminär status för manuella registreringar"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1663,6 +1640,12 @@ msgstr "En temporärtabell används för infopanelvyn"
 msgid "Supplier Refunds"
 msgstr "Återbetalningar till leverantör"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Skatteklasskod"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1700,7 +1683,6 @@ msgid "Groups"
 msgstr "Grupper"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Före skatt"
@@ -1833,6 +1815,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Försäljning per kontotyp"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1853,115 +1841,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2070,6 +1954,11 @@ msgstr "Dessa perioder kan överlappa."
 msgid "Draft statement"
 msgstr "Draft statement"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2098,26 +1987,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2125,16 +2013,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2145,8 +2033,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2191,7 +2079,7 @@ msgid "period close"
 msgstr "periodavslut"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2291,7 +2179,7 @@ msgid "Product Category"
 msgstr "Produktkategori"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2658,7 +2546,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Håll tomt för alla öppna räkenskapsår"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2676,7 +2564,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Skapa ett konto baserat på denna mall"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2697,7 +2585,7 @@ msgid "Main Sequence"
 msgstr "Huvudsekvens"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2707,14 +2595,12 @@ msgstr ""
 "transaktioner."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Betalningsvillkor"
 
@@ -2740,18 +2626,6 @@ msgstr "Kryssa i rutan"
 msgid "Filters"
 msgstr "Filter"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Öppen"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2763,6 +2637,11 @@ msgstr "Preliminär status för en faktura"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2840,25 +2719,20 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Leverantörsskatter"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "poster"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bankdetaljer"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2881,7 +2755,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2896,9 +2769,8 @@ msgstr ""
 "efter en månad."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2928,6 +2800,7 @@ msgstr "Transaktionsavstämning (avskrivning)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Moms"
 
@@ -2963,14 +2836,14 @@ msgid "Accounts"
 msgstr "Konton"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3068,6 +2941,12 @@ msgstr "Betald/avstämd"
 msgid "Refund Base Code"
 msgstr "Återbetalningskod"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Kontoutdrag"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3120,11 +2999,6 @@ msgstr "Kundreskontra, periodiserad"
 msgid "Accounting entries"
 msgstr "Redovisningstransaktioner"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "Kommunikationstyp"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3170,7 +3044,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3183,7 +3057,7 @@ msgid "Sales by Account"
 msgstr "Försäljning per konto"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3199,15 +3073,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "You have to define an analytic journal on the '%s' journal!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3215,7 +3089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3280,9 +3154,10 @@ msgstr ""
 "rapporter."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Rad 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3328,12 +3203,6 @@ msgstr "Baskodsbelopp"
 msgid "Default Sale Tax"
 msgstr "Standardmoms"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Fakturan '%s' är granskad."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3370,7 +3239,7 @@ msgid "Fiscal Position"
 msgstr "Skatteregion"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3399,7 +3268,7 @@ msgid "Trial Balance"
 msgstr "Råbalans"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3470,7 +3339,7 @@ msgstr ""
 "använda kursdatum. Inkommande transaktioner använder alltid det kursdatum."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3482,9 +3351,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Antal siffror i kontokoderna"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Rad namn"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3533,7 +3402,7 @@ msgid "View"
 msgstr "Vy"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3554,15 +3423,20 @@ msgstr "Proformafakturor"
 msgid "Electronic File"
 msgstr "Elektronisk fil"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Dag i månad: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Skattekodsmall"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3570,9 +3444,88 @@ msgid "Account Partner Ledger"
 msgstr "Kund och leverantörsreskontra"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3710,12 +3663,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Värdebelopp: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"om du anger namn annat än /, kommer dess transaktioner skapa "
+"bokföringsposter med samma namn som verifikatet. Detta tillåter "
+"transaktioner att ha samma referens som verifikatet i övrigt."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3730,7 +3689,7 @@ msgid "Starting Balance"
 msgstr "Ingående balans"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No Partner Defined !"
@@ -3934,7 +3893,7 @@ msgid "Period Length (days)"
 msgstr "Periodlängd (dagar)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3958,7 +3917,7 @@ msgid "Category of Product"
 msgstr "Produktkategori"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4096,7 +4055,7 @@ msgid "Chart of Accounts Template"
 msgstr "Förlaga för kontoplan"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4185,9 +4144,15 @@ msgid "Qty"
 msgstr "Antal"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Process"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"Du kan här ange koefficienten som skall användas vid konsolidering av "
+"beloppen till överliggande nivå. Till exempel anger 1/-1 om du vill lägga "
+"till / subtrahera den."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4272,11 +4237,6 @@ msgstr "Inga icke konfigurerade bolag !"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4294,11 +4254,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Ställ in dina bankkonton"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4345,8 +4300,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4376,7 +4331,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4414,11 +4369,6 @@ msgstr ""
 msgid "title"
 msgstr "titel"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4508,6 +4458,13 @@ msgstr "30 dagar månadsskiftet"
 msgid "Analytic Balance"
 msgstr "Objektbalans"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4528,6 +4485,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "Bokförda tranksationer"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4538,11 +4500,6 @@ msgstr "Sök momsmall"
 msgid "Draft Entries"
 msgstr "Preliminära transaktioner"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Dag i månaden= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4551,11 +4508,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Antal dagar: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4579,20 +4531,9 @@ msgid "Account Type"
 msgstr "Kontotyp"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Stäng kassalåda"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4615,9 +4556,20 @@ msgstr ""
 "Dessa genererar preliminära leverantörsfakturor."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Stäng kassalåda"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4645,7 +4597,7 @@ msgid "Month"
 msgstr "Månad"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4656,8 +4608,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4681,6 +4633,11 @@ msgstr "Paypalkonto"
 msgid "Acc.Type"
 msgstr "Kontotyp"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4693,7 +4650,7 @@ msgstr "Tecken för omvänd balans"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Balansrapport (skuldkonton)"
@@ -4715,7 +4672,7 @@ msgid "Account Base Code"
 msgstr "Kontobaskod"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4771,11 +4728,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Återkommande handläggning"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4805,10 +4757,9 @@ msgid "Account chart"
 msgstr "Kontoplan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Leverantörsfaktura"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4876,10 +4827,14 @@ msgstr "Credit Notes"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4931,7 +4886,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4946,7 +4901,7 @@ msgid "Based On"
 msgstr "Baserad på"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4971,11 +4926,6 @@ msgstr ""
 msgid "Change"
 msgstr "Byt"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank och checkar"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4998,11 +4948,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Exempel"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5013,11 +4958,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Om blankt används intäktskontot"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5027,7 +4967,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Inköpsmoms %.2f%%"
@@ -5101,16 +5041,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "Övr"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Faktura (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5224,6 +5159,7 @@ msgstr "Lägg till!"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Betalad"
 
@@ -5250,7 +5186,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Öppningsperiod"
@@ -5265,14 +5201,6 @@ msgstr "Verifikat att granska"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5285,7 +5213,7 @@ msgid "Tax Application"
 msgstr "Tax Application"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5318,9 +5246,9 @@ msgid "End of period"
 msgstr "Slutdatum"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bankdetaljer"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Betalning av fakturor"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5416,14 +5344,6 @@ msgstr "Moms Beskrivning"
 msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5470,7 +5390,7 @@ msgid "Target Moves"
 msgstr "Vald affärshändelse"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5506,6 +5426,7 @@ msgid "Python Code (reverse)"
 msgstr "Pythonkod (bakåt)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5523,12 +5444,6 @@ msgstr ""
 "sista valet förutsätter att uppsättningen av skatt definieras på den här "
 "mallen är klar"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5554,18 +5469,13 @@ msgstr "År"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Rad 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Internt namn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5604,7 +5514,7 @@ msgstr "Balansräkning"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Resultaträkning (intäktskonton)"
@@ -5637,7 +5547,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Beräkna kod (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5664,6 +5574,7 @@ msgstr "Automatisk avstämning"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5767,7 +5678,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5797,7 +5708,7 @@ msgid "Amount Computation"
 msgstr "Beloppsberäkning"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5833,10 +5744,16 @@ msgid "Account Common Account Report"
 msgstr "Allmän kontorapport"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Kommunikation"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Öppen"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5866,9 +5783,7 @@ msgstr "Momskoder"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Återbetalning till kund"
 
@@ -5885,11 +5800,6 @@ msgstr "Skattekodstecken"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Rapport som visar fakturor som skapats de senaste 15 dagarna"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Antal dagar: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5906,6 +5816,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Summa att betala"
@@ -5996,8 +5907,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6020,6 +5929,13 @@ msgstr "Normal text"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Betalningstransationer är den andra inmatningen för en avstämning"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6029,13 +5945,6 @@ msgstr ""
 "Antal delbelopp som tillsammans kan balansera ett belopp för automatisk "
 "avstämning"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr "Sekvensfältet används för att sortera rader med betalningsvillkor"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6093,12 +6002,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Fast belopp"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6122,7 +6030,6 @@ msgstr "Skapa ingående balanser"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Beräkningsmetod för moms."
 
@@ -6150,18 +6057,23 @@ msgid "Child Accounts"
 msgstr "Underliggande konton"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Transaktions namn (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Avskrivning"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "poster"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6178,7 +6090,7 @@ msgstr "Intäkter"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Leverantör"
@@ -6198,16 +6110,11 @@ msgid "Account n°"
 msgstr "Konto Nr"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Meddelande"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Värdering"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6322,7 +6229,7 @@ msgid "Filter by"
 msgstr "Filtrera efter"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Du har fel uttryck \"%(...)s\" i din mall !"
@@ -6369,6 +6276,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Antal dagar"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6512,7 +6427,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6691,7 +6606,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6722,12 +6637,6 @@ msgstr ""
 msgid "Current"
 msgstr "Aktuellt"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6752,7 +6661,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Procent"
 
@@ -6772,7 +6680,7 @@ msgid "Power"
 msgstr "Kraft"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kan inte generera en oanvänd journalkod."
@@ -6819,12 +6727,17 @@ msgid "Applicable Type"
 msgstr "Tillämplig typ"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Fakturareferens"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6843,12 +6756,12 @@ msgstr ""
 "children. In this case, the evaluation order is important."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6922,7 +6835,7 @@ msgid "Optional create"
 msgstr "Skapa (valfritt)"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6935,9 +6848,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Återbetalning till leverantör"
 
@@ -6975,9 +6886,12 @@ msgid "Group By..."
 msgstr "Gruppera på..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Utvärdera: balans"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7055,6 +6969,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Kontanttransaktioner"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7072,7 +6993,7 @@ msgstr "Objektstatistik"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Verifikat: "
@@ -7090,14 +7011,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Sant"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Balansräkning (tillgångar)"
@@ -7113,10 +7033,9 @@ msgid "Total debit"
 msgstr "Total debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Verifikat \"%s\" är inte giltigt !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Nästa företagsverifikat att stämma av"
 
 #. module: account
 #: report:account.invoice:0
@@ -7169,7 +7088,7 @@ msgstr "Skapa post"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Resultaträkning (Utgifter)"
@@ -7180,13 +7099,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Fel !"
@@ -7223,6 +7143,11 @@ msgstr "Project line"
 msgid "Manual"
 msgstr "Manuell"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7329,8 +7254,8 @@ msgstr "Journalval"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Ingående balans"
@@ -7412,7 +7337,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7432,6 +7357,11 @@ msgstr ""
 "\n"
 "t ex Min mall  på %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7486,7 +7416,7 @@ msgid "Done"
 msgstr "Klar"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7524,9 +7454,8 @@ msgid "Source Document"
 msgstr "Källdokument"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7553,7 +7482,7 @@ msgid "Taxes:"
 msgstr "Skatter:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7750,6 +7679,12 @@ msgstr ""
 "Detta fält används endast då du utvecklat din egen modul som implementerar "
 "specifika skatteregler i en anpassad domän."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Fakturareferens"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7842,7 +7777,7 @@ msgid "Use model"
 msgstr "Använd mall"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7893,7 +7828,7 @@ msgid "Root/View"
 msgstr "Root-vy"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7962,7 +7897,7 @@ msgid "Maturity Date"
 msgstr "Förfallodag"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Försäljningsjournal"
@@ -7973,7 +7908,7 @@ msgid "Invoice Tax"
 msgstr "Fakturaskatt"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "Stycknummer saknas !"
@@ -8017,7 +7952,7 @@ msgid "Sales Properties"
 msgstr "Försäljningsegenskaper"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8042,7 +7977,7 @@ msgstr "Till"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Valutajusteringar"
@@ -8076,7 +8011,7 @@ msgid "May"
 msgstr "Maj"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Globala skatter definierade, men de saknas på fakturaraderna !"
@@ -8094,10 +8029,9 @@ msgid ""
 msgstr "Numreringsfältet används för stigande sortering"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Skatteklasskod"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8113,17 +8047,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Bokför verifikat"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Kund"
@@ -8139,7 +8068,7 @@ msgstr "Rapportnamn"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Kontant"
@@ -8151,9 +8080,11 @@ msgid "Account Destination"
 msgstr "Account Destination"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Betalning av fakturor"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8161,7 +8092,6 @@ msgstr "Betalning av fakturor"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8299,15 +8229,14 @@ msgid "Partner Ledger"
 msgstr "Kund/leverantörsreskontra"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fast"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8375,7 +8304,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Välj valuta för fakturan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Inga faktura rader !"
@@ -8452,7 +8381,7 @@ msgid "Associated Partner"
 msgstr "Associerade företag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -8533,13 +8462,13 @@ msgstr ""
 "Satt om skatten måste ingå i beloppet för nästa steg i skatteberäkningen."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Inköpskreditjournal"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8612,7 +8541,7 @@ msgid "Net Total:"
 msgstr "Nettototal:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8632,15 +8561,6 @@ msgstr "Vanliga rapporter"
 msgid "Write-Off Journal"
 msgstr "Avskrivningsjournal"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Detta betalningsvillkor kommer användas istället för standard för detta "
-"företag"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8667,11 +8587,6 @@ msgstr "Intern typ"
 msgid "Tax/Base Amount"
 msgstr "Tax/Base Amount"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Värde: procent"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8725,6 +8640,11 @@ msgstr "Avstämt resultat"
 msgid "Ending Balance"
 msgstr "Utgående balans"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8767,7 +8687,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatisk import av bankutdrag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8790,7 +8710,12 @@ msgid "Account Types"
 msgstr "Kontotyper"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8798,9 +8723,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Värdebelopp: uppgift saknas"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "RR / BR-kategori"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8817,10 +8742,9 @@ msgid "Reconciliation"
 msgstr "Avstämning"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Kundfordringskonto"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Om blankt används intäktskontot"
 
 #. module: account
 #: view:account.invoice:0
@@ -8900,7 +8824,7 @@ msgid "The partner account used for this invoice."
 msgstr "Företagskonton använt för denna faktura"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Skatt %.2f%%"
@@ -8918,13 +8842,13 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Inköpsjournal"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -8953,11 +8877,6 @@ msgstr "Förfallodatum"
 msgid "Suppliers"
 msgstr "Leverantörer"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Sant"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9094,9 +9013,10 @@ msgid "Journal Name"
 msgstr "Journalnamn"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Nästa företagsverifikat att stämma av"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Verifikat \"%s\" är inte giltigt !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9143,7 +9063,7 @@ msgstr ""
 "post."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9204,7 +9124,7 @@ msgid "Reconciled entries"
 msgstr "Avstämda transaktioner"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Fel mall !"
@@ -9226,7 +9146,7 @@ msgid "Print Account Partner Balance"
 msgstr "Skriv ut företagsbalansen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9265,7 +9185,7 @@ msgstr "okänd"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Öppna transaktionsjournal"
@@ -9312,7 +9232,7 @@ msgstr ""
 "than on the total amount."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9327,21 +9247,9 @@ msgstr "Skapa med pythonkod"
 msgid "Journal Code"
 msgstr "Journalkod"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"Du kan här ange koefficienten som skall användas vid konsolidering av "
-"beloppen till överliggande nivå. Till exempel anger 1/-1 om du vill lägga "
-"till / subtrahera den."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Återstående belopp"
 
@@ -9374,7 +9282,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Kreditjournal"
@@ -9440,7 +9348,7 @@ msgid "Purchase Tax(%)"
 msgstr "Inköpsmoms(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Vänligen skapa några fakturarader."
@@ -9459,7 +9367,7 @@ msgid "Display Detail"
 msgstr "Visa detaljer"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9576,21 +9484,11 @@ msgstr "Bokföraren validerar verifikaten från fakturan. "
 msgid "Number of Periods"
 msgstr "Antal perioder"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Skattekodsmall"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Kontoutdrag"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "RR / BR-kategori"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9602,8 +9500,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9623,14 +9522,14 @@ msgid "Document"
 msgstr "Dokument"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Kontoutdrag"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Kundfordringskonto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9731,8 +9630,8 @@ msgid "Move"
 msgstr "Affärshändelse"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9811,11 +9710,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Unreconciliation Transactions"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9833,11 +9727,16 @@ msgid "Balance :"
 msgstr "Balans:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9874,13 +9773,6 @@ msgstr "Subscription"
 msgid "Account Analytic Balance"
 msgstr "Objektbalans"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9920,7 +9812,13 @@ msgid "Due date"
 msgstr "Förfallodatum"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10016,7 +9914,7 @@ msgid "Unreconciled"
 msgstr "Oavstämd"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Bristande total !"
@@ -10106,7 +10004,7 @@ msgid "Comparison"
 msgstr "Jämförelse"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10124,6 +10022,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10179,11 +10082,6 @@ msgstr "Kredit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10195,7 +10093,7 @@ msgid "Journal Entry Model"
 msgstr "Verifikatmall"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10280,7 +10178,7 @@ msgid "Profit (Loss) to report"
 msgstr "Resultaträkning"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10610,7 +10508,14 @@ msgid "Empty Accounts ? "
 msgstr "Tomma konton ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10735,7 +10640,7 @@ msgid "Receivable accounts"
 msgstr "Kundfordranskonto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10866,7 +10771,7 @@ msgid "Entries Sorted by"
 msgstr "Poster sorterade på"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10972,7 +10877,7 @@ msgid "Accounting Documents"
 msgstr "Affärshandlingar"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11017,7 +10922,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manuell fakturaskatt"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11098,17 +11003,6 @@ msgstr ""
 msgid "February"
 msgstr "februari"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"om du anger namn annat än /, kommer dess transaktioner skapa "
-"bokföringsposter med samma namn som verifikatet. Detta tillåter "
-"transaktioner att ha samma referens som verifikatet i övrigt."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11167,6 +11061,11 @@ msgstr "Mallkonto räkenskapsmappning"
 msgid "Expense Account on Product Template"
 msgstr "Expense Account on Product Template"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11231,12 +11130,13 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Journalverifikat"
 
-#~ msgid "Fixed"
-#~ msgstr "Fast"
-
 #~ msgid "Negative"
 #~ msgstr "Negativ"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Leverantörsfaktura"
+
 #~ msgid "Printing Date"
 #~ msgstr "Utskriftsdatum"
 
@@ -11328,6 +11228,11 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Verifikatnummer"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr "Sekvensfältet används för att sortera rader med betalningsvillkor"
+
 #~ msgid "Total write-off"
 #~ msgstr "Skriv av helt"
 
@@ -11492,6 +11397,9 @@ msgstr ""
 #~ msgid "Are you sure you want to close the fiscal year ?"
 #~ msgstr "Vill du verkligen stänga verksamhetsåret ?"
 
+#~ msgid "Line Name"
+#~ msgstr "Rad namn"
+
 #~ msgid "Message"
 #~ msgstr "Meddelande"
 
@@ -11610,6 +11518,9 @@ msgstr ""
 #~ msgid "Date End"
 #~ msgstr "Slutdatum"
 
+#~ msgid "Litigation"
+#~ msgstr "Process"
+
 #~ msgid "Acc. Type Name"
 #~ msgstr "Kontotyp namn"
 
@@ -11746,6 +11657,9 @@ msgstr ""
 #~ msgid ":"
 #~ msgstr ":"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "5"
 #~ msgstr "5"
 
@@ -11755,6 +11669,9 @@ msgstr ""
 #~ msgid "Entry label"
 #~ msgstr "Uppgiftsetikett"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Fiscal Position Accounts Mapping"
 #~ msgstr "Mappning av momsredovisningskonton"
 
@@ -11828,6 +11745,13 @@ msgstr ""
 #~ msgid "Import invoice"
 #~ msgstr "Importera faktura"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Detta betalningsvillkor kommer användas istället för standard för detta "
+#~ "företag"
+
 #~ msgid ""
 #~ "Financial and accounting module that covers:\n"
 #~ "    General accounting\n"
@@ -12928,6 +12852,9 @@ msgstr ""
 #~ msgid "Configure Fiscal Year"
 #~ msgstr "Inställningar för räkenskapsår"
 
+#~ msgid "Line 2:"
+#~ msgstr "Rad 2:"
+
 #~ msgid "Total :"
 #~ msgstr "Totalt:"
 
@@ -13044,6 +12971,9 @@ msgstr ""
 #~ msgid "Starting Date"
 #~ msgstr "Startdatum"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank och checkar"
+
 #~ msgid "Salesman"
 #~ msgstr "Säljare"
 
@@ -13181,6 +13111,9 @@ msgstr ""
 #~ msgid "Error! The duration of the Fiscal Year is invalid. "
 #~ msgstr "Fel! Bokföringsårets omfattning är fel. "
 
+#~ msgid "Line 1:"
+#~ msgstr "Rad 1:"
+
 #~ msgid "Check Date not in the Period"
 #~ msgstr "Kontrollera datum, ej i perioden"
 
@@ -13190,9 +13123,15 @@ msgstr ""
 #~ msgid "Debit/Credit"
 #~ msgstr "Debit/Kredit"
 
+#~ msgid "Communication"
+#~ msgstr "Kommunikation"
+
 #~ msgid "Refund Invoice Options"
 #~ msgstr "Kreditfakturainställningar"
 
+#~ msgid "Valuation"
+#~ msgstr "Värdering"
+
 #, python-format
 #~ msgid ""
 #~ "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
@@ -13502,6 +13441,17 @@ msgstr ""
 #~ msgid "New Company Financial Setting"
 #~ msgstr "Nya bolags finansiella inställningar"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Faktura (Ref ${object.number or 'n/a' })"
+
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Om du upphäver avstämningar måste du också verifiera alla åtgärder som är "
+#~ "kopplade till dessa transaktioner, därför dessa kommer inte att bli "
+#~ "inaktiverade."
+
 #~ msgid ""
 #~ "The default Chart of Accounts is matching your country selection. If no "
 #~ "certified Chart of Accounts exists for your specified country, a generic one "
@@ -13906,12 +13856,22 @@ msgstr ""
 #~ msgid "No sequence defined on the journal !"
 #~ msgstr "Nummerserie saknas för denna journal !"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Fakturan '%s' är granskad."
+
 #~ msgid "Month-1"
 #~ msgstr "Månad-1"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Dag i månad: 0"
+
 #~ msgid "This months' Sales by type"
 #~ msgstr "Denna månads försäljning per typ"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Värdebelopp: 0.02"
+
 #~ msgid "Quantity :"
 #~ msgstr "Kvantitet:"
 
@@ -13926,6 +13886,12 @@ msgstr ""
 #~ msgid "You can not create journal items on a closed account %s %s"
 #~ msgstr "Du kan inte skapa transaktioner med rubrikkonton %s %s."
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Dag i månaden= -1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Antal dagar: 30"
+
 #~ msgid "Avg. Due Delay"
 #~ msgstr "Ledtid för betalning i medeltal"
 
@@ -13936,6 +13902,9 @@ msgstr ""
 #~ msgid "Encoding error"
 #~ msgstr "Fel vid avkodning"
 
+#~ msgid "Example"
+#~ msgstr "Exempel"
+
 #~ msgid "My invoices"
 #~ msgstr "Mina fakturor"
 
@@ -13945,6 +13914,9 @@ msgstr ""
 #~ msgid "Analytic Accounts with a past deadline."
 #~ msgstr "Objektkonton som passerat tidsfristen."
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Antal dagar: 14"
+
 #, python-format
 #~ msgid "Already Reconciled!"
 #~ msgstr "Redan avstämd!"
@@ -14062,6 +14034,11 @@ msgstr ""
 #~ msgstr ""
 #~ "Du måste registrera ett konto för avskrivning av transaktionens differens !"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr ""
+#~ "Vid 14 nettodagar 2 procent, återstående belopp vid 30 dagar i slutet av "
+#~ "månaden."
+
 #~ msgid "Create a draft Refund"
 #~ msgstr "Skapa preleminär återbetalning"
 
@@ -14375,6 +14352,9 @@ msgstr ""
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "Bolaget måste överenstämma för alla konton och perioder."
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Utvärdera: balans"
+
 #~ msgid ""
 #~ "Bank Reconciliation consists of verifying that your bank statement "
 #~ "corresponds with the entries (or records) of that account in your accounting "
@@ -14495,6 +14475,9 @@ msgstr ""
 #~ "närstående transaktioner kan eller inte kan stämmas av.\n"
 #~ "* \"Avbruten\"-status  används när användaren avbryter en faktura."
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Värde: procent"
+
 #, python-format
 #~ msgid ""
 #~ "You can not cancel an invoice which is partially paid! You need to "
@@ -14724,6 +14707,12 @@ msgstr ""
 #~ "påminnelser kommer att använda betalningsvillkor för varje utskick. Varje "
 #~ "kund eller leverantör kan tilldelas ett av dessa betalningsvillkor."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Värdebelopp: uppgift saknas"
+
+#~ msgid "Periodical Processing"
+#~ msgstr "Återkommande handläggning"
+
 #~ msgid ""
 #~ "A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
 #~ "from a specific date, i.e. corresponding to the signature of a contract or "
@@ -14912,6 +14901,14 @@ msgstr ""
 #~ msgid "This action will erase taxes"
 #~ msgstr "Det här momentet uppdaterar momsen"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Om du upphäver avstämningar måste du också verifiera alla åtgärder som är "
+#~ "kopplade till dessa transaktioner, därför dessa kommer inte att bli "
+#~ "inaktiverade."
+
 #, python-format
 #~ msgid "You can not modify/delete a journal with entries for this period !"
 #~ msgstr "Du kan inte ändra / radera en journal med poster i denna perioden!"
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index ce1dcff5893..0413a3fcdc3 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "எச்சரிக்கை!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "உட் பெயர்"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 6d6afab4732..505a63a0b2f 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "శాతం"
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr "రకం"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr "అప్పు"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr "సమూహాలు"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "చెల్లింపు కాలం"
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "పన్ను"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr "ఖాతా రకం"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr "నెల"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr "మార్చు"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr "పన్ను వివరణ"
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "స్థిర మొత్తం"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr "ఆదాయం"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "రోజుల సంఖ్య"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "పొరపాటు!"
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr "పూర్తయ్యింది"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr "పన్నులు:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "నగదు"
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "స్ఠిర"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "హెచ్చరిక !"
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr "నికర మొత్తం:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr "సమన్వయ ఫలితం"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr "ఖాతా రకాలు"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,10 +8530,9 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "రావాల్సిన ఖాతా"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr "గడువు తేదీ"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "రావాల్సిన ఖాతా"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr "చందా"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10918,9 +10827,6 @@ msgstr ""
 #~ msgid "Charts of Account"
 #~ msgstr "ఖాతాల పట్టిక"
 
-#~ msgid "Fixed"
-#~ msgstr "స్ఠిర"
-
 #~ msgid "Accounting Entries-"
 #~ msgstr "గణాంక పద్దులు-"
 
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index afc732790cd..012fa554609 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:38+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "ยอดรวมทางด้านเดบิต"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr "คำเตือน!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "รูปแบบภาษี"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "บัญชี,ภาษี"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "รูปแบบผัง"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "ทุก ๆ 3 เดือน"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr "บัญชีลูกหนี้"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "เปอร์เซ็นต์"
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr "ประเภท"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "การไม่กระทบยอด"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "การคำนวณ"
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "ธนาคาร"
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr "บัญชีลูกหนี้"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr "กลุ่ม"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "ไม่ต้องเสียภาษี"
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr "งบการเงินฉบับร่าง"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr "ปิดงวด"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr "ประเภทสินค้า"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "ระยะเวลาการชำระเิงิน"
 
@@ -2697,18 +2591,6 @@ msgstr "ทำเครื่องหมายที่ช่องนี้"
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "เปิด"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "ภาษี"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr "บัญชี"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "รายการเคลืี่อนไหวเงินฝากธนาคาร"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr "บันทึกบัญชี"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr "แสดงตัวอย่าง"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr "ประเภทของสินค้า"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "ชื่อเรียกภายใน"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr "กระทบยอดอัตโนมัติ"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,10 +5623,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "เปิด"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5743,9 +5662,7 @@ msgstr "รหัสภาษี"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "จริง"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "การเตือน"
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "จริง"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "รายการเคลืี่อนไหวเงินฝากธนาคาร"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10989,6 +10898,9 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "ต้นกำเนิด"
 
+#~ msgid "account.tax"
+#~ msgstr "บัญชี,ภาษี"
+
 #~ msgid "Fiscal Year to Open"
 #~ msgstr "ปีบัญชีที่เริ่ม"
 
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 6c6e712bc9e..9a10db899b1 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:22+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,13 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -108,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -137,19 +124,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -161,7 +148,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -230,11 +217,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -250,6 +232,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -376,11 +363,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -435,6 +417,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -450,6 +437,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -611,13 +603,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -666,7 +651,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -677,13 +662,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -746,6 +731,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -768,6 +758,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -788,6 +784,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -830,7 +827,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -853,24 +850,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -901,11 +892,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -936,7 +922,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -951,6 +937,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -982,11 +969,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1022,7 +1006,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1093,10 +1077,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1172,8 +1156,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1219,7 +1204,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1515,9 +1500,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1531,7 +1516,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1586,7 +1571,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1629,6 +1614,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1666,7 +1657,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1799,6 +1789,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1819,115 +1815,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2036,6 +1928,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2064,26 +1961,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2091,16 +1987,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2111,8 +2007,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2157,7 +2053,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2257,7 +2153,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2616,7 +2512,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2634,7 +2530,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2655,7 +2551,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2663,14 +2559,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2696,18 +2590,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2719,6 +2601,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2796,24 +2683,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2837,7 +2719,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2847,9 +2728,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2879,6 +2759,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2914,14 +2795,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3018,6 +2899,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3070,11 +2957,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3115,7 +2997,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3128,7 +3010,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3144,15 +3026,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3160,7 +3042,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3222,8 +3104,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3270,12 +3153,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3309,7 +3186,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3336,7 +3213,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3402,7 +3279,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3414,8 +3291,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3465,7 +3342,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3486,14 +3363,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3502,9 +3384,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3630,12 +3591,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3650,7 +3614,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3850,7 +3814,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3874,7 +3838,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4010,7 +3974,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4095,8 +4059,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4180,11 +4147,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4202,11 +4164,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4251,8 +4208,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4282,7 +4239,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4314,11 +4271,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4408,6 +4360,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4427,6 +4386,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4437,11 +4401,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4450,11 +4409,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4478,19 +4432,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4512,8 +4455,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4542,7 +4496,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4553,8 +4507,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4578,6 +4532,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4590,7 +4549,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4612,7 +4571,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4667,11 +4626,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4701,9 +4655,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4772,10 +4725,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4824,7 +4781,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4839,7 +4796,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4864,11 +4821,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4891,11 +4843,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4906,11 +4853,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4920,7 +4862,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4994,16 +4936,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5114,6 +5051,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5140,7 +5078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5155,14 +5093,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5175,7 +5105,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5208,8 +5138,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5303,14 +5233,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5355,7 +5277,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5391,6 +5313,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5404,12 +5327,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5435,18 +5352,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5485,7 +5397,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5518,7 +5430,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5545,6 +5457,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5645,7 +5558,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5673,7 +5586,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5709,9 +5622,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5742,9 +5661,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5761,11 +5678,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5782,6 +5694,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5870,8 +5783,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5894,6 +5805,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5901,13 +5819,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5965,12 +5876,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5994,7 +5904,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6022,18 +5931,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6050,7 +5964,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6070,16 +5984,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6189,7 +6098,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6236,6 +6145,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6375,7 +6292,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6550,7 +6467,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6581,12 +6498,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6611,7 +6522,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6631,7 +6541,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6676,12 +6586,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6697,12 +6612,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6769,7 +6684,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6780,9 +6695,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6820,8 +6733,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6898,6 +6814,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6915,7 +6838,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6933,14 +6856,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6956,9 +6878,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7008,7 +6929,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7019,13 +6940,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7062,6 +6984,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7160,8 +7087,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7241,7 +7168,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7254,6 +7181,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7307,7 +7239,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7339,9 +7271,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7368,7 +7299,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7560,6 +7491,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7649,7 +7586,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7700,7 +7637,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7767,7 +7704,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7778,7 +7715,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7817,7 +7754,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7842,7 +7779,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7874,7 +7811,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7892,9 +7829,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7911,17 +7847,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7937,7 +7868,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7949,8 +7880,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7959,7 +7892,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8091,15 +8023,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8167,7 +8098,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8242,7 +8173,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8322,13 +8253,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8399,7 +8330,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8419,13 +8350,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8452,11 +8376,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8510,6 +8429,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8550,7 +8474,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8573,7 +8497,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8581,8 +8510,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8600,9 +8529,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8675,7 +8603,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8693,13 +8621,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8728,11 +8656,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8867,8 +8790,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8914,7 +8838,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8975,7 +8899,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8997,7 +8921,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9031,7 +8955,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9076,7 +9000,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9091,18 +9015,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9135,7 +9050,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9201,7 +9116,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9220,7 +9135,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9335,21 +9250,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9361,8 +9266,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9382,14 +9288,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9490,8 +9396,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9568,11 +9474,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9590,11 +9491,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9631,13 +9537,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9677,7 +9576,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9766,7 +9671,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9849,7 +9754,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9867,6 +9772,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9920,11 +9830,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9936,7 +9841,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10021,7 +9926,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10344,7 +10249,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10469,7 +10381,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10596,7 +10508,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10702,7 +10614,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10747,7 +10659,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10826,14 +10738,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10892,6 +10796,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index f9c67189be0..20ff8282712 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-01 21:27+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\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: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 msgstr ""
 "Bir hesabın mali durumu aynı hesapüzerinde yalnız bir kez tanımlanabilir."
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Unreconciliate Transactions"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Fatura ya da ödemeden içeaktar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "Hatalı Hesap!"
@@ -94,15 +89,6 @@ msgstr "Hatalı Hesap!"
 msgid "Total Debit"
 msgstr "Toplam Borç"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"Bir işlemin uzlaşmasını kaldırdığınızda, o işleme bağlı eylemler devre dışı "
-"bırakılmayacağı için o işleme bağlı bütün eylemleri de doğrulamalısınız."
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -115,7 +101,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -146,19 +131,19 @@ msgstr ""
 "gizlemenizi sağlayacaktır."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -170,7 +155,7 @@ msgid "Warning!"
 msgstr "Uyarı!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Çeşitli Günlük"
@@ -241,11 +226,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Vergi Şablonları"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "hesap.vergi"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -261,6 +241,11 @@ msgstr "Muhasebe girişleri bir uzlaşmanın girdileridir."
 msgid "Belgian Reports"
 msgstr "Belçika Raporları"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -394,11 +379,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "hesap.vergi.şablon"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -453,6 +433,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -468,6 +453,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Tablo Şablonu"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -629,16 +619,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3 Aylık"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Bu işlemlerin uzlaşmasını kaldırırsanız, aynı zamanda, bu işlemlere bağlı "
-"diğer hareketleri de doğrulamalısınız aksi takdirde bu işlemler devre dışı "
-"bırakılamaz."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -687,7 +667,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Hiç dönem bulunmadı ya da verilen tarih için birden çok dönem var."
@@ -698,13 +678,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Hesap Tipine Göre Satış Raporları"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -767,6 +747,11 @@ msgstr "Alıcılar Hesabı"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -791,6 +776,12 @@ msgstr "Yeniden Aç"
 msgid "Are you sure you want to create entries?"
 msgstr "Giriş oluşturmayı istediğinizden emin misiniz?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -811,6 +802,7 @@ msgstr "Altları sıradüzeniyle gösterin"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Yüzde"
 
@@ -853,7 +845,7 @@ msgid "Type"
 msgstr "Tür"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -878,24 +870,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Tedarikçi Faturaları ve İadeleri"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Uzlaşılmamış"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "14 Net günde yüzde 2, kalan tutar 30 günde ay sonunda."
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -926,11 +912,6 @@ msgstr "J.C./Adı taşı"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -962,7 +943,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -977,6 +958,7 @@ msgstr "Yeni Abonelik"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Hesaplama"
 
@@ -1008,11 +990,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1048,7 +1027,7 @@ msgid "Liability"
 msgstr "Liability"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Bu faturayla ilgili günlüğe lütfen bir sıra tanımlayın."
@@ -1122,10 +1101,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1203,8 +1182,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1250,7 +1230,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1548,9 +1528,9 @@ msgid "Account Receivable"
 msgstr "Alıcılar Hesabı"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1564,7 +1544,7 @@ msgid "With balance is not equal to 0"
 msgstr "Bakiye 0 a eşit değil"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1619,7 +1599,7 @@ msgstr "Elle girişlerde 'Taslak' Durumunu Geç"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1664,6 +1644,12 @@ msgstr "A Temporary table used for Dashboard view"
 msgid "Supplier Refunds"
 msgstr "Tedarikçi İadeleri"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Servis Talep Kodu"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1701,7 +1687,6 @@ msgid "Groups"
 msgstr "Gruplar"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Vergisiz"
@@ -1834,6 +1819,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Hesap Türüne göre Satışlar"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1854,115 +1845,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2073,6 +1960,11 @@ msgstr "Bu dönemler çakışabilir."
 msgid "Draft statement"
 msgstr "Taslak hesapözeti"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2101,26 +1993,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2128,16 +2019,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2148,8 +2039,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2194,7 +2085,7 @@ msgid "period close"
 msgstr "dönem kapat"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2294,7 +2185,7 @@ msgid "Product Category"
 msgstr "Ürün Kategorisi"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2663,7 +2554,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Bütün mali yıllar için boş bırakın"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2681,7 +2572,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Create an Account Based on this Template"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2702,7 +2593,7 @@ msgid "Main Sequence"
 msgstr "Ana Sıra No"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2712,14 +2603,12 @@ msgstr ""
 "iptal etmelisiniz."
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Ödeme Biçimi"
 
@@ -2745,18 +2634,6 @@ msgstr "Check this box"
 msgid "Filters"
 msgstr "Filters"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Aç"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2768,6 +2645,11 @@ msgstr "Faturanın taslak durumu"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2845,25 +2727,20 @@ msgid "Account Model Entries"
 msgstr "Model muhabebe kayıtları"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Tedarikçi Vergileri"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "Kayıtlar"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Banka Detayları"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2886,7 +2763,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2900,9 +2776,8 @@ msgstr ""
 "çeşitli vade tarihleri hesaplayabilir, örneğin %50 peşin, %50 bir ayda."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2932,6 +2807,7 @@ msgstr "Hesap hareket satırı uzlaşması (silme)"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Vergi"
 
@@ -2967,14 +2843,14 @@ msgid "Accounts"
 msgstr "Hesaplar"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3071,6 +2947,12 @@ msgstr "Ödendi/Uzlaşıldı"
 msgid "Refund Base Code"
 msgstr "İade Temel Kodu"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Banka Hesapözetleri"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3123,11 +3005,6 @@ msgstr "Yaşlandırılmış Paydaş Bakiyesi"
 msgid "Accounting entries"
 msgstr "Muhasebe girişleri"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "İletişim Türü"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3171,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3184,7 +3061,7 @@ msgid "Sales by Account"
 msgstr "Hesaba Göre Satışlar"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3200,15 +3077,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "'%s' Günlüğünde bir çözümsel günlük tanımlamalısınız!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3216,7 +3093,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3280,9 +3157,10 @@ msgstr ""
 "zorunlu bir gereksinim değildir ama bazı raporlar için çok kullanışlıdır."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3330,12 +3208,6 @@ msgstr "Matrah Kodu Tutarı"
 msgid "Default Sale Tax"
 msgstr "Varsayılan Satış Vergisi"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Fatura '%s' onaylandı."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3372,7 +3244,7 @@ msgid "Fiscal Position"
 msgstr "Mali Durum"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3401,7 +3273,7 @@ msgid "Trial Balance"
 msgstr "Geçici Mizan"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3472,7 +3344,7 @@ msgstr ""
 "always use the rate at date."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3484,9 +3356,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Hesap kodu için kullanılacak basamak sayısı"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Satır Adı"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3535,7 +3407,7 @@ msgid "View"
 msgstr "Görünüm"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3556,15 +3428,20 @@ msgstr "Proforma Faturalar"
 msgid "Electronic File"
 msgstr "Electronic File"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  Ayın Günü: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Vergi Kodu Şablonu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3572,9 +3449,88 @@ msgid "Account Partner Ledger"
 msgstr "Paydaş Hesabı Defteri"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3713,12 +3669,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  Değer tutarı: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"Eğer Ad olarak oluşturulandan farklı bir isim verirseniz /, Muhasebe Giriş "
+"Hareketleri ekstre adlarıyla aynı olacaktır. Bu da ekstre girişlerinin "
+"ekstrenin kendisiyle ayn referansa sahip olmasını sağlar."
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3733,7 +3695,7 @@ msgid "Starting Balance"
 msgstr "Açılış Bakiyesi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Tanımlı Paydaş Yok !"
@@ -3937,7 +3899,7 @@ msgid "Period Length (days)"
 msgstr "Dönem Süresi (gün)"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3961,7 +3923,7 @@ msgid "Category of Product"
 msgstr "Category of Product"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4097,7 +4059,7 @@ msgid "Chart of Accounts Template"
 msgstr "Hesap Planı Kartları Şablonu"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4185,9 +4147,15 @@ msgid "Qty"
 msgstr "Qty"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Hukuki Dava"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4271,11 +4239,6 @@ msgstr "Yapılandırılmamış firma yok!"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4293,11 +4256,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "Banka Hesaplarınızı ayarlayın"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4342,8 +4300,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4373,7 +4331,7 @@ msgid "Consolidated Children"
 msgstr "Altları Birleştir"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4410,11 +4368,6 @@ msgstr ""
 msgid "title"
 msgstr "başlık"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4504,6 +4457,13 @@ msgstr "Ay Sonu 30 Gündür"
 msgid "Analytic Balance"
 msgstr "Çözümsel Bilanço"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4525,6 +4485,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr "İşlenmiş Günlük Maddeleri"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4535,11 +4500,6 @@ msgstr "Vergi Şablonu Ara"
 msgid "Draft Entries"
 msgstr "Taslak Girişler"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  Ayın Günü= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4548,11 +4508,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  Gün Sayısı: 30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4576,20 +4531,9 @@ msgid "Account Type"
 msgstr "Hesap Türü"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Kasayı Kapat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4612,9 +4556,20 @@ msgstr ""
 "satınalınan mallar,...) Tedarikçilere ait taslak faturalar oluşturur."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Kasayı Kapat"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4642,7 +4597,7 @@ msgid "Month"
 msgstr "Ay"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4653,8 +4608,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4678,6 +4633,11 @@ msgstr "Paypal Hesabı"
 msgid "Acc.Type"
 msgstr "Hes.Türü"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4690,7 +4650,7 @@ msgstr "Ters bakiye imi"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "Bilanço Tablosu (Borç hesabı)"
@@ -4712,7 +4672,7 @@ msgid "Account Base Code"
 msgstr "Hesap Ana Kodu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4768,11 +4728,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Dönemsel İşlem"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4802,10 +4757,9 @@ msgid "Account chart"
 msgstr "Hesap tablosu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Tedarikçi Faturası"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4873,10 +4827,14 @@ msgstr "Alacak Dekontları"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4929,7 +4887,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4944,7 +4902,7 @@ msgid "Based On"
 msgstr "Temelli"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4969,11 +4927,6 @@ msgstr ""
 msgid "Change"
 msgstr "Değiştir"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Bank and Cheques"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4996,11 +4949,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "İptal Edildi"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "Örnek"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -5011,11 +4959,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Gelir hesabını kullanmak için boş bırakın"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5025,7 +4968,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Satınalma Vergisi %.2f%%"
@@ -5099,16 +5042,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "ÇEŞİTLİ"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} Fatura (Ref ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5222,6 +5160,7 @@ msgstr "Add"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Ödendi"
 
@@ -5248,7 +5187,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "Açılış Dönemi"
@@ -5263,14 +5202,6 @@ msgstr "Gözden geçirilecek Günlük Girişleri"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5283,7 +5214,7 @@ msgid "Tax Application"
 msgstr "Vergi Uygulaması"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5316,9 +5247,9 @@ msgid "End of period"
 msgstr "Dönem Sonu"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Banka Detayları"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Faturaların Ödenmesi"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5413,14 +5344,6 @@ msgstr "Vergi Açıklaması"
 msgid "Child Tax Accounts"
 msgstr "Alt Vergi Hesapları"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5466,7 +5389,7 @@ msgid "Target Moves"
 msgstr "Hedef Hareketler"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5502,6 +5425,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5517,12 +5441,6 @@ msgstr ""
 "Eğer kullanıcıya satış ve satınalma oranlarını şifrelemeyi ya da vergi "
 "listesinden seçmeyi önerecekseniz bu mantıksal işlem size yardım eder."
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5548,18 +5466,13 @@ msgstr "Year"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Line 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Dahili İsim"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5598,7 +5511,7 @@ msgstr "Balance Sheet"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "Kar & Zarar (Gelir hesabı)"
@@ -5631,7 +5544,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Kodu derle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5658,6 +5571,7 @@ msgstr "Otomatik Uzşlaşı"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5761,7 +5675,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5791,7 +5705,7 @@ msgid "Amount Computation"
 msgstr "Tutar Hesaplaması"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5827,10 +5741,16 @@ msgid "Account Common Account Report"
 msgstr "Genel Hesap Raporu Hesabı"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "İletişim"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Aç"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5860,9 +5780,7 @@ msgstr "Vergi Kodları"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Müşteri İade Faturası"
 
@@ -5879,11 +5797,6 @@ msgstr "Vergi Kodu İşareti"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Report of Invoices Created within Last 15 days"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  Gün Sayısı: 14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5900,6 +5813,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "Ödenecek Tutar"
@@ -5991,8 +5905,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -6015,6 +5927,13 @@ msgstr "Normal Metin"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Ödeme girişleri, uzlaşmanın ikinci girişleridir."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -6024,15 +5943,6 @@ msgstr ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Sıra alanı, ödeme biçimi satırlarını azdan çoğa doğru sıralamak için "
-"kullanılır"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6090,12 +6000,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Sabit Tutar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6119,7 +6028,6 @@ msgstr "AçılIş Girişleri Oluştur"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Vergi tutarı hesaplama yöntemi."
 
@@ -6147,18 +6055,23 @@ msgid "Child Accounts"
 msgstr "Alt Hesaplar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Adı (id) taşı : %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Write-Off"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "Kayıtlar"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6175,7 +6088,7 @@ msgstr "Income"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Tedarikçi"
@@ -6195,16 +6108,11 @@ msgid "Account n°"
 msgstr "Hesap n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Serbest Kaynak"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valuation"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6320,7 +6228,7 @@ msgid "Filter by"
 msgstr "Filter by"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Modelinizde hatalı deyim \"%(...)s\" !"
@@ -6367,6 +6275,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Gün Sayısı"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6510,7 +6426,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6688,7 +6604,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6719,12 +6635,6 @@ msgstr ""
 msgid "Current"
 msgstr "Current"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6749,7 +6659,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Percentage"
 
@@ -6769,7 +6678,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kullanılmayan bir günlük kodu oluşturulamaz."
@@ -6816,12 +6725,17 @@ msgid "Applicable Type"
 msgstr "Applicable Type"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Fatura Referansı"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6840,12 +6754,12 @@ msgstr ""
 "Bu durumda, değerlendirme sırası önemlidir."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6920,7 +6834,7 @@ msgid "Optional create"
 msgstr "Optional create"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6933,9 +6847,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Supplier Refund"
 
@@ -6973,9 +6885,12 @@ msgid "Group By..."
 msgstr "Gruplandır..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  Değerlendirme: Bilanço"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -7053,6 +6968,13 @@ msgstr "Vergi Adı her firma için eşsiz olmalı!"
 msgid "Cash Transactions"
 msgstr "Kasa İşlemleri"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7070,7 +6992,7 @@ msgstr "Çözümsel Giriş İstat"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Entries: "
@@ -7088,14 +7010,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Doğru"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "Bilanço Tablosu (Varlık hesabı)"
@@ -7111,10 +7032,9 @@ msgid "Total debit"
 msgstr "Toplam Borç"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "Uzlaştırılacak Sonraki Paydaş Girişleri"
 
 #. module: account
 #: report:account.invoice:0
@@ -7167,7 +7087,7 @@ msgstr "Kayıt Oluştur"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "Kar & Zarar (Gider hesabı)"
@@ -7178,13 +7098,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -7221,6 +7142,11 @@ msgstr "Proje Kalemi"
 msgid "Manual"
 msgstr "Manuel"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7326,8 +7252,8 @@ msgstr "Günlük Seç"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Açılış Bakiyesi"
@@ -7409,7 +7335,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7430,6 +7356,11 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7483,7 +7414,7 @@ msgid "Done"
 msgstr "Tamamlandı"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7521,9 +7452,8 @@ msgid "Source Document"
 msgstr "Kaynak Belge"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7550,7 +7480,7 @@ msgid "Taxes:"
 msgstr "Vergiler:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7747,6 +7677,12 @@ msgstr ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Fatura Referansı"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7838,7 +7774,7 @@ msgid "Use model"
 msgstr "Use model"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7889,7 +7825,7 @@ msgid "Root/View"
 msgstr "Kök/Görünüm"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7958,7 +7894,7 @@ msgid "Maturity Date"
 msgstr "Vade Sonu Tarihi"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Satış Günlüğü"
@@ -7969,7 +7905,7 @@ msgid "Invoice Tax"
 msgstr "Fatura Vergisi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -8013,7 +7949,7 @@ msgid "Sales Properties"
 msgstr "Satış Özellikleri"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8038,7 +7974,7 @@ msgstr "To"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Para Birimi Ayarlama"
@@ -8072,7 +8008,7 @@ msgid "May"
 msgstr "May"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8092,10 +8028,9 @@ msgstr ""
 "Sıra alanı, kaynakların düşükten yükseğe doğru sıralanması için kullanılır."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Servis Talep Kodu"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8111,17 +8046,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Günlük Girişlerini İşle"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Müşteri"
@@ -8137,7 +8067,7 @@ msgstr "Rapor Adı"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Kasa"
@@ -8149,9 +8079,11 @@ msgid "Account Destination"
 msgstr "Hedef Hesap"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Faturaların Ödenmesi"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8159,7 +8091,6 @@ msgstr "Faturaların Ödenmesi"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8297,15 +8228,14 @@ msgid "Partner Ledger"
 msgstr "Paydaş Defteri"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Sabitlendi"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8373,7 +8303,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Bu faturaya uygulanacak para birimini seçin"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -8453,7 +8383,7 @@ msgid "Associated Partner"
 msgstr "İlişkili Paydaş"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Önce bir paydaş seçmelisiniz !"
@@ -8535,13 +8465,13 @@ msgstr ""
 "edilip edilmeyeceğini ayarlayın."
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Satınalma İade Günlüğü"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8614,7 +8544,7 @@ msgid "Net Total:"
 msgstr "Net Total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8634,14 +8564,6 @@ msgstr "Generic Reporting"
 msgid "Write-Off Journal"
 msgstr "Gider Kaydetme Günlüğü"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"Bu ödeme koşulu geçerli paydaş için varsayılan yerine kullanılacaktır"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8668,11 +8590,6 @@ msgstr "Int.Type"
 msgid "Tax/Base Amount"
 msgstr "Vergi/Matrah Tutarı"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  Değerlendirme: Yüzde"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8726,6 +8643,11 @@ msgstr "Reconciliation Result"
 msgid "Ending Balance"
 msgstr "Kapanış Bakiyesi"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8768,7 +8690,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatic import of the bank sta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8791,7 +8713,12 @@ msgid "Account Types"
 msgstr "Hesap Türleri"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8799,9 +8726,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  Değer tutarı: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS Category"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8818,10 +8745,9 @@ msgid "Reconciliation"
 msgstr "Reconciliation"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Alacak Hesapları"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Gelir hesabını kullanmak için boş bırakın"
 
 #. module: account
 #: view:account.invoice:0
@@ -8900,7 +8826,7 @@ msgid "The partner account used for this invoice."
 msgstr "Bu fatura için kullanılan paydaş hesabı"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Vergi %.2f%%"
@@ -8918,13 +8844,13 @@ msgid "Payment Term Line"
 msgstr "Ödeme Vadesi Satırı"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Satınalma Günlüğü"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Ara Toplam"
 
@@ -8953,11 +8879,6 @@ msgstr "Vade Tarihi"
 msgid "Suppliers"
 msgstr "Tedarikçiler"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Doğru"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9094,9 +9015,10 @@ msgid "Journal Name"
 msgstr "Günlük Adı"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "Uzlaştırılacak Sonraki Paydaş Girişleri"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Entry \"%s\" is not valid !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9144,7 +9066,7 @@ msgstr ""
 "belirtilir."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9206,7 +9128,7 @@ msgid "Reconciled entries"
 msgstr "Mutabakatı Yapılan Kayıtlar"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "Yanlış model !"
@@ -9228,7 +9150,7 @@ msgid "Print Account Partner Balance"
 msgstr "Paydaş Hesabı Bakiyesini Yazdır"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9268,7 +9190,7 @@ msgstr "unknown"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Açılış Girişleri Günlüğü"
@@ -9315,7 +9237,7 @@ msgstr ""
 "yapılacağını ayarlayın."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9330,21 +9252,9 @@ msgstr "Given by Python Code"
 msgid "Journal Code"
 msgstr "Günlük Kodu"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Bakiye Tutarı"
 
@@ -9377,7 +9287,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Satış İade Günlüğü"
@@ -9443,7 +9353,7 @@ msgid "Purchase Tax(%)"
 msgstr "Satınalma Vergisi(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -9462,7 +9372,7 @@ msgid "Display Detail"
 msgstr "Ayrıntıları Görüntüle"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9579,21 +9489,11 @@ msgstr "Muhasebeci faturalardan yapılan girişleri doğrular. "
 msgid "Number of Periods"
 msgstr "Dönem Sayısı"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Vergi Kodu Şablonu"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Belge: Müşteri hesapözeti"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS Category"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9605,8 +9505,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9626,14 +9527,14 @@ msgid "Document"
 msgstr "Document"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Banka Hesapözetleri"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Alacak Hesapları"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9734,8 +9635,8 @@ msgid "Move"
 msgstr "Hareket"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9814,11 +9715,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Uzlaşısız işlemler"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9836,11 +9732,16 @@ msgid "Balance :"
 msgstr "Bakiye:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9877,13 +9778,6 @@ msgstr "Subscription"
 msgid "Account Analytic Balance"
 msgstr "Çözümsel Bilanço Hesabı"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9923,7 +9817,13 @@ msgid "Due date"
 msgstr "Vade Tarihi"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -10019,7 +9919,7 @@ msgid "Unreconciled"
 msgstr "Mutabakatsız"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Bad total !"
@@ -10109,7 +10009,7 @@ msgid "Comparison"
 msgstr "Karşılaştırma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10127,6 +10027,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10182,11 +10087,6 @@ msgstr "Alacak"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10198,7 +10098,7 @@ msgid "Journal Entry Model"
 msgstr "Günlük Giriş Modeli"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10283,7 +10183,7 @@ msgid "Profit (Loss) to report"
 msgstr "Raporlanacak Kar (Zarar)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10614,7 +10514,14 @@ msgid "Empty Accounts ? "
 msgstr "Boş Hesaplarmı ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10739,7 +10646,7 @@ msgid "Receivable accounts"
 msgstr "Alıcılar Hesabı"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10873,7 +10780,7 @@ msgid "Entries Sorted by"
 msgstr "Girişlerin sıralandırılması"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10979,7 +10886,7 @@ msgid "Accounting Documents"
 msgstr "Muhasebe Belgeleri"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -11024,7 +10931,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Faturaya Elle Vergi Girilmesi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11105,17 +11012,6 @@ msgstr ""
 msgid "February"
 msgstr "Şubat"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"Eğer Ad olarak oluşturulandan farklı bir isim verirseniz /, Muhasebe Giriş "
-"Hareketleri ekstre adlarıyla aynı olacaktır. Bu da ekstre girişlerinin "
-"ekstrenin kendisiyle ayn referansa sahip olmasını sağlar."
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11174,6 +11070,11 @@ msgstr "Mali Hesap Eşleştirme Şablonu"
 msgid "Expense Account on Product Template"
 msgstr "Ürün Şablonunda Gider Hesabı"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11221,9 +11122,6 @@ msgstr ""
 #~ msgid "Entry label"
 #~ msgstr "Giriş etiketi"
 
-#~ msgid "Fixed"
-#~ msgstr "Sabitlendi"
-
 #~ msgid "Negative"
 #~ msgstr "Negatif"
 
@@ -11281,6 +11179,10 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Yevmiye Fişi"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Tedarikçi Faturası"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Ödenen Mutabakat"
 
@@ -11377,6 +11279,9 @@ msgstr ""
 #~ msgid "Parent Analytic Account"
 #~ msgstr "Ana Alaniz Hesapları"
 
+#~ msgid "Line Name"
+#~ msgstr "Satır Adı"
+
 #~ msgid "Analytic Credit"
 #~ msgstr "Alacak Analizi"
 
@@ -11513,6 +11418,9 @@ msgstr ""
 #~ msgid "Acc. Type Name"
 #~ msgstr "Hesap Tipi Adı"
 
+#~ msgid "Litigation"
+#~ msgstr "Hukuki Dava"
+
 #~ msgid "Taxes Reports"
 #~ msgstr "Vergi Raporları"
 
@@ -11998,6 +11906,9 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#~ msgid "Communication"
+#~ msgstr "İletişim"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
@@ -12104,6 +12015,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Reference Number"
 
+#~ msgid "Line 2:"
+#~ msgstr "Line 2:"
+
 #~ msgid "All periods if empty"
 #~ msgstr "All periods if empty"
 
@@ -12267,6 +12181,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "No"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Bank and Cheques"
+
 #~ msgid "Are you sure ?"
 #~ msgstr "Are you sure ?"
 
@@ -12301,6 +12218,9 @@ msgstr ""
 #~ msgid "5"
 #~ msgstr "5"
 
+#~ msgid "Line 1:"
+#~ msgstr "Line 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Integrity Error !"
@@ -12388,6 +12308,9 @@ msgstr ""
 #~ "Streamlines invoice payment and creates hooks to plug automated payment "
 #~ "systems in."
 
+#~ msgid "Valuation"
+#~ msgstr "Valuation"
+
 #, python-format
 #~ msgid ""
 #~ "Tax base different !\n"
@@ -13054,6 +12977,10 @@ msgstr ""
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Tablo Şablonuyla Hesap Tablonuzu oluşturabilirsiniz."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Fatura '%s' onaylandı."
+
 #~ msgid ""
 #~ "This report allows you to print or generate a pdf of your trial balance "
 #~ "allowing you to quickly check the balance of each of your accounts in a "
@@ -13266,6 +13193,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Varsayılan Vergiler"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Dönemsel İşlem"
+
 #~ msgid ""
 #~ "When new move line is created the state will be 'Draft'.\n"
 #~ "* When all the payments are done it will be in 'Valid' state."
@@ -13393,6 +13323,14 @@ msgstr ""
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Hata! Biribiriyle çakışan mali yıllar tanımlayamazsınız"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Bu işlemlerin uzlaşmasını kaldırırsanız, aynı zamanda, bu işlemlere bağlı "
+#~ "diğer hareketleri de doğrulamalısınız aksi takdirde bu işlemler devre dışı "
+#~ "bırakılamaz."
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "Şirket adı tekil olmalı !"
 
@@ -13408,6 +13346,9 @@ msgstr ""
 #~ msgid "Bank Account Owner"
 #~ msgstr "Banka Hesabı Sahibi"
 
+#~ msgid "Example"
+#~ msgstr "Örnek"
+
 #~ msgid "Information About the Bank"
 #~ msgstr "Banka Hakkında Bilgi"
 
@@ -13440,6 +13381,9 @@ msgstr ""
 #~ "Günlük maddeleri içerdiğinden hesap türünü '%s' ten '%s' türüne "
 #~ "çeviremezsiniz!"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "14 Net günde yüzde 2, kalan tutar 30 günde ay sonunda."
+
 #~ msgid "Cancel: refund invoice and reconcile"
 #~ msgstr "Vazgeç: faturayı iade et ve uzlaştır"
 
@@ -13501,6 +13445,9 @@ msgstr ""
 #~ msgid "This months' Sales by type"
 #~ msgstr "Türlere göre bu ayın Satışları"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  Ayın Günü: 0"
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -13509,6 +13456,9 @@ msgstr ""
 #~ "Açık ya da ödenmiş bir faturayı silemezsiniz. Bunun yerine iade etmenizi "
 #~ "öneririz."
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  Değer tutarı: 0.02"
+
 #, python-format
 #~ msgid "You can not create journal items on a \"view\" account %s %s"
 #~ msgstr "%s%s \"görünüm\" hesabında günlük maddesi oluşturmazsınız"
@@ -13556,9 +13506,15 @@ msgstr ""
 #~ msgid "My invoices"
 #~ msgstr "Faturalarım"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} Fatura (Ref ${object.number or 'n/a' })"
+
 #~ msgid "Sale journal in this month"
 #~ msgstr "Bu aydaki Satış günlükleri"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  Gün Sayısı: 14"
+
 #~ msgid "Review your Financial Journals"
 #~ msgstr "Mali Günlüklerinizi inceleyin"
 
@@ -13566,6 +13522,9 @@ msgstr ""
 #~ msgid "Current currency is not configured properly !"
 #~ msgstr "Geçerli para birimi düzgün yapılandırılmadı!"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  Değerlendirme: Bilanço"
+
 #, python-format
 #~ msgid "Error :"
 #~ msgstr "Hata :"
@@ -13588,6 +13547,9 @@ msgstr ""
 #~ msgid "This Months Sales by type"
 #~ msgstr "Türe göre Bu Ayki Satışlar"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  Değerlendirme: Yüzde"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -13596,6 +13558,9 @@ msgstr ""
 #~ "Bu tarih için tanımlanan dönem yok: %s !\n"
 #~ "Lütfen bir tane oluşturun."
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  Değer tutarı: n.a"
+
 #, python-format
 #~ msgid ""
 #~ "Can not find a chart of accounts for this company, you should create one."
@@ -13622,6 +13587,12 @@ msgstr ""
 #~ msgid "Generate Your Chart of Accounts from a Chart Template"
 #~ msgstr "Tablo Şablonundan Hesap Tablonuzu oluşturun"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  Gün Sayısı: 30"
+
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  Ayın Günü= -1"
+
 #, python-format
 #~ msgid "The payment term of supplier does not have a payment term line!"
 #~ msgstr "Tedarikçi ödeme koşulunda ödeme koşulu satırı yok!"
@@ -13805,6 +13776,13 @@ msgstr ""
 #~ "\"Borç/Alacak\" iç türündeki hesapların \"Uzalaştırılmamış\" tan farklı "
 #~ "erteleme yöntemli bir hesap türünü seçemezsiniz! "
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "Bir işlemin uzlaşmasını kaldırdığınızda, o işleme bağlı eylemler devre dışı "
+#~ "bırakılmayacağı için o işleme bağlı bütün eylemleri de doğrulamalısınız."
+
 #~ msgid ""
 #~ "Configuration error! The currency chosen should be shared by the default "
 #~ "accounts too."
@@ -14214,6 +14192,12 @@ msgstr ""
 #~ "% endif\n"
 #~ "            "
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "Bu ödeme koşulu geçerli paydaş için varsayılan yerine kullanılacaktır"
+
 #~ msgid ""
 #~ "Create and manage the accounts you need to record journal entries. An "
 #~ "account is part of a ledger allowing your company to register all kinds of "
@@ -14230,6 +14214,12 @@ msgstr ""
 #~ "yıllık hesapları, yasal olarak belirli bir miktarda bilgi içermelidir. Bir "
 #~ "dış denetçi tarafından da onaylanmalıdır."
 
+#~ msgid "account.tax.template"
+#~ msgstr "hesap.vergi.şablon"
+
+#~ msgid "account.tax"
+#~ msgstr "hesap.vergi"
+
 #~ msgid "Tax Declaration: Credit Notes"
 #~ msgstr "Vergi Bildirimi: Alacak Dekontları"
 
@@ -14693,6 +14683,13 @@ msgstr ""
 #~ "ele alınmasından emin olmak için son öğenin 'Bakiye' türünde olması "
 #~ "gerektiğini unutmayın."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Sıra alanı, ödeme biçimi satırlarını azdan çoğa doğru sıralamak için "
+#~ "kullanılır"
+
 #~ msgid ""
 #~ "Payment terms define the conditions to pay a customer or supplier invoice in "
 #~ "one or several payments. Customers periodic reminders will use the payment "
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index b4a70eeafe0..11112be941f 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:32+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:26+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "ئىچكى ئىسمى"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr "ھېساباتنى توغىرىلاش نەتىجىسى"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 0f3bfe08028..03f132f833e 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,13 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Всього Дебет"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -108,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -137,19 +124,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -161,7 +148,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -230,11 +217,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Шаблони Податку"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -250,6 +232,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -376,11 +363,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -435,6 +417,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -450,6 +437,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -611,15 +603,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Якщо Ви відміняєте звірку операцій, то також мусите перевірити всі дії, "
-"пов'язані з цими операціями, тому що вони не будуть відмінені"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -668,7 +651,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -679,13 +662,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -748,6 +731,11 @@ msgstr "Рахунки дебіторів"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -770,6 +758,12 @@ msgstr "Перевідкрити"
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -790,6 +784,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
 
@@ -832,7 +827,7 @@ msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -855,24 +850,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Відміна звірки"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -903,11 +892,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -938,7 +922,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -953,6 +937,7 @@ msgstr "Нова Підписка"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Розрахунок"
 
@@ -984,11 +969,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1024,7 +1006,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1095,10 +1077,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1174,8 +1156,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1221,7 +1204,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1517,9 +1500,9 @@ msgid "Account Receivable"
 msgstr "Рахунок дебітора"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1533,7 +1516,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1588,7 +1571,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1631,6 +1614,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr "Повернення Постачальнику"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Код події"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1668,7 +1657,6 @@ msgid "Groups"
 msgstr "Групи"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1801,6 +1789,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1821,115 +1815,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2038,6 +1928,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2066,26 +1961,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2093,16 +1987,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2113,8 +2007,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2159,7 +2053,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2259,7 +2153,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2618,7 +2512,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2636,7 +2530,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2657,7 +2551,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2665,14 +2559,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Терміни оплати"
 
@@ -2698,18 +2590,6 @@ msgstr "Відмітити"
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Відкритий"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2721,6 +2601,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2798,25 +2683,20 @@ msgid "Account Model Entries"
 msgstr "Записи моделі обліку"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Податки постачальника"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Деталі Банку"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2839,7 +2719,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2849,9 +2728,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2881,6 +2759,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "ПДВ"
 
@@ -2916,14 +2795,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3020,6 +2899,12 @@ msgstr "Оплачено/Погоджено"
 msgid "Refund Base Code"
 msgstr "Повернути Базовий Код"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3072,11 +2957,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3117,7 +2997,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3130,7 +3010,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3146,15 +3026,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3162,7 +3042,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3224,8 +3104,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3272,12 +3153,6 @@ msgstr "Сума по базовому коду"
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3311,7 +3186,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3338,7 +3213,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3404,7 +3279,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3416,9 +3291,9 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Назва рядку"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3467,7 +3342,7 @@ msgid "View"
 msgstr "Перегляд"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3488,14 +3363,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3504,9 +3384,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3632,12 +3591,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3652,7 +3614,7 @@ msgid "Starting Balance"
 msgstr "Початковий баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3852,7 +3814,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3876,7 +3838,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4012,7 +3974,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон Плану Рахунків"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4097,9 +4059,12 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Спірний"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4182,11 +4147,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4204,11 +4164,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4253,8 +4208,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4284,7 +4239,7 @@ msgid "Consolidated Children"
 msgstr "Об'єднати Дочірні"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4316,11 +4271,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4410,6 +4360,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr "Аналітичний баланс"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4429,6 +4386,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4439,11 +4401,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4452,11 +4409,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4480,19 +4432,8 @@ msgid "Account Type"
 msgstr "Тип рахунку"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4514,8 +4455,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4544,7 +4496,7 @@ msgid "Month"
 msgstr "Місяць"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4555,8 +4507,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4580,6 +4532,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4592,7 +4549,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4614,7 +4571,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4669,11 +4626,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Періодична обробка"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4703,10 +4655,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "Інвойс постачальника"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4774,10 +4725,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4826,7 +4781,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4841,7 +4796,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4866,11 +4821,6 @@ msgstr ""
 msgid "Change"
 msgstr "Зміна"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4893,11 +4843,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4908,11 +4853,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Залишити порожнім для використання рахунку доходу"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4922,7 +4862,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4996,16 +4936,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5116,6 +5051,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Оплачено"
 
@@ -5142,7 +5078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5157,14 +5093,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5177,7 +5105,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5210,9 +5138,9 @@ msgid "End of period"
 msgstr "Кінець періоду"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Деталі Банку"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5305,14 +5233,6 @@ msgstr "Опис податку"
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5357,7 +5277,7 @@ msgid "Target Moves"
 msgstr "Цільові кроки"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5393,6 +5313,7 @@ msgid "Python Code (reverse)"
 msgstr "Код Пайтон (реверс)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5406,12 +5327,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5437,18 +5352,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Внутрішня назва"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5487,7 +5397,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5520,7 +5430,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Код розрахунку (якщо тип=код)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5547,6 +5457,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5647,7 +5558,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5675,7 +5586,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5711,10 +5622,16 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr ""
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Відкритий"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5744,9 +5661,7 @@ msgstr "Коди податків"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Повернення покупця"
 
@@ -5763,11 +5678,6 @@ msgstr "Знак коду податку"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5784,6 +5694,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5872,8 +5783,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5896,6 +5805,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5903,14 +5819,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Поле послідовності використовується для впорядкування термінів платежів"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5968,12 +5876,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Фіксована сума"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5997,7 +5904,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6025,18 +5931,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Списати"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6053,7 +5964,7 @@ msgstr "Дохід"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Постачальник"
@@ -6073,16 +5984,11 @@ msgid "Account n°"
 msgstr "№ рахунку"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6192,7 +6098,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6239,6 +6145,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Кількість днів"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6378,7 +6292,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6553,7 +6467,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6584,12 +6498,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6614,7 +6522,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6634,7 +6541,7 @@ msgid "Power"
 msgstr "Степінь"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6679,12 +6586,17 @@ msgid "Applicable Type"
 msgstr "Придатний тип"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Посилання на інвойс"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6700,12 +6612,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6772,7 +6684,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6783,9 +6695,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Повернення постачальнику"
 
@@ -6823,8 +6733,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6901,6 +6814,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6918,7 +6838,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6936,14 +6856,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Істина"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6959,9 +6878,8 @@ msgid "Total debit"
 msgstr "Всього Дебет"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7011,7 +6929,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7022,13 +6940,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7065,6 +6984,11 @@ msgstr "Рядок проекту"
 msgid "Manual"
 msgstr "Вручну"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7163,8 +7087,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7244,7 +7168,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7257,6 +7181,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7310,7 +7239,7 @@ msgid "Done"
 msgstr "Завершено"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7342,9 +7271,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7371,7 +7299,7 @@ msgid "Taxes:"
 msgstr "ПДВ:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7566,6 +7494,12 @@ msgstr ""
 "і дозволяє розробникам створювати специфічні податки в області дій "
 "користувача."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Посилання на інвойс"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7655,7 +7589,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7706,7 +7640,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7773,7 +7707,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Журнал продажів"
@@ -7784,7 +7718,7 @@ msgid "Invoice Tax"
 msgstr "Податок інвойса"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7823,7 +7757,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7848,7 +7782,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7880,7 +7814,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7898,10 +7832,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Код події"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7917,17 +7850,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Покупець"
@@ -7943,7 +7871,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Каса"
@@ -7955,8 +7883,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7965,7 +7895,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8097,15 +8026,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Фіксований"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Попередження !"
@@ -8173,7 +8101,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8248,7 +8176,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Ви повинні спочатку вибрати партнера !"
@@ -8328,13 +8256,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8405,7 +8333,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8425,13 +8353,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr "Журнал списання"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8458,11 +8379,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr "Сума податку/бази"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8516,6 +8432,11 @@ msgstr "Результат звірки"
 msgid "Ending Balance"
 msgstr "Кінцевий баланс"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8556,7 +8477,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8579,7 +8500,12 @@ msgid "Account Types"
 msgstr "Типи рахунків"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8587,8 +8513,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8606,10 +8532,9 @@ msgid "Reconciliation"
 msgstr "Звірка"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Рахунок Дебіторської Заборгованості"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Залишити порожнім для використання рахунку доходу"
 
 #. module: account
 #: view:account.invoice:0
@@ -8681,7 +8606,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8699,13 +8624,13 @@ msgid "Payment Term Line"
 msgstr "Рядок термінів оплати"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8734,11 +8659,6 @@ msgstr "Дата"
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Істина"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8873,8 +8793,9 @@ msgid "Journal Name"
 msgstr "Назва журналу"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8920,7 +8841,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8981,7 +8902,7 @@ msgid "Reconciled entries"
 msgstr "Вивірені проводки"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9003,7 +8924,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9037,7 +8958,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9082,7 +9003,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9097,18 +9018,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9141,7 +9053,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9207,7 +9119,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9226,7 +9138,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9341,21 +9253,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9367,8 +9269,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9388,14 +9291,14 @@ msgid "Document"
 msgstr "Документ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr ""
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Рахунок Дебіторської Заборгованості"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9496,8 +9399,8 @@ msgid "Move"
 msgstr "Переміщення"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9574,11 +9477,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Операції відміни звірки"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9596,11 +9494,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9637,13 +9540,6 @@ msgstr "Передплата"
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9683,7 +9579,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9772,7 +9674,7 @@ msgid "Unreconciled"
 msgstr "Незвірений"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9855,7 +9757,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9873,6 +9775,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9926,11 +9833,6 @@ msgstr "Кредит"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9942,7 +9844,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10027,7 +9929,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10350,7 +10252,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10475,7 +10384,7 @@ msgid "Receivable accounts"
 msgstr "Рахунки дебіторів"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10602,7 +10511,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10708,7 +10617,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10753,7 +10662,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Ручні податки інвойса"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10832,14 +10741,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10898,6 +10799,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10967,9 +10873,6 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "Записи Обліку"
 
-#~ msgid "Fixed"
-#~ msgstr "Фіксований"
-
 #~ msgid "Origin"
 #~ msgstr "Походження"
 
@@ -10998,12 +10901,22 @@ msgstr ""
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Неоплачені Повернення Постачальникові"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Періодична обробка"
+
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "Статистика записів аналітики"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "Інвойс постачальника"
+
 #~ msgid "Line"
 #~ msgstr "Рядок"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Банківський Журнал "
@@ -11084,6 +10997,12 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Документ"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "Поле послідовності використовується для впорядкування термінів платежів"
+
 #~ msgid "Total write-off"
 #~ msgstr "Разом списати"
 
@@ -11102,12 +11021,22 @@ msgstr ""
 #~ msgid "Purchase Taxes"
 #~ msgstr "Податки на придбання"
 
+#~ msgid "Line Name"
+#~ msgstr "Назва рядку"
+
 #~ msgid "Value"
 #~ msgstr "Вартість"
 
 #~ msgid "Centralised counterpart"
 #~ msgstr "Централізований аналог"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "Якщо Ви відміняєте звірку операцій, то також мусите перевірити всі дії, "
+#~ "пов'язані з цими операціями, тому що вони не будуть відмінені"
+
 #~ msgid "Customer Credit"
 #~ msgstr "Кредит клієнта"
 
@@ -11243,6 +11172,9 @@ msgstr ""
 #~ msgid "Use this code for the VAT declaration."
 #~ msgstr "Використовуйте цей код для декларації ПДВ"
 
+#~ msgid "Litigation"
+#~ msgstr "Спірний"
+
 #~ msgid "Dear Sir/Madam,"
 #~ msgstr "Шановний(а)"
 
@@ -11573,6 +11505,9 @@ msgstr ""
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Пропустити 'Чорновий' стан для Створених Записів"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "List of Accounts"
 #~ msgstr "Список Рахунків"
 
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index 4db90f6c655..5550c9c6c3f 100644
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 11:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr ""
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,9 +4656,8 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
 msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 2355ffb3ce1..9a6b8e887d9 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:34+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Unreconciliate Transactions"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -81,9 +76,9 @@ msgid "Import from invoice or payment"
 msgstr "Import from invoice or payment"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,15 +89,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "Tổng Nợ"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -113,7 +99,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -144,19 +129,19 @@ msgstr ""
 "thanh toán mà không cần loại bỏ nó."
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -168,7 +153,7 @@ msgid "Warning!"
 msgstr "Cảnh báo!"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -240,11 +225,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "Các mẫu thuế"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -260,6 +240,11 @@ msgstr "Các bút toán kế toán là đầu vào của việc đối soát."
 msgid "Belgian Reports"
 msgstr "Báo cáo của Bỉ"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -388,11 +373,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -447,6 +427,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -462,6 +447,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "Mẫu hệ thống tài khoản"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -623,15 +613,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "Mỗi 3 tháng"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -680,7 +661,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -691,13 +672,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Báo cáo Bán hàng theo Loại Tài khoản"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -760,6 +741,11 @@ msgstr "Các tài khoản phải thu"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -782,6 +768,12 @@ msgstr "Mở lại"
 msgid "Are you sure you want to create entries?"
 msgstr "Are you sure you want to create entries?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -802,6 +794,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Phần trăm"
 
@@ -844,7 +837,7 @@ msgid "Type"
 msgstr "Loại"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -867,24 +860,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "Chưa đối soát"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -915,11 +902,6 @@ msgstr "J.C./Move name"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -951,7 +933,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -966,6 +948,7 @@ msgstr "New Subscription"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "Tính toán"
 
@@ -997,11 +980,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1037,7 +1017,7 @@ msgid "Liability"
 msgstr "Liability"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1111,10 +1091,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1192,8 +1172,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1239,7 +1220,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "Ngân hàng"
@@ -1535,9 +1516,9 @@ msgid "Account Receivable"
 msgstr "Khoản phải thu"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1551,7 +1532,7 @@ msgid "With balance is not equal to 0"
 msgstr "With balance is not equal to 0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1606,7 +1587,7 @@ msgstr "Skip 'Draft' State for Manual Entries"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1649,6 +1630,12 @@ msgstr "A Temporary table used for Dashboard view"
 msgid "Supplier Refunds"
 msgstr "Hoàn tiền cho nhà cung cấp"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Case Code"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1686,7 +1673,6 @@ msgid "Groups"
 msgstr "Các nhóm"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "Không bị thuế"
@@ -1819,6 +1805,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "Doanh số theo loại tài khoản"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1839,115 +1831,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2056,6 +1944,11 @@ msgstr "Các chu kỳ này có thể gối lên nhau"
 msgid "Draft statement"
 msgstr "Draft statement"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2084,26 +1977,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2111,16 +2003,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2131,8 +2023,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2177,7 +2069,7 @@ msgid "period close"
 msgstr "đóng chu kỳ"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2277,7 +2169,7 @@ msgid "Product Category"
 msgstr "Nhóm sản phẩm"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2643,7 +2535,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Keep empty for all open fiscal year"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2661,7 +2553,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Tạo một Tài khoản dựa trên mẫu này"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2682,7 +2574,7 @@ msgid "Main Sequence"
 msgstr "Main Sequence"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2690,14 +2582,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "Điều khoản thanh toán"
 
@@ -2723,18 +2613,6 @@ msgstr "Check this box"
 msgid "Filters"
 msgstr "Các bộ lọc"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "Mở"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2746,6 +2624,11 @@ msgstr "Draft state of an invoice"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2823,25 +2706,20 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "Thuế đầu vào"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr ""
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Chi tiết ngân hàng"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2864,7 +2742,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2878,9 +2755,8 @@ msgstr ""
 "due dates, for example 50% now, 50% in one month."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2910,6 +2786,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "Thuế"
 
@@ -2945,14 +2822,14 @@ msgid "Accounts"
 msgstr "Các tài khoản"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3049,6 +2926,12 @@ msgstr "Đã thanh toán / Đã đối soát"
 msgid "Refund Base Code"
 msgstr "hoàn lại mã cơ bản"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Các sổ phụ ngân hàng"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3101,11 +2984,6 @@ msgstr "Aged Partner Balance"
 msgid "Accounting entries"
 msgstr "Accounting entries"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3151,7 +3029,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3164,7 +3042,7 @@ msgid "Sales by Account"
 msgstr "Doanh thu theo tài khoản"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3180,15 +3058,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "You have to define an analytic journal on the '%s' journal!"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3196,7 +3074,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3260,9 +3138,10 @@ msgstr ""
 "The quantity is not a legal requirement but is very useful for some reports."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3311,12 +3190,6 @@ msgstr "Base Code Amount"
 msgid "Default Sale Tax"
 msgstr "Default Sale Tax"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Hóa đơn  '%s' đã được kiểm tra."
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3353,7 +3226,7 @@ msgid "Fiscal Position"
 msgstr "Fiscal Position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3380,7 +3253,7 @@ msgid "Trial Balance"
 msgstr "Trial Balance"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3451,7 +3324,7 @@ msgstr ""
 "always use the rate at date."
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3463,9 +3336,9 @@ msgid "No. of Digits to use for account code"
 msgstr "Số ký tự dùng cho mã tài khoản"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3514,7 +3387,7 @@ msgid "View"
 msgstr "View"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3535,15 +3408,20 @@ msgstr ""
 msgid "Electronic File"
 msgstr "Electronic File"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr ""
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Tax Code Template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3551,9 +3429,88 @@ msgid "Account Partner Ledger"
 msgstr "Account Partner Ledger"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3690,12 +3647,18 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3710,7 +3673,7 @@ msgid "Starting Balance"
 msgstr "Số dư ban đầu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Không có đối tác được định nghĩa"
@@ -3914,7 +3877,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3938,7 +3901,7 @@ msgid "Category of Product"
 msgstr "Category of Product"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4077,7 +4040,7 @@ msgid "Chart of Accounts Template"
 msgstr "Hoạch đồ Kế toán Mẫu"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4167,9 +4130,15 @@ msgid "Qty"
 msgstr "Qty"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4253,11 +4222,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4275,11 +4239,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4324,8 +4283,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4355,7 +4314,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4391,11 +4350,6 @@ msgstr ""
 msgid "title"
 msgstr "title"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4485,6 +4439,13 @@ msgstr "30 Days End of Month"
 msgid "Analytic Balance"
 msgstr "Analytic Balance"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4506,6 +4467,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4516,11 +4482,6 @@ msgstr "Search Tax Templates"
 msgid "Draft Entries"
 msgstr "Draft Entries"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4529,11 +4490,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4557,20 +4513,9 @@ msgid "Account Type"
 msgstr "Loại tài khoản"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Close CashBox"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4593,9 +4538,20 @@ msgstr ""
 "accounts. These generate draft supplier invoices."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4623,7 +4579,7 @@ msgid "Month"
 msgstr "Tháng"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4634,8 +4590,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4659,6 +4615,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr "Loại tài khoản"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4671,7 +4632,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4693,7 +4654,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4748,11 +4709,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Xử lý định kỳ"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4782,10 +4738,9 @@ msgid "Account chart"
 msgstr "Hệ thống tài khoản kế toán"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "hóa đơn nhà cung cấp"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4853,10 +4808,14 @@ msgstr "Credit Notes"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4905,7 +4864,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4920,7 +4879,7 @@ msgid "Based On"
 msgstr "Dựa trên"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4945,11 +4904,6 @@ msgstr ""
 msgid "Change"
 msgstr "Thay đổi"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Ngân hàng và Séc"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4972,11 +4926,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Đã hủy bỏ"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4987,11 +4936,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Để trống để sử dụng tài khoản thu nhập"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -5001,7 +4945,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5075,16 +5019,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5195,6 +5134,7 @@ msgstr "Thêm"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "Đã thanh toán"
 
@@ -5221,7 +5161,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5236,14 +5176,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5256,7 +5188,7 @@ msgid "Tax Application"
 msgstr "Tax Application"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5289,9 +5221,9 @@ msgid "End of period"
 msgstr "Kết thúc chu kỳ"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Chi tiết ngân hàng"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Payment of invoices"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5384,14 +5316,6 @@ msgstr "Mô tả thuế"
 msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5438,7 +5362,7 @@ msgid "Target Moves"
 msgstr "Target Moves"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5474,6 +5398,7 @@ msgid "Python Code (reverse)"
 msgstr "Python Code (reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5487,12 +5412,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5518,18 +5437,13 @@ msgstr "Năm"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Dòng 1:"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "Tên nội bộ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5568,7 +5482,7 @@ msgstr "Bảng cân đối kế toán"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5601,7 +5515,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Compute Code (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5628,6 +5542,7 @@ msgstr "Đối soát tự động"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5731,7 +5646,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5761,7 +5676,7 @@ msgid "Amount Computation"
 msgstr "Tính toán giá trị"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5797,10 +5712,16 @@ msgid "Account Common Account Report"
 msgstr "Account Common Account Report"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Mở"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5830,9 +5751,7 @@ msgstr "Các mã thuế"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "Hoàn tiền cho Khách hàng"
 
@@ -5849,11 +5768,6 @@ msgstr "Tax Code Sign"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Báo cáo các Hóa đơn được tạo trong vòng 15 ngày vừa qua"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5870,6 +5784,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5961,8 +5876,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5985,6 +5898,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "Payment entries are the second input of the reconciliation."
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5994,15 +5914,6 @@ msgstr ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6060,12 +5971,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "Giá trị cố định"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6089,7 +5999,6 @@ msgstr "Generate Opening Entries"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "Phương pháp tính giá trị thuế."
 
@@ -6117,18 +6026,23 @@ msgid "Child Accounts"
 msgstr "Tài khoản con"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6145,7 +6059,7 @@ msgstr "Income"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "Nhà cung cấp"
@@ -6165,16 +6079,11 @@ msgid "Account n°"
 msgstr "Tài khoản số"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Tham chiếu tự do"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Định giá"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6289,7 +6198,7 @@ msgid "Filter by"
 msgstr "Lọc theo"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6336,6 +6245,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "Số ngày"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6477,7 +6394,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6652,7 +6569,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6683,12 +6600,6 @@ msgstr ""
 msgid "Current"
 msgstr "Hiện tại"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6713,7 +6624,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "Phần trăm"
 
@@ -6733,7 +6643,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6780,12 +6690,17 @@ msgid "Applicable Type"
 msgstr "Applicable Type"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Tham chiếu Hóa đơn"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6804,12 +6719,12 @@ msgstr ""
 "children. In this case, the evaluation order is important."
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6883,7 +6798,7 @@ msgid "Optional create"
 msgstr "Optional create"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6894,9 +6809,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "Hoàn tiền cho Nhà cung cấp"
 
@@ -6934,8 +6847,11 @@ msgid "Group By..."
 msgstr "Nhóm theo..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -7014,6 +6930,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "Các giao dịch tiền mặt"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -7031,7 +6954,7 @@ msgstr "Analytic Entries Statistics"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "Các bút toán: "
@@ -7049,14 +6972,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Đúng"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -7072,10 +6994,9 @@ msgid "Total debit"
 msgstr "Tổng nợ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "Bút toán \"%s\" không hợp lệ !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -7128,7 +7049,7 @@ msgstr "Tạo bút toán"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7139,13 +7060,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "Lỗi !"
@@ -7182,6 +7104,11 @@ msgstr "Project line"
 msgid "Manual"
 msgstr "Thủ công"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7284,8 +7211,8 @@ msgstr "Journal Select"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "Số dư đầu kỳ"
@@ -7367,7 +7294,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7388,6 +7315,11 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7441,7 +7373,7 @@ msgid "Done"
 msgstr "Hoàn tất"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7479,9 +7411,8 @@ msgid "Source Document"
 msgstr "Tài liệu gốc"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7508,7 +7439,7 @@ msgid "Taxes:"
 msgstr "Thuế:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7705,6 +7636,12 @@ msgstr ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Tham chiếu Hóa đơn"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7797,7 +7734,7 @@ msgid "Use model"
 msgstr "Sử dụng mô hình"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7848,7 +7785,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7917,7 +7854,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "Sổ nhật ký Bán hàng"
@@ -7928,7 +7865,7 @@ msgid "Invoice Tax"
 msgstr "Thuế Hóa đơn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7967,7 +7904,7 @@ msgid "Sales Properties"
 msgstr "Các thuộc tính Bán hàng"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7992,7 +7929,7 @@ msgstr "Đến"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8024,7 +7961,7 @@ msgid "May"
 msgstr "Tháng Năm"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8042,10 +7979,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8061,17 +7997,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "Post Journal Entries"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "Khách hàng"
@@ -8087,7 +8018,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "Tiền mặt"
@@ -8099,9 +8030,11 @@ msgid "Account Destination"
 msgstr "Account Destination"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8109,7 +8042,6 @@ msgstr "Payment of invoices"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8247,15 +8179,14 @@ msgid "Partner Ledger"
 msgstr "Partner Ledger"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Đã sửa"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -8323,7 +8254,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Chọn một loại tiền để áp dụng cho hóa đơn"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -8400,7 +8331,7 @@ msgid "Associated Partner"
 msgstr "Đối tác Liên quan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -8482,13 +8413,13 @@ msgstr ""
 "tính toán các khoản thuế tiếp theo"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Sổ nhật ký Hoàn tiền Mua hàng"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8559,7 +8490,7 @@ msgid "Net Total:"
 msgstr "Net Total:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8579,15 +8510,6 @@ msgstr "Generic Reporting"
 msgid "Write-Off Journal"
 msgstr "Sổ nhật ký Miễn bỏ"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8614,11 +8536,6 @@ msgstr "Int.Type"
 msgid "Tax/Base Amount"
 msgstr "Tax/Base Amount"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8672,6 +8589,11 @@ msgstr "Kết quả đối soát"
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8714,7 +8636,7 @@ msgid "Automatic import of the bank sta"
 msgstr "Automatic import of the bank sta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8737,7 +8659,12 @@ msgid "Account Types"
 msgstr "Loại tài khoản"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8745,9 +8672,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr ""
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P&L / BS Category"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8764,10 +8691,9 @@ msgid "Reconciliation"
 msgstr "Đối soát"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Tài khoản Phải thu"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Để trống để sử dụng tài khoản thu nhập"
 
 #. module: account
 #: view:account.invoice:0
@@ -8839,7 +8765,7 @@ msgid "The partner account used for this invoice."
 msgstr "The partner account used for this invoice."
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8857,13 +8783,13 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "Purchase Journal"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "Tổng phụ"
 
@@ -8892,11 +8818,6 @@ msgstr "Ngày đến hạn"
 msgid "Suppliers"
 msgstr "Các nhà cung cấp"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Đúng"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -9033,9 +8954,10 @@ msgid "Journal Name"
 msgstr "Journal Name"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr ""
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Bút toán \"%s\" không hợp lệ !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9084,7 +9006,7 @@ msgstr ""
 "entry."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9146,7 +9068,7 @@ msgid "Reconciled entries"
 msgstr "Reconciled entries"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9168,7 +9090,7 @@ msgid "Print Account Partner Balance"
 msgstr "Print Account Partner Balance"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9202,7 +9124,7 @@ msgstr "chưa biết"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -9249,7 +9171,7 @@ msgstr ""
 "than on the total amount."
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9264,21 +9186,9 @@ msgstr "Given by Python Code"
 msgid "Journal Code"
 msgstr "Journal Code"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "Giá trị còn lại"
 
@@ -9311,7 +9221,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
@@ -9377,7 +9287,7 @@ msgid "Purchase Tax(%)"
 msgstr "Thuế mua hàng(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -9396,7 +9306,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9514,21 +9424,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr "Số lượng chu kỳ"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Tax Code Template"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "Document: Customer account statement"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P&L / BS Category"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9540,8 +9440,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9561,14 +9462,14 @@ msgid "Document"
 msgstr "Tài liệu"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Các sổ phụ ngân hàng"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Tài khoản Phải thu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9669,8 +9570,8 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9750,11 +9651,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Các giao dịch chưa đối soát"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9772,11 +9668,16 @@ msgid "Balance :"
 msgstr "Số dư :"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9813,13 +9714,6 @@ msgstr "Subscription"
 msgid "Account Analytic Balance"
 msgstr "Account Analytic Balance"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9859,7 +9753,13 @@ msgid "Due date"
 msgstr "Ngày đến hạn"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9948,7 +9848,7 @@ msgid "Unreconciled"
 msgstr "Chưa được đối soát"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "Tổng không hợp lệ !"
@@ -10038,7 +9938,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10056,6 +9956,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10111,11 +10016,6 @@ msgstr "Credit"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10127,7 +10027,7 @@ msgid "Journal Entry Model"
 msgstr "Journal Entry Model"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10212,7 +10112,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10542,7 +10442,14 @@ msgid "Empty Accounts ? "
 msgstr "Các tài khoản rỗng ? "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10667,7 +10574,7 @@ msgid "Receivable accounts"
 msgstr "Các tài khoản phải thu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10795,7 +10702,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10901,7 +10808,7 @@ msgid "Accounting Documents"
 msgstr "Các Tài liệu Kế toán"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10946,7 +10853,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manual Invoice Taxes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11027,17 +10934,6 @@ msgstr ""
 msgid "February"
 msgstr "Tháng Hai"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -11096,6 +10992,11 @@ msgstr "Template Account Fiscal Mapping"
 msgid "Expense Account on Product Template"
 msgstr "Expense Account on Product Template"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -11120,9 +11021,6 @@ msgstr ""
 #~ msgid "Entry label"
 #~ msgstr "thử nhãn hàng"
 
-#~ msgid "Fixed"
-#~ msgstr "Đã sửa"
-
 #~ msgid ""
 #~ "Gives the view used when writing or browsing entries in this journal. The "
 #~ "view tell Open ERP which fields should be visible, required or readonly and "
@@ -11156,6 +11054,10 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Xác nhận tuyên bố có / không có hoà giải từ dự thảo báo cáo"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "hóa đơn nhà cung cấp"
+
 #~ msgid "Line"
 #~ msgstr "Dòng"
 
@@ -11202,6 +11104,13 @@ msgstr ""
 #~ msgid "Account Num."
 #~ msgstr "Sỗ tài khoản"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+
 #, python-format
 #~ msgid "You can not use this general account in this journal !"
 #~ msgstr "You can not use this general account in this journal !"
@@ -11242,6 +11151,9 @@ msgstr ""
 #~ "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 #~ "Cash Registers, or Customer/Supplier payments."
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid ""
 #~ "This field contains the informatin related to the numbering of the journal "
 #~ "entries of this journal."
@@ -11279,6 +11191,13 @@ msgstr ""
 #~ msgid "account.installer.modules"
 #~ msgstr "account.installer.modules"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "closing balance entered by the cashbox verifier"
 
@@ -11489,6 +11408,9 @@ msgstr ""
 #~ msgid "Refund Invoice Options"
 #~ msgstr "Refund Invoice Options"
 
+#~ msgid "Line 2:"
+#~ msgstr "Line 2:"
+
 #~ msgid "Required"
 #~ msgstr "Required"
 
@@ -11499,6 +11421,9 @@ msgstr ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
 
+#~ msgid "Line Name"
+#~ msgstr "Line Name"
+
 #~ msgid "Gives the sequence order to journal column."
 #~ msgstr "Gives the sequence order to journal column."
 
@@ -11564,6 +11489,9 @@ msgstr ""
 #~ "You cannot validate a Journal Entry unless all journal items are in same "
 #~ "chart of accounts !"
 
+#~ msgid "Litigation"
+#~ msgstr "Litigation"
+
 #~ msgid "Mapping"
 #~ msgstr "Mapping"
 
@@ -11731,6 +11659,9 @@ msgstr ""
 #~ "You can not do this modification on a reconciled entry ! Please note that "
 #~ "you can just change some non important fields !"
 
+#~ msgid "Communication"
+#~ msgstr "Communication"
+
 #~ msgid "Generate entries before:"
 #~ msgstr "Generate entries before:"
 
@@ -11765,6 +11696,13 @@ msgstr ""
 #~ "You should set the journal to allow cancelling entries if you want to do "
 #~ "that."
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+
 #~ msgid "Move journal"
 #~ msgstr "Move journal"
 
@@ -12045,6 +11983,13 @@ msgstr ""
 #~ "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 #~ "ready for editing."
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Compute Code for Taxes included prices"
 
@@ -12486,6 +12431,9 @@ msgstr ""
 #~ msgid "Default taxes"
 #~ msgstr "Các thuế mặc định"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "Xử lý định kỳ"
+
 #~ msgid "  day of the month: 0"
 #~ msgstr "  ngày trong tháng: 0"
 
@@ -12500,6 +12448,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Nhân viên bán hàng"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "Ngân hàng và Séc"
+
 #, python-format
 #~ msgid "Error"
 #~ msgstr "Lỗi"
@@ -12507,6 +12458,9 @@ msgstr ""
 #~ msgid "Column Name"
 #~ msgstr "Tên cột"
 
+#~ msgid "Line 1:"
+#~ msgstr "Dòng 1:"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Lỗi toàn vẹn !"
@@ -12643,6 +12597,9 @@ msgstr ""
 #~ msgid "Journal: %s"
 #~ msgstr "Sổ nhật ký: %s"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "Số dư được tính toán"
 
@@ -12781,6 +12738,9 @@ msgstr ""
 #~ msgid "Valid Up to"
 #~ msgstr "Có hiệu lực đến"
 
+#~ msgid "Valuation"
+#~ msgstr "Định giá"
+
 #, python-format
 #~ msgid "New currency is not confirured properly !"
 #~ msgstr "Loại tiền mới chưa được cấu hình đúng !"
@@ -12898,6 +12858,10 @@ msgstr ""
 #~ "Chưa có chu kỳ được xác định đối với ngày này: %s !\n"
 #~ "Vui lòng tạo một năm tài chính."
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "Hóa đơn  '%s' đã được kiểm tra."
+
 #, python-format
 #~ msgid "Invoice '%s' is waiting for validation."
 #~ msgstr "Hóa đơn '%s' đang chờ kiểm tra."
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 86f1cc0dd22..2156bcb2c5f 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 06:55+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2012-12-20 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr "在一个科目上只能设置一个应税设定"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "反核销业务"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "从发票或付款单导入"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr "坏账"
@@ -91,13 +86,6 @@ msgstr "坏账"
 msgid "Total Debit"
 msgstr "借方合计"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr "如果您反核销交易，您必须检查所有与这交易有关的操作，因为他们不会被关闭。"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -110,7 +98,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -139,19 +126,19 @@ msgid ""
 msgstr "如果设置为false，该付款条款将会被隐藏。"
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -163,7 +150,7 @@ msgid "Warning!"
 msgstr "警告！"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "其它凭证簿"
@@ -238,11 +225,6 @@ msgstr "设置辅助核算项，用于退款时发票上默认项目。如果默
 msgid "Tax Templates"
 msgstr "税模板"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -258,6 +240,11 @@ msgstr "核销的第一个输入是会计分录"
 msgid "Belgian Reports"
 msgstr "比利时报表"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -395,11 +382,6 @@ msgstr "允许使用辅助核算"
 msgid "Salesperson"
 msgstr "销售员"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -458,6 +440,11 @@ msgstr ""
 "                要安装account_asset模块. 如果不检查box, 可以处理发票和付款,\n"
 "                但不能处理账记(账簿明细, 会计报表, ...)"
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -473,6 +460,11 @@ msgstr "时间："
 msgid "Chart Template"
 msgstr "科目一览表模板"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -634,13 +626,6 @@ msgstr "日记帐分录小数精度"
 msgid "3 Monthly"
 msgstr "3个月"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr "如果执行反核销, 你必须检验链接该处理的所有操作. 因为他们不会被禁止."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -689,7 +674,7 @@ msgid "Profit Account"
 msgstr "利润科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "根据输入的凭证日期没有找到期间或找到了多个期间"
@@ -700,13 +685,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "销售报表的科目类型"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "不能不同币种的凭证"
@@ -771,6 +756,11 @@ msgstr "应收款科目"
 msgid "Configure your company bank accounts"
 msgstr "配置你公司银行账户"
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -793,6 +783,12 @@ msgstr "重开"
 msgid "Are you sure you want to create entries?"
 msgstr "你确定创建分录?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -813,6 +809,7 @@ msgstr "以层级结构显示子项"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "百分比"
 
@@ -855,7 +852,7 @@ msgid "Type"
 msgstr "类型"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -878,24 +875,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "供应商发票和退款"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "分录已经核销。"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "反核销"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "于第14个工作日支付总款2%，余款至30个工作日所在月之月末支付"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -926,11 +917,6 @@ msgstr "J.C.(成本)凭证名称"
 msgid "Account Code and Name"
 msgstr "科目代码和名称"
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr "已创建"
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -965,7 +951,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -980,6 +966,7 @@ msgstr "新周期性分录"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "计算"
 
@@ -1011,12 +998,9 @@ msgid "Purchase journal"
 msgstr "采购分类账"
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
-msgstr "你不能核准这个分类账分录，因为科目 \"%s\" 不属于科目表 \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr ""
 
 #. module: account
 #: view:validate.account.move:0
@@ -1051,7 +1035,7 @@ msgid "Liability"
 msgstr "负债"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "请为这张发票对应的凭证簿选择编号规则"
@@ -1122,10 +1106,10 @@ msgid "Features"
 msgstr "特性"
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1201,9 +1185,10 @@ msgid "Refund "
 msgstr "退款 "
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
-msgstr "银行帐号被打印在每个输出单据的页脚。"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
@@ -1248,7 +1233,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "银行"
@@ -1546,9 +1531,9 @@ msgid "Account Receivable"
 msgstr "应收科目"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -1562,7 +1547,7 @@ msgid "With balance is not equal to 0"
 msgstr "余额不为0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1619,7 +1604,7 @@ msgstr "如果是手工分录的话就跳过“草稿”状态"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr "未执行。"
@@ -1662,6 +1647,12 @@ msgstr "用于仪表盘视图的临时表"
 msgid "Supplier Refunds"
 msgstr "供应商红字发票"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "事务编码"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1699,7 +1690,6 @@ msgid "Groups"
 msgstr "组"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "未完税"
@@ -1832,6 +1822,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "销售科目类型"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1852,115 +1848,11 @@ msgid ""
 msgstr "这个分类账簿的“合并对方科目”必须被选中，“跳过草稿状态”不能选中。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "有些分录已经被核销。"
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2069,6 +1961,11 @@ msgstr "这会计期间可以重叠"
 msgid "Draft statement"
 msgstr "银行单据草稿"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2100,26 +1997,25 @@ msgstr ""
 "这非常有用，他使你任何时间可预览 在月份（或季度）的开始和结束欠了多少税。"
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2127,16 +2023,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2147,8 +2043,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2199,7 +2095,7 @@ msgid "period close"
 msgstr "关闭一个会计期间"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2299,7 +2195,7 @@ msgid "Product Category"
 msgstr "产品类别"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2658,7 +2554,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "留空为所有开启的会计年度"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2676,7 +2572,7 @@ msgid "Create an Account Based on this Template"
 msgstr "基于此模板创建科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2697,7 +2593,7 @@ msgid "Main Sequence"
 msgstr "主序列"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2705,14 +2601,12 @@ msgid ""
 msgstr "要删除银行对帐单，必须先取消并删除相关凭证项"
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "付款条款"
 
@@ -2738,18 +2632,6 @@ msgstr "勾选此项"
 msgid "Filters"
 msgstr "筛选"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "待支付"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2761,6 +2643,11 @@ msgstr "草稿状态的发票"
 msgid "Account Properties"
 msgstr "科目属性"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2838,25 +2725,20 @@ msgid "Account Model Entries"
 msgstr "凭证模板"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr "产生一张红字发票"
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "进项税"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "凭证"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "银行信息"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2879,7 +2761,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2891,10 +2772,9 @@ msgstr ""
 "然后在一个月内支付余下的50%."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
-msgstr "发票已经被核销"
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2923,6 +2803,7 @@ msgstr "凭证行核销（注销）"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "税"
 
@@ -2958,14 +2839,14 @@ msgid "Accounts"
 msgstr "科目"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3062,6 +2943,12 @@ msgstr "已付/已核销"
 msgid "Refund Base Code"
 msgstr "退税基编码"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "银行对账单"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3114,11 +3001,6 @@ msgstr "业务伙伴以前的余额表"
 msgid "Accounting entries"
 msgstr "会计分录"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "沟通类型"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr "选择的发票不能被确认，因为它们不是“草稿”或者“形式发票”状态"
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "你要选择属于同一个公司的会计区间"
@@ -3174,7 +3056,7 @@ msgid "Sales by Account"
 msgstr "销售科目"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "你不能删除已经登帐的分类账分录\"%s\"."
@@ -3190,15 +3072,15 @@ msgid "Sale journal"
 msgstr "销售分类帐"
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "您必须定义这 '%s' 的辅助核算账簿！"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3206,7 +3088,7 @@ msgid ""
 msgstr "这个分类账已经包含了分录，因此不能修改他的公司字段"
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3268,9 +3150,10 @@ msgid ""
 msgstr "行显示的非强制性数量，如：已销售产品。这数量不是一个强制要求，但对一些报表非常有用。"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "第2行"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3316,12 +3199,6 @@ msgstr "税基金额"
 msgid "Default Sale Tax"
 msgstr "默认销售税"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "发票 '%s' 已审核"
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3355,7 +3232,7 @@ msgid "Fiscal Position"
 msgstr "财务结构"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3384,7 +3261,7 @@ msgid "Trial Balance"
 msgstr "试算平衡"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr "不能适应初始余额（负数）"
@@ -3451,7 +3328,7 @@ msgstr ""
 "将选择要兑换货币的当前汇率。在大多数国家法定为“平均”，但只有少数软件系统能够管理。 所以如果你要导入另一个软件系统，你可能需要使用当日汇率。"
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "模版科目没有上级代码"
@@ -3463,9 +3340,9 @@ msgid "No. of Digits to use for account code"
 msgstr "科目代码使用数字"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "条款名称"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3514,7 +3391,7 @@ msgid "View"
 msgstr "视图"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3535,15 +3412,20 @@ msgstr "形式发票"
 msgid "Electronic File"
 msgstr "电子文件"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "公司有一个会计科目表"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  本月: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "税编码模板"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3551,10 +3433,89 @@ msgid "Account Partner Ledger"
 msgstr "业务伙伴会计帐本(往来帐)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
-msgstr "%s <b>被创建</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
 
 #. module: account
 #: view:account.period:0
@@ -3684,12 +3645,15 @@ msgid "Account Tax Declaration"
 msgstr "会计税务申报"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  值: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr "如果您指定其它名称，它创建的凭证或分录将用报表名相同的名称。这使得报表它自己关联相似的分录。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3704,7 +3668,7 @@ msgid "Starting Balance"
 msgstr "期初余额"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定义业务伙伴！"
@@ -3904,7 +3868,7 @@ msgid "Period Length (days)"
 msgstr "期间（天数）"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3928,7 +3892,7 @@ msgid "Category of Product"
 msgstr "产品类别"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4064,7 +4028,7 @@ msgid "Chart of Accounts Template"
 msgstr "科目一览表模板"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4151,9 +4115,12 @@ msgid "Qty"
 msgstr "数量"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "有异议"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr "您可以在这里输入一个将用于在合并父税事务金额时系数，例如：1为加，-1为减。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4236,11 +4203,6 @@ msgstr "还没有配置好公司"
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4258,11 +4220,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "设置银行科目"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4307,8 +4264,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4338,7 +4295,7 @@ msgid "Consolidated Children"
 msgstr "合并子科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4372,11 +4329,6 @@ msgstr ""
 msgid "title"
 msgstr "标题"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4466,6 +4418,13 @@ msgstr "月结束为30天"
 msgid "Analytic Balance"
 msgstr "辅助核算余额"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4485,6 +4444,11 @@ msgstr "如果活动字段设置为False，您将可以隐藏它而不在科目
 msgid "Posted Journal Items"
 msgstr "已登帐凭证"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4495,11 +4459,6 @@ msgstr "搜寻税模板"
 msgid "Draft Entries"
 msgstr "草案项"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  每月第几日= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4508,11 +4467,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  天数：30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4536,20 +4490,9 @@ msgid "Account Type"
 msgstr "类型"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "关闭出纳账"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4570,9 +4513,20 @@ msgid ""
 msgstr "（时间表，一些采购产品，... ...）分析成本来辅助核算项。用来产生供应商发票草稿。"
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "关闭出纳账"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4600,7 +4554,7 @@ msgid "Month"
 msgstr "月份"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4611,8 +4565,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4636,6 +4590,11 @@ msgstr "Paypal账户"
 msgid "Acc.Type"
 msgstr "科目类型"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4648,7 +4607,7 @@ msgstr "余额取反"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "资产负债表"
@@ -4670,7 +4629,7 @@ msgid "Account Base Code"
 msgstr "税基编码"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4725,11 +4684,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "定期处理"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4759,10 +4713,9 @@ msgid "Account chart"
 msgstr "科目一览表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "供应商发票"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4830,10 +4783,14 @@ msgstr "欠款单据"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4882,7 +4839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4897,7 +4854,7 @@ msgid "Based On"
 msgstr "基于"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4922,11 +4879,6 @@ msgstr ""
 msgid "Change"
 msgstr "改变"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "银行和支票"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4949,11 +4901,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "已取消"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "例子"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4964,11 +4911,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "留空为使用利润科目"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4978,7 +4920,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "采购税 %.2f%%"
@@ -5052,16 +4994,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "杂项"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} 发票 (编号 ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5172,6 +5109,7 @@ msgstr "添加"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "已付"
 
@@ -5198,7 +5136,7 @@ msgid ""
 msgstr "设置科目，用于退款时发票上默认税科目。留空使用费用科目。"
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "打开期间"
@@ -5213,14 +5151,6 @@ msgstr "要复核的凭证"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5233,7 +5163,7 @@ msgid "Tax Application"
 msgstr "税适用"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5266,9 +5196,9 @@ msgid "End of period"
 msgstr "结束会计期间"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "银行信息"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "发票付款"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5361,14 +5291,6 @@ msgstr "税说明"
 msgid "Child Tax Accounts"
 msgstr "子税科目"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5413,7 +5335,7 @@ msgid "Target Moves"
 msgstr "目标"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5449,6 +5371,7 @@ msgid "Python Code (reverse)"
 msgstr "Python代码(reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5462,12 +5385,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr "这个选项用于确定你是否希望提示用户输入销售和采购的税率，或者是从下拉列表选择税。这是设置税模版的最后一步。"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5493,18 +5410,13 @@ msgstr "年"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "第一行"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "内部名称"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5543,7 +5455,7 @@ msgstr "资产负债表"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "损益表"
@@ -5576,7 +5488,7 @@ msgid "Compute Code (if type=code)"
 msgstr "计算代码(如果类型=代码)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5603,6 +5515,7 @@ msgstr "自动核销"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5703,7 +5616,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5731,7 +5644,7 @@ msgid "Amount Computation"
 msgstr "计算金额"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5767,10 +5680,16 @@ msgid "Account Common Account Report"
 msgstr "科目合并的科目报表"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "沟通"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "待支付"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5800,9 +5719,7 @@ msgstr "税编码"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "客户红字发票"
 
@@ -5819,11 +5736,6 @@ msgstr "税编码符号(1为正数)"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "最近15天创建发票的报表"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  享受现金折扣的天数：14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5840,6 +5752,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "支付金额"
@@ -5928,8 +5841,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5952,6 +5863,13 @@ msgstr "普通文本"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "核销的第二个输入项是付款分录"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5959,13 +5877,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr "部分金额可以加起来作为找到的平衡点来强制填充自动核销"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr "这序列字段用于付款条款的从低到高排序."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -6023,12 +5934,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "固定金额"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr "你不能修改税，你需要删去并且重建这一行"
@@ -6052,7 +5962,6 @@ msgstr "产生开启分录"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "税金的计算方法"
 
@@ -6080,18 +5989,23 @@ msgid "Child Accounts"
 msgstr "子科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "会计凭证号 (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "补差额"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "凭证"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6108,7 +6022,7 @@ msgstr "收入"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "供应商"
@@ -6128,16 +6042,11 @@ msgid "Account n°"
 msgstr "科目编码"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "无限制的单号"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "定价"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6247,7 +6156,7 @@ msgid "Filter by"
 msgstr "筛选"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "模型中存在错误的表达式 \"%(...)s\""
@@ -6294,6 +6203,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "天数"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr "你不能核准这个分类账分录，因为科目 \"%s\" 不属于科目表 \"%s\"."
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6433,7 +6350,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6608,7 +6525,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6639,12 +6556,6 @@ msgstr ""
 msgid "Current"
 msgstr "当前的"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6669,7 +6580,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "百分比"
 
@@ -6689,7 +6599,7 @@ msgid "Power"
 msgstr "强制"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "不能生成一个未使用的凭证代码。"
@@ -6734,12 +6644,17 @@ msgid "Applicable Type"
 msgstr "适用类型"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "发票"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6755,12 +6670,12 @@ msgid ""
 msgstr "序列字段用于税从低到高排序, 如果税中有子税这排序是重要的"
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6827,7 +6742,7 @@ msgid "Optional create"
 msgstr "非强制创建"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6838,9 +6753,7 @@ msgstr "你不能修改已经存在凭证的公司帐户。"
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "供应商红字发票"
 
@@ -6878,9 +6791,12 @@ msgid "Group By..."
 msgstr "分组..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  估值:平衡"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6956,6 +6872,13 @@ msgstr "税的名称必须是每个公司唯一的"
 msgid "Cash Transactions"
 msgstr "现金交易"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6973,7 +6896,7 @@ msgstr "辅助核算统计"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "凭证： "
@@ -6991,14 +6914,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "True"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "资产负债表(资产帐户)"
@@ -7014,10 +6936,9 @@ msgid "Total debit"
 msgstr "借方合计"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "凭证\"%s\"无效！"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "要核销的下一个往来凭证"
 
 #. module: account
 #: report:account.invoice:0
@@ -7066,7 +6987,7 @@ msgstr "创建分录"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "损益(费用账户)"
@@ -7077,13 +6998,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -7120,6 +7042,11 @@ msgstr "项目明细"
 msgid "Manual"
 msgstr "手动"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7219,8 +7146,8 @@ msgstr "选择账簿"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "期初余额"
@@ -7300,7 +7227,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7320,6 +7247,11 @@ msgstr ""
 "\n"
 "例如：日期为 %(date)s 的定期发生凭证"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7373,7 +7305,7 @@ msgid "Done"
 msgstr "完成"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7407,10 +7339,9 @@ msgid "Source Document"
 msgstr "源单据"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "银行帐号被打印在每个输出单据的页脚。"
 
 #. module: account
 #: constraint:account.account:0
@@ -7436,7 +7367,7 @@ msgid "Taxes:"
 msgstr "税:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7628,6 +7559,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr "这字段只用于，如果您开发自己的模块允许开发者在自定义域创建特定的税"
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "发票"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7717,7 +7654,7 @@ msgid "Use model"
 msgstr "使用模型"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7768,7 +7705,7 @@ msgid "Root/View"
 msgstr "根/视图"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7835,7 +7772,7 @@ msgid "Maturity Date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "销售账簿"
@@ -7846,7 +7783,7 @@ msgid "Invoice Tax"
 msgstr "发票税"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "没会计期间!"
@@ -7887,7 +7824,7 @@ msgid "Sales Properties"
 msgstr "销售属性"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7912,7 +7849,7 @@ msgstr "到"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "汇兑损益调整"
@@ -7944,7 +7881,7 @@ msgid "May"
 msgstr "5"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "定义了全局税，但发票行中没有！"
@@ -7962,10 +7899,9 @@ msgid ""
 msgstr "这个字段用于从低到高对记录进行排序"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "事务编码"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7981,17 +7917,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "登账"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "客户"
@@ -8007,7 +7938,7 @@ msgstr "报表名称"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "现金"
@@ -8019,9 +7950,11 @@ msgid "Account Destination"
 msgstr "目标科目"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "发票付款"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8029,7 +7962,6 @@ msgstr "发票付款"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8161,15 +8093,14 @@ msgid "Partner Ledger"
 msgstr "业务伙伴分类账"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "固定"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -8237,7 +8168,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "在发票上选择合适的币别"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "没有发票明细"
@@ -8314,7 +8245,7 @@ msgid "Associated Partner"
 msgstr "相关业务伙伴"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必须首先选择一个业务伙伴!"
@@ -8394,13 +8325,13 @@ msgid ""
 msgstr "如果在计算未来的税前这税额必须包含在税基金额里，请设置"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "采购红字发票账簿"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8471,7 +8402,7 @@ msgid "Net Total:"
 msgstr "不含税合计:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8491,13 +8422,6 @@ msgstr "通用报告"
 msgid "Write-Off Journal"
 msgstr "补差额账簿"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "这付款条款将替代为当前业务伙伴默认的."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8524,11 +8448,6 @@ msgstr "Int.Type"
 msgid "Tax/Base Amount"
 msgstr "税/不含税金额"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  现金折扣比率：百分数"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8582,6 +8501,11 @@ msgstr "核销结果"
 msgid "Ending Balance"
 msgstr "期末结余"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8622,7 +8546,7 @@ msgid "Automatic import of the bank sta"
 msgstr "自动导入银行对账单"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8645,7 +8569,12 @@ msgid "Account Types"
 msgstr "科目类型"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8653,9 +8582,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  金额：无"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P＆L / BS分类"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8672,10 +8601,9 @@ msgid "Reconciliation"
 msgstr "核销"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "应收款科目"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "留空为使用利润科目"
 
 #. module: account
 #: view:account.invoice:0
@@ -8749,7 +8677,7 @@ msgid "The partner account used for this invoice."
 msgstr "这发票用这业务伙伴科目"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "税 %.2f%%"
@@ -8767,13 +8695,13 @@ msgid "Payment Term Line"
 msgstr "付款条款明细"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "采购账簿"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "小计"
 
@@ -8802,11 +8730,6 @@ msgstr "到期日期"
 msgid "Suppliers"
 msgstr "供应商列表"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "True"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8941,9 +8864,10 @@ msgid "Journal Name"
 msgstr "账簿名称"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "要核销的下一个往来凭证"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "凭证\"%s\"无效！"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8988,7 +8912,7 @@ msgid ""
 msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它货币金额."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9049,7 +8973,7 @@ msgid "Reconciled entries"
 msgstr "核销分录"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "模型有误！"
@@ -9071,7 +8995,7 @@ msgid "Print Account Partner Balance"
 msgstr "打印业务伙伴余额"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9107,7 +9031,7 @@ msgstr "未知的"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "账簿的开账分录"
@@ -9152,7 +9076,7 @@ msgid ""
 msgstr "设定，如果税计算是基于子税而不是总金额"
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9167,18 +9091,9 @@ msgstr "Python代码"
 msgid "Journal Code"
 msgstr "账簿编码"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr "您可以在这里输入一个将用于在合并父税事务金额时系数，例如：1为加，-1为减。"
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "余额"
 
@@ -9211,7 +9126,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "销售红字发票账簿"
@@ -9277,7 +9192,7 @@ msgid "Purchase Tax(%)"
 msgstr "进项税(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "请创建发票明细。"
@@ -9296,7 +9211,7 @@ msgid "Display Detail"
 msgstr "显示明细"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9411,21 +9326,11 @@ msgstr "经会计师生效的发票分录 "
 msgid "Number of Periods"
 msgstr "周期次数"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "税编码模板"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "文档:客户科目报表"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P＆L / BS分类"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9437,9 +9342,10 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
-msgstr ""
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr "发票已经被核销"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9458,14 +9364,14 @@ msgid "Document"
 msgstr "单据"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "银行对账单"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "应收款科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9566,8 +9472,8 @@ msgid "Move"
 msgstr "凭证"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9644,11 +9550,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "反核销处理"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9666,11 +9567,16 @@ msgid "Balance :"
 msgstr "余额:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9707,13 +9613,6 @@ msgstr "周期性"
 msgid "Account Analytic Balance"
 msgstr "辅助核算余额"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9753,7 +9652,13 @@ msgid "Due date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9844,7 +9749,7 @@ msgid "Unreconciled"
 msgstr "反核销"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "坏的合计!"
@@ -9929,7 +9834,7 @@ msgid "Comparison"
 msgstr "比较"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9947,6 +9852,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -10000,11 +9910,6 @@ msgstr "贷方"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -10016,7 +9921,7 @@ msgid "Journal Entry Model"
 msgstr "账簿分录模型"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10101,7 +10006,7 @@ msgid "Profit (Loss) to report"
 msgstr "要打印的损益"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10424,7 +10329,14 @@ msgid "Empty Accounts ? "
 msgstr "科目留空？ "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10549,7 +10461,7 @@ msgid "Receivable accounts"
 msgstr "应收款科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10677,7 +10589,7 @@ msgid "Entries Sorted by"
 msgstr "排序依据："
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10783,7 +10695,7 @@ msgid "Accounting Documents"
 msgstr "会计凭证"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10828,7 +10740,7 @@ msgid "Manual Invoice Taxes"
 msgstr "手动的发票税(非主营业务纳税)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10907,14 +10819,6 @@ msgstr ""
 msgid "February"
 msgstr "2"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr "如果您指定其它名称，它创建的凭证或分录将用报表名相同的名称。这使得报表它自己关联相似的分录。"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10973,6 +10877,11 @@ msgstr "科目一览模版"
 msgid "Expense Account on Product Template"
 msgstr "产品模板的费用科目"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10999,9 +10908,6 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Select Message"
 #~ msgstr "选择消息"
 
-#~ msgid "Fixed"
-#~ msgstr "固定"
-
 #~ msgid "Description on invoices"
 #~ msgstr "发票说明"
 
@@ -11029,6 +10935,10 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Cancel Invoice"
 #~ msgstr "取消发票"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "供应商发票"
+
 #~ msgid "Pay invoice"
 #~ msgstr "支付发票"
 
@@ -11065,6 +10975,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "State"
 #~ msgstr "状态"
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid "Sign for parent"
 #~ msgstr "上级符号"
 
@@ -11294,6 +11207,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "PRO-FORMA Customer Invoices"
 #~ msgstr "客户形式发票"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Current Date"
 #~ msgstr "当前日期"
 
@@ -11324,6 +11240,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Delta Debit"
 #~ msgstr "第三借方"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "定期处理"
+
 #~ msgid "Line"
 #~ msgstr "明细"
 
@@ -11700,6 +11619,11 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Accounts by type"
 #~ msgstr "按类型划分的科目"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr "这序列字段用于付款条款的从低到高排序."
+
 #~ msgid ""
 #~ "Indicate if the tax computation is based on the value computed for the "
 #~ "computation of child taxes or based on the total amount."
@@ -11978,6 +11902,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Purchase Taxes"
 #~ msgstr "进项税"
 
+#~ msgid "Line Name"
+#~ msgstr "条款名称"
+
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "选择你要支付和要放款的发票"
 
@@ -11987,6 +11914,11 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Customer Credit"
 #~ msgstr "客户信用"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr "如果执行反核销, 你必须检验链接该处理的所有操作. 因为他们不会被禁止."
+
 #~ msgid "Validated accounting entries."
 #~ msgstr "已审核的凭证"
 
@@ -12215,6 +12147,11 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Invoice line"
 #~ msgstr "发票行"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "这付款条款将替代为当前业务伙伴默认的."
+
 #~ msgid ""
 #~ "Check this box if you want to print all entries when printing the General "
 #~ "Ledger, otherwise it will only print its balance."
@@ -12673,6 +12610,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Manager"
 #~ msgstr "经理"
 
+#~ msgid "Line 2:"
+#~ msgstr "第2行"
+
 #~ msgid "Invoice State"
 #~ msgstr "发票状态"
 
@@ -12736,12 +12676,18 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Starting Date"
 #~ msgstr "开始日期"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "银行和支票"
+
 #~ msgid "Third Party (Country)"
 #~ msgstr "第三方（国家）"
 
 #~ msgid "Transaction"
 #~ msgstr "交易"
 
+#~ msgid "Line 1:"
+#~ msgstr "第一行"
+
 #~ msgid "Debit/Credit"
 #~ msgstr "借/贷"
 
@@ -12882,6 +12828,11 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "包括已核销分录"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr "如果您反核销交易，您必须检查所有与这交易有关的操作，因为他们不会被关闭。"
+
 #~ msgid ""
 #~ "The Profit and Loss report gives you an overview of your company profit and "
 #~ "loss in a single document"
@@ -13055,6 +13006,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "account entries!"
 #~ msgstr "您不能修改这科目类型从'%s'  到 '%s' 因为它含有分录"
 
+#~ msgid "Litigation"
+#~ msgstr "有异议"
+
 #~ msgid "Avg. Due Delay"
 #~ msgstr "平均延误"
 
@@ -13276,6 +13230,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "No period found !"
 #~ msgstr "没找到会计期间!"
 
+#~ msgid "Communication"
+#~ msgstr "沟通"
+
 #~ msgid "Sort By"
 #~ msgstr "排序方式"
 
@@ -13292,6 +13249,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "systems in."
 #~ msgstr "简化发票的付款，并在系统里创建挂钩的自动付款。"
 
+#~ msgid "Valuation"
+#~ msgstr "定价"
+
 #~ msgid ""
 #~ "The tax code definition depends on the tax declaration of your country. "
 #~ "OpenERP allows you to define the tax structure and manage it from this menu. "
@@ -14027,6 +13987,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Cancel: refund invoice and reconcile"
 #~ msgstr "取消：发票退款并核销"
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "于第14个工作日支付总款2%，余款至30个工作日所在月之月末支付"
+
 #~ msgid ""
 #~ "When doing multi-currency transactions, you may loose or gain some amount "
 #~ "due to changes of exchange rate. This menu gives you a forecast of the Gain "
@@ -14102,6 +14065,16 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "balance!"
 #~ msgstr "要设置期初余额需在凭证簿设置中勾选合并选项"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "发票 '%s' 已审核"
+
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  本月: 0"
+
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  值: 0.02"
+
 #, python-format
 #~ msgid ""
 #~ "You can not delete an invoice which is open or paid. We suggest you to "
@@ -14123,9 +14096,15 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "每个公司的货币代码必须唯一"
 
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  天数：30"
+
 #~ msgid "Bank Account Owner"
 #~ msgstr "银行帐户所有者"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  每月第几日= -1"
+
 #~ msgid "Error! The start date of the fiscal year must be before his end date."
 #~ msgstr "错误！ 财年的开始日期须小于截止日期"
 
@@ -14180,6 +14159,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "You can not remove an account containing journal items."
 #~ msgstr "您不能删除已经存在凭证的账户。"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  估值:平衡"
+
 #, python-format
 #~ msgid "You can not desactivate an account that contains some journal items."
 #~ msgstr "您不能停用已经存在凭证的账户。"
@@ -14245,6 +14227,12 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Encoding error"
 #~ msgstr "输入错误"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} 发票 (编号 ${object.number or 'n/a' })"
+
+#~ msgid "Example"
+#~ msgstr "例子"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -14278,6 +14266,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "You can not create journal items on closed account."
 #~ msgstr "凭证上不能使用已关闭的科目"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  享受现金折扣的天数：14"
+
 #~ msgid "This action will erase taxes"
 #~ msgstr "此操作将删除税"
 
@@ -14313,6 +14304,12 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "日期%s没有对应的期间！\n"
 #~ "请新建一个。"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  金额：无"
+
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  现金折扣比率：百分数"
+
 #~ msgid "Review your Financial Accounts"
 #~ msgstr "检查你的会计科目"
 
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index eccd7ceb0ff..9fa30488a3e 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 15:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:27+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,11 +28,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -79,9 +74,9 @@ msgid "Import from invoice or payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -92,13 +87,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -109,7 +97,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -138,19 +125,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -162,7 +149,7 @@ msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,11 +218,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -251,6 +233,11 @@ msgstr ""
 msgid "Belgian Reports"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -377,11 +364,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -436,6 +418,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -451,6 +438,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -612,13 +604,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -667,7 +652,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,13 +663,13 @@ msgid "Report of the Sales by Account Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -747,6 +732,11 @@ msgstr ""
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -769,6 +759,12 @@ msgstr ""
 msgid "Are you sure you want to create entries?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -789,6 +785,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -831,7 +828,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -854,24 +851,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -902,11 +893,6 @@ msgstr ""
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -937,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -952,6 +938,7 @@ msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr ""
 
@@ -983,11 +970,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1023,7 +1007,7 @@ msgid "Liability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1094,10 +1078,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1173,8 +1157,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1220,7 +1205,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1516,9 +1501,9 @@ msgid "Account Receivable"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1532,7 +1517,7 @@ msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1587,7 +1572,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1630,6 +1615,12 @@ msgstr ""
 msgid "Supplier Refunds"
 msgstr ""
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1667,7 +1658,6 @@ msgid "Groups"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr ""
@@ -1800,6 +1790,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr ""
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1820,115 +1816,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2037,6 +1929,11 @@ msgstr ""
 msgid "Draft statement"
 msgstr ""
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2065,26 +1962,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2092,16 +1988,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2112,8 +2008,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2158,7 +2054,7 @@ msgid "period close"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2258,7 +2154,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2617,7 +2513,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2635,7 +2531,7 @@ msgid "Create an Account Based on this Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2656,7 +2552,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2664,14 +2560,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr ""
 
@@ -2697,18 +2591,6 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2720,6 +2602,11 @@ msgstr ""
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2797,24 +2684,19 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr ""
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
 msgstr ""
 
 #. module: account
@@ -2838,7 +2720,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2848,9 +2729,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2880,6 +2760,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "稅項"
 
@@ -2915,14 +2796,14 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3019,6 +2900,12 @@ msgstr ""
 msgid "Refund Base Code"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3071,11 +2958,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3116,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3129,7 +3011,7 @@ msgid "Sales by Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3145,15 +3027,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3161,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3223,8 +3105,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
 msgstr ""
 
 #. module: account
@@ -3271,12 +3154,6 @@ msgstr ""
 msgid "Default Sale Tax"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr ""
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3310,7 +3187,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3337,7 +3214,7 @@ msgid "Trial Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3403,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3415,8 +3292,8 @@ msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
 msgstr ""
 
 #. module: account
@@ -3466,7 +3343,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3487,14 +3364,19 @@ msgstr ""
 msgid "Electronic File"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
 msgstr ""
 
 #. module: account
@@ -3503,9 +3385,88 @@ msgid "Account Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3631,12 +3592,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3651,7 +3615,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3851,7 +3815,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3875,7 +3839,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4011,7 +3975,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4096,8 +4060,11 @@ msgid "Qty"
 msgstr ""
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 msgstr ""
 
 #. module: account
@@ -4181,11 +4148,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4203,11 +4165,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4252,8 +4209,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4283,7 +4240,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4315,11 +4272,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4409,6 +4361,13 @@ msgstr ""
 msgid "Analytic Balance"
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4428,6 +4387,11 @@ msgstr ""
 msgid "Posted Journal Items"
 msgstr ""
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4438,11 +4402,6 @@ msgstr ""
 msgid "Draft Entries"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4451,11 +4410,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr ""
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4479,19 +4433,8 @@ msgid "Account Type"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
 msgstr ""
 
 #. module: account
@@ -4513,8 +4456,19 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: account
@@ -4543,7 +4497,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4554,8 +4508,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4579,6 +4533,11 @@ msgstr ""
 msgid "Acc.Type"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4591,7 +4550,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr ""
@@ -4613,7 +4572,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4668,11 +4627,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4702,10 +4656,9 @@ msgid "Account chart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
-msgstr "供應商發票"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4773,10 +4726,14 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4825,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4840,7 +4797,7 @@ msgid "Based On"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -4865,11 +4822,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4892,11 +4844,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4907,11 +4854,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4921,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4995,16 +4937,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr ""
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5115,6 +5052,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr ""
 
@@ -5141,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr ""
@@ -5156,14 +5094,6 @@ msgstr ""
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5176,7 +5106,7 @@ msgid "Tax Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5209,8 +5139,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
 msgstr ""
 
 #. module: account
@@ -5304,14 +5234,6 @@ msgstr ""
 msgid "Child Tax Accounts"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5356,7 +5278,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5392,6 +5314,7 @@ msgid "Python Code (reverse)"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5405,12 +5328,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5436,18 +5353,13 @@ msgstr ""
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "內部名稱"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5486,7 +5398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr ""
@@ -5519,7 +5431,7 @@ msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5546,6 +5458,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5646,7 +5559,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5674,7 +5587,7 @@ msgid "Amount Computation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5710,9 +5623,15 @@ msgid "Account Common Account Report"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
 msgstr ""
 
 #. module: account
@@ -5743,9 +5662,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr ""
 
@@ -5762,11 +5679,6 @@ msgstr ""
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr ""
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5783,6 +5695,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr ""
@@ -5871,8 +5784,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5895,6 +5806,13 @@ msgstr ""
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5902,13 +5820,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5966,12 +5877,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -5995,7 +5905,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -6023,18 +5932,23 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr ""
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6051,7 +5965,7 @@ msgstr ""
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -6071,16 +5985,11 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6190,7 +6099,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6237,6 +6146,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6376,7 +6293,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6551,7 +6468,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6582,12 +6499,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6612,7 +6523,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
@@ -6632,7 +6542,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6677,12 +6587,17 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6698,12 +6613,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6770,7 +6685,7 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6781,9 +6696,7 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr ""
 
@@ -6821,8 +6734,11 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
 msgstr ""
 
 #. module: account
@@ -6899,6 +6815,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr ""
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6916,7 +6839,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6934,14 +6857,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "正確"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6957,9 +6879,8 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
 msgstr ""
 
 #. module: account
@@ -7009,7 +6930,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr ""
@@ -7020,13 +6941,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -7063,6 +6985,11 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7161,8 +7088,8 @@ msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -7242,7 +7169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7255,6 +7182,11 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7308,7 +7240,7 @@ msgid "Done"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7340,9 +7272,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7369,7 +7300,7 @@ msgid "Taxes:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7561,6 +7492,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr ""
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7650,7 +7587,7 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7701,7 +7638,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7768,7 +7705,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7779,7 +7716,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7818,7 +7755,7 @@ msgid "Sales Properties"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7843,7 +7780,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7875,7 +7812,7 @@ msgid "May"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7893,9 +7830,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
 msgstr ""
 
 #. module: account
@@ -7912,17 +7848,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr ""
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -7938,7 +7869,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7950,8 +7881,10 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
 msgstr ""
 
 #. module: account
@@ -7960,7 +7893,6 @@ msgstr ""
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8092,15 +8024,14 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "固定"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "警告!"
@@ -8168,7 +8099,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -8243,7 +8174,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8323,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8400,7 +8331,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8420,13 +8351,6 @@ msgstr ""
 msgid "Write-Off Journal"
 msgstr ""
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr ""
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8453,11 +8377,6 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr ""
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8511,6 +8430,11 @@ msgstr ""
 msgid "Ending Balance"
 msgstr ""
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8551,7 +8475,7 @@ msgid "Automatic import of the bank sta"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8574,7 +8498,12 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8582,8 +8511,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
 msgstr ""
 
 #. module: account
@@ -8601,9 +8530,8 @@ msgid "Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
@@ -8676,7 +8604,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8694,13 +8622,13 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr ""
 
@@ -8729,11 +8657,6 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "正確"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8868,8 +8791,9 @@ msgid "Journal Name"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
@@ -8915,7 +8839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8976,7 +8900,7 @@ msgid "Reconciled entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8998,7 +8922,7 @@ msgid "Print Account Partner Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9032,7 +8956,7 @@ msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -9077,7 +9001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9092,18 +9016,9 @@ msgstr ""
 msgid "Journal Code"
 msgstr ""
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr ""
 
@@ -9136,7 +9051,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -9202,7 +9117,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -9221,7 +9136,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9336,21 +9251,11 @@ msgstr ""
 msgid "Number of Periods"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr ""
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9362,8 +9267,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9383,14 +9289,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9491,8 +9397,8 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9569,11 +9475,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9591,11 +9492,16 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9632,13 +9538,6 @@ msgstr ""
 msgid "Account Analytic Balance"
 msgstr ""
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9678,7 +9577,13 @@ msgid "Due date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9767,7 +9672,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9850,7 +9755,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9868,6 +9773,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9921,11 +9831,6 @@ msgstr ""
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9937,7 +9842,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10022,7 +9927,7 @@ msgid "Profit (Loss) to report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10345,7 +10250,14 @@ msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10470,7 +10382,7 @@ msgid "Receivable accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10597,7 +10509,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10703,7 +10615,7 @@ msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10748,7 +10660,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10827,14 +10739,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10893,6 +10797,11 @@ msgstr ""
 msgid "Expense Account on Product Template"
 msgstr ""
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10927,9 +10836,6 @@ msgstr ""
 #~ "The real total does not match the computed total."
 #~ msgstr "請核對發票上的價格"
 
-#~ msgid "Fixed"
-#~ msgstr "固定"
-
 #~ msgid "Origin"
 #~ msgstr "原本"
 
@@ -10945,6 +10851,10 @@ msgstr ""
 #~ msgid "Contra"
 #~ msgstr "沖消"
 
+#, python-format
+#~ msgid "Supplier invoice"
+#~ msgstr "供應商發票"
+
 #~ msgid "Printing Date"
 #~ msgstr "列印日期"
 
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index 0afe411818a..766e1b89d51 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-21 06:06+0000\n"
 "Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\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: 2012-12-04 05:28+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,11 +27,6 @@ msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "反核銷"
-
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid ""
@@ -78,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "從發票或支付款導入"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -91,13 +86,6 @@ msgstr ""
 msgid "Total Debit"
 msgstr "借方合計"
 
-#. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
-msgstr "如果您有未調節交易，您必須檢查所有與此交易有關的操作，因為他們不會被關閉。"
-
 #. module: account
 #: constraint:account.account.template:0
 msgid ""
@@ -108,7 +96,6 @@ msgstr ""
 #. module: account
 #. openerp-web
 #: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
@@ -137,19 +124,19 @@ msgid ""
 msgstr "如果設置為false，該付款條件將會被隱藏。"
 
 #. module: account
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:685
-#: code:addons/account/account.py:780
-#: code:addons/account/account.py:1043
-#: code:addons/account/account_invoice.py:776
-#: code:addons/account/account_invoice.py:779
-#: code:addons/account/account_invoice.py:782
-#: code:addons/account/account_invoice.py:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/account_move_line.py:820
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -161,7 +148,7 @@ msgid "Warning!"
 msgstr "警告！"
 
 #. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "其它帳簿"
@@ -230,11 +217,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr "稅範本"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "account.tax"
-
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
@@ -250,6 +232,11 @@ msgstr "調節的第一個輸入是科目分錄"
 msgid "Belgian Reports"
 msgstr "比利時報表"
 
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
@@ -376,11 +363,6 @@ msgstr ""
 msgid "Salesperson"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
@@ -435,6 +417,11 @@ msgid ""
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -450,6 +437,11 @@ msgstr ""
 msgid "Chart Template"
 msgstr "科目一覽表模板"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
@@ -611,13 +603,6 @@ msgstr ""
 msgid "3 Monthly"
 msgstr "3個月"
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr "如果執行未調節的交易, 你必須檢驗鏈接該處理的所有操作. 因為他們不會被禁止."
-
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
@@ -666,7 +651,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "根據輸入的日期沒有找到期間或找到了多個期間"
@@ -677,13 +662,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "銷售報表的科目類型"
 
 #. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -746,6 +731,11 @@ msgstr "應收帳款科目"
 msgid "Configure your company bank accounts"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -768,6 +758,12 @@ msgstr "重開"
 msgid "Are you sure you want to create entries?"
 msgstr "你確定要建立分錄?"
 
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
@@ -788,6 +784,7 @@ msgstr "以層級結構顯示子項"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "百分比"
 
@@ -830,7 +827,7 @@ msgid "Type"
 msgstr "類型"
 
 #. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -853,24 +850,18 @@ msgid "Supplier Invoices And Refunds"
 msgstr "供應商發票和退款"
 
 #. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
 msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
 msgstr "未調節"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr "於第14個工作日支付總款2%，餘款至30個工作日所在月之月末支付"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
@@ -901,11 +892,6 @@ msgstr "J.C.(成本)憑證名稱"
 msgid "Account Code and Name"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -936,7 +922,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -951,6 +937,7 @@ msgstr "新週期性分錄"
 
 #. module: account
 #: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
 msgid "Computation"
 msgstr "計算"
 
@@ -982,11 +969,8 @@ msgid "Purchase journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1316
-#, python-format
-msgid ""
-"You cannot validate this journal entry because account \"%s\" does not "
-"belong to chart of accounts \"%s\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
 msgstr ""
 
 #. module: account
@@ -1022,7 +1006,7 @@ msgid "Liability"
 msgstr "負債"
 
 #. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "請為這張發票對應的帳簿選擇編號規則"
@@ -1093,10 +1077,10 @@ msgid "Features"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
 #: code:addons/account/account_bank_statement.py:423
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1172,8 +1156,9 @@ msgid "Refund "
 msgstr ""
 
 #. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: account
@@ -1219,7 +1204,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Bank"
 msgstr "銀行"
@@ -1515,9 +1500,9 @@ msgid "Account Receivable"
 msgstr "應收科目"
 
 #. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1531,7 +1516,7 @@ msgid "With balance is not equal to 0"
 msgstr "餘額不能為0"
 
 #. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1586,7 +1571,7 @@ msgstr "如果是手工分錄的話就跳過「草稿」狀態"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
 msgstr ""
@@ -1629,6 +1614,12 @@ msgstr "用於控制台視圖的臨時表"
 msgid "Supplier Refunds"
 msgstr "供應商折讓"
 
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "事務編碼"
+
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
@@ -1666,7 +1657,6 @@ msgid "Groups"
 msgstr "群組"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
 msgstr "未完稅"
@@ -1799,6 +1789,12 @@ msgstr ""
 msgid "Sales by Account Type"
 msgstr "銷售科目類型"
 
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
@@ -1819,115 +1815,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
 
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
@@ -2036,6 +1928,11 @@ msgstr "這會計期間可以重疊"
 msgid "Draft statement"
 msgstr "銀行對帳單草稿"
 
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
@@ -2064,26 +1961,25 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: code:addons/account/account.py:929
-#: code:addons/account/account.py:1018
-#: code:addons/account/account.py:1056
-#: code:addons/account/account.py:1058
-#: code:addons/account/account.py:1097
-#: code:addons/account/account.py:1278
-#: code:addons/account/account.py:1292
-#: code:addons/account/account.py:1315
-#: code:addons/account/account.py:1322
-#: code:addons/account/account.py:1542
-#: code:addons/account/account.py:1546
-#: code:addons/account/account.py:1632
-#: code:addons/account/account.py:2305
-#: code:addons/account/account.py:2620
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:367
@@ -2091,16 +1987,16 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:418
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:855
-#: code:addons/account/account_invoice.py:889
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
 #: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:824
-#: code:addons/account/account_move_line.py:847
-#: code:addons/account/account_move_line.py:850
-#: code:addons/account/account_move_line.py:1109
-#: code:addons/account/account_move_line.py:1111
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2111,8 +2007,8 @@ msgstr ""
 #: code:addons/account/wizard/account_invoice_refund.py:111
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
@@ -2157,7 +2053,7 @@ msgid "period close"
 msgstr "關閉一個會計期間"
 
 #. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2257,7 +2153,7 @@ msgid "Product Category"
 msgstr "產品分類"
 
 #. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
 #, python-format
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
@@ -2616,7 +2512,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "所有已開啟的會計年度都保持空白"
 
 #. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
@@ -2634,7 +2530,7 @@ msgid "Create an Account Based on this Template"
 msgstr "根據這個範本建立使用者"
 
 #. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2655,7 +2551,7 @@ msgid "Main Sequence"
 msgstr "主序列"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2663,14 +2559,12 @@ msgid ""
 msgstr "要刪除銀行對帳單，必須先取消並刪除相關借貸項"
 
 #. module: account
-#: field:account.invoice,payment_term:0
 #: field:account.invoice.report,payment_term:0
 #: view:account.payment.term:0
 #: field:account.payment.term,name:0
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
 msgid "Payment Term"
 msgstr "付款條件"
 
@@ -2696,18 +2590,6 @@ msgstr "勾選此項"
 msgid "Filters"
 msgstr "篩選"
 
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr "開啟"
-
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2719,6 +2601,11 @@ msgstr "草稿狀態的發票"
 msgid "Account Properties"
 msgstr ""
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
@@ -2796,25 +2683,20 @@ msgid "Account Model Entries"
 msgstr "科目模型分錄"
 
 #. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
 
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
 msgstr "進項稅額"
 
 #. module: account
-#: view:account.entries.report:0
-msgid "entries"
-msgstr "分錄"
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "銀行信息"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2837,7 +2719,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -2849,9 +2730,8 @@ msgstr ""
 "然後在一個月內支付餘下的50%."
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
 msgstr ""
 
 #. module: account
@@ -2881,6 +2761,7 @@ msgstr "科目移轉明細調節（核銷）"
 #: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
 msgid "Tax"
 msgstr "稅額"
 
@@ -2916,14 +2797,14 @@ msgid "Accounts"
 msgstr "科目"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
 #, python-format
 msgid "Configuration Error!"
@@ -3020,6 +2901,12 @@ msgstr "已付/已調節"
 msgid "Refund Base Code"
 msgstr "退稅基編碼"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "銀行對帳單"
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
 msgid ""
@@ -3072,11 +2959,6 @@ msgstr "業務夥伴以前的餘額表"
 msgid "Accounting entries"
 msgstr "會計分錄"
 
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr "溝通類型"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
@@ -3119,7 +3001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3132,7 +3014,7 @@ msgid "Sales by Account"
 msgstr "銷售科目"
 
 #. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3148,15 +3030,15 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr "您必須在這 '%s' 的帳簿上先定義輔助核算帳簿！"
 
 #. module: account
-#: code:addons/account/account.py:780
+#: code:addons/account/account.py:781
 #, python-format
 msgid ""
 "This journal already contains items, therefore you cannot modify its company "
@@ -3164,7 +3046,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
 #, python-format
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
@@ -3226,9 +3108,10 @@ msgid ""
 msgstr "這個明細顯示的非強制性數量，如：已銷售產品。這數量不是一個強制要求，但對一些報表非常有用。"
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "第2行"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3274,12 +3157,6 @@ msgstr "稅基金額"
 msgid "Default Sale Tax"
 msgstr "預設銷項稅額"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "發票 '%s' 已審核"
-
 #. module: account
 #: help:account.model.line,date_maturity:0
 msgid ""
@@ -3313,7 +3190,7 @@ msgid "Fiscal Position"
 msgstr "財務結構"
 
 #. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3342,7 +3219,7 @@ msgid "Trial Balance"
 msgstr "試算平衡"
 
 #. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
@@ -3409,7 +3286,7 @@ msgstr ""
 "將選擇要兌換貨幣的當前匯率。在大多數國家法定為「平均」，但只有少數軟件系統能夠管理。 所以如果你要導入另一個軟件系統，你可能需要使用當日匯率。"
 
 #. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3421,9 +3298,9 @@ msgid "No. of Digits to use for account code"
 msgstr "科目代碼使用數字"
 
 #. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "條款名稱"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3472,7 +3349,7 @@ msgid "View"
 msgstr "視圖"
 
 #. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3493,15 +3370,20 @@ msgstr "形式發票"
 msgid "Electronic File"
 msgstr "電子文件"
 
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month: 0"
-msgstr "  本月: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "稅編碼模組"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3509,9 +3391,88 @@ msgid "Account Partner Ledger"
 msgstr "業務夥伴會計帳本(往來帳)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account
@@ -3642,12 +3603,15 @@ msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: 0.02"
-msgstr "  值: 0.02"
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr "如果您指定其它名稱，它建立的憑證或分錄將用報表名相同的名稱。這使得報表它自己關聯相似的分錄。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3662,7 +3626,7 @@ msgid "Starting Balance"
 msgstr "期初餘額"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定義業務夥伴！"
@@ -3862,7 +3826,7 @@ msgid "Period Length (days)"
 msgstr "期間（天數）"
 
 #. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3886,7 +3850,7 @@ msgid "Category of Product"
 msgstr "產品類別"
 
 #. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
 #, python-format
 msgid ""
 "There is no fiscal year defined for this date.\n"
@@ -4022,7 +3986,7 @@ msgid "Chart of Accounts Template"
 msgstr "科目一覽表模組"
 
 #. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4109,9 +4073,12 @@ msgid "Qty"
 msgstr "數量"
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "有異議"
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr "您可以在這裡輸入一個將用於在合併父稅事務金額時係數，例如：1為加，-1為減。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4194,11 +4161,6 @@ msgstr ""
 msgid "Expects a Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
@@ -4216,11 +4178,6 @@ msgstr ""
 msgid "Setup your Bank Accounts"
 msgstr "設置銀行科目"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
@@ -4265,8 +4222,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4296,7 +4253,7 @@ msgid "Consolidated Children"
 msgstr "合併子科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4328,11 +4285,6 @@ msgstr "最好使用一個專用的帳簿去控制所有會計年度的開帳分
 msgid "title"
 msgstr "標題"
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
@@ -4422,6 +4374,13 @@ msgstr "月結60天"
 msgid "Analytic Balance"
 msgstr "分析餘額"
 
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
 #. module: account
 #: view:account.config.settings:0
 msgid ""
@@ -4441,6 +4400,11 @@ msgstr "如果活動欄位設置為False，您將可以隱藏它而不在科目
 msgid "Posted Journal Items"
 msgstr "已過帳憑證"
 
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -4451,11 +4415,6 @@ msgstr "搜尋稅模組"
 msgid "Draft Entries"
 msgstr "草案項"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Day of the Month= -1"
-msgstr "  每月第幾日= -1"
-
 #. module: account
 #: help:account.config.settings,decimal_precision:0
 msgid ""
@@ -4464,11 +4423,6 @@ msgid ""
 "0.0231 EUR."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 30"
-msgstr "  天數：30"
-
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
@@ -4492,20 +4446,9 @@ msgid "Account Type"
 msgstr "類型"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to setup a new bank account. \n"
-"          </p><p>\n"
-"            Configure your company's bank account and select those that "
-"must\n"
-"            appear on the report footer.\n"
-"          </p><p>\n"
-"            If you use the accounting application of OpenERP, journals and\n"
-"            accounts will be created automatically based on these data.\n"
-"          </p>\n"
-"        "
-msgstr ""
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "關閉出納帳"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4526,9 +4469,20 @@ msgid ""
 msgstr "（時間表，一些採購產品，... ...）分析成本來輔助核算項。用來產生供應商發票草稿。"
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "關閉出納帳"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4556,7 +4510,7 @@ msgid "Month"
 msgstr "月份"
 
 #. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
@@ -4567,8 +4521,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4592,6 +4546,11 @@ msgstr "Paypal帳戶"
 msgid "Acc.Type"
 msgstr "科目類型"
 
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
@@ -4604,7 +4563,7 @@ msgstr "反向平衡的標誌"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
 msgstr "資產負債表"
@@ -4626,7 +4585,7 @@ msgid "Account Base Code"
 msgstr "稅基編碼"
 
 #. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4681,11 +4640,6 @@ msgstr ""
 msgid "Last Reconciliation:"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "定期處理"
-
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
@@ -4715,9 +4669,8 @@ msgid "Account chart"
 msgstr "科目一覽表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
 msgstr ""
 
 #. module: account
@@ -4786,10 +4739,14 @@ msgstr "欠款單據"
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
 msgstr ""
 
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
@@ -4838,7 +4795,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4853,7 +4810,7 @@ msgid "Based On"
 msgstr "基於"
 
 #. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4878,11 +4835,6 @@ msgstr ""
 msgid "Change"
 msgstr "改變"
 
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "銀行和支票"
-
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
@@ -4905,11 +4857,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "已取消"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr "例子"
-
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
@@ -4920,11 +4867,6 @@ msgstr ""
 msgid "Unit Of Currency Definition"
 msgstr ""
 
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "留空為使用利潤科目"
-
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
 #: help:account.report.general.ledger,amount_currency:0
@@ -4934,7 +4876,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "採購稅 %.2f%%"
@@ -5008,16 +4950,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
 #, python-format
 msgid "MISC"
 msgstr "雜項"
 
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${object.company_id.name} 發票 (編號 ${object.number or 'n/a' })"
-
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
@@ -5128,6 +5065,7 @@ msgstr "添加"
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
 msgstr "已付"
 
@@ -5154,7 +5092,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:889
+#: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
 msgstr "打開期間"
@@ -5169,14 +5107,6 @@ msgstr "要覆核的憑證"
 msgid "Round Globally"
 msgstr ""
 
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
@@ -5189,7 +5119,7 @@ msgid "Tax Application"
 msgstr "稅適用"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5222,9 +5152,9 @@ msgid "End of period"
 msgstr "結束會計期間"
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "銀行信息"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "發票付款"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5317,14 +5247,6 @@ msgstr "稅說明"
 msgid "Child Tax Accounts"
 msgstr "子稅科目"
 
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid ""
-"There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
 #. module: account
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
@@ -5369,7 +5291,7 @@ msgid "Target Moves"
 msgstr "目標"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5405,6 +5327,7 @@ msgid "Python Code (reverse)"
 msgstr "Python代碼(reverse)"
 
 #. module: account
+#: field:account.invoice,payment_term:0
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
@@ -5418,12 +5341,6 @@ msgid ""
 "choice assumes that the set of tax defined on this template is complete"
 msgstr "這個選項用於確定你是否希望提示使用者輸入銷售和採購的稅率，或者是從下拉列表選擇稅。這是設置稅模版的最後一步。"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
@@ -5449,18 +5366,13 @@ msgstr "年"
 msgid "It indicates that the invoice has been sent."
 msgstr ""
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "第一行"
-
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
 msgstr "內部名稱"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5499,7 +5411,7 @@ msgstr "資產負債表"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
 msgstr "損益表"
@@ -5532,7 +5444,7 @@ msgid "Compute Code (if type=code)"
 msgstr "計算代碼(如果類型=代碼)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5559,6 +5471,7 @@ msgstr "自動調節"
 #: view:account.analytic.line:0
 #: field:account.bank.statement.line,amount:0
 #: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
 #: field:account.invoice.tax,amount:0
 #: view:account.move:0
 #: field:account.move,amount:0
@@ -5659,7 +5572,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5687,7 +5600,7 @@ msgid "Amount Computation"
 msgstr "計算金額"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5723,10 +5636,16 @@ msgid "Account Common Account Report"
 msgstr "科目合併的科目報表"
 
 #. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
-msgstr "溝通"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "開啟"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5756,9 +5675,7 @@ msgstr "稅碼"
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Customer Refund"
 msgstr "客戶折讓"
 
@@ -5775,11 +5692,6 @@ msgstr "稅編碼符號(1為正數)"
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "最近15天建立發票的報表"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Number of Days: 14"
-msgstr "  享受現金折扣的天數：14"
-
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
@@ -5796,6 +5708,7 @@ msgid "Fill in this form if you put money in the cash register:"
 msgstr ""
 
 #. module: account
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
 msgstr "支付金額"
@@ -5884,8 +5797,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5908,6 +5819,13 @@ msgstr "普通文本"
 msgid "Payment entries are the second input of the reconciliation."
 msgstr "調節的第二個輸入項是付款分錄"
 
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
@@ -5915,13 +5833,6 @@ msgid ""
 "be chosen as the power of the automatic reconciliation"
 msgstr "部分金額可以加起來作為找到的平衡點來強制填充自動調節"
 
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr "這序列欄位用於付款條件的從低到高排序."
-
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
@@ -5979,12 +5890,11 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr "固定金額"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6008,7 +5918,6 @@ msgstr "產生開啟分錄"
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr "稅金的計算方法"
 
@@ -6036,18 +5945,23 @@ msgid "Child Accounts"
 msgstr "子科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "會計憑證號 (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
 #, python-format
 msgid "Write-Off"
 msgstr "補差額"
 
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr "分錄"
+
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
@@ -6064,7 +5978,7 @@ msgstr "收入"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
 #, python-format
 msgid "Supplier"
 msgstr "供應商"
@@ -6084,16 +5998,11 @@ msgid "Account n°"
 msgstr "科目編碼"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "無限制的單號"
 
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "定價"
-
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
@@ -6203,7 +6112,7 @@ msgid "Filter by"
 msgstr "篩選"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "模型中存在錯誤的表達式 \"%(...)s\""
@@ -6250,6 +6159,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr "天數"
 
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
@@ -6391,7 +6308,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6566,7 +6483,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6597,12 +6514,6 @@ msgstr ""
 msgid "Current"
 msgstr "當前的"
 
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
@@ -6627,7 +6538,6 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr "百分比"
 
@@ -6647,7 +6557,7 @@ msgid "Power"
 msgstr "強制"
 
 #. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "不能生成一個未使用的憑證代碼。"
@@ -6692,12 +6602,17 @@ msgid "Applicable Type"
 msgstr "適用類型"
 
 #. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
 #, python-format
 msgid ""
 "There is no opening/closing period defined, please create one to set the "
@@ -6713,12 +6628,12 @@ msgid ""
 msgstr "序列欄位用於稅從低到高排序, 如果稅中有子稅這排序是重要的"
 
 #. module: account
-#: code:addons/account/account.py:1405
 #: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1439
-#: code:addons/account/account.py:1446
-#: code:addons/account/account_invoice.py:975
-#: code:addons/account/account_move_line.py:995
+#: code:addons/account/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6785,7 +6700,7 @@ msgid "Optional create"
 msgstr "非強制建立"
 
 #. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
 #, python-format
 msgid ""
 "You cannot change the owner company of an account that already contains "
@@ -6796,9 +6711,7 @@ msgstr "你不能修改已經存在借貸項的公司帳戶。"
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
 #: selection:report.invoice.created,type:0
-#, python-format
 msgid "Supplier Refund"
 msgstr "供應商折讓"
 
@@ -6836,9 +6749,12 @@ msgid "Group By..."
 msgstr "分類方式..."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Balance"
-msgstr "  估值:平衡"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6914,6 +6830,13 @@ msgstr ""
 msgid "Cash Transactions"
 msgstr "現金交易"
 
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 #: view:account.bank.statement:0
@@ -6931,7 +6854,7 @@ msgstr "輔助核算統計"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
 #, python-format
 msgid "Entries: "
 msgstr "分錄： "
@@ -6949,14 +6872,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
-msgstr ""
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "真實"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr "資產負債表(資產帳戶)"
@@ -6972,10 +6894,9 @@ msgid "Total debit"
 msgstr "借方合計"
 
 #. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "分錄\"%s\"無效！"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "要調節的下一個往來分錄"
 
 #. module: account
 #: report:account.invoice:0
@@ -7024,7 +6945,7 @@ msgstr "建立分錄"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
 msgstr "損益(費用帳戶)"
@@ -7035,13 +6956,14 @@ msgid "Total Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
 #, python-format
 msgid "Error !"
 msgstr "錯誤！"
@@ -7078,6 +7000,11 @@ msgstr "專案細項"
 msgid "Manual"
 msgstr "手動"
 
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
@@ -7177,8 +7104,8 @@ msgstr "選擇帳簿"
 
 #. module: account
 #: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
 msgstr "期初餘額"
@@ -7258,7 +7185,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7278,6 +7205,11 @@ msgstr ""
 "\n"
 "例如：日期為 %(date)s 的定期發生憑證"
 
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
@@ -7331,7 +7263,7 @@ msgid "Done"
 msgstr "完成"
 
 #. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7365,9 +7297,8 @@ msgid "Source Document"
 msgstr "源單據"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
 
 #. module: account
@@ -7394,7 +7325,7 @@ msgid "Taxes:"
 msgstr "稅:"
 
 #. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
 #, python-format
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
@@ -7586,6 +7517,12 @@ msgid ""
 "to create specific taxes in a custom domain."
 msgstr "這欄位只用於，如果您開發自己的模塊允許開發者在自定義域建立特定的稅"
 
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Invoice Reference"
+
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
@@ -7675,7 +7612,7 @@ msgid "Use model"
 msgstr "使用模型"
 
 #. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7726,7 +7663,7 @@ msgid "Root/View"
 msgstr "根/視圖"
 
 #. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7793,7 +7730,7 @@ msgid "Maturity Date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
 #, python-format
 msgid "Sales Journal"
 msgstr "銷售帳簿"
@@ -7804,7 +7741,7 @@ msgid "Invoice Tax"
 msgstr "發票稅"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
 #, python-format
 msgid "No piece number !"
 msgstr "沒會計期間!"
@@ -7845,7 +7782,7 @@ msgid "Sales Properties"
 msgstr "銷售屬性"
 
 #. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7870,7 +7807,7 @@ msgstr "到"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
 #, python-format
 msgid "Currency Adjustment"
 msgstr "匯兌損益調整"
@@ -7902,7 +7839,7 @@ msgid "May"
 msgstr "5"
 
 #. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "定義了全局稅，但發票行中沒有！"
@@ -7920,10 +7857,9 @@ msgid ""
 msgstr "這個欄位用於從低到高對記錄進行排序"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "事務編碼"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -7939,17 +7875,12 @@ msgstr ""
 msgid "Post Journal Entries"
 msgstr "登帳"
 
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
 #, python-format
 msgid "Customer"
 msgstr "客戶"
@@ -7965,7 +7896,7 @@ msgstr "報表名稱"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3034
+#: code:addons/account/account.py:3044
 #, python-format
 msgid "Cash"
 msgstr "現金"
@@ -7977,9 +7908,11 @@ msgid "Account Destination"
 msgstr "目標科目"
 
 #. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "發票付款"
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7987,7 +7920,6 @@ msgstr "發票付款"
 #: field:account.invoice.line,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.code,sequence:0
@@ -8119,15 +8051,14 @@ msgid "Partner Ledger"
 msgstr "業務夥伴分類帳"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
-msgstr ""
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "固定"
 
 #. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -8195,7 +8126,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "在發票上選擇合適的幣別"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "沒有發票明細"
@@ -8272,7 +8203,7 @@ msgid "Associated Partner"
 msgstr "相關業務夥伴"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必須首先選擇一個業務夥伴!"
@@ -8352,13 +8283,13 @@ msgid ""
 msgstr "如果在計算未來的稅前這稅額必須包含在稅基金額裡，請設置"
 
 #. module: account
-#: code:addons/account/account.py:3138
+#: code:addons/account/account.py:3148
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "進貨退回帳簿"
 
 #. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8429,7 +8360,7 @@ msgid "Net Total:"
 msgstr "不含稅合計:"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
 msgstr ""
@@ -8449,13 +8380,6 @@ msgstr "通用報表"
 msgid "Write-Off Journal"
 msgstr "補差額帳簿"
 
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
-msgstr "這付款條件將替代為當前業務夥伴預設的."
-
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
@@ -8482,11 +8406,6 @@ msgstr "Int.Type"
 msgid "Tax/Base Amount"
 msgstr "稅/不含稅金額"
 
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  Valuation: Percent"
-msgstr "  現金折扣比率：百分數"
-
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid ""
@@ -8540,6 +8459,11 @@ msgstr "調節結果"
 msgid "Ending Balance"
 msgstr "期末結餘"
 
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
@@ -8580,7 +8504,7 @@ msgid "Automatic import of the bank sta"
 msgstr "自動導入銀行對帳單"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
 msgstr ""
@@ -8603,7 +8527,12 @@ msgid "Account Types"
 msgstr "科目類型"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8611,9 +8540,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  Value amount: n.a"
-msgstr "  金額：無"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "P＆L / BS分類"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8630,10 +8559,9 @@ msgid "Reconciliation"
 msgstr "調節"
 
 #. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "應收帳款科目"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "留空為使用利潤科目"
 
 #. module: account
 #: view:account.invoice:0
@@ -8707,7 +8635,7 @@ msgid "The partner account used for this invoice."
 msgstr "這發票用這業務夥伴科目"
 
 #. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "稅 %.2f%%"
@@ -8725,13 +8653,13 @@ msgid "Payment Term Line"
 msgstr "付款條件明細"
 
 #. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
 #, python-format
 msgid "Purchase Journal"
 msgstr "採購帳簿"
 
 #. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
 msgstr "小計"
 
@@ -8760,11 +8688,6 @@ msgstr "到期日期"
 msgid "Suppliers"
 msgstr "供應商列表"
 
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "真實"
-
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
@@ -8899,9 +8822,10 @@ msgid "Journal Name"
 msgstr "帳簿名稱"
 
 #. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
-msgstr "要調節的下一個往來分錄"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "分錄\"%s\"無效！"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8946,7 +8870,7 @@ msgid ""
 msgstr "如果它是一個多貨幣憑證,這金額表示一個可選的其它貨幣金額."
 
 #. module: account
-#: code:addons/account/account_move_line.py:996
+#: code:addons/account/account_move_line.py:1009
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9007,7 +8931,7 @@ msgid "Reconciled entries"
 msgstr "調節分錄"
 
 #. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
 #, python-format
 msgid "Wrong model !"
 msgstr "模型有誤！"
@@ -9029,7 +8953,7 @@ msgid "Print Account Partner Balance"
 msgstr "列印業務夥伴餘額"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9065,7 +8989,7 @@ msgstr "未知的"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "帳簿的開帳分錄"
@@ -9110,7 +9034,7 @@ msgid ""
 msgstr "設定，如果稅計算是基於子稅而不是總金額"
 
 #. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
@@ -9125,18 +9049,9 @@ msgstr "Python代碼"
 msgid "Journal Code"
 msgstr "帳簿編碼"
 
-#. module: account
-#: help:account.tax.code,sign:0
-msgid ""
-"You can specify here the coefficient that will be used when consolidating "
-"the amount of this case into its parent. For example, set 1/-1 if you want "
-"to add/substract it."
-msgstr "您可以在這裡輸入一個將用於在合併父稅事務金額時係數，例如：1為加，-1為減。"
-
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
 msgstr "餘額"
 
@@ -9169,7 +9084,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "銷貨折讓帳簿"
@@ -9235,7 +9150,7 @@ msgid "Purchase Tax(%)"
 msgstr "進項稅(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "請建立發票明細。"
@@ -9254,7 +9169,7 @@ msgid "Display Detail"
 msgstr "顯示明細"
 
 #. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9369,21 +9284,11 @@ msgstr "經會計師生效的發票分錄 "
 msgid "Number of Periods"
 msgstr "週期次數"
 
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "稅編碼模組"
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
 msgstr "文檔:客戶科目報表"
 
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "P＆L / BS分類"
-
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -9395,8 +9300,9 @@ msgid "Supplier credit note sequence"
 msgstr ""
 
 #. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
 msgstr ""
 
 #. module: account
@@ -9416,14 +9322,14 @@ msgid "Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "銀行對帳單"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "應收帳款科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9524,8 +9430,8 @@ msgid "Move"
 msgstr "憑證"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9602,11 +9508,6 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "反核銷"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
@@ -9624,11 +9525,16 @@ msgid "Balance :"
 msgstr "餘額:"
 
 #. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
@@ -9665,13 +9571,6 @@ msgstr "週期性"
 msgid "Account Analytic Balance"
 msgstr "輔助核算餘額"
 
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid ""
-"Credit note base on this type. You can not Modify and Cancel if the invoice "
-"is already reconciled"
-msgstr ""
-
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,period_to:0
@@ -9711,7 +9610,13 @@ msgid "Due date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9802,7 +9707,7 @@ msgid "Unreconciled"
 msgstr "反核銷"
 
 #. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Bad total !"
 msgstr "壞的合計!"
@@ -9887,7 +9792,7 @@ msgid "Comparison"
 msgstr "比較"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9905,6 +9810,11 @@ msgid ""
 "                This installs the module account_budget."
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
@@ -9958,11 +9868,6 @@ msgstr "貸方"
 msgid "Draft Invoice "
 msgstr ""
 
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9974,7 +9879,7 @@ msgid "Journal Entry Model"
 msgstr "帳簿分錄模型"
 
 #. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10059,7 +9964,7 @@ msgid "Profit (Loss) to report"
 msgstr "要列印的損益"
 
 #. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
 msgstr ""
@@ -10382,7 +10287,14 @@ msgid "Empty Accounts ? "
 msgstr "科目留空？ "
 
 #. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10507,7 +10419,7 @@ msgid "Receivable accounts"
 msgstr "應收帳款科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
 msgstr ""
@@ -10635,7 +10547,7 @@ msgid "Entries Sorted by"
 msgstr "排序依據："
 
 #. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10741,7 +10653,7 @@ msgid "Accounting Documents"
 msgstr "會計憑證"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
@@ -10786,7 +10698,7 @@ msgid "Manual Invoice Taxes"
 msgstr "手動的發票稅(非主營業務納稅)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -10865,14 +10777,6 @@ msgstr ""
 msgid "February"
 msgstr "2月"
 
-#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
-msgstr "如果您指定其它名稱，它建立的憑證或分錄將用報表名相同的名稱。這使得報表它自己關聯相似的分錄。"
-
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
@@ -10931,6 +10835,11 @@ msgstr "科目一覽模組"
 msgid "Expense Account on Product Template"
 msgstr "產品模組的費用科目"
 
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
@@ -10965,9 +10874,6 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Charts of Account"
 #~ msgstr "會計圖表"
 
-#~ msgid "Fixed"
-#~ msgstr "固定"
-
 #~ msgid "State"
 #~ msgstr "狀態"
 
@@ -11002,6 +10908,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Choose Fiscal Year "
 #~ msgstr "選擇會計年度 "
 
+#~ msgid "account.tax"
+#~ msgstr "account.tax"
+
 #~ msgid ""
 #~ "Check this box if you don't want any VAT related to this Tax Code to appear "
 #~ "on invoices"
@@ -11023,6 +10932,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Configure"
 #~ msgstr "設置"
 
+#~ msgid "account.tax.template"
+#~ msgstr "account.tax.template"
+
 #~ msgid "Fiscal Year to Open"
 #~ msgstr "打開會計年度"
 
@@ -11035,6 +10947,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "   30 Days   "
 #~ msgstr "   30 天   "
 
+#~ msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+#~ msgstr "於第14個工作日支付總款2%，餘款至30個工作日所在月之月末支付"
+
 #~ msgid "Avg. Delay To Pay"
 #~ msgstr "平均付款拖延時間"
 
@@ -11139,6 +11054,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Configure Your Chart of Accounts"
 #~ msgstr "科目表設置"
 
+#~ msgid "Line 2:"
+#~ msgstr "第2行"
+
 #~ msgid "Required"
 #~ msgstr "必需的"
 
@@ -11148,15 +11066,25 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ "refund it instead."
 #~ msgstr "無法刪除已確認或付款的發票。建議您做退款處理。"
 
+#, python-format
+#~ msgid "Invoice  '%s' is validated."
+#~ msgstr "發票 '%s' 已審核"
+
 #~ msgid "Cash Transaction"
 #~ msgstr "現金交易"
 
+#~ msgid "Line Name"
+#~ msgstr "條款名稱"
+
 #~ msgid "Month-1"
 #~ msgstr "上月"
 
 #~ msgid "Customer Credit"
 #~ msgstr "客戶信用"
 
+#~ msgid "  Day of the Month: 0"
+#~ msgstr "  本月: 0"
+
 #~ msgid "Starts on"
 #~ msgstr "開始於"
 
@@ -11170,6 +11098,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "No End of year journal defined for the fiscal year"
 #~ msgstr "此會計年度沒有定義年終轉結"
 
+#~ msgid "  Value amount: 0.02"
+#~ msgstr "  值: 0.02"
+
 #, python-format
 #~ msgid "The closing balance should be the same than the computed balance!"
 #~ msgstr "期末餘額與計算出來的餘額不平衡."
@@ -11202,6 +11133,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Contact Address Name"
 #~ msgstr "聯繫地址"
 
+#~ msgid "Litigation"
+#~ msgstr "有異議"
+
 #~ msgid "Account balance"
 #~ msgstr "科目餘額"
 
@@ -11222,6 +11156,12 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ "menu."
 #~ msgstr "無法在合併（centralised）憑證簿上建立發票，請在憑證簿設置選項中取消合併選項"
 
+#~ msgid "  Day of the Month= -1"
+#~ msgstr "  每月第幾日= -1"
+
+#~ msgid "  Number of Days: 30"
+#~ msgstr "  天數：30"
+
 #~ msgid "Bank Account Owner"
 #~ msgstr "銀行帳戶所有者"
 
@@ -11261,6 +11201,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Default taxes"
 #~ msgstr "預設稅"
 
+#~ msgid "Periodical Processing"
+#~ msgstr "定期處理"
+
 #~ msgid ""
 #~ "When new move line is created the state will be 'Draft'.\n"
 #~ "* When all the payments are done it will be in 'Valid' state."
@@ -11290,6 +11233,12 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "4"
 #~ msgstr "4"
 
+#~ msgid "Bank and Cheques"
+#~ msgstr "銀行和支票"
+
+#~ msgid "Example"
+#~ msgstr "例子"
+
 #, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
@@ -11309,6 +11258,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Starting Date"
 #~ msgstr "開始日期"
 
+#~ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+#~ msgstr "${object.company_id.name} 發票 (編號 ${object.number or 'n/a' })"
+
 #~ msgid "My invoices"
 #~ msgstr "我的發票"
 
@@ -11355,6 +11307,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Opening Cashbox"
 #~ msgstr "開啟的錢箱"
 
+#~ msgid "Line 1:"
+#~ msgstr "第一行"
+
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "完整性錯誤！"
@@ -11378,10 +11333,16 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Analytic Entries Stats"
 #~ msgstr "輔助核算統計"
 
+#~ msgid "Communication"
+#~ msgstr "溝通"
+
 #~ msgid ""
 #~ "You can not create more than one move per period on centralized journal"
 #~ msgstr "餘額憑證簿每個期間只能有一張會計憑證"
 
+#~ msgid "  Number of Days: 14"
+#~ msgstr "  享受現金折扣的天數：14"
+
 #, python-format
 #~ msgid "Configuration Error !"
 #~ msgstr "設置錯誤!"
@@ -11406,6 +11367,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "VAT"
 #~ msgstr "增值稅"
 
+#~ msgid "Valuation"
+#~ msgstr "定價"
+
 #~ msgid "Invoice Address"
 #~ msgstr "發票地址"
 
@@ -11476,6 +11440,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Readonly"
 #~ msgstr "只讀"
 
+#~ msgid "  Valuation: Balance"
+#~ msgstr "  估值:平衡"
+
 #~ msgid ""
 #~ "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 #~ "2% "
@@ -11595,6 +11562,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ "ready for editing."
 #~ msgstr "修改發票：取消當前的發票，並準備編輯建立一個新副本。"
 
+#~ msgid "  Valuation: Percent"
+#~ msgstr "  現金折扣比率：百分數"
+
 #~ msgid "current month"
 #~ msgstr "本月"
 
@@ -11606,6 +11576,9 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ "日期%s沒有對應的期間！\n"
 #~ "請新建一個。"
 
+#~ msgid "  Value amount: n.a"
+#~ msgstr "  金額：無"
+
 #~ msgid ""
 #~ "With Customer Invoices you can create and manage sales invoices issued to "
 #~ "your customers. OpenERP can also generate draft invoices automatically from "
@@ -11726,6 +11699,11 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Account currency"
 #~ msgstr "幣別"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disabled"
+#~ msgstr "如果您有未調節交易，您必須檢查所有與此交易有關的操作，因為他們不會被關閉。"
+
 #~ msgid ""
 #~ "Configuration error! The currency chosen should be shared by the default "
 #~ "accounts too."
@@ -11785,6 +11763,11 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ "稅的圖表反映的涉稅案件（或稅碼）的結構是一個樹視圖，並顯示當前的納稅情況。稅務圖表代表各個領域為貴國的納稅申報的金額。它在一個層次結構，它可以進行修改，以"
 #~ "適應您的需求。"
 
+#~ msgid ""
+#~ "If you unreconciliate transactions, you must also verify all the actions "
+#~ "that are linked to those transactions because they will not be disable"
+#~ msgstr "如果執行未調節的交易, 你必須檢驗鏈接該處理的所有操作. 因為他們不會被禁止."
+
 #, python-format
 #~ msgid "To reconcile the entries company should be the same for all entries"
 #~ msgstr "要調節這些分錄，這些分錄所屬公司必須一致"
@@ -12089,6 +12072,11 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ msgid "Refund Invoice Options"
 #~ msgstr "折讓單選項"
 
+#~ msgid ""
+#~ "The sequence field is used to order the payment term lines from the lowest "
+#~ "sequences to the higher ones"
+#~ msgstr "這序列欄位用於付款條件的從低到高排序."
+
 #~ msgid ""
 #~ "If no additional entries should be recorded on a fiscal year, you can close "
 #~ "it from here. It will close all opened periods in this year that will make "
@@ -12301,6 +12289,11 @@ msgstr "基於當前幣別的應收或應付帳款的餘額"
 #~ "當輸入付款以後發票進入『已付款』狀態。\n"
 #~ "如使用者作廢了發票則進入『已取消』狀態。"
 
+#~ msgid ""
+#~ "This payment term will be used instead of the default one for the current "
+#~ "partner"
+#~ msgstr "這付款條件將替代為當前業務夥伴預設的."
+
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Compute Code for Taxes included prices"
 
diff --git a/addons/account_accountant/i18n/ar.po b/addons/account_accountant/i18n/ar.po
index 4043e9ae5f1..e967964bd4b 100644
--- a/addons/account_accountant/i18n/ar.po
+++ b/addons/account_accountant/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-01 17:31+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/az.po b/addons/account_accountant/i18n/az.po
index 779c0634b9d..2b90cb86b39 100644
--- a/addons/account_accountant/i18n/az.po
+++ b/addons/account_accountant/i18n/az.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 05:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/bg.po b/addons/account_accountant/i18n/bg.po
index 6a361b749ed..e6cd7f1518e 100644
--- a/addons/account_accountant/i18n/bg.po
+++ b/addons/account_accountant/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-31 13:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/bn.po b/addons/account_accountant/i18n/bn.po
index c7a5601ecdb..183b64526a2 100644
--- a/addons/account_accountant/i18n/bn.po
+++ b/addons/account_accountant/i18n/bn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-21 12:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali <bn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/bs.po b/addons/account_accountant/i18n/bs.po
index 2f33faac426..6619912527a 100644
--- a/addons/account_accountant/i18n/bs.po
+++ b/addons/account_accountant/i18n/bs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-08 08:24+0000\n"
 "Last-Translator: Bojan Markovic <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/ca.po b/addons/account_accountant/i18n/ca.po
index c05b3383477..ba2890729a2 100644
--- a/addons/account_accountant/i18n/ca.po
+++ b/addons/account_accountant/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-06 23:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/cs.po b/addons/account_accountant/i18n/cs.po
index a025a427d72..ac00105fdc5 100644
--- a/addons/account_accountant/i18n/cs.po
+++ b/addons/account_accountant/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-26 09:46+0000\n"
 "Last-Translator: Pavel Stejskal <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po
index 3ee666b76eb..7b2abecb088 100644
--- a/addons/account_accountant/i18n/da.po
+++ b/addons/account_accountant/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-08 10:35+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po
index 83d63025bd2..0a362e58a09 100644
--- a/addons/account_accountant/i18n/de.po
+++ b/addons/account_accountant/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-04 07:23+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index 7565ade8bd9..f0b70c2fdc2 100644
--- a/addons/account_accountant/i18n/el.po
+++ b/addons/account_accountant/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-29 13:17+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/en_GB.po b/addons/account_accountant/i18n/en_GB.po
index 967f025244c..18e4eac8ae4 100644
--- a/addons/account_accountant/i18n/en_GB.po
+++ b/addons/account_accountant/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-08-25 11:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index ffedffdd81e..1d8d7519da2 100644
--- a/addons/account_accountant/i18n/es.po
+++ b/addons/account_accountant/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 19:57+0000\n"
 "Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/es_CR.po b/addons/account_accountant/i18n/es_CR.po
index 141c93f5e51..c40f1ca2da3 100644
--- a/addons/account_accountant/i18n/es_CR.po
+++ b/addons/account_accountant/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 17:28+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/es_DO.po b/addons/account_accountant/i18n/es_DO.po
index bfe70bac2ab..89d0690feb9 100644
--- a/addons/account_accountant/i18n/es_DO.po
+++ b/addons/account_accountant/i18n/es_DO.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 20:23+0000\n"
 "Last-Translator: Jose Ernesto Mendez <tecnologia@obsdr.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index 1dc5e47a570..3d6b072c768 100644
--- a/addons/account_accountant/i18n/es_EC.po
+++ b/addons/account_accountant/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-28 05:07+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/es_MX.po b/addons/account_accountant/i18n/es_MX.po
index 3a4633fac40..3b94060bb39 100644
--- a/addons/account_accountant/i18n/es_MX.po
+++ b/addons/account_accountant/i18n/es_MX.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-26 08:57+0000\n"
 "Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
 "<anegrinm@gmail.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/es_PY.po b/addons/account_accountant/i18n/es_PY.po
index 6df2e169cd7..5a94fcad523 100644
--- a/addons/account_accountant/i18n/es_PY.po
+++ b/addons/account_accountant/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/et.po b/addons/account_accountant/i18n/et.po
index 5541389af3b..d9cc8085eb3 100644
--- a/addons/account_accountant/i18n/et.po
+++ b/addons/account_accountant/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-12 09:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/fa.po b/addons/account_accountant/i18n/fa.po
index 86cf0fbe5c1..cf2d55f9321 100644
--- a/addons/account_accountant/i18n/fa.po
+++ b/addons/account_accountant/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-08 06:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/fi.po b/addons/account_accountant/i18n/fi.po
index ec0ac859fe7..b1185b8bedb 100644
--- a/addons/account_accountant/i18n/fi.po
+++ b/addons/account_accountant/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-22 05:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/fr.po b/addons/account_accountant/i18n/fr.po
index aca3bddda62..1d484341266 100644
--- a/addons/account_accountant/i18n/fr.po
+++ b/addons/account_accountant/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-03 20:18+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/gl.po b/addons/account_accountant/i18n/gl.po
index c6ace58ab83..345d789be42 100644
--- a/addons/account_accountant/i18n/gl.po
+++ b/addons/account_accountant/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-02 10:10+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/he.po b/addons/account_accountant/i18n/he.po
index 74fad5114db..8b9739723a5 100644
--- a/addons/account_accountant/i18n/he.po
+++ b/addons/account_accountant/i18n/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-18 17:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/hi.po b/addons/account_accountant/i18n/hi.po
index feb900fcb59..49fe94d6995 100644
--- a/addons/account_accountant/i18n/hi.po
+++ b/addons/account_accountant/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-20 08:28+0000\n"
 "Last-Translator: Sanjay Kumar <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/hr.po b/addons/account_accountant/i18n/hr.po
index 8886a91875a..953be33f918 100644
--- a/addons/account_accountant/i18n/hr.po
+++ b/addons/account_accountant/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 19:38+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/hu.po b/addons/account_accountant/i18n/hu.po
index b9ecad2b79f..68d2a5d56ed 100644
--- a/addons/account_accountant/i18n/hu.po
+++ b/addons/account_accountant/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-19 15:57+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/id.po b/addons/account_accountant/i18n/id.po
index 7ae579d4a7a..1f4f87a835f 100644
--- a/addons/account_accountant/i18n/id.po
+++ b/addons/account_accountant/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-07 18:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index 2436e754e50..cd5ccdf8ee0 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 19:50+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/ja.po b/addons/account_accountant/i18n/ja.po
index f236d4b4341..9527ae9364a 100644
--- a/addons/account_accountant/i18n/ja.po
+++ b/addons/account_accountant/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-13 22:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/ko.po b/addons/account_accountant/i18n/ko.po
index f99dbbb5ba9..cfe8170f079 100644
--- a/addons/account_accountant/i18n/ko.po
+++ b/addons/account_accountant/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-10 14:38+0000\n"
 "Last-Translator: Gang Sung-jin <potopro@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/lo.po b/addons/account_accountant/i18n/lo.po
index 163488031d3..d99bce8cb6b 100644
--- a/addons/account_accountant/i18n/lo.po
+++ b/addons/account_accountant/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 11:01+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
index 5f73217583e..2bcda10bbc4 100644
--- a/addons/account_accountant/i18n/lt.po
+++ b/addons/account_accountant/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-04-25 15:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/lv.po b/addons/account_accountant/i18n/lv.po
index 3a96adea207..2b6569a21fb 100644
--- a/addons/account_accountant/i18n/lv.po
+++ b/addons/account_accountant/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-24 01:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/mk.po b/addons/account_accountant/i18n/mk.po
index b15136a6c21..196598448ec 100644
--- a/addons/account_accountant/i18n/mk.po
+++ b/addons/account_accountant/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-06 12:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/mn.po b/addons/account_accountant/i18n/mn.po
index c0f1b2840a2..8f2691bd2fe 100644
--- a/addons/account_accountant/i18n/mn.po
+++ b/addons/account_accountant/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-21 14:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/nb.po b/addons/account_accountant/i18n/nb.po
index 69c2fb6c566..9e0d7e199b4 100644
--- a/addons/account_accountant/i18n/nb.po
+++ b/addons/account_accountant/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 12:57+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/nl.po b/addons/account_accountant/i18n/nl.po
index 3f7742c094e..c1012e5372a 100644
--- a/addons/account_accountant/i18n/nl.po
+++ b/addons/account_accountant/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 17:35+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index 2a5ef937b6e..29c0b8fff98 100644
--- a/addons/account_accountant/i18n/nl_BE.po
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-27 13:16+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/oc.po b/addons/account_accountant/i18n/oc.po
index 35ca7e58b02..9da4a2237e8 100644
--- a/addons/account_accountant/i18n/oc.po
+++ b/addons/account_accountant/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-20 09:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/pl.po b/addons/account_accountant/i18n/pl.po
index b6924a4af8d..2d22df5eb6f 100644
--- a/addons/account_accountant/i18n/pl.po
+++ b/addons/account_accountant/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 14:26+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/pt.po b/addons/account_accountant/i18n/pt.po
index 6505706853f..2bcc8527cdc 100644
--- a/addons/account_accountant/i18n/pt.po
+++ b/addons/account_accountant/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 15:29+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/pt_BR.po b/addons/account_accountant/i18n/pt_BR.po
index 3b86a5391c8..1ff38e8bcdd 100644
--- a/addons/account_accountant/i18n/pt_BR.po
+++ b/addons/account_accountant/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-16 22:40+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/ro.po b/addons/account_accountant/i18n/ro.po
index cc5e57f559b..fd0c5d986c8 100644
--- a/addons/account_accountant/i18n/ro.po
+++ b/addons/account_accountant/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-27 07:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/ru.po b/addons/account_accountant/i18n/ru.po
index 2e78b7929e8..20e8a849037 100644
--- a/addons/account_accountant/i18n/ru.po
+++ b/addons/account_accountant/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-12 04:04+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/sk.po b/addons/account_accountant/i18n/sk.po
index 85581c350f7..1aba51a328f 100644
--- a/addons/account_accountant/i18n/sk.po
+++ b/addons/account_accountant/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-09 09:40+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/sl.po b/addons/account_accountant/i18n/sl.po
index bc35de05398..38d6ba8e1df 100644
--- a/addons/account_accountant/i18n/sl.po
+++ b/addons/account_accountant/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 23:27+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/sq.po b/addons/account_accountant/i18n/sq.po
index 46db7c01abd..b24fe1c617b 100644
--- a/addons/account_accountant/i18n/sq.po
+++ b/addons/account_accountant/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-28 14:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/sr.po b/addons/account_accountant/i18n/sr.po
index fbb238ac6be..4a81aa63e06 100644
--- a/addons/account_accountant/i18n/sr.po
+++ b/addons/account_accountant/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-13 08:31+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/sr@latin.po b/addons/account_accountant/i18n/sr@latin.po
index 9b038ae8d92..b0510fba0d9 100644
--- a/addons/account_accountant/i18n/sr@latin.po
+++ b/addons/account_accountant/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-18 21:24+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/sv.po b/addons/account_accountant/i18n/sv.po
index 805c2279952..b542e9b1672 100644
--- a/addons/account_accountant/i18n/sv.po
+++ b/addons/account_accountant/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 14:38+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/ta.po b/addons/account_accountant/i18n/ta.po
index 489268111ea..506375a3696 100644
--- a/addons/account_accountant/i18n/ta.po
+++ b/addons/account_accountant/i18n/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-18 06:07+0000\n"
 "Last-Translator: சதீஷ் குமார் <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/th.po b/addons/account_accountant/i18n/th.po
index a7b078b1cec..57092a41f77 100644
--- a/addons/account_accountant/i18n/th.po
+++ b/addons/account_accountant/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-19 05:24+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/tr.po b/addons/account_accountant/i18n/tr.po
index d2f7d36eab1..2c7a6cd8af1 100644
--- a/addons/account_accountant/i18n/tr.po
+++ b/addons/account_accountant/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 09:13+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/uk.po b/addons/account_accountant/i18n/uk.po
index 0e10021db6f..d027aa831f2 100644
--- a/addons/account_accountant/i18n/uk.po
+++ b/addons/account_accountant/i18n/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-18 10:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/vi.po b/addons/account_accountant/i18n/vi.po
index 329e74af526..44afd49c449 100644
--- a/addons/account_accountant/i18n/vi.po
+++ b/addons/account_accountant/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-25 18:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/zh_CN.po b/addons/account_accountant/i18n/zh_CN.po
index 06502d2adf0..ce79a3ab380 100644
--- a/addons/account_accountant/i18n/zh_CN.po
+++ b/addons/account_accountant/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-25 08:59+0000\n"
 "Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_accountant/i18n/zh_TW.po b/addons/account_accountant/i18n/zh_TW.po
index cece68f215b..d8800741990 100644
--- a/addons/account_accountant/i18n/zh_TW.po
+++ b/addons/account_accountant/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-27 09:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index 807a9912b91..1cfd7211f6d 100644
--- a/addons/account_analytic_analysis/i18n/ar.po
+++ b/addons/account_analytic_analysis/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-05 20:55+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "الكمية الكلية ماتم أضافته للعميل لهذا ا
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "تم حسابها بالمعادلة: كمية الفواتير / إجم
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "حساب تحليلي"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,13 +154,9 @@ msgid "End Date"
 msgstr "تاريخ الإنتهاء"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"عدد الوقت (الساعات / الأيام) (من اليومية نوع ’عام’) للفواتير الصادرة و ذلك "
-"علي أساس الحساب التحليلي."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -165,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "حساب تحليلي"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -220,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -256,6 +252,11 @@ msgstr "الحساب بإستخدام صيغة: (الهامش الحقيقي/ا
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -309,10 +310,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"عدد الوقت (الساعات / الأيام) (من اليومية نوع ’عام’) للفواتير الصادرة و ذلك "
+"علي أساس الحساب التحليلي."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -457,16 +461,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "حسب الصيغة: سعر الفاتورة الأعلى - المبلغ المفوتر."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "تاريخ آخر فاتورة"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -555,9 +559,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 901788e5f38..2c691bba397 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-27 10:47+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Тотална сума по фактури към клиент за т
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Аналитична сметка"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -252,6 +250,11 @@ msgstr "Изчислява се по формулата: (Реален Марж
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,9 +306,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -451,16 +455,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Пресметнато по формулата: Максимална фактурна цена - фактурирани количества."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Дата на последната фактура"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -549,9 +553,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index 062b6715c0f..141e0f11388 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-08 08:39+0000\n"
 "Last-Translator: Bojan Markovic <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Ukupni iznos izlaznih Faktura za ovaj konto kupca."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitičko konto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr "Datum završetka"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitičko konto"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -253,6 +251,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -304,9 +307,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -452,16 +456,16 @@ msgstr ""
 "Izračunato korištenjem forumule: Maksimalna fakturna cijena - Fakturirana "
 "vrijednost"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Posljednji datum fakture"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -550,9 +554,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 8648455f594..e798931a5d1 100644
--- a/addons/account_analytic_analysis/i18n/ca.po
+++ b/addons/account_analytic_analysis/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 11:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Import total facturat al client per a aquesta compte."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Compte analític"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,10 +155,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -164,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte analític"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -217,12 +221,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -253,6 +251,11 @@ msgstr "Calcula utilitzant la fórmula: (Marge real / Costos totals) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -304,9 +307,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -451,16 +455,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Calculat utilitzant la fórmula: Preu máx. factura - Import facturat."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -549,9 +553,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index edd0c052429..cde3bfb8c63 100644
--- a/addons/account_analytic_analysis/i18n/cs.po
+++ b/addons/account_analytic_analysis/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 20:29+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,8 +111,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytický účet"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -143,10 +152,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -161,11 +168,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytický účet"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -214,12 +218,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -301,9 +304,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,13 +450,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -543,9 +547,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po
index 74905ad9002..070c356ad77 100644
--- a/addons/account_analytic_analysis/i18n/da.po
+++ b/addons/account_analytic_analysis/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-08 21:41+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,16 +450,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Sidste faktureringsdato"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 99edab9a77c..35d315bc197 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 15:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
@@ -101,6 +101,12 @@ msgstr "Bereits abgerechnete Beträge"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "Summe abgerechneter Arbeitszeiten"
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr "Berechnungsformel:  Abgerechnete Beträge / Abgerechnete Stunden"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Nicht unterzeichnete Verträge"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kostenstelle"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -160,13 +169,9 @@ msgid "End Date"
 msgstr "Ende Datum"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Abrechenbare Zeit (Stunden/Tage) vom Journaltyp 'Sonstige', wenn Abrechnung "
-"über die Kostenstelle erfolgt."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -180,11 +185,8 @@ msgstr "Erwartet"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Kostenstelle"
+msgid "Contracts not assigned"
+msgstr "Nicht unterzeichnete Verträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -237,12 +239,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Nichts abzurechnen, erstelle"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Vertragsvorlage"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -273,6 +269,11 @@ msgstr "Berechnungsformel: (Marge / Gesamte Kosten) * 100"
 msgid "or view"
 msgstr "oder Ansicht"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -326,10 +327,13 @@ msgid "Timesheets"
 msgstr "Stundenzettel"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Auftragszeilen von %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Abrechenbare Zeit (Stunden/Tage) vom Journaltyp 'Sonstige', wenn Abrechnung "
+"über die Kostenstelle erfolgt."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -499,16 +503,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Berechnungsformel: Geplanter Abrechnungsbetrag - Abgerechneter Betrag"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Projektleiter"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Letztes Rechnungsdatum"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -610,10 +614,16 @@ msgstr "sale.config.settings"
 msgid "Mandatory use of templates."
 msgstr "Zwingende Nutzung von Vorlagen"
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Verträge mit Kunden"
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index c3f198244ec..4eec72ed696 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-23 07:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Συνολικό τιμολογημένο ποσό πελάτη για 
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Λογαριασμος Αναλυτικής"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,10 +155,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -164,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Λογαριασμος Αναλυτικής"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -217,12 +221,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -255,6 +253,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -306,9 +309,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -455,16 +459,16 @@ msgstr ""
 "Υπολογισμός χρησιμοποιώντας την φόρμουλα: Μέγιστη Τιμή Τιμολογίου - "
 "Τιμολογημένο Ποσό."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Τελευταία Ημερομηνία Τιμολογίου"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -556,9 +560,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/en_GB.po b/addons/account_analytic_analysis/i18n/en_GB.po
index a0f04153025..7f4b279cfd7 100644
--- a/addons/account_analytic_analysis/i18n/en_GB.po
+++ b/addons/account_analytic_analysis/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-24 09:06+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Total customer invoiced amount for this account."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr "Computed using the formula: Invoiced Amount / Total Time"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytic Account"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,13 +155,9 @@ msgid "End Date"
 msgstr "End Date"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -166,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytic Account"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -221,12 +223,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -257,6 +253,11 @@ msgstr "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -310,10 +311,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -460,16 +464,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Computed using the formula: Max Invoice Price - Invoiced Amount."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Last Invoice Date"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -558,9 +562,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index d141cfb393a..d27fe90c169 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 12:28+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -104,6 +104,12 @@ msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 "Suma de las líneas de las hojas de servicios facturadas para este contrato"
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -111,8 +117,11 @@ msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Contratos no asignados"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -161,13 +170,9 @@ msgid "End Date"
 msgstr "Fecha fin"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
-"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -181,11 +186,8 @@ msgstr "Previsto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgid "Contracts not assigned"
+msgstr "Contratos no asignados"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -238,12 +240,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Nada que facturar, crear"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Plantilla de contrato"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -274,6 +270,11 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 msgid "or view"
 msgstr "o ver"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -327,10 +328,13 @@ msgid "Timesheets"
 msgstr "Hojas de servicios"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Líneas de pedidos de venta de %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -497,16 +501,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado usando la fórmula: Precio máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Responsable"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Fecha última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -605,10 +609,16 @@ msgstr "Configuración de las ventas"
 msgid "Mandatory use of templates."
 msgstr "Uso obligatorio de plantillas"
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Contratos que tienen una empresa"
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index 7d4cc1ee114..bcaef6bf57b 100644
--- a/addons/account_analytic_analysis/i18n/es_AR.po
+++ b/addons/account_analytic_analysis/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-16 17:13+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Importe total facturado al cliente para esta cuenta."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -252,6 +250,11 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costos totales) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,9 +306,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -451,16 +455,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado usando la fórmula: Precio máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Fecha de la última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -549,9 +553,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_CR.po b/addons/account_analytic_analysis/i18n/es_CR.po
index 78c2e7b45b4..362d4e94896 100644
--- a/addons/account_analytic_analysis/i18n/es_CR.po
+++ b/addons/account_analytic_analysis/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 18:02+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_analytic_analysis
@@ -101,6 +101,12 @@ msgstr "Importe total facturado al cliente para esta cuenta."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,13 +155,9 @@ msgid "End Date"
 msgstr "Fecha final"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
-"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -166,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -221,12 +223,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -257,6 +253,11 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -310,10 +311,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -461,16 +465,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado usando la fórmula: Precio máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Fecha última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -559,9 +563,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po
index d6f3742148c..b6fa5ea043a 100644
--- a/addons/account_analytic_analysis/i18n/es_EC.po
+++ b/addons/account_analytic_analysis/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-11 15:37+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Importe total facturado al cliente para esta cuenta."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,13 +154,9 @@ msgid "End Date"
 msgstr "Fecha fin"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
-"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -165,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -220,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -256,6 +252,11 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -309,10 +310,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -460,16 +464,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado usando la fórmula: Precio máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Fecha última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -558,9 +562,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index 0c7bc17d5dd..ec6ea5d079d 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-04 05:45+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -108,6 +108,12 @@ msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 "Suma de las lineas de la hoja de trabajo facturadas para este contrato."
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -115,8 +121,11 @@ msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "No tiene contratos asignados"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -168,13 +177,9 @@ msgid "End Date"
 msgstr "Fecha de término"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
-"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -188,11 +193,8 @@ msgstr "Esperado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+msgid "Contracts not assigned"
+msgstr "No tiene contratos asignados"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -246,12 +248,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Nada por facturar"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Plantilla de contrato"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -282,6 +278,11 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 msgid "or view"
 msgstr "o vista"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -335,10 +336,13 @@ msgid "Timesheets"
 msgstr "Hojas de trabajo"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Lineas de venta para %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -509,16 +513,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado usando la fórmula: Precio máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Responsable"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Ultima fecha de factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -619,10 +623,16 @@ msgstr "Configuración de venta"
 msgid "Mandatory use of templates."
 msgstr "Uso obligatorio de plantillas"
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Contratos que tiene una empresa"
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/es_PY.po b/addons/account_analytic_analysis/i18n/es_PY.po
index 89d0d8373e0..d2fba2bca9d 100644
--- a/addons/account_analytic_analysis/i18n/es_PY.po
+++ b/addons/account_analytic_analysis/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 19:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Importe total facturado al cliente para esta cuenta."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,10 +155,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -164,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -217,12 +221,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -253,6 +251,11 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -304,9 +307,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -452,16 +456,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado usando la fórmula: Precio máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Fecha última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -550,9 +554,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index e6c7a68985d..f0d8832f3d9 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 13:31+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr "Kleindile arveldatud arvete kogus sellel kontol."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,8 +112,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,11 +169,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr "Arvutatud kasutades valemit: (Tegelik tulu / kulud kokku) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -449,16 +453,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Arvutatud kasutades valemit: Maksimaalne arve hind - arveldatud kogus."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Viimase arve kuupäev"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -547,9 +551,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fa.po b/addons/account_analytic_analysis/i18n/fa.po
index 6db5987d581..832ced0c731 100644
--- a/addons/account_analytic_analysis/i18n/fa.po
+++ b/addons/account_analytic_analysis/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-18 16:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -447,13 +451,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index ee7383aa6cb..c8b642a98ce 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-08 09:39+0000\n"
 "Last-Translator: Tino Kraft <tino.kraft@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Asiakkaiden kokonaislaskutuksen määrä tälle tilille."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,10 +155,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -164,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -217,12 +221,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -254,6 +252,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -307,9 +310,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -453,16 +457,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Laskettu kaavalla: Laskun hinta enintään - Laskutettu"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Viimeisen laskun päiväys"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -551,9 +555,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index 2822f8d3561..d8aa09c4f47 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 15:53+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
@@ -100,6 +100,12 @@ msgstr "Montant total facturé au client pour ce compte"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "Calculé selon la formule : Montant facturé / Temps total"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Compte analytique"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,14 +154,9 @@ msgid "End Date"
 msgstr "Date de fin"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Nombre d'unités de temps (heure/jour) défini sur le journal de type "
-"'général' qui peuvent être facturées si vous facturez à partir des comptes "
-"analytiques."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -167,11 +171,8 @@ msgstr "Attendu"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte analytique"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -226,12 +227,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Modèle de contrat"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -262,6 +257,11 @@ msgstr "Calculé selon la formule : (Marge réelle / Coûts totaux) * 100"
 msgid "or view"
 msgstr "ou afficher"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -315,10 +315,14 @@ msgid "Timesheets"
 msgstr "Feuilles de temps"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Nombre d'unités de temps (heure/jour) défini sur le journal de type "
+"'général' qui peuvent être facturées si vous facturez à partir des comptes "
+"analytiques."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -467,16 +471,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculé selon la formule : Montant maximum à facturer - Les montants facturés"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Date de la dernière facture"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -565,9 +569,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index aa0cb341740..cc398c81f12 100644
--- a/addons/account_analytic_analysis/i18n/gl.po
+++ b/addons/account_analytic_analysis/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: account-analytic-analysis-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-02 10:26+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -102,6 +102,12 @@ msgstr "Importe total facturado ao cliente para esta conta."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -109,8 +115,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Conta analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -147,10 +156,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -165,11 +172,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta analítica"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -218,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -254,6 +252,11 @@ msgstr "Calcula usando a fórmula: (Marxe real / Custes totais) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -305,9 +308,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -452,16 +456,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Calculado usando a fórmula: Prezo máx. factura - Importe facturado."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data da última factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -550,9 +554,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/gu.po b/addons/account_analytic_analysis/i18n/gu.po
index ef35636561d..109ff4f7c29 100644
--- a/addons/account_analytic_analysis/i18n/gu.po
+++ b/addons/account_analytic_analysis/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-21 11:46+0000\n"
 "Last-Translator: Satish Vagadia <satish.vagadia@j-kri.com>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "આ ખાતાની કુલ ગ્રાહક ભરતિયા
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr "આ સૂત્રની મદદથી થયેલી ગણતર
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,13 +155,9 @@ msgid "End Date"
 msgstr "અંતિમ તારીખ"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"સમય અંક (કલાકો/દિવસો) ('જનરલ'-સામાન્ય રોજમેળ હિસાબ માંથી) કે જે ભરતિયામાં "
-"સમાવી શકો છો જો તમે વિશ્લેષણાત્મક ખાતા આધારિત ભરતિયુ બનાવો"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -166,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "વિશ્લેષણાત્મક ખાતું"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -221,12 +223,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -257,6 +253,11 @@ msgstr "આ સૂત્રની મદદથી થયેલી ગણતર
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -310,10 +311,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"સમય અંક (કલાકો/દિવસો) ('જનરલ'-સામાન્ય રોજમેળ હિસાબ માંથી) કે જે ભરતિયામાં "
+"સમાવી શકો છો જો તમે વિશ્લેષણાત્મક ખાતા આધારિત ભરતિયુ બનાવો"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -459,16 +463,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "આ સૂત્રની મદદથી થયેલી ગણતરી : ભરતિયાની અધિકતમ કિંમત - ભરતિયાની મૂળ રકમ"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "ભરતિયાની છેલ્લી તારીખ"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -557,9 +561,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 7a5ae301d93..0e31413b946 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 07:21+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Ukupno fakturirani iznos."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Konto analitike"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr "Datum završetka"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr "Očekivano"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Konto analitike"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -252,6 +250,11 @@ msgstr "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,9 +306,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -449,16 +453,16 @@ msgstr "Ukupno fakturirano"
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Izračun: Max. cijena računa - Fakturirani iznos."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Odgovoran"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Zadnji datum računa"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -547,9 +551,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index ea4b1c1a727..129f99facc8 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-30 15:04+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Ezen gyűjtőkód alapján a vevőnek összesen kiszámlázott összeg."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Gyűjtőkód"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Gyűjtőkód"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -252,6 +250,11 @@ msgstr "Valós fedezet/Összes költség*100 képlet alapján kerül kiszámít
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,9 +306,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -452,16 +456,16 @@ msgstr ""
 "Max. kiszámlázható érték - Kiszámlázott összeg képlet alapján kerül "
 "kiszámításra."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Utolsó számla dátuma"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -551,9 +555,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index d1263051c77..7379c389856 100644
--- a/addons/account_analytic_analysis/i18n/id.po
+++ b/addons/account_analytic_analysis/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-09 15:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,7 +111,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -143,10 +152,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -161,10 +168,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -214,12 +218,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -301,9 +304,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,13 +450,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -543,9 +547,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index ad74ca1dcba..61177ab42df 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 12:02+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -104,6 +104,12 @@ msgstr "Importo totale fatture cliente  per questo conto"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "Somma delle linee timesheet fatturate di questo contratto."
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -111,8 +117,11 @@ msgstr "Calcolato usando la formula: Fatturato / Tempo Totale"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Contratti non assegnati"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -162,13 +171,9 @@ msgid "End Date"
 msgstr "Data fine"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Tempo fatturabile (in ore/giorni, dal giornale di tipo 'generale') se si "
-"fattura tramite conto analitico"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -182,11 +187,8 @@ msgstr "Atteso"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
+msgid "Contracts not assigned"
+msgstr "Contratti non assegnati"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -239,12 +241,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Niente da fatturare, crealo"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Modello Contratto"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -276,6 +272,11 @@ msgstr ""
 msgid "or view"
 msgstr "o vista"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -329,10 +330,13 @@ msgid "Timesheets"
 msgstr "Timesheets"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Linee Ordine di Vendita di %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Tempo fatturabile (in ore/giorni, dal giornale di tipo 'generale') se si "
+"fattura tramite conto analitico"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -498,16 +502,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calcolato usando la formula: Prezzo massimo fattura - Importo fattura."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Responsabile"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Ultima data di fatturazione"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -607,10 +611,16 @@ msgstr "sale.config.settings"
 msgid "Mandatory use of templates."
 msgstr "Uso dei modelli obbligatorio"
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Contratti con Partner"
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 76d904c6091..9fdda57117e 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-12 00:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr "このアカウントに対する顧客請求金額の合計"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,8 +112,11 @@ msgstr "式を使った計算：請求金額 / 合計時間"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "分析アカウント"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -144,11 +153,9 @@ msgid "End Date"
 msgstr "終了日"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
-msgstr "請求書が分析アカウントに基づく場合、時間数（時間 / 日）（タイプが\"一般\"の仕訳帳から）が請求されます。"
+#: view:account.analytic.account:0
+msgid "Account Manager"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -162,11 +169,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "分析アカウント"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -215,12 +219,6 @@ msgstr "分析アカウントに費やされた時間数（勤務表から）で
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr "公式による計算：（実マージン / 合計コスト） * 100"
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,10 +305,11 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr ""
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr "請求書が分析アカウントに基づく場合、時間数（時間 / 日）（タイプが\"一般\"の仕訳帳から）が請求されます。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -446,16 +450,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "式を使った計算：最大請求価格 - 請求金額"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "前回請求日"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index 77f27d0f814..601f793933d 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 15:09+0000\n"
 "Last-Translator: sunygu <sunygyu@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr "이 계정의 총 고객 송장 금액"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,8 +112,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "분석 계정"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,11 +169,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "분석 계정"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr "다음 공식으로 계산함: (실제 마진 / 총 원가) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,16 +450,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "다음 공식을 사용하여 계산함: 최고 송장 가격 - 송장 금액"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "마지막 송장 일자"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 0266679c7ec..02a61889210 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Suma užsakovo sąskaitoje šiai sąskaitai."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitinė sąskaita"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitinė sąskaita"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -252,6 +250,11 @@ msgstr "Skaičiuoja pagal formulę: (Reali marža / Bendrosios išlaidos) * 100.
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,9 +306,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -450,16 +454,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Apskaičiuota pagal formulę: Maksimali kaina sąskaitoje - Suma sąskaitoje"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Paskutinės sąskaitos data"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -548,9 +552,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index 596a0d6dd10..082d35b78dc 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 14:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Kopējā klientam piestādītā summa no šā konta"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,10 +155,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -164,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analītiskais Konts"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -217,12 +221,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -255,6 +253,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -306,9 +309,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -453,16 +457,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Aprēķināts izmantojot formulu: Maksimālā Rēķina Cena - Piestādītā Summa."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Pēdējā Rēķina Datums"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -551,9 +555,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/mk.po b/addons/account_analytic_analysis/i18n/mk.po
index 87ec6551731..c8c42fdeeab 100644
--- a/addons/account_analytic_analysis/i18n/mk.po
+++ b/addons/account_analytic_analysis/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-14 08:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr "Краен датум"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -304,9 +307,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -449,16 +453,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Пресметано според формулата: Максимална фактурирана цена - Фактурирана цена."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Датум на последна фактура"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -547,9 +551,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index 4750c8a031f..ca1f43d0234 100644
--- a/addons/account_analytic_analysis/i18n/mn.po
+++ b/addons/account_analytic_analysis/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-20 23:20+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr "Бүх хэрэглэгчидийн нэхэмжилсэн дансны
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,8 +111,11 @@ msgstr "Тооцоололт хийсэн томъёо: Нэхэмжилсэн 
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Аналитик данс"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -143,13 +152,9 @@ msgid "End Date"
 msgstr "Дуусах огноо"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Хэрэв шинжилгээний данс дээр суурилж байгаа бол нэхэмжлэж болох хугацаа "
-"(цаг/өдөр) ('ерөнхий' төрөлтэй журналаас)."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -163,11 +168,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитик данс"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -218,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -254,6 +250,11 @@ msgstr "Томъёг ашиглан тооцоолох: (Бодит зөрүү/
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -307,10 +308,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Хэрэв шинжилгээний данс дээр суурилж байгаа бол нэхэмжлэж болох хугацаа "
+"(цаг/өдөр) ('ерөнхий' төрөлтэй журналаас)."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -456,16 +460,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Томъёг ашиглан тооцоолох:  Нэхэмжлэх үнийн дээд хэмжээ - Нэхэмжилсэн хэмжээ"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Сүүлийн нэхэмжлэлийн огноо"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -554,9 +558,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 56984febb64..788bd2ca37f 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 15:24+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Totalt beløp fakturert kunde for denne kontoen"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "Summen av timeliste linjer fakturert for denne kontrakten."
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr "Beregnet ved hjelp av formelen: Fakturert beløp / Total tid"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Kontrakter som ikke er tilordnet."
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytisk konto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,13 +155,9 @@ msgid "End Date"
 msgstr "Sluttdato"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Antall tid (timer / dager) (fra tidsskrift av typen generell') som kan "
-"faktureres dersom du faktura basert på analytiske konto."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -166,11 +171,8 @@ msgstr "Forventet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytisk konto"
+msgid "Contracts not assigned"
+msgstr "Kontrakter som ikke er tilordnet."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -224,12 +226,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Ikke noe å fakturere, opprett."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Mal av kontrakt."
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -260,6 +256,11 @@ msgstr "Beregnet etter formelen: (Virkelig margin / Totale kostnader) * 100"
 msgid "or view"
 msgstr "Eller vis."
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -313,10 +314,13 @@ msgid "Timesheets"
 msgstr "Timelister."
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Salgs ordre linjer av %s."
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Antall tid (timer / dager) (fra tidsskrift av typen generell') som kan "
+"faktureres dersom du faktura basert på analytiske konto."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -466,16 +470,16 @@ msgstr "Totalt fakturert."
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Beregnet med formelen: Maks. fakturapris - fakturert beløp"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Ansvarlig."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Siste fakturadato"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -564,10 +568,16 @@ msgstr "Salg.konfigurasjon.innstilling."
 msgid "Mandatory use of templates."
 msgstr "Obligatorisk bruk av maler."
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Kontrakter har en partner."
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 5bc2f4de483..23d6a023c6f 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-01 15:59+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -105,6 +105,12 @@ msgstr "Total gefactureerd bedrag voor deze kostenplaats"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "Totaal aan urenstaatregels gefactureerd voor dit contract"
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -113,8 +119,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Niet toegewezen contracten"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kostenplaats"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -166,13 +175,9 @@ msgid "End Date"
 msgstr "Einddatum"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Hoeveelheid tijd (uren/dagen) (van dagboek 'algemeen') dat kan worden "
-"gefactureerd als u factureert op basis van kostenplaatsen."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -186,11 +191,8 @@ msgstr "Verwacht"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Kostenplaats"
+msgid "Contracts not assigned"
+msgstr "Niet toegewezen contracten"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -241,12 +243,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Niets te factureren, aanmaken"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Sjabloon van een contract"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -277,6 +273,11 @@ msgstr "Berekend met de formule: (werkelijke marge / totale kosten) * 100."
 msgid "or view"
 msgstr "of bekijk"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -330,10 +331,13 @@ msgid "Timesheets"
 msgstr "Urenstaten"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Verkooporderregels van %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Hoeveelheid tijd (uren/dagen) (van dagboek 'algemeen') dat kan worden "
+"gefactureerd als u factureert op basis van kostenplaatsen."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -506,16 +510,16 @@ msgstr "Totaal gefactureerd"
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Berekend met de formule: max factuurprijs - gefactureerd bedrag"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Verantwoordelijke"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Laatste factuurdatum"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -604,7 +608,7 @@ msgstr "Vaste prijs"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr "Datum van de laatste werkzaamheden geboekt op deze rekening"
+msgstr "Datum van de laatste werkzaamheden geboekt op deze kostenplaats"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
@@ -616,10 +620,16 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Contracten met een gekoppelde klant"
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/nl_BE.po b/addons/account_analytic_analysis/i18n/nl_BE.po
index 150b0466288..5f58b3d45e5 100644
--- a/addons/account_analytic_analysis/i18n/nl_BE.po
+++ b/addons/account_analytic_analysis/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-07-20 12:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -447,13 +451,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index 69f51d41b42..4bf5673a962 100644
--- a/addons/account_analytic_analysis/i18n/oc.po
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 20:34+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,16 +450,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data de la darrièra factura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index d4e6067662a..2399b8091c9 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 16:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -103,6 +103,12 @@ msgstr "Suma zafakturowanych klientom kwot dla tego konta"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "Suma pozycji kart czasu pracy zafakturowanych dla tej umowy."
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -110,8 +116,11 @@ msgstr "Obliczone formułą: Kwota zafakturowana / Suma czasów"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Umowy nie przypisane"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Konto analityczne"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -159,13 +168,9 @@ msgid "End Date"
 msgstr "Data Końcowa"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Czas (godziny/dni) (z dziennika typu 'ogólny'), które mogą być fakturowane "
-"na podstawie kont analitycznych."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -179,11 +184,8 @@ msgstr "Oczekiwany"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Konto analityczne"
+msgid "Contracts not assigned"
+msgstr "Umowy nie przypisane"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -234,12 +236,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Nie ma nic do fakturowania, utwórz"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Szablon umowy"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -270,6 +266,11 @@ msgstr "Oblicza formułą: (Marża rzeczywista / Suma kosztów) * 100"
 msgid "or view"
 msgstr "lub widok"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -323,10 +324,13 @@ msgid "Timesheets"
 msgstr "Karty godzin"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Pozycje zamówienia sprzedaży z %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Czas (godziny/dni) (z dziennika typu 'ogólny'), które mogą być fakturowane "
+"na podstawie kont analitycznych."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -491,16 +495,16 @@ msgstr "Ogólna wartość faktury"
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Obliczone formułą: Maksymalna cena faktury - Kwota zafakturowana"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Odpowiedzialny"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data ostatniej faktury"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -600,10 +604,16 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr "Obowiązkowe stosowanie szablonów"
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Umowy z partnerem"
+msgid "Units Done"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index c52541694fa..7618ea93aa8 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 16:23+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Montante da faturação total do cliente para esta conta"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "Calculado através da fórmula: Valor faturado / Tempo Total"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Conta Analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,13 +154,9 @@ msgid "End Date"
 msgstr "Data final"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Número de tempo (horas ou dias) (de Diário do  tipo 'geral') que podem ser "
-"faturados, se fatura com base na conta analítica"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -165,11 +170,8 @@ msgstr "Esperado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -220,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Modelo de contrato"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -257,6 +253,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -310,10 +311,13 @@ msgid "Timesheets"
 msgstr "Folhas de horas"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Número de tempo (horas ou dias) (de Diário do  tipo 'geral') que podem ser "
+"faturados, se fatura com base na conta analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -462,16 +466,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado utilizando a fórmula: Valor Máximo da Fatura - Valor da Fatura"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Responsável"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data da última fatura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -560,9 +564,15 @@ msgstr "sale.config.settings"
 msgid "Mandatory use of templates."
 msgstr "Uso obrigatório de modelos"
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index dbdb313cc13..b8de3675f9b 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 10:47+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:04+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
@@ -105,6 +105,12 @@ msgstr "Valor total faturado ao cliente para esta conta"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "Total de linhas da planilha faturadas para este contrato."
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr "Linhas do Pedido de Vendas de %s"
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -112,8 +118,11 @@ msgstr "Calculado usando a formula: Total Faturado / Horas Totais"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "Contratos não atribuídos"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Conta Analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -162,13 +171,9 @@ msgid "End Date"
 msgstr "Data de Término"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
-msgstr ""
-"Número de horas (horas/dia) (do diário to tipo 'geral') que podem ser "
-"faturado se você emite fatura baseado em conta analítica."
+#: view:account.analytic.account:0
+msgid "Account Manager"
+msgstr "Gerente de Contas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -182,11 +187,8 @@ msgstr "Esperado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
+msgid "Contracts not assigned"
+msgstr "Contratos não atribuídos"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -239,12 +241,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr "Nada para faturar, crie."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr "Modelo de Contrato"
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -275,6 +271,11 @@ msgstr "Calcula usando a fórmula: (Margem Real / Custo Total) * 100."
 msgid "or view"
 msgstr "ou visualizar"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr "Contratos de Clientes"
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -328,10 +329,13 @@ msgid "Timesheets"
 msgstr "Planilha de horas"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "Linhas do pedido de venda %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Número de horas (horas/dia) (do diário to tipo 'geral') que podem ser "
+"faturado se você emite fatura baseado em conta analítica."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -503,16 +507,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Calculado utilizando a fórmula: Preço máximo de fatura - Valor Faturado"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "Responsável"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data da Última fatura"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr "Unidades Restantes"
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -614,10 +618,16 @@ msgstr "sale.config.settings"
 msgid "Mandatory use of templates."
 msgstr "Obrigatório o uso de modelos."
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr "Modelo de Contrato"
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
-msgstr "Contratos que possuem parceiro"
+msgid "Units Done"
+msgstr "Unidades Concluídas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index 32611cfc3dc..48bd6cd18ae 100644
--- a/addons/account_analytic_analysis/i18n/ro.po
+++ b/addons/account_analytic_analysis/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 16:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Valoarea totala facturata catre clienti pentru acest cont."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "Calculat folosind formula: Suma Facturata / Total Ore"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cont Analitic"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,13 +154,9 @@ msgid "End Date"
 msgstr "Data de sfarsit"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Timpul (numarul de ore/zile) (din registrul de tip 'general') care poate fi "
-"facturat daca facturati pe baza contului analitic."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -165,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cont Analitic"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -220,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -256,6 +252,11 @@ msgstr "Calculeaza folosind formula: (Marja reala / Total costuri) * 100"
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -309,10 +310,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Timpul (numarul de ore/zile) (din registrul de tip 'general') care poate fi "
+"facturat daca facturati pe baza contului analitic."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -459,16 +463,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Calculat folosind formula: Pretul maxim factura - Valoarea facturata"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Data ultimei facturi"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -557,9 +561,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index ad299064181..9bc981bd39b 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-19 12:16+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Итого сумма к оплате заказчику для этог
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Счет аналитики"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,10 +154,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -163,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Счет аналитики"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -216,12 +220,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -252,6 +250,11 @@ msgstr "Вычисляется по формуле: (Реальная маржа
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,9 +306,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -451,16 +455,16 @@ msgstr ""
 "Вычислено по формуле: Максимальная цена по Счету - Итоговая сумма по "
 "выставленным счетам."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Последняя дата выписки счета"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -549,9 +553,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index 7b59e8e867a..5938b752662 100644
--- a/addons/account_analytic_analysis/i18n/sl.po
+++ b/addons/account_analytic_analysis/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 12:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr "Skupni zaračunani znesek"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,8 +111,11 @@ msgstr "Formula izračuna: Obračunani čas / Skupni čas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitični konto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -143,11 +152,9 @@ msgid "End Date"
 msgstr "Zaključni datum"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
-msgstr "Čas , ki se lahko zaračuna , če zaračunavate na podlagi analitike."
+#: view:account.analytic.account:0
+msgid "Account Manager"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -161,11 +168,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitični konto"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -214,12 +218,6 @@ msgstr "Porabljen čas (na osnovi časovnic)."
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr "Formula izračuna: (Realna razlika/Vsi stroški)*100"
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -303,10 +306,11 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr ""
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr "Čas , ki se lahko zaračuna , če zaračunavate na podlagi analitike."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -448,16 +452,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Izračunano na podlagi formule: Najvišja cena na računu - zaračunani znesek"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Datum zadnjega računa"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -546,9 +550,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sq.po b/addons/account_analytic_analysis/i18n/sq.po
index e97baa66953..b688d767e0b 100644
--- a/addons/account_analytic_analysis/i18n/sq.po
+++ b/addons/account_analytic_analysis/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -447,13 +451,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -544,9 +548,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index 9b0457704fb..86031c91410 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-26 08:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Ukupni iznos izlaznih faktura za ovaj račun."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitički konto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,10 +155,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -164,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -217,12 +221,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -254,6 +252,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -305,9 +308,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -452,16 +456,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Израчунато помоћу формуле: Маx Цена рачауна - Износ доставницe."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Задњи датум рачуна"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -550,9 +554,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sr@latin.po b/addons/account_analytic_analysis/i18n/sr@latin.po
index 0ae96c8fed7..d88c7cc805d 100644
--- a/addons/account_analytic_analysis/i18n/sr@latin.po
+++ b/addons/account_analytic_analysis/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-13 16:49+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,12 @@ msgstr "Ukupni iznos korisničkih obračuna za ovaj nalog."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -108,8 +114,11 @@ msgstr "Izračunato koristeći formulu: obračunat iznos / ukupno vreme"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitički konto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -146,13 +155,9 @@ msgid "End Date"
 msgstr "Datum završetka"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Broj vremena (dana/sati) (iz dnevnika tipa 'opšte') koji se može fakturisati "
-"ako Vam je fakturisanje bazirano na analitičkom kontu."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -166,11 +171,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -221,12 +223,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -257,6 +253,11 @@ msgstr "Izračunava se pomoću formule: (Realna marža / ukupni troškovi) * 100
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -310,10 +311,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Broj vremena (dana/sati) (iz dnevnika tipa 'opšte') koji se može fakturisati "
+"ako Vam je fakturisanje bazirano na analitičkom kontu."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -459,16 +463,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Izračunato pomoću formule: Max cena obračuna - Iznos obračuna."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Datum poslednjeg obračuna"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -557,9 +561,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 4b5af0c5fe1..b8babc6f987 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 10:11+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Total customer invoiced amount for this account."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "Beräknad med formeln: Fakturerad tid / total tid"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyskonto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,13 +154,9 @@ msgid "End Date"
 msgstr "Slutdatum"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Tid (timmar / dagar) (från Journal av typen \"allmän\") som kan faktureras "
-"om du faktura baserad på objektkonto."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -165,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analyskonto"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -220,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -256,6 +252,11 @@ msgstr "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -309,10 +310,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Tid (timmar / dagar) (från Journal av typen \"allmän\") som kan faktureras "
+"om du faktura baserad på objektkonto."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -457,16 +461,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "Computed using the formula: Max Invoice Price - Invoiced Amount."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Last Invoice Date"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -555,9 +559,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index d25b62ea8d4..fd0ec3a5386 100644
--- a/addons/account_analytic_analysis/i18n/tlh.po
+++ b/addons/account_analytic_analysis/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:23+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,7 +111,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -143,10 +152,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -161,10 +168,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -214,12 +218,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -301,9 +304,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,13 +450,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -543,9 +547,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index f00ed13dbd6..9e2ae1b6349 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-22 13:35+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -100,6 +100,12 @@ msgstr "Bu hesap için toplam müşteri faturası miktarı."
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -107,8 +113,11 @@ msgstr "Hesaplamada kullanılan formül: Faturalandırılan Tutar / Toplam Süre
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitik Hesap"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -145,13 +154,9 @@ msgid "End Date"
 msgstr "Bitiş Tarihi"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
-"Analiz hesabına göre faturalandırıyorsanız faturalandırılacak saat sayısı "
-"(saat/gün)(günlük tipi 'genel'den) ."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -165,11 +170,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitik Hesap"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -220,12 +222,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -257,6 +253,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -310,10 +311,13 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
+"Analiz hesabına göre faturalandırıyorsanız faturalandırılacak saat sayısı "
+"(saat/gün)(günlük tipi 'genel'den) ."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -461,16 +465,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Hesaplamada kullanılan formül: En Yüksek Fatura Fiyatı - Faturalanmış Tutar."
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Son Fatura Tarihi"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -560,9 +564,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index 7503a5e3667..dcc84dfbd33 100644
--- a/addons/account_analytic_analysis/i18n/uk.po
+++ b/addons/account_analytic_analysis/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 13:50+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,8 +111,11 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Аналітичний рахунок"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -143,10 +152,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -161,11 +168,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналітичний рахунок"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -214,12 +218,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -301,9 +304,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -446,13 +450,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -543,9 +547,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/vi.po b/addons/account_analytic_analysis/i18n/vi.po
index cb68d4e74f1..98994c4e5d0 100644
--- a/addons/account_analytic_analysis/i18n/vi.po
+++ b/addons/account_analytic_analysis/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 22:52+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -99,6 +99,12 @@ msgstr ""
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -106,7 +112,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -144,10 +153,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -162,10 +169,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -215,12 +219,6 @@ msgstr ""
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -251,6 +249,11 @@ msgstr ""
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -302,9 +305,10 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -447,16 +451,16 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
 "Được tính toán theo công thức: Giá trị hóa đơn tối đa - Số lượng hóa đơn"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "Ngày lập hóa đơn gần nhất"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -545,9 +549,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 7686d69650d..725a5213df0 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 10:29+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr "这科目的客户发票合计"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr "合同已开票的计工单行的汇总"
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,8 +111,11 @@ msgstr "计算公式：已开票金额 / 总时数"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr "合同没指定"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -143,11 +152,9 @@ msgid "End Date"
 msgstr "截止日期"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
-msgstr "如果您按成本科目开票，这里是可以开票的工时。"
+#: view:account.analytic.account:0
+msgid "Account Manager"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -161,11 +168,8 @@ msgstr "预期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "辅助核算项"
+msgid "Contracts not assigned"
+msgstr "合同没指定"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -214,12 +218,6 @@ msgstr "你在这个成本科目上花费的时间总数（数据来自计工单
 msgid "Nothing to invoice, create"
 msgstr "尚未开票，创建"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr "计算公式为:(实际利润/总成本×100)"
 msgid "or view"
 msgstr "或 视图"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -301,10 +304,11 @@ msgid "Timesheets"
 msgstr "计工单"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr "销售单行 %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr "如果您按成本科目开票，这里是可以开票的工时。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -445,16 +449,16 @@ msgstr "已开发票数量"
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "计算公式为:最大发票价格 -  已开票金额"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr "负责人"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "最近开票日期"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -543,9 +547,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index 5efe4137356..54ba2685b9e 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-18 10:55+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -98,6 +98,12 @@ msgstr "這科目的客戶發票合計"
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -105,8 +111,11 @@ msgstr "計算公式：已開票金額/ 總時數"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts not assigned"
-msgstr ""
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "輔助核算項"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -143,11 +152,9 @@ msgid "End Date"
 msgstr "截止日期"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of time (hours/days) (from journal of type 'general') that can be "
-"invoiced if you invoice based on analytic account."
-msgstr "如果您按成本科目開票，這裡是可以開立發票的工時。"
+#: view:account.analytic.account:0
+msgid "Account Manager"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -161,11 +168,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "輔助核算項"
+msgid "Contracts not assigned"
+msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -214,12 +218,6 @@ msgstr "你在這個成本科目上花費的時間總數（數據來自工時表
 msgid "Nothing to invoice, create"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-msgid "Template of Contract"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
@@ -250,6 +248,11 @@ msgstr "計算公式為:(實際利潤/總成本×100)"
 msgid "or view"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
@@ -301,10 +304,11 @@ msgid "Timesheets"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
-msgstr ""
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr "如果您按成本科目開票，這裡是可以開立發票的工時。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -445,16 +449,16 @@ msgstr ""
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr "計算公式為:最大發票價格- 已開票金額"
 
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
 msgstr "最近開立發票日期"
 
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Units Remaining"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
 msgid ""
@@ -543,9 +547,15 @@ msgstr ""
 msgid "Mandatory use of templates."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index 5f3c6967cc2..d197a394cdf 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:39+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "تجميع حسب..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "قائمة الالتقاط"
 msgid "Conditions"
 msgstr "الشروط"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "المنتج"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "التوزيع التحليلي"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "المستخدم"
 msgid "Entries"
 msgstr "المدخلات"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "تحليل الإفتراضيات"
 msgid "Sequence"
 msgstr "مسلسل"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "خط الفاتورة"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "تحليل الحساب"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "التوزيع التحليلي"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index 8296ffdea18..57e6527a00d 100644
--- a/addons/account_analytic_default/i18n/bg.po
+++ b/addons/account_analytic_default/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 04:14+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Групирай по"
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Списък за товарене"
 msgid "Conditions"
 msgstr "Условия"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Продукт"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Аналитично рапределение"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Потребител"
 msgid "Entries"
 msgstr "Записи"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Стойности по подразбиране за аналитичн
 msgid "Sequence"
 msgstr "Последователност"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Ред от фактура"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Аналитична сметка"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Аналитично рапределение"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index f01172dd8e1..530459b765d 100644
--- a/addons/account_analytic_default/i18n/bs.po
+++ b/addons/account_analytic_default/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:41+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Uvijeti"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr "Korisnik"
 msgid "Entries"
 msgstr "Unosi"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Uobičajene postavke analitike"
 msgid "Sequence"
 msgstr "Redoslijed"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analitičko konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index 9045d10b051..047b7210516 100644
--- a/addons/account_analytic_default/i18n/ca.po
+++ b/addons/account_analytic_default/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 09:38+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Agrupa per..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Albarà"
 msgid "Conditions"
 msgstr "Condicions"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Producte"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribució analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Usuari"
 msgid "Entries"
 msgstr "Assentaments"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Anàlisi: Valors per defecte"
 msgid "Sequence"
 msgstr "Seqüència"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Línia de factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Compte analític"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribució analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index 6dd3c1bf6c2..f11610e8860 100644
--- a/addons/account_analytic_default/i18n/cs.po
+++ b/addons/account_analytic_default/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:42+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Podmínky"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr "Uživatel"
 msgid "Entries"
 msgstr "Položky"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Základní analytické nastavení"
 msgid "Sequence"
 msgstr "Sekvence"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po
index 165149601b6..24a66fc6364 100644
--- a/addons/account_analytic_default/i18n/da.po
+++ b/addons/account_analytic_default/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 22:24+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Gruppér efter..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Plukseddel"
 msgid "Conditions"
 msgstr "Betingelser"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr "Bruger"
 msgid "Entries"
 msgstr "Poster"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sekvens"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Fakturalinie"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index c97598df0fe..51ee3b014d3 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 22:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Gruppierung ..."
 msgid "Default end date for this Analytic Account."
 msgstr "Vorgabe für Ende Datum der Kostenstelle"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,17 +52,6 @@ msgstr "Lieferauftrag"
 msgid "Conditions"
 msgstr "Bedingungen"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Wählen Sie einen Partner aus, der bereits eine spezifizierte Kostenstelle "
-"hat (z.B. durch neu definierte Ausgangsrechnung oder einen Verkaufsauftrag  "
-"bei einer Auswahl des  unterzuordnenden Partners)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +59,12 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Kostenstellen Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,17 +83,6 @@ msgstr "Benutzer"
 msgid "Entries"
 msgstr "Buchungen"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Wählen Sie ein Produkt mit hinterlegter Standard Kostenstelle (z.B. bei der "
-"Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der Auswahl "
-"des Produkts eine automatische Erkennung der Kostenstelle gestartet)."
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -111,18 +100,6 @@ msgstr "Kostenstellen Buchungsvorlage"
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Wählen Sie ein Unternehmen mit hinterlegter Standard Kostenstelle (z.B. bei "
-"der Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der "
-"Auswahl des Unternehmens eine automatische Erkennung der Kostenstelle "
-"gestartet)."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -134,12 +111,25 @@ msgstr "Wählen Sie einen Benutzer mit der hinterlegten Standard Kostenstelle"
 msgid "Invoice Line"
 msgstr "Rechnungszeile"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Kostenstelle"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Kostenstellen Distribution"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 23d5e6274f1..adfb7b88140 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 11:33+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Ομαδοποίηση Κατά..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Λίστα Παραλαβής"
 msgid "Conditions"
 msgstr "Συνθήκες"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Προϊόν"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Αναλυτική Κατανομή"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Χρήστης"
 msgid "Entries"
 msgstr "Εγγραφές"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Προκαθορισμένη Αναλυτική"
 msgid "Sequence"
 msgstr "Αλληλουχία"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Γραμμή Τιμολογίου"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Αναλυτικός Λογαριασμός"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Αναλυτική Κατανομή"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index 217db463f93..7c2e267f309 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 21:42+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Agrupar por..."
 msgid "Default end date for this Analytic Account."
 msgstr "Fecha de fin por defecto para esta cuenta analítica"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,18 +51,6 @@ msgstr "Albarán"
 msgid "Conditions"
 msgstr "Condiciones"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione una empresa que usará la cuenta analítica especificada en "
-"analítica por defecto (ej: cree una nueva factura de cliente o pedido de "
-"venta. Si selecciona esta empresa, automáticamente cogerá esta cuenta "
-"analítica)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +58,12 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribución analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,17 +82,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione un producto que usará la cuenta analítica especificada en "
-"analítica por defecto (ej: cree una nueva factura o pedido de venta. Si "
-"selecciona este producto automáticamente cogerá esta cuenta analítica)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -111,17 +99,6 @@ msgstr "Análisis: Valores por defecto"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione una compañía que usará la cuenta analítica especificada en "
-"analítica por defecto (ej: cree una nueva factura o pedido de venta. Si "
-"selecciona esta compañía, automáticamente cogerá esta cuenta analítica)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -135,12 +112,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Línea de factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index 6cb6459fb14..3b31e5c32a3 100644
--- a/addons/account_analytic_default/i18n/es_AR.po
+++ b/addons/account_analytic_default/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 15:05+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Condiciones"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Valores analíticos predeterminados"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/es_CR.po b/addons/account_analytic_default/i18n/es_CR.po
index 03ade3a8234..7b450952267 100644
--- a/addons/account_analytic_default/i18n/es_CR.po
+++ b/addons/account_analytic_default/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:00+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_analytic_default
@@ -34,6 +34,14 @@ msgstr "Agrupar por..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Albarán"
 msgid "Conditions"
 msgstr "Condiciones"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribución analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Análisis: Valores por defecto"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Línea de factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/es_EC.po b/addons/account_analytic_default/i18n/es_EC.po
index d44f52636ac..53ca8cc6331 100644
--- a/addons/account_analytic_default/i18n/es_EC.po
+++ b/addons/account_analytic_default/i18n/es_EC.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 18:57+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
@@ -33,6 +33,14 @@ msgstr "Agrupado por..."
 msgid "Default end date for this Analytic Account."
 msgstr "Fecha de fin por defecto para esta cuenta analítica"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,18 +51,6 @@ msgstr "Paquete de productos"
 msgid "Conditions"
 msgstr "Condiciones"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione una empresa que usará la cuenta analítica especificada en "
-"analítica por defecto (ej: cree una nueva factura de cliente o pedido de "
-"venta. Si selecciona esta empresa, automáticamente cogerá esta cuenta "
-"analítica)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +58,12 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribución analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,17 +82,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione un producto que usará la cuenta analítica especificada en "
-"analítica por defecto (ej: cree una nueva factura o pedido de venta. Si "
-"selecciona este producto automáticamente cogerá esta cuenta analítica)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -111,17 +99,6 @@ msgstr "Análisis: Valores por defecto"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione una compañía que usará la cuenta analítica especificada en "
-"analítica por defecto (ej: cree una nueva factura o pedido de venta. Si "
-"selecciona esta compañía, automáticamente cogerá esta cuenta analítica)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -135,12 +112,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Detalle de Factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
index 1e375ac6fd9..23ac589e4a7 100644
--- a/addons/account_analytic_default/i18n/es_MX.po
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 23:44+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Agrupar por..."
 msgid "Default end date for this Analytic Account."
 msgstr "Fecha final default para esta Cuenta Analítica."
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,17 +52,6 @@ msgstr "Lista de Movimientos."
 msgid "Conditions"
 msgstr "Condiciones"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione la empresa que utilizara la cuenta analítica especificada por "
-"defecto.(ej. crea una nueva factura de cliente u Orden de venta si "
-"seleccionamos esta empresa, este automáticamente toma esta cuenta analítica)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +59,12 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribución analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,17 +83,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione el producto que utilizara la cuenta espeficifcada por defecto "
-"(ej. crea una nueva factura de cliente u orden de venta si seleccionamos "
-"este producto, este, automáticamente tomara esto como una cuenta analítica)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -111,18 +100,6 @@ msgstr "Valores analíticos por defecto"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleccione una compañía que utilizara la cuenta analítica espeficificada por "
-"defecto (ej. crea una nueva factura de cliente u orden de venta si "
-"selecciona esta compañía, este, automáticamente la toma como una cuenta "
-"analítica)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -134,12 +111,25 @@ msgstr "Seleccione un usuario que utilizara la cuenta analítica por defecto."
 msgid "Invoice Line"
 msgstr "Línea de factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/es_PY.po b/addons/account_analytic_default/i18n/es_PY.po
index 14f10d6e621..abbc7367d1d 100644
--- a/addons/account_analytic_default/i18n/es_PY.po
+++ b/addons/account_analytic_default/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 22:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Agrupar por..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Nota de Remisión"
 msgid "Conditions"
 msgstr "Condiciones"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribución Analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Entradas"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Análisis: Valores por defecto"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Línea de factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución Analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index e83f32caa7a..836e7ee953d 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-27 08:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Tingimused"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr "Toode"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr "Kasutaja"
 msgid "Entries"
 msgstr "Kirjed"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Analüütilised vaikeväärtused"
 msgid "Sequence"
 msgstr "Jada"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/fa.po b/addons/account_analytic_default/i18n/fa.po
index 01633129b97..4ba55af6edc 100644
--- a/addons/account_analytic_default/i18n/fa.po
+++ b/addons/account_analytic_default/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr ""
 msgid "Entries"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index c83e706a46d..41dfbd8127a 100644
--- a/addons/account_analytic_default/i18n/fi.po
+++ b/addons/account_analytic_default/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:43+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Ryhmittely.."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Keräilylista"
 msgid "Conditions"
 msgstr "Ehdot"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Tuote"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analyyttinen jakelu"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Käyttäjä"
 msgid "Entries"
 msgstr "Kirjaus"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Analyyttiset oletusasetukset"
 msgid "Sequence"
 msgstr "Sarja"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Laskun rivi"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analyyttinen tili"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analyyttinen jakelu"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index f26f1f25387..e11617be517 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 18:07+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
@@ -33,6 +33,14 @@ msgstr "Regrouper par..."
 msgid "Default end date for this Analytic Account."
 msgstr "Date de fin par défaut pour ce compte analytique"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,18 +51,6 @@ msgstr "Opération de manutention"
 msgid "Conditions"
 msgstr "Conditions"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Choisissez un partenaire qui utilisera le compte analytique par défaut "
-"définit dans \"Analytique par défaut\" (par exemple : en créant nouvelle une "
-"facture client ou une commande de vente, lorsqu'on choisira ce partenaire, "
-"cela sélectionnera automatiquement ce compte analytique)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +58,12 @@ msgid "Product"
 msgstr "Article"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribution analytique"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,18 +82,6 @@ msgstr "Utilisateur"
 msgid "Entries"
 msgstr "Écritures"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Choisissez un article qui utilisera le compte analytique par défaut définit "
-"dans \"Analytique par défaut\" (par exemple : en créant nouvelle une facture "
-"client ou une commande de vente, lorsqu'on choisira cet article, cela "
-"sélectionnera automatiquement ce compte analytique)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -112,18 +99,6 @@ msgstr "Analytique par défaut"
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Choisissez une société qui utilisera le compte analytique par défaut définit "
-"dans \"Analytique par défaut\" (par exemple : en créant nouvelle une facture "
-"client ou une commande de vente, lorsqu'on choisira cette société, cela "
-"sélectionnera automatiquement ce compte analytique)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -136,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Ligne de Facture"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Compte Analytique"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribution analytique"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index 46c16093f54..8866fbe73c9 100644
--- a/addons/account_analytic_default/i18n/gl.po
+++ b/addons/account_analytic_default/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: account-analytic-default-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 18:53+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -35,6 +35,14 @@ msgstr "Agrupar por ..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -45,14 +53,6 @@ msgstr "Albarán"
 msgid "Conditions"
 msgstr "Condicións"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -60,9 +60,12 @@ msgid "Product"
 msgstr "Produto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribución analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -81,14 +84,6 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asentos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -106,14 +101,6 @@ msgstr "Análise: Valores predefinidos"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -125,12 +112,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Liña de Factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Conta analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/gu.po b/addons/account_analytic_default/i18n/gu.po
index 39399c1bc20..cc361c7c374 100644
--- a/addons/account_analytic_default/i18n/gu.po
+++ b/addons/account_analytic_default/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-16 11:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "ગ્રુપ દ્વારા..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "શરતો"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr "ઉત્પાદન"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr "વપરાશકર્તા"
 msgid "Entries"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "ક્રમ"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "વિશ્લેષણાત્મક ખાતું"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index 77ad63beaeb..67e823ee7a6 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 13:14+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Grupiraj po..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Skladišni dokument"
 msgid "Conditions"
 msgstr "Uvjeti"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analitička raspodjela"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Korisnik"
 msgid "Entries"
 msgstr "Stavke"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Uobičajene postavke analitike"
 msgid "Sequence"
 msgstr "Redoslijed"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Stavka računa"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitička raspodjela"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index 493410fad61..c8b972b5c5b 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-09 13:58+0000\n"
 "Last-Translator: krnkris <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Csoportosítás"
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Kiszedési lista"
 msgid "Conditions"
 msgstr "Feltételek"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Termék"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analitikus felosztás"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Felhasználó"
 msgid "Entries"
 msgstr "Tételek"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Gyűjtőkód alapértelmezések"
 msgid "Sequence"
 msgstr "Sorszám"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Számlasor"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Gyűjtőkód"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitikus felosztás"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index 72bc93c7f13..c2170270fe2 100644
--- a/addons/account_analytic_default/i18n/id.po
+++ b/addons/account_analytic_default/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 16:11+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr ""
 msgid "Entries"
 msgstr "Transaksi"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index a66454861a7..1aabb967f00 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 10:03+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Raggruppa per..."
 msgid "Default end date for this Analytic Account."
 msgstr "Date termine di default per questo conto analitico"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,18 +51,6 @@ msgstr "Picking List"
 msgid "Conditions"
 msgstr "Condizioni"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleziona un partner che utilizzerà il conto analitico specificato nelle "
-"impostazioni analitiche predefinite (es. crea una nuova fattura cliente o un "
-"offerta se selezioniamo questo partner, prenderà automaticamente questo come "
-"conto analitico di default)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +58,12 @@ msgid "Product"
 msgstr "Prodotto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribuzione analitica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,18 +82,6 @@ msgstr "Utente"
 msgid "Entries"
 msgstr "Registrazioni"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleziona un prodotto che utilizzerà il conto analitico specificato nelle "
-"impostazioni analitiche predefinite (es. crea una nuova fattura cliente o un "
-"offerta se selezioniamo questo prodotto, prenderà automaticamente questo "
-"come conto analitico di default)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -112,18 +99,6 @@ msgstr "Valori predefiniti Conti analitici"
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Seleziona un'azienda che utilizzerà il conto analitico specificato nelle "
-"impostazioni analitiche predefinite (es. crea una nuova fattura cliente o un "
-"offerta se selezioniamo questa azienda, prenderà automaticamente questo come "
-"conto analitico di default)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -137,12 +112,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Linea fattura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Conto analitico"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribuzione analitica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/ja.po b/addons/account_analytic_default/i18n/ja.po
index f3b1b1136c9..a7bef703e2c 100644
--- a/addons/account_analytic_default/i18n/ja.po
+++ b/addons/account_analytic_default/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 01:35+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "グループ化…"
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "出庫票"
 msgid "Conditions"
 msgstr "条件"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "製品"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "分析分布"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "ユーザ"
 msgid "Entries"
 msgstr "エントリー"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "分析デフォルト"
 msgid "Sequence"
 msgstr "順序"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "請求行"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "分析アカウント"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "分析分布"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 21181b01862..16877ecc2ec 100644
--- a/addons/account_analytic_default/i18n/ko.po
+++ b/addons/account_analytic_default/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:59+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "조건"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr "상품"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr "사용자"
 msgid "Entries"
 msgstr "엔트리"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "분석 디폴트"
 msgid "Sequence"
 msgstr "시퀀스"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "분석 계정"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index ba05944c56b..5d9012181f3 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:15+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr "Produktas"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr "Naudotojas"
 msgid "Entries"
 msgstr "Įrašai"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Seka"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index 571fc798241..958a744769e 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-01 12:50+0000\n"
 "Last-Translator: Nauris Sedlers <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Grupēt pēc..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Izvades Saraksts"
 msgid "Conditions"
 msgstr "Nosacījumi"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Produkts"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analītiskais Sadalījums"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Lietotājs"
 msgid "Entries"
 msgstr "Ieraksti"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Analītikas Noklusētie Iestatījumi"
 msgid "Sequence"
 msgstr "Secība"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Rēķina Rinda"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analītiskais Konts"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analītiskais Sadalījums"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/mn.po b/addons/account_analytic_default/i18n/mn.po
index b3647f3804d..3360fb5853b 100644
--- a/addons/account_analytic_default/i18n/mn.po
+++ b/addons/account_analytic_default/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-12 06:37+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Бүлэглэх..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Бэлтгэх жагсаалт"
 msgid "Conditions"
 msgstr "Нөхцөлүүд"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Бараа"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Шинжилгээт тархалт"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Хэрэглэгч"
 msgid "Entries"
 msgstr "Бичлэгүүд"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Аналитик үндсэн утгууд"
 msgid "Sequence"
 msgstr "Дугаарлалт"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Нэхэмжлэлийн мөр"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Аналитик данс"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Шинжилгээт тархалт"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/nb.po b/addons/account_analytic_default/i18n/nb.po
index 36543638b87..246acd882b2 100644
--- a/addons/account_analytic_default/i18n/nb.po
+++ b/addons/account_analytic_default/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 14:58+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Grupper etter..."
 msgid "Default end date for this Analytic Account."
 msgstr "Standard sluttdato for denne Analytisk konto."
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Plukkliste"
 msgid "Conditions"
 msgstr "Betingelser"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analytisk Distribusjon"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,17 +83,6 @@ msgstr "Bruker"
 msgid "Entries"
 msgstr "Oppføringer"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Velg et produkt som vil bruke analytisk kontoen som er angitt i analytisk "
-"standard (f.eks lage ny kunde faktura eller salgsordre hvis vi velger dette "
-"produktet, vil den automatisk ta dette som en analytisk konto)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -108,17 +100,6 @@ msgstr "Analytiske Standarder"
 msgid "Sequence"
 msgstr "Sekvens"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Velg et selskap som vil bruke den analytiske kontoen som er angitt i "
-"analytisk standard (f.eks lage ny kunde faktura eller salgsordre hvis vi "
-"velger dette selskapet, vil den automatisk ta dette som en analytisk konto)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -132,12 +113,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Fakturalinje"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analytisk Konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analytisk Distribusjon"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 14983d8a10b..b246159668f 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 16:06+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Groepeer op..."
 msgid "Default end date for this Analytic Account."
 msgstr "Standaard einddatum voor deze kostenplaats"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,18 +51,6 @@ msgstr "Verzamellijst"
 msgid "Conditions"
 msgstr "Voorwaarden"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Selecteer een relatie welke gebruik zal maken van de kostenplaats, zoals "
-"gespecificeerd in de kostenplaats standaarden. (bijv. maak een nieuwe "
-"klantfactuur of verkooporder, wanneer we deze relatie selecteren. Het "
-"gebruikt automatisch deze kostenplaats."
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +58,12 @@ msgid "Product"
 msgstr "Product"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Kostenverdeling"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,18 +82,6 @@ msgstr "Gebruiker"
 msgid "Entries"
 msgstr "Boekingen"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Selecteer een product welke gebruik zal maken van de kostenplaats, zoals "
-"gespecificeerd in de kostenplaats standaarden. (bijv. maak een nieuwe "
-"klantfactuur of verkooporder, wanneer we deze relatie selecteren. Het "
-"gebruikt automatisch deze kostenplaats."
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -112,18 +99,6 @@ msgstr "Kostenplaatsen standaarden"
 msgid "Sequence"
 msgstr "Volgorde"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Selecteer een bedrijf welke gebruik zal maken van de kostenplaats, zoals "
-"gespecificeerd in de kostenplaats standaarden. (bijv. maak een nieuwe "
-"klantfactuur of verkooporder, wanneer we deze relatie selecteren. Het "
-"gebruikt automatisch deze kostenplaats."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -137,12 +112,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Factuurregel"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Kostenplaats"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Kostenverdeling"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
@@ -151,7 +139,7 @@ msgstr "Standaard startdatum voor deze kostenplaats."
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Kostenplaatsen"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index b403c87f34f..88849ca65bb 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 13:19+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Groeperen op..."
 msgid "Default end date for this Analytic Account."
 msgstr "Standaard einddatum voor deze analytische rekening"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,17 +51,6 @@ msgstr "Pickinglijst"
 msgid "Conditions"
 msgstr "Voorwaarden"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Kies een relatie voor wie de standaard analytische rekening van toepassing "
-"is (vb. maak een nieuwe verkoopfactuur of -order, en kies deze relatie; de "
-"analytische rekening wordt automatisch voorgesteld)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -61,9 +58,12 @@ msgid "Product"
 msgstr "Product"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analytische verdeelsleutels"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -82,17 +82,6 @@ msgstr "Gebruiker"
 msgid "Entries"
 msgstr "Boekingen"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Kies een product waarvoor de standaard analytische rekening van toepassing "
-"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit product; de "
-"analytische rekening wordt automatisch voorgesteld)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -110,17 +99,6 @@ msgstr "Analytische standaardwaarden"
 msgid "Sequence"
 msgstr "Volgorde"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Kies een bedrijf waarvoor de standaard analytische rekening van toepassing "
-"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit bedrijf; de "
-"analytische rekening wordt automatisch voorgesteld)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -133,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Factuurlijn"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analytische rekening"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analytische verdeelsleutels"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
index caa8eb5bea7..7cdd6c05776 100644
--- a/addons/account_analytic_default/i18n/oc.po
+++ b/addons/account_analytic_default/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:46+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Condicions"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr "Produch"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr "Utilizaire"
 msgid "Entries"
 msgstr "Escrituras"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Analitic per defaut"
 msgid "Sequence"
 msgstr "Sequéncia"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Compte Analitic"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 03afca0c0e3..53d26f1d94d 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 14:30+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Grupuj wg..."
 msgid "Default end date for this Analytic Account."
 msgstr "Domyślna data końcowa dla tego konta analitycznego"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Pobranie"
 msgid "Conditions"
 msgstr "Warunki"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr "Wybierz partnera, dla którego to konto będzie domyślne."
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Rozbicie analityczne"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Użytkownik"
 msgid "Entries"
 msgstr "Zapisy"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr "Wybierz produkt, dla którego to konto będzie domyślne."
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Domyślne ustawienia analityczne"
 msgid "Sequence"
 msgstr "Numeracja"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr "Wybierz firmę, dla której to konto będzie domyślne"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr "Wybierz użytkownika, dla którego to konto będzie domyślne."
 msgid "Invoice Line"
 msgstr "Pozycja faktury"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Rozbicie analityczne"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index 6ee4fe6eb20..50195f98625 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:25+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Agrupar por..."
 msgid "Default end date for this Analytic Account."
 msgstr "Data de fecho predefinida para esta conta analítica"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Lista Picking"
 msgid "Conditions"
 msgstr "Condições"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Artigo"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribuição analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Utilizador"
 msgid "Entries"
 msgstr "Movimentos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Valores por omissão da Analítica"
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Linha de fatura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Conta Analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribuição analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 52f72ae4932..6a785a4dc91 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 10:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 23:08+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
@@ -34,6 +34,18 @@ msgstr "Agrupar Por..."
 msgid "Default end date for this Analytic Account."
 msgstr "Data de término padrão para esta Conta Analítica"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+"Selecione um produto que irá utilizar a conta analítica especificada no "
+"padrão analítico (por exemplo, criar nova fatura de cliente ou pedido de "
+"vendas ao selecionar o produto, será criada uma conta analítica "
+"automaticamente)"
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,17 +56,6 @@ msgstr "Lista de Separação"
 msgid "Conditions"
 msgstr "Condições"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-"Selecione um parceiro que irá utilizar uma conta analítica padrão (ex: crie "
-"um novo cliente, crie uma fatura ou um pedido de venda, ao selecionar este "
-"cliente, o sistema irá automaticamente torná-lo uma conta analítica)"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -62,9 +63,16 @@ msgid "Product"
 msgstr "Produto"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distribuição Analítica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
+"Selecione um parceiro que irá utilizar a conta analítica especificada no "
+"padrão analítico (por exemplo, criar nova fatura de cliente ou pedido de "
+"vendas ao selecionar o parceiro, será criada uma conta analítica "
+"automaticamente)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -83,17 +91,6 @@ msgstr "Usuário"
 msgid "Entries"
 msgstr "Lançamentos"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-"Selecione um produto que irá utilizar uma conta analítica definida nos "
-"padrões (ex: crie um novo cliente, crie uma fatura ou um pedido de venda, ao "
-"este produto, o sistema irá automaticamente torná-lo uma conta analítica)"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -111,18 +108,6 @@ msgstr "Padrões Analíticos"
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-"Selecione uma empresa que irá utilizar uma conta analítica especificada nos "
-"padrões analíticos (por exemplo: crie um novo cliente, crie uma fatura ou um "
-"pedido de venda, se nós selecionarmos esta empresa, o sistema irá "
-"automaticamente torná-lo uma conta analítica)"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -136,12 +121,29 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Linha da Fatura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+"Selecione uma empresa que irá utilizar a conta analítica especificada no "
+"padrão analítico (por exemplo, criar nova fatura de cliente ou pedido de "
+"vendas ao selecionar a empresa, será criada uma conta analítica "
+"automaticamente)"
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Conta Analítica"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribuição Analítica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index 8f5e81c2cce..3b8920078f8 100644
--- a/addons/account_analytic_default/i18n/ro.po
+++ b/addons/account_analytic_default/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-17 07:29+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Grupeaza dupa..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Lista de ridicare"
 msgid "Conditions"
 msgstr "Conditii"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Produs"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Distributie analitica"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Utilizator"
 msgid "Entries"
 msgstr "Inregistrari"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Conturi Analitice implicite"
 msgid "Sequence"
 msgstr "Secventa"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Linie factura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Cont Analitic"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distributie analitica"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index 8e3261f4490..5d5c22a1714 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-17 10:54+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Группировать по ..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Комплектовочный лист"
 msgid "Conditions"
 msgstr "Условия"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Продукт"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Разнесение аналитики"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Пользователь"
 msgid "Entries"
 msgstr "Проводки"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Аналитика по умолчанию"
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Позиция счета"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Счет аналитического учета"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Разнесение аналитики"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index bc0bbb53bf4..325148b1024 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 10:18+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Podmienky"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr "Používateľ"
 msgid "Entries"
 msgstr "Položky"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Predvolené analýzy"
 msgid "Sequence"
 msgstr "Poradie"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index a94796f88c3..0374e6d5b50 100644
--- a/addons/account_analytic_default/i18n/sl.po
+++ b/addons/account_analytic_default/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 22:44+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
@@ -33,6 +33,14 @@ msgstr "Združeno po..."
 msgid "Default end date for this Analytic Account."
 msgstr "Privzeti zaključni datum"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Izbirni seznam"
 msgid "Conditions"
 msgstr "Pogoji"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr "Določile privzetega partnerja"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Izdelek"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analitična porazdelitev"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Uporabnik"
 msgid "Entries"
 msgstr "Vknjižbe"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr "Določite privzeti izdelek"
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Privzete vrednosti"
 msgid "Sequence"
 msgstr "Zaporedje"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr "Določite privzeto podjetje"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr "Določite privzetega uporabnika"
 msgid "Invoice Line"
 msgstr "Postavka računa"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analitični konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitična porazdelitev"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/sq.po b/addons/account_analytic_default/i18n/sq.po
index e2f46529506..27a9276c2ab 100644
--- a/addons/account_analytic_default/i18n/sq.po
+++ b/addons/account_analytic_default/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,8 +59,11 @@ msgid "Product"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -80,14 +83,6 @@ msgstr ""
 msgid "Entries"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index 906f950b42f..232d191a7be 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-29 09:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Grupirano po"
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Izborna Lista"
 msgid "Conditions"
 msgstr "Uslovi"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analitička Distribucija"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Korisnik"
 msgid "Entries"
 msgstr "Stavke"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Uobičajene postavke analitike"
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Faktura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitička Distribucija"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po
index ff05b3c123e..21c44477684 100644
--- a/addons/account_analytic_default/i18n/sr@latin.po
+++ b/addons/account_analytic_default/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-04 19:05+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Grupirano po"
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr "Izborna Lista"
 msgid "Conditions"
 msgstr "Uslovi"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analitička Distribucija"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Korisnik"
 msgid "Entries"
 msgstr "Stavke"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr "Uobičajene postavke analitike"
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Faktura"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitička Distribucija"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 92feb713a3d..4eabc34145d 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 09:18+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Gruppera"
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Plocklista"
 msgid "Conditions"
 msgstr "Villkor"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Objektdistribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Användare"
 msgid "Entries"
 msgstr "Poster"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Standard objektkonto"
 msgid "Sequence"
 msgstr "Sekvens"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Fakturarad"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analys konto"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Objektdistribution"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index 9cc9a950e95..bdd748e1638 100644
--- a/addons/account_analytic_default/i18n/tlh.po
+++ b/addons/account_analytic_default/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:23+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr ""
 msgid "Entries"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index d20b03ddbb7..a8e9c5fca97 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-10 23:06+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "Gruplandır..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "Toplama Listesi"
 msgid "Conditions"
 msgstr "Koşullar"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "Ürün"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Analitic Dağılım"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "Kullanıcı"
 msgid "Entries"
 msgstr "Girdiler"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "Varsayılan Analizler"
 msgid "Sequence"
 msgstr "Sıra No"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Fatura Kalemi"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Analiz Hesabı"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analitic Dağılım"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index a5e19a6fd6f..06610d1a774 100644
--- a/addons/account_analytic_default/i18n/uk.po
+++ b/addons/account_analytic_default/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:48+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr ""
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,8 +58,11 @@ msgid "Product"
 msgstr ""
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
 
 #. module: account_analytic_default
@@ -79,14 +82,6 @@ msgstr ""
 msgid "Entries"
 msgstr "Проводки"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/vi.po b/addons/account_analytic_default/i18n/vi.po
index 8e046790a00..a870490e170 100644
--- a/addons/account_analytic_default/i18n/vi.po
+++ b/addons/account_analytic_default/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-18 23:54+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -34,6 +34,14 @@ msgstr "Nhóm theo..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -44,14 +52,6 @@ msgstr ""
 msgid "Conditions"
 msgstr "Các điều kiện"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -59,9 +59,12 @@ msgid "Product"
 msgstr "Sản phẩm"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "Phân tích Phân phối"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -80,14 +83,6 @@ msgstr "Người sử dụng"
 msgid "Entries"
 msgstr "Mục nhập"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -105,14 +100,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Trình tự"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -124,12 +111,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "Dòng hóa đơn"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "Tài khoản KTQT"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Phân tích Phân phối"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 922d5679593..a4546a8776f 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 16:42+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "分组..."
 msgid "Default end date for this Analytic Account."
 msgstr "辅助核算项的默认结束日期"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "装箱单"
 msgid "Conditions"
 msgstr "条件"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "产品"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "辅助核算分摊"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "用户"
 msgid "Entries"
 msgstr "条目"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "默认辅助核算项"
 msgid "Sequence"
 msgstr "序列"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "发票行"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "辅助核算项"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "辅助核算分摊"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index 1c4cf1e6957..7b97d90ded3 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-18 11:11+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -33,6 +33,14 @@ msgstr "分類分式..."
 msgid "Default end date for this Analytic Account."
 msgstr ""
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -43,14 +51,6 @@ msgstr "提貨清單"
 msgid "Conditions"
 msgstr "條件"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"Select a partner which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
@@ -58,9 +58,12 @@ msgid "Product"
 msgstr "產品"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
-msgstr "輔助核算分配"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"partner, it will automatically take this as an analytic account)"
+msgstr ""
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -79,14 +82,6 @@ msgstr "使用者"
 msgid "Entries"
 msgstr "項目"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"Select a product which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
@@ -104,14 +99,6 @@ msgstr "輔助核算預設"
 msgid "Sequence"
 msgstr "序列"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid ""
-"Select a company which will use analytic account specified in analytic "
-"default (e.g. create new customer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytic account)"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -123,12 +110,25 @@ msgstr ""
 msgid "Invoice Line"
 msgstr "發票明細"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sales order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
 msgstr "輔助核算項目"
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "輔助核算分配"
+
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index ebf574d19a5..9d74e9eef33 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-30 23:10+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index aa50bd6c646..67224922b15 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2008-11-02 16:37+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index f1d2946ca21..9bfd3e46f2b 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:49+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index 3afa99f189c..0728d71628a 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:37+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index fdbd49bc63e..c4c4bef0ad9 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:53+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/da.po b/addons/account_analytic_plans/i18n/da.po
index aaaa8334271..31f09433da0 100644
--- a/addons/account_analytic_plans/i18n/da.po
+++ b/addons/account_analytic_plans/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 5defd9b28f1..5c785956da4 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 22:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index da44f0b8de0..5dffd951f0e 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 08:59+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index e5214fdf552..f19d113548c 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 11:44+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index cd4371a7613..8102346d9b2 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 15:29+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/es_CR.po b/addons/account_analytic_plans/i18n/es_CR.po
index 20937ddcf31..8cafe7018a8 100644
--- a/addons/account_analytic_plans/i18n/es_CR.po
+++ b/addons/account_analytic_plans/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:06+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_EC.po b/addons/account_analytic_plans/i18n/es_EC.po
index 051b1848625..f405e43da46 100644
--- a/addons/account_analytic_plans/i18n/es_EC.po
+++ b/addons/account_analytic_plans/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-11 15:42+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
index 07c67f28fad..0c77d71a6f8 100644
--- a/addons/account_analytic_plans/i18n/es_MX.po
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 00:35+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/es_PY.po b/addons/account_analytic_plans/i18n/es_PY.po
index 1bd157ee2ca..6bf0b51c578 100644
--- a/addons/account_analytic_plans/i18n/es_PY.po
+++ b/addons/account_analytic_plans/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-03 11:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index d41fe117577..0afac1f15b2 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:58+0000\n"
 "Last-Translator: lyyser <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Printing date:"
 #~ msgstr "Trükkimise kuupäev:"
diff --git a/addons/account_analytic_plans/i18n/fa.po b/addons/account_analytic_plans/i18n/fa.po
index 152df17504e..4d8324ae730 100644
--- a/addons/account_analytic_plans/i18n/fa.po
+++ b/addons/account_analytic_plans/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 76a33f4752a..67c5a7cb55b 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 860ddb0d050..46b00217bf8 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:41+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index 480f349b913..15a92aa816b 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: account-analytic-plans-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 19:57+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/gu.po b/addons/account_analytic_plans/i18n/gu.po
index 73b24266c2d..f3baf1f96ae 100644
--- a/addons/account_analytic_plans/i18n/gu.po
+++ b/addons/account_analytic_plans/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-16 12:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index 28e490fb4ce..0235dbc7545 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-30 15:24+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index d62986cc309..a3e089ae993 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-09 11:58+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index 924739ffb3d..a75d4e83656 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 22:01+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 650732c6ba3..c4d5c21cfbf 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-14 00:28+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/ja.po b/addons/account_analytic_plans/i18n/ja.po
index 728a0ee750b..b8a2136a0b5 100644
--- a/addons/account_analytic_plans/i18n/ja.po
+++ b/addons/account_analytic_plans/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-13 19:12+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index 78ee52f7502..327c61d677c 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 22:01+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 8aed9d8b913..20897cf8a82 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/lv.po b/addons/account_analytic_plans/i18n/lv.po
index b90f2b5600e..8696e8212a6 100644
--- a/addons/account_analytic_plans/i18n/lv.po
+++ b/addons/account_analytic_plans/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-01 12:44+0000\n"
 "Last-Translator: Nauris Sedlers <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index b319996b749..bae09abfe94 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-14 08:04+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/nb.po b/addons/account_analytic_plans/i18n/nb.po
index 0b147462b0c..e9559bb470b 100644
--- a/addons/account_analytic_plans/i18n/nb.po
+++ b/addons/account_analytic_plans/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-02 20:44+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 4929dd6e700..17257a01407 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 16:15+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -100,7 +100,7 @@ msgstr "Kostenverdelingsmodellen"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "Naam rekening"
+msgstr "Naam kostenplaats"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -705,10 +705,6 @@ msgstr "Vanaf datum"
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Ongeldige BBA gestructureerde communicatie!"
 
-#~ msgid "You can not create journal items on closed account."
-#~ msgstr ""
-#~ "Het is niet mogelijk een journaal boeking te doen op een afgesloten rekening."
-
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "Bedrijf moet gelijk zijn voor de gerelateerde rekening en periode."
 
@@ -749,3 +745,7 @@ msgstr "Vanaf datum"
 
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Het gekozen dagboek en periode moeten behoren tot hetzelfde bedrijf."
+
+#~ msgid "You can not create journal items on closed account."
+#~ msgstr ""
+#~ "Het is niet mogelijk een boeking te maken op een afgesloten kostenplaats."
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index a7886f88ca9..53ff65a6694 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
index 8d2fe2a1851..63bf292d38f 100644
--- a/addons/account_analytic_plans/i18n/oc.po
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 20:54+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index 8928b53b48e..bbd7ad1ad17 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 20:36+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 44b2aa8d14c..c2a0e4d18c6 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:28+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 686eaad4f9f..dc8c843deab 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 10:59+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index d212295c703..ad9f2de3c5f 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index 8ab9c0f6e32..f7e4e3acaa3 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-25 12:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index d8013160e60..84c8515fea1 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/sq.po b/addons/account_analytic_plans/i18n/sq.po
index 255c9c2fd11..6034918e561 100644
--- a/addons/account_analytic_plans/i18n/sq.po
+++ b/addons/account_analytic_plans/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index f48e4e3918d..963f956501b 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-29 09:40+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/sr@latin.po b/addons/account_analytic_plans/i18n/sr@latin.po
index 008fa8b37e8..1725927edd1 100644
--- a/addons/account_analytic_plans/i18n/sr@latin.po
+++ b/addons/account_analytic_plans/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-03 22:56+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 792ef973916..9593ec6628b 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-20 06:53+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index b893801c8f3..ea531e8a31d 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:23+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index d2c95c5d18a..07156eb20b1 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 00:10+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index e3e895bc752..f3f73fd6d4a 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:33+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/vi.po b/addons/account_analytic_plans/i18n/vi.po
index f5249a1dbe4..df136fda263 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-19 13:54+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index f302b3e96c8..3770abc4d45 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:38+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index e6c787b6779..94384416702 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-20 01:47+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
diff --git a/addons/account_anglo_saxon/i18n/ar.po b/addons/account_anglo_saxon/i18n/ar.po
index e7104e06fb2..083d3185603 100644
--- a/addons/account_anglo_saxon/i18n/ar.po
+++ b/addons/account_anglo_saxon/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-06-22 12:37+0000\n"
 "Last-Translator: Magd Addin M. Almuntaser <admin@liioiil.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/bg.po b/addons/account_anglo_saxon/i18n/bg.po
index 696f6a226ae..36f4513f608 100644
--- a/addons/account_anglo_saxon/i18n/bg.po
+++ b/addons/account_anglo_saxon/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-02-16 12:45+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/ca.po b/addons/account_anglo_saxon/i18n/ca.po
index 5852983ea0f..063df73ac1c 100644
--- a/addons/account_anglo_saxon/i18n/ca.po
+++ b/addons/account_anglo_saxon/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-06 23:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po
index 2d5a2b99d68..0997f877b26 100644
--- a/addons/account_anglo_saxon/i18n/da.po
+++ b/addons/account_anglo_saxon/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-09 21:36+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
index 3ac4cef9d35..880e169cb8d 100644
--- a/addons/account_anglo_saxon/i18n/de.po
+++ b/addons/account_anglo_saxon/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 22:10+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po
index 6265a90aa43..24023ad1690 100644
--- a/addons/account_anglo_saxon/i18n/el.po
+++ b/addons/account_anglo_saxon/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-13 08:21+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/en_GB.po b/addons/account_anglo_saxon/i18n/en_GB.po
index c4c28b534bd..83ec81d06bc 100644
--- a/addons/account_anglo_saxon/i18n/en_GB.po
+++ b/addons/account_anglo_saxon/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 13:21+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index f4261188b74..da6ce14b6ea 100644
--- a/addons/account_anglo_saxon/i18n/es.po
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 11:29+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/es_CR.po b/addons/account_anglo_saxon/i18n/es_CR.po
index a2f7811df54..5c11df78a76 100644
--- a/addons/account_anglo_saxon/i18n/es_CR.po
+++ b/addons/account_anglo_saxon/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:08+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/es_EC.po b/addons/account_anglo_saxon/i18n/es_EC.po
index 13ff7c62544..6768546fdb6 100644
--- a/addons/account_anglo_saxon/i18n/es_EC.po
+++ b/addons/account_anglo_saxon/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 03:32+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
index df6db677439..8ad5d95166d 100644
--- a/addons/account_anglo_saxon/i18n/es_MX.po
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 00:37+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/es_PY.po b/addons/account_anglo_saxon/i18n/es_PY.po
index 4c93af92e8b..20231672509 100644
--- a/addons/account_anglo_saxon/i18n/es_PY.po
+++ b/addons/account_anglo_saxon/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 23:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/et.po b/addons/account_anglo_saxon/i18n/et.po
index 7c34e6ce5c6..460f543d4c9 100644
--- a/addons/account_anglo_saxon/i18n/et.po
+++ b/addons/account_anglo_saxon/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-04-23 09:43+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/fa.po b/addons/account_anglo_saxon/i18n/fa.po
index a1583400c05..e7fb9d40d6b 100644
--- a/addons/account_anglo_saxon/i18n/fa.po
+++ b/addons/account_anglo_saxon/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po
index eabba56e033..d4bf00858a5 100644
--- a/addons/account_anglo_saxon/i18n/fi.po
+++ b/addons/account_anglo_saxon/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-29 08:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index 34a36082a17..ceea76e16fa 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-03 20:36+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/gl.po b/addons/account_anglo_saxon/i18n/gl.po
index 2758fa678a0..a2215a5dcd5 100644
--- a/addons/account_anglo_saxon/i18n/gl.po
+++ b/addons/account_anglo_saxon/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 10:33+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/gu.po b/addons/account_anglo_saxon/i18n/gu.po
index 1924da11195..3949bdaacc8 100644
--- a/addons/account_anglo_saxon/i18n/gu.po
+++ b/addons/account_anglo_saxon/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-16 11:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index b1bb2eebcd5..a6380b6ded2 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 12:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/hr.po b/addons/account_anglo_saxon/i18n/hr.po
index efcb4767a52..7773ac7ac23 100644
--- a/addons/account_anglo_saxon/i18n/hr.po
+++ b/addons/account_anglo_saxon/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-22 08:05+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/hu.po b/addons/account_anglo_saxon/i18n/hu.po
index 9f3b0c81b8b..fa0e65a1a49 100644
--- a/addons/account_anglo_saxon/i18n/hu.po
+++ b/addons/account_anglo_saxon/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-30 16:21+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
index 4da508273ba..e1ce667ac89 100644
--- a/addons/account_anglo_saxon/i18n/id.po
+++ b/addons/account_anglo_saxon/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-05-28 02:49+0000\n"
 "Last-Translator: Abdul Munif Hanafi <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 0fde5f9a420..08f9eea22c9 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 22:40+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
index 0c75f9192e0..c0fc4b15e6a 100644
--- a/addons/account_anglo_saxon/i18n/ja.po
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-10 03:21+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/lv.po b/addons/account_anglo_saxon/i18n/lv.po
index a0a4b5d9638..dc0e41ef5d1 100644
--- a/addons/account_anglo_saxon/i18n/lv.po
+++ b/addons/account_anglo_saxon/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-01 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
index 4d358bfc572..d8b7f420cb7 100644
--- a/addons/account_anglo_saxon/i18n/mn.po
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 17:19+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/nb.po b/addons/account_anglo_saxon/i18n/nb.po
index e74412850fb..3e6d4fbd431 100644
--- a/addons/account_anglo_saxon/i18n/nb.po
+++ b/addons/account_anglo_saxon/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-27 15:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index 3488387c3ba..d2da2e9f74b 100644
--- a/addons/account_anglo_saxon/i18n/nl.po
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:08+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/nl_BE.po b/addons/account_anglo_saxon/i18n/nl_BE.po
index 7efa95fae03..8f165381c56 100644
--- a/addons/account_anglo_saxon/i18n/nl_BE.po
+++ b/addons/account_anglo_saxon/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 13:28+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
index 538a2c5ad1e..d1093fd9474 100644
--- a/addons/account_anglo_saxon/i18n/oc.po
+++ b/addons/account_anglo_saxon/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-03-12 13:37+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index 8f81d121fe6..66f8a5bd2de 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-02-02 06:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/pt.po b/addons/account_anglo_saxon/i18n/pt.po
index 3a78c4ad98c..c71575843c7 100644
--- a/addons/account_anglo_saxon/i18n/pt.po
+++ b/addons/account_anglo_saxon/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 03:10+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/pt_BR.po b/addons/account_anglo_saxon/i18n/pt_BR.po
index 44c24920b5e..4bffde75971 100644
--- a/addons/account_anglo_saxon/i18n/pt_BR.po
+++ b/addons/account_anglo_saxon/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 11:04+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/ro.po b/addons/account_anglo_saxon/i18n/ro.po
index 53578818ac6..697b0247ddb 100644
--- a/addons/account_anglo_saxon/i18n/ro.po
+++ b/addons/account_anglo_saxon/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 13:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/ru.po b/addons/account_anglo_saxon/i18n/ru.po
index 0ccad3b4135..11937093b9a 100644
--- a/addons/account_anglo_saxon/i18n/ru.po
+++ b/addons/account_anglo_saxon/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-06-22 13:59+0000\n"
 "Last-Translator: devcode <brestows@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/sl.po b/addons/account_anglo_saxon/i18n/sl.po
index 12f1ec0f6bc..5b8a7a45f04 100644
--- a/addons/account_anglo_saxon/i18n/sl.po
+++ b/addons/account_anglo_saxon/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 00:48+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/sq.po b/addons/account_anglo_saxon/i18n/sq.po
index cea170d23d9..a144a4b17d5 100644
--- a/addons/account_anglo_saxon/i18n/sq.po
+++ b/addons/account_anglo_saxon/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/sr@latin.po b/addons/account_anglo_saxon/i18n/sr@latin.po
index 93653277707..48970d8d5ec 100644
--- a/addons/account_anglo_saxon/i18n/sr@latin.po
+++ b/addons/account_anglo_saxon/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-02 15:57+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/sv.po b/addons/account_anglo_saxon/i18n/sv.po
index 2804de21ea5..9fe1c231092 100644
--- a/addons/account_anglo_saxon/i18n/sv.po
+++ b/addons/account_anglo_saxon/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 11:55+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/ta.po b/addons/account_anglo_saxon/i18n/ta.po
index 4eafcd5a6b6..e8236ce1cc8 100644
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po
index a902fde1c80..aafc8f69c0a 100644
--- a/addons/account_anglo_saxon/i18n/tr.po
+++ b/addons/account_anglo_saxon/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 00:15+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index f5d7c809df5..db03d86bd60 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 16:41+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/zh_TW.po b/addons/account_anglo_saxon/i18n/zh_TW.po
index c3f28827136..35a9a869f4b 100644
--- a/addons/account_anglo_saxon/i18n/zh_TW.po
+++ b/addons/account_anglo_saxon/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-18 11:26+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_asset/i18n/ar.po b/addons/account_asset/i18n/ar.po
index 721699346fc..723ee3eadff 100644
--- a/addons/account_asset/i18n/ar.po
+++ b/addons/account_asset/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-08 02:35+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "قيد التنفيذ"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "مبلغ الإستهلاك"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "حفظ كمسودة"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "خطوط الأستهلاك"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "هي المبلغ المخطط لحصوله و يمكن إستهلاكه."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "مسوّدة"
 msgid "Date of asset purchase"
 msgstr "تاريخ شراء الأصول"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "حساب الإستهلاك لفترة زمنية محددة"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "نشِط"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "تغيير المدة"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "حساب تحليلي"
 msgid "Computation Method"
 msgstr "طريقة الحساب"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "تحديد الوقت لـ ٢ إستهلاك في الشهر"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -294,18 +291,9 @@ msgid ""
 msgstr "التناسب الزمني يمكن تطبيقه لأمر \"عدد الإستهلاك\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"طريقة تستخدم لحساب التواريخ  وعدد خطوط الاستهلاك.\n"
-"عدد الإستهلاكات: إصلاح عدد خطوط الاستهلاك و الوقت ما بين ٢ للإستهلاك.\n"
-"تاريخ الإنتهاء: اختيار الوقت بين ٢ من الإستهلاك حيث التاريخ للإستهلاك لن "
-"يتمتتجاوزه."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -353,6 +341,11 @@ msgstr "سجل الأصل"
 msgid "Search Asset Category"
 msgstr "بحث فئة الأصول"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -363,11 +356,6 @@ msgstr "خط الفاتورة"
 msgid "Depreciation Board"
 msgstr "لوحة الإستهلاك"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "عناصر دفتر اليومية"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -394,16 +382,18 @@ msgid "Note"
 msgstr "ملاحظة"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"أختر طريقة تستخدمها لحساب مبلغ  خطوط  الأستهلاك.\n"
-"  الخطي: محسوبة علي أساس: إجمالي القيمة/ عدد الأستهلاك\n"
-"  التدريجي: محسوبة علي أساس :القيمة المتبقية x عامل التدريجية"
+"طريقة تستخدم لحساب التواريخ  وعدد خطوط الاستهلاك.\n"
+"عدد الإستهلاكات: إصلاح عدد خطوط الاستهلاك و الوقت ما بين ٢ للإستهلاك.\n"
+"تاريخ الإنتهاء: اختيار الوقت بين ٢ من الإستهلاك حيث التاريخ للإستهلاك لن "
+"يتمتتجاوزه."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -474,9 +464,9 @@ msgid "User"
 msgstr "مستخدم"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "التاريخ"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "حساب الأصول"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -494,20 +484,15 @@ msgstr "احسب"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "سنة"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "حساب الأصول"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "نشِط"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -569,9 +554,9 @@ msgid "Close"
 msgstr "إغلاق"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "طريقة الأستهلاك"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "عناصر دفتر اليومية"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -604,9 +589,14 @@ msgid "Current"
 msgstr "الحالي"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "قيمة الاستهلاك"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "طريقة الأستهلاك"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -643,6 +633,15 @@ msgstr "اسم ورقة التاريخ"
 msgid "Amount Already Depreciated"
 msgstr "القيمة المستهلكة بالفعل"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -683,9 +682,9 @@ msgstr ""
 "فواتير."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "حفظ كمسودة"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "سنة"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -721,6 +720,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "أذكر الوقت بين ٢ تخفيضات، في الأشهر"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "التاريخ"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -838,6 +842,9 @@ msgstr "هرمية الأصول"
 #~ msgid "Month-1"
 #~ msgstr "شهر- ١"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "مبلغ الإستهلاك"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -850,6 +857,9 @@ msgstr "هرمية الأصول"
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "خطأ في إتصال قاعدة البيانات"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "حساب الإستهلاك لفترة زمنية محددة"
+
 #~ msgid "Gross value "
 #~ msgstr "إجمالي القيمة "
 
@@ -901,6 +911,9 @@ msgstr "هرمية الأصول"
 #~ msgid "Accounting information"
 #~ msgstr "معلومات محاسبية"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "قيمة الاستهلاك"
+
 #~ msgid "Assets purchased in last month"
 #~ msgstr "أصول مشتراه في الشهر الماضي"
 
@@ -920,6 +933,18 @@ msgstr "هرمية الأصول"
 #~ msgid "Post Depreciation Lines"
 #~ msgstr "إضافة خطوط الأستهلاك"
 
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "تحديد الوقت لـ ٢ إستهلاك في الشهر"
+
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "أختر طريقة تستخدمها لحساب مبلغ  خطوط  الأستهلاك.\n"
+#~ "  الخطي: محسوبة علي أساس: إجمالي القيمة/ عدد الأستهلاك\n"
+#~ "  التدريجي: محسوبة علي أساس :القيمة المتبقية x عامل التدريجية"
+
 #~ msgid "Review Asset Categories"
 #~ msgstr "مراجعة أصول الفئات"
 
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index beaf8eb43e6..dd23f4c3217 100755
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-08-17 21:30+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Actiu"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr "Compte analític"
 msgid "Computation Method"
 msgstr "Mètode de càlcul"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr "Històric de l'actiu"
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr "Taula d'amortització"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr "Usuari"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Data"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Compta d'actiu"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr ""
 msgid "Asset History"
 msgstr "Històric de l'actiu"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Compta d'actiu"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Actiu"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr "Tanca"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr "Nom històric"
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr "Seqüència"
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Data"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/cs.po b/addons/account_asset/i18n/cs.po
index d12f684c3b1..30324b076c9 100644
--- a/addons/account_asset/i18n/cs.po
+++ b/addons/account_asset/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account_asset
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Běžící"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Odpisová částka"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Nastavit na koncept"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Řádky odpisů"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Toto je částka, kterou plánujete, že nebudete odpisovat."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Návrh"
 msgid "Date of asset purchase"
 msgstr "Datum zakoupení majetku"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Spočítat odpočty v zadaném rozmezí"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktivní"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Změnit trvání"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Analytický účet"
 msgid "Computation Method"
 msgstr "Metoda výpočtu"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Zde zjistěte čas trvajících dvou odpisů v měsících"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -295,17 +292,9 @@ msgstr ""
 "Prorata temporis může být použita pouze pro časovou metodu \"počet odpisů\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Metoda k použití pro výpočet datumů a počet odpisových řádek.\n"
-"Počet odpisů: Pevné číslo počtu odpisových řádků a čas mezi 2 odpisy.\n"
-"Konečný datum: Vybere čas mezi 2 odpisy a datum odpis nemůže jít přes."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -353,6 +342,11 @@ msgstr "Historie majetku"
 msgid "Search Asset Category"
 msgstr "Hledat kategorii majetku"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -363,11 +357,6 @@ msgstr "Řádek faktury"
 msgid "Depreciation Board"
 msgstr "Odpisová tabule"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Položky deníku"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -394,16 +383,17 @@ msgid "Note"
 msgstr "Poznámka"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Vyberte metodu pro použití pro spočítání částky odpisových řádků.\n"
-"  * Lineární: Vypočteno na základě: Hrubé hodnoty / Počet odpisů\n"
-"  * Klesající: Vypočteno na základě: Zbytkové hodnoty * Činitel poklesu"
+"Metoda k použití pro výpočet datumů a počet odpisových řádek.\n"
+"Počet odpisů: Pevné číslo počtu odpisových řádků a čas mezi 2 odpisy.\n"
+"Konečný datum: Vybere čas mezi 2 odpisy a datum odpis nemůže jít přes."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -473,9 +463,9 @@ msgid "User"
 msgstr "Uživatel"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Účet majetku"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -493,20 +483,15 @@ msgstr "Spočítat"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Rok"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Účet majetku"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivní"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -568,9 +553,9 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Odpisová metoda"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Položky deníku"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -605,9 +590,14 @@ msgid "Current"
 msgstr "Aktuální"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Částka k odepsání"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Odpisová metoda"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -644,6 +634,15 @@ msgstr "Jméno historie"
 msgid "Amount Already Depreciated"
 msgstr "Již odepsaná částka"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -684,9 +683,9 @@ msgstr ""
 "kategorii, když jsou vytvořeny pomocí dokladů."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Nastavit na koncept"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Rok"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -722,6 +721,11 @@ msgstr "Pořadí"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Zde zjistěte čas mezi dvěma odpisy v měsíci"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -961,6 +965,9 @@ msgstr "Hierarchie majetku"
 #~ msgid "Parent asset"
 #~ msgstr "Nadřazený majetek"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Odpisová částka"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -977,6 +984,12 @@ msgstr "Hierarchie majetku"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Pořadí odpočtů"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Spočítat odpočty v zadaném rozmezí"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Zde zjistěte čas trvajících dvou odpisů v měsících"
+
 #~ msgid "Gross value "
 #~ msgstr "Hrubá hodnota "
 
@@ -998,6 +1011,15 @@ msgstr "Hierarchie majetku"
 #~ msgid "Asset durations to modify"
 #~ msgstr "Úprava trvání majetku"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Vyberte metodu pro použití pro spočítání částky odpisových řádků.\n"
+#~ "  * Lineární: Vypočteno na základě: Hrubé hodnoty / Počet odpisů\n"
+#~ "  * Klesající: Vypočteno na základě: Zbytkové hodnoty * Činitel poklesu"
+
 #~ msgid "Assets purchased in current month"
 #~ msgstr "Majetek zakoupený v tomto měsíci"
 
@@ -1010,6 +1032,9 @@ msgstr "Hierarchie majetku"
 #~ msgid "Review Asset Categories"
 #~ msgstr "Přezkoumat kategorie majetku"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Částka k odepsání"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
diff --git a/addons/account_asset/i18n/da.po b/addons/account_asset/i18n/da.po
index c6bd7491787..7b165167d3e 100644
--- a/addons/account_asset/i18n/da.po
+++ b/addons/account_asset/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-01 12:06+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr ""
 msgid "Date of asset purchase"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr ""
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr ""
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr ""
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,8 +454,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
 msgstr ""
 
 #. module: account_asset
@@ -481,19 +474,14 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
+#: field:account.asset.asset,active:0
+msgid "Active"
 msgstr ""
 
 #. module: account_asset
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 3040660b743..ba80fcbe22c 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 22:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -98,9 +98,9 @@ msgid "Running"
 msgstr "In Betrieb"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Abschreibung Betrag"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Setze auf Entwurf"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -147,6 +147,11 @@ msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 "Das ist der geplante Erinnerungswert, der nicht abgeschrieben werden kann."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -252,21 +257,18 @@ msgstr "Entwurf"
 msgid "Date of asset purchase"
 msgstr "Kaufdatum der Anlage"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Berechnet die Abschreibungen in einem definierten Intervall"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktiv"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Verändere Lebensdauer"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -283,11 +285,6 @@ msgstr "Kostenstelle"
 msgid "Computation Method"
 msgstr "Berechnungsmethode"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Definieren Sie die Zeit in Monaten zwischen 2 Abschreibungen"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -298,20 +295,9 @@ msgstr ""
 "Abschreibung\" verwendet werden"
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Die Methode, die verwendet wird, um das Datum und Anzahl der "
-"Abschreibungesbuchungen zu berechnen.\n"
-"Anzahl der Abschreibungen: Anzahl der Abschreibungsbuchungen und Zeit "
-"zwischen 2 Abschreibungen.\n"
-"Ende Datum: Wählen Sie die Zeit zwischen 2 Abschreibungen und das Datum nach "
-"dem keine Abschreibungen mehr berechnet werden."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -359,6 +345,11 @@ msgstr "Anlagenhistorie"
 msgid "Search Asset Category"
 msgstr "Suche Anlagen Kategorie"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -369,11 +360,6 @@ msgstr "Rechnungsposition"
 msgid "Depreciation Board"
 msgstr "Abschreibungsspiegel"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Journaleinträge"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -400,16 +386,20 @@ msgid "Note"
 msgstr "Notiz"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Wählen Sie die Methode der Berechnung der Abschreibungsbeträge.\n"
-"  * Linear: Berechnung: Brutto Wert / Anzahl der Abschreibungen\n"
-"  * Degressive: Berechnung : Restbuchwert * Degressiven Faktor"
+"Die Methode, die verwendet wird, um das Datum und Anzahl der "
+"Abschreibungesbuchungen zu berechnen.\n"
+"Anzahl der Abschreibungen: Anzahl der Abschreibungsbuchungen und Zeit "
+"zwischen 2 Abschreibungen.\n"
+"Ende Datum: Wählen Sie die Zeit zwischen 2 Abschreibungen und das Datum nach "
+"dem keine Abschreibungen mehr berechnet werden."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -486,9 +476,9 @@ msgid "User"
 msgstr "Benutzer"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Anlagen Konto"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -506,20 +496,15 @@ msgstr "Berechnen"
 msgid "Asset History"
 msgstr "Historie Anlagegegüter"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Jahr"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Anlagen Konto"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -581,9 +566,9 @@ msgid "Close"
 msgstr "Schließen"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Abschreibungsmethode"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journaleinträge"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -618,9 +603,14 @@ msgid "Current"
 msgstr "Aktuell"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Abzuschreibender Betrag"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Abschreibungsmethode"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -657,6 +647,15 @@ msgstr "Verlauf Bezeichnung"
 msgid "Amount Already Depreciated"
 msgstr "Bereits abgeschriebener Betrag"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -702,9 +701,9 @@ msgstr ""
 "der Rechnung bestätigt werden soll."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Setze auf Entwurf"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Jahr"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -740,6 +739,11 @@ msgstr "Sequenz"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Definieren Sie hier die Monate zwischen 2 Abschreibungen"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -965,6 +969,9 @@ msgstr "Anlangenhierarchie"
 #~ msgid "Indirect"
 #~ msgstr "Indirekt"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Abschreibung Betrag"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -981,6 +988,12 @@ msgstr "Anlangenhierarchie"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Sequenz der Abschreibung"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Berechnet die Abschreibungen in einem definierten Intervall"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Definieren Sie die Zeit in Monaten zwischen 2 Abschreibungen"
+
 #~ msgid "Other Information"
 #~ msgstr "Weitere Informationen"
 
@@ -1008,6 +1021,9 @@ msgstr "Anlangenhierarchie"
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Die Rechnungsnummer muss je Firma eindeutig sein"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Abzuschreibender Betrag"
+
 #~ msgid "Accounting information"
 #~ msgstr "Buchhaltung Information"
 
@@ -1046,6 +1062,15 @@ msgstr "Anlangenhierarchie"
 #~ msgid "Assets purchased in last month"
 #~ msgstr "Anlagen im letzen Monat gekauft"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Wählen Sie die Methode der Berechnung der Abschreibungsbeträge.\n"
+#~ "  * Linear: Berechnung: Brutto Wert / Anzahl der Abschreibungen\n"
+#~ "  * Degressive: Berechnung : Restbuchwert * Degressiven Faktor"
+
 #~ msgid "You can not create journal items on an account of type view."
 #~ msgstr "You can not create journal items on an account of type view."
 
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index bf05b47e6dd..c9fb5d7ef0d 100755
--- a/addons/account_asset/i18n/es.po
+++ b/addons/account_asset/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 11:45+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "En ejecución"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Importe de depreciación"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Líneas de depreciación"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Es el importe que prevee tener que no puede depreciar"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Borrador"
 msgid "Date of asset purchase"
 msgstr "Fecha de compra del activo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcula la amortización en el periodo especificado"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Activo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Cambiar duración"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Cuenta analítica"
 msgid "Computation Method"
 msgstr "Método de cálculo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,19 +293,9 @@ msgstr ""
 "amortizaciones\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"El método usado para calcular las fechas número de líneas de depreciación\n"
-"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
-"tiempo entre 2 depreciaciones\n"
-"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
-"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -356,6 +343,11 @@ msgstr "Histórico del activo"
 msgid "Search Asset Category"
 msgstr "Buscar categoría de activo"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -366,11 +358,6 @@ msgstr "Línea de factura"
 msgid "Depreciation Board"
 msgstr "Tabla de amortización"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Apuntes contables"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -397,17 +384,19 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Escoja el método para usar en el cálculo del importe de las líneas de "
-"amortización\n"
-"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
-"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -486,9 +475,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de activo"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -506,20 +495,15 @@ msgstr "Calcular"
 msgid "Asset History"
 msgstr "Histórico del activo"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Año"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "Asistente de confirmación de depreciación de activo"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Cuenta de activo"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -581,9 +565,9 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Método de depreciación"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes contables"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -618,9 +602,14 @@ msgid "Current"
 msgstr "Actual"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Importe a depreciar"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -657,6 +646,15 @@ msgstr "Nombre del histórico"
 msgid "Amount Already Depreciated"
 msgstr "importe depreciado"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -702,9 +700,9 @@ msgstr ""
 "es creado desde una factura."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -740,6 +738,11 @@ msgstr "Secuencia"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -974,6 +977,9 @@ msgstr "Jerarquía de activos"
 #~ msgid "Date created"
 #~ msgstr "Fecha de creación"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Importe de depreciación"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -987,6 +993,12 @@ msgstr "Jerarquía de activos"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Secuencia de amortización"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcula la amortización en el periodo especificado"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
+
 #~ msgid "Gross value "
 #~ msgstr "Valor bruto "
 
@@ -1024,6 +1036,16 @@ msgstr "Jerarquía de activos"
 #~ msgid "Asset durations to modify"
 #~ msgstr "Duraciones de activo para modificar"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Escoja el método para usar en el cálculo del importe de las líneas de "
+#~ "amortización\n"
+#~ "  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+#~ "  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
 #~ msgid "Analytic information"
 #~ msgstr "Información analítica"
 
@@ -1062,6 +1084,9 @@ msgstr "Jerarquía de activos"
 #~ "la última línea de depreciación se asienta, el activo automáticamente pasa a "
 #~ "este estado."
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Importe a depreciar"
+
 #~ msgid "Month-1"
 #~ msgstr "Mes-1"
 
diff --git a/addons/account_asset/i18n/es_AR.po b/addons/account_asset/i18n/es_AR.po
index 0f5d3d18cbd..3fe51999cde 100644
--- a/addons/account_asset/i18n/es_AR.po
+++ b/addons/account_asset/i18n/es_AR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-30 23:41+0000\n"
 "Last-Translator: Gustavo Earnshaw <gustavoear@gmail.com>\n"
 "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr ""
 msgid "Date of asset purchase"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr ""
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr ""
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr ""
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,8 +454,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
 msgstr ""
 
 #. module: account_asset
@@ -481,19 +474,14 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
+#: field:account.asset.asset,active:0
+msgid "Active"
 msgstr ""
 
 #. module: account_asset
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po
index 435aaeef065..67ccd05b0c9 100755
--- a/addons/account_asset/i18n/es_CR.po
+++ b/addons/account_asset/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 19:28+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: account_asset
@@ -98,9 +98,9 @@ msgid "Running"
 msgstr "En proceso"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Importe de depreciación"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -146,6 +146,11 @@ msgstr "Líneas de depreciación"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Es el importe que prevee tener que no puede depreciar"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -251,21 +256,18 @@ msgstr "Borrador"
 msgid "Date of asset purchase"
 msgstr "Fecha de compra del activo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcula la amortización en el periodo especificado"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Activo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Cambiar duración"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -282,11 +284,6 @@ msgstr "Cuenta analítica"
 msgid "Computation Method"
 msgstr "Método de cálculo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -297,19 +294,9 @@ msgstr ""
 "amortizaciones\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"El método usado para calcular las fechas número de líneas de depreciación\n"
-"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
-"tiempo entre 2 depreciaciones\n"
-"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
-"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -357,6 +344,11 @@ msgstr "Histórico del activo"
 msgid "Search Asset Category"
 msgstr "Buscar categoría de activo"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -367,11 +359,6 @@ msgstr "Línea de factura"
 msgid "Depreciation Board"
 msgstr "Tabla de amortización"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Elementos diario"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -398,17 +385,19 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Escoja el método para usar en el cálculo del importe de las líneas de "
-"amortización\n"
-"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
-"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -481,9 +470,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de activo"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -501,20 +490,15 @@ msgstr "Calcular"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Año"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Cuenta de activo"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -576,9 +560,9 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Método de depreciación"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -613,9 +597,14 @@ msgid "Current"
 msgstr "Actual"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Importe a depreciar"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -652,6 +641,15 @@ msgstr "Nombre histórico"
 msgid "Amount Already Depreciated"
 msgstr "Cantidad ya depreciada"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -692,9 +690,9 @@ msgstr ""
 "es creado desde una factura."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -730,6 +728,11 @@ msgstr "Secuencia"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -973,6 +976,9 @@ msgstr "Jerarquía de activos"
 #~ msgid "Date created"
 #~ msgstr "Fecha de creación"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Importe de depreciación"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -989,6 +995,12 @@ msgstr "Jerarquía de activos"
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "¡Estructura de comunicación BBA no válida!"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcula la amortización en el periodo especificado"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
+
 #~ msgid "Gross value "
 #~ msgstr "Valor bruto "
 
@@ -1023,6 +1035,16 @@ msgstr "Jerarquía de activos"
 #~ msgid "Asset durations to modify"
 #~ msgstr "Duraciones de activo para modificar"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Escoja el método para usar en el cálculo del importe de las líneas de "
+#~ "amortización\n"
+#~ "  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+#~ "  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
 #~ msgid "Analytic information"
 #~ msgstr "Información analítica"
 
@@ -1035,6 +1057,9 @@ msgstr "Jerarquía de activos"
 #~ msgid "You can not create journal items on an account of type view."
 #~ msgstr "No puede crear asientos en una cuenta de tipo vista"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Importe a depreciar"
+
 #~ msgid "Accounting information"
 #~ msgstr "Información contable"
 
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index 3d206b6a2df..8da44b53c5a 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-30 03:27+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "En proceso"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Importe de depreciación"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Detalle de Depreciación"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Es el importe que prevee tener y que no puede depreciar"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Borrador"
 msgid "Date of asset purchase"
 msgstr "Fecha de compra del activo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcula la depreciación en el período especificado"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Activo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Cambiar duración"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Cuenta Analitica"
 msgid "Computation Method"
 msgstr "Método de cálculo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,19 +293,9 @@ msgstr ""
 "depreciaciones\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"El método usado para calcular las fechas número de líneas de depreciación\n"
-"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
-"tiempo entre 2 depreciaciones\n"
-"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
-"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -356,6 +343,11 @@ msgstr "Histórico del activo"
 msgid "Search Asset Category"
 msgstr "Buscar categoría de activo"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -366,11 +358,6 @@ msgstr "Detalle de Factura"
 msgid "Depreciation Board"
 msgstr "Tabla de depreciación"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Asientos Contables"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -397,17 +384,19 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Escoja el método para usar en el cálculo del importe de las líneas de "
-"depreciación\n"
-"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
-"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -480,9 +469,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de Activo Fijo"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -500,20 +489,15 @@ msgstr "Calcular"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Año"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Cuenta de Activo Fijo"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -575,9 +559,9 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Método de depreciación"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Asientos Contables"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -612,9 +596,14 @@ msgid "Current"
 msgstr "Actual"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Importe a depreciar"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -651,6 +640,15 @@ msgstr "Nombre histórico"
 msgid "Amount Already Depreciated"
 msgstr "importe depreciado"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -691,9 +689,9 @@ msgstr ""
 "es creado desde una factura."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -729,6 +727,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -756,6 +759,9 @@ msgstr "Confirmar activo"
 msgid "Asset Hierarchy"
 msgstr "Jerarquía de activos"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Importe de depreciación"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -775,6 +781,9 @@ msgstr "Jerarquía de activos"
 #~ msgid "Gross value "
 #~ msgstr "Valor bruto "
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcula la depreciación en el período especificado"
+
 #~ msgid "Error ! You can not create recursive assets."
 #~ msgstr "¡Error! No puede crear activos recursivos"
 
@@ -815,6 +824,16 @@ msgstr "Jerarquía de activos"
 #~ msgid "Asset durations to modify"
 #~ msgstr "Duraciones de activo para modificar"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Escoja el método para usar en el cálculo del importe de las líneas de "
+#~ "depreciación\n"
+#~ "  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+#~ "  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
 #~ msgid "Analytic information"
 #~ msgstr "Información analítica"
 
@@ -853,6 +872,9 @@ msgstr "Jerarquía de activos"
 #~ "la última línea de depreciación se asienta, el activo automáticamente pasa a "
 #~ "este estado."
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Importe a depreciar"
+
 #~ msgid "Month-1"
 #~ msgstr "Mes-1"
 
@@ -874,3 +896,6 @@ msgstr "Jerarquía de activos"
 
 #~ msgid "Post Depreciation Lines"
 #~ msgstr "Asentar líneas de depreciación"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
index 6a872233d61..c2b2c9178a6 100644
--- a/addons/account_asset/i18n/es_MX.po
+++ b/addons/account_asset/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 00:58+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "En ejecución"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Importe de depreciación"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Líneas de depreciación"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Es el importe que prevee tener que no puede depreciar"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Borrador"
 msgid "Date of asset purchase"
 msgstr "Fecha de compra del activo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcula la amortización en el periodo especificado"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Activo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Cambiar duración"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Cuenta analítica"
 msgid "Computation Method"
 msgstr "Método de cálculo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,19 +293,9 @@ msgstr ""
 "amortizaciones\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"El método usado para calcular las fechas número de líneas de depreciación\n"
-"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
-"tiempo entre 2 depreciaciones\n"
-"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
-"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -356,6 +343,11 @@ msgstr "Histórico del activo"
 msgid "Search Asset Category"
 msgstr "Buscar categoría de activo"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -366,11 +358,6 @@ msgstr "Línea de factura"
 msgid "Depreciation Board"
 msgstr "Tabla de amortización"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Elementos diario"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -397,17 +384,19 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Escoja el método a usar en el cálculo del importe de las líneas de "
-"amortización\n"
-"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
-"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -486,9 +475,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de activo"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -506,20 +495,15 @@ msgstr "Calcular"
 msgid "Asset History"
 msgstr "Histórico del activo"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Año"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "Asistente de confirmación de depreciación de activo"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Cuenta de activo"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -581,9 +565,9 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Método de depreciación"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -618,9 +602,14 @@ msgid "Current"
 msgstr "Actual"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Importe a depreciar"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -657,6 +646,15 @@ msgstr "Nombre del histórico"
 msgid "Amount Already Depreciated"
 msgstr "el importe ya ha sido depreciado"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -705,9 +703,9 @@ msgstr ""
 "es creado desde una factura."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -743,6 +741,11 @@ msgstr "Secuencia"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -770,6 +773,9 @@ msgstr "Confirmar activo"
 msgid "Asset Hierarchy"
 msgstr "Jerarquía de activos"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Importe de depreciación"
+
 #~ msgid "Wrong credit or debit value in accounting entry !"
 #~ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 
@@ -783,6 +789,12 @@ msgstr "Jerarquía de activos"
 #~ "¡La fecha de su asiento no está en el periodo definido! Usted debería "
 #~ "cambiar la fecha o borrar esta restricción del diario."
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcula la amortización en el periodo especificado"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
+
 #~ msgid ""
 #~ "The selected account of your Journal Entry forces to provide a secondary "
 #~ "currency. You should remove the secondary currency on the account or select "
@@ -792,5 +804,18 @@ msgstr "Jerarquía de activos"
 #~ "Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
 #~ "vista multi-moneda"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Escoja el método a usar en el cálculo del importe de las líneas de "
+#~ "amortización\n"
+#~ "  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+#~ "  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "¡El número de factura debe ser único por compañía!"
+
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Importe a depreciar"
diff --git a/addons/account_asset/i18n/et.po b/addons/account_asset/i18n/et.po
index 321688f6d8d..6c2ef2f5970 100644
--- a/addons/account_asset/i18n/et.po
+++ b/addons/account_asset/i18n/et.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 19:06+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
@@ -95,9 +95,9 @@ msgid "Running"
 msgstr "Käigus"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr ""
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sea mustandiks"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr "Soetuskuupäev"
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktiivne"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr "Analüütiline konto"
 msgid "Computation Method"
 msgstr "Arvestusmeetod"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr "Põhivara ajalugu"
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr "Arve rida"
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr "Märkus"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr "Kasutaja"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Kuupäev"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr "Arvuta"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Aasta"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr ""
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiivne"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,9 +544,9 @@ msgid "Close"
 msgstr "Sulge"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Amortisatsioonimeetod"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr "Praegune"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Amortisatsioonimeetod"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,9 +670,9 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Sea mustandiks"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Aasta"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Kuupäev"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/fi.po b/addons/account_asset/i18n/fi.po
index 02cf2d883a4..2b2e857eef5 100644
--- a/addons/account_asset/i18n/fi.po
+++ b/addons/account_asset/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-30 07:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr ""
 msgid "Date of asset purchase"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr ""
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr ""
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr ""
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,8 +454,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
 msgstr ""
 
 #. module: account_asset
@@ -481,19 +474,14 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Vuosi"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
+#: field:account.asset.asset,active:0
+msgid "Active"
 msgstr ""
 
 #. module: account_asset
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,9 +670,9 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr ""
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Vuosi"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index 82747b1306e..a7759ca010e 100755
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-03 20:30+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -98,9 +98,9 @@ msgid "Running"
 msgstr "En cours"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Montant de dépréciation"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -146,6 +146,11 @@ msgstr "Lignes de dépréciation"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Il s'agit de la part non dépréciable de l'immobilisation."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -251,21 +256,18 @@ msgstr "Brouilon"
 msgid "Date of asset purchase"
 msgstr "Date d'achat de l'actif"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcule la dépréciation dans une période spécifique"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Actif"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Modifier la durée"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -282,11 +284,6 @@ msgstr "Compte Analytique"
 msgid "Computation Method"
 msgstr "Méthode de calcul"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Durée en mois entre 2 amortissements"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -297,20 +294,9 @@ msgstr ""
 "(unité de temps)"
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"La méthode à utiliser pour calculer les dates et le nombre de lignes "
-"d'amortissement.\n"
-"Nombre d'amortissements : déterminer le nombre de lignes d'amortissement et "
-"le temps entre 2 amortissements.\n"
-"Date de fin : choisissez le temps entre 2 amortissements et la date de fin "
-"des amortissements."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -358,6 +344,11 @@ msgstr "Historique de l'immobilisation"
 msgid "Search Asset Category"
 msgstr "Recherche une catérogie d'immobilisation"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -368,11 +359,6 @@ msgstr "Lignes de facture"
 msgid "Depreciation Board"
 msgstr "Tableau des amortissements"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Écritures comptables"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -399,18 +385,20 @@ msgid "Note"
 msgstr "Remarque"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Choisir la méthode à utiliser pour calculer le montant des lignes "
+"La méthode à utiliser pour calculer les dates et le nombre de lignes "
 "d'amortissement.\n"
-"  * Linéaire: Calculé sur la base : Montant total / nombre d'amortissements\n"
-"  * Dégressif: Calculé sur la base: Valeur résiduelle * taux d'amortissement "
-"* facteur d'amortissement"
+"Nombre d'amortissements : déterminer le nombre de lignes d'amortissement et "
+"le temps entre 2 amortissements.\n"
+"Date de fin : choisissez le temps entre 2 amortissements et la date de fin "
+"des amortissements."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -489,9 +477,9 @@ msgid "User"
 msgstr "Utilisateur"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Compte d'immobilisation"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -509,20 +497,15 @@ msgstr "Calculer"
 msgid "Asset History"
 msgstr "Historique de l'immobilisation"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Année"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Compte d'immobilisation"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Actif"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -584,9 +567,9 @@ msgid "Close"
 msgstr "Fermer"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Méthode d'amortissement"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Écritures comptables"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -621,9 +604,14 @@ msgid "Current"
 msgstr "En cours"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Montant de l'amortissement"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Méthode d'amortissement"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -660,6 +648,15 @@ msgstr "Nom de l'historique"
 msgid "Amount Already Depreciated"
 msgstr "Montant déjà ammorti"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -705,9 +702,9 @@ msgstr ""
 "immobilisations de cette catégorie lorsqu'elles sont créées par des factures."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Mettre à l'état \"Brouillon\""
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Année"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -743,6 +740,11 @@ msgstr "Séquence"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Définir ici le temps (en mois) entre 2 amortissements"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Date"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -887,6 +889,9 @@ msgstr "Hiérarchie des immobilisations"
 #~ msgid "Residual value"
 #~ msgstr "Valeur résiduelle"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Montant de dépréciation"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -897,9 +902,23 @@ msgstr "Hiérarchie des immobilisations"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Séquence de la dépréciation"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcule la dépréciation dans une période spécifique"
+
 #~ msgid "Asset durations to modify"
 #~ msgstr "Durées d'amortissement à modifier"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Choisir la méthode à utiliser pour calculer le montant des lignes "
+#~ "d'amortissement.\n"
+#~ "  * Linéaire: Calculé sur la base : Montant total / nombre d'amortissements\n"
+#~ "  * Dégressif: Calculé sur la base: Valeur résiduelle * taux d'amortissement "
+#~ "* facteur d'amortissement"
+
 #~ msgid "Analytic information"
 #~ msgstr "Information pour l'analytique"
 
@@ -909,6 +928,9 @@ msgstr "Hiérarchie des immobilisations"
 #~ msgid "Close asset"
 #~ msgstr "Fermer l'immobilisation"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Montant de l'amortissement"
+
 #~ msgid "Gross value "
 #~ msgstr "Valeur brute "
 
@@ -927,6 +949,9 @@ msgstr "Hiérarchie des immobilisations"
 #~ msgid "Review Asset Categories"
 #~ msgstr "Définir les catégories d'amortissement"
 
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Durée en mois entre 2 amortissements"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
diff --git a/addons/account_asset/i18n/gu.po b/addons/account_asset/i18n/gu.po
index c0cd274c80d..4c0017636fe 100644
--- a/addons/account_asset/i18n/gu.po
+++ b/addons/account_asset/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-15 19:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr "ચાલી રહ્યું છે"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr "ડ્રાફ્ટ"
 msgid "Date of asset purchase"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr ""
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr ""
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr ""
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,8 +454,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
 msgstr ""
 
 #. module: account_asset
@@ -481,19 +474,14 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
+#: field:account.asset.asset,active:0
+msgid "Active"
 msgstr ""
 
 #. module: account_asset
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
index 5745ab2e214..85e6803c13a 100644
--- a/addons/account_asset/i18n/hr.po
+++ b/addons/account_asset/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 07:32+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr "Analitički konto"
 msgid "Computation Method"
 msgstr "Computation Method"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr "Povijest DI"
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr "Bilješka"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Konto sredstva"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Konto sredstva"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivno"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr "Naziv"
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr "Brojčana serija"
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po
index 18622995715..c38888ef423 100644
--- a/addons/account_asset/i18n/id.po
+++ b/addons/account_asset/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-21 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr "Tanggal pembelian aset"
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktif"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr ""
 msgid "Computation Method"
 msgstr "Metode Perhitungan"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Tanggal"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr ""
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktif"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,9 +544,9 @@ msgid "Close"
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Metode Depresiasi"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Metode Depresiasi"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Tanggal"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/it.po b/addons/account_asset/i18n/it.po
index 9d58e84167c..63b0fed855c 100644
--- a/addons/account_asset/i18n/it.po
+++ b/addons/account_asset/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 23:32+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "In esecuzione"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Importo Ammortamento"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Imposta come Bozza"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Righe Ammortamento"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "E' l'ammontare che si prevede di non poter ammortizzare."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Bozza"
 msgid "Date of asset purchase"
 msgstr "Data di acquisto dell'immobilizzazione"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcola l'Ammortamento all'interno del periodo indicato"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Attivo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Modifica Durata"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Conto analitico"
 msgid "Computation Method"
 msgstr "Metodo di calcolo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Indicare l'intervallo tra 2 ammortamenti, in mesi"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,20 +293,9 @@ msgstr ""
 "di ammortamenti\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Il metodo da usare per calcolare le date e il numero delle righe di "
-"ammortamento.\n"
-"Numero di Ammortamenti: Indicare il numero delle righe di ammortamento e il "
-"periodo da 2 ammortamenti.\n"
-"Data Finale: Scegliere il periodo tra 2 ammortamenti e la data che gli "
-"ammortamenti non dovranno superare."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -357,6 +343,11 @@ msgstr "Storico immobilizzazione"
 msgid "Search Asset Category"
 msgstr "Ricerca Categoria Immobilizzazioni"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -367,11 +358,6 @@ msgstr "Riga fattura"
 msgid "Depreciation Board"
 msgstr "Piano d'Ammortamento"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Voci Sezionale"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -398,17 +384,20 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Selezionare il metodo da usare per calcolare l'importo degli ammortamenti.\n"
-"  *Lineare: Calcolate sulla base di: Importo Lordo / Numero di Periodi "
-"d'Ammortamento\n"
-"  *Regressivo: Calcolato sulla base di: Valore Residuo * Fattore Regressivo"
+"Il metodo da usare per calcolare le date e il numero delle righe di "
+"ammortamento.\n"
+"Numero di Ammortamenti: Indicare il numero delle righe di ammortamento e il "
+"periodo da 2 ammortamenti.\n"
+"Data Finale: Scegliere il periodo tra 2 ammortamenti e la data che gli "
+"ammortamenti non dovranno superare."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -487,9 +476,9 @@ msgid "User"
 msgstr "Utente"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Data"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Conto Immo bilizzazione"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -507,20 +496,15 @@ msgstr "Calcola"
 msgid "Asset History"
 msgstr "Storico Immobilizzazione"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Anno"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Conto Immo bilizzazione"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Attivo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -582,9 +566,9 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Metodo Ammortamento"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Voci Sezionale"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -619,9 +603,14 @@ msgid "Current"
 msgstr "Attivi"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Importo Ammortizzabile"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Metodo Ammortamento"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -658,6 +647,15 @@ msgstr "Nome Storico"
 msgid "Amount Already Depreciated"
 msgstr "Importo Già Ammortizzato"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -706,9 +704,9 @@ msgstr ""
 "categoria quando create dalle fatture."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Imposta come Bozza"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Anno"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -744,6 +742,11 @@ msgstr "Sequenza"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Indicare il periodo tra 2 ammortamenti, in mesi"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Data"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -771,8 +774,30 @@ msgstr "Conferma Immobilizzazione"
 msgid "Asset Hierarchy"
 msgstr "Gerarchia Immobilizzazioni"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Importo Ammortamento"
+
 #~ msgid "Wrong credit or debit value in accounting entry !"
 #~ msgstr "Valore di credito o debito errato nella registrazione contabile !"
 
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Comunicazione strutturata BBA non valida !"
+
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcola l'Ammortamento all'interno del periodo indicato"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Indicare l'intervallo tra 2 ammortamenti, in mesi"
+
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Selezionare il metodo da usare per calcolare l'importo degli ammortamenti.\n"
+#~ "  *Lineare: Calcolate sulla base di: Importo Lordo / Numero di Periodi "
+#~ "d'Ammortamento\n"
+#~ "  *Regressivo: Calcolato sulla base di: Valore Residuo * Fattore Regressivo"
+
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Importo Ammortizzabile"
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index 2b25091c916..c0852952ffb 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-16 19:05+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,9 +95,9 @@ msgid "Running"
 msgstr "動作中"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "減価償却額"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -143,6 +143,11 @@ msgstr "減価償却行"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "それは計画された量を持つため減価することはできません。"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr "ドラフト"
 msgid "Date of asset purchase"
 msgstr "資産の購入日"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "指定した間隔により減価償却を計算"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "有効"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "残存期間の変更"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr "分析アカウント"
 msgid "Computation Method"
 msgstr "計算方法"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "２つの減価償却の間隔を月数で明らかにして下さい。"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,17 +289,9 @@ msgid ""
 msgstr "プロラタ トンポリス（期間に応じて）は時間法で\"減価償却の数\"のためだけに適用できます。"
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"この方法は日付と減価償却行の数を計算するために使用します。\n"
-"減価償却の数：減価償却行の数と２つの減価償却の間の時間を固定します。\n"
-"終了日：２つの減価償却の間の時間と、減価償却日を超えない日付を選んでください。"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -350,6 +339,11 @@ msgstr "資産履歴"
 msgid "Search Asset Category"
 msgstr "資産分類の検索"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -360,11 +354,6 @@ msgstr "請求行"
 msgid "Depreciation Board"
 msgstr "減価償却委員会"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "仕訳項目"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -391,16 +380,17 @@ msgid "Note"
 msgstr "注記"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"減価償却行の金額を計算するために使う方法を選択して下さい。\n"
-"　・ リニア（定額法）：次の計算：全体の価値 / 減価償却の数\n"
-"　・ 逓減（定率法）：次の計算：残存価値 * 逓減因子"
+"この方法は日付と減価償却行の数を計算するために使用します。\n"
+"減価償却の数：減価償却行の数と２つの減価償却の間の時間を固定します。\n"
+"終了日：２つの減価償却の間の時間と、減価償却日を超えない日付を選んでください。"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -470,9 +460,9 @@ msgid "User"
 msgstr "ユーザ"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "日付"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "資産アカウント"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -490,20 +480,15 @@ msgstr "計算"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "年"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "資産アカウント"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "有効"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -565,9 +550,9 @@ msgid "Close"
 msgstr "閉じる"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "減価償却法"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "仕訳項目"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -600,9 +585,14 @@ msgid "Current"
 msgstr "現在"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "減価償却額"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "減価償却法"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -639,6 +629,15 @@ msgstr "履歴名"
 msgid "Amount Already Depreciated"
 msgstr "減価償却済額"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -677,9 +676,9 @@ msgid ""
 msgstr "請求書によって作成されたこの分類の資産を自動的に確認したい場合はこれをチェックして下さい。"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "ドラフトに設定"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "年"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -715,6 +714,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "ここでは２つの減価償却の期間を月数で表してください。"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "日付"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -742,6 +746,9 @@ msgstr "資産の確認"
 msgid "Asset Hierarchy"
 msgstr "資産の階層"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "減価償却額"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -759,6 +766,12 @@ msgstr "資産の階層"
 #~ msgid "Error ! You can not create recursive assets."
 #~ msgstr "エラー。再帰的な資産を作ることはできません。"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "指定した間隔により減価償却を計算"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "２つの減価償却の間隔を月数で明らかにして下さい。"
+
 #~ msgid "Gross value "
 #~ msgstr "総額 "
 
@@ -783,6 +796,15 @@ msgstr "資産の階層"
 #~ msgid "State"
 #~ msgstr "状態"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "減価償却行の金額を計算するために使う方法を選択して下さい。\n"
+#~ "　・ リニア（定額法）：次の計算：全体の価値 / 減価償却の数\n"
+#~ "　・ 逓減（定率法）：次の計算：残存価値 * 逓減因子"
+
 #~ msgid "Analytic information"
 #~ msgstr "分析情報"
 
@@ -815,6 +837,9 @@ msgstr "資産の階層"
 #~ "その資産が確認された場合は、状態が有効になりそして減価償却行は会計上記帳されます。\n"
 #~ "減価償却が終わった場合は、手動でその資産を閉じることができます。減価償却の最後の行が記帳された場合は、資産は自動的にその状態になります。"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "減価償却額"
+
 #~ msgid "Month-1"
 #~ msgstr "月-1"
 
diff --git a/addons/account_asset/i18n/lt.po b/addons/account_asset/i18n/lt.po
index 10c68cca83f..80e30631614 100644
--- a/addons/account_asset/i18n/lt.po
+++ b/addons/account_asset/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-09 15:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr ""
 msgid "Date of asset purchase"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr ""
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr ""
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr ""
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,8 +454,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
 msgstr ""
 
 #. module: account_asset
@@ -481,19 +474,14 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
+#: field:account.asset.asset,active:0
+msgid "Active"
 msgstr ""
 
 #. module: account_asset
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
index 664e4b325a1..9ca9aba45b6 100644
--- a/addons/account_asset/i18n/mn.po
+++ b/addons/account_asset/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-10 03:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Ажиллаж байна"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Элэгдлийн дүн"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Ноороглох"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Элэгдлийн мөрүүд"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Энэ нь таны төлөвлөж байгаа дүн буюу таны элэгдүүлж чадахгүй дүн"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Ноорог"
 msgid "Date of asset purchase"
 msgstr "Хөрөнгө худалдан авсан огноо"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Элэгдэл тооцоолох давтамжыг тодорхойлно"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Идэвхитэй"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Ашиглалтын хугацааг өөрчлөх"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Шинжилгээний данс"
 msgid "Computation Method"
 msgstr "Тооцоолох арга"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Нэг элэгдлээс дараагийн элэгдэл хүртэлх хугацаа, сараар"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -294,19 +291,9 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Огноо болон элэгдлийн тоог тооцоолох арга.\n"
-"Элэгдлийн тоо: Элэгдлийн мөрүүдийн элэгдэх тоо болон 2 элэгдэл хоорондын "
-"хугацаа.\n"
-"Дуусах огноо: 2 элэгдэл хоорондын хугацаа болон элэгдлийг зогсоох эцсийн "
-"хугацаа."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -354,6 +341,11 @@ msgstr "Хөрөнгийн түүх"
 msgid "Search Asset Category"
 msgstr "Хөрөнгийн ангилалаар хайх"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -364,11 +356,6 @@ msgstr "Нэхэмжлэлийн мөр"
 msgid "Depreciation Board"
 msgstr "Элэгдлийн Самбар"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Журналын бичилт"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -395,16 +382,19 @@ msgid "Note"
 msgstr "Тэмдэглэл"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Элэдгдлийн мөрүүдийн дүнг тооцоолох аргыг сонго.\n"
-"  * Шугаман: Тооцооллын үндэс нь: Нийт өртөг / элэгдэх тоо\n"
-"  * Бууруулах: Тооцооллын үндэс нь: Үлдэгдэл өртөг * Бууруулах үзүүлэлт"
+"Огноо болон элэгдлийн тоог тооцоолох арга.\n"
+"Элэгдлийн тоо: Элэгдлийн мөрүүдийн элэгдэх тоо болон 2 элэгдэл хоорондын "
+"хугацаа.\n"
+"Дуусах огноо: 2 элэгдэл хоорондын хугацаа болон элэгдлийг зогсоох эцсийн "
+"хугацаа."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -475,9 +465,9 @@ msgid "User"
 msgstr "Хэрэглэгч"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Огноо"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Хөрөнгийн данс"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -495,20 +485,15 @@ msgstr "Тооцоолох"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Жил"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Хөрөнгийн данс"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -570,9 +555,9 @@ msgid "Close"
 msgstr "Хаах"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Элэгдлийн арга"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Журналын бичилт"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -607,9 +592,14 @@ msgid "Current"
 msgstr "Одоогийн"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Элэгдэх үлдэгдэл"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Элэгдлийн арга"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -646,6 +636,15 @@ msgstr "Тайлбар"
 msgid "Amount Already Depreciated"
 msgstr "Өмнөх элэгдсэн нийлбэр"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -686,9 +685,9 @@ msgstr ""
 "бол үүнийг тэмдэглэ."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Ноороглох"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Жил"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -724,6 +723,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Энд 2 элэгдлийн хоорондын хугацааг сараар тодорхойлно"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Огноо"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -754,6 +758,9 @@ msgstr "Хөрөнгийн эзэмшигч"
 #~ msgid "Review Asset Categories"
 #~ msgstr "Хөрөнгийн ангилалыг дахин харах"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Элэгдлийн дүн"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -814,6 +821,15 @@ msgstr "Хөрөнгийн эзэмшигч"
 #~ msgstr ""
 #~ "Үүний холбогдох хугацааны муж болон дансанд компани нь ижил байх ёстой."
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Элэдгдлийн мөрүүдийн дүнг тооцоолох аргыг сонго.\n"
+#~ "  * Шугаман: Тооцооллын үндэс нь: Нийт өртөг / элэгдэх тоо\n"
+#~ "  * Бууруулах: Тооцооллын үндэс нь: Үлдэгдэл өртөг * Бууруулах үзүүлэлт"
+
 #~ msgid "Assets purchased in current month"
 #~ msgstr "Энэ сард худалдаж авсан хөрөнгүүд"
 
@@ -863,5 +879,14 @@ msgstr "Хөрөнгийн эзэмшигч"
 #~ msgid "Close asset"
 #~ msgstr "Хөрөнгө хаах"
 
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Нэг элэгдлээс дараагийн элэгдэл хүртэлх хугацаа, сараар"
+
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Элэгдэл тооцоолох давтамжыг тодорхойлно"
+
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Элэгдэх үлдэгдэл"
+
 #~ msgid "Gross value "
 #~ msgstr "Анхны өртөг "
diff --git a/addons/account_asset/i18n/nb.po b/addons/account_asset/i18n/nb.po
index 187cf783f4f..8b7ad463017 100644
--- a/addons/account_asset/i18n/nb.po
+++ b/addons/account_asset/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-28 14:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Løper"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "avskrivningsbeløpet"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sett som utkast"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Avskrivninger linjer"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "det er mengden du har tenkt å ha du ikke kan avskrive."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Kladd"
 msgid "Date of asset purchase"
 msgstr "Dato for kjøpsavtalen"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Beregner Avskrivninger innen angitt intervall"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktiv"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Endre Varighet"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Analytisk konto"
 msgid "Computation Method"
 msgstr "Beregningsmetoden"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Oppgi her tiden under 2 avskrivninger, i måneder."
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -295,19 +292,9 @@ msgstr ""
 "Prorata temporis kan bare brukes for tiden metoden \"antall avskrivninger\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Metode for å beregne datoene og antall avskrivninger linjer.\n"
-"Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
-"avskrivninger.\n"
-"Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke gå "
-"utover."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -355,6 +342,11 @@ msgstr "Eiendel historie"
 msgid "Search Asset Category"
 msgstr "Søk eiendel Kategori"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -365,11 +357,6 @@ msgstr "Fakturalinje"
 msgid "Depreciation Board"
 msgstr "Avskrivninger Styret"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Journal Elementer"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -396,16 +383,19 @@ msgid "Note"
 msgstr "Notat"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Velg metoden som skal brukes for å beregne mengden av avskrivninger linjer.\n"
-"* Lineær: Beregnet på grunnlag av: bruttoverdi / Antall Avskrivninger\n"
-"* Degressiv: Beregnet på grunnlag av: restverdi * degressiv faktor"
+"Metode for å beregne datoene og antall avskrivninger linjer.\n"
+"Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+"Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke gå "
+"utover."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -478,9 +468,9 @@ msgid "User"
 msgstr "Bruker"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Dato"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Eiendel Konto"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -498,20 +488,15 @@ msgstr "Beregn"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "År"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "eiendel.avskrivninger.bekreftelse.veiviseren"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Eiendel Konto"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -573,9 +558,9 @@ msgid "Close"
 msgstr "Lukke"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Avskrivningsmetode"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Elementer"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -610,9 +595,14 @@ msgid "Current"
 msgstr "Nåværende"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Beløp å avskrive"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Avskrivningsmetode"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -649,6 +639,15 @@ msgstr "Historie navn"
 msgid "Amount Already Depreciated"
 msgstr "Beløp Allerede Avskrives"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -689,9 +688,9 @@ msgstr ""
 "kategorien når laget av fakturaer."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Sett som utkast"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "År"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -727,6 +726,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Angi tiden mellom to avskrivninger, i måneder"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Dato"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -754,6 +758,9 @@ msgstr "Bekreft eiendel"
 msgid "Asset Hierarchy"
 msgstr "Eiendel Hierarki."
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "avskrivningsbeløpet"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -770,6 +777,12 @@ msgstr "Eiendel Hierarki."
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Beregner Avskrivninger innen angitt intervall"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Oppgi her tiden under 2 avskrivninger, i måneder."
+
 #~ msgid "Gross value "
 #~ msgstr "Bruttoverdi "
 
@@ -813,6 +826,15 @@ msgstr "Eiendel Hierarki."
 #~ msgid "Asset durations to modify"
 #~ msgstr "Eiendel lengder å endre"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Velg metoden som skal brukes for å beregne mengden av avskrivninger linjer.\n"
+#~ "* Lineær: Beregnet på grunnlag av: bruttoverdi / Antall Avskrivninger\n"
+#~ "* Degressiv: Beregnet på grunnlag av: restverdi * degressiv faktor"
+
 #~ msgid "Analytic information"
 #~ msgstr "analytisk informasjon"
 
@@ -851,6 +873,9 @@ msgstr "Eiendel Hierarki."
 #~ "linjen av avskrivninger er lagt ut, går eiendelen automatisk i den "
 #~ "tilstanden."
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Beløp å avskrive"
+
 #~ msgid "Month-1"
 #~ msgstr "Måned-1"
 
diff --git a/addons/account_asset/i18n/nl.po b/addons/account_asset/i18n/nl.po
index 1c5249de89b..034e3c440e9 100644
--- a/addons/account_asset/i18n/nl.po
+++ b/addons/account_asset/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 17:19+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 19:10+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Actief"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Afschrijvingsbedrag"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Zet op concept"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -146,6 +146,11 @@ msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 "Het is het bedrag dat u van plan bent te hebben, dat u niet kunt afschrijven."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -251,21 +256,18 @@ msgstr "Concept"
 msgid "Date of asset purchase"
 msgstr "Aankoopdatum van activa"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Berekent de afschrijving binnen het gespecificeerde interval"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Actief"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Verander duur"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -282,11 +284,6 @@ msgstr "Kostenplaats"
 msgid "Computation Method"
 msgstr "Berekeningsmethode"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Geef hier de tijd gedurende twee afschrijvingen, in maanden"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -297,20 +294,9 @@ msgstr ""
 "afschrijvingen\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr ""
-"De methode welke gebruikt kan worden om de datums en het aantal "
-"afschrijvingsregels te berekenen.\n"
-"Aantal afschrijvingen: Bevestig het aantal afschrijvingsregels en de tijd "
-"tussen twee afschrijvingen.\n"
-"Einddatum: Kies de tijd tussen twee afschrijvingen en de datum waarop de "
-"afschrijvingen niet verder zal gaan dan."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
+msgstr "Volgende afschrijf periode"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -358,6 +344,11 @@ msgstr "Activa historie"
 msgid "Search Asset Category"
 msgstr "Zoek in activa categorie"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr "maanden"
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -368,11 +359,6 @@ msgstr "Factuurregel"
 msgid "Depreciation Board"
 msgstr "Afschrijvingskaart"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Journaalpostregels"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -399,17 +385,20 @@ msgid "Note"
 msgstr "Opmerking"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Kies de methode welke gebruikt kan worden om de hoeveelheid "
+"De methode welke gebruikt kan worden om de datums en het aantal "
 "afschrijvingsregels te berekenen.\n"
-"   * Lineaire: Berekend op basis van: Bruto waarde / Aantal Afschrijvingen\n"
-"   * Degressief: Berekend op basis van: Restwaarde * Degressief Factor"
+"Aantal afschrijvingen: Bevestig het aantal afschrijvingsregels en de tijd "
+"tussen twee afschrijvingen.\n"
+"Einddatum: Kies de tijd tussen twee afschrijvingen en de datum waarop de "
+"afschrijvingen niet verder zal gaan dan."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -488,9 +477,9 @@ msgid "User"
 msgstr "Gebruiker"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Activa rekening"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -508,20 +497,15 @@ msgstr "Bereken"
 msgid "Asset History"
 msgstr "Activa historie"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Jaar"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Activa rekening"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Actief"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -583,9 +567,9 @@ msgid "Close"
 msgstr "Afsluiten"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Afschrijvingsmethode"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journaalpostregels"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -620,9 +604,14 @@ msgid "Current"
 msgstr "Huidig"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Bedrag voor waardevermindering"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Afschrijvingsmethode"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr "Huidige afschrijving"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -659,6 +648,15 @@ msgstr "Historische naam"
 msgid "Amount Already Depreciated"
 msgstr "Bedrag al in mindering gebracht"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -707,9 +705,9 @@ msgstr ""
 "als deze worden aangemaakt door een facturen."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Zet op concept"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Jaar"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -745,6 +743,11 @@ msgstr "Reeks"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Geef hier de tijd tussen twee afschrijvingen, in maanden"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -854,6 +857,12 @@ msgstr "Activa hiërarchie"
 #~ msgid "Accounting information"
 #~ msgstr "Boekhoud informatie"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Bedrag voor waardevermindering"
+
+#~ msgid "Depreciation Amount"
+#~ msgstr "Afschrijvingsbedrag"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -861,6 +870,9 @@ msgstr "Activa hiërarchie"
 #~ "Deze wizard zal de afschrijvingsregels boeken van de lopende activa, welke "
 #~ "behoren aan de geselecteerde periode."
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Berekent de afschrijving binnen het gespecificeerde interval"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
@@ -881,6 +893,9 @@ msgstr "Activa hiërarchie"
 #~ msgid "Asset durations to modify"
 #~ msgstr "Activa looptijd om te bewerken"
 
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Geef hier de tijd gedurende twee afschrijvingen, in maanden"
+
 #~ msgid "Review Asset Categories"
 #~ msgstr "Controleer uw activa categorieën"
 
@@ -892,3 +907,13 @@ msgstr "Activa hiërarchie"
 #~ "Uit dit rapport, krijgt u een overzicht van alle afschrijvingen. De "
 #~ "zoekmogelijkheid kan ook worden gebruikt om uw activarapporten te "
 #~ "personaliseren en deze analyse af te stemmen op uw behoeften;"
+
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Kies de methode welke gebruikt kan worden om de hoeveelheid "
+#~ "afschrijvingsregels te berekenen.\n"
+#~ "   * Lineaire: Berekend op basis van: Bruto waarde / Aantal Afschrijvingen\n"
+#~ "   * Degressief: Berekend op basis van: Restwaarde * Degressief Factor"
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index 2f0685acca3..586680a5dd3 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-27 13:35+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Lopend"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Afschrijvingsbedrag"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Terugzetten naar Concept"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Afschrijvingslijnen"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Dit is het bedrag dat u niet kunt afschrijven."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Concept"
 msgid "Date of asset purchase"
 msgstr "Aankoopdatum investering"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Berekent afschrijving binnen een bepaald interval"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Actief"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Duur wijzigen"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Analytische rekening"
 msgid "Computation Method"
 msgstr "Berekeningsmethode"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Geef hier de tijd in maanden tussen 2 afschrijvingen"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,19 +293,9 @@ msgstr ""
 "afschrijvingen\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"De methode om datums en aantal afschrijvingen te berekenen.\n"
-"Aantal afschrijvingen: bepaal het aantal afschrijvingen en de tijd tussen 2 "
-"afschrijvingen.\n"
-"Einddatum: kies de tijd tussen 2 afschrijvingen en de uiterste datum van de "
-"afschrijvingen."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -356,6 +343,11 @@ msgstr "Investeringshistoriek"
 msgid "Search Asset Category"
 msgstr "Investeringscategorie zoeken"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -366,11 +358,6 @@ msgstr "Factuurlijn"
 msgid "Depreciation Board"
 msgstr "Investeringsdashboard"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Boekingslijnen"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -397,16 +384,19 @@ msgid "Note"
 msgstr "Opmerking"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Kies de methode om het bedrag van de afschrijvingslijnen te berekenen:\n"
-"  * Lineair: op basis van brutowaarde / aantal afschrijvingen\n"
-"  * Degressief: op basis van resterende waarde * degressieve factor"
+"De methode om datums en aantal afschrijvingen te berekenen.\n"
+"Aantal afschrijvingen: bepaal het aantal afschrijvingen en de tijd tussen 2 "
+"afschrijvingen.\n"
+"Einddatum: kies de tijd tussen 2 afschrijvingen en de uiterste datum van de "
+"afschrijvingen."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -484,9 +474,9 @@ msgid "User"
 msgstr "Gebruiker"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Investeringsrekening"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -504,20 +494,15 @@ msgstr "Berekenen"
 msgid "Asset History"
 msgstr "Activahistoriek"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Jaar"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Investeringsrekening"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Actief"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -579,9 +564,9 @@ msgid "Close"
 msgstr "Afsluiten"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Afschrijvingsmethode"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Boekingslijnen"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -616,9 +601,14 @@ msgid "Current"
 msgstr "Huidig"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Af te schrijven bedrag"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Afschrijvingsmethode"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -655,6 +645,15 @@ msgstr "Historieknaam"
 msgid "Amount Already Depreciated"
 msgstr "Al afgeschreven bedrag"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -699,9 +698,9 @@ msgstr ""
 "bevestigen vanaf de factuur."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Terugzetten naar Concept"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Jaar"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -737,6 +736,11 @@ msgstr "Volgnummer"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Geef hier de tijd in maanden tussen 2 afschrijvingen"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -764,6 +768,9 @@ msgstr "Investering bevestigen"
 msgid "Asset Hierarchy"
 msgstr "Investeringshiërarchie"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Afschrijvingsbedrag"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -779,6 +786,12 @@ msgstr "Investeringshiërarchie"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Nummer van de afschrijving"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Berekent afschrijving binnen een bepaald interval"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Geef hier de tijd in maanden tussen 2 afschrijvingen"
+
 #~ msgid "Gross value "
 #~ msgstr "Brutowaarde "
 
@@ -825,6 +838,15 @@ msgstr "Investeringshiërarchie"
 #~ "De datum van uw boeking ligt niet in de gedefinieerde periode. Verander de "
 #~ "datum of schakel de optie op het journaal uit."
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Kies de methode om het bedrag van de afschrijvingslijnen te berekenen:\n"
+#~ "  * Lineair: op basis van brutowaarde / aantal afschrijvingen\n"
+#~ "  * Degressief: op basis van resterende waarde * degressieve factor"
+
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "De firma moet dezelfde zijn voor de rekening en de periode."
 
@@ -847,6 +869,9 @@ msgstr "Investeringshiërarchie"
 #~ msgid "Review Asset Categories"
 #~ msgstr "Investeringscategorieën opnieuw bekijken"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Af te schrijven bedrag"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index 3c6363c2191..7d9f10367fa 100755
--- a/addons/account_asset/i18n/pl.po
+++ b/addons/account_asset/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-12 12:04+0000\n"
 "Last-Translator: Kirti Savalia(OpenERP) <ksa@tinyerp.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktywny"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr "Konto analityczne"
 msgid "Computation Method"
 msgstr "Metoda obliczania"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr "Historia środka"
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr "Panel amortyzacji"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr "Notatka"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr "Użytkownik"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Data"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Konto środków trwałych"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr ""
 msgid "Asset History"
 msgstr "Historia środka"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Rok"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Konto środków trwałych"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktywny"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr "Zamknięte"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr "Nazwa historii"
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,9 +670,9 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr ""
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Rok"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -706,6 +708,11 @@ msgstr "Numeracja"
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Data"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 25fe1ae82fe..1dda318aff3 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 12:46+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Em Funcionamento"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Depreciação do montante"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Definir como rascunho"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Linhas de depreciação"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "É o valor que pretende ter e que não pode depreciar."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Rascunho"
 msgid "Date of asset purchase"
 msgstr "Data de compra de ativos"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcula depreciação dentro do intervalo especificado"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Activo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Alterar a duração"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Conta analítica"
 msgid "Computation Method"
 msgstr "Método Processado"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Declare aqui o tempo durante o 2 amortizações, em meses"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,20 +293,9 @@ msgstr ""
 "depreciações\" ."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"O método a utilizar para calcular as datas e o número de linhas de "
-"depreciação.\n"
-"Número de Amortizações: Fixar o número de linhas de depreciação e o tempo "
-"entre 2 depreciações.\n"
-"Data Final: Escolha o tempo entre 2 amortizações e as depreciações da data "
-"não vão além."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -357,6 +343,11 @@ msgstr "Histórico de activos"
 msgid "Search Asset Category"
 msgstr "Pesquisar categoria de ativos"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -367,11 +358,6 @@ msgstr "Linha de fatura"
 msgid "Depreciation Board"
 msgstr "Quadro de Depreciação"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Items Diários"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -398,17 +384,20 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Escolha o método a utilizar para calcular a quantidade de linhas de "
+"O método a utilizar para calcular as datas e o número de linhas de "
 "depreciação.\n"
-"   * Linear: Calculado com base em: Valor bruto / Número de Amortizações\n"
-"   * Degressivo: Calculado com base em: valor remanescente * Fator degressivo"
+"Número de Amortizações: Fixar o número de linhas de depreciação e o tempo "
+"entre 2 depreciações.\n"
+"Data Final: Escolha o tempo entre 2 amortizações e as depreciações da data "
+"não vão além."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -481,9 +470,9 @@ msgid "User"
 msgstr "Utilizador"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Data"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Conta de Activo"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -501,20 +490,15 @@ msgstr "Cálculo"
 msgid "Asset History"
 msgstr "Histórial de Activo"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Ano"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Conta de Activo"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -576,9 +560,9 @@ msgid "Close"
 msgstr "Fechar"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Método de depreciação"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Items Diários"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -613,9 +597,14 @@ msgid "Current"
 msgstr "Atual"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Montante a depreciar"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciação"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -652,6 +641,15 @@ msgstr "Nome de histórico"
 msgid "Amount Already Depreciated"
 msgstr "Valor já depreciado"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -692,9 +690,9 @@ msgstr ""
 "categoria quando criados por faturas."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Definir como rascunho"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Ano"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -730,6 +728,11 @@ msgstr "Sequência"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Declare aqui o tempo entre 2 amortizações, em meses"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Data"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -973,6 +976,9 @@ msgstr "Hierarquia de Activos"
 #~ msgid "Asset board"
 #~ msgstr "Painel do imobilizado"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Depreciação do montante"
+
 #~ msgid "Wrong credit or debit value in accounting entry !"
 #~ msgstr "Valor de Crédito ou débito errado na entrada de contabilidade!"
 
@@ -989,6 +995,12 @@ msgstr "Hierarquia de Activos"
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Estrutura de comunicação BBA inválida!"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcula depreciação dentro do intervalo especificado"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Declare aqui o tempo durante o 2 amortizações, em meses"
+
 #~ msgid "Gross value "
 #~ msgstr "Valor Bruto "
 
@@ -1023,12 +1035,25 @@ msgstr "Hierarquia de Activos"
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "A empresa deve ser a mesma para sua conta relacionada e período."
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Escolha o método a utilizar para calcular a quantidade de linhas de "
+#~ "depreciação.\n"
+#~ "   * Linear: Calculado com base em: Valor bruto / Número de Amortizações\n"
+#~ "   * Degressivo: Calculado com base em: valor remanescente * Fator degressivo"
+
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "O número da fatura deve ser único por empresa!"
 
 #~ msgid "Accounting information"
 #~ msgstr "Informação contabilística"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Montante a depreciar"
+
 #~ msgid "Review Asset Categories"
 #~ msgstr "Reveja as categorias de ativos"
 
diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po
index c55ff95d4a7..ed2ca9b7720 100644
--- a/addons/account_asset/i18n/pt_BR.po
+++ b/addons/account_asset/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-10 13:04+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 01:00+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +98,9 @@ msgid "Running"
 msgstr "Executando"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Valor de Depreciação"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Definir como Provisório"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +146,11 @@ msgstr "Linhas de Depreciação"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "É o valor que você pretende ter de que você não pode depreciar."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr "A quantidade de tempo entre duas depreciações, em meses"
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +256,18 @@ msgstr "Provisório"
 msgid "Date of asset purchase"
 msgstr "Data da compra do bem"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calcula a depreciação dentro do intervalo especificado"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Ativo"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Alterar Duração"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr "O número de depreciações necessárias para depreciar seu bem"
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +284,6 @@ msgstr "Conta analítica"
 msgid "Computation Method"
 msgstr "Método de Cálculo"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Declare aqui o tempo entre 2 depreciações, em meses."
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,18 +294,9 @@ msgstr ""
 "depreciações\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr ""
-"O método usado para calcular as datas e números das linhas de depreciações.\n"
-"Número de Depreciações: Defina o número de depreciações entre 2 "
-"depreciações.\n"
-"Data Final: Escolha o tempo entre 2 depreciações e a data não irá além"
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
+msgstr "Depreciação do Próximo Período"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -355,6 +344,11 @@ msgstr "Histórico do Bem"
 msgid "Search Asset Category"
 msgstr "Procurar Categoria de Patrimônio"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr "meses"
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -365,11 +359,6 @@ msgstr "Linha da Fatura"
 msgid "Depreciation Board"
 msgstr "Conselho de depreciação"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Itens do Diário"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -396,16 +385,18 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Escolha um método para calcular a quantidade de linhas de depreciação.\n"
-"  * Linear: Calculada na base de: Valor Bruto / Número de Depreciações\n"
-"  * Decrescente: Calculado com base em: valor remanescente Fator * degressivo"
+"O método usado para calcular as datas e números das linhas de depreciações.\n"
+"Número de Depreciações: Defina o número de depreciações entre 2 "
+"depreciações.\n"
+"Data Final: Escolha o tempo entre 2 depreciações e a data não irá além"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -483,9 +474,9 @@ msgid "User"
 msgstr "Usuário"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Data"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Conta do Patrimônio"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -503,20 +494,15 @@ msgstr "Calcular"
 msgid "Asset History"
 msgstr "Histórico de Ativo"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Ano"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Conta do Patrimônio"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Ativo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -578,9 +564,9 @@ msgid "Close"
 msgstr "Fechar"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Método de Depreciação"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Itens do Diário"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -615,9 +601,14 @@ msgid "Current"
 msgstr "Atual"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Valor a Depreciar"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de Depreciação"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr "Depreciação Atual"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -654,6 +645,19 @@ msgstr "Nome do Histórico"
 msgid "Amount Already Depreciated"
 msgstr "Valor já Depreciado"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+"Escolha o método a ser usado para calcular a quantidade de linhas de "
+"depreciação.\n"
+"   * Linear: Calculado com base em: Valor Bruto / Número de Amortizações\n"
+"   * Degressiva: Calculado com base em: Valor Residual * Fator degressiva"
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -700,9 +704,9 @@ msgstr ""
 "quando criado por faturas."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Definir como Provisório"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Ano"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -738,6 +742,11 @@ msgstr "Sequência"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Defina aqui o tempo entre 2 depreciações, em meses"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Data"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -796,6 +805,9 @@ msgstr "Hierarquia do Patrimônio"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Sequência da Depreciação"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calcula a depreciação dentro do intervalo especificado"
+
 #~ msgid "Gross value "
 #~ msgstr "Valor bruto "
 
@@ -811,6 +823,9 @@ msgstr "Hierarquia do Patrimônio"
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Comunicação estruturada BBA inválida !"
 
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Declare aqui o tempo entre 2 depreciações, em meses."
+
 #~ msgid "Month"
 #~ msgstr "Mês"
 
@@ -830,6 +845,15 @@ msgstr "Hierarquia do Patrimônio"
 #~ "secundária. Você deve remover a moeda secundária na conta ou selecione uma "
 #~ "visão multi-moeda no diário."
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Escolha um método para calcular a quantidade de linhas de depreciação.\n"
+#~ "  * Linear: Calculada na base de: Valor Bruto / Número de Depreciações\n"
+#~ "  * Decrescente: Calculado com base em: valor remanescente Fator * degressivo"
+
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "Empresa deve ser a mesma para a sua conta relacionada e período."
 
@@ -840,6 +864,9 @@ msgstr "Hierarquia do Patrimônio"
 #~ msgid "Accounting information"
 #~ msgstr "Informações Contábeis"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Valor a Depreciar"
+
 #~ msgid "Month-1"
 #~ msgstr "Mês-1"
 
@@ -870,6 +897,9 @@ msgstr "Hierarquia do Patrimônio"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo Inválido na definição da ação"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Valor de Depreciação"
+
 #~ msgid "Modify asset"
 #~ msgstr "Modificar patrimônio"
 
diff --git a/addons/account_asset/i18n/ro.po b/addons/account_asset/i18n/ro.po
index 21c645015c0..4d599298cea 100644
--- a/addons/account_asset/i18n/ro.po
+++ b/addons/account_asset/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 08:25+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "În derulare"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Suma de amortizat"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Schimbă în ciornă"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Linii amortizare"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Este suma pe care planuiti sa o aveti pe care nu o puteti amortiza."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Ciorna"
 msgid "Date of asset purchase"
 msgstr "Data achizitiei activelor"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Calculeaza Amortizarea in intervalul specificat"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Activ(a)"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Schimbati durata"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Cont analitic"
 msgid "Computation Method"
 msgstr "Metoda de calcul"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Introduceti durata dintre 2 amortizari, in luni"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -296,20 +293,9 @@ msgstr ""
 "amortizarilor\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Metoda care va fi folosita pentru calcularea datelor si numarul liniilor "
-"amortizarii.\n"
-"Numarul de amortizari: Fixati numarul liniilor amortizarii si perioada "
-"dintre 2 amortizari.\n"
-"Data de sfarsit: Alegeti perioada dintre 2 amortizari si data pe care "
-"amortizarile nu o vor depasi."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -357,6 +343,11 @@ msgstr "Istoric active"
 msgid "Search Asset Category"
 msgstr "Cauta Categoria de Active"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -367,11 +358,6 @@ msgstr "Linie factura"
 msgid "Depreciation Board"
 msgstr "Panou amortizare"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Elementele Jurnalului"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -398,17 +384,20 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Alegeti metoda care va fi folosita pentru calculul suma liniilor "
+"Metoda care va fi folosita pentru calcularea datelor si numarul liniilor "
 "amortizarii.\n"
-"* Lineara: Calculata pe baza: Valoarea Bruta / Numarul de Amortizari\n"
-"* Degresiva: Calculat pe baza: Valoarea ramasa * Factorul Degresiv"
+"Numarul de amortizari: Fixati numarul liniilor amortizarii si perioada "
+"dintre 2 amortizari.\n"
+"Data de sfarsit: Alegeti perioada dintre 2 amortizari si data pe care "
+"amortizarile nu o vor depasi."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -481,9 +470,9 @@ msgid "User"
 msgstr "Utilizator"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Data"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cont Active"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -501,20 +490,15 @@ msgstr "Calculeaza"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "An"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "wizard.confirmare.devalorizare.active"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Cont Active"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activ(a)"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -576,9 +560,9 @@ msgid "Close"
 msgstr "Închide"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Metoda amortizarii"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementele Jurnalului"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -613,9 +597,14 @@ msgid "Current"
 msgstr "Actual(a)"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Suma de amortizat"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Metoda amortizarii"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -652,6 +641,15 @@ msgstr "Nume istoric"
 msgid "Amount Already Depreciated"
 msgstr "Suma deja amortizata"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -692,9 +690,9 @@ msgstr ""
 "categorie atunci cand sunt create de facturi."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Schimbă în ciornă"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "An"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -730,6 +728,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Aici introduceti perioada dintre 2 amortizari, in luni"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Data"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -838,12 +841,31 @@ msgstr "Ierarhie Active"
 #~ msgid "Assets purchased in last month"
 #~ msgstr "Active achzhtionate luna trecuta"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Suma de amortizat"
+
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Comunicare Structurata BBA Invalida !"
 
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Secventa amortizarii"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Calculeaza Amortizarea in intervalul specificat"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Introduceti durata dintre 2 amortizari, in luni"
+
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Alegeti metoda care va fi folosita pentru calculul suma liniilor "
+#~ "amortizarii.\n"
+#~ "* Lineara: Calculata pe baza: Valoarea Bruta / Numarul de Amortizari\n"
+#~ "* Degresiva: Calculat pe baza: Valoarea ramasa * Factorul Degresiv"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
@@ -857,6 +879,9 @@ msgstr "Ierarhie Active"
 #~ "Puteti inchide manual activele atunci cand amortizarea ia sfarsit. Daca este "
 #~ "afisata ultima linie a amortizarii, activele intra automat in acea stare."
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Suma de amortizat"
+
 #~ msgid ""
 #~ "From this report, you can have an overview on all depreciation. The tool "
 #~ "search can also be used to personalise your Assets reports and so, match "
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index beb0f31bca1..a8b9cd4458e 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-12 12:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Выполняется"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Сумма амортизации"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Установить в \"Черновик\""
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Позиции амортизации"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Черновик"
 msgid "Date of asset purchase"
 msgstr "Дата приобретения актива"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Вычислить амортизацию за период"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Активное"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Изменить длительность"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Счет аналитики"
 msgid "Computation Method"
 msgstr "Метод вычисления"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -294,13 +291,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -349,6 +341,11 @@ msgstr "История основного средства"
 msgid "Search Asset Category"
 msgstr "Поиск категории актива"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -359,11 +356,6 @@ msgstr "Позиция счета"
 msgid "Depreciation Board"
 msgstr "Панель амортизации"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Элементы журнала"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -390,12 +382,13 @@ msgid "Note"
 msgstr "Примечание"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -463,9 +456,9 @@ msgid "User"
 msgstr "Пользователь"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Дата"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Счет активов"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -483,20 +476,15 @@ msgstr "Вычислить"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Год"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Счет активов"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Активное"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -558,9 +546,9 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Метод амортизации"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Элементы журнала"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -593,9 +581,14 @@ msgid "Current"
 msgstr "Текущий"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Сумма амортизации"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Метод амортизации"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -632,6 +625,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr "Сумма уже самортизирована"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -670,9 +672,9 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Установить в \"Черновик\""
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Год"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -708,6 +710,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Дата"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -888,6 +895,9 @@ msgstr "Структура активов"
 #~ msgid "Accounting information"
 #~ msgstr "Информация учета"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Сумма амортизации"
+
 #~ msgid "Month-1"
 #~ msgstr "Месяц-1"
 
@@ -897,6 +907,12 @@ msgstr "Структура активов"
 #~ msgid "Assets purchased in last month"
 #~ msgstr "Активы, приобретенные в прошлом месяце"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Сумма амортизации"
+
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Вычислить амортизацию за период"
+
 #~ msgid "Error ! You can not create recursive assets."
 #~ msgstr "Ошибка ! Нельзя создавать рекурсивные активы."
 
diff --git a/addons/account_asset/i18n/sl.po b/addons/account_asset/i18n/sl.po
index 847ce986a62..af61e4ce3eb 100644
--- a/addons/account_asset/i18n/sl.po
+++ b/addons/account_asset/i18n/sl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 21:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 12:35+0000\n"
 "Last-Translator: Stanko Zvonar <stanko.zvonar@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
@@ -95,9 +95,9 @@ msgid "Running"
 msgstr "Se izvaja"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Znesek amortizacije"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Nastavi kot osnutek"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -136,13 +136,18 @@ msgstr "Vnosi"
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr "Amortizacijske vrstice"
+msgstr "Amortizacijske postavke"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Planirana vrednost,ki se ne amortizira"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -193,7 +198,7 @@ msgstr "Postavka amortizacije"
 #: view:asset.asset.report:0
 #: field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr "# amortizacijskih vrstic"
+msgstr "# amortizacijskih postavk"
 
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
@@ -248,21 +253,18 @@ msgstr "Osnutek"
 msgid "Date of asset purchase"
 msgstr "Datum nabave osnovnega sredstva"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Izračun amortizacije v določenem intervalu"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktivno"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Spremeni trajanje"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr "Analitični konto"
 msgid "Computation Method"
 msgstr "Metoda izračuna"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Čas med dvema amortizacijama( v mesecih)"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -293,18 +290,9 @@ msgstr ""
 "\"Prorata temporis\" lahko uporabimo le pri metodi \"število amortizacij\""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Izberi metodo:\n"
-"Število amortizacij\n"
-"ali\n"
-"Končni datum"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -352,6 +340,11 @@ msgstr "Zgodovina osnovnega sredstva"
 msgid "Search Asset Category"
 msgstr "Iskanje po kategoriji osnovnega sredstva"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -362,11 +355,6 @@ msgstr "Postavka računa"
 msgid "Depreciation Board"
 msgstr "Amortizacijska tabela"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Postavke"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -393,16 +381,18 @@ msgid "Note"
 msgstr "Opomba"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Izberi metodo  za izračun vrednosti amortizacije:\n"
-"  *Linerna: bruto vrednost/št.amortizacij\n"
-"  *Degresivna:ostanek vrednosti*degresivni faktor"
+"Izberi metodo:\n"
+"Število amortizacij\n"
+"ali\n"
+"Končni datum"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -415,7 +405,7 @@ msgid ""
 "  * Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
-"Izberi metodo za izračun datumov in števila amortizacijskih vrstic\n"
+"Izberi metodo za izračun datumov in števila amortizacijskih postavk\n"
 "  *Število amortizacij:določi število amortizacij in čas med dvema "
 "amortizacijama\n"
 "  *Končni datum:Čas med dvema amortizacijama in končni datum amortizacije"
@@ -455,7 +445,7 @@ msgstr "Poslovni partner"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr "Knjižene amortizacijske vrstice"
+msgstr "Knjižene amortizacijske postavke"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
@@ -473,9 +463,9 @@ msgid "User"
 msgstr "Uporabnik"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Konto osnovnega sredstva"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -493,20 +483,15 @@ msgstr "Izračunaj"
 msgid "Asset History"
 msgstr "Zgodovina osnovnega sredstva"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Leto"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "osnovno sredstvo.amortizacija.potrditev.čarovnik"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Konto osnovnega sredstva"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivno"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -568,9 +553,9 @@ msgid "Close"
 msgstr "Zapri"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Metoda obračuna amortizacije"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Postavke"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -605,9 +590,14 @@ msgid "Current"
 msgstr "Trenutno"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Znesek za amortizacijo"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Metoda obračuna amortizacije"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -644,6 +634,15 @@ msgstr "Naziv"
 msgid "Amount Already Depreciated"
 msgstr "Že amortizirani znesek"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -684,14 +683,14 @@ msgstr ""
 "bila kreirana z računi."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Nastavi kot osnutek"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Leto"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
 msgid "Asset depreciation line"
-msgstr "Amortizacijska vrstica osnovnega sredstva"
+msgstr "Amortizacijska postavka osnovnega sredstva"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -704,7 +703,7 @@ msgstr "Kategorija osnovnega sredstva"
 #: view:asset.asset.report:0
 #: field:asset.asset.report,depreciation_value:0
 msgid "Amount of Depreciation Lines"
-msgstr "Vrednost amortizacijskih vrstic"
+msgstr "Vrednost amortizacijskih postavk"
 
 #. module: account_asset
 #: code:addons/account_asset/wizard/wizard_asset_compute.py:49
@@ -722,6 +721,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Čas med dvema amortizacijama v mesecih"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -766,3 +770,24 @@ msgstr "Hierarhija osnovnega sredstva"
 
 #~ msgid "You can not create journal items on closed account."
 #~ msgstr "Konto je zaprt."
+
+#~ msgid "Depreciation Amount"
+#~ msgstr "Znesek amortizacije"
+
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Izračun amortizacije v določenem intervalu"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Čas med dvema amortizacijama( v mesecih)"
+
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Izberi metodo  za izračun vrednosti amortizacije:\n"
+#~ "  *Linerna: bruto vrednost/št.amortizacij\n"
+#~ "  *Degresivna:ostanek vrednosti*degresivni faktor"
+
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Znesek za amortizacijo"
diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po
index e4b415b9cde..855a419ec49 100644
--- a/addons/account_asset/i18n/sr@latin.po
+++ b/addons/account_asset/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-10 16:33+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr "Analitički konto"
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr "Istorija sredstava"
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr "Napomena"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr ""
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivno"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr "Naziv istorijata"
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr "Sekvenca"
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index da1ec3c6bfd..82a3557fde4 100755
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-12 12:04+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr "Inventarier i preleminär eller öppen status"
+msgstr "Tillgångar i preleminär eller öppen status"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -96,9 +96,9 @@ msgid "Running"
 msgstr "Kör"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Avskrivningsbelopp"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sätt till preliminär"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -144,6 +144,11 @@ msgstr "Avskrivningsrad"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Belopp som enligt plan inte kan avskrivas"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -169,7 +174,7 @@ msgstr "Bokfört belopp"
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr "Inventarier"
+msgstr "Tillgångar"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -204,7 +209,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr "Inventarier i preleminär status"
+msgstr "Tillgångar i preleminär status"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -249,21 +254,18 @@ msgstr "Preliminär"
 msgid "Date of asset purchase"
 msgstr "Datum för införskaffandet"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Beräknar avskrivning inom angivet intervall"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Aktiv"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Ändra varaktighet"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -280,11 +282,6 @@ msgstr "Objektkonto"
 msgid "Computation Method"
 msgstr "Beräkningsmetod"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Ange tiden mellan två avskrivningar, i månader"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -294,20 +291,9 @@ msgstr ""
 "Prorata temporis kan endast tillämpas på tidmetoder  \"antal avskrivningar\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Den metod som ska användas för att beräkna datum och antal "
-"avskrivningsrader.\n"
-"Antal avskrivningar: fastställa antalet avskrivningsrader och tiden mellan "
-"två avskrivningar.\n"
-"Slutdatum: Välj tiden mellan 2 avskrivningar till och med sista dag för "
-"avskrivningarna."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -337,7 +323,7 @@ msgstr "Tillgångskategori"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr "Inventarier i status \"stängd\""
+msgstr "Tillgångar i status \"stängd\""
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -355,6 +341,11 @@ msgstr "Tillgångshistorik"
 msgid "Search Asset Category"
 msgstr "Sök tillgångskategori"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -365,11 +356,6 @@ msgstr "Fakturarad"
 msgid "Depreciation Board"
 msgstr "Avskrivningsinfopanel"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Transaktioner"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -396,16 +382,20 @@ msgid "Note"
 msgstr "Anteckning"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Välj metod för beräkning av avskrivningen.\n"
-"  * Linjär: beräknas baserat på: bruttovärde / antal avskrivningar\n"
-"  * Avtagande: beräknas på: restvärdet * avskrivningsfaktor"
+"Den metod som ska användas för att beräkna datum och antal "
+"avskrivningsrader.\n"
+"Antal avskrivningar: fastställa antalet avskrivningsrader och tiden mellan "
+"två avskrivningar.\n"
+"Slutdatum: Välj tiden mellan 2 avskrivningar till och med sista dag för "
+"avskrivningarna."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -427,7 +417,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr "Aktiva inventarier"
+msgstr "Aktiva tillgångar"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -464,7 +454,7 @@ msgstr "Bokförda avskrivningsrader"
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr "Underinventarier"
+msgstr "Underliggande tillgångar"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -477,9 +467,9 @@ msgid "User"
 msgstr "Användare"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Tillgångskonto"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -497,20 +487,15 @@ msgstr "Beräkna"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "År"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Tillgångskonto"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -572,9 +557,9 @@ msgid "Close"
 msgstr "Stäng"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Avskrivningsmetod"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Transaktioner"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -600,8 +585,8 @@ msgid ""
 "Choose the period for which you want to automatically post the depreciation "
 "lines of running assets"
 msgstr ""
-"Välj period för vilken du vill automatiskt bokföra avskrivningsrader för "
-"aktuella inventarier"
+"Välj period där du automatiskt vill bokföra avskrivningsrader för aktuella "
+"tillgångar."
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -609,9 +594,14 @@ msgid "Current"
 msgstr "Aktuellt"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Avskrivet belopp"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Avskrivningsmetod"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -648,6 +638,15 @@ msgstr "Historienamn"
 msgid "Amount Already Depreciated"
 msgstr "Andel redan avskrivet"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -684,13 +683,13 @@ msgid ""
 "Check this if you want to automatically confirm the assets of this category "
 "when created by invoices."
 msgstr ""
-"Kryssa denna ruta om du automatiskt vill bekräfta inventarier i denna "
-"kategori när det skapas via leverantörsfakturor."
+"Kryssa i denna ruta om du automatiskt vill bekräfta tillgångar i denna "
+"kategori när de skapas via leverantörsfakturor."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Sätt till preliminär"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "År"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -726,6 +725,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Ange tiden mellan två avskrivningar i månader"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -768,12 +772,24 @@ msgstr "Tillgångshierarki"
 #~ "    *Asset usage period and property.\n"
 #~ "    "
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Avskrivningsbelopp"
+
 #~ msgid "Invalid BBA Structured Communication !"
 #~ msgstr "Ogiltig BBA-strukturerad kommunikation!"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Beräknar avskrivning inom angivet intervall"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Ange tiden mellan två avskrivningar, i månader"
+
 #~ msgid "Month-1"
 #~ msgstr "Månad-1"
 
+#~ msgid "Assets purchased in last month"
+#~ msgstr "Tillgångar inköpta under senaste månaden"
+
 #~ msgid "Post Depreciation Lines"
 #~ msgstr "Lagra avskrivningsrader"
 
@@ -806,9 +822,15 @@ msgstr "Tillgångshierarki"
 #~ msgid "State"
 #~ msgstr "Status"
 
+#~ msgid "Assets purchased in current year"
+#~ msgstr "Tillgångar införskaffade innehvarande år"
+
 #~ msgid "Gross value "
 #~ msgstr "Brutto värde "
 
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Fel! Du kan inte skapa tillgångar rekursivt."
+
 #~ msgid ""
 #~ "The date of your Journal Entry is not in the defined period! You should "
 #~ "change the date or remove this constraint from the journal."
@@ -831,6 +853,9 @@ msgstr "Tillgångshierarki"
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Fakturanummer måste vara unikt per bolag!"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Avskrivet belopp"
+
 #~ msgid "You can not create journal items on closed account."
 #~ msgstr "Du kan inte skapa transaktioner på ett stängt konto."
 
@@ -843,6 +868,15 @@ msgstr "Tillgångshierarki"
 #~ msgid "Asset durations to modify"
 #~ msgstr "Tillgångsvaraktighet att ändra"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Välj metod för beräkning av avskrivningen.\n"
+#~ "  * Linjär: beräknas baserat på: bruttovärde / antal avskrivningar\n"
+#~ "  * Avtagande: beräknas på: restvärdet * avskrivningsfaktor"
+
 #~ msgid ""
 #~ "From this report, you can have an overview on all depreciation. The tool "
 #~ "search can also be used to personalise your Assets reports and so, match "
@@ -864,21 +898,12 @@ msgstr "Tillgångshierarki"
 #~ "Du kan manuellt stänga en tillgång när avskrivningen är slutförd. Om den "
 #~ "sista avskrivningsraden är bokförd, avslutas tillgången automatiskt."
 
-#~ msgid "Assets purchased in current year"
-#~ msgstr "Inventarier införskaffade innehvarande år"
-
 #~ msgid "Assets purchased in current month"
-#~ msgstr "Inventarier som anskaffats innevarande månad"
+#~ msgstr "Anskaffade tillgångar för innevarande månad"
 
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
 #~ msgstr ""
-#~ "Denna guide vill lagra avskrivningsrader för aktuella inventarier som "
-#~ "tillhör vald period."
-
-#~ msgid "Error ! You can not create recursive assets."
-#~ msgstr "Fel! Du kan inte skapa inventarier rekursivt."
-
-#~ msgid "Assets purchased in last month"
-#~ msgstr "Inventarier inköpta under senaste månaden"
+#~ "Denna guide skapar avskrivningsrader för aktuella tillgångar som tillhör "
+#~ "vald period."
diff --git a/addons/account_asset/i18n/tr.po b/addons/account_asset/i18n/tr.po
index 86a36174b96..aab3472b57e 100644
--- a/addons/account_asset/i18n/tr.po
+++ b/addons/account_asset/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-25 17:20+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -97,9 +97,9 @@ msgid "Running"
 msgstr "Çalışan"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "Amortisman Tutarı"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Taslağa  Ayarla"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -145,6 +145,11 @@ msgstr "Amortisman Kalemleri"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Bu amortisman düşemeyeceğinizi planladığınız tutardır."
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -250,21 +255,18 @@ msgstr "Taslak"
 msgid "Date of asset purchase"
 msgstr "Demirbaşın satınalınma tarihi"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "Belirlenen aralıkta Amortisman Hesaplamaları"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Etkin"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "Süreyi Değiştir"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -281,11 +283,6 @@ msgstr "Analiz Hesabı"
 msgid "Computation Method"
 msgstr "Hesaplama Yöntemi"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "Burada, ay olarak, 2 amortisman sırasındaki süreyi belirt"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -295,19 +292,9 @@ msgstr ""
 "Kısmi süreyle orantı yalnızca süre yöntemine \"amortisman sayısı\" uygulanır."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"Tarihlerin ve amortisman satırlarının hesaplamasında kullanılan yöntem.\n"
-"Amortisman Sayısı: 2 Amortisman arasındakiamortisman satırı sayısını ve "
-"süresini sabitleyin .\n"
-"Bitiş Tarihi: Amortismanın daha öteye gidemeyeceği 2 amortisman arasındaki "
-"süreyi ve tarihi seçin."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -355,6 +342,11 @@ msgstr "Demirbaş geçmişi"
 msgid "Search Asset Category"
 msgstr "Demirbaş Kategorisi Ara"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -365,11 +357,6 @@ msgstr "Fatura Satırı"
 msgid "Depreciation Board"
 msgstr "Amortisman Tablosu"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "Günlük MAddeleri"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -396,16 +383,19 @@ msgid "Note"
 msgstr "Not"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"Demirbaş satırları tutarını hesaplanmasında kullanılacak yöntemi seçin.\n"
-"  * Doğrusal: Hesaplama temeli: Brüt Değer/ Amortisman Sayısı\n"
-"  * Azalan: Hesaplama temeli: Kalan Değer* Azalma Faktörü"
+"Tarihlerin ve amortisman satırlarının hesaplamasında kullanılan yöntem.\n"
+"Amortisman Sayısı: 2 Amortisman arasındakiamortisman satırı sayısını ve "
+"süresini sabitleyin .\n"
+"Bitiş Tarihi: Amortismanın daha öteye gidemeyeceği 2 amortisman arasındaki "
+"süreyi ve tarihi seçin."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -478,9 +468,9 @@ msgid "User"
 msgstr "Kullanıcı"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Tarih"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Demirbaş Hesabı"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -498,20 +488,15 @@ msgstr "Hesapla"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "Yıl"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "demirbas.amortisman.onaylama.sihirbaz"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "Demirbaş Hesabı"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Etkin"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -573,9 +558,9 @@ msgid "Close"
 msgstr "Kapat"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "Amortisman Yöntemi"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Günlük MAddeleri"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -610,9 +595,14 @@ msgid "Current"
 msgstr "Geçerli"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "Düşülecek Değer Tutarı"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Amortisman Yöntemi"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -649,6 +639,15 @@ msgstr "Geçmiş adı"
 msgid "Amount Already Depreciated"
 msgstr "Halihazırda Düşülmüş Değer Tutarı"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -689,9 +688,9 @@ msgstr ""
 "onaylanmasını istiyorsanız bunu işaretleyin."
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "Taslağa  Ayarla"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Yıl"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -727,6 +726,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "Burada, ay olarak, 2 amortisman arasındaki süreyi belirtin"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Tarih"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -754,6 +758,9 @@ msgstr "Demirbaş Onayla"
 msgid "Asset Hierarchy"
 msgstr "Demirbaş Sıradüzeni"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "Amortisman Tutarı"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -770,6 +777,12 @@ msgstr "Demirbaş Sıradüzeni"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "Amortisman Sırası"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "Belirlenen aralıkta Amortisman Hesaplamaları"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "Burada, ay olarak, 2 amortisman sırasındaki süreyi belirt"
+
 #~ msgid "Other Information"
 #~ msgstr "Diğer Bilgiler"
 
@@ -803,6 +816,15 @@ msgstr "Demirbaş Sıradüzeni"
 #~ msgid "Month"
 #~ msgstr "Ay"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "Demirbaş satırları tutarını hesaplanmasında kullanılacak yöntemi seçin.\n"
+#~ "  * Doğrusal: Hesaplama temeli: Brüt Değer/ Amortisman Sayısı\n"
+#~ "  * Azalan: Hesaplama temeli: Kalan Değer* Azalma Faktörü"
+
 #~ msgid "Asset durations to modify"
 #~ msgstr "Değiştirilecek demirbaş süresi"
 
@@ -837,6 +859,9 @@ msgstr "Demirbaş Sıradüzeni"
 #~ msgid "Review Asset Categories"
 #~ msgstr "Demirbaş Kategorilerini incele"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "Düşülecek Değer Tutarı"
+
 #~ msgid "Month-1"
 #~ msgstr "Ay-1"
 
diff --git a/addons/account_asset/i18n/vi.po b/addons/account_asset/i18n/vi.po
index 3c7b30e343a..f6f527af254 100644
--- a/addons/account_asset/i18n/vi.po
+++ b/addons/account_asset/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-20 07:54+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,8 +95,8 @@ msgid "Running"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: account_asset
@@ -143,6 +143,11 @@ msgstr ""
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -249,18 +254,15 @@ msgid "Date of asset purchase"
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
+#: view:account.asset.asset:0
+msgid "Change Duration"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "Hoạt động"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
@@ -279,11 +281,6 @@ msgstr "Tài khoản phân tích"
 msgid "Computation Method"
 msgstr ""
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,13 +289,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -347,6 +339,11 @@ msgstr ""
 msgid "Search Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -357,11 +354,6 @@ msgstr ""
 msgid "Depreciation Board"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -388,12 +380,13 @@ msgid "Note"
 msgstr "Chú thích"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
 
 #. module: account_asset
@@ -461,9 +454,9 @@ msgid "User"
 msgstr "Người sử dụng"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "Ngày"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,20 +474,15 @@ msgstr ""
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr ""
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Hoạt động"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -556,8 +544,8 @@ msgid "Close"
 msgstr "Ðóng"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_asset
@@ -591,8 +579,13 @@ msgid "Current"
 msgstr ""
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
 msgstr ""
 
 #. module: account_asset
@@ -630,6 +623,15 @@ msgstr ""
 msgid "Amount Already Depreciated"
 msgstr ""
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -668,8 +670,8 @@ msgid ""
 msgstr ""
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: account_asset
@@ -706,6 +708,11 @@ msgstr "Trình tự"
 msgid "State here the time between 2 depreciations, in months"
 msgstr ""
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Ngày"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index 3cae4c25678..9e9e506a109 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-07 15:37+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,9 +95,9 @@ msgid "Running"
 msgstr "运行中"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "折旧额"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "设为草稿"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -143,6 +143,11 @@ msgstr "折旧明细"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "折旧后资产的剩余价值金额"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr "草稿"
 msgid "Date of asset purchase"
 msgstr "资产采购日期"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "计算指定时间段内的折旧"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "激活"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "修改周期"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr "核算科目"
 msgid "Computation Method"
 msgstr "计算方法"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "在这里输入两次折旧的间隔月数"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,17 +289,9 @@ msgid ""
 msgstr "等比折旧仅用于“折旧次数”的计时方式"
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"用于计算折旧行的日期和次数的方法。\n"
-"折旧次数：设定折旧次数和两次折旧之间的间隔时间\n"
-"截止日期：设定两次折旧的间隔时间和折旧的截止日期"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -350,6 +339,11 @@ msgstr "资产历史"
 msgid "Search Asset Category"
 msgstr "搜索资产类别"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -360,11 +354,6 @@ msgstr "发票明细"
 msgid "Depreciation Board"
 msgstr "折旧板"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "日记帐项目"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -391,16 +380,17 @@ msgid "Note"
 msgstr "备注"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"选择用于计算折旧明细金额的方法：\n"
-"  * 线性：使用“总价值 / 折旧次数”\n"
-"  * 递减：使用“剩余价值 * 递减因子”"
+"用于计算折旧行的日期和次数的方法。\n"
+"折旧次数：设定折旧次数和两次折旧之间的间隔时间\n"
+"截止日期：设定两次折旧的间隔时间和折旧的截止日期"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -470,9 +460,9 @@ msgid "User"
 msgstr "用户"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "日期"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "资产科目"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -490,20 +480,15 @@ msgstr "计算"
 msgid "Asset History"
 msgstr "资产历史"
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "年"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "资产科目"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "激活"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -565,9 +550,9 @@ msgid "Close"
 msgstr "报废"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "折旧方法"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "日记帐项目"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -600,9 +585,14 @@ msgid "Current"
 msgstr "当前"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "要折旧的金额"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "折旧方法"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -639,6 +629,15 @@ msgstr "历史名称"
 msgid "Amount Already Depreciated"
 msgstr "已折旧金额"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -677,9 +676,9 @@ msgid ""
 msgstr "如果你像让这类固定资产在开发票之后自动确认为“运行”状态，勾选这里。"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "设为草稿"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "年"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -715,6 +714,11 @@ msgstr "编号"
 msgid "State here the time between 2 depreciations, in months"
 msgstr "在这里输入两次折旧的间隔月份"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "日期"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -742,12 +746,18 @@ msgstr "确认固定资产"
 msgid "Asset Hierarchy"
 msgstr "固定资产树"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "折旧额"
+
 #~ msgid "Wrong credit or debit value in accounting entry !"
 #~ msgstr "会计分录中包含错误的借贷值！"
 
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "折旧顺序号"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "计算指定时间段内的折旧"
+
 #~ msgid "Gross value "
 #~ msgstr "总价值 "
 
@@ -810,6 +820,15 @@ msgstr "固定资产树"
 #~ msgid "Assets purchased in last month"
 #~ msgstr "上月采购的资产"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "选择用于计算折旧明细金额的方法：\n"
+#~ "  * 线性：使用“总价值 / 折旧次数”\n"
+#~ "  * 递减：使用“剩余价值 * 递减因子”"
+
 #~ msgid "Close asset"
 #~ msgstr "报废资产"
 
@@ -821,6 +840,9 @@ msgstr "固定资产树"
 #~ "to the selected period."
 #~ msgstr "这个向导将生成所选期间正在使用的固定资产的折旧行"
 
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "在这里输入两次折旧的间隔月数"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
@@ -832,6 +854,9 @@ msgstr "固定资产树"
 #~ "被确认的固定资产是“正在运行”状态，可以折旧并过账到财务。\n"
 #~ "你可以在折旧结束后关闭这个固定资产。如果最后一个折旧行已过帐，资产自动进入这个状态。"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "要折旧的金额"
+
 #~ msgid "Asset durations to modify"
 #~ msgstr "要修改的资产周期"
 
diff --git a/addons/account_asset/i18n/zh_TW.po b/addons/account_asset/i18n/zh_TW.po
index d1df85a9014..71cd97df180 100644
--- a/addons/account_asset/i18n/zh_TW.po
+++ b/addons/account_asset/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 01:50+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -95,9 +95,9 @@ msgid "Running"
 msgstr "運行"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
-msgstr "折舊金額"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "設置為草稿"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -143,6 +143,11 @@ msgstr "折舊明細"
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "這是你已計劃好的金額，你可以不折舊。"
 
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
@@ -248,21 +253,18 @@ msgstr "草稿"
 msgid "Date of asset purchase"
 msgstr "資產購買日期"
 
-#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr "在指定的時間間隔計算折舊"
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
-msgstr "活躍"
-
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
 msgstr "更改時間"
 
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
@@ -279,11 +281,6 @@ msgstr "分析科目"
 msgid "Computation Method"
 msgstr "計算方法"
 
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr "在這裡說明2個折舊期間的月份"
-
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid ""
@@ -292,17 +289,9 @@ msgid ""
 msgstr "時間的方法只能按時間的比例 \"折舊數量\"."
 
 #. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid ""
-"The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time "
-"between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
 msgstr ""
-"使用的方法來計算折舊線的日期和數量。\n"
-"數量折舊。修正折舊明細的數量和時間之間折舊\n"
-"結束日期：選擇2折舊，折舊將無法超越的日期之間的時間。"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -350,6 +339,11 @@ msgstr "資產曆史記錄"
 msgid "Search Asset Category"
 msgstr "搜索資產類別"
 
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
@@ -360,11 +354,6 @@ msgstr "發票明細"
 msgid "Depreciation Board"
 msgstr "折舊板"
 
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr "帳簿項目"
-
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
@@ -391,16 +380,17 @@ msgid "Note"
 msgstr "備註"
 
 #. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
+#: help:account.asset.history,method_time:0
 msgid ""
-"Choose the method to use to compute the amount of depreciation lines.\n"
-"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
 msgstr ""
-"選擇使用的方法來計算折舊明細的數量。\n"
-"  * 線性：計算基礎：總值/數量折舊\n"
-"  * 遞減的基礎上計算：剩餘價值遞減因素"
+"使用的方法來計算折舊線的日期和數量。\n"
+"數量折舊。修正折舊明細的數量和時間之間折舊\n"
+"結束日期：選擇2折舊，折舊將無法超越的日期之間的時間。"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -470,9 +460,9 @@ msgid "User"
 msgstr "使用者"
 
 #. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
-msgstr "日期"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "資產科目"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -490,20 +480,15 @@ msgstr "計算"
 msgid "Asset History"
 msgstr ""
 
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr "年度"
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
 msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
-msgstr "資產科目"
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "活躍"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
@@ -565,9 +550,9 @@ msgid "Close"
 msgstr "關閉"
 
 #. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
-msgstr "折舊方法"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "帳簿項目"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -600,9 +585,14 @@ msgid "Current"
 msgstr "當前"
 
 #. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
-msgstr "折舊的金額"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "折舊方法"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -639,6 +629,15 @@ msgstr "歷史名稱"
 msgid "Amount Already Depreciated"
 msgstr "已折舊金額"
 
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0
@@ -677,9 +676,9 @@ msgid ""
 msgstr "當你在建立發票時，如果你想要自動確認固定資產類別，必須先檢查這個"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
-msgstr "設置為草稿"
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "年度"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -715,6 +714,11 @@ msgstr ""
 msgid "State here the time between 2 depreciations, in months"
 msgstr "在這裏說明這幾個月內，兩個已提折舊之間的時間"
 
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "日期"
+
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
 #: selection:account.asset.asset,method_time:0
@@ -742,6 +746,9 @@ msgstr "已確認資產"
 msgid "Asset Hierarchy"
 msgstr "資產層級"
 
+#~ msgid "Depreciation Amount"
+#~ msgstr "折舊金額"
+
 #~ msgid ""
 #~ "This wizard will post the depreciation lines of running assets that belong "
 #~ "to the selected period."
@@ -756,6 +763,12 @@ msgstr "資產層級"
 #~ msgid "Sequence of the depreciation"
 #~ msgstr "序列的折舊"
 
+#~ msgid "Calculates Depreciation within specified interval"
+#~ msgstr "在指定的時間間隔計算折舊"
+
+#~ msgid "State here the time during 2 depreciations, in months"
+#~ msgstr "在這裡說明2個折舊期間的月份"
+
 #~ msgid "Gross value "
 #~ msgstr "總值 "
 
@@ -791,6 +804,15 @@ msgstr "資產層級"
 #~ "change the date or remove this constraint from the journal."
 #~ msgstr "你的帳簿分錄的日期不是在規定的時間內！您應該更改日期或從帳簿中刪除這個限制。"
 
+#~ msgid ""
+#~ "Choose the method to use to compute the amount of depreciation lines.\n"
+#~ "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+#~ "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#~ msgstr ""
+#~ "選擇使用的方法來計算折舊明細的數量。\n"
+#~ "  * 線性：計算基礎：總值/數量折舊\n"
+#~ "  * 遞減的基礎上計算：剩餘價值遞減因素"
+
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "科目和期間必須屬於同一個公司"
 
@@ -809,6 +831,9 @@ msgstr "資產層級"
 #~ msgid "Review Asset Categories"
 #~ msgstr "檢視資產類別"
 
+#~ msgid "Amount to Depreciate"
+#~ msgstr "折舊的金額"
+
 #~ msgid ""
 #~ "When an asset is created, the state is 'Draft'.\n"
 #~ "If the asset is confirmed, the state goes in 'Running' and the depreciation "
diff --git a/addons/account_bank_statement_extensions/i18n/ar.po b/addons/account_bank_statement_extensions/i18n/ar.po
index eb968397336..7fa7224c637 100644
--- a/addons/account_bank_statement_extensions/i18n/ar.po
+++ b/addons/account_bank_statement_extensions/i18n/ar.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:23+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "بحث عن المعاملات البنكية"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "هل أنت متأكد من إلغاء سطور كشف الحساب ال
 msgid "Name"
 msgstr "الاسم"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "رقم كود البنك (BIC) للطرف الآخر"
 msgid "Child Codes"
 msgstr "رموز فرعية"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "بحث عن المعاملات البنكية"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -289,11 +299,6 @@ msgstr "الرمز"
 msgid "Counterparty Name"
 msgstr "اسم الطرف الآخر"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "التواصل"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -367,6 +372,9 @@ msgstr "المعرف العالمي"
 #~ msgid "Warning"
 #~ msgstr "تحذير"
 
+#~ msgid "Communication"
+#~ msgstr "التواصل"
+
 #~ msgid "The RIB and/or IBAN is not valid"
 #~ msgstr "رقم الحساب أو IBAN غير صحيح"
 
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index a8f9e63205b..5baa4b6c964 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 23:53+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Suche Banktransaktionen"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -204,6 +204,11 @@ msgstr "Wollen Sie die ausgewählten Bankbuchungszeilen wirklich stornieren?"
 msgid "Name"
 msgstr "Bezeichnung"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -254,6 +259,11 @@ msgstr "Gegenkonto BIC"
 msgid "Child Codes"
 msgstr "untergeordnete Codes"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Suche Banktransaktionen"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -293,11 +303,6 @@ msgstr "Code"
 msgid "Counterparty Name"
 msgstr "Gegenkonto Name"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Kommunikation"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -389,6 +394,9 @@ msgstr "Sammler ID"
 #~ msgstr ""
 #~ "Die gewählten Journal und Perioden müssen zum selben Unternehmen gehören"
 
+#~ msgid "Communication"
+#~ msgstr "Kommunikation"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please define BIC/Swift code on bank for bank type IBAN Account to make "
diff --git a/addons/account_bank_statement_extensions/i18n/es.po b/addons/account_bank_statement_extensions/i18n/es.po
index 35bd963b185..676cff2654a 100644
--- a/addons/account_bank_statement_extensions/i18n/es.po
+++ b/addons/account_bank_statement_extensions/i18n/es.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-10 21:47+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:02+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Buscar transacciones bancarias"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Información del emisor al beneficiario"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -205,6 +205,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr "OBI"
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -255,6 +260,11 @@ msgstr "BIC de la contrapartida"
 msgid "Child Codes"
 msgstr "Códigos hijos"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar transacciones bancarias"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -296,11 +306,6 @@ msgstr "Código"
 msgid "Counterparty Name"
 msgstr "Nombre de la contrapartida"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicación"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -402,3 +407,6 @@ msgstr "ID global"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr ""
 #~ "El diario y periodo seleccionados tienen que pertenecer a la misma compañía."
+
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
diff --git a/addons/account_bank_statement_extensions/i18n/es_CR.po b/addons/account_bank_statement_extensions/i18n/es_CR.po
index 7db7357230e..addb1217b71 100644
--- a/addons/account_bank_statement_extensions/i18n/es_CR.po
+++ b/addons/account_bank_statement_extensions/i18n/es_CR.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 20:40+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Buscar transacciones del Banco"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -203,6 +203,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -253,6 +258,11 @@ msgstr "Contraparte BIC"
 msgid "Child Codes"
 msgstr "Códigos hijos"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar transacciones del Banco"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -293,11 +303,6 @@ msgstr "Código"
 msgid "Counterparty Name"
 msgstr "Nombre de Contraparte"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicación"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -400,3 +405,6 @@ msgstr "ID de Globalización"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr ""
 #~ "El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
+
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
diff --git a/addons/account_bank_statement_extensions/i18n/es_EC.po b/addons/account_bank_statement_extensions/i18n/es_EC.po
index e7e47a54cbb..abc59537493 100644
--- a/addons/account_bank_statement_extensions/i18n/es_EC.po
+++ b/addons/account_bank_statement_extensions/i18n/es_EC.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-03 19:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Buscar Transacciones Bancarias"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "Seguro de cancelar el detalle seleccionado ?"
 msgid "Name"
 msgstr "Nombre"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "BIC"
 msgid "Child Codes"
 msgstr "Códigos hijos"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar Transacciones Bancarias"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "Código"
 msgid "Counterparty Name"
 msgstr "Descripción"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicación"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -392,3 +397,6 @@ msgstr "ID"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr ""
 #~ "El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
+
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
diff --git a/addons/account_bank_statement_extensions/i18n/es_MX.po b/addons/account_bank_statement_extensions/i18n/es_MX.po
index 0fc1a860fd6..8480c11bf56 100644
--- a/addons/account_bank_statement_extensions/i18n/es_MX.po
+++ b/addons/account_bank_statement_extensions/i18n/es_MX.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 01:06+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Buscar transacciones bancarias"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -205,6 +205,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -255,6 +260,11 @@ msgstr "BIC de la contrapartida"
 msgid "Child Codes"
 msgstr "Códigos hijos"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar transacciones bancarias"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -296,11 +306,6 @@ msgstr "Código"
 msgid "Counterparty Name"
 msgstr "Nombre de la contrapartida"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicación"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -374,3 +379,6 @@ msgstr "ID global"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr ""
 #~ "El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
+
+#~ msgid "Communication"
+#~ msgstr "Comunicación"
diff --git a/addons/account_bank_statement_extensions/i18n/fi.po b/addons/account_bank_statement_extensions/i18n/fi.po
index b97afbaed5a..10fdd12152e 100644
--- a/addons/account_bank_statement_extensions/i18n/fi.po
+++ b/addons/account_bank_statement_extensions/i18n/fi.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-03 13:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
 msgstr ""
 
 #. module: account_bank_statement_extensions
@@ -201,6 +201,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr ""
 msgid "Child Codes"
 msgstr ""
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr ""
 msgid "Counterparty Name"
 msgstr ""
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr ""
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
diff --git a/addons/account_bank_statement_extensions/i18n/fr.po b/addons/account_bank_statement_extensions/i18n/fr.po
index 7b2b9b2aa03..f08bedc7502 100644
--- a/addons/account_bank_statement_extensions/i18n/fr.po
+++ b/addons/account_bank_statement_extensions/i18n/fr.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-21 13:52+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 13:46+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Chercher parmi les transactions bancaires"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -59,7 +59,7 @@ msgstr "Annuler les lignes de relevé sélectionnées"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "Date de valeur"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -104,7 +104,7 @@ msgstr "Information sur les paiements en lot"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -113,11 +113,14 @@ msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
 msgstr ""
+"La suppression d'opération n'est pas autorisée. Merci de vous rendre sur le "
+"formulaire de l'état bancaire pour supprimer et/ou modifier la ligne "
+"correspondante."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -202,6 +205,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nom / Libellé"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -220,7 +228,7 @@ msgstr "Manuel"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Transaction bancaire"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -252,6 +260,11 @@ msgstr "BIC contrepartie"
 msgid "Child Codes"
 msgstr "Codes fils"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Chercher parmi les transactions bancaires"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -291,11 +304,6 @@ msgstr "Code"
 msgid "Counterparty Name"
 msgstr "Nom de la contrepartie"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Communication"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -327,7 +335,7 @@ msgstr "Lignes de relevé bancaire"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement!"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
@@ -396,3 +404,6 @@ msgstr "N° du lot"
 #~ msgstr ""
 #~ "Suppression interdite ! Pour supprimer et / ou modifier cette ligne de  "
 #~ "relevé vous devez vous rendre sur le relevé bancaire correspondant."
+
+#~ msgid "Communication"
+#~ msgstr "Communication"
diff --git a/addons/account_bank_statement_extensions/i18n/gu.po b/addons/account_bank_statement_extensions/i18n/gu.po
index ae6ea61dafd..6963e37d1ec 100644
--- a/addons/account_bank_statement_extensions/i18n/gu.po
+++ b/addons/account_bank_statement_extensions/i18n/gu.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-24 08:18+0000\n"
 "Last-Translator: Jalpesh Patel(OpenERP) <pja@tinyerp.com>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "બેન્ક વ્યવહારો શોધો"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "શું તમે ખરેખર પસંદિત બેન્ક 
 msgid "Name"
 msgstr "નામ"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr ""
 msgid "Child Codes"
 msgstr ""
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "બેન્ક વ્યવહારો શોધો"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "સંકેત"
 msgid "Counterparty Name"
 msgstr "પ્રતિકૂળ નામ"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "સંચાર"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -363,3 +368,6 @@ msgstr ""
 
 #~ msgid "Confirm selected statement lines."
 #~ msgstr "પસંદ નિવેદન લીટીઓ ખાતરી કરો."
+
+#~ msgid "Communication"
+#~ msgstr "સંચાર"
diff --git a/addons/account_bank_statement_extensions/i18n/hr.po b/addons/account_bank_statement_extensions/i18n/hr.po
index a94820197a2..034a1382b00 100644
--- a/addons/account_bank_statement_extensions/i18n/hr.po
+++ b/addons/account_bank_statement_extensions/i18n/hr.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:28+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
 msgstr ""
 
 #. module: account_bank_statement_extensions
@@ -201,6 +201,11 @@ msgstr ""
 msgid "Name"
 msgstr "Naziv"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr ""
 msgid "Child Codes"
 msgstr "Šifre podređenih"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "Šifra"
 msgid "Counterparty Name"
 msgstr ""
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Poziv na broj"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -350,3 +355,6 @@ msgstr ""
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
 msgstr ""
+
+#~ msgid "Communication"
+#~ msgstr "Poziv na broj"
diff --git a/addons/account_bank_statement_extensions/i18n/it.po b/addons/account_bank_statement_extensions/i18n/it.po
index 8aee2882725..b98dcb5c6cf 100644
--- a/addons/account_bank_statement_extensions/i18n/it.po
+++ b/addons/account_bank_statement_extensions/i18n/it.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 07:42+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Cerca transazioni bancarie"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -205,6 +205,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -255,6 +260,11 @@ msgstr "BIC Controparte"
 msgid "Child Codes"
 msgstr "Codici Figli"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Cerca transazioni bancarie"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -296,11 +306,6 @@ msgstr "Codice"
 msgid "Counterparty Name"
 msgstr "Nome Controparte"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicazione"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -365,3 +370,6 @@ msgstr "ID Globalizzazione"
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Attenzione"
+
+#~ msgid "Communication"
+#~ msgstr "Comunicazione"
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index ffa8ed067aa..32b6e8f39c8 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-23 06:08+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "銀行取引の検索"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "選択した銀行明細行のキャンセルを本当に行いますか
 msgid "Name"
 msgstr "氏名"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "相手方BIC"
 msgid "Child Codes"
 msgstr "子コード"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "銀行取引の検索"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "コード"
 msgid "Counterparty Name"
 msgstr "相手方名"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "通信"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -370,6 +375,9 @@ msgstr "国際化ID"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "選択された仕訳帳と期間は同じ会社に属していなければなりません。"
 
+#~ msgid "Communication"
+#~ msgstr "通信"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
diff --git a/addons/account_bank_statement_extensions/i18n/mn.po b/addons/account_bank_statement_extensions/i18n/mn.po
index 3920248a0c4..25c6740c81e 100644
--- a/addons/account_bank_statement_extensions/i18n/mn.po
+++ b/addons/account_bank_statement_extensions/i18n/mn.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-16 07:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Банкны гүйлгээгээр хайх"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr ""
 msgid "Child Codes"
 msgstr ""
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Банкны гүйлгээгээр хайх"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr ""
 msgid "Counterparty Name"
 msgstr ""
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr ""
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
diff --git a/addons/account_bank_statement_extensions/i18n/nb.po b/addons/account_bank_statement_extensions/i18n/nb.po
index 9189a2ab065..b35209e93cb 100644
--- a/addons/account_bank_statement_extensions/i18n/nb.po
+++ b/addons/account_bank_statement_extensions/i18n/nb.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:34+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Søk Bank Transaksjon"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -203,6 +203,11 @@ msgstr "Er du sikker på at du vil avbryte de valgte kontoutskrift linjer?"
 msgid "Name"
 msgstr "Navn"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -253,6 +258,11 @@ msgstr "Motpart BIC"
 msgid "Child Codes"
 msgstr "Underordnet kode"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Søk Bank Transaksjon"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -292,11 +302,6 @@ msgstr "Kode"
 msgid "Counterparty Name"
 msgstr "Motpartens navn"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Kommunikasjon"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -391,6 +396,9 @@ msgstr "Globalisering ID"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
 
+#~ msgid "Communication"
+#~ msgstr "Kommunikasjon"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
diff --git a/addons/account_bank_statement_extensions/i18n/nl.po b/addons/account_bank_statement_extensions/i18n/nl.po
index 9d288c778f8..5383279bd0a 100644
--- a/addons/account_bank_statement_extensions/i18n/nl.po
+++ b/addons/account_bank_statement_extensions/i18n/nl.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 17:22+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 20:43+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Zoeken in banktransacties"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Opdrachtgever aan Begunstigde Informatie"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -204,6 +204,11 @@ msgstr ""
 msgid "Name"
 msgstr "Naam"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr "OBI"
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -254,6 +259,11 @@ msgstr "BIC tegenrekening"
 msgid "Child Codes"
 msgstr "Onderliggende codes"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Zoeken in banktransacties"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -294,11 +304,6 @@ msgstr "Code"
 msgid "Counterparty Name"
 msgstr "Naam tegenrekeninghouder"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Kenmerk"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -397,5 +402,8 @@ msgstr "Globalisatie ID"
 #~ "Het bedrag op de bon moet hetzelfde bedrag zijn dat vermeld staat op de "
 #~ "afschriftregel"
 
+#~ msgid "Communication"
+#~ msgstr "Kenmerk"
+
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Het gekozen dagboek en periode moeten behoren tot hetzelfde bedrijf."
diff --git a/addons/account_bank_statement_extensions/i18n/pl.po b/addons/account_bank_statement_extensions/i18n/pl.po
index 8a8f35f6965..cb4dfbae175 100644
--- a/addons/account_bank_statement_extensions/i18n/pl.po
+++ b/addons/account_bank_statement_extensions/i18n/pl.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-24 16:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Szukaj transakcji bankowych"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "Jesteś pewna, że chcesz anulować wybrane pozycje wyciągu ?"
 msgid "Name"
 msgstr "Nazwa"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "Przeciwstawny BIC"
 msgid "Child Codes"
 msgstr "Rejestry podrzędne"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Szukaj transakcji bankowych"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "Kod"
 msgid "Counterparty Name"
 msgstr ""
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Komunikacja"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -387,3 +392,6 @@ msgstr "ID poziomu"
 
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Dziennik i okres muszą należeć do tej samej firmy."
+
+#~ msgid "Communication"
+#~ msgstr "Komunikacja"
diff --git a/addons/account_bank_statement_extensions/i18n/pt.po b/addons/account_bank_statement_extensions/i18n/pt.po
index a1818c8e009..2503ddaa884 100644
--- a/addons/account_bank_statement_extensions/i18n/pt.po
+++ b/addons/account_bank_statement_extensions/i18n/pt.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-16 14:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Pesquisar operações bancárias"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -203,6 +203,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -253,6 +258,11 @@ msgstr "BIC da contraparte"
 msgid "Child Codes"
 msgstr "Códigos descendentes"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Pesquisar operações bancárias"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -294,11 +304,6 @@ msgstr "Código"
 msgid "Counterparty Name"
 msgstr "Nome da contraparte"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicação"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -398,3 +403,6 @@ msgstr "ID Globalização"
 #~ msgstr ""
 #~ "Excluir operação não permitida! Por favor, vá para o extrato bancário "
 #~ "associado, a fim de eliminar e / ou modificar esta linha do extrato bancário"
+
+#~ msgid "Communication"
+#~ msgstr "Comunicação"
diff --git a/addons/account_bank_statement_extensions/i18n/pt_BR.po b/addons/account_bank_statement_extensions/i18n/pt_BR.po
index cf3e05f0c62..0178b52a344 100644
--- a/addons/account_bank_statement_extensions/i18n/pt_BR.po
+++ b/addons/account_bank_statement_extensions/i18n/pt_BR.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 11:08+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 23:09+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Procurar Transações Bancárias"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Informação de Origem para Beneficiário"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -206,6 +206,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -256,6 +261,11 @@ msgstr "BIC da Contrapartida"
 msgid "Child Codes"
 msgstr "Códigos derivados (sub-contas)"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Procurar Transações Bancárias"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -296,11 +306,6 @@ msgstr "Código"
 msgid "Counterparty Name"
 msgstr "Nome da Contrapartida"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicação"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -398,5 +403,8 @@ msgstr "ID Globalização"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
 
+#~ msgid "Communication"
+#~ msgstr "Comunicação"
+
 #~ msgid "Valuta Date"
 #~ msgstr "Data do Crédito"
diff --git a/addons/account_bank_statement_extensions/i18n/ro.po b/addons/account_bank_statement_extensions/i18n/ro.po
index e25ade212ca..b8e76453539 100644
--- a/addons/account_bank_statement_extensions/i18n/ro.po
+++ b/addons/account_bank_statement_extensions/i18n/ro.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-21 11:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Cauta Tranzactii Bancare"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -202,6 +202,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nume"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -252,6 +257,11 @@ msgstr "BIC echivalent"
 msgid "Child Codes"
 msgstr "Coduri subordonate"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Cauta Tranzactii Bancare"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -293,11 +303,6 @@ msgstr "Cod"
 msgid "Counterparty Name"
 msgstr "Nume echivalent"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Comunicare"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -397,3 +402,6 @@ msgstr "ID globalizare"
 
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Jurnalul si perioada aleasa trebuie sa apartina aceleiasi companii."
+
+#~ msgid "Communication"
+#~ msgstr "Comunicare"
diff --git a/addons/account_bank_statement_extensions/i18n/sr@latin.po b/addons/account_bank_statement_extensions/i18n/sr@latin.po
index 94afde4c4cd..945c8af5a98 100644
--- a/addons/account_bank_statement_extensions/i18n/sr@latin.po
+++ b/addons/account_bank_statement_extensions/i18n/sr@latin.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-13 16:55+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Pretraži bankovne transakcije"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "Da li zaista želite da otkažete izabrane redove izvoda banke?"
 msgid "Name"
 msgstr "Naziv"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "BIC druge strane"
 msgid "Child Codes"
 msgstr "Podređeni kodovi"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Pretraži bankovne transakcije"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -290,11 +300,6 @@ msgstr "Kod"
 msgid "Counterparty Name"
 msgstr "Ime druge strane"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Komunikacija"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -393,3 +398,6 @@ msgstr "ID globalizacije"
 
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Dnevnik i izabrani period treba da pripadaju istom preduzeću."
+
+#~ msgid "Communication"
+#~ msgstr "Komunikacija"
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index 62c1d61c0e2..dffae15a5b8 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-03 09:17+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Sök banktransaktioner"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "Är du säker på att du vill avbryta valda bankutdragsrader ?"
 msgid "Name"
 msgstr "Namn"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "Motpartens BIC"
 msgid "Child Codes"
 msgstr "Barnkoder"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Sök banktransaktioner"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -289,11 +299,6 @@ msgstr "Kod"
 msgid "Counterparty Name"
 msgstr "Motpartsnamn"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "Kommunikation"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -379,6 +384,9 @@ msgstr "Globalt ID"
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Journalen och perioden måste tillhöra samma bolag."
 
+#~ msgid "Communication"
+#~ msgstr "Kommunikation"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
diff --git a/addons/account_bank_statement_extensions/i18n/tr.po b/addons/account_bank_statement_extensions/i18n/tr.po
index 487feba17ca..efbe22ee324 100644
--- a/addons/account_bank_statement_extensions/i18n/tr.po
+++ b/addons/account_bank_statement_extensions/i18n/tr.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-05 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "Banka İşlemi Ara"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -202,6 +202,11 @@ msgstr ""
 msgid "Name"
 msgstr "Adı"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -252,6 +257,11 @@ msgstr "Karşı Tarafı BIC"
 msgid "Child Codes"
 msgstr "Alt Kodlar"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Banka İşlemi Ara"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -291,11 +301,6 @@ msgstr "Kod"
 msgid "Counterparty Name"
 msgstr "Karşı Taraf Adı"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "İletişim"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -392,5 +397,8 @@ msgstr "Küreselleşme ID"
 #~ "statement line"
 #~ msgstr "Fiş tutarı banka hesap özetindekiyle aynı tutarda olmalı"
 
+#~ msgid "Communication"
+#~ msgstr "İletişim"
+
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Seçilen günlük ve dönem aynı firmaya ait olmalıdır."
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index 69fa03a2468..de396eba52b 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_CN.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 06:46+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "搜索银行交易"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "你确信要取消所选的银行单据行么？"
 msgid "Name"
 msgstr "名称"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "对方BIC"
 msgid "Child Codes"
 msgstr "下级编码"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "搜索银行交易"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "编号"
 msgid "Counterparty Name"
 msgstr "对方名称"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "通讯"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -388,3 +393,6 @@ msgstr "全局编号"
 
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "所选的凭证簿和期间必须属于相同公司。"
+
+#~ msgid "Communication"
+#~ msgstr "通讯"
diff --git a/addons/account_bank_statement_extensions/i18n/zh_TW.po b/addons/account_bank_statement_extensions/i18n/zh_TW.po
index fb2a3a615cd..5d92dff6313 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_TW.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_TW.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-22 02:20+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
-msgstr "搜尋銀行交易"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,6 +201,11 @@ msgstr "你確定要刪除選定的銀行對帳單明細 ?"
 msgid "Name"
 msgstr "名稱"
 
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
@@ -251,6 +256,11 @@ msgstr "交易對方 BIC"
 msgid "Child Codes"
 msgstr "下層代碼"
 
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "搜尋銀行交易"
+
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -288,11 +298,6 @@ msgstr "代碼"
 msgid "Counterparty Name"
 msgstr "交易對方名稱"
 
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr "通訊"
-
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
@@ -383,6 +388,9 @@ msgstr "全球化 ID"
 #~ "statement line"
 #~ msgstr "憑證金額必須和對帳單明細上的金額一致"
 
+#~ msgid "Communication"
+#~ msgstr "通訊"
+
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "所選的帳簿和期間必須屬於相同公司。"
 
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 213519a5923..b6801c745fa 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 17:45+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index 929b7b099f1..870cc1a096c 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-01 18:21+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index accaf9b0d5b..2109194b87a 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:01+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index 66ce59853c0..ad38555186d 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 08:25+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index bf0a78b57e0..5f5c969020f 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-18 06:21+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po
index df62156148b..0b69599589d 100644
--- a/addons/account_budget/i18n/da.po
+++ b/addons/account_budget/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 22:25+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 92e42756c3b..1589f146614 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 19:08+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index db16ed4e7a2..ad2413f4385 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 16:27+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/en_GB.po b/addons/account_budget/i18n/en_GB.po
index c3f7e68376e..77d6889d15d 100644
--- a/addons/account_budget/i18n/en_GB.po
+++ b/addons/account_budget/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 15:32+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 557c92a08ba..dc1bc40fe33 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 11:49+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index 57a994aba4d..f0693af3750 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 16:22+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/es_CR.po b/addons/account_budget/i18n/es_CR.po
index c59fd61f67f..0ae5abc4fe9 100644
--- a/addons/account_budget/i18n/es_CR.po
+++ b/addons/account_budget/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 20:44+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po
index 6287b0ee482..55228e29332 100644
--- a/addons/account_budget/i18n/es_EC.po
+++ b/addons/account_budget/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 22:41+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
index c61d8d350b1..3d123b2f702 100644
--- a/addons/account_budget/i18n/es_MX.po
+++ b/addons/account_budget/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 01:18+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/es_PY.po b/addons/account_budget/i18n/es_PY.po
index 4d638cfac74..a89308ca4a2 100644
--- a/addons/account_budget/i18n/es_PY.po
+++ b/addons/account_budget/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 23:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index 6cf4d6f2bc2..3a78885e443 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:03+0000\n"
 "Last-Translator: lyyser <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/fa.po b/addons/account_budget/i18n/fa.po
index c33e1627864..3f5bd36dfd1 100644
--- a/addons/account_budget/i18n/fa.po
+++ b/addons/account_budget/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 73b44f16504..39791061e8a 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 332c88c9797..93b07bd3911 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:42+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index 29d76f93a4d..89d7ff38adb 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: account-budget-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-11 13:01+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/gu.po b/addons/account_budget/i18n/gu.po
index 300f427a062..8a8da64a686 100644
--- a/addons/account_budget/i18n/gu.po
+++ b/addons/account_budget/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-07 10:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/he.po b/addons/account_budget/i18n/he.po
index 30be3853012..f69900bfd83 100644
--- a/addons/account_budget/i18n/he.po
+++ b/addons/account_budget/i18n/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-08 20:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index c982d35d746..21a366891ac 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:30+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index 1ef55607bb8..205edd8b8fe 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-07 11:12+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index 26546dfb0e3..34556f7edd2 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-09 13:49+0000\n"
 "Last-Translator: krnkris <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index 7c48907287c..8f2bc5a768c 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:05+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 075eb95ae9d..5ca5f3ea50c 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 21:11+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index e920481849e..257482ee213 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-13 17:16+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 133f37f4daa..16898d42953 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:44+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/lo.po b/addons/account_budget/i18n/lo.po
index 63505a61956..3072106ff46 100644
--- a/addons/account_budget/i18n/lo.po
+++ b/addons/account_budget/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-09 16:05+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 9e3c30309a2..55557db12da 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 16:01+0000\n"
 "Last-Translator: Andrius Preimantas <andrius.preimantas@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/lv.po b/addons/account_budget/i18n/lv.po
index 434c27f1967..8333b735e4d 100644
--- a/addons/account_budget/i18n/lv.po
+++ b/addons/account_budget/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-01 08:33+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/mn.po b/addons/account_budget/i18n/mn.po
index 3f08ee62f25..cb0a0aaf243 100644
--- a/addons/account_budget/i18n/mn.po
+++ b/addons/account_budget/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-31 09:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/nb.po b/addons/account_budget/i18n/nb.po
index 1eaf28a87b2..ccdbd0423be 100644
--- a/addons/account_budget/i18n/nb.po
+++ b/addons/account_budget/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-30 21:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 72995709663..838fe11e66e 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 11:57+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index 6729f793648..de8c51f4333 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
index f7b5811f617..c8e2ff8bcc5 100644
--- a/addons/account_budget/i18n/oc.po
+++ b/addons/account_budget/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:07+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index 2574fbaa2fd..6e5062673bc 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 20:42+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index 4e3f88fc3d7..1d831a8dc03 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:54+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 48992950f97..43d9ecb2f75 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 17:40+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index 82aff1fe15e..c3eacc85858 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-27 06:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index 4f57a44b515..d9bbe1c1f88 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 12:28+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index 36bb352e327..b4d6cbf06a3 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po
index 4435739315a..fc4cb794b2e 100644
--- a/addons/account_budget/i18n/sq.po
+++ b/addons/account_budget/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index 14a2b767970..1e34c727fec 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-29 09:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index adb05819244..4b8e6fe7be8 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-17 05:29+0000\n"
 "Last-Translator: MD <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index c135ca82af4..455fb54cb29 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-11 11:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index 6e16c5d9137..5000098c0eb 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index b4dbc40d230..9180398da1a 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 22:05+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index f545fb0c0d9..50e2fabd218 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:49+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po
index 74b5919eb64..d59ea306305 100644
--- a/addons/account_budget/i18n/vi.po
+++ b/addons/account_budget/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 6144b37dd9e..0002b4f89f5 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 06:47+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index 090dc9d6566..931858cecd9 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-22 03:26+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_cancel/i18n/ar.po b/addons/account_cancel/i18n/ar.po
index 92fbc961e14..843b49ecaeb 100644
--- a/addons/account_cancel/i18n/ar.po
+++ b/addons/account_cancel/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-05 17:03+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bg.po b/addons/account_cancel/i18n/bg.po
index dd1386cbbf8..ffe4303c3d1 100644
--- a/addons/account_cancel/i18n/bg.po
+++ b/addons/account_cancel/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-18 09:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bn.po b/addons/account_cancel/i18n/bn.po
index 4449877b9bb..f8bcb14cb1b 100644
--- a/addons/account_cancel/i18n/bn.po
+++ b/addons/account_cancel/i18n/bn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-21 12:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali <bn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/br.po b/addons/account_cancel/i18n/br.po
index e5066cb34d0..fc61ef51672 100644
--- a/addons/account_cancel/i18n/br.po
+++ b/addons/account_cancel/i18n/br.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-12 10:15+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Breton <br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bs.po b/addons/account_cancel/i18n/bs.po
index 3b57aa50a0d..34987e09c72 100644
--- a/addons/account_cancel/i18n/bs.po
+++ b/addons/account_cancel/i18n/bs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 11:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ca.po b/addons/account_cancel/i18n/ca.po
index 57925fdab7a..1589b415077 100644
--- a/addons/account_cancel/i18n/ca.po
+++ b/addons/account_cancel/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-06 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/cs.po b/addons/account_cancel/i18n/cs.po
index 525148de7ce..1d8414e7df6 100644
--- a/addons/account_cancel/i18n/cs.po
+++ b/addons/account_cancel/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 04:54+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index f1edf55d875..ee29f6358c6 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 10:42+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/de.po b/addons/account_cancel/i18n/de.po
index 8d6c42ba058..aea6024b42c 100644
--- a/addons/account_cancel/i18n/de.po
+++ b/addons/account_cancel/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-13 19:21+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index e7ff04adb85..2c87382654f 100644
--- a/addons/account_cancel/i18n/el.po
+++ b/addons/account_cancel/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/en_GB.po b/addons/account_cancel/i18n/en_GB.po
index c3bbfbe0db6..5c2f3b385d6 100644
--- a/addons/account_cancel/i18n/en_GB.po
+++ b/addons/account_cancel/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 13:21+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po
index de045c84a0a..0dab712c219 100644
--- a/addons/account_cancel/i18n/es.po
+++ b/addons/account_cancel/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-08 19:31+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_CL.po b/addons/account_cancel/i18n/es_CL.po
index d3b10a939e2..af5a9a2d48f 100644
--- a/addons/account_cancel/i18n/es_CL.po
+++ b/addons/account_cancel/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-14 18:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_CR.po b/addons/account_cancel/i18n/es_CR.po
index 4cfeae28e37..9f3e2832b22 100644
--- a/addons/account_cancel/i18n/es_CR.po
+++ b/addons/account_cancel/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 20:45+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: account_cancel
diff --git a/addons/account_cancel/i18n/es_EC.po b/addons/account_cancel/i18n/es_EC.po
index 231b6849cb2..83882031d6e 100644
--- a/addons/account_cancel/i18n/es_EC.po
+++ b/addons/account_cancel/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-17 17:57+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_MX.po b/addons/account_cancel/i18n/es_MX.po
index 1820ebeece3..c85f71ab30b 100644
--- a/addons/account_cancel/i18n/es_MX.po
+++ b/addons/account_cancel/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-22 17:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_PY.po b/addons/account_cancel/i18n/es_PY.po
index 4be90823ef4..fb4b4fb446a 100644
--- a/addons/account_cancel/i18n/es_PY.po
+++ b/addons/account_cancel/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 23:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fa.po b/addons/account_cancel/i18n/fa.po
index f8a0e0cc495..7d7b96f36fb 100644
--- a/addons/account_cancel/i18n/fa.po
+++ b/addons/account_cancel/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fi.po b/addons/account_cancel/i18n/fi.po
index 1090c11213f..4920eb4d04a 100644
--- a/addons/account_cancel/i18n/fi.po
+++ b/addons/account_cancel/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-24 13:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fr.po b/addons/account_cancel/i18n/fr.po
index f73bed50595..c186b732b1c 100644
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 21:09+0000\n"
 "Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/gl.po b/addons/account_cancel/i18n/gl.po
index 925b84c73b2..da8c8ed5be8 100644
--- a/addons/account_cancel/i18n/gl.po
+++ b/addons/account_cancel/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-04 08:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/gu.po b/addons/account_cancel/i18n/gu.po
index 95d5128f30f..c17a09a09cc 100644
--- a/addons/account_cancel/i18n/gu.po
+++ b/addons/account_cancel/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-06 18:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hi.po b/addons/account_cancel/i18n/hi.po
index 36485f6ecaf..77926afb429 100644
--- a/addons/account_cancel/i18n/hi.po
+++ b/addons/account_cancel/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-20 08:30+0000\n"
 "Last-Translator: Sanjay Kumar <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hr.po b/addons/account_cancel/i18n/hr.po
index fdbe4f24eea..1ecd1ed3c16 100644
--- a/addons/account_cancel/i18n/hr.po
+++ b/addons/account_cancel/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-28 20:52+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hu.po b/addons/account_cancel/i18n/hu.po
index be17d507ca8..98bf09d24e3 100644
--- a/addons/account_cancel/i18n/hu.po
+++ b/addons/account_cancel/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-30 16:46+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/id.po b/addons/account_cancel/i18n/id.po
index 606959e46fc..322bfdf0c07 100644
--- a/addons/account_cancel/i18n/id.po
+++ b/addons/account_cancel/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 18:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index fcd3aecdb5b..87dc00900d6 100644
--- a/addons/account_cancel/i18n/it.po
+++ b/addons/account_cancel/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 19:46+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ja.po b/addons/account_cancel/i18n/ja.po
index 35cde8ddbd7..0860b522ac2 100644
--- a/addons/account_cancel/i18n/ja.po
+++ b/addons/account_cancel/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-31 18:46+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/kk.po b/addons/account_cancel/i18n/kk.po
index e5dcbff173b..a7b320a2561 100644
--- a/addons/account_cancel/i18n/kk.po
+++ b/addons/account_cancel/i18n/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-20 01:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lo.po b/addons/account_cancel/i18n/lo.po
index 067e5323d8f..3f8f5853066 100644
--- a/addons/account_cancel/i18n/lo.po
+++ b/addons/account_cancel/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-20 18:45+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lt.po b/addons/account_cancel/i18n/lt.po
index 643a5ce6b29..3c7a18257c0 100644
--- a/addons/account_cancel/i18n/lt.po
+++ b/addons/account_cancel/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-09 15:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lv.po b/addons/account_cancel/i18n/lv.po
index 0231c40a3c1..16ad0e1d87d 100644
--- a/addons/account_cancel/i18n/lv.po
+++ b/addons/account_cancel/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-30 20:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/mk.po b/addons/account_cancel/i18n/mk.po
index 6e072106330..32457a5680c 100644
--- a/addons/account_cancel/i18n/mk.po
+++ b/addons/account_cancel/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-06 14:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
index 69c6c48dcc8..c28ac7a2721 100644
--- a/addons/account_cancel/i18n/mn.po
+++ b/addons/account_cancel/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-22 12:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nb.po b/addons/account_cancel/i18n/nb.po
index e8021fba1cb..df1682dee66 100644
--- a/addons/account_cancel/i18n/nb.po
+++ b/addons/account_cancel/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-30 20:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nl.po b/addons/account_cancel/i18n/nl.po
index 983a6517460..ccd2fd1d177 100644
--- a/addons/account_cancel/i18n/nl.po
+++ b/addons/account_cancel/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-13 08:35+0000\n"
 "Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nl_BE.po b/addons/account_cancel/i18n/nl_BE.po
index ffdc2d9b6fe..3f67ff0a28d 100644
--- a/addons/account_cancel/i18n/nl_BE.po
+++ b/addons/account_cancel/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 17:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/oc.po b/addons/account_cancel/i18n/oc.po
index 9978592afd1..bd12bd381f5 100644
--- a/addons/account_cancel/i18n/oc.po
+++ b/addons/account_cancel/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-20 09:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pl.po b/addons/account_cancel/i18n/pl.po
index 5c1fbb49831..fe1d5578eab 100644
--- a/addons/account_cancel/i18n/pl.po
+++ b/addons/account_cancel/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-19 08:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pt.po b/addons/account_cancel/i18n/pt.po
index 7d641e8d591..62aa79e2379 100644
--- a/addons/account_cancel/i18n/pt.po
+++ b/addons/account_cancel/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-09 21:45+0000\n"
 "Last-Translator: António Sequeira <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pt_BR.po b/addons/account_cancel/i18n/pt_BR.po
index b48dd3ed15b..5f5613512f0 100644
--- a/addons/account_cancel/i18n/pt_BR.po
+++ b/addons/account_cancel/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-16 13:22+0000\n"
 "Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ro.po b/addons/account_cancel/i18n/ro.po
index cd9de944652..5c958825795 100644
--- a/addons/account_cancel/i18n/ro.po
+++ b/addons/account_cancel/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-26 09:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ru.po b/addons/account_cancel/i18n/ru.po
index f0dbf54a3eb..2ea46c78ae6 100644
--- a/addons/account_cancel/i18n/ru.po
+++ b/addons/account_cancel/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-23 09:42+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sl.po b/addons/account_cancel/i18n/sl.po
index eda5a77ea84..6d6ab45f279 100644
--- a/addons/account_cancel/i18n/sl.po
+++ b/addons/account_cancel/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-02 10:18+0000\n"
 "Last-Translator: Peter Robic <peterrobic@yahoo.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sq.po b/addons/account_cancel/i18n/sq.po
index 06c839cc98b..080a9ca28d0 100644
--- a/addons/account_cancel/i18n/sq.po
+++ b/addons/account_cancel/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sr.po b/addons/account_cancel/i18n/sr.po
index 9d6f91942ca..4624c101a6b 100644
--- a/addons/account_cancel/i18n/sr.po
+++ b/addons/account_cancel/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-14 07:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sr@latin.po b/addons/account_cancel/i18n/sr@latin.po
index 4a008fe4804..a7c255bc106 100644
--- a/addons/account_cancel/i18n/sr@latin.po
+++ b/addons/account_cancel/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-04 19:10+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
index 0c755a1ff51..ccd244e92bd 100644
--- a/addons/account_cancel/i18n/sv.po
+++ b/addons/account_cancel/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-01 23:18+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ta.po b/addons/account_cancel/i18n/ta.po
index c493e96001e..0174eba4ef0 100644
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po
index 342ab54d26e..9958bfc67d8 100644
--- a/addons/account_cancel/i18n/tr.po
+++ b/addons/account_cancel/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-10 22:55+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/vi.po b/addons/account_cancel/i18n/vi.po
index dfe976acaa4..91782df7f1d 100644
--- a/addons/account_cancel/i18n/vi.po
+++ b/addons/account_cancel/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 14:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/zh_CN.po b/addons/account_cancel/i18n/zh_CN.po
index 951ee063489..75ea198ac69 100644
--- a/addons/account_cancel/i18n/zh_CN.po
+++ b/addons/account_cancel/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-07 07:53+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/zh_TW.po b/addons/account_cancel/i18n/zh_TW.po
index 656d23dd9ea..05a3edb4186 100644
--- a/addons/account_cancel/i18n/zh_TW.po
+++ b/addons/account_cancel/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-18 11:29+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_check_writing/i18n/ar.po b/addons/account_check_writing/i18n/ar.po
index 64ed2807e3b..b5d00a1c7be 100644
--- a/addons/account_check_writing/i18n/ar.po
+++ b/addons/account_check_writing/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:24+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "شيك في الأعلى"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "فتح رصيد"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "طباعة الشيك"
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "شيك في النهاية"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -89,20 +106,8 @@ msgid "Original Amount"
 msgstr "المبلغ الأصلي"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -127,6 +132,23 @@ msgstr "استخدام الصكوك المطبوعة مسبقاً"
 msgid "Print Check (Bottom)"
 msgstr "اطبع الشيك (أسفل)"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -144,6 +166,17 @@ msgstr "اطبع الشيك (وسط)"
 msgid "Companies"
 msgstr "الشركات"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -167,20 +200,35 @@ msgstr "مبلغ الشيك"
 msgid "Accounting Voucher"
 msgstr "القسيمة المحاسبية"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "المبلغ نصياً"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "فتح رصيد"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "اختيار تصميم الصك"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
@@ -204,5 +252,8 @@ msgstr "اختيار تصميم الصك"
 #~ "خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
 #~ "أيضأً."
 
+#~ msgid "Choose Check layout"
+#~ msgstr "اختيار تصميم الصك"
+
 #~ msgid "Default Check layout"
 #~ msgstr "التصميم الافتراضي للصك"
diff --git a/addons/account_check_writing/i18n/de.po b/addons/account_check_writing/i18n/de.po
index 6e288e877b9..95ee2a5cd6a 100644
--- a/addons/account_check_writing/i18n/de.po
+++ b/addons/account_check_writing/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 09:04+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -24,6 +24,12 @@ msgid "Check on Top"
 msgstr "Ausgabe Oben"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Offener Saldo"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Druckausgabe Scheck"
@@ -49,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Ausgabe Unten"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,6 +108,33 @@ msgstr "Rabatt"
 msgid "Original Amount"
 msgstr "Ursprünglicher Betrag"
 
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Scheckzahlung möglich"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Zahlung"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Benutze Vordruck"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Scheck drucken (Unterteil)"
+
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
 msgid ""
@@ -121,28 +165,6 @@ msgstr ""
 "               </ p>\n"
 "            "
 
-#. module: account_check_writing
-#: field:account.voucher,allow_check:0
-msgid "Allow Check Writing"
-msgstr "Scheckzahlung möglich"
-
-#. module: account_check_writing
-#: report:account.print.check.bottom:0
-#: report:account.print.check.middle:0
-#: report:account.print.check.top:0
-msgid "Payment"
-msgstr "Zahlung"
-
-#. module: account_check_writing
-#: field:account.journal,use_preprint_check:0
-msgid "Use Preprinted Check"
-msgstr "Benutze Vordruck"
-
-#. module: account_check_writing
-#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
-msgid "Print Check (Bottom)"
-msgstr "Scheck drucken (Unterteil)"
-
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -160,6 +182,17 @@ msgstr "Scheck drucken (Mittelteil)"
 msgid "Companies"
 msgstr "Unternehmen"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -183,20 +216,35 @@ msgstr "Scheck Zahlbetrag"
 msgid "Accounting Voucher"
 msgstr "Buchung Zahlungsbelege"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Betrag in Worten"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Offener Saldo"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Auswahl Scheckgestaltung"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -235,3 +283,6 @@ msgstr "Auswahl Scheckgestaltung"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "Die Journalbezeichnung sollte pro Unternehmen eindeutig sein."
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Auswahl Scheckgestaltung"
diff --git a/addons/account_check_writing/i18n/es.po b/addons/account_check_writing/i18n/es.po
index b9b7f61df05..cb404fb3f87 100644
--- a/addons/account_check_writing/i18n/es.po
+++ b/addons/account_check_writing/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 11:55+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Cheque en la parte de arriba"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimir cheque"
@@ -49,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Cheque en la parte de abajo"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,6 +108,33 @@ msgstr "Descuento"
 msgid "Original Amount"
 msgstr "Importe original"
 
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir escribir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagos"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Imprimir cheque (abajo)"
+
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
 msgid ""
@@ -118,28 +162,6 @@ msgstr ""
 "</p>\n"
 "            "
 
-#. module: account_check_writing
-#: field:account.voucher,allow_check:0
-msgid "Allow Check Writing"
-msgstr "Permitir escribir cheques"
-
-#. module: account_check_writing
-#: report:account.print.check.bottom:0
-#: report:account.print.check.middle:0
-#: report:account.print.check.top:0
-msgid "Payment"
-msgstr "Pagos"
-
-#. module: account_check_writing
-#: field:account.journal,use_preprint_check:0
-msgid "Use Preprinted Check"
-msgstr "Usar cheque preimpreso"
-
-#. module: account_check_writing
-#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
-msgid "Print Check (Bottom)"
-msgstr "Imprimir cheque (abajo)"
-
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -157,6 +179,17 @@ msgstr "Imprimir cheque (en medio)"
 msgid "Companies"
 msgstr "Compañías"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -180,20 +213,35 @@ msgstr "Importe del cheque"
 msgid "Accounting Voucher"
 msgstr "Comprobante contable"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Cantidad en palabras"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Saldo Inicial"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Elija el formato del cheque."
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -230,3 +278,6 @@ msgstr "Elija el formato del cheque."
 
 #~ msgid "Default Check layout"
 #~ msgstr "Formato de cheque por defecto"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Elija el formato del cheque."
diff --git a/addons/account_check_writing/i18n/es_CR.po b/addons/account_check_writing/i18n/es_CR.po
index 1dc1074dd58..4d9b2b8e90c 100644
--- a/addons/account_check_writing/i18n/es_CR.po
+++ b/addons/account_check_writing/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 14:50+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Verifique el tope"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Abrir balance"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimir Cheque"
@@ -49,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Verifique en la parte inferior"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -94,20 +111,8 @@ msgid "Original Amount"
 msgstr "Importe original"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -132,6 +137,23 @@ msgstr "Utilice cheque preimpreso"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -149,6 +171,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Compañias"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -172,20 +205,35 @@ msgstr "Monto del  cheque"
 msgid "Accounting Voucher"
 msgstr "Comprobantes contables"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Cantidad en palabras"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Abrir balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Seleccione el diseño del cheque"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -223,3 +271,6 @@ msgstr "Seleccione el diseño del cheque"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "¡El nombre del diaro debe ser único por compañía!"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Seleccione el diseño del cheque"
diff --git a/addons/account_check_writing/i18n/es_EC.po b/addons/account_check_writing/i18n/es_EC.po
index 696bd08876a..ab064bd0f31 100644
--- a/addons/account_check_writing/i18n/es_EC.po
+++ b/addons/account_check_writing/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-18 19:01+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Cheque on Top"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimir Cheque"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Cheque on bottom"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,20 +108,8 @@ msgid "Original Amount"
 msgstr "Monto Inicial"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -129,6 +134,23 @@ msgstr "Usar cheque preimpreso"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -146,6 +168,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Compañias"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -169,20 +202,35 @@ msgstr "Monto Cheque"
 msgid "Accounting Voucher"
 msgstr "Comprobantes de Pago"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Monto en Letras"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Saldo Inicial"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Elegir diseño de cheque"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -218,3 +266,6 @@ msgstr "Elegir diseño de cheque"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "El nombre del diaro debe ser único por compañía !"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Elegir diseño de cheque"
diff --git a/addons/account_check_writing/i18n/es_MX.po b/addons/account_check_writing/i18n/es_MX.po
index 0fa94028383..e9e0ec1101e 100644
--- a/addons/account_check_writing/i18n/es_MX.po
+++ b/addons/account_check_writing/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 18:20+0000\n"
-"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Cheque en la parte de arriba"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimir cheque"
@@ -49,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Cheque en la parte de abajo"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,6 +108,33 @@ msgstr "Descuento"
 msgid "Original Amount"
 msgstr "Importe original"
 
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir escribir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Imprimir cheque (Abajo)"
+
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
 msgid ""
@@ -120,28 +164,6 @@ msgstr ""
 "              </p>\n"
 "            "
 
-#. module: account_check_writing
-#: field:account.voucher,allow_check:0
-msgid "Allow Check Writing"
-msgstr "Permitir escribir cheques"
-
-#. module: account_check_writing
-#: report:account.print.check.bottom:0
-#: report:account.print.check.middle:0
-#: report:account.print.check.top:0
-msgid "Payment"
-msgstr "Pago"
-
-#. module: account_check_writing
-#: field:account.journal,use_preprint_check:0
-msgid "Use Preprinted Check"
-msgstr "Usar cheque preimpreso"
-
-#. module: account_check_writing
-#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
-msgid "Print Check (Bottom)"
-msgstr "Imprimir cheque (Abajo)"
-
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -159,6 +181,17 @@ msgstr "Imprimir Cheque (Al Centro)"
 msgid "Companies"
 msgstr "Compañías"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -182,20 +215,35 @@ msgstr "Importe del cheque"
 msgid "Accounting Voucher"
 msgstr "Comprobante contable"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Cantidad en letra"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Saldo Inicial"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Elija el formato del cheque."
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "¡Error! No puede crear compañías recursivas."
@@ -208,3 +256,6 @@ msgstr "Elija el formato del cheque."
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "¡El nombre del diaro debe ser único por compañía!"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Elija el formato del cheque."
diff --git a/addons/account_check_writing/i18n/fi.po b/addons/account_check_writing/i18n/fi.po
index ab27fa641e8..9f70a38d645 100644
--- a/addons/account_check_writing/i18n/fi.po
+++ b/addons/account_check_writing/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-06 15:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr ""
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr ""
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr ""
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,17 +199,32 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
diff --git a/addons/account_check_writing/i18n/fr.po b/addons/account_check_writing/i18n/fr.po
index cab409b8f7d..aebce4c2a04 100644
--- a/addons/account_check_writing/i18n/fr.po
+++ b/addons/account_check_writing/i18n/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:43+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Chéque en haut"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Solde initial"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimer un chèque"
@@ -49,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Chèque en bas"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,6 +108,33 @@ msgstr "Remise"
 msgid "Original Amount"
 msgstr "Montant original"
 
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Autoriser l'émission du chèque"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Paiement"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Utiliser des chèques pré-imprimés"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Imprimer chèque (bas)"
+
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
 msgid ""
@@ -120,28 +164,6 @@ msgstr ""
 "              </p>\n"
 "            "
 
-#. module: account_check_writing
-#: field:account.voucher,allow_check:0
-msgid "Allow Check Writing"
-msgstr "Autoriser l'émission du chèque"
-
-#. module: account_check_writing
-#: report:account.print.check.bottom:0
-#: report:account.print.check.middle:0
-#: report:account.print.check.top:0
-msgid "Payment"
-msgstr "Paiement"
-
-#. module: account_check_writing
-#: field:account.journal,use_preprint_check:0
-msgid "Use Preprinted Check"
-msgstr "Utiliser des chèques pré-imprimés"
-
-#. module: account_check_writing
-#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
-msgid "Print Check (Bottom)"
-msgstr "Imprimer chèque (bas)"
-
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -159,6 +181,17 @@ msgstr "Imprimer chèque (milieu)"
 msgid "Companies"
 msgstr "Sociétés"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -182,20 +215,35 @@ msgstr "Montant du chèque"
 msgid "Accounting Voucher"
 msgstr "Justificatif comptable"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Montant en lettres"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Solde initial"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Choisir un modèle de formulaire pour le chèque"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -212,6 +260,9 @@ msgstr "Choisir un modèle de formulaire pour le chèque"
 #~ msgid "Default Check layout"
 #~ msgstr "Formulaire de chèque par défaut"
 
+#~ msgid "Choose Check layout"
+#~ msgstr "Choisir un modèle de formulaire pour le chèque"
+
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
 
diff --git a/addons/account_check_writing/i18n/gu.po b/addons/account_check_writing/i18n/gu.po
index 3daec1a27d0..6c5d908b854 100644
--- a/addons/account_check_writing/i18n/gu.po
+++ b/addons/account_check_writing/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-15 19:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr ""
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr ""
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr ""
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,19 +199,34 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
 
 #~ msgid "Configuration"
diff --git a/addons/account_check_writing/i18n/hr.po b/addons/account_check_writing/i18n/hr.po
index d5e5ac58f9b..8bf1be8c020 100644
--- a/addons/account_check_writing/i18n/hr.po
+++ b/addons/account_check_writing/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:31+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr ""
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Otvoreni saldo"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Ispiši ček"
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr "Originalni iznos"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Organizacije"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,17 +199,32 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr "Knjigovodstveni vaučer"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Slovima"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Otvoreni saldo"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
diff --git a/addons/account_check_writing/i18n/ja.po b/addons/account_check_writing/i18n/ja.po
index 2071b4bec36..17a84694ae3 100644
--- a/addons/account_check_writing/i18n/ja.po
+++ b/addons/account_check_writing/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-01 06:41+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "小切手位置（上部）"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "期首残高"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "小切手印刷"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "小切手位置（下部）"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,20 +108,8 @@ msgid "Original Amount"
 msgstr "元アカウント"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -129,6 +134,23 @@ msgstr "事前印刷小切手の使用"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -146,6 +168,17 @@ msgstr ""
 msgid "Companies"
 msgstr "会社"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -169,20 +202,35 @@ msgstr "小切手金額"
 msgid "Accounting Voucher"
 msgstr "会計バウチャー"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "文字による金額"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "期首残高"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "小切手レイアウトの選択"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -215,3 +263,6 @@ msgstr "小切手レイアウトの選択"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "仕訳帳の名前は会社ごとに固有でなければなりません、"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "小切手レイアウトの選択"
diff --git a/addons/account_check_writing/i18n/lt.po b/addons/account_check_writing/i18n/lt.po
index 7859586e8b2..a5be1471c6b 100644
--- a/addons/account_check_writing/i18n/lt.po
+++ b/addons/account_check_writing/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-16 06:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr ""
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr ""
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr ""
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,17 +199,32 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
diff --git a/addons/account_check_writing/i18n/mn.po b/addons/account_check_writing/i18n/mn.po
index e7f77a78b0d..fc4e753a363 100644
--- a/addons/account_check_writing/i18n/mn.po
+++ b/addons/account_check_writing/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-16 07:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Чекийн дээд хэсэг"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Чек хэвлэх"
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Чекийн доод хэсэг"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr ""
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,17 +199,32 @@ msgstr "Чекийн дүн"
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
diff --git a/addons/account_check_writing/i18n/nb.po b/addons/account_check_writing/i18n/nb.po
index 00be5874324..6e53ea6e0d4 100644
--- a/addons/account_check_writing/i18n/nb.po
+++ b/addons/account_check_writing/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-27 15:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Sjekk på topp"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Åpen balanse"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Skriv ut sjekk"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Skjekk på bunnen"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,20 +108,8 @@ msgid "Original Amount"
 msgstr "Opprinnelig beløp"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -129,6 +134,23 @@ msgstr "Bruk Forhåndstrykt Sjekk"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -146,6 +168,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Firmaer"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -169,20 +202,35 @@ msgstr "Sjekk Beløp"
 msgid "Accounting Voucher"
 msgstr "Regnskapsmessig kupong"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Beløp i Ord"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Åpen balanse"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Velg Sjekk oppsettet"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -218,3 +266,6 @@ msgstr "Velg Sjekk oppsettet"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "Navnet på journalen må være unikt per firma !"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Velg Sjekk oppsettet"
diff --git a/addons/account_check_writing/i18n/nl.po b/addons/account_check_writing/i18n/nl.po
index dbc6348e3af..2efb1ded0d0 100644
--- a/addons/account_check_writing/i18n/nl.po
+++ b/addons/account_check_writing/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Cheque boven"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Open balans"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Cheque afdrukken"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Cheque beneden"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -93,20 +110,8 @@ msgid "Original Amount"
 msgstr "Oorspronkelijk bedrag"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -131,6 +136,23 @@ msgstr "Gebruik voorafgedrukte cheque"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -148,6 +170,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Bedrijven"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -171,20 +204,35 @@ msgstr "Cheque bedrag"
 msgid "Accounting Voucher"
 msgstr "Betalingsintentie"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Bedrag in woord"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Open balans"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Kies cheque opmaak"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
@@ -205,6 +253,9 @@ msgstr "Kies cheque opmaak"
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "De naam van het dagboek moet uniek zijn per bedrijf !"
 
+#~ msgid "Choose Check layout"
+#~ msgstr "Kies cheque opmaak"
+
 #~ msgid "Default Check layout"
 #~ msgstr "Standaard cheque opmaak"
 
diff --git a/addons/account_check_writing/i18n/pl.po b/addons/account_check_writing/i18n/pl.po
index b4cbc4c16e8..8bbbb764740 100644
--- a/addons/account_check_writing/i18n/pl.po
+++ b/addons/account_check_writing/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-25 16:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr ""
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr ""
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr ""
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,19 +199,34 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
 
 #~ msgid "Configuration"
diff --git a/addons/account_check_writing/i18n/pt.po b/addons/account_check_writing/i18n/pt.po
index 0a6cc1b3664..34e7ea1749e 100644
--- a/addons/account_check_writing/i18n/pt.po
+++ b/addons/account_check_writing/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Verifique no topo"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Abrir Balanço"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimir Cheque"
@@ -49,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Verifique na parte inferior"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -92,20 +109,8 @@ msgid "Original Amount"
 msgstr "Montante original"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -130,6 +135,23 @@ msgstr "Usar cheques pré imprimidos"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -147,6 +169,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -170,20 +203,35 @@ msgstr "Verificar montante"
 msgid "Accounting Voucher"
 msgstr "Voucher da Contabilidade"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Valor em Palavra"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Abrir Balanço"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Escolha verificação da disposição"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -221,3 +269,6 @@ msgstr "Escolha verificação da disposição"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "O nome do diário deve ser único por empresa!"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Escolha verificação da disposição"
diff --git a/addons/account_check_writing/i18n/pt_BR.po b/addons/account_check_writing/i18n/pt_BR.po
index e20dbed3125..e6f6aabbe51 100644
--- a/addons/account_check_writing/i18n/pt_BR.po
+++ b/addons/account_check_writing/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-10 15:04+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 23:19+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +24,12 @@ msgid "Check on Top"
 msgstr "Cheque no topo"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo em Aberto"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Imprimir Cheque"
@@ -48,6 +55,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Cheque no rodapé"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr "Imprimir cheques em lote"
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr "Um dos cheques impressos já possui um número."
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -90,6 +108,33 @@ msgstr "Desconto"
 msgid "Original Amount"
 msgstr "Valor Original"
 
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr "Modelo de Cheque"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permite escrever Cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagamento"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheques pré-impressos"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Imprimir o Cheque"
+
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
 msgid ""
@@ -113,35 +158,13 @@ msgstr ""
 "os pagamentos que você faz\n"
 "                para seus fornecedores, utilizando cheque. Quando você "
 "seleciona um fornecedor, o\n"
-"                o método de pagamento e o montante para pagamento, o OpenERP "
+"                o método de pagamento e o valor para pagamento, o OpenERP "
 "irá\n"
 "                propor a reconciliar seu pagamento com as faturas e "
 "cobranças em aberto com o fornecedor.\n"
 "              </p>\n"
 "            "
 
-#. module: account_check_writing
-#: field:account.voucher,allow_check:0
-msgid "Allow Check Writing"
-msgstr "Permite escrever cheques"
-
-#. module: account_check_writing
-#: report:account.print.check.bottom:0
-#: report:account.print.check.middle:0
-#: report:account.print.check.top:0
-msgid "Payment"
-msgstr "Pagamento"
-
-#. module: account_check_writing
-#: field:account.journal,use_preprint_check:0
-msgid "Use Preprinted Check"
-msgstr "Usar cheques pré-impressos"
-
-#. module: account_check_writing
-#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
-msgid "Print Check (Bottom)"
-msgstr "Imprimir o Cheque"
-
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -152,13 +175,24 @@ msgstr "Data de Vencimento"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
 msgid "Print Check (Middle)"
-msgstr "Imprimir Cheque (Miolo)"
+msgstr "Imprimir Cheque (Meio)"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr "O número do próximo cheque a ser impresso"
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -168,7 +202,7 @@ msgstr "Saldo Devedor"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
 msgid "Print Check (Top)"
-msgstr "Imprimir Cheque (Cabeçalho)"
+msgstr "Imprimir Cheque (Topo)"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -182,20 +216,35 @@ msgstr "Valor do Cheque"
 msgid "Accounting Voucher"
 msgstr "Comprovante Contábil"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr "ou"
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Valor por extenso"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Saldo em Aberto"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr "Imprimir Cheques em Lote"
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Escolha o Layout do Cheque"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr "Próximo Número de Cheque"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr "Cheque"
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -233,3 +282,6 @@ msgstr "Escolha o Layout do Cheque"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "O nome do diário deve ser único por empresa!"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Escolha o Layout do Cheque"
diff --git a/addons/account_check_writing/i18n/ro.po b/addons/account_check_writing/i18n/ro.po
index f22ef35b610..31526a92c92 100644
--- a/addons/account_check_writing/i18n/ro.po
+++ b/addons/account_check_writing/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-21 12:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Cecul in partea de sus"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Sold la deschidere"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Printeaza Cecul"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Cecul in partea de jos"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -92,20 +109,8 @@ msgid "Original Amount"
 msgstr "Suma Initiala"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -130,6 +135,23 @@ msgstr "Folositi Cecuri pre-tiparite"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -147,6 +169,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Companii"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -170,20 +203,35 @@ msgstr "Suma Cec"
 msgid "Accounting Voucher"
 msgstr "Chitanta contabila"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Suma in litere"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Sold la deschidere"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Alegeti formatul Cecului"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -221,3 +269,6 @@ msgstr "Alegeti formatul Cecului"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "Numele jurnalului trebuie sa fie unic per companie !"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Alegeti formatul Cecului"
diff --git a/addons/account_check_writing/i18n/ru.po b/addons/account_check_writing/i18n/ru.po
index e51d88ef609..445b340a57f 100644
--- a/addons/account_check_writing/i18n/ru.po
+++ b/addons/account_check_writing/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 13:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr ""
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr ""
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr ""
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,17 +199,32 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
diff --git a/addons/account_check_writing/i18n/sr@latin.po b/addons/account_check_writing/i18n/sr@latin.po
index 3418095cd28..e68ec612bea 100644
--- a/addons/account_check_writing/i18n/sr@latin.po
+++ b/addons/account_check_writing/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Ček na vrhu"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Otvori stanje"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Štampanje čeka"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Ček na dnu"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,20 +108,8 @@ msgid "Original Amount"
 msgstr "Prvobitni iznos"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -129,6 +134,23 @@ msgstr "iskoristi predefinisan ček"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -146,6 +168,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Preduzeća"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -169,20 +202,35 @@ msgstr "Iznos čeka"
 msgid "Accounting Voucher"
 msgstr "KVaučer knjigovodstva"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Iznos rečima"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Otvori stanje"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Izaberi izgled čeka"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -219,3 +267,6 @@ msgstr "Izaberi izgled čeka"
 #~ msgstr ""
 #~ "Greška podešavanja! Izabrana valuta mora biti zajednička za default račune "
 #~ "takođe."
+
+#~ msgid "Choose Check layout"
+#~ msgstr "Izaberi izgled čeka"
diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po
index aeb7f75cf0b..276b3cd2aad 100644
--- a/addons/account_check_writing/i18n/sv.po
+++ b/addons/account_check_writing/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-01 23:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Checken högst upp"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Skriv ut check"
@@ -45,6 +51,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Checken längst ner"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -88,20 +105,8 @@ msgid "Original Amount"
 msgstr "Ursprungligt belopp"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -126,6 +131,23 @@ msgstr ""
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -143,6 +165,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Företag"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -166,19 +199,34 @@ msgstr ""
 msgid "Accounting Voucher"
 msgstr ""
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr ""
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
 msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
 msgstr ""
 
 #~ msgid "Error! You can not create recursive companies."
diff --git a/addons/account_check_writing/i18n/tr.po b/addons/account_check_writing/i18n/tr.po
index 1a871a0a005..50735f1b382 100644
--- a/addons/account_check_writing/i18n/tr.po
+++ b/addons/account_check_writing/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-10 21:18+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "Çek üstte"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Açık Bakiye"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "Çek Basımı"
@@ -48,6 +54,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "Çek altta"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -91,20 +108,8 @@ msgid "Original Amount"
 msgstr "İlk Tutar"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -129,6 +134,23 @@ msgstr "Basılı çek kullan"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -146,6 +168,17 @@ msgstr ""
 msgid "Companies"
 msgstr "Şirketler"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -169,20 +202,35 @@ msgstr "Çek tutarı"
 msgid "Accounting Voucher"
 msgstr "Muhasebe Fişi"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "Yazı ile Tutar"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "Açık Bakiye"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "Çek düzenini seç"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Hata! özyinelemeli şirketler oluşturamazsınız."
@@ -216,5 +264,8 @@ msgstr "Çek düzenini seç"
 #~ "seçtiğinizde, OpenERP, size açık faturalar ya da fişlerinizin ödemeniz ile "
 #~ "uzlaştırılmasını önerecektir. Çeki yazdırabilirsiniz."
 
+#~ msgid "Choose Check layout"
+#~ msgstr "Çek düzenini seç"
+
 #~ msgid "Default Check layout"
 #~ msgstr "Varsayıla çek düzeni"
diff --git a/addons/account_check_writing/i18n/zh_CN.po b/addons/account_check_writing/i18n/zh_CN.po
index 7cfd4ab00c7..57eaad9f04f 100644
--- a/addons/account_check_writing/i18n/zh_CN.po
+++ b/addons/account_check_writing/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 06:58+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "顶部的支票"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "期初余额"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "打印支票"
@@ -47,6 +53,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "底部的支票"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -89,6 +106,33 @@ msgstr "折扣"
 msgid "Original Amount"
 msgstr "原始金额"
 
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "允许写支票"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "付款"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "用预先打印的支票"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "打印支票（底部）"
+
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
 msgid ""
@@ -115,28 +159,6 @@ msgstr ""
 "              </p>\n"
 "            "
 
-#. module: account_check_writing
-#: field:account.voucher,allow_check:0
-msgid "Allow Check Writing"
-msgstr "允许写支票"
-
-#. module: account_check_writing
-#: report:account.print.check.bottom:0
-#: report:account.print.check.middle:0
-#: report:account.print.check.top:0
-msgid "Payment"
-msgstr "付款"
-
-#. module: account_check_writing
-#: field:account.journal,use_preprint_check:0
-msgid "Use Preprinted Check"
-msgstr "用预先打印的支票"
-
-#. module: account_check_writing
-#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
-msgid "Print Check (Bottom)"
-msgstr "打印支票（底部）"
-
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -154,6 +176,17 @@ msgstr "打印支票（中间）"
 msgid "Companies"
 msgstr "公司"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -177,20 +210,35 @@ msgstr "支票金额"
 msgid "Accounting Voucher"
 msgstr "手工凭证"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "金额大写"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "期初余额"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "选择支票格式"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -222,3 +270,6 @@ msgstr "选择支票格式"
 
 #~ msgid "The name of the journal must be unique per company !"
 #~ msgstr "每个公司的账簿名称必须唯一！"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "选择支票格式"
diff --git a/addons/account_check_writing/i18n/zh_TW.po b/addons/account_check_writing/i18n/zh_TW.po
index 6bb2659a805..0452b37178d 100644
--- a/addons/account_check_writing/i18n/zh_TW.po
+++ b/addons/account_check_writing/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-22 06:48+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Cenoq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -23,6 +23,12 @@ msgid "Check on Top"
 msgstr "支票位於頂部"
 
 #. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "期初餘額"
+
+#. module: account_check_writing
+#: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
 msgstr "列印支票"
@@ -47,6 +53,17 @@ msgstr ""
 msgid "Check on bottom"
 msgstr "支票位於底部"
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
@@ -90,20 +107,8 @@ msgid "Original Amount"
 msgstr "原始金額"
 
 #. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new check. \n"
-"              </p><p>\n"
-"                The check payment form allows you to track the payment you "
-"do\n"
-"                to your suppliers using checks. When you select a supplier, "
-"the\n"
-"                payment method and an amount for the payment, OpenERP will\n"
-"                propose to reconcile your payment with the open supplier\n"
-"                invoices or bills.\n"
-"              </p>\n"
-"            "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
 msgstr ""
 
 #. module: account_check_writing
@@ -128,6 +133,23 @@ msgstr "使用套表列印的支票"
 msgid "Print Check (Bottom)"
 msgstr ""
 
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -145,6 +167,17 @@ msgstr ""
 msgid "Companies"
 msgstr "公司"
 
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
@@ -168,20 +201,35 @@ msgstr "支票金額"
 msgid "Accounting Voucher"
 msgstr "手工憑證"
 
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
 msgstr "金額大寫"
 
 #. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
-msgstr "期初餘額"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
 
 #. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
-msgstr "選擇支票版型"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
@@ -213,3 +261,6 @@ msgstr "選擇支票版型"
 
 #~ msgid "The code of the journal must be unique per company !"
 #~ msgstr "每個公司的帳簿編碼必須唯一！"
+
+#~ msgid "Choose Check layout"
+#~ msgstr "選擇支票版型"
diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po
index 3700316b7df..0ffa10a1ae6 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/i18n/ar.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:26+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "موضوع الايميل"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "المقدار"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "الشريك"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "الشركاء"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "تاريخ :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "الشركاء"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "تذكير بالفواتير"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "غير متقاضي"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "رسالة مطبوعة"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr "شريك للتذكير"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "متابعات"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,9 +554,11 @@ msgid "or"
 msgstr "أو"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "محظور"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -625,43 +605,77 @@ msgstr "متابعة تاريخ الارسال"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "وثيقة : ادارة حساب العميل"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "تذكير بالفواتير"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr "الإجمالي:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "الشركات"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,112 +755,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "دائن"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "تاريخ الاستحقاق"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -869,7 +778,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -877,76 +786,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "اخر تحرك"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "مسلسل"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "فترة"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "تقاضي"
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "الوصف"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr "هذه السنة المالية"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,9 +1108,9 @@ msgid "Total credit"
 msgstr "إجمالي الإئتمان"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "دائن"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "مسلسل"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "مرجع العميل:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "تاريخ الاستحقاق"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "إختبار الطباعة"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "محظور"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1403,6 +1195,9 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
 
+#~ msgid "Companies"
+#~ msgstr "الشركات"
+
 #~ msgid "Continue"
 #~ msgstr "تابع"
 
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index 095ab8bec75..42037d11288 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:28+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Тема"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Партньор"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Партньори"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Дата :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Партньори"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Отпечатано съобщение"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Следва"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,9 +554,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Блокиран"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Фирми"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Кредит"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Последно движение"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Последователност"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Период"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Жалба"
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Описание"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,9 +1107,9 @@ msgid "Total credit"
 msgstr "Общо кредит"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Кредит"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Блокиран"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1492,5 +1284,8 @@ msgstr ""
 #~ msgid "Email Settings"
 #~ msgstr "Настройки на е-поща"
 
+#~ msgid "Companies"
+#~ msgstr "Фирми"
+
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index 03dfbe0fa42..93513849742 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:28+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Naslov  Emaila"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Iznos"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partneri"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Datum:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partneri"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Ispisana poruka"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Opomene"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -555,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -581,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -592,8 +556,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -611,6 +577,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,43 +607,77 @@ msgstr "Datum slanja opomene"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument : Izvod konta kupca"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -683,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -700,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -727,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -749,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Potraživanje"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Datum dospjelosti"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -871,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -879,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Poslijenje knjiženje"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1022,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1054,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1074,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1103,10 +967,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1129,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1192,6 +1062,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1212,94 +1087,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1322,9 +1109,9 @@ msgid "Total credit"
 msgstr "Ukupno potražuje"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Potraživanje"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1336,6 +1123,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Refernca kupca:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Datum dospjelosti"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1354,11 +1146,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1369,6 +1156,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index bfe4fec3f3f..81ef9d52443 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Assumpte correu electrònic"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Empreses"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Data :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Empreses"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatori de factures"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Sense litigi"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -395,12 +398,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -434,8 +431,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -456,40 +453,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Missatge imprès"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -504,7 +479,7 @@ msgstr "Empresa per recordar"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -514,7 +489,7 @@ msgid "Follow Ups"
 msgstr "Seguiments"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -525,11 +500,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -555,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -581,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -592,9 +556,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloquejat"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -611,6 +577,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -629,43 +609,77 @@ msgstr "Data enviament del seguiment"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Document: Estat comptable del client"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Recordatori de factures"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -685,16 +699,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -702,6 +711,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -729,16 +747,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Companyies"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -751,112 +759,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haver"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Data venciment"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -873,7 +782,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -881,76 +790,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -978,24 +836,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Últim moviment"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Seqüència"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Període"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1024,7 +894,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litigi"
 
@@ -1056,8 +925,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1076,14 +948,6 @@ msgstr ""
 msgid "Description"
 msgstr "Descripció"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1105,10 +969,8 @@ msgid "This Fiscal year"
 msgstr "Aquest exercici fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1131,15 +993,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1196,6 +1066,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1216,94 +1091,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1326,9 +1113,9 @@ msgid "Total credit"
 msgstr "Total haver"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haver"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1340,6 +1127,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Ref. client :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Data venciment"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1358,11 +1150,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1373,6 +1160,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloquejat"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1718,6 +1510,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Línies de seguiment"
 
+#~ msgid "Companies"
+#~ msgstr "Companyies"
+
 #~ msgid "Followup Level"
 #~ msgstr "Nivell de seguiment"
 
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index ebce1b162f0..2b26a00c896 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,8 +238,18 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -280,8 +258,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr ""
+
+#. module: account_followup
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,14 +833,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -991,7 +861,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,8 +1107,8 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_followup
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/da.po b/addons/account_followup/i18n/da.po
index 46f1c5d313c..cb10ed2b105 100644
--- a/addons/account_followup/i18n/da.po
+++ b/addons/account_followup/i18n/da.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,8 +239,18 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -281,8 +259,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,8 +555,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,14 +607,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -643,26 +653,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,33 +756,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr ""
+
+#. module: account_followup
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -792,162 +793,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,14 +834,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -992,7 +862,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,8 +1108,8 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_followup
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index d61eae1c749..a42b649e743 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 21:46+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,25 +14,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Manuelle Folgeaktion"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "Maximale Mahnstufe"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Gruppierung ..."
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr "%(date)s"
 msgid "Next Action Date"
 msgstr "Nächste Zahlungserinnerung"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Manuelle Folgeaktion"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,162 +72,6 @@ msgstr "-> Als erledigt markieren"
 msgid "Action To Do"
 msgstr "Folgeaktion"
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Guten Tag ${object.name},</p>\n"
-"    <p>\n"
-"    unter der Annahme, dass unsere Konten korrekt gebucht sind, sind "
-"offensichtlich folgende Beträge nicht bezahlt.\n"
-"    Bitte nehmen Sie innerhalb der nächsten 8 Tage einen Kontoausgleich "
-"vor.\n"
-"\n"
-"    Sollte sich unsere Mahnung mit Ihrer Zahlung überschneiden, betrachten "
-"Sie diesen Vorgang als erledigt.\n"
-"    Bitte zögern Sie bei Rückfragen nicht, unsere Finanzabteilung per EMail "
-"oder Telefon  zu kontaktieren.\n"
-"\n"
-"<br/>\n"
-"Viele Grüsse\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Rechnungsdatum</td>\n"
-"            <td>Referenz</td>\n"
-"            <td>Fällig am</td>\n"
-"            <td>Betrag (%s)</td>\n"
-"            <td>EUR</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>fälliger Gesamtbetrag: %s </center>''' % "
-"(total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Anstehende Mahnungen"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -244,41 +91,9 @@ msgid "Email Subject"
 msgstr "EMail-Betreff"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
-"\n"
-"Sehr geehrte(r) %(partner_name)s,\n"
-"\n"
-"trotz verschiedener Zahlungserinnerungen, wurde Ihr Konto bislang nicht "
-"ausgegelichen.\n"
-"\n"
-"Sollte in den nächsten 8 Tagen keine Zahlung eingehen, ergreifen wir ohne "
-"weitere Vorwarnung die erforderlichen Maßnahmen des gesetzlichen "
-"Mahnverfahrens. Voraussichtlich wird dieser Schritt nicht erforderlich sein, "
-"sie sehen alle fälligen Rechnungen in der unteren Liste.\n"
-"\n"
-"Bei weiteren Fragestellungen zu der Rechnung, zögern Sie bitte nicht unsere "
-"Finanzbuchhaltung anzusprechen. \n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -295,16 +110,6 @@ msgstr "Mahnstufen"
 msgid "Email Body"
 msgstr "Text der E-Mail"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Verantwortlicher Mitarbeiter für die Durchführung"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Überfälliger Betrag"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -315,11 +120,79 @@ msgstr "Sende Mahnungen"
 msgid "Amount"
 msgstr "Betrag"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Kein Verantwortlicher"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -340,6 +213,11 @@ msgstr "Nächste Aktion"
 msgid ": Partner Name"
 msgstr ": Partner Name"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr "Zuweisen eines Verantwortlichen"
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -361,9 +239,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partner"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -371,9 +259,9 @@ msgid "Date :"
 msgstr "Datum:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Ich bin verantwortlich"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partner"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -381,64 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Es ist nur ein Mahnverfahren je Unternehmen zulässig"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
-"\n"
-"Sehr geehrte(r)  %(partner_name)s,\n"
-"\n"
-"trotz mehrerer Mahnungen, ist Ihr Konto leider immer noch nicht "
-"ausgeglichen.\n"
-"\n"
-"Sofern keine vollständige Bezahlung innerhalb der nächsten 8 Tage "
-"vorgenommen wird, \n"
-"werden wir unsererseits die erforderlichen rechtlichen Schritte für das "
-"gesetzliche\n"
-"Mahnverfahren ohne weitere Ankündigung in die Wege leiten.\n"
-"\n"
-"Wir sind zuversichtlich, dass diese Aktion nicht erforderlich sein wird. "
-"Sämtliche Details der \n"
-"fälligen Rechnungen sind in diesem Schreiben aufgelistet.\n"
-"\n"
-"Bei Fragen zu dieser Angelegenheit, zögern Sie bitte nicht, unsere "
-"Buchhaltung unter #\n"
-"(+49) 4471 840 9000 zu kontaktieren.\n"
-"\n"
-"Freundliche Grüsse\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Erinnerung an zu zahlende Rechnungen"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Bei Verarbeitung wird ein Anschreiben gedruckt"
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Kein Verzug"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Ohne Verantwortlichen"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -454,6 +304,47 @@ msgstr "Manuelle Mahnung"
 msgid "%(partner_name)s"
 msgstr "%(partner_name)s"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -508,12 +399,6 @@ msgstr "Mahnwesen"
 msgid "Due Days"
 msgstr "Zahlungsverzug"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Niemand"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -547,9 +432,9 @@ msgid "Send Email Confirmation"
 msgstr "Sende Email Bestätigung"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr "Drucke fällige Zahlungen"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "Mahnungen mit Rechnung aus diesem Jahr"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -569,54 +454,19 @@ msgstr " gesendete Email(s)"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "Drucke Erinnerungen & Sende Emails"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Guten Tag  %( partner_name)s,\n"
-"\n"
-"in unseren Unterlagen stehen die folgenden Rechnungen zur Zahlung aus. Bitte "
-"überprüfen Sie dies auf Ihrer Seite und ergreifen Sie die erforderlichen "
-"Massnahmen innerhalb der nächsten 8 Tage. Sollte die Zahlung zeitlich nach "
-"dieser Mitteilung erfolgen, können Sie bitte diese Benachrichtigung "
-"ignorieren. \n"
-"Sollte uns unerwartet ein Fehler unterlaufen sein, so bitten wir dies zu "
-"entschuldigen, und hoffen, dass Sie uns helfen diese Angelegenheit zu "
-"bereinigen.\n"
-"\n"
-"Freundliche Grüsse\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "gedruckte Mitteilung"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr "Letzte Mahnstufe vor Mahnverfahren"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
-msgstr "Kunden mit Guthaben"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
+msgstr ""
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -630,8 +480,8 @@ msgstr "Zu erinnernde Partner"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
-msgstr "Drucke fällige Zahlungen ohne Mahnstufe"
+msgid "Print Overdue Payments"
+msgstr "Drucke fällige Zahlungen"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -640,7 +490,7 @@ msgid "Follow Ups"
 msgstr "Mahnungen"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr "Email wurde aufgrund fehlender Mailadresse nicht gesendet"
@@ -651,16 +501,11 @@ msgid "Account Follow-up"
 msgstr "Mahnwesen"
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
-"Folgendermassen können Sie eine weitere Mahnung schreiben. Tragen Sie das "
-"aktuelle Datum  ein und lassen Sie alle weiteren Felder unausgefüllt damit "
-"der Partner hierdurch eine Mahnstufe erhält, die eine manuelle Aktion "
-"erfordert. "
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
@@ -687,22 +532,6 @@ msgstr " manuell zugewiesene Aktion:"
 msgid "Search Partner"
 msgstr "Suche Partner"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-"Unten sehen Sie die Vorgangshistorie für diesen \n"
-"                            Kunden. Einer Rechnung kann zugewiesen werden, "
-"daß Sie per\n"
-"                            gesetzlichem  Mahnverfahren weiter verfolgt "
-"wird, um weitere\n"
-"                            Versendungen von Mahnungen zu vermeiden."
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -719,7 +548,7 @@ msgid "Account Move line"
 msgstr "Buchungszeile"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr "Versende Mahnschreiben und Emails: Zusammenfassung"
@@ -730,9 +559,11 @@ msgid "or"
 msgstr "oder"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Abgewiesen"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -749,6 +580,20 @@ msgstr "Klicken Sie um Aktion abzuschließen"
 msgid "Follow-Ups Analysis"
 msgstr "Statistik Mahnungen"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr "Drucke fällige Zahlungen ohne Mahnstufe"
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -767,52 +612,78 @@ msgstr "Datum für Versand der Mahnung(en)"
 msgid "Follow-up Responsible"
 msgstr "Verantwortlich für Mahnung"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument: Kundenkonto"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Erinnerung an zu zahlende Rechnungen"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr "Mahnstufen"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr "Zukünftige Mahnungen"
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
-"Um Kunden an die Zahlung Ihrer offenen Rechnungen zu erinnern, können Sie\n"
-"                        je nach Fristüberschreitung unterschiedliche "
-"Mahnaktionen auslösen .\n"
-"                        Diese werden zusammengefasst in verschiedenen "
-"Mahnstufen,\n"
-"                        die in Abhängigkeit Ihres maximalen Verzugs bei "
-"Überschreitung\n"
-"                        ausgelöst werden."
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "Mahnungen mit Rechnung aus diesem Jahr"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr ""
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -831,16 +702,11 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr "Druck überfällige Zahlungen"
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr "EMail Vorlagen"
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -849,6 +715,15 @@ msgid ""
 msgstr ""
 "Bei Durchführung wird das manuelle Verfahren für diesen Kunden vorgeschlagen "
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -877,16 +752,6 @@ msgstr "Summe:"
 msgid "Email Template"
 msgstr "EMail Vorlage"
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr "%(user_signature)s"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Unternehmen"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -899,208 +764,14 @@ msgid "Send an Email"
 msgstr "Sende eine Email"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
-"\n"
-"Sehr geehrte(r) %partner_name,\n"
-"\n"
-"wir haben mit Enttäuschung feststellen müssen, dass trotz erfolgter Mahnung, "
-"Ihr Konto weiterhin überfällig ist.\n"
-"\n"
-"Es ist in Ihrem eigenen Interesse sehr wichtig, dass die sofortige Zahlung "
-"erfolgt, sonst müssen wir in Betracht ziehen, \n"
-"dass wir nicht mehr in der Lage sein werden, Ihr Unternehmen mit Waren / "
-"Dienstleistungen zu beliefern. Bitte ergreifen Sie \n"
-"geeignete Maßnahmen, um die Durchführung dieser Zahlung in den nächsten 8 "
-"Tagen vorzunehmen.\n"
-"\n"
-"Wenn es ein Problem mit der Zahlung der Rechnung gibt, die uns aktuell nicht "
-"bewusst ist, zögern Sie bitte nicht, unsere Buchhaltung unter (+49) 4471 "
-"8409000 zu kontaktieren. damit wir die Angelegenheit schnell lösen können.\n"
-"\n"
-"Details fälliger Zahlungen werden dann weiter unten gedruckt.\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Punkte"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fällingkeitsdatum"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Sehr geehrte(r) ${object.name},</p>\n"
-"    <p>\n"
-"     Vorbehaltlich eines Fehler unsererseits, sind offensichtlich die "
-"folgenden Beträge noch nicht bezahlt. \n"
-"Bitte ergreifen Sie geeignete Maßnahmen Ihrerseits, um die entsprechenden "
-"Zahlungen innerhalb der nächsten \n"
-"8 Tage anzuweisen. Sollte sich diese EMail mit Ihrer Bezahlung zeitlich "
-"überschneiden, ignorieren Sie bitte diese Nachricht. \n"
-"Zögern Sie bei Rückfragen bitte auch nicht, unsere Buchhaltung unter (+49) "
-"4471 8409000 zu kontaktieren.\n"
-"    </p>\n"
-"<br/>\n"
-"Freundliche Grüsse\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Rechnungsdatum</td>\n"
-"            <td>Rechnungsnummer</td>\n"
-"            <td>fällig am</td>\n"
-"            <td>Betrag (%s)</td>\n"
-"            <td>EUR</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>fälliger Betrag: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -1118,7 +789,7 @@ msgid "Latest Follow-up Date"
 msgstr "Letzte Mahnung"
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -1126,161 +797,28 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Sehr geehrte(r) ${object.name},</p>\n"
-"   <p>\n"
-"   \t Wir sind enttäuscht, dass trotz Mahnung, Ihr Konto immer noch "
-"überfällige Rechnungen ausweist.\n"
-"\n"
-"Es ist wichtig, dass die sofortige Zahlung erfolgt, sonst müssen wir in "
-"Betracht ziehen, Ihr Kundenkonto zu sperren, \n"
-"wodurch wir dann leider gezwungen sind, Ihr Unternehmen vorerst nicht mehr "
-"mit Waren / Dienstleistungen zu \n"
-"beliefern. Bitte ergreifen Sie geeignete Maßnahmen, um eine Zahlung in den "
-"nächsten 8 Tagen durchzuführen.\n"
-"\n"
-"Wenn es ein Problem mit der Zahlung der Rechnung(en) gibt, die uns nicht "
-"bekannt ist, zögern Sie nicht, \n"
-"unsere Buchhaltung unter (+49) 4471 8409000 zu kontaktieren, damit wir die "
-"Angelegenheit lösen können.\n"
-"\n"
-"Details zu den fälligen Zahlungen finden Sie unten.\n"
-" </p>\n"
-"<br/>\n"
-"Mit freundlichen Grüßen\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Rechnungsdatum</td>\n"
-"            <td>Rechnungsnummer</td>\n"
-"            <td>fällig am</td>\n"
-"            <td>Betrag(%s)</td>\n"
-"            <td>EUR</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Fälliger Betrag: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -1305,24 +843,36 @@ msgstr "Meine Mahnungen"
 msgid "%(company_name)s"
 msgstr "%(company_name)s"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Letzte Buchung"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Folge"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Periode"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr "%s Partner haben kein Guthaben, insofern wurde die Aktion gelöscht"
@@ -1353,7 +903,6 @@ msgstr "Schließen"
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Rechtsstreit"
 
@@ -1385,9 +934,12 @@ msgid ": Current Date"
 msgstr ": Heutiges Datum"
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
-msgstr "Fälliger Gesamtbetrag"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
+msgstr ""
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
@@ -1405,14 +957,6 @@ msgstr "Beinhaltet Buchungen aus lfd. Rechtsstreitigkeiten"
 msgid "Description"
 msgstr "Beschreibung"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr "${user.company_id.name} Mahnwesen"
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1434,13 +978,9 @@ msgid "This Fiscal year"
 msgstr "Dieses Geschäftsjahr"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
-msgstr ""
-"Falls nicht automatisch durch die Mahnstufe vorgegeben, wird die Standard "
-"Mahnvorlage für Anschreiben und EMail angewendet."
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
+msgstr "Letzte Mahnstufe vor Mahnverfahren"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1467,19 +1007,24 @@ msgid "Follow-up lines"
 msgstr "Mahnpositionen"
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr "Zuweisen eines Verantwortlichen"
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
-"Hierdurch werden Mahnungen als EMails versendet, Anschreiben ausgedruckt und "
-"die manuell zu\n"
-"bearbeiteten Mahnungen der Kunden ausgelöst."
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1544,6 +1089,11 @@ msgstr "Statistik Mahnwesen nach Partner"
 msgid " letter(s) in report"
 msgstr " Geschäftsformulare Ansicht"
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1575,176 +1125,6 @@ msgstr ""
 "               </ p>\n"
 "          "
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Sehr geehrte(r) ${object.name},</p>\n"
-"    <p>\n"
-"    Trotz mehrerer Mahnungen, ist Ihr Konto immer noch nicht ausgeglichen.\n"
-"Sofern keine vollständige Bezahlung in den nächsten 8 Tagen vorgenommen "
-"wird, werden wir \n"
-"weitere rechtliche Schritte ohne weitere Ankündigung in die Wege leiten.  "
-"Wir sind zuversichtlich, \n"
-"dass diese Aktion unnötig ist. Sollten Ihrerseits zu diesem Zeitpunkt "
-"weitere Detailfragen zu diesem \n"
-"Thema auftreten, zögern Sie bitte nicht, unsere  Buchhaltung unter (+49) "
-"4471 8409000 \n"
-"zu kontaktieren.\n"
-"</p>\n"
-"<br/>\n"
-"Freundliche Grüsse\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Rechnungsdatum</td>\n"
-"            <td>Rechnungsnummer</td>\n"
-"            <td>Fällig am</td>\n"
-"            <td>Betrag (%s)</td>\n"
-"            <td>EUR</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>fälliger Betrag: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-"Dies ist die nächste Aktion, die durch den Anwender getroffen werden muss. "
-"Die Aktion wird jetzt automatisch so eingestellt, \r\n"
-"dass erst wenn die Aktion Felder leer sind und der Partner eine automatische "
-"Mahnstufe erhält, ein manueller Eingriff \r\n"
-"erforderlich sein wird. "
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1767,9 +1147,9 @@ msgid "Total credit"
 msgstr "Forderungssumme"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Punkte"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Folge"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1781,6 +1161,11 @@ msgstr "To-Do Liste Mahnungen"
 msgid "Customer Ref :"
 msgstr "Kunden Referenz:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fällingkeitsdatum"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1802,11 +1187,6 @@ msgstr "Letztes Änderung der Mahnstufe"
 msgid "Test Print"
 msgstr "Testdruck"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr "Suche Ansicht"
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1817,6 +1197,11 @@ msgstr ": Benutzer Name"
 msgid "Accounting"
 msgstr "Finanzbuchhaltung"
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Abgewiesen"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -2117,6 +1502,9 @@ msgstr "Kundenzahlung Versprechen"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
+#~ msgid "Companies"
+#~ msgstr "Unternehmen"
+
 #~ msgid "Followup Lines"
 #~ msgstr "Zahlungserinnerungen Positionen"
 
@@ -2349,6 +1737,34 @@ msgstr "Kundenzahlung Versprechen"
 #~ msgid "Email body"
 #~ msgstr "EMail Haupttext"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Guten Tag  %( partner_name)s,\n"
+#~ "\n"
+#~ "in unseren Unterlagen stehen die folgenden Rechnungen zur Zahlung aus. Bitte "
+#~ "überprüfen Sie dies auf Ihrer Seite und ergreifen Sie die erforderlichen "
+#~ "Massnahmen innerhalb der nächsten 8 Tage. Sollte die Zahlung zeitlich nach "
+#~ "dieser Mitteilung erfolgen, können Sie bitte diese Benachrichtigung "
+#~ "ignorieren. \n"
+#~ "Sollte uns unerwartet ein Fehler unterlaufen sein, so bitten wir dies zu "
+#~ "entschuldigen, und hoffen, dass Sie uns helfen diese Angelegenheit zu "
+#~ "bereinigen.\n"
+#~ "\n"
+#~ "Freundliche Grüsse\n"
+
 #~ msgid "Partner Selection"
 #~ msgstr "Partnerauswahl"
 
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index 034a5bc2183..70cbf5cb78f 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 01:30+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Θέμα Email"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Συνεργάτες"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Ημερομηνία :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Συνεργάτες"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,26 +269,10 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Υπενθύμιση Τιμολογίων"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Εκτύπωση Μηνύματος"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Follow Ups"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,9 +555,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Μπλοκαρισμένο"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -628,43 +608,77 @@ msgstr "Follow-up Sending Date"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Έγγραφο : Δήλωση λογαριασμού Πελάτη"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Υπενθύμιση Τιμολογίων"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -684,16 +698,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -701,6 +710,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -728,16 +746,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Εταιρίες"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -750,112 +758,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Πίστωση"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Ημερομηνία Ενηλικίωσης"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -872,7 +781,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -880,76 +789,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -977,24 +835,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Τελευταία κίνηση"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Αλληλουχία"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Περίοδος"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1023,7 +893,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1055,8 +924,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1075,14 +947,6 @@ msgstr ""
 msgid "Description"
 msgstr "Περιγραφή"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1104,10 +968,8 @@ msgid "This Fiscal year"
 msgstr "Αυτό το Οικονομοικό Έτος"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1130,15 +992,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1195,6 +1065,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1215,94 +1090,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1325,9 +1112,9 @@ msgid "Total credit"
 msgstr "Σύνολο πίστωσης"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Πίστωση"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Αλληλουχία"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1339,6 +1126,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Σχ. Πελάτη :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Ημερομηνία Ενηλικίωσης"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1357,11 +1149,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1372,6 +1159,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Μπλοκαρισμένο"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1659,6 +1451,9 @@ msgstr ""
 #~ "Όλα τα E-mails έχουν αποσταλεί στους Συνεργάτες:.\n"
 #~ "\n"
 
+#~ msgid "Companies"
+#~ msgstr "Εταιρίες"
+
 #, python-format
 #~ msgid "Select Partners"
 #~ msgstr "Επιλογή Συνεργατών"
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 6aa15d9887b..7f8aa7a17f7 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -6,32 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 11:14+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Acción manual"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "Nivel máximo de seguimiento"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Agrupar por"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr "%(date)s"
 msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Acción manual"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,159 +71,6 @@ msgstr "Marcar como terminado"
 msgid "Action To Do"
 msgstr "Acción a realizar"
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Estimado/a ${object.name},</p>\n"
-"    <p>\n"
-"    Perdónenos si es un error, pero parece que la siguiente cantidad "
-"permanece sin pagar. Por favor, tome las medidas adecuadas para realizar "
-"este pago en los siguientes 8 días.\n"
-"\n"
-"Si el pago se ha realizado antes de que este correo se enviara, ignore por "
-"favor este mensaje. No dude en contactar con nuestro departamento de "
-"administración para cualquier cuestión.\n"
-"    </p>\n"
-"<br/>\n"
-"Saludos cordiales,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Seguimientos a realizar"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -240,43 +90,9 @@ msgid "Email Subject"
 msgstr "Asunto correo electrónico"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"Pese a haberle sido remitidos varios avisos, sigue sin estar al corriente de "
-"pago.\n"
-"\n"
-"A menos que se efectúe el pago íntegro de la cantidad adeudada en los "
-"próximos 8 días, serán emprendidas acciones legales para reclamar el cobro "
-"sin más aviso.\n"
-"\n"
-"Confiamos en que sea innecesario recurrir a la justicia, para ello tiene "
-"adjuntos los detalles del pago pendiente.\n"
-"\n"
-"Para cualquier consulta sobre el asunto, no dude en contactar con nuestro "
-"departamento contable en el (+32).10.68.94.39.\n"
-"\n"
-"Saludos cordiales,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -293,16 +109,6 @@ msgstr "Pasos del seguimiento"
 msgid "Email Body"
 msgstr "Cuerpo del mensaje"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Responsable para asegurar que la acción sucede."
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Importe adeudado"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -313,11 +119,79 @@ msgstr "Enviar seguimientos"
 msgid "Amount"
 msgstr "Importe"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Sin responsable"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -338,6 +212,11 @@ msgstr "Próxima acción"
 msgid ": Partner Name"
 msgstr "Nombre empresa"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr "Asignar un responsable"
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -359,9 +238,19 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Empresas"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -369,9 +258,9 @@ msgid "Date :"
 msgstr "Fecha :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Yo soy el responsable"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -379,59 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Solo se permite un seguimiento por compañía"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
-"\n"
-"Estimado/a %(partner_name)s,\n"
-"\n"
-"A pesar de los diversos recordatorios, su cuenta aún no está resuelta.\n"
-"\n"
-"A menos que realice el pago completo en los próximos 8 días, se podrán "
-"emprender acciones legales para recuperar la cantidad debida sin más "
-"notificaciones.\n"
-"\n"
-"Confiamos en que esta acción sea innecesaria. Se muestran los detalles del "
-"pago a continuación.\n"
-"\n"
-"En caso de alguna consulta acerca de este asunto, no dude en contactar con "
-"nuestro departamento de administración.\n"
-"\n"
-"Saludos cordiales,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatorio facturas"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Al ser procesado, imprimirá una carta"
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "No litigio"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Sin responsable"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -447,6 +303,47 @@ msgstr "Seguimientos manuales"
 msgid "%(partner_name)s"
 msgstr "%(partner_name)s"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -501,12 +398,6 @@ msgstr "Seguimiento de pagos"
 msgid "Due Days"
 msgstr "Días vencimiento"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Nadie"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -540,9 +431,9 @@ msgid "Send Email Confirmation"
 msgstr "Enviar confirmación por correo electrónico"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr "Imprimir pagos pendientes"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "Realizar seguimiento a asientos con periodo en el año actual"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -562,53 +453,19 @@ msgstr " correo(s) enviados"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "imprimir seguimiento y enviar mail al cliente"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Estimado %(partner_name)s, \n"
-"\n"
-"A excepción de que fuese un error nuestro, parece que el siguiente importe "
-"sigue impagado. Por favor, tome las medidas oportunas para realizar el pago "
-"en los próximos 8 días.\n"
-"\n"
-"Si su pago ha sido realizado después de que este correo haya sido enviado, "
-"por favor, ignore el mensaje. No dude en contactar con nuestro departamente "
-"financiero en el (+32) .10.69.94.39.\n"
-"\n"
-"Cordiales saludos,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensaje impreso"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr "Ultimo nivel de seguimiento sin litigio"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
-msgstr "Empresas con créditos"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
+msgstr ""
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -622,9 +479,8 @@ msgstr "Empresa a recordar"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
-"Imprimir informe de pagos vencidos independiente de la línea de seguimiento"
+msgid "Print Overdue Payments"
+msgstr "Imprimir pagos pendientes"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -633,7 +489,7 @@ msgid "Follow Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -646,15 +502,11 @@ msgid "Account Follow-up"
 msgstr "Seguimiento de cuenta"
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
-"Esto es cuando se requiere un seguimiento posterior. La fecha se ha "
-"establecido a la fecha actual si los campos de acción están vacíos y el "
-"cliente tiene un nivel de seguimiento que requiere una acción manual. "
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
@@ -681,19 +533,6 @@ msgstr " acción(es) manual(es) asignada(s):"
 msgid "Search Partner"
 msgstr "Buscar empresa"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-"A continuación se encuentra la historia de las transacciones de este "
-"cliente. Puede establecer una factura en litigio para no incluirla en los "
-"próximos seguimientos de pago."
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -710,7 +549,7 @@ msgid "Account Move line"
 msgstr "Apunte contable"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr "Enviar correos e emails: Resumen de acciones"
@@ -721,9 +560,11 @@ msgid "or"
 msgstr "o"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqueado"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -740,6 +581,21 @@ msgstr "Haga click para establecer la acción como realizada"
 msgid "Follow-Ups Analysis"
 msgstr "Análisis de seguimientos"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+"Imprimir informe de pagos vencidos independiente de la línea de seguimiento"
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -758,49 +614,78 @@ msgstr "Fecha envío del seguimiento"
 msgid "Follow-up Responsible"
 msgstr "Responsable del seguimiento"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Recordatorio facturas"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr "Niveles de seguimiento"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr "Seguimientos futuros"
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
-"Para recordar a los clientes el pago de sus facturas, puede definir "
-"diferentes acciones dependiendo de cuánto esté de atrasado el cliente. Estas "
-"acciones se empaquetarán en niveles de seguimiento que serán lanzados cuando "
-"la fecha de vencimiento de la factura más atrasada haya sobrepasado cierta "
-"cantidad de días."
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "Realizar seguimiento a asientos con periodo en el año actual"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr ""
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -819,16 +704,11 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr "Impresión del informe de pagos vencidos"
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr "Plantillas de correo electrónico"
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -838,6 +718,15 @@ msgstr ""
 "Al procesar, se establecerá la acción manual que deberá hacerse para ese "
 "cliente. "
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -867,16 +756,6 @@ msgstr "Total:"
 msgid "Email Template"
 msgstr "Plantilla email"
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr "%(user_signature)s"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -889,209 +768,14 @@ msgid "Send an Email"
 msgstr "Enviar un correo"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
-"\n"
-"Estimado/a %(partner_name)s,\n"
-"\n"
-"Estamos decepcionados de ver que a pesar del recordatorio, su cuenta está "
-"ahora seriamente atrasada.\n"
-"\n"
-"Es esencial que se realice el pago inmediatamente, o de lo contrario "
-"deberemos considerar una parada en su cuenta, lo que significará que no "
-"volveremos a suplir a su compañía con nuestros (bienes/servicios).\n"
-"\n"
-"Por favor, tome las medidas apropiadas para realizar el pago en los próximos "
-"8 días.\n"
-"\n"
-"Si hay algún problema con el pago de la factura del que no seamos "
-"conscientes, no dude en contactar con nuestro departamento de contabilidad, "
-"para que podamos resolverlo rápidamente.\n"
-"\n"
-"Se acompañan a continuación detalles del pago atrasado.\n"
-"\n"
-"Saludos cordiales,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fecha vencimiento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Estimado/a ${object.name},</p>\n"
-"    <p>\n"
-"Perdónenos si es un error, pero parece que la siguiente cantidad permanece "
-"sin pagar. Por favor, tome las medidas adecuadas para realizar este pago en "
-"los siguientes 8 días.\n"
-"\n"
-"Si el pago se ha realizado antes de que este correo se enviara, ignore por "
-"favor este mensaje. No dude en contactar con nuestro departamento de "
-"administración para cualquier cuestión.\n"
-"</p>\n"
-"<br/>\n"
-"Saludos cordiales,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -1109,7 +793,7 @@ msgid "Latest Follow-up Date"
 msgstr "Ultima fecha de seguimiento"
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -1117,159 +801,28 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Estimado/a ${object.name},</p>\n"
-"   <p>\n"
-"Estamos decepcionados de ver que a pesar del recordatorio, su cuenta está "
-"ahora seriamente atrasada.\n"
-"\n"
-"Es esencial que se realice el pago inmediatamente, o de lo contrario "
-"deberemos considerar una parada en su cuenta, lo que significará que no "
-"volveremos a suplir a su compañía con nuestros (bienes/servicios).\n"
-"\n"
-"Por favor, tome las medidas apropiadas para realizar el pago en los próximos "
-"8 días.\n"
-"\n"
-"Si hay algún problema con el pago de la factura del que no seamos "
-"conscientes, no dude en contactar con nuestro departamento de contabilidad, "
-"para que podamos resolverlo rápidamente.\n"
-"\n"
-"Se acompañan a continuación detalles del pago atrasado.\n"
-" </p>\n"
-"<br/>\n"
-"Saludos cordiales,   \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -1294,24 +847,36 @@ msgstr "Mis seguimientos"
 msgid "%(company_name)s"
 msgstr "%(company_name)s"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Período"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr "%s empresas no tienen crédito y por eso la acción se ha limpiado"
@@ -1343,7 +908,6 @@ msgstr "Cerrar"
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litigio"
 
@@ -1375,9 +939,12 @@ msgid ": Current Date"
 msgstr ": Fecha actual"
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
-msgstr "Importe total vencido"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
+msgstr ""
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
@@ -1395,14 +962,6 @@ msgstr "Incluyendo asientos marcados como litigio"
 msgid "Description"
 msgstr "Descripción"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr "${user.company_id.name} Seguimiento del pago"
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1424,13 +983,9 @@ msgid "This Fiscal year"
 msgstr "Este ejercicio fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
-msgstr ""
-"Si no se especifica en el último nivel de seguimiento, se enviará la "
-"plantilla de facturas atrasadas del seguimiento por defecto"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
+msgstr "Ultimo nivel de seguimiento sin litigio"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1456,18 +1011,24 @@ msgid "Follow-up lines"
 msgstr "Líneas de seguimiento"
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr "Asignar un responsable"
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
-"Esta acción enviará correos electrónicos de seguimiento, imprimirá las "
-"cartas y establecerá las acciones manuales por clientes."
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1527,6 +1088,11 @@ msgstr "Estadísticas de seguimiento por empresa"
 msgid " letter(s) in report"
 msgstr " carta(s) en el informe"
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1555,175 +1121,6 @@ msgstr ""
 "</p>\n"
 "          "
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Estimado %(partner_name)s,</p>\n"
-"    <p>\n"
-"Pese a haberle sido remitidos varios avisos, sigue sin estar al corriente de "
-"pago.\n"
-"\n"
-"A menos que se efectúe el pago íntegro de la cantidad adeudada en los "
-"próximos 8 días, serán emprendidas acciones legales para reclamar el cobro "
-"sin más aviso.\n"
-"\n"
-"Confiamos en que sea innecesario recurrir a la justicia, para ello tiene "
-"adjuntos los detalles del pago pendiente.\n"
-"\n"
-"Para cualquier consulta sobre el asunto, no dude en contactar con nuestro "
-"departamento contable en el (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Saludos cordiales,\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-"Ésta es la próxima acción a realizar por parte del usuario. Se establecerá "
-"cuando los campos de acción estén vacíos y la empresa alcance el nivel de "
-"seguimiento que requiere una acción manual. "
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1746,9 +1143,9 @@ msgid "Total credit"
 msgstr "Total haber"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haber"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1760,6 +1157,11 @@ msgstr "Seguimientos a realizar"
 msgid "Customer Ref :"
 msgstr "Ref. cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha vencimiento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1782,11 +1184,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Imprimir prueba"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr "Vista de búsqueda"
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1797,6 +1194,11 @@ msgstr ": Nombre de usuario"
 msgid "Accounting"
 msgstr "Contabilidad"
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -2122,6 +1524,9 @@ msgstr "Promesa de pago del cliente"
 #~ msgid "Followup Lines"
 #~ msgstr "Líneas de seguimiento"
 
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
 #~ msgid "%(user_signature)s: User Name"
 #~ msgstr "%(user_signature)s: Nombre del usuario"
 
@@ -2366,6 +1771,33 @@ msgstr "Promesa de pago del cliente"
 #~ msgid "Message"
 #~ msgstr "Mensaje"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s, \n"
+#~ "\n"
+#~ "A excepción de que fuese un error nuestro, parece que el siguiente importe "
+#~ "sigue impagado. Por favor, tome las medidas oportunas para realizar el pago "
+#~ "en los próximos 8 días.\n"
+#~ "\n"
+#~ "Si su pago ha sido realizado después de que este correo haya sido enviado, "
+#~ "por favor, ignore el mensaje. No dude en contactar con nuestro departamente "
+#~ "financiero en el (+32) .10.69.94.39.\n"
+#~ "\n"
+#~ "Cordiales saludos,\n"
+
 #~ msgid "Follow up Entries with period in current year"
 #~ msgstr "Asientos de seguimiento con el periodo en este año"
 
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index bc64c20a569..2500d937cfe 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_AR.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-15 15:33+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Asunto del correo electrónico"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Fecha :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partners"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensaje impreso"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,43 +607,77 @@ msgstr "Fecha de envío del seguimiento"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Estado de cuenta del cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -683,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -700,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -727,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -749,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fecha de vencimiento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -871,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -879,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1022,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1054,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1074,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Descripción"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1103,10 +967,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1129,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1192,6 +1062,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1212,94 +1087,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1322,9 +1109,9 @@ msgid "Total credit"
 msgstr "Total haber"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haber"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1336,6 +1123,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Referencia del cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha de vencimiento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1354,11 +1146,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1369,6 +1156,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/es_CR.po b/addons/account_followup/i18n/es_CR.po
index f6efb70e191..517df8f27e8 100644
--- a/addons/account_followup/i18n/es_CR.po
+++ b/addons/account_followup/i18n/es_CR.po
@@ -6,21 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 14:55+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Asunto correo electrónico"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Monto"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Empresas"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Fecha :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,42 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatorio facturas"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "No litigio"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -396,12 +399,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -435,8 +432,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -457,52 +454,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Estimado %(partner_name)s, \n"
-"\n"
-"A excepción de que fuese un error nuestro, parece que el siguiente importe "
-"sigue impagado. Por favor, tome las medidas oportunas para realizar el pago "
-"en los próximos 8 días.\n"
-"\n"
-"Si su pago ha sido realizado después de que este correo haya sido enviado, "
-"por favor, ignore el mensaje. No dude en contactar con nuestro departamente "
-"financiero en el (+32) .10.69.94.39.\n"
-"\n"
-"Cordiales saludos,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensaje impreso"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -517,7 +480,7 @@ msgstr "Empresa a recordar"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -527,7 +490,7 @@ msgid "Follow Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -538,11 +501,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -570,16 +532,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -596,7 +548,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -607,9 +559,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqueado"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -626,6 +580,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -644,43 +612,77 @@ msgstr "Fecha envío del seguimiento"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Recordatorio facturas"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -700,16 +702,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -717,6 +714,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -744,16 +750,6 @@ msgstr "Total:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -766,112 +762,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fecha vencimiento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -888,7 +785,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -896,76 +793,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -993,24 +839,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Período"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1039,7 +897,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litigio"
 
@@ -1071,8 +928,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1091,14 +951,6 @@ msgstr "Incluyendo asientos marcados como litigio"
 msgid "Description"
 msgstr "Descripción"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1120,10 +972,8 @@ msgid "This Fiscal year"
 msgstr "Este ejercicio fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1146,15 +996,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1211,6 +1069,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1231,94 +1094,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1341,9 +1116,9 @@ msgid "Total credit"
 msgstr "Total haber"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haber"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1355,6 +1130,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Ref. cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha vencimiento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1373,11 +1153,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Imprimir prueba"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1388,6 +1163,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1485,6 +1265,9 @@ msgstr ""
 #~ msgid "%(company_name)s: User's Company name"
 #~ msgstr "%(company_name): Nombre de la compañía del usuario"
 
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
 #~ msgid "%(partner_name)s: Partner Name"
 #~ msgstr "%(partner_name)s: Nombre de empresa"
 
@@ -1957,6 +1740,33 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "Mensaje"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s, \n"
+#~ "\n"
+#~ "A excepción de que fuese un error nuestro, parece que el siguiente importe "
+#~ "sigue impagado. Por favor, tome las medidas oportunas para realizar el pago "
+#~ "en los próximos 8 días.\n"
+#~ "\n"
+#~ "Si su pago ha sido realizado después de que este correo haya sido enviado, "
+#~ "por favor, ignore el mensaje. No dude en contactar con nuestro departamente "
+#~ "financiero en el (+32) .10.69.94.39.\n"
+#~ "\n"
+#~ "Cordiales saludos,\n"
+
 #~ msgid "Follow up Entries with period in current year"
 #~ msgstr "Asientos de seguimiento con el periodo en este año"
 
diff --git a/addons/account_followup/i18n/es_EC.po b/addons/account_followup/i18n/es_EC.po
index 4a11cd7a6bd..00141297169 100644
--- a/addons/account_followup/i18n/es_EC.po
+++ b/addons/account_followup/i18n/es_EC.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-09 21:09+0000\n"
 "Last-Translator: Edgar Alejandro <Unknown>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Asunto correo electrónico"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Empresas"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Fecha :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensaje impreso"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,43 +607,77 @@ msgstr "Fecha envío del seguimiento"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -683,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -700,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -727,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -749,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fecha vencimiento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -871,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -879,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1022,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1054,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1074,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Descripción"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1103,10 +967,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1129,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1192,6 +1062,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1212,94 +1087,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1322,9 +1109,9 @@ msgid "Total credit"
 msgstr "Total haber"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haber"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1336,6 +1123,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Ref. cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha vencimiento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1354,11 +1146,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1369,6 +1156,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/es_PY.po b/addons/account_followup/i18n/es_PY.po
index 215504d14fa..5962b9c23e5 100644
--- a/addons/account_followup/i18n/es_PY.po
+++ b/addons/account_followup/i18n/es_PY.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-03 10:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Asunto correo electrónico"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Empresas"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Fecha :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,42 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatorio facturas"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "No litigio"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -396,12 +399,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -435,8 +432,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -457,40 +454,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensaje impreso"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -505,7 +480,7 @@ msgstr "Empresa a recordar"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -515,7 +490,7 @@ msgid "Follow Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -526,11 +501,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -556,16 +530,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -582,7 +546,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -593,9 +557,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqueado"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -612,6 +578,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -630,43 +610,77 @@ msgstr "Fecha envío del seguimiento"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Estado contable del cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Recordatorio facturas"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -686,16 +700,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -703,6 +712,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -730,16 +748,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -752,112 +760,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Crédito"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fecha vencimiento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -874,7 +783,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -882,76 +791,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -979,24 +837,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Período"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1025,7 +895,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litigio"
 
@@ -1057,8 +926,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1077,14 +949,6 @@ msgstr ""
 msgid "Description"
 msgstr "Descripción"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1106,10 +970,8 @@ msgid "This Fiscal year"
 msgstr "Este ejercicio fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1132,15 +994,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1197,6 +1067,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1217,94 +1092,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1327,9 +1114,9 @@ msgid "Total credit"
 msgstr "Total Credito"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Crédito"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1341,6 +1128,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Ref. cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha vencimiento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1359,11 +1151,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1374,6 +1161,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1667,6 +1459,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Líneas de seguimiento"
 
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
 #~ msgid "%(company_currency)s: User's Company Currency"
 #~ msgstr "%(company_currency)s: Moneda de la compañía del usuario"
 
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index 200734e55b4..1dbaeb28ffc 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 16:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "E-kirja teema"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partnerid"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Kuupäev :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partnerid"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Prinditud sõnum"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kreedit"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Järjekord"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Kirjeldus"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,9 +1107,9 @@ msgid "Total credit"
 msgstr "Krediitsumma"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kreedit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Järjekord"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/fa.po b/addons/account_followup/i18n/fa.po
index ea13acffb49..e2b90e9e6b9 100644
--- a/addons/account_followup/i18n/fa.po
+++ b/addons/account_followup/i18n/fa.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,8 +239,18 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -281,8 +259,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,8 +555,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,14 +607,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -643,26 +653,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,33 +756,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr ""
+
+#. module: account_followup
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -792,162 +793,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,14 +834,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -992,7 +862,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,8 +1108,8 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_followup
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index bcefa035ed9..e91d25a8893 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Sähköpostin aihe"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Määrä"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Kumppanit"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Päiväys"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Kumppanit"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,42 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Laskumuistutus"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Ei perittävä"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Tulostettu viesti"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr "Muistutettava kumppani"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Muistutukset"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,9 +555,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Estetty"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,43 +606,77 @@ msgstr "Seurannan lähetyspäivä"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokumentti : Asiakkaan tiliote"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Laskumuistutus"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Yritykset"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,112 +756,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Luotto"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Eräpäivä"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -870,7 +779,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -878,76 +787,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,24 +833,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Viimeisin siirto"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenssi"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Jakso"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Oikeudenkäynti"
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr "Kuvaus"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr "Kuluva tilivuosi"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1193,6 +1063,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1213,94 +1088,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1323,9 +1110,9 @@ msgid "Total credit"
 msgstr "Kokonaisluotto"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Luotto"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenssi"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1337,6 +1124,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Asiakkaan viite"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Eräpäivä"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1355,11 +1147,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1370,6 +1157,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Estetty"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1454,6 +1246,9 @@ msgstr ""
 #~ msgid "Due"
 #~ msgstr "Erääntyy"
 
+#~ msgid "Companies"
+#~ msgstr "Yritykset"
+
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 6a36aaaf5c1..06930928bfc 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 09:17+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-13 04:43+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Grouper par"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Date de la prochaine action"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Sujet du courriel"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr "Corps du courriel"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr "Envoyer les relances"
 msgid "Amount"
 msgstr "Montant"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Aucun responsable"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "Action suivante"
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partenaires"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Date :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partenaires"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Une seule relance est autorisée par société"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Rappel de facture"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Non contentieux"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Sans responsable"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr "Relances manuelles"
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -395,12 +398,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Personne"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -434,8 +431,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -456,51 +453,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Cher %(partner_name)s,\n"
-"\n"
-"Sauf erreur ou omission de notre part, nous constatons que votre compte "
-"client présente à ce jour un solde débiteur.\n"
-"L’échéance étant dépassée, nous vous demandons de bien vouloir régulariser "
-"cette situation par retour de courrier. Dans le cas où votre règlement "
-"aurait été adressé entre temps, nous vous prions de ne pas tenir compte de "
-"la présente. \n"
-"Vous remerciant par avance, nous vous prions d'agréer,  l’expression de nos "
-"salutations distinguées.\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Imprimer le Message"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -515,7 +479,7 @@ msgstr "Partenaire à rappeler"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -525,7 +489,7 @@ msgid "Follow Ups"
 msgstr "Relances"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -536,11 +500,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -568,16 +531,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -594,7 +547,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -605,9 +558,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqué"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -624,6 +579,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -641,43 +610,77 @@ msgstr "Date d'envoi de la Relance"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Document : état de compte client"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Rappel de facture"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -697,16 +700,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -714,6 +712,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -741,16 +748,6 @@ msgstr "Total :"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Sociétés"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -763,112 +760,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Crédit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Date de Maturité"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -885,7 +783,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -893,76 +791,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -990,24 +837,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Dernier mouvement"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Période"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1036,7 +895,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litige"
 
@@ -1068,8 +926,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1088,14 +949,6 @@ msgstr "Inclure les écritures marquées comme litigieuses"
 msgid "Description"
 msgstr "Description"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1117,10 +970,8 @@ msgid "This Fiscal year"
 msgstr "Exercice comptable"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1143,15 +994,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1208,6 +1067,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1228,94 +1092,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1338,9 +1114,9 @@ msgid "Total credit"
 msgstr "Total crédit"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Crédit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1352,6 +1128,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Réf. Client"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Date de Maturité"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1370,11 +1151,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Tester l'impression"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1385,6 +1161,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqué"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1563,6 +1344,9 @@ msgstr ""
 #~ msgid "Select Partners"
 #~ msgstr "Sélectionner les partenaires"
 
+#~ msgid "Companies"
+#~ msgstr "Sociétés"
+
 #~ msgid "%(user_signature)s: User Name"
 #~ msgstr "%(user_signature)s: Nom d'utilisateur"
 
@@ -1859,6 +1643,32 @@ msgstr ""
 #~ msgid "Company must be the same for its related account and period."
 #~ msgstr "La société doit être la même pour son compte et la période liée."
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Cher %(partner_name)s,\n"
+#~ "\n"
+#~ "Sauf erreur ou omission de notre part, nous constatons que votre compte "
+#~ "client présente à ce jour un solde débiteur.\n"
+#~ "L’échéance étant dépassée, nous vous demandons de bien vouloir régulariser "
+#~ "cette situation par retour de courrier. Dans le cas où votre règlement "
+#~ "aurait été adressé entre temps, nous vous prions de ne pas tenir compte de "
+#~ "la présente. \n"
+#~ "Vous remerciant par avance, nous vous prions d'agréer,  l’expression de nos "
+#~ "salutations distinguées.\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
diff --git a/addons/account_followup/i18n/gl.po b/addons/account_followup/i18n/gl.po
index 41439dd6549..4a66e36bc81 100644
--- a/addons/account_followup/i18n/gl.po
+++ b/addons/account_followup/i18n/gl.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Asunto do correo electrónico"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Socio"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Socios"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Data:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Socios"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,42 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatorio facturas"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "No litixio"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -395,12 +398,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -434,8 +431,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -456,40 +453,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensaxe impresa"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -504,7 +479,7 @@ msgstr "Empresa a recordar"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -514,7 +489,7 @@ msgid "Follow Ups"
 msgstr "Seguimentos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -525,11 +500,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -555,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -581,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -592,9 +556,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqueado"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -611,6 +577,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -629,43 +609,77 @@ msgstr "Fecha envío do seguimento"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Estado contable do cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Recordatorio facturas"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -685,16 +699,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -702,6 +711,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -729,16 +747,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -751,112 +759,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Data vencemento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -873,7 +782,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -881,76 +790,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -978,24 +836,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movemento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Período"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1024,7 +894,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litixio"
 
@@ -1056,8 +925,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1076,14 +948,6 @@ msgstr ""
 msgid "Description"
 msgstr "Descrición"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1105,10 +969,8 @@ msgid "This Fiscal year"
 msgstr "Este exercicio fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1131,15 +993,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1196,6 +1066,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1216,94 +1091,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1326,9 +1113,9 @@ msgid "Total credit"
 msgstr "Total haber"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Haber"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1340,6 +1127,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Ref. cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Data vencemento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1358,11 +1150,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1373,6 +1160,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1639,6 +1431,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Liñas de seguimento"
 
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
 #~ msgid "Follow-Up lines"
 #~ msgstr "Liñas de seguimento"
 
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index d537cf5455a..27aea499245 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 21:11+0000\n"
 "Last-Translator: Velimir Valjetic <velimir.valjetic@procudo.hr>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr "Maksimalni nivo pratećih koraka"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Grupiraj po"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr "%(datum)s"
 msgid "Next Action Date"
 msgstr "Datum slijedeće akcije"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr "Označi kao izvršeno"
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Napraviti slijedeće korake"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Predmet email-a"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr "Prateći koraci"
 msgid "Email Body"
 msgstr "Sadržaj email-a"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Odgovorna osoba za ispravnost provedenih akcija"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Dospjeli iznos"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr "Pošalji prateće korake"
 msgid "Amount"
 msgstr "Iznos"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Nema odgovorne osobe"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "Slijedeća akcija"
 msgid ": Partner Name"
 msgstr ": Ime partnera"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partneri"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Datum :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Ja sam odgovoran"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partneri"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,58 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Dopušten je samo jedan prateći korak po organizaciji"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
-"\n"
-"Dragi %(ime partnera),\n"
-"\n"
-"Unatoč nekoliko podsjetnika, Vaš račun još nije podmiren.\n"
-"\n"
-"Ukoliko ne bude plaćeno u roku od 8 dana, bit će poduzeti pravni koaci u "
-"naplati duga bez daljne obavijesti.\n"
-"\n"
-"Vjerujem da takva radnja neće biti potrebna te su stoga detalji plaćanja "
-"napisani u nastavku.\n"
-"\n"
-"U slučaju bilo kakvih nejasnoća, slobodno kontaktirajte naš računovodstveni "
-"odjel.\n"
-"\n"
-"Srdačan pozdrav,\n"
-"            "
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Prilikom procesiranja, ispisat će pismo"
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Not Litigation"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Bez odgovorne osobe"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -357,6 +303,47 @@ msgstr "Ručni odabir pratećih koraka"
 msgid "%(partner_name)s"
 msgstr "%(Ime partnera)"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -409,12 +396,6 @@ msgstr "Prateći koraci plaćanja"
 msgid "Due Days"
 msgstr "Prekoračeni dani"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Nitko"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -448,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr "Pošalji potvrdu email-a"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -470,40 +451,18 @@ msgstr " Poslani email"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "Ispiši Prateći koraci % Pošalji email korisniku"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Ispisana Poruka"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -518,7 +477,7 @@ msgstr "Partner to Remind"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -528,7 +487,7 @@ msgid "Follow Ups"
 msgstr "IOS-i"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr "Email nije poslan zato što nije pronađena email adresa partnera."
@@ -539,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -571,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr "Pronađi partnera"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -597,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -608,9 +556,11 @@ msgid "or"
 msgstr "ili"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Blokiran"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -627,6 +577,20 @@ msgstr "Klikni kako bi označio da je radnja završena."
 msgid "Follow-Ups Analysis"
 msgstr "Analiza pratećih koraka."
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -643,43 +607,77 @@ msgstr "Datum slanja IOS-a"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Document : Customer account statement"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -699,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -716,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -743,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Organizacije"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -765,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Potražuje"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Maturity Date"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -887,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -895,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -992,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Zadnja transakcija"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Period"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1038,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Sporno"
 
@@ -1070,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1090,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1119,10 +967,8 @@ msgid "This Fiscal year"
 msgstr "This Fiscal year"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1145,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1210,6 +1064,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1230,94 +1089,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1340,9 +1111,9 @@ msgid "Total credit"
 msgstr "Ukupno potražuje"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Potražuje"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1354,6 +1125,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Poziv na broj"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Maturity Date"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1372,11 +1148,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1387,6 +1158,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blokiran"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1525,6 +1301,9 @@ msgstr ""
 #~ msgid "%(company_name)s: User's Company name"
 #~ msgstr "%(poduzeće_naziv)s: User's Company name"
 
+#~ msgid "Companies"
+#~ msgstr "Organizacije"
+
 #~ msgid "%(partner_name)s: Partner Name"
 #~ msgstr "%(partner_name)s: Partner Name"
 
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index 14ea0449f70..b5186cfa4a5 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "E-mail tárgya"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partnerek"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Dátum :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partnerek"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Fizetési emlékeztető"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Nem peresített"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Kinyomtatott üzenet"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr "Emlékeztetendő partner"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Fizetési emlékeztetők"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,9 +554,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Zárolt"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,43 +607,77 @@ msgstr "Fizetési emlékeztető küldés időpontja"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Bizonylat: vevő folyószámla kivonat"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Fizetési emlékeztető"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -683,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -700,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -727,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Vállalatok"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -749,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Követel"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Fizetési határidő"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -871,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -879,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Utolsó tétel"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sorszám"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Időszak"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1022,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Peresített"
 
@@ -1054,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1074,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Megjegyzés"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1103,10 +967,8 @@ msgid "This Fiscal year"
 msgstr "Tárgyév"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1129,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1194,6 +1064,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1214,94 +1089,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1324,9 +1111,9 @@ msgid "Total credit"
 msgstr "Követel összesen"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Követel"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1338,6 +1125,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Vevő hiv.:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fizetési határidő"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1356,11 +1148,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1371,6 +1158,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Zárolt"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1476,6 +1268,9 @@ msgstr ""
 #~ msgid "Send email confirmation"
 #~ msgstr "Visszaigazolás küldése e-mailben"
 
+#~ msgid "Companies"
+#~ msgstr "Vállalatok"
+
 #~ msgid "Followup Lines"
 #~ msgstr "Fizetési emlékeztető sorok"
 
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index 9752bd3f35b..1cd28ebf669 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 16:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,8 +238,18 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -280,8 +258,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr ""
+
+#. module: account_followup
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,14 +833,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -991,7 +861,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,8 +1107,8 @@ msgid "Total credit"
 msgstr "Total Kredit"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_followup
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 682ea089bc7..62189a10b64 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.po
@@ -6,32 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 22:31+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Azione Manuale"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "Il livello massimo di solleciti di pagamento"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Raggruppa per"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr "%(date)s"
 msgid "Next Action Date"
 msgstr "Data prossima azione"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Azione Manuale"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr "⇾ Marca come Fatto"
 msgid "Action To Do"
 msgstr "Azione Da Fare"
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Solleciti di pagamento da fare"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Oggetto Email"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr "Passi Solleciti di Pagamento"
 msgid "Email Body"
 msgstr "Corpo Mail"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Responsabile verifica esecuzione attività."
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Importo scaduto"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr "Invio Solleciti di Pagamento"
 msgid "Amount"
 msgstr "Importo"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Nessun Responsabile"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "Prossima Azione"
 msgid ": Partner Name"
 msgstr ": Nome del Partner"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Data:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Io sono responsabile"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partners"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,58 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "E' permessa solo un sollecito di pagamento per azienda"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
-"\n"
-"Egregio %(partner_name)s,\n"
-"\n"
-"Nonostante vari promemoria, il Vs. debito risulta ancora impagato.\n"
-"\n"
-"A meno che il pagamento completo sia eseguito nei prossimi 8 giorni, "
-"verranno attivate le azioni legali opportune senza altro avviso.\n"
-"\n"
-"Nella speranza che tali azioni non siano necessarie, troverete in calce il "
-"saldo di quanto dovuto.\n"
-"\n"
-"Per ogni dettaglio in merito a quanto in oggetto, non esitate a contattare "
-"il ns. ufficio amministrativo al (+39).xxx.xxx.xxx.\n"
-"\n"
-"Cordiali saluti,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Promemoria fatture"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Se eseguito, verrà stampata una lettera"
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Non Contenzioso"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Senza responsabile"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -357,6 +303,47 @@ msgstr "Solleciti di Pagamento Manuali"
 msgid "%(partner_name)s"
 msgstr "%(partner_name)s"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -411,12 +398,6 @@ msgstr "Solleciti di Pagamento"
 msgid "Due Days"
 msgstr "Giorni di Ritardo"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Nessuno"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -450,9 +431,9 @@ msgid "Send Email Confirmation"
 msgstr "Invia Email di Conferma"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr "Stampa Pagamenti Scaduti"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "Voci Sollecito di Pagamento con periodo nell'anno corrente"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -472,52 +453,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "Stampa Sollecito di Pagamento e Invia Mail ai Clienti"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Egregio %(partner_name)s,\n"
-"\n"
-"Scusandoci in anticipo in caso di errore, sembra che i seguenti importi non "
-"siano stati pagati. Vi preghiamo cortesemente di verificare e, se corretto, "
-"di provvedere al pagamento entro 8 giorni.\n"
-"\n"
-"Nel caso il pagamento sia stato emesso nel frattempo, Vi preghiamo di "
-"ignorare questa comunicazione. Non esitate a contattare il ns. ufficio "
-"amministrativo al (+39).xxx.xxx.xxx.\n"
-"\n"
-"Cordiali saluti,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mesasggio stampato"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr "Ultimo Livello di Sollecito di Pagamento senza causa legale"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -532,8 +479,8 @@ msgstr "Partner da sollecitare"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
+msgid "Print Overdue Payments"
+msgstr "Stampa Pagamenti Scaduti"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -542,7 +489,7 @@ msgid "Follow Ups"
 msgstr "Solleciti di Pagamento"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -553,11 +500,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -585,16 +531,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -611,7 +547,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr "Invio Lettere e Email: Resoconto Azioni"
@@ -622,9 +558,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloccato"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -642,6 +580,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr "Analisi Solleciti di Pagamento"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -660,44 +612,78 @@ msgstr "Data Invio Sollecito di Pagamento"
 msgid "Follow-up Responsible"
 msgstr "Responsabile Gestione Crediti"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Rendiconto cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Promemoria fatture"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr "Livelli Sollecito di Pagamento"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr "Solleciti di Pagamento Previsti"
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "Voci Sollecito di Pagamento con periodo nell'anno corrente"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr ""
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -716,16 +702,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr "Report stampe pagamenti scaduti"
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -733,6 +714,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -760,16 +750,6 @@ msgstr "Totale:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Aziende"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -782,112 +762,13 @@ msgid "Send an Email"
 msgstr "Invia una Email"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Credito"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Data di scadenza"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -906,7 +787,7 @@ msgid "Latest Follow-up Date"
 msgstr "Ultima Data Sollecito di Pagamento"
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -914,76 +795,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -1011,24 +841,36 @@ msgstr "I Miei Solleciti di Pagamento"
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Ultimo movimento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Periodo"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1059,7 +901,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Contenzioso"
 
@@ -1091,8 +932,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1111,14 +955,6 @@ msgstr "Incluse le registrazioni marcate come contenzioso"
 msgid "Description"
 msgstr "Descrizione"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr "${user.company_id.name} Sollecito di Pagamento"
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1140,13 +976,9 @@ msgid "This Fiscal year"
 msgstr "Questo anno fiscale"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
-msgstr ""
-"Se non specificato dall'ultimo livello di sollecito di pagamento, verrà "
-"inviato dal livello di default di sollecito del modello di fatture scadute"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
+msgstr "Ultimo Livello di Sollecito di Pagamento senza causa legale"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1168,19 +1000,24 @@ msgid "Follow-up lines"
 msgstr "Righe Sollecito di Pagamento"
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
-"Questa azione invierà email di sollecito di pagamento, stamperà le lettere "
-"e\n"
-"                        imposterà le azioni manuali per i clienti."
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1236,6 +1073,11 @@ msgstr "Statistiche Sollecito di Pagamento per Partner"
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1256,94 +1098,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1366,9 +1120,9 @@ msgid "Total credit"
 msgstr "Totale crediti"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Credito"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1380,6 +1134,11 @@ msgstr "Solleciti di Pagamento Da Fare"
 msgid "Customer Ref :"
 msgstr "Rif. Cliente:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Data di scadenza"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1400,11 +1159,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Stampa di prova"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1415,6 +1169,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloccato"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1526,6 +1285,9 @@ msgstr "Promessa di Pagamento Cliente"
 #~ msgid "Follow-Ups"
 #~ msgstr "Follow up"
 
+#~ msgid "Companies"
+#~ msgstr "Aziende"
+
 #~ msgid "Company must be same for its related account and period."
 #~ msgstr ""
 #~ "L'azienda deve essere la stessa per il periodo ed il conto ad essa correlato."
@@ -1835,3 +1597,30 @@ msgstr "Promessa di Pagamento Cliente"
 #~ msgid "You can not create journal items on closed account."
 #~ msgstr ""
 #~ "Non è possibile creare registrazioni contabili su di un conto chiuso."
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Egregio %(partner_name)s,\n"
+#~ "\n"
+#~ "Scusandoci in anticipo in caso di errore, sembra che i seguenti importi non "
+#~ "siano stati pagati. Vi preghiamo cortesemente di verificare e, se corretto, "
+#~ "di provvedere al pagamento entro 8 giorni.\n"
+#~ "\n"
+#~ "Nel caso il pagamento sia stato emesso nel frattempo, Vi preghiamo di "
+#~ "ignorare questa comunicazione. Non esitate a contattare il ns. ufficio "
+#~ "amministrativo al (+39).xxx.xxx.xxx.\n"
+#~ "\n"
+#~ "Cordiali saluti,\n"
diff --git a/addons/account_followup/i18n/ja.po b/addons/account_followup/i18n/ja.po
index 66d39b6b700..a10bc00d378 100644
--- a/addons/account_followup/i18n/ja.po
+++ b/addons/account_followup/i18n/ja.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-09 02:19+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Eメール件名"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr "金額"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "パートナ"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "パートナ"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "日付 :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "パートナ"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,42 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "請求書の通知"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "告訴しない"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,50 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"%(partner_name)s 様、\n"
-"\n"
-"弊社の手違いであったかの知れませんが、どうやら、以下のお支払をいただいていないように思われます。どうぞ、8日間以内にこの支払のための適切な措置を講じて下さ"
-"るよう、お願いいたします。\n"
-"\n"
-"すでにお支払を済ませられたにもかかわらず、この通知がなされた場合には、この通知を無視して下さい。何かご不明な点がございましたら、弊社の会計部門 "
-"（+32）.10.68.94.39 にご連絡下さい。\n"
-"\n"
-"敬具\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "メッセージ印刷済"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +478,7 @@ msgstr "通知するパートナ"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -523,7 +488,7 @@ msgid "Follow Ups"
 msgstr "フォローアップ"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -534,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -564,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -590,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -601,9 +555,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "ブロック"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -620,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -636,43 +606,77 @@ msgstr "送信日のフォローアップ"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "ドキュメント：顧客口座取引明細書"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "請求書の通知"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -692,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -709,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -736,16 +744,6 @@ msgstr "合計："
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "会社"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -758,112 +756,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "貸方"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "満期日"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -880,7 +779,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -888,76 +787,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -985,24 +833,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "前回動作"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "順序"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "期間"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1031,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "訴訟"
 
@@ -1063,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1083,14 +945,6 @@ msgstr "訴訟としてマークされた仕訳帳エントリーを含みます
 msgid "Description"
 msgstr "説明"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1112,10 +966,8 @@ msgid "This Fiscal year"
 msgstr "今会計年度"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1138,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1201,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1221,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1331,9 +1108,9 @@ msgid "Total credit"
 msgstr "合計貸方"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "貸方"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "順序"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1345,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "顧客参照："
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "満期日"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1363,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "テストプリント"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1378,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "ブロック"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1489,6 +1271,31 @@ msgstr ""
 #~ "a multi-currency view on the journal."
 #~ msgstr "選択した仕訳のアカウントは第２の通貨の入力を要求しています。アカウントの第２通貨を削除するか、仕訳で多通貨ビューを選択して下さい。"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%(partner_name)s 様、\n"
+#~ "\n"
+#~ "弊社の手違いであったかの知れませんが、どうやら、以下のお支払をいただいていないように思われます。どうぞ、8日間以内にこの支払のための適切な措置を講じて下さ"
+#~ "るよう、お願いいたします。\n"
+#~ "\n"
+#~ "すでにお支払を済ませられたにもかかわらず、この通知がなされた場合には、この通知を無視して下さい。何かご不明な点がございましたら、弊社の会計部門 "
+#~ "（+32）.10.68.94.39 にご連絡下さい。\n"
+#~ "\n"
+#~ "敬具\n"
+
 #~ msgid "Partner Selection"
 #~ msgstr "パートナ選択"
 
@@ -1538,6 +1345,9 @@ msgstr ""
 #~ msgid "Followup Statistics by Partner"
 #~ msgstr "パートナ別の統計のフォローアップ"
 
+#~ msgid "Companies"
+#~ msgstr "会社"
+
 #~ msgid "%(user_signature)s: User Name"
 #~ msgstr "%(user_signature)s：ユーザ名"
 
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index 5aee3e2fc46..d766d133681 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:41+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "이메일 주제"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "파트너"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "파트너"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "날짜:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "파트너"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "인쇄된 메시지"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,8 +555,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,43 +606,77 @@ msgstr ""
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "문서: 고객 계정 문서"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,112 +756,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "대변"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "만기 날짜"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -870,7 +779,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -878,76 +787,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,24 +833,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "마지막 무브"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "시퀀스"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr "설명"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,9 +1108,9 @@ msgid "Total credit"
 msgstr "총 대변"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "대변"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "시퀀스"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "고객 참조:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "만기 날짜"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 307273f49d0..ac3ae0e8cf0 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partneriai"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partneriai"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kreditas"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Seka"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Aprašas"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,9 +1107,9 @@ msgid "Total credit"
 msgstr "Iš viso kredito"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kreditas"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Seka"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/mn.po b/addons/account_followup/i18n/mn.po
index 35bfc109d41..6e048674329 100644
--- a/addons/account_followup/i18n/mn.po
+++ b/addons/account_followup/i18n/mn.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-11 05:36+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Харилцагч"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Огноо"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Харилцагч"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,26 +269,10 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Үнийн нэхэмжлэл сануулах"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,8 +555,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,43 +606,77 @@ msgstr ""
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Баримт: Үйлчлүүлэгчийн дансны тодорхойлолт"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Үнийн нэхэмжлэл сануулах"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,33 +756,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Кредит"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -792,162 +793,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,24 +833,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Дугаарлалт"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr "Тайлбар"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,9 +1108,9 @@ msgid "Total credit"
 msgstr "Нийт кредит"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Кредит"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Дугаарлалт"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po
index 41c422ee213..3b629cc776b 100644
--- a/addons/account_followup/i18n/nb.po
+++ b/addons/account_followup/i18n/nb.po
@@ -7,32 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 15:35+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Manuell handling."
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "Maksimal oppfølging nivå."
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Grupper etter."
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr "%(Dato)s"
 msgid "Next Action Date"
 msgstr "Neste handling dato."
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Manuell handling."
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr "Merk som ferdig."
 msgid "Action To Do"
 msgstr "Handling å gjøre."
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Oppfølginger å gjøre."
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,25 +91,9 @@ msgid "Email Subject"
 msgstr "E-post Emne"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
+msgstr "%(Bruker_signatur)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -205,16 +110,6 @@ msgstr "Oppfølging trinn."
 msgid "Email Body"
 msgstr "E-post kropp."
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Ansvarlig for å sørge for at handlingen skjer."
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Forfalte beløpet."
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr "Send oppfølgninger."
 msgid "Amount"
 msgstr "Beløp"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Ingen ansvarlige."
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr "Neste handling."
 msgid ": Partner Name"
 msgstr ": Partner navn."
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr "Tildele en ansvarlig."
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partnere"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Dato :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Jeg er ansvarlig."
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partnere"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,42 +269,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Bare en oppfølgning per. firma er lov."
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Faktura påminnelse"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Ved behandling, vil den skrive ut et brev."
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Ikke Prosedyre"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Uten ansvar."
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr "Manuelle oppfølgninger."
 msgid "%(partner_name)s"
 msgstr "%(partner_navn)s"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr "Betaling oppfølgninger."
 msgid "Due Days"
 msgstr "Grunn dager."
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Ingen."
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,9 +430,9 @@ msgid "Send Email Confirmation"
 msgstr "Send e-post Bekreftelse."
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr "Skriv ut forsinket betaling."
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "Oppfølging oppføringer med perioden i inneværende år."
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -455,53 +452,19 @@ msgstr " E-post(er) sendt."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "Skriv ut oppfølging og send e-post til kundene."
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Kjære% (PARTNER_NAME) s,\n"
-"\n"
-"Unntak gjøres dersom det var en feil av oss, synes det som om følgende beløp "
-"forblir ubetalt. Vennligst ta nødvendige tiltak for å gjennomføre denne "
-"betalingen i de neste 8 dagene.\n"
-"\n"
-"Ville betalingen er gjennomført etter denne posten ble sendt, kan du se bort "
-"fra denne meldingen. Ikke nøl med å ta kontakt med vår regnskapsavdelingen "
-"på (+32) .10.68.94.39.\n"
-"\n"
-"Med vennlig hilsen,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Utskrevet Beskjed"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr "Siste Oppfølging nivå uten søksmål."
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
-msgstr "Partnere med kreditter."
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
+msgstr ""
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -515,9 +478,8 @@ msgstr "Partner til Påminnelse"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
-"Skriv ut forsinket betaling rapporterer uavhengig av oppfølging linje."
+msgid "Print Overdue Payments"
+msgstr "Skriv ut forsinket betaling."
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -526,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Oppfølginger"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr "E-posten er ikke send fordi e-postadressen partner ikke er fylt ut."
@@ -537,11 +499,10 @@ msgid "Account Follow-up"
 msgstr "Oppfølgings konto"
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -569,16 +530,6 @@ msgstr " Manuell handling(er) tilordnet:"
 msgid "Search Partner"
 msgstr "Søk partner."
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -595,7 +546,7 @@ msgid "Account Move line"
 msgstr "Konto Flytt linjen."
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr "Send brever og e-poster: Handling oppsummering."
@@ -606,9 +557,11 @@ msgid "or"
 msgstr "Eller."
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Blokkert"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -625,6 +578,21 @@ msgstr "Klikk for å markere handling som ferdig."
 msgid "Follow-Ups Analysis"
 msgstr "Oppfølgnings analyse."
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+"Skriv ut forsinket betaling rapporterer uavhengig av oppfølging linje."
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -643,44 +611,78 @@ msgstr "Oppfølgings sendedato"
 msgid "Follow-up Responsible"
 msgstr "Oppfølgning ansvarlig."
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument: Kundens kontoutskrift"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Faktura påminnelse"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr "Oppfølgnings nivåer."
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr "Fremtidige Oppfølgninger."
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "Oppfølging oppføringer med perioden i inneværende år."
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr ""
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -699,16 +701,11 @@ msgid "unknown"
 msgstr "Ukjent."
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr "Skrevet ut forfalte betalings rapporter."
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr "E-post maler."
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -718,6 +715,15 @@ msgstr ""
 "Ved behandling, vil det sette den manuelle tiltak som bør iverksettes for "
 "den kunden. "
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -745,16 +751,6 @@ msgstr "Totalt:"
 msgid "Email Template"
 msgstr "E-post mal."
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr "%(Bruker_signatur)s"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Firmaer"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -767,112 +763,13 @@ msgid "Send an Email"
 msgstr "Send en e-post."
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kredit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Forfallsdato"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -891,7 +788,7 @@ msgid "Latest Follow-up Date"
 msgstr "Siste Oppfølging Dato."
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -899,76 +796,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -996,24 +842,36 @@ msgstr "Mine oppfølgninger."
 msgid "%(company_name)s"
 msgstr "%(Firma_navn)s"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Siste bevegelse"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvens"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Periode"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr "% s partnere har ingen kreditter og slik at handlingen er fjernet."
@@ -1044,7 +902,6 @@ msgstr "Lukk."
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Prosedyre"
 
@@ -1076,9 +933,12 @@ msgid ": Current Date"
 msgstr ": Nåværende dato."
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
-msgstr "Totalbeløpet."
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
+msgstr ""
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
@@ -1096,14 +956,6 @@ msgstr "Inkludert posteringer merket som en rettssak"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr "$ {Bruker.Firma_ID.navn} Betaling Oppfølging"
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1125,13 +977,9 @@ msgid "This Fiscal year"
 msgstr "Dette Regnskapsåret"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
-msgstr ""
-"Hvis det ikke spesifisert av den siste oppfølging nivåen, vil den sende fra "
-"standard oppfølging av forfalte fakturaer maler."
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
+msgstr "Siste Oppfølging nivå uten søksmål."
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1157,18 +1005,24 @@ msgid "Follow-up lines"
 msgstr "Oppfølging linjer."
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr "Tildele en ansvarlig."
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
-"Denne handlingen vil sende oppfølging e-postmeldinger, skriv ut brevene og\n"
-"sett en manuell handling per. kunder."
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1224,6 +1078,11 @@ msgstr "Oppfølging statistikk av partner."
 msgid " letter(s) in report"
 msgstr " Brev(er) i rapport."
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1244,94 +1103,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1354,9 +1125,9 @@ msgid "Total credit"
 msgstr "Total kredit"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kredit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1368,6 +1139,11 @@ msgstr "Oppfølgninger å gjøre."
 msgid "Customer Ref :"
 msgstr "Kunde ref:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Forfallsdato"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1386,11 +1162,6 @@ msgstr "Siste dato som oppfølging nivå av partner ble endret."
 msgid "Test Print"
 msgstr "Prøv Skriv ut"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1401,6 +1172,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blokkert"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1577,6 +1353,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Oppfølgingslinjer"
 
+#~ msgid "Companies"
+#~ msgstr "Firmaer"
+
 #~ msgid "Follow-Up lines"
 #~ msgstr "Oppfølgings linjer"
 
@@ -1625,6 +1404,33 @@ msgstr ""
 #~ msgid "Followup Summary"
 #~ msgstr "Oppfølging Oppsummering"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kjære% (PARTNER_NAME) s,\n"
+#~ "\n"
+#~ "Unntak gjøres dersom det var en feil av oss, synes det som om følgende beløp "
+#~ "forblir ubetalt. Vennligst ta nødvendige tiltak for å gjennomføre denne "
+#~ "betalingen i de neste 8 dagene.\n"
+#~ "\n"
+#~ "Ville betalingen er gjennomført etter denne posten ble sendt, kan du se bort "
+#~ "fra denne meldingen. Ikke nøl med å ta kontakt med vår regnskapsavdelingen "
+#~ "på (+32) .10.68.94.39.\n"
+#~ "\n"
+#~ "Med vennlig hilsen,\n"
+
 #~ msgid "%(heading)s: Move line header"
 #~ msgstr "% (posisjon) s: Flytt linje til topptekst"
 
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index c7cdc088578..288bc7d431a 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -6,32 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 18:16+0000\n"
 "Last-Translator: Harjan Talen <harjantalen@gmail.com>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Handmatige actie"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "Het maximale herinneringsniveau"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Groeperen op"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr "%(date)s"
 msgid "Next Action Date"
 msgstr "Volgende actiedatum"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Handmatige actie"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr "⇾ Markeer als gereed"
 msgid "Action To Do"
 msgstr "Actie Te doen"
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Betalingsherinneringen nog te doen"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,25 +90,9 @@ msgid "Email Subject"
 msgstr "E-mail onderwerp"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -204,16 +109,6 @@ msgstr "Betalingsherinneringen stappen"
 msgid "Email Body"
 msgstr "Email bericht"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Verantwoordelijke die ervoor zorgt dat de actie gebeurt."
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Vervallen bedrag"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr "Verstuur Betalingsherinneringen"
 msgid "Amount"
 msgstr "Bedrag"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "Volgende actie"
 msgid ": Partner Name"
 msgstr ": Relatie naam"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr "Wijs een verantwoordelijke toe"
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Relaties"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Datum :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Ik ben verantwoordelijk"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Relaties"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,57 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Per bedrijf is één betalingsherinnering mogelijk"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
-"\n"
-"Geachte %(partner_name)s,\n"
-"\n"
-"Ondanks herhaaldelijk verzoek is onze vordering nog niet voldaan.\n"
-"\n"
-"Wanneer de volledige betaling niet binnen 8 dagen wordt voldaan zijn wij "
-"genoodzaakt verdere stappen te ondernemen zonder vermelding vooraf.\n"
-"\n"
-"Wij gaan er vanuit dat dit echter niet noodzakelijk zal zijn. Onderstaand "
-"een overzicht van de openstaande posten.\n"
-"\n"
-"Wanneer u vragen op opmerkingen hierover heeft dan horen wij dat graag.\n"
-"\n"
-"Met vriendelijke groet,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Betalingsherinnering"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Bij verwerken wordt een brieg gemaakt"
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Geen geschil"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Zonder verantwoordelijke"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -356,6 +303,47 @@ msgstr "Handmatige herinnneringen"
 msgid "%(partner_name)s"
 msgstr "%(partner_name)s"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -409,12 +397,6 @@ msgstr "Betalingsherinnneringen"
 msgid "Due Days"
 msgstr "Vervallen dagen"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Niemand"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -448,9 +430,9 @@ msgid "Send Email Confirmation"
 msgstr "Stuur e-mail bevestiging"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr "Vervallen betalingen afdrukken"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "Betalingsherinneringen met refels in het huidige jaar"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -470,53 +452,19 @@ msgstr " e-mail(s) verstuurd"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "Betalingsherinneringen afdrukken & E-mails naar klanten versturen"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Beste %(partner_name)s,\n"
-"\n"
-"Onder voorbehoud van fouten van onze zijde, lijkt het erop dat het volgende "
-"bedrag onbetaald blijft. Neemt u alstublieft, passende maatregelen voor het "
-"uitvoeren van deze betaling in de komende 8 dagen.\n"
-"\n"
-"Indien uw betaling is uitgevoerd nadat deze e-mail is verzonden, dan kunt u "
-"dit bericht negeren. Aarzel niet contact op te nemen met onze administratie "
-"op [TEL. NUMMER]\n"
-"\n"
-"Met vriendelijke groet,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Afgedrukt bericht"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr "Laatste herinnering voor het incasso-traject."
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
-msgstr "Relaties met openstaande facturen"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
+msgstr ""
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -530,9 +478,8 @@ msgstr "Relatie voor betalingsherinnering"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
-"Druk overzicht openstaande posten af ongeacht status betalingsherinneringen."
+msgid "Print Overdue Payments"
+msgstr "Vervallen betalingen afdrukken"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -541,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Betalingsherinneringen"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -554,11 +501,10 @@ msgid "Account Follow-up"
 msgstr "Betalingsherinneringen"
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -586,16 +532,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr "Zoek relatie"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -612,7 +548,7 @@ msgid "Account Move line"
 msgstr "Journaalpostregel"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -623,9 +559,11 @@ msgid "or"
 msgstr "of"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Geblokkeerd"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -642,6 +580,21 @@ msgstr "Klik om de actie als gereed te kenmerken"
 msgid "Follow-Ups Analysis"
 msgstr "Betalingsherinneringanalyse"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+"Druk overzicht openstaande posten af ongeacht status betalingsherinneringen."
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -660,44 +613,78 @@ msgstr "Verzenddatum betalingsherinnering"
 msgid "Follow-up Responsible"
 msgstr "Betalingsherinnering verantwoordelijke"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Document: Rekeningoverzicht klant"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Betalingsherinnering"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr "Betalingsherinnering niveau's"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr "Toekomstige betalingsherinneringen"
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "Betalingsherinneringen met refels in het huidige jaar"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr ""
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -716,16 +703,11 @@ msgid "unknown"
 msgstr "onbekend"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr "Druk het rapport achterstallige betalingen af"
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr "Email-sjablonen"
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -733,6 +715,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -762,16 +753,6 @@ msgstr "Totaal:"
 msgid "Email Template"
 msgstr "Email sjabloon"
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr "%(user_signature)s"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Bedrijven"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -784,112 +765,13 @@ msgid "Send an Email"
 msgstr "Verstuur een e-mail"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Credit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Vervaldatum"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -906,7 +788,7 @@ msgid "Latest Follow-up Date"
 msgstr "Laaste betalingsherinnering datum"
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -914,76 +796,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -1011,24 +842,36 @@ msgstr "Mijn betalingsherinneringen"
 msgid "%(company_name)s"
 msgstr "%(company_name)s"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Laatste boeking"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Volgnummer"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Periode"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1057,7 +900,6 @@ msgstr "Afsluiten"
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Betwist"
 
@@ -1089,9 +931,12 @@ msgid ": Current Date"
 msgstr ": Huidige datum"
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
-msgstr "Totaal vervallen bedrag"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
+msgstr ""
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
@@ -1109,14 +954,6 @@ msgstr "Inclusief journaalposten gemarkeerd als een geschil"
 msgid "Description"
 msgstr "Omschrijving"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1138,11 +975,9 @@ msgid "This Fiscal year"
 msgstr "Dit fiscale jaar"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
-msgstr ""
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
+msgstr "Laatste herinnering voor het incasso-traject."
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1168,15 +1003,23 @@ msgid "Follow-up lines"
 msgstr "Betalingsherinneringregels"
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr "Wijs een verantwoordelijke toe"
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1233,6 +1076,11 @@ msgstr "Betalingsherinnering analyses per relatie"
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1253,94 +1101,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1363,9 +1123,9 @@ msgid "Total credit"
 msgstr "Totaal credit"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Volgnummer"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1377,6 +1137,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Referentie klant:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Vervaldatum"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1395,11 +1160,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Test afdruk"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1410,6 +1170,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Geblokkeerd"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1825,6 +1590,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Aanmaningsregels"
 
+#~ msgid "Companies"
+#~ msgstr "Bedrijven"
+
 #~ msgid "Payable Items"
 #~ msgstr "Achterstallige posten"
 
@@ -2079,6 +1847,33 @@ msgstr ""
 #~ "\n"
 #~ "Met vriendelijke groet,\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Beste %(partner_name)s,\n"
+#~ "\n"
+#~ "Onder voorbehoud van fouten van onze zijde, lijkt het erop dat het volgende "
+#~ "bedrag onbetaald blijft. Neemt u alstublieft, passende maatregelen voor het "
+#~ "uitvoeren van deze betaling in de komende 8 dagen.\n"
+#~ "\n"
+#~ "Indien uw betaling is uitgevoerd nadat deze e-mail is verzonden, dan kunt u "
+#~ "dit bericht negeren. Aarzel niet contact op te nemen met onze administratie "
+#~ "op [TEL. NUMMER]\n"
+#~ "\n"
+#~ "Met vriendelijke groet,\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 5c16879a59d..8327d6b1f49 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-17 09:57+0000\n"
 "Last-Translator: Niels Huylebroeck <Unknown>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "E-mail onderwerp"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Relaties"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Datum :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Relaties"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,26 +268,10 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Facturen aanmaning"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Afgedrukt bericht"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr "Relatie voor aanmaning"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Aanmaningen"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,9 +554,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Geblokkeerd"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -628,15 +608,45 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Facturen aanmaning"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr ""
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
@@ -644,26 +654,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -683,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -700,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -727,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Bedrijven"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -749,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Krediet"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Vervaldatum"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -871,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -879,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -977,14 +835,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -993,7 +863,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1022,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1054,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1074,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Omschrijving"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1103,10 +967,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1129,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1192,6 +1062,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1212,94 +1087,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1322,9 +1109,9 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Krediet"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1336,6 +1123,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Vervaldatum"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1354,11 +1146,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1369,6 +1156,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Geblokkeerd"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1668,6 +1460,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Aanmaningsregels"
 
+#~ msgid "Companies"
+#~ msgstr "Bedrijven"
+
 #~ msgid "%(company_currency)s: User's Company Currency"
 #~ msgstr "%(company_currency)s: Bedrijfsvaluta gebruiker"
 
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
index 544e01b40cc..ee48a6d0217 100644
--- a/addons/account_followup/i18n/oc.po
+++ b/addons/account_followup/i18n/oc.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:37+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,8 +239,18 @@ msgid "Partner"
 msgstr "Partenari"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -281,8 +259,8 @@ msgid "Date :"
 msgstr "Data :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,8 +555,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,14 +607,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -643,26 +653,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,33 +756,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -792,162 +793,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,24 +833,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sequéncia"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr "Descripcion"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,9 +1108,9 @@ msgid "Total credit"
 msgstr "Credit total"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index 133b9f98e30..9baf1f700af 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 17:49+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-13 04:43+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Grupuj wg"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Data następnej akcji"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr "⇾ Zaznacz jako wykonane"
 msgid "Action To Do"
 msgstr "Akcja do wykonania"
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Temat wiadomości"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Kwota"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "Następna akcja"
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partnerzy"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Data :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partnerzy"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Wydrukowana wiadomość"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Windykacje"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -625,43 +605,77 @@ msgstr "Data wysłania wezwań"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument : Zestawienie konta klienta"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,112 +755,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Ma"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Termin płatności"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -869,7 +778,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -877,76 +786,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Ostatnia zmiana"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Numeracja"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,9 +1107,9 @@ msgid "Total credit"
 msgstr "Suma Ma"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Ma"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Odn. klienta"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Termin płatności"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 4e42360c488..8299d3fe383 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -6,32 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 17:18+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Ação manual"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Agrupar por"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Ação manual"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Assunto do E-mail"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr "Corpo da mensagem"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Montante"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "Próxima ação"
 msgid ": Partner Name"
 msgstr ": Nome do parceiro"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Parceiros"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Data :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Parceiros"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Lembrete de faturas"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Sem Litígio"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Ninguém"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,52 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Caro %(partner_name)s,\n"
-"\n"
-"Exceção feita se houver um erro nosso, parece que a seguinte montante "
-"continua por pagar. Por favor, tome as medidas adequadas a fim de realizar "
-"este pagamento nos próximos 8 dias.\n"
-"\n"
-"Se o pagamento já tiver sido realizado e só depois recebeu este e-mail, por "
-"favor, ignore esta mensagem. Não hesite em contactar o nosso departamento de "
-"contabilidade no (+32) .10.68.94.39.\n"
-"\n"
-"Atenciosamente,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensagem Impressa"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -515,7 +478,7 @@ msgstr "Parceiro a lembrar"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -525,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Seguimentos"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -536,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -568,16 +530,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr "Procurar parceiro"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -594,7 +546,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -605,9 +557,11 @@ msgid "or"
 msgstr "ou"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqueado"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -624,6 +578,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -642,43 +610,77 @@ msgstr "Seguimento da Data de Envio"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Extrato da conta do cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Lembrete de faturas"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -698,16 +700,11 @@ msgid "unknown"
 msgstr "desconhecido"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr "Modelos de mensagens"
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -715,6 +712,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -742,16 +748,6 @@ msgstr "Total:"
 msgid "Email Template"
 msgstr "Modelo de mensagem"
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -764,112 +760,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Crédito"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Data de vencimento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -886,7 +783,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -894,76 +791,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -991,24 +837,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimento"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Período"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1037,7 +895,6 @@ msgstr "Fechar"
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litígio"
 
@@ -1069,8 +926,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1089,14 +949,6 @@ msgstr "Incluindo entradas diárias marcadas como litígio"
 msgid "Description"
 msgstr "Descrição"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1118,10 +970,8 @@ msgid "This Fiscal year"
 msgstr "Neste ano Fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1144,15 +994,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1209,6 +1067,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1229,94 +1092,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1339,9 +1114,9 @@ msgid "Total credit"
 msgstr "Crédito Total"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Crédito"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1353,6 +1128,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Referência do Cliente:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Data de vencimento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1371,11 +1151,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Teste Impressão"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1386,6 +1161,11 @@ msgstr ": Nome do utilizador"
 msgid "Accounting"
 msgstr "Contabilidade"
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1870,6 +1650,9 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Erro! Não pode criar empresas recursivas"
 
+#~ msgid "Companies"
+#~ msgstr "Empresas"
+
 #~ msgid "Followup Lines"
 #~ msgstr "Linhas de Acompanhamento"
 
@@ -1978,6 +1761,33 @@ msgstr ""
 #~ msgid "The company name must be unique !"
 #~ msgstr "O nome da empresa deve ser único!"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Caro %(partner_name)s,\n"
+#~ "\n"
+#~ "Exceção feita se houver um erro nosso, parece que a seguinte montante "
+#~ "continua por pagar. Por favor, tome as medidas adequadas a fim de realizar "
+#~ "este pagamento nos próximos 8 dias.\n"
+#~ "\n"
+#~ "Se o pagamento já tiver sido realizado e só depois recebeu este e-mail, por "
+#~ "favor, ignore esta mensagem. Não hesite em contactar o nosso departamento de "
+#~ "contabilidade no (+32) .10.68.94.39.\n"
+#~ "\n"
+#~ "Atenciosamente,\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index 38876283593..17c2f31cd80 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -6,33 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-18 17:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 00:49+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "Ação Manual"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr "${user.company_id.name} Lembrete de Pagamento"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "Nível máximo de acompanhamento de cobrança"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "Agrupar por"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr "%(date)s"
 msgid "Next Action Date"
 msgstr "Data da Próxima Ação"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "Ação Manual"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,159 +72,6 @@ msgstr "⇾ Marcar como Concluído"
 msgid "Action To Do"
 msgstr "Ação a ser feita"
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Prezado ${object.name},</p>\n"
-"    <p>\n"
-"    Consta em nossos registros que o seguinte valor permanece sem aberto. "
-"Por favor providencie o pagamento o mais breve possível.\n"
-"\n"
-"Se o pagamento já foi efetuado, desconsidere essa mensagem. \n"
-"Qualquer dúvida entre em contato com nosso departamento financeiro por "
-"telefone.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Atenciosamente,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Data da Fatura</td>\n"
-"            <td>Referencia</td>\n"
-"            <td>Data de Vencimento</td>\n"
-"            <td>Valor (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Valor em aberto: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr "Cobranças a serem feitas"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -241,41 +91,9 @@ msgid "Email Subject"
 msgstr "Assunto do E-mail"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
-"\n"
-"Prezado %(partner_name)s,\n"
-"\n"
-"Apesar de vários avisos, ainda não detectamos o pagamento de sua fatura.\n"
-"\n"
-"A menos que o pagamento total seja efetuado nos próximos 8 dias, acões "
-"legais poderão ser tomadas sem outros avisos.\n"
-"\n"
-"Temos certeza de que essas ações não serão necessárias, evite o protesto de "
-"seu titulo, os detalhes do pagamento em aberto encontram-se abaixo.\n"
-"\n"
-"Em caso de dúvidas referente a esta questão, entre em contato com nosso "
-"Departamento Financeiro.\n"
-"\n"
-"Atenciosamente,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -292,16 +110,6 @@ msgstr "Passos da Cobrança"
 msgid "Email Body"
 msgstr "Corpo do Email"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "Responsável para garantir que a ação aconteça"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "Valor em Atraso"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -312,11 +120,81 @@ msgstr "Enviar Cobranças"
 msgid "Amount"
 msgstr "Valor"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+"Esta é a próxima ação a ser tomada. Ela será definida automaticamente quando "
+"o parceiro recebe um nível de acompanhamento que requer uma ação manual. "
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr "Nenhum Responsável"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -337,6 +215,11 @@ msgstr "Próxima Ação"
 msgid ": Partner Name"
 msgstr ": Nome do Parceiro"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr "Associar a um Responsável"
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -358,9 +241,32 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Parceiros"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
+"Para lembrar os clientes de pagar as suas faturas, você pode\n"
+"                         definir ações diferentes, dependendo de quanto "
+"tempo\n"
+"                         o cliente está em atraso. Essas ações são "
+"agrupadas\n"
+"                         em níveis de acompanhamento que são acionados "
+"quando a \n"
+"                         data de vencimento de uma fatura já está em atraso "
+"um certo\n"
+"                         número de dias. Se houver outras faturas vencidas "
+"para o\n"
+"                         mesmo cliente, a ação da fatura mais antiga será "
+"executada."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -368,9 +274,9 @@ msgid "Date :"
 msgstr "Data :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr "Eu sou o reponsável"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Parceiros"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -378,58 +284,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr "Apenas uma cobrança por empresa é permitida"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
-"\n"
-"Prezado %(partner_name)s,\n"
-"\n"
-"Apesar de vários avisos, ainda não detectamos o pagamento de sua fatura.\n"
-"\n"
-"Efetue o pagamento nos próximos dias, evitando assim o protesto de sua "
-"fatura, caso contrário o protesto poderá ocorrer sem outros avisos.\n"
-"\n"
-"Temos certeza de que essas ações não serão necessárias os detalhes dos "
-"pagamentos em atraso encontram-se abaixo.\n"
-"\n"
-"Em caso de dúvidas referente a esta questão, entre em contato com nosso "
-"departamento financeiro.\n"
-"\n"
-"Atenciosamente,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Lembrete de Faturas"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr "Quando processado, irá imprimir uma carta"
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr "Maior Atraso"
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Sem Litígio"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr "Sem responsável"
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -445,6 +319,47 @@ msgstr "Cobranças manuais"
 msgid "%(partner_name)s"
 msgstr "%(partner_name)s"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -497,12 +412,6 @@ msgstr "Acompanhamento dos Pagamentos"
 msgid "Due Days"
 msgstr "Dias em Atraso"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr "Ninguém"
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -536,9 +445,9 @@ msgid "Send Email Confirmation"
 msgstr "Enviar Email de Confirmação"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr "Imprimir Pagamentos em Atraso"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "Cobranças com prazo neste ano"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -558,53 +467,19 @@ msgstr " email(s) enviados"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "Imprimir Cobranças & Enviar email a Clientes"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Prezado %(partner_name)s,\n"
-"\n"
-"Não detectamos o pagamento de sua fatura, por favor tome as medidas "
-"necessárias para efetuar o pagamento nos próximos 8 dias.\n"
-"\n"
-"Se tiver algum problema com a fatura ou o pagamento não deixe de entrar em "
-"contato com nosso departamento financeiro.\n"
-"\n"
-"Se o pagamento já foi feito, por favor desconsidere essa mensagem.\n"
-"\n"
-"Atenciosamente,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mensagem Impressa"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr "Último nível de Cobrança sem processo"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
-msgstr "Parceiros com Créditos"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
+msgstr "Qualquer um"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -618,8 +493,8 @@ msgstr "Parceiros para Lembrete"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
-msgstr "Imprimir pagamentos em atraso independente da linha de cobrança"
+msgid "Print Overdue Payments"
+msgstr "Imprimir Pagamentos em Atraso"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -628,7 +503,7 @@ msgid "Follow Ups"
 msgstr "Cobranças"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr "Email não enviado, por que o email do parceiro não está preenchido"
@@ -639,15 +514,13 @@ msgid "Account Follow-up"
 msgstr "Acompanhamento de Contas"
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
-"Isto é para quando uma cobrança ainda for necessária. A data será definida "
-"como a data atual, se os campos de ação estão vazios e o parceiro recebe um "
-"nível de cobrança que requer uma ação manual. "
+"Opcionalmente você pode definir um usuário neste campo, que o fará "
+"responsável pela ação."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
@@ -674,19 +547,6 @@ msgstr " Ação manual atribuída:"
 msgid "Search Partner"
 msgstr "Buscar Parceiro"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-"Segue o histórico de todas as transações desde cliente.\n"
-"                            Você pode definir uma Fatura em protesto\n"
-"                            Para não incluir na próxima cobrança."
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -703,7 +563,7 @@ msgid "Account Move line"
 msgstr "Linha de Movimentação"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr "Envio de Cartas e Emails: Resumo das Ações"
@@ -714,9 +574,13 @@ msgid "or"
 msgstr "ou"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bloqueado"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
+"Se não for especificado pelo o último nível de cobrança, será enviado pelo "
+"modelo padrão de email"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -733,6 +597,24 @@ msgstr "Clique para marcar como feito"
 msgid "Follow-Ups Analysis"
 msgstr "Análise de Cobranças"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+"Isto é para quando um acompanhamento manual é necessário. A data será "
+"definida para a data atual, quando o parceiro recebe um nível de cobrança "
+"que requer uma ação manual. Pode ser prático para definir manualmente para "
+"por exemplo ver se ele cumpre o combinado."
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr "Imprimir pagamentos em atraso independente da linha de cobrança"
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -750,51 +632,78 @@ msgstr "Data para o Envio da Cobrança"
 msgid "Follow-up Responsible"
 msgstr "Responsável pela Cobrança"
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Documento: Demonstrativo de conta do cliente"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Lembrete de Faturas"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr "Níveis de Cobrança"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr "Cobranças Futuras"
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
-"Para lembrar os clientes de pagar as suas faturas, você pode\n"
-"                         definir ações diferentes, dependendo do tempo "
-"atraso\n"
-"                         do cliente. Essas ações agrupadas em níveis de "
-"cobrança\n"
-"                         que são acionadas quando o atraso é superior a um "
-"período."
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "Cobranças com prazo neste ano"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr "Valor Devido"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -813,16 +722,11 @@ msgid "unknown"
 msgstr "Desconhecido"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr "Relatórios de pagamentos em atraso impresso"
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr "Modelos de Email"
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -832,6 +736,20 @@ msgstr ""
 "Quando executado, irá definir uma ação manual a ser tomada para este "
 "cliente. "
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+"Abaixo está o histórico das operações desse\n"
+"                             cliente. Você pode verificar \"Não Acompanhar\" "
+"\n"
+"                             a fim de excluí-la das próximos ações de "
+"cobrança."
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -860,16 +778,6 @@ msgstr "Total:"
 msgid "Email Template"
 msgstr "Modelo de Email"
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr "%(user_signature)s"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -882,206 +790,14 @@ msgid "Send an Email"
 msgstr "Enviar um Email"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
-"\n"
-"Prezado %(partner_name)s,\n"
-"\n"
-"Estamos desapontados em ver que apesar de enviarmos um lembrete, sua conta "
-"agora está seriamente atrasada.\n"
-"\n"
-"É essencial que o pagamento imediato seja feito, caso contrário iremos "
-"suspender sua conta e você não receberá mais nenhum produto ou serviço.\n"
-"Por favor tome as medidas apropriadas para regularizar esse pagamento nos "
-"próximos dias.\n"
-"\n"
-"Se tiver alguma dúvida ou problema para efetuar o pagamento desta fatura que "
-"não estejamos cientes, entre em contato com nosso departamento financeiro, "
-"para que possamos resolver essa questão o mais breve possível.\n"
-"\n"
-"Detalhes dos pagamentos em atraso estão impressos abaixo.\n"
-"\n"
-"Atenciosamente,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Crédito"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Data de Vencimento"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Prezado ${object.name},</p>\n"
-"    <p>\n"
-"    Nosso controle de pagamentos acusa, em sua conta, prestação vencida, "
-"motivo pelo qual pedimos a V. Sa. sua imediata regularização.\n"
-"Tendo em vista que a emissão deste aviso é automática, caso V. Sa. já tenha "
-"efetuado o pagamento, solicitamos desconsiderá-lo.\n"
-"    Caso tenha alguma dúvida não deixe de entrar em contato com nosso "
-"departamento financeiro.\n"
-"    </p>\n"
-"<br/>\n"
-"Atenciosamente,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Data da Fatura</td>\n"
-"            <td>Referencia</td>\n"
-"            <td>Data de Vencimento</td>\n"
-"            <td>Valor (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Valor devido: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr "Valor em Atraso"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -1099,7 +815,7 @@ msgid "Latest Follow-up Date"
 msgstr "Última Data de Cobrança"
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -1107,158 +823,28 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Prezado ${object.name},</p>\n"
-"   <p>\n"
-"   Apesar das mensagens enviadas referenes ao seu pagamento, sua conta está "
-"ccom um atraso sério.\n"
-"É essencial que o pagamento imediato das faturas em aberto seja feito, caso "
-"contrário seremos obrigados\n"
-"a colocar uma restrição em sua conta e enviar sua fatura para o departamento "
-"jurídico\n"
-"o que significa que não iremos mais fornecer sua empresa com produtos ou "
-"serviços.\n"
-"Por favor tome as medidas necessárias para a regularização do pagamento o "
-"mais breve possível.\n"
-"Se houver algum problema referente a este pagamento, não deixe de entrar em "
-"contato com nosso departamento financeiro.\n"
-"Os detalhes do pagamento em atraso estão abaixo.\n"
-" </p>\n"
-"<br/>\n"
-"Atenciosamente,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Data da Fatura</td>\n"
-"            <td>Referencia</td>\n"
-"            <td>Data de Vencimento</td>\n"
-"            <td>Valor (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Valor devido: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -1283,24 +869,36 @@ msgstr "Minhas Cobranças"
 msgid "%(company_name)s"
 msgstr "%(company_name)s"
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Última movimentação"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Período"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr "%s parceiros não possuem créditos e essa ação foi desmarcada"
@@ -1329,7 +927,6 @@ msgstr "Fechar"
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litígio"
 
@@ -1361,9 +958,15 @@ msgid ": Current Date"
 msgstr ": Data Atual"
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
-msgstr "Valor total em aberto"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
+msgstr ""
+"Esta ação irá enviar e-mails de cobrança, imprimir cartas e\n"
+"                         definir as ações manuais, por cliente, de acordo "
+"com os níveis de cobrança definidos."
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
@@ -1381,14 +984,6 @@ msgstr "Incluindo os itens de diário marcados como em protesto"
 msgid "Description"
 msgstr "Descrição"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr "${user.company_id.name} Cobrança de Pagamento"
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1410,13 +1005,9 @@ msgid "This Fiscal year"
 msgstr "Este Ano Fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
-msgstr ""
-"Se não for especificado pelo último nível de cobrança, será enviado o modelo "
-"padrão de cobrança"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
+msgstr "Último nível de Cobrança sem processo"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1442,19 +1033,24 @@ msgid "Follow-up lines"
 msgstr "Linhas de Cobrança"
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr "Associar a um Responsável"
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
-"Esta ação irá enviar emails de cobrança, imprimir cartas e\n"
-"                                                                             "
-"                      definir ação manual por clientes."
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1517,6 +1113,11 @@ msgstr "Estatísticas de Cobrança por Parceiro"
 msgid " letter(s) in report"
 msgstr " cartas no relatório"
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr "Parceiros com Créditos Vencidos"
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1548,171 +1149,6 @@ msgstr ""
 "              </p>\n"
 "          "
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Prezado ${object.name},</p>\n"
-"    <p>\n"
-"    Apesar de inúmeras mensagens, sua conta continua em atraso.\n"
-"O pagamento imediato das faturas em aberto devem ser feito, caso contrário a "
-"cobrança será encaminhada ao departamento jurídico\n"
-"sem outro aviso prévio.\n"
-"Acreditamos que isso não será necessário.\n"
-"Em caso de dúvidas sobre esta cobrança, entre em contato com nosso "
-"departamento financeiro.\n"
-"</p>\n"
-"<br/>\n"
-"Atenciosamente,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Data da Fatura</td>\n"
-"            <td>Referencia</td>\n"
-"            <td>Data de Vencimento</td>\n"
-"            <td>Valor (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Valor devido: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-"Esta é a próxima ação a ser tomada pelo usuário. Ele será automaticamente "
-"definida quando os campos de ação estiverem vazios e o parceiro recebe um "
-"nível de cobrança que requer uma ação manual. "
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1735,9 +1171,9 @@ msgid "Total credit"
 msgstr "Total de crédito"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Crédito"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1749,6 +1185,11 @@ msgstr "Cobranças a Serem Feitas"
 msgid "Customer Ref :"
 msgstr "Ref Cliente :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Data de Vencimento"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1770,11 +1211,6 @@ msgstr "Última data em que o nível de cobrança do parceiro foi alterado"
 msgid "Test Print"
 msgstr "Testar Impressão"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr "Visão da Busca"
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1785,6 +1221,11 @@ msgstr ": Nome do Usuário"
 msgid "Accounting"
 msgstr "Contabilidade"
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1975,6 +1416,9 @@ msgstr "Promessa de Pagamento do Cliente"
 #~ msgid "Followup Lines"
 #~ msgstr "Linhas de Acompanhamento"
 
+#~ msgid "Companies"
+#~ msgstr "Empresas"
+
 #~ msgid "%(user_signature)s: User Name"
 #~ msgstr "%(user_signature)s: Nome do Usuário"
 
@@ -2128,6 +1572,33 @@ msgstr "Promessa de Pagamento do Cliente"
 #~ msgid "%(company_name)s: User's Company Name"
 #~ msgstr "%(company_name)s: Empresa do Usuário"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Prezado %(partner_name)s,\n"
+#~ "\n"
+#~ "Não detectamos o pagamento de sua fatura, por favor tome as medidas "
+#~ "necessárias para efetuar o pagamento nos próximos 8 dias.\n"
+#~ "\n"
+#~ "Se tiver algum problema com a fatura ou o pagamento não deixe de entrar em "
+#~ "contato com nosso departamento financeiro.\n"
+#~ "\n"
+#~ "Se o pagamento já foi feito, por favor desconsidere essa mensagem.\n"
+#~ "\n"
+#~ "Atenciosamente,\n"
+
 #~ msgid ""
 #~ "Define follow up levels and their related messages and delay. For each step, "
 #~ "specify the message and the day of delay. Use the legend to know the using "
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index 4f58bc41dd1..a2269d929cf 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/i18n/ro.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 21:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Subiect e-mail"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Suma"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partener"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Parteneri"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Data:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Parteneri"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Memento facturi"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Nu este litigiu"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,52 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Stimate %(nume_partener)s,\n"
-"\n"
-"Cu exceptia cazului in care este o greseala de-a noastra, se pare ca inca nu "
-"ati achitat suma respectiva. Va rugam sa luati masurile care se impun pentru "
-"a efectua aceasta plata in urmatoarele 8 zile.\n"
-"\n"
-"Daca plata d-voastra a fost efectuata dupa ce acest e-mail a fost trimis, va "
-"rugam sa ignorati acest mesaj. Nu ezitati sa contactati departamentul "
-"contabil la (+32).10.68.94.39.\n"
-"\n"
-"Cu stima,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Mesaj tiparit"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -515,7 +478,7 @@ msgstr "Partenerul care va primi un memento"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -525,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Urmari"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -536,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -568,16 +530,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -594,7 +546,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -605,9 +557,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Blocat(a)"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -624,6 +578,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -642,43 +610,77 @@ msgstr "Data trimiterii urmarii"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Document: Extras de cont client"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Memento facturi"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -698,16 +700,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -715,6 +712,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -742,16 +748,6 @@ msgstr "Total:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Companii"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -764,112 +760,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Credit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Data scadenta"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -886,7 +783,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -894,76 +791,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -991,24 +837,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Ultima miscare"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Secventa"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Perioada"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1037,7 +895,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Litigiu"
 
@@ -1069,8 +926,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1089,14 +949,6 @@ msgstr "Inclusiv inregistrari in jurnal marcate ca litigiu"
 msgid "Description"
 msgstr "Descriere"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1118,10 +970,8 @@ msgid "This Fiscal year"
 msgstr "Acest an fiscal"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1144,15 +994,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1209,6 +1067,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1229,94 +1092,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1339,9 +1114,9 @@ msgid "Total credit"
 msgstr "Total credit"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secventa"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1353,6 +1128,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Ref Client :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Data scadenta"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1371,11 +1151,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Test imprimare"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1386,6 +1161,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blocat(a)"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1834,6 +1614,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Linii urmarire"
 
+#~ msgid "Companies"
+#~ msgstr "Companii"
+
 #~ msgid "Company must be same for its related account and period."
 #~ msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociate."
 
@@ -1948,6 +1731,33 @@ msgstr ""
 #~ msgid "Email body"
 #~ msgstr "Continut e-mail"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Stimate %(nume_partener)s,\n"
+#~ "\n"
+#~ "Cu exceptia cazului in care este o greseala de-a noastra, se pare ca inca nu "
+#~ "ati achitat suma respectiva. Va rugam sa luati masurile care se impun pentru "
+#~ "a efectua aceasta plata in urmatoarele 8 zile.\n"
+#~ "\n"
+#~ "Daca plata d-voastra a fost efectuata dupa ce acest e-mail a fost trimis, va "
+#~ "rugam sa ignorati acest mesaj. Nu ezitati sa contactati departamentul "
+#~ "contabil la (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Cu stima,\n"
+
 #~ msgid "Partner Selection"
 #~ msgstr "Selectie Partener"
 
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index 507ece94048..1542c5e17b3 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Тема эл.письма"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Контрагенты"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Дата :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Контрагенты"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Напоминание о счетах"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Не судебное"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Напечатанное сообщение"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr "Напомнить контрагенту"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Дальнейшие действия"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,9 +554,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Блокировано"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -625,43 +605,77 @@ msgstr "Дата отправки напоминания"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Документ: ведомость по счету заказчика"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Напоминание о счетах"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Организации"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,112 +755,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Кредит"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Срок платежа"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -869,7 +778,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -877,76 +786,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Последнее движение"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Период"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Судебный спор"
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Описание"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr "Этот финансовый год"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1192,6 +1062,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1212,94 +1087,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1322,9 +1109,9 @@ msgid "Total credit"
 msgstr "Всего кредит"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Кредит"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1336,6 +1123,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Заказчик:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Срок платежа"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1354,11 +1146,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1369,6 +1156,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Блокировано"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1532,6 +1324,9 @@ msgstr ""
 #~ msgid "You can not create move line on view account."
 #~ msgstr "Нельзя создать операцию по счету с типом Вид."
 
+#~ msgid "Companies"
+#~ msgstr "Организации"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index 2eac4101f49..ba79c2d492a 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 09:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Predmet e-pošte"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partnerji"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Datum:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partnerji"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Izpisano sporočilo"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -625,43 +605,77 @@ msgstr ""
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument: Izpisek konta stranke"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,112 +755,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Zasluge"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Datum zapadlosti"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -869,7 +778,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -877,76 +786,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Zadnji premik"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Zaporedje"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,9 +1107,9 @@ msgid "Total credit"
 msgstr "Skupaj v dobro"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Zasluge"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Sklic stranke:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Datum zapadlosti"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/sq.po b/addons/account_followup/i18n/sq.po
index db5de21680a..72b055ae7d1 100644
--- a/addons/account_followup/i18n/sq.po
+++ b/addons/account_followup/i18n/sq.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,8 +239,18 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -281,8 +259,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,8 +555,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,14 +607,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -643,26 +653,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,33 +756,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr ""
+
+#. module: account_followup
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -792,162 +793,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,14 +834,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -992,7 +862,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,8 +1108,8 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_followup
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index ff440197873..d33893bac62 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Tema Email-a"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partneri"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Datum :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partneri"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,16 +279,16 @@ msgstr ""
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Nije Sporno"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Ispisana Poruka"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Praćenja"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,9 +555,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Blokiran"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -628,43 +608,77 @@ msgstr "Datum Slanja Pracenja"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument:Korisnicka stavka naloga"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -684,16 +698,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -701,6 +710,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -728,16 +746,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Kompanije"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -750,112 +758,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kredit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Datum Dospeća"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -872,7 +781,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -880,76 +789,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -977,24 +835,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Poslednji potez"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Razdoblje"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1023,7 +893,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Sporno"
 
@@ -1055,8 +924,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1075,14 +947,6 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1104,10 +968,8 @@ msgid "This Fiscal year"
 msgstr "Fiskalna Godina"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1130,15 +992,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1195,6 +1065,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1215,94 +1090,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1325,9 +1112,9 @@ msgid "Total credit"
 msgstr "Ukupno potražuje"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kredit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1339,6 +1126,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Poziv na broj"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Datum Dospeća"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1357,11 +1149,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1372,6 +1159,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blokiran"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1776,6 +1568,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Linije Pracenja"
 
+#~ msgid "Companies"
+#~ msgstr "Kompanije"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po
index 8582dc683e3..be6a14608d4 100644
--- a/addons/account_followup/i18n/sr@latin.po
+++ b/addons/account_followup/i18n/sr@latin.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-22 19:07+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Zaglavlje e-maila"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Partneri"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Datum :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Partneri"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,16 +279,16 @@ msgstr ""
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Nije sporno"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Ištampana poruka"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr "Partner za podsećanje"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr "Praćenja"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,9 +555,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Blokirano"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,43 +607,77 @@ msgstr "Datum slanja praćenja"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument: Izjava korisničkog naloga"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -683,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -700,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -727,16 +745,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Preduzeća"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -749,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kredit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Datum dospeća"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -871,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -879,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -976,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Poslednji potez"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Period"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1022,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Sporno"
 
@@ -1054,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1074,14 +946,6 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1103,10 +967,8 @@ msgid "This Fiscal year"
 msgstr "Ova fiskalna godina"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1129,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1194,6 +1064,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1214,94 +1089,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1324,9 +1111,9 @@ msgid "Total credit"
 msgstr "Ukupno potražuje"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kredit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1338,6 +1125,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Poziv na broj"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Datum dospeća"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1356,11 +1148,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1371,6 +1158,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blokirano"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1755,6 +1547,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "Linije praćenja"
 
+#~ msgid "Companies"
+#~ msgstr "Preduzeća"
+
 #~ msgid "%(company_currency)s: User's Company Currency"
 #~ msgstr "%(company_currency)s: Valuta preduzeća korisnika"
 
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index fe6072dc24a..4a7e254157e 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-11 15:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "E-postrubrik"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Belopp"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Företag"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Företag"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Datum:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Företag"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Fakturapåminnelser"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Ej tvistig"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,52 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Dear% (partner_name)s, \n"
-"\n"
-"Enligt våra noteringar verkar det som om följande belopp förblivit obetalda. "
-"Vänligen vidta lämpliga åtgärder för att genomföra denna betalning under de "
-"närmaste 8 dagar. \n"
-"\n"
-"Skulle din betalning har gjorts efter att detta meddelande skickades, "
-"vänligen ignorera detta meddelande. Tveka inte att kontakta vår "
-"ekonomiavdelning på (+32) .10.68.94.39. \n"
-"\n"
-"Vänliga hälsningar,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Utskrivet meddelande"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -514,7 +477,7 @@ msgstr "Partner att påminna"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -524,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Uppföljning"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -535,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -567,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -593,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -604,9 +556,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Blockerad"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -623,6 +577,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -640,43 +608,77 @@ msgstr "Uppföljningsdatum"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Dokument: kundkontoutdrag"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Fakturapåminnelser"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -696,16 +698,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -713,6 +710,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -740,16 +746,6 @@ msgstr "Summa:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Företag"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -762,112 +758,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kredit"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Förfallodag"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -884,7 +781,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -892,76 +789,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -989,24 +835,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Senast åtgärd"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Nummerserie"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Period"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1035,7 +893,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Tvist"
 
@@ -1067,8 +924,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1087,14 +947,6 @@ msgstr "Inkluderade verifikat märkta som tvistiga"
 msgid "Description"
 msgstr "Beskrivning"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1116,10 +968,8 @@ msgid "This Fiscal year"
 msgstr "Nuvarande bokföringsår"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1142,15 +992,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1207,6 +1065,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1227,94 +1090,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1337,9 +1112,9 @@ msgid "Total credit"
 msgstr "Totalt kredit"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kredit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Nummerserie"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1351,6 +1126,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Kundreferens :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Förfallodag"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1369,11 +1149,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Testutskrift"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1384,6 +1159,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blockerad"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1499,6 +1279,9 @@ msgstr ""
 #~ "Alla email skickades till partners:\n"
 #~ "\n"
 
+#~ msgid "Companies"
+#~ msgstr "Företag"
+
 #~ msgid "%(user_signature)s: User Name"
 #~ msgstr "%(user_signature)s: Användarnamn"
 
@@ -1630,6 +1413,33 @@ msgstr ""
 #~ "Valt konto på verifikatet tvingar fram en sekundär valuta. Du kan ta bort "
 #~ "den sekundära valutan på kontot eller välja en flervalutavy för journalen."
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Dear% (partner_name)s, \n"
+#~ "\n"
+#~ "Enligt våra noteringar verkar det som om följande belopp förblivit obetalda. "
+#~ "Vänligen vidta lämpliga åtgärder för att genomföra denna betalning under de "
+#~ "närmaste 8 dagar. \n"
+#~ "\n"
+#~ "Skulle din betalning har gjorts efter att detta meddelande skickades, "
+#~ "vänligen ignorera detta meddelande. Tveka inte att kontakta vår "
+#~ "ekonomiavdelning på (+32) .10.68.94.39. \n"
+#~ "\n"
+#~ "Vänliga hälsningar,\n"
+
 #~ msgid "%(heading)s: Move line header"
 #~ msgstr "%(heading)s: transaktionsrubrik"
 
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index 7ed3b7e727f..585e69ade49 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,8 +238,18 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -280,8 +258,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
+msgstr ""
+
+#. module: account_followup
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,14 +833,26 @@ msgid "%(company_name)s"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
 msgstr ""
 
 #. module: account_followup
@@ -991,7 +861,7 @@ msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,8 +1107,8 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_followup
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 9e512239426..64fc2d7d91a 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-24 20:05+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "Eposta Konusu"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "Tutar"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "Paydaş"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Paydaşlar"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "Tarih :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Paydaşlar"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Fatura Anımsatıcıs"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "Dava açılmamış"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,52 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"Sayın %(partner_name)s,\n"
-"\n"
-"Bizim bir hatamızın olması istisnası kabul edilmek üzere, aşağıdaki tutar "
-"ödenmemiş durumdadır. Lütfen önümüzdeki 8 gün içinde bu ödemenin yapılması "
-"için uygun önlemleri alın.\n"
-"\n"
-"Eğer ödemeyi bu iletimizin gönderilmesinde sonra yapmışsanız, lütfen bu "
-"mesajımızı dikkate almayın. (+32).10.68.94.39. numaralı telefondan muhasebe "
-"bölümümüzle iletişime geçmekte tereddüt etmeyin.\n"
-"\n"
-"Saygılarımızla,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Yazılı Mesaj"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -514,7 +477,7 @@ msgstr "Anımsatma Gönderilecek Paydaş"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -524,7 +487,7 @@ msgid "Follow Ups"
 msgstr "İzlemeler"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -535,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -567,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -593,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -604,9 +556,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Engellendi"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -623,6 +577,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -639,43 +607,77 @@ msgstr "İzleme Gönderim Tarihi"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "Belge: Müşteri hesap ekstresi"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "Fatura Anımsatıcıs"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -695,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -712,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -739,16 +745,6 @@ msgstr "Toplam:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Firmalar"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -761,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Alacak"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "Vade Sonu Tarihi"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -883,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -891,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -988,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Son Hareket"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sıra No"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Dönem"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1034,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "Hukuki Dava"
 
@@ -1066,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1086,14 +946,6 @@ msgstr "Davalı olarak işaretli günlük girişlerini içerir"
 msgid "Description"
 msgstr "Açıklama"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1115,10 +967,8 @@ msgid "This Fiscal year"
 msgstr "Bu Mali Yıl"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1141,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1206,6 +1064,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1226,94 +1089,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1336,9 +1111,9 @@ msgid "Total credit"
 msgstr "Toplam Alacak"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Alacak"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sıra No"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1350,6 +1125,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Müşteri Ref :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Vade Sonu Tarihi"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1368,11 +1148,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "Test Baskısı"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1383,6 +1158,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Engellendi"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1783,6 +1563,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "İzleme Satırları"
 
+#~ msgid "Companies"
+#~ msgstr "Firmalar"
+
 #~ msgid "%(user_signature)s: User Name"
 #~ msgstr "%(kullanıcı_imza)lar: Kullanıcı Adı"
 
@@ -1979,6 +1762,33 @@ msgstr ""
 #~ "\n"
 #~ "Saygılarımızla,\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sayın %(partner_name)s,\n"
+#~ "\n"
+#~ "Bizim bir hatamızın olması istisnası kabul edilmek üzere, aşağıdaki tutar "
+#~ "ödenmemiş durumdadır. Lütfen önümüzdeki 8 gün içinde bu ödemenin yapılması "
+#~ "için uygun önlemleri alın.\n"
+#~ "\n"
+#~ "Eğer ödemeyi bu iletimizin gönderilmesinde sonra yapmışsanız, lütfen bu "
+#~ "mesajımızı dikkate almayın. (+32).10.68.94.39. numaralı telefondan muhasebe "
+#~ "bölümümüzle iletişime geçmekte tereddüt etmeyin.\n"
+#~ "\n"
+#~ "Saygılarımızla,\n"
+
 #~ msgid ""
 #~ "Define follow up levels and their related messages and delay. For each step, "
 #~ "specify the message and the day of delay. Use the legend to know the using "
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index c19c323f90b..5355e99468e 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,8 +238,18 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
 msgstr ""
 
 #. module: account_followup
@@ -280,8 +258,8 @@ msgid "Date :"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
 msgstr ""
 
 #. module: account_followup
@@ -290,25 +268,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -317,13 +279,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,40 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -502,7 +477,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -512,7 +487,7 @@ msgid "Follow Ups"
 msgstr "Послідовності дій"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -523,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -553,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -579,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -590,8 +554,10 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
 msgstr ""
 
 #. module: account_followup
@@ -609,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -626,14 +606,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -642,26 +652,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -681,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -698,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -725,16 +743,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -747,33 +755,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Кредит"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -791,162 +792,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -974,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Остання дія"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Послідовність"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1020,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1052,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1072,14 +944,6 @@ msgstr ""
 msgid "Description"
 msgstr "Опис"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1101,10 +965,8 @@ msgid "This Fiscal year"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1127,15 +989,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1190,6 +1060,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1210,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1320,9 +1107,9 @@ msgid "Total credit"
 msgstr "Всього Кредит"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Кредит"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Послідовність"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1334,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr ""
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1352,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1367,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
diff --git a/addons/account_followup/i18n/vi.po b/addons/account_followup/i18n/vi.po
index 6b053b95082..fe9297b3ac3 100644
--- a/addons/account_followup/i18n/vi.po
+++ b/addons/account_followup/i18n/vi.po
@@ -7,20 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -28,11 +30,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -54,6 +51,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -69,88 +72,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -170,24 +91,8 @@ msgid "Email Subject"
 msgstr "Tiêu đề Thư điện tử"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -205,16 +110,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -225,11 +120,79 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -250,6 +213,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -271,9 +239,19 @@ msgid "Partner"
 msgstr "Đối tác"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "Các đối tác"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,9 +259,9 @@ msgid "Date :"
 msgstr "Ngày :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "Các đối tác"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -291,25 +269,9 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -318,13 +280,13 @@ msgid "When processing, it will print a letter"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
@@ -342,6 +304,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -394,12 +397,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -433,8 +430,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -455,40 +452,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -503,7 +478,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -513,7 +488,7 @@ msgid "Follow Ups"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -524,11 +499,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -554,16 +528,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -580,7 +544,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -591,9 +555,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "Bị phong toả"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -610,6 +576,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -627,14 +607,44 @@ msgid "Follow-up Responsible"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Document : Customer account statement"
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
 msgstr ""
 
 #. module: account_followup
@@ -643,26 +653,30 @@ msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -682,16 +696,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -699,6 +708,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -726,16 +744,6 @@ msgstr ""
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "Các công ty"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -748,33 +756,26 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Bên có"
+
+#. module: account_followup
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
+#: help:res.partner,latest_followup_level_id_without_lit:0
+msgid ""
+"The maximum follow-up level without taking into account the account move "
+"lines with litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:res.partner,latest_followup_date:0
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
@@ -792,162 +793,19 @@ msgid ""
 "appropriate measures in order to carry out this payment in the next 8 days.\n"
 "Would your payment have been carried out after this mail was sent, please "
 "ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
+"contact our accounting department.\n"
 "    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"</br>\n"
-"</br>\n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,latest_followup_level_id_without_lit:0
-msgid ""
-"The maximum follow-up level without taking into account the account move "
-"lines with litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:res.partner,latest_followup_date:0
-msgid "Latest Follow-up Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
 "<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -975,24 +833,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Trình tự"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "Chu kỳ"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1021,7 +891,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr ""
 
@@ -1053,8 +922,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1073,14 +945,6 @@ msgstr ""
 msgid "Description"
 msgstr "Mô tả"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1102,10 +966,8 @@ msgid "This Fiscal year"
 msgstr "Năm tài chính này"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1128,15 +990,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1191,6 +1061,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1211,94 +1086,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1321,9 +1108,9 @@ msgid "Total credit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Bên có"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Trình tự"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1335,6 +1122,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "Tham chiếu khách hàng :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1353,11 +1145,6 @@ msgstr ""
 msgid "Test Print"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1368,6 +1155,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bị phong toả"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1407,6 +1199,9 @@ msgstr ""
 #~ msgid "%(partner_name)s: Partner Name"
 #~ msgstr "%(partner_name)s: Tên Đối tác"
 
+#~ msgid "Companies"
+#~ msgstr "Các công ty"
+
 #~ msgid "%(followup_amount)s: Total Amount Due"
 #~ msgstr "%(followup_amount)s: Tổng Giá trị tới hạn"
 
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index e2184129bf8..81e9e1b5e60 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -6,32 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 04:57+0000\n"
 "Last-Translator: sum1201 <Unknown>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
-msgstr "手动操作"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
+msgstr ""
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
 msgstr "最大跟踪级别"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr "分组"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr "%(日期）"
 msgid "Next Action Date"
 msgstr "下次活动日期"
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr "手动操作"
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr "标记为完成"
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "电子邮件主题"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr "催款步骤"
 msgid "Email Body"
 msgstr "电子邮件正文"
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr "负责确保动作发生。"
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr "逾期金额"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr "发送催款"
 msgid "Amount"
 msgstr "金额"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr "下个行动日期"
 msgid ": Partner Name"
 msgstr "：伙伴名称"
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "业务伙伴列表"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "日期:"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "业务伙伴列表"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "发票提醒"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "没争议"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr "手动跟进"
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,9 +429,9 @@ msgid "Send Email Confirmation"
 msgstr "发送邮件确认"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
-msgstr ""
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
+msgstr "本年度的催款明细"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -454,48 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr "打印催款并发送邮件给客户"
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"尊敬的 %(partner_name)s，\n"
-"\n"
-"如果我们搞错了请纠正我们，似乎您的以下欠款还没有支付。请在8日内支付到我们的账户。\n"
-"\n"
-"如果您在收到此信前已经付款了，请忽略这封信。并与我们的会计部门联系。\n"
-"\n"
-"顺祝商祺，\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "已打印消息"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -510,7 +477,7 @@ msgstr "提醒合作伙伴"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -520,7 +487,7 @@ msgid "Follow Ups"
 msgstr "催款"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -531,11 +498,10 @@ msgid "Account Follow-up"
 msgstr "催款"
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -561,16 +527,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -587,7 +543,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -598,9 +554,11 @@ msgid "or"
 msgstr "or"
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "已封锁"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -617,6 +575,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -633,44 +605,78 @@ msgstr "催款发送日期"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "文档: 客户帐户对帐单"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "发票提醒"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
-msgstr "本年度的催款明细"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
+msgstr ""
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -689,16 +695,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -706,6 +707,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -733,16 +743,6 @@ msgstr "合计:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "公司"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -755,112 +755,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "贷方"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "到期日期"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -877,7 +778,7 @@ msgid "Latest Follow-up Date"
 msgstr "最新的催款日期"
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -885,76 +786,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -982,24 +832,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "最近的凭证"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "序列"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "会计期间"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1028,7 +890,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "有异议"
 
@@ -1060,8 +921,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1080,14 +944,6 @@ msgstr "包含有争议的凭证行"
 msgid "Description"
 msgstr "说明"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1109,10 +965,8 @@ msgid "This Fiscal year"
 msgstr "本会计年度"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1135,15 +989,23 @@ msgid "Follow-up lines"
 msgstr "催款明细"
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1198,6 +1060,11 @@ msgstr "按合作伙伴的催款统计"
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1218,94 +1085,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1328,9 +1107,9 @@ msgid "Total credit"
 msgstr "贷方合计"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "贷方"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "序列"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1342,6 +1121,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "客户:"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "到期日期"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1360,11 +1144,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "仅打印"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1375,6 +1154,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "已封锁"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1607,6 +1391,9 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "错误！您不能创建循环的公司。"
 
+#~ msgid "Companies"
+#~ msgstr "公司"
+
 #~ msgid "%(line)s: Ledger Posting lines"
 #~ msgstr "%(line)s: 总帐总行数"
 
@@ -1924,6 +1711,29 @@ msgstr ""
 #~ "change the date or remove this constraint from the journal."
 #~ msgstr "凭证日期不在所选期间内！可以修改凭证日期或在凭证簿上去掉这个检查项。"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "尊敬的 %(partner_name)s，\n"
+#~ "\n"
+#~ "如果我们搞错了请纠正我们，似乎您的以下欠款还没有支付。请在8日内支付到我们的账户。\n"
+#~ "\n"
+#~ "如果您在收到此信前已经付款了，请忽略这封信。并与我们的会计部门联系。\n"
+#~ "\n"
+#~ "顺祝商祺，\n"
+
 #, python-format
 #~ msgid ""
 #~ "All E-mails have been successfully sent to Partners:.\n"
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 381ba959614..789be6c5a22 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-24 12:49+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: model:email.template,subject:account_followup.email_template_account_followup_default
+#: model:email.template,subject:account_followup.email_template_account_followup_level0
+#: model:email.template,subject:account_followup.email_template_account_followup_level1
+#: model:email.template,subject:account_followup.email_template_account_followup_level2
+msgid "${user.company_id.name} Payment Reminder"
 msgstr ""
 
 #. module: account_followup
@@ -27,11 +29,6 @@ msgstr ""
 msgid "The maximum follow-up level"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Group by"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 #: view:res.partner:0
@@ -53,6 +50,12 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
@@ -68,88 +71,6 @@ msgstr ""
 msgid "Action To Do"
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-"   <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
@@ -169,24 +90,8 @@ msgid "Email Subject"
 msgstr "電子郵件主題"
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"        "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
 msgstr ""
 
 #. module: account_followup
@@ -204,16 +109,6 @@ msgstr ""
 msgid "Email Body"
 msgstr ""
 
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
@@ -224,11 +119,79 @@ msgstr ""
 msgid "Amount"
 msgstr "金額"
 
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid ""
+"This is the next action to be taken.  It will automatically be set when the "
+"partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department, so that we can resolve the "
+"matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.  \n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
@@ -249,6 +212,11 @@ msgstr ""
 msgid ": Partner Name"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
@@ -270,9 +238,19 @@ msgid "Partner"
 msgstr "合夥人"
 
 #. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
-msgstr "合夥人"
+#: view:account_followup.followup:0
+msgid ""
+"To remind customers of paying their invoices, you can\n"
+"                        define different actions depending on how severely\n"
+"                        overdue the customer is. These actions are bundled\n"
+"                        into follow-up levels that are triggered when the "
+"due\n"
+"                        date of an invoice has passed a certain\n"
+"                        number of days. If there are other overdue invoices "
+"for the \n"
+"                        same customer, the actions of the most \n"
+"                        overdue invoice will be executed."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -280,9 +258,9 @@ msgid "Date :"
 msgstr "日期 :"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
-msgstr ""
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
+msgstr "合夥人"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -290,42 +268,26 @@ msgid "Only one follow-up per company is allowed"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the "
-"recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"            "
-msgstr ""
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
+msgstr "發票提醒"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
 msgstr ""
 
+#. module: account_followup
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr "非訴訟"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
@@ -341,6 +303,47 @@ msgstr ""
 msgid "%(partner_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"   <p>\n"
+"    We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account\n"
+"which means that we will no longer be able to supply your company with "
+"(goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting\n"
+"department. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
@@ -393,12 +396,6 @@ msgstr ""
 msgid "Due Days"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 #: view:account_followup.stat:0
@@ -432,8 +429,8 @@ msgid "Send Email Confirmation"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -454,47 +451,18 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount stays unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to contact our accounting department at "
-"(+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-msgstr ""
-"\n"
-"尊敬的 %(partner_name)s,\n"
-"\n"
-"下列金額尚未付款，如屬例外，那就是我們的錯誤. 請採取適當的措施，在未來的8天內付款\n"
-"\n"
-"如果您在收到此信前已經付款了，請忽略這封信。並與我們的會計部門聯繫。\n"
-"最好的祝福,\n"
-
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
 msgstr "Printed Message"
 
 #. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
 msgstr ""
 
 #. module: account_followup
@@ -509,7 +477,7 @@ msgstr "提醒業務夥伴"
 
 #. module: account_followup
 #: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
 msgstr ""
 
 #. module: account_followup
@@ -519,7 +487,7 @@ msgid "Follow Ups"
 msgstr "催款"
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
@@ -530,11 +498,10 @@ msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: help:res.partner,payment_next_action_date:0
+#: help:res.partner,payment_responsible_id:0
 msgid ""
-"This is when further follow-up is needed.  The date will have been set to "
-"the current date if the action fields are empty and the partner gets a "
-"follow-up level that requires a manual action. "
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
 msgstr ""
 
 #. module: account_followup
@@ -562,16 +529,6 @@ msgstr ""
 msgid "Search Partner"
 msgstr ""
 
-#. module: account_followup
-#: view:res.partner:0
-msgid ""
-"Below is the history of the transactions of this\n"
-"                            customer. You can set an invoice in litigation "
-"in\n"
-"                            order to not include it in the next payment\n"
-"                            follow-ups."
-msgstr ""
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
@@ -588,7 +545,7 @@ msgid "Account Move line"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
 msgstr ""
@@ -599,9 +556,11 @@ msgid "or"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
-msgstr "已封鎖"
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -618,6 +577,20 @@ msgstr ""
 msgid "Follow-Ups Analysis"
 msgstr ""
 
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid ""
+"This is when the manual follow-up is needed. The date will be set to the "
+"current date when the partner gets a follow-up level that requires a manual "
+"action. Can be practical to set manually e.g. to see if he keeps his "
+"promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
 #. module: account_followup
 #: help:account_followup.print,date:0
 msgid ""
@@ -634,43 +607,77 @@ msgstr "催款發送日期"
 msgid "Follow-up Responsible"
 msgstr ""
 
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level2
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    Despite several reminders, your account is still not settled.\n"
+"Unless full payment is made in next 8 days, legal action for the recovery of "
+"the debt will be taken without\n"
+"further notice.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
 msgstr "文件 : 客戶帳戶對帳單"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
-msgstr "發票提醒"
-
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
 msgstr ""
 
 #. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
 msgid ""
-"To remind customers of paying their invoices, you can\n"
-"                        define different actions depending on how severely\n"
-"                        overdue the customer is. These actions are bundled\n"
-"                        into folow-up levels that are triggered when the "
-"due\n"
-"                        date of the most overdue invoice has passed a "
-"certain\n"
-"                        amount of days."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"            "
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
 msgstr ""
 
 #. module: account_followup
@@ -690,16 +697,11 @@ msgid "unknown"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
 #, python-format
 msgid "Printed overdue payments report"
 msgstr ""
 
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
-msgstr ""
-
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
 msgid ""
@@ -707,6 +709,15 @@ msgid ""
 "customer. "
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"Below is the history of the transactions of this\n"
+"                            customer. You can check \"No Follow-up\" in\n"
+"                            order to exclude it from the next follow-up "
+"actions."
+msgstr ""
+
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
@@ -734,16 +745,6 @@ msgstr "總計:"
 msgid "Email Template"
 msgstr ""
 
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr "公司"
-
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
@@ -756,112 +757,13 @@ msgid "Send an Email"
 msgstr ""
 
 #. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account which means that we will no longer "
-"be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-"we can resolve the matter quickly.\n"
-"\n"
-"Details of due payments is printed below.\n"
-"\n"
-"Best Regards,\n"
-"        "
-msgstr ""
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "貸方"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr "到期日"
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Exception made if there was a mistake of ours, it seems that the "
-"following amount stays unpaid. Please, take\n"
-"appropriate measures in order to carry out this payment in the next 8 days.\n"
-"Would your payment have been carried out after this mail was sent, please "
-"ignore this message. Do not hesitate to\n"
-"contact our accounting department at (+32).10.68.94.39.\n"
-"    </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"   \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
 msgstr ""
 
 #. module: account_followup
@@ -878,7 +780,7 @@ msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
@@ -886,76 +788,25 @@ msgid ""
 "255, 255); \">\n"
 "    \n"
 "    <p>Dear ${object.name},</p>\n"
-"   <p>\n"
-"   \tWe are disappointed to see that despite sending a reminder, that your "
-"account is now seriously overdue.\n"
-"It is essential that immediate payment is made, otherwise we will have to "
-"consider placing a stop on your account\n"
-"which means that we will no longer be able to supply your company with "
-"(goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the "
-"next 8 days.\n"
-"If there is a problem with paying invoice that we are not aware of, do not "
-"hesitate to contact our accounting\n"
-"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
-"Details of due payments is printed below.\n"
-" </p>\n"
+"    <p>\n"
+"    Exception made if there was a mistake of ours, it seems that the "
+"following amount stays unpaid. Please, take\n"
+"appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to\n"
+"contact our accounting department.\n"
+"    </p>\n"
 "<br/>\n"
 "Best Regards,\n"
-"    \n"
+"<br/>\n"
 "<br/>\n"
 "${user.name}\n"
-"    \n"
 "<br/>\n"
 "<br/>\n"
 "\n"
-"   \n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
 "\n"
+"<br/>\n"
 "</div>\n"
 "            "
 msgstr ""
@@ -983,24 +834,36 @@ msgstr ""
 msgid "%(company_name)s"
 msgstr ""
 
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.  "
+"\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "最近"
 
-#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "序列"
-
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr "會計期間"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
 msgstr ""
@@ -1029,7 +892,6 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-#: view:res.partner:0
 msgid "Litigation"
 msgstr "有爭議"
 
@@ -1061,8 +923,11 @@ msgid ": Current Date"
 msgstr ""
 
 #. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid ""
+"This action will send follow-up emails, print the letters and\n"
+"                        set the manual actions per customer, according to "
+"the follow-up levels defined."
 msgstr ""
 
 #. module: account_followup
@@ -1081,14 +946,6 @@ msgstr "包括訴訟標記的帳簿分錄"
 msgid "Description"
 msgstr "說明"
 
-#. module: account_followup
-#: model:email.template,subject:account_followup.email_template_account_followup_default
-#: model:email.template,subject:account_followup.email_template_account_followup_level0
-#: model:email.template,subject:account_followup.email_template_account_followup_level1
-#: model:email.template,subject:account_followup.email_template_account_followup_level2
-msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
@@ -1110,10 +967,8 @@ msgid "This Fiscal year"
 msgstr "本會計年度"
 
 #. module: account_followup
-#: view:res.partner:0
-msgid ""
-"If not specified by the latest follow-up level, it will send from the "
-"default follow-up of overdue invoices template"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
 msgstr ""
 
 #. module: account_followup
@@ -1136,15 +991,23 @@ msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,manual_action_responsible_id:0
-msgid "Assign a Responsible"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.print:0
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
-"This action will send follow-up emails, print the letters and\n"
-"                        set the manual actions per customers."
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the "
+"recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department.\n"
+"\n"
+"Best Regards,\n"
 msgstr ""
 
 #. module: account_followup
@@ -1199,6 +1062,11 @@ msgstr ""
 msgid " letter(s) in report"
 msgstr ""
 
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
@@ -1219,94 +1087,6 @@ msgid ""
 "          "
 msgstr ""
 
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"    \n"
-"    <p>Dear ${object.name},</p>\n"
-"    <p>\n"
-"    Despite several reminders, your account is still not settled.\n"
-"Unless full payment is made in next 8 days, legal action for the recovery of "
-"the debt will be taken without\n"
-"further notice.\n"
-"I trust that this action will prove unnecessary and details of due payments "
-"is printed below.\n"
-"In case of any queries concerning this matter, do not hesitate to contact "
-"our accounting department at (+32).10.68.94.39.\n"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"    \n"
-"<br/>\n"
-"${user.name}\n"
-"    \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-"    \n"
-"\n"
-"<%\n"
-"    from openerp.addons.account_followup.report import "
-"account_followup_print\n"
-"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
-"\"followup_rml_parser\")\n"
-"    final_res = rml_parse._lines_get_with_partner(object, "
-"user.company_id.id)\n"
-"    followup_table = ''\n"
-"    for currency_dict in final_res:\n"
-"        currency_symbol = currency_dict.get('line', [{'currency_id': "
-"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-"        followup_table += '''\n"
-"        <table border=\"2\" width=100%%>\n"
-"        <tr>\n"
-"            <td>Invoice date</td>\n"
-"            <td>Reference</td>\n"
-"            <td>Due date</td>\n"
-"            <td>Amount (%s)</td>\n"
-"            <td>Lit.</td>\n"
-"        </tr>\n"
-"        ''' % (currency_symbol)\n"
-"        total = 0\n"
-"        for aml in currency_dict['line']:\n"
-"            block = aml['blocked'] and 'X' or ' '\n"
-"            total += aml['balance']\n"
-"            strbegin = \"<TD> \"\n"
-"            strend = \"</TD> \"\n"
-"            date = aml['date_maturity'] or aml['date']\n"
-"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-"                strbegin = \"<TD><B>\"\n"
-"                strend = \"</B></TD>\"\n"
-"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
-"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
-"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-"        total = rml_parse.formatLang(total, dp='Account', "
-"currency_obj=object.company_id.currency_id)\n"
-"        followup_table += '''<tr> </tr>\n"
-"                        </table>\n"
-"                        <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-"    <br/>\n"
-"\n"
-"</div>\n"
-"            "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid ""
-"This is the next action to be taken by the user.  It will automatically be "
-"set when the action fields are empty and the partner gets a follow-up level "
-"that requires a manual action. "
-msgstr ""
-
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
@@ -1329,9 +1109,9 @@ msgid "Total credit"
 msgstr "貸方合計"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "貸方"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "序列"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1343,6 +1123,11 @@ msgstr ""
 msgid "Customer Ref :"
 msgstr "客戶 :"
 
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "到期日"
+
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
 msgid ""
@@ -1361,11 +1146,6 @@ msgstr ""
 msgid "Test Print"
 msgstr "測試列印"
 
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
@@ -1376,6 +1156,11 @@ msgstr ""
 msgid "Accounting"
 msgstr ""
 
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "已封鎖"
+
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
@@ -1402,6 +1187,9 @@ msgstr ""
 #~ msgid "Followup Lines"
 #~ msgstr "跟進明細"
 
+#~ msgid "Companies"
+#~ msgstr "公司"
+
 #~ msgid "Follow-Up Lines"
 #~ msgstr "跟進明細"
 
@@ -1502,6 +1290,28 @@ msgstr ""
 #~ msgid "Partner Selection"
 #~ msgstr "業務夥伴的選擇"
 
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount stays unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "ignore this message. Do not hesitate to contact our accounting department at "
+#~ "(+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ msgstr ""
+#~ "\n"
+#~ "尊敬的 %(partner_name)s,\n"
+#~ "\n"
+#~ "下列金額尚未付款，如屬例外，那就是我們的錯誤. 請採取適當的措施，在未來的8天內付款\n"
+#~ "\n"
+#~ "如果您在收到此信前已經付款了，請忽略這封信。並與我們的會計部門聯繫。\n"
+#~ "最好的祝福,\n"
+
 #~ msgid "Send followups"
 #~ msgstr "發送催款"
 
diff --git a/addons/account_payment/i18n/am.po b/addons/account_payment/i18n/am.po
index 59500fd69df..1fdf7146615 100644
--- a/addons/account_payment/i18n/am.po
+++ b/addons/account_payment/i18n/am.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-21 15:50+0000\n"
 "Last-Translator: Araya <info@climaxtechnologies.com>\n"
 "Language-Team: Amharic <am@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index 9c276626869..0d844b67e5f 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 9ad125ff7ee..93b54dc24cf 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 08:04+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index 2ec44201179..84e9c60fd5f 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 22:04+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index 96336a0bfdf..fd5ee7da9c8 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:38+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 87eb8c083a8..e72756836a9 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 22:04+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/da.po b/addons/account_payment/i18n/da.po
index e115fc194c9..6d4854e6442 100644
--- a/addons/account_payment/i18n/da.po
+++ b/addons/account_payment/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index c61aa961d60..0554c840658 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 15:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index e442d017e4e..a671f35cd00 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-15 08:29+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index eaefdb7011f..135f5c19451 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 11:59+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index 9721b0da851..b0d7263671a 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 13:06+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/es_CL.po b/addons/account_payment/i18n/es_CL.po
index 283e9254e8e..a9e7142bd2c 100644
--- a/addons/account_payment/i18n/es_CL.po
+++ b/addons/account_payment/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-26 23:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/es_CR.po b/addons/account_payment/i18n/es_CR.po
index e94f28d5355..1b24823774e 100644
--- a/addons/account_payment/i18n/es_CR.po
+++ b/addons/account_payment/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 15:01+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/es_EC.po b/addons/account_payment/i18n/es_EC.po
index adbb8242b4d..6e086cbf47c 100644
--- a/addons/account_payment/i18n/es_EC.po
+++ b/addons/account_payment/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 03:47+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/es_PY.po b/addons/account_payment/i18n/es_PY.po
index 4bcfe48ba1a..33b711c188e 100644
--- a/addons/account_payment/i18n/es_PY.po
+++ b/addons/account_payment/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-03 00:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index 30849c88d8a..a74a40b95ec 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-10 19:42+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/fa.po b/addons/account_payment/i18n/fa.po
index e5e9d14077a..110d096722b 100644
--- a/addons/account_payment/i18n/fa.po
+++ b/addons/account_payment/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index b93cf7f4e62..dc85c15c3f7 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 09:15+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 7c1fbfec4bc..a54c964aae6 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-03 21:19+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Total debit"
 #~ msgstr "Débit total"
diff --git a/addons/account_payment/i18n/gl.po b/addons/account_payment/i18n/gl.po
index 619f8098af7..b9aa60b27f2 100644
--- a/addons/account_payment/i18n/gl.po
+++ b/addons/account_payment/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-04 23:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index 97f8be9f8f9..7ac39321236 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:51+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index bec3812f323..cfec06e34fc 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-08 17:06+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index b084fb719ab..8edbb4f2802 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-30 18:36+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index c20230779b2..9679ccbd90e 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-19 05:53+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 79020ba945f..fa12dd68477 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 18:55+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index a0d591d4a99..a1efe70c24e 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:11+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index 5b7e0cd52f2..d02d4c7f146 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:22+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index bebe701f9b7..518c24ec32f 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/lv.po b/addons/account_payment/i18n/lv.po
index f74466e7f3b..dde7a99fb89 100644
--- a/addons/account_payment/i18n/lv.po
+++ b/addons/account_payment/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-02 13:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index f9f5d1ffdb3..3c045227c32 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-22 08:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
index 8a9b1f1c8a5..e98ee42fafb 100644
--- a/addons/account_payment/i18n/nb.po
+++ b/addons/account_payment/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 12:53+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 078d57c954c..62e59a26119 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-12 11:33+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 0e477f3f65c..687e21d629c 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po
index 4c1a9585f23..93ac26b1209 100644
--- a/addons/account_payment/i18n/oc.po
+++ b/addons/account_payment/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 22:07+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index 2e8903645be..c5c329a8da1 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 12:29+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index 1ea4c2532ee..8c9347beba4 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:48+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index 02dd5ca440d..5943ae1c4fd 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 12:23+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 61305cb6732..ad7f3bec540 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-26 18:16+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index fe15846fff3..d205d86e9a3 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-14 07:27+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index 513cce7a4c6..dc9e9b80cc3 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/sq.po b/addons/account_payment/i18n/sq.po
index f8435aaf2c1..7ae9ceb1205 100644
--- a/addons/account_payment/i18n/sq.po
+++ b/addons/account_payment/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
index 07c944e7061..4dc266c873d 100644
--- a/addons/account_payment/i18n/sr.po
+++ b/addons/account_payment/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-27 08:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index be733631c58..08e48d88529 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-13 15:21+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index d2079458bdd..2d201af6586 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 16:22+0000\n"
 "Last-Translator: Aries Bucquet, Aspirix AB <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index dd1df415fcf..c1f61cc4308 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index c49e16b107e..77bf54ed91d 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 22:36+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index 8804c0f46bf..afb9864c237 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:40+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po
index 959742a796e..5f868cb4c28 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-04 22:07+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index cf3a9a2ec2e..3419cedad57 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 10:37+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 5597774a134..264419f6028 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-29 15:27+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
diff --git a/addons/account_sequence/i18n/ar.po b/addons/account_sequence/i18n/ar.po
index 0132467eb32..4b5a160da09 100644
--- a/addons/account_sequence/i18n/ar.po
+++ b/addons/account_sequence/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:27+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/bg.po b/addons/account_sequence/i18n/bg.po
index e3ecd24c405..48c17c095e2 100644
--- a/addons/account_sequence/i18n/bg.po
+++ b/addons/account_sequence/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 08:03+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ca.po b/addons/account_sequence/i18n/ca.po
index 7cf743c4475..d19239d15e6 100644
--- a/addons/account_sequence/i18n/ca.po
+++ b/addons/account_sequence/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:38+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po
index c9ae3ad5508..c7c9541e96c 100644
--- a/addons/account_sequence/i18n/da.po
+++ b/addons/account_sequence/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-09 21:40+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/de.po b/addons/account_sequence/i18n/de.po
index 481acca183c..5f05b1eb878 100644
--- a/addons/account_sequence/i18n/de.po
+++ b/addons/account_sequence/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-08 08:52+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/el.po b/addons/account_sequence/i18n/el.po
index 2cd8b439477..23ec37fe1d6 100644
--- a/addons/account_sequence/i18n/el.po
+++ b/addons/account_sequence/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-15 17:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es.po b/addons/account_sequence/i18n/es.po
index 698d8866b60..42d4a278a83 100644
--- a/addons/account_sequence/i18n/es.po
+++ b/addons/account_sequence/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-08 19:53+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es_CR.po b/addons/account_sequence/i18n/es_CR.po
index 96638d97374..a74571fb7b1 100644
--- a/addons/account_sequence/i18n/es_CR.po
+++ b/addons/account_sequence/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 15:03+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: account_sequence
diff --git a/addons/account_sequence/i18n/es_EC.po b/addons/account_sequence/i18n/es_EC.po
index 79f881be7a2..d124e325e84 100644
--- a/addons/account_sequence/i18n/es_EC.po
+++ b/addons/account_sequence/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-18 19:13+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es_PY.po b/addons/account_sequence/i18n/es_PY.po
index 53ade7df43a..5ec3aa2df8f 100644
--- a/addons/account_sequence/i18n/es_PY.po
+++ b/addons/account_sequence/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-04 16:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/fa.po b/addons/account_sequence/i18n/fa.po
index 148072fc060..cacbc3e6889 100644
--- a/addons/account_sequence/i18n/fa.po
+++ b/addons/account_sequence/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 16:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/fr.po b/addons/account_sequence/i18n/fr.po
index ecf26be24bf..1c7a58474fc 100644
--- a/addons/account_sequence/i18n/fr.po
+++ b/addons/account_sequence/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 17:04+0000\n"
 "Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/gl.po b/addons/account_sequence/i18n/gl.po
index a6f96d06807..66dd53c9c58 100644
--- a/addons/account_sequence/i18n/gl.po
+++ b/addons/account_sequence/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-25 09:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/hr.po b/addons/account_sequence/i18n/hr.po
index e56cd4d188c..759c30d427b 100644
--- a/addons/account_sequence/i18n/hr.po
+++ b/addons/account_sequence/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-08 15:33+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/hu.po b/addons/account_sequence/i18n/hu.po
index 48594cacdbb..c7d20a37bbf 100644
--- a/addons/account_sequence/i18n/hu.po
+++ b/addons/account_sequence/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-15 15:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/id.po b/addons/account_sequence/i18n/id.po
index bd5aa335020..cc3b5584d03 100644
--- a/addons/account_sequence/i18n/id.po
+++ b/addons/account_sequence/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-16 13:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/it.po b/addons/account_sequence/i18n/it.po
index 86a2876089d..5e622617d52 100644
--- a/addons/account_sequence/i18n/it.po
+++ b/addons/account_sequence/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-03 20:02+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ja.po b/addons/account_sequence/i18n/ja.po
index 3fbae6414ce..4be1f72dab1 100644
--- a/addons/account_sequence/i18n/ja.po
+++ b/addons/account_sequence/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-28 05:41+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/lv.po b/addons/account_sequence/i18n/lv.po
index de7b862f088..f1302064f84 100644
--- a/addons/account_sequence/i18n/lv.po
+++ b/addons/account_sequence/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 13:46+0000\n"
 "Last-Translator: Normunds (Alistek) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po
index 3ce909c4cf5..3808ce3f120 100644
--- a/addons/account_sequence/i18n/nb.po
+++ b/addons/account_sequence/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-24 11:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nl.po b/addons/account_sequence/i18n/nl.po
index d56127f27bd..3d4e66e8909 100644
--- a/addons/account_sequence/i18n/nl.po
+++ b/addons/account_sequence/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 16:19+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nl_BE.po b/addons/account_sequence/i18n/nl_BE.po
index 5f931c9b20d..26141d45bc0 100644
--- a/addons/account_sequence/i18n/nl_BE.po
+++ b/addons/account_sequence/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 13:36+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pl.po b/addons/account_sequence/i18n/pl.po
index 0f36c747999..987edeeff8e 100644
--- a/addons/account_sequence/i18n/pl.po
+++ b/addons/account_sequence/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-15 15:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
index 4cbe4c93701..5fedd68533c 100644
--- a/addons/account_sequence/i18n/pt.po
+++ b/addons/account_sequence/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-09 10:09+0000\n"
 "Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pt_BR.po b/addons/account_sequence/i18n/pt_BR.po
index 89cf97318fd..7bdf720d338 100644
--- a/addons/account_sequence/i18n/pt_BR.po
+++ b/addons/account_sequence/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-19 15:04+0000\n"
 "Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ro.po b/addons/account_sequence/i18n/ro.po
index d4adedec634..21358a8e473 100644
--- a/addons/account_sequence/i18n/ro.po
+++ b/addons/account_sequence/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-24 12:20+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ru.po b/addons/account_sequence/i18n/ru.po
index 4ac4af7e0f8..e8d6df98080 100644
--- a/addons/account_sequence/i18n/ru.po
+++ b/addons/account_sequence/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-14 07:15+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sq.po b/addons/account_sequence/i18n/sq.po
index 423a990fa81..a50f8cd84e9 100644
--- a/addons/account_sequence/i18n/sq.po
+++ b/addons/account_sequence/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sr@latin.po b/addons/account_sequence/i18n/sr@latin.po
index 5b0640f50cc..2a59babdba1 100644
--- a/addons/account_sequence/i18n/sr@latin.po
+++ b/addons/account_sequence/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-24 21:01+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sv.po b/addons/account_sequence/i18n/sv.po
index 00e40eb6f40..b5a8edf64d7 100644
--- a/addons/account_sequence/i18n/sv.po
+++ b/addons/account_sequence/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-04 17:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/tr.po b/addons/account_sequence/i18n/tr.po
index e29159bb8a9..c181d6018d1 100644
--- a/addons/account_sequence/i18n/tr.po
+++ b/addons/account_sequence/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 00:14+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/vi.po b/addons/account_sequence/i18n/vi.po
index f2f3f83f0b9..c6f59c7e916 100644
--- a/addons/account_sequence/i18n/vi.po
+++ b/addons/account_sequence/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-25 14:15+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/zh_CN.po b/addons/account_sequence/i18n/zh_CN.po
index dcf075f3bf4..135c4605b71 100644
--- a/addons/account_sequence/i18n/zh_CN.po
+++ b/addons/account_sequence/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:24+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/zh_TW.po b/addons/account_sequence/i18n/zh_TW.po
index f60376d5662..5d3af72c1da 100644
--- a/addons/account_sequence/i18n/zh_TW.po
+++ b/addons/account_sequence/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-28 02:48+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index 29eef9e0098..7f769c59fa3 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:43+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "إلغاء"
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "احصائيات القسيمة"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "تحقق"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "بيع"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "عنصر يومية"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "ملغي"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "ضريبة"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "مسودة"
 msgid "Import Invoices"
 msgstr "إستيراد فواتير"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr "استلام"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "فترة"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "مورد"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "مدين"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "قيود الإيصال"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr "مذكرة"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "استلام المبيعات"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr "متوسط تأخير المستحقات"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "دفع الفاتورة"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "لا يوجد قانون قاعدة الحساب و قانون ضريبة الحساب!"
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr "للمراجعة"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "تغيير"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr "أغسطس"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -711,7 +732,7 @@ msgid "October"
 msgstr "أكتوبر"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -731,6 +752,13 @@ msgstr ""
 msgid "Paid"
 msgstr "مدفوع"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -768,24 +796,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "المبلغ المسوّي"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -802,6 +812,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "المدفوعات السابقة؟"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -829,14 +845,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -844,12 +869,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -912,13 +931,6 @@ msgstr "سبتمبر"
 msgid "Sales Information"
 msgstr "بيانات المبيعات"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "تحليل استلام المبيعات"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -961,18 +973,11 @@ msgid "Journal Items"
 msgstr "عناصر اليومية"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "دفع العميل"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1050,12 +1055,6 @@ msgstr ""
 msgid "Journal"
 msgstr "يومية"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "دفع الموردين"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1074,8 +1073,6 @@ msgstr "المبلغ الأصلي"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1135,6 +1132,12 @@ msgstr "سنة"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "بيع"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1179,7 +1182,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1190,7 +1193,7 @@ msgid "Effective date for accounting entries"
 msgstr "تاريخ فعال للمدخلات المحاسبية"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1237,8 +1240,13 @@ msgid "Open Balance"
 msgstr "فتح رصيد"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1323,6 +1331,9 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "حساب الضريبة"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "دفع الموردين"
+
 #~ msgid "Through :"
 #~ msgstr "خلال:"
 
@@ -1409,9 +1420,18 @@ msgstr ""
 #~ msgid "Accounting Voucher Entries"
 #~ msgstr "مدخلات قسيمة المحاسبية"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "استلام المبيعات"
+
+#~ msgid "Customer Payment"
+#~ msgstr "دفع العميل"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "فواتير الاستيراد في بيان"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "تحليل استلام المبيعات"
+
 #~ msgid "Write-Off Comment"
 #~ msgstr "شطب التعليق"
 
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index 8d493fedfff..e21e92af1b8 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Отписване"
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "Статистика за ваучери"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Потвърждаване"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Продажба"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "Артикул от дневник"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "Отказани"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "Данък"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Проект"
 msgid "Import Invoices"
 msgstr "Импортиране на фактури"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "Период"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Доставчик"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "Дебит"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr "Бележка"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Плащане на фактура"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr "За преглед"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr "Август"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr "Октомври"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Изравнена сметка"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Предишни плащания"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr "Септември"
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Плащане към доставчик"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr "Година"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Продажба"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1335,6 +1343,9 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "Изчисление на данък"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Плащане към доставчик"
+
 #~ msgid "Through :"
 #~ msgstr "Чрез :"
 
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index eb4fbc20346..d7cbeddaa01 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index aaceae6d515..a491c85c16b 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Desajust"
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Estadístiques de comprovants"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validada"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venda"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "Anotació comptable"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Cancel·lat"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -295,7 +293,7 @@ msgid "Tax"
 msgstr "Impost"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -317,6 +315,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -340,6 +343,12 @@ msgstr "Esborrany"
 msgid "Import Invoices"
 msgstr "Importa les factures"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -354,7 +363,7 @@ msgid "Receipt"
 msgstr "Rebut"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -375,6 +384,8 @@ msgstr "Període"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Proveïdor"
 
@@ -394,7 +405,7 @@ msgid "Debit"
 msgstr "Deure"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -422,6 +433,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Comprovants"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -442,13 +465,6 @@ msgstr "Anotació"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Rebut de vendes"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -489,13 +505,13 @@ msgid "Avg. Due Delay"
 msgstr "Retard mig del deute"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Paga factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "No codi base comptable i codi d'impost comptable!"
@@ -549,15 +565,15 @@ msgid "To Review"
 msgstr "Per revisa"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -654,7 +670,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -699,6 +715,11 @@ msgstr ""
 msgid "August"
 msgstr "Agost"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -712,7 +733,7 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -732,6 +753,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -769,24 +797,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Import conciliat"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -803,6 +813,12 @@ msgstr "De/Ha"
 msgid "Previous Payments ?"
 msgstr "Pagaments previs?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -830,14 +846,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -845,12 +870,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -913,13 +932,6 @@ msgstr "Setembre"
 msgid "Sales Information"
 msgstr "Informació de vendes"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Anàlisi de cobraments de vendes"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -962,18 +974,11 @@ msgid "Journal Items"
 msgstr "Apunts comptables"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pagament del client"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1051,12 +1056,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diari"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pagament del proveïdor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1075,8 +1074,6 @@ msgstr "Import original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1136,6 +1133,12 @@ msgstr "Any"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venda"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1180,7 +1183,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1191,7 +1194,7 @@ msgid "Effective date for accounting entries"
 msgstr "Data efectiva per entrades comptables."
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1238,8 +1241,13 @@ msgid "Open Balance"
 msgstr "Obre balanç"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1535,6 +1543,9 @@ msgstr ""
 #~ msgid "Unreconciliation"
 #~ msgstr "Trenca conciliació"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Rebut de vendes"
+
 #~ msgid ""
 #~ "The supplier payment form allows you to track the payment you do to your "
 #~ "suppliers. When you select a supplier, the payment method and an amount for "
@@ -1570,10 +1581,16 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "Calcula impostos"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pagament del proveïdor"
+
 #, python-format
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Defineix una seqüència en el diari!"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Anàlisi de cobraments de vendes"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importa factures en extracte"
 
@@ -1658,6 +1675,9 @@ msgstr ""
 #~ "            \n"
 #~ "* L'estat \"Cancel·lat\" s'utilitza quan l'usuari cancel·la el rebut."
 
+#~ msgid "Customer Payment"
+#~ msgstr "Pagament del client"
+
 #~ msgid ""
 #~ "If you unreconciliate transactions, you must also verify all the actions "
 #~ "that are linked to those transactions because they will not be disable"
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index c51095f3fa9..a28b9852056 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/da.po b/addons/account_voucher/i18n/da.po
index 5e0bf8e98b2..27e7437acf4 100644
--- a/addons/account_voucher/i18n/da.po
+++ b/addons/account_voucher/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 8b5f7898867..86366bffa70 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 15:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Abschreibung"
@@ -66,16 +66,6 @@ msgstr "Berechnet als Differenz zwischen Belege und Belegzeilen"
 msgid "(Update)"
 msgstr "(Aktualisieren)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"Sie müssen Bankauszug Positionen für manuell abgeglichen Positionen löschen. "
-"Bitte überprüfen Sie die Zahlung des Partners % s in Höhe des Betrag % s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -140,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Statistik Zahlungsbelege"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -154,6 +144,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Bestätigen"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -224,10 +220,10 @@ msgid "Messages"
 msgstr "Mitteilungen"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Verkauf"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -235,8 +231,8 @@ msgid "Journal Item"
 msgstr "Journal Buchung"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -263,7 +259,7 @@ msgid "Cancelled"
 msgstr "Abgebrochen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -314,7 +310,7 @@ msgid "Tax"
 msgstr "Steuer"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Diese Aktion ist fehlerhaft !"
@@ -339,6 +335,11 @@ msgstr ""
 "Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt "
 "zu werden."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Gesamte Zuordnung"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -362,6 +363,12 @@ msgstr "Entwurf"
 msgid "Import Invoices"
 msgstr "Importiere Rechnungen"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -376,7 +383,7 @@ msgid "Receipt"
 msgstr "Zahlungsbestätigung"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -400,6 +407,8 @@ msgstr "Periode"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Lieferant"
 
@@ -419,7 +428,7 @@ msgid "Debit"
 msgstr "Konto belasten (Soll)"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Es ist nicht möglich das Journal zu ändern !"
@@ -447,6 +456,18 @@ msgstr "Pro-Forma Belege"
 msgid "Voucher Entries"
 msgstr "Zahlungsbeleg Buchungen"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -469,13 +490,6 @@ msgstr ""
 "Wollen Sie den Ausgleich wirklich rückgängig machen und den Datensatz "
 "stornieren / löschen"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Buchen von Einnahmen"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -523,13 +537,13 @@ msgid "Avg. Due Delay"
 msgstr "Durch. Zahlungsverzug"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Zahle Rechnung"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Kein Steuerfinanzkonto und Steuerkonto definiert!"
@@ -593,15 +607,15 @@ msgid "To Review"
 msgstr "Zu Prüfen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "Ändern"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -703,7 +717,7 @@ msgid "Reconcile Payment Balance"
 msgstr "OP-Ausgleich Saldo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Konfigurationsfehler !"
@@ -748,6 +762,11 @@ msgstr "oder"
 msgid "August"
 msgstr "August"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -763,7 +782,7 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Bitte aktivieren Sie die Nummernfolge für das gewählte Journal !"
@@ -783,6 +802,13 @@ msgstr "Wechselkurs der Zahlung"
 msgid "Paid"
 msgstr "Bezahlt"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -820,32 +846,6 @@ msgstr "Bezahlter Betrag in Unternehmenswährung"
 msgid "Amount reconciled"
 msgstr "Betrag Ausgeglichen"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                 Klicken Sie zur Eingabe einer Lieferanten Zahlung.\n"
-"               </ p>\n"
-"                 OpenERP hilft bei der Ermittlung der offenen Rechnungen für "
-"Zahlungsvorschläge \n"
-"                 und hilft bei der Verfolgung von Zahlungen .\n"
-"               </ p>\n"
-"            "
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -862,6 +862,12 @@ msgstr "S/H"
 msgid "Previous Payments ?"
 msgstr "Vorherige Zahlungen?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -889,27 +895,30 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Bitte definieren Sie eine Nummernfolge für dieses Journal."
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Gesamte Zuordnung"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Gruppiert je Rechnungsdatum"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Falsche Bankauszugposition"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -972,13 +981,6 @@ msgstr "September"
 msgid "Sales Information"
 msgstr "Information Umsatz"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Statistik Einnahmen"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -1021,20 +1023,13 @@ msgid "Journal Items"
 msgstr "Buchungsjournale"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 "Bitte definieren Sie je ein Standard  Soll / Haben Konto für das Journal "
 "\"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Buchen von Einzahlungen"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1125,12 +1120,6 @@ msgstr "Verkauf Buchungsbelege"
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Lieferantenzahlung"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1149,8 +1138,6 @@ msgstr "Ursprünglicher Betrag"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Einkauf Bestätigung"
 
@@ -1210,6 +1197,12 @@ msgstr "Jahr"
 msgid "Gain Exchange Rate Account"
 msgstr "Kursverlust Konto"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Verkauf"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1256,7 +1249,7 @@ msgstr ""
 "Bankauszug."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Offene oder bezahlte Belege können nicht storniert werden"
@@ -1267,7 +1260,7 @@ msgid "Effective date for accounting entries"
 msgstr "Tatsächliches Buchungsdatum"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Status Änderung"
 
@@ -1314,8 +1307,13 @@ msgid "Open Balance"
 msgstr "Offener Saldo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Unzureichende Konfiguration !"
@@ -1631,12 +1629,18 @@ msgstr ""
 #~ msgid "Accounting Voucher Entries"
 #~ msgstr "Zahlungsbeleg Buchungen"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Buchen von Einnahmen"
+
 #~ msgid "Cr/Dr"
 #~ msgstr "Buchung Partner"
 
 #~ msgid "Audit Complete ?"
 #~ msgstr "Kontoabstimmung?"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Buchen von Einzahlungen"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Rechnungen in Bankauszug importieren"
 
@@ -1702,6 +1706,9 @@ msgstr ""
 #~ msgid "Write-Off Comment"
 #~ msgstr "Abschreibungsgrund"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Lieferantenzahlung"
+
 #~ msgid "Reconcile with Write-Off"
 #~ msgstr "Ausgleichen mit Abschreibung"
 
@@ -1730,6 +1737,9 @@ msgstr ""
 #~ msgid "Voucher Date"
 #~ msgstr "Zahlungsbeleg Datum"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Statistik Einnahmen"
+
 #~ msgid "Voucher State"
 #~ msgstr "Status Zahlungsbeleg"
 
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index 88023d5b2cf..3b7fe538837 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Παραγραφή"
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Επικύρωση"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Πώληση"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "Στοιχείο Ημερολογίου"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr "Φόρος"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "Πρόχειρο"
 msgid "Import Invoices"
 msgstr "Εισαγωγή Τιμολογίων"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr "Απόδειξη"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "Περίοδος"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Πριμηθευτής"
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "Χρέωση"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Εγγραφές Παραστατικών"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr "Υπενθυμίσεις"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Απόδειξη Πώλησης"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Τιμολόγιο Πληρωμής"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr "Για Επισκόπηση"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr "Αύγουστος"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr "Οκτώβριος"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Συμφωνημένο ποσό"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr "Χ/Π"
 msgid "Previous Payments ?"
 msgstr "Προηγούμενες Πληρωμές ;"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr "Σεπτέμβριος"
 msgid "Sales Information"
 msgstr "Πληροφορίες Πώλησης"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr "Στοιχεία Ημερολογίου"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Πληρωμή Πελάτη"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr "Αρχεικό Ποσό"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr "Έτος"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Πώληση"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr "Ανοιχτό Ισοζύγιο"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1486,6 +1494,9 @@ msgstr ""
 #~ msgid "Date:"
 #~ msgstr "Ημερομηνία:"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Απόδειξη Πώλησης"
+
 #~ msgid "Number:"
 #~ msgstr "Αριθμός:"
 
@@ -1495,6 +1506,9 @@ msgstr ""
 #~ msgid "Payment Terms"
 #~ msgstr "Όροι Πληρωμής"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Πληρωμή Πελάτη"
+
 #~ msgid "Unreconciliation transactions"
 #~ msgstr "Ασυμβίβαστες συναλλαγές"
 
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 8d440ec5a69..ed96b74c095 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 12:02+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "Parámetros de configuración contable"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
@@ -67,17 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(Actualizar)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"Tiene que borrar manualmente la línea del extracto bancario con la que fue "
-"conciliado el pago. Por favor verifique el pago de la empresa %s por la "
-"cantidad de %s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -142,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Estadísticas de comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -156,6 +145,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -226,10 +221,10 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venta"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -237,8 +232,8 @@ msgid "Journal Item"
 msgstr "Apunte contable"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -265,7 +260,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -316,7 +311,7 @@ msgid "Tax"
 msgstr "Impuesto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "¡Acción no válida!"
@@ -340,6 +335,11 @@ msgstr ""
 "Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Asignación total"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -363,6 +363,12 @@ msgstr "Borrador"
 msgid "Import Invoices"
 msgstr "Importar facturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -377,7 +383,7 @@ msgid "Receipt"
 msgstr "Recibo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -401,6 +407,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -420,7 +428,7 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "¡Imposible cambiar el diario!"
@@ -448,6 +456,18 @@ msgstr "Comprobantes pro-forma"
 msgid "Voucher Entries"
 msgstr "Comprobantes"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -468,13 +488,6 @@ msgstr "Memoria"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "¿Está seguro de romper la conciliación y cancelar este registro?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de ventas"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -522,13 +535,13 @@ msgid "Avg. Due Delay"
 msgstr "Retraso promedio deuda"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "¡No código base contable y código impuesto contable!"
@@ -590,15 +603,15 @@ msgid "To Review"
 msgstr "A revisar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "cambio"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -699,7 +712,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Conciliar saldo del pago"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "¡Error de configuración!"
@@ -744,6 +757,11 @@ msgstr "o"
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -759,7 +777,7 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "¡Active por favor la secuencia del diario seleccionado!"
@@ -779,6 +797,13 @@ msgstr "Tasa de cambio del pago"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -816,32 +841,6 @@ msgstr "Importe pagado en la moneda de la compañía"
 msgid "Amount reconciled"
 msgstr "Importe conciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear un nuevo pago a proveedor.\n"
-"</p>\n"
-"<p>\n"
-"OpenERP  le ayuda a controlar los pagos que hace y  le recuerda su saldo con "
-"los proveedores.\n"
-"</p>\n"
-"            "
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -858,6 +857,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr "¿Pagos previos?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -885,27 +890,30 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Por favor defina una secuencia en el diario."
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Asignación total"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Agrupar por fecha factura"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Línea de extracto bancaria incorrecta."
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -968,13 +976,6 @@ msgstr "Septiembre"
 msgid "Sales Information"
 msgstr "Información de ventas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Análisis cobros de ventas"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -1017,20 +1018,13 @@ msgid "Journal Items"
 msgstr "Apuntes contables"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 "Por favor defina las cuentas de ingresos y gastos por defecto en el diario "
 "\"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pago cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1119,12 +1113,6 @@ msgstr "Recibo de ventas"
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pago del proveedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1143,8 +1131,6 @@ msgstr "Importe original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Recibo de compra"
 
@@ -1207,6 +1193,12 @@ msgstr "Año"
 msgid "Gain Exchange Rate Account"
 msgstr "Ingresos por diferencia de cambio"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venta"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1252,7 +1244,7 @@ msgstr ""
 "El importe del comprobante debe ser el mismo que el de la línea del extracto."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "No se pueden borrar comprobantes que ya están abiertos o pagados."
@@ -1263,7 +1255,7 @@ msgid "Effective date for accounting entries"
 msgstr "Fecha efectiva para entradas contables."
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Cambio de estado"
 
@@ -1310,8 +1302,13 @@ msgid "Open Balance"
 msgstr "Abrir balance"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "¡Configuraciín insuficiente!"
@@ -1603,6 +1600,9 @@ msgstr ""
 #~ msgid "Unreconciliation"
 #~ msgstr "Romper conciliación"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de ventas"
+
 #~ msgid "Currency:"
 #~ msgstr "Moneda:"
 
@@ -1628,6 +1628,9 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "¡Defina una secuencia en el diario!"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Pago cliente"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importar facturas en extracto"
 
@@ -1691,6 +1694,9 @@ msgstr ""
 #~ msgid "Write-Off Amount"
 #~ msgstr "Importe del desajuste"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pago del proveedor"
+
 #~ msgid "Reconcile with Write-Off"
 #~ msgstr "Conciliar con desajuste"
 
@@ -1731,6 +1737,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Comercial"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Análisis cobros de ventas"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index 59a810cc7a9..25bc692cf48 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-22 12:28+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Borrador"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Asientos de vouchers"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Libro diario"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/es_CR.po b/addons/account_voucher/i18n/es_CR.po
index 0101469c964..652659043fc 100644
--- a/addons/account_voucher/i18n/es_CR.po
+++ b/addons/account_voucher/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-15 15:32+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: account_voucher
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
@@ -68,14 +68,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -140,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Estadísticas de comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -152,6 +144,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -215,10 +213,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venta"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -226,8 +224,8 @@ msgid "Journal Item"
 msgstr "Apunte contable"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -254,7 +252,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -297,7 +295,7 @@ msgid "Tax"
 msgstr "Impuesto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -319,6 +317,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Asignación Total"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -342,6 +345,12 @@ msgstr "Borrador"
 msgid "Import Invoices"
 msgstr "Importar facturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -356,7 +365,7 @@ msgid "Receipt"
 msgstr "Recibo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -377,6 +386,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -396,7 +407,7 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -424,6 +435,18 @@ msgstr "Pro-Forma de Comprobante"
 msgid "Voucher Entries"
 msgstr "Comprobantes"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -444,13 +467,6 @@ msgstr "Memoria"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "¿Está seguro que desea no conciliar y cancelar este registro?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de ventas"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -491,13 +507,13 @@ msgid "Avg. Due Delay"
 msgstr "Retraso promedio deuda"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "¡No código base contable y código impuesto contable!"
@@ -551,15 +567,15 @@ msgid "To Review"
 msgstr "A revisar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "cambio"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -658,7 +674,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Pago del saldo de conciliación"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -703,6 +719,11 @@ msgstr ""
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -718,7 +739,7 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -738,6 +759,13 @@ msgstr "Pago de Divisas"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -775,24 +803,6 @@ msgstr "Monto de pago en moneda de la compañía"
 msgid "Amount reconciled"
 msgstr "Importe conciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -809,6 +819,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr "¿Pagos previos?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -836,27 +852,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Asignación Total"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Agrupar por fecha factura"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -919,13 +938,6 @@ msgstr "Septiembre"
 msgid "Sales Information"
 msgstr "Información de ventas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Análisis cobros de ventas"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -968,18 +980,11 @@ msgid "Journal Items"
 msgstr "Apuntes contables"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pago cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1061,12 +1066,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pago del proveedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1085,8 +1084,6 @@ msgstr "Importe original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Recibo de compra"
 
@@ -1148,6 +1145,12 @@ msgstr "Año"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venta"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1192,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1203,7 +1206,7 @@ msgid "Effective date for accounting entries"
 msgstr "Fecha efectiva para entradas contables."
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1250,8 +1253,13 @@ msgid "Open Balance"
 msgstr "Abrir balance"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1317,6 +1325,9 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "¡Error!"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de ventas"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "¡ Acción invalida !"
@@ -1376,6 +1387,12 @@ msgstr ""
 #~ "contabilidad.\n"
 #~ "* El estado \"Cancelado\" se utiliza cuando el usuario cancela el recibo."
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Análisis cobros de ventas"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Pago cliente"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importar facturas en extracto"
 
@@ -1392,6 +1409,9 @@ msgstr ""
 #~ "de búsqueda también se puede utilizar para personalizar los informes de las "
 #~ "facturas y por tanto, adaptar este análisis a sus necesidades."
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pago del proveedor"
+
 #~ msgid "Voucher State"
 #~ msgstr "Estado comprobante"
 
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index d494ef8eebb..027326a385b 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 03:47+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Ajuste"
@@ -65,14 +65,6 @@ msgstr "Diferencia entre el monto del comprobante y la suma del detalle"
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "Estadísticas de Comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venta"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "Items de Diario"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -294,7 +292,7 @@ msgid "Tax"
 msgstr "Impuesto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -316,6 +314,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Asignación"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -339,6 +342,12 @@ msgstr "Borrador"
 msgid "Import Invoices"
 msgstr "Importar Facturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -353,7 +362,7 @@ msgid "Receipt"
 msgstr "Recibo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -374,6 +383,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -393,7 +404,7 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -421,6 +432,18 @@ msgstr "Proforma"
 msgid "Voucher Entries"
 msgstr "Comprobantes"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -441,13 +464,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Seguro de romper conciliación y cancelar este registro ?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de Venta"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -488,13 +504,13 @@ msgid "Avg. Due Delay"
 msgstr "Retraso promedio deuda"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar Factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "No hay cuenta base ni cuenta de impuesto"
@@ -548,15 +564,15 @@ msgid "To Review"
 msgstr "A revisar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "cambio"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -653,7 +669,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Conciliar Saldo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -698,6 +714,11 @@ msgstr ""
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -713,7 +734,7 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -733,6 +754,13 @@ msgstr "Tasa de pago"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -770,24 +798,6 @@ msgstr "Monto Pagado"
 msgid "Amount reconciled"
 msgstr "Monto conciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -804,6 +814,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr "Pagos Previos ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -831,27 +847,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Asignación"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Agrupar por fecha de factura"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -914,13 +933,6 @@ msgstr "Septiembre"
 msgid "Sales Information"
 msgstr "Información de Ventas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Ventas: Analisis de Recibos"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -963,18 +975,11 @@ msgid "Journal Items"
 msgstr "Items de Diario"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pago de Cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1055,12 +1060,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pago a Proveedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1079,8 +1078,6 @@ msgstr "Monto Inicial"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Recibos de Compra"
 
@@ -1142,6 +1139,12 @@ msgstr "Año"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venta"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1186,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1197,7 +1200,7 @@ msgid "Effective date for accounting entries"
 msgstr "Fecha de vigencia de asientos contables"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1244,8 +1247,13 @@ msgid "Open Balance"
 msgstr "Abrir Balance"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1528,6 +1536,9 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "Error !"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de Venta"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Acción Inválida !"
@@ -1560,6 +1571,9 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Por favor defina una secuencia en el diario !"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Pago de Cliente"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importar Facturas en Extracto"
 
@@ -1648,6 +1662,9 @@ msgstr ""
 #~ msgid "Reconcile with Write-Off"
 #~ msgstr "Conciliar con desajuste"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pago a Proveedor"
+
 #~ msgid "Write-Off Comment"
 #~ msgstr "Comentario del desajuste"
 
@@ -1667,6 +1684,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Vendedor"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Ventas: Analisis de Recibos"
+
 #~ msgid "Voucher State"
 #~ msgstr "Estado de Comprobante"
 
diff --git a/addons/account_voucher/i18n/es_PY.po b/addons/account_voucher/i18n/es_PY.po
index 6d40abba07a..5f530e7e3f9 100644
--- a/addons/account_voucher/i18n/es_PY.po
+++ b/addons/account_voucher/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-07 15:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Cancelar Dividas"
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Estadísticas de comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Ventas"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "Registro diario"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -295,7 +293,7 @@ msgid "Tax"
 msgstr "Impuestos"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -317,6 +315,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -340,6 +343,12 @@ msgstr "Borrador"
 msgid "Import Invoices"
 msgstr "Importar facturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -354,7 +363,7 @@ msgid "Receipt"
 msgstr "Recibo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -375,6 +384,8 @@ msgstr "Periodo"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -394,7 +405,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -422,6 +433,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Comprobantes"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -442,13 +465,6 @@ msgstr "Memoria"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de ventas"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -489,13 +505,13 @@ msgid "Avg. Due Delay"
 msgstr "Retraso promedio deuda"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "¡No código base contable y código impuesto contable!"
@@ -549,15 +565,15 @@ msgid "To Review"
 msgstr "A revisar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -654,7 +670,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -699,6 +715,11 @@ msgstr ""
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -712,7 +733,7 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -732,6 +753,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -769,24 +797,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Importe conciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -803,6 +813,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "¿Pagos previos?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -830,14 +846,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -845,12 +870,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -913,13 +932,6 @@ msgstr "Setiembre"
 msgid "Sales Information"
 msgstr "Información de ventas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Análisis cobros de ventas"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -962,18 +974,11 @@ msgid "Journal Items"
 msgstr "Registros del diario"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pago cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1051,12 +1056,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pago del proveedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1075,8 +1074,6 @@ msgstr "Importe original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1136,6 +1133,12 @@ msgstr "Año"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Ventas"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1180,7 +1183,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1191,7 +1194,7 @@ msgid "Effective date for accounting entries"
 msgstr "Fecha efectiva para entradas contables."
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1238,8 +1241,13 @@ msgid "Open Balance"
 msgstr "Abrir balance"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1342,6 +1350,9 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "¡Error!"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de ventas"
+
 #~ msgid "Want to remove accounting entries too ?"
 #~ msgstr "¿También desea eliminar asientos contables?"
 
@@ -1422,9 +1433,18 @@ msgstr ""
 #~ "contabilidad.\n"
 #~ "* El estado \"Cancelado\" se utiliza cuando el usuario cancela el recibo."
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pago del proveedor"
+
 #~ msgid "Through :"
 #~ msgstr "A través de :"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Análisis cobros de ventas"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Pago cliente"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importar facturas en extracto"
 
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 8d672a9c776..a690e0c9f11 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-09 16:29+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Panga sissetulekuorder"
@@ -42,7 +42,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Mahakandmine"
@@ -80,14 +80,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -152,7 +144,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -164,6 +156,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -227,9 +225,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -238,8 +236,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -266,7 +264,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -307,7 +305,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -329,6 +327,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -352,6 +355,12 @@ msgstr "Mustand"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -366,7 +375,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -387,6 +396,8 @@ msgstr "Periood"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -406,7 +417,7 @@ msgid "Debit"
 msgstr "Deebet"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -434,6 +445,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Tähiku kirjed"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -454,13 +477,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -501,13 +517,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -561,15 +577,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -666,7 +682,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -711,6 +727,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -724,7 +745,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -744,6 +765,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -781,24 +809,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -815,6 +825,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -842,14 +858,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -857,12 +882,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -925,13 +944,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -974,18 +986,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1063,12 +1068,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Päevik"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1087,8 +1086,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1148,6 +1145,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1192,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1203,7 +1206,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1250,8 +1253,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/fa.po b/addons/account_voucher/i18n/fa.po
index efb11875287..82640115e6e 100644
--- a/addons/account_voucher/i18n/fa.po
+++ b/addons/account_voucher/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-18 16:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 07fb2f675f0..24b4e521c1d 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 15:43+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustement"
@@ -67,17 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(Mise à jour)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"Vous devez supprimer manuellement la ligne de relevé bancaire correspondant "
-"au règlement et à son lettrage. Recherchez un paiement du partenaire %s et "
-"d'un montant de %s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -142,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Statistiques des justificatifs comptables"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -155,6 +144,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Valider"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -226,10 +221,10 @@ msgid "Messages"
 msgstr "Messages"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Vente"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -237,8 +232,8 @@ msgid "Journal Item"
 msgstr "Écriture comptable"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Erreur !"
@@ -265,7 +260,7 @@ msgid "Cancelled"
 msgstr "Annulé"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -316,7 +311,7 @@ msgid "Tax"
 msgstr "Taxe"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Action invalide !"
@@ -338,6 +333,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Allocation totale"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -361,6 +361,12 @@ msgstr "Brouillon"
 msgid "Import Invoices"
 msgstr "Importer les factures"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -375,7 +381,7 @@ msgid "Receipt"
 msgstr "Reçu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -399,6 +405,8 @@ msgstr "Période"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Fournisseur"
 
@@ -418,7 +426,7 @@ msgid "Debit"
 msgstr "Débit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Impossible de changer de journal !"
@@ -446,6 +454,18 @@ msgstr "Reçus pro-forma"
 msgid "Voucher Entries"
 msgstr "Saisie de justificatifs"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -466,13 +486,6 @@ msgstr "Mémo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Êtes-vous sûr de vouloir délettrer et annuler cette entrée?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Reçu de ventes"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -513,13 +526,13 @@ msgid "Avg. Due Delay"
 msgstr "Délai moyen de règlement"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Payer la facture"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Aucun code comptable de base et aucun code comptable de taxe !"
@@ -573,15 +586,15 @@ msgid "To Review"
 msgstr "À vérifier"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "modifier"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -683,7 +696,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Lettrer la balance de paiement"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Erreur de configuration !"
@@ -728,6 +741,11 @@ msgstr "ou"
 msgid "August"
 msgstr "Août"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -743,7 +761,7 @@ msgid "October"
 msgstr "Octobre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Veuillez activer la sequence du journal sélectionné"
@@ -763,6 +781,13 @@ msgstr "Taux de change du paiement"
 msgid "Paid"
 msgstr "Réglé"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -800,24 +825,6 @@ msgstr "Montant réglé dans la devise de la société"
 msgid "Amount reconciled"
 msgstr "Montant réconcilié"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaires et courriels"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -834,6 +841,12 @@ msgstr "D/C"
 msgid "Previous Payments ?"
 msgstr "Règlements précédents ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -861,27 +874,30 @@ msgid "Active"
 msgstr "Actif"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Veuillez définir une séquence sur ce journal"
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Allocation totale"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Grouper par date de facturation"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Mauvaise ligne de relevé"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -944,13 +960,6 @@ msgstr "Septembre"
 msgid "Sales Information"
 msgstr "Information sur les ventes"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Analyse des reçus de ventes"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -993,20 +1002,13 @@ msgid "Journal Items"
 msgstr "Ècritures comptable"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 "Veuillez définir par un compte de débit et de crédit par défaut sur le "
 "journal \"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Paiements client"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1088,12 +1090,6 @@ msgstr "Règlement Client"
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Paiement fournisseur"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1112,8 +1108,6 @@ msgstr "Montant original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Reçu d'achat"
 
@@ -1176,6 +1170,12 @@ msgstr "Année"
 msgid "Gain Exchange Rate Account"
 msgstr "Compte de gain de change"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Vente"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1221,7 +1221,7 @@ msgstr ""
 "Le montant du règlement doit être le même que sur la ligne du relevé bancaire"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Impossible de supprimer des règlements à l'état ouvert ou payé"
@@ -1232,7 +1232,7 @@ msgid "Effective date for accounting entries"
 msgstr "Date effective pour les pièces comptables"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Changement de statut"
 
@@ -1279,8 +1279,13 @@ msgid "Open Balance"
 msgstr "Restant dû"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Configuration insuffisante !"
@@ -1492,6 +1497,9 @@ msgstr ""
 #~ msgid "Date:"
 #~ msgstr "Date:"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Reçu de ventes"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Action incorrecte !"
@@ -1505,6 +1513,12 @@ msgstr ""
 #~ msgid "Payment Terms"
 #~ msgstr "Conditions de paiement"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Paiement fournisseur"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Analyse des reçus de ventes"
+
 #~ msgid "State:"
 #~ msgstr "État:"
 
@@ -1619,6 +1633,9 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Veuillez définir une séquence pour ce journal !"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Paiements client"
+
 #~ msgid "Voucher Print"
 #~ msgstr "Imprimer le justificatif"
 
diff --git a/addons/account_voucher/i18n/gl.po b/addons/account_voucher/i18n/gl.po
index b407863e479..405737e7bcb 100644
--- a/addons/account_voucher/i18n/gl.po
+++ b/addons/account_voucher/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Desaxuste"
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Estatísticas de comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venda"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "Rexistro diario"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Anulado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -295,7 +293,7 @@ msgid "Tax"
 msgstr "Imposto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -317,6 +315,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -340,6 +343,12 @@ msgstr "Borrador"
 msgid "Import Invoices"
 msgstr "Importar facturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -354,7 +363,7 @@ msgid "Receipt"
 msgstr "Recibo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -375,6 +384,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Provedor"
 
@@ -394,7 +405,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -422,6 +433,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Comprobantes"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -442,13 +465,6 @@ msgstr "Nota"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de vendas"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -489,13 +505,13 @@ msgid "Avg. Due Delay"
 msgstr "Atraso medio débeda"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Non código base contable nin código imposto contable!"
@@ -549,15 +565,15 @@ msgid "To Review"
 msgstr "A revisar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -654,7 +670,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -699,6 +715,11 @@ msgstr ""
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -712,7 +733,7 @@ msgid "October"
 msgstr "Outubro"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -732,6 +753,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -769,24 +797,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Importe conciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -803,6 +813,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Pagamentos previos?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -830,14 +846,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -845,12 +870,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -913,13 +932,6 @@ msgstr "Setembro"
 msgid "Sales Information"
 msgstr "Información de vendas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Análise cobramentos de vendas"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -962,18 +974,11 @@ msgid "Journal Items"
 msgstr "Elementos do Diario"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pagamento cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1051,12 +1056,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pagamento do provedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1075,8 +1074,6 @@ msgstr "Importe orixinal"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1136,6 +1133,12 @@ msgstr "Ano"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venda"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1180,7 +1183,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1191,7 +1194,7 @@ msgid "Effective date for accounting entries"
 msgstr "Data efectiva para entradas contables."
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1238,8 +1241,13 @@ msgid "Open Balance"
 msgstr "Abrir balance"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1356,6 +1364,9 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "Erro!"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de vendas"
+
 #~ msgid "Want to remove accounting entries too ?"
 #~ msgstr "Desexa tamén eliminar os asentamentos contables?"
 
@@ -1416,6 +1427,9 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Defina unha secuencia no diario!"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pagamento do provedor"
+
 #~ msgid ""
 #~ " * The 'Draft' state is used when a user is encoding a new and unconfirmed "
 #~ "Voucher.                         \n"
@@ -1436,6 +1450,12 @@ msgstr ""
 #~ msgid "Through :"
 #~ msgstr "A través de:"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Análise cobramentos de vendas"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Pagamento cliente"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importar facturas en extracto"
 
diff --git a/addons/account_voucher/i18n/gu.po b/addons/account_voucher/i18n/gu.po
index 2625e48b9cd..a82d9323d3d 100644
--- a/addons/account_voucher/i18n/gu.po
+++ b/addons/account_voucher/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-06 18:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "રદ થયેલ"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "ડ્રાફ્ટ"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "અવધિ"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "ઉધાર"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr "મેમો"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr "ઑગસ્ટ"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr "ઑક્ટોબર"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr "સપ્ટેમ્બર"
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "રોજનામું"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr "વર્ષ"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/hi.po b/addons/account_voucher/i18n/hi.po
index ef5a23f0bcb..f0a1c83d6d4 100644
--- a/addons/account_voucher/i18n/hi.po
+++ b/addons/account_voucher/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-20 08:45+0000\n"
 "Last-Translator: Sanjay Kumar <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "प्रदायक"
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index f4c01b81724..d82e000f2c1 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "Statistike vaučera"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Potvrdi"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Prodaja"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "Stavka dnevnika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "Otkazani"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "Porez"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Nacrt"
 msgid "Import Invoices"
 msgstr "Uvoz računa"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr "Receipt"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "Period"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "Duguje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Stavke vaučera"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Izdani vaučeri"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr "Pros. dugovanje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Plaćanje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr "Za provjeru"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr "Kolovoz"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr "Listopad"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Zatvoreni iznos"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr "Predhodna plaćanja ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr "Rujan"
 msgid "Sales Information"
 msgstr "Informacije o prodaji"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Analiza izdanih vaučera"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr "Stavke glavne knjige"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Plaćanja kupaca"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Plaćanja dobavljačima"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr "Originalni iznos"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr "Godina"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Prodaja"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr "Effective date for accounting entries"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr "Otvoreni saldo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1307,6 +1315,9 @@ msgstr ""
 #~ msgid "Unreconciliation"
 #~ msgstr "Poništavanje zatvaranja IOS-a"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Izdani vaučeri"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
@@ -1351,6 +1362,12 @@ msgstr ""
 #~ "temeljnica    \n"
 #~ " * U stanju 'Otkazan' su nevažeći vaučeri"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Analiza izdanih vaučera"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Plaćanja kupaca"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Uvezi račune na nalog"
 
@@ -1365,6 +1382,9 @@ msgstr ""
 #~ "Pregled fakturiranih iznosa i kašnjenja plaćanja. Za prilagodbu izvještaja "
 #~ "vašim potrebama koristite funkcionalnosti traženja i grupiranja."
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Plaćanja dobavljačima"
+
 #~ msgid "Voucher State"
 #~ msgstr "Stanje vaučera"
 
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 16b255d9b10..b88c674ebb4 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Különbözet leírása"
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "Nyugta statisztika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Jóváhagyás"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Értékesítés"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "Könyvelési tételsor"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "Érvénytelenített"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -294,7 +292,7 @@ msgid "Tax"
 msgstr "ÁFA"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -316,6 +314,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -339,6 +342,12 @@ msgstr "Tervezet"
 msgid "Import Invoices"
 msgstr "Számlák importálása"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -353,7 +362,7 @@ msgid "Receipt"
 msgstr "Befizetés"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -374,6 +383,8 @@ msgstr "Időszak"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Szállító"
 
@@ -393,7 +404,7 @@ msgid "Debit"
 msgstr "Tartozik"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -421,6 +432,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Nyugta tételek"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -441,13 +464,6 @@ msgstr "Megnevezés"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Nyugta"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -488,13 +504,13 @@ msgid "Avg. Due Delay"
 msgstr "Álagos fizetési határidő"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Számla kifizetése"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Nincs adóalapgyűjtő kód és adógyűjtő kód!"
@@ -548,15 +564,15 @@ msgid "To Review"
 msgstr "Ellenőrizendő"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -653,7 +669,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -698,6 +714,11 @@ msgstr ""
 msgid "August"
 msgstr "Augusztus"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -711,7 +732,7 @@ msgid "October"
 msgstr "Október"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -731,6 +752,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -768,24 +796,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Párosított összeg"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -802,6 +812,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Előző kifizetések ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -829,14 +845,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -844,12 +869,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -912,13 +931,6 @@ msgstr "Szeptember"
 msgid "Sales Information"
 msgstr "Értékesítési információ"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Értékesítési nyugta elemzés"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -961,18 +973,11 @@ msgid "Journal Items"
 msgstr "Könyvelési tételsorok"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Vevői befizetések"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1050,12 +1055,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Napló"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Szállítói kifizetések"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1074,8 +1073,6 @@ msgstr "Eredeti összeg"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1135,6 +1132,12 @@ msgstr "Év"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Értékesítés"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1179,7 +1182,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1190,7 +1193,7 @@ msgid "Effective date for accounting entries"
 msgstr "Könyvelési tételek teljesítési dátuma"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1237,8 +1240,13 @@ msgid "Open Balance"
 msgstr "Nyitott egyenleg"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1300,6 +1308,9 @@ msgstr ""
 #~ msgid "Want to remove accounting entries too ?"
 #~ msgstr "A könyvelési tételeket is törölni szeretné?"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Nyugta"
+
 #~ msgid "Unreconciliation"
 #~ msgstr "Párosítás visszavonása"
 
@@ -1350,6 +1361,9 @@ msgstr ""
 #~ "a nyugta jóváhagyásra kerül, a könyvelési tételek automatikusan létrejönnek "
 #~ "és Ön berögzítheti a vevői befizetéseket erre a nyugtára."
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Értékesítési nyugta elemzés"
+
 #~ msgid "Voucher State"
 #~ msgstr "Nyugta állapot"
 
@@ -1414,6 +1428,9 @@ msgstr ""
 #~ msgid "Audit Complete ?"
 #~ msgstr "Befejezte az ellenőrzést?"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Vevői befizetések"
+
 #~ msgid ""
 #~ "If you unreconciliate transactions, you must also verify all the actions "
 #~ "that are linked to those transactions because they will not be disable"
@@ -1437,6 +1454,9 @@ msgstr ""
 #~ "    * csekk nyilvántartás\n"
 #~ "    "
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Szállítói kifizetések"
+
 #~ msgid "Through :"
 #~ msgstr "Által :"
 
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index dcbf0e5c0ce..b880bc5c7d0 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-01-02 20:15+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Draft"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "Debit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index 6fc2f6fb9e0..fabab9fe568 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-16 22:28+0000\n"
 "Last-Translator: Luca Crea – EUROPA s.a.s. <Unknown>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Storno"
@@ -67,17 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(Aggiorna)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"E' necessario eliminare la registrazione contabile il cui pagamento è stato "
-"riconciliato a manuale. Verificare il pagamento del partner %s per "
-"l'ammontare di %s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -142,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Statistiche Voucher"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -156,6 +145,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Valida"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -228,10 +223,10 @@ msgid "Messages"
 msgstr "Messaggi"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Vendita"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -239,8 +234,8 @@ msgid "Journal Item"
 msgstr "Voce sezionale"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -267,7 +262,7 @@ msgid "Cancelled"
 msgstr "Annullato"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -317,7 +312,7 @@ msgid "Tax"
 msgstr "Tassa"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Azione non valida!"
@@ -341,6 +336,11 @@ msgstr ""
 "Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Totale Importo"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -364,6 +364,12 @@ msgstr "Bozza"
 msgid "Import Invoices"
 msgstr "Importa fatture"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -378,7 +384,7 @@ msgid "Receipt"
 msgstr "Ricevuta"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -402,6 +408,8 @@ msgstr "Periodo"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Fornitore"
 
@@ -421,7 +429,7 @@ msgid "Debit"
 msgstr "Debito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Impossibile cambiare il sezionale !"
@@ -449,6 +457,18 @@ msgstr "Vouchers Proforma"
 msgid "Voucher Entries"
 msgstr "Registrazioni Voucher"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -469,13 +489,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Sicuro di voler annullare la riconciliazione?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Ricevute di vendita"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -524,13 +537,13 @@ msgid "Avg. Due Delay"
 msgstr "Tempo medio dilazione"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Paga fattura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Mancano Codici di conto di mastro e Codici di conto imposta!"
@@ -594,15 +607,15 @@ msgid "To Review"
 msgstr "Da rivedere"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "cambia"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -702,7 +715,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Rinconcilia saldo pagamento"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Errore di configurazione!"
@@ -747,6 +760,11 @@ msgstr "o"
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -762,7 +780,7 @@ msgid "October"
 msgstr "Ottobre"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Si prega di attivare la sequenza del sezionale selezionato!"
@@ -782,6 +800,13 @@ msgstr "Cambio valuta del pagamento"
 msgid "Paid"
 msgstr "Pagato"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -819,32 +844,6 @@ msgstr "Importo Pagato in Valuta Aziendale"
 msgid "Amount reconciled"
 msgstr "Importo riconciliato"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliccare per creare un nuovo pagamento a fornitore.\n"
-"              </p><p>\n"
-"                OpenERP aiuta a tracciare facilmente i pagamenti fatti e a "
-"ricordare\n"
-"                i saldi residui da pagare ai fornitori.\n"
-"              </p>\n"
-"            "
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -861,6 +860,12 @@ msgstr "Debito/Credito"
 msgid "Previous Payments ?"
 msgstr "Pagamenti precedenti ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -888,27 +893,30 @@ msgid "Active"
 msgstr "Attivo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "E' necessario definire una sequenza per il sezionale."
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Totale Importo"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Raggruppa per Data Fattura"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Riga registrazione bancaria errata"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -971,13 +979,6 @@ msgstr "Settembre"
 msgid "Sales Information"
 msgstr "Informazioni vendite"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Analisi delle ricevute di vendita"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -1020,19 +1021,12 @@ msgid "Journal Items"
 msgstr "Voci sezionale"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 "Si prega di definire i conti credito/debito di default nel sezionale \"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Incassi Clienti"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1124,12 +1118,6 @@ msgstr "Ricevuta di Vendita"
 msgid "Journal"
 msgstr "Sezionale"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pagamenti Fornitori"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1148,8 +1136,6 @@ msgstr "Importo originario"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Ricevuta d'Acquisto"
 
@@ -1212,6 +1198,12 @@ msgstr "Anno"
 msgid "Gain Exchange Rate Account"
 msgstr "Conto Utili su Cambi"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Vendita"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1258,7 +1250,7 @@ msgstr ""
 "dichiarazione."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Non è possibile eliminare voucher(s) che sono già aperti o pagati."
@@ -1269,7 +1261,7 @@ msgid "Effective date for accounting entries"
 msgstr "Data effettiva per le registrazioni contabili"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Cambio di stato"
 
@@ -1316,8 +1308,13 @@ msgid "Open Balance"
 msgstr "Residuo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Configurazione Insufficiente!"
@@ -1552,6 +1549,9 @@ msgstr ""
 #~ msgid "Contra Voucher"
 #~ msgstr "Ricevuta di deposito"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Ricevute di vendita"
+
 #~ msgid "Payment Terms"
 #~ msgstr "Termini di pagamento"
 
@@ -1612,6 +1612,9 @@ msgstr ""
 #~ msgid "Supplier Vouchers"
 #~ msgstr "Voucher Fornitori"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pagamenti Fornitori"
+
 #~ msgid "Accounting Voucher Entries"
 #~ msgstr "Registrazioni Voucher"
 
@@ -1681,6 +1684,9 @@ msgstr ""
 #~ "              \n"
 #~ "* Lo stato 'Annullato' è usato quando l'utente annulla un pagamento."
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Analisi delle ricevute di vendita"
+
 #~ msgid "Are you sure to confirm this record ?"
 #~ msgstr "Confermare questo record?"
 
@@ -1720,3 +1726,6 @@ msgstr ""
 #, python-format
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Per favore definire una sequenza nel sezionale!"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Incassi Clienti"
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 8ec71dceec2..1304474af4f 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-16 19:07+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "償却"
@@ -66,14 +66,6 @@ msgstr "バウチャーで明示された金額とバウチャー行で割り当
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "バウチャー統計"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "検証"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "販売"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "仕訳帳項目"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "キャンセル済"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr "税金"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "割り当て合計"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "ドラフト"
 msgid "Import Invoices"
 msgstr "請求書インポート"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr "レシート"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "期間"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "仕入先"
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "借方"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr "プロフォーマバウチャー"
 msgid "Voucher Entries"
 msgstr "バウチャーエントリー"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr "メモ"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "このレコードを本当に消し込みしキャンセルしますか？"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "領収書"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr "平均遅延"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "請求書支払"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "アカウント基本コードとアカウント税金コードがありません。"
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr "レビュー"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "変更"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr "消し込み支払残高"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr "8月"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr "10月"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr "支払の通貨レート"
 msgid "Paid"
 msgstr "支払済"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr "会社通貨での支払済金額"
 msgid "Amount reconciled"
 msgstr "消し込み済金額"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr "借方 / 貸方"
 msgid "Previous Payments ?"
 msgstr "以前の支払ですか？"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,27 +844,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "割り当て合計"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "請求日でグループ化"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr "9月"
 msgid "Sales Information"
 msgstr "販売情報"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "領収書分析"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr "仕訳帳項目"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "顧客支払"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1051,12 +1056,6 @@ msgstr ""
 msgid "Journal"
 msgstr "仕訳帳"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "仕入先支払"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1075,8 +1074,6 @@ msgstr "元アカウント"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "領収書"
 
@@ -1136,6 +1133,12 @@ msgstr "年"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "販売"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1180,7 +1183,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1191,7 +1194,7 @@ msgid "Effective date for accounting entries"
 msgstr "会計エントリーの有効日"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1238,8 +1241,13 @@ msgid "Open Balance"
 msgstr "期首残高"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1340,6 +1348,9 @@ msgstr ""
 #~ msgid "Invalid action !"
 #~ msgstr "無効なアクションです。"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "領収書"
+
 #~ msgid ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
@@ -1377,9 +1388,15 @@ msgstr ""
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "請求書番号は会社ごとに固有である必要があります。"
 
+#~ msgid "Customer Payment"
+#~ msgstr "顧客支払"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "請求書を取引明細書にインポート"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "領収書分析"
+
 #~ msgid ""
 #~ "From this report, you can have an overview of the amount invoiced to your "
 #~ "customer as well as payment delays. The tool search can also be used to "
@@ -1410,6 +1427,9 @@ msgstr ""
 #~ "            \n"
 #~ "・ キャンセル済状態はユーザがバウチャーをキャンセルした状態です。"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "仕入先支払"
+
 #~ msgid "Expense Currency Rate"
 #~ msgstr "費用の通貨レート"
 
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 08f31f007ab..6a6e3258d72 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 15:50+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "초안"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "기간"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "차변"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "전표 엔트리"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "저널"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index c43f95da142..9bf309b6e1b 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 13:01+0000\n"
 "Last-Translator: Andrius Preimantas <andrius.preimantas@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Nurašymas"
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "Kvito statistika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Patvirtinti"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Pardavimas"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "Atšauktas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "Mokestis"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Juodraštis"
 msgid "Import Invoices"
 msgstr "Įkelti S/F"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "Periodas"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Tiekėjas"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "Debetas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Kvito eilutės"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Pardavimo kvitai"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Apmokėti sąskaitą"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr "D/K"
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Pardavimo kvitų analizė"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Kliento mokėjimai"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Žurnalas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Mokėjimai tiekėjui"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Pirkimo kvitas"
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Pardavimas"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1481,3 +1489,15 @@ msgstr ""
 
 #~ msgid "Date payment"
 #~ msgstr "Mokėjimo data"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Kliento mokėjimai"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Pardavimo kvitų analizė"
+
+#~ msgid "Sales Receipt"
+#~ msgstr "Pardavimo kvitai"
+
+#~ msgid "Supplier Payment"
+#~ msgstr "Mokėjimai tiekėjui"
diff --git a/addons/account_voucher/i18n/mn.po b/addons/account_voucher/i18n/mn.po
index b7f6758519f..b164e345016 100644
--- a/addons/account_voucher/i18n/mn.po
+++ b/addons/account_voucher/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:20+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Зөрүү"
@@ -68,14 +68,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -140,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Ваучерийн статистик"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -152,6 +144,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Батламжлах"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -215,10 +213,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Борлуулалт"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -226,8 +224,8 @@ msgid "Journal Item"
 msgstr "Журналын бичилт"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -254,7 +252,7 @@ msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -296,7 +294,7 @@ msgid "Tax"
 msgstr "Татвар"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -318,6 +316,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Нийт төлөх дүн"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -341,6 +344,12 @@ msgstr "Ноорог"
 msgid "Import Invoices"
 msgstr "Нэхэмжлэх Импортлох"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -355,7 +364,7 @@ msgid "Receipt"
 msgstr "Талон"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -376,6 +385,8 @@ msgstr "Мөчлөг"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Нийлүүлэгч"
 
@@ -395,7 +406,7 @@ msgid "Debit"
 msgstr "Дебит"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -423,6 +434,18 @@ msgstr "Урьдчилсан ваучер"
 msgid "Voucher Entries"
 msgstr "Ваучерийн бичилт"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -443,13 +466,6 @@ msgstr "Санамж"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Тулгалтыг арилгаж, бичлэгийг устгахдаа та итгэлтэй байна уу ?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Борлуулалтын төлбөрийн баримт"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -490,13 +506,13 @@ msgid "Avg. Due Delay"
 msgstr "Дундаж Хугацаа Хэтрэлт"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Төлбөрийн нэхэмжлэл"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Дансны Суурь код болон Дансны Татварын Код алга байна!"
@@ -550,15 +566,15 @@ msgid "To Review"
 msgstr "Үзлэг хийх"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "зөрүү"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -656,7 +672,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Төлбөрийн үлдэгдлийг гүйцээх"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -701,6 +717,11 @@ msgstr ""
 msgid "August"
 msgstr "8-р сар"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -716,7 +737,7 @@ msgid "October"
 msgstr "10-р сар"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -736,6 +757,13 @@ msgstr "Төлбөрийн Ханшийн Валют"
 msgid "Paid"
 msgstr "Төлөгдсөн"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -773,24 +801,6 @@ msgstr "Төлөгдсөн Дүн компаний валютаар"
 msgid "Amount reconciled"
 msgstr "Тулгагдсан дүн"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -807,6 +817,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Өмнөх төлбөрүүд ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -834,27 +850,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Нийт төлөх дүн"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Нэхэмжлэлийн Огноогоор Бүлэглэх"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -917,13 +936,6 @@ msgstr "9-р сар"
 msgid "Sales Information"
 msgstr "Борлуулалтын Мэдээлэл"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Борлуулалтын төлбөрийн баримтын анализ"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -966,18 +978,11 @@ msgid "Journal Items"
 msgstr "Журналын бичилтүүд"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Захиалагчийн төлөлт"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1058,12 +1063,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Нийлүүлэгчийн Төлбөр"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1082,8 +1081,6 @@ msgstr "Жинхэнэ дүн"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Худалдан авалтын баримт"
 
@@ -1145,6 +1142,12 @@ msgstr "Жил"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Борлуулалт"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1189,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1200,7 +1203,7 @@ msgid "Effective date for accounting entries"
 msgstr "Санхүүгийн бичилт хийхэд зохистой огноо"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1247,8 +1250,13 @@ msgid "Open Balance"
 msgstr "Төлөгдөөгүй үлдэгдэл"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1420,6 +1428,9 @@ msgstr ""
 #~ msgid "year"
 #~ msgstr "жил"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Нийлүүлэгчийн Төлбөр"
+
 #~ msgid "Month-1"
 #~ msgstr "Сар-1"
 
@@ -1458,6 +1469,9 @@ msgstr ""
 #~ msgid "Income Currency Rate"
 #~ msgstr "Ханшийн зөрүүний олзын данс"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Захиалагчийн төлөлт"
+
 #~ msgid ""
 #~ "When you sell products to a customer, you can give him a sales receipt or an "
 #~ "invoice. When the sales receipt is confirmed, it creates journal items "
@@ -1468,3 +1482,9 @@ msgstr ""
 #~ "баримт эсвэл нэхэмжлэл өгөх боломжтой. Борлуулалтын төлбөрийн баримт "
 #~ "батлагдмагц тухайн борлуулалттай холбоотой төлбөрийн журналын бичилт "
 #~ "автоматаар үүснэ."
+
+#~ msgid "Sales Receipt"
+#~ msgstr "Борлуулалтын төлбөрийн баримт"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Борлуулалтын төлбөрийн баримтын анализ"
diff --git a/addons/account_voucher/i18n/nb.po b/addons/account_voucher/i18n/nb.po
index cc20a92a33f..2e63754c515 100644
--- a/addons/account_voucher/i18n/nb.po
+++ b/addons/account_voucher/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 15:48+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "Konto.konfigurasjon.innstillinger."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Nedskrivning."
@@ -68,16 +68,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(Oppdatert)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"Du må slette kontoutskrift linje som betalingen ble forsonet til manuelt. "
-"Vennligst sjekk betaling av partner% s av mengden% s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -142,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Kupong statistikker."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -156,6 +146,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Valider."
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -219,10 +215,10 @@ msgid "Messages"
 msgstr "Meldinger."
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Salg."
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -230,8 +226,8 @@ msgid "Journal Item"
 msgstr "Journal Elementer."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Feil!"
@@ -258,7 +254,7 @@ msgid "Cancelled"
 msgstr "Kansellert."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -300,7 +296,7 @@ msgid "Tax"
 msgstr "Skatt."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ugyldig handling!"
@@ -322,6 +318,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Total tildeling."
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -345,6 +346,12 @@ msgstr "Kladd."
 msgid "Import Invoices"
 msgstr "Importer fakturaer."
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -359,7 +366,7 @@ msgid "Receipt"
 msgstr "Kvittering."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -380,6 +387,8 @@ msgstr "Periode."
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Leverandør"
 
@@ -399,7 +408,7 @@ msgid "Debit"
 msgstr "Debet."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Kan ikke endre journal!"
@@ -427,6 +436,18 @@ msgstr "Proforma Kuponger."
 msgid "Voucher Entries"
 msgstr "Kupong oppføringer."
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -447,13 +468,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Er du sikker på å unreconcile og avbryte denne posten?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Salgs kvittering."
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -494,13 +508,13 @@ msgid "Avg. Due Delay"
 msgstr "Avg. på grunn av Forsinkelse."
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Betal faktura."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Ingen konto base kode og konto skatt kode."
@@ -554,15 +568,15 @@ msgid "To Review"
 msgstr "Til gjennomgang."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "Endre."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -659,7 +673,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Avstemming betalings balanse."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Konfigurasjons feil!"
@@ -704,6 +718,11 @@ msgstr "Eller."
 msgid "August"
 msgstr "August."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -717,7 +736,7 @@ msgid "October"
 msgstr "Oktober."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Vennligst aktiver sekvensen av den utvalgte journal!"
@@ -737,6 +756,13 @@ msgstr "Betaling Pris Valuta."
 msgid "Paid"
 msgstr "Betalt."
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -774,24 +800,6 @@ msgstr "Betalt beløp i firmas valuta."
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -808,6 +816,12 @@ msgstr "Dr/Cr."
 msgid "Previous Payments ?"
 msgstr "Tidligere Betalinger ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -835,27 +849,30 @@ msgid "Active"
 msgstr "Aktiv."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Vennligst definere en sekvens på tidsskriftet."
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Total tildeling."
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Grupper etter fakturadato."
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Feil kontoutskrift linje."
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -918,13 +935,6 @@ msgstr "September."
 msgid "Sales Information"
 msgstr "Salgs informasjon."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Salgs kvittering analyse."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -967,19 +977,12 @@ msgid "Journal Items"
 msgstr "Journal Elementer."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 "Vennligst definere standard kreditt / debet-kontoer på tidsskriftet \"% s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Kunde betaling."
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1057,12 +1060,6 @@ msgstr "Salgs kvittering."
 msgid "Journal"
 msgstr "Journal."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Leverandør betaling."
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1081,8 +1078,6 @@ msgstr "Opprinnelig beløp."
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Kjøps kvitteringen."
 
@@ -1142,6 +1137,12 @@ msgstr "År."
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Salg."
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1187,7 +1188,7 @@ msgstr ""
 "Mengden av kupongen må være det samme beløp som den på uttalelse linje."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Kan ikke slette kupong(er) som allerede er åpnet eller betalt."
@@ -1198,7 +1199,7 @@ msgid "Effective date for accounting entries"
 msgstr "Effektiv dato for regnskapsføring."
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Statusendring."
 
@@ -1245,8 +1246,13 @@ msgid "Open Balance"
 msgstr "Åpen balanse."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1271,5 +1277,17 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Feil ! Du kan ikke lage rekursive firmaer."
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Salgs kvittering."
+
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Fakturanummer må være unik pr. firma!"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Salgs kvittering analyse."
+
+#~ msgid "Customer Payment"
+#~ msgstr "Kunde betaling."
+
+#~ msgid "Supplier Payment"
+#~ msgstr "Leverandør betaling."
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 4e095b7ec4d..d178a5d3b4d 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 22:01+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Boek af"
@@ -67,14 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(Update)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -139,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Bon analyses"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -151,6 +143,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Valideren"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -214,10 +212,10 @@ msgid "Messages"
 msgstr "Berichten"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Verkoop"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -225,8 +223,8 @@ msgid "Journal Item"
 msgstr "Journaal item"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -253,7 +251,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -296,7 +294,7 @@ msgid "Tax"
 msgstr "Belasting"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie!"
@@ -321,6 +319,11 @@ msgstr ""
 "samenvatting is direct in html formaat om zo in de kanban weergave te worden "
 "ingevoegd."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Totale toewijzing"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -344,6 +347,12 @@ msgstr "Concept"
 msgid "Import Invoices"
 msgstr "Importeer facturen"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -358,7 +367,7 @@ msgid "Receipt"
 msgstr "Ontvangstbewijs"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -379,6 +388,8 @@ msgstr "Periode"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Leverancier"
 
@@ -398,7 +409,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -426,6 +437,18 @@ msgstr "Pro-forma bonnen"
 msgid "Voucher Entries"
 msgstr "Boekingen bonnen"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -446,13 +469,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Weet u zeker dat u het afletteren van deze regel wilt afbreken?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Verkoopbon"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -493,13 +509,13 @@ msgid "Avg. Due Delay"
 msgstr "Gem. overschrijding"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Betaling factuur"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Geen financiële rekening en fiscale rekening gedefinieerd!"
@@ -553,15 +569,15 @@ msgid "To Review"
 msgstr "Na te kijken"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "wijziging"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -660,7 +676,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Afletteren betalingsbalans"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -705,6 +721,11 @@ msgstr "of"
 msgid "August"
 msgstr "augustus"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -720,7 +741,7 @@ msgid "October"
 msgstr "oktober"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -740,6 +761,13 @@ msgstr "Wisselkoers van betaling"
 msgid "Paid"
 msgstr "Betaald"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -777,24 +805,6 @@ msgstr "Betaald bedrag in bedrijfsvaluta"
 msgid "Amount reconciled"
 msgstr "Verrekend bedrag"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -811,6 +821,12 @@ msgstr "Db/Cr"
 msgid "Previous Payments ?"
 msgstr "Vorige betalingen?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -838,27 +854,30 @@ msgid "Active"
 msgstr "Actief"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Totale toewijzing"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Groepeer op factuurdatum"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -921,13 +940,6 @@ msgstr "september"
 msgid "Sales Information"
 msgstr "Verkoop informatie"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Verkoopbon analyse"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -970,18 +982,11 @@ msgid "Journal Items"
 msgstr "Journaalpostregels"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Klantbetaling"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1063,12 +1068,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dagboek"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Leveranciersbetaling"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1087,8 +1086,6 @@ msgstr "Oorspronkelijk bedrag"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Ontvangstbon"
 
@@ -1148,6 +1145,12 @@ msgstr "jaar"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Verkoop"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1192,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1203,7 +1206,7 @@ msgid "Effective date for accounting entries"
 msgstr "Boek datum voor financiële boekingen"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Statuswijziging"
 
@@ -1250,8 +1253,13 @@ msgid "Open Balance"
 msgstr "Open balans"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1529,6 +1537,9 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "Bereken belastingen"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Leveranciersbetaling"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importeer facturen in afschrift"
 
@@ -1546,6 +1557,9 @@ msgstr ""
 #~ msgid "Unreconcile entries"
 #~ msgstr "Maak afletteren ongedaan"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Verkoopbon"
+
 #~ msgid "Write-Off Amount"
 #~ msgstr "Afschrijf bedrag"
 
@@ -1555,6 +1569,9 @@ msgstr ""
 #~ msgid "Are you sure to confirm this record ?"
 #~ msgstr "Weet u zeker dat u deze regel wilt bevestigen?"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Verkoopbon analyse"
+
 #~ msgid "Write-Off Comment"
 #~ msgstr "Afschrijvings opmerking"
 
@@ -1684,6 +1701,9 @@ msgstr ""
 #~ "voorstel doen om deze betaling af te letteren tegen een open factuur of "
 #~ "verkoopbon."
 
+#~ msgid "Customer Payment"
+#~ msgstr "Klantbetaling"
+
 #~ msgid "The journal and period chosen have to belong to the same company."
 #~ msgstr "Het gekozen dagboek en periode moeten behoren tot hetzelfde bedrijf."
 
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index ac8a8dfd99f..4255ef5e724 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 18:04+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: nl\n"
 
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Afschrijving"
@@ -68,16 +68,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(bijwerken)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"U moet manueel de uittreksellijn verwijderen waarmee de betaling is "
-"afgepunt. Kijk de betaling van relatie %s na voor een bedrag van %s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -142,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Boekingsstatistieken"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -154,6 +144,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Goedkeuren"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -224,10 +220,10 @@ msgid "Messages"
 msgstr "Berichten"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Verkoop"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -235,8 +231,8 @@ msgid "Journal Item"
 msgstr "Boekingslijn"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Fout"
@@ -263,7 +259,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -314,7 +310,7 @@ msgid "Tax"
 msgstr "Btw"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie"
@@ -338,6 +334,11 @@ msgstr ""
 "Bevat de Chatsamenvatting (aantal berichten, ...). Deze samenvatting is in "
 "html-formaat, zodat ze in de kanbanweergave kan worden gebruikt."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Totale toewijzing"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -361,6 +362,12 @@ msgstr "Voorlopig"
 msgid "Import Invoices"
 msgstr "Facturen importeren"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -375,7 +382,7 @@ msgid "Receipt"
 msgstr "Reçu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -399,6 +406,8 @@ msgstr "Periode"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Leverancier"
 
@@ -418,7 +427,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -446,6 +455,18 @@ msgstr "Pro-formareçu's"
 msgid "Voucher Entries"
 msgstr "Reçuboekingen"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -466,13 +487,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Wilt u de afpunting van dit record ongedaan maken en het annuleren?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Verkoopreçu"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -513,13 +527,13 @@ msgid "Avg. Due Delay"
 msgstr "Gem. aant. dagen vervallen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Factuur betalen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Geen rekening voor basisvak en btw-vak"
@@ -573,15 +587,15 @@ msgid "To Review"
 msgstr "Te controleren"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "wijzigen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -682,7 +696,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Betalingssaldo afpunten"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Configuratiefout"
@@ -727,6 +741,11 @@ msgstr "of"
 msgid "August"
 msgstr "Augustus"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -742,7 +761,7 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Gelieve de nummering van het gekozen journaal te activeren."
@@ -762,6 +781,13 @@ msgstr "Koers betaling"
 msgid "Paid"
 msgstr "Betaald"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -799,24 +825,6 @@ msgstr "Betaald bedrag in munt van de firma"
 msgid "Amount reconciled"
 msgstr "Afgepunt bedrag"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaar en e-mails"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -833,6 +841,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Vorige betalingen?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -860,27 +874,30 @@ msgid "Active"
 msgstr "Actief"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Gelieve een reeks in te stellen voor het journaal."
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Totale toewijzing"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Groepering per factuurdatum"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Verkeerde uittreksellijn"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -943,13 +960,6 @@ msgstr "September"
 msgid "Sales Information"
 msgstr "Verkoopinfo"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Analyse verkoopreçu's"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -992,18 +1002,11 @@ msgid "Journal Items"
 msgstr "Boekingslijnen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "Stel een standaard debet-/creditrekening in voor journaal \"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Klantenbetaling"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1088,12 +1091,6 @@ msgstr "Verkoopreçu"
 msgid "Journal"
 msgstr "Journaal"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Leveranciersbetaling"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1112,8 +1109,6 @@ msgstr "Oorspronkelijk bedrag"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Aankoopreçu"
 
@@ -1173,6 +1168,12 @@ msgstr "Jaar"
 msgid "Gain Exchange Rate Account"
 msgstr "Rekening voordelige koersverschillen"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Verkoop"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1218,7 +1219,7 @@ msgstr ""
 "Het bedrag van het reçu moet gelijk zijn aan het bedrag op de uittreksellijn."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Een openstaand of betaald reçu kan niet meer worden verwijderd."
@@ -1229,7 +1230,7 @@ msgid "Effective date for accounting entries"
 msgstr "Effectieve datum voor boekingen"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Statuswijziging"
 
@@ -1276,8 +1277,13 @@ msgid "Open Balance"
 msgstr "Openstaand saldo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Niet volledig geconfigureerd"
@@ -1307,5 +1313,17 @@ msgstr ""
 #~ msgid "The company name must be unique !"
 #~ msgstr "De firmanaam moet uniek zijn"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Verkoopreçu"
+
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Factuurnummer moet uniek zijn per bedrijf"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Analyse verkoopreçu's"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Klantenbetaling"
+
+#~ msgid "Supplier Payment"
+#~ msgstr "Leveranciersbetaling"
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index b4b89d2a9c2..65016647724 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 23:58+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "Borrolhon"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "Periòde"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "Debit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Jornal"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 81e5863b4e3..7c41a1b4ea0 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-10 13:37+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 11:40+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Statystyka poleceń"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr "Nie możesz zmienić dziennika, jeśli już uzgodniłeś niektóre pozyc
 msgid "Validate"
 msgstr "Zatwierdź"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr "Płatności od dostwców"
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -161,6 +159,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknij, aby zarejestrować rachunek zakupu. \n"
+"              </p><p>\n"
+"                Kiedy zatwierdzisz rachunek od dostawcy, to\n"
+"                będziesz mógł zarejestrować i skojarzyć płątność\n"
+"                do tego rachunku.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -213,10 +219,10 @@ msgid "Messages"
 msgstr "Wiadomości"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Sprzedaż"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr "Rachunki od dostawców"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +230,8 @@ msgid "Journal Item"
 msgstr "Pozycja zapisu dziennika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -252,7 +258,7 @@ msgid "Cancelled"
 msgstr "Anulowano"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -271,6 +277,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknij, aby zarejestrować rachunek sprzedaży.\n"
+"              </p><p>\n"
+"                Kiedy rachunek jest zatwierdzony, to możesz\n"
+"                kojarzyć z nim płatność.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
@@ -294,7 +307,7 @@ msgid "Tax"
 msgstr "Podatek"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Niedozwolona akcja!"
@@ -315,6 +328,14 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Zawiera podsumowanie wypowiedzi (liczbę wiadomości, ...). To podsumowanie "
+"jest bezpośrednio w formacie html, aby można je było stosować w widokach "
+"kanban."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Suma przydziału"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -339,6 +360,12 @@ msgstr "Projekt"
 msgid "Import Invoices"
 msgstr "Importuj faktury"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr "Błędna pozycja rachunku"
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -353,7 +380,7 @@ msgid "Receipt"
 msgstr "Rachunek"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -376,6 +403,8 @@ msgstr "Okres"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Dostawca"
 
@@ -387,7 +416,7 @@ msgstr "Rachunek od dostawcy"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Obserwatorzy"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -395,7 +424,7 @@ msgid "Debit"
 msgstr "Winien"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Nie można zmienić dziennika !"
@@ -423,6 +452,25 @@ msgstr "Rachunek pro-forma"
 msgid "Voucher Entries"
 msgstr "Zapisy rachunku"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknij, aby utworzyć płatność do dostawcy.\n"
+"              </p><p>\n"
+"                OpenERP pomaga śledzić twoje płatności i wskazywać "
+"płatności, które powinieneś dokonać swoim dostawcom.\n"
+"              </p>\n"
+"            "
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -444,13 +492,6 @@ msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 "Jesteś pewien, że chcesz skasować uzgodnienia i anulować ten rekord ?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Rachunek uproszczony"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -478,6 +519,14 @@ msgid ""
 "\n"
 "* The 'Cancelled' status is used when user cancel voucher."
 msgstr ""
+" * Stan 'Projekt' oznacza, że użytkownik jeszcze pracuje nad wprowadzeniem "
+"dokumentu.                         \n"
+"* Stan 'Pro-forma' oznacza, że rachunek został wystawiony bez numeru.        "
+"                 \n"
+"* Stan 'Zaksięgowane' oznacza, że dokument został zatwierdzony, posiada swój "
+"numer i zapisy księgowe.                         \n"
+"* Stan 'Anulowano' oznacza, że użytkownik zrezygnował z wprowadzania tego "
+"dokumentu."
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
@@ -491,13 +540,13 @@ msgid "Avg. Due Delay"
 msgstr "Śred. opóźnienie"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Zapłać fakturę"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Brak rejestru podstawy i rejestru podatku !"
@@ -527,6 +576,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknij, aby zarejestrować nową płatność. \n"
+"              </p><p>\n"
+"                Wprowadź klienta i metodę płatności, a później utwórz "
+"ręcznie\n"
+"                rekord płatności lub OpenERP zaproponuje ci automatyczne\n"
+"                uzgodnienie płatności z otwartą fakturą lub rachunkiem\n"
+"                sprzedaży.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: field:account.config.settings,expense_currency_exchange_account_id:0
@@ -551,15 +610,15 @@ msgid "To Review"
 msgstr "Do sprawdzenia"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "zmień"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -660,7 +719,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Uzgodnij bilans płatności"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Błąd konfiguracji !"
@@ -705,6 +764,11 @@ msgstr "lub"
 msgid "August"
 msgstr "Sierpień"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr "Zatwierdź płatność"
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -720,7 +784,7 @@ msgid "October"
 msgstr "Październik"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Aktywuj numerację wybranego dziennika !"
@@ -740,10 +804,17 @@ msgstr "Kurs dla płatności"
 msgid "Paid"
 msgstr "Zapłacono"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr "Rachunek dla klienta"
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Jest obserwatorem"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
@@ -777,24 +848,6 @@ msgstr "Kwota zapłacona w walucie firmy"
 msgid "Amount reconciled"
 msgstr "Kwota uzgodniona"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -811,6 +864,12 @@ msgstr "Wn/Ma"
 msgid "Previous Payments ?"
 msgstr "Poprzednia płatność ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr "Faktura, którą chcesz zapłacić, nie jest poprawna."
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -838,27 +897,30 @@ msgid "Active"
 msgstr "Aktywne"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Zdefiniuj numerację w dzienniku"
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Suma przydziału"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr "Płatności Klientów"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr "Analiza rachunków dla klientów"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Grupuj wg dat"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Błędna pozycja wyciągu"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -921,13 +983,6 @@ msgstr "Wrzesień"
 msgid "Sales Information"
 msgstr "Informacja o sprzedaży"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Analiza rachunków uproszczonych"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -970,18 +1025,11 @@ msgid "Journal Items"
 msgstr "Pozycje zapisów dziennika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "Zdefiniuj domyślne konta Winien/Ma w dzienniku \"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Płatności klienta"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1022,6 +1070,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p>\n"
+"            Z tego raportu możesz dowiedzieć się o kwotach\n"
+"            zafakturowanych klientom, jak również o czasach płatności.\n"
+"            Narzędzie do wyszukiwania może być stosowane do\n"
+"            dostosowania tej analizy do konkretnych twoich potrzeb.\n"
+"          </p>\n"
+"        "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1061,12 +1116,6 @@ msgstr "Rachunek sprzedaży"
 msgid "Journal"
 msgstr "Dziennik"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Płatność Dostawcy"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1085,8 +1134,6 @@ msgstr "Pierwotna kwota"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Rachunek zakupu"
 
@@ -1147,6 +1194,12 @@ msgstr "Rok"
 msgid "Gain Exchange Rate Account"
 msgstr "Konto zysków różnic kursowych"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Sprzedaż"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1191,7 +1244,7 @@ msgid ""
 msgstr "Kwota płatności musi być taka sama jak w pozycji wyciągu."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Nie mozna usuwać racunków/płatności, które są otwarte lub zapłacone."
@@ -1202,7 +1255,7 @@ msgid "Effective date for accounting entries"
 msgstr "Efektywna data zapisów"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Zmiana statusu"
 
@@ -1249,8 +1302,13 @@ msgid "Open Balance"
 msgstr "Stan początkowy"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr "Stan <b>zmieniono</b>"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Niepełna konfiguracja!"
@@ -1435,6 +1493,9 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "Oblicz podatki"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Płatność Dostawcy"
+
 #~ msgid "Through :"
 #~ msgstr "Przez:"
 
@@ -1442,6 +1503,9 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Zdefiniuj numerację dla dziennika !"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Płatności klienta"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importuj faktury do wyciągu"
 
@@ -1539,6 +1603,9 @@ msgstr ""
 #~ "(=dziennik) i kwotę płatności. OpenERP zaproponuje cie automatycznie "
 #~ "uzgodnienie płatności z otwartą fakturą lub rachunkiem uproszczonym."
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Rachunek uproszczony"
+
 #~ msgid "Income Currency Rate"
 #~ msgstr "Kurs przy dochodzie"
 
@@ -1585,6 +1652,9 @@ msgstr ""
 #~ "i swoje zapisy księgowe.                         \n"
 #~ "* Stan 'Anulowano' pojawia się po anulowaniu rachunku."
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Analiza rachunków uproszczonych"
+
 #~ msgid "year"
 #~ msgstr "rok"
 
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index 6926107185d..133eead31f7 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 17:16+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Eliminar"
@@ -67,14 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -139,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Estatísticas do voucher"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -151,6 +143,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -214,10 +212,10 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venda"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -225,8 +223,8 @@ msgid "Journal Item"
 msgstr "Item do Diário"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -253,7 +251,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -296,7 +294,7 @@ msgid "Tax"
 msgstr "Imposto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação inválida!"
@@ -318,6 +316,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Alocação total"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -341,6 +344,12 @@ msgstr "Rascunho"
 msgid "Import Invoices"
 msgstr "Importar faturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -355,7 +364,7 @@ msgid "Receipt"
 msgstr "Recibo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -376,6 +385,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Fornecedor"
 
@@ -395,7 +406,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -423,6 +434,18 @@ msgstr "Vouchers Pro-forma"
 msgid "Voucher Entries"
 msgstr "Movimentos Voucher"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -443,13 +466,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Tem certeza que deseja não reconciliar e cancelar este registo?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de Venda"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -490,13 +506,13 @@ msgid "Avg. Due Delay"
 msgstr "Atraso médio devido"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar fatura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Sem código da conta base e código da conta impostos"
@@ -550,15 +566,15 @@ msgid "To Review"
 msgstr "Para rever"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "modificar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -657,7 +673,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Reconciliar Balanço de Pagamentos"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Erro de configuração!"
@@ -702,6 +718,11 @@ msgstr "ou"
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -717,7 +738,7 @@ msgid "October"
 msgstr "Outubro"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -737,6 +758,13 @@ msgstr "Taxa da Moeda de Pagamento"
 msgid "Paid"
 msgstr "Pago"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -774,24 +802,6 @@ msgstr "Valor pago em moeda da empresa"
 msgid "Amount reconciled"
 msgstr "Montante reconciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -808,6 +818,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr "Pagamentos anteriores?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -835,27 +851,30 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Alocação total"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Grupo por data de fatura"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -918,13 +937,6 @@ msgstr "Setembro"
 msgid "Sales Information"
 msgstr "Informação de vendas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Análise dos Recibos de Vendas"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -967,18 +979,11 @@ msgid "Journal Items"
 msgstr "Items do Diário"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pagamento de Cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1059,12 +1064,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diário"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pagamento a Fornecedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1083,8 +1082,6 @@ msgstr "Montante original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Recibo de Compra"
 
@@ -1146,6 +1143,12 @@ msgstr "Ano"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venda"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1190,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1201,7 +1204,7 @@ msgid "Effective date for accounting entries"
 msgstr "Data efectiva para lançamentos contáveis"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1248,8 +1251,13 @@ msgid "Open Balance"
 msgstr "Abrir Balanço"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Configuração incompleta!"
@@ -1699,3 +1707,15 @@ msgstr ""
 #~ "The amount of the voucher must be the same amount as the one on the "
 #~ "statement line"
 #~ msgstr "O montante do voucher deve ser o mesmo que o da linha do extrato"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Pagamento de Cliente"
+
+#~ msgid "Supplier Payment"
+#~ msgstr "Pagamento a Fornecedor"
+
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de Venda"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Análise dos Recibos de Vendas"
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index ea81277e895..598ac4c6df6 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-17 00:37+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 00:55+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Ajuste"
@@ -68,17 +68,6 @@ msgstr ""
 msgid "(Update)"
 msgstr "(Atualizar)"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-"Você precisa excluir a linha do demonstrativo bancário em que o pagamento "
-"foi reconciliado manualmente. Verifique o pagamento do parceiro %s com o "
-"valor de %s."
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -143,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Estatísticas de Comprovantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -157,6 +146,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr "Pagamentos a Fornecedor"
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -227,10 +222,10 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Venda"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr "Recibos de Compra"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -238,8 +233,8 @@ msgid "Journal Item"
 msgstr "Item de Diário"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -266,7 +261,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -316,7 +311,7 @@ msgid "Tax"
 msgstr "Imposto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação Inválida!"
@@ -341,6 +336,11 @@ msgstr ""
 "gerado diretamente em formato HTML para que possa ser inserido nas visões "
 "kanban."
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Total Alocado"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -364,6 +364,12 @@ msgstr "Provisório"
 msgid "Import Invoices"
 msgstr "Importar Faturas"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr "Linha de comprovante errada"
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -378,7 +384,7 @@ msgid "Receipt"
 msgstr "Recebido"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -402,6 +408,8 @@ msgstr "Período"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Fornecedor"
 
@@ -421,7 +429,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Não é possível alterar o diário!"
@@ -449,6 +457,25 @@ msgstr "Comprovantes Pro-forma"
 msgid "Voucher Entries"
 msgstr "Lançamento de Comprovantes"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um novo pagamento a fornecedor.\n"
+"              </p><p>\n"
+"                O OpenERP te ajuda a controlar facilmente os pagamentos que "
+"você faz e os saldos restantes que você precisa pagar a seus fornecedores.\n"
+"              </p>\n"
+"            "
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -469,13 +496,6 @@ msgstr "Comentário"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Tem certeza de que deseja des-reconciliar e cancelar este registro?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Recibo de Vendas"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -523,13 +543,13 @@ msgid "Avg. Due Delay"
 msgstr "Atraso Médio"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Pagar Fatura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Sem conta para Base e Imposto!"
@@ -593,15 +613,15 @@ msgid "To Review"
 msgstr "Para Revisar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "modificar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -703,7 +723,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Reconciliar o Balanço do Pagamento"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "Erro de Configuração!"
@@ -748,6 +768,11 @@ msgstr "ou"
 msgid "August"
 msgstr "Agosto"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr "Validar Pagamento"
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -763,7 +788,7 @@ msgid "October"
 msgstr "Outubro"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Por favor ative a sequência no diário selecionado!"
@@ -783,6 +808,13 @@ msgstr "Taxa de Pagamento"
 msgid "Paid"
 msgstr "Pago"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr "Receitas de Vendas"
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -820,31 +852,6 @@ msgstr "Valor pago na moeda da Empresa"
 msgid "Amount reconciled"
 msgstr "Valor Reconciliado"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para criar um novo pagamento a fornecedor.\n"
-"              </p><p>\n"
-"                O OpenERP te ajuda a acompanhar os pagamentos que você faz\n"
-"                e o balanço restante a pagar ao seu fornecedor.\n"
-"              </p>\n"
-"            "
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -861,6 +868,12 @@ msgstr "D/C"
 msgid "Previous Payments ?"
 msgstr "Pagamentos Anteriores?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr "A fatura que você deseja pagar não é mais válida."
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -888,27 +901,30 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Por favor defina a sequência no diário."
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Total Alocado"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr "Pagamentos de Cliente"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr "Análise de Receitas de Vendas"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Agrupar por Data da Fatura"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "Linha do demonstrativo bancário errada"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -971,13 +987,6 @@ msgstr "Setembro"
 msgid "Sales Information"
 msgstr "Informação de Vendas"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Análise Recebimento das Vendas"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -1020,18 +1029,11 @@ msgid "Journal Items"
 msgstr "Itens do Diário"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "Por favor defina a conta de crédito/débito padrão no diário \"%s\"."
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Pagamento do Cliente"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1121,12 +1123,6 @@ msgstr "Recibo de Vendas"
 msgid "Journal"
 msgstr "Diário"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Pagamento ao Fornecedor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1145,8 +1141,6 @@ msgstr "Valor Original"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Recibo de Compra"
 
@@ -1208,6 +1202,12 @@ msgstr "Ano"
 msgid "Gain Exchange Rate Account"
 msgstr "Conta de Ganho de Taxa de Câmbio"
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venda"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1254,7 +1254,7 @@ msgstr ""
 "demonstrativo."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Não é possivel excluir comprovante(s) que já foi aberto ou pago."
@@ -1265,7 +1265,7 @@ msgid "Effective date for accounting entries"
 msgstr "Data efetiva dos Lançamentos Contábeis"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "Mudança de Situação"
 
@@ -1312,8 +1312,13 @@ msgid "Open Balance"
 msgstr "Saldo em Aberto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr "Situação <b>alterada</b>"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Configurações Insuficientes!"
@@ -1513,6 +1518,15 @@ msgstr ""
 #~ "comprovante é gerado e o lançamento é efetuado.   \n"
 #~ "* O estado \"Cancelado\" quando o usuário cancela o Comprovante."
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Pagamento ao Fornecedor"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Análise Recebimento das Vendas"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Pagamento do Cliente"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importar Faturas no Demonstrativo"
 
@@ -1546,6 +1560,9 @@ msgstr ""
 #~ msgid "State:"
 #~ msgstr "Status:"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Recibo de Vendas"
+
 #~ msgid "Unreconciliation"
 #~ msgstr "Desconciliação"
 
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 482f6dbaa3c..85314af60a5 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:43+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustare"
@@ -67,14 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -139,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Statistici voucher"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -151,6 +143,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Validati"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -214,10 +212,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Vanzari"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -225,8 +223,8 @@ msgid "Journal Item"
 msgstr "Element Jurnal"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -253,7 +251,7 @@ msgid "Cancelled"
 msgstr "Anulat(a)"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -296,7 +294,7 @@ msgid "Tax"
 msgstr "Taxa"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -318,6 +316,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Total Alocare"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -341,6 +344,12 @@ msgstr "Ciorna"
 msgid "Import Invoices"
 msgstr "Importati Facturi"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -355,7 +364,7 @@ msgid "Receipt"
 msgstr "Chitanta"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -376,6 +385,8 @@ msgstr "Perioada"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Furnizor"
 
@@ -395,7 +406,7 @@ msgid "Debit"
 msgstr "Debit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -423,6 +434,18 @@ msgstr "Vouchere Pro-forma"
 msgid "Voucher Entries"
 msgstr "Inregistrari vouchere"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -445,13 +468,6 @@ msgstr ""
 "Sunteti sigur(a) ca doriti sa nu reconciliati aceasta inregistrare si sa o "
 "anulati ?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Chitanta vanzari"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -492,13 +508,13 @@ msgid "Avg. Due Delay"
 msgstr "Media Intarzierilor"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Platiti Factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -553,15 +569,15 @@ msgid "To Review"
 msgstr "De verificat"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "schimbati"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -660,7 +676,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Reconciliati Plata Sold"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -705,6 +721,11 @@ msgstr ""
 msgid "August"
 msgstr "August"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -721,7 +742,7 @@ msgid "October"
 msgstr "Octombrie"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -741,6 +762,13 @@ msgstr "Plata Curs valutar"
 msgid "Paid"
 msgstr "Platit(a)"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -778,24 +806,6 @@ msgstr "Suma platita in Moneda companiei"
 msgid "Amount reconciled"
 msgstr "Suma reconciliata"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -812,6 +822,12 @@ msgstr "Dr/Cr"
 msgid "Previous Payments ?"
 msgstr "Plati anterioare ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -839,27 +855,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Total Alocare"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Grupati dupa Data Facturii"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -922,13 +941,6 @@ msgstr "Septembrie"
 msgid "Sales Information"
 msgstr "Informatii vanzare"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Analiza chitantei de vanzare"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -971,18 +983,11 @@ msgid "Journal Items"
 msgstr "Elementele Jurnalului"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Plata Client"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1064,12 +1069,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Jurnal"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Plata furnizor"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1088,8 +1087,6 @@ msgstr "Suma Initiala"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Chitanta cumparaturi"
 
@@ -1151,6 +1148,12 @@ msgstr "An"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Vanzari"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1195,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1206,7 +1209,7 @@ msgid "Effective date for accounting entries"
 msgstr "Data efectiva pentru inregistrarile contabile"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1253,8 +1256,13 @@ msgid "Open Balance"
 msgstr "Sold la deschidere"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1575,6 +1583,9 @@ msgstr ""
 #~ msgid "Write-Off Amount"
 #~ msgstr "Suma pierduta"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Chitanta vanzari"
+
 #~ msgid "Want to remove accounting entries too ?"
 #~ msgstr "Doriti sa stergeti si inregistrarile contabile?"
 
@@ -1621,6 +1632,9 @@ msgstr ""
 #~ "in cont\n"
 #~ "* Starea 'Anulat' este folosita atunci cand utilizatorul anuleaza o chitanta."
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Analiza chitantei de vanzare"
+
 #, python-format
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Va rugam sa definiti o secventa in jurnal !"
@@ -1715,12 +1729,18 @@ msgstr ""
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Numarul Facturii trebuie sa fie unic per Companie!"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Plata Client"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importati Facturi in Extras"
 
 #~ msgid "year"
 #~ msgstr "an"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Plata furnizor"
+
 #~ msgid "Month-1"
 #~ msgstr "Luna-1"
 
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 49edeb6d45e..602c2fd509e 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Утвердить"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Продажа"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "Элемент журнала"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "Отменено"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "Налог"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Черновик"
 msgid "Import Invoices"
 msgstr "Импорт счетов"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr "Приход"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "Период"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Поставщик"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "Дебет"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Проводки ваучера"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr "Памятка"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Оплата счета"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr "Для проверки"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr "Август"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr "Октябрь"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Сверенная сумма"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Предыдущие платежи ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr "Сентябрь"
 msgid "Sales Information"
 msgstr "Информация о продажах"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr "Элементы журнала"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Платеж заказчика"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Оплаты поставщикам"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr "Первоначальная сумма"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr "Год"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Продажа"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr "Дата вступления в силу бухгалтерских проводок"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr "Открытый баланс"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1383,6 +1391,9 @@ msgstr ""
 #~ msgid "Number:"
 #~ msgstr "Номер:"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Платеж заказчика"
+
 #~ msgid "State:"
 #~ msgstr "Состояние:"
 
@@ -1396,6 +1407,9 @@ msgstr ""
 #~ "вашим поставщикам. При выборе поставщика, способа оплаты и суммы для оплаты, "
 #~ "OpenERP предложит связать ваш платеж с открытым счетом поставщика."
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Оплаты поставщикам"
+
 #~ msgid "Voucher Print"
 #~ msgstr "Печатать ваучер"
 
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 5f987072681..79380c1b593 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 14:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "Osnutek"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "Obdobje"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "V breme"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr "Br/Db"
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index 449a91df5b9..af846df79a0 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,9 +211,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index db538a24f0c..5521b75379d 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Statistike Vaucera"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Overi"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Prodaja"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "Stavka Dnevnika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Otkazano"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr "Porez"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "Priprema"
 msgid "Import Invoices"
 msgstr "Uvezi Racune"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr "Racun"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "Razdoblje"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "Duguje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Sadrzaj Vaucera"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Racun Prodaje"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Racun"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Nema bazne postavke naloga kao ni poreza za isti."
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr "Pregledati"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Zatvoreni iznos"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Predhodne Isplate"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr "Informacije Prodaje"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr "Sadrzaj Dnevnika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Placanja Stranki"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Prodaja"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr "Efektivni datum za sadrzaj racuna"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr "Otvori Stanje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1391,6 +1399,9 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Molim definisite sekvencu Knjige"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Placanja Stranki"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1446,3 +1457,6 @@ msgstr ""
 
 #~ msgid "Accounting Voucher Entries"
 #~ msgstr "Knjigovodstveni Sadrzaj Vaucera"
+
+#~ msgid "Sales Receipt"
+#~ msgstr "Racun Prodaje"
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index 9021716116f..7aca0f7b1b0 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Statistike Vaucera"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Overi"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Prodaja"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr "Stavka Dnevnika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Otkazano"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr "Porez"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "Priprema"
 msgid "Import Invoices"
 msgstr "Uvezi Racune"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr "Racun"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "Razdoblje"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "Duguje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr "Sadrzaj Vaucera"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr "Memo"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Racun Prodaje"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Racun"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Nema bazne postavke naloga kao ni poreza za isti."
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr "Pregledati"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Zatvoreni iznos"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Predhodne Isplate"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr "Informacije Prodaje"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr "Sadrzaj Dnevnika"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Placanja Stranki"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Prodaja"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr "Efektivni datum za sadrzaj racuna"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr "Otvori Stanje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1328,6 +1336,9 @@ msgstr ""
 #~ msgid "Authorised Signatory"
 #~ msgstr "Autorizovanj Potpis"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Racun Prodaje"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Neispravna akcija!"
@@ -1369,6 +1380,9 @@ msgstr ""
 #~ msgid "Through :"
 #~ msgstr "Kroz:"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Placanja Stranki"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 88d1c765203..bbe64e48a3d 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Avskrivning"
@@ -67,14 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -139,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Verifikatstatistik"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -151,6 +143,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Godkänna"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -214,10 +212,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Försäljning"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -225,8 +223,8 @@ msgid "Journal Item"
 msgstr "Journalpost"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -253,7 +251,7 @@ msgid "Cancelled"
 msgstr "Avbruten"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -294,7 +292,7 @@ msgid "Tax"
 msgstr "Skatt"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -316,6 +314,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Total allokering"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -339,6 +342,12 @@ msgstr "Preliminär"
 msgid "Import Invoices"
 msgstr "Importera fakturor"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -353,7 +362,7 @@ msgid "Receipt"
 msgstr "Kvitto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -374,6 +383,8 @@ msgstr "Period"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Leverantör"
 
@@ -393,7 +404,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -421,6 +432,18 @@ msgstr "Pro-forma bokföringsorder"
 msgid "Voucher Entries"
 msgstr "Verifikattransaktioner"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -441,13 +464,6 @@ msgstr "Anteckning"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "Är du säker på att avbryta och göra posten oavstämd?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Försäljningskvitto"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -488,13 +504,13 @@ msgid "Avg. Due Delay"
 msgstr "Ledtid för betalning i medeltal"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Betala faktura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Ingen kontokod och skattekod"
@@ -548,15 +564,15 @@ msgid "To Review"
 msgstr "Att godkänna"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "ändra"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -655,7 +671,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Stäm av betalningsbalansen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -700,6 +716,11 @@ msgstr ""
 msgid "August"
 msgstr "augusti"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -715,7 +736,7 @@ msgid "October"
 msgstr "oktober"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -735,6 +756,13 @@ msgstr "Betalningsvalutakurs"
 msgid "Paid"
 msgstr "Betalad"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -772,24 +800,6 @@ msgstr "Betalat belopp i bolagets valuta"
 msgid "Amount reconciled"
 msgstr "Avstämt belopp"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -806,6 +816,12 @@ msgstr "D/K"
 msgid "Previous Payments ?"
 msgstr "Tidigare betalningar ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -833,27 +849,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Total allokering"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Gruppera på fakturadatum"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -916,13 +935,6 @@ msgstr "september"
 msgid "Sales Information"
 msgstr "Försäljningsinformation"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Försäljningskvittoanalys"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -965,18 +977,11 @@ msgid "Journal Items"
 msgstr "Journalrader"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Kundbetalning"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1058,12 +1063,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Levratörsbetalning"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1082,8 +1081,6 @@ msgstr "Ursprungligt belopp"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Inköpskvitto"
 
@@ -1146,6 +1143,12 @@ msgstr "År"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Försäljning"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1190,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1201,7 +1204,7 @@ msgid "Effective date for accounting entries"
 msgstr "Bokföringsdatum för konteringstransaktioner"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1248,8 +1251,13 @@ msgid "Open Balance"
 msgstr "Ingående balans"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1360,6 +1368,9 @@ msgstr ""
 #~ msgid "Date:"
 #~ msgstr "Datum:"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Försäljningskvitto"
+
 #~ msgid "PRO-FORMA"
 #~ msgstr "PRO-FORMA"
 
@@ -1388,6 +1399,9 @@ msgstr ""
 #~ msgid "Number:"
 #~ msgstr "Nummer:"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Kundbetalning"
+
 #~ msgid "Are you sure to confirm this record ?"
 #~ msgstr "Är du säker på att du vill godkänna denna post?"
 
@@ -1449,6 +1463,9 @@ msgstr ""
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Fakturanummer måste vara unikt per bolag!"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Levratörsbetalning"
+
 #~ msgid "year"
 #~ msgstr "år"
 
@@ -1540,6 +1557,9 @@ msgstr ""
 #~ "Kunde inte skapa redovisningspost för valutakursskillnad. Du måste "
 #~ "konfigurera fältet \"beräknade inkomstbortfallsvaluta\" på bolaget! "
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Försäljningskvittoanalys"
+
 #, python-format
 #~ msgid ""
 #~ "Unable to create accounting entry for currency rate difference. You have to "
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 8b9c67cbf23..115bc5cb444 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index b94a3a94b98..5d4d597cad7 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Borç Silme"
@@ -67,14 +67,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -139,7 +131,7 @@ msgid "Voucher Statistics"
 msgstr "Fiş İstatistikleri"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -151,6 +143,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Doğrula"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -214,10 +212,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Satış"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -225,8 +223,8 @@ msgid "Journal Item"
 msgstr "Yevmiye Kalemi"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -253,7 +251,7 @@ msgid "Cancelled"
 msgstr "İptal Edilmiş"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -296,7 +294,7 @@ msgid "Tax"
 msgstr "Vergi"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -318,6 +316,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "Toplam Tahsis"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -341,6 +344,12 @@ msgstr "Taslak"
 msgid "Import Invoices"
 msgstr "Faturaları İçe aktar"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -355,7 +364,7 @@ msgid "Receipt"
 msgstr "Makbuz"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -376,6 +385,8 @@ msgstr "Dönem"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Tedarikçi"
 
@@ -395,7 +406,7 @@ msgid "Debit"
 msgstr "Borç"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -423,6 +434,18 @@ msgstr "Pro-forma Fişleri"
 msgid "Voucher Entries"
 msgstr "Fiş Girişleri"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -444,13 +467,6 @@ msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 "Bu kayıtın uzlaşmasını kaldırmak ve iptal etmek istediğinizden emin misiniz?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Satış Makbuzu"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -491,13 +507,13 @@ msgid "Avg. Due Delay"
 msgstr "Ort. Gecikme Vadesi"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Fatura Ödeme"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Hesap kodu ve Vergi kodu yok !"
@@ -551,15 +567,15 @@ msgid "To Review"
 msgstr "İncelenecek"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "değiştir"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -657,7 +673,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Bakiye Ödemesini Uzlaştır"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -702,6 +718,11 @@ msgstr ""
 msgid "August"
 msgstr "Ağustos"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -717,7 +738,7 @@ msgid "October"
 msgstr "Ekim"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -737,6 +758,13 @@ msgstr "Ödeme Para Birimi"
 msgid "Paid"
 msgstr "Ödenmiş"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -774,24 +802,6 @@ msgstr "Firma Para Biriminde Ödenen Tutar"
 msgid "Amount reconciled"
 msgstr "Uzlaşılan Tutar"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -808,6 +818,12 @@ msgstr "Borç/Alacak"
 msgid "Previous Payments ?"
 msgstr "Öncek Ödemeler ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -835,27 +851,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "Toplam Tahsis"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "Fatura Tarihine göre gruplandır"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -918,13 +937,6 @@ msgstr "Eylül"
 msgid "Sales Information"
 msgstr "Satış Bilgisi"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "Satış Makbuzları Analizi"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -967,18 +979,11 @@ msgid "Journal Items"
 msgstr "Yevmiye Kalemleri"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Müşteri Ödemesi"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1058,12 +1063,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Yevmiye"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Tedarikçi Ödemesi"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1082,8 +1081,6 @@ msgstr "İlk Tutar"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "Satınalma Makbuzu"
 
@@ -1145,6 +1142,12 @@ msgstr "Yıl"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Satış"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1189,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1200,7 +1203,7 @@ msgid "Effective date for accounting entries"
 msgstr "Hesap Girişleri için Yürürlük Tarihi"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1247,8 +1250,13 @@ msgid "Open Balance"
 msgstr "Bilanço Aç"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1514,6 +1522,9 @@ msgstr ""
 #~ msgid "Accounting Voucher Entries"
 #~ msgstr "Muhasebe Fiş Girişleri"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Satış Makbuzu"
+
 #~ msgid "Want to remove accounting entries too ?"
 #~ msgstr "Hesap girişlerini de silmek ister misiniz?"
 
@@ -1556,9 +1567,18 @@ msgstr ""
 #~ msgid "Please define a sequence on the journal !"
 #~ msgstr "Yevmiyede lütfen bir dizi tanımlayın !"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Tedarikçi Ödemesi"
+
 #~ msgid "Through :"
 #~ msgstr "Yoluyla"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "Satış Makbuzları Analizi"
+
+#~ msgid "Customer Payment"
+#~ msgstr "Müşteri Ödemesi"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Ekstredeki Faturaları İçeaktar"
 
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index a8dd24f829c..1a419a451f9 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 12:49+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -65,14 +65,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,9 +210,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
 msgstr ""
 
 #. module: account_voucher
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr ""
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr ""
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr ""
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,14 +843,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -842,12 +867,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1133,6 +1130,12 @@ msgstr ""
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index c6022df141b..956944ac6dd 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
@@ -66,14 +66,6 @@ msgstr ""
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -138,7 +130,7 @@ msgid "Voucher Statistics"
 msgstr "Thống kê phiếu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -150,6 +142,12 @@ msgstr ""
 msgid "Validate"
 msgstr "Xác nhận"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -213,10 +211,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "Bán hàng"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,8 +222,8 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -252,7 +250,7 @@ msgid "Cancelled"
 msgstr "Đã hủy bỏ"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -293,7 +291,7 @@ msgid "Tax"
 msgstr "Thuế"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -315,6 +313,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -338,6 +341,12 @@ msgstr "Nháp"
 msgid "Import Invoices"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -352,7 +361,7 @@ msgid "Receipt"
 msgstr "Phiếu thu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -373,6 +382,8 @@ msgstr "Chu kỳ"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "Nhà cung cấp"
 
@@ -392,7 +403,7 @@ msgid "Debit"
 msgstr "Bên nợ"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -420,6 +431,18 @@ msgstr ""
 msgid "Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -440,13 +463,6 @@ msgstr "Ghi nhớ"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "Phiếu thu bán hàng"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -487,13 +503,13 @@ msgid "Avg. Due Delay"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "Thanh toán hóa đơn"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -547,15 +563,15 @@ msgid "To Review"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -652,7 +668,7 @@ msgid "Reconcile Payment Balance"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -697,6 +713,11 @@ msgstr ""
 msgid "August"
 msgstr "Tháng Tám"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -710,7 +731,7 @@ msgid "October"
 msgstr "Tháng Mười"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -730,6 +751,13 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -767,24 +795,6 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr "Giá trị đã đối soát"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -801,6 +811,12 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr "Các thanh toán trước đây ?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -828,14 +844,23 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
 msgstr ""
 
 #. module: account_voucher
@@ -843,12 +868,6 @@ msgstr ""
 msgid "Group by Invoice Date"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -911,13 +930,6 @@ msgstr "Tháng Chín"
 msgid "Sales Information"
 msgstr "Các thông tin bán hàng"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -960,18 +972,11 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "Thanh toán từ khách hàng"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1049,12 +1054,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Nhật ký"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "Thanh toán cho nhà cung cấp"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1073,8 +1072,6 @@ msgstr "Giá trị nguyên thủy"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -1134,6 +1131,12 @@ msgstr "Năm"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Bán hàng"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1178,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1189,7 +1192,7 @@ msgid "Effective date for accounting entries"
 msgstr ""
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1236,8 +1239,13 @@ msgid "Open Balance"
 msgstr "Số dư đầu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1288,6 +1296,9 @@ msgstr ""
 #~ msgid "Unreconciliation"
 #~ msgstr "Chưa đối soát"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "Phiếu thu bán hàng"
+
 #~ msgid "Currency:"
 #~ msgstr "Loại tiền:"
 
@@ -1303,9 +1314,15 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "Tính toán thuế"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "Thanh toán cho nhà cung cấp"
+
 #~ msgid "Through :"
 #~ msgstr "Thông qua :"
 
+#~ msgid "Customer Payment"
+#~ msgstr "Thanh toán từ khách hàng"
+
 #~ msgid "Canceled"
 #~ msgstr "Đã hủy bỏ"
 
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 963cfe61b6b..c39494c006e 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 10:48+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "补差额"
@@ -65,14 +65,6 @@ msgstr "计算公式 ： 凭证上输入的金额 - 凭证行的金额合计"
 msgid "(Update)"
 msgstr "（更新）"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "凭证统计"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "记账"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr "消息"
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "销售"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "会计凭证行"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr "错误!"
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "已取消"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "税"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr "非法的动作"
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "凭证总额"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "草稿"
 msgid "Import Invoices"
 msgstr "导入发票"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr "收据"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "会计期间"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "供应商"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "借方"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr "收据"
 msgid "Voucher Entries"
 msgstr "手工凭证"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr "备注"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "你确定要反核销并作废这条记录么？"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "销售收据"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr "平均延误"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "支付发票"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "没有科目和税码！"
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr "待审查"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "改动"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr "核销付款余额"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr "设置错误!"
@@ -696,6 +712,11 @@ msgstr "or"
 msgid "August"
 msgstr "8月"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr "10月"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "请激活选中分类账的 序列（ sequence  ）。"
@@ -729,6 +750,13 @@ msgstr "付款汇率货币"
 msgid "Paid"
 msgstr "已付款"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr "按公司本位币计的付款金额"
 msgid "Amount reconciled"
 msgstr "已对账金额"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr "借/贷"
 msgid "Previous Payments ?"
 msgstr "预付款？"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,27 +843,30 @@ msgid "Active"
 msgstr "启用"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "请在分类账上定义一个序列（ sequence  ）。"
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "凭证总额"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "按发票日期分组"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr "错误的银行对账单行"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr "9月"
 msgid "Sales Information"
 msgstr "销售信息"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "分析销售收据"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr "账簿明细"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "定义分类账 \"%s\" 的默认借方/贷方科目"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "客户付款"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr "销售收据"
 msgid "Journal"
 msgstr "账簿"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "供应商付款"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr "原金额"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "采购付款"
 
@@ -1133,6 +1130,12 @@ msgstr "年"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "销售"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr "单据的金额必须跟对账单其中一行金额相同。"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "不能删除已经开启或者支付的单据。"
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr "会计分录的生效日期"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr "状态更改"
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr "期初余额"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1549,6 +1557,9 @@ msgstr ""
 #~ msgid "Are you sure to unreconcile this record ?"
 #~ msgstr "确定要对此记录反对账么？"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "供应商付款"
+
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "在银行单据里导入发票"
 
@@ -1558,6 +1569,12 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "计算税"
 
+#~ msgid "Customer Payment"
+#~ msgstr "客户付款"
+
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "分析销售收据"
+
 #~ msgid ""
 #~ "The supplier payment form allows you to track the payment you do to your "
 #~ "suppliers. When you select a supplier, the payment method and an amount for "
@@ -1595,6 +1612,9 @@ msgstr ""
 #~ msgid "Unreconcile entries"
 #~ msgstr "未对账条目"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "销售收据"
+
 #~ msgid "Accounting Voucher Entries"
 #~ msgstr "手工凭证"
 
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index fb8585583f7..4185e45fc35 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-28 02:30+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
 #, python-format
 msgid "Write-Off"
 msgstr "補差額"
@@ -65,14 +65,6 @@ msgstr "計算公式 ： 憑證上输入的金额 - 憑證行的金额合計."
 msgid "(Update)"
 msgstr ""
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid ""
-"You have to delete the bank statement line which the payment was reconciled "
-"to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -137,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr "換領券統計"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -149,6 +141,12 @@ msgstr ""
 msgid "Validate"
 msgstr "驗證"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
 msgid ""
@@ -212,10 +210,10 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
-msgstr "減價"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -223,8 +221,8 @@ msgid "Journal Item"
 msgstr "會計憑證行"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -251,7 +249,7 @@ msgid "Cancelled"
 msgstr "取消"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -292,7 +290,7 @@ msgid "Tax"
 msgstr "稅"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -314,6 +312,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr "憑證總額"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -337,6 +340,12 @@ msgstr "草稿"
 msgid "Import Invoices"
 msgstr "匯入發票"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -351,7 +360,7 @@ msgid "Receipt"
 msgstr "收據"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -372,6 +381,8 @@ msgstr "會計期間"
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
 msgid "Supplier"
 msgstr "供應商"
 
@@ -391,7 +402,7 @@ msgid "Debit"
 msgstr "借方"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
 #, python-format
 msgid "Unable to change journal !"
 msgstr ""
@@ -419,6 +430,18 @@ msgstr "收據"
 msgid "Voucher Entries"
 msgstr "換領券項目"
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
@@ -439,13 +462,6 @@ msgstr "備忘錄"
 msgid "Are you sure to unreconcile and cancel this record ?"
 msgstr "你確定要反核銷並作廢這條記錄嗎?"
 
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr "銷售收據"
-
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
@@ -486,13 +502,13 @@ msgid "Avg. Due Delay"
 msgstr "平均到期延誤"
 
 #. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
 msgstr "付款"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "沒有科目和稅碼!"
@@ -546,15 +562,15 @@ msgid "To Review"
 msgstr "待審查"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
 #, python-format
 msgid "change"
 msgstr "變更"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -651,7 +667,7 @@ msgid "Reconcile Payment Balance"
 msgstr "核銷付款餘額"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -696,6 +712,11 @@ msgstr ""
 msgid "August"
 msgstr "八月"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
@@ -709,7 +730,7 @@ msgid "October"
 msgstr "十月"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr ""
@@ -729,6 +750,13 @@ msgstr "付款匯率貨幣"
 msgid "Paid"
 msgstr "已付款"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
@@ -766,24 +794,6 @@ msgstr "按公司本位幣計的付款金額"
 msgid "Amount reconciled"
 msgstr "已對帳金額"
 
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new supplier payment.\n"
-"              </p><p>\n"
-"                OpenERP helps you easily track payments you do and remining\n"
-"                balance to pay to your supplier.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
@@ -800,6 +810,12 @@ msgstr "借/貸"
 msgid "Previous Payments ?"
 msgstr "預付款?"
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
@@ -827,27 +843,30 @@ msgid "Active"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
-msgstr "憑證總額"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
 msgstr "依發票日期分組"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
@@ -910,13 +929,6 @@ msgstr "九月"
 msgid "Sales Information"
 msgstr "銷售資料"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr "銷售收據分析"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
@@ -959,18 +971,11 @@ msgid "Journal Items"
 msgstr "帳簿明細"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr "客戶付款"
-
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
@@ -1048,12 +1053,6 @@ msgstr ""
 msgid "Journal"
 msgstr "帳簿"
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr "供應商付款"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -1072,8 +1071,6 @@ msgstr "原總額"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
 msgstr "採購付款"
 
@@ -1133,6 +1130,12 @@ msgstr "年份"
 msgid "Gain Exchange Rate Account"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "減價"
+
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
@@ -1177,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1188,7 +1191,7 @@ msgid "Effective date for accounting entries"
 msgstr "會計分錄的生效日期"
 
 #. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
 msgstr ""
 
@@ -1235,8 +1238,13 @@ msgid "Open Balance"
 msgstr "未結餘額"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
@@ -1270,6 +1278,9 @@ msgstr ""
 #~ msgid "Go"
 #~ msgstr "前往"
 
+#~ msgid "Sales Receipt"
+#~ msgstr "銷售收據"
+
 #~ msgid "Currency:"
 #~ msgstr "貨幣:"
 
@@ -1288,6 +1299,9 @@ msgstr ""
 #~ msgid "Compute Tax"
 #~ msgstr "計算稅項"
 
+#~ msgid "Supplier Payment"
+#~ msgstr "供應商付款"
+
 #~ msgid "Through :"
 #~ msgstr "透過:"
 
@@ -1297,6 +1311,12 @@ msgstr ""
 #~ msgid "Write-Off account"
 #~ msgstr "注銷帳號"
 
+#~ msgid "Sales Receipt Analysis"
+#~ msgstr "銷售收據分析"
+
+#~ msgid "Customer Payment"
+#~ msgstr "客戶付款"
+
 #~ msgid "Canceled"
 #~ msgstr "取消"
 
diff --git a/addons/analytic/i18n/ar.po b/addons/analytic/i18n/ar.po
index e27d58ed4d0..82faed29080 100644
--- a/addons/analytic/i18n/ar.po
+++ b/addons/analytic/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 14:39+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "تحديد مجموع الكمية لعدّها"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "مدين"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "مدير المحاسبة"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "مغلق"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "مدين"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "خط بياني"
 msgid "Description"
 msgstr "وصف"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -190,9 +207,9 @@ msgid "User"
 msgstr "مستخدِم"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "الحساب التحليلي الرئيسي"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -200,24 +217,24 @@ msgid "Date"
 msgstr "تاريخ"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"محسوبة بواسطة ضرب الكمية و السعر المعطى في  سعر تكلفة المنتج. و يعبر عنه "
+"دائما بالعملة الرئيسية للشركة."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -234,9 +251,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "الحساب التحليلي الرئيسي"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -265,19 +282,13 @@ msgid "Credit"
 msgstr "دائن"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "المقدار"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -322,7 +333,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -333,9 +344,9 @@ msgid "Analytic Accounting"
 msgstr "محاسبة تحليلية"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "المقدار"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -373,13 +384,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"محسوبة بواسطة ضرب الكمية و السعر المعطى في  سعر تكلفة المنتج. و يعبر عنه "
-"دائما بالعملة الرئيسية للشركة."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/bg.po b/addons/analytic/i18n/bg.po
index 87b866239ef..5d2d7055661 100644
--- a/addons/analytic/i18n/bg.po
+++ b/addons/analytic/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-25 23:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Дебит"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Отговорник за сметка"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Затворена"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Дебит"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Аналитичен ред"
 msgid "Description"
 msgstr "Описание"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Потребител"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Родителска аналитична сметка"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,9 +245,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Родителска аналитична сметка"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr "Кредит"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Количество"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +338,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Количество"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/bs.po b/addons/analytic/i18n/bs.po
index d357b282688..51f99fe8638 100644
--- a/addons/analytic/i18n/bs.po
+++ b/addons/analytic/i18n/bs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 10:36+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Specificira količinu koja se zaračunava."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Dugovanje"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Upravitelj računa"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Zatvorena"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Dugovanje"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analitička stavka"
 msgid "Description"
 msgstr "Opis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadređeni analitički konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,9 +245,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadređeni analitički konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr "Potraživanje"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +338,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Iznos"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/ca.po b/addons/analytic/i18n/ca.po
index 909c2b7c982..80a0776a360 100644
--- a/addons/analytic/i18n/ca.po
+++ b/addons/analytic/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-02 18:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica el valor de les quantitats a comptar."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Dèbit"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Gestor comptable"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Tancat"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Dèbit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Línia analítica"
 msgid "Description"
 msgstr "Descripció"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Usuari/a"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Compte analítica pare"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Data"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculat multiplicant la quantitat i el preu obtingut del preu de cost del "
+"producte. Sempre s'expressa en la moneda principal de la companyia."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Compte analítica pare"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Haver"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Quantitat"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Quantitat"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculat multiplicant la quantitat i el preu obtingut del preu de cost del "
-"producte. Sempre s'expressa en la moneda principal de la companyia."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/cs.po b/addons/analytic/i18n/cs.po
index 38556785438..aa1d8d3f539 100644
--- a/addons/analytic/i18n/cs.po
+++ b/addons/analytic/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-06 06:48+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: czech\n"
 
 #. module: analytic
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Určuje částku množství ke spočtení."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Má dáti"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Správce účtu"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Uzavřeno"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Má dáti"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analytický řádek"
 msgid "Description"
 msgstr "Popis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Uživatel"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadřazený analytický účet"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Vypočteno jako násobek množství a ceny dané cenou Výrobku. Vždy vyjádřeno v "
+"hlavní měně společnosti."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadřazený analytický účet"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Dal"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Částka"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Částka"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Vypočteno jako násobek množství a ceny dané cenou Výrobku. Vždy vyjádřeno v "
-"hlavní měně společnosti."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/da.po b/addons/analytic/i18n/da.po
index ada2793640d..52b6e307dfc 100644
--- a/addons/analytic/i18n/da.po
+++ b/addons/analytic/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,20 +100,14 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
 msgstr ""
 
 #. module: analytic
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,8 +203,8 @@ msgid "User"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
 msgstr ""
 
 #. module: analytic
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,8 +245,8 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
 msgstr ""
 
 #. module: analytic
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr ""
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,8 +338,8 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: analytic
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index a2b4294d422..13ca63eca95 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-08 10:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 14:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -29,9 +29,10 @@ msgid "In Progress"
 msgstr "In Arbeit"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Status Änderung"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Vertrag: "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -48,6 +49,32 @@ msgstr "Ende Datum"
 msgid "Specifies the amount of quantity to count."
 msgstr "Definiert die zu zählende Menge"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Soll"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+"Wenn Sie 'Ansicht' als Typ einer Kostenstelle auswählen, darf auf dieser "
+"Kostenstelle nicht gebucht werden.\n"
+"Der Typ 'Kostenstelle' steht für die normalen internen Kostenstellen, die "
+"nur in der Buchhaltung verwendet werden.\n"
+"Wenn Sie 'Vertrag oder Projekt' auswählen, können Sie die Einstellungen zur "
+"Vertragsdauer und zur Abrechnung \n"
+"verwalten. In einer 'Vertrag Vorlage' hinterlegen Sie Standard-Daten, die "
+"Sie immer wieder verwenden können."
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -67,10 +94,14 @@ msgstr ""
 "Vertrag mit  dem Kunden zu erneuern."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Vertrag: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Vertrag oder Projekt"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Kostenstelle/Vertrag Bezeichnung"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -82,21 +113,15 @@ msgstr "Verantw. Mitarbeiter"
 msgid "Followers"
 msgstr "Followers"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr "Vertrag wurde <b>erstellt</b>."
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Beendet"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Soll"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -114,7 +139,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
@@ -130,11 +155,6 @@ msgstr "Kostenstellen Buchung"
 msgid "Description"
 msgstr "Buchungstext"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Kostenstelle/Vertrag Bezeichnung"
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -161,6 +181,11 @@ msgstr "Erneuerung"
 msgid "Messages and communication history"
 msgstr "Nachrichten und Kommunikation"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -171,7 +196,7 @@ msgstr ""
 "den Stundenzetteln ergibt (z.B. Kontingent Supportstunden)."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -182,8 +207,8 @@ msgid ""
 "currencies, for example."
 msgstr ""
 "Wenn Sie ein Unternehmen definieren, müssen die Währungen übereinstimmen.\n"
-"Sie können die Definition des Unternehmen für Sicheten entfernen.\n"
-"Damit können Sie verschiedene Firmen mit verschiedenen Währungen "
+"Sie können die Definition des Unternehmen für Ansichten entfernen.\n"
+"Damit können Sie dann auch verschiedene Firmen mit verschiedenen Währungen \n"
 "konsolidieren."
 
 #. module: analytic
@@ -197,9 +222,9 @@ msgid "User"
 msgstr "Benutzer"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Übergeordnetes Analyse Konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -207,31 +232,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
-"Wenn Sie 'Ansicht' als Typ einer Kostenstelle auswählen, darf auf dieser "
-"Kostenstelle nicht gebucht werden.\n"
-"Der Typ 'Kostenstelle' steht für die normalen internen Kostenstellen, die "
-"nur in der Buchhaltung verwendet werden.\n"
-"Wenn Sie 'Vertrag oder Projekt' auswählen, können Sie die Einstellungen zur "
-"Vertragsdauer und zur Abrechnung \n"
-"verwalten. In einer 'Vertrag Vorlage' hinterlegen Sie Standard-Daten, die "
-"Sie immer wieder verwenden können."
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Bedingungen und Konditionen"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Berechnet durch Multiplikation von Menge und Herstellungskosten bzw. "
+"Anschaffungskosten des Produkts. Die Angabe erfolgt immer in der Standard "
+"Währung des Unternehmens."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -249,10 +267,9 @@ msgid "Messages"
 msgstr "Mitteilungen"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
-"Sie können keine Kostenstellen buchen, die als Ansicht definiert wurde"
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Übergeordnete Kostenstelle"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -281,20 +298,14 @@ msgid "Credit"
 msgstr "Haben"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Betrag"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr "Vertrag für <em>%s</em> wurde <b>erstellt</b>."
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Bedingungen und Konditionen"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -338,7 +349,7 @@ msgid "Reference"
 msgstr "Kostenstellennummer"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -349,9 +360,9 @@ msgid "Analytic Accounting"
 msgstr "Kostenstellenrechnung"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Vertrag oder Projekt"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Betrag"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -392,14 +403,10 @@ msgid "Start Date"
 msgstr "Start Datum"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Berechnet durch Multiplikation von Menge und Herstellungskosten bzw. "
-"Anschaffungskosten des Produkts. Die Angabe erfolgt immer in der Standard "
-"Währung des Unternehmens."
+"Sie können keine Kostenstellen buchen, die als Ansicht definiert wurde"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index a948727043b..77532a01c5b 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 10:18+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Καθορίζει την επιμετρούμενη ποσότητα"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Χρεωστική"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Υπεύθυνος Λογαριασμού"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Κλεισμένα"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Χρεωστική"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Γραμμή Αναλυτικής"
 msgid "Description"
 msgstr "Περιγραφή"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Χρήστης"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Γονικός Λογαριασμός Αναλυτικής"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,25 @@ msgid "Date"
 msgstr "Ημερομηνία"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Υπολογίστηκε πολλαπλασιάζοντας τη νποσότητα επί την τιμή που προκύπτει από "
+"την τιμή κόστους του πίνακα Προϊόντων. Πάντα εκφράζεται στο κύριο νόμισμα "
+"της εταιρείας."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +248,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Γονικός Λογαριασμός Αναλυτικής"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +279,13 @@ msgid "Credit"
 msgstr "Πίστωση"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Ποσό"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +330,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +341,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Ποσό"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,14 +381,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Υπολογίστηκε πολλαπλασιάζοντας τη νποσότητα επί την τιμή που προκύπτει από "
-"την τιμή κόστους του πίνακα Προϊόντων. Πάντα εκφράζεται στο κύριο νόμισμα "
-"της εταιρείας."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 5bc3bfc725a..319b7326037 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 12:55+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "En proceso"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Cambio de estado"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Contrato: "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,31 @@ msgstr "Fecha final"
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica el valor de las cantidades a contar."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+"Si selecciona el tipo 'Vista', no podrá crear asientos usando esta cuenta. "
+"El tipo 'Cuenta analítica' está para las cuentas usuales que sólo se quieren "
+"usar en contabilidad. Si selecciona 'Contrato o proyecto', le permite la "
+"posibilidad de administrar una validez y opciones de facturación para esta "
+"cuenta.\n"
+"El tipo especial 'Plantilla de contrato' permite definir una plantilla con "
+"los datos por defecto que se podrán reutilizar fácilmente."
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -66,10 +92,14 @@ msgstr ""
 "el cliente."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Contrato: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Contrato o proyecto"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Nombre del contrato/cuenta"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -81,21 +111,15 @@ msgstr "Gestor contable"
 msgid "Followers"
 msgstr "Seguidores"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr "Contrato <b>creado</b>."
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debe"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -113,7 +137,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -129,11 +153,6 @@ msgstr "Línea analítica"
 msgid "Description"
 msgstr "Descripción"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Nombre del contrato/cuenta"
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -160,6 +179,11 @@ msgstr "Renovación"
 msgid "Messages and communication history"
 msgstr "Mensajes e historial de comunicación"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -171,7 +195,7 @@ msgstr ""
 "limitado)."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -198,9 +222,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Cuenta analítica padre"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -208,30 +232,23 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
-"Si selecciona el tipo 'Vista', no podrá crear asientos usando esta cuenta. "
-"El tipo 'Cuenta analítica' está para las cuentas usuales que sólo se quieren "
-"usar en contabilidad. Si selecciona 'Contrato o proyecto', le permite la "
-"posibilidad de administrar una validez y opciones de facturación para esta "
-"cuenta.\n"
-"El tipo especial 'Plantilla de contrato' permite definir una plantilla con "
-"los datos por defecto que se podrán reutilizar fácilmente."
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Plazos y condiciones"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
+"del producto. Siempre se expresa en la moneda principal de la compañía."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -249,9 +266,9 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr "No puede crear una línea analítica en una cuenta de tipo vista."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cuenta analítica padre"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -280,20 +297,14 @@ msgid "Credit"
 msgstr "Haber"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Importe"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr "El contrato para <em>%s</em> ha sido <b>creado</b>."
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Plazos y condiciones"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -337,7 +348,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -348,9 +359,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilidad analítica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Contrato o proyecto"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Importe"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -390,13 +401,9 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr ""
-"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
-"del producto. Siempre se expresa en la moneda principal de la compañía."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "No puede crear una línea analítica en una cuenta de tipo vista."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/es_CR.po b/addons/analytic/i18n/es_CR.po
index 9839544a58b..eb57c260d69 100644
--- a/addons/analytic/i18n/es_CR.po
+++ b/addons/analytic/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 15:50+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: analytic
@@ -29,8 +29,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -48,6 +49,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica el valor de las cantidades a contar."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -63,9 +82,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -78,21 +101,15 @@ msgstr "Gestor contable"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debe"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -110,7 +127,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -126,11 +143,6 @@ msgstr "Línea analítica"
 msgid "Description"
 msgstr "Descripción"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -157,6 +169,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -165,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -193,9 +210,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Cuenta analítica padre"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -203,24 +220,24 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
+"del producto. Siempre se expresa en la moneda principal de la compañía."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -237,9 +254,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cuenta analítica padre"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -268,19 +285,13 @@ msgid "Credit"
 msgstr "Haber"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Monto"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -325,7 +336,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -336,9 +347,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilidad analítica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Monto"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -376,13 +387,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
-"del producto. Siempre se expresa en la moneda principal de la compañía."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/es_EC.po b/addons/analytic/i18n/es_EC.po
index da725063b53..69db3441d7a 100644
--- a/addons/analytic/i18n/es_EC.po
+++ b/addons/analytic/i18n/es_EC.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 03:48+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -23,8 +23,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -42,6 +43,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Especificar el monto de la cantidad a contar"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debito"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -57,9 +76,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -72,21 +95,15 @@ msgstr "Administrador Contable"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debito"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -104,7 +121,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -120,11 +137,6 @@ msgstr "Linea Analitica"
 msgid "Description"
 msgstr "Descripcion"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -151,6 +163,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -159,7 +176,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Cuenta Analitica Padre"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
+"del producto. Siempre se expresa en la moneda principal de la compañía."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cuenta Analitica Padre"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Credito"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Monto"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilidad Analítica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Monto"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
-"del producto. Siempre se expresa en la moneda principal de la compañía."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/es_PY.po b/addons/analytic/i18n/es_PY.po
index db58b75d9a0..a347462826a 100644
--- a/addons/analytic/i18n/es_PY.po
+++ b/addons/analytic/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-07 23:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica el valor de las cantidades a contar."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Gestor contable"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Cierre"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Débito"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Línea analítica"
 msgid "Description"
 msgstr "Descripción"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Cuenta analítica padre"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
+"del producto. Siempre se expresa en la moneda principal de la compañía."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cuenta analítica padre"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Importe"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
-"del producto. Siempre se expresa en la moneda principal de la compañía."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
index 619d7f9d2cc..b475ca2b38d 100644
--- a/addons/analytic/i18n/et.po
+++ b/addons/analytic/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 00:14+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Deebet"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Konto haldur"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Suletud"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Deebet"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr ""
 msgid "Description"
 msgstr "Kirjeldus"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Kasutaja"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Ülem analüütiline konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr "Kuupäev"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,9 +245,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Ülem analüütiline konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr "Krediit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Kogus"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +338,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Kogus"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/fa.po b/addons/analytic/i18n/fa.po
index 50904c11387..cbe0264c974 100644
--- a/addons/analytic/i18n/fa.po
+++ b/addons/analytic/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 17:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,20 +100,14 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
 msgstr ""
 
 #. module: analytic
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,8 +203,8 @@ msgid "User"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
 msgstr ""
 
 #. module: analytic
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,8 +245,8 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
 msgstr ""
 
 #. module: analytic
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr ""
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,8 +338,8 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: analytic
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po
index f68159a339a..02789d9513a 100644
--- a/addons/analytic/i18n/fi.po
+++ b/addons/analytic/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-29 06:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Määrittelee laskettavan määrän"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Asiakasvastaava"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Suljettu"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debet"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analyyttinen rivi"
 msgid "Description"
 msgstr "Kuvaus"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Käyttäjä"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Ylempi analyyttinen tili"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Päiväys"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Laskettu kertomalla määrä ja tuotteen kustannushinta. Yrityksen "
+"päävaluutassa."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Ylempi analyyttinen tili"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Määrä"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Määrä"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Laskettu kertomalla määrä ja tuotteen kustannushinta. Yrityksen "
-"päävaluutassa."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index 45849bc8a9b..c39feb41cab 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 15:37+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Définit le montant de la quantité à compter."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Débit"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Responsable du compte"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Fermé"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Débit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Ligne analytique"
 msgid "Description"
 msgstr "Description"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -192,9 +209,9 @@ msgid "User"
 msgstr "Utilisateur"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Compte analytique parent"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -202,24 +219,24 @@ msgid "Date"
 msgstr "Date"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculé en multipliant la quantité par le prix de revient de l'article. "
+"Toujours exprimé dans la devise principale de la société."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -236,9 +253,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Compte analytique parent"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -267,19 +284,13 @@ msgid "Credit"
 msgstr "Crédit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Montant"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -324,7 +335,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -335,9 +346,9 @@ msgid "Analytic Accounting"
 msgstr "Comptabilité analytique"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Montant"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -375,13 +386,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculé en multipliant la quantité par le prix de revient de l'article. "
-"Toujours exprimé dans la devise principale de la société."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/gl.po b/addons/analytic/i18n/gl.po
index 23f031a138d..c450239d698 100644
--- a/addons/analytic/i18n/gl.po
+++ b/addons/analytic/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-24 00:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica o importe da cantidade a contar."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Xestor da Conta"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Pechado"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Débito"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Liña Analítica"
 msgid "Description"
 msgstr "Descrición"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Conta Analítica Padre"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Data"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando a cantidade e o prezo dado no prezo de custo do "
+"produto. Sempre expresado na divisa da compañía principal."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Conta Analítica Padre"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Importe"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculado multiplicando a cantidade e o prezo dado no prezo de custo do "
-"produto. Sempre expresado na divisa da compañía principal."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/hr.po b/addons/analytic/i18n/hr.po
index 271e967abe5..e9a94c51a25 100644
--- a/addons/analytic/i18n/hr.po
+++ b/addons/analytic/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-30 15:18+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Količina"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Duguje"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Voditelj računovodstva"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Zatvoren"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Duguje"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analitičke stavke"
 msgid "Description"
 msgstr "Opis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadređeni analitički konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Izračunato kao umnožak količine i nabavne cijene proizvoda. Uvijek u "
+"matičnoj valuti organizacije(kn)."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadređeni analitički konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Potražuje"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr "Analitičko računovodstvo"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Iznos"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Izračunato kao umnožak količine i nabavne cijene proizvoda. Uvijek u "
-"matičnoj valuti organizacije(kn)."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/hu.po b/addons/analytic/i18n/hu.po
index 02e20c8e924..19de9e5e090 100644
--- a/addons/analytic/i18n/hu.po
+++ b/addons/analytic/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-30 18:54+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -27,8 +27,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -46,6 +47,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Itt lehet megadni a mennyiséget."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Tartozik"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -61,9 +80,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -76,21 +99,15 @@ msgstr "Felelős"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Lezárt"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Tartozik"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -108,7 +125,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -124,11 +141,6 @@ msgstr "Gyűjtőkód tétel"
 msgid "Description"
 msgstr "Leírás"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -155,6 +167,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -163,7 +180,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -185,9 +202,9 @@ msgid "User"
 msgstr "Felhasználó"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Fölérendelt gyűjtőkód"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -195,24 +212,24 @@ msgid "Date"
 msgstr "Dátum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"A mennyiség és a termék törzsadatai között tárolt bekerülési érték "
+"szorzataként kerül kiszámításra. Mindig a vállalat pénznemében van kifejezve."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -229,9 +246,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Fölérendelt gyűjtőkód"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -260,19 +277,13 @@ msgid "Credit"
 msgstr "Követel"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Összeg"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -317,7 +328,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -328,9 +339,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Összeg"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -368,13 +379,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"A mennyiség és a termék törzsadatai között tárolt bekerülési érték "
-"szorzataként kerül kiszámításra. Mindig a vállalat pénznemében van kifejezve."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index dcebab3348b..b8f20e4a45d 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 21:13+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "In Corso"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Cambio di stato"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Contratto: "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,32 @@ msgstr "Data Finale"
 msgid "Specifies the amount of quantity to count."
 msgstr "Specifica la quantità da sommare"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debito"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+"Se viene selezionata il Tipo Vista, significa che non sarà permesso creare "
+"registrazioni usando quel conto.\n"
+"Il tipo 'Conto analitico' serve per conti tipici che si usano in "
+"contabilità.\n"
+"Se viene selezionato Contratto o Progetto, permette di gestire la validità e "
+"le opzioni di fatturazione per questo conto.\n"
+"Il tipo speciale 'Modello di Contratto' permette di definire un modello con "
+"i dati di default che è possibile riutilizzare facilmente."
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -72,10 +99,14 @@ msgstr ""
 "                                        cliente."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Contratto: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Contratto o Progetto"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Nome Conto/Contratto"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -87,21 +118,15 @@ msgstr "Gestore Conti"
 msgid "Followers"
 msgstr "Followers"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr "Contratto <b>creato</b>."
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Chiuso"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debito"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -119,7 +144,7 @@ msgid "Status"
 msgstr "Stato"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -135,11 +160,6 @@ msgstr "Linea conto analitico"
 msgid "Description"
 msgstr "Descrizione"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Nome Conto/Contratto"
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -166,6 +186,11 @@ msgstr "Rinnovo"
 msgid "Messages and communication history"
 msgstr "Storico messaggi e comunicazioni"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -177,7 +202,7 @@ msgstr ""
 "pacchetto.)"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -205,9 +230,9 @@ msgid "User"
 msgstr "Utente"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Conto Analitico padre"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -215,31 +240,23 @@ msgid "Date"
 msgstr "Data"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
-"Se viene selezionata il Tipo Vista, significa che non sarà permesso creare "
-"registrazioni usando quel conto.\n"
-"Il tipo 'Conto analitico' serve per conti tipici che si usano in "
-"contabilità.\n"
-"Se viene selezionato Contratto o Progetto, permette di gestire la validità e "
-"le opzioni di fatturazione per questo conto.\n"
-"Il tipo speciale 'Modello di Contratto' permette di definire un modello con "
-"i dati di default che è possibile riutilizzare facilmente."
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Termini e Condizioni"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calcolato moltiplicando la quantità ed il prezzo specificato nel prezzo di "
+"costo del Prodotto. Sempre espresso nella valuta principale aziendale."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -257,9 +274,9 @@ msgid "Messages"
 msgstr "Messaggi"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr "Non è possibile creare righe analitiche in conti vista."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Conto Analitico padre"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -288,20 +305,14 @@ msgid "Credit"
 msgstr "Credito"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Importo"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr "Il Contratto per <em>%s</em> è stato <b>creato</b>."
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Termini e Condizioni"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -345,7 +356,7 @@ msgid "Reference"
 msgstr "Riferimento"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -356,9 +367,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilità Analitica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Contratto o Progetto"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Importo"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -398,13 +409,9 @@ msgid "Start Date"
 msgstr "Data Iniziale"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr ""
-"Calcolato moltiplicando la quantità ed il prezzo specificato nel prezzo di "
-"costo del Prodotto. Sempre espresso nella valuta principale aziendale."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "Non è possibile creare righe analitiche in conti vista."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/ja.po b/addons/analytic/i18n/ja.po
index b24719be6bc..dfd39405c10 100644
--- a/addons/analytic/i18n/ja.po
+++ b/addons/analytic/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 23:38+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "数えた数量の指定"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "会計マネジャ"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "閉じた"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "借方"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "分析行"
 msgid "Description"
 msgstr "詳細"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -189,9 +206,9 @@ msgid "User"
 msgstr "ユーザ"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "パートナ分析アカウント"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -199,24 +216,22 @@ msgid "Date"
 msgstr "日付"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr "数量と製品の原価価格を乗算して計算されます。いつも会社の主な通貨で表現されます。"
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -233,9 +248,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "パートナ分析アカウント"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -264,19 +279,13 @@ msgid "Credit"
 msgstr "貸方"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "金額"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -321,7 +330,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -332,9 +341,9 @@ msgid "Analytic Accounting"
 msgstr "分析会計"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "金額"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -372,11 +381,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr "数量と製品の原価価格を乗算して計算されます。いつも会社の主な通貨で表現されます。"
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/lv.po b/addons/analytic/i18n/lv.po
index 66b69c5832d..7e74ac39adb 100644
--- a/addons/analytic/i18n/lv.po
+++ b/addons/analytic/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-28 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Norāda uzskaitāmo daudzumu."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debets"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Kontu Pārvaldnieks"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Slēgts"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debets"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analītiskā Rinda"
 msgid "Description"
 msgstr "Apraksts"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Lietotājs"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Saistītais Analītiskais Konts"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Datums"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Aprēķina produkta pašizmaksas cenu reizinot ar daudzumu. Vienmēr izsaka "
+"uzņēmuma galvenajā valūtā."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Saistītais Analītiskais Konts"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Kredīts"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Summa"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Summa"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Aprēķina produkta pašizmaksas cenu reizinot ar daudzumu. Vienmēr izsaka "
-"uzņēmuma galvenajā valūtā."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index 59a79a2ff7e..5d577a0d72a 100644
--- a/addons/analytic/i18n/mn.po
+++ b/addons/analytic/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Тоо ширхэгийг тоолох хэмжээг тооцоолох"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Дебит"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Дансны менежер"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Хаасан"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Дебит"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Аналитик шугам"
 msgid "Description"
 msgstr "Тайлбар"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -190,9 +207,9 @@ msgid "User"
 msgstr "Хэрэглэгч"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Эцэг аналитик данс"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -200,24 +217,24 @@ msgid "Date"
 msgstr "Огноо"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Барааны өртөг үнэнд өгөгдсөн тоо ширхэг болон үнийг үржүүлж тооцоолоогдсон. "
+"Үргэлж компанийн үндсэн мөнгөн тэмдэгтэд илэрхийлэгддэг."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -234,9 +251,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Эцэг аналитик данс"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -265,19 +282,13 @@ msgid "Credit"
 msgstr "Кредит"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Дүн"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -322,7 +333,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -333,9 +344,9 @@ msgid "Analytic Accounting"
 msgstr "Аналитик санхүү"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Дүн"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -373,13 +384,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Барааны өртөг үнэнд өгөгдсөн тоо ширхэг болон үнийг үржүүлж тооцоолоогдсон. "
-"Үргэлж компанийн үндсэн мөнгөн тэмдэгтэд илэрхийлэгддэг."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
index abe41034a88..20e4da1190a 100644
--- a/addons/analytic/i18n/nb.po
+++ b/addons/analytic/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 13:08+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "I arbeid."
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Statusendring."
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Kontrakt. "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,24 @@ msgstr "Sluttdato."
 msgid "Specifies the amount of quantity to count."
 msgstr "Angir mengden avnkvantitet å telle."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,10 +81,14 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Kontrakt. "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Kontrakt eller prosjekt."
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Konto/kontrakt navn."
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -77,21 +100,15 @@ msgstr "kontofører"
 msgid "Followers"
 msgstr "Følgere."
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr "Kontrakt <b> Opprett <b>."
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Lukket"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debet"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr "Status."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopi)"
@@ -125,11 +142,6 @@ msgstr "Analytisk linje"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Konto/kontrakt navn."
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr "Meldinger og kommunikasjon historie."
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -192,9 +209,9 @@ msgid "User"
 msgstr "Bruker"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Overordnet analytisk konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -202,23 +219,23 @@ msgid "Date"
 msgstr "Dato"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Vilkår og betingelser."
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Beregnet ved å multiplisere antall og pris gitt av produktets kostpris. "
+"Alltid uttrykt i firmaets hovedvaluta."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -236,9 +253,9 @@ msgid "Messages"
 msgstr "Meldinger."
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr "Du kan ikke opprette en analytisk linje på vis konto."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Overordnet analytisk konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -267,20 +284,14 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Beløp"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr "Kontrakt for <em>%s</em> har vært <b> Opprett <b>."
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Vilkår og betingelser."
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -324,7 +335,7 @@ msgid "Reference"
 msgstr "Referanse."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Feil!"
@@ -335,9 +346,9 @@ msgid "Analytic Accounting"
 msgstr "Analytisk bokføring"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Kontrakt eller prosjekt."
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Beløp"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -375,13 +386,9 @@ msgid "Start Date"
 msgstr "Startdato."
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr ""
-"Beregnet ved å multiplisere antall og pris gitt av produktets kostpris. "
-"Alltid uttrykt i firmaets hovedvaluta."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/nl.po b/addons/analytic/i18n/nl.po
index 1077f732ffe..ba5e4437f8a 100644
--- a/addons/analytic/i18n/nl.po
+++ b/addons/analytic/i18n/nl.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 21:19+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr "Subrekeningen"
+msgstr "Onderliggende kostenplaatsen"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "In Behandeling"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Statuswijziging"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Contract: "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,24 @@ msgstr "Einddatum"
 msgid "Specifies the amount of quantity to count."
 msgstr "Het aantal te rekenen eenheden"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,10 +81,14 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Contract of project"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -77,21 +100,15 @@ msgstr "Beheerder kostenplaats"
 msgid "Followers"
 msgstr "Volgers"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Gesloten"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -125,11 +142,6 @@ msgstr "Kostenplaatsboeking"
 msgid "Description"
 msgstr "Omschrijving"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr "Vernieuwen"
 msgid "Messages and communication history"
 msgstr "Berichten en communicatie historie"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -192,9 +209,9 @@ msgid "User"
 msgstr "Gebruiker"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Bovenliggende kostenplaats"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -202,23 +219,23 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Voorwaarden"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Berekend door vermenigvuldiging van aantal en prijs uit de kostprijs van het "
+"product. Altijd uitgedrukt in de hoofdvaluta van het bedrijf."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -228,7 +245,7 @@ msgstr "Klant"
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
 msgid "Account Hierarchy"
-msgstr "Rekening hirarcie"
+msgstr "Kostenplaats hirarcie"
 
 #. module: analytic
 #: field:account.analytic.account,message_ids:0
@@ -236,9 +253,9 @@ msgid "Messages"
 msgstr "Berichten"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Bovenliggende kostenplaats"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -267,20 +284,14 @@ msgid "Credit"
 msgstr "Credit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Bedrag"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Voorwaarden"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -324,7 +335,7 @@ msgid "Reference"
 msgstr "Referentie"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -335,9 +346,9 @@ msgid "Analytic Accounting"
 msgstr "Kostenplaatsen"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Contract of project"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Bedrag"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -378,22 +389,15 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Berekend door vermenigvuldiging van aantal en prijs uit de kostprijs van het "
-"product. Altijd uitgedrukt in de hoofdvaluta van het bedrijf."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Kostenplaatsboekingen"
 
-#~ msgid "Account Name"
-#~ msgstr "Naam rekening"
-
 #~ msgid "State"
 #~ msgstr "Status"
 
@@ -407,37 +411,6 @@ msgstr "Kostenplaatsboekingen"
 #~ msgid "Draft"
 #~ msgstr "Concept"
 
-#~ msgid ""
-#~ "* When an account is created its in 'Draft' state.                           "
-#~ "       \n"
-#~ "* If any associated partner is there, it can be in 'Open' state.             "
-#~ "                     \n"
-#~ "* If any pending balance is there it can be in 'Pending'.                    "
-#~ "               \n"
-#~ "* And finally when all the transactions are over, it can be in 'Close' "
-#~ "state.                                   \n"
-#~ "* The project can be in either if the states 'Template' and 'Running'.\n"
-#~ " If it is template then we can make projects based on the template projects. "
-#~ "If its in 'Running' state it is a normal project.                            "
-#~ "     \n"
-#~ " If it is to be reviewed then the state is 'Pending'.\n"
-#~ " When the project is completed the state is set to 'Done'."
-#~ msgstr ""
-#~ "* Nadat de rekening is gemaakt, wordt de status 'Concept'.                   "
-#~ "               \n"
-#~ "* Als er een gekoppelde relatie is, kan de status naar 'Open'.               "
-#~ "                   \n"
-#~ "* Als er openstaand saldo is, kan de status naar 'Wacht'.                    "
-#~ "               \n"
-#~ "* En tenslotte als alle transacties klaar zijn, dan gaat de status naar "
-#~ "'Gesloten'.                                   \n"
-#~ "* Het project kan zowel in 'Sjabloon' als in 'Lopend' zijn.\n"
-#~ " Als het in 'Sjabloon' status is, dan kunnen we projecten maken op basis van "
-#~ "het sjabloon project. Als het status 'Lopend' heeft, dan is het een gewoon "
-#~ "project.                                 \n"
-#~ " Als het moet worden nagekeken is de status 'Wacht'.\n"
-#~ " Als het project klaar is dan is de status 'Klaar'."
-
 #~ msgid "Pending"
 #~ msgstr "Wacht"
 
@@ -465,9 +438,6 @@ msgstr "Kostenplaatsboekingen"
 #~ msgid "Open"
 #~ msgstr "Open"
 
-#~ msgid "Account Type"
-#~ msgstr "Rekeningsoort"
-
 #~ msgid "Maximum Quantity"
 #~ msgstr "Maximum aantal"
 
@@ -494,18 +464,55 @@ msgstr "Kostenplaatsboekingen"
 #~ msgid "Maximum Time"
 #~ msgstr "Maximum Tijd"
 
-#~ msgid "You can not create analytic line on view account."
-#~ msgstr ""
-#~ "Het is niet mogelijk een kostenplaats te maken op een rekening van het type "
-#~ "'view'"
-
 #~ msgid "Sets the higher limit of time to work on the contract."
 #~ msgstr ""
 #~ "Bepaald het bovenbereik  van de tijd wat kan worden gewerkt op een contract."
 
+#~ msgid "You can not create analytic line on view account."
+#~ msgstr ""
+#~ "Het is niet mogelijk een kostenplaats boekingen te maken op een kostenplaats "
+#~ "van het type 'aanzicht'"
+
+#~ msgid "Account Name"
+#~ msgstr "Naam kostenplaats"
+
+#~ msgid "Account Type"
+#~ msgstr "Soort kostenplaats"
+
+#~ msgid ""
+#~ "* When an account is created its in 'Draft' state.                           "
+#~ "       \n"
+#~ "* If any associated partner is there, it can be in 'Open' state.             "
+#~ "                     \n"
+#~ "* If any pending balance is there it can be in 'Pending'.                    "
+#~ "               \n"
+#~ "* And finally when all the transactions are over, it can be in 'Close' "
+#~ "state.                                   \n"
+#~ "* The project can be in either if the states 'Template' and 'Running'.\n"
+#~ " If it is template then we can make projects based on the template projects. "
+#~ "If its in 'Running' state it is a normal project.                            "
+#~ "     \n"
+#~ " If it is to be reviewed then the state is 'Pending'.\n"
+#~ " When the project is completed the state is set to 'Done'."
+#~ msgstr ""
+#~ "* Nadat de kostenplaats is gemaakt, wordt de status 'Concept'.               "
+#~ "                   \n"
+#~ "* Als er een gekoppelde relatie is, kan de status naar 'Open'.               "
+#~ "                   \n"
+#~ "* Als er openstaand saldo is, kan de status naar 'Wacht'.                    "
+#~ "               \n"
+#~ "* En tenslotte als alle transacties klaar zijn, dan gaat de status naar "
+#~ "'Gesloten'.                                   \n"
+#~ "* Het project kan zowel in 'Sjabloon' als in 'Lopend' zijn.\n"
+#~ " Als het in 'Sjabloon' status is, dan kunnen we projecten maken op basis van "
+#~ "het sjabloon project. Als het status 'Lopend' heeft, dan is het een gewoon "
+#~ "project.                                 \n"
+#~ " Als het moet worden nagekeken is de status 'Wacht'.\n"
+#~ " Als het project klaar is dan is de status 'Klaar'."
+
 #~ msgid ""
 #~ "If you select the View Type, it means you won't allow to create journal "
 #~ "entries using that account."
 #~ msgstr ""
 #~ "Als u de soort weergave selecteert, betekent dat u het niet toelaat dat er "
-#~ "journaalposten op deze rekening gemaakt worden."
+#~ "journaalposten op deze kostenplaats gemaakt worden."
diff --git a/addons/analytic/i18n/nl_BE.po b/addons/analytic/i18n/nl_BE.po
index 3cb352b2c9d..ef00fe85d9e 100644
--- a/addons/analytic/i18n/nl_BE.po
+++ b/addons/analytic/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-03 16:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,20 +100,14 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
 msgstr ""
 
 #. module: analytic
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,8 +203,8 @@ msgid "User"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
 msgstr ""
 
 #. module: analytic
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,8 +245,8 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
 msgstr ""
 
 #. module: analytic
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr ""
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,8 +338,8 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: analytic
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/pl.po b/addons/analytic/i18n/pl.po
index 600366c847d..74bdaecdee4 100644
--- a/addons/analytic/i18n/pl.po
+++ b/addons/analytic/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 19:45+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "W toku"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Zmiana statusu"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Umowa: "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,31 @@ msgstr "Data Końcowa"
 msgid "Specifies the amount of quantity to count."
 msgstr "Określa ilość do obliczeń."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Winien"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+"Typ konta Widok oznacza, że nie zezwalasz na zapisy na tym koncie.\n"
+"Typ 'Konto analityczne' jest stosowany do zwykłych zapisów analitycznych.\n"
+"Jeśli wybierzesz \"Umowa' lub 'Projekt', to konta będą miały dodatkowe "
+"funkcjonalności\n"
+"zatwierdzania zapisów i fakturowania.\n"
+"Typ specjalny 'Szablon umowy' pozwala definiować szablon z ustawieniami "
+"domyślnymi do kopiowania w tworzonych umowach.."
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -70,10 +96,14 @@ msgstr ""
 "                                        umowy z klientem."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Umowa: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Umowa lub Projekt"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Nazwa umowy/konta"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -85,21 +115,15 @@ msgstr "Menedżer kontraktu"
 msgid "Followers"
 msgstr "Wypowiadający się"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr "Umowę <b>utworzono</b>."
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Zamknięte"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Winien"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -117,7 +141,7 @@ msgid "Status"
 msgstr "Stan"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -133,11 +157,6 @@ msgstr "Pozycja analityczna"
 msgid "Description"
 msgstr "Opis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Nazwa umowy/konta"
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -164,6 +183,11 @@ msgstr "Odnowienie"
 msgid "Messages and communication history"
 msgstr "Wiadomości i historia komunikacji"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -172,7 +196,7 @@ msgid ""
 msgstr "Ustaw wyższy limit czasu pracy dla umowy związanej z kartą pracy."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -197,9 +221,9 @@ msgid "User"
 msgstr "Użytkownik"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadrzędne konto analityczne"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -207,30 +231,23 @@ msgid "Date"
 msgstr "Data"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
-"Typ konta Widok oznacza, że nie zezwalasz na zapisy na tym koncie.\n"
-"Typ 'Konto analityczne' jest stosowany do zwykłych zapisów analitycznych.\n"
-"Jeśli wybierzesz \"Umowa' lub 'Projekt', to konta będą miały dodatkowe "
-"funkcjonalności\n"
-"zatwierdzania zapisów i fakturowania.\n"
-"Typ specjalny 'Szablon umowy' pozwala definiować szablon z ustawieniami "
-"domyślnymi do kopiowania w tworzonych umowach.."
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Warunki i postanowienia"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Obliczone jako iloczyn ilości i ceny kosztowej z Produktu. Wyrażone i "
+"walucie firmy."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -248,9 +265,9 @@ msgid "Messages"
 msgstr "Wiadomości"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr "Nie możesz robić zapisu na koncie analitycznym typu widok."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadrzędne konto analityczne"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -279,20 +296,14 @@ msgid "Credit"
 msgstr "Ma"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Kwota"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr "Umowa dla <em>%s</em> została <b>utworzona</b>."
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Warunki i postanowienia"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -336,7 +347,7 @@ msgid "Reference"
 msgstr "Odnośnik"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -347,9 +358,9 @@ msgid "Analytic Accounting"
 msgstr "Księgowość analityczna"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Umowa lub Projekt"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Kwota"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -390,13 +401,9 @@ msgid "Start Date"
 msgstr "Data początkowa"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr ""
-"Obliczone jako iloczyn ilości i ceny kosztowej z Produktu. Wyrażone i "
-"walucie firmy."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "Nie możesz robić zapisu na koncie analitycznym typu widok."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/pt.po b/addons/analytic/i18n/pt.po
index a132f205ea0..1d55d8fb01a 100644
--- a/addons/analytic/i18n/pt.po
+++ b/addons/analytic/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:32+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "Em progresso"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Alteração de estado"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Contrato: "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,24 @@ msgstr "Data de fecho"
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica o montante do valor a contar"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,10 +81,14 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Contrato: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Contrato ou projeto"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Nome de Conta/Contrato"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -77,21 +100,15 @@ msgstr "Gestor de conta"
 msgid "Followers"
 msgstr "Seguidores"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Encerrado"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Débito"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Linha analítica"
 msgid "Description"
 msgstr "Descrição"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Nome de Conta/Contrato"
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr "Renovação"
 msgid "Messages and communication history"
 msgstr "Histórico de mensagens e comunicação"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -192,9 +209,9 @@ msgid "User"
 msgstr "Utilizador"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Conta Analítica Ascendente"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -202,23 +219,23 @@ msgid "Date"
 msgstr "Data"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Termos e condições"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando a quantidade pelo preço de custo do artigo. Sempre "
+"expresso na Moeda da principal da empresa."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -236,9 +253,9 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Conta Analítica Ascendente"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -267,20 +284,14 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Montante"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Termos e condições"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -324,7 +335,7 @@ msgid "Reference"
 msgstr "Referência"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -335,9 +346,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilidade Analítica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Contrato ou projeto"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Montante"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -375,13 +386,9 @@ msgid "Start Date"
 msgstr "Data de abertura"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculado multiplicando a quantidade pelo preço de custo do artigo. Sempre "
-"expresso na Moeda da principal da empresa."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index b0f48e582f5..dec1fbf54ff 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/i18n/pt_BR.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-16 22:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:02+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -29,9 +29,10 @@ msgid "In Progress"
 msgstr "Em Andamento"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "Mudança de Situação"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Contrato "
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -48,6 +49,32 @@ msgstr "Data Final"
 msgid "Specifies the amount of quantity to count."
 msgstr "Especifica o total da quantidade para contar."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+"Se você selecionar o tipo de visão, isso significa que você não vai permitir "
+"a criação de lançamentos de diário usando essa conta.\n"
+"O Tipo 'Conta Analítica' é para contas habituais que você só quer usar em "
+"contabilidade.\n"
+"Se você selecionar Contrato ou Projeto, oferece-lhe a possibilidade de "
+"controlar a validade e as opções de faturamento para esta conta.\n"
+"O tipo especial 'Modelo de Contrato' permite que você defina um modelo com "
+"dados padrão que você pode reutilizar facilmente."
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -73,10 +100,14 @@ msgstr ""
 "                                         cliente."
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
-msgstr "Contrato "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Contrato ou Projeto"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Conta/Nome do Contrato"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -88,21 +119,15 @@ msgstr "Gerente de Contas"
 msgid "Followers"
 msgstr "Seguidores"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr "Contrato <b>criado</b>."
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Fechado"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Débito"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr "Contrato para Renovar"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -120,7 +145,7 @@ msgid "Status"
 msgstr "Situação"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -136,11 +161,6 @@ msgstr "Linha Analítica"
 msgid "Description"
 msgstr "Descrição"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr "Conta/Nome do Contrato"
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -167,6 +187,11 @@ msgstr "Renovação"
 msgid "Messages and communication history"
 msgstr "Histórico de mensagens e comunicação"
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr "Estágio <b>aberto</b>"
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -178,7 +203,7 @@ msgstr ""
 "limitado.)"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -205,9 +230,9 @@ msgid "User"
 msgstr "Usuário"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Conta Analítica Pai"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr "Contrato <b>pendente</b>"
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -215,31 +240,23 @@ msgid "Date"
 msgstr "Data"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
-msgstr ""
-"Se você selecionar o tipo de visão, isso significa que você não vai permitir "
-"a criação de lançamentos de diário usando essa conta.\n"
-"O Tipo 'Conta Analítica' é para contas habituais que você só quer usar em "
-"contabilidade.\n"
-"Se você selecionar Contrato ou Projeto, oferece-lhe a possibilidade de "
-"controlar a validade e as opções de faturamento para esta conta.\n"
-"O tipo especial 'Modelo de Contrato' permite que você defina um modelo com "
-"dados padrão que você pode reutilizar facilmente."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
+msgstr "Contrato Terminado"
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Termos e Condições"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculado multiplicando a quantidade e o preço dado no preço de custo do "
+"produto. Sempre expressos na moeda principal da empresa."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -257,10 +274,9 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
-"Você não pode criar uma linha analítica em uma conta de visualização."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Conta Analítica Pai"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -289,20 +305,14 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Valor"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr "Contrato Iniciado"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr "Contrato para <em>%s</em> foi <b>criado</b>."
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
-msgstr "Termos e Condições"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr "Contrato <b>fechado</b>"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -346,7 +356,7 @@ msgid "Reference"
 msgstr "Referência"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -357,9 +367,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilidade Analítica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr "Contrato ou Projeto"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Valor"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -400,13 +410,10 @@ msgid "Start Date"
 msgstr "Data de Início"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculado multiplicando a quantidade e o preço dado no preço de custo do "
-"produto. Sempre expressos na moeda principal da empresa."
+"Você não pode criar uma linha analítica em uma conta de visualização."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/ro.po b/addons/analytic/i18n/ro.po
index 3227949ffed..5330e7cfef7 100644
--- a/addons/analytic/i18n/ro.po
+++ b/addons/analytic/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-29 23:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Specifica suma de numarat"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Manager cont"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Inchis"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Linie analitica"
 msgid "Description"
 msgstr "Descriere"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -191,9 +208,9 @@ msgid "User"
 msgstr "Utilizator"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Cont Analitic Părinte"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -201,24 +218,24 @@ msgid "Date"
 msgstr "Dată"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Calculat prin inmultirea cantitatii cu pretul dat in pretul de cost al "
+"Produsului. Exprimat intotdeauna in moneda principala a companiei."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -235,9 +252,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cont Analitic Părinte"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -266,19 +283,13 @@ msgid "Credit"
 msgstr "Credit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Sumă"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -323,7 +334,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -334,9 +345,9 @@ msgid "Analytic Accounting"
 msgstr "Contabilitate Analitica"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Sumă"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -374,13 +385,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Calculat prin inmultirea cantitatii cu pretul dat in pretul de cost al "
-"Produsului. Exprimat intotdeauna in moneda principala a companiei."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/ru.po b/addons/analytic/i18n/ru.po
index c9fe8a4d6e3..15fd661dc32 100644
--- a/addons/analytic/i18n/ru.po
+++ b/addons/analytic/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-21 18:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Определяет итоговую сумму для расчета."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Дебет"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Управляющий счётом"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Закрыто"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Дебет"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Позиция аналитики"
 msgid "Description"
 msgstr "Описание"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Пользователь"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Основной аналитический счет"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Рассчитывается путем умножения количества и цены, взятой из себестоимости "
+"ТМЦ. Всегда выражено в основной валюте компании."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Основной аналитический счет"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Кредит"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Суммма"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Суммма"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Рассчитывается путем умножения количества и цены, взятой из себестоимости "
-"ТМЦ. Всегда выражено в основной валюте компании."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
index 0e7b7a4dbfc..0ccc573694f 100644
--- a/addons/analytic/i18n/sl.po
+++ b/addons/analytic/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 05:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Določa vrednost količine za štetje."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Breme"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Računovodja"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Zaprto"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Breme"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analitična postavka"
 msgid "Description"
 msgstr "Opis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Uporabnik"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadrejeni analitični konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Izračunano z množenjem količine in cene podane v ceni vrednosti Izdelka. "
+"Vedno izraženo v glavni valuti podjetja."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadrejeni analitični konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Dobro"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Znesek"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Znesek"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Izračunano z množenjem količine in cene podane v ceni vrednosti Izdelka. "
-"Vedno izraženo v glavni valuti podjetja."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/sq.po b/addons/analytic/i18n/sq.po
index 31baa8b742a..0abc0801c18 100644
--- a/addons/analytic/i18n/sq.po
+++ b/addons/analytic/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,20 +100,14 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
 msgstr ""
 
 #. module: analytic
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,8 +203,8 @@ msgid "User"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
 msgstr ""
 
 #. module: analytic
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,8 +245,8 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
 msgstr ""
 
 #. module: analytic
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr ""
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,8 +338,8 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: analytic
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index 64fa8221a7c..cc42d1d5ca4 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-26 08:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Specificira koju kolicinu iznosa da broji"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Duguje"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Upravnik računovodstva"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Zatvoren"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Duguje"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analiticki red"
 msgid "Description"
 msgstr "Opis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,9 +203,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadređeni analitički konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -196,24 +213,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Izracunato mnozenjem kolicine i cene date u proizvodovom cenovniku. Uvek "
+"prikazano u osnovnoj valuti preduzeca."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -230,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadređeni analitički konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -261,19 +278,13 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Iznos"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,13 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Izracunato mnozenjem kolicine i cene date u proizvodovom cenovniku. Uvek "
-"prikazano u osnovnoj valuti preduzeca."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/sr@latin.po b/addons/analytic/i18n/sr@latin.po
index f960e6cb536..48e959bb191 100644
--- a/addons/analytic/i18n/sr@latin.po
+++ b/addons/analytic/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-27 16:12+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Naznačuje količinu naloga za brojanje"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Duguje"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Upravnik računovodstva"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Zatvoren"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Duguje"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analiticki red"
 msgid "Description"
 msgstr "Opis"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -191,9 +208,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadređeni analitički konto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -201,24 +218,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Izračunato množenjem količine i cene datim u cenovniku proizvoda. Uvek "
+"izraženo u osnovnoj valuti preduzeća."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -235,9 +252,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadređeni analitički konto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -266,19 +283,13 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -323,7 +334,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -334,9 +345,9 @@ msgid "Analytic Accounting"
 msgstr "Analitičko računovodstvo"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Iznos"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -374,13 +385,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Izračunato množenjem količine i cene datim u cenovniku proizvoda. Uvek "
-"izraženo u osnovnoj valuti preduzeća."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index aa8730a32c2..9ca80bc415a 100644
--- a/addons/analytic/i18n/sv.po
+++ b/addons/analytic/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-02 09:05+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Ange antal att räkna."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Ekonomichef"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Stängd"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Debet"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Objektrad"
 msgid "Description"
 msgstr "Beskrivning"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -191,9 +208,9 @@ msgid "User"
 msgstr "Användare"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Överliggande objektkonto"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -201,24 +218,24 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Beräknad genom multiplicering av kvantitet och priser från produktens "
+"kostpris. Alltid uttryckt i bolagets huvudvaluta."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -235,9 +252,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Överliggande objektkonto"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -266,19 +283,13 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Belopp"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -323,7 +334,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -334,9 +345,9 @@ msgid "Analytic Accounting"
 msgstr "Objektsredovisning"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Belopp"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -374,13 +385,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Beräknad genom multiplicering av kvantitet och priser från produktens "
-"kostpris. Alltid uttryckt i bolagets huvudvaluta."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
index d589be7c829..6c063b59f79 100644
--- a/addons/analytic/i18n/tr.po
+++ b/addons/analytic/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-29 17:52+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "Sayılacak miktarı belirtir."
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Borç"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Hesap Yöneticisi"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Kapalı"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Borç"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "Analiz Satırı"
 msgid "Description"
 msgstr "Açıklama"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -191,9 +208,9 @@ msgid "User"
 msgstr "Kullanıcı"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Üst Hesap Analizi"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -201,24 +218,24 @@ msgid "Date"
 msgstr "Tarih"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Ürünün maliyet bedeli olarak verilen fiyatın miktarla çarpılmasıyla "
+"hesaplanır. Her zaman şirketin ana para birimi cinsinden ifade edilmelidir."
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -235,9 +252,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Üst Hesap Analizi"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -266,19 +283,13 @@ msgid "Credit"
 msgstr "Kredi"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Tutar"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -323,7 +334,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -334,9 +345,9 @@ msgid "Analytic Accounting"
 msgstr "Analiz Muhasebesi"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Tutar"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -374,13 +385,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
-"Ürünün maliyet bedeli olarak verilen fiyatın miktarla çarpılmasıyla "
-"hesaplanır. Her zaman şirketin ana para birimi cinsinden ifade edilmelidir."
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/vi.po b/addons/analytic/i18n/vi.po
index 696b37c28d3..452c3cb4ae5 100644
--- a/addons/analytic/i18n/vi.po
+++ b/addons/analytic/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-26 08:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr ""
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Bên nợ"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "Người quản lý Tài Khoản"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "Đã đóng"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "Bên nợ"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr ""
 msgid "Description"
 msgstr "Mô tả"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -186,8 +203,8 @@ msgid "User"
 msgstr "Người dùng"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
 msgstr ""
 
 #. module: analytic
@@ -196,22 +213,20 @@ msgid "Date"
 msgstr "Ngày"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
 msgstr ""
 
 #. module: analytic
@@ -230,8 +245,8 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
 msgstr ""
 
 #. module: analytic
@@ -261,19 +276,13 @@ msgid "Credit"
 msgstr "Bên có"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "Giá trị"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -318,7 +327,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -329,9 +338,9 @@ msgid "Analytic Accounting"
 msgstr ""
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Giá trị"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -369,10 +378,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
 msgstr ""
 
 #. module: analytic
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 4c1aa0de264..1ab151aa64b 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 07:45+0000\n"
 "Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,9 +28,10 @@ msgid "In Progress"
 msgstr "进行中"
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
-msgstr "状态更改"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,6 +48,24 @@ msgstr "截止日期"
 msgid "Specifies the amount of quantity to count."
 msgstr "指定金额的数量用来计算"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "科目管理员"
 msgid "Followers"
 msgstr "关注者"
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "已关闭"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "借方"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr "状态"
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -125,11 +142,6 @@ msgstr "辅助核算明细"
 msgid "Description"
 msgstr "描述"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -188,9 +205,9 @@ msgid "User"
 msgstr "用户"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "上级辅助核算项"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -198,24 +215,22 @@ msgid "Date"
 msgstr "日期"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr "计算公式是数量乘以产品成本价。币别是公司本位币。"
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -232,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "上级辅助核算项"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -263,19 +278,13 @@ msgid "Credit"
 msgstr "贷方"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "金额"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -320,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -331,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr "成本会计"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "金额"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -371,11 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr "计算公式是数量乘以产品成本价。币别是公司本位币。"
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/zh_TW.po b/addons/analytic/i18n/zh_TW.po
index a149f78645a..48fe2289d24 100644
--- a/addons/analytic/i18n/zh_TW.po
+++ b/addons/analytic/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-27 12:22+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -28,8 +28,9 @@ msgid "In Progress"
 msgstr ""
 
 #. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
 msgstr ""
 
 #. module: analytic
@@ -47,6 +48,24 @@ msgstr ""
 msgid "Specifies the amount of quantity to count."
 msgstr "指定金額的數量用來計算"
 
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
 #. module: analytic
 #: view:account.analytic.account:0
 msgid ""
@@ -62,9 +81,13 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
 msgstr ""
 
 #. module: analytic
@@ -77,21 +100,15 @@ msgstr "科目管理"
 msgid "Followers"
 msgstr ""
 
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
 msgstr "已關閉"
 
 #. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
-msgstr "借方"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -109,7 +126,7 @@ msgid "Status"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -125,11 +142,6 @@ msgstr "輔助核算項目明細"
 msgid "Description"
 msgstr "說明"
 
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
@@ -156,6 +168,11 @@ msgstr ""
 msgid "Messages and communication history"
 msgstr ""
 
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid ""
@@ -164,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid ""
 "If you set a company, the currency selected has to be the same as it's "
@@ -188,9 +205,9 @@ msgid "User"
 msgstr "使用者"
 
 #. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "上級輔助核算項"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -198,24 +215,22 @@ msgid "Date"
 msgstr "日期"
 
 #. module: analytic
-#: help:account.analytic.account,type:0
-msgid ""
-"If you select the View Type, it means you won't allow to create journal "
-"entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to "
-"use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage "
-"the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with "
-"default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
 msgstr ""
 
 #. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr "計算公式是數量乘以產品成本價。幣別是公司主要幣別。"
+
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
@@ -232,9 +247,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "上級輔助核算項"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -263,19 +278,13 @@ msgid "Credit"
 msgstr "貸方"
 
 #. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
-msgstr "金額"
-
-#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
 msgstr ""
 
 #. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
 msgstr ""
 
 #. module: analytic
@@ -320,7 +329,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -331,9 +340,9 @@ msgid "Analytic Accounting"
 msgstr "輔助核算會計"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
-msgstr ""
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "金額"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -371,11 +380,9 @@ msgid "Start Date"
 msgstr ""
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price. Always expressed in the company main currency."
-msgstr "計算公式是數量乘以產品成本價。幣別是公司主要幣別。"
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr ""
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic_contract_hr_expense/i18n/ar.po b/addons/analytic_contract_hr_expense/i18n/ar.po
index 54cdf30f435..5bf296cf2e2 100644
--- a/addons/analytic_contract_hr_expense/i18n/ar.po
+++ b/addons/analytic_contract_hr_expense/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:30+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "حسابات تحليلية"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr ""
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr ""
diff --git a/addons/analytic_contract_hr_expense/i18n/de.po b/addons/analytic_contract_hr_expense/i18n/de.po
index 2bb1023a7f7..b1315e553ce 100644
--- a/addons/analytic_contract_hr_expense/i18n/de.po
+++ b/addons/analytic_contract_hr_expense/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 15:31+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
@@ -39,13 +39,13 @@ msgid "Analytic Account"
 msgstr "Kostenstelle"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Spesen Abrechnung zu %s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Spesen zu %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/es.po b/addons/analytic_contract_hr_expense/i18n/es.po
index 21114981da9..cadd73d6a3f 100644
--- a/addons/analytic_contract_hr_expense/i18n/es.po
+++ b/addons/analytic_contract_hr_expense/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 12:02+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Gastos a facturar de %s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Gastos de %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/fr.po b/addons/analytic_contract_hr_expense/i18n/fr.po
index 6084c8b540a..bb9b15f374f 100644
--- a/addons/analytic_contract_hr_expense/i18n/fr.po
+++ b/addons/analytic_contract_hr_expense/i18n/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:00+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Compte Analytique"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr ""
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr ""
diff --git a/addons/analytic_contract_hr_expense/i18n/hr.po b/addons/analytic_contract_hr_expense/i18n/hr.po
index 49e3ab00dd9..de71083393e 100644
--- a/addons/analytic_contract_hr_expense/i18n/hr.po
+++ b/addons/analytic_contract_hr_expense/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:34+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Analitički konto"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr ""
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Troškovi %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/it.po b/addons/analytic_contract_hr_expense/i18n/it.po
index bee2b304211..087519b54c9 100644
--- a/addons/analytic_contract_hr_expense/i18n/it.po
+++ b/addons/analytic_contract_hr_expense/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 23:34+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Conto analitico"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Costi da Fatturare di %s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Costi di %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/nb.po b/addons/analytic_contract_hr_expense/i18n/nb.po
index 9b3ea2929c1..c7996cb0336 100644
--- a/addons/analytic_contract_hr_expense/i18n/nb.po
+++ b/addons/analytic_contract_hr_expense/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 13:13+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Analytisk konto."
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Utgifter til Faktura av% s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Utgifter av %s."
diff --git a/addons/analytic_contract_hr_expense/i18n/nl.po b/addons/analytic_contract_hr_expense/i18n/nl.po
index f49523025d6..33fe31e5e4e 100644
--- a/addons/analytic_contract_hr_expense/i18n/nl.po
+++ b/addons/analytic_contract_hr_expense/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 15:10+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Kostenplaats"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Uitgave te factureren van %s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Uitgaven van %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/pl.po b/addons/analytic_contract_hr_expense/i18n/pl.po
index 1ae139ab3e0..11047615aea 100644
--- a/addons/analytic_contract_hr_expense/i18n/pl.po
+++ b/addons/analytic_contract_hr_expense/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:12+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Konto analityczne"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Wydatki do zafakturowania %s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr ""
diff --git a/addons/analytic_contract_hr_expense/i18n/pt.po b/addons/analytic_contract_hr_expense/i18n/pt.po
index b477c92dd6f..de877454114 100644
--- a/addons/analytic_contract_hr_expense/i18n/pt.po
+++ b/addons/analytic_contract_hr_expense/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 17:54+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Conta analítica"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr ""
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Despesas de %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/pt_BR.po b/addons/analytic_contract_hr_expense/i18n/pt_BR.po
index 060d6dbd00e..ab3633d453b 100644
--- a/addons/analytic_contract_hr_expense/i18n/pt_BR.po
+++ b/addons/analytic_contract_hr_expense/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 14:50+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "Conta Analítica"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "Despesas para Faturar de %s"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "Despesas de %s"
diff --git a/addons/analytic_contract_hr_expense/i18n/zh_CN.po b/addons/analytic_contract_hr_expense/i18n/zh_CN.po
index 4271f2247d2..219cb8cfe99 100644
--- a/addons/analytic_contract_hr_expense/i18n/zh_CN.po
+++ b/addons/analytic_contract_hr_expense/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 17:47+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -38,13 +38,13 @@ msgid "Analytic Account"
 msgstr "辅助核算项"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
 msgstr "%s的费用到发票"
 
 #. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
 #, python-format
 msgid "Expenses of %s"
 msgstr "%s的费用"
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index 8593fa06b9a..453bdab2ffa 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index 9c817c45a7d..0cf7eec3a3c 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 09:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 2c4629791f3..8525055da2b 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index 68fe1b3c4c0..77928f19f0a 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 14:54+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index a0beaeb096f..d39970be5c3 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:06+0000\n"
 "Last-Translator: Konki <pavel.konkol@seznam.cz>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/da.po b/addons/analytic_user_function/i18n/da.po
index 522bbd3803b..4af1f89d1b9 100644
--- a/addons/analytic_user_function/i18n/da.po
+++ b/addons/analytic_user_function/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 595cc4bca3e..e6d5a7fac0d 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 11:12+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 02b9ce261fd..03c7f92b20c 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 13:04+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po
index 532c4f16bc6..54794d188b4 100644
--- a/addons/analytic_user_function/i18n/en_GB.po
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 13:22+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 95a21586cdc..9c52f82759a 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 13:06+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index 7364cc28186..eca626b5ba3 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-16 17:44+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/es_CR.po b/addons/analytic_user_function/i18n/es_CR.po
index 44bb3ff4a1a..43774674907 100644
--- a/addons/analytic_user_function/i18n/es_CR.po
+++ b/addons/analytic_user_function/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 15:53+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index 25e4108293e..ccee1764ba7 100644
--- a/addons/analytic_user_function/i18n/es_EC.po
+++ b/addons/analytic_user_function/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 03:54+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po
index 58a7a2c8d86..15ba19a5a23 100644
--- a/addons/analytic_user_function/i18n/es_PY.po
+++ b/addons/analytic_user_function/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-07 23:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 14aa1bb84b0..3e17be7d763 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 15:57+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po
index 0b74d6b207f..6e39ff8dbe2 100644
--- a/addons/analytic_user_function/i18n/fa.po
+++ b/addons/analytic_user_function/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 17:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po
index 041bc179468..5757e4a30f4 100644
--- a/addons/analytic_user_function/i18n/fi.po
+++ b/addons/analytic_user_function/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-29 05:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 224cb2b632e..2ff47a7883a 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 15:23+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index a271d119b57..3a56b39ca1d 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: analytic-user-function-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-11 13:07+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/gu.po b/addons/analytic_user_function/i18n/gu.po
index 4babcc1290b..6aaebe653c0 100644
--- a/addons/analytic_user_function/i18n/gu.po
+++ b/addons/analytic_user_function/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 12:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index 7bb66e39b81..34f843bfa0d 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-08 15:51+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index 310c2ff3953..73f61e5651e 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-09 13:28+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index 7b664f73581..80e5e521ed5 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 8df85533e55..983ef735cae 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 08:02+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po
index 5388571d8e2..103039c0cff 100644
--- a/addons/analytic_user_function/i18n/ja.po
+++ b/addons/analytic_user_function/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-08 05:16+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index 1029a520074..4f101247531 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index e4edc02126b..7aad3d46c68 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:50+0000\n"
 "Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/mk.po b/addons/analytic_user_function/i18n/mk.po
index 99404699242..0b6efb66833 100644
--- a/addons/analytic_user_function/i18n/mk.po
+++ b/addons/analytic_user_function/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-20 17:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index f9c90dfe56c..4ac644af9aa 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-11 03:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po
index 27af82a0578..60a3c668d2f 100644
--- a/addons/analytic_user_function/i18n/nb.po
+++ b/addons/analytic_user_function/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 13:16+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index b47b008217d..b15cc99c9ea 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 21:59+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/nl_BE.po b/addons/analytic_user_function/i18n/nl_BE.po
index cac5a110ba9..88e408f2c2f 100644
--- a/addons/analytic_user_function/i18n/nl_BE.po
+++ b/addons/analytic_user_function/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-02 07:35+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index fab1ca6342f..1821f0c5e90 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index 517ccf05e24..eca48795f0f 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:16+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 7ed8735d5be..985653dda95 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:27+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index f81a39b09ac..cb3534c8375 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 22:37+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index f055349a5a4..9c0a7c6000c 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 02:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index 4a48c5f009c..e7d5bdb1330 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-04-16 13:24+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index d773065897c..e4adcc0fe31 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 02:57+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 20d20f33b52..6c85662172c 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 18:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index ca73ff6b69f..71e553c8889 100644
--- a/addons/analytic_user_function/i18n/sq.po
+++ b/addons/analytic_user_function/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index e647d08dc55..76342e0e0dc 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-27 08:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index 8a41a96f672..3efbb8f27cc 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-27 15:49+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 0930fa08a51..4f336c19c23 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-23 09:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index f2ba26158d2..e1c09cc0c76 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index fb4d3f33834..e60c14504ff 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-10 23:17+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 424d80cd42e..f801122e68d 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po
index ac92764f85a..5e91de67d9e 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index ed402f1806b..3146314c7cc 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 14:18+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index 28255a7ee1a..2c0264ccf8c 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-20 03:00+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
diff --git a/addons/anonymization/i18n/ar.po b/addons/anonymization/i18n/ar.po
index e59d38aa906..1e65c914060 100644
--- a/addons/anonymization/i18n/ar.po
+++ b/addons/anonymization/i18n/ar.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:13+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "نموذج.حقول.معالج"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "كائن"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "اسم الحقل"
 msgid "Field"
 msgstr "حقل"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "استيراد"
 msgid "ir.model.fields.anonymization"
 msgstr "نموذج.حقول.إخفاء الهوية"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "مجهول"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "كائن"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "مسار الملف"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "تصدير"
 msgid "Reverse the Database Anonymization"
 msgstr "اعكس تجهيل قاعدة البيانات"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "حقول"
 msgid "Clear"
 msgstr "مسح"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "الملخص"
 msgid "Anonymized Field"
 msgstr "حقل التجاهل"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "الوحدة.الملفات.التجاهل.السجل"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "تجاهل-> واضح"
 msgid "Started"
 msgstr "بدئت"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/bg.po b/addons/anonymization/i18n/bg.po
index 952b165dd00..394ae858a7d 100644
--- a/addons/anonymization/i18n/bg.po
+++ b/addons/anonymization/i18n/bg.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 06:17+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Обект"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Име на поле"
 msgid "Field"
 msgstr "Поле"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Импортиране"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "неизвестен"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Обект"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Път до файла"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Експортиране"
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Полета"
 msgid "Clear"
 msgstr "Изчистване"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Обобщена информация"
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr "Стартирана"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/ca.po b/addons/anonymization/i18n/ca.po
index 3aded45a95a..66a9a2e806d 100644
--- a/addons/anonymization/i18n/ca.po
+++ b/addons/anonymization/i18n/ca.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-09 18:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objecte"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nom del camp"
 msgid "Field"
 msgstr "Camp"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importa"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "desconegut"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objecte"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ruta del fitxer"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exporta"
 msgid "Reverse the Database Anonymization"
 msgstr "Reverteix l'anonimat de la base de dades"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Camps"
 msgid "Clear"
 msgstr "Neteja"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Resum"
 msgid "Anonymized Field"
 msgstr "Camp anònim"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "Anònim --> A la vista"
 msgid "Started"
 msgstr "Iniciat"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/da.po b/addons/anonymization/i18n/da.po
index 6d0eb36a5e5..33abbce7d4e 100644
--- a/addons/anonymization/i18n/da.po
+++ b/addons/anonymization/i18n/da.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr ""
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,8 +125,9 @@ msgid "unknown"
 msgstr ""
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
 msgstr ""
 
 #. module: anonymization
@@ -107,6 +135,13 @@ msgstr ""
 msgid "File path"
 msgstr ""
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr ""
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr ""
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/de.po b/addons/anonymization/i18n/de.po
index 49559a7d716..717ff296b48 100644
--- a/addons/anonymization/i18n/de.po
+++ b/addons/anonymization/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 06:59+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
@@ -22,6 +22,11 @@ msgstr ""
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr "Ziel Version"
 msgid "sql"
 msgstr "SQL"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Feldname"
 msgid "Field"
 msgstr "Feld"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Import"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,25 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objekt"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Dateipfad"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+"Diese Datei wurde durch den Anonymisierungsprozess erzeugt und sollte die "
+"Endung '.pickle' haben"
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +159,14 @@ msgstr "Export"
 msgid "Reverse the Database Anonymization"
 msgstr "Mache Datenbankanonymiserung rückgängig"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +194,14 @@ msgstr "Felder"
 msgid "Clear"
 msgstr "Leeren"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +212,16 @@ msgstr "Zusammenfassung"
 msgid "Anonymized Field"
 msgstr "Anonymisiertes Feld"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,13 +260,20 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
-"Diese Datei wurde durch den Anonymisierungsprozess erzeugt und sollte die "
-"Endung '.pickle' haben"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -231,6 +301,12 @@ msgstr "anonymisiert -> leer"
 msgid "Started"
 msgstr "Begonnen"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/es.po b/addons/anonymization/i18n/es.po
index bd0434ac337..a5d3dd4261e 100644
--- a/addons/anonymization/i18n/es.po
+++ b/addons/anonymization/i18n/es.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:05+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr "Versión objetivo"
 msgid "sql"
 msgstr "sql"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nombre de campo"
 msgid "Field"
 msgstr "campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importar"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,25 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objeto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ruta de archivo"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+"Éste es el archivo creado por el proceso de anonimización. Debería tener la "
+"extensión '.pickle'."
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +159,14 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Revertir el hacer anónima la base de datos"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +194,14 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "A la vista"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +212,16 @@ msgstr "Resumen"
 msgid "Anonymized Field"
 msgstr "Campo anónimo"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,13 +260,20 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
-"Éste es el archivo creado por el proceso de anonimización. Debería tener la "
-"extensión '.pickle'."
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -231,6 +301,12 @@ msgstr "Anónimo --> A la vista"
 msgid "Started"
 msgstr "Iniciado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/es_CR.po b/addons/anonymization/i18n/es_CR.po
index c7bc9913be9..4dbe7f0768c 100644
--- a/addons/anonymization/i18n/es_CR.po
+++ b/addons/anonymization/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 16:17+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: anonymization
@@ -23,6 +23,11 @@ msgstr ""
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -38,6 +43,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -49,6 +63,11 @@ msgstr "Nombre de campo"
 msgid "Field"
 msgstr "campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -59,6 +78,14 @@ msgstr "Importar"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -99,15 +126,23 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objeto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ruta de archivo"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -123,6 +158,14 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Revertir el hacer anónima la base de datos"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -150,6 +193,14 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "A la vista"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -160,6 +211,16 @@ msgstr "Resumen"
 msgid "Anonymized Field"
 msgstr "Campo anónimo"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -198,10 +259,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -230,6 +300,12 @@ msgstr "Anónimo --> A la vista"
 msgid "Started"
 msgstr "Iniciado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/es_EC.po b/addons/anonymization/i18n/es_EC.po
index 2befc33e792..25548372830 100644
--- a/addons/anonymization/i18n/es_EC.po
+++ b/addons/anonymization/i18n/es_EC.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-23 23:34+0000\n"
 "Last-Translator: Mario Andrés Correa <Unknown>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nombre de campo"
 msgid "Field"
 msgstr "Campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importar"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objeto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ruta de archivo"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Revertir el hacer anónima la base de datos"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "Limpiar"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Resumen"
 msgid "Anonymized Field"
 msgstr "Campo anónimo"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/es_PY.po b/addons/anonymization/i18n/es_PY.po
index ad6fc8ab550..b6ead437ebf 100644
--- a/addons/anonymization/i18n/es_PY.po
+++ b/addons/anonymization/i18n/es_PY.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-07 23:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nombre del Campo"
 msgid "Field"
 msgstr "campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importar"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objeto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ruta del archivo"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Revertir el hacer anónima la base de datos"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "Limpiar"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Resumen"
 msgid "Anonymized Field"
 msgstr "Campo anónimo"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "Anónimo --> A Limpio"
 msgid "Started"
 msgstr "Iniciado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/et.po b/addons/anonymization/i18n/et.po
index ba5e7569b57..f8417e6eb23 100644
--- a/addons/anonymization/i18n/et.po
+++ b/addons/anonymization/i18n/et.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-11 18:09+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Välja Nimi:"
 msgid "Field"
 msgstr "Väli"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Import"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr ""
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objekt"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Faili asukoht"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Eksport"
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Väljad"
 msgid "Clear"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Kokkuvõte"
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/fa.po b/addons/anonymization/i18n/fa.po
index 2861ce61f78..18cda8cb9e9 100644
--- a/addons/anonymization/i18n/fa.po
+++ b/addons/anonymization/i18n/fa.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 17:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr ""
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,8 +125,9 @@ msgid "unknown"
 msgstr ""
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
 msgstr ""
 
 #. module: anonymization
@@ -107,6 +135,13 @@ msgstr ""
 msgid "File path"
 msgstr ""
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr ""
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr ""
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po
index 19a0609638e..9ca71edc97e 100644
--- a/addons/anonymization/i18n/fi.po
+++ b/addons/anonymization/i18n/fi.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-30 09:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekti"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Kentän nimi"
 msgid "Field"
 msgstr "Kenttä"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Tuo"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "Tuntematon"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objekti"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Tiedoston polku"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Vie"
 msgid "Reverse the Database Anonymization"
 msgstr "Poista tietokannan anonymisointi"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Kentät"
 msgid "Clear"
 msgstr "Tyhjennä"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Yhteenveto"
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "Anonymisoitu -> näkyvä"
 msgid "Started"
 msgstr "Käynnistetty"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/fr.po b/addons/anonymization/i18n/fr.po
index f46ebbe6e11..eb208be4aa5 100644
--- a/addons/anonymization/i18n/fr.po
+++ b/addons/anonymization/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:44+0000\n"
 "Last-Translator: Florian Hatat <Unknown>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
@@ -21,6 +21,11 @@ msgstr ""
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objet"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -36,6 +41,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -47,6 +61,11 @@ msgstr "Nom du champ"
 msgid "Field"
 msgstr "Champ"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -57,6 +76,14 @@ msgstr "Importer"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -97,15 +124,23 @@ msgid "unknown"
 msgstr "Inconnu"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objet"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Chemin d'accès au fichier"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -121,6 +156,14 @@ msgstr "Exporter"
 msgid "Reverse the Database Anonymization"
 msgstr "Démasquage de la base de données"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -148,6 +191,14 @@ msgstr "Champs"
 msgid "Clear"
 msgstr "Effacer"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -158,6 +209,16 @@ msgstr "Résumé"
 msgid "Anonymized Field"
 msgstr "Champ masqué"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -196,10 +257,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -228,6 +298,12 @@ msgstr "masqué --> en clair"
 msgid "Started"
 msgstr "Démarré"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/gl.po b/addons/anonymization/i18n/gl.po
index fbf125e78bb..6f4baa9215d 100644
--- a/addons/anonymization/i18n/gl.po
+++ b/addons/anonymization/i18n/gl.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-15 15:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Obxecto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nome do Campo"
 msgid "Field"
 msgstr "Campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importar"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "descoñecido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Obxecto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ruta do ficheiro"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Reverti-lo proceso de facer anónima a BD"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "Limpar"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Resumo"
 msgid "Anonymized Field"
 msgstr "Campo anónimo"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "Feita anónima -> limpar"
 msgid "Started"
 msgstr "Comezado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/hr.po b/addons/anonymization/i18n/hr.po
index c618e3c0280..0bdddace900 100644
--- a/addons/anonymization/i18n/hr.po
+++ b/addons/anonymization/i18n/hr.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-08 15:53+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Naziv polja"
 msgid "Field"
 msgstr "Polje"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Uvoz"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "nepoznato"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objekt"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Putanja datoteke"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Izvoz"
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Polja"
 msgid "Clear"
 msgstr "Očisti"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Sažetak"
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/it.po b/addons/anonymization/i18n/it.po
index 0526ac03249..41a375db8dc 100644
--- a/addons/anonymization/i18n/it.po
+++ b/addons/anonymization/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 21:10+0000\n"
 "Last-Translator: Andrea Cometa <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
@@ -22,6 +22,11 @@ msgstr ""
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Oggetto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nome campo"
 msgid "Field"
 msgstr "Campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importa"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "sconosciuto"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Oggetto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Percorso file"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Esporta"
 msgid "Reverse the Database Anonymization"
 msgstr "Ripristina il database anonimizzato"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Campi"
 msgid "Clear"
 msgstr "In chiaro"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Riepilogo"
 msgid "Anonymized Field"
 msgstr "Campo anonimo"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "anonimizzato -> in chiaro"
 msgid "Started"
 msgstr "Iniziato"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/ja.po b/addons/anonymization/i18n/ja.po
index 3dcb8aaea16..3b277c42d9a 100644
--- a/addons/anonymization/i18n/ja.po
+++ b/addons/anonymization/i18n/ja.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-16 02:18+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "オブジェクト"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "項目名"
 msgid "Field"
 msgstr "項目"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "インポート"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "不明"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "オブジェクト"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "ファイルパス"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "エクスポート"
 msgid "Reverse the Database Anonymization"
 msgstr "逆データベース匿名化"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "項目"
 msgid "Clear"
 msgstr "クリア"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "要約"
 msgid "Anonymized Field"
 msgstr "匿名化項目"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "匿名化 -> クリア"
 msgid "Started"
 msgstr "開始済"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/lv.po b/addons/anonymization/i18n/lv.po
index 7536762bd99..b942b87295a 100644
--- a/addons/anonymization/i18n/lv.po
+++ b/addons/anonymization/i18n/lv.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-16 20:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekts"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Lauka Nosaukums"
 msgid "Field"
 msgstr "Lauks"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importēt"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "nezināms"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objekts"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ceļš uz failu"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Eksportēt"
 msgid "Reverse the Database Anonymization"
 msgstr "Atgriezt Datubāzes Anonimizāciju"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Lauki"
 msgid "Clear"
 msgstr "Notīrīt"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Kopsavilkums"
 msgid "Anonymized Field"
 msgstr "Anonimizēts lauks"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "anonimizēts -> tīrs"
 msgid "Started"
 msgstr "Iesākta"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/mn.po b/addons/anonymization/i18n/mn.po
index a231617064b..05dd3111998 100644
--- a/addons/anonymization/i18n/mn.po
+++ b/addons/anonymization/i18n/mn.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-22 02:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr ""
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,8 +125,9 @@ msgid "unknown"
 msgstr ""
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
 msgstr ""
 
 #. module: anonymization
@@ -107,6 +135,13 @@ msgstr ""
 msgid "File path"
 msgstr ""
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr ""
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr ""
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/nb.po b/addons/anonymization/i18n/nb.po
index 3b13e7fd740..a36da99a344 100644
--- a/addons/anonymization/i18n/nb.po
+++ b/addons/anonymization/i18n/nb.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:09+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.modell.felt.anonymisere.veiviseren"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr "Mål versjon."
 msgid "sql"
 msgstr "Sql."
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Feltnavn"
 msgid "Field"
 msgstr "Felt"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importer"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.modell.felt.anonymisering"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,25 @@ msgid "unknown"
 msgstr "ukjent"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objekt"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "filbane"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+"Dette er filen som er opprettet av anonymisering prosessen. Det bør ha ». "
+"Pickle 'forlengelse."
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +159,14 @@ msgstr "Eksporter"
 msgid "Reverse the Database Anonymization"
 msgstr "Reversere Database anonymisering"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +194,14 @@ msgstr "Felter"
 msgid "Clear"
 msgstr "fjerne"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +212,16 @@ msgstr "Oppsummering"
 msgid "Anonymized Field"
 msgstr "Anonymisert Felt"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,13 +260,20 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.modell.felt.anonymisering.historie"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
-"Dette er filen som er opprettet av anonymisering prosessen. Det bør ha ». "
-"Pickle 'forlengelse."
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -231,6 +301,12 @@ msgstr "Anonymisert -> klart"
 msgid "Started"
 msgstr "Startet"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/nl.po b/addons/anonymization/i18n/nl.po
index de93c717354..5006f3f5f2d 100644
--- a/addons/anonymization/i18n/nl.po
+++ b/addons/anonymization/i18n/nl.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-18 20:01+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Object"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Veldnaam"
 msgid "Field"
 msgstr "Veld"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importeren"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "onbekend"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Bestandspad"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exporteren"
 msgid "Reverse the Database Anonymization"
 msgstr "De database anonimisatie ongedaan maken"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Velden"
 msgid "Clear"
 msgstr "Zichtbaar"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Samenvatting"
 msgid "Anonymized Field"
 msgstr "Geanonimiseerd veld"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "geanonimiseerd -> zichtbaar"
 msgid "Started"
 msgstr "Gestart"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/pl.po b/addons/anonymization/i18n/pl.po
index a51195a72fd..cbf13c9234c 100644
--- a/addons/anonymization/i18n/pl.po
+++ b/addons/anonymization/i18n/pl.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 15:33+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Obiekt"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr "Wersja docelowa"
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nazwa Pola"
 msgid "Field"
 msgstr "Pole"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importuj"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "nieznany"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Obiekt"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Ścieżka pliku"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Eksportuj"
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Pola"
 msgid "Clear"
 msgstr "Wyczyść"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Podsumowanie"
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr "Rozpoczęte"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/pt.po b/addons/anonymization/i18n/pt.po
index de04192d510..6cdc8e7515f 100644
--- a/addons/anonymization/i18n/pt.po
+++ b/addons/anonymization/i18n/pt.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 17:01+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr "sql"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nome do Campo"
 msgid "Field"
 msgstr "Campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importar"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "Desconhecido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objeto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Localização do ficheiro"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Inverter a Anonimização da Base de Dados"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "Limpar"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Sumário"
 msgid "Anonymized Field"
 msgstr "Campo Anonimizado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "anonimizado -> limpo"
 msgid "Started"
 msgstr "Iniciado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po
index 1d554df77a8..2c609e3ae00 100644
--- a/addons/anonymization/i18n/pt_BR.po
+++ b/addons/anonymization/i18n/pt_BR.po
@@ -7,22 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-16 22:59+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 10:29+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -38,6 +43,19 @@ msgstr "Versão Alvo"
 msgid "sql"
 msgstr "sql"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+"O anonimização do banco de dados está atualmente em um estado instável. "
+"Alguns campos são anónimos, enquanto alguns campos não são anónimos. Você "
+"deve tentar resolver o problema antes de tentar criar, escrever ou apagar "
+"campos."
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -49,6 +67,11 @@ msgstr "Nome do Campo"
 msgid "Field"
 msgstr "Campo"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr "Novo"
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -59,6 +82,16 @@ msgstr "Importação"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+"Antes de executar o processo de anonimização, você deve fazer um backup do "
+"seu banco de dados."
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -99,15 +132,25 @@ msgid "unknown"
 msgstr "desconhecido"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Objeto"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr "Valor anonimo é Nenhum. Isto não pode acontecer."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Caminho do arquivo"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+"Este é o arquivo criado pelo processo de anonimização. Ele deve ter a "
+"extensão '.pickle' ."
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -123,6 +166,16 @@ msgstr "Exportar"
 msgid "Reverse the Database Anonymization"
 msgstr "Reverter a Anonimização do Banco de dados"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+"Não pode anonimizar campos desses tipos: binary, many2many, many2one, "
+"one2many, reference."
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -150,6 +203,16 @@ msgstr "Campos"
 msgid "Clear"
 msgstr "Limpar"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+"Não é possível reverter o processo de anonimização sem fornecer o arquivo de "
+"exportação."
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -160,6 +223,19 @@ msgstr "Resumo"
 msgid "Anonymized Field"
 msgstr "Campo Anonimizado"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+"O anonimização do banco de dados está atualmente em um estado instável. "
+"Alguns campos são anónimos, enquanto alguns campos não são anónimos. Você "
+"deve tentar resolver o problema antes de tentar fazer qualquer coisa."
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -198,13 +274,23 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
 msgstr ""
-"Este é o arquivo criado pelo processo de anonimização. Ele deve ter a "
-"extensão '.pickle' ."
+"O anonimização do banco de dados está atualmente em um estado instável. "
+"Alguns campos são anónimos, enquanto alguns campos não são anónimos. Você "
+"deve tentar resolver o problema antes de tentar fazer qualquer coisa."
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -232,6 +318,14 @@ msgstr "anonimizado -> em branco"
 msgid "Started"
 msgstr "Iniciada"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+"O banco de dados está atualmente anónimos, você não pode anonimizar "
+"novamente."
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/ro.po b/addons/anonymization/i18n/ro.po
index 49009f9234f..f6ed0284fb4 100644
--- a/addons/anonymization/i18n/ro.po
+++ b/addons/anonymization/i18n/ro.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-30 11:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.wizard.anonimizare.campuri.model"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Obiect"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Nume camp"
 msgid "Field"
 msgstr "Camp"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Importa"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.anonimizare.campuri.model"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "necunoscut(a)"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Obiect"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Cale Fiser"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Exporta"
 msgid "Reverse the Database Anonymization"
 msgstr "Anuleaza anonimizarea bazei de date"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Campuri"
 msgid "Clear"
 msgstr "Stergeti"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Rezumat"
 msgid "Anonymized Field"
 msgstr "Camp anonimizat"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.istoric.anonimizare.campuri.model"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "anonimizat -> sterge"
 msgid "Started"
 msgstr "Inceput"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/ru.po b/addons/anonymization/i18n/ru.po
index cac15c4f743..5925a4db4ac 100644
--- a/addons/anonymization/i18n/ru.po
+++ b/addons/anonymization/i18n/ru.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-19 11:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Объект"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Название поля"
 msgid "Field"
 msgstr "Поле"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Импорт"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "неизвестный"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Объект"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Путь к файлу"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Экспорт"
 msgid "Reverse the Database Anonymization"
 msgstr "Отменить анонимизацию базы данных"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Поля"
 msgid "Clear"
 msgstr "Очистить"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Итого"
 msgid "Anonymized Field"
 msgstr "Анонимизированное поле"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "анонимизирован -> очищен"
 msgid "Started"
 msgstr "Начато"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/sq.po b/addons/anonymization/i18n/sq.po
index e7ed181ecf8..3ba7459f544 100644
--- a/addons/anonymization/i18n/sq.po
+++ b/addons/anonymization/i18n/sq.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr ""
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,8 +125,9 @@ msgid "unknown"
 msgstr ""
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
 msgstr ""
 
 #. module: anonymization
@@ -107,6 +135,13 @@ msgstr ""
 msgid "File path"
 msgstr ""
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr ""
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr ""
 msgid "Anonymized Field"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/sr@latin.po b/addons/anonymization/i18n/sr@latin.po
index 4ff93febd77..88f1d1cfa20 100644
--- a/addons/anonymization/i18n/sr@latin.po
+++ b/addons/anonymization/i18n/sr@latin.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-28 20:55+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Stavka"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Naziv polja"
 msgid "Field"
 msgstr "Polje"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Uvoz"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "nepoznato"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Stavka"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Putanja datoteke"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Izvoz"
 msgid "Reverse the Database Anonymization"
 msgstr "Poništi anonimizaciju baze podataka"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Polja"
 msgid "Clear"
 msgstr "Očisti"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Sažetak"
 msgid "Anonymized Field"
 msgstr "Anonimizirano polje"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "anonimizirano -> očisti"
 msgid "Started"
 msgstr "Započet"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/sv.po b/addons/anonymization/i18n/sv.po
index ee478c7a22f..0dec41ecfdb 100644
--- a/addons/anonymization/i18n/sv.po
+++ b/addons/anonymization/i18n/sv.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-02 00:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr ""
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Object"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Fältnamn"
 msgid "Field"
 msgstr "Fält"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "Import"
 msgid "ir.model.fields.anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "okänd"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Sökväg"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Export"
 msgid "Reverse the Database Anonymization"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Fält"
 msgid "Clear"
 msgstr "Rensa"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr ""
 msgid "Anonymized Field"
 msgstr "Anonymiserade fält"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr ""
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr ""
 msgid "Started"
 msgstr "Påbörjad"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/tr.po b/addons/anonymization/i18n/tr.po
index 96ca8c255ea..cdf62e66485 100644
--- a/addons/anonymization/i18n/tr.po
+++ b/addons/anonymization/i18n/tr.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-10 23:07+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Nesne"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "Alan Adı"
 msgid "Field"
 msgstr "Alan"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "İçeaktar"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "bilinmeyen"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "Nesne"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "Dosya yolu"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "Dışaaktar"
 msgid "Reverse the Database Anonymization"
 msgstr "Veritabanı Anonimleştirmeyi Tersine Çevir"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "Alanlar"
 msgid "Clear"
 msgstr "Temizle"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "Özet"
 msgid "Anonymized Field"
 msgstr "Anonim Alan"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "anonim -> temizle"
 msgid "Started"
 msgstr "Başlamış"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 0ba47de11c4..b9f8ea5e55d 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/i18n/zh_CN.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 06:50+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "对象"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr "目标版本"
 msgid "sql"
 msgstr "sql"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "字段名称"
 msgid "Field"
 msgstr "字段"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "导入"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "状态"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "对象"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "文件路径"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr "这个文件有匿名进程创建，他没有 '.pickle' 扩展名"
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "导出"
 msgid "Reverse the Database Anonymization"
 msgstr "解除数据库隐藏"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "字段"
 msgid "Clear"
 msgstr "无隐藏"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "概要"
 msgid "Anonymized Field"
 msgstr "隐藏字段"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,11 +258,20 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
-msgstr "这个文件有匿名进程创建，他没有 '.pickle' 扩展名"
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
+msgstr ""
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -229,6 +299,12 @@ msgstr "隐藏->无隐藏"
 msgid "Started"
 msgstr "已开始"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/anonymization/i18n/zh_TW.po b/addons/anonymization/i18n/zh_TW.po
index 3dfa6c9498a..0aeefd714f5 100644
--- a/addons/anonymization/i18n/zh_TW.po
+++ b/addons/anonymization/i18n/zh_TW.po
@@ -7,21 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-29 03:38+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
 msgstr "ir.model.fields.anonymize.wizard"
 
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "物件"
+
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
@@ -37,6 +42,15 @@ msgstr ""
 msgid "sql"
 msgstr ""
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to create, write or delete fields."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
@@ -48,6 +62,11 @@ msgstr "欄位名稱"
 msgid "Field"
 msgstr "欄位"
 
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
@@ -58,6 +77,14 @@ msgstr "匯入"
 msgid "ir.model.fields.anonymization"
 msgstr "ir.model.fields.anonymization"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid ""
+"Before executing the anonymization process, you should make a backup of your "
+"database."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
@@ -98,15 +125,23 @@ msgid "unknown"
 msgstr "不明"
 
 #. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
-msgstr "物件"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
+msgstr ""
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
 msgstr "檔案路徑"
 
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid ""
+"This is the file created by the anonymization process. It should have the "
+"'.pickle' extention."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
@@ -122,6 +157,14 @@ msgstr "匯出"
 msgid "Reverse the Database Anonymization"
 msgstr "回復資料庫匿名"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid ""
+"Cannot anonymize fields of these types: binary, many2many, many2one, "
+"one2many, reference."
+msgstr ""
+
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
@@ -149,6 +192,14 @@ msgstr "欄位"
 msgid "Clear"
 msgstr "清除"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid ""
+"It is not possible to reverse the anonymization process without supplying "
+"the anonymization export file."
+msgstr ""
+
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
@@ -159,6 +210,16 @@ msgstr "摘要"
 msgid "Anonymized Field"
 msgstr "匿名欄位"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid ""
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
@@ -197,10 +258,19 @@ msgid "ir.model.fields.anonymization.history"
 msgstr "ir.model.fields.anonymization.history"
 
 #. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
 msgid ""
-"This is the file created by the anonymization process. It should have the "
-"'.pickle' extention."
+"The database anonymization is currently in an unstable state. Some fields "
+"are anonymized, while some fields are not anonymized. You should try to "
+"solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: anonymization
@@ -229,6 +299,12 @@ msgstr "匿名->清楚"
 msgid "Started"
 msgstr "開始"
 
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
diff --git a/addons/audittrail/i18n/ar.po b/addons/audittrail/i18n/ar.po
index 72d8b7d71f7..cebd8f6e947 100644
--- a/addons/audittrail/i18n/ar.po
+++ b/addons/audittrail/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:14+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/bg.po b/addons/audittrail/i18n/bg.po
index a4864e11342..1b84cfd753d 100644
--- a/addons/audittrail/i18n/bg.po
+++ b/addons/audittrail/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index b156dd2137a..9f8410122c8 100644
--- a/addons/audittrail/i18n/bs.po
+++ b/addons/audittrail/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index e02cc2af0c4..f1f3e7b8522 100644
--- a/addons/audittrail/i18n/ca.po
+++ b/addons/audittrail/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:57+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index 623c38d1e79..823fa32c1c7 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-06 06:48+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/da.po b/addons/audittrail/i18n/da.po
index ab52726b8a0..15ec3c0794c 100644
--- a/addons/audittrail/i18n/da.po
+++ b/addons/audittrail/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 7d3ad5fa12f..7133c7375fb 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 06:55+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index 9e5397bcc16..87d2d8fa002 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 17:25+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 92df0e569c0..44e5591e083 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:06+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index ba9f7038b0a..fe2ca12c65e 100644
--- a/addons/audittrail/i18n/es_AR.po
+++ b/addons/audittrail/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-22 14:05+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/es_CR.po b/addons/audittrail/i18n/es_CR.po
index e58d19e2ed4..e2c8d1a0cce 100644
--- a/addons/audittrail/i18n/es_CR.po
+++ b/addons/audittrail/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 16:44+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es_EC.po b/addons/audittrail/i18n/es_EC.po
index 02f4eb7cc34..894b8991008 100644
--- a/addons/audittrail/i18n/es_EC.po
+++ b/addons/audittrail/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-18 19:14+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/es_PY.po b/addons/audittrail/i18n/es_PY.po
index 6d4c5b64fe4..f9bc75face9 100644
--- a/addons/audittrail/i18n/es_PY.po
+++ b/addons/audittrail/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-08 00:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index e5f395b18de..5f8983d3882 100644
--- a/addons/audittrail/i18n/et.po
+++ b/addons/audittrail/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 16:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/fa.po b/addons/audittrail/i18n/fa.po
index 0155832f73b..8c7d606c851 100644
--- a/addons/audittrail/i18n/fa.po
+++ b/addons/audittrail/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 19:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/fi.po b/addons/audittrail/i18n/fi.po
index 5aa1026a5d9..46e6b0752d6 100644
--- a/addons/audittrail/i18n/fi.po
+++ b/addons/audittrail/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-27 10:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 346cf8a3e43..d56510d394b 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:05+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/gl.po b/addons/audittrail/i18n/gl.po
index 2e022678dc5..5d17b92868d 100644
--- a/addons/audittrail/i18n/gl.po
+++ b/addons/audittrail/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-28 10:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/gu.po b/addons/audittrail/i18n/gu.po
index 3ff17c2faa6..99d3c5d758d 100644
--- a/addons/audittrail/i18n/gu.po
+++ b/addons/audittrail/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-06 18:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index b3540543e0a..35e1b131587 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:37+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index 63ce7d01617..b44b32552f5 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-31 12:50+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index 1719f05eafe..71b61c7a5e8 100644
--- a/addons/audittrail/i18n/id.po
+++ b/addons/audittrail/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 13:45+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index ce16615a1ba..d29e72393b0 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 08:00+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/ja.po b/addons/audittrail/i18n/ja.po
index 40b5527121d..5d2fadc29fb 100644
--- a/addons/audittrail/i18n/ja.po
+++ b/addons/audittrail/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:18+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 83d7a13ec79..8a48f19ba9a 100644
--- a/addons/audittrail/i18n/ko.po
+++ b/addons/audittrail/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:25+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index ab31489c677..94e9410df08 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:16+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/lv.po b/addons/audittrail/i18n/lv.po
index 2d31ae18b9b..21eadd565c2 100644
--- a/addons/audittrail/i18n/lv.po
+++ b/addons/audittrail/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 22:59+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index 3663c278b11..d9e51ce67d8 100644
--- a/addons/audittrail/i18n/mn.po
+++ b/addons/audittrail/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-22 10:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/nb.po b/addons/audittrail/i18n/nb.po
index 702c19f1f79..fcdb0128e6b 100644
--- a/addons/audittrail/i18n/nb.po
+++ b/addons/audittrail/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-31 16:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index 91e865b36a2..31d713cfb65 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:09+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index 4b300fe34b6..f458db99045 100644
--- a/addons/audittrail/i18n/nl_BE.po
+++ b/addons/audittrail/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
index 18bce1a694d..a268098b2dd 100644
--- a/addons/audittrail/i18n/oc.po
+++ b/addons/audittrail/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 00:49+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index b0ae51cf30b..63891fa2900 100644
--- a/addons/audittrail/i18n/pl.po
+++ b/addons/audittrail/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 08:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index b9397792fa3..b3243fce90e 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:28+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index ea018c66a56..1aa373dd71a 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 11:17+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index 8834b96ceb4..d2d6825d825 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 00:51+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 6003ac76e79..7dd371f115c 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-05 09:24+0000\n"
 "Last-Translator: Эдуард <Unknown>\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: 2012-12-06 04:40+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index 63cfec5c5d1..01ef4a6d9df 100644
--- a/addons/audittrail/i18n/sl.po
+++ b/addons/audittrail/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 17:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/sq.po b/addons/audittrail/i18n/sq.po
index 3713ac443a2..7eff19d4434 100644
--- a/addons/audittrail/i18n/sq.po
+++ b/addons/audittrail/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/sr@latin.po b/addons/audittrail/i18n/sr@latin.po
index 74dee95858f..a0f4e1aef7e 100644
--- a/addons/audittrail/i18n/sr@latin.po
+++ b/addons/audittrail/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 16:12+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index 2cd495ae4fe..3cbc44cb0e0 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 00:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index feac29356c5..5bf78bcfd8c 100644
--- a/addons/audittrail/i18n/tlh.po
+++ b/addons/audittrail/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 063e2fa1d9e..7b91fe72251 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:16+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index a6508cef250..22c6e5c10cf 100644
--- a/addons/audittrail/i18n/uk.po
+++ b/addons/audittrail/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:34+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/vi.po b/addons/audittrail/i18n/vi.po
index 12d2e7cfe64..2cf80a39ef5 100644
--- a/addons/audittrail/i18n/vi.po
+++ b/addons/audittrail/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 11:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 344c8a6bdd9..3d5e5693a7e 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 06:31+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 4bf6a250890..38d1bf2babc 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 13:46+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/auth_ldap/i18n/ar.po b/addons/auth_ldap/i18n/ar.po
index 3c19298da7b..dbab68288c4 100644
--- a/addons/auth_ldap/i18n/ar.po
+++ b/addons/auth_ldap/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:00+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/bg.po b/addons/auth_ldap/i18n/bg.po
index 8b985e76fb6..b702fe2ea51 100644
--- a/addons/auth_ldap/i18n/bg.po
+++ b/addons/auth_ldap/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 20:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/ca.po b/addons/auth_ldap/i18n/ca.po
index 2298f6a586c..4d86a68dae4 100644
--- a/addons/auth_ldap/i18n/ca.po
+++ b/addons/auth_ldap/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-05 23:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/da.po b/addons/auth_ldap/i18n/da.po
index b1938e8d3d1..a688db351fd 100644
--- a/addons/auth_ldap/i18n/da.po
+++ b/addons/auth_ldap/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 06:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/de.po b/addons/auth_ldap/i18n/de.po
index 7d25fadf290..170a1408ca4 100644
--- a/addons/auth_ldap/i18n/de.po
+++ b/addons/auth_ldap/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 06:57+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
diff --git a/addons/auth_ldap/i18n/es.po b/addons/auth_ldap/i18n/es.po
index 18823b5b6d5..1a8c3807fe6 100644
--- a/addons/auth_ldap/i18n/es.po
+++ b/addons/auth_ldap/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 21:58+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/es_CR.po b/addons/auth_ldap/i18n/es_CR.po
index 3b84bb3473d..5ba074ad5aa 100644
--- a/addons/auth_ldap/i18n/es_CR.po
+++ b/addons/auth_ldap/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-20 01:19+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: auth_ldap
diff --git a/addons/auth_ldap/i18n/fi.po b/addons/auth_ldap/i18n/fi.po
index b34fa64cfe4..863dd9ce177 100644
--- a/addons/auth_ldap/i18n/fi.po
+++ b/addons/auth_ldap/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-13 09:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/fr.po b/addons/auth_ldap/i18n/fr.po
index 28509bba26e..8bffd9504be 100644
--- a/addons/auth_ldap/i18n/fr.po
+++ b/addons/auth_ldap/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 17:08+0000\n"
 "Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/gl.po b/addons/auth_ldap/i18n/gl.po
index 8f4f49b5485..594685d6292 100644
--- a/addons/auth_ldap/i18n/gl.po
+++ b/addons/auth_ldap/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-05 01:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/hr.po b/addons/auth_ldap/i18n/hr.po
index 2e9a5081d9a..848db6b27e9 100644
--- a/addons/auth_ldap/i18n/hr.po
+++ b/addons/auth_ldap/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-21 14:58+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/hu.po b/addons/auth_ldap/i18n/hu.po
index 1fe5f342816..4559328950b 100644
--- a/addons/auth_ldap/i18n/hu.po
+++ b/addons/auth_ldap/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-27 12:31+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/it.po b/addons/auth_ldap/i18n/it.po
index 88c0639973f..f56abe3860b 100644
--- a/addons/auth_ldap/i18n/it.po
+++ b/addons/auth_ldap/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 07:56+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/ja.po b/addons/auth_ldap/i18n/ja.po
index 4a072ae5d0f..9a5e1f3db89 100644
--- a/addons/auth_ldap/i18n/ja.po
+++ b/addons/auth_ldap/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-16 22:21+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/mn.po b/addons/auth_ldap/i18n/mn.po
index 26e910d2093..afa20440602 100644
--- a/addons/auth_ldap/i18n/mn.po
+++ b/addons/auth_ldap/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 13:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/nb.po b/addons/auth_ldap/i18n/nb.po
index e54a18e7c2d..a62e5caeaa9 100644
--- a/addons/auth_ldap/i18n/nb.po
+++ b/addons/auth_ldap/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:01+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/nl.po b/addons/auth_ldap/i18n/nl.po
index 2588a4dad46..4cbc91b50e0 100644
--- a/addons/auth_ldap/i18n/nl.po
+++ b/addons/auth_ldap/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:25+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/pl.po b/addons/auth_ldap/i18n/pl.po
index c7540ff66fe..94b3a242420 100644
--- a/addons/auth_ldap/i18n/pl.po
+++ b/addons/auth_ldap/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:18+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/pt.po b/addons/auth_ldap/i18n/pt.po
index 86e97058916..476f99fb87f 100644
--- a/addons/auth_ldap/i18n/pt.po
+++ b/addons/auth_ldap/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:36+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/pt_BR.po b/addons/auth_ldap/i18n/pt_BR.po
index 85db8d35f84..1688a8b49e5 100644
--- a/addons/auth_ldap/i18n/pt_BR.po
+++ b/addons/auth_ldap/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 00:42+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/ro.po b/addons/auth_ldap/i18n/ro.po
index 5e8fe12d33b..f28dcdb3458 100644
--- a/addons/auth_ldap/i18n/ro.po
+++ b/addons/auth_ldap/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-09 11:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/ru.po b/addons/auth_ldap/i18n/ru.po
index 54b8f84428e..414df40218b 100644
--- a/addons/auth_ldap/i18n/ru.po
+++ b/addons/auth_ldap/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-12 20:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/sv.po b/addons/auth_ldap/i18n/sv.po
index 117ef88754e..b84d4440e59 100644
--- a/addons/auth_ldap/i18n/sv.po
+++ b/addons/auth_ldap/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-23 11:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/tr.po b/addons/auth_ldap/i18n/tr.po
index 99f6717a887..3d7dcd1179c 100644
--- a/addons/auth_ldap/i18n/tr.po
+++ b/addons/auth_ldap/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-10 21:12+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index 65e3f484149..322873edf7c 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:07+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
diff --git a/addons/auth_oauth/i18n/ar.po b/addons/auth_oauth/i18n/ar.po
index 30d6eda6f50..be6d3f06ea7 100644
--- a/addons/auth_oauth/i18n/ar.po
+++ b/addons/auth_oauth/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 11:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/de.po b/addons/auth_oauth/i18n/de.po
index 628056489ea..af29d91b885 100644
--- a/addons/auth_oauth/i18n/de.po
+++ b/addons/auth_oauth/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 14:45+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
diff --git a/addons/auth_oauth/i18n/es.po b/addons/auth_oauth/i18n/es.po
index c1d7f1f0d82..2d39a67b3c0 100644
--- a/addons/auth_oauth/i18n/es.po
+++ b/addons/auth_oauth/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:10+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/fr.po b/addons/auth_oauth/i18n/fr.po
index af21a721dd1..3f9d009abb3 100644
--- a/addons/auth_oauth/i18n/fr.po
+++ b/addons/auth_oauth/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 09:21+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/hr.po b/addons/auth_oauth/i18n/hr.po
index 11a48882901..05ab8b96e17 100644
--- a/addons/auth_oauth/i18n/hr.po
+++ b/addons/auth_oauth/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:36+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/it.po b/addons/auth_oauth/i18n/it.po
new file mode 100644
index 00000000000..aa99f1adab1
--- /dev/null
+++ b/addons/auth_oauth/i18n/it.po
@@ -0,0 +1,135 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 22:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,validation_endpoint:0
+msgid "Validation URL"
+msgstr "URL Validazione"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,auth_endpoint:0
+msgid "Authentication URL"
+msgstr "URL Autenticazione"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,name:0
+msgid "Provider name"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,scope:0
+msgid "Scope"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_provider_id:0
+msgid "OAuth Provider"
+msgstr "Fronitore di  OAuth"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,css_class:0
+msgid "CSS class"
+msgstr "Classe CSS"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,body:0
+msgid "Body"
+msgstr "Corpo"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_users
+msgid "Users"
+msgstr "Utenti"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,sequence:0
+msgid "unknown"
+msgstr "sconosciuto"
+
+#. module: auth_oauth
+#: field:res.users,oauth_access_token:0
+msgid "OAuth Access Token"
+msgstr "Token Accesso OAuth"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,client_id:0
+#: field:base.config.settings,auth_oauth_facebook_client_id:0
+#: field:base.config.settings,auth_oauth_google_client_id:0
+msgid "Client ID"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
+msgid "OAuth Providers"
+msgstr "Fornitore di OAuth"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_auth_oauth_provider
+msgid "OAuth2 provider"
+msgstr "Fornitore di OAuth2"
+
+#. module: auth_oauth
+#: field:res.users,oauth_uid:0
+msgid "OAuth User ID"
+msgstr "ID Utente OAuth"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_facebook_enabled:0
+msgid "Allow users to sign in with Facebook"
+msgstr "Permetti agli utenti di autenticarsi tramite Facebook"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr ""
+
+#. module: auth_oauth
+#: help:res.users,oauth_uid:0
+msgid "Oauth Provider user_id"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,data_endpoint:0
+msgid "Data URL"
+msgstr ""
+
+#. module: auth_oauth
+#: view:auth.oauth.provider:0
+msgid "arch"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
+msgid "Providers"
+msgstr ""
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_google_enabled:0
+msgid "Allow users to sign in with Google"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,enabled:0
+msgid "Allowed"
+msgstr ""
diff --git a/addons/auth_oauth/i18n/nb.po b/addons/auth_oauth/i18n/nb.po
index a83f6902692..5aac36339df 100644
--- a/addons/auth_oauth/i18n/nb.po
+++ b/addons/auth_oauth/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-02 20:51+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/nl.po b/addons/auth_oauth/i18n/nl.po
index e783d337d01..9ec1f6e4e93 100644
--- a/addons/auth_oauth/i18n/nl.po
+++ b/addons/auth_oauth/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 19:36+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/pl.po b/addons/auth_oauth/i18n/pl.po
index 800eac166d0..f88c8d520e7 100644
--- a/addons/auth_oauth/i18n/pl.po
+++ b/addons/auth_oauth/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:19+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/pt_BR.po b/addons/auth_oauth/i18n/pt_BR.po
index f4340cc322c..79e3ae3d3d8 100644
--- a/addons/auth_oauth/i18n/pt_BR.po
+++ b/addons/auth_oauth/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 23:41+0000\n"
 "Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
index a82f8fb2720..8113fd4de2e 100644
--- a/addons/auth_oauth/i18n/zh_CN.po
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 14:27+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_openid/i18n/ar.po b/addons/auth_openid/i18n/ar.po
index 22ce0dda9a9..31d0a6bbb94 100644
--- a/addons/auth_openid/i18n/ar.po
+++ b/addons/auth_openid/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:05+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/de.po b/addons/auth_openid/i18n/de.po
index 10330c21691..185b16af477 100644
--- a/addons/auth_openid/i18n/de.po
+++ b/addons/auth_openid/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 07:24+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/es.po b/addons/auth_openid/i18n/es.po
index 78c23035bb4..fd36ca5ef86 100644
--- a/addons/auth_openid/i18n/es.po
+++ b/addons/auth_openid/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 21:46+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/es_CR.po b/addons/auth_openid/i18n/es_CR.po
index 5c1dc0de513..9b6b420fdef 100644
--- a/addons/auth_openid/i18n/es_CR.po
+++ b/addons/auth_openid/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 16:48+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/fi.po b/addons/auth_openid/i18n/fi.po
index 1e62d136070..634963db0e6 100644
--- a/addons/auth_openid/i18n/fi.po
+++ b/addons/auth_openid/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-30 09:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po
index 700cecf965b..2ff57534f59 100644
--- a/addons/auth_openid/i18n/fr.po
+++ b/addons/auth_openid/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 10:02+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/gu.po b/addons/auth_openid/i18n/gu.po
index 7ff4e5e9b1e..891c4f01ca2 100644
--- a/addons/auth_openid/i18n/gu.po
+++ b/addons/auth_openid/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 11:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/hr.po b/addons/auth_openid/i18n/hr.po
index 777ad73a39f..e385bb71357 100644
--- a/addons/auth_openid/i18n/hr.po
+++ b/addons/auth_openid/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:13+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/it.po b/addons/auth_openid/i18n/it.po
index 2b4289395d0..b4269d05c8f 100644
--- a/addons/auth_openid/i18n/it.po
+++ b/addons/auth_openid/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 07:47+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/ja.po b/addons/auth_openid/i18n/ja.po
index a6d712c1b5a..5c575672a3e 100644
--- a/addons/auth_openid/i18n/ja.po
+++ b/addons/auth_openid/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-19 03:56+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/nb.po b/addons/auth_openid/i18n/nb.po
index 1520a492664..a7701a1a189 100644
--- a/addons/auth_openid/i18n/nb.po
+++ b/addons/auth_openid/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-25 09:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/nl.po b/addons/auth_openid/i18n/nl.po
index ac8eb64a147..950662587e4 100644
--- a/addons/auth_openid/i18n/nl.po
+++ b/addons/auth_openid/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:23+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/pl.po b/addons/auth_openid/i18n/pl.po
index e13ab73efa1..c5cab1c0814 100644
--- a/addons/auth_openid/i18n/pl.po
+++ b/addons/auth_openid/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-25 17:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/pt.po b/addons/auth_openid/i18n/pt.po
index 5ef8e08c809..18ee941a154 100644
--- a/addons/auth_openid/i18n/pt.po
+++ b/addons/auth_openid/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:30+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/pt_BR.po b/addons/auth_openid/i18n/pt_BR.po
index 4e34e7a3971..59880a2ff92 100644
--- a/addons/auth_openid/i18n/pt_BR.po
+++ b/addons/auth_openid/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 15:27+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/ro.po b/addons/auth_openid/i18n/ro.po
index 003d4697dd8..229a1eef20a 100644
--- a/addons/auth_openid/i18n/ro.po
+++ b/addons/auth_openid/i18n/ro.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 07:05+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sk.po b/addons/auth_openid/i18n/sk.po
index 7c43b7760a4..325b7de2ec9 100644
--- a/addons/auth_openid/i18n/sk.po
+++ b/addons/auth_openid/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-09 09:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/sr@latin.po b/addons/auth_openid/i18n/sr@latin.po
index 2d37e6a5539..274740d3a44 100644
--- a/addons/auth_openid/i18n/sr@latin.po
+++ b/addons/auth_openid/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-05 15:20+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/sv.po b/addons/auth_openid/i18n/sv.po
index e8a34a6ff38..45c887f7e80 100644
--- a/addons/auth_openid/i18n/sv.po
+++ b/addons/auth_openid/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-04 10:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index 57e7996fb14..d6239e174e2 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 22:07+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_openid/i18n/zh_CN.po b/addons/auth_openid/i18n/zh_CN.po
index 57d2583de4e..f40c927c475 100644
--- a/addons/auth_openid/i18n/zh_CN.po
+++ b/addons/auth_openid/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 15:15+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_signup/i18n/ar.po b/addons/auth_signup/i18n/ar.po
index 90814343ae6..a4629cfef16 100644
--- a/addons/auth_signup/i18n/ar.po
+++ b/addons/auth_signup/i18n/ar.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 11:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr ""
@@ -86,6 +91,12 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index 43fe51b8d1f..8368274cb1b 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.po
@@ -7,16 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 14:58+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr "Kann keine EMail senden, weil der Benutzer keine EMail Adresse hat"
@@ -64,7 +69,7 @@ msgstr "Passwort zurücksetzen"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Bitte ein Passwort eintragen und bestätigen"
@@ -87,6 +92,12 @@ msgstr "Anmelden"
 msgid "New"
 msgstr "Neu"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -116,7 +127,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr "Bitte geben Sie einen Namen ein."
@@ -133,7 +144,7 @@ msgstr "Registrierungs URL"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr "Bitte Benutzernamen eingeben."
@@ -143,6 +154,14 @@ msgstr "Bitte Benutzernamen eingeben."
 msgid "Active"
 msgstr "Aktiv"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -159,7 +178,7 @@ msgstr "Name"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr "Bitte Benutzername oder EMail Adresse eingeben"
@@ -200,35 +219,35 @@ msgstr "Anmeldungs Token ist gültig"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr "Login"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr "Anmeldungs Token ist ungültig"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr "Passworte stimmen nicht überein, bitte neu eingeben"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr "Keine Datenbank ausgewählt-"
diff --git a/addons/auth_signup/i18n/es.po b/addons/auth_signup/i18n/es.po
index 247758371ea..7f9e3aa6c62 100644
--- a/addons/auth_signup/i18n/es.po
+++ b/addons/auth_signup/i18n/es.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:32+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "Parámetros de configuración base"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -67,7 +72,7 @@ msgstr "Restablecer contraseña"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Por favor introduzca una contraseña y confírmela."
@@ -89,6 +94,12 @@ msgstr "Registro"
 msgid "New"
 msgstr "Nuevo"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -118,7 +129,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr "Por favor, introduzca un nombre."
@@ -135,7 +146,7 @@ msgstr "URL de ingreso"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr "Por favor, introduzca un nombre de usuario."
@@ -145,6 +156,14 @@ msgstr "Por favor, introduzca un nombre de usuario."
 msgid "Active"
 msgstr "Activo"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -161,7 +180,7 @@ msgstr "Nombre"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -205,35 +224,35 @@ msgstr "La palabra de ingreso es válida"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr "Palabra de ingreso no válida"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr "Las contraseñas no coinciden. Por favor vuelva a teclearlas."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr "¡No se ha seleccionado ninguna base de datos!"
diff --git a/addons/auth_signup/i18n/fr.po b/addons/auth_signup/i18n/fr.po
index 484eb74f91a..deb48c21c4c 100644
--- a/addons/auth_signup/i18n/fr.po
+++ b/addons/auth_signup/i18n/fr.po
@@ -7,32 +7,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
-"PO-Revision-Date: 2012-12-20 11:59+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 13:39+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr ""
+msgstr "Autorise les utilisateurs externes à se connecter"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
 #, python-format
 msgid "Confirm Password"
-msgstr ""
+msgstr "Confirmez le mot de passe"
 
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
 msgstr ""
+"Si la case est décochée, seules les utilisateurs invités pourront se "
+"connecter."
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
@@ -40,56 +47,65 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
+"Impossible d'envoyer l'e-mail : l'utilisateur n'a pas d'adresse e-mail."
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
 #, python-format
 msgid "Reset password"
-msgstr ""
+msgstr "Réinitialiser le mot de passe"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
 msgstr ""
+"Utilisateur modèle pour les nouveaux utilisateurs créés à travers signup"
 
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.reset_password_email
 msgid "Password reset"
-msgstr ""
+msgstr "Réinitialisation du mot de passe"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
-msgstr ""
+msgstr "Veuillez entrer un mot de passe et le confirmer"
 
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send an email to the user to (re)set their password."
 msgstr ""
+"Envoyer un e-mail à l'utilisateurs pour (ré-)initialiser son mot de passe."
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
 #, python-format
 msgid "Sign Up"
-msgstr ""
+msgstr "S'inscrire"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "New"
+msgstr "Nouveau"
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
 msgstr ""
 
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@@ -103,34 +119,51 @@ msgid ""
 "\n"
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
+"\n"
+"<p>Une demande de ré-initialisation de mot de passe sur le compte OpenERP "
+"associé à cet email.</p>\n"
+"\n"
+"<p>Vous pouvez changer votre mot de passe en utilisant  <a "
+"href=\"${object.signup_url}\">ce lien</a>.</p>\n"
+"\n"
+"<p>Note: vous pouvez ignorer ce mail si vous ne souhaitez pas changer votre "
+"mot de passe.</p>"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "Veuillez entrer un nom."
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #. module: auth_signup
 #: field:res.partner,signup_url:0
 msgid "Signup URL"
-msgstr ""
+msgstr "Url d'authentification"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
-msgstr ""
+msgstr "Merci de saisir votre nom d'utilisateur"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
+msgstr "Activer"
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
 msgstr ""
 
 #. module: auth_signup
@@ -138,121 +171,124 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "Merci de saisir votre nom d'utilisateur ou une adresse email"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Resetting Password"
-msgstr ""
+msgstr "Réinitialiser le mot de passe"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
 #, python-format
 msgid "Username (Email)"
-msgstr ""
+msgstr "Utilisateur (Email)"
 
 #. module: auth_signup
 #: field:res.partner,signup_expiration:0
 msgid "Signup Expiration"
-msgstr ""
+msgstr "Expiration de la session de connexion"
 
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_reset_password:0
 msgid "This allows users to trigger a password reset from the Login page."
 msgstr ""
+"Permet à l'utilisateur de demander un changement de mot de passe depuis la "
+"page d'identification."
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
 #, python-format
 msgid "Log in"
-msgstr ""
+msgstr "Ouverture de session"
 
 #. module: auth_signup
 #: field:res.partner,signup_valid:0
 msgid "Signup Token is Valid"
-msgstr ""
+msgstr "La session d'authentification est valide"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Identifiant"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
-msgstr ""
+msgstr "La session d'authentification est invalide"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr ""
+msgstr "Les mot des passes ne correspondent pas; merci de les resaisir."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Aucune base de données sélectionnée !"
 
 #. module: auth_signup
 #: view:res.users:0
 msgid "Reset Password"
-msgstr ""
+msgstr "Réinitialiser le mot de passe"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
 msgstr ""
+"Permettre la réinitialisation du mot de passe depuis la page de connexion"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
 #, python-format
 msgid "Back to Login"
-msgstr ""
+msgstr "Retour à la fenêtre de connexion"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Sign up"
-msgstr ""
+msgstr "S'enregistrer"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0
 msgid "Signup Token"
-msgstr ""
+msgstr "Session de connexion"
diff --git a/addons/auth_signup/i18n/hr.po b/addons/auth_signup/i18n/hr.po
index a95bba3f1c3..968570ac79b 100644
--- a/addons/auth_signup/i18n/hr.po
+++ b/addons/auth_signup/i18n/hr.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 19:58+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr "Korisnik nema e-mail adresu."
@@ -64,7 +69,7 @@ msgstr "Promjena lozinke"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Molim upišite lozinku i potvrdu."
@@ -86,6 +91,12 @@ msgstr ""
 msgid "New"
 msgstr "Nova(i)"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr "Unesite ime"
@@ -123,7 +134,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr "Upišite korisničko ime"
@@ -133,6 +144,14 @@ msgstr "Upišite korisničko ime"
 msgid "Active"
 msgstr "Aktivan"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr "Naziv"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr "Upišite korisničko ime ili email adresu."
@@ -190,35 +209,35 @@ msgstr "Token prijave je ispravan"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr "Prijava"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr "Lozinke nisu iste, pokušajte ponovo."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr "Nije odabrana baza podataka"
diff --git a/addons/auth_signup/i18n/it.po b/addons/auth_signup/i18n/it.po
index 30a935a8f02..f10f710412a 100644
--- a/addons/auth_signup/i18n/it.po
+++ b/addons/auth_signup/i18n/it.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 11:51+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr "Non è possibile inviare email: l'utente non ha l'indirizzo impostato"
@@ -66,7 +71,7 @@ msgstr "Ripristino password"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Prego inserire una password e confermarla"
@@ -88,6 +93,12 @@ msgstr "Registrazione"
 msgid "New"
 msgstr "Nuovo"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -117,7 +128,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr "Prego inserire un nome"
@@ -134,7 +145,7 @@ msgstr "URL registrazione"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr "Prego inserire un username"
@@ -144,6 +155,14 @@ msgstr "Prego inserire un username"
 msgid "Active"
 msgstr "Attivo"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -160,7 +179,7 @@ msgstr "Nome"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr "Prego inserire un nome utente e un indirizzo mail."
@@ -203,35 +222,35 @@ msgstr "Il token di registrazione è valido"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr "Login"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr "Il token di registrazione non è valido"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr "Le password non corrispondono; prego riscriverle."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr "Nessun database selezionato!"
diff --git a/addons/auth_signup/i18n/nb.po b/addons/auth_signup/i18n/nb.po
index be66d178c58..54b43129172 100644
--- a/addons/auth_signup/i18n/nb.po
+++ b/addons/auth_signup/i18n/nb.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-02 20:32+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "Base.Konfigurasjon.Innstillinger."
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr ""
@@ -86,6 +91,12 @@ msgstr "Registrer deg."
 msgid "New"
 msgstr "Ny."
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr "Regitrer deg URL."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiv."
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr "Navn."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/auth_signup/i18n/nl.po b/addons/auth_signup/i18n/nl.po
index 96bbebd9134..5ed53ba464a 100644
--- a/addons/auth_signup/i18n/nl.po
+++ b/addons/auth_signup/i18n/nl.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 20:16+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr "Reset wachtwoord"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr ""
@@ -86,6 +91,12 @@ msgstr "Aanmelden"
 msgid "New"
 msgstr "Nieuw"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr "URL voor aanmelden"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr "Actief"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr "Naam"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/auth_signup/i18n/pl.po b/addons/auth_signup/i18n/pl.po
index 6bc2fe02c43..bbe87eb269c 100644
--- a/addons/auth_signup/i18n/pl.po
+++ b/addons/auth_signup/i18n/pl.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 18:01+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -41,7 +46,7 @@ msgid "base.config.settings"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -65,7 +70,7 @@ msgstr "Reset hasła"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Wprowadź hasło o potwierdź je"
@@ -87,6 +92,12 @@ msgstr "Rejestracja"
 msgid "New"
 msgstr "Nowy"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -107,7 +118,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr "Wprowadź nazwę"
@@ -124,7 +135,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -134,6 +145,14 @@ msgstr ""
 msgid "Active"
 msgstr "Aktywne"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -150,7 +169,7 @@ msgstr "Nazwa"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -191,35 +210,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr "Zaloguj się"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr "Nie wybrano bazy !"
diff --git a/addons/auth_signup/i18n/pt.po b/addons/auth_signup/i18n/pt.po
index 9cc1ba2525a..8d6914ded44 100644
--- a/addons/auth_signup/i18n/pt.po
+++ b/addons/auth_signup/i18n/pt.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 18:26+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr "Repor senha"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Por favor indique uma senha e confirme-a"
@@ -86,6 +91,12 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/auth_signup/i18n/pt_BR.po b/addons/auth_signup/i18n/pt_BR.po
index 4fa96cf0535..cee71cac3f7 100644
--- a/addons/auth_signup/i18n/pt_BR.po
+++ b/addons/auth_signup/i18n/pt_BR.po
@@ -7,15 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
-"PO-Revision-Date: 2012-12-04 18:30+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 11:08+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr "Tipo de token para Inscrição"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -37,10 +43,10 @@ msgstr "Se não marcado, somente usuários convidados poderão inscrever-se"
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
-msgstr "Configurações"
+msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -65,7 +71,7 @@ msgstr "Redefinir Senha"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "Por favor digite uma senha e sua confirmação."
@@ -87,6 +93,12 @@ msgstr "Inscreva-se"
 msgid "New"
 msgstr "Novo"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr "Mensagem enviadas para:"
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -105,21 +117,20 @@ msgid ""
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
 "\n"
-"<p>Uma redefinição de senha foi solicitada para a conta OpenERP associada a "
-"este e-mail.</p>\n"
+"<p>Uma redefinição de senha foi solicitada para a conta do OpenERP associada "
+"a este e-mail.</p>\n"
 "\n"
 "<p>Você pode mudar sua senha acessando <a href=\"${object.signup_url}\">este "
 "endereço</a>.</p>\n"
 "\n"
-"<p>Nota: Se esta ação não era esperada, você pode seguramente ignorar este e-"
-"mail.</p>"
+"<p>Nota: Se você não solicitou essa alteração, basta ignorar este e-mail.</p>"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
-msgstr "Por favor informe um nome."
+msgstr "Por favor, informe o nome"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -133,7 +144,7 @@ msgstr "URL de inscrição"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr "Por favor informe um nome de usuário"
@@ -143,6 +154,16 @@ msgstr "Por favor informe um nome de usuário"
 msgid "Active"
 msgstr "Ativo"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+"Não é possível enviar email: o servidor de saída não está configurado.\n"
+"Você pode configurar em Configurações / Configurações Gerais."
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -159,7 +180,7 @@ msgstr "Nome"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr "Por favor informe um nome de usuário ou endereço de e-mail."
@@ -202,35 +223,35 @@ msgstr "Token de Inscrição é Válido"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr "Autenticação"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr "Token de inscrição inválido"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr "As senhas não combinam; por favor redigite-as."
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr "Nenhuma base de dados selecionada !"
diff --git a/addons/auth_signup/i18n/ru.po b/addons/auth_signup/i18n/ru.po
index 1b6295b6e1c..2c4bb9b0ac3 100644
--- a/addons/auth_signup/i18n/ru.po
+++ b/addons/auth_signup/i18n/ru.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 06:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr ""
@@ -86,6 +91,12 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/auth_signup/i18n/tr.po b/addons/auth_signup/i18n/tr.po
index b5b0822191e..2560ff5fb2b 100644
--- a/addons/auth_signup/i18n/tr.po
+++ b/addons/auth_signup/i18n/tr.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 20:16+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr ""
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr "Parola sıfırlandı"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr ""
@@ -86,6 +91,12 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 813db8acad6..96d5bd6d7ea 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -7,15 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 20:16+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -40,7 +45,7 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
 #, python-format
 msgid "Cannot send email: user has no email address."
 msgstr ""
@@ -64,7 +69,7 @@ msgstr "重置密码"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr ""
@@ -86,6 +91,12 @@ msgstr "注册"
 msgid "New"
 msgstr "新建"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
@@ -106,7 +117,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
 #, python-format
 msgid "Please enter a name."
 msgstr ""
@@ -123,7 +134,7 @@ msgstr "注册 URL"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
 #, python-format
 msgid "Please enter a username."
 msgstr ""
@@ -133,6 +144,14 @@ msgstr ""
 msgid "Active"
 msgstr "启用"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -149,7 +168,7 @@ msgstr "姓名"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Please enter a username or email address."
 msgstr ""
@@ -190,35 +209,35 @@ msgstr "注册令牌（ Token  ）是有效的"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
 #, python-format
 msgid "No database selected !"
 msgstr ""
diff --git a/addons/base_action_rule/i18n/ar.po b/addons/base_action_rule/i18n/ar.po
index 49fe92e2b9a..3c025f56667 100644
--- a/addons/base_action_rule/i18n/ar.po
+++ b/addons/base_action_rule/i18n/ar.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:30+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "عين التابعين"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "قواعد الاجراء"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "مسئول"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "ملاحظة"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "فئة الشريك"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "تأخير بعد تاريخ تريجر"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr "اذا عُيين الحقل النشط الى خطأ, سيسمح لك بإخفاء القاعدة بدون ازالتها."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "الشروط"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "الحالة"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "قاعدة الاجراء"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "حقول للتغيير"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "تم الضغط على الزر"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "تاريخ اخر اجراء"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,36 +140,15 @@ msgid "Hours"
 msgstr "ساعات"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "ضع حالة لـ"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"يحدد تأخير بعد تاريخ تريجر, يمكنك وضع عدد سلبي. اذا كنت تريد التأخير قبل "
-"تاريخ تريجر, كإرسال تذكير قبل الاجتماع ب15 دقيقة."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "كرون"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "تاريخ"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "نشط"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -152,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "تأخير بعد تاريخ تريجر"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "عيين مؤول عن"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "لا شئ"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "شهور"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "اسم القاعدة"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -172,55 +188,45 @@ msgstr "شهور"
 msgid "Automated Actions"
 msgstr "الإجراءات التلقائية"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "ويعطي امر التسلسل عند عرض قائمة من القواعد."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "الشروط على حقول النموذج"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "إجراء الخادم"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "شهور"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "أيام"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "تأخير النوع"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "مُرشِّح"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "نشط"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "رجإكس على اسم المصدر"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "تاريخ آخر تعديل"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -238,38 +244,21 @@ msgid "Minutes"
 msgstr "دقائق"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"التعبير العادي لتوفيق الاسم من المصدر\n"
-"مثال: سيبحث ‘طاري.*‘ على التسجيلات شاملة على بداية الاسم مع السللسلة "
-"‘طاريء‘\n"
-"لاحظ: انها تكون بحث مكثف للحالة."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "الشروط على التوقيت"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "اسم القاعدة"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "مسلسل"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "الشروط على الشريك النموذجي"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -292,39 +281,43 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "تاريخ الإنشاء"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "انشيء سجل"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "الموعد النهائي"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "شريك"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "تاريخ تريجر"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr "إجراءات الخادم"
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Object"
 #~ msgstr "كائن"
 
+#~ msgid "Partner Category"
+#~ msgstr "فئة الشريك"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "خطأ!"
@@ -332,12 +325,36 @@ msgstr "إجراءات الخادم"
 #~ msgid "Reply-To"
 #~ msgstr "رد على"
 
+#~ msgid "Deadline"
+#~ msgstr "الموعد النهائي"
+
+#~ msgid "Creation Date"
+#~ msgstr "تاريخ الإنشاء"
+
 #~ msgid "State"
 #~ msgstr "الحالة"
 
+#~ msgid "None"
+#~ msgstr "لا شئ"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "معطيات غير سليمة"
 
+#~ msgid "Note"
+#~ msgstr "ملاحظة"
+
+#~ msgid "Date"
+#~ msgstr "تاريخ"
+
+#~ msgid "Filter"
+#~ msgstr "مُرشِّح"
+
+#~ msgid "Server Action"
+#~ msgstr "إجراء الخادم"
+
+#~ msgid "Button Pressed"
+#~ msgstr "تم الضغط على الزر"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "ارسل بريد للمراقبين"
 
@@ -352,6 +369,9 @@ msgstr "إجراءات الخادم"
 #~ msgid "Mail to these Emails"
 #~ msgstr "ارسل بريد الى البريد الالكتروني"
 
+#~ msgid "Set State to"
+#~ msgstr "ضع حالة لـ"
+
 #~ msgid "Remind Partner"
 #~ msgstr "قم بتذكير الشريك"
 
@@ -367,12 +387,18 @@ msgstr "إجراءات الخادم"
 #~ msgid "Email Reminders"
 #~ msgstr "تذكيرات البريد الالكتروني"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "الشروط على الشريك النموذجي"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
 #~ "تحقق من هذا اذا كنت تريد القاعدة لارسال تذكير بواسطة البريد الالكتروني الى "
 #~ "الشريك."
 
+#~ msgid "Last Action Date"
+#~ msgstr "تاريخ اخر اجراء"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -380,6 +406,9 @@ msgstr "إجراءات الخادم"
 #~ "استخدم تعبير بايثون لتحدد الحقل الصحيح من اي واحد منهم  عن ماسيستخدم إلى "
 #~ "الحقل الرأسي"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "عيين مؤول عن"
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -428,6 +457,14 @@ msgstr "إجراءات الخادم"
 #~ msgid "Call Object Method"
 #~ msgstr "إستدعاء اسلوب الهدف"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "يحدد تأخير بعد تاريخ تريجر, يمكنك وضع عدد سلبي. اذا كنت تريد التأخير قبل "
+#~ "تاريخ تريجر, كإرسال تذكير قبل الاجتماع ب15 دقيقة."
+
 #~ msgid "%(partner_email)s = Partner Email"
 #~ msgstr "%(الشريك_البريد الالكتروني) = البريد الالكتروني للشريك"
 
@@ -450,6 +487,9 @@ msgstr "إجراءات الخادم"
 #~ "توصف اسم الاجراء.\n"
 #~ "مثال: على اي هدف سيأخذ الاجراء على اساس اي شرط"
 
+#~ msgid "ir.cron"
+#~ msgstr "كرون"
+
 #~ msgid "Mail body"
 #~ msgstr "هيئة البريد"
 
@@ -459,6 +499,9 @@ msgstr "إجراءات الخادم"
 #~ msgid "%(object_date)s = Creation date"
 #~ msgstr "%(الهدف_التاريخ) = تاريخ الانشاء"
 
+#~ msgid "Regex on Resource Name"
+#~ msgstr "رجإكس على اسم المصدر"
+
 #~ msgid "Server Action to be Triggered"
 #~ msgstr "اجراء الخدمة لتكون تريجرد"
 
@@ -475,6 +518,9 @@ msgstr "إجراءات الخادم"
 #~ "تحقق من هذا إذا كنت تريد أن ترفق جميع المستندات المرفقة للهدف للبريد "
 #~ "الالكتروني المذكر المرسل."
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "الشروط على حقول النموذج"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -487,6 +533,14 @@ msgstr "إجراءات الخادم"
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(الهدف_المستخدم) = اسم المسئول"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr "اذا عُيين الحقل النشط الى خطأ, سيسمح لك بإخفاء القاعدة بدون ازالتها."
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "الشروط على التوقيت"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -500,6 +554,17 @@ msgstr "إجراءات الخادم"
 #~ msgid "Error: The mail is not well formated"
 #~ msgstr "خطأ: لم يتم إعداد الرسالة جيداً"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "التعبير العادي لتوفيق الاسم من المصدر\n"
+#~ "مثال: سيبحث ‘طاري.*‘ على التسجيلات شاملة على بداية الاسم مع السللسلة "
+#~ "‘طاريء‘\n"
+#~ "لاحظ: انها تكون بحث مكثف للحالة."
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_action_rule/i18n/bg.po
index ea61b3be582..6ade6bd99f3 100644
--- a/addons/base_action_rule/i18n/bg.po
+++ b/addons/base_action_rule/i18n/bg.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-21 10:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Отговорник"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Бележка"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Категория на контрагент"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Условия"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Дата на последно действие"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "Часове"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Дата"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Активен"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Няма"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Месеци"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Име на правило"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "Месеци"
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Действия на сървъра"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Месеци"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Дни"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Тип на забавяне"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Филтър"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Минути"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Име на правило"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Последователност"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,45 +281,52 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Дата на създаване"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Създаване на дата"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Краен срок"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Контрагент"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Дата на изпълнение"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Email From"
 #~ msgstr "Имейл от"
 
 #~ msgid "Object"
 #~ msgstr "Обект"
 
+#~ msgid "Partner Category"
+#~ msgstr "Категория на контрагент"
+
 #~ msgid "Email Body"
 #~ msgstr "Тяло на имейл"
 
+#~ msgid "Deadline"
+#~ msgstr "Краен срок"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Грешка!"
@@ -335,9 +337,30 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Състояние"
 
+#~ msgid "Creation Date"
+#~ msgstr "Дата на създаване"
+
+#~ msgid "None"
+#~ msgstr "Няма"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Невалидни аргументи"
 
+#~ msgid "Note"
+#~ msgstr "Бележка"
+
+#~ msgid "Filter"
+#~ msgstr "Филтър"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Server Action"
+#~ msgstr "Действия на сървъра"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
@@ -346,6 +369,9 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Напомняниея по имейл"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Дата на последно действие"
+
 #~ msgid "Remind with Attachment"
 #~ msgstr "Напомняне с прикрепен файл"
 
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_action_rule/i18n/bs.po
index d80bf51e577..2479e4f6168 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:18+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Pravila radnje"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Odgovoran"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Bilješka"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Kategorija partnera"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Odgodi nakon datuma okidanja"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Ukoliko je aktivno polje postavljeno na False, omogućiti će vam da sakrijete "
-"pravilo bez uklanjanja."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Uvjeti"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Pravilo radnje"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Polja za izmijeniti"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Pritisnuto dugme"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Datum zadnje radnje"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Postavi stanje na"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"'Odgodi nakon datuma okidanja' specificira da možete staviti negativan bro, "
-"ako trebate odgodu prije datuma okidanja, npr. slanje podsjetnika 15 minuta "
-"prije sastanka."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Odgodi nakon datuma okidanja"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Postavi za odgovornu osobu"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ništa"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Mjeseci"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Naziv pravila"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Mjeseci"
 msgid "Automated Actions"
 msgstr "Automatizirane radnje"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Daje sekvencu kod prikaza liste pravila."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Uvjeti za polja modela"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Serverska radnja"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mjeseci"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dana"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Vrsta odgode"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Reg.izr. nad nazivom resursa"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,38 +244,21 @@ msgid "Minutes"
 msgstr "Minute"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Regularni izraz za pronalaženje naziva resursa\n"
-"npr.; 'urgent.*' će naći zapise koji imaju naziv koji počinje nizom "
-"'urgent'\n"
-"Napomena: Pretraga razlikuje velika i mala slova."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Uvjeti vremena"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Naziv pravila"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Uvjeti partnera modela"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -295,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Datum unosa"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Rok izvršenja"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Datum okidanja"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr "Označite ukoliko želite da pravilo šalje email odgovornoj osobi."
@@ -332,6 +319,15 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Podsjeti partnera"
 
+#~ msgid "Partner Category"
+#~ msgstr "Kategorija partnera"
+
+#~ msgid "Set State to"
+#~ msgstr "Postavi stanje na"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Pritisnuto dugme"
+
 #~ msgid "Object"
 #~ msgstr "Objekat"
 
@@ -356,6 +352,12 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Email podsjetnici"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Uvjeti partnera modela"
+
+#~ msgid "Deadline"
+#~ msgstr "Rok izvršenja"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Naslov objekta"
 
@@ -368,6 +370,18 @@ msgstr ""
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Email-id osoba kojima treba poslati email"
 
+#~ msgid "Creation Date"
+#~ msgstr "Datum kreiranja"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Datum zadnje radnje"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Postavi za odgovornu osobu"
+
+#~ msgid "None"
+#~ msgstr "Ništa"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Telefon odg. osobe"
 
@@ -380,6 +394,20 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Neispravni argumenti"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Regularni izraz za pronalaženje naziva resursa\n"
+#~ "npr.; 'urgent.*' će naći zapise koji imaju naziv koji počinje nizom "
+#~ "'urgent'\n"
+#~ "Napomena: Pretraga razlikuje velika i mala slova."
+
+#~ msgid "Note"
+#~ msgstr "Bilješka"
+
 #~ msgid ""
 #~ "Check this if you want the rule to mark CC(mail to any other person defined "
 #~ "in actions)."
@@ -390,6 +418,15 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Pozovi metodu objekta"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "'Odgodi nakon datuma okidanja' specificira da možete staviti negativan bro, "
+#~ "ako trebate odgodu prije datuma okidanja, npr. slanje podsjetnika 15 minuta "
+#~ "prije sastanka."
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Opis objekta"
 
@@ -400,6 +437,12 @@ msgstr ""
 #~ "Opisuje naziv radnje.\n"
 #~ "npr.: nad kojim objektima se provodi koja radnja na osnovu kojeg uvjeta"
 
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Napomeni odg. osobu"
 
@@ -435,6 +478,9 @@ msgstr ""
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Email za nadzor (CC)"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Uvjeti vremena"
+
 #~ msgid "Server Action to be Triggered"
 #~ msgstr "Akcija servera koju treba okinut."
 
@@ -444,6 +490,15 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Dodaj nadzor (CC)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Uvjeti za polja modela"
+
+#~ msgid "Server Action"
+#~ msgstr "Serverska radnja"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Reg.izr. nad nazivom resursa"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -456,3 +511,10 @@ msgstr ""
 
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Ime odg. osobe"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Ukoliko je aktivno polje postavljeno na False, omogućiti će vam da sakrijete "
+#~ "pravilo bez uklanjanja."
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
index cecbd4b9ef2..744d227feee 100644
--- a/addons/base_action_rule/i18n/ca.po
+++ b/addons/base_action_rule/i18n/ca.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:40+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Regles d'acció"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoria de l'empresa"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,49 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Retard després de la data d'activació"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Si el camp actiu es desmarca, permet ocultar la regla sense eliminar-la."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condicions"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regla d'acció"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Camps a canviar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botó pressionat"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data última acció"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -116,37 +140,15 @@ msgid "Hours"
 msgstr "Hores"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Fixa estat a"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Retard després data de llançament. Podeu posar un número negatiu si "
-"necessiteu un retard abans de la data de llançament, com enviar un "
-"recordatori 15 minuts abans d'una reunió."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Actiu"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -154,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Retard després de la data de llançament"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Fixa responsable a"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Sense"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Mesos"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nom de la regla"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -174,54 +188,44 @@ msgstr "Mesos"
 msgid "Automated Actions"
 msgstr "Accions automatitzades"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Indiqueu l'ordre de seqüència quan es mostra una llista de regles."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condicions en els camps del model"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Acció servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mesos"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dies"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipus de retard"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtre"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Actiu"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex sobre nom del recurs"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -240,38 +244,21 @@ msgid "Minutes"
 msgstr "Minuts"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Expressió regular per concordar amb el nom del recurs.\n"
-"Per exemple: 'urgent.' cercarà els registres que el seu nom comencin amb el "
-"text 'urgent'\n"
-"Nota: Aquesta recerca distingeix majúscules de minúscules."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condicions sobre temporització"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nom de la regla"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Seqüència"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condicions en el model empresa"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data de creació"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Data de creació"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Data límit"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Data d'activació"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Envia correu als observadors (CC)"
 
@@ -336,28 +324,43 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Envia correu a aquests emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Fixa estat a"
+
 #~ msgid "Object"
 #~ msgstr "Objecte"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Recorda empresa"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoria de l'empresa"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Error!"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condicions en el model empresa"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
 #~ "Marqueu aquesta opció si voleu que la regla enviï un recordatori per correu "
 #~ "electrònic a l'empresa."
 
+#~ msgid "Deadline"
+#~ msgstr "Data límit"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Assumpte objecte"
 
 #~ msgid "State"
 #~ msgstr "Estat"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data de creació"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
@@ -378,6 +381,12 @@ msgstr ""
 #~ "ID de l'email de les persones a els qui el correu electrònic ha de ser "
 #~ "enviat."
 
+#~ msgid "Last Action Date"
+#~ msgstr "Data última acció"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Fixa responsable a"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Telèfon responsable"
 
@@ -387,6 +396,17 @@ msgstr ""
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = ID objete"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expressió regular per concordar amb el nom del recurs.\n"
+#~ "Per exemple: 'urgent.' cercarà els registres que el seu nom comencin amb el "
+#~ "text 'urgent'\n"
+#~ "Nota: Aquesta recerca distingeix majúscules de minúscules."
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -395,6 +415,9 @@ msgstr ""
 #~ "camps no-buits perquè la regla executi l'acció descrita en la pestanya "
 #~ "\"Accions\"."
 
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nom empresa"
 
@@ -408,6 +431,12 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Mètode per cridar l'objecte"
 
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Filter"
+#~ msgstr "Filtre"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Recorda responsable"
 
@@ -419,6 +448,15 @@ msgstr ""
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Retard després data de llançament. Podeu posar un número negatiu si "
+#~ "necessiteu un retard abans de la data de llançament, com enviar un "
+#~ "recordatori 15 minuts abans d'una reunió."
+
 #~ msgid "Email Information"
 #~ msgstr "Informació email"
 
@@ -442,6 +480,9 @@ msgstr ""
 #~ "Per exemple: Sobre quin objecte quina acció ha d'executar-se sobre la base "
 #~ "de quina condició."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "%(partner_email)s = Partner Email"
 #~ msgstr "%(partner_email)s = Email empresa"
 
@@ -460,6 +501,12 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Afegeix observadors (CC)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condicions en els camps del model"
+
+#~ msgid "Server Action"
+#~ msgstr "Acció servidor"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -472,6 +519,18 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Nom del responsable"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el camp actiu es desmarca, permet ocultar la regla sense eliminar-la."
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condicions sobre temporització"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex sobre nom del recurs"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -482,6 +541,9 @@ msgstr ""
 #~ msgid "Email From"
 #~ msgstr "Email de"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Botó pressionat"
+
 #~ msgid "Email Body"
 #~ msgstr "Missatje del email"
 
@@ -506,6 +568,9 @@ msgstr ""
 #~ "contingut del qual, s'utilitzarà per al camp \"Per\" de la capçalera del "
 #~ "correu."
 
+#~ msgid "None"
+#~ msgstr "Sense"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Arguments invàlids"
 
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 597f6839b49..add7189be8e 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 22:29+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,47 +88,50 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
 msgstr ""
 
 #. module: base_action_rule
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "Timer"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Dato"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
+#: view:base.action.rule:0
+msgid "Filter Condition"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Måneder"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regel Navn"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "Måneder"
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr ""
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Måneder"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dage"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Regel Navn"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr ""
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Deadline"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Email From"
 #~ msgstr "E-mail fra"
 
@@ -326,6 +322,15 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Svar til"
 
+#~ msgid "Deadline"
+#~ msgstr "Deadline"
+
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
 #~ msgid "Object"
 #~ msgstr "Objekt"
 
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 65d5d6658e8..e2b07467c70 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 20:29+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,23 +14,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "Setze Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
-"Diese Regel benutzt den AND Operator. Das Datenmodell sollte alle nicht "
-"leeren Felder zuweisen, so daß dieses Regel die Aktion auslöst, die auf dem "
-"'Aktion' Tabulator hinterlegt wurde."
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -38,83 +36,103 @@ msgid "Action Rules"
 msgstr "Regeln zur Auslösung v. Aktionen"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Verantwortlicher"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Hinweis"
-
-#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Partner Kategorie"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
-"Auszuführende Serveraktionen (z.B. Email Reminder, Call Object Methode "
-"etc.... )"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
 msgstr "Zeitspanne nach Auslösetermin"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Durch Deaktivierung des Feldes 'Aktiv' kann die einmal definierte Regel "
-"nicht mehr angezeigt werden und muss somit nicht zwingend gelöscht werden."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Bedingungen"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "Status"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regel für Aktion"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Zu ändernde Felder"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Button Bestätigt"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
-msgstr "Bedingungen des Status"
+msgid "The filter must therefore be available in this page."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Datum letzte Aktion"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -122,39 +140,15 @@ msgid "Hours"
 msgstr "Stunden"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Definiere Status"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
-"Definieren Sie Server Actions:\n"
-"(z.B. Email Erinnerungen, CallObject Service)"
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"In das Feld Zeitspanne nach Auslösetermin, kann auch ein negativer Wert "
-"eingetragen werden. Sinnvoll kann dieses zum Beispiel zur Erinnerung im "
-"Vorfeld eines bestimmten Meetings eingesetzt werden."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -162,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Zeitspanne nach Auslösedatum"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Definiere Verantwortlichen"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Keine"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Monate"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Bezeichnung Regel"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -182,55 +188,45 @@ msgstr "Monate"
 msgid "Automated Actions"
 msgstr "Automatische Aktion"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr "verbundenes Datenmodell"
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Reihenfolge für die Anzeige der Regeln"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Bedingungen zu Datenfeldern"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Server Aktion"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Monate"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Tage"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Typ Zeitverzug"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktiv"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "RegEx für Ress. Bez."
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "Letztes Änderungsdatum"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -248,38 +244,21 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr "verbundenes Datenmodell"
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
-"Suchausdruck zur Suche nach passenden Bezeichnungen der \n"
-"entsprechenden Ressource. Zum Beispiel 'urgent.*' sucht alle Daten, die mit "
-"dem Textstring 'urgent' beginnen. \n"
-"Hinweis: Die Suche erfolgt aus dem jeweiligen Kontext."
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Bedingungen Terminierung"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Bezeichnung Regel"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Bedingungen Partner Daten"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -314,36 +293,37 @@ msgstr ""
 "Erinnerung aus.\n"
 "            "
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Datum Erstellung"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Datum Erstellung"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Frist"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Auslösetermin"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr "Server-Aktion"
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
@@ -353,17 +333,26 @@ msgstr "Server-Aktion"
 #~ msgid "Remind Partner"
 #~ msgstr "Erinnerung an Partner"
 
+#~ msgid "Partner Category"
+#~ msgstr "Partner Kategorie"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
 #~ "Aktiviere Feld, wenn diese Regel eine EMail an den Benutzer senden soll."
 
+#~ msgid "Button Pressed"
+#~ msgstr "Button Bestätigt"
+
 #~ msgid "Object"
 #~ msgstr "Objekt"
 
 #~ msgid "Mail to these Emails"
 #~ msgstr "Sende an Emailempfänger"
 
+#~ msgid "Set State to"
+#~ msgstr "Definiere Status"
+
 #~ msgid "Email Body"
 #~ msgstr "EMail Haupttext"
 
@@ -389,6 +378,12 @@ msgstr "Server-Aktion"
 #~ msgid "Email Reminders"
 #~ msgstr "EMail Erinnerung"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Bedingungen Partner Daten"
+
+#~ msgid "Deadline"
+#~ msgstr "Frist"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Objekt Subjekt"
 
@@ -401,6 +396,12 @@ msgstr "Server-Aktion"
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Email Adressen der Empfänger"
 
+#~ msgid "Creation Date"
+#~ msgstr "Datum Erstellung"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Datum letzte Aktion"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = Objekt ID"
 
@@ -410,6 +411,12 @@ msgstr "Server-Aktion"
 #~ msgid "Invalid arguments"
 #~ msgstr "Fehlerhafte Bedingungen"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Definiere Verantwortlichen"
+
+#~ msgid "None"
+#~ msgstr "Keine"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Telefon Verantwortl."
 
@@ -434,6 +441,18 @@ msgstr "Server-Aktion"
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Partner Bezeichnung"
 
+#~ msgid "Note"
+#~ msgstr "Hinweis"
+
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "In das Feld Zeitspanne nach Auslösetermin, kann auch ein negativer Wert "
+#~ "eingetragen werden. Sinnvoll kann dieses zum Beispiel zur Erinnerung im "
+#~ "Vorfeld eines bestimmten Meetings eingesetzt werden."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "EMail Daten fehlen bei den Adressdaten Ihrer Firma!"
@@ -446,6 +465,12 @@ msgstr "Server-Aktion"
 #~ "Dieses Modul ermöglicht die Definition von Regeln für bestimmte Aktionen von "
 #~ "beliebigen Objekten"
 
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -490,6 +515,12 @@ msgstr "Server-Aktion"
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Hinzufügen Kopieempf. (CC)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Bedingungen zu Datenfeldern"
+
+#~ msgid "Server Action"
+#~ msgstr "Server Aktion"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -497,6 +528,16 @@ msgstr "Server-Aktion"
 #~ "Aktiviere diese Option, um alle angehängten Dokumente als Anhang zur "
 #~ "Erinnerungsemail mitzuversenden."
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Bedingungen Terminierung"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Durch Deaktivierung des Feldes 'Aktiv' kann die einmal definierte Regel "
+#~ "nicht mehr angezeigt werden und muss somit nicht zwingend gelöscht werden."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Name Verantwortlicher"
 
@@ -513,6 +554,17 @@ msgstr "Server-Aktion"
 #~ "Benutze Python Ausdruck zur Spezifizierung des richtigen Datenfeldes für das "
 #~ "'An' Feld im Emailkopf."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Suchausdruck zur Suche nach passenden Bezeichnungen der \n"
+#~ "entsprechenden Ressource. Zum Beispiel 'urgent.*' sucht alle Daten, die mit "
+#~ "dem Textstring 'urgent' beginnen. \n"
+#~ "Hinweis: Die Suche erfolgt aus dem jeweiligen Kontext."
+
 #~ msgid "Email To"
 #~ msgstr "Email an"
 
@@ -523,9 +575,15 @@ msgstr "Server-Aktion"
 #~ "Benutze Python Ausdruck zur Spezifizierung des richtigen Datenfeldes für das "
 #~ "'Von' Feld im Emailkopf."
 
+#~ msgid "Regex on Resource Name"
+#~ msgstr "RegEx für Ress. Bez."
+
 #~ msgid "Error: The mail is not well formated"
 #~ msgstr "Fehler: Email wurde nicht ausreichend konfiguriert"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
index 193afd25a9a..43947be2e42 100644
--- a/addons/base_action_rule/i18n/el.po
+++ b/addons/base_action_rule/i18n/el.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Υπεύθυνος"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Σημείωση"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Κατηγορία Συνεργάτη"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Καθυστέρηση μετά την ημερομηνίας εναύσματος"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Συνθήκες"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Κανόνας Ενέργειας"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Πεδία προς Αλλαγή"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Το Κουμπί Πατήθηκε"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Τελευταία Ημερομηνία Ενέργειας"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "Ώρες"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Θέσε την κατάσταση σε"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Ημερομηνία"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Ενεργό"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Καθυστέρηση Μετά την Ημερομηνία Εναύσματος"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Κανένας"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Μήνες"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Όνομα Κανόνα"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "Μήνες"
 msgid "Automated Actions"
 msgstr "Αυτοματοποιημένες ενέργειες"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Ενέργεια Διακομιστή"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Μήνες"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Ημέρες"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Τύπος καθυστέρησης"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Φίλτρο"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Ενεργό"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Λεπτά"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Όνομα Κανόνα"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Ακολουθία"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Ημερομηνία Δημιουργίας"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Προσθεσμία"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Ημερομηνία Εναύσματος"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Email From"
 #~ msgstr "Email Από"
 
@@ -327,12 +323,21 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Αποστολή σε αυτά τα Emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Θέσε την κατάσταση σε"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Το Κουμπί Πατήθηκε"
+
 #~ msgid "Object"
 #~ msgstr "Αντικείμενο"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Υπενθύμιση Συνεργάτη"
 
+#~ msgid "Partner Category"
+#~ msgstr "Κατηγορία Συνεργάτη"
+
 #~ msgid "Email Body"
 #~ msgstr "Σώμα Email"
 
@@ -343,18 +348,42 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Απάντηση-Σε"
 
+#~ msgid "Deadline"
+#~ msgstr "Προσθεσμία"
+
 #~ msgid "State"
 #~ msgstr "Κατάσταση"
 
+#~ msgid "Creation Date"
+#~ msgstr "Ημερομηνία Δημιουργίας"
+
+#~ msgid "None"
+#~ msgstr "Κανένας"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Μη έγκυρες παράμετροι"
 
+#~ msgid "Note"
+#~ msgstr "Σημείωση"
+
+#~ msgid "Filter"
+#~ msgstr "Φίλτρο"
+
+#~ msgid "Date"
+#~ msgstr "Ημερομηνία"
+
 #~ msgid "Error: The mail is not well formated"
 #~ msgstr "Σφάλμα:Το email δεν είναι σωστά διαμορφωμένο"
 
 #~ msgid "Mail body"
 #~ msgstr "Σώμα Mail"
 
+#~ msgid "Server Action"
+#~ msgstr "Ενέργεια Διακομιστή"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Τελευταία Ημερομηνία Ενέργειας"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = Object ID"
 
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index e9225670cb5..c9f7b1689f3 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -7,30 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 12:47+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "Establecer seguidores"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
-"Las reglas usan el operador lógico AND. El modelo debe coincidir todos los "
-"campos no vacíos para que la regla ejecuta la acción configurada en la "
-"pestaña 'Acciones'."
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -38,82 +36,103 @@ msgid "Action Rules"
 msgstr "Reglas acción"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "Acciones del servidor"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoría empresa"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
-"Acciones del servidor a ser lanzadas (por ejemplo, enviar correos de "
-"recordatorio, llamar método de objetos, etc...)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
 msgstr "Retraso después fecha de disparo"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condiciones"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "Estado"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regla acción"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campos a cambiar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botón pulsado"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
-msgstr "Condiciones sobre el estado"
+msgid "The filter must therefore be available in this page."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Fecha última acción"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -121,39 +140,15 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Fijar estado a"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
-"Definir acciones de servidor.\n"
-"Por ejemplo: correos de recordatorio, llamar a servicios de objeto, etc..."
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Retraso después fecha de disparo. Puede poner un número negativo si necesita "
-"un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
-"minutos antes de una reunión."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Fecha"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -161,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Retraso después fecha de disparo"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Fijar responsable a"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ninguno"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meses"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre regla"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -181,55 +188,45 @@ msgstr "Meses"
 msgid "Automated Actions"
 msgstr "Acciones automatizadas"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr "Modelo de documento relacionado"
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Indica el orden de secuencia cuando se muestra una lista de reglas."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condiciones en campos de modelo"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Acción servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Días"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo retraso"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtro"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Activo"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex sobre nombre recurso"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "Fecha de última modificación"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -247,38 +244,21 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr "Modelo de documento relacionado"
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
-"Expresión regular para concordar con el nombre del recurso.\n"
-"Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
-"texto 'urgente'\n"
-"Nota: Esta búsqueda distingue mayúsculas de minúsculas."
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condiciones en tiempo"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nombre regla"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condiciones en el modelo empresa"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -311,36 +291,37 @@ msgstr ""
 "</p>\n"
 "            "
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Fecha creación"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Fecha activación"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr "Acciones de servidor"
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
@@ -350,6 +331,12 @@ msgstr "Acciones de servidor"
 #~ msgid "Mail to these Emails"
 #~ msgstr "Enviar correo a estos emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Fijar estado a"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Botón pulsado"
+
 #~ msgid "Object"
 #~ msgstr "Objeto"
 
@@ -362,6 +349,9 @@ msgstr "Acciones de servidor"
 #~ msgid "Remind Partner"
 #~ msgstr "Recordar empresa"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoría empresa"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -376,12 +366,18 @@ msgstr "Acciones de servidor"
 #~ msgid "Reply-To"
 #~ msgstr "Responder a"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condiciones en el modelo empresa"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
 #~ "Seleccione esta opción si desea que la regla envíe un recordatorio por "
 #~ "correo electrónico a la empresa."
 
+#~ msgid "Deadline"
+#~ msgstr "Fecha límite"
+
 #~ msgid "Email Body"
 #~ msgstr "Mensaje email"
 
@@ -393,6 +389,12 @@ msgstr "Acciones de servidor"
 #~ "ID del email de las personas a quienes el correo electrónico debe ser "
 #~ "enviado."
 
+#~ msgid "Creation Date"
+#~ msgstr "Fecha creación"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Fecha última acción"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
@@ -402,6 +404,12 @@ msgstr "Acciones de servidor"
 #~ msgid "Email Reminders"
 #~ msgstr "Recordatorios email"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Fijar responsable a"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Teléfono responsable"
 
@@ -439,6 +447,9 @@ msgstr "Acciones de servidor"
 #~ "Marque esta opción si desea que la regla use CC (envíe correo a otras "
 #~ "personas definidas en las acciones)."
 
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nombre empresa"
 
@@ -452,6 +463,9 @@ msgstr "Acciones de servidor"
 #~ "Utilice una expresión Python para especificar el campo apropiado cuyo "
 #~ "contenido se utilizará para el campo \"Para\" de la cabecera del correo."
 
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Recordar responsable"
 
@@ -464,6 +478,15 @@ msgstr "Acciones de servidor"
 #~ msgstr ""
 #~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Retraso después fecha de disparo. Puede poner un número negativo si necesita "
+#~ "un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
+#~ "minutos antes de una reunión."
+
 #~ msgid "Email Information"
 #~ msgstr "Información email"
 
@@ -481,6 +504,12 @@ msgstr "Acciones de servidor"
 #~ "Por ejemplo: Sobre que objeto que acción debe ejecutarse en base a que "
 #~ "condición."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
 #~ msgid "Content of mail"
 #~ msgstr "Contenido del correo."
 
@@ -499,12 +528,41 @@ msgstr "Acciones de servidor"
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Añadir observadores (CC)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condiciones en campos de modelo"
+
+#~ msgid "Server Action"
+#~ msgstr "Acción servidor"
+
 #~ msgid "Conditions on States"
 #~ msgstr "Condiciones en estados"
 
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Nombre responsable"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
+
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expresión regular para concordar con el nombre del recurso.\n"
+#~ "Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
+#~ "texto 'urgente'\n"
+#~ "Nota: Esta búsqueda distingue mayúsculas de minúsculas."
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condiciones en tiempo"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex sobre nombre recurso"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
diff --git a/addons/base_action_rule/i18n/es_CR.po b/addons/base_action_rule/i18n/es_CR.po
index 4a8a00594b2..77deb4822b0 100644
--- a/addons/base_action_rule/i18n/es_CR.po
+++ b/addons/base_action_rule/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:03+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,20 +15,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -37,30 +38,51 @@ msgid "Action Rules"
 msgstr "Reglas acción"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoría empresa"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -68,49 +90,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Retraso después fecha de disparo"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condiciones"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regla acción"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campos a cambiar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botón pulsado"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Fecha última acción"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -118,37 +142,15 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Fijar estado a"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Retraso después fecha de disparo. Puede poner un número negativo si necesita "
-"un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
-"minutos antes de una reunión."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Fecha"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -156,19 +158,31 @@ msgid "Delay After Trigger Date"
 msgstr "Retraso después fecha de disparo"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Fijar responsable a"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ninguno"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meses"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre regla"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -176,54 +190,44 @@ msgstr "Meses"
 msgid "Automated Actions"
 msgstr "Acciones automatizadas"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Indica el orden de secuencia cuando se muestra una lista de reglas."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condiciones en campos de modelo"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Acción servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Días"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo retraso"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtro"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Activo"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex sobre nombre recurso"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -242,38 +246,21 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Expresión regular para concordar con el nombre del recurso.\n"
-"Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
-"texto 'urgente'\n"
-"Nota: Esta búsqueda distingue mayúsculas de minúsculas."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condiciones en tiempo"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nombre regla"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condiciones en el modelo empresa"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -296,36 +283,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Fecha creación"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Fecha activación"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
@@ -335,15 +323,24 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Recordar empresa"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoría empresa"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Enviar correo a observadores (CC)"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Botón pulsado"
+
 #~ msgid "Object"
 #~ msgstr "Objeto"
 
 #~ msgid "Mail to these Emails"
 #~ msgstr "Enviar correo a estos emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Fijar estado a"
+
 #~ msgid "Email From"
 #~ msgstr "Email de"
 
@@ -370,6 +367,12 @@ msgstr ""
 #~ "Seleccione esta opción si desea que la regla envíe un recordatorio por "
 #~ "correo electrónico a la empresa."
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condiciones en el modelo empresa"
+
+#~ msgid "Deadline"
+#~ msgstr "Fecha límite"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Asunto objeto"
 
@@ -399,6 +402,12 @@ msgstr ""
 #~ "ID del email de las personas a quienes el correo electrónico debe ser "
 #~ "enviado."
 
+#~ msgid "Creation Date"
+#~ msgstr "Fecha creación"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Fecha última acción"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = ID objeto"
 
@@ -408,6 +417,12 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumentos no válidos"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Fijar responsable a"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -426,6 +441,17 @@ msgstr ""
 #~ "campos no-vacíos para que la regla ejecute la acción descrita en la pestaña "
 #~ "\"Acciones\"."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expresión regular para concordar con el nombre del recurso.\n"
+#~ "Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
+#~ "texto 'urgente'\n"
+#~ "Nota: Esta búsqueda distingue mayúsculas de minúsculas."
+
 #~ msgid "Call Object Method"
 #~ msgstr "Llamar método objeto"
 
@@ -442,6 +468,9 @@ msgstr ""
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nombre empresa"
 
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'From' field of the header"
@@ -449,6 +478,15 @@ msgstr ""
 #~ "Utilice una expresión Python para especificar el campo apropiado cuyo "
 #~ "contenido se utilizará para el campo \"Desde\" de la cabecera del correo."
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Retraso después fecha de disparo. Puede poner un número negativo si necesita "
+#~ "un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
+#~ "minutos antes de una reunión."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr ""
@@ -457,6 +495,12 @@ msgstr ""
 #~ msgid "Remind Responsible"
 #~ msgstr "Recordar responsable"
 
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -465,6 +509,9 @@ msgstr ""
 #~ "Por ejemplo: Sobre que objeto que acción debe ejecutarse en base a que "
 #~ "condición."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Descripción objeto"
 
@@ -507,6 +554,15 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Añadir observadores (CC)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condiciones en campos de modelo"
+
+#~ msgid "Server Action"
+#~ msgstr "Acción servidor"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex sobre nombre recurso"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -514,6 +570,15 @@ msgstr ""
 #~ "Marque esta opción si desea que todos los documentos adjuntos al objeto sean "
 #~ "adjuntados al correo de recordatorio enviado."
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condiciones en tiempo"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Nombre responsable"
 
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po
index 65f12799534..1f380e477f1 100644
--- a/addons/base_action_rule/i18n/es_EC.po
+++ b/addons/base_action_rule/i18n/es_EC.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-28 14:14+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,47 +88,50 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botón presionado"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
 msgstr ""
 
 #. module: base_action_rule
@@ -115,33 +140,14 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Fijar estado a"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
 msgstr ""
 
 #. module: base_action_rule
@@ -150,44 +156,46 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
+#: view:base.action.rule:0
+msgid "Filter Condition"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
 #: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
 msgstr ""
 
 #. module: base_action_rule
@@ -195,29 +203,29 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nombre de regla"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condiciones en el modelo empresa"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,39 +281,43 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr ""
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Email From"
 #~ msgstr "Correo desde"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Botón presionado"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Asunto objeto"
 
@@ -337,6 +336,12 @@ msgstr ""
 #~ "oportunidad que todaviía esté pendiente tras 14 días puede lanzar un e-mail "
 #~ "recordatorio automáticamente."
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condiciones en el modelo empresa"
+
+#~ msgid "Set State to"
+#~ msgstr "Fijar estado a"
+
 #~ msgid "Remind Partner"
 #~ msgstr "Recordar empresa"
 
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_action_rule/i18n/es_PY.po
index 794db3f5358..07f0e79e0d4 100644
--- a/addons/base_action_rule/i18n/es_PY.po
+++ b/addons/base_action_rule/i18n/es_PY.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-08 00:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Reglas de acciones"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoría de socio"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,49 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Retraso después fecha de disparo"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condiciones"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regla acción"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campos a cambiar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botón pulsado"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Fecha última acción"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -116,37 +140,15 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Fijar estado a"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Retraso después fecha de disparo. Puede poner un número negativo si necesita "
-"un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
-"minutos antes de una reunión."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Fecha"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -154,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Retraso después fecha de disparo"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Fijar responsable a"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ninguno"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meses"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre de la regla"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -174,54 +188,44 @@ msgstr "Meses"
 msgid "Automated Actions"
 msgstr "Acciones automatizadas"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Indica el orden de secuencia cuando se muestra una lista de reglas."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condiciones en campos de modelo"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Acción servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Días"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo retraso"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtro"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Activo"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex sobre nombre recurso"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -240,38 +244,21 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Expresión regular para concordar con el nombre del recurso.\n"
-"Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
-"texto 'urgente'\n"
-"Nota: Esta búsqueda distingue mayúsculas de minúsculas."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condiciones en tiempo"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nombre de la regla"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condiciones en el modelo empresa"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Socio"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Fecha activación"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Enviar correo a observadores (CC)"
 
@@ -339,12 +327,21 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Enviar correo a estos emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Fijar estado a"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Botón pulsado"
+
 #~ msgid "Object"
 #~ msgstr "Objeto"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Recordar socio"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoría de socio"
+
 #~ msgid "Email Body"
 #~ msgstr "Mensaje email"
 
@@ -362,12 +359,18 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Responder a"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condiciones en el modelo empresa"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
 #~ "Seleccione esta opción si desea que la regla envíe un recordatorio por "
 #~ "correo electrónico a la empresa."
 
+#~ msgid "Deadline"
+#~ msgstr "Fecha límite"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Asunto objeto"
 
@@ -382,6 +385,9 @@ msgstr ""
 #~ "ID del email de las personas a quienes el correo electrónico debe ser "
 #~ "enviado."
 
+#~ msgid "Creation Date"
+#~ msgstr "Fecha creación"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
@@ -397,6 +403,9 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Recordatorios email"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Fecha última acción"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -404,6 +413,9 @@ msgstr ""
 #~ "Utilice una expresión Python para especificar el campo apropiado cuyo "
 #~ "contenido se utilizará para el campo \"Para\" de la cabecera del correo."
 
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Teléfono responsable"
 
@@ -416,6 +428,9 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumentos no válidos"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Fijar responsable a"
+
 #~ msgid "Email To"
 #~ msgstr "Para"
 
@@ -426,6 +441,20 @@ msgstr ""
 #~ "Utilice una expresión Python para especificar el campo apropiado cuyo "
 #~ "contenido se utilizará para el campo \"Desde\" de la cabecera del correo."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expresión regular para concordar con el nombre del recurso.\n"
+#~ "Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
+#~ "texto 'urgente'\n"
+#~ "Nota: Esta búsqueda distingue mayúsculas de minúsculas."
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nombre empresa"
 
@@ -439,6 +468,12 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Llamar método objeto"
 
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Recordar responsable"
 
@@ -451,6 +486,15 @@ msgstr ""
 #~ msgstr ""
 #~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Retraso después fecha de disparo. Puede poner un número negativo si necesita "
+#~ "un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
+#~ "minutos antes de una reunión."
+
 #~ msgid "%(partner_email)s = Partner Email"
 #~ msgstr "%(partner_email)s = Email empresa"
 
@@ -474,6 +518,9 @@ msgstr ""
 #~ "Por ejemplo: Sobre que objeto que acción debe ejecutarse en base a que "
 #~ "condición."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "Email Information"
 #~ msgstr "Información email"
 
@@ -495,6 +542,12 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Añadir observadores (CC)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condiciones en campos de modelo"
+
+#~ msgid "Server Action"
+#~ msgstr "Acción servidor"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -507,6 +560,18 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Nombre responsable"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condiciones en tiempo"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex sobre nombre recurso"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_action_rule/i18n/fa.po
index b9ebf479cb8..88b038abb94 100644
--- a/addons/base_action_rule/i18n/fa.po
+++ b/addons/base_action_rule/i18n/fa.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-18 19:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,47 +88,50 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
 msgstr ""
 
 #. module: base_action_rule
@@ -115,33 +140,14 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
 msgstr ""
 
 #. module: base_action_rule
@@ -150,18 +156,30 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
+#: view:base.action.rule:0
+msgid "Filter Condition"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
 msgstr ""
 
 #. module: base_action_rule
@@ -170,24 +188,14 @@ msgstr ""
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
 msgstr ""
 
 #. module: base_action_rule
@@ -195,29 +203,29 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,22 +244,14 @@ msgid "Minutes"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
-msgstr ""
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
 #. module: base_action_rule
@@ -259,11 +259,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,32 +281,33 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr ""
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_action_rule/i18n/fi.po
index cce8e5f575e..3bf3faa9699 100644
--- a/addons/base_action_rule/i18n/fi.po
+++ b/addons/base_action_rule/i18n/fi.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Toimintosäännöt"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Vastuuhenkilö"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Huomautus"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Kumppanin katerogia"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Viive ajastetun päivämäärän jälkeen"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Jos aktiivisen kentän tilaksi asetetaan epätosi (false), se mahdollistaa "
-"säännön piilottamisen poistamatta sitä."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Ehdot"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Toimintosääntö"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Muutettavat kentät"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Painiketta painettu"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Viimeisen toiminnon päivämäärä"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,34 +140,15 @@ msgid "Hours"
 msgstr "Tunnit"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Aseta tilaksi"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Päiväys"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktiivinen"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -152,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Viive liipaisupäivän jälkeen"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Aseta vastuuhenkilöksi"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ei mitään"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Kuukaudet"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Säännön nimi"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -172,54 +188,44 @@ msgstr "Kuukaudet"
 msgid "Automated Actions"
 msgstr "Automatisoidut Toiminnot"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Antaa järjestyksen sääntölistaa näytettäessä."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Palvelintoiminto"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Kuukaudet"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Päivät"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Viivästyksen tyyppi"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Suodin"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktiivinen"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -238,34 +244,21 @@ msgid "Minutes"
 msgstr "Minuutit"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Ajastuksen tilat"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Säännön nimi"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvenssi"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Mallikumppanin ehdot"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -288,36 +281,40 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Luontipäivämäärä"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Luontipäivä"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Määräaika"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Kumppani"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Liipaisupäivämäärä"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Button Pressed"
+#~ msgstr "Painiketta painettu"
+
 #~ msgid "Remind Partner"
 #~ msgstr "Muistuta Kumppania"
 
@@ -331,6 +328,15 @@ msgstr ""
 #~ "Valitse tämä, jos haluat, että kumppanille lähetetään muistutus "
 #~ "sähköpostilla."
 
+#~ msgid "Deadline"
+#~ msgstr "Määräaika"
+
+#~ msgid "Creation Date"
+#~ msgstr "Luontipäivämäärä"
+
+#~ msgid "Note"
+#~ msgstr "Huomautus"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -351,12 +357,18 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Lähetä sähköpostia näihin osoitteisiin"
 
+#~ msgid "Set State to"
+#~ msgstr "Aseta tilaksi"
+
 #~ msgid "Object"
 #~ msgstr "Objekti"
 
 #~ msgid "Email Body"
 #~ msgstr "Sähköpostin runko"
 
+#~ msgid "Partner Category"
+#~ msgstr "Kumppanin katerogia"
+
 #~ msgid "State"
 #~ msgstr "Tila"
 
@@ -388,6 +400,18 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Sähköposti muistuttimiet"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Mallikumppanin ehdot"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Viimeisen toiminnon päivämäärä"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Aseta vastuuhenkilöksi"
+
+#~ msgid "None"
+#~ msgstr "Ei mitään"
+
 #~ msgid "Remind with Attachment"
 #~ msgstr "Muistuta liitteen kanssa"
 
@@ -418,6 +442,12 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Kutsu objektia"
 
+#~ msgid "Filter"
+#~ msgstr "Suodin"
+
+#~ msgid "Date"
+#~ msgstr "Päiväys"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Muistuta vastuuhenkilöä"
 
@@ -444,9 +474,19 @@ msgstr ""
 #~ msgid "Mail body"
 #~ msgstr "Viestirunko"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Ajastuksen tilat"
+
 #~ msgid "Conditions on States"
 #~ msgstr "Tilojen asemat"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Jos aktiivisen kentän tilaksi asetetaan epätosi (false), se mahdollistaa "
+#~ "säännön piilottamisen poistamatta sitä."
+
 #~ msgid "Server Action to be Triggered"
 #~ msgstr "Liipaistava palvelintoiminto"
 
@@ -455,3 +495,6 @@ msgstr ""
 
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Lisää seuraajia (Cc)"
+
+#~ msgid "Server Action"
+#~ msgstr "Palvelintoiminto"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 56acc074640..c8924bfd803 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,19 +14,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Règles d'action"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Remarque"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Catégorie de partenaire"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Délai après la date de déclenchement"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Si ce champ est à \"Faux\", cela vous permet de cacher la règle sans la "
-"supprimer."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Conditions"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Règle d'action"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Champs à modifier"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Bouton pressé"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Date de la dernière action"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Heures"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Changer l'état en"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Délai après la date de déclenchement. Ce nombre peut être négatif si vous "
-"avez besoin d'un délai avant la date de déclenchement,  par exemple envoyer "
-"un rappel 15 minutes avant une réunion."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Date"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Actif"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Délai après la date de déclenchement"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Attribuer la responsabilité à"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Aucun(e)"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Mois"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nom de la règle"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,11 +188,6 @@ msgstr "Mois"
 msgid "Automated Actions"
 msgstr "Actions automatisées"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
@@ -187,43 +195,38 @@ msgstr ""
 "Donne l'ordre de la séquence lors de l'affichage d'une liste de règles."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Conditions sur les champs du Modèle"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Action du serveur"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mois"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Jours"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Type de délai"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtrer"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Actif"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Expression régulière sur le nom de la ressource"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -242,38 +245,21 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Expression régulière pour identifier le nom de la ressource\n"
-"Par exemple : \"urgent.*\" va chercher des enregistrements dont le nom "
-"commence par la chaine de caractères \"urgent\"\n"
-"Remarque : cette recherche tient compte de la casse."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Conditions sur le temps d'exécution"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nom de la règle"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Conditions sur le partenaire du modèle"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -296,36 +282,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Date de création"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Date de création"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Echéance"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Date de déclenchement"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Object"
 #~ msgstr "Objet"
 
@@ -338,6 +325,9 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Envoyer un rappel au partenaire"
 
+#~ msgid "Partner Category"
+#~ msgstr "Catégorie de partenaire"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Erreur !"
@@ -345,9 +335,21 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Répondre à"
 
+#~ msgid "Deadline"
+#~ msgstr "Echéance"
+
+#~ msgid "Creation Date"
+#~ msgstr "Date de création"
+
+#~ msgid "Note"
+#~ msgstr "Remarque"
+
 #~ msgid "Call Object Method"
 #~ msgstr "Appel de la Méthode Objet"
 
+#~ msgid "Filter"
+#~ msgstr "Filtrer"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Envoyer un rappel au Responsable"
 
@@ -356,18 +358,48 @@ msgstr ""
 #~ "Ce module permet de mettre en place des régles d'action pour n'importe quel "
 #~ "objet."
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Délai après la date de déclenchement. Ce nombre peut être négatif si vous "
+#~ "avez besoin d'un délai avant la date de déclenchement,  par exemple envoyer "
+#~ "un rappel 15 minutes avant une réunion."
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Conditions sur les champs du Modèle"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Expression régulière sur le nom de la ressource"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
 #~ "Cochez cette case si vous voulez que cette règle déclenche l'envoi d'un "
 #~ "courriel au responsable."
 
+#~ msgid "Set State to"
+#~ msgstr "Changer l'état en"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Bouton pressé"
+
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Conditions sur le partenaire du modèle"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Mots-clés spéciaux à utiliser dans le corps du texte"
 
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Identité courriel de la personne à qui le message va être envoyé"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Date de la dernière action"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -375,6 +407,23 @@ msgstr ""
 #~ "Utilisez une expression Python pour définir le champ qui sera utilisé en "
 #~ "tant que destinataire (champ \"À\" de l'entête)"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expression régulière pour identifier le nom de la ressource\n"
+#~ "Par exemple : \"urgent.*\" va chercher des enregistrements dont le nom "
+#~ "commence par la chaine de caractères \"urgent\"\n"
+#~ "Remarque : cette recherche tient compte de la casse."
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Attribuer la responsabilité à"
+
+#~ msgid "None"
+#~ msgstr "Aucun(e)"
+
 #~ msgid "Remind with Attachment"
 #~ msgstr "Envoyer un rappel avec pièce jointe"
 
@@ -415,6 +464,9 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Responsible name"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Conditions sur le temps d'exécution"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -451,6 +503,9 @@ msgstr ""
 #~ msgid "Email Information"
 #~ msgstr "Information de courriel"
 
+#~ msgid "Server Action"
+#~ msgstr "Action du serveur"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -472,6 +527,13 @@ msgstr ""
 #~ msgid "Conditions on States"
 #~ msgstr "Conditions sur les états"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si ce champ est à \"Faux\", cela vous permet de cacher la règle sans la "
+#~ "supprimer."
+
 #~ msgid "Email To"
 #~ msgstr "Envoyer un courriel à"
 
@@ -482,6 +544,9 @@ msgstr ""
 #~ "Cochez cette case si vous voulez que la règle envoie un courriel en copie à "
 #~ "toutes les autres personnes définies dans Actions."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "%(object_date)s = Creation date"
 #~ msgstr "%(object_date)s = Date de création"
 
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_action_rule/i18n/gl.po
index 1edf087483b..63a41e9152a 100644
--- a/addons/base_action_rule/i18n/gl.po
+++ b/addons/base_action_rule/i18n/gl.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:32+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Regras das accións"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoría Empresa"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,49 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Atraso despois da data do disparo"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Se se desmarca o campo activo, permite ocultar a regra sen eliminala."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condicións"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regra acción"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campos a cambiar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botón premido"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data da última acción"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -116,37 +140,15 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Establecer estado a"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Atraso despois da data de disparo. Pode poñer un número negativo se necesita "
-"un atraso antes da data de disparo, como enviar un recordatorio 15 minutos "
-"antes dunha reunión."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -154,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Atraso despois da data de disparo"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Fixar responsable a"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ningún"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meses"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nome da regra"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -174,54 +188,44 @@ msgstr "Meses"
 msgid "Automated Actions"
 msgstr "Accións automáticas"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Indica a orde da secuencia cando se amosa unha lista de regras."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condicións en campos de modelo"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Acción do servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Días"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo de atraso"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtro"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Activo"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex sobre nome recurso"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -240,37 +244,21 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Expresión regular para concordar co nome do recurso. Por exemplo: "
-"\"urxente.*\" buscará os rexistros cuxo nome comece co texto \"urxente\". "
-"Nota: Esta busca distingue maiúsculas de minúsculas."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condicións sobre temporización"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nome da regra"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condicións no modelo empresa"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -293,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data de creación"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Crear data"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Data límite"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Socio"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Data de activación"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Enviar correo ós observadores (CC)"
 
@@ -338,12 +327,21 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Enviar correo a estes emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Establecer estado a"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Botón premido"
+
 #~ msgid "Object"
 #~ msgstr "Obxecto"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Recordar empresa"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoría Empresa"
+
 #~ msgid "Email Body"
 #~ msgstr "Corpo do email"
 
@@ -361,12 +359,18 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Responder a"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condicións no modelo empresa"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
 #~ "Prema esta opción se desexa que a regra envíe un recordatorio por correo "
 #~ "electrónico á empresa."
 
+#~ msgid "Deadline"
+#~ msgstr "Data límite"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Asunto obxecto"
 
@@ -376,6 +380,9 @@ msgstr ""
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palabras chave especiais para ser empregadas no corpo da mensaxe"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data de creación"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
@@ -394,6 +401,9 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Recordatorios email"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Data da última acción"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -401,6 +411,12 @@ msgstr ""
 #~ "Utilice unha expresión Python para especificar o campo apropiado, o contido "
 #~ "do cal utilizarase para o campo \"Para\" da cabeceira do correo."
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Fixar responsable a"
+
+#~ msgid "None"
+#~ msgstr "Ningún"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = ID obxecto"
 
@@ -416,6 +432,16 @@ msgstr ""
 #~ msgid "Email To"
 #~ msgstr "Para"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expresión regular para concordar co nome do recurso. Por exemplo: "
+#~ "\"urxente.*\" buscará os rexistros cuxo nome comece co texto \"urxente\". "
+#~ "Nota: Esta busca distingue maiúsculas de minúsculas."
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -431,6 +457,9 @@ msgstr ""
 #~ "Utilice unha expresión Python para especificar o campo apropiado, o contido "
 #~ "do cal se utilizará para o campo \"Desde\" da cabeceira do correo."
 
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nome da empresa"
 
@@ -444,6 +473,12 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Método chamada ó obxecto"
 
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Recordar responsable"
 
@@ -455,6 +490,15 @@ msgstr ""
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Non se atopou ningún ID de email para o enderezo da súa compañía!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Atraso despois da data de disparo. Pode poñer un número negativo se necesita "
+#~ "un atraso antes da data de disparo, como enviar un recordatorio 15 minutos "
+#~ "antes dunha reunión."
+
 #~ msgid "%(partner_email)s = Partner Email"
 #~ msgstr "%(partner_email)s = Email empresa"
 
@@ -480,6 +524,9 @@ msgstr ""
 #~ "Describe o nome da acción. Por exemplo: Sobre que obxecto, que acción debe "
 #~ "executarse, en base a que condición."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "Mail body"
 #~ msgstr "Corpo da mensaxe"
 
@@ -498,6 +545,12 @@ msgstr ""
 #~ msgid "Mail to Responsible"
 #~ msgstr "Enviar correo ó responsable"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condicións en campos de modelo"
+
+#~ msgid "Server Action"
+#~ msgstr "Acción do servidor"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -510,6 +563,18 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Nome do responsable"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se se desmarca o campo activo, permite ocultar a regra sen eliminala."
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condicións sobre temporización"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex sobre nome recurso"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
diff --git a/addons/base_action_rule/i18n/gu.po b/addons/base_action_rule/i18n/gu.po
index 028099dac49..e29c922af42 100644
--- a/addons/base_action_rule/i18n/gu.po
+++ b/addons/base_action_rule/i18n/gu.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-06 18:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "નોંધ"
-
-#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,47 +88,50 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "શરતો"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
 msgstr ""
 
 #. module: base_action_rule
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "કલાક"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "તારીખ"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "કાર્યશીલ"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,18 +156,30 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "કંઇ નહિં"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
 msgstr ""
 
 #. module: base_action_rule
@@ -170,24 +188,14 @@ msgstr ""
 msgid "Automated Actions"
 msgstr "સ્વયંચાલિતકાર્યો(એકશન્સ)"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
 msgstr ""
 
 #. module: base_action_rule
@@ -195,29 +203,29 @@ msgstr ""
 msgid "Days"
 msgstr "દિવસો"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "ફિલ્ટર"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "કાર્યશીલ"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,22 +244,14 @@ msgid "Minutes"
 msgstr "મિનીટો"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
-msgstr ""
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
 #. module: base_action_rule
@@ -259,11 +259,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "ક્રમ"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr ""
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Object"
 #~ msgstr "વસ્તુ"
 
@@ -325,5 +321,17 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "સ્થિતિ"
 
+#~ msgid "None"
+#~ msgstr "કંઇ નહિં"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "અયોગ્ય દલીલો"
+
+#~ msgid "Note"
+#~ msgstr "નોંધ"
+
+#~ msgid "Filter"
+#~ msgstr "ફિલ્ટર"
+
+#~ msgid "Date"
+#~ msgstr "તારીખ"
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_action_rule/i18n/hr.po
index 360fee4c7be..6dea9825e6f 100644
--- a/addons/base_action_rule/i18n/hr.po
+++ b/addons/base_action_rule/i18n/hr.po
@@ -6,26 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:00+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -34,30 +35,51 @@ msgid "Action Rules"
 msgstr "Action Rules"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Odgovoran"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Bilješka"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Kategorija partnera"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -65,50 +87,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Delay after trigger date"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Uvjeti"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "Status"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Action Rule"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Fields to Change"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Button Pressed"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Datum zadnje akcije"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -116,37 +139,15 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Set State to"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -154,19 +155,31 @@ msgid "Delay After Trigger Date"
 msgstr "Delay After Trigger Date"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ništa"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Months"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Naziv pravila"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -174,55 +187,45 @@ msgstr "Months"
 msgid "Automated Actions"
 msgstr "Automatske akcije"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Gives the sequence order when displaying a list of rules."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Conditions on Model Fields"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Serverske akcije"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Months"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Days"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Delay type"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex na naziv resursa"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "Datum zadnje promjene"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -240,38 +243,21 @@ msgid "Minutes"
 msgstr "Minute"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Conditions on Timing"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Naziv pravila"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Uvjeti na model Partner"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,36 +280,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Kreiraj datum"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Krajnji rok"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Datum okidača"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
@@ -332,15 +319,24 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Remind Partner"
 
+#~ msgid "Partner Category"
+#~ msgstr "Kategorija partnera"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Mail to Watchers (CC)"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Button Pressed"
+
 #~ msgid "Object"
 #~ msgstr "Object"
 
 #~ msgid "Mail to these Emails"
 #~ msgstr "Mail to these Emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Set State to"
+
 #~ msgid "Email From"
 #~ msgstr "E-mail od"
 
@@ -362,6 +358,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Uvjeti na model Partner"
+
+#~ msgid "Deadline"
+#~ msgstr "Krajnji rok"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Object subject"
 
@@ -388,6 +390,12 @@ msgstr ""
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Email-id of the persons whom mail is to be sent"
 
+#~ msgid "Creation Date"
+#~ msgstr "Datum kreiranja"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Datum zadnje akcije"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = Object ID"
 
@@ -397,6 +405,12 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Neispravni argumenti"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Set Responsible to"
+
+#~ msgid "None"
+#~ msgstr "Ništa"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -414,6 +428,17 @@ msgstr ""
 #~ "Pravilo koristi AND operator. Model se mora poklapati sa svim ne praznim "
 #~ "poljima, tako da pravilo izvrši akciju opisanoj u tabu 'Akcije'."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+
 #~ msgid "Call Object Method"
 #~ msgstr "Call Object Method"
 
@@ -430,6 +455,9 @@ msgstr ""
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Naziv partnera"
 
+#~ msgid "Note"
+#~ msgstr "Bilješka"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'From' field of the header"
@@ -437,9 +465,24 @@ msgstr ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'From' field of the header"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Remind Responsible"
 
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -447,6 +490,9 @@ msgstr ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Opis objekta"
 
@@ -488,6 +534,15 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Add Watchers (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Conditions on Model Fields"
+
+#~ msgid "Server Action"
+#~ msgstr "Serverske akcije"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex na naziv resursa"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -495,6 +550,16 @@ msgstr ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Conditions on Timing"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Odgovorna osoba"
 
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_action_rule/i18n/hu.po
index 0e8282051d6..5cc67a2bcb8 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.po
@@ -6,26 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -34,30 +35,51 @@ msgid "Action Rules"
 msgstr "Műveleti előírások"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Felelős"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Megjegyzés"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Partner kategória"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -65,50 +87,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Késedelem az indítás dátuma után"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Ha az aktív mező Hamisra van állítva, az lehetővé teszi Önnek az előírás "
-"elrejtését annak törlése nélkül."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Feltételek"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Műveleti előírások"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Mezők módosítása"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Gomb megnyomva"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Utolsó művelet dátuma"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -116,37 +139,15 @@ msgid "Hours"
 msgstr "Órák"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Állapot beállítása"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Késedelem az indítás dátuma után, előírja, hogy megadhat negatív számot. Ha "
-"Önnek szüksége van késedelemre az indítás dátuma előtt, kérheti emlékeztető "
-"küldését a találkozás előtt 15 perccel."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Dátum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "aktív"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -154,19 +155,31 @@ msgid "Delay After Trigger Date"
 msgstr "Késedelem az indítás dátuma után"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Felelős beállítása"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Nincs"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Hónapok"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Előírás neve"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -174,11 +187,6 @@ msgstr "Hónapok"
 msgid "Automated Actions"
 msgstr "Automatizált műveletek"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
@@ -186,43 +194,38 @@ msgstr ""
 "Adja meg a rendezési szempontot a szabályok listájának megjelenítésekor."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Feltételek a Modell Mezőknél"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Szerverművelet"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Hónapok"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Napok"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Késedelem típusa"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Szűrő"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "aktív"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Reguláris kifejezés az Erőforrás nevéhez"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,38 +244,21 @@ msgid "Minutes"
 msgstr "Percek"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Szabályos kifejezések az erőforrás nevének összehasonlításához\n"
-"pl.: 'sürgős.*' megkeresi azokat a rekordokat, amelyeknek a neve a 'sürgős' "
-"sztringgel kezdődik\n"
-"Megjegyzés: Ez kis- és nagybetűket megkülönböztető keresés."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Ütemezés feltételei"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Előírás neve"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sorrend"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Feltételek a Modell Partnernél"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -295,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Létrehozás dátuma"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Dátum létrehozása"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Határidő"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Indítás dátuma"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
@@ -334,9 +321,18 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Partner emlékeztetése"
 
+#~ msgid "Partner Category"
+#~ msgstr "Partner kategória"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Gomb megnyomva"
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Levelek küldése"
 
+#~ msgid "Set State to"
+#~ msgstr "Állapot beállítása"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Hiba!"
@@ -351,18 +347,36 @@ msgstr ""
 #~ "Ezek az emberek kapni fognak a parner és a felhasználók közötti jövőbeni "
 #~ "kommunikációról egy másolatot emailben"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Feltételek a Modell Partnernél"
+
+#~ msgid "Deadline"
+#~ msgstr "Határidő"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Objektum tárgy"
 
 #~ msgid "State"
 #~ msgstr "Állam"
 
+#~ msgid "Creation Date"
+#~ msgstr "Létrehozás dátuma"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Utolsó művelet dátuma"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = Objektum ID"
 
 #~ msgid "Invalid arguments"
 #~ msgstr "Érvénytelen argumentumok"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Felelős beállítása"
+
+#~ msgid "None"
+#~ msgstr "Nincs"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -381,15 +395,35 @@ msgstr ""
 #~ "üres mezővel azért, hogy a szabály végrehajtsa a 'Műveletek' fülön leírt "
 #~ "műveletet."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Szabályos kifejezések az erőforrás nevének összehasonlításához\n"
+#~ "pl.: 'sürgős.*' megkeresi azokat a rekordokat, amelyeknek a neve a 'sürgős' "
+#~ "sztringgel kezdődik\n"
+#~ "Megjegyzés: Ez kis- és nagybetűket megkülönböztető keresés."
+
 #~ msgid "Call Object Method"
 #~ msgstr "Objektum behívási mód"
 
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Partner neve"
 
+#~ msgid "Note"
+#~ msgstr "Megjegyzés"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Felelős emlékeztetése"
 
+#~ msgid "Filter"
+#~ msgstr "Szűrő"
+
+#~ msgid "Date"
+#~ msgstr "Dátum"
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -397,6 +431,9 @@ msgstr ""
 #~ "Leírja a művelet nevét.\n"
 #~ "pl: melyik objektumon melyik alkalmazás melyik feltétel alapján történik"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Objektum leírása"
 
@@ -409,6 +446,12 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Másolatok hozzáadása (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Feltételek a Modell Mezőknél"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Reguláris kifejezés az Erőforrás nevéhez"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -416,6 +459,16 @@ msgstr ""
 #~ "Jelölje be, ha azt szeretné, hogy az ügyhöz csatolt összes dokumentumot "
 #~ "csatolja az emlékeztető email küldésénél."
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Ütemezés feltételei"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Ha az aktív mező Hamisra van állítva, az lehetővé teszi Önnek az előírás "
+#~ "elrejtését annak törlése nélkül."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Felelős neve"
 
@@ -469,6 +522,15 @@ msgstr ""
 #~ "Használjon python kifejezést, hogy meghatározza a megfelelő mezőt, amelyet a "
 #~ "fejléc 'Kitől' mezőjének fogunk használni"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Késedelem az indítás dátuma után, előírja, hogy megadhat negatív számot. Ha "
+#~ "Önnek szüksége van késedelemre az indítás dátuma előtt, kérheti emlékeztető "
+#~ "küldését a találkozás előtt 15 perccel."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Nem található e-mail ID az Ön válallatának címéhez!"
@@ -505,5 +567,8 @@ msgstr ""
 #~ msgid "Server Action to be Triggered"
 #~ msgstr "Szerverművelet elindítva"
 
+#~ msgid "Server Action"
+#~ msgstr "Szerverművelet"
+
 #~ msgid "%(object_date)s = Creation date"
 #~ msgstr "%(object_date)s = Létrehozás dátuma"
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index ea4eed02f32..3da106635b4 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -7,30 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 21:06+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "Imposta followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
-"La regola usa l'operatore AND. Nel modello devono corrispondere tutti i "
-"campi non vuoti cosicché la regola esegua l'azione descritta nella scheda "
-"'Azioni'."
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -38,83 +36,103 @@ msgid "Action Rules"
 msgstr "Regole Azione"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsabile"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoria Partner"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
-"Azioni Server da Eseguire Automaticamente (es. Email di Promemoria, Chiamata "
-"a Metodo di un Oggetto, ecc...)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
 msgstr "Ritardo dopo Data Programmata"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Se il campo attivo è impostato a Falso, ti permetterà di nascondere la "
-"regola senza rimuoverla."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condizioni"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "Stato"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regola Azione"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campi da cambiare"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Pulsante premuto"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data ultima azione"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -122,37 +140,15 @@ msgid "Hours"
 msgstr "Ore"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Imposta lo Stato per"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Ritardo dopo la data programmata, puoi mettere un numero negativo. Se "
-"necessiti un lasso di tempo prima della data programmata, come inviare un "
-"promemoria 15 minuti prima del meeting."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Attivo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -160,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Ritardo dopo la data programmata"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Imposta il responsabile a"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Nessuno"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Mesi"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nome della Regola"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -180,11 +188,6 @@ msgstr "Mesi"
 msgid "Automated Actions"
 msgstr "Azioni automatiche"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr "Modello documento relativo"
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
@@ -192,44 +195,39 @@ msgstr ""
 "Fornisce l'ordine alla sequenza quando si visualizza una lista di regole"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condizioni sui campi del modello"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Azione Server"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mesi"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Giorni"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo Ritardo"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtro"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Attivo"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex sul nome risorsa"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "Data ultima modifica"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -247,38 +245,21 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr "Modello documento relativo"
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
-"Espressione regolare per rintracciare il nome della risorsa\n"
-"es.: \"urgente.*\" cercherà i record che hanno il nome che comincia per la "
-"stringa: \"urgente\"\n"
-"Nota: La ricerca è sensibile alle maiuscole/minuscole"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condizioni sulla temporizzazione"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nome della Regola"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condizioni sul Modello Partner"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -301,42 +282,49 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data di Creazione"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Data di creazione"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Termine"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Data Programmata"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr "Azioni Server"
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Set State to"
+#~ msgstr "Imposta lo Stato per"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
 #~ "Spunta questo se desideri la regola per inviare una e-mail alla persona "
 #~ "responsabile."
 
+#~ msgid "Button Pressed"
+#~ msgstr "Pulsante premuto"
+
 #~ msgid "Object"
 #~ msgstr "Oggetto"
 
@@ -349,9 +337,15 @@ msgstr "Azioni Server"
 #~ msgid "Remind Partner"
 #~ msgstr "Promemoria Partner"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoria Partner"
+
 #~ msgid "Email Body"
 #~ msgstr "Corpo Mail"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condizioni sul Modello Partner"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -369,6 +363,9 @@ msgstr "Azioni Server"
 #~ msgid "Email Reminders"
 #~ msgstr "Promemoria Email"
 
+#~ msgid "Deadline"
+#~ msgstr "Termine"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Oggetto Soggetto"
 
@@ -381,6 +378,18 @@ msgstr "Azioni Server"
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "ID Email della persona a cui le mail vanno spedite"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data di Creazione"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Data ultima azione"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Imposta il responsabile a"
+
+#~ msgid "None"
+#~ msgstr "Nessuno"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Telefono responsabile"
 
@@ -393,6 +402,9 @@ msgstr "Azioni Server"
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = ID Oggetto"
 
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nome Partner"
 
@@ -406,6 +418,15 @@ msgstr "Azioni Server"
 #~ msgid "Call Object Method"
 #~ msgstr "Metodo Chiamata Oggetto"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Ritardo dopo la data programmata, puoi mettere un numero negativo. Se "
+#~ "necessiti un lasso di tempo prima della data programmata, come inviare un "
+#~ "promemoria 15 minuti prima del meeting."
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Descrizione oggetto"
 
@@ -417,6 +438,15 @@ msgstr "Azioni Server"
 #~ "es.: su quale oggetto quale azione deve essere presa sulle basi di quale "
 #~ "condizione"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Promemoria Responsabile"
 
@@ -448,6 +478,9 @@ msgstr "Azioni Server"
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Mail agli osservatori (Campo CC)"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condizioni sulla temporizzazione"
+
 #~ msgid "Server Action to be Triggered"
 #~ msgstr "Azione server che deve essere programmata"
 
@@ -457,6 +490,9 @@ msgstr "Azioni Server"
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Aggiungi Osservatori (CC)"
 
+#~ msgid "Server Action"
+#~ msgstr "Azione Server"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -478,9 +514,30 @@ msgstr "Azioni Server"
 #~ msgid "Conditions on States"
 #~ msgstr "Condizioni sugli stati"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se il campo attivo è impostato a Falso, ti permetterà di nascondere la "
+#~ "regola senza rimuoverla."
+
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Espressione regolare per rintracciare il nome della risorsa\n"
+#~ "es.: \"urgente.*\" cercherà i record che hanno il nome che comincia per la "
+#~ "stringa: \"urgente\"\n"
+#~ "Nota: La ricerca è sensibile alle maiuscole/minuscole"
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Invia mail a questi indirizzi"
 
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex sul nome risorsa"
+
 #~ msgid "Email To"
 #~ msgstr "Email per"
 
@@ -491,6 +548,9 @@ msgstr "Azioni Server"
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Nessun Email ID trovato per l'indirizzo della tua azienda"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condizioni sui campi del modello"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index b6917f10c6f..95db5a3a2cb 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-07 21:07+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "アクションルール"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "責任者"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "注記"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "パートナ分類"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "トリガー日後の遅延"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr "アクティブ項目がFalseに設定された場合、ルールを削除することなく非表示にできます。"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "条件"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "アクションルール"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "変更する項目"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "ボタンが押されました。"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "最新実行日"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "時間"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "状態を設定："
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr "ミーティングの15分前に通知を送信したいといったトリガー日前の遅延が必要な場合には、トリガー日後の遅延は負の数値を定義できます。"
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "日付"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "アクティブ"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "トリガー日後の遅延"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "責任者の設定"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "なし"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "月"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "ルール名"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "月"
 msgid "Automated Actions"
 msgstr "自動的なアクション"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "ルールのリストを表示する時には、並び順を指定します。"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "モデル項目の条件"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "サーバアクション"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "月"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "日"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "遅延タイプ"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "フィルタ"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "アクティブ"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "リソース名の正規表現"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,37 +244,21 @@ msgid "Minutes"
 msgstr "分"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"リソースの名前を一致させる正規表現\n"
-"例：\"urgent.*\"  は文字列 \"urgent\" で始まる名前を持つレコードが検索されます.\n"
-"注記：この検索は大文字と小文字を区別します。"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "タイミングの条件"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "ルール名"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "順序"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "モデルパートナとしての条件"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -289,36 +281,40 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "作成日"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "作成日"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "期限"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "パートナ"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "トリガー日"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Set State to"
+#~ msgstr "状態を設定："
+
 #~ msgid "Email From"
 #~ msgstr "Eメールフォーム"
 
@@ -329,9 +325,15 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "これらのEメールへのメール"
 
+#~ msgid "Button Pressed"
+#~ msgstr "ボタンが押されました。"
+
 #~ msgid "Object"
 #~ msgstr "オブジェクト"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "モデルパートナとしての条件"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -360,14 +362,26 @@ msgstr ""
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "メールを送信した人のEメールID"
 
+#~ msgid "Creation Date"
+#~ msgstr "作成日"
+
 #~ msgid "Email Reminders"
 #~ msgstr "Eメールの通知"
 
+#~ msgid "Last Action Date"
+#~ msgstr "最新実行日"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
 #~ msgstr "ヘッダーのTo項目を使用するよりも正しい項目を定義するにはPython表現を使用して下さい。"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "責任者の設定"
+
+#~ msgid "None"
+#~ msgstr "なし"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = 連絡先電話"
 
@@ -383,6 +397,16 @@ msgstr ""
 #~ msgid "Email To"
 #~ msgstr "Eメール宛先"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "リソースの名前を一致させる正規表現\n"
+#~ "例：\"urgent.*\"  は文字列 \"urgent\" で始まる名前を持つレコードが検索されます.\n"
+#~ "注記：この検索は大文字と小文字を区別します。"
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -397,6 +421,9 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "オブジェクトメソッドの呼び出し"
 
+#~ msgid "Note"
+#~ msgstr "注記"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = パートナ名"
 
@@ -416,9 +443,21 @@ msgstr ""
 #~ "アクション名を記述して下さい：\n"
 #~ "例：どのオブジェクトがどの条件に基づきどのアクションを実行するか"
 
+#~ msgid "Filter"
+#~ msgstr "フィルタ"
+
+#~ msgid "Date"
+#~ msgstr "日付"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "責任者への通知"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr "ミーティングの15分前に通知を送信したいといったトリガー日前の遅延が必要な場合には、トリガー日後の遅延は負の数値を定義できます。"
+
 #~ msgid "%(partner_email)s = Partner Email"
 #~ msgstr "%(partner_email)s = パートナEメール"
 
@@ -458,10 +497,27 @@ msgstr ""
 #~ msgid "Mail to Responsible"
 #~ msgstr "責任者へのメール"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "モデル項目の条件"
+
+#~ msgid "Server Action"
+#~ msgstr "サーバアクション"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "リソース名の正規表現"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr "ユーザにEメールによって通知を送信するルールを希望する場合、ここをチェックして下さい。"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr "アクティブ項目がFalseに設定された場合、ルールを削除することなく非表示にできます。"
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "タイミングの条件"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -473,9 +529,15 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = 責任者名"
 
+#~ msgid "Deadline"
+#~ msgstr "期限"
+
 #~ msgid "Remind Partner"
 #~ msgstr "パートナを思い出させる"
 
+#~ msgid "Partner Category"
+#~ msgstr "パートナ分類"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_action_rule/i18n/lt.po
index dd2bd0ff7ad..a531ae1e99f 100644
--- a/addons/base_action_rule/i18n/lt.po
+++ b/addons/base_action_rule/i18n/lt.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Veiksmo taisyklės"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Atsakingas"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Pastabos"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Partnerio kategorija"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Atidėti po datos"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Jeigu šiam laukui yra panaikintas žymėjimas, tai leis jums išjungti šią "
-"taisyklę be jos ištrinimo."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Sąlygos"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Veiksmo taisyklė"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Laukų nustatymas"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Nuspaustas mygtukas"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Paskutinė veiksmo data"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Valandos"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Nustatyti būseną"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Delsa po iškvietimo datos,nurodo, kad galite įterpti neigiamą skaičių. Jei "
-"Jums reikia delsos prieš iškvietimo datą, pavyzdžiui siųsti priminimą 15 "
-"min. prieš susitikimą."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktyvus"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Atidėti po įvykio datos"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Nustatyti atsakingą asmenį"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Nieko"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Mėnesiai"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Taisyklės pavadinimas"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Mėnesiai"
 msgid "Automated Actions"
 msgstr "Automatiniai veiksmai"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Suteikia eilės tvarką, pagal kurį atvaizduojamas taisyklių sąrašas"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Laukų sąlygos"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Serverio veiksmai"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mėnesiai"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dienos"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Uždelsimo tipas"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtras"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktyvus"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Reguliarusis reiškinys pavadinimui"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,38 +244,21 @@ msgid "Minutes"
 msgstr "Minutės"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"reguliarusis reiškinys atitinkantis pavadinimą\n"
-"pvz.: 'svarb.*' ieškos visų įrašų, kurie turi pavadinimą prasidedanti "
-"'svarb'\n"
-"Pastaba: paieška jautri raidžių dydžiui"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Laiko sąlygos"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Taisyklės pavadinimas"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Seka"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Partnerio sąlygos"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -295,42 +281,46 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Sukūrimo data"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Sukūrimo data"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Galutinis terminas"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Įvykio data"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Object"
 #~ msgstr "Objektas"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Priminti partneriui"
 
+#~ msgid "Partner Category"
+#~ msgstr "Partnerio kategorija"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Klaida!"
@@ -341,9 +331,21 @@ msgstr ""
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Specialūs raktažodžiai naudojami tekste"
 
+#~ msgid "Creation Date"
+#~ msgstr "Sukūrimo data"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Paskutinė veiksmo data"
+
+#~ msgid "None"
+#~ msgstr "Nieko"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Blogi argumentai"
 
+#~ msgid "Note"
+#~ msgstr "Pastabos"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Partnerio pavadinimas"
 
@@ -354,9 +356,18 @@ msgstr ""
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
 
+#~ msgid "Filter"
+#~ msgstr "Filtras"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
 #~ msgid "Mail body"
 #~ msgstr "El. laiško tekstas"
 
+#~ msgid "Server Action"
+#~ msgstr "Serverio veiksmai"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -366,9 +377,18 @@ msgstr ""
 #~ msgid "Conditions on States"
 #~ msgstr "Būsenų sąlygos"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Laiko sąlygos"
+
 #~ msgid "Reply-To"
 #~ msgstr "Atsakyti (kam)"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Nuspaustas mygtukas"
+
+#~ msgid "Deadline"
+#~ msgstr "Galutinis terminas"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr ""
@@ -381,6 +401,9 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Siųsti šiems el. pašto adresams"
 
+#~ msgid "Set State to"
+#~ msgstr "Nustatyti būseną"
+
 #~ msgid "Email From"
 #~ msgstr "El. laiškas nuo"
 
@@ -400,6 +423,9 @@ msgstr ""
 #~ "Pažymėkite, jeigu norite, kad taisyklė išsiųstų priminimą partneriui el. "
 #~ "paštu."
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Partnerio sąlygos"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(case_subject)s = Įvykio tema"
 
@@ -412,6 +438,9 @@ msgstr ""
 #~ msgid "Remind with Attachment"
 #~ msgstr "Priminti su priedais"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Nustatyti atsakingą asmenį"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(case_user_phone)s = Atsakingo asmens telefonas"
 
@@ -422,6 +451,17 @@ msgstr ""
 #~ "Taisyklė naudoja IR operatoriu. Objekto modelis turi atitikti visus "
 #~ "netuščius laukus, tada taisyklė įvykdo veiksmą nurodytą 'Veiksmai' kortelėje."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "reguliarusis reiškinys atitinkantis pavadinimą\n"
+#~ "pvz.: 'svarb.*' ieškos visų įrašų, kurie turi pavadinimą prasidedanti "
+#~ "'svarb'\n"
+#~ "Pastaba: paieška jautri raidžių dydžiui"
+
 #~ msgid "Email To"
 #~ msgstr "El. laiškas kam"
 
@@ -473,6 +513,12 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Pridėti stebėtojus (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Laukų sąlygos"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Reguliarusis reiškinys pavadinimui"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -480,6 +526,13 @@ msgstr ""
 #~ "Pažymėkite, jei jūs norite, kad visi prie įvykio prisegti dokumentai, būtų "
 #~ "prisegti prie priminimo el. laiško."
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Jeigu šiam laukui yra panaikintas žymėjimas, tai leis jums išjungti šią "
+#~ "taisyklę be jos ištrinimo."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(case_user)s = Atsakingo asmens vardas"
 
@@ -511,3 +564,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Naudokite Python išraišką teisingo laukelio nurodymui, kuris bus naudojamas "
 #~ "antraštės \"Nuo\" laukeliui."
+
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Delsa po iškvietimo datos,nurodo, kad galite įterpti neigiamą skaičių. Jei "
+#~ "Jums reikia delsos prieš iškvietimo datą, pavyzdžiui siųsti priminimą 15 "
+#~ "min. prieš susitikimą."
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_action_rule/i18n/lv.po
index 16b7d576300..2dd6c965ece 100644
--- a/addons/base_action_rule/i18n/lv.po
+++ b/addons/base_action_rule/i18n/lv.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Darbību noteikumi"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Atbildīgais"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Piezīme"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Partnera Kategorija"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Aizkave pēc trigger datuma"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Nosacījumi"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Darbības noteikums"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Lauki izmaiņām"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Poga nospiesta"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Pēdējas darbības datums"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "Stundas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Uzstādīt stāvokli"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datums"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktīvs"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Aizkave pēc trigger datuma"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Ielikt par atbildīgo"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Nav"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Mēneši"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Noteikuma nosaukums"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "Mēneši"
 msgid "Automated Actions"
 msgstr "Automatizētas darbības"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Servera Darbība"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mēneši"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dienas"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Aizkaves tips"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtrs"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktīvs"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Minūtes"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Nosacījumi uz laiku"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Noteikuma nosaukums"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Secība"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,48 +281,58 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Izveidošanas datums"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Izveidošanas datums"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Termiņš"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Datums, kad tiks Izpildīts"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "E-pastu sekotājiem (CC)"
 
+#~ msgid "Set State to"
+#~ msgstr "Uzstādīt stāvokli"
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "E-pastu uz šim adresēm"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Poga nospiesta"
+
 #~ msgid "Object"
 #~ msgstr "Objekts"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Atgādināt partnerim"
 
+#~ msgid "Partner Category"
+#~ msgstr "Partnera Kategorija"
+
 #~ msgid "Email Body"
 #~ msgstr "E-pasta teksts"
 
@@ -338,6 +343,9 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Atbildēt uz"
 
+#~ msgid "Deadline"
+#~ msgstr "Termiņš"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Objekta subjekts"
 
@@ -347,9 +355,21 @@ msgstr ""
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Speciāli atslēgas vārdi, kas tiks izmantoti tekstā"
 
+#~ msgid "Creation Date"
+#~ msgstr "Izveidošanas datums"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Pēdējas darbības datums"
+
 #~ msgid "Email Reminders"
 #~ msgstr "E-pasta atgādinājumi"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Ielikt par atbildīgo"
+
+#~ msgid "None"
+#~ msgstr "Nav"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Atbildīgā tālrunis"
 
@@ -365,12 +385,21 @@ msgstr ""
 #~ msgid "Email To"
 #~ msgstr "E-pastu"
 
+#~ msgid "Note"
+#~ msgstr "Piezīme"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Partnera nosaukums"
 
 #~ msgid "Call Object Method"
 #~ msgstr "Izsaukt objekta metodi"
 
+#~ msgid "Filter"
+#~ msgstr "Filtrs"
+
+#~ msgid "Date"
+#~ msgstr "Datums"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Atgādināt atbildīgajam"
 
@@ -395,6 +424,9 @@ msgstr ""
 #~ msgid "Email Actions"
 #~ msgstr "E-pasta darbības"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "Mail body"
 #~ msgstr "E-pasta teksts"
 
@@ -407,8 +439,14 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Pievienot sekotājus (CC)"
 
+#~ msgid "Server Action"
+#~ msgstr "Servera Darbība"
+
 #~ msgid "Conditions on States"
 #~ msgstr "Stāvokļu nosacījumi"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Nosacījumi uz laiku"
+
 #~ msgid "Email From"
 #~ msgstr "E-pasts no"
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 3c1f1f8d65b..d7dc9d222d2 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Үйл ажиллагааны дүрэм"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Хариуцлагатай"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Тэмдэглэл"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Харилцагчийн ангилал"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,49 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Саатсаны дараах гарааны огноо"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Хэрэв актив талбар худал байвал дүрэм журмыг устгалгүй далдлах нь зүйтэй."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Нөхцөл"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Үйл ажиллаагааны дүрэм"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Солих утгууд"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Дарсан товчлуур"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Сүүлийн үйл ажиллагааны огноо"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -116,37 +140,15 @@ msgid "Hours"
 msgstr "Цаг"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Ноороглох"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Delay After Trigger Date,specifies you can put a negative number. Хэрэв та "
-"гол огнооны өмнө зогсох хэргтэй бол, уулзалтаас 15 минутын өмнө анхааруулга "
-"илгээж байна."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Огноо"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -154,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Саатлын дараах гарааны огноо"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Хариуцуулах"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Хоосон"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Сарууд"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Дүрмийн нэр"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -174,54 +188,44 @@ msgstr "Сарууд"
 msgid "Automated Actions"
 msgstr "Үйл ажиллагааны автоматжуулалт"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Дэлгэцэнд дүрмийн жагсаалт харагдахад захиалгын дарааллыг өгнө."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Модел талбарууд дахь нөхцөл"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Үйлдвэр үйлчилгээ"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Сарууд"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Өдөр"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Саатлын төрөл"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Шүүлтүүр"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Идэвхитэй"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Нөөцийн нэр дээрх Regex"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -240,37 +244,21 @@ msgid "Minutes"
 msgstr "Минут"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Нөөцийн нэрийг тулгах Regular expression\n"
-"ө.х.: 'urgent.*' нь 'urgent'-р эхэлсэн бичлэгүүдийг хайна\n"
-"Анхаарах нь: Энэ нь том жижиг үсэг ялгадаг хайлт."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Үйл явдлын дараалал дахь нөхцөл"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Дүрмийн нэр"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Дараалал"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Эцэг модел дээрх нөхцөл"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -293,42 +281,61 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Үүсгэсэн Огноо"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Үүссэн Огноо"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Товлосон хугацаа"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Гарааны огноо"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Partner Category"
+#~ msgstr "Харилцагчийн ангилал"
+
 #~ msgid "Object"
 #~ msgstr "Объект"
 
+#~ msgid "Deadline"
+#~ msgstr "Товлосон хугацаа"
+
 #~ msgid "State"
 #~ msgstr "Төлөв"
 
+#~ msgid "Creation Date"
+#~ msgstr "Үүсгэсэн Огноо"
+
+#~ msgid "Note"
+#~ msgstr "Тэмдэглэл"
+
+#~ msgid "Date"
+#~ msgstr "Огноо"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Дарсан товчлуур"
+
 #~ msgid "Email Body"
 #~ msgstr "Имэйлийн гол утга"
 
@@ -342,6 +349,9 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Имэйл сануулагууд"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Сүүлийн үйл ажиллагааны огноо"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s=Объектын дугаар"
 
@@ -351,6 +361,9 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Алдаатай аргумент"
 
+#~ msgid "None"
+#~ msgstr "Хоосон"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Хариуцлагатай утас"
 
@@ -363,6 +376,9 @@ msgstr ""
 #~ msgid "Remind Responsible"
 #~ msgstr "Хариуцлага тооцох"
 
+#~ msgid "Filter"
+#~ msgstr "Шүүлтүүр"
+
 #~ msgid "Email Actions"
 #~ msgstr "Имэйл үйл ажиллагаанууд"
 
@@ -384,6 +400,18 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Сонирхогч нэмэх"
 
+#~ msgid "Server Action"
+#~ msgstr "Үйлдвэр үйлчилгээ"
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Үйл явдлын дараалал дахь нөхцөл"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Хэрэв актив талбар худал байвал дүрэм журмыг устгалгүй далдлах нь зүйтэй."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Хариуцлагын нэр"
 
@@ -405,6 +433,9 @@ msgstr ""
 #~ msgid "Email To"
 #~ msgstr "Э-мэйлрүү"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Таны компаны хаягийн санд Э-мэйл ID байхгүй байна!"
@@ -431,15 +462,33 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Эдгээр хаягуудруу илгээх"
 
+#~ msgid "Set State to"
+#~ msgstr "Ноороглох"
+
 #~ msgid "Email From"
 #~ msgstr "Э-мэйлээс"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Эцэг модел дээрх нөхцөл"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Объектын гарчиг"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Их биенд тусгай түлхүүр үгсийг хэрэглэсэн байх"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Хариуцуулах"
+
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. Хэрэв та "
+#~ "гол огнооны өмнө зогсох хэргтэй бол, уулзалтаас 15 минутын өмнө анхааруулга "
+#~ "илгээж байна."
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -456,6 +505,9 @@ msgstr ""
 #~ msgid "Mail body"
 #~ msgstr "Э-мэйлийн гол утга"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Модел талбарууд дахь нөхцөл"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -478,6 +530,9 @@ msgstr ""
 #~ msgid "Error: The mail is not well formated"
 #~ msgstr "Алдаа: Мэйл сайн форматтай биш байна"
 
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Нөөцийн нэр дээрх Regex"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -485,6 +540,16 @@ msgstr ""
 #~ "Толгойны 'Хэнд' талбар дээр хэрэглэх  зөв талбарыг зааж өгөх Python "
 #~ "илэрхийллэг ашигла"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Нөөцийн нэрийг тулгах Regular expression\n"
+#~ "ө.х.: 'urgent.*' нь 'urgent'-р эхэлсэн бичлэгүүдийг хайна\n"
+#~ "Анхаарах нь: Энэ нь том жижиг үсэг ялгадаг хайлт."
+
 #~ msgid ""
 #~ "Check this if you want the rule to mark CC(mail to any other person defined "
 #~ "in actions)."
diff --git a/addons/base_action_rule/i18n/nb.po b/addons/base_action_rule/i18n/nb.po
index 7e0f4387503..19c38cb7133 100644
--- a/addons/base_action_rule/i18n/nb.po
+++ b/addons/base_action_rule/i18n/nb.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-03 16:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Handlingsregler"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Ansvarlig"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Notat"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Partner Kategori"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Forsinkelse etter triggerdato"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
-"regelen uten å fjerne den."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Betingelser"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Handling regel"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Felter å endre"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Knapp trykket"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Siste handlingsdato"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Timer"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Still stat til"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Forsinkelse Etter utløser Dato, spesifiserer du kan sette et negativt tall. "
-"Hvis du trenger en forsinkelse før avtrekkeren dato, som å sende en "
-"påminnelse 15 minutter før et møte."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.actions.actions"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Dato"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Forsinkelse Etter utløser Dato"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Satt Ansvarlig for å"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ingen"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Måneder"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regelnavn"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Måneder"
 msgid "Automated Actions"
 msgstr "Automatiserte handinger"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Gir sekvens ordre når du viser en liste over regler."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Forholdene på Modell Felter"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Tjenerhandling"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Måneder"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dager"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "forsinkelse typen"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtrer"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktiv"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex på Ressursnavn"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,38 +244,21 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Regulært uttrykk for matchende navnet på ressursen\n"
-"f.eks: \". haster * 'vil søke etter poster som har navn som starter med "
-"strengen\" haster \"\n"
-"Merk: Dette er små bokstaver søk."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Vilkår for timing"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Regelnavn"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvens"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Forholdene på Modell Partner"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -295,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Opprettelsesdato"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Opprettet dato"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Frist"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Uttløser dato"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Post til overvåkere (CC)"
 
@@ -339,15 +326,27 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Send mail til disse e-postene"
 
+#~ msgid "Set State to"
+#~ msgstr "Still stat til"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Knapp trykket"
+
 #~ msgid "Object"
 #~ msgstr "Objekt"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Påminn partner"
 
+#~ msgid "Partner Category"
+#~ msgstr "Partner Kategori"
+
 #~ msgid "Email Body"
 #~ msgstr "E-post kropp"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Forholdene på Modell Partner"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -368,6 +367,9 @@ msgstr ""
 #~ "Sjekk dette hvis du vil at regelen skal sende en påminnelse via e-post til "
 #~ "partneren."
 
+#~ msgid "Deadline"
+#~ msgstr "Frist"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Object subject"
 
@@ -377,6 +379,9 @@ msgstr ""
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Spesielle nøkkelord for bruk i meldingsinnhold"
 
+#~ msgid "Creation Date"
+#~ msgstr "Opprettelsesdato"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
@@ -394,6 +399,9 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "E-post påminnelser"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Siste handlingsdato"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -401,6 +409,12 @@ msgstr ""
 #~ "Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
 #~ "for Til-feltet på header."
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Satt Ansvarlig for å"
+
+#~ msgid "None"
+#~ msgstr "Ingen"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "% (object_bruker_telefonen) s = Ansvarlig telefon"
 
@@ -419,6 +433,17 @@ msgstr ""
 #~ msgid "Email To"
 #~ msgstr "E-post til."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Regulært uttrykk for matchende navnet på ressursen\n"
+#~ "f.eks: \". haster * 'vil søke etter poster som har navn som starter med "
+#~ "strengen\" haster \"\n"
+#~ "Merk: Dette er små bokstaver søk."
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -433,6 +458,9 @@ msgstr ""
 #~ "Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
 #~ "for Fra-feltet på overskriften"
 
+#~ msgid "Note"
+#~ msgstr "Notat"
+
 #~ msgid ""
 #~ "Check this if you want the rule to mark CC(mail to any other person defined "
 #~ "in actions)."
@@ -451,6 +479,12 @@ msgstr ""
 #~ "f.eks: på hvilket objekt som tiltak som skal iverksettes på grunnlag av "
 #~ "hvilken tilstand"
 
+#~ msgid "Filter"
+#~ msgstr "Filtrer"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Minn Ansvarlig"
 
@@ -458,6 +492,15 @@ msgstr ""
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Ingen E-post ID funnet for din firmaadresse!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Forsinkelse Etter utløser Dato, spesifiserer du kan sette et negativt tall. "
+#~ "Hvis du trenger en forsinkelse før avtrekkeren dato, som å sende en "
+#~ "påminnelse 15 minutter før et møte."
+
 #~ msgid "%(object_date)s = Creation date"
 #~ msgstr "%(object_dato)s = opprettelsesdato"
 
@@ -473,6 +516,9 @@ msgstr ""
 #~ msgid "Email Actions"
 #~ msgstr "E-post handlinger"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.actions.actions"
+
 #~ msgid "Content of mail"
 #~ msgstr "Innholdet av post"
 
@@ -482,6 +528,9 @@ msgstr ""
 #~ msgid "Mail body"
 #~ msgstr "Mail kropp"
 
+#~ msgid "Server Action"
+#~ msgstr "Tjenerhandling"
+
 #~ msgid "%(object_user_email)s = Responsible Email"
 #~ msgstr "% (object_brukerens_e-post) s = Ansvarlig e-post"
 
@@ -494,6 +543,12 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Legg til overvåkere (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Forholdene på Modell Felter"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex på Ressursnavn"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -503,9 +558,19 @@ msgstr ""
 #~ msgid "Conditions on States"
 #~ msgstr "Vilkår for tilstander"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+#~ "regelen uten å fjerne den."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "% (object_bruker) s = Ansvarlig navn"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Vilkår for timing"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index f00d5fd44fb..db947c433b0 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 20:36+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "Volgers instellen"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,83 +36,103 @@ msgid "Action Rules"
 msgstr "Actieregels"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Notitie"
-
-#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Relatiecategorie"
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
-"Serveractie welke wordt getriggerd (bijv. E-mail reminder, Call Object "
-"Method, etc...)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
 msgstr "Vertraging na activeerdatum"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Als het actief veld uitzet, kunt u de regel verbergen zonder haar te "
-"verwijderen."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Voorwaarden"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "Status"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Actieregel"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Te veranderen velden"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Knop ingedrukt"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Laatste actiedatum"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -119,39 +140,15 @@ msgid "Hours"
 msgstr "Uren"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Zet status op"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
-"Definieer server actiies.\n"
-"Bijv: E-mail herinneringen, Call Object Service, etc."
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Vertraging na activeerdatum, specificeert dat u een negatief getal kunt "
-"invoeren als u vertraging vóór de activeerdatum wilt, zoals een herinnering "
-"15 minuten voor een vergadering versturen."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Actief"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -159,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Vertraging na Activeerdatum"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Zet verantwoordelijke op"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Geen"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Maanden"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regelnaam"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -179,55 +188,45 @@ msgstr "Maanden"
 msgid "Automated Actions"
 msgstr "Geautomatiseerde acties"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr "Gerelateerde document model"
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Geeft de volgorde aan waarin de lijst van regels wordt weergegeven."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Voorwaarden op Model velden"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Server-actie"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Maanden"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dagen"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Soort vertraging"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Actief"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex op bronnaam"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "datum laatst aangepast"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -245,38 +244,21 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr "Gerelateerde document model"
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
-"Reguliere expressie voor overeenkomende naam van de bron; \n"
-"i.e.: 'urgent.*' zal zoeken naar records met de naam beginnend met de tekst "
-"'urgent'\n"
-"Opmerking: dit zoeken is hoofdletter gevoelig."
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Voorwaarden op timing"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Regelnaam"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Volgnummer"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Voorwaarden op relatiemodel"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -299,42 +281,49 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Aanmaakdatum"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Aanmaakdatum"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Uiterste datum"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Activeerdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr "Server acties"
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Email Body"
 #~ msgstr "Email bericht"
 
 #~ msgid "Mail to these Emails"
 #~ msgstr "Mail naar deze emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Zet status op"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Knop ingedrukt"
+
 #~ msgid "Object"
 #~ msgstr "Object"
 
@@ -363,6 +352,12 @@ msgstr "Server acties"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Speciale sleutelwoorden die in het bericht kunnen worden gebruikt"
 
+#~ msgid "Creation Date"
+#~ msgstr "Aanmaakdatum"
+
+#~ msgid "None"
+#~ msgstr "Geen"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Telefoon verantwoordelijke"
 
@@ -372,6 +367,9 @@ msgstr "Server acties"
 #~ msgid "Invalid arguments"
 #~ msgstr "Ongeldige argumenten"
 
+#~ msgid "Note"
+#~ msgstr "Notitie"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Naam relatie"
 
@@ -395,6 +393,15 @@ msgstr "Server acties"
 #~ "Beschrijft de actie naam.\n"
 #~ "ie: op welk object welke actie wordt uitgevoerd onder welke conditie"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid "%(partner_email)s = Partner Email"
 #~ msgstr "%(partner_email)s = Relatie email"
 
@@ -413,6 +420,9 @@ msgstr "Server acties"
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Toevoegen toeschouwers (Cc)"
 
+#~ msgid "Server Action"
+#~ msgstr "Server-actie"
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Naam verantwoordelijke"
 
@@ -428,6 +438,9 @@ msgstr "Server acties"
 #~ "Vink dit aan wanneer u wilt dat de regel de gebruiker via de mail een "
 #~ "herinnering stuurt."
 
+#~ msgid "Partner Category"
+#~ msgstr "Relatiecategorie"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -438,9 +451,21 @@ msgstr "Server acties"
 #~ msgid "Reply-To"
 #~ msgstr "Antwoord naar"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Voorwaarden op relatiemodel"
+
+#~ msgid "Deadline"
+#~ msgstr "Uiterste datum"
+
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Email-id van de personen waarvan de mail wordt verstuurd"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Laatste actiedatum"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Zet verantwoordelijke op"
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -452,6 +477,26 @@ msgstr "Server acties"
 #~ msgid "Remind with Attachment"
 #~ msgstr "Herinneren met bijlage"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Reguliere expressie voor overeenkomende naam van de bron; \n"
+#~ "i.e.: 'urgent.*' zal zoeken naar records met de naam beginnend met de tekst "
+#~ "'urgent'\n"
+#~ "Opmerking: dit zoeken is hoofdletter gevoelig."
+
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Vertraging na activeerdatum, specificeert dat u een negatief getal kunt "
+#~ "invoeren als u vertraging vóór de activeerdatum wilt, zoals een herinnering "
+#~ "15 minuten voor een vergadering versturen."
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Herinneren verantwoordelijke"
 
@@ -471,12 +516,21 @@ msgstr "Server acties"
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "E-mail naar toeschouwers (CC)"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Voorwaarden op timing"
+
 #~ msgid "Server Action to be Triggered"
 #~ msgstr "Server actie om te activeren"
 
 #~ msgid "Mail to Responsible"
 #~ msgstr "E-mail naar verantwoordelijke"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Voorwaarden op Model velden"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex op bronnaam"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -487,6 +541,13 @@ msgstr "Server acties"
 #~ msgid "Conditions on States"
 #~ msgstr "Voorwaarden op status"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Als het actief veld uitzet, kunt u de regel verbergen zonder haar te "
+#~ "verwijderen."
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_action_rule/i18n/pl.po
index c058ae6d6cf..dffcc2ab702 100644
--- a/addons/base_action_rule/i18n/pl.po
+++ b/addons/base_action_rule/i18n/pl.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:24+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Uwaga"
-
-#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Opóźnienie po dacie wyzwolenia"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Warunki"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Pola do zmiany"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data ostatniej akcji"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "Godziny"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktywne"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Ustaw odpowiedzialnego na"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Brak"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Miesiące"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nazwa reguły"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "Miesiące"
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr ""
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Miesiące"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dni"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Typ opóźnienia"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtr"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktywne"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Minuty"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nazwa reguły"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data utworzenia"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Termin"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Błąd!"
@@ -328,21 +324,45 @@ msgstr ""
 #~ msgstr ""
 #~ "Zaznacz, jeśli chcesz, aby reguła wysyłała przypomnienie mailem do partnera."
 
+#~ msgid "Deadline"
+#~ msgstr "Termin"
+
 #~ msgid "State"
 #~ msgstr "Stan"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Specjalne słowa kluczowe do zastosowania w treści"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data utworzenia"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Data ostatniej akcji"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "Ustaw odpowiedzialnego na"
+
+#~ msgid "None"
+#~ msgstr "Brak"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Niepoprawne argumenty"
 
+#~ msgid "Note"
+#~ msgstr "Uwaga"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nazwa partnera"
 
 #~ msgid "Call Object Method"
 #~ msgstr "Metoda wywołania obiektu"
 
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Filter"
+#~ msgstr "Filtr"
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Brak ID email dla adresu twojej firmy !"
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index b85fc3e037b..cba6f1d24ba 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:50+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Regras de ação"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsável"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoria de Parceiros"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Atraso após a data de limite"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Se o campo ativo é definido como Falso, ele permitirá que se oculte a regra "
-"sem a remover."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Condições"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regra de ação"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campos a mudar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botão Pressionado"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data da ação mais recente"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Alterar o estado para"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Após atraso Data de Limite, especifica que pode colocar um número negativo. "
-"Se precisar de um atraso antes da data limite, como o envio de um lembrete "
-"15 minutos antes de uma reunião."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Ativo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Após atraso Data Gatilho"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Responsável por definir"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Nenhum"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meses"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nome da Regra"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,55 +188,45 @@ msgstr "Meses"
 msgid "Automated Actions"
 msgstr "Ações Automáticas"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr "Modelo de documento relacionado"
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Dá a ordem da sequência ao exibir uma lista de regras."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condições em campos Modelo"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Ação do servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dias"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo de atraso"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtro"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Ativo"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex em Nome do Recurso"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "Data da modificação mais recente"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -241,38 +244,21 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr "Modelo de documento relacionado"
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
-"Expressão regular para nome correspondente do recurso \n"
-"por exemplo: \"urgente .* 'irá procurar registos ter o nome começando com a "
-"string 'urgente' \n"
-"Nota: Esta busca é sensível a maiúsculas e minúsculas."
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condições de sincronismo"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nome da Regra"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condições de Parceiro Modelo"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -295,45 +281,64 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data de criação"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Data de criação"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Prazo Limite"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Data Limite"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Set State to"
+#~ msgstr "Alterar o estado para"
+
 #~ msgid "Object"
 #~ msgstr "Objeto"
 
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumentos inválidos"
 
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Server Action"
+#~ msgstr "Ação do servidor"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data de criação"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Data da ação mais recente"
+
 #~ msgid "Email Body"
 #~ msgstr "Conteúdo da mensagem"
 
@@ -355,6 +360,15 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Chamar o método do objeto"
 
+#~ msgid "None"
+#~ msgstr "Nenhum"
+
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "E-mail para Vigilantes(CC)"
 
@@ -377,6 +391,9 @@ msgstr ""
 #~ "Marque esta opção se quiser que a regra envie um lembrete por e-mail para o "
 #~ "parceiro."
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condições de Parceiro Modelo"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palavras-chave especial para ser usado no corpo"
 
@@ -386,6 +403,9 @@ msgstr ""
 #~ msgid "Remind with Attachment"
 #~ msgstr "Relembre com o Anexo"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Responsável por definir"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -396,6 +416,17 @@ msgstr ""
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Telefone responsável"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expressão regular para nome correspondente do recurso \n"
+#~ "por exemplo: \"urgente .* 'irá procurar registos ter o nome começando com a "
+#~ "string 'urgente' \n"
+#~ "Nota: Esta busca é sensível a maiúsculas e minúsculas."
+
 #~ msgid "Email To"
 #~ msgstr "Email Para"
 
@@ -441,6 +472,15 @@ msgstr ""
 #~ msgid "Mail to Responsible"
 #~ msgstr "Email para Responsável"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condições em campos Modelo"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex em Nome do Recurso"
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condições de sincronismo"
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Nome Responsável"
 
@@ -453,13 +493,22 @@ msgstr ""
 #~ "Marque esta opção se quiser que a regra envie um e-mail para a pessoa "
 #~ "responsável."
 
+#~ msgid "Button Pressed"
+#~ msgstr "Botão Pressionado"
+
 #~ msgid "Remind Partner"
 #~ msgstr "Alertar Parceiro"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoria de Parceiros"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Erro !"
 
+#~ msgid "Deadline"
+#~ msgstr "Prazo Limite"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Sujeito Objeto"
 
@@ -499,6 +548,15 @@ msgstr ""
 #~ "Descreve o nome da ação. \n"
 #~ " eg: em qual objeto, que ação a ser tomada com base em qual condição"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Após atraso Data de Limite, especifica que pode colocar um número negativo. "
+#~ "Se precisar de um atraso antes da data limite, como o envio de um lembrete "
+#~ "15 minutos antes de uma reunião."
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Descrição Objeto"
 
@@ -511,6 +569,13 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Adicionar visualizadores (Cc)"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se o campo ativo é definido como Falso, ele permitirá que se oculte a regra "
+#~ "sem a remover."
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index 54f1663d8b1..9e7ad47feb6 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/i18n/pt_BR.po
@@ -7,30 +7,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-16 23:22+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 11:29+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "Definir Seguidores"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr "Em Andamento"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
-"A regra usa o operador AND. O modelo deve corresponder a todos os campos não "
-"vazios de modo que a regra executa a ação descrita na aba 'Ações'."
+"- Nesta mesma \"Pesquisa\", selecione o menu \"Salvar Filtro Atual\", digite "
+"o nome (Ex: Criar o 01/01/2012) e adicione a opção \"Compartilhar com todos "
+"os usuários\""
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -38,47 +40,60 @@ msgid "Action Rules"
 msgstr "Regras da Ação"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr "Escolha um filtro ou condição de tempo."
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsável"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr "Exemplos: lembretes de e-mail, serviço de objeto de chamada, etc"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr "Adicionar Seguidores"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categoria do Parceiro"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr "Definir Responsável"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
 msgstr ""
-"Ações de servidor a serem disparadas(ex: Emails, chamar métodos de objetos, "
-"etc...)"
+"Atraso após a data de disparo. Você pode colocar um número negativo se você "
+"precisa de um atraso antes da data de disparo, como o envio de um lembrete "
+"15 minutos antes de uma reunião."
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr "base.action.rule.lead.test"
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr "Fechado"
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
+msgstr "Novo"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr "Atraso após a data do disparador"
-
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Se o campo ativo é definido como False, ele permitirá que você esconda a "
-"regra sem removê-lo."
+msgstr "Atraso após a data de disparo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -86,35 +101,46 @@ msgid "Conditions"
 msgstr "Condições"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr "Situação"
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr "Antes de Atualizar o Filtro"
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Ações Automáticas"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+"Se marcado, esta condição deve ser satisfeita após a atualização do registro."
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campos para Mudar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Botão Pressionado"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
-msgstr "Condições na Situação"
+msgid "The filter must therefore be available in this page."
+msgstr "O filtro deve estar disponível nesta página."
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data da Última Ação"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr "Após Atualização do Filtro"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -122,39 +148,15 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Mudar Situação para"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
+msgstr "Para criar um novo filtro:"
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-"Define ações de servidor.\n"
-"Ex: Emails, Chamar serviço de objeto, etc..."
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Atraso depois da Data de Disparo, você pode colocar um número negativo. Se "
-"você precisar de um atraso antes da data de disparo, como o envio de um "
-"lembrete 15 minutos antes de uma reunião."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Ativa"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -162,19 +164,39 @@ msgid "Delay After Trigger Date"
 msgstr "Atraso depois da Data de Disparo"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Mudar Responsável para"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
+"Uma regra de ação é verificado quando você criar ou modificar o \"Modelo de "
+"Documentos Relacionados\". O filtro pré-condição é verificado logo antes da "
+"modificação, enquanto o filtro de pós-condição é verificado após a "
+"modificação. Um filtro de pré-condição, portanto, não funciona durante uma "
+"criação."
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Nenhum"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr "Condição do Filtro"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meses"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+"- Vá para a página de \"Modelo de Documento Relacionado\" e defina os "
+"parâmetros do filtro na visão \"Procurar\" (Exemplo de filtro com base em "
+"Prospectos / Oportunidades: Data da Criação \" é igual a \" 01/01/2012)"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nome da Regra"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -182,55 +204,45 @@ msgstr "Meses"
 msgid "Automated Actions"
 msgstr "Ações Automatizadas"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr "Modelo de Documento Relacionado"
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
-msgstr "Define a ordem de sequência para mostrar a lista de regras."
+msgstr "Define a sequência ao exibir a lista de regras."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Condições no Campo de Modelo"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Ação de Servidor"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dias"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr "Contador"
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tipo de atraso"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtrar"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr "Ações do servidor a serem executadas"
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Ativa"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr "Quando desmarcado, esta regra é oculta e não será executada."
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex no Nome do Recurso"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
-msgstr "Data da ultima alteração"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -248,38 +260,23 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr "Modelo de Documento Relacionado"
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
-"Expressão Regular para encontrar o nome do recurso\n"
-"Ex.: 'urgente.*' irá procurar pelos registros que tem o nome começando com "
-"'urgente'\n"
-"Obs.: Esta procura diferencia maiúsculo e minúsculo."
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Condições de Tempo"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Nome da Regra"
+"Se presente, esta condição precisa ser satisfeita antes da atualização do "
+"registro."
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Condições no Modelo de Parceiro"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -305,48 +302,52 @@ msgstr ""
 "                Clique para configurar uma nova regra de ação automatizada. "
 "\n"
 "              </p><p>\n"
-"                Use ações automáticas para criar gatilhos de ações para "
+"                Use ações automáticas para criar disparos de ações para "
 "várias telas.\n"
 "                Exemplo: um prospecto criado por um determinado usuário "
 "poderá ser atribuído\n"
-"                automáticamente para uma equipe de vendas específica, ou "
+"                automaticamente para uma equipe de vendas específica, ou "
 "uma\n"
-"                oportunidade na qual continua a situação pendente após 14 "
+"                oportunidade na qual a situação continua pendente após 14 "
 "dias e seja interessante enviar um e-mail\n"
 "                automático de lembrete.\n"
 "              </p>\n"
 "            "
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data de Criação"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Criar Data"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Prazo Final"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr "Última Ação"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Data de Disparo"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr "Ações no Servidor"
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr "Assunto"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Botão Pressionado"
+
 #~ msgid "Email From"
 #~ msgstr "Email de"
 
@@ -356,6 +357,9 @@ msgstr "Ações no Servidor"
 #~ msgid "Remind Partner"
 #~ msgstr "Lembrar Parceiro"
 
+#~ msgid "Partner Category"
+#~ msgstr "Categoria do Parceiro"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Erro!"
@@ -363,9 +367,27 @@ msgstr "Ações no Servidor"
 #~ msgid "Reply-To"
 #~ msgstr "Responder-Para"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data de Criação"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Data da Última Ação"
+
+#~ msgid "None"
+#~ msgstr "Nenhum"
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
 #~ msgid "Mail body"
 #~ msgstr "Corpo da mensagem"
 
+#~ msgid "Server Action"
+#~ msgstr "Ação de Servidor"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -397,6 +419,9 @@ msgstr "Ações no Servidor"
 #~ "Use uma expressão python para especificar o campo correto que será usado "
 #~ "para o campo 'Para' do cabeçalho"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Mudar Responsável para"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = Objeto ID"
 
@@ -465,6 +490,9 @@ msgstr "Ações no Servidor"
 #~ "Descreve o nome da ação.\n"
 #~ "Ex.: Em qual objeto qual ação será tomada com base em qual condição"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Responsável pelo Lembrete"
 
@@ -500,9 +528,15 @@ msgstr "Ações no Servidor"
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Email para Observadores (CC)"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Condições no Modelo de Parceiro"
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Enviar para estes Emails"
 
+#~ msgid "Set State to"
+#~ msgstr "Mudar Situação para"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palavras-chave especiais a serem utilizadas no corpo"
 
@@ -521,6 +555,31 @@ msgstr "Ações no Servidor"
 #~ "oportunidade que ainda está pendente após 14 dias pode enviar um e-mail de "
 #~ "lembrete automáticamente."
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condições de Tempo"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se o campo ativo é definido como False, ele permitirá que você esconda a "
+#~ "regra sem removê-lo."
+
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Condições no Campo de Modelo"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex no Nome do Recurso"
+
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Atraso depois da Data de Disparo, você pode colocar um número negativo. Se "
+#~ "você precisar de um atraso antes da data de disparo, como o envio de um "
+#~ "lembrete 15 minutos antes de uma reunião."
+
 #~ msgid "Conditions on States"
 #~ msgstr "Condições nas Situações"
 
@@ -533,8 +592,25 @@ msgstr "Ações no Servidor"
 #~ "Selecione aqui se quiser a regra para enviar um aviso por e-mail para o "
 #~ "parceiro."
 
+#~ msgid "Deadline"
+#~ msgstr "Prazo Final"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Assunto do Objeto"
 
 #~ msgid "State"
 #~ msgstr "Situação"
+
+#~ msgid "Filter"
+#~ msgstr "Filtrar"
+
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expressão Regular para encontrar o nome do recurso\n"
+#~ "Ex.: 'urgente.*' irá procurar pelos registros que tem o nome começando com "
+#~ "'urgente'\n"
+#~ "Obs.: Esta procura diferencia maiúsculo e minúsculo."
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_action_rule/i18n/ro.po
index d0e424986f7..adb69d0ea7e 100644
--- a/addons/base_action_rule/i18n/ro.po
+++ b/addons/base_action_rule/i18n/ro.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Reguli de actiune"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Responsabil"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Nota"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Categorie Partener"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Intarziere dupa data declansarii"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Daca campul activ este setat pe Fals, va va permite sa ascundeti regula fara "
-"a o sterge."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Conditii"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Regula actiunii"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Campuri care vor fi schimbate"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Buton apasat"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Data ultimei actiuni"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Ore"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Setati Starea pe"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Intarziere dupa data declansarii, specifica faptul ca puteti sa introduceti "
-"un numar negativ. Daca doriti o intarziere inainte de data declansarii, "
-"precum trimiterea unui memento cu 15 minute inaintea unei intalniri."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Data"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Activ(a)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Intarziere dupa data declansarii"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Setare responsabil"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Niciunul"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Luni de zile"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Numele regulii"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Luni de zile"
 msgid "Automated Actions"
 msgstr "Actiuni automate"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Da ordinea secventei atunci cand afiseaza o lista de reguli."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Conditii in Campurile model"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Actiune Server"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Luni de zile"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Zile"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tip intarziere"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtru"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Activ(a)"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex in Numele resursei"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,38 +244,21 @@ msgid "Minutes"
 msgstr "Minute"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Expresia obisnuita pentru potrivirea numelui resursei \n"
-"de exemplu: 'urgent.*' va cauta inregistrari al caror nume incepe cu sirul "
-"'urgent' \n"
-"Nota: Aceasta este o cautare sensibla la caractere"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Conditii privind Sincronizarea"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Numele regulii"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Secventa"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Conditii pe Partener Model"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -295,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Data crearii"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Data Crearii"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Termen limita"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partener"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Data declansarii"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Object"
 #~ msgstr "Obiect"
 
@@ -338,9 +325,15 @@ msgstr ""
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partener)i = Numele partenerului"
 
+#~ msgid "Filter"
+#~ msgstr "Filtru"
+
 #~ msgid "Error: The mail is not well formated"
 #~ msgstr "Eroare: e-mail-ul nu este bine formatat"
 
+#~ msgid "Server Action"
+#~ msgstr "Actiune Server"
+
 #~ msgid "Email From"
 #~ msgstr "E-mail de la"
 
@@ -351,6 +344,9 @@ msgstr ""
 #~ "Acesti oameni vor primi o copie a comunicarii viitoare dintre partener si "
 #~ "utilizatori prin email"
 
+#~ msgid "Set State to"
+#~ msgstr "Setati Starea pe"
+
 #~ msgid "Remind Partner"
 #~ msgstr "Memento Partener"
 
@@ -363,6 +359,9 @@ msgstr ""
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(obiect_subiect) = Obiect subiect"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Data ultimei actiuni"
+
 #~ msgid ""
 #~ "Use automated actions to automatically trigger actions for various screens. "
 #~ "Example: a lead created by a specific user may be automatically set to a "
@@ -381,6 +380,9 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Memento-uri prin email"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Conditii pe Partener Model"
+
 #~ msgid "Email To"
 #~ msgstr "Email catre"
 
@@ -391,6 +393,17 @@ msgstr ""
 #~ "Folositi o expresie python pentru a specifica campul corect pe care il vom "
 #~ "folosi pentru campul 'Catre' al antetului."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Expresia obisnuita pentru potrivirea numelui resursei \n"
+#~ "de exemplu: 'urgent.*' va cauta inregistrari al caror nume incepe cu sirul "
+#~ "'urgent' \n"
+#~ "Nota: Aceasta este o cautare sensibla la caractere"
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -402,6 +415,12 @@ msgstr ""
 #~ msgid "Remind with Attachment"
 #~ msgstr "Memento cu Atasament"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Setare responsabil"
+
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -457,12 +476,25 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(obiect_utilizator) = Nume responsabil"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Daca campul activ este setat pe Fals, va va permite sa ascundeti regula fara "
+#~ "a o sterge."
+
 #~ msgid "Mail to Responsible"
 #~ msgstr "Mail catre Responsabil"
 
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Adauga observatori (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Conditii in Campurile model"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex in Numele resursei"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -479,6 +511,12 @@ msgstr ""
 #~ "Bifati aici daca doriti ca regula sa trimita un e-mail persoanei "
 #~ "responsabile."
 
+#~ msgid "Button Pressed"
+#~ msgstr "Buton apasat"
+
+#~ msgid "Partner Category"
+#~ msgstr "Categorie Partener"
+
 #~ msgid "Reply-To"
 #~ msgstr "Raspunde"
 
@@ -488,23 +526,47 @@ msgstr ""
 #~ "Bifati aici daca doriti ca regula sa trimita un memento prin e-mail "
 #~ "partenerului."
 
+#~ msgid "Deadline"
+#~ msgstr "Termen limita"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Cuvinte cheie speciale pentru a fi utilizate in corpul mesajului"
 
+#~ msgid "Creation Date"
+#~ msgstr "Data crearii"
+
+#~ msgid "None"
+#~ msgstr "Niciunul"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(obiect_telefon_utilizator) = Responsabil telefon"
 
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumente nevalide"
 
+#~ msgid "Note"
+#~ msgstr "Nota"
+
 #~ msgid "Call Object Method"
 #~ msgstr "Metoda de apel a obiectului"
 
+#~ msgid "Date"
+#~ msgstr "Data"
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr ""
 #~ "Nu a fost gasit nici un ID de email pentru Adresa companiei dumneavoastra!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Intarziere dupa data declansarii, specifica faptul ca puteti sa introduceti "
+#~ "un numar negativ. Daca doriti o intarziere inainte de data declansarii, "
+#~ "precum trimiterea unui memento cu 15 minute inaintea unei intalniri."
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -513,6 +575,9 @@ msgstr ""
 #~ msgid "Conditions on States"
 #~ msgstr "Conditii privind Starile"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Conditii privind Sincronizarea"
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Mesaj la aceste e-mail-uri"
 
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index 3683a1fbafe..567a845f876 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Правила действий"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Ответственный"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Примечание"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Категория партнера"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Задержка после даты активации"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"если поле \"Активно\" установлено в \"ложь\", то это позволит вам скрыть "
-"правило без его удаления."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Условия"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Правило действия"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Поля для изменения"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Кнопка нажата"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Дата последнего действия"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Часы"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Уснатовить состояние в"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Задержка после даты активации может быть отрицательным числом. Если вы "
-"хотите предупреждение до события. Например, предупреждение за 15 минут перед "
-"совещанием."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Дата"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Активен"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Задержка после даты активации"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Установить ответственного по"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Ничего"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Месяцы"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Название правила"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Месяцы"
 msgid "Automated Actions"
 msgstr "Автоматизированные действия"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Упорядочивает по полю последовательности при выводе списка правил."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Условия для полей модели"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Действие сервера"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Месяцы"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Дней"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Тип задержки"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Фильтр"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Активен"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Регулярное выражение для названия ресурса"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,37 +244,21 @@ msgid "Minutes"
 msgstr "Минуты"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Регулярное выражение для проверки названия ресурса\n"
-"напр. 'urgent.*' соответствует записям, начинающимся со строки 'urgent'.\n"
-"Прим.: поиск чувствителен к регистру."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Условия по времени"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Название правила"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Условия для модели контрагента"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,36 +281,40 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Дата создания"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Дата создания"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Срок"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Контрагент"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Дата активации"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Set State to"
+#~ msgstr "Уснатовить состояние в"
+
 #~ msgid "Email From"
 #~ msgstr "Форма эл. письма"
 
@@ -336,6 +327,9 @@ msgstr ""
 #~ msgid "Mail to these Emails"
 #~ msgstr "Отправить письма по этим эл. адресам"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Кнопка нажата"
+
 #~ msgid "Object"
 #~ msgstr "Объект"
 
@@ -348,6 +342,9 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Напомнить партнеру"
 
+#~ msgid "Partner Category"
+#~ msgstr "Категория партнера"
+
 #~ msgid ""
 #~ "These people will receive a copy of the future communication between partner "
 #~ "and users by email"
@@ -367,15 +364,30 @@ msgstr ""
 #~ msgstr ""
 #~ "Отметьте, если вы хотите иметь правило напоминания партнеру по эл. почте."
 
+#~ msgid "Deadline"
+#~ msgstr "Срок"
+
 #~ msgid "Email Body"
 #~ msgstr "Тело эл. письма"
 
 #~ msgid "State"
 #~ msgstr "Состояние"
 
+#~ msgid "Creation Date"
+#~ msgstr "Дата создания"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Дата последнего действия"
+
 #~ msgid "Email Reminders"
 #~ msgstr "Напоминания по эп. почте"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Установить ответственного по"
+
+#~ msgid "None"
+#~ msgstr "Ничего"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = телефон ответственного"
 
@@ -402,6 +414,9 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Вызов метода объекта"
 
+#~ msgid "Filter"
+#~ msgstr "Фильтр"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Напомнить ответственным"
 
@@ -409,6 +424,15 @@ msgstr ""
 #~ msgstr ""
 #~ "Этот модуль позволяет устанавливать правила действий по всем объектам."
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Задержка после даты активации может быть отрицательным числом. Если вы "
+#~ "хотите предупреждение до события. Например, предупреждение за 15 минут перед "
+#~ "совещанием."
+
 #~ msgid "Email Information"
 #~ msgstr "Информация эл. почты"
 
@@ -429,6 +453,9 @@ msgstr ""
 #~ "прим.: при каком условии какое действие и по какому объекту должно быть "
 #~ "выполнено"
 
+#~ msgid "Date"
+#~ msgstr "Дата"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Получатели копий (CC)"
 
@@ -450,15 +477,28 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Копии (CC)"
 
+#~ msgid "Server Action"
+#~ msgstr "Действие сервера"
+
 #~ msgid "Conditions on States"
 #~ msgstr "Условия по продажам"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "если поле \"Активно\" установлено в \"ложь\", то это позволит вам скрыть "
+#~ "правило без его удаления."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Имя ответственного"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Специальные ключевые слова используемые в тексте"
 
+#~ msgid "Note"
+#~ msgstr "Примечание"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Название партнера"
 
@@ -469,6 +509,15 @@ msgstr ""
 #~ "Отметьте, если вы хотите иметь правило для маркировки CC(послать эл. письмо "
 #~ "другим получателям, определенным в действии)"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Условия по времени"
+
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Условия для полей модели"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Регулярное выражение для названия ресурса"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -476,6 +525,9 @@ msgstr ""
 #~ "Отметьте, если вы хотите чтобы все вложенные в объект документы были вложены "
 #~ "в отсылаемое напоминание."
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Нет ID эл. почты в адресе вашей компании!"
@@ -511,9 +563,22 @@ msgstr ""
 #~ "Используйте выражение на Python для указания поля, которое будет "
 #~ "использовано в качестве поля заголовка «Кому»"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Регулярное выражение для проверки названия ресурса\n"
+#~ "напр. 'urgent.*' соответствует записям, начинающимся со строки 'urgent'.\n"
+#~ "Прим.: поиск чувствителен к регистру."
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'From' field of the header"
 #~ msgstr ""
 #~ "Используйте выражение на Python для указания поля, которое будет "
 #~ "использовано в качестве поля заголовка «От кого»"
+
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Условия для модели контрагента"
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po
index 74a7cd90811..0c69d60fb2e 100644
--- a/addons/base_action_rule/i18n/sl.po
+++ b/addons/base_action_rule/i18n/sl.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-15 06:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Kategorija partnerja"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,47 +88,50 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Pritisnjeni gumb"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
 msgstr ""
 
 #. module: base_action_rule
@@ -115,33 +140,14 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Nastavi stanje na"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
 msgstr ""
 
 #. module: base_action_rule
@@ -150,44 +156,46 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
+#: view:base.action.rule:0
+msgid "Filter Condition"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Ime pravila"
+
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
 #: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
 msgstr ""
 
 #. module: base_action_rule
@@ -195,29 +203,29 @@ msgstr ""
 msgid "Days"
 msgstr "Dnevi"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Minute"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Ime pravila"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,48 +281,58 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Ustvarjeno dne"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Rok"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Stranka"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Sporočila na te e-pošte"
 
 #~ msgid "Email From"
 #~ msgstr "E-pošta od"
 
+#~ msgid "Set State to"
+#~ msgstr "Nastavi stanje na"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Pritisnjeni gumb"
+
 #~ msgid "Object"
 #~ msgstr "Predmet"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Opomni partnerja"
 
+#~ msgid "Partner Category"
+#~ msgstr "Kategorija partnerja"
+
 #~ msgid "Email Body"
 #~ msgstr "Vsebina e-pošte"
 
@@ -349,3 +354,9 @@ msgstr ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
 #~ "Označite to, če želite da pravilo pošlje opomnik po e-pošti partnerju."
+
+#~ msgid "Deadline"
+#~ msgstr "Rok"
+
+#~ msgid "Creation Date"
+#~ msgstr "Ustvarjeno dne"
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_action_rule/i18n/sq.po
index 6a3dc74a5e6..4e1e39350b1 100644
--- a/addons/base_action_rule/i18n/sq.po
+++ b/addons/base_action_rule/i18n/sq.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,47 +88,50 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
 msgstr ""
 
 #. module: base_action_rule
@@ -115,33 +140,14 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
 msgstr ""
 
 #. module: base_action_rule
@@ -150,18 +156,30 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
+#: view:base.action.rule:0
+msgid "Filter Condition"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
 msgstr ""
 
 #. module: base_action_rule
@@ -170,24 +188,14 @@ msgstr ""
 msgid "Automated Actions"
 msgstr ""
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
 msgstr ""
 
 #. module: base_action_rule
@@ -195,29 +203,29 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,22 +244,14 @@ msgid "Minutes"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
-msgstr ""
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
 #. module: base_action_rule
@@ -259,11 +259,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,32 +281,33 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr ""
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index 05411f9c876..55ecfa98985 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/i18n/sr.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:29+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Pravila Akcije"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Odgovoran"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Napomena"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Kategorija partnera"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Kasnjenje nakon datuma okidaca"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Ako je aktivno polje postavljeno na NEISTINA, omogucava ti da sakrijes "
-"pravilo bez uklanjanja istog."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Uslovi"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Pravilo Akcije"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Polja za Menjanje"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Pritisnuto dugme"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Datum poslednje akcije"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Postavi stanje na"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Kasnjenje nakon datuma okidaca, specificira da mozes postaviti i negativni "
-"broj. Ako trebas kasnjenje pre datuma okidaca, kao npr slanje podsetnika 15 "
-"minuta pre sastanka."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Kasnjenje nakon datuma okidaca"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Postavi odgovornost na"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "NIjedan"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meseci"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Naziv pravila"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Meseci"
 msgid "Automated Actions"
 msgstr "Automatske Akcije"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Daje redosled sekvenci pri prikazu liste pravila"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Uslovi na poljima modela"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Akcije Servera"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meseci"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dana"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tip Kasnjenja"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex na Imenu Resursa"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,37 +244,21 @@ msgid "Minutes"
 msgstr "Minute"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Regularna expresija za podudarnost imena resursa\n"
-"npr: 'hitno.*' ce traziti zapise koji pocinju sa 'hitno'\n"
-"Napomena: Ovo pretrazivanje je osetljivo na velicinu slova."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Uslovi vezani za Vreme"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Naziv pravila"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvence"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Uslovi za Model Partnera"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Datum Kreiranja"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Krajnji Rok"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Datum Okidanja"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Email za Ostale Emailove"
 
@@ -331,6 +319,12 @@ msgstr ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr "Označite ukoliko želite da pravilo šalje email odgovornoj osobi."
 
+#~ msgid "Set State to"
+#~ msgstr "Postavi stanje na"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Pritisnuto dugme"
+
 #~ msgid "Object"
 #~ msgstr "Objekat"
 
@@ -341,6 +335,9 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Podseti partnera"
 
+#~ msgid "Partner Category"
+#~ msgstr "Kategorija partnera"
+
 #~ msgid "Email Body"
 #~ msgstr "Email Sadrzaj"
 
@@ -361,10 +358,16 @@ msgstr ""
 #~ msgid "Email Reminders"
 #~ msgstr "Email podsetnici"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Uslovi za Model Partnera"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr "oznaci ovde ako zelis da pravilo posalje Email podsetnik partnerima"
 
+#~ msgid "Deadline"
+#~ msgstr "Krajnji Rok"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Objekt subject"
 
@@ -377,6 +380,12 @@ msgstr ""
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Email-id osoba kojima treba poslati email"
 
+#~ msgid "Creation Date"
+#~ msgstr "Datum kreiranja"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Datum poslednje akcije"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -387,6 +396,9 @@ msgstr ""
 #~ msgid "Email From"
 #~ msgstr "Email Od"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Postavi odgovornost na"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = Dezurni telefon"
 
@@ -399,9 +411,22 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Neispravni argumenti"
 
+#~ msgid "None"
+#~ msgstr "NIjedan"
+
 #~ msgid "Email To"
 #~ msgstr "Email ZA"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Regularna expresija za podudarnost imena resursa\n"
+#~ "npr: 'hitno.*' ce traziti zapise koji pocinju sa 'hitno'\n"
+#~ "Napomena: Ovo pretrazivanje je osetljivo na velicinu slova."
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -416,6 +441,9 @@ msgstr ""
 #~ "Koristi python expresiju da specificiras pravo polje koje ce mo na dalje "
 #~ "koristiti za \" OD\" polje zaglavlja"
 
+#~ msgid "Note"
+#~ msgstr "Napomena"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "Copy text \t %(partner)s = Partnerovo Ime"
 
@@ -429,6 +457,9 @@ msgstr ""
 #~ msgid "Call Object Method"
 #~ msgstr "Pozovi Metod Objekta"
 
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Odgovorni Podsetnik"
 
@@ -440,6 +471,15 @@ msgstr ""
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "NIje nadjena sifra Emaila  adrese tvog Preduzeca"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Kasnjenje nakon datuma okidaca, specificira da mozes postaviti i negativni "
+#~ "broj. Ako trebas kasnjenje pre datuma okidaca, kao npr slanje podsetnika 15 "
+#~ "minuta pre sastanka."
+
 #~ msgid "Email Information"
 #~ msgstr "Informacije Email-a"
 
@@ -460,6 +500,12 @@ msgstr ""
 #~ "npr: sa kojim objektom koja se akcija treba prvo preduzeti i pod kojim "
 #~ "uslovima"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "Posalji pratiocima(CC)"
 
@@ -481,12 +527,31 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Dodaj Pratioce (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Uslovi na poljima modela"
+
+#~ msgid "Server Action"
+#~ msgstr "Akcije Servera"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Ako je aktivno polje postavljeno na NEISTINA, omogucava ti da sakrijes "
+#~ "pravilo bez uklanjanja istog."
+
 #~ msgid "Conditions on States"
 #~ msgstr "Uslovi vezani za Stanja"
 
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Ime Odgovornog"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Uslovi vezani za Vreme"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex na Imenu Resursa"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index ce219b1d5ec..e06f6d0cec0 100644
--- a/addons/base_action_rule/i18n/sr@latin.po
+++ b/addons/base_action_rule/i18n/sr@latin.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:43+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Pravila Akcije"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Odgovoran"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Napomena"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Kategorija partnera"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Kasnjenje nakon datuma okidaca"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Ako je aktivno polje postavljeno na NEISTINA, omogucava ti da sakrijes "
-"pravilo bez uklanjanja istog."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Uslovi"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Pravilo Akcije"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Polja za Menjanje"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Pritisnuto dugme"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Datum poslednje akcije"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Postavi stanje na"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Kasnjenje nakon datuma okidaca, specificira da mozes postaviti i negativni "
-"broj. Ako trebas kasnjenje pre datuma okidaca, kao npr slanje podsetnika 15 "
-"minuta pre sastanka."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Kasnjenje nakon datuma okidaca"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Postavi odgovornost na"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "NIjedan"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Meseci"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Naziv pravila"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Meseci"
 msgid "Automated Actions"
 msgstr "Automatske Akcije"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Daje redosled sekvenci pri prikazu liste pravila"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Uslovi na poljima modela"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Akcije Servera"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meseci"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dana"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Tip Kasnjenja"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Regex na Imenu Resursa"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,37 +244,21 @@ msgid "Minutes"
 msgstr "Minute"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Regularna expresija za podudarnost imena resursa\n"
-"npr: 'hitno.*' ce traziti zapise koji pocinju sa 'hitno'\n"
-"Napomena: Ovo pretrazivanje je osetljivo na velicinu slova."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Uslovi vezani za Vreme"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Naziv pravila"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvence"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Uslovi za Model Partnera"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,36 +281,37 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Datum Kreiranja"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Krajnji Rok"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Datum Okidanja"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr "Označite ukoliko želite da pravilo šalje email odgovornoj osobi."
@@ -331,16 +319,25 @@ msgstr ""
 #~ msgid "Remind Partner"
 #~ msgstr "Podseti partnera"
 
+#~ msgid "Partner Category"
+#~ msgstr "Kategorija partnera"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr "Označite ukoliko želite da pravilo šalje podsjetnik korisniku."
 
+#~ msgid "Button Pressed"
+#~ msgstr "Pritisnuto dugme"
+
 #~ msgid "Object"
 #~ msgstr "Objekat"
 
 #~ msgid "Mail to these Emails"
 #~ msgstr "Email za Ostale Emailove"
 
+#~ msgid "Set State to"
+#~ msgstr "Postavi stanje na"
+
 #~ msgid "Email From"
 #~ msgstr "Email Od"
 
@@ -365,6 +362,12 @@ msgstr ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr "oznaci ovde ako zelis da pravilo posalje Email podsetnik partnerima"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Uslovi za Model Partnera"
+
+#~ msgid "Deadline"
+#~ msgstr "Krajnji Rok"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject)s = Objekt subject"
 
@@ -380,6 +383,12 @@ msgstr ""
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Email-id osoba kojima treba poslati email"
 
+#~ msgid "Creation Date"
+#~ msgstr "Datum kreiranja"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Datum poslednje akcije"
+
 #~ msgid "%(object_id)s = Object ID"
 #~ msgstr "%(object_id)s = Object ID"
 
@@ -389,6 +398,12 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Neispravni argumenti"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Postavi odgovornost na"
+
+#~ msgid "None"
+#~ msgstr "NIjedan"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'To' field of the header"
@@ -406,6 +421,16 @@ msgstr ""
 #~ "Pravilo koristi AND operator. Modul mora da potvrdi sva prazna polja tako da "
 #~ "pravilo izvrsi akciju opisanoj u tabu ' Akcije'."
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Regularna expresija za podudarnost imena resursa\n"
+#~ "npr: 'hitno.*' ce traziti zapise koji pocinju sa 'hitno'\n"
+#~ "Napomena: Ovo pretrazivanje je osetljivo na velicinu slova."
+
 #~ msgid "Call Object Method"
 #~ msgstr "Pozovi Metod Objekta"
 
@@ -422,6 +447,9 @@ msgstr ""
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "Copy text \t %(partner)s = Partnerovo Ime"
 
+#~ msgid "Note"
+#~ msgstr "Napomena"
+
 #~ msgid ""
 #~ "Use a python expression to specify the right field on which one than we will "
 #~ "use for the 'From' field of the header"
@@ -429,6 +457,15 @@ msgstr ""
 #~ "Koristi python expresiju da specificiras pravo polje koje ce mo na dalje "
 #~ "koristiti za \" OD\" polje zaglavlja"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Kasnjenje nakon datuma okidaca, specificira da mozes postaviti i negativni "
+#~ "broj. Ako trebas kasnjenje pre datuma okidaca, kao npr slanje podsetnika 15 "
+#~ "minuta pre sastanka."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "NIje nadjena sifra Emaila  adrese tvog Preduzeca"
@@ -440,6 +477,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Ovaj modul omogucava implementiranje pravila akcija za svaki objekat."
 
+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid ""
 #~ "Describes the action name.\n"
 #~ "eg:on which object which action to be taken on basis of which condition"
@@ -448,6 +491,9 @@ msgstr ""
 #~ "npr: sa kojim objektom koja se akcija treba prvo preduzeti i pod kojim "
 #~ "uslovima"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "%(object_description)s = Object description"
 #~ msgstr "%(object_description)s = Opis Objekta"
 
@@ -481,6 +527,15 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Dodaj Pratioce (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Uslovi na poljima modela"
+
+#~ msgid "Server Action"
+#~ msgstr "Akcije Servera"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Regex na Imenu Resursa"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -488,6 +543,16 @@ msgstr ""
 #~ "Cekiraj ovde ako zelis da svi dokumenti pridodati objektu budu pridodani "
 #~ "podsetniku za slanje Emailova"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "Uslovi vezani za Vreme"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Ako je aktivno polje postavljeno na NEISTINA, omogucava ti da sakrijes "
+#~ "pravilo bez uklanjanja istog."
+
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(object_user)s = Ime Odgovornog"
 
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index 188bc8c22a0..9520bb584b7 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-16 15:31+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Ansvarig"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Anteckning"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Partnerkategori"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Villkor"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Fält att ändra"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Knappen intryckt"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Senaste uppdatering"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "Timmar"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Sätt status till"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Datum"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Ledtid efter utlösningsdatum"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Sätt ansvarig till"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Inga"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Månader"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regelnamn"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "Månader"
 msgid "Automated Actions"
 msgstr "Automatiserade händelser"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr ""
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Månader"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Dagar"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Filtrera"
-
-#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "Minuter"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Regelnamn"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Sekvens"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,42 +281,49 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Skapad datum"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Skapat datum"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Tidsfrist"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Företag"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Set State to"
+#~ msgstr "Sätt status till"
+
 #~ msgid "Object"
 #~ msgstr "Objekt"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Påminn partner"
 
+#~ msgid "Partner Category"
+#~ msgstr "Partnerkategori"
+
 #, python-format
 #~ msgid "Error!"
 #~ msgstr "Fel!"
@@ -329,12 +331,33 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Svara till"
 
+#~ msgid "Button Pressed"
+#~ msgstr "Knappen intryckt"
+
 #~ msgid "%(object_subject)s = Object subject"
 #~ msgstr "%(object_subject) = Objekt ämnen"
 
+#~ msgid "Creation Date"
+#~ msgstr "Skapad datum"
+
+#~ msgid "None"
+#~ msgstr "Inga"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Ogiltiga argument"
 
+#~ msgid "Note"
+#~ msgstr "Anteckning"
+
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Filter"
+#~ msgstr "Filtrera"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "Lägg till bevakare (CC)"
 
@@ -350,9 +373,18 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Status"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Senaste uppdatering"
+
+#~ msgid "Deadline"
+#~ msgstr "Tidsfrist"
+
 #~ msgid "Mail to these Emails"
 #~ msgstr "Skicka till dessa e-postadresser"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Sätt ansvarig till"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Speciella nyckelord att använda i brödtexten"
 
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
index 07a64405c2e..279cf68af84 100644
--- a/addons/base_action_rule/i18n/tr.po
+++ b/addons/base_action_rule/i18n/tr.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "Eylem Kuralları"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "Sorumlu"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "Not"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "Paydaş Kategorisi"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,50 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "Tetikleme Tarihi sonrası Gecikme"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-"Eğer etkin alanı Yanlış olarak işaretli ise, kuralı silmeden gizlemenizi "
-"sağlar."
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "Koşullar"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "Eylem Kuralı"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "Değiştirilecek Alanlar"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "Düğmeye Basıldı"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "Son Eylem Tarihi"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -117,37 +140,15 @@ msgid "Hours"
 msgstr "Saatler"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "Durumu şuna Ayarla"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-"Tetikleme Sonrası Gecikme, burada negatif sayı kullanabilirsiniz. Eğer "
-"tetikleme tarihinden önce, örneğin toplantıdan 15 dakika önce anımsatma "
-"gönder gibi, bir gecikmeye gerek duyarsanız."
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "Tarih"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "Etkin"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "Tetikleme Tarihi sonrası Gecikme"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "Sorumluyu şuna Ayarla"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "Hiçbiri"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "Aylar"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Kural Adı"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -175,54 +188,44 @@ msgstr "Aylar"
 msgid "Automated Actions"
 msgstr "Otomatik Eylemler"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "Kural listesini görüntülerken diziliş sırasını verir."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "Model Alanları Koşulları"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "Sunucu Eylemi"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Aylar"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "Günler"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "Gecikme türü"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "Süzgeç"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "Etkin"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "Kaynak Adı için Kurallı İfade"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -241,37 +244,21 @@ msgid "Minutes"
 msgstr "Dakikalar"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"Kaynak adına uygun kural ifadesi\n"
-"ör.: 'acil.*' 'acil' dizesi ile başlayan bütün kayıtları arıyacaktır\n"
-"Not: Harf durumu duyarlı bir aramadır."
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "Zamanlama Koşulları"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "Kural Adı"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "Diziliş"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "Model Paydaş için Koşullar"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -294,42 +281,52 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "Oluşturulma Tarihi"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "Tarih Oluştur"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "Bitiş tarihi"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "Paydaş"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "Tetikleme Tarihi"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
+#~ msgid "Set State to"
+#~ msgstr "Durumu şuna Ayarla"
+
+#~ msgid "Button Pressed"
+#~ msgstr "Düğmeye Basıldı"
+
 #~ msgid "Object"
 #~ msgstr "Nesne"
 
 #~ msgid "Remind Partner"
 #~ msgstr "Paydaşa Anımsat"
 
+#~ msgid "Partner Category"
+#~ msgstr "Paydaş Kategorisi"
+
 #~ msgid "Email Body"
 #~ msgstr "Eposta Gövdesi"
 
@@ -347,18 +344,33 @@ msgstr ""
 #~ msgid "Reply-To"
 #~ msgstr "Yanıtla"
 
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "Model Paydaş için Koşullar"
+
+#~ msgid "Deadline"
+#~ msgstr "Bitiş tarihi"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Gövdede Kullanılacak Özel Anahtar Kelimeler"
 
 #~ msgid "Email-id of the persons whom mail is to be sent"
 #~ msgstr "Eposta gönderilecek kişinin Eposta kimliği"
 
+#~ msgid "Creation Date"
+#~ msgstr "Oluşturulma Tarihi"
+
 #~ msgid "State"
 #~ msgstr "Durum"
 
 #~ msgid "Email Reminders"
 #~ msgstr "Eposta Anımsatıcıları"
 
+#~ msgid "Last Action Date"
+#~ msgstr "Son Eylem Tarihi"
+
+#~ msgid "None"
+#~ msgstr "Hiçbiri"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(nesne_kullanıcı_telefon)lar = Sorumlu telefonu"
 
@@ -371,9 +383,21 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Geçersiz parametreler"
 
+#~ msgid "Set Responsible to"
+#~ msgstr "Sorumluyu şuna Ayarla"
+
 #~ msgid "Email To"
 #~ msgstr "Şuna Eposta Gönder"
 
+#~ msgid "Note"
+#~ msgstr "Not"
+
+#~ msgid "Filter"
+#~ msgstr "Süzgeç"
+
+#~ msgid "Date"
+#~ msgstr "Tarih"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "Sorumluya Hatırlat"
 
@@ -399,6 +423,9 @@ msgstr ""
 #~ "Eylem adını belirtir.\n"
 #~ "ör:koşula uygun olarak hangi nesne için hangi eylem ele alınır"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
 #~ msgid "Mail body"
 #~ msgstr "Posta gövdesi"
 
@@ -417,6 +444,12 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "İzleyici Ekle (Cc)"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "Model Alanları Koşulları"
+
+#~ msgid "Server Action"
+#~ msgstr "Sunucu Eylemi"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -429,6 +462,16 @@ msgstr ""
 #~ msgid "%(object_user)s = Responsible name"
 #~ msgstr "%(nesne_kullanıcı)lar = Sorumlu adı"
 
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Eğer etkin alanı Yanlış olarak işaretli ise, kuralı silmeden gizlemenizi "
+#~ "sağlar."
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Zamanlama Koşulları"
+
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
@@ -470,6 +513,16 @@ msgstr ""
 #~ "Başlıkta 'Kime' için kullanılacak  doğru alanı belirlemek için bir python "
 #~ "ifadesi kullanın"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "Kaynak adına uygun kural ifadesi\n"
+#~ "ör.: 'acil.*' 'acil' dizesi ile başlayan bütün kayıtları arıyacaktır\n"
+#~ "Not: Harf durumu duyarlı bir aramadır."
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -505,9 +558,21 @@ msgstr ""
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Firma adresinizde bir Eposta Kimliği yok!"
 
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr ""
+#~ "Tetikleme Sonrası Gecikme, burada negatif sayı kullanabilirsiniz. Eğer "
+#~ "tetikleme tarihinden önce, örneğin toplantıdan 15 dakika önce anımsatma "
+#~ "gönder gibi, bir gecikmeye gerek duyarsanız."
+
 #~ msgid "Email Information"
 #~ msgstr "Eposta Bilgisi"
 
+#~ msgid "Regex on Resource Name"
+#~ msgstr "Kaynak Adı için Kurallı İfade"
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "İzleyicilere Postala (CC)"
 
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 24a52a78e29..06117523edd 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -7,27 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 04:40+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
-msgstr "设置关注者"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
-msgstr "这条规则用了AND 操作符。这个模型必须匹配所有非空字段，这样这条规则执行在“动作”便签里说明的动作"
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
+msgstr ""
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "动作规则"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr "负责人"
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
-msgstr "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "备注"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "业务伙伴分类"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr "触发日期后的延迟"
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr "如果有效字段不选择，你可以隐藏它而无需删除。"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "条件"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "动作规则"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "会更改的字段"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr "按下按钮"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "最后动作日期"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,36 +140,15 @@ msgid "Hours"
 msgstr "时"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
-msgstr "设置状态为"
-
-#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
-"定义服务器动作。\n"
-"例如：Emaik 提醒，调用Object Service，等"
 
 #. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr "你可以填一个负数来推迟触发日期，例如你在开会前要推迟15分钟触发"
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr "ir.cron"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "日期"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "激活"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -152,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr "触发日期后的延迟"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
-msgstr "设置负责人"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "无"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "月"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "规则名称"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -172,54 +188,44 @@ msgstr "月"
 msgid "Automated Actions"
 msgstr "自动动作"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr "为规则列表添加序号"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr "作用于模型字段上的条件"
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "服务器动作"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "月"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "天数"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "延迟类型"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
-msgstr "筛选"
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "激活"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
-msgstr "正则表达式对资源名称"
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -238,37 +244,21 @@ msgid "Minutes"
 msgstr "分"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
 msgstr ""
-"正则表达式匹配的资源名称\n"
-"如：“紧急.*'将搜索字符串”紧急“的名称开始记录\n"
-"注：这是区分大小写的搜索。"
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr "时间条件"
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "规则名称"
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr "序号"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr "业务伙伴模型的条件"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -291,45 +281,52 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "创建日期"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "创建时间"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "截止日期"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr "触发日期"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Mail to Watchers (CC)"
 #~ msgstr "抄送"
 
+#~ msgid "Set State to"
+#~ msgstr "设置状态为"
+
 #~ msgid "Email From"
 #~ msgstr "发件人"
 
 #~ msgid "Mail to these Emails"
 #~ msgstr "要发邮件的地址"
 
+#~ msgid "Button Pressed"
+#~ msgstr "按下按钮"
+
 #~ msgid "Object"
 #~ msgstr "对象"
 
@@ -350,15 +347,27 @@ msgstr ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr "如果您希望该规则发送提醒邮件给业务伙伴的话请选中此项。"
 
+#~ msgid "Deadline"
+#~ msgstr "截止日期"
+
 #~ msgid "State"
 #~ msgstr "状态"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "指定正文里的关键字"
 
+#~ msgid "Creation Date"
+#~ msgstr "创建日期"
+
 #~ msgid "Email Reminders"
 #~ msgstr "电子邮件提醒"
 
+#~ msgid "Last Action Date"
+#~ msgstr "最后动作日期"
+
+#~ msgid "None"
+#~ msgstr "无"
+
 #~ msgid "%(object_user_phone)s = Responsible phone"
 #~ msgstr "%(object_user_phone)s = 责任人电话"
 
@@ -371,12 +380,18 @@ msgstr ""
 #~ msgid "Email To"
 #~ msgstr "邮件至"
 
+#~ msgid "Note"
+#~ msgstr "备注"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = 业务伙伴名称"
 
 #~ msgid "Call Object Method"
 #~ msgstr "调用对象方法"
 
+#~ msgid "Date"
+#~ msgstr "日期"
+
 #~ msgid "Remind Responsible"
 #~ msgstr "提醒责任人"
 
@@ -415,9 +430,18 @@ msgstr ""
 #~ msgid "Add Watchers (Cc)"
 #~ msgstr "添加抄送人"
 
+#~ msgid "Conditions on Model Fields"
+#~ msgstr "作用于模型字段上的条件"
+
+#~ msgid "Server Action"
+#~ msgstr "服务器动作"
+
 #~ msgid "Conditions on States"
 #~ msgstr "状态条件"
 
+#~ msgid "Conditions on Timing"
+#~ msgstr "时间条件"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
 #~ msgstr "如果您希望发送邮件给负责人的话请选中此处"
@@ -437,6 +461,19 @@ msgstr ""
 #~ "使用自动操作，自动触发各种屏幕的行动。例：一个特定的用户创建了一个线索可能被自动归为一个特定的销售队伍，或商机仍然保持状态，可能待14天之后会触发自动电子"
 #~ "邮件提醒。"
 
+#~ msgid ""
+#~ "Regular expression for matching name of the resource\n"
+#~ "e.g.: 'urgent.*' will search for records having name starting with the "
+#~ "string 'urgent'\n"
+#~ "Note: This is case sensitive search."
+#~ msgstr ""
+#~ "正则表达式匹配的资源名称\n"
+#~ "如：“紧急.*'将搜索字符串”紧急“的名称开始记录\n"
+#~ "注：这是区分大小写的搜索。"
+
+#~ msgid "Set Responsible to"
+#~ msgstr "设置负责人"
+
 #~ msgid ""
 #~ "The rule uses the AND operator. The model must match all non-empty fields so "
 #~ "that the rule executes the action described in the 'Actions' tab."
@@ -484,6 +521,12 @@ msgstr ""
 #~ "描述动作的名称。\n"
 #~ "例如：哪些对象在哪些条件的基础上应采取的行动"
 
+#~ msgid "ir.cron"
+#~ msgstr "ir.cron"
+
+#~ msgid "Regex on Resource Name"
+#~ msgstr "正则表达式对资源名称"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr "这个模块允许任何对象实现的行动规则。"
 
@@ -491,3 +534,23 @@ msgstr ""
 #~ "Check this if you want that all documents attached to the object be attached "
 #~ "to the reminder email sent."
 #~ msgstr "如果你想作为附件添加对象的所有文件到一个提醒邮件，勾选这"
+
+#~ msgid ""
+#~ "Delay After Trigger Date,specifies you can put a negative number. If you "
+#~ "need a delay before the trigger date, like sending a reminder 15 minutes "
+#~ "before a meeting."
+#~ msgstr "你可以填一个负数来推迟触发日期，例如你在开会前要推迟15分钟触发"
+
+#~ msgid "Partner Category"
+#~ msgstr "业务伙伴分类"
+
+#~ msgid "Conditions on Model Partner"
+#~ msgstr "业务伙伴模型的条件"
+
+#~ msgid "Filter"
+#~ msgstr "筛选"
+
+#~ msgid ""
+#~ "If the active field is set to False, it will allow you to hide the rule "
+#~ "without removing it."
+#~ msgstr "如果有效字段不选择，你可以隐藏它而无需删除。"
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_action_rule/i18n/zh_TW.po
index 43de77876b4..19c61309ed4 100644
--- a/addons/base_action_rule/i18n/zh_TW.po
+++ b/addons/base_action_rule/i18n/zh_TW.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-27 12:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
-"The rule uses the AND operator. The model must match all non-empty fields so "
-"that the rule executes the action  described in the 'Actions' tab."
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
 msgstr ""
 
 #. module: base_action_rule
@@ -35,30 +36,51 @@ msgid "Action Rules"
 msgstr "動作規則"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
-msgstr "備註"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
-msgstr "伙伴分類"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
+#: help:base.action.rule,trg_date_range:0
 msgid ""
-"Server Actions to be Triggered (eg. Email Reminder, Call Object Method, "
-"etc...)"
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
 msgstr ""
 
 #. module: base_action_rule
@@ -66,48 +88,51 @@ msgstr ""
 msgid "Delay after trigger date"
 msgstr ""
 
-#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the rule "
-"without removing it."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
 msgstr "條件"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
 msgid "Status"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
 msgid "Action Rule"
 msgstr "動作規則"
 
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
 msgstr "要變更欄位"
 
-#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "The filter must therefore be available in this page."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
-msgstr "最後動作日期"
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,34 +140,15 @@ msgid "Hours"
 msgstr "小時"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
 msgstr ""
 
 #. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid ""
-"Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid ""
-"Delay After Trigger Date,specifies you can put a negative number. If you "
-"need a delay before the trigger date, like sending a reminder 15 minutes "
-"before a meeting."
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
-msgstr ""
-
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
-msgstr "日期"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr "活躍"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -150,19 +156,31 @@ msgid "Delay After Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
-msgstr "無"
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
-msgstr "月"
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "規則名稱"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -170,54 +188,44 @@ msgstr "月"
 msgid "Automated Actions"
 msgstr "自動化動作"
 
-#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
 
 #. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
-msgstr "伺服器動作"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "月"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
 msgstr "日"
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
 msgstr "延遲類型"
 
 #. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
+#: view:base.action.rule:0
+msgid "Server actions to run"
 msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
-msgstr "活躍"
-
-#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
 msgstr ""
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: base_action_rule
@@ -236,34 +244,21 @@ msgid "Minutes"
 msgstr "分鐘"
 
 #. module: base_action_rule
-#: help:base.action.rule,regex_name:0
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
 msgid ""
-"Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the "
-"string 'urgent'\n"
-"Note: This is case sensitive search."
+"If present, this condition must be satisfied before the update of the record."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
-msgstr "規則名稱"
-
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
@@ -286,42 +281,64 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr "建立日期"
-
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
 msgstr "建立日期"
 
 #. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
-msgstr "最後限期"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
 msgid "Partner"
 msgstr "伙伴"
 
 #. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
 msgstr ""
 
 #. module: base_action_rule
 #: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
 #~ msgid "Object"
 #~ msgstr "物件"
 
+#~ msgid "Partner Category"
+#~ msgstr "伙伴分類"
+
+#~ msgid "Deadline"
+#~ msgstr "最後限期"
+
+#~ msgid "Creation Date"
+#~ msgstr "建立日期"
+
+#~ msgid "Last Action Date"
+#~ msgstr "最後動作日期"
+
+#~ msgid "None"
+#~ msgstr "無"
+
 #~ msgid "Email To"
 #~ msgstr "電郵至"
 
+#~ msgid "Note"
+#~ msgstr "備註"
+
+#~ msgid "Date"
+#~ msgstr "日期"
+
 #~ msgid "Email Information"
 #~ msgstr "電郵資料"
 
@@ -334,5 +351,8 @@ msgstr ""
 #~ msgid "Mail body"
 #~ msgstr "郵件內文"
 
+#~ msgid "Server Action"
+#~ msgstr "伺服器動作"
+
 #~ msgid "%(object_date)s = Creation date"
 #~ msgstr "%(object_date)s = 建立日期"
diff --git a/addons/base_calendar/i18n/af.po b/addons/base_calendar/i18n/af.po
index ea4ad0942fa..dde5d36fecc 100644
--- a/addons/base_calendar/i18n/af.po
+++ b/addons/base_calendar/i18n/af.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Jacobus Erasmus <jacobus@kewlconcepts.co.za>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr "Harhalende Afspraak"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Prosedure"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Kamer"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Waarskuwing!"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "E-pos"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Kamer"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,10 +567,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,9 +979,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1053,11 +1033,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1228,7 +1203,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1354,6 +1329,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1434,6 +1414,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1454,7 +1439,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1472,7 +1457,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1485,7 +1470,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/ar.po b/addons/base_calendar/i18n/ar.po
index f0aae773625..cf3ae7dab99 100644
--- a/addons/base_calendar/i18n/ar.po
+++ b/addons/base_calendar/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr "اجتماع دوري"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr "إلى"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "خطأ!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "الإجراءات"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "معرّف التكرار"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "غرفة"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "تاريخ الهوية المكررة"
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -513,9 +509,9 @@ msgid "Email"
 msgstr "البريد الإلكتروني"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "غرفة"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -528,7 +524,7 @@ msgid "Event alarm information"
 msgstr "معلومات عن منبه الحدث"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -539,11 +535,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -572,11 +566,9 @@ msgid "Caldav URL"
 msgstr "عنوان (URL) Caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "معرّف التكرار"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -608,7 +600,7 @@ msgid "Delegrated To"
 msgstr "مفوّض إلى"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -716,12 +708,6 @@ msgstr "متاح"
 msgid "Individual"
 msgstr "فرد"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -757,7 +743,7 @@ msgid "Declined"
 msgstr "مرفوض"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -793,13 +779,6 @@ msgstr "الخصوصية"
 msgid "Basic Alarm Information"
 msgstr "معلومات المنبه الأساسي"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "الإثنين"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -999,10 +978,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "المجموعات التي ينتمي إليها المدعو"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "الإثنين"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1052,11 +1032,6 @@ msgstr "متعلق بـ"
 msgid "Interval"
 msgstr "الفترة"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1081,7 +1056,7 @@ msgid "Active"
 msgstr "نشِط"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1231,7 +1206,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1357,6 +1332,11 @@ msgstr "القيم"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1439,6 +1419,11 @@ msgstr ""
 "وتحتوي على نص لتُستخدم كعنوان رسالة للبريد الالكتروني او تحتوي على نص "
 "لتستخدم للعرض"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1459,7 +1444,7 @@ msgid "April"
 msgstr "أبريل"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1477,7 +1462,7 @@ msgid "Weekday"
 msgstr "يوم العمل"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1490,7 +1475,7 @@ msgid "By day"
 msgstr "باليوم"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1723,9 +1708,6 @@ msgstr "الخامس"
 #~ msgid "Required to Join"
 #~ msgstr "الانضمام مطلوب"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Show time as"
 #~ msgstr "عرض الوقت كـ"
 
diff --git a/addons/base_calendar/i18n/bg.po b/addons/base_calendar/i18n/bg.po
index 1afb1554b77..c243f3ade32 100644
--- a/addons/base_calendar/i18n/bg.po
+++ b/addons/base_calendar/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Повтряща се среща"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Грешка!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Процедура"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID на Повторение"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Помещение"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "Имейл"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Помещение"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr "Информация за аларма на събитие"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,11 +567,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID на Повторение"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr "Наличност"
 msgid "Individual"
 msgstr "Индивидуално"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr "Отказано"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr "Поверителност"
 msgid "Basic Alarm Information"
 msgstr "Основна информация за Аларма"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Пон"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,10 +979,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Показва групата, към която принадлежи участник"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Пон"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1053,11 +1033,6 @@ msgstr "Свързан със"
 msgid "Interval"
 msgstr "Интервал"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Активен"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1231,7 +1206,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1357,6 +1332,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1437,6 +1417,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1457,7 +1442,7 @@ msgid "April"
 msgstr "Април"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1475,7 +1460,7 @@ msgid "Weekday"
 msgstr "Ден от седмицата"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1488,7 +1473,7 @@ msgid "By day"
 msgstr "По дни"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1646,9 +1631,6 @@ msgstr "Пети"
 #~ msgid "Warning !"
 #~ msgstr "Предупреждение !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Ежегодишно"
 
diff --git a/addons/base_calendar/i18n/bn.po b/addons/base_calendar/i18n/bn.po
index 29e46badf1d..ff374651057 100644
--- a/addons/base_calendar/i18n/bn.po
+++ b/addons/base_calendar/i18n/bn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-21 12:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali <bn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "ভুল"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "রুম"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "ই-মেইল"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "রুম"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr "প্রাইভেসি"
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,9 +977,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/bs.po b/addons/base_calendar/i18n/bs.po
index f1e99c7d355..6b3720f128e 100644
--- a/addons/base_calendar/i18n/bs.po
+++ b/addons/base_calendar/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 09:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
 "Language: hr\n"
 "X-Poedit-Language: Bosnian\n"
@@ -70,12 +70,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -514,8 +510,8 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
 msgstr ""
 
 #. module: base_calendar
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,10 +567,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,9 +979,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1053,11 +1033,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Aktivan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1228,7 +1203,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1354,6 +1329,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1434,6 +1414,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1454,7 +1439,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1472,7 +1457,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1485,7 +1470,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/ca.po b/addons/base_calendar/i18n/ca.po
index be9da97ca20..a89a8f3ebe4 100644
--- a/addons/base_calendar/i18n/ca.po
+++ b/addons/base_calendar/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:47+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Reunió periòdica"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procediment"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID recurrent"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID data recurrent"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Avís!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Correu electrònic"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Informació de l'avís de l'esdeveniment"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "URL de caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrent"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegada en"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Disponibilitat"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -761,7 +747,7 @@ msgid "Declined"
 msgstr "Rebutjat"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -797,13 +783,6 @@ msgstr "Privacitat"
 msgid "Basic Alarm Information"
 msgstr "Informació sobre l'alarma bàsica"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Dll"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1005,10 +984,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indiqueu els grups als quals pertany l'assistent"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Dll"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1058,11 +1038,6 @@ msgstr "Relacionat amb"
 msgid "Interval"
 msgstr "Interval"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1087,7 +1062,7 @@ msgid "Active"
 msgstr "Actiu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1239,7 +1214,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1369,6 +1344,11 @@ msgstr "ir.valors"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunt"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1451,6 +1431,11 @@ msgstr ""
 "Conté el text que s'utilitzarà com a assumpte del missatge del correu "
 "electrònic o conté el text que s'utilitzarà per mostrar"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1471,7 +1456,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1489,7 +1474,7 @@ msgid "Weekday"
 msgstr "Dia de la setmana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1502,7 +1487,7 @@ msgid "By day"
 msgstr "Per dia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1674,9 +1659,6 @@ msgstr "Cinquè"
 #~ msgid "Warning !"
 #~ msgstr "Avís!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.adjunt"
-
 #~ msgid "Yearly"
 #~ msgstr "Anualment"
 
diff --git a/addons/base_calendar/i18n/cs.po b/addons/base_calendar/i18n/cs.po
index adb5a514df9..e547acd3443 100644
--- a/addons/base_calendar/i18n/cs.po
+++ b/addons/base_calendar/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:16+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Opakované setkání"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Chyba!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID opakování"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Místnost"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID data opakování"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "Email"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Místnost"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr "Informace budíku události"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,11 +567,9 @@ msgid "Caldav URL"
 msgstr "URL Caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID opakování"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr "Pověřit"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr "Dostupnost"
 msgid "Individual"
 msgstr "Jednotlivý"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr "Odmítnuté"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr "Soukromí"
 msgid "Basic Alarm Information"
 msgstr "Informace základního budíku"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Po"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,10 +979,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Označuje skupinu, do které účastník patří"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Po"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1053,11 +1033,6 @@ msgstr "Vztažené k"
 msgid "Interval"
 msgstr "Rozmezí"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Aktivní"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1230,7 +1205,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1357,6 +1332,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1437,6 +1417,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1457,7 +1442,7 @@ msgid "April"
 msgstr "Duben"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1475,7 +1460,7 @@ msgid "Weekday"
 msgstr "Den v týdnu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1488,7 +1473,7 @@ msgid "By day"
 msgstr "Podle dne"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1658,9 +1643,6 @@ msgstr "Pátý"
 #~ msgid "Show time as"
 #~ msgstr "Ukázat čas jako"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Ročně"
 
diff --git a/addons/base_calendar/i18n/da.po b/addons/base_calendar/i18n/da.po
index c3383450013..e8d0b053de4 100644
--- a/addons/base_calendar/i18n/da.po
+++ b/addons/base_calendar/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-01 20:11+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Fejl!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Rum"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Rum"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,9 +977,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index 2049a530a67..7adefbedcf6 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 22:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Wiederkehrender Termin"
 msgid "Feedback Meeting"
 msgstr "Rückmeldung Meeting"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Meeting <b>wurde erledigt</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Bis"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -277,6 +271,13 @@ msgstr "Meine Mettings"
 msgid "Procedure"
 msgstr "Prozedur"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Kurzbez."
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Meetings"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Raum"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Wiederk. Vorgang"
 
@@ -368,11 +364,11 @@ msgstr ""
 "html Format, um Sie später in einer Kanban Ansicht einfügen zu können."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
@@ -518,9 +514,9 @@ msgid "Email"
 msgstr "E-Mail Adresse"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "CRM Meeting: Markiere als ungelesen"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Raum"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -533,7 +529,7 @@ msgid "Event alarm information"
 msgstr "Termin Erinnerung"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "Sie können nicht negativ oder 0 sein"
@@ -544,11 +540,9 @@ msgid "Creation Date"
 msgstr "Datum Erstellung"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Meeting"
 
@@ -577,11 +571,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Kurzbez."
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -613,7 +605,7 @@ msgid "Delegrated To"
 msgstr "Delegiert an"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "Die folgenden Kontakte haben keine E-Mail Adresse hinterlegt:"
@@ -721,12 +713,6 @@ msgstr "Verfügbarkeit"
 msgid "Individual"
 msgstr "Einzeltermin"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Meeting <b>wurde bestätigt</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -762,7 +748,7 @@ msgid "Declined"
 msgstr "Abgesagt"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -800,13 +786,6 @@ msgstr "Vertraulichkeit"
 msgid "Basic Alarm Information"
 msgstr "Basisinfo Warnhinweis"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Mo"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1008,10 +987,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Anzeige der zugehörigen Gruppe des Teilnehmers"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Mo"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1061,11 +1041,6 @@ msgstr "Bezug"
 msgid "Interval"
 msgstr "Intervalle"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "CRM Meeting: Markiere als ungelesen"
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1090,7 +1065,7 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Sie können einen Teilnehmer nicht duplizieren"
@@ -1250,7 +1225,7 @@ msgid "Select Weekdays"
 msgstr "Auswahl Wochentage"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1378,6 +1353,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr "Suche Meetings"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1468,6 +1448,11 @@ msgstr ""
 "Beinhaltet den Text für die neue Betreffzeile von Benachrichtigung mittels E-"
 "Mail oder für die Benachrichtigung"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1488,7 +1473,7 @@ msgid "April"
 msgstr "April"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "E-Mail Adresse wurde nicht gefunden"
@@ -1506,7 +1491,7 @@ msgid "Weekday"
 msgstr "Wochentag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "Zeitraum kann nicht negativ sein"
@@ -1519,7 +1504,7 @@ msgid "By day"
 msgstr "Nach Tag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "Als erstes müssen Sie dann das Datum der Einladung akzeptieren."
@@ -1906,9 +1891,6 @@ msgstr "5ter"
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Edit all Occurrences  of recurrent Meeting."
 #~ msgstr "Bearbeite alle Einträge für wiederkehrende Termine"
 
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index 7fe5af7a39f..a111239f416 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Λάθος!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Διαδικασία"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Περιοδικό ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Δωμάτιο"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Προειδοποίηση"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "Email"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Δωμάτιο"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr "Πληροφορίες Υπενθύμισης Γεγονότος"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,11 +567,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Περιοδικό ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr "Εξουσιοδότηση σε"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr "Διαθεσιμότητα"
 msgid "Individual"
 msgstr "Μεμονωμένα"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -759,7 +745,7 @@ msgid "Declined"
 msgstr "Απορρίφθηκε"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -795,13 +781,6 @@ msgstr "Απόρρητο"
 msgid "Basic Alarm Information"
 msgstr "Βασικές Πληροφορίες Υπενθύμισης"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Δευ"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1001,10 +980,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Δηλώνει τις ομάδες που ο προσκεκλημένος ανήκει"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Δευ"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1054,11 +1034,6 @@ msgstr "Συσχετίζεται με"
 msgid "Interval"
 msgstr "Διάστημα"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1083,7 +1058,7 @@ msgid "Active"
 msgstr "Ενεργό"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1231,7 +1206,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1357,6 +1332,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1439,6 +1419,11 @@ msgstr ""
 "Περιλαμβάνει το κείμενο που θα χρησιμοποιηθεί σαν θέμα μυνήματος για email ή "
 "περιλαμβάνει το κείμενο για προβολή"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1459,7 +1444,7 @@ msgid "April"
 msgstr "Απρίλιος"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1477,7 +1462,7 @@ msgid "Weekday"
 msgstr "Καθημερινή"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1490,7 +1475,7 @@ msgid "By day"
 msgstr "Κατά ημέρα"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1751,9 +1736,6 @@ msgstr "Πέμπτος"
 #~ "Η επιλεγμένη εταιρία δεν είναι στις επιτρεπόμενες εταιρίες γι' αυτόν τον "
 #~ "χρήστη"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Weekly"
 #~ msgstr "Εβδομαδιαία"
 
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index e5f7414525f..b26ace8323f 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-11 14:15+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:03+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Reunión periódica"
 msgid "Feedback Meeting"
 msgstr "Opinión reunión"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Reunión <b>finalizada</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Para"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -277,6 +271,13 @@ msgstr "Mis reuniones"
 msgid "Procedure"
 msgstr "Procedimiento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Reuniones"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID fecha recurrente"
 
@@ -368,11 +364,11 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -518,9 +514,9 @@ msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "Reunión CRM: Marcar no leído."
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -533,7 +529,7 @@ msgid "Event alarm information"
 msgstr "Información del aviso del evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "La cuenta no puede ser negativa o cero"
@@ -544,11 +540,9 @@ msgid "Creation Date"
 msgstr "Fecha de creación"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -577,11 +571,9 @@ msgid "Caldav URL"
 msgstr "URL de caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Asistente de invitación"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -613,7 +605,7 @@ msgid "Delegrated To"
 msgstr "Delegada en"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "Los siguientes contactos no tienen cuenta de correo"
@@ -721,12 +713,6 @@ msgstr "Disponibilidad"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Reunión <b>confirmada</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -762,7 +748,7 @@ msgid "Declined"
 msgstr "Rechazada"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -799,13 +785,6 @@ msgstr "Privacidad"
 msgid "Basic Alarm Information"
 msgstr "Información sobre la alarma básica"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Lun"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1007,10 +986,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indicar los grupos a los que pertenece el asistente"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1061,11 +1041,6 @@ msgstr "Relacionado con"
 msgid "Interval"
 msgstr "Intervalo"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "Reunión CRM: Marcar leido."
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1090,7 +1065,7 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "No puede duplicar un asistente calendario"
@@ -1250,7 +1225,7 @@ msgid "Select Weekdays"
 msgstr "Seleccione días de la semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1380,6 +1355,11 @@ msgstr "ir.valores"
 msgid "Search Meetings"
 msgstr "Buscar reuniones"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1470,6 +1450,11 @@ msgstr ""
 "Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
 "o contiene el texto a mostrar"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr "Mensaje"
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1490,7 +1475,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "Dirección de email no encontrada"
@@ -1508,7 +1493,7 @@ msgid "Weekday"
 msgstr "Día de la semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "El intervalo no puede ser negativo"
@@ -1521,7 +1506,7 @@ msgid "By day"
 msgstr "Por día"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "Primero debe especificar la fecha de la invitación."
@@ -1769,9 +1754,6 @@ msgstr "Quinto"
 #~ msgid "Hourly"
 #~ msgstr "Cada hora"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.adjunto"
-
 #~ msgid "Yearly"
 #~ msgstr "Anualmente"
 
diff --git a/addons/base_calendar/i18n/es_CR.po b/addons/base_calendar/i18n/es_CR.po
index baf00a7d44f..2aa4a0b2c8b 100644
--- a/addons/base_calendar/i18n/es_CR.po
+++ b/addons/base_calendar/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 16:50+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: base_calendar
@@ -71,12 +71,6 @@ msgstr "Reunión periódica"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -258,7 +252,7 @@ msgid "To"
 msgstr "Para"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -278,6 +272,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedimiento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -337,14 +338,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID fecha recurrente"
 
@@ -367,11 +363,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -517,9 +513,9 @@ msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -532,7 +528,7 @@ msgid "Event alarm information"
 msgstr "Información del aviso del evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -543,11 +539,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -576,11 +570,9 @@ msgid "Caldav URL"
 msgstr "URL de caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -612,7 +604,7 @@ msgid "Delegrated To"
 msgstr "Delegada en"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -720,12 +712,6 @@ msgstr "Disponibilidad"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -761,7 +747,7 @@ msgid "Declined"
 msgstr "Rechazada"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -797,13 +783,6 @@ msgstr "Privacidad"
 msgid "Basic Alarm Information"
 msgstr "Información sobre la alarma básica"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Lun"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1005,10 +984,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indicar los grupos a los que pertenece el asistente"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1058,11 +1038,6 @@ msgstr "Relacionado con"
 msgid "Interval"
 msgstr "Intervalo"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1087,7 +1062,7 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "No puede duplicar un asistente calendario"
@@ -1239,7 +1214,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1369,6 +1344,11 @@ msgstr "ir.valores"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1452,6 +1432,11 @@ msgstr ""
 "Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
 "o contiene el texto a mostrar"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1472,7 +1457,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1490,7 +1475,7 @@ msgid "Weekday"
 msgstr "Día de la semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1503,7 +1488,7 @@ msgid "By day"
 msgstr "Por día"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1783,9 +1768,6 @@ msgstr "Quinto"
 #~ msgid "Search Invitations"
 #~ msgstr "Buscar invitaciones"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.adjunto"
-
 #~ msgid "Invite"
 #~ msgstr "Invitar"
 
diff --git a/addons/base_calendar/i18n/es_EC.po b/addons/base_calendar/i18n/es_EC.po
index dad2e273167..f3249c0985c 100644
--- a/addons/base_calendar/i18n/es_EC.po
+++ b/addons/base_calendar/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-11 23:49+0000\n"
 "Last-Translator: Mario Andrés Correa <Unknown>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Reunión periódica"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedimiento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,10 +569,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1002,9 +981,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1055,11 +1035,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1084,7 +1059,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1230,7 +1205,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1356,6 +1331,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1436,6 +1416,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1456,7 +1441,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1474,7 +1459,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1487,7 +1472,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1656,9 +1641,6 @@ msgstr ""
 #~ msgid "Warning !"
 #~ msgstr "¡Advertencia!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.adjunto"
-
 #~ msgid "Yearly"
 #~ msgstr "Anual"
 
diff --git a/addons/base_calendar/i18n/es_PY.po b/addons/base_calendar/i18n/es_PY.po
index 4ea898ed4ab..0378fad7af7 100644
--- a/addons/base_calendar/i18n/es_PY.po
+++ b/addons/base_calendar/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-08 00:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Reunión periódica"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedimiento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID fecha recurrente"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "¡Cuidado!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Información del aviso del evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "URL de caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegada en"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Disponibilidad"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Rechazada"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Privacidad"
 msgid "Basic Alarm Information"
 msgstr "Información sobre la alarma básica"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Lun"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1004,10 +983,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indicar los grupos a los que pertenece el asistente"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1057,11 +1037,6 @@ msgstr "Relacionado con"
 msgid "Interval"
 msgstr "Intervalo"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1086,7 +1061,7 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1238,7 +1213,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1368,6 +1343,11 @@ msgstr "ir.valores"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1451,6 +1431,11 @@ msgstr ""
 "Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
 "o contiene el texto a mostrar"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1471,7 +1456,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1489,7 +1474,7 @@ msgid "Weekday"
 msgstr "Día de la semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1502,7 +1487,7 @@ msgid "By day"
 msgstr "Por día"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1677,9 +1662,6 @@ msgstr "Quinto"
 #~ msgid "Warning !"
 #~ msgstr "¡Atención!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.adjunto"
-
 #~ msgid "Yearly"
 #~ msgstr "Anualmente"
 
diff --git a/addons/base_calendar/i18n/et.po b/addons/base_calendar/i18n/et.po
index a23b935bfd7..1ceedae383d 100644
--- a/addons/base_calendar/i18n/et.po
+++ b/addons/base_calendar/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-10-11 18:08+0000\n"
-"Last-Translator: Aare Vesi <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 18:19+0000\n"
+"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr "Korduv kohtumine"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Viga!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Ruum"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Ruum"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -691,7 +683,7 @@ msgstr ""
 #: selection:calendar.todo,month_list:0
 #: selection:crm.meeting,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Detsember"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,9 +977,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1173,7 +1148,7 @@ msgstr ""
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/fa.po b/addons/base_calendar/i18n/fa.po
index 35c222626bb..c730358c164 100644
--- a/addons/base_calendar/i18n/fa.po
+++ b/addons/base_calendar/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-28 12:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -512,8 +508,8 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
 msgstr ""
 
 #. module: base_calendar
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,9 +977,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/fi.po b/addons/base_calendar/i18n/fi.po
index d026e3df2db..66fadf6c78c 100644
--- a/addons/base_calendar/i18n/fi.po
+++ b/addons/base_calendar/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Toistuva kokous"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Vastaanottaja"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Virhe!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Toimintosarja"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Toiston ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Huone"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Toistuvan ID:n päiväys"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Varoitus!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Sähköposti"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Huone"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Tapahtuman hälytystiedot"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Toiston ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegoitu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Saatavuus"
 msgid "Individual"
 msgstr "Yksittäinen"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Hylätty"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Yksityisyys"
 msgid "Basic Alarm Information"
 msgstr "Perus hälytyksen tiedot"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Ma"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1004,10 +983,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Mihin ryhmiin osallistuja kuulluu"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Ma"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1057,11 +1037,6 @@ msgstr "Liittyy"
 msgid "Interval"
 msgstr "Aikaväli"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1086,7 +1061,7 @@ msgid "Active"
 msgstr "Aktiivinen"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Et voi kopioida kalenterin mukaista osallistujaa"
@@ -1238,7 +1213,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1366,6 +1341,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1448,6 +1428,11 @@ msgstr ""
 "Sisältää tekstin jota käytetään viestin otsikkona sähköposteissa tai "
 "näytöissä"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1468,7 +1453,7 @@ msgid "April"
 msgstr "Huhtikuu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1486,7 +1471,7 @@ msgid "Weekday"
 msgstr "Arkipäivä"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1499,7 +1484,7 @@ msgid "By day"
 msgstr "Päivittäin"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index 3461636dfdd..febbfe7ee71 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:24+0000\n"
 "Last-Translator: Jocelyn Duc <duc.jocelyn@gmail.com>\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: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -69,12 +69,6 @@ msgstr "Rendez-vous récurrents"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -256,7 +250,7 @@ msgid "To"
 msgstr "À"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Erreur!"
@@ -276,6 +270,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procédure"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID récurrent"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -335,14 +336,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Salle"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Id. de la date récurrente"
 
@@ -365,11 +361,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Avertissement!"
@@ -513,9 +509,9 @@ msgid "Email"
 msgstr "Courriel"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Salle"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -528,7 +524,7 @@ msgid "Event alarm information"
 msgstr "Information sur l'alarme de l'évènement"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -539,11 +535,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -572,11 +566,9 @@ msgid "Caldav URL"
 msgstr "URL caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID récurrent"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -608,7 +600,7 @@ msgid "Delegrated To"
 msgstr "Délégué à"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -716,12 +708,6 @@ msgstr "Disponibilité"
 msgid "Individual"
 msgstr "Individuel"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -757,7 +743,7 @@ msgid "Declined"
 msgstr "Refusé"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -793,13 +779,6 @@ msgstr "Confidentialité"
 msgid "Basic Alarm Information"
 msgstr "Information de rappel simple"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Lun"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,10 +979,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indique les groupes auxquels appartient le participant"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1053,11 +1033,6 @@ msgstr "En relation avec"
 msgid "Interval"
 msgstr "Intervalle"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Actif"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Vous ne pouvez indiquer un participant en double."
@@ -1234,7 +1209,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1364,6 +1339,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1444,6 +1424,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr "Contient le texte à utiliser comme sujet du courriel ou à afficher"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1464,7 +1449,7 @@ msgid "April"
 msgstr "Avril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1482,7 +1467,7 @@ msgid "Weekday"
 msgstr "Jour de la semaine"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1495,7 +1480,7 @@ msgid "By day"
 msgstr "Par jour"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1855,9 +1840,6 @@ msgstr "Cinquième"
 #~ msgid "Interval can not be Negative"
 #~ msgstr "L'intervalle ne peut pas être négatif"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Vous ne pouvez pas avoir deux utilisateurs avec le même login !"
 
diff --git a/addons/base_calendar/i18n/gl.po b/addons/base_calendar/i18n/gl.po
index fdfb76fdc3b..826209c1297 100644
--- a/addons/base_calendar/i18n/gl.po
+++ b/addons/base_calendar/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Xoan Sampaiño <xoansampainho@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Reunión periódica"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Para"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedemento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID recorrente"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Cuarto"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID data recorrente"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Cuarto"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Información do aviso do evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "URL de caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recorrente"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegada en"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Dispoñibilidade"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Rexeitado"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Intimidade"
 msgid "Basic Alarm Information"
 msgstr "Información sobre a alarma básica"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Luns"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1004,10 +983,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indicar os grupos ós que pertence o asistente"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Luns"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1057,11 +1037,6 @@ msgstr "Relacionado con"
 msgid "Interval"
 msgstr "Intervalo"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1086,7 +1061,7 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1238,7 +1213,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1368,6 +1343,11 @@ msgstr "ir.valores"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adxunto"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1451,6 +1431,11 @@ msgstr ""
 "Contén o texto a usar como asunto da mensaxe para correos electrónicos, ou "
 "contén o texto a amosar"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1471,7 +1456,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1489,7 +1474,7 @@ msgid "Weekday"
 msgstr "Día laborable"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1502,7 +1487,7 @@ msgid "By day"
 msgstr "Por día"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1671,9 +1656,6 @@ msgstr "Quinto"
 #~ msgid "Warning !"
 #~ msgstr "Aviso!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.adxunto"
-
 #~ msgid "Yearly"
 #~ msgstr "Anual"
 
diff --git a/addons/base_calendar/i18n/hr.po b/addons/base_calendar/i18n/hr.po
index 47f038ebcb6..2d6d75f3a35 100644
--- a/addons/base_calendar/i18n/hr.po
+++ b/addons/base_calendar/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 17:00+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Ponavljajući sastanak"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Sastanak <b>završen</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Do"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -277,6 +271,13 @@ msgstr "Moji sastanci"
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Ponavljajući ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Sastanci"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Soba"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Ponavljajući ID datuma"
 
@@ -368,11 +364,11 @@ msgstr ""
 "da bi mogao biti ubačen u kanban pogled."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "E-pošta"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "CRM Sastanak: Označi kao nepročitano"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Soba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Informacija alarma događaja"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "Broj ne smije biti negativan ili 0."
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr "Datum kreiranja"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Sastanak"
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "CalDAV URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Ponavljajući ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Proslijeđeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "Za ove osobe nemamo email adresu:"
@@ -719,12 +711,6 @@ msgstr "Raspoloživost"
 msgid "Individual"
 msgstr "Pojedinačno"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Sastanak <b>potvrđen</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Odbijeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr "Grupiranje po datumu nije podržano. Koristite kalendar."
@@ -796,13 +782,6 @@ msgstr "Privatnost"
 msgid "Basic Alarm Information"
 msgstr "Osnovni podaci alarma"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pon"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1002,10 +981,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Označite grupe kojima sudionik pripada"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pon"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1055,11 +1035,6 @@ msgstr "Povezano sa"
 msgid "Interval"
 msgstr "Razdoblje"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "CRM sastanak: Označi kao pročitano"
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1084,7 +1059,7 @@ msgid "Active"
 msgstr "Aktivan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1236,7 +1211,7 @@ msgid "Select Weekdays"
 msgstr "Odabir dana u tjednu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1364,6 +1339,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr "Traži sastanke"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1453,6 +1433,11 @@ msgstr ""
 "Sadrži tekst koji će se koristiti kao naslov poruke za e-poštu ili sadrži "
 "tekst koji će se koristiti za prikaz"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1473,7 +1458,7 @@ msgid "April"
 msgstr "Travanj"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "Email adrese koje nisu pronađene"
@@ -1491,7 +1476,7 @@ msgid "Weekday"
 msgstr "Dan u tjednu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "Interval ne može biti negativan"
@@ -1504,7 +1489,7 @@ msgid "By day"
 msgstr "Po danu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "Navedite datum pozivnice"
@@ -1833,9 +1818,6 @@ msgstr "Peti"
 #~ msgid "Partner"
 #~ msgstr "Stranka"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
diff --git a/addons/base_calendar/i18n/hu.po b/addons/base_calendar/i18n/hu.po
index 4e0f4ab2ff6..3eccfdffab9 100644
--- a/addons/base_calendar/i18n/hu.po
+++ b/addons/base_calendar/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:13+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -67,12 +67,6 @@ msgstr "Ismétlődő megbeszélések"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -254,7 +248,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Hiba!"
@@ -274,6 +268,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Eljárás"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Időszakos ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -333,14 +334,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Szoba"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Időszakos ID dátuma"
 
@@ -363,11 +359,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Vigyázat!"
@@ -511,9 +507,9 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Szoba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -526,7 +522,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -537,11 +533,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -570,11 +564,9 @@ msgid "Caldav URL"
 msgstr "CalDAV URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Időszakos ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -606,7 +598,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -714,12 +706,6 @@ msgstr "Elérhetőség"
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -755,7 +741,7 @@ msgid "Declined"
 msgstr "Elutasítva"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -791,13 +777,6 @@ msgstr "Adatvédelem"
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "H"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -997,10 +976,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "H"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1050,11 +1030,6 @@ msgstr ""
 msgid "Interval"
 msgstr "Intervallum"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1079,7 +1054,7 @@ msgid "Active"
 msgstr "Aktív"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1225,7 +1200,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1351,6 +1326,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1431,6 +1411,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1451,7 +1436,7 @@ msgid "April"
 msgstr "Április"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1469,7 +1454,7 @@ msgid "Weekday"
 msgstr "Hétköznap"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1482,7 +1467,7 @@ msgid "By day"
 msgstr "Nappal"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1646,9 +1631,6 @@ msgstr "Ötödik"
 #~ msgid "Warning !"
 #~ msgstr "Vigyázat!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Éves"
 
diff --git a/addons/base_calendar/i18n/id.po b/addons/base_calendar/i18n/id.po
index d86efe7ae28..2d316582bb9 100644
--- a/addons/base_calendar/i18n/id.po
+++ b/addons/base_calendar/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-27 02:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Pertemuan yang Berulang"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -514,8 +510,8 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
 msgstr ""
 
 #. module: base_calendar
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,10 +567,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,9 +979,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1053,11 +1033,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1228,7 +1203,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1354,6 +1329,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1434,6 +1414,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1454,7 +1439,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1472,7 +1457,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1485,7 +1470,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index 1fa6184e2e1..102800f4264 100644
--- a/addons/base_calendar/i18n/it.po
+++ b/addons/base_calendar/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 15:25+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Meeting ricorsivo"
 msgid "Feedback Meeting"
 msgstr "Feedback del meeting"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Meeting <b>completo</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "A"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -277,6 +271,13 @@ msgstr "I Miei Meeting"
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID ricorrente"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Meetings"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Stanza"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Data dell'ID ricorrente"
 
@@ -368,11 +364,11 @@ msgstr ""
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -518,9 +514,9 @@ msgid "Email"
 msgstr "Email"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "Meeting CRM: imposta come non letti"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Stanza"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -533,7 +529,7 @@ msgid "Event alarm information"
 msgstr "Informazioni avviso evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "Il conteggio non può essere negativo o zero."
@@ -544,11 +540,9 @@ msgid "Creation Date"
 msgstr "Data di Creazione"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Meeting"
 
@@ -577,11 +571,9 @@ msgid "Caldav URL"
 msgstr "URL Caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID ricorrente"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -613,7 +605,7 @@ msgid "Delegrated To"
 msgstr "Delegato a"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "I sequenti contatti non hanno indirizzo email:"
@@ -721,12 +713,6 @@ msgstr "Disponibilità"
 msgid "Individual"
 msgstr "Individuale"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Appuntamento <b>confermato</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -763,7 +749,7 @@ msgid "Declined"
 msgstr "Rifiutato"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr "Raggruppo per data non supportato, usa la vista calendario."
@@ -799,13 +785,6 @@ msgstr "Privacy"
 msgid "Basic Alarm Information"
 msgstr "Informazioni avviso base"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Lun"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1007,10 +986,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indica i gruppi a cui il partecipante appartiene"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1060,11 +1040,6 @@ msgstr "Relativo a"
 msgid "Interval"
 msgstr "Intervallo"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "Appuntamento CRM: Marca come letto"
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1089,7 +1064,7 @@ msgid "Active"
 msgstr "Attivo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Impossibile duplicare un partecipante"
@@ -1250,7 +1225,7 @@ msgid "Select Weekdays"
 msgstr "Giorni selezionati"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1379,6 +1354,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr "Ricerca appuntamenti"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1470,6 +1450,11 @@ msgstr ""
 "per email,                      oppure contiene il testo usato per la "
 "visualizzazione"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1490,7 +1475,7 @@ msgid "April"
 msgstr "Aprile"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "Indirizzo email non trovato"
@@ -1508,7 +1493,7 @@ msgid "Weekday"
 msgstr "Giorno della settimana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "L'intervallo non può essere negativo"
@@ -1521,7 +1506,7 @@ msgid "By day"
 msgstr "Per giorno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "E' necessario prima specificare la data dell'invito"
@@ -1680,9 +1665,6 @@ msgstr "Quinto"
 #~ msgid "Warning !"
 #~ msgstr "Attenzione !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "No Repeat"
 #~ msgstr "Nessuna ripetizione"
 
diff --git a/addons/base_calendar/i18n/ja.po b/addons/base_calendar/i18n/ja.po
index 1bea9e5ff35..aa7763eeb99 100644
--- a/addons/base_calendar/i18n/ja.po
+++ b/addons/base_calendar/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:32+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr "定期ミーティング"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr "終了"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "エラー"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "手続き"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "定期ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "部屋"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "定期ID日付"
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "警告"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "Eメール"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "部屋"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr "イベントアラーム情報"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,11 +565,9 @@ msgid "Caldav URL"
 msgstr "CalDAVのURL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "定期ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr "委任先"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr "利用可能"
 msgid "Individual"
 msgstr "個人"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr "拒否済"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr "プライバシー"
 msgid "Basic Alarm Information"
 msgstr "基本アラーム情報"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "月"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "出席者が属すグループを示して下さい。"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "月"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr "関連先"
 msgid "Interval"
 msgstr "間隔"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr "アクティブ"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "カレンダーの出席者は重複できません。"
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr "Eメールのメッセージの件名として使用されるテキスト、あるいは表示に使用するためのテキストが含まれています。"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr "4月"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr "平日"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr "日別"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/ln.po b/addons/base_calendar/i18n/ln.po
index 8e5decc1d70..7242daee13a 100644
--- a/addons/base_calendar/i18n/ln.po
+++ b/addons/base_calendar/i18n/ln.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-30 11:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lingala <ln@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -512,8 +508,8 @@ msgid "Email"
 msgstr "Nkandá"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
 msgstr ""
 
 #. module: base_calendar
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Mɔ́k"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Mɔ́k"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr "apríli"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1622,9 +1607,6 @@ msgstr ""
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Years"
 #~ msgstr "Mibú"
 
diff --git a/addons/base_calendar/i18n/lt.po b/addons/base_calendar/i18n/lt.po
index 6b06c6017dc..ccb50899cd2 100644
--- a/addons/base_calendar/i18n/lt.po
+++ b/addons/base_calendar/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:21+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Klaida!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedūra"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Kambarys"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Įspėjimas!"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "El. paštas"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Kambarys"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr "Deleguoti"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr "Prieinamumas"
 msgid "Individual"
 msgstr "Asmeninis"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr "Atsisakyta"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr "Privatumas"
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pirm."
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pirm."
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr "Susijęs su"
 msgid "Interval"
 msgstr "Intervalas"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr "Aktyvus"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr "Balandis"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr "Savaitės diena"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr "Pagal dieną"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/lv.po b/addons/base_calendar/i18n/lv.po
index 9ea4cb153da..69ae502c7d3 100644
--- a/addons/base_calendar/i18n/lv.po
+++ b/addons/base_calendar/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Kļūda!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Atkārtošanās ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Istaba"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Atkārtošanās ID datums"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Uzmanību!"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "E-pasts"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Istaba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,11 +567,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Atkārtošanās ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr "Pieejamība"
 msgid "Individual"
 msgstr "Individuāli"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr "Noraidīts"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr "Privātums"
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pi"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,10 +979,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pi"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1053,11 +1033,6 @@ msgstr ""
 msgid "Interval"
 msgstr "Intervāls"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Aktīvs"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1228,7 +1203,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1356,6 +1331,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1436,6 +1416,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1456,7 +1441,7 @@ msgid "April"
 msgstr "Aprīlis"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1474,7 +1459,7 @@ msgid "Weekday"
 msgstr "Nedēļas diena"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1487,7 +1472,7 @@ msgid "By day"
 msgstr "Pēc dienas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1651,9 +1636,6 @@ msgstr ""
 #~ msgid "Warning !"
 #~ msgstr "Uzmanību!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Ik gadu"
 
diff --git a/addons/base_calendar/i18n/mk.po b/addons/base_calendar/i18n/mk.po
index ccb1be9db70..ace691f0732 100644
--- a/addons/base_calendar/i18n/mk.po
+++ b/addons/base_calendar/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-17 15:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -512,8 +508,8 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
 msgstr ""
 
 #. module: base_calendar
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,9 +977,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index 2e85e116b7a..75388ce8e34 100644
--- a/addons/base_calendar/i18n/mn.po
+++ b/addons/base_calendar/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Давтагдах Уулзалт"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Хэнд"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Алдаа!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Хийх ажил"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Давтагдсан ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Өрөө"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID давтагдсан огноо"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Сануулга!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Э-мэйл"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Өрөө"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Үйл явдлын мэдээлэл"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Давтагдсан ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Ацаглагдсан"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Боломжтой"
 msgid "Individual"
 msgstr "Хувийн"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Буурсан"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Хувийн"
 msgid "Basic Alarm Information"
 msgstr "Үндсэн дохионы мэдээлэл"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Да"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1002,10 +981,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Оролцогсдын харъяалагдах группүүд"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Да"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1055,11 +1035,6 @@ msgstr "Холбоотой"
 msgid "Interval"
 msgstr "Завсар"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1084,7 +1059,7 @@ msgid "Active"
 msgstr "Идэвхитэй"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Цаглабарын ирцыг хувилж болохгүй"
@@ -1234,7 +1209,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1360,6 +1335,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1442,6 +1422,11 @@ msgstr ""
 "Текст байх агуулагч                  мэссэжийн гарчгийг имэйлд хэрэглэсэн    "
 "             буюу агуулагчийн текстийг дэлгэцэнд хэрэглэсэн"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1462,7 +1447,7 @@ msgid "April"
 msgstr "4 сар"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1480,7 +1465,7 @@ msgid "Weekday"
 msgstr "Ажлын өдөр"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1493,7 +1478,7 @@ msgid "By day"
 msgstr "Өдрөөр"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1740,9 +1725,6 @@ msgstr "5 дахь"
 #~ msgid "Show as"
 #~ msgstr "Үзүүлэх"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Show time as"
 #~ msgstr "Үзүүлэх цаг"
 
diff --git a/addons/base_calendar/i18n/nb.po b/addons/base_calendar/i18n/nb.po
index 528dcf606a1..de51747136f 100644
--- a/addons/base_calendar/i18n/nb.po
+++ b/addons/base_calendar/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 14:52+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Gjentagende møte."
 msgid "Feedback Meeting"
 msgstr "Tilbakemelding møte."
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Møte<b>Fullført</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Til."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Feil!"
@@ -277,6 +271,13 @@ msgstr "Mine møter."
 msgid "Procedure"
 msgstr "Prosedyre."
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Tilbakevendende ID."
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Møter."
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Rom"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Gjentagende ID dato."
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "E-post."
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "CRM Møte: Merk som ulest."
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Rom"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Arrangement alarm informasjon."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "Teller kan ikke være negativ eller 0."
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr "Opprettelses dato."
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Møte."
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "CalDAV URL."
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Tilbakevendende ID."
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegert til."
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "Følgende kontakter har ingen e-postadresse:"
@@ -719,12 +711,6 @@ msgstr "Tilgjengelighet."
 msgid "Individual"
 msgstr "Individuell."
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Møte<b>bekreftet</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Avslått."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr "Gruppe etter dato støttes ikke, bruk kalenderens visning i stedet."
@@ -796,13 +782,6 @@ msgstr "Privat."
 msgid "Basic Alarm Information"
 msgstr "Grunnleggende alarm informasjon."
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Man."
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1002,10 +981,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indikere de gruppene som deltakeren tilhører."
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Man."
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1055,11 +1035,6 @@ msgstr "Relatert til."
 msgid "Interval"
 msgstr "Intervall"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "CRM Møte: Merk som lest."
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1084,7 +1059,7 @@ msgid "Active"
 msgstr "Aktiv."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Du kan ikke kopiere en kalender av deltaker."
@@ -1230,7 +1205,7 @@ msgid "Select Weekdays"
 msgstr "Velg Hverdager."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1358,6 +1333,11 @@ msgstr "Ir.Verdier."
 msgid "Search Meetings"
 msgstr "Søk møter."
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1438,6 +1418,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1458,7 +1443,7 @@ msgid "April"
 msgstr "April."
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "E-post adresse ikke funnet."
@@ -1476,7 +1461,7 @@ msgid "Weekday"
 msgstr "Hverdag."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "Intervall kan ikke være negativ."
@@ -1489,7 +1474,7 @@ msgid "By day"
 msgstr "Pr. dag."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "Først må du angi dato for invitasjonen."
@@ -1647,9 +1632,6 @@ msgstr "Femte."
 #~ msgid "Warning !"
 #~ msgstr "Advarsel !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Årlig"
 
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 5c5b1dc8f99..6e859090611 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 20:35+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Terugkerende afspraak"
 msgid "Feedback Meeting"
 msgstr "Feedback afspraak"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Afspraak <b>afgerond</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Aan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -277,6 +271,13 @@ msgstr "Mijn afspraken"
 msgid "Procedure"
 msgstr "Werkwijze"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Terugkerend ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Afspraken"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Zaal"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Herhaling ID datum"
 
@@ -369,11 +365,11 @@ msgstr ""
 "ingevoegd."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -519,9 +515,9 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "CRM Afspraak: Markeer als ongelezen"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Zaal"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -534,7 +530,7 @@ msgid "Event alarm information"
 msgstr "Alarminformatie gebeurtenis"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "telling mag niet negatief of nul zijn."
@@ -545,11 +541,9 @@ msgid "Creation Date"
 msgstr "Aanmaakdatum"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Afspraak"
 
@@ -578,11 +572,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Terugkerend ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -614,7 +606,7 @@ msgid "Delegrated To"
 msgstr "Toegewezen aan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "De volgende contactpersonen hebben geen e-mail adres:"
@@ -722,12 +714,6 @@ msgstr "Beschikbaarheid"
 msgid "Individual"
 msgstr "Persoon"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Afspraak <b>bevestigt</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -763,7 +749,7 @@ msgid "Declined"
 msgstr "Geweigerd"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -801,13 +787,6 @@ msgstr "Privacy"
 msgid "Basic Alarm Information"
 msgstr "Basis alarm informatie"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Maa"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1009,10 +988,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Geeft de groepen aan waar de deelnemer bij behoort"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Maa"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1062,11 +1042,6 @@ msgstr "Begin of eind"
 msgid "Interval"
 msgstr "Interval"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "CRM Afspraak: Markeer als gelezen"
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1091,7 +1066,7 @@ msgid "Active"
 msgstr "Actief"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "U kunt een kalender deelnemer niet kopieren"
@@ -1250,7 +1225,7 @@ msgid "Select Weekdays"
 msgstr "Selecteer dagen van de qweek"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1380,6 +1355,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr "Zoek afspraken"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1469,6 +1449,11 @@ msgstr ""
 "Bevat de tekst om te gebruiken als email bericht onderwerp of bevat de tekst "
 "voor weergave"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1489,7 +1474,7 @@ msgid "April"
 msgstr "April"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "E-mail adressen neit gevonden"
@@ -1507,7 +1492,7 @@ msgid "Weekday"
 msgstr "Weekdag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "Interval mag niet negatief zijn."
@@ -1520,7 +1505,7 @@ msgid "By day"
 msgstr "Op dag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "Eerst dient u de datum van de uitnodiging in te geven."
@@ -1678,9 +1663,6 @@ msgstr "Vijfde"
 #~ msgid "Warning !"
 #~ msgstr "Waarschuwing !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Edit all Occurrences"
 #~ msgstr "Reeks bewerken"
 
diff --git a/addons/base_calendar/i18n/pl.po b/addons/base_calendar/i18n/pl.po
index 7a89a9a6ebd..915051d66a2 100644
--- a/addons/base_calendar/i18n/pl.po
+++ b/addons/base_calendar/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 21:03+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Spotanie powtarzalne"
 msgid "Feedback Meeting"
 msgstr "Odpowiedzi do spotkania"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Spotkanie <b>odbyte</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Do"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -277,6 +271,13 @@ msgstr "Moje spotkania"
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Rekurencyjne ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Spotkania"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Pomieszczenie"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Data ID powtarzalności"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Uwaga!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "Spotkanie CRM: Oznacz jako nieprzeczytane"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Pomieszczenie"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Informacja alarmu zdarzenia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "Licznik nie może być 0"
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr "Data utworzenia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Rekurencyjne ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Przydzielono dla"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "Te kontakty nie mają adresów email :"
@@ -719,12 +711,6 @@ msgstr "Dostępność"
 msgid "Individual"
 msgstr "Indywidualne"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Spotkanie <b>potwierdzone</b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Odrzucono"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr "Grupowanie po dacie nie jest dostępne. Stosuj widok kalendarzowy."
@@ -796,13 +782,6 @@ msgstr "Prywatność"
 msgid "Basic Alarm Information"
 msgstr "Podstawowe informacje o alarmie"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pon"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1002,10 +981,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Wskaż grupy, do których należy uczestnik"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pon"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1055,11 +1035,6 @@ msgstr "Powiązany z"
 msgid "Interval"
 msgstr "Interwał"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "Spotkanie CRM: Oznacz jako przeczytane"
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1084,7 +1059,7 @@ msgid "Active"
 msgstr "Aktywne"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Nie możesz duplikować uczestników kalendarza."
@@ -1242,7 +1217,7 @@ msgid "Select Weekdays"
 msgstr "Wybierz dni tygodnia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1371,6 +1346,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr "Przeszukuj spotkania"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1458,6 +1438,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr "Zawiera tekst tematu dla wiadomości lub tekst do wyświetlania"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1478,7 +1463,7 @@ msgid "April"
 msgstr "Kwiecień"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "Nie znaleziono adresu"
@@ -1496,7 +1481,7 @@ msgid "Weekday"
 msgstr "Dzień tygodnia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "Interwał nie może być ujemny."
@@ -1509,7 +1494,7 @@ msgid "By day"
 msgstr "Co dzień"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po
index 695586bfcd8..54a9c6e6876 100644
--- a/addons/base_calendar/i18n/pt.po
+++ b/addons/base_calendar/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:32+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Reunião recorrente"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Reunião <b>completada</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Para"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -277,6 +271,13 @@ msgstr "As minhas reuniões"
 msgid "Procedure"
 msgstr "Procedimento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Recorrente ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr "Reuniões"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Recurrent ID date"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Informações do alarme do evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr "Data de criação"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Recorrente ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegado a"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Disponibilidade"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Negado"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Privacidade"
 msgid "Basic Alarm Information"
 msgstr "Informação para alerta simples"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Seg"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1004,10 +983,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indique os grupos que o participante pertence ao"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Seg"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1057,11 +1037,6 @@ msgstr "Relacionado com"
 msgid "Interval"
 msgstr "Interval"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1086,7 +1061,7 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Não pode duplicar um participante no calendário."
@@ -1238,7 +1213,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1368,6 +1343,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1450,6 +1430,11 @@ msgstr ""
 "Contém o texto a ser                      usado como o assunto da mensagem "
 "de e-mail                      ou contém o texto a ser usado para exibição"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1470,7 +1455,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1488,7 +1473,7 @@ msgid "Weekday"
 msgstr "Dia de semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1501,7 +1486,7 @@ msgid "By day"
 msgstr "Por dia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1662,9 +1647,6 @@ msgstr "Quinto"
 #~ msgid "Warning !"
 #~ msgstr "Atenção!"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Anualmente"
 
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index 6b36e32af9c..e8c09781300 100644
--- a/addons/base_calendar/i18n/pt_BR.po
+++ b/addons/base_calendar/i18n/pt_BR.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-16 23:48+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:03+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -71,12 +71,6 @@ msgstr "Compromisso Recorrente"
 msgid "Feedback Meeting"
 msgstr "Reunião de feedback"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "Reunião <b>concluída</ b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -258,7 +252,7 @@ msgid "To"
 msgstr "Para"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -278,6 +272,13 @@ msgstr "Minhas Reuniões"
 msgid "Procedure"
 msgstr "Procedimento"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID Recorrente"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -337,14 +338,9 @@ msgid "Meetings"
 msgstr "Reuniões"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "ID de data recorrente"
 
@@ -370,11 +366,11 @@ msgstr ""
 "kanban."
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -520,9 +516,9 @@ msgid "Email"
 msgstr "Email"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr "CRM Reunião : Marcar como não lida"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -535,7 +531,7 @@ msgid "Event alarm information"
 msgstr "Informações do Alarme de Evento"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr "Contador não pode ser negativo ou 0."
@@ -546,11 +542,9 @@ msgid "Creation Date"
 msgstr "Data de Criação"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -579,11 +573,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID Recorrente"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Assistente de Convite"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -615,7 +607,7 @@ msgid "Delegrated To"
 msgstr "Delegado para"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr "Os seguintes contatos não possuem e-mail:"
@@ -723,12 +715,6 @@ msgstr "Disponibilidade"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr "Reunião <b>confirmada</ b>."
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -764,7 +750,7 @@ msgid "Declined"
 msgstr "Recusado"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -802,13 +788,6 @@ msgstr "Privacidade"
 msgid "Basic Alarm Information"
 msgstr "Informação básica do Alarme"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Seg"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1010,10 +989,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indica os grupos aos quais os participantes pertencem"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Seg"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1063,11 +1043,6 @@ msgstr "Relacionado a"
 msgid "Interval"
 msgstr "Intervalo"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr "CRM Reunião: Marcar como lida"
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1092,7 +1067,7 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Você não pode duplicar um participante do calendário."
@@ -1253,7 +1228,7 @@ msgid "Select Weekdays"
 msgstr "Selecione dias da semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1383,6 +1358,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr "Procurar Reuniões"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1474,6 +1454,11 @@ msgstr ""
 "Contém o texto que será utilizado como título de mensagem para o email ou "
 "contém o texto a ser usado para exibição."
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr "Mensagem"
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1494,7 +1479,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr "Email não encontrado"
@@ -1512,7 +1497,7 @@ msgid "Weekday"
 msgstr "Dia da semana"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr "O intervalo não pode ser negativo"
@@ -1525,7 +1510,7 @@ msgid "By day"
 msgstr "Por dia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr "Especifique primeiro a data do convite."
@@ -1697,9 +1682,6 @@ msgstr "Quinto"
 #~ msgid "Show time as"
 #~ msgstr "Mostrar horário como"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Edit all Occurrences"
 #~ msgstr "Editar todas as Ocorrências"
 
diff --git a/addons/base_calendar/i18n/ro.po b/addons/base_calendar/i18n/ro.po
index 75b2e65fc30..a3c477c76c9 100644
--- a/addons/base_calendar/i18n/ro.po
+++ b/addons/base_calendar/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Intalnire recurenta"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Catre"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Eroare!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "ID recurent"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Camera"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Data ID-ului recurent"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Avertizare!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "E-Mail"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Camera"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Informatii alarma eveniment"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "URL Caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurent"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegat la"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Disponibilitate"
 msgid "Individual"
 msgstr "Individual"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Refuzat(a)"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Confidentialitate"
 msgid "Basic Alarm Information"
 msgstr "informatii de Baza Alarma"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Luni"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1004,10 +983,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Indica grupurile de care apartine participantul"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Luni"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1057,11 +1037,6 @@ msgstr "Referitor la"
 msgid "Interval"
 msgstr "Interval"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1086,7 +1061,7 @@ msgid "Active"
 msgstr "Activ(a)"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Nu puteti copia un participant in calendar."
@@ -1239,7 +1214,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1369,6 +1344,11 @@ msgstr "ir.valori"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.atasament"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1452,6 +1432,11 @@ msgstr ""
 "Contine textul care va fi folosit drept subiectul mesajului pentru email sau "
 "contine textul care va fi folosit pentru afisare"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1472,7 +1457,7 @@ msgid "April"
 msgstr "Aprilie"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1490,7 +1475,7 @@ msgid "Weekday"
 msgstr "Zi lucratoare"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1503,7 +1488,7 @@ msgid "By day"
 msgstr "Dupa zi"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1944,9 +1929,6 @@ msgstr "Al cincilea (a cincea)"
 #~ msgid "Search Invitations"
 #~ msgstr "Cauta Invitatii"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.atasament"
-
 #~ msgid "Invite"
 #~ msgstr "Invita"
 
diff --git a/addons/base_calendar/i18n/ru.po b/addons/base_calendar/i18n/ru.po
index b3abf6a08a8..28b6db652d2 100644
--- a/addons/base_calendar/i18n/ru.po
+++ b/addons/base_calendar/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Повторяющаяся встреча"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Кому"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Процедура"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Повторяющийся ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Комната"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Дата повторяющегося ID"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Эл. почта"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Комната"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Информация об уведомлении о событии"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Адрес Caldav"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Повторяющийся ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Поручено"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Доступность"
 msgid "Individual"
 msgstr "Персональный"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Отклонено"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Степень конфиденциальности"
 msgid "Basic Alarm Information"
 msgstr "Основная информация уведомления"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Пн"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1003,10 +982,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Указывает на группы, к которым принадлежит приглашённый"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Пн"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1056,11 +1036,6 @@ msgstr "Связан с"
 msgid "Interval"
 msgstr "Интервал"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1085,7 +1060,7 @@ msgid "Active"
 msgstr "Активно"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Нельзя дублировать участника календаря."
@@ -1237,7 +1212,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1365,6 +1340,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1447,6 +1427,11 @@ msgstr ""
 "Содержит текст, используемый в качестве темы электронного письма или "
 "отображаемый текст"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1467,7 +1452,7 @@ msgid "April"
 msgstr "Апрель"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1485,7 +1470,7 @@ msgid "Weekday"
 msgstr "День недели"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1498,7 +1483,7 @@ msgid "By day"
 msgstr "По дню"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1695,9 +1680,6 @@ msgstr "Пятый"
 #~ msgid "Warning !"
 #~ msgstr "Warning !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
diff --git a/addons/base_calendar/i18n/sk.po b/addons/base_calendar/i18n/sk.po
index 1f02d118e5a..02f2297470c 100644
--- a/addons/base_calendar/i18n/sk.po
+++ b/addons/base_calendar/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-03 16:49+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Chyba!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Miestnosť"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Varovanie !"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "Email"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Miestnosť"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr "Individuálne"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr "Súkromný"
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pon"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pon"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1635,9 +1620,6 @@ msgstr ""
 #~ msgid "No Repeat"
 #~ msgstr "Bez opakovania"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Ročne"
 
diff --git a/addons/base_calendar/i18n/sl.po b/addons/base_calendar/i18n/sl.po
index 0cf8ec17f72..00a3aadb4ee 100644
--- a/addons/base_calendar/i18n/sl.po
+++ b/addons/base_calendar/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Napaka!"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Soba"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Opozorilo!"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "E-pošta"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Soba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr "Razpoložljivost"
 msgid "Individual"
 msgstr "Posamezno"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr "Zavrnjeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr "Zasebno"
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pon"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pon"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr "Aktiven"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr "April"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr "Delovni dan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr "Po dnevih"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/sq.po b/addons/base_calendar/i18n/sq.po
index 9eb2225aa0e..edddb88a79c 100644
--- a/addons/base_calendar/i18n/sq.po
+++ b/addons/base_calendar/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -512,8 +508,8 @@ msgid "Email"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
 msgstr ""
 
 #. module: base_calendar
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,9 +977,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1051,11 +1031,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
index 700e276e325..8968efaffa8 100644
--- a/addons/base_calendar/i18n/sr.po
+++ b/addons/base_calendar/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Greška"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Ponavljajući ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Soba"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Ponavljajući ID datuma"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "E‑pošta"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Soba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr "Informacija alarma događaja"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,11 +567,9 @@ msgid "Caldav URL"
 msgstr "CalDAV URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Ponavljajući ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr "Proslijeđeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr "Dostupnost"
 msgid "Individual"
 msgstr "Individualno"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr "Odbijeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr "Privatnost"
 msgid "Basic Alarm Information"
 msgstr "Osnovni podaci alarma"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pon"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,10 +979,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Označite grupe kojima ucesnik pripada"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pon"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1053,11 +1033,6 @@ msgstr "Povezano sa"
 msgid "Interval"
 msgstr "Interval"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Aktivan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1234,7 +1209,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1364,6 +1339,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1446,6 +1426,11 @@ msgstr ""
 "Sadrži tekst koji će se koristiti kao naslov poruke za e-poštu ili sadrži "
 "tekst koji će se koristiti za prikaz"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1466,7 +1451,7 @@ msgid "April"
 msgstr "April"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1484,7 +1469,7 @@ msgid "Weekday"
 msgstr "Sedmicni Dan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1497,7 +1482,7 @@ msgid "By day"
 msgstr "po Danu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1658,9 +1643,6 @@ msgstr "Peti"
 #~ msgid "Warning !"
 #~ msgstr "Upozorenje !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Godišnje"
 
diff --git a/addons/base_calendar/i18n/sr@latin.po b/addons/base_calendar/i18n/sr@latin.po
index cb2fd5c1cd7..c17de737004 100644
--- a/addons/base_calendar/i18n/sr@latin.po
+++ b/addons/base_calendar/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:29+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr ""
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Greška"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedura"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Ponavljajući ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Soba"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Ponavljajući ID datuma"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -514,9 +510,9 @@ msgid "Email"
 msgstr "E‑pošta"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Soba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -529,7 +525,7 @@ msgid "Event alarm information"
 msgstr "Informacija alarma događaja"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -540,11 +536,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -573,11 +567,9 @@ msgid "Caldav URL"
 msgstr "CalDAV URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Ponavljajući ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -609,7 +601,7 @@ msgid "Delegrated To"
 msgstr "Proslijeđeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -717,12 +709,6 @@ msgstr "Dostupnost"
 msgid "Individual"
 msgstr "Individualno"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -758,7 +744,7 @@ msgid "Declined"
 msgstr "Odbijeno"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -794,13 +780,6 @@ msgstr "Privatnost"
 msgid "Basic Alarm Information"
 msgstr "Osnovni podaci alarma"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pon"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1000,10 +979,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Označite grupe kojima ucesnik pripada"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pon"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1053,11 +1033,6 @@ msgstr "Povezano sa"
 msgid "Interval"
 msgstr "Interval"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1082,7 +1057,7 @@ msgid "Active"
 msgstr "Aktivan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1234,7 +1209,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1364,6 +1339,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1446,6 +1426,11 @@ msgstr ""
 "Sadrži tekst koji će se koristiti kao naslov poruke za e-poštu ili sadrži "
 "tekst koji će se koristiti za prikaz"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1466,7 +1451,7 @@ msgid "April"
 msgstr "April"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1484,7 +1469,7 @@ msgid "Weekday"
 msgstr "Sedmicni Dan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1497,7 +1482,7 @@ msgid "By day"
 msgstr "po Danu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1661,9 +1646,6 @@ msgstr "Peti"
 #~ msgid "Warning !"
 #~ msgstr "Upozorenje !"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Show time as"
 #~ msgstr "Prikaži vreme kao"
 
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index b970b89e2e5..c85de5bf844 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:29+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Återkommande möte"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Mottagare"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Fel!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Procedur"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Återkommande ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Rum"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Återkommande ID datum"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Epost"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Rum"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Evenemangsalarminformation"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Återkommande ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Delegerad till"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Tillgänglighet"
 msgid "Individual"
 msgstr "Individuell"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Avslaget"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Integritet"
 msgid "Basic Alarm Information"
 msgstr "Grundläggande alarminformation"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Mån"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1004,10 +983,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "indikator på gruppen deltagaren tillhör"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Mån"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1057,11 +1037,6 @@ msgstr "Relaterad till"
 msgid "Interval"
 msgstr "Intervall"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1086,7 +1061,7 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Du kan inte duplicera ett kalenderdeltagande"
@@ -1238,7 +1213,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1367,6 +1342,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1449,6 +1429,11 @@ msgstr ""
 "Innehåller den text som ska användas som ärendemening för e-post eller "
 "innehåller text som ska användas för visning"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1469,7 +1454,7 @@ msgid "April"
 msgstr "april"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1487,7 +1472,7 @@ msgid "Weekday"
 msgstr "Veckodag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1500,7 +1485,7 @@ msgid "By day"
 msgstr "Per dag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1662,9 +1647,6 @@ msgstr "Femte"
 #~ msgid "Show time as"
 #~ msgstr "Visa tiden som"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "Årligen"
 
diff --git a/addons/base_calendar/i18n/th.po b/addons/base_calendar/i18n/th.po
index d2e9c7e5652..b7387fb7c89 100644
--- a/addons/base_calendar/i18n/th.po
+++ b/addons/base_calendar/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -69,12 +69,6 @@ msgstr "เกิดซ้อนๆกัน"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -256,7 +250,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "ผิดพลาด!"
@@ -276,6 +270,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "กระบวนการ"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -335,14 +336,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "ห้อง"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -365,11 +361,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "คำเตือน!"
@@ -513,9 +509,9 @@ msgid "Email"
 msgstr "อีเมล์"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "ห้อง"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -528,7 +524,7 @@ msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -539,11 +535,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -572,10 +566,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -608,7 +600,7 @@ msgid "Delegrated To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -716,12 +708,6 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -757,7 +743,7 @@ msgid "Declined"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -793,13 +779,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr ""
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -999,9 +978,10 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr ""
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
 msgstr ""
 
 #. module: base_calendar
@@ -1052,11 +1032,6 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1081,7 +1056,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1227,7 +1202,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1353,6 +1328,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1433,6 +1413,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1453,7 +1438,7 @@ msgid "April"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1471,7 +1456,7 @@ msgid "Weekday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1484,7 +1469,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
index 092b3992f5a..8a5960f26c8 100644
--- a/addons/base_calendar/i18n/tr.po
+++ b/addons/base_calendar/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:34+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -70,12 +70,6 @@ msgstr "Yinelenen Toplantı"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -257,7 +251,7 @@ msgid "To"
 msgstr "Kime"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "Hata!"
@@ -277,6 +271,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "Yöntem"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "Tekrarlayan ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -336,14 +337,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Oda"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "Yinelenen Kimlik tarihi"
 
@@ -366,11 +362,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -516,9 +512,9 @@ msgid "Email"
 msgstr "Eposta"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Oda"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -531,7 +527,7 @@ msgid "Event alarm information"
 msgstr "Etkinlik alarm bilgisi"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -542,11 +538,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -575,11 +569,9 @@ msgid "Caldav URL"
 msgstr "Caldav URL si"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "Tekrarlayan ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -611,7 +603,7 @@ msgid "Delegrated To"
 msgstr "Şuna Yetkilendirildi"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -719,12 +711,6 @@ msgstr "Elverişlilik"
 msgid "Individual"
 msgstr "Bireysel"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -760,7 +746,7 @@ msgid "Declined"
 msgstr "Reddedildi"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -796,13 +782,6 @@ msgstr "Gizlilik"
 msgid "Basic Alarm Information"
 msgstr "Temel Alarm Bilgisi"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Pzt"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -1002,10 +981,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "Katılanın bağlı olduğu grubu belirt"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Pzt"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1055,11 +1035,6 @@ msgstr "Bağlı olduğu"
 msgid "Interval"
 msgstr "Aralık"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1084,7 +1059,7 @@ msgid "Active"
 msgstr "Etkin"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "Takvim katılımcısını çoğaltamazsınız."
@@ -1236,7 +1211,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1365,6 +1340,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.ek"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1447,6 +1427,11 @@ msgstr ""
 "Eposta konusu olarak kullanılacak ya da görüntülenecek metin olarak "
 "kullanılacak metni içerir."
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1467,7 +1452,7 @@ msgid "April"
 msgstr "Nisan"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1485,7 +1470,7 @@ msgid "Weekday"
 msgstr "Hafta İçi"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1498,7 +1483,7 @@ msgid "By day"
 msgstr "Gündüz"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1776,9 +1761,6 @@ msgstr "Beşinci"
 #~ msgid "Can not Duplicate"
 #~ msgstr "Çoğaltılamaz"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.ek"
-
 #~ msgid "Delegation Info"
 #~ msgstr "Temsilci Bilgisi"
 
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index a1ece1f61e4..3c91be52d4c 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 16:50+0000\n"
 "Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr "定期会议"
 msgid "Feedback Meeting"
 msgstr "会议反馈"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr "会议<b>完成</b>."
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr "到"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -275,6 +269,13 @@ msgstr "我的会议"
 msgid "Procedure"
 msgstr "程序"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr "循环ID"
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr "会议"
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "室"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr "循环日期"
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "电子邮箱"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "室"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr "事件提醒信息"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,11 +565,9 @@ msgid "Caldav URL"
 msgstr "Caldav 服务的URL"
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "循环ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr "代表人"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr "可用"
 msgid "Individual"
 msgstr "个人"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr "已拒绝"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr "隐私的"
 msgid "Basic Alarm Information"
 msgstr "基本提醒信息"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "周一"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "与会者属于指定的组"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "周一"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr "关联到"
 msgid "Interval"
 msgstr "间隔"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr "生效"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr "你不能复制日程参与者"
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr "ir.values"
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr "包含电子邮件主题中使用的文本或包含了用于显示的文本"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr "4月"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr "工作日"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr "按天"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
@@ -1637,9 +1622,6 @@ msgstr "第五个"
 #~ msgid "Invitation"
 #~ msgstr "邀请"
 
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
 #~ msgid "Yearly"
 #~ msgstr "每年"
 
diff --git a/addons/base_calendar/i18n/zh_TW.po b/addons/base_calendar/i18n/zh_TW.po
index 4821bd469fe..a1fe0ca0170 100644
--- a/addons/base_calendar/i18n/zh_TW.po
+++ b/addons/base_calendar/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -68,12 +68,6 @@ msgstr "重覆定期會議"
 msgid "Feedback Meeting"
 msgstr ""
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -255,7 +249,7 @@ msgid "To"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
 #, python-format
 msgid "Error!"
 msgstr "錯誤！"
@@ -275,6 +269,13 @@ msgstr ""
 msgid "Procedure"
 msgstr "程序"
 
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
@@ -334,14 +335,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "房間"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
 msgid "Recurrent ID date"
 msgstr ""
 
@@ -364,11 +360,11 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -512,9 +508,9 @@ msgid "Email"
 msgstr "電郵"
 
 #. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
-msgstr ""
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "房間"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -527,7 +523,7 @@ msgid "Event alarm information"
 msgstr "活動警示資訊"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -538,11 +534,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -571,10 +565,8 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: base_calendar
@@ -607,7 +599,7 @@ msgid "Delegrated To"
 msgstr "委託予"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
 msgstr ""
@@ -715,12 +707,6 @@ msgstr "有空"
 msgid "Individual"
 msgstr "個人"
 
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
@@ -756,7 +742,7 @@ msgid "Declined"
 msgstr "拒絕"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -792,13 +778,6 @@ msgstr ""
 msgid "Basic Alarm Information"
 msgstr "基本警示資訊"
 
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "一"
-
 #. module: base_calendar
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
@@ -998,10 +977,11 @@ msgid "Indicate the groups that the attendee belongs to"
 msgstr "指示出席者所屬群組"
 
 #. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "一"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1051,11 +1031,6 @@ msgstr "關係到"
 msgid "Interval"
 msgstr "區間"
 
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
@@ -1080,7 +1055,7 @@ msgid "Active"
 msgstr "活躍"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
 msgstr ""
@@ -1226,7 +1201,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1352,6 +1327,11 @@ msgstr ""
 msgid "Search Meetings"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_crm_meeting_type
 msgid "Meeting Type"
@@ -1432,6 +1412,11 @@ msgid ""
 "email                      or contains the text to be used for display"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
@@ -1452,7 +1437,7 @@ msgid "April"
 msgstr "四月"
 
 #. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
 msgstr ""
@@ -1470,7 +1455,7 @@ msgid "Weekday"
 msgstr "週日"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
@@ -1483,7 +1468,7 @@ msgid "By day"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
 #, python-format
 msgid "First you have to specify the date of the invitation."
 msgstr ""
diff --git a/addons/base_gengo/i18n/ar.po b/addons/base_gengo/i18n/ar.po
index 94bd98beacb..fcdc2e25ac9 100644
--- a/addons/base_gengo/i18n/ar.po
+++ b/addons/base_gengo/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 11:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/de.po b/addons/base_gengo/i18n/de.po
index 4fa8bc497f7..9a20abfafbc 100644
--- a/addons/base_gengo/i18n/de.po
+++ b/addons/base_gengo/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 19:47+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
diff --git a/addons/base_gengo/i18n/es.po b/addons/base_gengo/i18n/es.po
index c328fe30e86..60643b71a69 100644
--- a/addons/base_gengo/i18n/es.po
+++ b/addons/base_gengo/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 02:09+0000\n"
 "Last-Translator: Roberto Lizana (trey.es) <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/hr.po b/addons/base_gengo/i18n/hr.po
index 128c691bef4..93ea116c988 100644
--- a/addons/base_gengo/i18n/hr.po
+++ b/addons/base_gengo/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:02+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/it.po b/addons/base_gengo/i18n/it.po
index d0aa2abbca1..a1b5eee1dd8 100644
--- a/addons/base_gengo/i18n/it.po
+++ b/addons/base_gengo/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 20:57+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/nb.po b/addons/base_gengo/i18n/nb.po
index 935f150894c..0d7bc05d7bc 100644
--- a/addons/base_gengo/i18n/nb.po
+++ b/addons/base_gengo/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 10:25+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/pt.po b/addons/base_gengo/i18n/pt.po
index ed2b0a3a471..91283b6c5b6 100644
--- a/addons/base_gengo/i18n/pt.po
+++ b/addons/base_gengo/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 14:44+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/pt_BR.po b/addons/base_gengo/i18n/pt_BR.po
index 6c9fdf6c7aa..fd6149254c8 100644
--- a/addons/base_gengo/i18n/pt_BR.po
+++ b/addons/base_gengo/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 15:30+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_gengo/i18n/zh_CN.po b/addons/base_gengo/i18n/zh_CN.po
index e53a023c8a1..0c0aaab361d 100644
--- a/addons/base_gengo/i18n/zh_CN.po
+++ b/addons/base_gengo/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 16:26+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_gengo
 #: view:res.company:0
diff --git a/addons/base_iban/i18n/ar.po b/addons/base_iban/i18n/ar.po
index 4e826c4f86b..b07f8949551 100644
--- a/addons/base_iban/i18n/ar.po
+++ b/addons/base_iban/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:14+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/bg.po b/addons/base_iban/i18n/bg.po
index df0caef496e..544e4b4cca2 100644
--- a/addons/base_iban/i18n/bg.po
+++ b/addons/base_iban/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 01:48+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index cefd773ec29..d2e1a18f715 100644
--- a/addons/base_iban/i18n/bs.po
+++ b/addons/base_iban/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 08:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index b18d0c8d3f9..fe0a9c75450 100644
--- a/addons/base_iban/i18n/ca.po
+++ b/addons/base_iban/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 01:49+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index 9014fac1585..5cbcf2bc540 100644
--- a/addons/base_iban/i18n/cs.po
+++ b/addons/base_iban/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:16+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/da.po b/addons/base_iban/i18n/da.po
index 902333762c3..2112692f3ce 100644
--- a/addons/base_iban/i18n/da.po
+++ b/addons/base_iban/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-23 16:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index 6e2a27818f2..fe4fb586c45 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:44+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\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: 2012-12-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index 101e778a360..16ff9197e6c 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 10:18+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_iban/i18n/en_GB.po b/addons/base_iban/i18n/en_GB.po
index 0f0ac0871f1..d6ea534eabe 100644
--- a/addons/base_iban/i18n/en_GB.po
+++ b/addons/base_iban/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-24 13:19+0000\n"
 "Last-Translator: John Bradshaw <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index d2413d4d8eb..7ad3e0dbe0f 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-11 17:50+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index 614e0bd5e24..aafbbe463a6 100644
--- a/addons/base_iban/i18n/es_AR.po
+++ b/addons/base_iban/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 18:22+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_CR.po b/addons/base_iban/i18n/es_CR.po
index 13eca5ce068..47f3b321b53 100644
--- a/addons/base_iban/i18n/es_CR.po
+++ b/addons/base_iban/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 16:57+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_EC.po b/addons/base_iban/i18n/es_EC.po
index a8912b9cd02..21c11c63bc0 100644
--- a/addons/base_iban/i18n/es_EC.po
+++ b/addons/base_iban/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:02+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_PY.po b/addons/base_iban/i18n/es_PY.po
index 97d9c72e080..6ec0741d5d4 100644
--- a/addons/base_iban/i18n/es_PY.po
+++ b/addons/base_iban/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-08 17:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index b2be8f3e342..a88ccbc2755 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-27 08:07+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
index 806b717583d..81026e0f55d 100644
--- a/addons/base_iban/i18n/eu.po
+++ b/addons/base_iban/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-08 07:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fa.po b/addons/base_iban/i18n/fa.po
index 5e622a01f6a..36c4af9b259 100644
--- a/addons/base_iban/i18n/fa.po
+++ b/addons/base_iban/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 09:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index d25ee115a71..24f02c9fdec 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:36+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 08e355ad5d7..4dae473f58a 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 10:02+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index af119cad99c..e3be5c397c1 100644
--- a/addons/base_iban/i18n/gl.po
+++ b/addons/base_iban/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: base-iban-gl\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-08-14 09:01+0000\n"
 "Last-Translator: Frco. Javier Rial <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/gu.po b/addons/base_iban/i18n/gu.po
index dd88e619d18..e34905a9e47 100644
--- a/addons/base_iban/i18n/gu.po
+++ b/addons/base_iban/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-12 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index b51c4d465c0..a2862dee066 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 16:40+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index f92903cdbd0..3051af940bd 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-20 13:10+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index d9fc60f755d..2a8fc8780f3 100644
--- a/addons/base_iban/i18n/id.po
+++ b/addons/base_iban/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 13:46+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index 32aebfa3371..385a62a4a1f 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 21:57+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-16 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ja.po b/addons/base_iban/i18n/ja.po
index e3fa16bf133..fb61452c6fd 100644
--- a/addons/base_iban/i18n/ja.po
+++ b/addons/base_iban/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-23 06:14+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index 2e1f796f4b2..b874a006998 100644
--- a/addons/base_iban/i18n/ko.po
+++ b/addons/base_iban/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:59+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index 8d3f42e2786..e5e4d162396 100644
--- a/addons/base_iban/i18n/lt.po
+++ b/addons/base_iban/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-11 14:05+0000\n"
 "Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index b346b131bd3..4fa5615852b 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-19 13:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/mn.po b/addons/base_iban/i18n/mn.po
index 033af5111ba..322711a5a8e 100644
--- a/addons/base_iban/i18n/mn.po
+++ b/addons/base_iban/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 14:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nb.po b/addons/base_iban/i18n/nb.po
index 208a7eb7d5e..59e77445938 100644
--- a/addons/base_iban/i18n/nb.po
+++ b/addons/base_iban/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-28 13:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 67b40a0eb87..039f1fc840a 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 12:05+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index 53ee238aecd..d1f2f005799 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-01 11:08+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
index cdded604c83..93de430a097 100644
--- a/addons/base_iban/i18n/oc.po
+++ b/addons/base_iban/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:37+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index 5f3552a7387..7a4e13e33b9 100644
--- a/addons/base_iban/i18n/pl.po
+++ b/addons/base_iban/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 11:32+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index 1a2d2e42970..86c0bcc74d9 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 01:41+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index ab3c14549cd..d8936ab5265 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-28 15:02+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index ccea199f0ce..0e8a0742f6d 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-01 05:01+0000\n"
 "Last-Translator: Cristi Harjoi <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 6395fb746b1..0a292c213ec 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-27 11:13+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index e242137aa8b..9e2fa9f6281 100644
--- a/addons/base_iban/i18n/sk.po
+++ b/addons/base_iban/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-01 08:26+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index 46532b7f7c6..c22032fd6db 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 11:25+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index 9f3a1a2b377..066a702099a 100644
--- a/addons/base_iban/i18n/sq.po
+++ b/addons/base_iban/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-12-29 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index de66ae3a16d..bc4dd8b01e9 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 14:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index 2ff4840e5f7..d6a3bf61020 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-05 15:22+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index a3fd5cc3cd9..4a079183f47 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 11:49+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ta.po b/addons/base_iban/i18n/ta.po
index 3ccfddcd4e0..c503d7af6f1 100644
--- a/addons/base_iban/i18n/ta.po
+++ b/addons/base_iban/i18n/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 05:52+0000\n"
 "Last-Translator: சதீஷ் குமார் <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index 9dc53dce75e..df702536a91 100644
--- a/addons/base_iban/i18n/tlh.po
+++ b/addons/base_iban/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 62c6ff19e85..e5eec93892a 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 21:43+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index 736e643db61..b72af9ad923 100644
--- a/addons/base_iban/i18n/uk.po
+++ b/addons/base_iban/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:51+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/vi.po b/addons/base_iban/i18n/vi.po
index 9234e4cf8c7..e557e17af90 100644
--- a/addons/base_iban/i18n/vi.po
+++ b/addons/base_iban/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index d39b533010b..52872d28e8a 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-10 03:09+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index 998ee409cc8..c748db67cf8 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-19 10:36+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_import/i18n/ar.po b/addons/base_import/i18n/ar.po
index 4668a009d1d..a60c9006828 100644
--- a/addons/base_import/i18n/ar.po
+++ b/addons/base_import/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-02 07:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-03 04:36+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -470,15 +470,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -822,6 +813,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/de.po b/addons/base_import/i18n/de.po
index 6085dc44877..48fc390a5ca 100644
--- a/addons/base_import/i18n/de.po
+++ b/addons/base_import/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 21:57+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
@@ -536,18 +536,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-"Wie kann ich eine one2many Beziehung importieren (z.B. verschiedene "
-"Auftragspositionen\n"
-"                                          zu einem Auftrag) ?"
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -901,6 +889,15 @@ msgstr ""
 "Zuerst exportieren wir alle Unternehmen mit seiner \"Externen ID\".\n"
 "In PSQL erfolgt das durch das aktive Kommando:"
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/es.po b/addons/base_import/i18n/es.po
index c80dd35794d..b20d34668c8 100644
--- a/addons/base_import/i18n/es.po
+++ b/addons/base_import/i18n/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-19 16:36+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:03+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
@@ -531,17 +531,6 @@ msgstr ". La problemática suele ser una codificación de archivo incorrecta."
 msgid "base_import.tests.models.m2o.required"
 msgstr "Campos many2one requeridos de los modelos de test de importación"
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-"¿Cómo puede importar una relación one2many (uno a muchos; por ejemplo, "
-"varias líneas de pedido de un pedido de venta)?"
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -923,6 +912,17 @@ msgstr ""
 "Se exportará primero todas las compañías y sus id. externos. En PSQL, "
 "escriba el siguiente comando:"
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+"¿Cómo puedo importar una relación uno a muchos (one2many - por ejemplo: las "
+"líneas de pedido del pedido de venta)?"
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index edebd707f3a..b4646b245da 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/i18n/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:27+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
@@ -470,15 +470,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -822,6 +813,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/hr.po b/addons/base_import/i18n/hr.po
index 5c47dc2ea7c..7a119f19aaf 100644
--- a/addons/base_import/i18n/hr.po
+++ b/addons/base_import/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 22:33+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -470,15 +470,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -824,6 +815,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/it.po b/addons/base_import/i18n/it.po
index a7a824312cd..12ee5f56afe 100644
--- a/addons/base_import/i18n/it.po
+++ b/addons/base_import/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 12:10+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -479,17 +479,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr "base_import.tests.models.m2o.required"
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-"Come posso importare relazioni uno-a-molti (es. molte \n"
-"righe ordine di un ordine di vendita)?"
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -833,6 +822,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/nb.po b/addons/base_import/i18n/nb.po
index 868a15ad8a3..fa5755be7ed 100644
--- a/addons/base_import/i18n/nb.po
+++ b/addons/base_import/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:19+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -486,15 +486,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr "Base_import.tester.modeller.m2o.påkrevd."
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -846,6 +837,15 @@ msgstr ""
 "Vi vil først eksportere alle selskaper og deres\n"
 "\"Ekstern ID\". I psql, skriv inn følgende kommando:"
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/nl.po b/addons/base_import/i18n/nl.po
index 00a5cf5e7b5..19b5c8f6d45 100644
--- a/addons/base_import/i18n/nl.po
+++ b/addons/base_import/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 20:04+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -470,15 +470,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -822,6 +813,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/pl.po b/addons/base_import/i18n/pl.po
index ad7b2cf6d9b..a0c064aceff 100644
--- a/addons/base_import/i18n/pl.po
+++ b/addons/base_import/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 17:54+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
@@ -470,15 +470,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -822,6 +813,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/pt_BR.po b/addons/base_import/i18n/pt_BR.po
index aba9ac571eb..cece86d5281 100644
--- a/addons/base_import/i18n/pt_BR.po
+++ b/addons/base_import/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 11:52+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -481,15 +481,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -833,6 +824,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/ru.po b/addons/base_import/i18n/ru.po
index 6245fa856da..3dec71355b4 100644
--- a/addons/base_import/i18n/ru.po
+++ b/addons/base_import/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 07:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
@@ -470,15 +470,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -822,6 +813,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_import/i18n/zh_CN.po b/addons/base_import/i18n/zh_CN.po
index c4e9376e2cd..9acbaf06db2 100644
--- a/addons/base_import/i18n/zh_CN.po
+++ b/addons/base_import/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 03:03+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
@@ -496,15 +496,6 @@ msgstr ""
 msgid "base_import.tests.models.m2o.required"
 msgstr ""
 
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid ""
-"How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sale Order)?"
-msgstr ""
-
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
@@ -848,6 +839,15 @@ msgid ""
 "command:"
 msgstr ""
 
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
index f67307a022a..8ed8da6bd4e 100644
--- a/addons/base_report_designer/i18n/ar.po
+++ b/addons/base_report_designer/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 17:32+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/bg.po b/addons/base_report_designer/i18n/bg.po
index 8fc5fb5a55a..906210ae485 100644
--- a/addons/base_report_designer/i18n/bg.po
+++ b/addons/base_report_designer/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:25+0000\n"
 "Last-Translator: Tsvetin Vasilev <cecipv@yahoo.com>\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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
index ec609e7a5ce..cdcfccc2619 100644
--- a/addons/base_report_designer/i18n/bs.po
+++ b/addons/base_report_designer/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
index a5fffe89e1f..ba43a3166ca 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index 42d23597b0d..0f51218a3c2 100644
--- a/addons/base_report_designer/i18n/cs.po
+++ b/addons/base_report_designer/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 08:52+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/da.po b/addons/base_report_designer/i18n/da.po
index 6451866d6ef..09537168bf2 100644
--- a/addons/base_report_designer/i18n/da.po
+++ b/addons/base_report_designer/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index 32bc2b76822..d2c598b78ce 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 19:54+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index c3be12db9e7..a42dbc99363 100644
--- a/addons/base_report_designer/i18n/el.po
+++ b/addons/base_report_designer/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:03+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index b757d8c986c..6d748310dd9 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:19+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index f522bf10c06..e5b5417db7d 100644
--- a/addons/base_report_designer/i18n/es_AR.po
+++ b/addons/base_report_designer/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-15 19:44+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_CR.po b/addons/base_report_designer/i18n/es_CR.po
index 3bc6b883a54..8339305735c 100644
--- a/addons/base_report_designer/i18n/es_CR.po
+++ b/addons/base_report_designer/i18n/es_CR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:06+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/es_EC.po b/addons/base_report_designer/i18n/es_EC.po
index 592b9313e7e..525eaed9389 100644
--- a/addons/base_report_designer/i18n/es_EC.po
+++ b/addons/base_report_designer/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:35+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_PY.po b/addons/base_report_designer/i18n/es_PY.po
index 6c249e86e88..559a18c2f3a 100644
--- a/addons/base_report_designer/i18n/es_PY.po
+++ b/addons/base_report_designer/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-12 01:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index 40075748718..86ffe45896c 100644
--- a/addons/base_report_designer/i18n/et.po
+++ b/addons/base_report_designer/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 16:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fa.po b/addons/base_report_designer/i18n/fa.po
index 91dafdec4c8..9d4843eefb3 100644
--- a/addons/base_report_designer/i18n/fa.po
+++ b/addons/base_report_designer/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
index b7518bb2e6c..5257037c10b 100644
--- a/addons/base_report_designer/i18n/fi.po
+++ b/addons/base_report_designer/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index a1beaebafff..231e7852a37 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-05 09:16+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-06 04:40+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
index e038709d08e..8bd5d5bd103 100644
--- a/addons/base_report_designer/i18n/gl.po
+++ b/addons/base_report_designer/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: base-report-designer-gl\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 9829befe247..b7cb2645b9f 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:10+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
index 6e436d70020..4ae16500193 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:18+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
index 276f7cba35a..80ffe43bc05 100644
--- a/addons/base_report_designer/i18n/id.po
+++ b/addons/base_report_designer/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:45+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 514223d74e0..0f2dff1de9d 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 19:53+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ja.po b/addons/base_report_designer/i18n/ja.po
index 2c934ddd8ea..d10471dcf12 100644
--- a/addons/base_report_designer/i18n/ja.po
+++ b/addons/base_report_designer/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-24 04:08+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index 0051c256d5e..42f6d2d43d9 100644
--- a/addons/base_report_designer/i18n/ko.po
+++ b/addons/base_report_designer/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:49+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
index 878596324dd..cdcfccc2619 100644
--- a/addons/base_report_designer/i18n/lt.po
+++ b/addons/base_report_designer/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/mn.po b/addons/base_report_designer/i18n/mn.po
index b996e289f7a..83dbadf8c07 100644
--- a/addons/base_report_designer/i18n/mn.po
+++ b/addons/base_report_designer/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:47+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nb.po b/addons/base_report_designer/i18n/nb.po
index f3f0ffea765..e2537841d1f 100644
--- a/addons/base_report_designer/i18n/nb.po
+++ b/addons/base_report_designer/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-04 13:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
index 77d51e2985b..6b7b1ee4d05 100644
--- a/addons/base_report_designer/i18n/nl.po
+++ b/addons/base_report_designer/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 52855644af1..9b4e2125123 100644
--- a/addons/base_report_designer/i18n/nl_BE.po
+++ b/addons/base_report_designer/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:40+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
index 178517430a7..95274bfeb29 100644
--- a/addons/base_report_designer/i18n/pl.po
+++ b/addons/base_report_designer/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2008-12-09 00:19+0000\n"
 "Last-Translator: Marcin Ostajewski (panszpik) <Unknown>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
index cb54635d6f3..70dd51e1f89 100644
--- a/addons/base_report_designer/i18n/pt.po
+++ b/addons/base_report_designer/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:31+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
index 320ce082f0e..10e44c73977 100644
--- a/addons/base_report_designer/i18n/pt_BR.po
+++ b/addons/base_report_designer/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 18:03+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index 723999ef385..36cf79fac94 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:07+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index 8f52a2900a7..bfe1ed206c1 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index 378ae33391a..cdfd0c64d8e 100644
--- a/addons/base_report_designer/i18n/sk.po
+++ b/addons/base_report_designer/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:46+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
index d77dfc5c867..28f2a9c8ada 100644
--- a/addons/base_report_designer/i18n/sl.po
+++ b/addons/base_report_designer/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sq.po b/addons/base_report_designer/i18n/sq.po
index d7d6ac0a7e7..1f61eaba59e 100644
--- a/addons/base_report_designer/i18n/sq.po
+++ b/addons/base_report_designer/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index 527c2118cf4..dac6e84ec93 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sr@latin.po b/addons/base_report_designer/i18n/sr@latin.po
index d8dfe3a8d83..058cbe4a87c 100644
--- a/addons/base_report_designer/i18n/sr@latin.po
+++ b/addons/base_report_designer/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 8a74726a0b9..994cc66ebce 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index ee615cfdaf1..1f916a53d83 100644
--- a/addons/base_report_designer/i18n/tlh.po
+++ b/addons/base_report_designer/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 143b96d3c0f..51f12a81c8c 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 20:20+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
index 73dce55216e..888f2910969 100644
--- a/addons/base_report_designer/i18n/uk.po
+++ b/addons/base_report_designer/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:16+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/vi.po b/addons/base_report_designer/i18n/vi.po
index de26ec8461a..1d7a7de1f65 100644
--- a/addons/base_report_designer/i18n/vi.po
+++ b/addons/base_report_designer/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index abee97593ac..55077e17777 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 02:28+0000\n"
 "Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\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: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index c90f003561f..fea6668ab06 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:22+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index c1747c36cfc..89cffe719d9 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-14 11:20+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "كيف يمكنك استدعاء عميل"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr "العميل"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 59a8a7e0acc..2160b099485 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 6189fbc1418..331b95fad17 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 09:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 86385d991d8..c8ffdbe9f8b 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index bca5dfe9aba..25715e89be0 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base_setup
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index 8619e5f3e3f..853faa8dbd8 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 10:30+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index f7d43180c34..92d86883d53 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 22:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
@@ -66,6 +66,11 @@ msgstr ""
 "                                    Mailanwendung bestimmte EMails nach "
 "OpenERP transferieren."
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -123,16 +128,16 @@ msgstr "Erlaubt Benutzern Import von .csv Dateien"
 msgid "Manage multiple companies"
 msgstr "Multi-Company Verwaltung"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr "Erlauben Sie Kunden oder Lieferanten Zugriff auf Ihre Belege"
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "Anbindung E-Mail Anwendung"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -211,6 +216,14 @@ msgstr ""
 "entsprechenden Berechtigungen für den wechselseitigen Unternehmenszugriff "
 "einfach an."
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -230,6 +243,19 @@ msgstr "sale.config.settings"
 msgid "How do you call a Customer"
 msgstr "Wie bezeichnen Sie einen Kunden"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -241,7 +267,7 @@ msgid "Client"
 msgstr "Klient"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 "Aktivieren Sie den Zugriff auf veröffentliche Bereiche und Dokumente , "
@@ -312,8 +338,16 @@ msgstr "Einstellungen"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Aktivierung des Kunden / Lieferanten Portals"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -321,7 +355,12 @@ msgid "Allow documents sharing"
 msgstr "Ermögliche Dokumentenfreigabe"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Aktivierung des öffentlichen Portals"
 
@@ -335,6 +374,11 @@ msgstr "Konfiguriere die Postausgangsserver"
 msgid "Social Network Integration"
 msgstr "Integration Sozialer Netzwerke"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index b77573179e0..443309fb1a8 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Πώς καλείς έναν Πελάτη"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Πελάτης"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/en_GB.po b/addons/base_setup/i18n/en_GB.po
index 52ade56c158..15eb883df44 100644
--- a/addons/base_setup/i18n/en_GB.po
+++ b/addons/base_setup/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 15:44+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "How do you call a Customer"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Client"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index ccdad34599e..01180a9b438 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:19+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:43+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -59,6 +59,11 @@ msgstr ""
 "POP/IMAP, con scripts desde su servidor de correo, o manualmente usando los "
 "plugins específicos para su gestor de correo preferido."
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -116,16 +121,16 @@ msgstr "Permitir a los usuarios importar datos desde archivos CSV"
 msgid "Manage multiple companies"
 msgstr "Gestionar varias compañías"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr "Dar acceso a sus clientes y proveedores a sus documentos"
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "En cliente email"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -205,6 +210,14 @@ msgstr ""
 "compañias.\n"
 "Se instalará el módulo multi_company."
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -224,6 +237,19 @@ msgstr "Configuración de las ventas"
 msgid "How do you call a Customer"
 msgstr "Como llama  a un cliente"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -235,7 +261,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 "Activar la parte pública de openerp, openerp se convierte en un website "
@@ -298,8 +324,16 @@ msgstr "Opciones"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Activar portal cliente/proveedor"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -307,7 +341,12 @@ msgid "Allow documents sharing"
 msgstr "Permitir compartir documentos"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Activar portal público"
 
@@ -321,6 +360,11 @@ msgstr "Configurar servidores de correo saliente"
 msgid "Social Network Integration"
 msgstr "Integración red social"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index c8c611c7c76..62c6da70016 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-15 15:41+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index c479544eb4b..9dbacc10677 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-14 04:34+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/es_CR.po b/addons/base_setup/i18n/es_CR.po
index 696da59f0cf..a048904ccc0 100644
--- a/addons/base_setup/i18n/es_CR.po
+++ b/addons/base_setup/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 17:34+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: base_setup
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "¿Cómo usted llama a un cliente?"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index ef51533995f..6eb9af17930 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-27 16:41+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Como llamar a un cliente"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 9becf9b1428..d086801f1b3 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-18 12:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index fbb5dca9acd..79771ff39a3 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-10 19:33+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr "Klient"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index a8226760dc3..afc0db09ee6 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:47+0000\n"
 "Last-Translator: avion <nat@sethack.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index db51efbb224..c187eae82fc 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Kuinka soitat asiakkaalle"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Asiakas"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 2d67d41ff37..9dd34f4ef7d 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:45+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Comment appelez-vous un client"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Client"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 931c11a85d4..9e211c17601 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/gu.po b/addons/base_setup/i18n/gu.po
index eac4f816b2e..1928e278719 100644
--- a/addons/base_setup/i18n/gu.po
+++ b/addons/base_setup/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 11:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index b6bbea31161..e6872d364f4 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 20:31+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: base_setup
@@ -58,6 +58,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -115,16 +120,16 @@ msgstr "Dozvoli uvoz podataka iz CSV datoteka"
 msgid "Manage multiple companies"
 msgstr "Više organizacija (tvrtki)"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr "Dozvoli kupcima i dobavljačima pristup relevantnim dokumentima."
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Koji temin želite koristiti za kupce"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Klijent"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr "Dozvoli javni dio OpenERP-a. Vaš OpenERP postaje javna web stranica."
 
@@ -276,8 +302,16 @@ msgstr "Opcije"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Activiraj portal kupcima/dobavljačima"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr "Dozvoli dijeljenje dokumenata"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Aktiviraj javni portal"
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr "Integracija društvenih mreža"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index d03df0038ed..958683f4227 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:54+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 04f6e566203..d446e92aebd 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-05-28 02:39+0000\n"
 "Last-Translator: Abdul Munif Hanafi <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Bagaimana anda menghubungi Pelanggan"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Klien"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 938d5292088..383448fb18e 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 11:58+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -64,6 +64,11 @@ msgstr ""
 "specifici\n"
 "plugin for il vostro client di posta preferito."
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -121,17 +126,16 @@ msgstr "Permetti agli utenti di importare dati da file CSV"
 msgid "Manage multiple companies"
 msgstr "Gestione multi aziendale"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr ""
-"Fornisce l'accesso, ai vostri fornitori e clienti, ai propri documenti."
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "Su client email"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -211,6 +215,14 @@ msgstr ""
 "appropriate tra le aziende.\n"
 "Installa il modulo multi_company."
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -230,6 +242,19 @@ msgstr "sale.config.settings"
 msgid "How do you call a Customer"
 msgstr "Come chiamate un cliente"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -241,7 +266,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 "Abilità l'accesso pubblico ad openerp, openerp diventa un sito web pubblico."
@@ -306,8 +331,16 @@ msgstr "Opzioni"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Attiva il portale clienti/fornitori"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -315,7 +348,12 @@ msgid "Allow documents sharing"
 msgstr "Abilita la condivisione documenti"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Attiva il portale pubblico"
 
@@ -329,6 +367,11 @@ msgstr "Configura email server in uscita"
 msgid "Social Network Integration"
 msgstr "Integrazione social network"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 24dfa076e3f..4e59a8a5608 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-28 21:52+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "どのように顧客を呼びますか"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr "顧客"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index abf3079a9dc..3ca7f16f709 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:19+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index c82a359283d..75d97d117b9 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-12-15 18:45+0000\n"
 "Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 5acca1abe8d..44203d52bd3 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-30 14:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index a6f60f9876a..fc37289ced9 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Захиалагчийг та юу гэж дууддаг вэ?"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Клиент"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index 977b41f6e69..87776807526 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:32+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -58,6 +58,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -115,16 +120,16 @@ msgstr "Tillater brukere å importere data fra CSV-filer."
 msgid "Manage multiple companies"
 msgstr "Administrere flere selskaper."
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr "Gi tilgang til kunder og leverandører til sine dokumenter."
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "På Mail klient."
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -201,6 +206,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -220,6 +233,19 @@ msgstr "Salg.konfigurasjon.innstilling."
 msgid "How do you call a Customer"
 msgstr "Hvordan ringer du en kunde"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -231,7 +257,7 @@ msgid "Client"
 msgstr "Klient"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 "Aktiver den offentlige delen av openerp, openerp blir et offentlig nettsted."
@@ -283,8 +309,16 @@ msgstr "Alternativer."
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Aktiver kunde / leverandør portal."
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -292,7 +326,12 @@ msgid "Allow documents sharing"
 msgstr "Tillate å dele dokumenter."
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Aktiver den offentlige portalen."
 
@@ -306,6 +345,11 @@ msgstr "Konfigurer utgående e-post servere."
 msgid "Social Network Integration"
 msgstr "Sosialt nettverk Integrering."
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 19bcbbe8839..dd254461e40 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 18:22+0000\n"
 "Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr "Beheer meerdere bedrijven"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr "sale.config.settings"
 msgid "How do you call a Customer"
 msgstr "Hoe belt u een klant"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "Client"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,8 +302,16 @@ msgstr "Opties"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Activeer de klant/leverancier portaal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr "Staa documentdelen toe"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Activeer het publieke portaal"
 
@@ -299,6 +338,11 @@ msgstr "Uitgaande e-mail servers instellen"
 msgid "Social Network Integration"
 msgstr "Sociale netwerken intergratie"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index 927be2eb95e..ac59db37916 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-01 11:22+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Hoe wordt een klant bij u genoemd?"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Cliënt"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index f89629ab307..d53949bad67 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 12:01+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -65,6 +65,11 @@ msgstr ""
 "możesz przekazywać\n"
 "                            maile z aplikacji do OpenERP przy użyciu wtyczek."
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -122,16 +127,16 @@ msgstr "Pozwala importować dane z pliku CSV"
 msgid "Manage multiple companies"
 msgstr "Obsługuj kilka firm"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr "Udostępnia dokumenty klientom i dostawcom"
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "W aplikacji mailowej"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -206,6 +211,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -223,6 +236,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Jak nazywasz klienta"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -234,7 +260,7 @@ msgid "Client"
 msgstr "Klient"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr "Włącz część publiczną openerp. Openerp stanie się publiczną witryną."
 
@@ -285,8 +311,16 @@ msgstr "Opcje"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Aktywuj portal klienta/dostawcy"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -294,7 +328,12 @@ msgid "Allow documents sharing"
 msgstr "Pozwalaj na współdzielenie dokumentów"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Aktywuj portal publiczny"
 
@@ -308,6 +347,11 @@ msgstr "Konfiguruj serwery poczty wychodzącej"
 msgid "Social Network Integration"
 msgstr "Integracja z portalami społecznościowymi"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index a0139638ab2..8a2388e7e7f 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 14:06+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr "Gerir várias empresas"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr "sale.config.settings"
 msgid "How do you call a Customer"
 msgstr "Como vai chamar o cliente"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr "Opções"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr "Permitir a partilha de documentos"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr "Integração com redes sociais"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 71590a0bd33..e5f03ed3541 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-16 23:13+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:12+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -65,6 +65,11 @@ msgstr ""
 "                             específicos para o seu aplicativo de e-mail "
 "preferido."
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VENDA"
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -122,17 +127,16 @@ msgstr "Permite a usuários importar dados de arquivos CSV"
 msgid "Manage multiple companies"
 msgstr "Gerenciar múltiplas Empresas"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr ""
-"Dá acesso a seus clientes e fornecedores aos seus respectivos documentos."
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "No Cliente de Email"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr "--db-filter=SUA_DATABASE"
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -212,6 +216,18 @@ msgstr ""
 "entre as empresas.\n"
 "Isso instala o módulo multi_company."
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+"O portal público é acessível apenas se você estiver em um modo único banco "
+"de dados. você pode\n"
+"                                     iniciar o servidor OpenERP com esta "
+"opção"
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -231,6 +247,26 @@ msgstr "sale.config.settings"
 msgid "How do you call a Customer"
 msgstr "Como você chama um Cliente"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Quando você enviar um documento para um cliente\n"
+"                                     (fatura, cotação), seu cliente será\n"
+"                                     capaz de se inscrever para obter todos "
+"os seus documentos,\n"
+"                                     ler as notícias da empresa, verificar "
+"seus projetos,\n"
+"                                     etc"
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -242,7 +278,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 "Habilita a parte pública do OpenERP, OpenERP torna-se um site público."
@@ -308,8 +344,19 @@ msgstr "Opções"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "Ativar o portal do cliente / fornecedor"
+msgid "Activate the customer portal"
+msgstr "Ativar o Portal de Cliente"
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
+"ao fazê-lo.\n"
+"                                     Uma vez ativada, a página de login será "
+"substituído pelo site público."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -317,7 +364,12 @@ msgid "Allow documents sharing"
 msgstr "Permite compartilhar documentos"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr "(notícias da empresa, trabalhos, formulário de contato, etc)"
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "Ativar o portal público"
 
@@ -331,6 +383,11 @@ msgstr "Configurar servidor de email para saida"
 msgid "Social Network Integration"
 msgstr "Integração com redes sociais"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dê a seus clientes o acesso a seus documentos."
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index dabeb7c7dc8..232e3dcd9fb 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Cum sunati un Client"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Client"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 50840be692b..9917503f75b 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 17:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Как вы называете заказчика"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr "Клиент"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index fd7e70cab98..d1fdebebeff 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:13+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 422a940d34e..b2ff0a0cf4e 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 "Kateri izraz želite uporabljati za kupce (stranka,kupec,poslovni partner "
 "...) ?"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Odjemalec"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 578b8a4addf..e30b3ad6e68 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-12-29 15:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 84a51b5bde2..fe49cc0fdc2 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 9af25a2e83b..d11367c98a5 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -197,6 +202,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -214,6 +227,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Koji temin želite koristiti za kupce"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -225,7 +251,7 @@ msgid "Client"
 msgstr "klijent"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -276,7 +302,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -285,7 +319,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -299,6 +338,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index df2bba819e0..4219becd333 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Hur kontaktar du en kund"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr "Klient"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index eec37efed49..3a227b52168 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-15 08:18+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index c8fea321ce2..54bb0d71eec 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index f532ab1952d..93eb1ee680d 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 21:47+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -196,6 +201,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -213,6 +226,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr "Müşterilerinize ne isim veriyorsunuz ?"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -224,7 +250,7 @@ msgid "Client"
 msgstr "Müşteri"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -275,7 +301,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -284,7 +318,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -298,6 +337,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index a51636ec61f..baf1252a599 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:18+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 310bf57868f..d72bdc69cbd 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -56,6 +56,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -114,13 +119,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -195,6 +200,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -212,6 +225,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -223,7 +249,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -274,7 +300,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -283,7 +317,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -297,6 +336,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 5c119e20a9e..72a8f8fd78e 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-14 13:52+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 04:14+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -60,6 +60,11 @@ msgstr ""
 "    或者通过插件，为你首选的Email 程序手动推送\n"
 "     email到Openerp。"
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "销售"
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -117,16 +122,16 @@ msgstr "允许导入CSV数据"
 msgid "Manage multiple companies"
 msgstr "允许多公司操作"
 
-#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
-msgstr "允许客户或者供应商访问他们的单据"
-
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
 msgstr "在邮件客户端"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr "--db-filter=YOUR_DATABAE"
+
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
@@ -201,6 +206,14 @@ msgstr ""
 "工作在多公司环境，公司之间适当地安全访问\n"
 "               为此安装模块multi_company。"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr "只用当你在 单数据库 模式时，公共门户才是可以访问的。你能用此选项运行 OpenERP服务器。"
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -218,6 +231,19 @@ msgstr "sale.config.settings"
 msgid "How do you call a Customer"
 msgstr "你如何称呼您的客户"
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr "当你发送单据给客户（报价单，发票），你的可能能登录，获取他单据，阅读你的公司新闻，检查他的项目等。"
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -229,7 +255,7 @@ msgid "Client"
 msgstr "客户"
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr "启用Openerp的公共部分，Openerp成为一个公共的web站点"
 
@@ -286,8 +312,16 @@ msgstr "选项"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
-msgstr "开启合作伙伴Portal"
+msgid "Activate the customer portal"
+msgstr "激活客户门户"
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr "这样做了，一旦激活，登录页面将被公共web站点替换。"
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -295,7 +329,12 @@ msgid "Allow documents sharing"
 msgstr "允许分享单据"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr "（公司新闻，工作，联系人表单 等）"
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr "启用公共门户"
 
@@ -309,6 +348,11 @@ msgstr "配置邮箱发件服务器"
 msgid "Social Network Integration"
 msgstr "集成社交网络"
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "让你的客户访问他们的单据"
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index f10b185c8ee..9aa1e4fc823 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +55,11 @@ msgid ""
 "                            plugins for your preferred email application."
 msgstr ""
 
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
@@ -113,13 +118,13 @@ msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
 msgstr ""
 
 #. module: base_setup
@@ -194,6 +199,14 @@ msgid ""
 "                This installs the module multi_company."
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 msgid ""
@@ -211,6 +224,19 @@ msgstr ""
 msgid "How do you call a Customer"
 msgstr ""
 
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
@@ -222,7 +248,7 @@ msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
 
@@ -273,7 +299,15 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
 msgstr ""
 
 #. module: base_setup
@@ -282,7 +316,12 @@ msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
 msgstr ""
 
@@ -296,6 +335,11 @@ msgstr ""
 msgid "Social Network Integration"
 msgstr ""
 
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
diff --git a/addons/base_status/i18n/ar.po b/addons/base_status/i18n/ar.po
index 7881b5ca00e..19f7b04217f 100644
--- a/addons/base_status/i18n/ar.po
+++ b/addons/base_status/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:05+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "خطأ !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "خطأ!"
@@ -52,26 +50,19 @@ msgid ""
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -79,8 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr ""
diff --git a/addons/base_status/i18n/de.po b/addons/base_status/i18n/de.po
index e9c60fbfe9c..01e6ecee22d 100644
--- a/addons/base_status/i18n/de.po
+++ b/addons/base_status/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 13:50+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -25,21 +25,19 @@ msgid "Error !"
 msgstr "Fehler !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s wurde <b>eröffnet</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s wurde <b>erneuert</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -55,26 +53,19 @@ msgstr ""
 "haben."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s wurde geändert auf <b>Wiedervorlage</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s wurde <b>abgebrochen</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s wurde <b>abgebrochen</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -84,8 +75,7 @@ msgstr ""
 "haben."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s wurde <b>beendet</b>."
diff --git a/addons/base_status/i18n/es.po b/addons/base_status/i18n/es.po
index b16f4fccede..bfcca7fb8fe 100644
--- a/addons/base_status/i18n/es.po
+++ b/addons/base_status/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 22:19+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "¡ Error !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s ha sido  <b>abierto</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s ha sido  <b>renovado</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -53,26 +51,19 @@ msgstr ""
 "No puede escalar, usted está en la categoría más alta de su equipo de ventas"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s está ahora  <b>pendiente</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s ha sido  <b>cancelado</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s ha sido  <b>cancelado</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -82,8 +73,7 @@ msgstr ""
 "Por lo tanto no puede escalar más allá."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s ha sido  <b>cerrado</b>."
diff --git a/addons/base_status/i18n/fr.po b/addons/base_status/i18n/fr.po
index 6af7564047b..38a2f161f47 100644
--- a/addons/base_status/i18n/fr.po
+++ b/addons/base_status/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-05 09:30+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Erreur !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s a été <b>ouverte</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s a été <b>renouvelée</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Erreur !"
@@ -54,26 +52,19 @@ msgstr ""
 "possible dans votre catégorie d'équipes de ventes."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s est maintenant <b>en attente</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s à été <b>annulée</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s à été <b>annulée</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -84,8 +75,7 @@ msgstr ""
 "Par conséquent vous ne pouvez pas demander une escalade au niveau supérieur."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s à été <b>fermée</b>."
diff --git a/addons/base_status/i18n/hr.po b/addons/base_status/i18n/hr.po
index d5f12130be2..8aad7f7292c 100644
--- a/addons/base_status/i18n/hr.po
+++ b/addons/base_status/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 19:46+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Greška !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s je <b>otvoren</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s je <b>obnovljen</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -52,26 +50,19 @@ msgid ""
 msgstr "Ne možete eskaliarati. Vi ste na vrhu hijerarhije prodajnog tima."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s je sada <b>na čekanju</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s je <b>otkazan</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s je <b>otkazan</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -81,8 +72,7 @@ msgstr ""
 "Stoga ne možete dalje eskalirati."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s je <b>zatvoren</b>."
diff --git a/addons/base_status/i18n/id.po b/addons/base_status/i18n/id.po
index 78afc027cfc..8036d996b9b 100644
--- a/addons/base_status/i18n/id.po
+++ b/addons/base_status/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 00:41+0000\n"
 "Last-Translator: Riza Kurniawan <rizabisnis@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Ada Kesalahan !!!"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s sedang <b>dibuka</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s sedang <b>diperbaharui</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Ada Kesalahan !"
@@ -53,26 +51,19 @@ msgstr ""
 "Tidak bisa ditingkatkan, anda pada tingkat tertinggi bersama tim sales anda."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s saat ini <b>ditunda</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s sedang = <b>dibatalkan</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s sedang = <b>dibatalkan</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -80,8 +71,7 @@ msgid ""
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s sedang = <b>ditutup</b>."
diff --git a/addons/base_status/i18n/it.po b/addons/base_status/i18n/it.po
index cdc55bd9105..6a235457237 100644
--- a/addons/base_status/i18n/it.po
+++ b/addons/base_status/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 19:22+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Errore !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s è stato <b>aperto</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s è stato <b>rinnovato</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -52,26 +50,19 @@ msgid ""
 msgstr "Impossibile scalare, si è già al livello massimo del team vendite."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s è ora <b>in attesa</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s è stato <b>annullato</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s è stato <b>annullato</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -81,8 +72,7 @@ msgstr ""
 "Quindi non è possibile scalare ulteriormente."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s è stato <b>chiuso</b>."
diff --git a/addons/base_status/i18n/nl.po b/addons/base_status/i18n/nl.po
index 15862a01fea..d2add70a7d0 100644
--- a/addons/base_status/i18n/nl.po
+++ b/addons/base_status/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 14:05+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Fout!"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s is <b>geopend</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s is <b>vernieuw</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -54,26 +52,19 @@ msgstr ""
 "van uw verkoopteam categorieën."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s is nu <b>in afwachting</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s is <b>geannuleerd</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s is <b>geannuleerd</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -83,8 +74,7 @@ msgstr ""
 "Het is zodoende niet mogelijk om verder te escaleren."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s is <b>gesloten</b>."
diff --git a/addons/base_status/i18n/pl.po b/addons/base_status/i18n/pl.po
index 01dc1dd4074..b9baabab265 100644
--- a/addons/base_status/i18n/pl.po
+++ b/addons/base_status/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:12+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Błąd !"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s zostało <b>otwarte</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s zostało <b>odnowione</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -53,26 +51,19 @@ msgstr ""
 "Nie możesz przekazywać nadrzędnym, bo jesteś na górze w kategorii zespołu."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s <b>oczekuje</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s zostało <b>anulowane</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s zostało <b>anulowane</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -82,8 +73,7 @@ msgstr ""
 "Więc nie możesz przekazywać wyżej."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s zostało <b>zamknięte</b>."
diff --git a/addons/base_status/i18n/pt.po b/addons/base_status/i18n/pt.po
index 7abdf733922..d0b08717512 100644
--- a/addons/base_status/i18n/pt.po
+++ b/addons/base_status/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 16:39+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "Erro!"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -52,26 +50,19 @@ msgid ""
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -79,8 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr ""
diff --git a/addons/base_status/i18n/pt_BR.po b/addons/base_status/i18n/pt_BR.po
index 382e1bbf2be..ebea282efc9 100644
--- a/addons/base_status/i18n/pt_BR.po
+++ b/addons/base_status/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 23:52+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -25,21 +25,19 @@ msgid "Error !"
 msgstr "Erro!"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s foi <b>aberta</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s foi <b>revisado </b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -55,26 +53,19 @@ msgstr ""
 "categoria de equipe de vendas."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s está agora <b>pendente</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s foi <b>cancelado</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s foi <b>cancelado</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -84,8 +75,7 @@ msgstr ""
 "Portanto, você não pode escalar além disso."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s foi <b>fechado</b>."
diff --git a/addons/base_status/i18n/zh_CN.po b/addons/base_status/i18n/zh_CN.po
index 5b4a7d03724..f5dbb0deab9 100644
--- a/addons/base_status/i18n/zh_CN.po
+++ b/addons/base_status/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:43+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -24,21 +24,19 @@ msgid "Error !"
 msgstr "错误！"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
 msgstr "%s 已经被 <b>打开</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
 msgstr "%s 已经被 <b>更新</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid "Error!"
 msgstr "错误!"
@@ -52,26 +50,19 @@ msgid ""
 msgstr "不能上报，你已经在您销售团队类别中的最高级了。"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
 msgstr "%s 现在 <b>待定</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s 已经被 <b>取消</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
 msgstr "%s 已经被 <b>取消</b>."
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
 #, python-format
 msgid ""
 "You are already at the top level of your sales-team category.\n"
@@ -81,8 +72,7 @@ msgstr ""
 "因此，你不能再上报了。"
 
 #. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
 msgstr "%s 已经被 <b>关闭</b>."
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index 9c9b034be7d..0cf60470660 100644
--- a/addons/base_vat/i18n/ar.po
+++ b/addons/base_vat/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:14+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index d62883334bb..7ce0f492c1f 100644
--- a/addons/base_vat/i18n/bg.po
+++ b/addons/base_vat/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-27 10:03+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index ae6c80b6ccb..683cb880235 100644
--- a/addons/base_vat/i18n/bs.po
+++ b/addons/base_vat/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 20:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index 45129fc5fc1..2e1ac0cd9c4 100644
--- a/addons/base_vat/i18n/ca.po
+++ b/addons/base_vat/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:16+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index 6f94feb33ce..82d01082af6 100644
--- a/addons/base_vat/i18n/cs.po
+++ b/addons/base_vat/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:22+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 77cb3f214da..d9b1789cd1f 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 10:58+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 655c76c98b2..820b586e07b 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 12:05+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\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: 2012-12-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index ccfc2957ef7..6f5d87b558f 100644
--- a/addons/base_vat/i18n/el.po
+++ b/addons/base_vat/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-03 20:14+0000\n"
 "Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 9159e774261..d14e7cd900f 100644
--- a/addons/base_vat/i18n/en_AU.po
+++ b/addons/base_vat/i18n/en_AU.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:16+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/en_GB.po b/addons/base_vat/i18n/en_GB.po
index e468cff044d..6352dcfacf3 100644
--- a/addons/base_vat/i18n/en_GB.po
+++ b/addons/base_vat/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 13:23+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index c7d11cfae46..0c994eaff38 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 22:21+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\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: 2012-12-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index 99a86fdafea..7c4b0aabf73 100644
--- a/addons/base_vat/i18n/es_AR.po
+++ b/addons/base_vat/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 13:45+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/es_CL.po b/addons/base_vat/i18n/es_CL.po
index 46a49b64508..893928346da 100644
--- a/addons/base_vat/i18n/es_CL.po
+++ b/addons/base_vat/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-18 17:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/es_CR.po b/addons/base_vat/i18n/es_CR.po
index 0def5977748..84381d49db7 100644
--- a/addons/base_vat/i18n/es_CR.po
+++ b/addons/base_vat/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 17:43+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es_EC.po b/addons/base_vat/i18n/es_EC.po
index ca5d3487979..5cfd12e0cfb 100644
--- a/addons/base_vat/i18n/es_EC.po
+++ b/addons/base_vat/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:07+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po
index a9f86e77e1c..a98be2db24f 100644
--- a/addons/base_vat/i18n/es_MX.po
+++ b/addons/base_vat/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-07 00:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/es_PY.po b/addons/base_vat/i18n/es_PY.po
index 39364c339ea..f40fe517316 100644
--- a/addons/base_vat/i18n/es_PY.po
+++ b/addons/base_vat/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-18 12:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index 0d8d800d73d..8f30508e06c 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-10 18:08+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
index 8abdcfa750e..83931cf9361 100644
--- a/addons/base_vat/i18n/eu.po
+++ b/addons/base_vat/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-08 07:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/fa.po b/addons/base_vat/i18n/fa.po
index ea7dbbc9b50..98f339dc81d 100644
--- a/addons/base_vat/i18n/fa.po
+++ b/addons/base_vat/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 09:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index a3dd5f03291..8f6a7844481 100644
--- a/addons/base_vat/i18n/fi.po
+++ b/addons/base_vat/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:16+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 8f68fe96206..c9115727e57 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:48+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index 9619c28f175..9eedc1a4c4c 100644
--- a/addons/base_vat/i18n/gl.po
+++ b/addons/base_vat/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/gu.po b/addons/base_vat/i18n/gu.po
index 5457704f877..4fb24be2a80 100644
--- a/addons/base_vat/i18n/gu.po
+++ b/addons/base_vat/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-06 18:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index e6624f859ab..d7dfff389c7 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-28 20:22+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index c8cabafaabb..639697dc344 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 18:32+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index ab67e2020c7..ab0631d53ce 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:16+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index d8314bf08a1..e16e8bc14b3 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 22:37+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/ja.po b/addons/base_vat/i18n/ja.po
index b0c72f70baa..086fab6dee2 100644
--- a/addons/base_vat/i18n/ja.po
+++ b/addons/base_vat/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-28 00:19+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index 1d1f5e7fe16..165ebdbd7ed 100644
--- a/addons/base_vat/i18n/ko.po
+++ b/addons/base_vat/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:24+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index bad82c26ef7..2fa6ee4bae0 100644
--- a/addons/base_vat/i18n/lt.po
+++ b/addons/base_vat/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:16+0000\n"
 "Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/lv.po b/addons/base_vat/i18n/lv.po
index 692a5fa65ba..71518da9db5 100644
--- a/addons/base_vat/i18n/lv.po
+++ b/addons/base_vat/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-28 11:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/mn.po b/addons/base_vat/i18n/mn.po
index ce3e0d9f80c..2a947aa34c4 100644
--- a/addons/base_vat/i18n/mn.po
+++ b/addons/base_vat/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 05:26+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index 8b9d4296662..617778be1f7 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 10:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index ebf779200eb..43cb422dc1b 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 17:36+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index c85e76d2ead..40be46af922 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-01 11:23+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index 259d645cd49..555de4b3f07 100644
--- a/addons/base_vat/i18n/oc.po
+++ b/addons/base_vat/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-18 12:36+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index 89da4bd12f4..eda04798332 100644
--- a/addons/base_vat/i18n/pl.po
+++ b/addons/base_vat/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:27+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 76a9262cdc9..f5a4452a5a3 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:48+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 498bf62cb45..fe3585c854b 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 23:53+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index 976483992f8..947b9c69efc 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-21 19:12+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index e400ed7d3b4..56db094b394 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-05 07:36+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index 56d473c9a1d..acf63a74e49 100644
--- a/addons/base_vat/i18n/sk.po
+++ b/addons/base_vat/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:17+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index a5c7ed689d2..0ad09f0d655 100644
--- a/addons/base_vat/i18n/sl.po
+++ b/addons/base_vat/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 08:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/sq.po b/addons/base_vat/i18n/sq.po
index 7626422cb6f..980b6c8fad8 100644
--- a/addons/base_vat/i18n/sq.po
+++ b/addons/base_vat/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-06 17:28+0000\n"
 "Last-Translator: Arianit Kukaj <Unknown>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index 16ed4aef3b0..5afb28a6e7a 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-29 09:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/sr@latin.po b/addons/base_vat/i18n/sr@latin.po
index 559a9131750..fd3cc6f59d0 100644
--- a/addons/base_vat/i18n/sr@latin.po
+++ b/addons/base_vat/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-06 13:45+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index f0aeede19ca..51e8790c936 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 17:22+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/th.po b/addons/base_vat/i18n/th.po
index f4640057b11..c0b317d6ee0 100644
--- a/addons/base_vat/i18n/th.po
+++ b/addons/base_vat/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-16 14:42+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index 2c59da00429..4e7aaea748e 100644
--- a/addons/base_vat/i18n/tlh.po
+++ b/addons/base_vat/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 70e9b26de27..64f3af6ea11 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 21:48+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index e77a3a7713c..3d13d320957 100644
--- a/addons/base_vat/i18n/uk.po
+++ b/addons/base_vat/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 20:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/vi.po b/addons/base_vat/i18n/vi.po
index 3853d092f44..5930cb1d795 100644
--- a/addons/base_vat/i18n/vi.po
+++ b/addons/base_vat/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-25 14:58+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index 85d5145b2fb..48a462c57e9 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 17:41+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index d44b54c2888..03ffc9765df 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-30 12:44+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_vat
 #: view:res.partner:0
diff --git a/addons/board/i18n/ar.po b/addons/board/i18n/ar.po
index e8469ffe9ce..14b81c77b70 100644
--- a/addons/board/i18n/ar.po
+++ b/addons/board/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index 6dc2fdf1993..515db425fa7 100644
--- a/addons/board/i18n/bg.po
+++ b/addons/board/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 15:51+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/br.po b/addons/board/i18n/br.po
index 9c1e8b2b7e3..6f2eea65280 100644
--- a/addons/board/i18n/br.po
+++ b/addons/board/i18n/br.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-12 09:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Breton <br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index a702f70fdd1..965b6f8a239 100644
--- a/addons/board/i18n/bs.po
+++ b/addons/board/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:42+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index 682e5c8d6f3..02b5e2a7c33 100644
--- a/addons/board/i18n/ca.po
+++ b/addons/board/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:57+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index f01395a0719..3c4f53903f3 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:15+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: board
diff --git a/addons/board/i18n/da.po b/addons/board/i18n/da.po
index 13a8553726b..2700a0b97cd 100644
--- a/addons/board/i18n/da.po
+++ b/addons/board/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 41ad21d9509..925ca3a8a26 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 22:20+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index fcb7ead7eaa..c4c62fdb897 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 17:22+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index ed5d5a7f03d..6525449da5f 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 21:34+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index e8194d7f918..6894ae77fe2 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-18 18:46+0000\n"
 "Last-Translator: Eduardo Alberto Calvo <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/es_CL.po b/addons/board/i18n/es_CL.po
index 6aa32a2c767..0e537ede767 100644
--- a/addons/board/i18n/es_CL.po
+++ b/addons/board/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-21 07:20+0000\n"
 "Last-Translator: David Acevedo Toledo <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/es_CR.po b/addons/board/i18n/es_CR.po
index 00aee79d504..6639aa91769 100644
--- a/addons/board/i18n/es_CR.po
+++ b/addons/board/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 17:50+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: board
diff --git a/addons/board/i18n/es_EC.po b/addons/board/i18n/es_EC.po
index 35978e42a77..d91f3df9a68 100644
--- a/addons/board/i18n/es_EC.po
+++ b/addons/board/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-17 19:09+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/es_PY.po b/addons/board/i18n/es_PY.po
index fa3f69fc47c..69d3c35a3d7 100644
--- a/addons/board/i18n/es_PY.po
+++ b/addons/board/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-18 12:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index cf73ae9b1ad..2b5f3fb4c7f 100644
--- a/addons/board/i18n/et.po
+++ b/addons/board/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:20+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/fa.po b/addons/board/i18n/fa.po
index f2bef1df1f0..097ba367eaf 100644
--- a/addons/board/i18n/fa.po
+++ b/addons/board/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 09:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
index d085f68fd25..77a8065db64 100644
--- a/addons/board/i18n/fi.po
+++ b/addons/board/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:20+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 1742bd9827c..ba905cf76ec 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:04+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index d5a408e0c8b..5574cf86474 100644
--- a/addons/board/i18n/gl.po
+++ b/addons/board/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: board-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 18:25+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/gu.po b/addons/board/i18n/gu.po
index b812af98917..4a55875547c 100644
--- a/addons/board/i18n/gu.po
+++ b/addons/board/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 11:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index f3116bd5ccc..edf1fa964e6 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 16:03+0000\n"
 "Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index 3af760278f4..90d7dacde7b 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 18:41+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index d56feb5ca72..a353a5cafcb 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:21+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index 62affa41efb..731dfff3458 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 20:48+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index 80d1742b0be..22182b47fa4 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:39+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index 22d5f6c57e5..77e6f0d1357 100644
--- a/addons/board/i18n/ko.po
+++ b/addons/board/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:34+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
index a5063868328..22f1584ce1d 100644
--- a/addons/board/i18n/ln.po
+++ b/addons/board/i18n/ln.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-15 08:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lingala <ln@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index c891775b5c8..f1924b82cc4 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 22:30+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/lv.po b/addons/board/i18n/lv.po
index bbcaca7a9f6..372f2eaee42 100644
--- a/addons/board/i18n/lv.po
+++ b/addons/board/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 12:53+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 7adb7c5efbb..0de577a9fab 100644
--- a/addons/board/i18n/mn.po
+++ b/addons/board/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-20 02:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/nb.po b/addons/board/i18n/nb.po
index bd25715b42a..4324fdf0030 100644
--- a/addons/board/i18n/nb.po
+++ b/addons/board/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:28+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index eb71068f5d8..168157f4061 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:14+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 104681b46a5..6cb89183580 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-06-15 14:17+0000\n"
 "Last-Translator: Niels Huylebroeck <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index 0e1e70c246c..ec975a913ed 100644
--- a/addons/board/i18n/pl.po
+++ b/addons/board/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 23:18+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index da2f3b033e6..6ef4e874eaf 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 16:50+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index 650d7cf32d7..c7cb11ad367 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 23:57+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 87e6cac12f8..7d6411e870a 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-26 06:04+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 071aab80197..08ddd2df385 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-26 09:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 0b7829fbda1..11ab5066558 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-19 21:46+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index 2d53086fa89..916b4e4a4e2 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 11:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/sq.po b/addons/board/i18n/sq.po
index 3bdea3e533b..b0259aac317 100644
--- a/addons/board/i18n/sq.po
+++ b/addons/board/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
index 50d7d6a8b42..77173b2d1ef 100644
--- a/addons/board/i18n/sr.po
+++ b/addons/board/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/sr@latin.po b/addons/board/i18n/sr@latin.po
index c76dc569a9e..4aa76beaafe 100644
--- a/addons/board/i18n/sr@latin.po
+++ b/addons/board/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 16:16+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index 356d41b2b2e..0ad67d305cf 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-03 23:18+0000\n"
 "Last-Translator: Stefan Lind <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/th.po b/addons/board/i18n/th.po
index 4c2134d98aa..bbf37a0fa0d 100644
--- a/addons/board/i18n/th.po
+++ b/addons/board/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 14:30+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/tlh.po b/addons/board/i18n/tlh.po
index 98c724a4d24..dbc421f107f 100644
--- a/addons/board/i18n/tlh.po
+++ b/addons/board/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 31d4eab76ee..d55137e0def 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 23:39+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index e562cebd4a0..7e2d028b10d 100644
--- a/addons/board/i18n/uk.po
+++ b/addons/board/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:14+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/vi.po b/addons/board/i18n/vi.po
index 6b56b383179..0e498df58e1 100644
--- a/addons/board/i18n/vi.po
+++ b/addons/board/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-25 15:06+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index 816f79d0185..af2544a0279 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 17:42+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-01 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index dfdd073e353..9fb847f45e6 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-30 12:44+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
diff --git a/addons/claim_from_delivery/i18n/ar.po b/addons/claim_from_delivery/i18n/ar.po
index 7c2c4f3473c..ee0a7f89b6e 100644
--- a/addons/claim_from_delivery/i18n/ar.po
+++ b/addons/claim_from_delivery/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:15+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/bg.po b/addons/claim_from_delivery/i18n/bg.po
index f3e0e02a336..190b3daebb1 100644
--- a/addons/claim_from_delivery/i18n/bg.po
+++ b/addons/claim_from_delivery/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-19 15:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/ca.po b/addons/claim_from_delivery/i18n/ca.po
index 5ce1cbe3ed6..cd7fe217bb7 100644
--- a/addons/claim_from_delivery/i18n/ca.po
+++ b/addons/claim_from_delivery/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-26 18:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/cs.po b/addons/claim_from_delivery/i18n/cs.po
index 2fd96fb26ad..7256b2cdade 100644
--- a/addons/claim_from_delivery/i18n/cs.po
+++ b/addons/claim_from_delivery/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 04:57+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/da.po b/addons/claim_from_delivery/i18n/da.po
index cd0b123f343..30276fcf4ab 100644
--- a/addons/claim_from_delivery/i18n/da.po
+++ b/addons/claim_from_delivery/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 67400a342e1..f31ede8a9ad 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 12:45+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/en_GB.po b/addons/claim_from_delivery/i18n/en_GB.po
index 132da26d1cc..5942d4189b1 100644
--- a/addons/claim_from_delivery/i18n/en_GB.po
+++ b/addons/claim_from_delivery/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-25 11:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index cce8ce4fcd0..f6983a525b6 100644
--- a/addons/claim_from_delivery/i18n/es.po
+++ b/addons/claim_from_delivery/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 22:22+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/es_AR.po b/addons/claim_from_delivery/i18n/es_AR.po
index 8edef4c093d..cbf31a4bd2b 100644
--- a/addons/claim_from_delivery/i18n/es_AR.po
+++ b/addons/claim_from_delivery/i18n/es_AR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-18 18:38+0000\n"
 "Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
 "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/es_CL.po b/addons/claim_from_delivery/i18n/es_CL.po
index 815ac3cc460..1c6eefb21af 100644
--- a/addons/claim_from_delivery/i18n/es_CL.po
+++ b/addons/claim_from_delivery/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-07 20:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/es_CR.po b/addons/claim_from_delivery/i18n/es_CR.po
index a7747ec4bb4..50853e27b0b 100644
--- a/addons/claim_from_delivery/i18n/es_CR.po
+++ b/addons/claim_from_delivery/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:13+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_EC.po b/addons/claim_from_delivery/i18n/es_EC.po
index 71c7461d7a6..b8e62f2cd0a 100644
--- a/addons/claim_from_delivery/i18n/es_EC.po
+++ b/addons/claim_from_delivery/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:08+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/es_PY.po b/addons/claim_from_delivery/i18n/es_PY.po
index 0e0d6e796ad..b41dffb350b 100644
--- a/addons/claim_from_delivery/i18n/es_PY.po
+++ b/addons/claim_from_delivery/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-18 13:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/fa.po b/addons/claim_from_delivery/i18n/fa.po
index 5eeb7b9b327..168af6dc2ea 100644
--- a/addons/claim_from_delivery/i18n/fa.po
+++ b/addons/claim_from_delivery/i18n/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 09:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/fi.po b/addons/claim_from_delivery/i18n/fi.po
index 264189b1e9a..b44fcbeb6c2 100644
--- a/addons/claim_from_delivery/i18n/fi.po
+++ b/addons/claim_from_delivery/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-20 10:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/fr.po b/addons/claim_from_delivery/i18n/fr.po
index 78870b04a3c..964ecbff300 100644
--- a/addons/claim_from_delivery/i18n/fr.po
+++ b/addons/claim_from_delivery/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:43+0000\n"
 "Last-Translator: Pierre Lamarche (www.savoirfairelinux.com) "
 "<pierre.lamarche@savoirfairelinux.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/gl.po b/addons/claim_from_delivery/i18n/gl.po
index f57c2d9fe1e..45c8b6270a9 100644
--- a/addons/claim_from_delivery/i18n/gl.po
+++ b/addons/claim_from_delivery/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 21:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/gu.po b/addons/claim_from_delivery/i18n/gu.po
index 14154a2bf52..ebb171b8977 100644
--- a/addons/claim_from_delivery/i18n/gu.po
+++ b/addons/claim_from_delivery/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 11:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/hr.po b/addons/claim_from_delivery/i18n/hr.po
index bbcecb166b0..23e9d6336f6 100644
--- a/addons/claim_from_delivery/i18n/hr.po
+++ b/addons/claim_from_delivery/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:11+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/hu.po b/addons/claim_from_delivery/i18n/hu.po
index 8f50e0a8f0b..b03c71ec9b0 100644
--- a/addons/claim_from_delivery/i18n/hu.po
+++ b/addons/claim_from_delivery/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-17 13:47+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/id.po b/addons/claim_from_delivery/i18n/id.po
index 51e6b78ab38..e6b13e82d01 100644
--- a/addons/claim_from_delivery/i18n/id.po
+++ b/addons/claim_from_delivery/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 18:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 904678c797c..8e25eec1e9b 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 00:12+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/ja.po b/addons/claim_from_delivery/i18n/ja.po
index e53a10a9736..c91aa70cd4e 100644
--- a/addons/claim_from_delivery/i18n/ja.po
+++ b/addons/claim_from_delivery/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-01 05:47+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/lo.po b/addons/claim_from_delivery/i18n/lo.po
index 0b43538c2ee..f8b1125a1c1 100644
--- a/addons/claim_from_delivery/i18n/lo.po
+++ b/addons/claim_from_delivery/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-20 18:44+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/lt.po b/addons/claim_from_delivery/i18n/lt.po
index f557fe38dab..952e033a884 100644
--- a/addons/claim_from_delivery/i18n/lt.po
+++ b/addons/claim_from_delivery/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-15 13:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/mn.po b/addons/claim_from_delivery/i18n/mn.po
index 45d99268a53..60229f7d804 100644
--- a/addons/claim_from_delivery/i18n/mn.po
+++ b/addons/claim_from_delivery/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 02:12+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/nb.po b/addons/claim_from_delivery/i18n/nb.po
index 89078cf4889..05e4592f5a2 100644
--- a/addons/claim_from_delivery/i18n/nb.po
+++ b/addons/claim_from_delivery/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 19:14+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/nl.po b/addons/claim_from_delivery/i18n/nl.po
index f37cadd844a..56a5c35da2d 100644
--- a/addons/claim_from_delivery/i18n/nl.po
+++ b/addons/claim_from_delivery/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 19:07+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/nl_BE.po b/addons/claim_from_delivery/i18n/nl_BE.po
index 7de6943064e..496d14fe707 100644
--- a/addons/claim_from_delivery/i18n/nl_BE.po
+++ b/addons/claim_from_delivery/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-01 11:24+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/oc.po b/addons/claim_from_delivery/i18n/oc.po
index 88db2107e88..5213248cbeb 100644
--- a/addons/claim_from_delivery/i18n/oc.po
+++ b/addons/claim_from_delivery/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-20 09:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/pl.po b/addons/claim_from_delivery/i18n/pl.po
index e5aa393d3a5..e82be916b0b 100644
--- a/addons/claim_from_delivery/i18n/pl.po
+++ b/addons/claim_from_delivery/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:28+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/pt.po b/addons/claim_from_delivery/i18n/pt.po
index db4d0e59fd9..e3f35fff8a3 100644
--- a/addons/claim_from_delivery/i18n/pt.po
+++ b/addons/claim_from_delivery/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-03 18:53+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/pt_BR.po b/addons/claim_from_delivery/i18n/pt_BR.po
index bc23e918b1d..6ae05580143 100644
--- a/addons/claim_from_delivery/i18n/pt_BR.po
+++ b/addons/claim_from_delivery/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 18:14+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/ro.po b/addons/claim_from_delivery/i18n/ro.po
index 057e8970774..fcca173afff 100644
--- a/addons/claim_from_delivery/i18n/ro.po
+++ b/addons/claim_from_delivery/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-29 15:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index 23c01a5cb57..cc60bf365df 100644
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-30 06:47+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/sl.po b/addons/claim_from_delivery/i18n/sl.po
index 84647f270ed..b697f631098 100644
--- a/addons/claim_from_delivery/i18n/sl.po
+++ b/addons/claim_from_delivery/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 11:26+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/sq.po b/addons/claim_from_delivery/i18n/sq.po
index 761a169670b..e3b9ddd7b51 100644
--- a/addons/claim_from_delivery/i18n/sq.po
+++ b/addons/claim_from_delivery/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/sr.po b/addons/claim_from_delivery/i18n/sr.po
index 3b5cca1de4a..a5b99290bfa 100644
--- a/addons/claim_from_delivery/i18n/sr.po
+++ b/addons/claim_from_delivery/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-17 07:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/sr@latin.po b/addons/claim_from_delivery/i18n/sr@latin.po
index 697fc0cf048..249191f8f4a 100644
--- a/addons/claim_from_delivery/i18n/sr@latin.po
+++ b/addons/claim_from_delivery/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-06 14:05+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/sv.po b/addons/claim_from_delivery/i18n/sv.po
index c56a86025e8..501c8a8a770 100644
--- a/addons/claim_from_delivery/i18n/sv.po
+++ b/addons/claim_from_delivery/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-24 09:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/ta.po b/addons/claim_from_delivery/i18n/ta.po
index 843e3e8dbc4..8f21464b48e 100644
--- a/addons/claim_from_delivery/i18n/ta.po
+++ b/addons/claim_from_delivery/i18n/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 06:05+0000\n"
 "Last-Translator: சதீஷ் குமார் <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/tr.po b/addons/claim_from_delivery/i18n/tr.po
index 643f5552ccb..c53076a4280 100644
--- a/addons/claim_from_delivery/i18n/tr.po
+++ b/addons/claim_from_delivery/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-05 10:15+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po
index f638742ba82..1c9290aa8f6 100644
--- a/addons/claim_from_delivery/i18n/zh_CN.po
+++ b/addons/claim_from_delivery/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 04:11+0000\n"
 "Last-Translator: sum1201 <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/claim_from_delivery/i18n/zh_TW.po b/addons/claim_from_delivery/i18n/zh_TW.po
index c0251c0c6c0..0ec752dd6f3 100644
--- a/addons/claim_from_delivery/i18n/zh_TW.po
+++ b/addons/claim_from_delivery/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-19 10:24+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
diff --git a/addons/contacts/i18n/ar.po b/addons/contacts/i18n/ar.po
index 6119dea8d8f..77dbaffe73a 100644
--- a/addons/contacts/i18n/ar.po
+++ b/addons/contacts/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 17:43+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/de.po b/addons/contacts/i18n/de.po
index fd3fde8877f..8ee019e0e35 100644
--- a/addons/contacts/i18n/de.po
+++ b/addons/contacts/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 12:50+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/es.po b/addons/contacts/i18n/es.po
index 825d45cbbb8..6c84ae4e4cf 100644
--- a/addons/contacts/i18n/es.po
+++ b/addons/contacts/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:20+0000\n"
 "Last-Translator: Armando Regnault <armandoplc@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/et.po b/addons/contacts/i18n/et.po
index 9974c578a78..75dde80e82e 100644
--- a/addons/contacts/i18n/et.po
+++ b/addons/contacts/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 18:48+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/fr.po b/addons/contacts/i18n/fr.po
index cca9a57847e..c05bfd959a5 100644
--- a/addons/contacts/i18n/fr.po
+++ b/addons/contacts/i18n/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:42+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
diff --git a/addons/contacts/i18n/hr.po b/addons/contacts/i18n/hr.po
index 8de3a7cf309..d9d806fb0b5 100644
--- a/addons/contacts/i18n/hr.po
+++ b/addons/contacts/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 19:40+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po
index eacc9b22406..500d4f50c83 100644
--- a/addons/contacts/i18n/hu.po
+++ b/addons/contacts/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 23:56+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/it.po b/addons/contacts/i18n/it.po
index e0d4d816737..230ebcf637c 100644
--- a/addons/contacts/i18n/it.po
+++ b/addons/contacts/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 19:52+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/nl.po b/addons/contacts/i18n/nl.po
index 70d43860c53..5a14a8015b4 100644
--- a/addons/contacts/i18n/nl.po
+++ b/addons/contacts/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 20:26+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/pl.po b/addons/contacts/i18n/pl.po
index 64e2d8de6fa..003e0e5a906 100644
--- a/addons/contacts/i18n/pl.po
+++ b/addons/contacts/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 10:43+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/pt.po b/addons/contacts/i18n/pt.po
index 465f9e0936d..595e42f9fff 100644
--- a/addons/contacts/i18n/pt.po
+++ b/addons/contacts/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 14:10+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/pt_BR.po b/addons/contacts/i18n/pt_BR.po
index 45de98d2136..15cd67ec31b 100644
--- a/addons/contacts/i18n/pt_BR.po
+++ b/addons/contacts/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 00:40+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/ro.po b/addons/contacts/i18n/ro.po
index ebf9563d58b..9fa14b52acb 100644
--- a/addons/contacts/i18n/ro.po
+++ b/addons/contacts/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 09:13+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/ru.po b/addons/contacts/i18n/ru.po
index 15f41977fda..986793d1347 100644
--- a/addons/contacts/i18n/ru.po
+++ b/addons/contacts/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 18:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/tr.po b/addons/contacts/i18n/tr.po
index 9b68dbf5ddc..d816310fb9e 100644
--- a/addons/contacts/i18n/tr.po
+++ b/addons/contacts/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 21:52+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/zh_CN.po b/addons/contacts/i18n/zh_CN.po
index 4334507a174..2671c0df754 100644
--- a/addons/contacts/i18n/zh_CN.po
+++ b/addons/contacts/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 13:55+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/zh_TW.po b/addons/contacts/i18n/zh_TW.po
new file mode 100644
index 00000000000..72df3ef7766
--- /dev/null
+++ b/addons/contacts/i18n/zh_TW.po
@@ -0,0 +1,37 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 05:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
diff --git a/addons/crm/i18n/ar.po b/addons/crm/i18n/ar.po
index 0a736fd492b..a90d7dcd004 100644
--- a/addons/crm/i18n/ar.po
+++ b/addons/crm/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 13:13+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "المصدر"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "الاسم"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "إجراء"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "اختر الفرص"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "تأخر علي الإغلاق"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "اسم المرحلة"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "انشاء يوم"
 msgid "Rule Name"
 msgstr "اسم القاعدة"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "إعداد مكالمة أخري"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "إلغاء الإشتراك"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "الحالة"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "الإجابات المستبعدة:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "أقسام"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "تحليل المهام الأساسية"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "حملات"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "اختر الفرص"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "الحالة"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "شريك متوقع"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "بدون موضوع"
@@ -386,11 +389,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "انقسام"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -414,7 +423,6 @@ msgstr ""
 "لتتحقق."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -429,15 +437,21 @@ msgstr "فئة"
 msgid "#Opportunities"
 msgstr "عدد الفرص"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -469,22 +483,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "إنشاء فرصة"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "أغسطس"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "اسم المرحلة"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "تهيئة"
 
 #. module: crm
 #: view:crm.lead:0
@@ -497,9 +502,9 @@ msgid "Mailings"
 msgstr "رسائل"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "في انتظار التنفيذ"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -519,9 +524,9 @@ msgid "Planned Revenue"
 msgstr "الأرباح المتوقعة"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "الربح المتوقع"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -557,6 +562,11 @@ msgstr "ملخّص"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -567,11 +577,6 @@ msgstr "فئة الحالة"
 msgid "Partner Contact Name"
 msgstr "اسم الشريك المتصل"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -594,6 +599,11 @@ msgstr "#المكالمات التليفونية"
 msgid "The code of the sales team must be unique !"
 msgstr "الترميز لفريق المبيعات يجب أن يكون فريداً !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -657,9 +667,9 @@ msgid "Partner Segmentation"
 msgstr "إنقسام الشريك"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "المدة بالدقائق"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -677,9 +687,9 @@ msgid "The name of the segmentation."
 msgstr "إسم الانقسام"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "الإحتمال (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -697,13 +707,7 @@ msgid "Statistics Dashboard"
 msgstr "لوحة الاحصائيات"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -716,12 +720,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "فرصة"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -758,17 +756,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "اسم الفرصة"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "ضع الفريق لـ"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -780,25 +767,21 @@ msgid "Exclusive"
 msgstr "خاص"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "سنة الإنشاء"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -821,21 +804,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -843,9 +811,9 @@ msgid "Requirements"
 msgstr "المتطلبات"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "تحويل إلي فرصة "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "ألبريدي"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -890,9 +858,9 @@ msgid "Mark Won"
 msgstr "تعليم كـ فوز"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "الإحتمال (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -917,7 +885,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "تحذير !"
@@ -927,23 +895,12 @@ msgstr "تحذير !"
 msgid "Days to Open"
 msgstr "الأيام للفتح"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "إنشاء شريك"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "الجوال"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -969,11 +926,6 @@ msgstr "تستخدم لحساب الأيام المفتوحة"
 msgid "Meetings"
 msgstr "اللقاءات"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -981,6 +933,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "الإجراء التالي"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "مسودة"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1049,14 +1014,6 @@ msgstr "احسب الإنقسام"
 msgid "Lowest"
 msgstr "أدنى"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1066,9 +1023,9 @@ msgid "Creation Date"
 msgstr "تاريخ الإنشاء"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1128,23 +1085,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "الربح المتوقع"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1153,8 +1102,19 @@ msgid "September"
 msgstr "سبتمبر"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1186,21 +1146,15 @@ msgid "Opening Date"
 msgstr "تاريخ الفتح"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "المدة بالدقائق"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "اسم القناة"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "تابع"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1230,6 +1184,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1239,14 +1199,6 @@ msgstr ""
 "تحقق ما اذا كنت تريد استخدام الحساب هذا كجزء من قاعدة الانقسام. اذا لم "
 "تتحقق, سيتم تجاهل ما دونالمعايير"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "انشأ شريك"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1268,17 +1220,12 @@ msgid "unknown"
 msgstr "مجهول"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "شريك إلي فرصة"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1287,13 +1234,6 @@ msgstr "شريك إلي فرصة"
 msgid "Date"
 msgstr "تاريخ"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1342,6 +1282,13 @@ msgstr ""
 "عند ارسال رسائل البريد الالكتروني، فإن عنوان البريد الالكتروني الافتراضي "
 "يؤخذ من فريق المبيعات."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1353,7 +1300,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "الفرص الممزوجة"
@@ -1397,13 +1344,9 @@ msgstr "مراجع"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "إلغاء"
@@ -1424,14 +1367,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "ضم فرصتين"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "في انتظار التنفيذ"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "المكالمة التليفونيه للشريك"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1470,6 +1420,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "أقسام"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1518,6 +1478,12 @@ msgstr "الاسم"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "تاريخ الإغلاق"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1554,17 +1520,6 @@ msgstr "مرتفع"
 msgid "Convert to prospect to business partner"
 msgstr "تحويل إلي فرصة لشريك الأعمال"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1601,6 +1556,7 @@ msgstr "الفريق الاصلي"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1609,11 +1565,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "موعد الاجراء التالي"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "قيد التنفيذ"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1627,11 +1578,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "ألبريدي"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1643,7 +1589,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1696,11 +1642,6 @@ msgstr "قيمة"
 msgid "Customer Name"
 msgstr "اسم العميل"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "المكالمة الهاتفية بالفرصة"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1721,11 +1662,6 @@ msgstr "الفرص حسب المرحلة"
 msgid "Prospect is converting to business partner"
 msgstr "الاحتمال هو التحويل الى شريك تجاري"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1859,11 +1795,6 @@ msgstr "الإحالة من"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "أُستخدمت العلامة لفصل المهامات والفرص"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "هل انت متأكد من انشاء شريك بناءًا على هذه المكالمة الهاتفية ؟"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1894,16 +1825,9 @@ msgid "Sales Teams"
 msgstr "فرق المبيعات"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "تؤدي الى الشريك"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "انقسام"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1915,12 +1839,6 @@ msgstr "فريق"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1932,12 +1850,6 @@ msgstr "لم تُعقد"
 msgid "Probability"
 msgstr "الإحتمال"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1953,6 +1865,12 @@ msgstr "شهر"
 msgid "Leads"
 msgstr "المهام"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1964,28 +1882,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "قيد التنفيذ"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2046,24 +1954,6 @@ msgstr "معلّق"
 msgid "Prospect Opportunity"
 msgstr "فرصة متحملة"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2112,17 +2002,15 @@ msgid "Mandatory Expression"
 msgstr "تعبير إلزامي"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "إرسال بريد"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2152,11 +2040,6 @@ msgstr "تحليل الفرص"
 msgid "Misc"
 msgstr "متفرقات"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "التعبير العادي في سجل الحالة"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2184,11 +2067,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "مسؤول"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2200,21 +2078,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "سجل الاتصالات القصوى"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "سنة الإنشاء"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2281,7 +2160,6 @@ msgstr "إكمال العملية"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2363,8 +2241,13 @@ msgid "Company"
 msgstr "شركة"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "قيد التنفيذ"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2372,6 +2255,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2392,26 +2280,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "ت_حويل"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2456,6 +2324,11 @@ msgstr ""
 "مكالماتهم التليفونية. يمكنك تجميع او تصفية المعلومات طبقًا لمعايير متعددة و "
 "الانتقال ال المعلومات, بإضافة المزيد من المجموعات في التقرير."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2487,6 +2360,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "مؤكد"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2519,6 +2397,24 @@ msgstr "تعبير اختياري"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2574,11 +2470,6 @@ msgstr "إنشاء فرص اعمال من المهام"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "ضع تصنيف لـ"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2623,8 +2514,9 @@ msgid "Qualification"
 msgstr "المؤهل"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2643,15 +2535,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "أغسطس"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "تهيئة"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2747,17 +2641,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "احتمالية ناجحة"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "مسودة"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2769,7 +2656,6 @@ msgstr "حالات من فريق المبيعات"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "إجتماع"
 
@@ -2778,11 +2664,6 @@ msgstr "إجتماع"
 msgid "Category of Case"
 msgstr "فئة الحالة"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "زبون متوقع/زبون"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2806,11 +2687,6 @@ msgstr "الشارع ٢"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "قد تُعرف ان هذا النموذج غير موجود بالفعل."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2829,21 +2705,6 @@ msgstr "مستخدِم"
 msgid "November"
 msgstr "نوفمبر"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "تفاوض"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2867,11 +2728,6 @@ msgstr "عقد"
 msgid "Twitter Ads"
 msgstr "إعلانات تويتر"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2883,14 +2739,9 @@ msgid "Planned Revenues"
 msgstr "الأرباح المخططة"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "مكالمة إلي مكالمة"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Exp.Closing"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2914,16 +2765,10 @@ msgid "Categorization"
 msgstr "التصنيف"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "قواعد الاجراء"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2947,7 +2792,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2973,7 +2817,6 @@ msgid "Description"
 msgstr "وصف"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3052,20 +2895,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "ساعات العمل"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "مكالمات هاتفية"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "عميل"
 
@@ -3087,7 +2921,7 @@ msgid "Lost"
 msgstr "خسارة"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3135,17 +2969,14 @@ msgid "Phone calls by user and section"
 msgstr "مكالمات تليفونية من المستخدم والقسم"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "تفاوض"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "مكالمة إلي مكالمة"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3163,10 +2994,10 @@ msgid "Proposition"
 msgstr "إقتراح"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "تاريخ الإغلاق"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "مكالمات هاتفية"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3180,6 +3011,11 @@ msgstr "سنة"
 msgid "Newsletter"
 msgstr "نشرة الأخبار"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3321,15 +3157,27 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "تفاصيل"
 
+#~ msgid "Continue"
+#~ msgstr "تابع"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer"
 
+#~ msgid "Set Team to"
+#~ msgstr "ضع الفريق لـ"
+
+#~ msgid "Convert To Opportunity "
+#~ msgstr "تحويل إلي فرصة "
+
 #~ msgid "Supplier"
 #~ msgstr "مورِّد"
 
 #~ msgid "Add Note"
 #~ msgstr "إضافة ملاحظة"
 
+#~ msgid "Create Partner"
+#~ msgstr "إنشاء شريك"
+
 #~ msgid "My Meetings"
 #~ msgstr "لقاءاتي"
 
@@ -3426,6 +3274,9 @@ msgstr ""
 #~ msgid "End of recurrency"
 #~ msgstr "نهاية التكرار"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "شريك إلي فرصة"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "ملخص الفرصة"
 
@@ -3450,6 +3301,9 @@ msgstr ""
 #~ msgid "Fix amout of times"
 #~ msgstr "تثبيت عدد المرات"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "ضم فرصتين"
+
 #~ msgid "Current"
 #~ msgstr "الحالي"
 
@@ -3474,6 +3328,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "السبت"
 
+#~ msgid "_Convert"
+#~ msgstr "ت_حويل"
+
 #~ msgid "Wizard"
 #~ msgstr "المعالج"
 
@@ -3582,9 +3439,6 @@ msgstr ""
 #~ msgid "Attachments"
 #~ msgstr "مرفقات"
 
-#~ msgid "Send Mail"
-#~ msgstr "إرسال بريد"
-
 #~ msgid "Uncertain"
 #~ msgstr "غير مؤكد"
 
@@ -3830,6 +3684,9 @@ msgstr ""
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "تم تحويل المهمة ‘%s‘ إلى فرصة."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "التعبير العادي في سجل الحالة"
+
 #~ msgid "Change Responsible"
 #~ msgstr "غير المسؤولية"
 
@@ -3951,6 +3808,12 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "ويدير خدمة مكتب المساعدة."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "اسم الفرصة"
+
+#~ msgid "Create a Partner"
+#~ msgstr "انشأ شريك"
+
 #~ msgid "Check this if you want the rule to send an email to the partner."
 #~ msgstr "تحقق من هذا اذا كنت تريد القاعدة لإرسال البريد الالكتروني للشريك."
 
@@ -3984,6 +3847,9 @@ msgstr ""
 #~ msgid "The case '%s' has been opened."
 #~ msgstr "تم فتح الحالة ‘%s‘."
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "المكالمة الهاتفية بالفرصة"
+
 #~ msgid "Communication  History"
 #~ msgstr "سجل الاتصالات"
 
@@ -4010,6 +3876,12 @@ msgstr ""
 #~ msgid "If opt-in is checked, this contact has accepted to receive emails."
 #~ msgstr "اذا تم التحقق من التقيد, سيُقبل هذا المتصل ليستقبل البريد الالكتروني"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "هل انت متأكد من انشاء شريك بناءًا على هذه المكالمة الهاتفية ؟"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "تؤدي الى الشريك"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "اعيد الى وضع غير مثبت"
 
@@ -4058,6 +3930,9 @@ msgstr ""
 #~ msgid "CRM - Statistics Dashboard"
 #~ msgstr "لوحة احصائيات - ادارة علاقات العملاء"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "سجل الاتصالات القصوى"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "هل انت متأكد من انشاء شريك بناءًا على هذه المهمة ؟"
 
@@ -4082,6 +3957,9 @@ msgstr ""
 #~ msgid "My Win/Lost Ratio for the Last Year"
 #~ msgstr "نسبة الكسب/المفقود الخاصة بي للسنة الماضية"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "المكالمة التليفونيه للشريك"
+
 #~ msgid "Set New State To"
 #~ msgstr "اضف حالة جديدة إلى"
 
@@ -4176,6 +4054,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "تكوين تطبيق ادارة العلاقات للعملاء"
 
+#~ msgid "Set Category to"
+#~ msgstr "ضع تصنيف لـ"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "تقرير مهام إدارة العلافات للعملاء"
 
@@ -4188,12 +4069,18 @@ msgstr ""
 #~ msgid "Communication & History"
 #~ msgstr "الاتصالات والسجلات"
 
+#~ msgid "Success Probability"
+#~ msgstr "احتمالية ناجحة"
+
 #~ msgid "Allows to delete non draft cases"
 #~ msgstr "ويسمح بحذف ما دون حالات المشروع"
 
 #~ msgid "Error ! You can not create recursive profiles."
 #~ msgstr "خطأ ! لا يمكنك انشاء تشكيلات عودية."
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "قد تُعرف ان هذا النموذج غير موجود بالفعل."
+
 #~ msgid "Schedule Phone Call"
 #~ msgstr "جدول المكالمات التليفونية"
 
@@ -4225,6 +4112,9 @@ msgstr ""
 #~ msgid "Merged into Opportunity: %s"
 #~ msgstr "دمجت داخل الفرصة: %s"
 
+#~ msgid "Action Rules"
+#~ msgstr "قواعد الاجراء"
+
 #~ msgid "Recurrency"
 #~ msgstr "إعادة العملة"
 
@@ -4490,6 +4380,9 @@ msgstr ""
 #~ msgid "Mail Gateway"
 #~ msgstr "بوابة الإيميل الإلكتروني"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "زبون متوقع/زبون"
+
 #~ msgid "Phonecalls during last 7 days"
 #~ msgstr "المكالمات خلال 7 أيام السابقة"
 
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index 8d8b53e831e..053ccc9307a 100644
--- a/addons/crm/i18n/bg.po
+++ b/addons/crm/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr "Заглавието"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Действие"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Име на правило"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Състояние"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Секции"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Кампании"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Състояние"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Разделяне"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,15 +432,21 @@ msgstr "Категория"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -464,22 +478,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr ""
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Настройване"
 
 #. module: crm
 #: view:crm.lead:0
@@ -492,8 +497,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -514,9 +519,9 @@ msgid "Planned Revenue"
 msgstr "Планирани приходи"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Очаквани приходи"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -552,6 +557,11 @@ msgstr "Обобщена информация"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr "#Телефонни обаждания"
 msgid "The code of the sales team must be unique !"
 msgstr "Кодът на екипа по продажби трябва да са уникален!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,8 +660,8 @@ msgid "Partner Segmentation"
 msgstr "Сегментация на контрагент"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -670,8 +680,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Възможности"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr "Изключителност"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,9 +804,9 @@ msgid "Requirements"
 msgstr "Изисквания"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr ""
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Пощенски код"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -883,8 +851,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Предупреждение !"
@@ -920,23 +888,12 @@ msgstr "Предупреждение !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Мобилен"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Срещи"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Следващо действие"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Чернова"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr ""
 msgid "Lowest"
 msgstr "Най-нисък"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr "Дата на създаване"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,23 +1078,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Очаквани приходи"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr "Септември"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,8 +1139,8 @@ msgid "Opening Date"
 msgstr "Дата на отваряне"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1188,12 +1148,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Продължи"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Създай партньор"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,15 +1208,10 @@ msgid "unknown"
 msgstr "неизвестен"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1275,13 +1222,6 @@ msgstr ""
 msgid "Date"
 msgstr "Дата"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1383,13 +1330,9 @@ msgstr "Препратки"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Отказ"
@@ -1410,13 +1353,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1456,6 +1406,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Секции"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1500,6 +1460,12 @@ msgstr "Име"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Дата на затваряне"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1536,17 +1502,6 @@ msgstr "Висок"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1583,6 +1538,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1591,11 +1547,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Изпълнява се"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1609,11 +1560,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Пощенски код"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1625,7 +1571,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1678,11 +1624,6 @@ msgstr "Стойност"
 msgid "Customer Name"
 msgstr "Име на клиент"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "От телефонен разговор към Възможност"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1703,11 +1644,6 @@ msgstr "Възможности на етап"
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1841,11 +1777,6 @@ msgstr "Отпратка"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1876,17 +1807,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Разделяне"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1897,12 +1821,6 @@ msgstr "Екип"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1914,12 +1832,6 @@ msgstr ""
 msgid "Probability"
 msgstr "Вероятност"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1935,6 +1847,12 @@ msgstr "Месец"
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1946,28 +1864,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Да се направи"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2028,24 +1936,6 @@ msgstr "Висящи"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2094,17 +1984,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Изпращане на е-поща"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2134,11 +2022,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Разни"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2166,11 +2049,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Отговорен"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2182,14 +2060,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2197,6 +2069,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2263,7 +2142,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2345,8 +2223,13 @@ msgid "Company"
 msgstr "Фирма"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Изпълнява се"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2354,6 +2237,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2374,26 +2262,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Преобразуване"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2435,6 +2303,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2466,6 +2339,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Потвърден"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2498,6 +2376,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2550,11 +2446,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2599,8 +2490,9 @@ msgid "Qualification"
 msgstr "Квалификация"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2619,15 +2511,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Август"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Настройване"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2720,18 +2614,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Чернова"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2742,7 +2629,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Среща"
 
@@ -2751,11 +2637,6 @@ msgstr "Среща"
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2779,11 +2660,6 @@ msgstr "Улица2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2802,21 +2678,6 @@ msgstr "Потребител"
 msgid "November"
 msgstr "Ноември"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Преговори"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2840,11 +2701,6 @@ msgstr "Договор"
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2856,13 +2712,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2887,16 +2738,10 @@ msgid "Categorization"
 msgstr "Категоризация"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2920,7 +2765,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2946,7 +2790,6 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3025,20 +2868,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Работно време"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Телефони разговори"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Клиент"
 
@@ -3060,7 +2894,7 @@ msgid "Lost"
 msgstr "Загуби"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3108,16 +2942,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Преговори"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3136,10 +2967,10 @@ msgid "Proposition"
 msgstr "Предложение"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Дата на затваряне"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Телефони разговори"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3153,6 +2984,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3277,6 +3113,9 @@ msgstr ""
 #~ msgid "Years"
 #~ msgstr "Години"
 
+#~ msgid "Continue"
+#~ msgstr "Продължи"
+
 #~ msgid "By day"
 #~ msgstr "По дни"
 
@@ -3343,6 +3182,9 @@ msgstr ""
 #~ msgid "Fri"
 #~ msgstr "Пет"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Създай партньор"
+
 #~ msgid "crm.lead"
 #~ msgstr "crm.lead"
 
@@ -3398,6 +3240,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Събота"
 
+#~ msgid "_Convert"
+#~ msgstr "_Преобразуване"
+
 #~ msgid "Wizard"
 #~ msgstr "Помощник"
 
@@ -3440,6 +3285,9 @@ msgstr ""
 #~ msgid "Free"
 #~ msgstr "Свободен"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "От телефонен разговор към Възможност"
+
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Възможности по категории"
 
@@ -3496,9 +3344,6 @@ msgstr ""
 #~ msgid "Months"
 #~ msgstr "Месеци"
 
-#~ msgid "Send Mail"
-#~ msgstr "Изпращане на е-поща"
-
 #~ msgid "CC"
 #~ msgstr "Копие до"
 
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index bd7bd0fa525..77cc1ca23b0 100644
--- a/addons/crm/i18n/bs.po
+++ b/addons/crm/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 09:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,8 +247,8 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,15 +432,21 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -464,21 +478,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -492,8 +497,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -514,8 +519,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -552,6 +557,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,8 +660,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -670,8 +680,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,8 +804,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -883,8 +851,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -920,23 +888,12 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,10 +1078,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1132,12 +1087,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,8 +1139,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1188,12 +1148,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,15 +1208,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1275,13 +1222,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1383,13 +1330,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1410,13 +1353,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1456,6 +1406,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1500,6 +1460,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1536,17 +1502,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1583,6 +1538,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1591,11 +1547,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1609,11 +1560,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1625,7 +1571,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1678,11 +1624,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1703,11 +1644,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1841,11 +1777,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1876,15 +1807,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1897,12 +1821,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1914,12 +1832,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1935,6 +1847,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1946,28 +1864,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2028,24 +1936,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2094,17 +1984,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2134,11 +2022,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2166,11 +2049,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2182,14 +2060,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2197,6 +2069,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2263,7 +2142,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2345,8 +2223,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2354,6 +2237,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2374,26 +2262,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2435,6 +2303,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2466,6 +2339,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2498,6 +2376,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2550,11 +2446,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2599,8 +2490,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2619,14 +2511,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2720,16 +2614,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2742,7 +2629,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2751,11 +2637,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2779,11 +2660,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2802,21 +2678,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2840,11 +2701,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2856,13 +2712,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2887,16 +2738,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2920,7 +2765,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2946,7 +2790,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3025,20 +2868,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3060,7 +2894,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3108,16 +2942,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3136,9 +2967,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3153,6 +2984,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index c57f97e7a2f..f08d6e92163 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-08-17 21:32+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciativa"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Títol"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Acció"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Selecciona oportunitats"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "Demora per tancar"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nom de la fase"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Nom de regla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Avís!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Planifica una altra trucada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "No accepta rebre emails"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Estat"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Respostes excloses:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Seccions"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Anàlisi d'iniciatives"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campanyes"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Selecciona oportunitats"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Estat"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "Soci prospecte"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentació"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -415,7 +424,6 @@ msgstr ""
 "casos d'aquesta etapa sigui un èxit"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -430,15 +438,21 @@ msgstr "Categoria"
 msgid "#Opportunities"
 msgstr "nº oportunitats"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -470,22 +484,13 @@ msgstr "Estat"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Crea oportunitat"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agost"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nom de la fase"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configura"
 
 #. module: crm
 #: view:crm.lead:0
@@ -498,8 +503,8 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -520,9 +525,9 @@ msgid "Planned Revenue"
 msgstr "Retorn previst"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingrès esperat"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,6 +563,11 @@ msgstr "Resum"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -568,11 +578,6 @@ msgstr "Categoria del cas"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -595,6 +600,11 @@ msgstr "#Trucades telefòniques"
 msgid "The code of the sales team must be unique !"
 msgstr "El codi de l'equip de vendes ha de ser únic!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentació d'empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duració en minuts"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "El nom de la segmentació."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilitat (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Taulell d'estadístiques"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Oportunitat"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nom de l'oportunitat"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Estableix equip a"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Exclusiu"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Requisits"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Converteix a oportunitat "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Codi Postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Marca com guanyat"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilitat (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Atenció!"
@@ -929,23 +897,12 @@ msgstr "Atenció!"
 msgid "Days to Open"
 msgstr "Dies per obrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Crea empresa"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mòbil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Reunions"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condicions sobre camps del cas"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr "Condicions sobre camps del cas"
 msgid "Next Action"
 msgstr "Següent acció"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Esborrany"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Calcula la segmentació"
 msgid "Lowest"
 msgstr "Molt baix"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Data creació"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ingrès esperat"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "Setembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Data d'obertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duració en minuts"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continua"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1230,6 +1184,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "segmentació. Si no es marca, els criteris continguts a la pestanya seran "
 "ignorats"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Crea una empresa"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "Desconegut"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Empresa a oportunitat"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Empresa a oportunitat"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1396,13 +1343,9 @@ msgstr "Referències"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusiona les dues oportunitats"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Trucada telefònica a empresa"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Seccions"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1518,6 +1478,12 @@ msgstr "Nom"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Data de tancament"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1554,17 +1520,6 @@ msgstr "Alta"
 msgid "Convert to prospect to business partner"
 msgstr "Converteix el prospecte en empresa"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1601,6 +1556,7 @@ msgstr "Equip pare"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1609,11 +1565,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Data de la següent acció"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En procés"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1627,11 +1578,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Codi Postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1643,7 +1589,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1696,11 +1642,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nom del client"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Trucada telefònica a oportunitat"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1721,11 +1662,6 @@ msgstr "Oportunitats per etapa"
 msgid "Prospect is converting to business partner"
 msgstr "El prospecte es converteix en una empresa"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1859,12 +1795,6 @@ msgstr "Referent"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipus és utilitzat per separar iniciatives i oportunitats"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Esteu segur que voleu crear una empresa basada en aquesta trucada telefònica?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1895,16 +1825,9 @@ msgid "Sales Teams"
 msgstr "Equips de vendes"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Iniciativa a client"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentació"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1916,12 +1839,6 @@ msgstr "Equip"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1933,12 +1850,6 @@ msgstr "No ocupat"
 msgid "Probability"
 msgstr "Probabilitat"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1954,6 +1865,12 @@ msgstr "Mes"
 msgid "Leads"
 msgstr "Iniciatives"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1965,28 +1882,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Pendents"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2047,24 +1954,6 @@ msgstr "Pendent"
 msgid "Prospect Opportunity"
 msgstr "Oportunitat de prospecció"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2113,17 +2002,15 @@ msgid "Mandatory Expression"
 msgstr "Expressió obligatòria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Envia correu"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2153,11 +2040,6 @@ msgstr "Anàlisi d'oportunitats"
 msgid "Misc"
 msgstr "Varis"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expressions regulars en l'històric del cas"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2185,11 +2067,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2201,21 +2078,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Màxim historial de comunicacions"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2282,7 +2160,6 @@ msgstr "Continua el procés"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2364,8 +2241,13 @@ msgid "Company"
 msgstr "Companyia"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En procés"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2373,6 +2255,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2393,26 +2280,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Converteix"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2458,6 +2325,11 @@ msgstr ""
 "informació d'acord a diversos criteris i aprofundir en la informació afegint "
 "més grups a l'informe."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2489,6 +2361,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmat"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2521,6 +2398,24 @@ msgstr "Expressió opcional"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2577,11 +2472,6 @@ msgstr "Creant oportunitats de negoci des d'iniciatives"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Estableix categoria"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2626,8 +2516,9 @@ msgid "Qualification"
 msgstr "Qualificació"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2646,15 +2537,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agost"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configura"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2750,17 +2643,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilitat d'èxit"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Esborrany"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2772,7 +2658,6 @@ msgstr "Casos per equip de vendes"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunió"
 
@@ -2781,11 +2666,6 @@ msgstr "Reunió"
 msgid "Category of Case"
 msgstr "Categoria de cas"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2809,11 +2689,6 @@ msgstr "Carrer2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Verifiqueu que aquesta empresa ja no existeix."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2832,21 +2707,6 @@ msgstr "Usuari/a"
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociació"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2870,11 +2730,6 @@ msgstr "Contracte"
 msgid "Twitter Ads"
 msgstr "Anuncis Twiter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2886,14 +2741,9 @@ msgid "Planned Revenues"
 msgstr "Ingressos esperats"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Trucada telefònica a trucada telefònica"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Tancament previst"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2917,16 +2767,10 @@ msgid "Categorization"
 msgstr "Categorizació"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Regles d'accions"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2950,7 +2794,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2976,7 +2819,6 @@ msgid "Description"
 msgstr "Descripció"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3055,20 +2897,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Hores de treball"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Trucades telefòniques"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
@@ -3090,7 +2923,7 @@ msgid "Lost"
 msgstr "Perdut"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3138,17 +2971,14 @@ msgid "Phone calls by user and section"
 msgstr "Trucades telefòniques per usuari i secció"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociació"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Tancament previst"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Trucada telefònica a trucada telefònica"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3166,10 +2996,10 @@ msgid "Proposition"
 msgstr "Proposta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Data de tancament"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Trucades telefòniques"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3183,6 +3013,11 @@ msgstr "Any"
 msgid "Newsletter"
 msgstr "Butlletí de notícies"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3318,6 +3153,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Esdeveniments empresa"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condicions sobre camps del cas"
+
 #~ msgid "Reset to Draft"
 #~ msgstr "Canvia a esborrany"
 
@@ -3841,6 +3679,9 @@ msgstr ""
 #~ "No podeu enviar missatges amb un text buit, hauria d'incloure una descripció "
 #~ "en el missatge"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Màxim historial de comunicacions"
+
 #~ msgid "Allows to delete non draft cases"
 #~ msgstr "Permet eliminar els casos en estat no esborrany."
 
@@ -3993,6 +3834,9 @@ msgstr ""
 #~ msgid "Fundraising"
 #~ msgstr "Recaptació de fons"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expressions regulars en l'històric del cas"
+
 #~ msgid "Convert/Merge Opportunity"
 #~ msgstr "Converteix/Fusiona oportunitat"
 
@@ -4115,6 +3959,9 @@ msgstr ""
 #~ "Gestiona les reclamacions de clients i proveïdors, incloent accions "
 #~ "correctives o preventives"
 
+#~ msgid "Continue"
+#~ msgstr "Continua"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been won."
 #~ msgstr "L'oportunitat '%s' ha estat guanyada"
@@ -4126,6 +3973,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "Per dia"
 
+#~ msgid "Set Team to"
+#~ msgstr "Estableix equip a"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.instal·lador"
 
@@ -4142,10 +3992,16 @@ msgstr ""
 #~ "Aquesta propietat defineix la llista d'excepcions de data/hora per a un "
 #~ "esdeveniment de calendari recurrent."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Converteix a oportunitat "
+
 #~ msgid "Gives the sequence order when displaying a list of case stages."
 #~ msgstr ""
 #~ "Indiqueu l'ordre de seqüència quan es mostra una llista d'etapes de casos."
 
+#~ msgid "Create Partner"
+#~ msgstr "Crea empresa"
+
 #~ msgid "My Meetings"
 #~ msgstr "Les meves reunions"
 
@@ -4230,6 +4086,9 @@ msgstr ""
 #~ "Crea categories específiques de trucada telefònica per definir millor el "
 #~ "tipus de trucades en el sistema de seguiment."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nom de l'oportunitat"
+
 #~ msgid "Edit All"
 #~ msgstr "Edita tot"
 
@@ -4239,6 +4098,9 @@ msgstr ""
 #~ msgid "Fri"
 #~ msgstr "Dv"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Crea una empresa"
+
 #~ msgid "crm.lead"
 #~ msgstr "crm.iniciativa"
 
@@ -4251,6 +4113,9 @@ msgstr ""
 #~ msgid "End of recurrency"
 #~ msgstr "Finalització de recurrència"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Empresa a oportunitat"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Resum de l'oportunitat"
 
@@ -4276,6 +4141,9 @@ msgstr ""
 #~ msgid "Fix amout of times"
 #~ msgstr "Quantitat fixa de vegades"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fusiona les dues oportunitats"
+
 #~ msgid "Current"
 #~ msgstr "Actual"
 
@@ -4306,6 +4174,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Dissabte"
 
+#~ msgid "_Convert"
+#~ msgstr "_Converteix"
+
 #~ msgid ""
 #~ "Sales team to which this case belongs to. Defines responsible user and e-"
 #~ "mail address for the mail gateway."
@@ -4346,6 +4217,9 @@ msgstr ""
 #~ msgid "Free"
 #~ msgstr "Lliure"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Trucada telefònica a oportunitat"
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Converteix a oportunitat"
 
@@ -4383,6 +4257,10 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Repeteix x vegades"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Esteu segur que voleu crear una empresa basada en aquesta trucada telefònica?"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
@@ -4395,6 +4273,9 @@ msgstr ""
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Iniciativa a client"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Restableix a no confirmat"
 
@@ -4423,9 +4304,6 @@ msgstr ""
 #~ msgid "The stage of opportunity '%s' has been changed to '%s'."
 #~ msgstr "La fase de l'oportunitat '%s' ha canviat a '%s'."
 
-#~ msgid "Send Mail"
-#~ msgstr "Envia correu"
-
 #~ msgid "Claims"
 #~ msgstr "Reclamacions"
 
@@ -4529,6 +4407,9 @@ msgstr ""
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Iniciativa a oportunitat"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Trucada telefònica a empresa"
+
 #~ msgid "Recurrency period"
 #~ msgstr "Període de recurrència"
 
@@ -4673,6 +4554,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Configuració de l'aplicació CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Estableix categoria"
+
 #~ msgid "Timezone"
 #~ msgstr "Zona horària"
 
@@ -4718,6 +4602,9 @@ msgstr ""
 #~ msgid "Attendees"
 #~ msgstr "Assistents"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilitat d'èxit"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "Informe d'iniciatives CRM"
 
@@ -4730,6 +4617,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Categories de reunions"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Verifiqueu que aquesta empresa ja no existeix."
+
 #~ msgid "Communication & History"
 #~ msgstr "Comunicació i historial"
 
@@ -4760,6 +4650,9 @@ msgstr ""
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "El cas '%s' ha estat tancat"
 
+#~ msgid "Action Rules"
+#~ msgstr "Regles d'accions"
+
 #~ msgid "Recurrent ID date"
 #~ msgstr "ID data recurrent"
 
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 553329df3b6..6b333406a61 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-10-10 21:31+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: crm
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Oslovení"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Akce"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Vyberte příležitosti"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Prodleva do ukončení"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Název fáze"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Název pravidla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Naplánovat jiný hovor"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stav"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekce"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Vyberte příležitosti"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stav"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -386,11 +389,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Členění"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -412,7 +421,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -427,15 +435,21 @@ msgstr "Kategorie"
 msgid "#Opportunities"
 msgstr "#Příležitosti"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -467,22 +481,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Vytvořit příležitost"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Srpen"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Název fáze"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Nastavit"
 
 #. module: crm
 #: view:crm.lead:0
@@ -495,8 +500,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -517,9 +522,9 @@ msgid "Planned Revenue"
 msgstr "Plánovaný výnos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Očekávaný výnos"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -555,6 +560,11 @@ msgstr "Shrnutí"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -565,11 +575,6 @@ msgstr "Kategorie případu"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -592,6 +597,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -653,9 +663,9 @@ msgid "Partner Segmentation"
 msgstr "Členění partnerů"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Trvání v minutách"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -673,9 +683,9 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Pravděpodobnost (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -693,13 +703,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistická nástěnka"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -712,12 +716,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Příležitost"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -754,17 +752,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Jméno příležitosti"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Nastavit tým na"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -776,25 +763,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -817,21 +800,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -839,9 +807,9 @@ msgid "Requirements"
 msgstr "Požadavky"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Převést na příležitost "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Zip"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -886,9 +854,9 @@ msgid "Mark Won"
 msgstr "Označit jako vítězné"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Pravděpodobnost (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -913,7 +881,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Varování !"
@@ -923,23 +891,12 @@ msgstr "Varování !"
 msgid "Days to Open"
 msgstr "Dnů do otevření"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Vytvořit partnera"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -965,11 +922,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Setkání"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -977,6 +929,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Další akce"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Koncept"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1045,14 +1010,6 @@ msgstr ""
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1062,9 +1019,9 @@ msgid "Creation Date"
 msgstr "Datum vytvoření"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1124,23 +1081,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Očekávaný výnos"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1149,8 +1098,19 @@ msgid "September"
 msgstr "Září"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1182,21 +1142,15 @@ msgid "Opening Date"
 msgstr "Datum otevření"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Trvání v minutách"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Pokračovat"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1223,6 +1177,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1230,14 +1190,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Vytvořit partnera"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1259,17 +1211,12 @@ msgid "unknown"
 msgstr "neznámé"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner k příležitosti"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1278,13 +1225,6 @@ msgstr "Partner k příležitosti"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1331,6 +1271,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1342,7 +1289,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1386,13 +1333,9 @@ msgstr "Odkazy"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Zrušit"
@@ -1413,14 +1356,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Sloučit dvě příležitosti"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefonní hovor partnerovi"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1459,6 +1409,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekce"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1503,6 +1463,12 @@ msgstr "Jméno"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Datum uzavření"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1539,17 +1505,6 @@ msgstr "Vysoká"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1586,6 +1541,7 @@ msgstr "Nadřazený tým"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1594,11 +1550,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Datum další akce"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Běžící"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1612,11 +1563,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Zip"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1628,7 +1574,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1681,11 +1627,6 @@ msgstr "Hodnota"
 msgid "Customer Name"
 msgstr "Jméno zákazníka"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1706,11 +1647,6 @@ msgstr "Příležitosti podle fáze"
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1844,11 +1780,6 @@ msgstr "Odkazující"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1879,17 +1810,10 @@ msgid "Sales Teams"
 msgstr "Prodejní tým"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Členění"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1900,12 +1824,6 @@ msgstr "Tým"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1917,12 +1835,6 @@ msgstr "Nedrženo"
 msgid "Probability"
 msgstr "qPravděpodobnost"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1938,6 +1850,12 @@ msgstr "Měsíc"
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1949,28 +1867,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "K udělání"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2031,24 +1939,6 @@ msgstr "Čekající"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2097,17 +1987,15 @@ msgid "Mandatory Expression"
 msgstr "Povinný výraz"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Poslat poštu"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2137,11 +2025,6 @@ msgstr "Analýza příležitosti"
 msgid "Misc"
 msgstr "Různé"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2169,11 +2052,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Odopovědné"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2185,14 +2063,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2200,6 +2072,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2266,7 +2145,6 @@ msgstr "Pokračovat v postupu"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2348,8 +2226,13 @@ msgid "Company"
 msgstr "Společnost"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Běžící"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2357,6 +2240,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2377,26 +2265,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Převést"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2438,6 +2306,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2469,6 +2342,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrzeno"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2501,6 +2379,24 @@ msgstr "Volitelný výraz"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2553,11 +2449,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Nastavit kategorii na"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2602,8 +2493,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2622,15 +2514,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Srpen"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Nastavit"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2726,17 +2620,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Pravděpodobnost úspěchu"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Koncept"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2748,7 +2635,6 @@ msgstr "Případy podle obchodních týmů"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Setkání"
 
@@ -2757,11 +2643,6 @@ msgstr "Setkání"
 msgid "Category of Case"
 msgstr "Kategorie případů"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2785,11 +2666,6 @@ msgstr "Ulice 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Měli byste ověřit, že tento partner již neexistuje."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2808,21 +2684,6 @@ msgstr "Uživatel"
 msgid "November"
 msgstr "Listopad"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Vyjednávání"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2846,11 +2707,6 @@ msgstr "Smlouva"
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2862,14 +2718,9 @@ msgid "Planned Revenues"
 msgstr "Plánované výnosy"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Hovor k hovoru"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Oček.uzavření"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2893,16 +2744,10 @@ msgid "Categorization"
 msgstr "Kategorizace"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Pravidla akcí"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2926,7 +2771,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2952,7 +2796,6 @@ msgid "Description"
 msgstr "Popis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3031,20 +2874,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Pracovní hodiny"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonní hovory"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Zákazník"
 
@@ -3066,7 +2900,7 @@ msgid "Lost"
 msgstr "Ztratil"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3114,17 +2948,14 @@ msgid "Phone calls by user and section"
 msgstr "Hovory podle uživatele a sekce"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Vyjednávání"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Oček.uzavření"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Hovor k hovoru"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3142,10 +2973,10 @@ msgid "Proposition"
 msgstr "Návrh"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Datum uzavření"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonní hovory"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3159,6 +2990,11 @@ msgstr "Rok"
 msgid "Newsletter"
 msgstr "Zpravodaj"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3272,6 +3108,9 @@ msgstr ""
 #~ msgid "Years"
 #~ msgstr "Roky"
 
+#~ msgid "Continue"
+#~ msgstr "Pokračovat"
+
 #~ msgid "By day"
 #~ msgstr "Podle dne"
 
@@ -3464,9 +3303,6 @@ msgstr ""
 #~ msgid "Uncertain"
 #~ msgstr "Nejistý"
 
-#~ msgid "Send Mail"
-#~ msgstr "Poslat poštu"
-
 #~ msgid "Months"
 #~ msgstr "Měsíce"
 
@@ -3663,6 +3499,9 @@ msgstr ""
 #~ msgid "Days per Periode"
 #~ msgstr "Dnů na období"
 
+#~ msgid "Set Team to"
+#~ msgstr "Nastavit tým na"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer"
 
@@ -3710,10 +3549,16 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Partner je již určen u tohoto hovoru."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Převést na příležitost "
+
 #, python-format
 #~ msgid "The opportunity '%s' has been closed."
 #~ msgstr "Byla uzavřena příležitost '%s'."
 
+#~ msgid "Create Partner"
+#~ msgstr "Vytvořit partnera"
+
 #~ msgid "HTML formatting?"
 #~ msgstr "Formátování HTML?"
 
@@ -3732,18 +3577,30 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Spravuje službu technické podpory."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Jméno příležitosti"
+
 #~ msgid "crm.lead"
 #~ msgstr "crm.lead"
 
 #~ msgid "Write Date"
 #~ msgstr "Datum zápisu"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Vytvořit partnera"
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner k příležitosti"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Souhrn příležitosti"
 
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Příležitosti podle kategorií"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Sloučit dvě příležitosti"
+
 #~ msgid "Check this if you want the rule to send an email to the partner."
 #~ msgstr ""
 #~ "Zaškrtněte toto pokud chcete pravidlo pro odeslání emailu partnerovi."
@@ -3757,6 +3614,9 @@ msgstr ""
 #~ msgid "Unconfirmed"
 #~ msgstr "Nepotvrzené"
 
+#~ msgid "_Convert"
+#~ msgstr "_Převést"
+
 #~ msgid "_Schedule"
 #~ msgstr "_Naplánovat"
 
@@ -3861,6 +3721,9 @@ msgstr ""
 #~ msgid "Thunderbird"
 #~ msgstr "Thunderbird"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefonní hovor partnerovi"
+
 #~ msgid "Set New State To"
 #~ msgstr "Nastav nový stav na"
 
@@ -3903,6 +3766,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Nastavení aplikace CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Nastavit kategorii na"
+
 #~ msgid "This module relates sale from opportunity cases in the CRM."
 #~ msgstr "Vztažené prodeje tohoto modulu z případů příležitostí v CRM"
 
@@ -3915,12 +3781,18 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "Výchozí (0=Žádné)"
 
+#~ msgid "Success Probability"
+#~ msgstr "Pravděpodobnost úspěchu"
+
 #~ msgid "Communication & History"
 #~ msgstr "Komunikace & historie"
 
 #~ msgid "Meeting Categories"
 #~ msgstr "Kategorie setkání"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Měli byste ověřit, že tento partner již neexistuje."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "Pro vaši adresu společnosti nebylo nalezeno ID e-mailu!"
@@ -3945,6 +3817,9 @@ msgstr ""
 #~ msgid "Merged into Opportunity: %s"
 #~ msgstr "Sloučeno do Příležitosti: %s"
 
+#~ msgid "Action Rules"
+#~ msgstr "Pravidla akcí"
+
 #~ msgid "State of Mind"
 #~ msgstr "Stav mysli"
 
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
index da786a95b90..24a30159434 100644
--- a/addons/crm/i18n/da.po
+++ b/addons/crm/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-08 21:47+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -44,19 +46,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -65,11 +77,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,9 +84,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,8 +248,8 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampagner"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr "Kategori"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,21 +479,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,8 +520,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -553,6 +558,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,8 +681,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,8 +805,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -884,8 +852,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel!"
@@ -921,23 +889,12 @@ msgstr "Advarsel!"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,10 +1079,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1133,12 +1088,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,15 +1209,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1276,13 +1223,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1384,13 +1331,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1411,13 +1354,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1457,6 +1407,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,15 +1808,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1898,12 +1822,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,14 +2061,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2198,6 +2070,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2447,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2491,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,14 +2512,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2721,16 +2615,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2743,7 +2630,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2752,11 +2638,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2661,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2679,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2702,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2713,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2739,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2766,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2791,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2869,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3061,7 +2895,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2943,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,9 +2968,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3154,6 +2985,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 8d8bb747a07..6574d4f6bf9 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 19:13+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
@@ -32,11 +32,13 @@ msgstr ""
 "eingehenden E-Mails neue Interessenten erzeugen."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Interessent"
 
@@ -46,22 +48,30 @@ msgid "Title"
 msgstr "Anrede"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Aktion"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
-"Ein Telefonanruf für die Chance <em>%s</em> wurde <b> erstellt</b> und "
-"<b>terminiert</b> für den<em>%s</em>."
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Wähle Chancen"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -69,11 +79,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Fund Raising Management"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Umwandeln in Chance"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -81,10 +86,10 @@ msgid "Delay to close"
 msgstr "Dauer für Beendigung"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Interessent wurde <b>ungewandelt in Chance</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Bezeichnung Stufe"
 
 #. module: crm
 #: view:crm.lead:0
@@ -99,11 +104,6 @@ msgstr "Verkäufer"
 msgid "CRM Lead Analysis"
 msgstr "CRM Interessenten Statistik"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Erinnerung an Interessent: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -149,6 +149,12 @@ msgstr "Datum Erstellung"
 msgid "Rule Name"
 msgstr "Regel Bezeichnung"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -181,8 +187,8 @@ msgstr ""
 "html Format, um Sie später in einer Kanban Ansicht einfügen zu können."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -209,7 +215,7 @@ msgid "Schedule Other Call"
 msgstr "Terminiere weiteren Anruf"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -221,9 +227,14 @@ msgid "Opt-Out"
 msgstr "Opt-Out"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Ohne Eintrag in Ansichten verbergen"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Status"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -241,9 +252,9 @@ msgid "Excluded Answers :"
 msgstr "Ausgeschlossene Antworten:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sektionen"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -253,7 +264,7 @@ msgid "Leads Analysis"
 msgstr "Statistik Interessenten"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s Anruf</b> für den <em>%s</em>."
@@ -264,16 +275,6 @@ msgstr "<b>%s Anruf</b> für den <em>%s</em>."
 msgid "Campaigns"
 msgstr "Kampagnen"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Wähle Chancen"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Status"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -296,7 +297,7 @@ msgid "Prospect Partner"
 msgstr "Interessent"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Kein Betreff"
@@ -423,11 +424,17 @@ msgstr "Kein Auftrag"
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentierung"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Verbinde zu Kunde"
 
@@ -451,7 +458,6 @@ msgstr ""
 "Wahrscheinlichkeit für einen erfolgreichen Verkaufsabschluss."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -466,16 +472,22 @@ msgstr "Kategorie"
 msgid "#Opportunities"
 msgstr "Anzahl Chancen"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr "Interessenten des Teams, bei denen ich Leiter bin und meine eigenen."
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Umwandlung"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Partner Kontakt E-Mail"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -517,22 +529,13 @@ msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Erstelle Chance"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Bezeichnung Stufe"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Konfigurieren"
 
 #. module: crm
 #: view:crm.lead:0
@@ -545,9 +548,9 @@ msgid "Mailings"
 msgstr "Zustimmung E-Mailversand"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -567,9 +570,9 @@ msgid "Planned Revenue"
 msgstr "Geplanter Umsatz"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "Telefonanruf: Als gelesen markieren"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Erwarteter Umsatz"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -610,6 +613,11 @@ msgstr "Übersicht"
 msgid "Merge"
 msgstr "Zusammenfassen"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -620,11 +628,6 @@ msgstr "Vorgangshistorie"
 msgid "Partner Contact Name"
 msgstr "Partner Kontakt Name"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "CRM Anruf: Als ungelesen markieren"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -649,6 +652,11 @@ msgstr "Anzahl Anrufe"
 msgid "The code of the sales team must be unique !"
 msgstr "Das Kürzel für das Vertriebsteam muss eindeutig sein!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "E-Mail Adresse des Kontakts"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -720,9 +728,9 @@ msgid "Partner Segmentation"
 msgstr "Partner Segmentierung"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Dauer in Minuten"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Währung"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -740,9 +748,9 @@ msgid "The name of the segmentation."
 msgstr "Bezeichnung des Kundensegments"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Interessenten aus der USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Wahrscheinl. (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -762,13 +770,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistik Anzeigetafel"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stufe wurde geändert auf <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -781,12 +783,6 @@ msgstr "Stufe wurde geändert auf <b>%s</b>."
 msgid "Opportunity"
 msgstr "Chance"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Ein Meeting wurde <b>terminiert</b> für den <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -823,17 +819,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr "Interessenten / Chancen, die mir oder meinem Team zugewiesen wurden."
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Chance Bezeichnung"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Setze Team auf"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -845,25 +830,21 @@ msgid "Exclusive"
 msgstr "Exklusiv"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Von %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Jahr der Erzeugung"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Umwandeln in Chance"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "oder"
@@ -888,32 +869,6 @@ msgstr ""
 "Verbindung vertrieblicher Stufen zu Teams. Hierdurch können Sie die "
 "Auswahlmöglichkeiten für Stufen in Abhängigkeit vom Team einschränken."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hallo [[object.user_id.name]], \n"
-"könntest Du bitte diesen Interessenten prüfen, der Fall wurde schon seit 5 "
-"Tagen noch nicht bearbeitet ?\n"
-"\n"
-"Interessent: [[object.id ]]\n"
-"Beschreibung:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Vielen Dank\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -921,9 +876,9 @@ msgid "Requirements"
 msgstr "Anforderungen"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Umwandel zu Chance "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Plz"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -968,9 +923,9 @@ msgid "Mark Won"
 msgstr "Markiere als erfolgreich angeschlossen"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Wahrscheinl. (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Interessenten aus der USA"
 
 #. module: crm
 #: view:crm.lead:0
@@ -995,7 +950,7 @@ msgid "Send Email"
 msgstr "E-Mail senden"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Warnung !"
@@ -1005,23 +960,12 @@ msgstr "Warnung !"
 msgid "Days to Open"
 msgstr "Tage bis Eröffnung"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Erzeuge Partner"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "Anruf wurde <b>zurück gesetzt und wieder eröffnet</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -1047,11 +991,6 @@ msgstr "Für Kalkulation der offenen Tage"
 msgid "Meetings"
 msgstr "Meetings"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Filterkriterien"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1059,6 +998,19 @@ msgstr "Filterkriterien"
 msgid "Next Action"
 msgstr "Nächster Schritt"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1130,16 +1082,6 @@ msgstr "Berechnung Segmentierung"
 msgid "Lowest"
 msgstr "Sehr gering"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Verknüpftes Meeting zum Anruf  <em>%s</em> wurde <b>erstellt</b> und "
-"<b>terminiert</b> zum <em>%s</em>."
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1149,10 +1091,10 @@ msgid "Creation Date"
 msgstr "Erzeugt am"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s wurde <b>erstellt</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1214,23 +1156,15 @@ msgid "Delete"
 msgstr "Löschen"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Erwarteter Umsatz"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "Chance wurde <b>kein erfolgreicher Abschluss</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1239,9 +1173,20 @@ msgid "September"
 msgstr "September"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "E-Mail Adresse des Kontakts"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1272,21 +1217,15 @@ msgid "Opening Date"
 msgstr "Datum Eröffnung"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Währung"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Dauer in Minuten"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Verkaufskanal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Fortsetzen"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1320,6 +1259,12 @@ msgstr ""
 "Chancen benötigt, bzw. zur besonderen Kennzeichnung, wenn Stufen für beide "
 "Typen zugleich existieren."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1330,14 +1275,6 @@ msgstr ""
 "Segmentierung genutzt werden soll. Falls der Haken nicht gesetzt wird, "
 "werden die Kriterien dieser Seite ignoriert."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Erzeuge Partner"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1359,18 +1296,11 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-"Follower eines Vertriebsteams folgen automatisch auch allen Interessenten "
-"und Chancen Ihres Teams."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner zu Chance"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Ist bereits Follower"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1380,13 +1310,6 @@ msgstr "Partner zu Chance"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Ist bereits Follower"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1438,6 +1361,13 @@ msgid ""
 msgstr ""
 "Für den Mailversand wird die Standardadresse des  Verkaufsteams verwendet"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1449,7 +1379,7 @@ msgid "Lead Description"
 msgstr "Interessent Beschreibung"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Zusammengefasste Chancen"
@@ -1493,13 +1423,9 @@ msgstr "Referenzen"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -1520,14 +1446,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Interessenten / Chancen zur Wiedervorlage"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fasse zwei Chancen zusammen"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "To Do"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefonanruf zu Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Verknüpfter Kunde"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1566,6 +1499,16 @@ msgstr "Offene Chancen / Interessenten"
 msgid "Users"
 msgstr "Benutzer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sektionen"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1617,6 +1560,12 @@ msgstr "Name"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Mir zugewiesene Interessenten / Chancen"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Abschluss Datum"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1653,17 +1602,6 @@ msgstr "Hoch"
 msgid "Convert to prospect to business partner"
 msgstr "Konvertiere zu Kaufinteressent oder Partner"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "Chance wurde <b>erfolgreich abgeschlossen</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Anrufe, die mir oder meinem Team zugewiesen wurden"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1700,6 +1638,7 @@ msgstr "Hauptteam"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Nicht mit Kunden verbinden"
 
@@ -1708,11 +1647,6 @@ msgstr "Nicht mit Kunden verbinden"
 msgid "Next Action Date"
 msgstr "Datum nächste Aktion"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "In laufender Bearbeitung"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1730,11 +1664,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Chance zuweisen an"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Plz"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1746,7 +1675,7 @@ msgid "Month of call"
 msgstr "Monat des Anrufs"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "Partner wurde <b>erstellt</b>."
@@ -1804,11 +1733,6 @@ msgstr "Wert"
 msgid "Customer Name"
 msgstr "Kundenname"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Anruf bei Chance"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1829,11 +1753,6 @@ msgstr "Chancen nach Stufen"
 msgid "Prospect is converting to business partner"
 msgstr "Interessent wird zu Partner konvertiert"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "CRM Interessent: Markiere als ungelesen"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1969,13 +1888,6 @@ msgstr "Wiederkehrer"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ wird zur Unterscheidung von Interessent und Chance verwendet."
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Sind Sie sicher, dass Sie einen neuen Partner auf der Grundlage dieses "
-"Anrufs anlegen möchten?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -2006,16 +1918,9 @@ msgid "Sales Teams"
 msgstr "Vertriebsteams"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Konvertiere zu Partner"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentierung"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -2027,12 +1932,6 @@ msgstr "Team"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Neuer Interessent / Chance"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>Kunde</b>wurde geändert zu<em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -2044,12 +1943,6 @@ msgstr "Nicht Telefoniert"
 msgid "Probability"
 msgstr "Wahrscheinl."
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Bitte wählen Sie mehr als eine Chance aus"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -2065,6 +1958,12 @@ msgstr "Monat"
 msgid "Leads"
 msgstr "Interessenten"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -2076,42 +1975,18 @@ msgstr "Layout und Design"
 msgid "Merge with existing opportunities"
 msgstr "Zusammenfassen mit existierenden Chancen"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Klicken Sie zur Erstellung einer neuen Chance.\n"
-"            </p><p>\n"
-"              OpenERP hilft Ihnen dabei, Ihre Vertriebs-Pipeline zu "
-"verfolgen\n"
-"               und die Prognose zukünftiger Umsätze zu optimieren.\n"
-"            </p><p>\n"
-"              Sie können Ihre Meetings und Telefonanrufe bei Chancen "
-"einplanen,\n"
-"              Angebote ableiten, Dateianhänge und Dokumente hochladen, "
-"Kommentare\n"
-"              und Diskussionen verfolgen , und vieles mehr.   \n"
-"            </p>\n"
-"          "
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Zu erledigen"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2174,41 +2049,6 @@ msgstr "Wiedervorlage"
 msgid "Prospect Opportunity"
 msgstr "Aussichtsreiche Chance"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Klicken Sie zur Erstellung eines Interessenten. \n"
-"          </p><p>\n"
-"             Erfassen Sie zuerst Interessenten, wenn Sie vor der "
-"Qualifikation und Umwandlung zur Chance\n"
-"             einen vorgeschalteten Schritt für sinnvoll erachten. Dieses "
-"kann eine Visitenkarte\n"
-"             sein oder auch andere unqualifizierte Adressdaten, die Sie z.B. "
-"über das Kontaktformular Ihrer \n"
-"             Homepage oder aus einem Adressverzeichnis importieren.\n"
-"          </p><p>\n"
-"            Nach einer Qualifizierung können Sie den Interessenten in eine "
-"Verkaufschance umwandeln,\n"
-"            oder bereits direkt einen neuen Kunden mit Kontaktdaten "
-"anlegen.\n"
-"          </p>\n"
-"        "
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2257,18 +2097,16 @@ msgid "Mandatory Expression"
 msgstr "Verbindlich"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Erstellen Sie einen neuen Kunden"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Sende EMail"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Verknüpfter Kunde"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Erstellen Sie einen neuen Kunden"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2297,11 +2135,6 @@ msgstr "Statistik Chancen"
 msgid "Misc"
 msgstr "Sonstiges"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Suchausdruck in Fallhistorie"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2329,11 +2162,6 @@ msgstr "Anruf erledigt"
 msgid "Responsible"
 msgstr "Verantwortlich"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Erinnerung an Kunde"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2345,21 +2173,22 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "Anruf wurde <b>erstellt und eröffnet</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maximum Kommunikation Historie"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Jahr der Erzeugung"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Optionen zur Umwandlung"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2430,7 +2259,6 @@ msgstr "Prozess fortsetzen"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Unwandeln zu Chance"
 
@@ -2528,15 +2356,25 @@ msgid "Company"
 msgstr "Unternehmen"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Bedingungen der Kommunikation"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "In laufender Bearbeitung"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "nicht zugewiesene Interessenten"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2557,36 +2395,6 @@ msgstr "Zurücksetzen"
 msgid "After-Sale Services"
 msgstr "After-Sale Dienstleistung"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hallo [[object.partner_id and object.partner_id.name or '']], \n"
-"der folgende Interessent wurde nach 5 Tage immer noch nicht eröffnet.\n"
-"\n"
-"Interessent: [[object.id ]]\n"
-"Beschreibung: \n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Vielen Dank\n"
-"            "
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Umwandeln"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2631,6 +2439,11 @@ msgstr ""
 "ihrer Anwendnung beurteilen . Sie können ausserdem Informationen anhand "
 "verschiedener Kriterien filtern und gründlich untersuchen."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2662,6 +2475,11 @@ msgstr "Auswahl Interessenten / Chancen"
 msgid "Confirmed"
 msgstr "Bestätigt"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2694,6 +2512,24 @@ msgstr "Optional"
 msgid "Followers"
 msgstr "Followers"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2749,11 +2585,6 @@ msgstr "Erzeuge Chance aus Interessent"
 msgid "Email Campaign - Products"
 msgstr "E-Mail Kampagne - Produkte"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Setze Kategorie auf"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2812,9 +2643,10 @@ msgid "Qualification"
 msgstr "Qualifikation"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Partner Kontakt E-Mail"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Umwandlung"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2845,15 +2677,17 @@ msgstr ""
 "            "
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Ein Partner wird nach-wie vor"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "August"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Konfigurieren"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2949,17 +2783,10 @@ msgid "Logged Calls"
 msgstr "Aufgezeichete Anrufe"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Erfolgswahrscheinlichkeit"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Entwurf"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2971,7 +2798,6 @@ msgstr "Vorgänge der Teams"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Meeting"
 
@@ -2980,11 +2806,6 @@ msgstr "Meeting"
 msgid "Category of Case"
 msgstr "Vorgang Kategorie"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Chance / Kunde"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -3008,11 +2829,6 @@ msgstr "Straße 2"
 msgid "Manage Helpdesk and Support"
 msgstr "Kundenservice und Support Management"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Sie sollten prüfen ob Partner bereits existiert."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -3031,21 +2847,6 @@ msgstr "Benutzer"
 msgid "November"
 msgstr "November"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Verhandlung"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -3069,11 +2870,6 @@ msgstr "Vertrag"
 msgid "Twitter Ads"
 msgstr "Twitter Werbung"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Gemeinsam für alle Teams"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -3085,14 +2881,9 @@ msgid "Planned Revenues"
 msgstr "Geplanter Umsatz"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "CRM Interessent: Markiere als gelesen"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Folgeanruf zu Anruf"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Geplanter Abschluss"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -3116,16 +2907,10 @@ msgid "Categorization"
 msgstr "Kategorisierung"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Anrufprotokoll"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Regeln zur Auslösung v. Aktionen"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -3150,7 +2935,6 @@ msgstr "Datum Erstellung"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "am"
 
@@ -3176,7 +2960,6 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3268,20 +3051,11 @@ msgstr "Auf To Do zurücksetzen"
 msgid "Working Hours"
 msgstr "Arbeitsstunden"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonanrufe"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Kunde"
 
@@ -3303,7 +3077,7 @@ msgid "Lost"
 msgstr "Verloren"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3353,19 +3127,14 @@ msgid "Phone calls by user and section"
 msgstr "Anrufe nach Benutzer und Sektion"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Ein Meeting für diese Chance <em>%s</em> wurde <b>erstellt</b> und "
-"<b>terminiert</b> am <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Verhandlung"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Geplanter Abschluss"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Folgeanruf zu Anruf"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3383,10 +3152,10 @@ msgid "Proposition"
 msgstr "Umsatzprognose"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Abschluss Datum"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonanrufe"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3400,6 +3169,11 @@ msgstr "Jahr"
 msgid "Newsletter"
 msgstr "Newsletter"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3923,6 +3697,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Link zu vorhandenem Partner"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Suchausdruck in Fallhistorie"
+
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -3966,6 +3743,9 @@ msgstr ""
 #~ "EMail Adresse, die als \"Antworten an\" Adresse in alle Emails eingetragen "
 #~ "wird, die zu allen Vorgängen dieser Sektion versendet werden."
 
+#~ msgid "Continue"
+#~ msgstr "Fortsetzen"
+
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
@@ -3997,6 +3777,9 @@ msgstr ""
 #~ "Aktiviere Feld, wenn diese Regel eine EMail Erinnerung an Kunden / "
 #~ "Lieferanten senden soll."
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Filterkriterien"
+
 #~ msgid "_Cancel"
 #~ msgstr "Abbrechen"
 
@@ -4067,9 +3850,6 @@ msgstr ""
 #~ "Aktiviere diese Option, falls alle Dokumente die zum Fall gehören auch an "
 #~ "eine  Erinnerungsmail  angehängt werden sollen."
 
-#~ msgid "Send Mail"
-#~ msgstr "Sende EMail"
-
 #~ msgid "Claims"
 #~ msgstr "Reklamationen"
 
@@ -4187,6 +3967,9 @@ msgstr ""
 #~ "Sie müssen eine E-Mail Adresse für den Partner haben, um diese Aktion zu "
 #~ "nutzen!"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Sie sollten prüfen ob Partner bereits existiert."
+
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
@@ -4272,6 +4055,9 @@ msgstr ""
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer"
 
+#~ msgid "Set Team to"
+#~ msgstr "Setze Team auf"
+
 #~ msgid "Supplier"
 #~ msgstr "Lieferant"
 
@@ -4356,6 +4142,9 @@ msgstr ""
 #~ msgid "Reply To"
 #~ msgstr "Antwort an"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefonanruf zu Partner"
+
 #~ msgid "Sunday"
 #~ msgstr "Sonntag"
 
@@ -4680,6 +4469,9 @@ msgstr ""
 #~ msgid "Create"
 #~ msgstr "Erstelle"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Konvertiere zu Partner"
+
 #~ msgid "MS-Outlook"
 #~ msgstr "MS Outlook"
 
@@ -4842,6 +4634,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Konfiguration CRM & SRM Anwendungen"
 
+#~ msgid "Set Category to"
+#~ msgstr "Setze Kategorie auf"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Monat-1    "
 
@@ -5327,6 +5122,9 @@ msgstr ""
 #~ "Urlauben und Opportunitäten.\n"
 #~ "        "
 
+#~ msgid "Success Probability"
+#~ msgstr "Erfolgswahrscheinlichkeit"
+
 #~ msgid "Recurrence termination"
 #~ msgstr "Ende der Wiederholungen"
 
@@ -5497,6 +5295,9 @@ msgstr ""
 #~ "Abgeschlossene/ stornierte Kontakte, die nicht in Verkaufschance umgewandelt "
 #~ "wurden"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Gemeinsam für alle Teams"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "Die Chance '%s' wurde gewonnen"
@@ -5584,3 +5385,49 @@ msgstr ""
 #~ msgstr ""
 #~ "Keine weitere Eskalation möglich, da Sie bereits die obersten Ebene erreicht "
 #~ "haben."
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner zu Chance"
+
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Anruf bei Chance"
+
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Umwandel zu Chance "
+
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fasse zwei Chancen zusammen"
+
+#~ msgid "Opportunity Name"
+#~ msgstr "Chance Bezeichnung"
+
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Chance / Kunde"
+
+#~ msgid "Create Partner"
+#~ msgstr "Erzeuge Partner"
+
+#~ msgid "Create a Partner"
+#~ msgstr "Erzeuge Partner"
+
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie einen neuen Partner auf der Grundlage dieses "
+#~ "Anrufs anlegen möchten?"
+
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Bitte wählen Sie mehr als eine Chance aus"
+
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maximum Kommunikation Historie"
+
+#~ msgid "_Convert"
+#~ msgstr "_Umwandeln"
+
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Ein Partner wird nach-wie vor"
+
+#~ msgid "Action Rules"
+#~ msgstr "Regeln zur Auslösung v. Aktionen"
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index cda7bd4c73c..e6a1f84c2ad 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-24 20:03+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -32,11 +32,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Υποψήφιος Πελάτης"
 
@@ -46,32 +48,37 @@ msgid "Title"
 msgstr "Τίτλος"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Ενέργεια"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Επιλογή Εκαιριών"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -79,10 +86,10 @@ msgid "Delay to close"
 msgstr "Καθηστέρηση για κλείσιμο"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Όνομα Σταδίου"
 
 #. module: crm
 #: view:crm.lead:0
@@ -97,11 +104,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -147,6 +149,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Όνομα Κανόνα"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -177,8 +185,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Προειδοποίηση!"
@@ -205,7 +213,7 @@ msgid "Schedule Other Call"
 msgstr "Προγραμμάτισε άλλο Τηλέφωνημα"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -217,8 +225,13 @@ msgid "Opt-Out"
 msgstr "Εκτός συμφωνίας"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -237,9 +250,9 @@ msgid "Excluded Answers :"
 msgstr "Εξαιρούμενες Απαντήσεις:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Τμήματα"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -249,7 +262,7 @@ msgid "Leads Analysis"
 msgstr "Ανάλυση Ευκαιριών"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -260,16 +273,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Εκστρατείες"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Επιλογή Εκαιριών"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Κατάσταση"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -292,7 +295,7 @@ msgid "Prospect Partner"
 msgstr "Προσδοκούμενος Συνεργάτης"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -390,11 +393,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Καταμερισμός"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,15 +439,21 @@ msgstr "Κατηγορία"
 msgid "#Opportunities"
 msgstr "# Ευκαιρίες"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -471,22 +485,13 @@ msgstr "Στάδιο"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Δημιουργία Ευκαιρίας"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Αύγουστος"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Όνομα Σταδίου"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Προσαρμογή"
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,8 +504,8 @@ msgid "Mailings"
 msgstr "Αλληλογραφία"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Προγραμματισμένα Έσοδα"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Προσδοκόμενα Έσοδα"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Σύνοψη"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Κατηγορία Θέματος"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "#Τηλεφωνήματα"
 msgid "The code of the sales team must be unique !"
 msgstr "Ο κωδικός της ομάδας πώλησης πρέπει να είναι μοναδικός !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Καταμερισμός Συνεργατών"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Διάρκεια σε Λεπτά"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "Όνομα καταμερισμού"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Πιθανότητα (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Ταμπλό Στατιστικών"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Ευκαιρία"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Όνομα Ευκαιρίας"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Αποκλειστικά"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Απαιτήσεις"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Μετατροπή σε Ευκαιρία "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Τ.Κ."
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Μάρκαρε Επιτυχία"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Πιθανότητα (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Προσοχή!"
@@ -929,23 +897,12 @@ msgstr "Προσοχή!"
 msgid "Days to Open"
 msgstr "Μέρες για να Ανοίξει"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Δημιουργία Συνεργάτη"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Κινητό"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Συναντήσεις"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Όροι στα Πεδία Θέματος"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr "Όροι στα Πεδία Θέματος"
 msgid "Next Action"
 msgstr "Επόμενη Ενέργεια"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Πρόχειρη"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Υπολογισμός Καταμερισμού"
 msgid "Lowest"
 msgstr "Χαμηλότερο"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Ημερ/νία Δημιουργίας"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Προσδοκόμενα Έσοδα"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "Σεπτέμβριος"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Μέρα Έναρξης"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Διάρκεια σε Λεπτά"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Συνέχεια"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1231,6 +1185,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "Επιλέξτε το αν επιθυμείτε να χρησιμοποιήσετε αυτή την καρτέλλα στον κανόνα "
 "καταμερισμού. Αν δεν επιλεγεί, τα παρακάτω κριτήρια θα αγνοηθούν"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Δημιουργία Συνεργάτη"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "άγνωστο"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Συνεργάτης σε Ευκαιρία"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Συνεργάτης σε Ευκαιρία"
 msgid "Date"
 msgstr "Ημερ/νία"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1396,13 +1343,9 @@ msgstr "Παραπομπές"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Ακύρωση"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Συγχώνευση δύο Ευκαιριών"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Τηλεφώνημα σε Συνεργάτη"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Τμήματα"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1513,6 +1473,12 @@ msgstr "Όνομα"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Ημερομηνία Ολοκλήρωσης"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1549,17 +1515,6 @@ msgstr "Υψηλή"
 msgid "Convert to prospect to business partner"
 msgstr "Μετατροπή προοπτικής σε συνεργάτη"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1596,6 +1551,7 @@ msgstr "Πατρική Ομάδα"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1604,11 +1560,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Επόμενη Ημερομηνία Ενέργειας"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Σε κίνηση"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1622,11 +1573,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Τ.Κ."
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1638,7 +1584,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1691,11 +1637,6 @@ msgstr "Αξία"
 msgid "Customer Name"
 msgstr "Όνομα Πελάτη"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Τηλεφώνημα σε Ευκαιρία"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1716,11 +1657,6 @@ msgstr "Ευκαιρίες ανά Στάδιο"
 msgid "Prospect is converting to business partner"
 msgstr "Η προοπτική μετατρέπεται σε συνεργάτη"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1856,13 +1792,6 @@ msgstr ""
 "Ο Τύπος χρησιμοποιήτε για να ξεχωρίσει τους Πιθανούς Πελάτες από τις "
 "Ευκαιρίες"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Είσαι σίγουρος ότι θέλεις να δημιουργήσεις συνεργάτη βασισμένο σε αυτό το "
-"Τηγλεφώνημά;"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1893,16 +1822,9 @@ msgid "Sales Teams"
 msgstr "Ομάδες Πωλήσεων"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Πιθανός Πελάτης σε Συνεργάτη"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Καταμερισμός"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1914,12 +1836,6 @@ msgstr "Ομάδα"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1931,12 +1847,6 @@ msgstr "Δεν πραγματοποιήθηκε"
 msgid "Probability"
 msgstr "Πιθανότητα"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1952,6 +1862,12 @@ msgstr "Μήνας"
 msgid "Leads"
 msgstr "Υποψήφιοι Πελάτες"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1963,28 +1879,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Προς υλοποίηση"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2045,24 +1951,6 @@ msgstr "Εκκρεμμή"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2111,17 +1999,15 @@ msgid "Mandatory Expression"
 msgstr "Υποχρεωτική Έκφραση"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Αποστολή αλληλογραφίας"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2151,11 +2037,6 @@ msgstr "Ανάλυση Ευκαιριών"
 msgid "Misc"
 msgstr "Διαφ."
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2183,11 +2064,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Υπεύθυνος"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2199,21 +2075,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Μέγιστο ιστορικό επικοινωνίας"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2280,7 +2157,6 @@ msgstr "Συνέχιση Διαδικασίας"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2362,8 +2238,13 @@ msgid "Company"
 msgstr "Εταιρία"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Σε κίνηση"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2371,6 +2252,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2391,26 +2277,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Μετατροπή"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2452,6 +2318,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2483,6 +2354,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Επιβεβαιωμένο"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2515,6 +2391,24 @@ msgstr "Προαιρετική Έκφραση"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2567,11 +2461,6 @@ msgstr "Δημιουργία ευκαιριών από Υποψήφιους Πε
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Επιλογή Κατηγορίας σε"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2616,8 +2505,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2636,15 +2526,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Αύγουστος"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Προσαρμογή"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2737,17 +2629,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Πιθανότητα Επιτυχίας"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Πρόχειρη"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2759,7 +2644,6 @@ msgstr "Υποθέσεις κατά Ομάδα Πώλησης"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Συνάντηση"
 
@@ -2768,11 +2652,6 @@ msgstr "Συνάντηση"
 msgid "Category of Case"
 msgstr "Κατηγορία Υπόθεσης"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2796,12 +2675,6 @@ msgstr "Οδός 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-"Μπορεί να χρειαστεί να επιβεβαιώσετε ότι αυτός ο συνεργάτης δεν υπάρχει ήδη."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2820,21 +2693,6 @@ msgstr "Χρήστης"
 msgid "November"
 msgstr "Νοέμβριος"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Διαπραγμάτευση"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2858,11 +2716,6 @@ msgstr "Σύμβαση"
 msgid "Twitter Ads"
 msgstr "Διαφημίσεις Twitter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2874,15 +2727,10 @@ msgid "Planned Revenues"
 msgstr "Προβλεπόμενα Έσοδα"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Τηλεφώνημα σε Τηλεφώνημα"
-
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
@@ -2905,16 +2753,10 @@ msgid "Categorization"
 msgstr "Κατηγοριοποίηση"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2938,7 +2780,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2964,7 +2805,6 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3043,20 +2883,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Ώρες Εργασίας"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Τηλεφωνήματα"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Πελάτης"
 
@@ -3078,7 +2909,7 @@ msgid "Lost"
 msgstr "Χαμένος"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3126,17 +2957,14 @@ msgid "Phone calls by user and section"
 msgstr "Τηλεφωνήματα ανά χρήστη και τομέα"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Διαπραγμάτευση"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr ""
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Τηλεφώνημα σε Τηλεφώνημα"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3154,10 +2982,10 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Ημερομηνία Ολοκλήρωσης"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Τηλεφωνήματα"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3171,6 +2999,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3303,6 +3136,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Συμβάντα Συνεργάτη"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Όροι στα Πεδία Θέματος"
+
 #~ msgid "Reset to Draft"
 #~ msgstr "Μηδενισμός σε Πρόχειρη"
 
@@ -3853,6 +3689,9 @@ msgstr ""
 #~ "αλλάξει αφού μάλλον αγόρασε από κάπου αλλού. Χρησιμοποιήστε αυτήν την "
 #~ "δυνατότητα σε επαναλαμβανόμενες πωλήσεις."
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Μέγιστο ιστορικό επικοινωνίας"
+
 #~ msgid "Allows to delete non draft cases"
 #~ msgstr "Επιτρέπει την διαγραφή μη πρόχειρων θεμάτων"
 
@@ -3936,18 +3775,30 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "Λεπτομέρειες"
 
+#~ msgid "Continue"
+#~ msgstr "Συνέχεια"
+
 #~ msgid "By day"
 #~ msgstr "Κατά ημέρα"
 
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Συγχρονισμός Ημερολογίου"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Όνομα Ευκαιρίας"
+
 #~ msgid "Add Note"
 #~ msgstr "Προσθήκη Σημείωσης"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Μετατροπή σε Ευκαιρία "
+
 #~ msgid "Supplier"
 #~ msgstr "Προμηθευτής"
 
+#~ msgid "Create Partner"
+#~ msgstr "Δημιουργία Συνεργάτη"
+
 #~ msgid "Organizer"
 #~ msgstr "Ατζέντα"
 
@@ -4018,6 +3869,12 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Δευτέρα"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Δημιουργία Συνεργάτη"
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Συνεργάτης σε Ευκαιρία"
+
 #~ msgid "Reminder"
 #~ msgstr "Υπενθύμιση"
 
@@ -4027,6 +3884,9 @@ msgstr ""
 #~ msgid "Search Meetings"
 #~ msgstr "Αναζήτηση Συναντήσεων"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Συγχώνευση δύο Ευκαιριών"
+
 #~ msgid "Wizard"
 #~ msgstr "Οδηγός"
 
@@ -4045,6 +3905,9 @@ msgstr ""
 #~ msgid "Synchronization"
 #~ msgstr "Συγχρονισμός"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Τηλεφώνημα σε Ευκαιρία"
+
 #~ msgid "Mon"
 #~ msgstr "Δευ"
 
@@ -4057,6 +3920,11 @@ msgstr ""
 #~ msgid "Weeks"
 #~ msgstr "Εβδομάδες"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Είσαι σίγουρος ότι θέλεις να δημιουργήσεις συνεργάτη βασισμένο σε αυτό το "
+#~ "Τηγλεφώνημά;"
+
 #, python-format
 #~ msgid "The lead '%s' has been closed."
 #~ msgstr "Ο Υποψήφιος Πελάτης '%s' έχει κλείσει"
@@ -4273,6 +4141,9 @@ msgstr ""
 #~ msgid "Opportunity Summary"
 #~ msgstr "Περίληψη Ευκαιρίας"
 
+#~ msgid "_Convert"
+#~ msgstr "_Μετατροπή"
+
 #~ msgid "Caldav URL"
 #~ msgstr "Caldav URL"
 
@@ -4303,9 +4174,6 @@ msgstr ""
 #~ msgid "Decline"
 #~ msgstr "Απόρριψη"
 
-#~ msgid "Send Mail"
-#~ msgstr "Αποστολή αλληλογραφίας"
-
 #~ msgid "Customer Meeting"
 #~ msgstr "Σύσκεψη με Πελάτη"
 
@@ -4455,6 +4323,9 @@ msgstr ""
 #~ msgid "crm.lead"
 #~ msgstr "crm.lead"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Τηλεφώνημα σε Συνεργάτη"
+
 #~ msgid "Assignment"
 #~ msgstr "Ανάθεση"
 
@@ -4499,6 +4370,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Παραμετροποίηση Εφαρμογής CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Επιλογή Κατηγορίας σε"
+
 #~ msgid "Thu"
 #~ msgstr "Πέμ"
 
@@ -4550,6 +4424,9 @@ msgstr ""
 #~ msgid "Contacts"
 #~ msgstr "Επαφές"
 
+#~ msgid "Success Probability"
+#~ msgstr "Πιθανότητα Επιτυχίας"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "Αναφορά Υποψηφίων πελατών CRM"
 
@@ -4562,6 +4439,10 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Κατηγορίες Συναντήσεων"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr ""
+#~ "Μπορεί να χρειαστεί να επιβεβαιώσετε ότι αυτός ο συνεργάτης δεν υπάρχει ήδη."
+
 #~ msgid "Schedule Phone Call"
 #~ msgstr "Προγραμματισμός Τηλεφωνήματος"
 
@@ -4649,6 +4530,9 @@ msgstr ""
 #~ msgid "Recurrent Meeting"
 #~ msgstr "Επαναλαμβανόμενη Συνάντηση"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Πιθανός Πελάτης σε Συνεργάτη"
+
 #~ msgid "Repeat x times"
 #~ msgstr "Επανάληψη χ φορές"
 
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 65b001a1f5d..9f664b02f70 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 12:36+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,11 +31,13 @@ msgstr ""
 "desde los correos entrantes."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciativa"
 
@@ -45,22 +47,30 @@ msgid "Title"
 msgstr "Título"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Acción"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
-"La llamada asociada a la oportunidad  <em>%s</em>  ha sido <b>creada</b> y  "
-"<b>planificada</b> en <em>%s</em>."
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -68,11 +78,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Administrar recaudación de fondos"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Convertir a oportunidad"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -80,10 +85,10 @@ msgid "Delay to close"
 msgstr "Demora cierre"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "La iniciativa ha sido <b>convertida en una oportunidad</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre de etapa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -98,11 +103,6 @@ msgstr "Comercial"
 msgid "CRM Lead Analysis"
 msgstr "Análisis Iniciativas CRM"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Recordatorio en iniciativa: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -148,6 +148,12 @@ msgstr "Fecha creción"
 msgid "Rule Name"
 msgstr "Nombre de regla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -180,8 +186,8 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -208,7 +214,7 @@ msgid "Schedule Other Call"
 msgstr "Planificar otra llamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -220,9 +226,14 @@ msgid "Opt-Out"
 msgstr "No acepta recibir emails"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Ocultar en vistas si está vacío"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -240,9 +251,9 @@ msgid "Excluded Answers :"
 msgstr "Respuestas excluidas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secciones"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -252,7 +263,7 @@ msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -265,16 +276,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campañas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Seleccionar oportunidades"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Estado"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -297,7 +298,7 @@ msgid "Prospect Partner"
 msgstr "Socio prospecto"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Sin asunto"
@@ -416,11 +417,17 @@ msgstr "Muerta"
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Enlace a cliente existente"
 
@@ -444,7 +451,6 @@ msgstr ""
 "casos de esta etapa sean un éxito."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -459,6 +465,13 @@ msgstr "Categoría"
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
@@ -466,10 +479,9 @@ msgstr ""
 "Iniciativas asignadas a uno de los equipos que gestiono, o a mí mismo"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Acciones de conversión"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Email de contacto de la empresa"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -508,22 +520,13 @@ msgstr "Estado"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Crear oportunidad"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nombre de etapa"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -536,9 +539,9 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Por hacer"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,9 +561,9 @@ msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "CRM llamada: Marcar leída"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -600,6 +603,11 @@ msgstr "Resumen"
 msgid "Merge"
 msgstr "Fusionar"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -610,11 +618,6 @@ msgstr "Categoría del caso"
 msgid "Partner Contact Name"
 msgstr "Nombre contacto de empresa"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "CRM llamada: Marcar sin leer"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -639,6 +642,11 @@ msgstr "#Llamadas telefónicas"
 msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Dirección de email del contacto"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -710,9 +718,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentación de empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duración en minutos"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -730,9 +738,9 @@ msgid "The name of the segmentation."
 msgstr "El nombre de la segmentación."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Iniciativas de EEUU"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -750,13 +758,7 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa cambiada a  <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -769,12 +771,6 @@ msgstr "Etapa cambiada a  <b>%s</b>."
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Una reunión ha sido  <b>programada</b> en <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -813,17 +809,6 @@ msgstr ""
 "Iniciativas/Oportunidades que están asignadas a uno de los equipos de venta "
 "que gestiono"
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nombre oportunidad"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Establecer equipo a"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -835,25 +820,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "De %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Año de creación"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Convertir a oportunidad"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "o"
@@ -878,31 +859,6 @@ msgstr ""
 "Enlace entre etapas y equipos de ventas. Cuando se asigna, las etapas están "
 "limitadas al equipo de venta seleccionado."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hola [[object.user_id.name]], \n"
-"¿podría comprobar la siguiente iniciativa? Está abierta desde hace 5 días.\n"
-"\n"
-"Iniciativa: [[object.id ]]\n"
-"Descripción:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Gracias,\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -910,9 +866,9 @@ msgid "Requirements"
 msgstr "Requerimientos"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Convertir a oportunidad "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -957,9 +913,9 @@ msgid "Mark Won"
 msgstr "Marcar ganado"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidad (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Iniciativas de EEUU"
 
 #. module: crm
 #: view:crm.lead:0
@@ -984,7 +940,7 @@ msgid "Send Email"
 msgstr "Enviar correo"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Advertencia !"
@@ -994,23 +950,12 @@ msgstr "Advertencia !"
 msgid "Days to Open"
 msgstr "Días para abrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Crear empresa"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Móvil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "Llamada ha sido <b>reiniciada y establecida a abierta</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -1037,11 +982,6 @@ msgstr "Utilizado para cálculo de días abiertos"
 msgid "Meetings"
 msgstr "Reuniones"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condiciones sobre campos del caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1049,6 +989,19 @@ msgstr "Condiciones sobre campos del caso"
 msgid "Next Action"
 msgstr "Acción siguiente"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1119,16 +1072,6 @@ msgstr "Calcular la segmentación"
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"La reunión enlazada a la llamada  <em>%s</em> ha sido <b>creada</b> y  "
-"<b>programada</b> en <em>%s</em>."
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1138,10 +1081,10 @@ msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s ha sido  <b>creado</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1202,23 +1145,15 @@ msgid "Delete"
 msgstr "Borrar"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ingreso estimado"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr "í"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "La oportunidad ha sido  <b>perdida</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1227,9 +1162,20 @@ msgid "September"
 msgstr "Setiembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Dirección de email del contacto"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1262,21 +1208,15 @@ msgid "Opening Date"
 msgstr "Fecha de apertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nombre del canal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Siguiente"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1310,6 +1250,12 @@ msgstr ""
 "de etapas relacionadas con oportunidades, o para especificar etapas "
 "disponibles para ambos tipos."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1319,14 +1265,6 @@ msgstr ""
 "Márquela si quiere utilizar esta pestaña como parte de la regla de "
 "segmentación. Si no se marca, los criterios que contenga serán ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Crear una empresa"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1348,18 +1286,11 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-"Seguidores de este equipo siguen automáticamente todas las oportunidades "
-"relacionadas con este equipo."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Empresa a oportunidad"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Es un seguidor."
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1369,13 +1300,6 @@ msgstr "Empresa a oportunidad"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Es un seguidor."
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1428,6 +1352,13 @@ msgstr ""
 "Cunado se envían emails, la dirección de email por defecto proviene del "
 "equipo de ventas"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1439,7 +1370,7 @@ msgid "Lead Description"
 msgstr "Descripción de la iniciativa"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Oportunidades fusionadas"
@@ -1483,13 +1414,9 @@ msgstr "Referencias"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1510,14 +1437,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Iniciativas/Oportunidades que están en estado pendiente"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusionar dos oportunidades"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Por hacer"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Llamada telefónica a empresa"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Cliente relacionado"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1556,6 +1490,16 @@ msgstr "Iniciativas/Oportunidades que están en estado abierto"
 msgid "Users"
 msgstr "Usuarios"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1605,6 +1549,12 @@ msgstr "Nombre"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Iniciativas/Oportunidades que están asignadas a mí."
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1641,17 +1591,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr "Convertir prospección a empresa"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "La oportunidad ha sido <b>ganada</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Llamadas de teléfono que están asignadas a mi o a mi(s) equipo(s)"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1688,6 +1627,7 @@ msgstr "Equipo padre"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "No enlazar a un cliente"
 
@@ -1696,11 +1636,6 @@ msgstr "No enlazar a un cliente"
 msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En proceso"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1718,11 +1653,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Asignar oportunidades a"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1734,7 +1664,7 @@ msgid "Month of call"
 msgstr "Mes de la llamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "El cliente ha sido  <b>creado</b>."
@@ -1791,11 +1721,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nombre del cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Llamada telefónica a oportunidad"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1816,11 +1741,6 @@ msgstr "Oportunidades por etapa"
 msgid "Prospect is converting to business partner"
 msgstr "El prospecto se convierte a partner"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "Iniciativa CRM: Marcar sin leer"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1955,12 +1875,6 @@ msgstr "Referenciado por"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1991,16 +1905,9 @@ msgid "Sales Teams"
 msgstr "Equipos de ventas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Inicaitiva a cliente"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -2012,12 +1919,6 @@ msgstr "Equipo"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Iniciativas / oportunidades que están en estado nuveo"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>empresa</b>se  ha establecido a <em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -2029,12 +1930,6 @@ msgstr "Pendiente"
 msgid "Probability"
 msgstr "Probabilidad"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Por favor seleccione más de una oportunidad de la lista"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -2050,6 +1945,12 @@ msgstr "Mes"
 msgid "Leads"
 msgstr "Iniciativas"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -2061,39 +1962,18 @@ msgstr "Diseño"
 msgid "Merge with existing opportunities"
 msgstr "Fusionar con oportunidad existente"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear una nueva oportunidad.\n"
-"</p><p>\n"
-"OpenERP le ayuda a seguir el flujo de ventas para mantener las ventas "
-"potenciales y prever mejor futuros ingresos.\n"
-"</p><p>\n"
-"Será capaz de planificar reuniones y llamadas telefónicas desde las "
-"oportunidades, convertirlas en ofertas, adjuntar documentos relacionados, "
-"seguir todas las discusiones, y mucho más.\n"
-"</p>\n"
-"          "
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Por hacer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2156,36 +2036,6 @@ msgstr "Pendiente"
 msgid "Prospect Opportunity"
 msgstr "Oportunidad de prospección"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear una iniciativa sin calificar.\n"
-"</p><p>\n"
-"Use las iniciativas si necesita un paso de calificación antes de crear la "
-"oportunidad o el cliente. Puede ser una tarjeta de visita que ha recibido, "
-"un formulario de contacto rellenado en su web, un archivo de prospectos sin "
-"calificar que ha importado, etc.\n"
-"</p><p>\n"
-"Una vez calificada, la iniciativa puede ser convertida en una oportunidad "
-"y/o un nuevo cliente en su libreta de direcciones.\n"
-"</p>\n"
-"        "
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2234,18 +2084,16 @@ msgid "Mandatory Expression"
 msgstr "Expresión obligatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Crear un nuevo cliente"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Enviar correo"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Cliente relacionado"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Crear un nuevo cliente"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2274,11 +2122,6 @@ msgstr "Análisis de oportunidades"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expresiones Regulares en el Historial del Caso"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2306,11 +2149,6 @@ msgstr "Llamada realizada"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Recordar al cliente"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2322,21 +2160,22 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "La llamada ha sido  <b>creada y abierta</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicaciones"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Año de creación"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Opciones de conversión"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2407,7 +2246,6 @@ msgstr "Continuar el proceso"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Convertir a oportunidad"
 
@@ -2501,15 +2339,25 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Condiciones en el historial de comunicación"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "Iniciativas sin asignar"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2530,36 +2378,6 @@ msgstr "Restablecer"
 msgid "After-Sale Services"
 msgstr "Servicios Post-venta"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hola [[object.partner_id and object.partner_id.name or '']], \n"
-"la siguiente iniciativa no ha sido abierta desde hace 5 días.\n"
-"\n"
-"Iniciativa: [[object.id ]]\n"
-"Descripción:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Gracias,\n"
-"            "
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convertir"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2605,6 +2423,11 @@ msgstr ""
 "información de acuerdo a varios criterios y profundizar en la información "
 "añadiendo más grupos al informe."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2636,6 +2459,11 @@ msgstr "Seleccionar Iniciativas/Oportunidades"
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2668,6 +2496,24 @@ msgstr "Expresión opcional"
 msgid "Followers"
 msgstr "Seguidores"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2724,11 +2570,6 @@ msgstr "Creando oportunidades de negocio desde iniciativas"
 msgid "Email Campaign - Products"
 msgstr "Campaña email - productos"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Establecer categoría"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2784,9 +2625,10 @@ msgid "Qualification"
 msgstr "Calificación"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Email de contacto de la empresa"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Acciones de conversión"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2813,15 +2655,17 @@ msgstr ""
 "            "
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Una empresa ya ha sido definida"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurar"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2917,17 +2761,10 @@ msgid "Logged Calls"
 msgstr "Llamadas registradas"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidad de éxito"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2939,7 +2776,6 @@ msgstr "Casos por equipo de ventas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2948,11 +2784,6 @@ msgstr "Reunión"
 msgid "Category of Case"
 msgstr "Categoría de caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Oportunidad / Cliente"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2976,11 +2807,6 @@ msgstr "Calle2"
 msgid "Manage Helpdesk and Support"
 msgstr "Gestionar incidencias y soporte"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Debería verificar que esta empresa no exista ya."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2999,21 +2825,6 @@ msgstr "Usuario"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociación"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -3037,11 +2848,6 @@ msgstr "Contrato"
 msgid "Twitter Ads"
 msgstr "Anuncios Twiter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Común a todos los equipos"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -3053,14 +2859,9 @@ msgid "Planned Revenues"
 msgstr "Ingresos esperados"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "Iniciativa CRM: Marcar leído"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Llamada telefónica a llamada telefónica"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -3084,16 +2885,10 @@ msgid "Categorization"
 msgstr "Categorización"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Registrar llamada"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reglas de acciones"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -3120,7 +2915,6 @@ msgstr "Fecha de creación"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "en"
 
@@ -3146,7 +2940,6 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3236,20 +3029,11 @@ msgstr "Cambiar a 'Para hacer'"
 msgid "Working Hours"
 msgstr "Horario de trabajo"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Llamadas telefónicas"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3271,7 +3055,7 @@ msgid "Lost"
 msgstr "Perdido"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3321,19 +3105,14 @@ msgid "Phone calls by user and section"
 msgstr "Llamadas telefónicas por usuario y sección"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"La reunión relacionada con la oportunidad <em>%s</em> ha sido <b>creada</b> "
-"y <b>planificada</b> en <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociación"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Cierre previsto"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3351,10 +3130,10 @@ msgid "Proposition"
 msgstr "Propuesta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Fecha cierre"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3368,6 +3147,11 @@ msgstr "Año"
 msgid "Newsletter"
 msgstr "Boletín de noticias"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3504,6 +3288,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Eventos empresa"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condiciones sobre campos del caso"
+
 #~ msgid "Reset to Draft"
 #~ msgstr "Cambiar a borrador"
 
@@ -4014,6 +3801,9 @@ msgstr ""
 #~ "No puede enviar mensajes con un texto vacío, debería incluir una descripción "
 #~ "en el mensaje"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Máximo historial de comunicaciones"
+
 #~ msgid "Allows to delete non draft cases"
 #~ msgstr "Permite eliminar los casos en estado no borrador."
 
@@ -4075,6 +3865,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Enlace al socio existente"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expresiones Regulares en el Historial del Caso"
+
 #, python-format
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Una empresa ya esta definida para esta llamada."
@@ -4082,12 +3875,18 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "Mensaje"
 
+#~ msgid "Create Partner"
+#~ msgstr "Crear empresa"
+
 #~ msgid "My Meetings"
 #~ msgstr "Mis reuniones"
 
 #~ msgid "Attendees"
 #~ msgstr "Asistentes"
 
+#~ msgid "Continue"
+#~ msgstr "Siguiente"
+
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Descripción del caso"
 
@@ -4122,9 +3921,6 @@ msgstr ""
 #~ msgid "Claims"
 #~ msgstr "Reclamaciones"
 
-#~ msgid "Send Mail"
-#~ msgstr "Enviar correo"
-
 #~ msgid "To"
 #~ msgstr "Para"
 
@@ -4163,6 +3959,9 @@ msgstr ""
 #~ msgid "Create a new partner"
 #~ msgstr "Crear una nueva empresa"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nombre oportunidad"
+
 #~ msgid "Recurrent Rule"
 #~ msgstr "Regla recurrente"
 
@@ -4175,6 +3974,12 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Comercial"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Debería verificar que esta empresa no exista ya."
+
+#~ msgid "Success Probability"
+#~ msgstr "Probabilidad de éxito"
+
 #~ msgid "Schedule Phone Call"
 #~ msgstr "Planificar llamada telefónica"
 
@@ -4336,6 +4141,9 @@ msgstr ""
 #~ msgid "Supplier"
 #~ msgstr "Proveedor"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Convertir a oportunidad "
+
 #~ msgid "Add Note"
 #~ msgstr "Añadir nota"
 
@@ -4379,9 +4187,18 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Lunes"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Crear una empresa"
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Empresa a oportunidad"
+
 #~ msgid "Frequency"
 #~ msgstr "Frecuencia"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fusionar dos oportunidades"
+
 #~ msgid "Invite People"
 #~ msgstr "Invitar personas"
 
@@ -4413,6 +4230,9 @@ msgstr ""
 #~ msgid "Synchronization"
 #~ msgstr "Sincronización"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Llamada telefónica a oportunidad"
+
 #~ msgid "Mon"
 #~ msgstr "Lun"
 
@@ -4434,6 +4254,9 @@ msgstr ""
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Inicaitiva a cliente"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
@@ -4587,6 +4410,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Configuración de la aplicación CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Establecer categoría"
+
 #~ msgid "Thu"
 #~ msgstr "Jue"
 
@@ -4637,6 +4463,9 @@ msgstr ""
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "El caso '%s' ha sido cerrado"
 
+#~ msgid "Action Rules"
+#~ msgstr "Reglas de acciones"
+
 #~ msgid "Recurrent ID date"
 #~ msgstr "ID fecha recurrente"
 
@@ -4755,9 +4584,16 @@ msgstr ""
 #~ msgid "# of Emails"
 #~ msgstr "Nº de e-mails"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
 #~ msgid "Free"
 #~ msgstr "Libre"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Llamada telefónica a empresa"
+
 #~ msgid "# Emails"
 #~ msgstr "Nº de emails"
 
@@ -4847,6 +4683,9 @@ msgstr ""
 #~ "Empresa relacionada opcional, normalmente después de la conversión de la "
 #~ "iniciativa"
 
+#~ msgid "_Convert"
+#~ msgstr "_Convertir"
+
 #~ msgid "The"
 #~ msgstr "El"
 
@@ -4903,6 +4742,9 @@ msgstr ""
 #~ msgid "Plug-In"
 #~ msgstr "Conector"
 
+#~ msgid "Set Team to"
+#~ msgstr "Establecer equipo a"
+
 #, python-format
 #~ msgid "The stage of opportunity '%s' has been changed to '%s'."
 #~ msgstr "La fase de la oportunidad '%s' ha cambiado a '%s'."
@@ -5281,6 +5123,9 @@ msgstr ""
 #~ msgid "Assigned opportunities to"
 #~ msgstr "Oportunidades asigandas a"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Oportunidad / Cliente"
+
 #~ msgid "Mail Gateway"
 #~ msgstr "Pasarela de correo"
 
@@ -5361,6 +5206,10 @@ msgstr ""
 #~ msgid "Leads creating during last 7 days"
 #~ msgstr "Iniciativas creadas durante los 7 últimos días"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Por favor seleccione más de una oportunidad de la lista"
+
 #~ msgid "Scheduled Phonecalls"
 #~ msgstr "Llamadas planificadas"
 
@@ -5419,10 +5268,17 @@ msgstr ""
 #~ "Las iniciativas Cerradas /Canceladas no pueden ser convertidas en "
 #~ "oportunidades"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Una empresa ya ha sido definida"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "La oportunidad '%s' ha sido ganada."
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Común a todos los equipos"
+
 #~ msgid "Edit"
 #~ msgstr "Editar"
 
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index 7f3514ff512..5868c348d9a 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-15 15:45+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Nombre de regla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Respuestas excluidas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secciones"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -385,11 +388,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -411,7 +420,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -426,15 +434,21 @@ msgstr "Categoría"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -466,21 +480,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -494,8 +499,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -516,8 +521,8 @@ msgid "Planned Revenue"
 msgstr "Ingreso planeado"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -554,6 +559,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -564,11 +574,6 @@ msgstr "Categoría del caso"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -591,6 +596,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -652,8 +662,8 @@ msgid "Partner Segmentation"
 msgstr "Segmentación de Empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -672,9 +682,9 @@ msgid "The name of the segmentation."
 msgstr "El nombre de la segmentación."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -692,13 +702,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -711,12 +715,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -753,17 +751,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -775,25 +762,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -816,21 +799,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -838,8 +806,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -885,9 +853,9 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidad (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -912,7 +880,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Atención !"
@@ -922,23 +890,12 @@ msgstr "Atención !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -964,11 +921,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condiciones sobre campos del caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -976,6 +928,19 @@ msgstr "Condiciones sobre campos del caso"
 msgid "Next Action"
 msgstr "Próxima acción"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1044,14 +1009,6 @@ msgstr "Calcular la segmentación"
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1061,9 +1018,9 @@ msgid "Creation Date"
 msgstr "Fecha de creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1123,10 +1080,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1134,12 +1089,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1148,8 +1097,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1181,8 +1141,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1190,12 +1150,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1222,6 +1176,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1231,14 +1191,6 @@ msgstr ""
 "Márque la casilla si quiere utilizar esta solapa como parte de la regla de "
 "segmentación. Si no se marca, los criterios que contenga serán ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1260,15 +1212,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1279,13 +1226,6 @@ msgstr ""
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1332,6 +1272,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1343,7 +1290,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1387,13 +1334,9 @@ msgstr "Referencias"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1414,13 +1357,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1460,6 +1410,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1504,6 +1464,12 @@ msgstr "Nombre"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1540,17 +1506,6 @@ msgstr "Alta"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1587,6 +1542,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1595,11 +1551,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En ejecución"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1613,11 +1564,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1629,7 +1575,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1682,11 +1628,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1707,11 +1648,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1845,11 +1781,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1880,17 +1811,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1901,12 +1825,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1918,12 +1836,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1939,6 +1851,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1950,28 +1868,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2032,24 +1940,6 @@ msgstr "Pendiente"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2098,17 +1988,15 @@ msgid "Mandatory Expression"
 msgstr "Expresión obligatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2138,11 +2026,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2170,11 +2053,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2186,21 +2064,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicaciones"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2267,7 +2146,6 @@ msgstr "Continuar el proceso"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2349,8 +2227,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En ejecución"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2358,6 +2241,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2378,26 +2266,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2439,6 +2307,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2470,6 +2343,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2502,6 +2380,24 @@ msgstr "Expresión opcional"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2554,11 +2450,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2603,8 +2494,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2623,14 +2515,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2724,18 +2618,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Borrador"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2746,7 +2633,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2755,11 +2641,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2783,11 +2664,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2806,21 +2682,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2844,11 +2705,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2860,13 +2716,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2891,16 +2742,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2924,7 +2769,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2950,7 +2794,6 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3029,20 +2872,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3064,7 +2898,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3112,16 +2946,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3140,9 +2971,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3157,6 +2988,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3272,6 +3108,9 @@ msgstr ""
 #~ msgid "Case Communication History"
 #~ msgstr "Historial de comunicación del caso"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condiciones sobre campos del caso"
+
 #~ msgid "Category of case"
 #~ msgstr "Categoría del caso"
 
@@ -3784,6 +3623,9 @@ msgstr ""
 #~ "No puede enviar mensajes con un texto vacío, debería incluir una descripción "
 #~ "en el mensaje"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Máximo historial de comunicaciones"
+
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr ""
diff --git a/addons/crm/i18n/es_CR.po b/addons/crm/i18n/es_CR.po
index b8037f20191..329602b281f 100644
--- a/addons/crm/i18n/es_CR.po
+++ b/addons/crm/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-15 19:23+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: crm
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciativa"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Título"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Acción"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Demora cierre"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre de etapa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "Análisis Iniciativas CRM"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr "Fecha creción"
 msgid "Rule Name"
 msgstr "Nombre de regla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Planificar otra llamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "No acepta recibir emails"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Respuestas excluidas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secciones"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campañas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Seleccionar oportunidades"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Estado"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Socio prospecto"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Sin Asunto"
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgstr ""
 "casos de esta etapa sean un éxito."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,16 +439,22 @@ msgstr "Categoría"
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Email de contacto de la empresa"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -471,22 +485,13 @@ msgstr "Estado"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Crear oportunidad"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nombre de etapa"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,9 +504,9 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Por hacer"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Resumen"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Categoría del caso"
 msgid "Partner Contact Name"
 msgstr "Nombre contacto de empresa"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "#Llamadas telefónicas"
 msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -660,9 +670,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentación de empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duración en minutos"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -680,9 +690,9 @@ msgid "The name of the segmentation."
 msgstr "El nombre de la segmentación."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -700,13 +710,7 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -719,12 +723,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -761,17 +759,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nombre oportunidad"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Establecer equipo a"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -783,25 +770,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "De %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Año de creación"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -824,21 +807,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -846,9 +814,9 @@ msgid "Requirements"
 msgstr "Requerimientos"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Convertir a oportunidad "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -893,9 +861,9 @@ msgid "Mark Won"
 msgstr "Marcar ganado"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidad (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -920,7 +888,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Advertencia !"
@@ -930,23 +898,12 @@ msgstr "Advertencia !"
 msgid "Days to Open"
 msgstr "Días para abrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Crear empresa"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Móvil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -972,11 +929,6 @@ msgstr "Se utiliza para calcular los días abiertos"
 msgid "Meetings"
 msgstr "Reuniones"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condiciones sobre campos del caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -984,6 +936,19 @@ msgstr "Condiciones sobre campos del caso"
 msgid "Next Action"
 msgstr "Acción siguiente"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1052,14 +1017,6 @@ msgstr "Calcular la segmentación"
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1069,9 +1026,9 @@ msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1131,23 +1088,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ingreso estimado"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1156,8 +1105,19 @@ msgid "September"
 msgstr "Setiembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1191,21 +1151,15 @@ msgid "Opening Date"
 msgstr "Fecha de apertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nombre del canal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Siguiente"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1236,6 +1190,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1245,14 +1205,6 @@ msgstr ""
 "Márquela si quiere utilizar esta pestaña como parte de la regla de "
 "segmentación. Si no se marca, los criterios que contenga serán ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Crear una empresa"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1274,17 +1226,12 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Empresa a oportunidad"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1293,13 +1240,6 @@ msgstr "Empresa a oportunidad"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1348,6 +1288,13 @@ msgstr ""
 "Cunado se envían emails, la dirección de email por defecto proviene del "
 "equipo de ventas"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1359,7 +1306,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Oportunidades fusionadas"
@@ -1403,13 +1350,9 @@ msgstr "Referencias"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1430,14 +1373,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Iniciativas/Oportunidades que están en estado pendiente"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusionar dos oportunidades"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Por hacer"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Llamada telefónica a empresa"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1476,6 +1426,16 @@ msgstr "Iniciativas/Oportunidades que están en estado abierto"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1525,6 +1485,12 @@ msgstr "Nombre"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1561,17 +1527,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr "Convertir prospección a empresa"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1608,6 +1563,7 @@ msgstr "Equipo padre"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1616,11 +1572,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En proceso"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1634,11 +1585,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1650,7 +1596,7 @@ msgid "Month of call"
 msgstr "Mes de la llamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1703,11 +1649,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nombre del cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Llamada telefónica a oportunidad"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1728,11 +1669,6 @@ msgstr "Oportunidades por etapa"
 msgid "Prospect is converting to business partner"
 msgstr "El prospecto se convierte a partner"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1866,12 +1802,6 @@ msgstr "Referenciado por"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1902,16 +1832,9 @@ msgid "Sales Teams"
 msgstr "Equipos de ventas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Inicaitiva a cliente"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1923,12 +1846,6 @@ msgstr "Equipo"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Iniciativas / oportunidades que están en estado nuveo"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1940,12 +1857,6 @@ msgstr "Pendiente"
 msgid "Probability"
 msgstr "Probabilidad"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Por favor seleccione más de una oportunidad de la lista"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1961,6 +1872,12 @@ msgstr "Mes"
 msgid "Leads"
 msgstr "Iniciativas"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1972,28 +1889,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Por hacer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2054,24 +1961,6 @@ msgstr "Pendiente"
 msgid "Prospect Opportunity"
 msgstr "Oportunidad de prospección"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2120,17 +2009,15 @@ msgid "Mandatory Expression"
 msgstr "Expresión obligatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Enviar correo"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2160,11 +2047,6 @@ msgstr "Análisis de oportunidades"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expresiones Regulares en el Historial del Caso"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2192,11 +2074,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2208,21 +2085,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicaciones"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Año de creación"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2291,7 +2169,6 @@ msgstr "Continuar el proceso"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2373,8 +2250,13 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2382,6 +2264,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Iniciativas sin asignar"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2402,26 +2289,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convertir"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2467,6 +2334,11 @@ msgstr ""
 "información de acuerdo a varios criterios y profundizar en la información "
 "añadiendo más grupos al informe."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2498,6 +2370,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2530,6 +2407,24 @@ msgstr "Expresión opcional"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2586,11 +2481,6 @@ msgstr "Creando oportunidades de negocio desde iniciativas"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Establecer categoría"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2635,9 +2525,10 @@ msgid "Qualification"
 msgstr "Calificación"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Email de contacto de la empresa"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2655,15 +2546,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Una empresa ya ha sido definida"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurar"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2759,17 +2652,10 @@ msgid "Logged Calls"
 msgstr "Llamadas registradas"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidad de éxito"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2781,7 +2667,6 @@ msgstr "Casos por equipo de ventas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2790,11 +2675,6 @@ msgstr "Reunión"
 msgid "Category of Case"
 msgstr "Categoría de caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Oportunidad / Cliente"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2818,11 +2698,6 @@ msgstr "Calle2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Debería verificar que esta empresa no exista ya."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2841,21 +2716,6 @@ msgstr "Usuario"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociación"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2879,11 +2739,6 @@ msgstr "Contrato"
 msgid "Twitter Ads"
 msgstr "Anuncios Twiter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Común a todos los equipos"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2895,14 +2750,9 @@ msgid "Planned Revenues"
 msgstr "Ingresos esperados"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Llamada telefónica a llamada telefónica"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2926,16 +2776,10 @@ msgid "Categorization"
 msgstr "Categorización"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Registrar llamada"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reglas de acciones"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2959,7 +2803,6 @@ msgstr "Fecha de creación"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2985,7 +2828,6 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3064,20 +2906,11 @@ msgstr "Restablecer Todo"
 msgid "Working Hours"
 msgstr "Horario de trabajo"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Llamadas telefónicas"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3099,7 +2932,7 @@ msgid "Lost"
 msgstr "Perdido"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3147,17 +2980,14 @@ msgid "Phone calls by user and section"
 msgstr "Llamadas telefónicas por usuario y sección"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociación"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Cierre previsto"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3175,10 +3005,10 @@ msgid "Proposition"
 msgstr "Propuesta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Fecha cierre"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3192,6 +3022,11 @@ msgstr "Año"
 msgid "Newsletter"
 msgstr "Boletín de noticias"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3289,6 +3124,9 @@ msgstr ""
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expresiones Regulares en el Historial del Caso"
+
 #, python-format
 #~ msgid "The lead '%s' has been opened."
 #~ msgstr "La iniciativa '%s' ha sido abierta."
@@ -3361,12 +3199,18 @@ msgstr ""
 #~ "reuniones con tu teléfono móvil usando la interfaz de CalDAV.\n"
 #~ "        "
 
+#~ msgid "Continue"
+#~ msgstr "Siguiente"
+
 #~ msgid "Days per Periode"
 #~ msgstr "Días por período"
 
 #~ msgid "By day"
 #~ msgstr "Por día"
 
+#~ msgid "Set Team to"
+#~ msgstr "Establecer equipo a"
+
 #~ msgid ""
 #~ "This property defines the list of date/time exceptions for a recurring "
 #~ "calendar component."
@@ -3374,6 +3218,9 @@ msgstr ""
 #~ "Esta propiedad define la lista de excepciones de fecha/hora para un evento "
 #~ "de calendario recurrente."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Convertir a oportunidad "
+
 #~ msgid "Recurrent Meeting"
 #~ msgstr "Reunión periódica"
 
@@ -3386,6 +3233,9 @@ msgstr ""
 #~ msgid "Show time as"
 #~ msgstr "Mostrar hora como"
 
+#~ msgid "Create Partner"
+#~ msgstr "Crear empresa"
+
 #~ msgid "<"
 #~ msgstr "<"
 
@@ -3460,6 +3310,9 @@ msgstr ""
 #~ "Crear categorías específicas de llamada telefónica para definir mejor el "
 #~ "tipo de llamadas en el sistema de seguimiento."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nombre oportunidad"
+
 #~ msgid "Fri"
 #~ msgstr "Vie"
 
@@ -3478,6 +3331,9 @@ msgstr ""
 #~ msgid "Set an alarm at this time, before the event occurs"
 #~ msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Crear una empresa"
+
 #~ msgid "Monday"
 #~ msgstr "Lunes"
 
@@ -3485,6 +3341,9 @@ msgstr ""
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "El caso '%s' ha sido cerrado"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Empresa a oportunidad"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Oportunidades por categorías"
 
@@ -3503,6 +3362,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.usuarios"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fusionar dos oportunidades"
+
 #~ msgid "Exception Rule"
 #~ msgstr "Exception de regla"
 
@@ -3538,6 +3400,9 @@ msgstr ""
 #~ msgid "The"
 #~ msgstr "El"
 
+#~ msgid "_Convert"
+#~ msgstr "_Convertir"
+
 #~ msgid ""
 #~ "With Meeting Invitations you can create and manage the meeting invitations "
 #~ "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
@@ -3584,6 +3449,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Oportunidades por categorías"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Llamada telefónica a oportunidad"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Seleccionar etapas para este equipo de ventas"
 
@@ -3631,6 +3499,10 @@ msgstr ""
 #~ msgid "Caldav URL"
 #~ msgstr "URL de caldav"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
 #~ msgid ""
 #~ "Define a Sales Team to organize your different salesmen or sales departments "
 #~ "into separate teams. Each team will work in its own list of opportunities, "
@@ -3648,6 +3520,9 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Repetir x veces"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Inicaitiva a cliente"
+
 #~ msgid ""
 #~ "Leads allow you to manage and keep track of all initial contacts with a "
 #~ "prospect or partner showing interest in your products or services. A lead is "
@@ -3747,6 +3622,9 @@ msgstr ""
 #~ msgid "My Open Opportunities"
 #~ msgstr "Mis oportunidades abiertas"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Máximo historial de comunicaciones"
+
 #~ msgid "Invite People"
 #~ msgstr "Invitar personas"
 
@@ -3793,6 +3671,9 @@ msgstr ""
 #~ msgid "Weekday"
 #~ msgstr "Día de la semana"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Llamada telefónica a empresa"
+
 #~ msgid "Set New State To"
 #~ msgstr "Establecer nuevo estado a"
 
@@ -3914,6 +3795,9 @@ msgstr ""
 #~ msgid "Need Information"
 #~ msgstr "Necesita información"
 
+#~ msgid "Set Category to"
+#~ msgstr "Establecer categoría"
+
 #~ msgid "Thu"
 #~ msgstr "Jue"
 
@@ -3976,6 +3860,9 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "Por defecto (0=Ninguno)"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilidad de éxito"
+
 #~ msgid "Attendees"
 #~ msgstr "Asistentes"
 
@@ -3988,6 +3875,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Categorías de reuniones"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Debería verificar que esta empresa no exista ya."
+
 #, python-format
 #~ msgid "The case '%s' has been cancelled."
 #~ msgstr "El caso '%s' ha sido cancelado"
@@ -4015,6 +3905,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Cerrado"
 
+#~ msgid "Action Rules"
+#~ msgstr "Reglas de acciones"
+
 #~ msgid "Recurrency"
 #~ msgstr "Recurrencia"
 
@@ -4149,6 +4042,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Eventos empresa"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condiciones sobre campos del caso"
+
 #~ msgid "Case Communication History"
 #~ msgstr "Historial de comunicación del caso"
 
@@ -4673,9 +4569,6 @@ msgstr ""
 #~ msgid "Claims"
 #~ msgstr "Reclamaciones"
 
-#~ msgid "Send Mail"
-#~ msgstr "Enviar correo"
-
 #~ msgid "Helpdesk"
 #~ msgstr "Asistencia/Ayuda"
 
@@ -5117,6 +5010,9 @@ msgstr ""
 #~ "\"Ingresos previstos\" y \"Fecha de cierre prevista\". Debe dede leer "
 #~ "igualmente la ayuda del campo \"Cambiar la probabilidad automáticamente\""
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Oportunidad / Cliente"
+
 #~ msgid "Recurrence termination"
 #~ msgstr "Terminación de recurrencia"
 
@@ -5240,6 +5136,10 @@ msgstr ""
 #~ msgid "Leads creating during last 7 days"
 #~ msgstr "Iniciativas creadas durante los 7 últimos días"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Por favor seleccione más de una oportunidad de la lista"
+
 #~ msgid "Scheduled Phonecalls"
 #~ msgstr "Llamadas planificadas"
 
@@ -5315,10 +5215,17 @@ msgstr ""
 #~ "Las iniciativas Cerradas /Canceladas no pueden ser convertidas en "
 #~ "oportunidades"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Una empresa ya ha sido definida"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "La oportunidad '%s' ha sido ganada."
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Común a todos los equipos"
+
 #~ msgid "Edit"
 #~ msgstr "Editar"
 
diff --git a/addons/crm/i18n/es_EC.po b/addons/crm/i18n/es_EC.po
index c1f2a495b1a..544325e990d 100644
--- a/addons/crm/i18n/es_EC.po
+++ b/addons/crm/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 03:41+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciativa"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Título"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Acción"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "Demora cierre"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre de etapa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Nombre de regla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Planificar otra llamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "No acepta recibir emails"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Estado/Provincia"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Respuestas excluidas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secciones"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campañas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Seleccionar oportunidades"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Estado/Provincia"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "Socio prospecto"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -415,7 +424,6 @@ msgstr ""
 "casos de esta etapa sean un éxito."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -430,15 +438,21 @@ msgstr "Categoría"
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -470,22 +484,13 @@ msgstr "Estado"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Crear oportunidad"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nombre de etapa"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -498,8 +503,8 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -520,9 +525,9 @@ msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,6 +563,11 @@ msgstr "Resumen"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -568,11 +578,6 @@ msgstr "Categoría del caso"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -595,6 +600,11 @@ msgstr "#Llamadas telefónicas"
 msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentación de empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duración en minutos"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "El nombre de la segmentación."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nombre oportunidad"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Establecer equipo a"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Requerimientos"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Convertir a oportunidad "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Marcar ganado"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidad (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Advertencia !"
@@ -929,23 +897,12 @@ msgstr "Advertencia !"
 msgid "Days to Open"
 msgstr "Días para abrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Crear empresa"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Móvil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Reuniones"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condiciones sobre campos del caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr "Condiciones sobre campos del caso"
 msgid "Next Action"
 msgstr "Acción siguiente"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Calcular la segmentación"
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ingreso estimado"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "Setiembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Fecha de apertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Siguiente"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1231,6 +1185,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "Márquela si quiere utilizar esta pestaña como parte de la regla de "
 "segmentación. Si no se marca, los criterios que contenga serán ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Crear una empresa"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Empresa a oportunidad"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Empresa a oportunidad"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1396,13 +1343,9 @@ msgstr "Referencias"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusionar dos oportunidades"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Llamada telefónica a empresa"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1518,6 +1478,12 @@ msgstr "Nombre"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1554,17 +1520,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr "Convertir prospección a empresa"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1601,6 +1556,7 @@ msgstr "Equipo padre"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1609,11 +1565,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En proceso"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1627,11 +1578,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1643,7 +1589,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1696,11 +1642,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nombre del cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Llamada telefónica a oportunidad"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1721,11 +1662,6 @@ msgstr "Oportunidades por etapa"
 msgid "Prospect is converting to business partner"
 msgstr "El prospecto se convierte a partner"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1859,12 +1795,6 @@ msgstr "Referenciado por"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1895,16 +1825,9 @@ msgid "Sales Teams"
 msgstr "Equipos de ventas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Inicaitiva a cliente"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1916,12 +1839,6 @@ msgstr "Equipo"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1933,12 +1850,6 @@ msgstr "No ocupado"
 msgid "Probability"
 msgstr "Probabilidad"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1954,6 +1865,12 @@ msgstr "Mes"
 msgid "Leads"
 msgstr "Iniciativas"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1965,28 +1882,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Por hacer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2047,24 +1954,6 @@ msgstr "Pendiente"
 msgid "Prospect Opportunity"
 msgstr "Oportunidad de prospección"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2113,17 +2002,15 @@ msgid "Mandatory Expression"
 msgstr "Expresión obligatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Enviar correo"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2153,11 +2040,6 @@ msgstr "Análisis de oportunidades"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expresiones Regulares en el Historial del Caso"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2185,11 +2067,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2201,21 +2078,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicaciones"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2282,7 +2160,6 @@ msgstr "Continuar el proceso"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2364,8 +2241,13 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2373,6 +2255,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2393,26 +2280,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convertir"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2458,6 +2325,11 @@ msgstr ""
 "información de acuerdo a varios criterios y profundizar en la información "
 "añadiendo más grupos al informe."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2489,6 +2361,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2521,6 +2398,24 @@ msgstr "Expresión opcional"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2577,11 +2472,6 @@ msgstr "Creando oportunidades de negocio desde iniciativas"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Establecer categoría"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2626,8 +2516,9 @@ msgid "Qualification"
 msgstr "Calificación"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2646,15 +2537,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurar"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2750,17 +2643,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidad de éxito"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2772,7 +2658,6 @@ msgstr "Casos por equipo de ventas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2781,11 +2666,6 @@ msgstr "Reunión"
 msgid "Category of Case"
 msgstr "Categoría de caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2809,11 +2689,6 @@ msgstr "Calle2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Debería verificar que esta empresa no exista ya."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2832,21 +2707,6 @@ msgstr "Usuario"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociación"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2870,11 +2730,6 @@ msgstr "Contrato"
 msgid "Twitter Ads"
 msgstr "Anuncios Twiter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2886,14 +2741,9 @@ msgid "Planned Revenues"
 msgstr "Ingresos esperados"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Llamada telefónica a llamada telefónica"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2917,16 +2767,10 @@ msgid "Categorization"
 msgstr "Categorización"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reglas de acciones"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2950,7 +2794,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2976,7 +2819,6 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3055,20 +2897,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Horario de trabajo"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Llamadas telefónicas"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3090,7 +2923,7 @@ msgid "Lost"
 msgstr "Perdido"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3138,17 +2971,14 @@ msgid "Phone calls by user and section"
 msgstr "Llamadas telefónicas por usuario y sección"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociación"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Cierre previsto"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3166,10 +2996,10 @@ msgid "Proposition"
 msgstr "Propuesta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Fecha cierre"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3183,6 +3013,11 @@ msgstr "Año"
 msgid "Newsletter"
 msgstr "Boletín de noticias"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3303,6 +3138,9 @@ msgstr ""
 #~ msgid "Enhance your core CRM Application with additional functionalities."
 #~ msgstr "Mejore su aplicación CRM básica con funcionalidades adicionales."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expresiones Regulares en el Historial del Caso"
+
 #, python-format
 #~ msgid "The lead '%s' has been opened."
 #~ msgstr "La iniciativa '%s' ha sido abierta."
@@ -3463,12 +3301,18 @@ msgstr ""
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Sincronización del calendario"
 
+#~ msgid "Continue"
+#~ msgstr "Siguiente"
+
 #~ msgid "Days per Periode"
 #~ msgstr "Días por período"
 
 #~ msgid "By day"
 #~ msgstr "Por día"
 
+#~ msgid "Set Team to"
+#~ msgstr "Establecer equipo a"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.instalador"
 
@@ -3486,6 +3330,9 @@ msgstr ""
 #~ "Esta propiedad define la lista de excepciones de fecha/hora para un evento "
 #~ "de calendario recurrente."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Convertir a oportunidad "
+
 #~ msgid "Gives the sequence order when displaying a list of case stages."
 #~ msgstr ""
 #~ "Indica el orden de secuencia cuando se muestra un lista de etapas de casos."
@@ -3506,6 +3353,9 @@ msgstr ""
 #~ msgid "Show time as"
 #~ msgstr "Mostrar hora como"
 
+#~ msgid "Create Partner"
+#~ msgstr "Crear empresa"
+
 #~ msgid "<"
 #~ msgstr "<"
 
@@ -3604,6 +3454,9 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Gestiona un servicio de soporte."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nombre oportunidad"
+
 #~ msgid "  Year  "
 #~ msgstr "  Año  "
 
@@ -3625,9 +3478,15 @@ msgstr ""
 #~ msgid "Reminder"
 #~ msgstr "Recordatorio"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Crear una empresa"
+
 #~ msgid "Monday"
 #~ msgstr "Lunes"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Empresa a oportunidad"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Resumen oportunidad"
 
@@ -3655,6 +3514,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.usuarios"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fusionar dos oportunidades"
+
 #~ msgid "Current"
 #~ msgstr "Actual"
 
@@ -3703,6 +3565,9 @@ msgstr ""
 #~ "El equipo de ventas al que pertenece este caso. Define el usuario "
 #~ "responsable y la dirección de correo electrónico para la pasarela de correo."
 
+#~ msgid "_Convert"
+#~ msgstr "_Convertir"
+
 #~ msgid "Saturday"
 #~ msgstr "Sábado"
 
@@ -3757,6 +3622,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Oportunidades por categorías"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Llamada telefónica a oportunidad"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Seleccionar etapas para este equipo de ventas"
 
@@ -3814,9 +3682,16 @@ msgstr ""
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
 #~ msgid "Repeat x times"
 #~ msgstr "Repetir x veces"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Inicaitiva a cliente"
+
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
@@ -3867,9 +3742,6 @@ msgstr ""
 #~ msgid "CC"
 #~ msgstr "CC"
 
-#~ msgid "Send Mail"
-#~ msgstr "Enviar correo"
-
 #~ msgid "Months"
 #~ msgstr "Meses"
 
@@ -3943,6 +3815,9 @@ msgstr ""
 #~ msgid "Main Job"
 #~ msgstr "Trabajo principal"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Máximo historial de comunicaciones"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
 
@@ -4002,6 +3877,9 @@ msgstr ""
 #~ msgid "Configure Your CRM Application"
 #~ msgstr "Configure su aplicación CRM"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Llamada telefónica a empresa"
+
 #~ msgid "Set New State To"
 #~ msgstr "Establecer nuevo estado a"
 
@@ -4156,6 +4034,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Configuración de la aplicación CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Establecer categoría"
+
 #~ msgid "Configuration"
 #~ msgstr "Configuración"
 
@@ -4239,6 +4120,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "¡Error! No puede crear miembros asociados recursivos."
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilidad de éxito"
+
 #~ msgid "Attendees"
 #~ msgstr "Asistentes"
 
@@ -4254,6 +4138,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Categorías de reuniones"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Debería verificar que esta empresa no exista ya."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
@@ -4303,6 +4190,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Cerrado"
 
+#~ msgid "Action Rules"
+#~ msgstr "Reglas de acciones"
+
 #~ msgid "Recurrency"
 #~ msgstr "Recurrencia"
 
@@ -4441,6 +4331,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Eventos empresa"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condiciones sobre campos del caso"
+
 #~ msgid "Case Communication History"
 #~ msgstr "Historial de comunicación del caso"
 
diff --git a/addons/crm/i18n/es_PY.po b/addons/crm/i18n/es_PY.po
index d44e68b61a2..8da4735695a 100644
--- a/addons/crm/i18n/es_PY.po
+++ b/addons/crm/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-19 13:27+0000\n"
 "Last-Translator: fadel <Unknown>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciativa"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Título"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Acción"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Demora a cerrar"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre etapa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Nombre de la regla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "¡Cuidado!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Planificar otra llamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "No acepta recibir emails"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Departamento"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Respuestas excluidas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secciónes"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campañas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Seleccionar oportunidades"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Departamento"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Socio prospecto"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgstr ""
 "casos de esta etapa sean un éxito."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,15 +439,21 @@ msgstr "Categoría"
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -471,22 +485,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Crear oportunidad"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nombre etapa"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,8 +504,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Resúmen"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Categoría del caso"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "#Llamadas telefónicas"
 msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -660,9 +670,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentación de empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duración en minutos"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -680,9 +690,9 @@ msgid "The name of the segmentation."
 msgstr "El nombre de la segmentación."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -700,13 +710,7 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -719,12 +723,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -761,17 +759,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nombre oportunidad"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Establecer equipo a"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -783,25 +770,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -824,21 +807,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -846,9 +814,9 @@ msgid "Requirements"
 msgstr "Requisitos"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Convertir a oportunidad "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -893,9 +861,9 @@ msgid "Mark Won"
 msgstr "Marcar ganado"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidad (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -920,7 +888,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -930,23 +898,12 @@ msgstr "¡Atención!"
 msgid "Days to Open"
 msgstr "Días para abrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Crear Socio"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Celular"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -972,11 +929,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Reuniones"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -984,6 +936,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Acción siguiente"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1052,14 +1017,6 @@ msgstr "Calcular la segmentación"
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1069,9 +1026,9 @@ msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1131,23 +1088,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ingreso estimado"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1156,8 +1105,19 @@ msgid "September"
 msgstr "Septiembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1189,21 +1149,15 @@ msgid "Opening Date"
 msgstr "Fecha de apertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continuar"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1232,6 +1186,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1241,14 +1201,6 @@ msgstr ""
 "Márquela si quiere utilizar esta pestaña como parte de la regla de "
 "segmentación. Si no se marca, los criterios que contenga serán ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Crear un socio"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1270,17 +1222,12 @@ msgid "unknown"
 msgstr "desconocido"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Socio con  oportunidad"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1289,13 +1236,6 @@ msgstr "Socio con  oportunidad"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1342,6 +1282,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1353,7 +1300,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1397,13 +1344,9 @@ msgstr "Referencias"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1424,14 +1367,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusionar dos oportunidades"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Llamada telefónica a empresa"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1470,6 +1420,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciónes"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1519,6 +1479,12 @@ msgstr "Nombre"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1555,17 +1521,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr "Convertir prospección a empresa"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1602,6 +1557,7 @@ msgstr "Equipo padre"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1610,11 +1566,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En proceso"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1628,11 +1579,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1644,7 +1590,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1697,11 +1643,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nombre del cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Llamada telefónica a oportunidad"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1722,11 +1663,6 @@ msgstr "Oportunidades por etapa"
 msgid "Prospect is converting to business partner"
 msgstr "El prospecto se convierte a socio"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1860,12 +1796,6 @@ msgstr "Referenciado por"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1896,16 +1826,9 @@ msgid "Sales Teams"
 msgstr "Equipos de ventas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Inicaitiva a cliente"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1917,12 +1840,6 @@ msgstr "Equipo"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1934,12 +1851,6 @@ msgstr ""
 msgid "Probability"
 msgstr "Probabilidad"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1955,6 +1866,12 @@ msgstr "Mes"
 msgid "Leads"
 msgstr "Iniciativas"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1966,28 +1883,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Por hacer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2048,24 +1955,6 @@ msgstr "Pendiente"
 msgid "Prospect Opportunity"
 msgstr "Oportunidad de prospección"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2114,17 +2003,15 @@ msgid "Mandatory Expression"
 msgstr "Expresión obligatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Enviar correo"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2154,11 +2041,6 @@ msgstr "Análisis de oportunidades"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expresiones Regulares en el Historial del Caso"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2186,11 +2068,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2202,21 +2079,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicaciones"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2283,7 +2161,6 @@ msgstr "Continuar el proceso"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2365,8 +2242,13 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2374,6 +2256,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2394,26 +2281,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convertir"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2459,6 +2326,11 @@ msgstr ""
 "información de acuerdo a varios criterios y profundizar en la información "
 "añadiendo más grupos al informe."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2490,6 +2362,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2522,6 +2399,24 @@ msgstr "Expresión opcional"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2578,11 +2473,6 @@ msgstr "Creando oportunidades de negocio desde iniciativas"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Establecer categoría"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2627,8 +2517,9 @@ msgid "Qualification"
 msgstr "Calificación"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2647,15 +2538,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurar"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2751,17 +2644,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidad de éxito"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2773,7 +2659,6 @@ msgstr "Casos por equipo de ventas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2782,11 +2667,6 @@ msgstr "Reunión"
 msgid "Category of Case"
 msgstr "Categoría de caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2810,11 +2690,6 @@ msgstr "Calle2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Debería verificar que esta empresa no exista ya."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2833,21 +2708,6 @@ msgstr "Usuario"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociación"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2871,11 +2731,6 @@ msgstr "Contrato"
 msgid "Twitter Ads"
 msgstr "Anuncios Twiter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2887,14 +2742,9 @@ msgid "Planned Revenues"
 msgstr "Ingresos esperados"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Llamada telefónica a llamada telefónica"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2918,16 +2768,10 @@ msgid "Categorization"
 msgstr "Categorización"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reglas de acciones"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2951,7 +2795,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2977,7 +2820,6 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3056,20 +2898,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Horario de trabajo"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Llamadas telefónicas"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3091,7 +2924,7 @@ msgid "Lost"
 msgstr "Perdido"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3139,17 +2972,14 @@ msgid "Phone calls by user and section"
 msgstr "Llamadas telefónicas por usuario y sección"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociación"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Cierre previsto"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3167,10 +2997,10 @@ msgid "Proposition"
 msgstr "Propuesta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Fecha cierre"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3184,6 +3014,11 @@ msgstr "Año"
 msgid "Newsletter"
 msgstr "Boletín de noticias"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3304,6 +3139,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Enlace al socio existente"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expresiones Regulares en el Historial del Caso"
+
 #~ msgid "Convert/Merge Opportunity"
 #~ msgstr "Convertir/Fusionar oportunidad"
 
@@ -3460,9 +3298,15 @@ msgstr ""
 #~ msgid "Days per Periode"
 #~ msgstr "Días por período"
 
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
 #~ msgid "By day"
 #~ msgstr "Por día"
 
+#~ msgid "Set Team to"
+#~ msgstr "Establecer equipo a"
+
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Sincronización del calendario"
 
@@ -3492,10 +3336,16 @@ msgstr ""
 #~ msgid "Add Note"
 #~ msgstr "Añadir nota"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Convertir a oportunidad "
+
 #~ msgid "Gives the sequence order when displaying a list of case stages."
 #~ msgstr ""
 #~ "Indica el orden de secuencia cuando se muestra un lista de etapas de casos."
 
+#~ msgid "Create Partner"
+#~ msgstr "Crear Socio"
+
 #~ msgid "Way to end reccurency"
 #~ msgstr "Forma de terminar recurrencia"
 
@@ -3604,6 +3454,9 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Gestiona un servicio de soporte."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nombre oportunidad"
+
 #~ msgid "  Year  "
 #~ msgstr "  Año  "
 
@@ -3613,6 +3466,9 @@ msgstr ""
 #~ msgid "Fri"
 #~ msgstr "Vie"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Crear un socio"
+
 #~ msgid "crm.lead"
 #~ msgstr "crm.iniciativa"
 
@@ -3628,6 +3484,9 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Lunes"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Socio con  oportunidad"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Resumen oportunidad"
 
@@ -3664,6 +3523,9 @@ msgstr ""
 #~ msgid "Fix amout of times"
 #~ msgstr "Cantidad fija de veces"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fusionar dos oportunidades"
+
 #~ msgid "Current"
 #~ msgstr "Actual"
 
@@ -3718,6 +3580,9 @@ msgstr ""
 #~ "invitación no debe ser únicamente para usuarios de OpenERP, puede ser "
 #~ "igualmente para terceros externos, como un cliente."
 
+#~ msgid "_Convert"
+#~ msgstr "_Convertir"
+
 #~ msgid ""
 #~ "Sales team to which this case belongs to. Defines responsible user and e-"
 #~ "mail address for the mail gateway."
@@ -3794,6 +3659,9 @@ msgstr ""
 #~ msgid "Days"
 #~ msgstr "Días"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Llamada telefónica a oportunidad"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Seleccionar etapas para este equipo de ventas"
 
@@ -3865,6 +3733,13 @@ msgstr ""
 #~ "oportunidades y pedidos de venta mostrados se filtrarán automáticamente de "
 #~ "acuerdo a su equipo."
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "Inicaitiva a cliente"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
@@ -3930,9 +3805,6 @@ msgstr ""
 #~ msgid "Customer Meeting"
 #~ msgstr "Reunión de cliente"
 
-#~ msgid "Send Mail"
-#~ msgstr "Enviar correo"
-
 #~ msgid "CC"
 #~ msgstr "Cc"
 
@@ -4059,6 +3931,9 @@ msgstr ""
 #~ "Si el caso necesita ser revisado entonces en estado se establece a "
 #~ "'Pendiente'."
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Máximo historial de comunicaciones"
+
 #~ msgid "End Date"
 #~ msgstr "Fecha final"
 
@@ -4087,6 +3962,9 @@ msgstr ""
 #~ msgid "My Win/Lost Ratio for the Last Year"
 #~ msgstr "Mi coeficiente ganado/perdido del año anterior"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Llamada telefónica a empresa"
+
 #~ msgid "Set New State To"
 #~ msgstr "Establecer nuevo estado a"
 
@@ -4293,6 +4171,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Configuración de la aplicación CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Establecer categoría"
+
 #~ msgid "Thu"
 #~ msgstr "Jue"
 
@@ -4367,6 +4248,9 @@ msgstr ""
 #~ msgid "Attendees"
 #~ msgstr "Asistentes"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilidad de éxito"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "Informe de iniciativas CRM"
 
@@ -4379,6 +4263,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Categorías de reuniones"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Debería verificar que esta empresa no exista ya."
+
 #~ msgid "Communication & History"
 #~ msgstr "Comunicación e Historial"
 
@@ -4441,6 +4328,9 @@ msgstr ""
 #~ msgid "State of Mind"
 #~ msgstr "Grado de satisfacción"
 
+#~ msgid "Action Rules"
+#~ msgstr "Reglas de acciones"
+
 #~ msgid "Recurrency"
 #~ msgstr "Recurrencia"
 
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index c01ce71f6e6..4a132db1476 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:32+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr "Pealkiri"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Toiming"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Reegel Nimi"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Hoiatus!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Riik"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Jaotised"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Riik"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -385,11 +388,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmenteerimine"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -411,7 +420,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -426,15 +434,21 @@ msgstr "Kategooria"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -466,21 +480,12 @@ msgstr "Staatus"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Loo võimalus"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -494,8 +499,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -516,9 +521,9 @@ msgid "Planned Revenue"
 msgstr "Planeeritud tulu"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Eeldatav tulu"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -554,6 +559,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -564,11 +574,6 @@ msgstr "Juhtumi Kategooria"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -591,6 +596,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -652,8 +662,8 @@ msgid "Partner Segmentation"
 msgstr "Partneri Segmenteerimine"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -672,9 +682,9 @@ msgid "The name of the segmentation."
 msgstr "Segmenteerimise Nimi."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Tõenäosus (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -692,13 +702,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -711,12 +715,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Võimalus"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -753,17 +751,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -775,25 +762,21 @@ msgid "Exclusive"
 msgstr "Eksklusiivne"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -816,21 +799,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -838,8 +806,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -885,9 +853,9 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Tõenäosus (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -912,7 +880,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Ettevaatust !"
@@ -922,23 +890,12 @@ msgstr "Ettevaatust !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Loo partner"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobiil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -964,11 +921,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Koosolekud"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Juhtumi väljade olukord"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -976,6 +928,19 @@ msgstr "Juhtumi väljade olukord"
 msgid "Next Action"
 msgstr "Järgmine Toiming"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Mustand"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1044,14 +1009,6 @@ msgstr "Arvuta Segmenteerimine"
 msgid "Lowest"
 msgstr "Madalaim"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1061,9 +1018,9 @@ msgid "Creation Date"
 msgstr "Loomise Kuupäev"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1123,23 +1080,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Eeldatav tulu"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1148,8 +1097,19 @@ msgid "September"
 msgstr "September"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1181,8 +1141,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1190,12 +1150,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Jätka"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1222,6 +1176,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1231,14 +1191,6 @@ msgstr ""
 "Märgista see, kui sa tahad kasutada seda kaarti segmenteerimisreegli osana. "
 "Kui pole märgistatud siis allolevat kriteeriumi ignoreeritakse."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1260,15 +1212,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1279,13 +1226,6 @@ msgstr ""
 msgid "Date"
 msgstr "Kuupäev"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1332,6 +1272,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1343,7 +1290,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1387,13 +1334,9 @@ msgstr "Viited"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Loobu"
@@ -1414,13 +1357,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1460,6 +1410,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Jaotised"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1504,6 +1464,12 @@ msgstr "Nimi"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1540,17 +1506,6 @@ msgstr "Kõrge"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1587,6 +1542,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1595,11 +1551,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Töös"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1613,11 +1564,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1629,7 +1575,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1682,11 +1628,6 @@ msgstr "Väärtus"
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1707,11 +1648,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr "Perspektiiv konverditakse äripartneriks"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1845,11 +1781,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1880,17 +1811,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmenteerimine"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1901,12 +1825,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1918,12 +1836,6 @@ msgstr "Ära hoia"
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1939,6 +1851,12 @@ msgstr "Kuu"
 msgid "Leads"
 msgstr "Algatused"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1950,28 +1868,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2032,24 +1940,6 @@ msgstr "Pooleliolev"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2098,17 +1988,15 @@ msgid "Mandatory Expression"
 msgstr "Kohustuslik avaldis"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Saada kiri"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2138,11 +2026,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2170,11 +2053,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Vastutav"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2186,14 +2064,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2201,6 +2073,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2267,7 +2146,6 @@ msgstr "Jätka protsessi"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2349,8 +2227,13 @@ msgid "Company"
 msgstr "Ettevõte"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Töös"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2358,6 +2241,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2378,26 +2266,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2439,6 +2307,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2470,6 +2343,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Kinnitatud"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2502,6 +2380,24 @@ msgstr "Valikuline avaldis"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2554,11 +2450,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2603,8 +2494,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2623,14 +2515,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "August"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2724,17 +2618,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Edu tõenäosus"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Mustand"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2746,7 +2633,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Kohtumine"
 
@@ -2755,11 +2641,6 @@ msgstr "Kohtumine"
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2783,11 +2664,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Võibolla pead veenduma kas see partner juba ei eksisteri."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2806,21 +2682,6 @@ msgstr "Kasutaja"
 msgid "November"
 msgstr "November"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2844,11 +2705,6 @@ msgstr "Leping"
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2860,13 +2716,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2891,16 +2742,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2924,7 +2769,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2950,7 +2794,6 @@ msgid "Description"
 msgstr "Kirjeldus"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3029,20 +2872,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3064,7 +2898,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3112,16 +2946,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3140,9 +2971,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3157,6 +2988,11 @@ msgstr "Aasta"
 msgid "Newsletter"
 msgstr "Infoleht"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3570,6 +3406,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Partneri sündmused"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Juhtumi väljade olukord"
+
 #~ msgid "New "
 #~ msgstr "Uus "
 
@@ -3790,9 +3629,15 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Partner on juba määratletud selle telefonikõne."
 
+#~ msgid "Continue"
+#~ msgstr "Jätka"
+
 #~ msgid "Message"
 #~ msgstr "Sõnum"
 
+#~ msgid "Create Partner"
+#~ msgstr "Loo partner"
+
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Juhtumi kirjeldus"
 
@@ -3836,9 +3681,6 @@ msgstr ""
 #~ msgid "Customer Meeting"
 #~ msgstr "Kohtumine kliendiga"
 
-#~ msgid "Send Mail"
-#~ msgstr "Saada kiri"
-
 #~ msgid "Claims"
 #~ msgstr "Nõuded"
 
@@ -3867,8 +3709,14 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Müügimees"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Võibolla pead veenduma kas see partner juba ei eksisteri."
+
 #~ msgid "Schedule Phone Call"
 #~ msgstr "Planeeri telefonikõne"
 
+#~ msgid "Success Probability"
+#~ msgstr "Edu tõenäosus"
+
 #~ msgid "CC"
 #~ msgstr "Koopia"
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 162dbc0a99f..6afc45bf5b1 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-12 15:26+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Liidi"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Otsikko"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Toiminto"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Valitse mahdollisuudet"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Viive sulkemiseen"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Vaiheen nimi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "CRM Liidi analyysi"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Säännön nimi"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Varoitus!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Aikatauluta muu soitto"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Jättäydy pois"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Tila"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Poissuljetut vastaukset:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Osiot"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Liidi analyysi"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kamppanjat"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Valitse mahdollisuudet"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Tila"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Ehdokaskumppani"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentointi"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -414,7 +423,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -429,15 +437,21 @@ msgstr "Kategoria"
 msgid "#Opportunities"
 msgstr "Mahdollisuuksien määrä"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -469,22 +483,13 @@ msgstr "Tila"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Luo mahdollisuus"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Elokuu"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Vaiheen nimi"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Konfiguroi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -497,8 +502,8 @@ msgid "Mailings"
 msgstr "Postitukset"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -519,9 +524,9 @@ msgid "Planned Revenue"
 msgstr "Suunniteltu tuotto"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Odotettu tuotto"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -557,6 +562,11 @@ msgstr "Yhteenveto"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -567,11 +577,6 @@ msgstr "Asiakategoria"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -594,6 +599,11 @@ msgstr "Puhelujen määrä"
 msgid "The code of the sales team must be unique !"
 msgstr "Myyntitiimin koodin tulee olla uniikki !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -657,9 +667,9 @@ msgid "Partner Segmentation"
 msgstr "Kumppanijaottelu"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Kesto minuuttia"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -677,9 +687,9 @@ msgid "The name of the segmentation."
 msgstr "Jaottelun nimi"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Todennäköisyys (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -697,13 +707,7 @@ msgid "Statistics Dashboard"
 msgstr "Tilastojen työpöytä"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -716,12 +720,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Mahdollisuus"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -758,17 +756,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Mahdollisuuden nimi"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Aseta tiimiksi"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -780,25 +767,21 @@ msgid "Exclusive"
 msgstr "Poissulkeva"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -821,21 +804,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -843,9 +811,9 @@ msgid "Requirements"
 msgstr "vaatimukset"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Muunna mahdollisuudeksi "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postinumero"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -890,9 +858,9 @@ msgid "Mark Won"
 msgstr "Merkitse voitetuksi"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Todennäköisyys (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -917,7 +885,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Varoitus!"
@@ -927,23 +895,12 @@ msgstr "Varoitus!"
 msgid "Days to Open"
 msgstr "Päiviä avaamiseen"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Luo kumppani"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -969,11 +926,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Kokoukset"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Tapahtumakenttien tilat"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -981,6 +933,19 @@ msgstr "Tapahtumakenttien tilat"
 msgid "Next Action"
 msgstr "Seuraava Toimenpide"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1049,14 +1014,6 @@ msgstr "Laske segmentointi"
 msgid "Lowest"
 msgstr "Alin"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1066,9 +1023,9 @@ msgid "Creation Date"
 msgstr "Luontipäivämäärä"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1128,23 +1085,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Odotettu tuotto"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1153,8 +1102,19 @@ msgid "September"
 msgstr "Syyskuu"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1186,21 +1146,15 @@ msgid "Opening Date"
 msgstr "Avauspäivä"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Kesto minuuttia"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "jatka"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1229,6 +1183,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1238,14 +1198,6 @@ msgstr ""
 "Laita täppä päälle jos haluat käyttää tätä välilehteä osana "
 "segmentointisääntöä. Jos ei päällä kriteriat alapuolella ohitetaan."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Luo kumppani"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1267,17 +1219,12 @@ msgid "unknown"
 msgstr "Tuntematon"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Mahdollisuuteen liittyvä kumppani"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1286,13 +1233,6 @@ msgstr "Mahdollisuuteen liittyvä kumppani"
 msgid "Date"
 msgstr "Päiväys"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1339,6 +1279,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1350,7 +1297,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1394,13 +1341,9 @@ msgstr "Viittaukset"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Peruuta"
@@ -1421,14 +1364,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Yhdistä kaksi mahdollisuutta"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Soitto kumppanille"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1467,6 +1417,16 @@ msgstr "Liidit/mahdollisuudet jotka ovat avoimessa tilassa"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Osiot"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1511,6 +1471,12 @@ msgstr "Nimi"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Päättymispäivä"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1547,17 +1513,6 @@ msgstr "Suuri"
 msgid "Convert to prospect to business partner"
 msgstr "Muunna ehdokas liiketoimintakumppaniksi"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1594,6 +1549,7 @@ msgstr "Ylätason tiimi"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1602,11 +1558,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Seuraava toiminnon päivä"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Käynnissä"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1620,11 +1571,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postinumero"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1636,7 +1582,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1689,11 +1635,6 @@ msgstr "Arvo"
 msgid "Customer Name"
 msgstr "Asiakkaan nimi"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Soitoista mahdollisuuksiksi"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1714,11 +1655,6 @@ msgstr "Mahdollisuudet vaiheittain"
 msgid "Prospect is converting to business partner"
 msgstr "Ehdokas on muuttumassa liiketoimintakumppaniksi"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1852,12 +1788,6 @@ msgstr "Viittaaja"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tyyppiä käytetään erottamaan mahdollisuudet ja myyntimahdollisuudet"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Oletko varma että haluat luoda kumppanin perustuen tähän puhelinsoittoon ?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1888,16 +1818,9 @@ msgid "Sales Teams"
 msgstr "Myyntitiimit"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Liidistä kumppaniksi"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentointi"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1909,12 +1832,6 @@ msgstr "Tiimi"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Liidit/Mahdollisuudet jotka ovat tilassa Uusi"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1926,12 +1843,6 @@ msgstr "Ei pidätetty"
 msgid "Probability"
 msgstr "Todennäköisyys"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1947,6 +1858,12 @@ msgstr "Kuukausi"
 msgid "Leads"
 msgstr "Liidit"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1958,28 +1875,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Tehtävät"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2040,24 +1947,6 @@ msgstr "Odottaa"
 msgid "Prospect Opportunity"
 msgstr "Mahdollinen mahdollisuus"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2106,17 +1995,15 @@ msgid "Mandatory Expression"
 msgstr "Pakollinen Määritelmä"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Lähetä sähköpostia"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2146,11 +2033,6 @@ msgstr "Mahdollisuuksien analyysi"
 msgid "Misc"
 msgstr "Sekalaiset"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Säännöllinen lauseke tilannehistoriassa"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2178,11 +2060,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Vastuullinen"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2194,21 +2071,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Suurin kommunikointihistoria"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2275,7 +2153,6 @@ msgstr "Jatka prosessia"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2357,8 +2234,13 @@ msgid "Company"
 msgstr "Yritys"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Käynnissä"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2366,6 +2248,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Liidit joilla ei ole vastuuhenkilöä"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2386,26 +2273,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Muunna"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2447,6 +2314,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2478,6 +2350,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Vahvistettu"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2510,6 +2387,24 @@ msgstr "Lisämääritys"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2562,11 +2457,6 @@ msgstr "Bisnesmahdollisuuksien luonti liideistä."
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Aseta kategoriaksi"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2611,8 +2501,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2631,15 +2522,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Elokuu"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Konfiguroi"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2735,17 +2628,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Onnistunut mahdollisuus"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Luonnos"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2757,7 +2643,6 @@ msgstr "Tapaukset myyntitiimeittäin"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Kokous"
 
@@ -2766,11 +2651,6 @@ msgstr "Kokous"
 msgid "Category of Case"
 msgstr "Tapauksen kategoria"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2794,11 +2674,6 @@ msgstr "Katuosoite2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Sinun täytyy varmistaa ettei tämä kumppani ole jo olemassa."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2817,21 +2692,6 @@ msgstr "Käyttäjä"
 msgid "November"
 msgstr "Marraskuu"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Neuvottelu"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2855,11 +2715,6 @@ msgstr "Sopimus"
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2871,15 +2726,10 @@ msgid "Planned Revenues"
 msgstr "Suunniteltu liikevaihto"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Puhelusta puheluun"
-
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
@@ -2902,16 +2752,10 @@ msgid "Categorization"
 msgstr "Kategorisointi"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Toimintosäännöt"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2935,7 +2779,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2961,7 +2804,6 @@ msgid "Description"
 msgstr "Kuvaus"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3040,20 +2882,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Työtunnit"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Puhelinsoitot"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Asiakas"
 
@@ -3075,7 +2908,7 @@ msgid "Lost"
 msgstr "Hävitty"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3123,17 +2956,14 @@ msgid "Phone calls by user and section"
 msgstr "Puhelinsoitot käyttäjittäin ja osastoittain"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Neuvottelu"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr ""
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Puhelusta puheluun"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3151,10 +2981,10 @@ msgid "Proposition"
 msgstr "Ehdotus"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Päättymispäivä"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Puhelinsoitot"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3168,6 +2998,11 @@ msgstr "Vuosi"
 msgid "Newsletter"
 msgstr "Uutiskirje"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3309,6 +3144,9 @@ msgstr ""
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(tapahtuma_kuvaus) = Tapahtuma kuvaus"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Tapahtumakenttien tilat"
+
 #~ msgid "Maximim Priority"
 #~ msgstr "Korkein tärkeys"
 
@@ -3584,6 +3422,9 @@ msgstr ""
 #~ msgid "All Pending "
 #~ msgstr "Kaikki odottavat "
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Suurin kommunikointihistoria"
+
 #~ msgid "Set priority to"
 #~ msgstr "Aseta prioriteetti"
 
@@ -3684,6 +3525,9 @@ msgstr ""
 #~ "täytettyihin kenttiin, jotta sääntö voi suorittaa toiminnon, joka on kuvattu "
 #~ "\"Toiminnot\" -välilehdellä."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Säännöllinen lauseke tilannehistoriassa"
+
 #~ msgid "Communication"
 #~ msgstr "Viestintä"
 
@@ -3717,6 +3561,9 @@ msgstr ""
 #~ msgid "Set state to"
 #~ msgstr "Aseta tilaksi"
 
+#~ msgid "Continue"
+#~ msgstr "jatka"
+
 #~ msgid "Message"
 #~ msgstr "Viesti"
 
@@ -3735,6 +3582,9 @@ msgstr ""
 #~ msgid "Trigger Date"
 #~ msgstr "Laukaisupäivämäärä"
 
+#~ msgid "Create Partner"
+#~ msgstr "Luo kumppani"
+
 #~ msgid "Rules"
 #~ msgstr "Säännöt"
 
@@ -3843,9 +3693,6 @@ msgstr ""
 #~ msgid "cancel"
 #~ msgstr "Peruuta"
 
-#~ msgid "Send Mail"
-#~ msgstr "Lähetä sähköpostia"
-
 #~ msgid "Claims"
 #~ msgstr "Vaateet"
 
@@ -3876,9 +3723,15 @@ msgstr ""
 #~ msgid "Calendar"
 #~ msgstr "Kalenteri"
 
+#~ msgid "Success Probability"
+#~ msgstr "Onnistunut mahdollisuus"
+
 #~ msgid "Salesman"
 #~ msgstr "Myyjä"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Sinun täytyy varmistaa ettei tämä kumppani ole jo olemassa."
+
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr ""
@@ -4060,6 +3913,9 @@ msgstr ""
 #~ msgid "Add Note"
 #~ msgstr "Lisää huomautus"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Muunna mahdollisuudeksi "
+
 #~ msgid "Way to end reccurency"
 #~ msgstr "Toiston lopettaminen"
 
@@ -4162,18 +4018,30 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Hallinnoi helpdesk palvelua."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Mahdollisuuden nimi"
+
 #~ msgid "Write Date"
 #~ msgstr "Kirjoita päiväys"
 
 #~ msgid "Monday"
 #~ msgstr "Maanantai"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Luo kumppani"
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Mahdollisuuteen liittyvä kumppani"
+
 #~ msgid "End of recurrency"
 #~ msgstr "Toiston loppu"
 
 #~ msgid "Frequency"
 #~ msgstr "Tiheys"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Yhdistä kaksi mahdollisuutta"
+
 #~ msgid "Fix amout of times"
 #~ msgstr "Korjaa aikojen määrät"
 
@@ -4212,6 +4080,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Lauantai"
 
+#~ msgid "_Convert"
+#~ msgstr "_Muunna"
+
 #~ msgid "Wizard"
 #~ msgstr "Velho"
 
@@ -4239,6 +4110,9 @@ msgstr ""
 #~ msgid "Free"
 #~ msgstr "Vapaa"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Soitoista mahdollisuuksiksi"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Valitse vaiheet tälle myyntitiimille"
 
@@ -4276,6 +4150,10 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Toista x kertaa"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Oletko varma että haluat luoda kumppanin perustuen tähän puhelinsoittoon ?"
+
 #~ msgid ""
 #~ "This property defines the list of date/time exceptions for a recurring "
 #~ "calendar component."
@@ -4283,6 +4161,9 @@ msgstr ""
 #~ "Tämä ominaisuus määrittelee poikkeusajankohdat toistuville "
 #~ "kalenterikomponenteille."
 
+#~ msgid "Set Team to"
+#~ msgstr "Aseta tiimiksi"
+
 #, python-format
 #~ msgid "The case '%s' has been opened."
 #~ msgstr "Tapaus '%s' on avattu"
@@ -4395,6 +4276,9 @@ msgstr ""
 #~ msgid "Sales Dashboard"
 #~ msgstr "Myynnin työpöytä"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Soitto kumppanille"
+
 #~ msgid "Set New State To"
 #~ msgstr "Aseta uudeksi tilaksi"
 
@@ -4480,6 +4364,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "CRM ohjelmiston konfiguraatio"
 
+#~ msgid "Set Category to"
+#~ msgstr "Aseta kategoriaksi"
+
 #~ msgid "Thu"
 #~ msgstr "To"
 
@@ -4555,6 +4442,9 @@ msgstr ""
 #~ msgid "Thursday"
 #~ msgstr "Torstai"
 
+#~ msgid "Action Rules"
+#~ msgstr "Toimintosäännöt"
+
 #~ msgid "Recurrency"
 #~ msgstr "Toistuvuus"
 
@@ -4762,6 +4652,9 @@ msgstr ""
 #~ msgid "Leads/Opportunities created in current year"
 #~ msgstr "Liidit/Mahdollisuudet jotka on luotu kuluvana vuonna"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Liidistä kumppaniksi"
+
 #~ msgid ""
 #~ "Track from where is coming your leads and opportunities by creating specific "
 #~ "channels that will be maintained at the creation of a document in the "
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 847ca97051c..8db4d1cc51f 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-18 23:02+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 19:12+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
@@ -31,11 +31,13 @@ msgstr ""
 "pistes à partir de courriels entrant."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Piste"
 
@@ -45,22 +47,30 @@ msgid "Title"
 msgstr "Titre"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Action"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
-"L'appel téléphonique lié à l'opportunité <em>%s</em> a été créé et planifié "
-"à <em>%s</em>."
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Sélectionnez des opportunités"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -68,11 +78,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Gérer les levées de fonds"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Convertir en opportunités"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -80,10 +85,10 @@ msgid "Delay to close"
 msgstr "Délai pour clôturer"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "La piste a été <b>convertie en opportunité</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nom de l'étape"
 
 #. module: crm
 #: view:crm.lead:0
@@ -98,11 +103,6 @@ msgstr "Vendeur"
 msgid "CRM Lead Analysis"
 msgstr "Analyse des pistes CRM"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Rappel de la piste: [[object.id]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -148,6 +148,12 @@ msgstr "Jour de création"
 msgid "Rule Name"
 msgstr "Nom de la règle"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -176,10 +182,12 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Gère l'historique de \"Chatter\" (nombre de messages, ...). Cet historique "
+"est au format HTML pour permettre son utilisation dans la vue kanban"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Avertissement !"
@@ -206,7 +214,7 @@ msgid "Schedule Other Call"
 msgstr "Planifier un autre appel"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -218,9 +226,14 @@ msgid "Opt-Out"
 msgstr "Retirer des campagnes marketing"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Cacher dans les vues si vide"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "État"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -238,9 +251,9 @@ msgid "Excluded Answers :"
 msgstr "Réponses exclues :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -250,10 +263,10 @@ msgid "Leads Analysis"
 msgstr "Analyse des pistes"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s un appel</b>pour <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -261,16 +274,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campagnes"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Sélectionnez des opportunités"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "État"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -294,7 +297,7 @@ msgid "Prospect Partner"
 msgstr "Prospect"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Pas de sujet"
@@ -382,7 +385,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 msgid "Dead"
-msgstr ""
+msgstr "Perdu"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -392,11 +395,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentation"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Lier à un client existant"
 
@@ -420,7 +429,6 @@ msgstr ""
 "niveau devienne un succès"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -435,6 +443,13 @@ msgstr "Catégorie"
 msgid "#Opportunities"
 msgstr "Nb. d'opportunités"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
@@ -442,10 +457,9 @@ msgstr ""
 "Pistes qui sont assignées à l'une des équipes de vente que je gère, ou à moi"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Action de conversion"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Courriel du contact du partenaire"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -476,22 +490,13 @@ msgstr "État"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Créer une opportunité"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Août"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nom de l'étape"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurer"
 
 #. module: crm
 #: view:crm.lead:0
@@ -504,9 +509,9 @@ msgid "Mailings"
 msgstr "Publipostages"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "À faire"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -526,9 +531,9 @@ msgid "Planned Revenue"
 msgstr "Revenu prévu"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "Appel téléphonique CRM : marquer comme lu"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Revenu estimé"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -564,6 +569,11 @@ msgstr "Résumé"
 msgid "Merge"
 msgstr "Fusionner"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr "Opportunité ${object.name | h})"
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -574,11 +584,6 @@ msgstr "Catégorie des cas"
 msgid "Partner Contact Name"
 msgstr "Nom du contact chez le partenaire"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "Appel téléphonique CRM : Marquer comme non lu"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -603,6 +608,11 @@ msgstr "Nb. d'appels téléphoniques"
 msgid "The code of the sales team must be unique !"
 msgstr "Le code de l'équipe de vente doit être unique !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Adresse courriel du contact"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -667,9 +677,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentation du partenaire"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Durée en minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Devise"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -687,9 +697,9 @@ msgid "The name of the segmentation."
 msgstr "Le nom de la segmentation"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Pistes des USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilité (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -708,13 +718,7 @@ msgid "Statistics Dashboard"
 msgstr "Tableau de bord de statistiques"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "État changé à <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -727,12 +731,6 @@ msgstr "État changé à <b>%s</b>."
 msgid "Opportunity"
 msgstr "Opportunité"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Un rendez-vous a été <b>planifié</b> à <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -756,7 +754,7 @@ msgstr "Arrêter le processus"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -771,17 +769,6 @@ msgstr ""
 "Pistes/opportunités qui sont assignées à l'une des équipes de vente que je "
 "gère"
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nom de l'opportunité"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Attribuer à l'équipe"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -793,25 +780,21 @@ msgid "Exclusive"
 msgstr "Sélection exclusive"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "De %s: %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Année de création"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Convertir en opportunités"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "ou"
@@ -834,21 +817,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -856,9 +824,9 @@ msgid "Requirements"
 msgstr "Pré-requis"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Convertir en opportunité "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Code postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -903,9 +871,9 @@ msgid "Mark Won"
 msgstr "Marquer comme gagné"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilité (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Pistes des USA"
 
 #. module: crm
 #: view:crm.lead:0
@@ -930,7 +898,7 @@ msgid "Send Email"
 msgstr "Envoyer un courriel"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -940,23 +908,12 @@ msgstr "Avertissement !"
 msgid "Days to Open"
 msgstr "Jours pour ouvrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Créer un partenaire"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Téléphone mobile"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -984,11 +941,6 @@ msgstr "Utlilisé pour calculer les jours ouvrables"
 msgid "Meetings"
 msgstr "Rendez-vous"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condition sur le champ du cas"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -996,6 +948,19 @@ msgstr "Condition sur le champ du cas"
 msgid "Next Action"
 msgstr "Prochaine action"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr "<b>Les partenaire</b> à été positionné  à <em>%s</em>."
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1064,14 +1029,6 @@ msgstr "Calculer la segmentation"
 msgid "Lowest"
 msgstr "Très basse"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1081,10 +1038,10 @@ msgid "Creation Date"
 msgstr "Date de création"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr "Piste <b>convertie en opportunité</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1146,23 +1103,15 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Revenu estimé"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1171,9 +1120,20 @@ msgid "September"
 msgstr "Septembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Adresse courriel du contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1192,7 +1152,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
@@ -1206,21 +1166,15 @@ msgid "Opening Date"
 msgstr "Date d'ouverture"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Devise"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Durée en minutes"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nom du canal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continuer"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1251,6 +1205,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1261,14 +1221,6 @@ msgstr ""
 "la règle de segmentation. Si cette case n'est pas cochée, le critère en "
 "dessous sera ignoré."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Créer un partenaire"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1290,18 +1242,11 @@ msgid "unknown"
 msgstr "inconnu"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-"Les abonnés de cette équipe de vente suivent automatiquement toutes les "
-"opportunités relatives à cette équipe de vente."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partenaire de l'opportunité"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Est abonné"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1311,13 +1256,6 @@ msgstr "Partenaire de l'opportunité"
 msgid "Date"
 msgstr "Date"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Est abonné"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1366,6 +1304,13 @@ msgstr ""
 "Lors de l'envoi de courriels, l'adresse de courriel par défaut est celle de "
 "l'équipe de vente."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1377,7 +1322,7 @@ msgid "Lead Description"
 msgstr "Description de la piste"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Opportunités fusionnées"
@@ -1421,13 +1366,9 @@ msgstr "Références"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Annuler"
@@ -1448,14 +1389,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Pistes/opportunités en attente"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusionner deux opportunités"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "À faire"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Appel téléphonique au partenaire"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1494,6 +1442,16 @@ msgstr "Pistes/opportunités en statut \"ouvert\""
 msgid "Users"
 msgstr "Utilisateurs"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sections"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1543,6 +1501,12 @@ msgstr "Nom du segment"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Pistes/opportunités m'étant assignées"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Date de clôture"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1579,18 +1543,6 @@ msgstr "Haute"
 msgid "Convert to prospect to business partner"
 msgstr "Convertir un prospect en client"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-"Appels téléphoniques m'étant assignés ou l'étant à mon ou mes équipes"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1627,6 +1579,7 @@ msgstr "Équipe parente"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Ne pas lier à un client"
 
@@ -1635,11 +1588,6 @@ msgstr "Ne pas lier à un client"
 msgid "Next Action Date"
 msgstr "Date de la prochaine action"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En cours"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1653,11 +1601,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Assigner les opportunités à"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Code postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1669,7 +1612,7 @@ msgid "Month of call"
 msgstr "Mois de l'appel"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1726,11 +1669,6 @@ msgstr "Valeur"
 msgid "Customer Name"
 msgstr "Nom du client"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Appel téléphonique pour une opportunité"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1751,11 +1689,6 @@ msgstr "Opportunités par étape"
 msgid "Prospect is converting to business partner"
 msgstr "Le prospect est converti en partenaire"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "Piste CRM : marquer comme non lue"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1889,13 +1822,6 @@ msgstr "Référent"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Le type est utilisé pour différencier les pistes des opportunités"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Êtes-vous sûr de vouloir créer un partenaire à partir de cet appel "
-"téléphonique ?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1926,16 +1852,9 @@ msgid "Sales Teams"
 msgstr "Équipes commerciales"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Conversion d'une piste en partenaire"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1947,12 +1866,6 @@ msgstr "Équipe"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Pistes/opportunités dans l'état \"Nouveau\""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1964,12 +1877,6 @@ msgstr "Non conclu"
 msgid "Probability"
 msgstr "Probabilité"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Veuillez sélectionner plus d'une opportunité sur la vue en liste"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1985,10 +1892,16 @@ msgstr "Mois"
 msgid "Leads"
 msgstr "Pistes"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Concevoir"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -1996,28 +1909,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr "Fusionner avec les opportunités existantes"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "À faire"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2080,24 +1983,6 @@ msgstr "En attente"
 msgid "Prospect Opportunity"
 msgstr "Opportunité prospect"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2146,18 +2031,16 @@ msgid "Mandatory Expression"
 msgstr "Expression obligatoire"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Créer un nouveau client"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Envoyer un courriel"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr ""
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Créer un nouveau client"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2186,11 +2069,6 @@ msgstr "Analyse des opportunités"
 msgid "Misc"
 msgstr "Divers"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expression régulière sur l'historique du cas"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2218,11 +2096,6 @@ msgstr "Appel fait"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Rappel au client"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2234,21 +2107,22 @@ msgid "Product"
 msgstr "Article"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Limite Maximale de l'Historique de communication"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Année de création"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Options de conversion"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2319,7 +2193,6 @@ msgstr "Continuer le processus"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Convertir en opportunité"
 
@@ -2401,8 +2274,13 @@ msgid "Company"
 msgstr "Société"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En cours"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2410,6 +2288,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Pistes non assignées"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2431,26 +2314,6 @@ msgstr "Réinitialiser"
 msgid "After-Sale Services"
 msgstr "Services après vente"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convertir"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2496,6 +2359,11 @@ msgstr ""
 "filtrer les informations en fonction de plusieurs critères et extraire les "
 "informations, en ajoutant plus de groupes dans le rapport."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2527,6 +2395,11 @@ msgstr "Sélectionner pistes/opportunités"
 msgid "Confirmed"
 msgstr "Confirmée"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2559,6 +2432,24 @@ msgstr "Expression facultative"
 msgid "Followers"
 msgstr "Abonnés"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2615,11 +2506,6 @@ msgstr "Créer des opportunités d'affaires à partir des pistes."
 msgid "Email Campaign - Products"
 msgstr "Campagne courriel - articles"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Passer la catégorie à"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2664,9 +2550,10 @@ msgid "Qualification"
 msgstr "Qualification"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Courriel du contact du partenaire"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Action de conversion"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2695,15 +2582,17 @@ msgstr ""
 "            "
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Un partenaire est déjà défini."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Août"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurer"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2799,17 +2688,10 @@ msgid "Logged Calls"
 msgstr "Appels consignés"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilité de succès"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Brouillon"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2821,7 +2703,6 @@ msgstr "Cas par équipes commerciales"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Rendez-vous"
 
@@ -2830,11 +2711,6 @@ msgstr "Rendez-vous"
 msgid "Category of Case"
 msgstr "Catégorie de cas"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Opportunité / client"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2858,11 +2734,6 @@ msgstr "Rue 2"
 msgid "Manage Helpdesk and Support"
 msgstr "Gérer l'assitance et le support"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Vous devriez vérifier que ce partenaire n'existe pas déjà."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2881,21 +2752,6 @@ msgstr "Utilisateur"
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaires et courriels"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Négociation"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2919,11 +2775,6 @@ msgstr "Contrat"
 msgid "Twitter Ads"
 msgstr "Publicités Twitter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Commun à toutes les équipes"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2935,14 +2786,9 @@ msgid "Planned Revenues"
 msgstr "Revenus planifiés"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "Piste CRM : marquer comme lu"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Appel téléphonique à appel téléphonique"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Clôture prév."
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2966,16 +2812,10 @@ msgid "Categorization"
 msgstr "Catégorisation"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Consigner l'appel"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Règles d'action"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2999,7 +2839,6 @@ msgstr "Date de création"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "à"
 
@@ -3025,7 +2864,6 @@ msgid "Description"
 msgstr "Description"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3104,20 +2942,11 @@ msgstr "Revenir à 'à faire'"
 msgid "Working Hours"
 msgstr "Heures de travail"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Appels téléphoniques"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
@@ -3139,7 +2968,7 @@ msgid "Lost"
 msgstr "Perdu"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3188,17 +3017,14 @@ msgid "Phone calls by user and section"
 msgstr "Appels téléphoniques par utilisateur et par section"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Négociation"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Clôture prév."
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Appel téléphonique à appel téléphonique"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3216,10 +3042,10 @@ msgid "Proposition"
 msgstr "Proposition"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Date de clôture"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Appels téléphoniques"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3233,6 +3059,11 @@ msgstr "Année"
 msgid "Newsletter"
 msgstr "Lettre d'information"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3414,6 +3245,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Évènements partenaire"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condition sur le champ du cas"
+
 #~ msgid "Case Communication History"
 #~ msgstr "Historique de la communication"
 
@@ -3861,6 +3695,9 @@ msgstr ""
 #~ "Impossible d'envoyer un courriel vide, le corps du courriel doit comporter "
 #~ "du texte"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Limite Maximale de l'Historique de communication"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Des mots clés spéciaux peuvent être utilisés dans le corps"
 
@@ -3877,6 +3714,9 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Un partenaire est déjà défini pour cette conférence téléphonique"
 
+#~ msgid "Continue"
+#~ msgstr "Continuer"
+
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
@@ -3887,6 +3727,9 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "Message"
 
+#~ msgid "Create Partner"
+#~ msgstr "Créer un partenaire"
+
 #~ msgid "My Meetings"
 #~ msgstr "Mes rendez vous"
 
@@ -3947,9 +3790,6 @@ msgstr ""
 #~ msgid "Internal Meeting"
 #~ msgstr "Rendez vous interne"
 
-#~ msgid "Send Mail"
-#~ msgstr "Envoyer un courriel"
-
 #~ msgid "Claims"
 #~ msgstr "Réclamations"
 
@@ -3962,6 +3802,9 @@ msgstr ""
 #~ msgid "Helpdesk"
 #~ msgstr "Support"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nom de l'opportunité"
+
 #~ msgid "Invalid arguments"
 #~ msgstr "Arguments non valides"
 
@@ -3977,6 +3820,9 @@ msgstr ""
 #~ msgid "CC"
 #~ msgstr "CC"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expression régulière sur l'historique du cas"
+
 #~ msgid "Show as"
 #~ msgstr "Montrer comme"
 
@@ -4161,9 +4007,15 @@ msgstr ""
 #~ msgid "Write Date"
 #~ msgstr "Date d'écriture"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Créer un partenaire"
+
 #~ msgid "Monday"
 #~ msgstr "Lundi"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partenaire de l'opportunité"
+
 #~ msgid "Frequency"
 #~ msgstr "Fréquence"
 
@@ -4199,6 +4051,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Samedi"
 
+#~ msgid "_Convert"
+#~ msgstr "_Convertir"
+
 #~ msgid "Wizard"
 #~ msgstr "Assistant"
 
@@ -4214,6 +4069,9 @@ msgstr ""
 #~ msgid "Synchronization"
 #~ msgstr "Synchronisation"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Appel téléphonique pour une opportunité"
+
 #~ msgid "crm.phonecall"
 #~ msgstr "crm.phonecall"
 
@@ -4300,6 +4158,9 @@ msgstr ""
 #~ msgid "Reply To"
 #~ msgstr "Répondre à"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Appel téléphonique au partenaire"
+
 #~ msgid "Set New State To"
 #~ msgstr "Passer le nouvel état à"
 
@@ -4353,6 +4214,9 @@ msgstr ""
 #~ msgid "Need Information"
 #~ msgstr "A besoin d'information"
 
+#~ msgid "Set Category to"
+#~ msgstr "Passer la catégorie à"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mois -1    "
 
@@ -4380,6 +4244,9 @@ msgstr ""
 #~ msgid "Contacts"
 #~ msgstr "Contacts"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilité de succès"
+
 #~ msgid "From"
 #~ msgstr "De"
 
@@ -4392,6 +4259,9 @@ msgstr ""
 #~ msgid "Thursday"
 #~ msgstr "Jeudi"
 
+#~ msgid "Action Rules"
+#~ msgstr "Règles d'action"
+
 #~ msgid "_Add"
 #~ msgstr "_Ajouter"
 
@@ -4468,6 +4338,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been won."
 #~ msgstr "L'opportunité \"%s\" a été gagnée."
 
+#~ msgid "Set Team to"
+#~ msgstr "Attribuer à l'équipe"
+
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Synchronisation de calendrier"
 
@@ -4482,6 +4355,9 @@ msgstr ""
 #~ "Cette propriété définit la liste des exceptions (date/heures) pour un "
 #~ "élément récurrent du calendrier."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Convertir en opportunité "
+
 #~ msgid "Show time as"
 #~ msgstr "Afficher l'heure en"
 
@@ -4530,6 +4406,9 @@ msgstr ""
 #~ "Partenaire facultatif, en général précisé après la conversion de la piste en "
 #~ "opportunité"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Conversion d'une piste en partenaire"
+
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Conversion de piste en opportunité"
 
@@ -4617,6 +4496,9 @@ msgstr ""
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Opportunités par catégorie"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Fusionner deux opportunités"
+
 #~ msgid ""
 #~ "Sales team to which this case belongs to. Defines responsible user and e-"
 #~ "mail address for the mail gateway."
@@ -4658,6 +4540,11 @@ msgstr ""
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Campagne de courriels 1"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Êtes-vous sûr de vouloir créer un partenaire à partir de cet appel "
+#~ "téléphonique ?"
+
 #, python-format
 #~ msgid "The stage of opportunity '%s' has been changed to '%s'."
 #~ msgstr "L'étape de l'opportunité \"%s\" a été changé à \"%s\"."
@@ -4830,6 +4717,9 @@ msgstr ""
 #~ msgid "CRM Lead Report"
 #~ msgstr "Rapport sur les pistes du CRM"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Vous devriez vérifier que ce partenaire n'existe pas déjà."
+
 #~ msgid "Need Consulting"
 #~ msgstr "A besoin de consultation"
 
@@ -5152,6 +5042,9 @@ msgstr ""
 #~ msgid "Recurrence termination"
 #~ msgstr "Fin de répétition"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Opportunité / client"
+
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Plannifier/noter un appel"
 
@@ -5209,6 +5102,10 @@ msgstr ""
 #~ msgid "CRM Dashboard"
 #~ msgstr "Tableau de bord CRM"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Un partenaire est déjà défini."
+
 #~ msgid "Mail To"
 #~ msgstr "Courriel à"
 
@@ -5219,6 +5116,9 @@ msgstr ""
 #~ msgid "Phone calls made in current month"
 #~ msgstr "Appels passés ce mois"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Commun à toutes les équipes"
+
 #, python-format
 #~ msgid "No E-Mail Found for your Company address!"
 #~ msgstr "Aucun courriel trouvé pour l'adresse de votre société !"
@@ -5241,6 +5141,10 @@ msgstr ""
 #~ msgid "Schedule call"
 #~ msgstr "Planifier un appel"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Veuillez sélectionner plus d'une opportunité sur la vue en liste"
+
 #~ msgid "Scheduled Phonecalls"
 #~ msgstr "Appels téléphoniques planifiés"
 
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index 54893185da5..cb0df539924 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: crm-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,11 +31,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -45,19 +47,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Acción"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -66,11 +78,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -78,9 +85,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -96,11 +103,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -146,6 +148,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Nome de regra"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -176,8 +184,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -204,7 +212,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -216,8 +224,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -236,9 +249,9 @@ msgid "Excluded Answers :"
 msgstr "Respostas excluídas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Seccións"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -248,7 +261,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -259,16 +272,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -413,7 +422,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -428,15 +436,21 @@ msgstr "Categoría"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -468,21 +482,12 @@ msgstr "Estado"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -496,8 +501,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -518,8 +523,8 @@ msgid "Planned Revenue"
 msgstr "Retorno planeado"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -556,6 +561,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -566,11 +576,6 @@ msgstr "Categoría do caso"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -593,6 +598,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -654,8 +664,8 @@ msgid "Partner Segmentation"
 msgstr "Segmentación de empresa"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -674,9 +684,9 @@ msgid "The name of the segmentation."
 msgstr "O nome da segmentación."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -694,13 +704,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -713,12 +717,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -755,17 +753,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -777,25 +764,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -818,21 +801,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -840,8 +808,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -887,9 +855,9 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidade (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -914,7 +882,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
@@ -924,23 +892,12 @@ msgstr "Aviso !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -966,11 +923,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condicións sobre campos do caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -978,6 +930,19 @@ msgstr "Condicións sobre campos do caso"
 msgid "Next Action"
 msgstr "Seguinte acción"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1046,14 +1011,6 @@ msgstr "Calculo da segmentación"
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1063,9 +1020,9 @@ msgid "Creation Date"
 msgstr "Data de creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1125,10 +1082,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1136,12 +1091,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1150,8 +1099,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1183,8 +1143,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1192,12 +1152,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1224,6 +1178,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1233,14 +1193,6 @@ msgstr ""
 "Márquea se quere empregar este separdor como parte da regra de segmentación. "
 "Se non se marca, os criterios que conteña serán ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1262,15 +1214,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1281,13 +1228,6 @@ msgstr ""
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1334,6 +1274,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1345,7 +1292,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1389,13 +1336,9 @@ msgstr "Referencias"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1416,13 +1359,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1462,6 +1412,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Seccións"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1506,6 +1466,12 @@ msgstr "Nome"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1542,17 +1508,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1589,6 +1544,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1597,11 +1553,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En execución"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1615,11 +1566,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1631,7 +1577,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1684,11 +1630,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1709,11 +1650,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1847,11 +1783,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1882,17 +1813,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1903,12 +1827,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1920,12 +1838,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1941,6 +1853,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1952,28 +1870,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2034,24 +1942,6 @@ msgstr "Pendente"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2100,17 +1990,15 @@ msgid "Mandatory Expression"
 msgstr "Expresión obrigatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2140,11 +2028,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2172,11 +2055,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsábel"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2188,21 +2066,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicacións"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2269,7 +2148,6 @@ msgstr "Continuar proceso"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2351,8 +2229,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En execución"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2360,6 +2243,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2380,26 +2268,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2441,6 +2309,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2472,6 +2345,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2504,6 +2382,24 @@ msgstr "Expresión opcional"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2556,11 +2452,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2605,8 +2496,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2625,14 +2517,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2726,18 +2620,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Borrador"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2748,7 +2635,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2757,11 +2643,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2785,11 +2666,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2808,21 +2684,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2846,11 +2707,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2862,13 +2718,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2893,16 +2744,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2926,7 +2771,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2952,7 +2796,6 @@ msgid "Description"
 msgstr "Descrición"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3031,20 +2874,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3066,7 +2900,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3114,16 +2948,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3142,9 +2973,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3159,6 +2990,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3267,6 +3103,9 @@ msgstr ""
 #~ msgid "Case Communication History"
 #~ msgstr "Historial de comunicación do caso"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condicións sobre campos do caso"
+
 #~ msgid "Estimates"
 #~ msgstr "Estimacións"
 
@@ -3808,6 +3647,9 @@ msgstr ""
 #~ "¡Debe definir un usuario responsábel para este caso para poder utilizar esta "
 #~ "acción!"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Máximo historial de comunicacións"
+
 #~ msgid "Allows to delete non draft cases"
 #~ msgstr "Permite eliminar os casos en estado non borrador."
 
diff --git a/addons/crm/i18n/gu.po b/addons/crm/i18n/gu.po
index 809d9406895..0aa609b63e1 100644
--- a/addons/crm/i18n/gu.po
+++ b/addons/crm/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-19 12:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "લીડ"
 
@@ -44,19 +46,29 @@ msgid "Title"
 msgstr "શિર્ષક"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -65,11 +77,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,9 +84,9 @@ msgid "Delay to close"
 msgstr "બંધ કરવા માં વિલંબ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "વિભાગ"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "સ્થિતિ"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "કોઈ વિષય નથી"
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr "શ્રેણી"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,21 +479,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "ઓગસ્ટ"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -493,9 +498,9 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "કરવાનું"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -515,8 +520,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -553,6 +558,11 @@ msgstr "સારાંશ"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,8 +681,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,8 +805,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -884,8 +852,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -921,23 +889,12 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,10 +1079,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1133,12 +1088,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,15 +1209,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1276,13 +1223,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1384,13 +1331,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1411,13 +1354,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "કરવાનું"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1457,6 +1407,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "વિભાગ"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,15 +1808,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1898,12 +1822,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,14 +2061,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2198,6 +2070,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2447,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2491,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,14 +2512,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "ઓગસ્ટ"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2721,16 +2615,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2743,7 +2630,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2752,11 +2638,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2661,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2679,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2702,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2713,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2739,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2766,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2791,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2869,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3061,7 +2895,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2943,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,9 +2968,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3154,6 +2985,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 0dda30c115b..bbc4d51e638 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 19:26+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: crm
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Potencijali"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Naslov"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Akcija"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Odaberite prilike"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Pretvori u prilike"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Odgodi zaključivanje"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Potencijal <b> je sad prilika </b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Naziv faze"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr "Prodavač"
 msgid "CRM Lead Analysis"
 msgstr "Analiza CRM potencijala"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Naziv pravila"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Zakaži drugi poziv"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Isključiti"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Isključeni odgovori :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekcije"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Analiza CRM potencijala"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampanje"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Odaberite prilike"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stanje"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Izgledni partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Bez naslova"
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentacija"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgstr ""
 "ovoj fazi"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,15 +439,21 @@ msgstr "Grupa"
 msgid "#Opportunities"
 msgstr "#Prilika"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -471,22 +485,13 @@ msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Kreiraj priliku"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Kolovoz"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Naziv faze"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Postavke"
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,9 +504,9 @@ msgid "Mailings"
 msgstr "e-pošta"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Za napraviti"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Planirani prihod"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Očekivani prihod"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Sažetak"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Kategorija slučaja"
 msgid "Partner Contact Name"
 msgstr "Naziv kontakta partnera"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "# Tel. poziva"
 msgid "The code of the sales team must be unique !"
 msgstr "Šifra prodajnog tima mora biti jedinstvena!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentacija partnera"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Trajanje u minutama"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "Naziv segmentacije"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Vjerojatnost (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Kokpit statistike"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Prilika"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Ime Prilike"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Postavi tim"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Isključujući"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Od %s do %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr ""
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Pretvori u prilike"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Uvjeti"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Pretvori u priliku "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Poštanski br."
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Označi kao dobiven"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Vjerojatnost (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -929,23 +897,12 @@ msgstr "Upozorenje!"
 msgid "Days to Open"
 msgstr "Dana za otvaranje"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Krairaj partnera"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobilni"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Sastanci"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Uvjeti vezani uz polja Slučaja"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr "Uvjeti vezani uz polja Slučaja"
 msgid "Next Action"
 msgstr "Siljedeća akcija"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Izračunaj Segmentaciju"
 msgid "Lowest"
 msgstr "Najniži"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Datum kreiranja"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Očekivani prihod"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "Rujan"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Datum otvaranja"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Trajanje u minutama"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Naziv kanala"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continue"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1231,6 +1185,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "Označite ako želite koristiti ovu karticu (Tab) kao dio pravila "
 "segmentacije. Ako ne označite, kriteriji koji slijedi će biti zanemaren"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Kreiraj partnera"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "nepoznato"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partnera u priliku"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Partnera u priliku"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Spojene prilike"
@@ -1396,13 +1343,9 @@ msgstr "Reference"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Odustani"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Spoji dvije prilike"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Za napraviti"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Tel.poziv u partnera"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr "Otvoreni potencijali i prilike"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekcije"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1518,6 +1478,12 @@ msgstr "Naziv"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Datum zatvaranja"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1554,17 +1520,6 @@ msgstr "Visok"
 msgid "Convert to prospect to business partner"
 msgstr "Pretv u Izglenog Partnera pa u Poslovnog Partnera"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1601,6 +1556,7 @@ msgstr "Parent Team"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1609,11 +1565,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Datum slijedeće akcije"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "U tijeku"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1627,11 +1578,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Poštanski br."
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1643,7 +1589,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1696,11 +1642,6 @@ msgstr "Value"
 msgid "Customer Name"
 msgstr "Naziv kupca"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Tel.poziv u priliku"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1721,11 +1662,6 @@ msgstr "Prilike po fazama"
 msgid "Prospect is converting to business partner"
 msgstr "Izgledna stranka pretvara se u poslovnog Partnera"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1859,11 +1795,6 @@ msgstr "Referrer"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tip se koristi za razlikovanje potencijalnih kontakta i prilika."
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Želite li kreirati partnera temeljem ovog tel. poziva ?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1894,16 +1825,9 @@ msgid "Sales Teams"
 msgstr "Prodajni timovi"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Pot. kontakt u partnera"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentacija"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1915,12 +1839,6 @@ msgstr "Team"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Novi potencijali i prilike"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1932,12 +1850,6 @@ msgstr "Nije održano"
 msgid "Probability"
 msgstr "Probability"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1953,6 +1865,12 @@ msgstr "Mjesec"
 msgid "Leads"
 msgstr "Potencijalni kontakti"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1964,28 +1882,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Za obaviti"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2046,24 +1954,6 @@ msgstr "Na čekanju"
 msgid "Prospect Opportunity"
 msgstr "Istraži Priliku"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2112,17 +2002,15 @@ msgid "Mandatory Expression"
 msgstr "Obavezan izraz"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Pošalji mail"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2152,11 +2040,6 @@ msgstr "Analiza prilika"
 msgid "Misc"
 msgstr "Ostalo"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Regularni izraz na povijesti slučaja"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2184,11 +2067,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Odgovoran"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2200,21 +2078,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimalna povijest komunikacije"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2281,7 +2160,6 @@ msgstr "Nastavi Process"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2363,8 +2241,13 @@ msgid "Company"
 msgstr "Organizacija"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "U tijeku"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2372,6 +2255,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Nedodjeljeni potencijali"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2392,26 +2280,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Pretvori"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2457,6 +2325,11 @@ msgstr ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2488,6 +2361,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrđeno"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2520,6 +2398,24 @@ msgstr "Opcijski Izraz"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2576,11 +2472,6 @@ msgstr "Kreiranje poslovnih prilika iz pot. kontakata"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Postavi kategoriju na"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2625,8 +2516,9 @@ msgid "Qualification"
 msgstr "Qualification"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2645,15 +2537,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Kolovoz"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Postavke"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2748,17 +2642,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Vjerojatnost uspjeha"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Nacrt"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2770,7 +2657,6 @@ msgstr "Cases by Sales Team"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Sastanak"
 
@@ -2779,11 +2665,6 @@ msgstr "Sastanak"
 msgid "Category of Case"
 msgstr "Kategorija slučaja"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Prilika / kupac"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2807,11 +2688,6 @@ msgstr "Ulica2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Trebate provjeriti postoji li već ovaj Partner!"
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2830,21 +2706,6 @@ msgstr "Korisnik"
 msgid "November"
 msgstr "Studeni"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negotiation"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2868,11 +2729,6 @@ msgstr "Ugovor"
 msgid "Twitter Ads"
 msgstr "Twitter Ads"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2884,14 +2740,9 @@ msgid "Planned Revenues"
 msgstr "Planned Revenues"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Tel.poziv u tel.poziv"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Oček.zatvaranje"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2915,16 +2766,10 @@ msgid "Categorization"
 msgstr "Kategorizacija"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Action Rules"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2948,7 +2793,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2974,7 +2818,6 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3053,20 +2896,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Radno vrijeme(od-do)"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Tel. pozivi"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Kupac"
 
@@ -3088,7 +2922,7 @@ msgid "Lost"
 msgstr "Lost"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3136,17 +2970,14 @@ msgid "Phone calls by user and section"
 msgstr "Tel. pozivi po korisniku i odabiru"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negotiation"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Oček.zatvaranje"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Tel.poziv u tel.poziv"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3164,10 +2995,10 @@ msgid "Proposition"
 msgstr "Proposition"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Datum zatvaranja"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Tel. pozivi"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3181,6 +3012,11 @@ msgstr "Godina"
 msgid "Newsletter"
 msgstr "Bilten"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3453,6 +3289,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Označite želite li postaviti pravilo slanja e-mail podsjetnika partneru."
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Uvjeti vezani uz polja Slučaja"
+
 #~ msgid "Attendees"
 #~ msgstr "Sudionici"
 
@@ -3638,9 +3477,6 @@ msgstr ""
 #~ "Potvrdite ako želite da se svi dokumenti vezani uz slučaj dodaju u privitak "
 #~ "maila podsjetnika."
 
-#~ msgid "Send Mail"
-#~ msgstr "Pošalji mail"
-
 #~ msgid "Claims"
 #~ msgstr "Potraživanja"
 
@@ -3662,6 +3498,9 @@ msgstr ""
 #~ "You are already at the top level."
 #~ msgstr "Ne možete eskalirati ovaj slučaj. Već ste na najvišoj razini."
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimalna povijest komunikacije"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr ""
 #~ "Jeste li sigurni da želite kreirati Partnera na osnovi ovog Kontakta ?"
@@ -3713,6 +3552,9 @@ msgstr ""
 #~ msgid "Error!"
 #~ msgstr "Greška !"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Ime Prilike"
+
 #~ msgid "Case Communication History"
 #~ msgstr "Povijest komunikacije Slučaja"
 
@@ -3760,6 +3602,9 @@ msgstr ""
 #~ msgid "Historize"
 #~ msgstr "Pretvori u povijesni oblik"
 
+#~ msgid "Success Probability"
+#~ msgstr "Vjerojatnost uspjeha"
+
 #~ msgid "Delay after trigger date"
 #~ msgstr "Odgoda nakon Datuma pokretanja"
 
@@ -3770,6 +3615,9 @@ msgstr ""
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr "Da biste koristili ovu radnju, morate upisati Email Partnera!"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Trebate provjeriti postoji li već ovaj Partner!"
+
 #~ msgid "Parent Section"
 #~ msgstr "ishodna Grupa"
 
@@ -3890,6 +3738,9 @@ msgstr ""
 #~ msgid "Enhance your core CRM Application with additional functionalities."
 #~ msgstr "Obogatite CRM dodatnim funkcionalnostima."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Regularni izraz na povijesti slučaja"
+
 #~ msgid "Change Responsible"
 #~ msgstr "Promjeni odgovornog"
 
@@ -3993,9 +3844,15 @@ msgstr ""
 #~ "using the caldav interface.\n"
 #~ "        "
 
+#~ msgid "Continue"
+#~ msgstr "Continue"
+
 #~ msgid "By day"
 #~ msgstr "Po danu"
 
+#~ msgid "Set Team to"
+#~ msgstr "Postavi tim"
+
 #~ msgid ""
 #~ "This property defines the list of date/time exceptions for a recurring "
 #~ "calendar component."
@@ -4003,6 +3860,9 @@ msgstr ""
 #~ "Ovo svojstvo određuje listu iznimki datuma/vremena za ponavljajuću "
 #~ "komponentu kalendara"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Pretvori u priliku "
+
 #~ msgid "Recurrent Meeting"
 #~ msgstr "Ponavljajući sastanak"
 
@@ -4015,6 +3875,9 @@ msgstr ""
 #~ msgid "Show time as"
 #~ msgstr "Prikaži vrijeme kao"
 
+#~ msgid "Create Partner"
+#~ msgstr "Krairaj partnera"
+
 #~ msgid "Next Stage"
 #~ msgstr "Slijedeća faza"
 
@@ -4097,9 +3960,15 @@ msgstr ""
 #~ msgid "Set an alarm at this time, before the event occurs"
 #~ msgstr "Set an alarm at this time, before the event occurs"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Kreiraj partnera"
+
 #~ msgid "Monday"
 #~ msgstr "Ponedjeljak"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partnera u priliku"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Prilike po kategorijama"
 
@@ -4118,6 +3987,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Spoji dvije prilike"
+
 #~ msgid "Exception Rule"
 #~ msgstr "Pravilo iznimke"
 
@@ -4145,6 +4017,9 @@ msgstr ""
 #~ msgid "The"
 #~ msgstr "The"
 
+#~ msgid "_Convert"
+#~ msgstr "_Pretvori"
+
 #~ msgid ""
 #~ "With Meeting Invitations you can create and manage the meeting invitations "
 #~ "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
@@ -4182,6 +4057,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Prilike po kategorijama"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Tel.poziv u priliku"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Faze za ovaj prodajni tim"
 
@@ -4219,6 +4097,9 @@ msgstr ""
 #~ msgid "Caldav URL"
 #~ msgstr "CalDAV URL"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Želite li kreirati partnera temeljem ovog tel. poziva ?"
+
 #~ msgid ""
 #~ "Define a Sales Team to organize your different salesmen or sales departments "
 #~ "into separate teams. Each team will work in its own list of opportunities, "
@@ -4234,6 +4115,9 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Repeat x times"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Pot. kontakt u partnera"
+
 #~ msgid ""
 #~ "Leads allow you to manage and keep track of all initial contacts with a "
 #~ "prospect or partner showing interest in your products or services. A lead is "
@@ -4319,6 +4203,9 @@ msgstr ""
 #~ msgid "Weekday"
 #~ msgstr "Dan u tjednu"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Tel.poziv u partnera"
+
 #~ msgid ""
 #~ "The name of the future partner that will be created while converting the "
 #~ "into opportunity"
@@ -4435,6 +4322,9 @@ msgstr ""
 #~ msgid "Need Information"
 #~ msgstr "Treba informacije"
 
+#~ msgid "Set Category to"
+#~ msgstr "Postavi kategoriju na"
+
 #~ msgid "Thu"
 #~ msgstr "Čet"
 
@@ -4512,6 +4402,9 @@ msgstr ""
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !"
 
+#~ msgid "Action Rules"
+#~ msgstr "Action Rules"
+
 #~ msgid "Recurrency"
 #~ msgstr "Ponavljanje"
 
@@ -4554,6 +4447,9 @@ msgstr ""
 #~ msgid "Assigned opportunities to"
 #~ msgstr "Dodijeli prilike"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Prilika / kupac"
+
 #, python-format
 #~ msgid "The meeting '%s' has been confirmed."
 #~ msgstr "Sastanak '%s' je potvrđen."
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index f8e1a12b010..d55a9d29ca9 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-02 18:48+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Érdeklődő"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Pozíció"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Művelet"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Lehetőségek kiválasztása"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Szakasz neve"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Előírás neve"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Vigyázat!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Egyéb hívások ütemezése"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Állapot"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Szakaszok"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Érdeklődők elemzése"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampányok"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Lehetőségek kiválasztása"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Állapot"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr "Leendő partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Szegmentálás"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,15 +432,21 @@ msgstr "Kategória"
 msgid "#Opportunities"
 msgstr "Lehetőségek száma"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -464,22 +478,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Lehetőség létrehozása"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Augusztus"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Szakasz neve"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Beállítás"
 
 #. module: crm
 #: view:crm.lead:0
@@ -492,8 +497,8 @@ msgid "Mailings"
 msgstr "Levelezések"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -514,9 +519,9 @@ msgid "Planned Revenue"
 msgstr "Tervezett jövedelem"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Várható bevételek"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -552,6 +557,11 @@ msgstr "Összegzés"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr "Eset kategória"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr "Telefonhívások száma"
 msgid "The code of the sales team must be unique !"
 msgstr "Az értékesítési csapat kódjának egyedinek kell lennie !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,9 +660,9 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Időtartam percben"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -670,9 +680,9 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Valószínűség (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr "Statisztika vezérlőpult"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Lehetőség"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Lehetőség megnevezése"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr "Kizárólagos"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,9 +804,9 @@ msgid "Requirements"
 msgstr "Követelmények"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr ""
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Irányítószám"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -883,9 +851,9 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Valószínűség (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Vigyázat !"
@@ -920,23 +888,12 @@ msgstr "Vigyázat !"
 msgid "Days to Open"
 msgstr "Megnyitásig hátralévő napok"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Partner létrehozása"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Találkozók"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Következő művelet"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Tervezet"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr ""
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,23 +1078,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Várható bevételek"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr "Szeptember"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,21 +1139,15 @@ msgid "Opening Date"
 msgstr "Nyitó dátum"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Időtartam percben"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Tovább"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Partner létrehozása"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,15 +1208,10 @@ msgid "unknown"
 msgstr "Ismeretlen"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1275,13 +1222,6 @@ msgstr ""
 msgid "Date"
 msgstr "Dátum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1383,13 +1330,9 @@ msgstr "Hivatkozások"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Mégse"
@@ -1410,13 +1353,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Két lehetőség egyesítése"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1456,6 +1406,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Szakaszok"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1500,6 +1460,12 @@ msgstr "Név"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Zárás dátuma"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1536,17 +1502,6 @@ msgstr "Magas"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1583,6 +1538,7 @@ msgstr "Főcsoport"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1591,11 +1547,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Következő művelet időpontja"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Futó"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1609,11 +1560,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Irányítószám"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1625,7 +1571,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1678,11 +1624,6 @@ msgstr "Érték"
 msgid "Customer Name"
 msgstr "Vevő neve"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1703,11 +1644,6 @@ msgstr "Lehetőségek szakaszok szerint"
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1841,12 +1777,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Biztos benne, hogy a telefonhívás alapján szeretne egy partnert létrehozni?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,17 +1807,10 @@ msgid "Sales Teams"
 msgstr "Értékesítési csapatok"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Szegmentálás"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1898,12 +1821,6 @@ msgstr "Csapat"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1832,6 @@ msgstr "Nem tartott"
 msgid "Probability"
 msgstr "Valószínűség"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1847,12 @@ msgstr "Hónap"
 msgid "Leads"
 msgstr "Érdeklődők"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1864,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Tennivaló"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1936,6 @@ msgstr "Függőben lévő"
 msgid "Prospect Opportunity"
 msgstr "Várható lehetőség"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1984,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Levél küldése"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2022,6 @@ msgstr "Lehetőségek elemzése"
 msgid "Misc"
 msgstr "Vegyes"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2049,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Felelős"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,21 +2060,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maximális kommunikációs előzmények"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2142,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2223,13 @@ msgid "Company"
 msgstr "Vállalat"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Futó"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2237,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2262,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2303,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2339,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Megerősítve"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2376,24 @@ msgstr "Választható kifejezés"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2446,6 @@ msgstr "Üzleti lehetőségek létrehozása a potenciális ügyfelekből"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Kategória beállítása"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2490,9 @@ msgid "Qualification"
 msgstr "Végzettség"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,15 +2511,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Augusztus"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Beállítás"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2721,17 +2614,10 @@ msgid "Logged Calls"
 msgstr "Naplózott hívások"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "A siker valószínűsége"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Tervezet"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2743,7 +2629,6 @@ msgstr "Esetek értékesítési csapatonként"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Találkozó"
 
@@ -2752,11 +2637,6 @@ msgstr "Találkozó"
 msgid "Category of Case"
 msgstr "Eset kategóriája"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2660,6 @@ msgstr "Utca2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2678,6 @@ msgstr "Felhasználó"
 msgid "November"
 msgstr "November"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Tárgyalás"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2701,6 @@ msgstr "Szerződés"
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2712,8 @@ msgid "Planned Revenues"
 msgstr "Tervezett bevételek"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2738,10 @@ msgid "Categorization"
 msgstr "Kategorizálás"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Műveleti előírások"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2765,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2790,6 @@ msgid "Description"
 msgstr "Leírás"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2868,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Munkaórák"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonhívások"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Vevő"
 
@@ -3061,7 +2894,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2942,13 @@ msgid "Phone calls by user and section"
 msgstr "Telefonhívás felhasználónként és szakaszonként"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Tárgyalás"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,10 +2967,10 @@ msgid "Proposition"
 msgstr "Javaslat"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Zárás dátuma"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonhívások"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3154,6 +2984,11 @@ msgstr "Év"
 msgid "Newsletter"
 msgstr "Hírlevél"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3263,6 +3098,9 @@ msgstr ""
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Naptár szinkronizáció"
 
+#~ msgid "Continue"
+#~ msgstr "Tovább"
+
 #~ msgid "By day"
 #~ msgstr "Nappal"
 
@@ -3272,6 +3110,9 @@ msgstr ""
 #~ msgid "Supplier"
 #~ msgstr "Szállító"
 
+#~ msgid "Create Partner"
+#~ msgstr "Partner létrehozása"
+
 #~ msgid "Next Stage"
 #~ msgstr "Következő lépés"
 
@@ -3409,6 +3250,10 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "Hiba !"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Biztos benne, hogy a telefonhívás alapján szeretne egy partnert létrehozni?"
+
 #~ msgid "Create a new partner"
 #~ msgstr "Új partner létrehozása"
 
@@ -3430,9 +3275,6 @@ msgstr ""
 #~ msgid "CC"
 #~ msgstr "Másolat"
 
-#~ msgid "Send Mail"
-#~ msgstr "Levél küldése"
-
 #~ msgid "Months"
 #~ msgstr "Hónapok"
 
@@ -3469,6 +3311,9 @@ msgstr ""
 #~ msgid "My Open Opportunities"
 #~ msgstr "Nyitott lehetőségeim"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maximális kommunikációs előzmények"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr ""
 #~ "Biztos benne, hogy létre szeretné hozni a partnert a potenciális ügyfél "
@@ -3596,6 +3441,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Hiba! Nem hozhat létre rekurzív társult tagokat."
 
+#~ msgid "Success Probability"
+#~ msgstr "A siker valószínűsége"
+
 #~ msgid "Attendees"
 #~ msgstr "Résztvevők"
 
@@ -3625,6 +3473,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Zárás"
 
+#~ msgid "Action Rules"
+#~ msgstr "Műveleti előírások"
+
 #~ msgid "Recurrency"
 #~ msgstr "Ismétlődés"
 
@@ -3712,6 +3563,9 @@ msgstr ""
 #~ msgid "End of recurrency"
 #~ msgstr "Ismétlődés vége"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Lehetőség megnevezése"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Lehetőség összegzése"
 
@@ -3773,6 +3627,9 @@ msgstr ""
 #~ msgid "Thunderbird"
 #~ msgstr "Thunderbird"
 
+#~ msgid "Set Category to"
+#~ msgstr "Kategória beállítása"
+
 #~ msgid "Need Information"
 #~ msgstr "Információra van szüksége"
 
@@ -3805,6 +3662,12 @@ msgstr ""
 #~ msgid "Choose day where repeat the meeting"
 #~ msgstr "Válassza ki azt a napot, amikor a találkozó ismétlődjön"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Partner létrehozása"
+
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Két lehetőség egyesítése"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Lehetőségek kategóriánként"
 
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index 3c61c100682..b6663270c3c 100644
--- a/addons/crm/i18n/id.po
+++ b/addons/crm/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-09 13:48+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,8 +247,8 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,15 +432,21 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -464,21 +478,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -492,8 +497,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -514,8 +519,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -552,6 +557,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,8 +660,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -670,8 +680,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,8 +804,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -883,8 +851,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -920,23 +888,12 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,10 +1078,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1132,12 +1087,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,8 +1139,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1188,12 +1148,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,15 +1208,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1275,13 +1222,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1383,13 +1330,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1410,13 +1353,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1456,6 +1406,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1500,6 +1460,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1536,17 +1502,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1583,6 +1538,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1591,11 +1547,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1609,11 +1560,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1625,7 +1571,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1678,11 +1624,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1703,11 +1644,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1841,11 +1777,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1876,15 +1807,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1897,12 +1821,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1914,12 +1832,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1935,6 +1847,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1946,28 +1864,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2028,24 +1936,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2094,17 +1984,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2134,11 +2022,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2166,11 +2049,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2182,14 +2060,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2197,6 +2069,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2263,7 +2142,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2345,8 +2223,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2354,6 +2237,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2374,26 +2262,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2435,6 +2303,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2466,6 +2339,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2498,6 +2376,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2550,11 +2446,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2599,8 +2490,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2619,14 +2511,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2720,16 +2614,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2742,7 +2629,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2751,11 +2637,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2779,11 +2660,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2802,21 +2678,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2840,11 +2701,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2856,13 +2712,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2887,16 +2738,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2920,7 +2765,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2946,7 +2790,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3025,20 +2868,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3060,7 +2894,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3108,16 +2942,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3136,9 +2967,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3153,6 +2984,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 6779dba1f85..3afb2fca4ee 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 08:58+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,11 +31,13 @@ msgstr ""
 "email ricevute."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Lead"
 
@@ -45,22 +47,30 @@ msgid "Title"
 msgstr "Titolo"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Azione"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
-"La telefonata collegata all'opportunità <em>%s</em> è stata <b>creata</b> e "
-"<b>pianificata</b> per il <em>%s</em>."
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Seleziona opportunità"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -68,11 +78,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Gestione Raccolta Fondi"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Converti in Opportunità"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -80,10 +85,10 @@ msgid "Delay to close"
 msgstr "Tempo di chiusura"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Il lead è stato <b>convertito in opportunità</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nome Stadio"
 
 #. module: crm
 #: view:crm.lead:0
@@ -98,11 +103,6 @@ msgstr "Commerciale"
 msgid "CRM Lead Analysis"
 msgstr "Analisi CRM Lead"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Promemoria su Lead: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -148,6 +148,12 @@ msgstr "Giorno creazione"
 msgid "Rule Name"
 msgstr "Nome Regola"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -180,8 +186,8 @@ msgstr ""
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -208,7 +214,7 @@ msgid "Schedule Other Call"
 msgstr "Pianifica altra chiamata"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -220,9 +226,14 @@ msgid "Opt-Out"
 msgstr "Opt-Out"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Nascondi nelle Viste se Vuoto"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stato"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -240,9 +251,9 @@ msgid "Excluded Answers :"
 msgstr "Risposte escluse:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sezioni"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -252,7 +263,7 @@ msgid "Leads Analysis"
 msgstr "Analisi dei lead"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s una chiamata</b> per il <em>%s</em>."
@@ -263,16 +274,6 @@ msgstr "<b>%s una chiamata</b> per il <em>%s</em>."
 msgid "Campaigns"
 msgstr "Campagne"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Seleziona opportunità"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stato"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -295,7 +296,7 @@ msgid "Prospect Partner"
 msgstr "Prospect Partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Nessun Oggetto"
@@ -418,11 +419,17 @@ msgstr "Chiuso"
 msgid "Unread Messages"
 msgstr "Messaggi Non Letti"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentazione"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Collega ad un cliente esistente"
 
@@ -446,7 +453,6 @@ msgstr ""
 "in questo stadio, si chiuda con un successo"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -461,16 +467,22 @@ msgstr "Categoria"
 msgid "#Opportunities"
 msgstr "# Opportunità"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr "Leads assegnati ad uno dei miei team di vendita o a me"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Azione Conversione"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Email Contatto Partner"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -511,22 +523,13 @@ msgstr "Stato"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Crea Opportunità"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nome Stadio"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configura"
 
 #. module: crm
 #: view:crm.lead:0
@@ -539,9 +542,9 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Da Fare"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -561,9 +564,9 @@ msgid "Planned Revenue"
 msgstr "Entrata Pianificata"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "CRM Telefonate: Segna letto"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Entrata prevista"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -603,6 +606,11 @@ msgstr "Riepilogo"
 msgid "Merge"
 msgstr "Unisci"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -613,11 +621,6 @@ msgstr "categoria Caso"
 msgid "Partner Contact Name"
 msgstr "Nome Contatto Partner"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "CRM Telefonate: Segna non letto"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -642,6 +645,11 @@ msgstr "# Telefonate"
 msgid "The code of the sales team must be unique !"
 msgstr "Il codice del team di vendita deve essere unico!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Indirizzo email del contatto"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -714,9 +722,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentazione Partner"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Durata in minuti"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -734,9 +742,9 @@ msgid "The name of the segmentation."
 msgstr "Nome della Segmentazione"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Leads da USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilità (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -755,13 +763,7 @@ msgid "Statistics Dashboard"
 msgstr "Dashboard statistiche"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stato cambiato a <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -774,12 +776,6 @@ msgstr "Stato cambiato a <b>%s</b>."
 msgid "Opportunity"
 msgstr "Opportunità"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Un appuntamento è stato <b>pianificato</b> in data <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -817,17 +813,6 @@ msgid ""
 msgstr ""
 "Lead/Opportunità che sono assegnate a me o ad uno dei miei team di vendita"
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nome opportunità"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Imposta il team a"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -839,25 +824,21 @@ msgid "Exclusive"
 msgstr "Esclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Da %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Anno Creazione"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Converti in Opportunità"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "o"
@@ -882,31 +863,6 @@ msgstr ""
 "Collegamento tra fasi e team di vendita. Quando impostato, limita la fase "
 "corrente al team di vendita selezionato."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Salve [[object.user_id.name]], \n"
-"potresti gestire il sequente lead? Non è stato aperto da 5 giorni.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Descrizione:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Grazie,\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -914,9 +870,9 @@ msgid "Requirements"
 msgstr "Requisiti"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Converti a Opportunità "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "CAP"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -961,9 +917,9 @@ msgid "Mark Won"
 msgstr "Marca Vinto"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilità (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Leads da USA"
 
 #. module: crm
 #: view:crm.lead:0
@@ -988,7 +944,7 @@ msgid "Send Email"
 msgstr "Invia Email"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione !"
@@ -998,23 +954,12 @@ msgstr "Attenzione !"
 msgid "Days to Open"
 msgstr "Giorni per l'apertura"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Creare Partner"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Cellulare"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "La telefonata è stata <b>reimportata ad aperta</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -1042,11 +987,6 @@ msgstr "Usato per calcolare i giorni liberi"
 msgid "Meetings"
 msgstr "Appuntamenti"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condizioni sui campi del caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1054,6 +994,19 @@ msgstr "Condizioni sui campi del caso"
 msgid "Next Action"
 msgstr "Prossima Azione"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Bozza"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1124,16 +1077,6 @@ msgstr "Calcola Segmentazione"
 msgid "Lowest"
 msgstr "Minima"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"L'appuntamento collegato alla telefonata <em>%s</em> è stato <b>creato</b> e "
-"<b>pianificato</b> in data <em>%s</em>."
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1143,10 +1086,10 @@ msgid "Creation Date"
 msgstr "Data di Creazione"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s è stato <b>creato</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1208,23 +1151,15 @@ msgid "Delete"
 msgstr "Elimina"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Entrata prevista"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr "í"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "L'opportunità è stata <b>persa</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1233,9 +1168,20 @@ msgid "September"
 msgstr "Settembre"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Indirizzo email del contatto"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1268,21 +1214,15 @@ msgid "Opening Date"
 msgstr "Data apertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Durata in minuti"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nome Canale"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continua"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1315,6 +1255,12 @@ msgstr ""
 "Questo campo è usato per distinguere fasi collegate ai lead da quelle legate "
 "alle opportunità, o per specificare fasi disponibili su entrambi i tipi."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1325,14 +1271,6 @@ msgstr ""
 "segmentazione. Se non spuntata, i criteri contenuti nella scheda verranno "
 "ignorati"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Crea un Partner"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1354,18 +1292,11 @@ msgid "unknown"
 msgstr "sconosciuto"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-"I followers di questi team di vendita seguono automaticamente tutte le "
-"opportunità del team."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner in Opportunità"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "E' un Follower"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1375,13 +1306,6 @@ msgstr "Partner in Opportunità"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "E' un Follower"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1433,6 +1357,13 @@ msgid ""
 msgstr ""
 "Inviando email, l'indirizzo email di default viene presa dal team di vendita."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1444,7 +1375,7 @@ msgid "Lead Description"
 msgstr "Descrizione Lead"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Unisci opportunità"
@@ -1488,13 +1419,9 @@ msgstr "Riferimenti"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Annulla"
@@ -1515,14 +1442,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Leads/Opportunità in stato \"in attesa\""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Unisci due Opportunità"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Da Fare"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefonata al partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Cliente Correlato"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1561,6 +1495,16 @@ msgstr "Leads/Opportunità in stato aperto"
 msgid "Users"
 msgstr "Utenti"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sezioni"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1610,6 +1554,12 @@ msgstr "Nome"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Leads/Opportunità assegnate a me"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Data chiusura"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1646,17 +1596,6 @@ msgstr "Alta"
 msgid "Convert to prospect to business partner"
 msgstr "Converti candidato in business partner"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "L'opportunità è stata <b>vinta</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Telefonate assegnate a me o al/ai miei team"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1693,6 +1632,7 @@ msgstr "Team padre"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "non collegare a cliente"
 
@@ -1701,11 +1641,6 @@ msgstr "non collegare a cliente"
 msgid "Next Action Date"
 msgstr "Data prossima azione"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "In esecuzione"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1722,11 +1657,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Assegna opportunità a"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "CAP"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1738,7 +1668,7 @@ msgid "Month of call"
 msgstr "Mese della chiamata"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "Il partner è stato <b>creato</b>."
@@ -1794,11 +1724,6 @@ msgstr "Valore"
 msgid "Customer Name"
 msgstr "Nome cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Telefonata in Opportunità"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1819,11 +1744,6 @@ msgstr "Opportunità per stadio"
 msgid "Prospect is converting to business partner"
 msgstr "Il Prospect è convertito in business partner"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "CRM Lead: Segna non letto"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1959,11 +1879,6 @@ msgstr "Segnalante"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Il tipo è utilizzato per distinguere i Lead dalle Opportunità"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Sei sicuro di voler creare un Partner basandolo su questa chiamata?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1994,16 +1909,9 @@ msgid "Sales Teams"
 msgstr "Team di vendita"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Da Lead a Partner"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentazione"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -2015,12 +1923,6 @@ msgstr "Team"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Leads/Opportunità in stato Nuovo"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "Il <b>partner</b> %s è ora impostato su <em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -2032,12 +1934,6 @@ msgstr "Non gestito"
 msgid "Probability"
 msgstr "Probabililtà"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Si prega di selezionare più opportunità dalla lista"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -2053,6 +1949,12 @@ msgstr "Mese"
 msgid "Leads"
 msgstr "Lead"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -2064,41 +1966,18 @@ msgstr "Design"
 msgid "Merge with existing opportunities"
 msgstr "Unisci ad opportunità esistenti"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Cliccare per creare una nuova opportunità\n"
-"            </p><p>\n"
-"              OpenERP aiuta a tenere traccia del flusso di vendita per "
-"seguire\n"
-"              un potenziale cliente o per prevedere futuri profitti.\n"
-"            </p><p>\n"
-"              Sarete in grado di pianificare appuntamenti e telefonate "
-"dalle\n"
-"              opportunità, convertirle in preventivi, allegare documenti,\n"
-"              tenere traccia di discussioni e molto altro ancora.\n"
-"            </p>\n"
-"          "
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Da fare"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2161,40 +2040,6 @@ msgstr "In sospeso"
 msgid "Prospect Opportunity"
 msgstr "Possibile Opportunità"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"            Cliccare per creare un lead non qualificato.\n"
-"          </p><p>\n"
-"            Usare i lead se si necessità una fase di qualificazione prima di "
-"creare una\n"
-"            opportunità o un cliente. Può essere un biglietto da visita "
-"ricevuto,\n"
-"            un form di contatti dal sito web, o un file con opportunità non "
-"qualificate\n"
-"            da importare, etc.\n"
-"          </p><p>\n"
-"            Una volta qualificato, il lead può essere convertito in\n"
-"            opportunità e/o in nuovo cliente nella rubrica.\n"
-"          </p>\n"
-"        "
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2243,18 +2088,16 @@ msgid "Mandatory Expression"
 msgstr "Espressione Obbligatoria"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Crea un nuovo cliente"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Invia email"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Cliente Correlato"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Crea un nuovo cliente"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2283,11 +2126,6 @@ msgstr "Analisi Opportunità"
 msgid "Misc"
 msgstr "Varie"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Espressione regolare nello storico del caso"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2315,11 +2153,6 @@ msgstr "Chiamata Completata"
 msgid "Responsible"
 msgstr "Responsabile"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Promemoria cliente"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2331,21 +2164,22 @@ msgid "Product"
 msgstr "Prodotto"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "La telefonata è stata <b>creata e aperta</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Massimo Storico Contatti"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Anno Creazione"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Opzioni Conversione"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2416,7 +2250,6 @@ msgstr "Prosegui Processo"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Converti ad Opportunità"
 
@@ -2513,15 +2346,25 @@ msgid "Company"
 msgstr "Azienda"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Condizioni su Storico Comunicazioni"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "In esecuzione"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "Leads non Assegnati"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2542,36 +2385,6 @@ msgstr "Ripristina"
 msgid "After-Sale Services"
 msgstr "Servizi Post Vendita"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Salve [[object.partner_id and object.partner_id.name or '']], \n"
-"questo lead che stai seguendo non è stato aperto negli ultimi 5 giorni.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Descrizione:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Grazie,\n"
-"            "
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Converti"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2617,6 +2430,11 @@ msgstr ""
 "informazioni secondo diversi criteri e successivi approfondimenti mediante "
 "l'aggiunta di ulteriori gruppi nel report."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2648,6 +2466,11 @@ msgstr "Seleziona Leads/Opportunità"
 msgid "Confirmed"
 msgstr "Confermato"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2680,6 +2503,24 @@ msgstr "Espressione Opzionale"
 msgid "Followers"
 msgstr "Followers"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2736,11 +2577,6 @@ msgstr "Crea una opportunità a partire dal Lead"
 msgid "Email Campaign - Products"
 msgstr "Campagna Email - Prodotti"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Imposta categoria a"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2799,9 +2635,10 @@ msgid "Qualification"
 msgstr "Qualificazione"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Email Contatto Partner"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Azione Conversione"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2831,15 +2668,17 @@ msgstr ""
 "            "
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Un partner è già stato definito."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configura"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2935,17 +2774,10 @@ msgid "Logged Calls"
 msgstr "Chiamate Registrate"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilità di successo"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Bozza"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2957,7 +2789,6 @@ msgstr "Casi per Team di vendita"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Riunione"
 
@@ -2966,11 +2797,6 @@ msgstr "Riunione"
 msgid "Category of Case"
 msgstr "Categoria del caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Opportunità / Cliente"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2994,11 +2820,6 @@ msgstr "VIa (2)"
 msgid "Manage Helpdesk and Support"
 msgstr "Gestione Helpdesk e Supporto"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Si deve verificare che questo partner non esista già."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -3017,21 +2838,6 @@ msgstr "Utente"
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negoziazione"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -3055,11 +2861,6 @@ msgstr "Contratto"
 msgid "Twitter Ads"
 msgstr "Ads di Twitter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Comune a Tutti i Teams"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -3071,14 +2872,9 @@ msgid "Planned Revenues"
 msgstr "Entrate pianificate"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "CRM Lead: Segna letto"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefonata a telefonata"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Chiusura Attesa"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -3102,16 +2898,10 @@ msgid "Categorization"
 msgstr "Categorizzazione"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Registra Chiamata"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Regole Azione"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -3135,7 +2925,6 @@ msgstr "Data Creazione"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "a"
 
@@ -3161,7 +2950,6 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3253,20 +3041,11 @@ msgstr "Reimposta a Da Fare"
 msgid "Working Hours"
 msgstr "Ore lavorative"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Chiamate"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3288,7 +3067,7 @@ msgid "Lost"
 msgstr "Perso"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3337,19 +3116,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefonate per utente e sezione"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"L'appuntamento collegato all'opportunità <em>%s</em> è stato <b>creato</b> e "
-"<b>pianificato</b> in data <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negoziazione"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Chiusura Attesa"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefonata a telefonata"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3367,10 +3141,10 @@ msgid "Proposition"
 msgstr "Proposta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Data chiusura"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Chiamate"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3384,6 +3158,11 @@ msgstr "Anno"
 msgid "Newsletter"
 msgstr "Newsletter"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3528,6 +3307,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Eventi Partner"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condizioni sui campi del caso"
+
 #~ msgid "Reset to Draft"
 #~ msgstr "Riporta a Bozza"
 
@@ -4051,6 +3833,9 @@ msgstr ""
 #~ msgid "Condition on Communication History"
 #~ msgstr "Condizione sullo Storico Contatti"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Massimo Storico Contatti"
+
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Descrizione del Caso"
 
@@ -4088,9 +3873,15 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Un partner è già definito in questa telefonata."
 
+#~ msgid "Continue"
+#~ msgstr "Continua"
+
 #~ msgid "Message"
 #~ msgstr "Messaggio"
 
+#~ msgid "Create Partner"
+#~ msgstr "Creare Partner"
+
 #~ msgid "_Cancel"
 #~ msgstr "_Cancel"
 
@@ -4122,9 +3913,6 @@ msgstr ""
 #~ msgid "Internal Meeting"
 #~ msgstr "Riunione Interna"
 
-#~ msgid "Send Mail"
-#~ msgstr "Invia email"
-
 #~ msgid "To"
 #~ msgstr "Per"
 
@@ -4143,6 +3931,12 @@ msgstr ""
 #~ msgid "Invalid arguments"
 #~ msgstr "Argomenti non validi"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Si deve verificare che questo partner non esista già."
+
+#~ msgid "Success Probability"
+#~ msgstr "Probabilità di successo"
+
 #~ msgid "Salesman"
 #~ msgstr "Venditore"
 
@@ -4162,6 +3956,9 @@ msgstr ""
 #~ msgid "open"
 #~ msgstr "Aperto"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Espressione regolare nello storico del caso"
+
 #~ msgid "Exception Rule"
 #~ msgstr "Eccezione alla regola"
 
@@ -4188,6 +3985,9 @@ msgstr ""
 #~ "               \n"
 #~ "Se il caso ha bisogno di una revisione lo stato è impostato a \"Pendente\"."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nome opportunità"
+
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
@@ -4362,6 +4162,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "Per giorno"
 
+#~ msgid "Set Team to"
+#~ msgstr "Imposta il team a"
+
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Sincronizzazione calendario"
 
@@ -4371,6 +4174,9 @@ msgstr ""
 #~ msgid "Add Note"
 #~ msgstr "Aggiungi nota"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Converti a Opportunità "
+
 #~ msgid "Previous"
 #~ msgstr "Precedente"
 
@@ -4405,6 +4211,9 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Lunedì"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Crea un Partner"
+
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
@@ -4430,6 +4239,9 @@ msgstr ""
 #~ msgid "Mon"
 #~ msgstr "Lun"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Telefonata in Opportunità"
+
 #~ msgid "crm.phonecall"
 #~ msgstr "crm.phonecall"
 
@@ -4448,6 +4260,9 @@ msgstr ""
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Sei sicuro di voler creare un Partner basandolo su questa chiamata?"
+
 #~ msgid "_Schedule Call"
 #~ msgstr "_Pianifica chiamata"
 
@@ -4624,6 +4439,9 @@ msgstr ""
 #~ msgid "Edit All"
 #~ msgstr "Modifica tutto"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner in Opportunità"
+
 #, python-format
 #~ msgid "Unable to send mail. Please check SMTP is configured properly."
 #~ msgstr ""
@@ -4632,6 +4450,9 @@ msgstr ""
 #~ msgid "Frequency"
 #~ msgstr "Frequenza"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Unisci due Opportunità"
+
 #~ msgid "Invite People"
 #~ msgstr "Invita persone"
 
@@ -4641,6 +4462,9 @@ msgstr ""
 #~ msgid "Potential Reseller"
 #~ msgstr "Potenziale Rivenditore"
 
+#~ msgid "_Convert"
+#~ msgstr "_Converti"
+
 #~ msgid "Synchronization"
 #~ msgstr "Sincronizzazione"
 
@@ -4702,6 +4526,9 @@ msgstr ""
 #~ msgid "Sales Dashboard"
 #~ msgstr "Dashboard vendite"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefonata al partner"
+
 #~ msgid "Partners Segmentation"
 #~ msgstr "Segmentazione dei partner"
 
@@ -4727,6 +4554,9 @@ msgstr ""
 #~ msgid "Interest in Computer"
 #~ msgstr "Interessato ai Computer"
 
+#~ msgid "Set Category to"
+#~ msgstr "Imposta categoria a"
+
 #~ msgid "Image"
 #~ msgstr "Immagine"
 
@@ -5066,6 +4896,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Partner associato, tipicamente dopo la conversione del lead (opzionale)."
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Da Lead a Partner"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "CRM Lead Report"
 
@@ -5123,3 +4956,20 @@ msgstr ""
 
 #~ msgid "Opt-In"
 #~ msgstr "Opt-In"
+
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Opportunità / Cliente"
+
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Un partner è già stato definito."
+
+#~ msgid "Action Rules"
+#~ msgstr "Regole Azione"
+
+#~ msgid "Common to All Teams"
+#~ msgstr "Comune a Tutti i Teams"
+
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Si prega di selezionare più opportunità dalla lista"
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 5fdc67c55bf..9ba4cb0b6b6 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-09 05:13+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "リード"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "役職"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "アクション"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "商談を選択"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "締めを延期する"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "段階名"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "CRMリード分析"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr "作成日"
 msgid "Rule Name"
 msgstr "ルール名"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "他の電話をスケジュール"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "オプトアウト"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "状態"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "回答を除く"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "セクション"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "リード分析"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "キャンペーン"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "商談を選択"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "状態"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr "予想パートナ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "無題"
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "分類"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr "この割合は、成功のための、この段階の案件のデフォルト/ 平均確率を示します。"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,16 +433,22 @@ msgstr "分類"
 msgid "#Opportunities"
 msgstr "商談の数"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "パートナの連絡先Eメール"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -465,22 +479,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "商談作成"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "段階名"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -493,9 +498,9 @@ msgid "Mailings"
 msgstr "郵便物"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "ToDo"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -515,9 +520,9 @@ msgid "Planned Revenue"
 msgstr "計画売上高"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "見込売上"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -553,6 +558,11 @@ msgstr "要約"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr "案件分類"
 msgid "Partner Contact Name"
 msgstr "パートナの担当者名"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr "通話番号"
 msgid "The code of the sales team must be unique !"
 msgstr "営業チームのコードは固有である必要があります。"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,9 +661,9 @@ msgid "Partner Segmentation"
 msgstr "パートナの分類"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "分による期間"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -671,9 +681,9 @@ msgid "The name of the segmentation."
 msgstr "分類の名前"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "確率（%）"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr "統計ダッシュボード"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "商談"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "商談名"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "チーム設定先"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr "排他"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "%s から：%s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "作成年"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,9 +805,9 @@ msgid "Requirements"
 msgstr "必要事項"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "商談に変換 "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "郵便番号"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -884,9 +852,9 @@ msgid "Mark Won"
 msgstr "受注とマーク"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "確率（%）"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "警告"
@@ -921,23 +889,12 @@ msgstr "警告"
 msgid "Days to Open"
 msgstr "開始日"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "パートナの作成"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "携帯電話"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr "開始日数を計算するために使用"
 msgid "Meetings"
 msgstr "ミーティング"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "次のアクション"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr "分類の計算"
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr "作成日"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,23 +1079,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "見込売上"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr "9月"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,21 +1140,15 @@ msgid "Opening Date"
 msgstr "開始日"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "分による期間"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "チャネル名"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "続行"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr "分類ルールの部分としてのこのタブを使うことを望む場合はチェックします。チェックしない場合、以下の基準は無視されます。"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "パートナを作成"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,17 +1209,12 @@ msgid "unknown"
 msgstr "不明"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "パートナから商談へ"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1276,13 +1223,6 @@ msgstr "パートナから商談へ"
 msgid "Date"
 msgstr "日付"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr "メールを送信する時、デフォルトEメールアドレスは営業チームのものが使われます。"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "統合された商談"
@@ -1384,13 +1331,9 @@ msgstr "参照"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "キャンセル"
@@ -1411,14 +1354,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "リード / 商談は保留中状態です。"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "２つの商談を統合"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "ToDo"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "通話からパートナへ"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1457,6 +1407,16 @@ msgstr "リード / 商談は開いています。"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "セクション"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1503,6 +1463,12 @@ msgstr "名称"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "契約日"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1539,17 +1505,6 @@ msgstr "高い"
 msgid "Convert to prospect to business partner"
 msgstr "ビジネスパートナとして見込み客に変換"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1586,6 +1541,7 @@ msgstr "親チーム"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1594,11 +1550,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "次のアクションの日付"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "実行中"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1612,11 +1563,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "郵便番号"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1628,7 +1574,7 @@ msgid "Month of call"
 msgstr "通話の月"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1681,11 +1627,6 @@ msgstr "値"
 msgid "Customer Name"
 msgstr "顧客名"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "通話から商談へ"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1706,11 +1647,6 @@ msgstr "段階別の商談"
 msgid "Prospect is converting to business partner"
 msgstr "見込みはビジネスパートナに変換されています。"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1844,11 +1780,6 @@ msgstr "参照元"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "リードと商談を区別するためにタイプを使います。"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "この通話を元に、本当にパートナを作成したいのですか？"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1879,16 +1810,9 @@ msgid "Sales Teams"
 msgstr "営業チーム"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "リードからパートナへ"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "分類"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1900,12 +1824,6 @@ msgstr "チーム"
 msgid "Leads/Opportunities which are in New state"
 msgstr "新規状態にあるリード / 商談"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1917,12 +1835,6 @@ msgstr "未保留"
 msgid "Probability"
 msgstr "確信度"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "リストビューから１つ以上の商談を選択して下さい。"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1938,6 +1850,12 @@ msgstr "月"
 msgid "Leads"
 msgstr "リード"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1949,28 +1867,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "ToDo"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2031,24 +1939,6 @@ msgstr "保留中"
 msgid "Prospect Opportunity"
 msgstr "商談の見込み"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2097,17 +1987,15 @@ msgid "Mandatory Expression"
 msgstr "必須の表現"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2137,11 +2025,6 @@ msgstr "商談分析"
 msgid "Misc"
 msgstr "その他"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "案件の履歴の正規表現"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2169,11 +2052,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "担当"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2185,21 +2063,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "通信履歴の最大"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "作成年"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2266,7 +2145,6 @@ msgstr "処理の継続"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2348,8 +2226,13 @@ msgid "Company"
 msgstr "会社"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "実行中"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2357,6 +2240,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "見割当リード"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2377,26 +2265,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "変換"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2440,6 +2308,11 @@ msgstr ""
 "このレポートから、通話を基準としたあなたの営業チームの成績の分析ができます。より多くのグループをレポートに追加することで、幾つかの基準と情報のドリルダウン"
 "による情報のクループ化やフィルタができます。"
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2471,6 +2344,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "確認済"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2503,6 +2381,24 @@ msgstr "オプションの式"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2557,11 +2453,6 @@ msgstr "リードからビジネス商談の作成"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "分類の設定先"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2606,9 +2497,10 @@ msgid "Qualification"
 msgstr "資格"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "パートナの連絡先Eメール"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2626,14 +2518,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "パートナは既に定義済です。"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "8月"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2727,17 +2621,10 @@ msgid "Logged Calls"
 msgstr "ログ対象通話"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "成功確率"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "ドラフト"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2749,7 +2636,6 @@ msgstr "営業チーム毎の案件"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "ミーティング"
 
@@ -2758,11 +2644,6 @@ msgstr "ミーティング"
 msgid "Category of Case"
 msgstr "案件の分類"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "商談 / 顧客"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2786,11 +2667,6 @@ msgstr "番地"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "このパートナが既に存在しないことを確認する必要があります。"
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2809,21 +2685,6 @@ msgstr "ユーザ"
 msgid "November"
 msgstr "11月"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "交渉"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2847,11 +2708,6 @@ msgstr "契約"
 msgid "Twitter Ads"
 msgstr "Twitter広告"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "全てのチームに共通"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2863,14 +2719,9 @@ msgid "Planned Revenues"
 msgstr "計画売上高"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "通話から通話へ"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "見込完了"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2894,16 +2745,10 @@ msgid "Categorization"
 msgstr "分類化"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "通話ログ"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "アクションルール"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2927,7 +2772,6 @@ msgstr "作成日"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2953,7 +2797,6 @@ msgid "Description"
 msgstr "詳細"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3032,20 +2875,11 @@ msgstr "ToDoにリセット"
 msgid "Working Hours"
 msgstr "労働時間"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "通話"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "顧客"
 
@@ -3067,7 +2901,7 @@ msgid "Lost"
 msgstr "失注"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3115,17 +2949,14 @@ msgid "Phone calls by user and section"
 msgstr "ユーザとセクション別通話"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "交渉"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "見込完了"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "通話から通話へ"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3143,10 +2974,10 @@ msgid "Proposition"
 msgstr "案件"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "契約日"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "通話"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3160,6 +2991,11 @@ msgstr "年"
 msgid "Newsletter"
 msgstr "ニュースレター"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3212,6 +3048,9 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "詳細"
 
+#~ msgid "Continue"
+#~ msgstr "続行"
+
 #~ msgid "Supplier"
 #~ msgstr "仕入先"
 
@@ -3239,12 +3078,18 @@ msgstr ""
 #~ msgid "History Information"
 #~ msgstr "履歴情報"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "商談名"
+
 #~ msgid "Write Date"
 #~ msgstr "記入日"
 
 #~ msgid "Monday"
 #~ msgstr "月曜日"
 
+#~ msgid "Create a Partner"
+#~ msgstr "パートナを作成"
+
 #~ msgid "Schedule a Call"
 #~ msgstr "通話予定"
 
@@ -3329,6 +3174,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "既存パートナにリンク"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "案件の履歴の正規表現"
+
 #~ msgid "Mail Gateway"
 #~ msgstr "メールゲートウェイ"
 
@@ -3396,6 +3244,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "日別"
 
+#~ msgid "Set Team to"
+#~ msgstr "チーム設定先"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
@@ -3430,6 +3281,12 @@ msgstr ""
 #~ msgid "Scheduled Phonecalls"
 #~ msgstr "スケジュール済通話"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "この通話を元に、本当にパートナを作成したいのですか？"
+
+#~ msgid "Phonecall to Partner"
+#~ msgstr "通話からパートナへ"
+
 #~ msgid "Recurrent"
 #~ msgstr "定期"
 
@@ -3442,6 +3299,9 @@ msgstr ""
 #~ msgid "Recurrent ID date"
 #~ msgstr "定期ID日付"
 
+#~ msgid "Create Partner"
+#~ msgstr "パートナの作成"
+
 #~ msgid "Opt-In"
 #~ msgstr "オプトイン"
 
@@ -3506,6 +3366,9 @@ msgstr ""
 #~ msgid "Day of month"
 #~ msgstr "月の日"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "全てのチームに共通"
+
 #~ msgid "Wed"
 #~ msgstr "水"
 
@@ -3589,6 +3452,9 @@ msgstr ""
 #~ msgid "Unconfirmed"
 #~ msgstr "未確定"
 
+#~ msgid "_Convert"
+#~ msgstr "変換"
+
 #~ msgid "The"
 #~ msgstr "・"
 
@@ -3638,6 +3504,9 @@ msgstr ""
 #~ msgid "Leads/Opportunities created in last month"
 #~ msgstr "先月作成されたリード / 商談"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "商談 / 顧客"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been marked as lost."
 #~ msgstr "商談 %s は失注としてマークされています。"
@@ -3646,6 +3515,9 @@ msgstr ""
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "リード %s は商談に変換されました。"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "商談に変換 "
+
 #~ msgid ""
 #~ "Stages will allow salesmen to easily track how a specific opportunity is "
 #~ "positioned in the sales cycle. In order to efficiently manage your sales "
@@ -3669,6 +3541,12 @@ msgstr ""
 #~ "タフェースを使って、携帯電話と同期させることもできます。\n"
 #~ "        "
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "パートナから商談へ"
+
+#~ msgid "Merge two Opportunities"
+#~ msgstr "２つの商談を統合"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "分類別商談"
 
@@ -3697,6 +3575,9 @@ msgstr ""
 #~ msgid "Convert opportunities"
 #~ msgstr "商談の変換"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "通話から商談へ"
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "商談に変換"
 
@@ -3809,6 +3690,13 @@ msgstr ""
 #~ msgid "Pending Opportunities"
 #~ msgstr "保留中商談"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "リストビューから１つ以上の商談を選択して下さい。"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "リードからパートナへ"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "未確認にリセット"
 
@@ -4000,6 +3888,9 @@ msgstr ""
 #~ msgid "Exception Date/Times"
 #~ msgstr "例外の日付 / 時間"
 
+#~ msgid "Set Category to"
+#~ msgstr "分類の設定先"
+
 #~ msgid "Need Information"
 #~ msgstr "情報が必要"
 
@@ -4034,6 +3925,10 @@ msgstr ""
 #~ msgid "Daily"
 #~ msgstr "日次"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "パートナは既に定義済です。"
+
 #~ msgid "First"
 #~ msgstr "第１"
 
@@ -4083,6 +3978,9 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "デフォルト（0=なし）"
 
+#~ msgid "Success Probability"
+#~ msgstr "成功確率"
+
 #~ msgid "7 Days"
 #~ msgstr "7日間"
 
@@ -4099,6 +3997,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "ミーティングの分類"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "このパートナが既に存在しないことを確認する必要があります。"
+
 #~ msgid "Error ! You can not create recursive profiles."
 #~ msgstr "エラー。再帰的なプロファイルの作成はできません。"
 
@@ -4115,6 +4016,9 @@ msgstr ""
 #~ msgid "Partner Contact"
 #~ msgstr "パートナ連絡先"
 
+#~ msgid "Action Rules"
+#~ msgstr "アクションルール"
+
 #~ msgid "Recurrency"
 #~ msgstr "定期的"
 
@@ -4172,3 +4076,6 @@ msgstr ""
 
 #~ msgid "# Emails"
 #~ msgstr "Eメールの数"
+
+#~ msgid "Maximum Communication History"
+#~ msgstr "通信履歴の最大"
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index bb1923aabc9..dabb1b6a70a 100644
--- a/addons/crm/i18n/ko.po
+++ b/addons/crm/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:13+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -44,19 +46,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "액션"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -65,11 +77,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,9 +84,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "규칙 이름"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "재외된 답변들:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "섹션"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "세그먼테이션"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr "카테고리"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,21 +479,12 @@ msgstr "상태"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,8 +520,8 @@ msgid "Planned Revenue"
 msgstr "계획된 수입"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -553,6 +558,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr "케이스 카테고리"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr "파트너 세그먼테이션"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,9 +681,9 @@ msgid "The name of the segmentation."
 msgstr "세그먼테이션 이름"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "가능성 (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr "배타적"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,8 +805,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -884,9 +852,9 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "가능성 (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "경고 !"
@@ -921,23 +889,12 @@ msgstr "경고 !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "케이스 필드 상의 조건"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr "케이스 필드 상의 조건"
 msgid "Next Action"
 msgstr "다음 액션"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "초안"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr "세그먼테이션 계산"
 msgid "Lowest"
 msgstr "최저"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr "생성 날짜:"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,10 +1079,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1133,12 +1088,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1230,14 +1190,6 @@ msgstr ""
 "이 탭을 세그먼테이션 규칙의 일부로 이용하려면 체크하십시오.\r\n"
 "체크되지 않으면, 기저의 범주가 무시됩니다."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1259,15 +1211,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1278,13 +1225,6 @@ msgstr ""
 msgid "Date"
 msgstr "날짜"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1331,6 +1271,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1342,7 +1289,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1386,13 +1333,9 @@ msgstr "참조"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "취소"
@@ -1413,13 +1356,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1459,6 +1409,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "섹션"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1503,6 +1463,12 @@ msgstr "이름"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1539,17 +1505,6 @@ msgstr "높음"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1586,6 +1541,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1594,11 +1550,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "진행 중"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1612,11 +1563,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1628,7 +1574,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1681,11 +1627,6 @@ msgstr "값"
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1706,11 +1647,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1844,11 +1780,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1879,17 +1810,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "세그먼테이션"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1900,12 +1824,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1917,12 +1835,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1938,6 +1850,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1949,28 +1867,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2031,24 +1939,6 @@ msgstr "보류"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2097,17 +1987,15 @@ msgid "Mandatory Expression"
 msgstr "필수 표현"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2137,11 +2025,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2169,11 +2052,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "책임"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2185,21 +2063,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "최대 커뮤니케이션 히스토리"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2266,7 +2145,6 @@ msgstr "프로세스 계속"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2348,8 +2226,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "진행 중"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2357,6 +2240,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2377,26 +2265,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2438,6 +2306,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2469,6 +2342,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2501,6 +2379,24 @@ msgstr "선택적 표현"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2553,11 +2449,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2602,8 +2493,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2622,14 +2514,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2723,18 +2617,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "초안"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2745,7 +2632,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2754,11 +2640,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2782,11 +2663,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2805,21 +2681,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2843,11 +2704,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2859,13 +2715,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2890,16 +2741,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2923,7 +2768,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2949,7 +2793,6 @@ msgid "Description"
 msgstr "설명"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3028,20 +2871,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3063,7 +2897,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3111,16 +2945,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3139,9 +2970,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3156,6 +2987,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3529,6 +3365,9 @@ msgstr ""
 #~ msgid "Maximim Priority"
 #~ msgstr "최대 우선순위"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "케이스 필드 상의 조건"
+
 #~ msgid "Category of case"
 #~ msgstr "케이스 카테고리"
 
@@ -3704,6 +3543,9 @@ msgstr ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr "사용자에게 상기 서신을 보낼 규칙을 사용하려면 체크하십시오."
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "최대 커뮤니케이션 히스토리"
+
 #~ msgid "All Canceled "
 #~ msgstr "취소된 모두 "
 
diff --git a/addons/crm/i18n/lo.po b/addons/crm/i18n/lo.po
index 89f495f9835..0fa7e7d6226 100644
--- a/addons/crm/i18n/lo.po
+++ b/addons/crm/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 19:07+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "ຮ່ອມຮອຍ"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "ຫົວຂໍ້້"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "ເລືອກໂອກາດ"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "ເຍື້ອນໄປເພື່ອປິດ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "ຊື່ຂັ້ນຕອນ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr "ມື້ສ້າງ"
 msgid "Rule Name"
 msgstr "ຊື່ກົດການ"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "ລະວັງ !"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "ຕຽມເອີ້ນໃໝ່"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,8 +248,8 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "ເລືອກໂອກາດ"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,23 +479,14 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "ຊື່ຂັ້ນຕອນ"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Escalate"
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,8 +520,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -553,6 +558,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr "ລາຫັດຂອງທີມຂາຍຕ້ອງມີຕົວດຽວ"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,8 +681,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,8 +805,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -884,8 +852,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "ລະວັງ !"
@@ -921,23 +889,12 @@ msgstr "ລະວັງ !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,10 +1079,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1133,12 +1088,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,15 +1209,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1276,13 +1223,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1384,13 +1331,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1411,13 +1354,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1457,6 +1407,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,15 +1808,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1898,12 +1822,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,14 +2061,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2198,6 +2070,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2447,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2491,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,14 +2512,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2721,16 +2615,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2743,7 +2630,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2752,11 +2638,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2661,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2679,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2702,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2713,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2739,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2766,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2791,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2869,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3061,7 +2895,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2943,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,9 +2968,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3154,6 +2985,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 2f1ea014c6f..72e227a975a 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-06 18:54+0000\n"
 "Last-Translator: zadukas <depuxster@gmail.com>\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: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: lt\n"
 
 #. module: crm
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciatyva"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Kreipinys"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Veiksmas"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Pažymėti galimybės"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Delsimas užverti"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Etapo pavadinimas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "CRM iniciatyvų analizė"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr "Sukūrimo diena"
 msgid "Rule Name"
 msgstr "Taisyklės pavadinimas"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Įspėjimas"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Suplanuoti kitą skambutį"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Draudžia siųsti"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Būsena"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Neįeinantys atsakymai:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekcijos"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Iniciatyvų analizė"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampanijos"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Pažymėti galimybės"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Būsena"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Galimas partneris"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Nėra temos"
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentacija"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -414,7 +423,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -429,15 +437,21 @@ msgstr "Kategorija"
 msgid "#Opportunities"
 msgstr "Pardavimų galimybės"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -469,22 +483,13 @@ msgstr "Būsena"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Sukurti pardavimo galimybę"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Rugpjūtis"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Etapo pavadinimas"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Konfigūruoti"
 
 #. module: crm
 #: view:crm.lead:0
@@ -497,9 +502,9 @@ msgid "Mailings"
 msgstr "El. laiškai"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Darbas"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -519,9 +524,9 @@ msgid "Planned Revenue"
 msgstr "Planuojamos pajamos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Numanomos pajamos"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -557,6 +562,11 @@ msgstr "Santrauka"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -567,11 +577,6 @@ msgstr "Įvykio kategorija"
 msgid "Partner Contact Name"
 msgstr "Partnerio kontakto vardas"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -594,6 +599,11 @@ msgstr "Telefonų skambučiai"
 msgid "The code of the sales team must be unique !"
 msgstr "Pardavimų komandos kodas turi būti unikalus!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -657,9 +667,9 @@ msgid "Partner Segmentation"
 msgstr "Partnerio segmentavimas"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Trukmė minutėmis"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -677,9 +687,9 @@ msgid "The name of the segmentation."
 msgstr "Segmentacijos pavadinimas."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Tikimybė (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -697,13 +707,7 @@ msgid "Statistics Dashboard"
 msgstr "Veiklos monintoringo statistika"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -716,12 +720,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Pardavimo galimybė"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -758,17 +756,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Pardavimo galimybės pavadinimas"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Nustatytį komandą"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -780,25 +767,21 @@ msgid "Exclusive"
 msgstr "Išskirtinis"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Nuo %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Sukūrimo metai"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -821,21 +804,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -843,9 +811,9 @@ msgid "Requirements"
 msgstr "Reikalavimai"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Konvertuoti į pardavimo galimybę "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Pašto indeksas"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -890,9 +858,9 @@ msgid "Mark Won"
 msgstr "Pažymėti laimėta"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Tikimybė (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -917,7 +885,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Perspėjimas!"
@@ -927,23 +895,12 @@ msgstr "Perspėjimas!"
 msgid "Days to Open"
 msgstr "Dienų skaičius iki atvėrimo"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Sukurti partnerį"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobilus tel."
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -969,11 +926,6 @@ msgstr "Naudojmas paskaičiuoti laisvas dienas"
 msgid "Meetings"
 msgstr "Susitikimai"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Įvykio laukų sąlygos"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -981,6 +933,19 @@ msgstr "Įvykio laukų sąlygos"
 msgid "Next Action"
 msgstr "Kitas veiksmas"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Juodraštis"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1049,14 +1014,6 @@ msgstr "Apskaičiuoti segmentaciją"
 msgid "Lowest"
 msgstr "Mažiausias"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1066,9 +1023,9 @@ msgid "Creation Date"
 msgstr "Sukūrimo data"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1128,23 +1085,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Numanomos pajamos"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1153,8 +1102,19 @@ msgid "September"
 msgstr "Rugsėjis"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1186,21 +1146,15 @@ msgid "Opening Date"
 msgstr "Atidarymo data"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Trukmė minutėmis"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Kanalo pavadinimas"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Tęsti"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1229,6 +1183,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1238,14 +1198,6 @@ msgstr ""
 "Pažymėkite, jeigu norite naudoti šią kortelę kaip dalį segmentavimo "
 "taisyklės. Jeigu nepažymėta, žemiau esantys kriterijai bus nepaisomi."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Sukurti partnerį"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1267,17 +1219,12 @@ msgid "unknown"
 msgstr "nežinomas"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partneris į pardavimo galimybę"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1286,13 +1233,6 @@ msgstr "Partneris į pardavimo galimybę"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1339,6 +1279,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1350,7 +1297,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Sulieti galimybes"
@@ -1394,13 +1341,9 @@ msgstr "Nuorodos"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Atsisakyti"
@@ -1421,14 +1364,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Sulieti dvi pardavimo galimybes"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Darbas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Skambutį į partnerį"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1467,6 +1417,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekcijos"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1515,6 +1475,12 @@ msgstr "Pavadinimas"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Užvėrimo data"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1551,17 +1517,6 @@ msgstr "Didelis"
 msgid "Convert to prospect to business partner"
 msgstr "Konvertuoti galimą klientą į verslo partnerius"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1598,6 +1553,7 @@ msgstr "Tėvinė komanda"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1606,11 +1562,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Kito veiksmo data"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Vykdomas"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1624,11 +1575,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Pašto indeksas"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1640,7 +1586,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1693,11 +1639,6 @@ msgstr "Vertė"
 msgid "Customer Name"
 msgstr "Kliento pavadinimas"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Skambutis į pardavimo galimybę"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1718,11 +1659,6 @@ msgstr "Pardavimo galimybės pagal etapą"
 msgid "Prospect is converting to business partner"
 msgstr "Galimas klientas konvertuojamas į verslo partnerį"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1856,11 +1792,6 @@ msgstr "Nuoroda"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipas naudojamas atskirti iniciatyvas nuo pardavimo galimybių"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Ar tikrai norite sukurti partnerį pagal šį skambutį?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1891,16 +1822,9 @@ msgid "Sales Teams"
 msgstr "Pardavimų komandos"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Iniciatyvą į partnerį"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentacija"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1912,12 +1836,6 @@ msgstr "Komanda"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1929,12 +1847,6 @@ msgstr "Neįvyko"
 msgid "Probability"
 msgstr "Tikimybė"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1950,6 +1862,12 @@ msgstr "Mėnuo"
 msgid "Leads"
 msgstr "Iniciatyvos"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1961,28 +1879,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Planuojamas"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2043,24 +1951,6 @@ msgstr "Laukti"
 msgid "Prospect Opportunity"
 msgstr "Galimo kliento pardavimo galimybė"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2109,17 +1999,15 @@ msgid "Mandatory Expression"
 msgstr "Privaloma išraiška"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Siųsti el. laikšą"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2149,11 +2037,6 @@ msgstr "Pardavimo galimybių analizė"
 msgid "Misc"
 msgstr "Įvairūs"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Regulerusis reiškinys įvykio istorijai"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2181,11 +2064,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Atsakingas"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2197,21 +2075,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimali bendravimo istorija"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Sukūrimo metai"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2278,7 +2157,6 @@ msgstr "Tęsti procesą"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2360,8 +2238,13 @@ msgid "Company"
 msgstr "Kompanija"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Vykdomas"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2369,6 +2252,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Nepriskirtos iniciatyvos"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2389,26 +2277,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Konvertuoti"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2450,6 +2318,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2481,6 +2354,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Patvirtintas"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2513,6 +2391,24 @@ msgstr "Pasirenkama išraiška"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2565,11 +2461,6 @@ msgstr "Kuriamos verslo galimybes iš iniciatyvų"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Nustatyti kategoriją"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2614,8 +2505,9 @@ msgid "Qualification"
 msgstr "Kvalifikacija"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2634,15 +2526,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Rugpjūtis"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Konfigūruoti"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2738,17 +2632,10 @@ msgid "Logged Calls"
 msgstr "Užregistruoti skambučiai"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Sėkmės tikimybė"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Juodraštis"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2760,7 +2647,6 @@ msgstr "Įvykiai pagal pardavimų komandą"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Susitikimas"
 
@@ -2769,11 +2655,6 @@ msgstr "Susitikimas"
 msgid "Category of Case"
 msgstr "Kategorija pagal įvykį"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Galimybė / Klientas"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2797,11 +2678,6 @@ msgstr "Gatvė 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Gali reikėti patikrinti ar šis partneris jau neegzistuoja."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2820,21 +2696,6 @@ msgstr "Naudotojas"
 msgid "November"
 msgstr "Lapkritis"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Derybos"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2858,11 +2719,6 @@ msgstr "Kontraktas"
 msgid "Twitter Ads"
 msgstr "Twitter reklamos"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2874,14 +2730,9 @@ msgid "Planned Revenues"
 msgstr "Planuojamos pajamos"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Skambutį į skambutį"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Numatomas užvėrimas"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2905,16 +2756,10 @@ msgid "Categorization"
 msgstr "Kategorizavimas"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Veiksmų taisyklės"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2938,7 +2783,6 @@ msgstr "Sukūrimo data"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2964,7 +2808,6 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3043,20 +2886,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Darbo valandos"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefono skambučiai"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Klientas"
 
@@ -3078,7 +2912,7 @@ msgid "Lost"
 msgstr "Prarasta"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3126,17 +2960,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefono skambučiai pagal naudotoją ir sekciją"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Derybos"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Numatomas užvėrimas"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Skambutį į skambutį"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3154,10 +2985,10 @@ msgid "Proposition"
 msgstr "Pasiūlymas"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Užvėrimo data"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefono skambučiai"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3171,6 +3002,11 @@ msgstr "Metai"
 msgid "Newsletter"
 msgstr "Naujienlaiškis"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3512,6 +3348,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Partnerio įvykiai"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Įvykio laukų sąlygos"
+
 #~ msgid "Case Communication History"
 #~ msgstr "Įvykio komunikavimo istorija"
 
@@ -3912,6 +3751,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Nurodyti esamą partnerį"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Regulerusis reiškinys įvykio istorijai"
+
 #, python-format
 #~ msgid "The lead '%s' has been opened."
 #~ msgstr "Iniciatyva '%s' buvo atverta."
@@ -4023,9 +3865,15 @@ msgstr ""
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Kalendoriaus sinchronizavimas"
 
+#~ msgid "Continue"
+#~ msgstr "Tęsti"
+
 #~ msgid "By day"
 #~ msgstr "Pagal dieną"
 
+#~ msgid "Set Team to"
+#~ msgstr "Nustatytį komandą"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been won."
 #~ msgstr "Pardavimų galimybė '%s' laimėjo."
@@ -4033,6 +3881,9 @@ msgstr ""
 #~ msgid "Set an alarm at this time, before the event occurs"
 #~ msgstr "Nustatykite priminimą šiam laikui, prieš įvykstant įvykiui"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Konvertuoti į pardavimo galimybę "
+
 #~ msgid "Add Note"
 #~ msgstr "Pridėti pastabą"
 
@@ -4049,6 +3900,9 @@ msgstr ""
 #~ msgid "Show time as"
 #~ msgstr "Rodyti laiką kaip"
 
+#~ msgid "Create Partner"
+#~ msgstr "Sukurti partnerį"
+
 #~ msgid "Way to end reccurency"
 #~ msgstr "Būdas užbaigti pasikartojimą"
 
@@ -4123,6 +3977,9 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Valdo pagalbos centro paslaugą."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Pardavimo galimybės pavadinimas"
+
 #~ msgid "  Year  "
 #~ msgstr "  Metai  "
 
@@ -4141,9 +3998,15 @@ msgstr ""
 #~ msgid "Reminder"
 #~ msgstr "Priminimas"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Sukurti partnerį"
+
 #~ msgid "Monday"
 #~ msgstr "Pirmadienis"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partneris į pardavimo galimybę"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Pardavimo galimybės santrauka"
 
@@ -4166,6 +4029,9 @@ msgstr ""
 #~ msgid "Frequency"
 #~ msgstr "Dažnumas"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Sulieti dvi pardavimo galimybes"
+
 #~ msgid "Fix amout of times"
 #~ msgstr "Nustatytą kiekį kartų"
 
@@ -4201,6 +4067,9 @@ msgstr ""
 #~ "Pardavimų komanda kuriai priklauso šis įvykis. Nurodo el. pašto šliuzui "
 #~ "atsakingą naudotoją ir jo el. pašto adresą."
 
+#~ msgid "_Convert"
+#~ msgstr "_Konvertuoti"
+
 #~ msgid "Saturday"
 #~ msgstr "Šeštadienis"
 
@@ -4259,6 +4128,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Pardavimo galimybės pagal kategoriją"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Skambutis į pardavimo galimybę"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Pasirinkite etapus šiai pardavimų komandai"
 
@@ -4286,6 +4158,9 @@ msgstr ""
 #~ msgid "Weeks"
 #~ msgstr "Savaitės"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Ar tikrai norite sukurti partnerį pagal šį skambutį?"
+
 #~ msgid ""
 #~ "Define a Sales Team to organize your different salesmen or sales departments "
 #~ "into separate teams. Each team will work in its own list of opportunities, "
@@ -4302,6 +4177,9 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Kartoti x kartų"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Iniciatyvą į partnerį"
+
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
@@ -4368,9 +4246,6 @@ msgstr ""
 #~ msgid "CC"
 #~ msgstr "Cc"
 
-#~ msgid "Send Mail"
-#~ msgstr "Siųsti el. laikšą"
-
 #~ msgid "Claims"
 #~ msgstr "Skundai"
 
@@ -4427,6 +4302,9 @@ msgstr ""
 #~ msgid "Main Job"
 #~ msgstr "Pagrindinis darbas"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimali bendravimo istorija"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "Ar tikrai norite sukurti partnerį remiantis šia iniciatyva?"
 
@@ -4475,6 +4353,9 @@ msgstr ""
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Iniciatyva į pardavimo galimybę"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Skambutį į partnerį"
+
 #~ msgid ""
 #~ "The name of the future partner that will be created while converting the "
 #~ "into opportunity"
@@ -4628,6 +4509,9 @@ msgstr ""
 #~ msgid "Need Information"
 #~ msgstr "Reikia informacijos"
 
+#~ msgid "Set Category to"
+#~ msgstr "Nustatyti kategoriją"
+
 #~ msgid "Thu"
 #~ msgstr "Ketv."
 
@@ -4682,6 +4566,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Klaida! Jūs negalite sukurti rekursiškai susijusio nario."
 
+#~ msgid "Success Probability"
+#~ msgstr "Sėkmės tikimybė"
+
 #~ msgid "Attendees"
 #~ msgstr "Dalyviai"
 
@@ -4697,6 +4584,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Susitikimo kategorijos"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Gali reikėti patikrinti ar šis partneris jau neegzistuoja."
+
 #~ msgid "Schedule Phone Call"
 #~ msgstr "Numatytas skambutis telefonu"
 
@@ -4740,6 +4630,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Užverti"
 
+#~ msgid "Action Rules"
+#~ msgstr "Veiksmų taisyklės"
+
 #~ msgid "Recurrency"
 #~ msgstr "Pasikartojimas"
 
@@ -4801,6 +4694,9 @@ msgstr ""
 #~ msgid "Mail Gateway"
 #~ msgstr "El. pašto šliuzas"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Galimybė / Klientas"
+
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Planuoti/Registruoti skambutį"
 
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 7d6d25de99d..8cc066b44b5 100644
--- a/addons/crm/i18n/lv.po
+++ b/addons/crm/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-25 09:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Potenciālie Klienti"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Uzruna"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Darbība"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Izvēlēties iespējamo darījumu"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Kavēt pirms slēgšanas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Posma nosaukums"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Noteikuma nosaukums"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Uzmanību!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Ieplānot piezvanīt vēlreiz"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Neiekļautās Atbildes:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sadaļas"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Potenciālo klientu Analīze"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampaņas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Izvēlēties iespējamo darījumu"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stāvoklis"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr "Partneris paredzamajam klientam"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentācija"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr "Kategorija"
 msgid "#Opportunities"
 msgstr "Potenciālo darījumu skaits"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,22 +479,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Izveidot Potenciālo darījumu"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Augusts"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Posma nosaukums"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Konfigurēt"
 
 #. module: crm
 #: view:crm.lead:0
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr "Sarakste"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,9 +520,9 @@ msgid "Planned Revenue"
 msgstr "Plānotie ieņēmumi"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Sagaidāmais ienākums"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -553,6 +558,11 @@ msgstr "Kopsavilkums"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr "Pieprasījuma kategorija"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr "Zvanu skaits"
 msgid "The code of the sales team must be unique !"
 msgstr "Pārdošanas komandas kodam jābūt unikālam!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,9 +661,9 @@ msgid "Partner Segmentation"
 msgstr "Partnera Segmentācija"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Ilgums minūtēs"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -671,9 +681,9 @@ msgid "The name of the segmentation."
 msgstr "Segmentācijas nosaukums"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Iespējamība"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistikas instrumentu panelis"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Potenciālais darījums"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Potenciālā darījuma nosaukums"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Noteikt komandu"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr "Atzīmēt kā īpašs"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,9 +805,9 @@ msgid "Requirements"
 msgstr "Prasības"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Pārveidot par Potenciālo darījumu "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Pasta indekss"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -884,9 +852,9 @@ msgid "Mark Won"
 msgstr "Atzīmēt kā uzvarētu"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Iespējamība"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Uzmanību!"
@@ -921,23 +889,12 @@ msgstr "Uzmanību!"
 msgid "Days to Open"
 msgstr "Dienas līdz Atvēršanai"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Veidot partneri"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mob. tālr."
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Tikšanās"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Nākamā darbība"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Melnraksts"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr "Aprēķināt Segmentāciju"
 msgid "Lowest"
 msgstr "Zemākā"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr "Izveides Datums"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,23 +1079,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Sagaidāmais ienākums"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr "Septembris"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,21 +1140,15 @@ msgid "Opening Date"
 msgstr "Atvēršanas datums"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Ilgums minūtēs"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Turpināt"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1223,6 +1177,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1230,14 +1190,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Veidot partneri"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1259,17 +1211,12 @@ msgid "unknown"
 msgstr "nezināma"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partneri par Potenciālo darījumu"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1278,13 +1225,6 @@ msgstr "Partneri par Potenciālo darījumu"
 msgid "Date"
 msgstr "Datums"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1331,6 +1271,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1342,7 +1289,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1386,13 +1333,9 @@ msgstr "Atsauces"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Atcelt"
@@ -1413,14 +1356,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Apvienot divus Potenciālos darījumus"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Zvanīt Partnerim"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1459,6 +1409,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sadaļas"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1503,6 +1463,12 @@ msgstr "Nosaukums"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Slēgšanas Datums"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1539,17 +1505,6 @@ msgstr "Augsta"
 msgid "Convert to prospect to business partner"
 msgstr "Pārveidot paredzamo klientu par biznesa partneri"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1586,6 +1541,7 @@ msgstr "Virskomanda"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1594,11 +1550,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Nākamās darbības datums"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Aktīvs"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1612,11 +1563,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Pasta indekss"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1628,7 +1574,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1681,11 +1627,6 @@ msgstr "Vērtība"
 msgid "Customer Name"
 msgstr "Klienta nosaukums"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Zvanu par Potenciālo darījumu"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1706,11 +1647,6 @@ msgstr "Potenciālie darījumi pēc Posma"
 msgid "Prospect is converting to business partner"
 msgstr "Paredzamais klients tiek pārveidots par biznesa partneri"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1846,11 +1782,6 @@ msgstr ""
 "Tips tiek lietots, lai atšķirtu potenciālos klientus no potenciālajiem "
 "darījumiem"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1881,16 +1812,9 @@ msgid "Sales Teams"
 msgstr "Pārdošanas komandas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Potenciālo Klientu par partneri"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentācija"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1902,12 +1826,6 @@ msgstr "Komanda"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1919,12 +1837,6 @@ msgstr "Nav Noticis"
 msgid "Probability"
 msgstr "Iespējamība"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1940,6 +1852,12 @@ msgstr "Mēnesis"
 msgid "Leads"
 msgstr "Pavedieni"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1951,28 +1869,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Jāveic"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2033,24 +1941,6 @@ msgstr "Gaida"
 msgid "Prospect Opportunity"
 msgstr "Paredzamais darījums ar Klientu"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2099,17 +1989,15 @@ msgid "Mandatory Expression"
 msgstr "Obligāta izteiksme"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Sūtīt pastu"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2139,11 +2027,6 @@ msgstr "Potenciālo darījumu analīze"
 msgid "Misc"
 msgstr "Dažādi"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Regulāra izteiksme lietas vēsturei"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2171,11 +2054,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Atbildīgais"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2187,21 +2065,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimālā saziņas vēsture"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2268,7 +2147,6 @@ msgstr "Turpināt procesu"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2350,8 +2228,13 @@ msgid "Company"
 msgstr "Uzņēmums"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Aktīvs"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2359,6 +2242,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2379,26 +2267,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Pārveidot"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2440,6 +2308,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2471,6 +2344,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Apstiprināts"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2503,6 +2381,24 @@ msgstr "Neobligāta izteiksme"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2555,11 +2451,6 @@ msgstr "Veido biznesa izdevības no pavedieniem"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Atzīmēt Kategoriju kā"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2604,8 +2495,9 @@ msgid "Qualification"
 msgstr "Kvalifikācija"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2624,15 +2516,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Augusts"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Konfigurēt"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2725,17 +2619,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Veiksmes Iespējamība"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Melnraksts"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2747,7 +2634,6 @@ msgstr "Pieprasījumi pēc pārdošanas komandas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Tikšanās"
 
@@ -2756,11 +2642,6 @@ msgstr "Tikšanās"
 msgid "Category of Case"
 msgstr "Pieprasījuma Kategorija"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2784,11 +2665,6 @@ msgstr "Iela2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2807,21 +2683,6 @@ msgstr "Lietotājs"
 msgid "November"
 msgstr "Novembris"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Sarunas"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2845,11 +2706,6 @@ msgstr "Līgums"
 msgid "Twitter Ads"
 msgstr "Twitter ziņojumi"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2861,14 +2717,9 @@ msgid "Planned Revenues"
 msgstr "Plānotie Ieņēmumi"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefonsarunu par Telefonsarunu"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Sag.pabeig."
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2892,16 +2743,10 @@ msgid "Categorization"
 msgstr "Kategorizācija"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Darbību noteikumi"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2925,7 +2770,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2951,7 +2795,6 @@ msgid "Description"
 msgstr "Apraksts"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3030,20 +2873,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Darba laiks"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Zvani"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Klients"
 
@@ -3065,7 +2899,7 @@ msgid "Lost"
 msgstr "Zaudēts"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3113,17 +2947,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefonsarunas pēc lietotāja un sekcijas"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Sarunas"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Sag.pabeig."
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefonsarunu par Telefonsarunu"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3141,10 +2972,10 @@ msgid "Proposition"
 msgstr "Priekšlikums"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Slēgšanas Datums"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Zvani"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3158,6 +2989,11 @@ msgstr "Gads"
 msgid "Newsletter"
 msgstr "Izziņošana"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3220,6 +3056,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Saite uz esošo partneri"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Regulāra izteiksme lietas vēsturei"
+
 #~ msgid "_Send"
 #~ msgstr "_Sūtīt"
 
@@ -3284,6 +3123,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "Pēc dienas"
 
+#~ msgid "Set Team to"
+#~ msgstr "Noteikt komandu"
+
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Kalendāra sinhronizēšana"
 
@@ -3341,9 +3183,15 @@ msgstr ""
 #~ msgid "  Year  "
 #~ msgstr "  Gads  "
 
+#~ msgid "Continue"
+#~ msgstr "Turpināt"
+
 #~ msgid "Monday"
 #~ msgstr "Pirmdiena"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Veidot partneri"
+
 #~ msgid "Reminder"
 #~ msgstr "Atgādinājums"
 
@@ -3386,6 +3234,9 @@ msgstr ""
 #~ msgid "Potential Reseller"
 #~ msgstr "Potenciāls aģents"
 
+#~ msgid "_Convert"
+#~ msgstr "_Pārveidot"
+
 #~ msgid "Invitation details"
 #~ msgstr "Ielūguma sīkāka informācija"
 
@@ -3475,9 +3326,6 @@ msgstr ""
 #~ msgid "Uncertain"
 #~ msgstr "Nenoteikts"
 
-#~ msgid "Send Mail"
-#~ msgstr "Sūtīt pastu"
-
 #~ msgid ">"
 #~ msgstr ">"
 
@@ -3522,6 +3370,9 @@ msgstr ""
 #~ msgid "CRM - Statistics Dashboard"
 #~ msgstr "CRM - statistikas instrumentu panelis"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimālā saziņas vēsture"
+
 #~ msgid "Third"
 #~ msgstr "Trešais"
 
@@ -3669,6 +3520,9 @@ msgstr ""
 #~ msgid "Thursday"
 #~ msgstr "Ceturtdiena"
 
+#~ msgid "Action Rules"
+#~ msgstr "Darbību noteikumi"
+
 #~ msgid "Recurrency"
 #~ msgstr "Atkārtošanās"
 
@@ -3856,6 +3710,9 @@ msgstr ""
 #~ msgid "Current Activity"
 #~ msgstr "Pašreizējās Aktivitātes"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Pārveidot par Potenciālo darījumu "
+
 #, python-format
 #~ msgid "The opportunity '%s' has been won."
 #~ msgstr "Potenciālais darījums '%s' ir uzvarēts."
@@ -3864,6 +3721,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been closed."
 #~ msgstr "Potenciālais darījums '%s' ir slēgts."
 
+#~ msgid "Create Partner"
+#~ msgstr "Veidot partneri"
+
 #~ msgid "My Meetings"
 #~ msgstr "Manas Tikšanās"
 
@@ -3891,12 +3751,18 @@ msgstr ""
 #~ msgid "Condition Case Fields"
 #~ msgstr "Pieteikuma nosacījumu lauki"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Potenciālā darījuma nosaukums"
+
 #~ msgid "Edit All"
 #~ msgstr "Labot Visus"
 
 #~ msgid "Fri"
 #~ msgstr "Piekt."
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partneri par Potenciālo darījumu"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Potenciālā darījuma kopsavilkums"
 
@@ -3909,6 +3775,9 @@ msgstr ""
 #~ msgid "Fix amout of times"
 #~ msgstr "Noteikt reižu skaitu"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Apvienot divus Potenciālos darījumus"
+
 #~ msgid "Unconfirmed"
 #~ msgstr "Neapstiprināts"
 
@@ -3925,12 +3794,18 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Potenciālie darījumi pēc kategorijām"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Zvanu par Potenciālo darījumu"
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Pārveidot par Potenciālo darījumu"
 
 #~ msgid "Merge Opportunities"
 #~ msgstr "Apvienot Potenciālos darījumus"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Potenciālo Klientu par partneri"
+
 #, python-format
 #~ msgid "The stage of opportunity '%s' has been changed to '%s'."
 #~ msgstr "Potenciālā darījuma '%s' stāvoklis tika nomainīts uz '%s'"
@@ -3957,6 +3832,9 @@ msgstr ""
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Konvertēt Potenciālo klientu uz Potenciālo darījumu"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Zvanīt Partnerim"
+
 #, python-format
 #~ msgid "A partner is already defined on this lead."
 #~ msgstr "Potenciālā klienta objektam jau ir definēts partneris."
@@ -3993,6 +3871,9 @@ msgstr ""
 #~ msgid "Daily"
 #~ msgstr "Reizi dienā"
 
+#~ msgid "Set Category to"
+#~ msgstr "Atzīmēt Kategoriju kā"
+
 #~ msgid "Thu"
 #~ msgstr "Cet."
 
@@ -4008,6 +3889,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Pārdevējs"
 
+#~ msgid "Success Probability"
+#~ msgstr "Veiksmes Iespējamība"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "CRM atskaite par Potenciālajiem klientiem"
 
@@ -4047,3 +3931,16 @@ msgstr ""
 
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Izvēlieties posmus šai pārdošanas komandai"
+
+#~ msgid ""
+#~ "Outbound Calls list all the calls to be done by your sales team. A salesman "
+#~ "can record the information about the call in the form view. This information "
+#~ "will be stored in the partner form to trace every contact you have with a "
+#~ "customer. You can also import a .CSV file with a list of calls to be done by "
+#~ "your sales team."
+#~ msgstr ""
+#~ "Izejošie Zvani uzskaita visus pārdošanas komandas veiktos zvanus. Pārdevējs "
+#~ "var pierakstīt informāciju par zvanu formas skatījumā. Informācija tiks "
+#~ "uzglabāta partnera formā, lai sekotu līdzi katrai saskarei starp jums un "
+#~ "klientu. Ir iespējams importēt .CSV failu ar pārdošanas komandas veikto "
+#~ "zvanu sarakstu."
diff --git a/addons/crm/i18n/mn.po b/addons/crm/i18n/mn.po
index 056f9637ca9..2d38ed989a8 100644
--- a/addons/crm/i18n/mn.po
+++ b/addons/crm/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Сэжим"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Гарчиг"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Үйлдэл"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Боломж Сонгох"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Хаах хүлээлт"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Үеийн нэр"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "CRM-н сэжимийн шинжилгээ"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr "Үүсгэсэн өдөр"
 msgid "Rule Name"
 msgstr "Дүрмийн нэр"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Сануулга!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Бусад дуудлагыг төлөвлөх"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Хүлээж авахгүй"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Ялгагдсан Хариултууд :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Хэсэг"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Сэжимийн Шинжилгээ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Компанит ажил"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Боломж Сонгох"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Төлөв"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Хэтийн түнш"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Гарчиг үгүй"
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Сегментчлэл"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -415,7 +424,6 @@ msgstr ""
 "илэрхийлнэ"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -430,16 +438,22 @@ msgstr "Ангилал"
 msgid "#Opportunities"
 msgstr "#"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Харилцагчийн Холбоо барих Имэйл"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -470,22 +484,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Боломж үүсгэх"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "8 сар"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Үеийн нэр"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -498,9 +503,9 @@ msgid "Mailings"
 msgstr "Илгээх"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Ажил"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -520,9 +525,9 @@ msgid "Planned Revenue"
 msgstr "Төлөвлөсөн орлого"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Төлөвлөсөн орлого"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,6 +563,11 @@ msgstr "Дүгнэлт"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -568,11 +578,6 @@ msgstr "Хэрэгийн Ангилал"
 msgid "Partner Contact Name"
 msgstr "Харилцагчийн холбоо барих нэр"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -595,6 +600,11 @@ msgstr "#Утасны дуудлага"
 msgid "The code of the sales team must be unique !"
 msgstr "Борлуулалтын багийн код үл давхцах байх ёстой !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -656,9 +666,9 @@ msgid "Partner Segmentation"
 msgstr "Харилцагчийн хуваалт"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Минутын үргэлжлэх хугацаа"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -676,9 +686,9 @@ msgid "The name of the segmentation."
 msgstr "Сегментийн нэр"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Боломж (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -696,13 +706,7 @@ msgid "Statistics Dashboard"
 msgstr "Статистик хянах самбар"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -715,12 +719,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Боломж"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -757,17 +755,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Боломжийн нэр"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Багийг оноох"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -779,25 +766,21 @@ msgid "Exclusive"
 msgstr "Дээд зиндаанд зориулсан"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "%s -ээс: %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Үүсгэсэн Он"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -820,21 +803,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -842,9 +810,9 @@ msgid "Requirements"
 msgstr "Шаардлага"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Боломж руу хөрвүүлэх "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Зип"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -889,9 +857,9 @@ msgid "Mark Won"
 msgstr "Ялснаар Тэмдэглэх"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Боломж (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -916,7 +884,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Сануулга !"
@@ -926,23 +894,12 @@ msgstr "Сануулга !"
 msgid "Days to Open"
 msgstr "Нээх өдөр"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Харилцагч үүсгэх"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Гар утас"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -968,11 +925,6 @@ msgstr "Нээлттэй өдөрийг тооцоолоход хэрэглэг
 msgid "Meetings"
 msgstr "Уулзалтууд"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -980,6 +932,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Дараагийн үйл ажиллагаа"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1048,14 +1013,6 @@ msgstr "Сегментчлэлийг Тооцоолох"
 msgid "Lowest"
 msgstr "Доод"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1065,9 +1022,9 @@ msgid "Creation Date"
 msgstr "Үүсгэх огноо"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1127,23 +1084,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Төлөвлөсөн орлого"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1152,8 +1101,19 @@ msgid "September"
 msgstr "9 сар"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1185,21 +1145,15 @@ msgid "Opening Date"
 msgstr "Нээх өдөр"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Минутын үргэлжлэх хугацаа"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Сувгийн нэр"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Үргэлжлэх"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1230,6 +1184,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1239,14 +1199,6 @@ msgstr ""
 "Энэ таабыг сегментчилэлийн дүрэмд хэрэглэхээр бол тэмдэглэнэ үү. "
 "Тэмдэглэхгүй бол үзүүлэлтэд хэрэгсэхгүй."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Харилцагч үүсгэх"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1268,17 +1220,12 @@ msgid "unknown"
 msgstr "тодорхой бус"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Харилцагчийг Боломж руу"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1287,13 +1234,6 @@ msgstr "Харилцагчийг Боломж руу"
 msgid "Date"
 msgstr "Огноо"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1340,6 +1280,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr "Имэйл илгээхэд анхны мэйл хаяг нь борлуулалтын багаас авагдана."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1351,7 +1298,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Нийлүүлсэн боломж"
@@ -1395,13 +1342,9 @@ msgstr "Дугаар"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Цуцлах"
@@ -1422,14 +1365,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Хүлээгдэж байгаа Сэжим/Борлуулалт"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Хоёр Боломжийг Нийлүүлэх"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Ажил"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Харилцагчийн утасны дуудлага"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1468,6 +1418,16 @@ msgstr "Нээлттэй Сэжим/Боломж"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Хэсэг"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1516,6 +1476,12 @@ msgstr "Нэр"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Хаах огноо"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1552,17 +1518,6 @@ msgstr "Өндөр"
 msgid "Convert to prospect to business partner"
 msgstr "Бизнесийн харилцагчийн хэтийн төлөв рүү хөрвүүлэх"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1599,6 +1554,7 @@ msgstr "Эцэг баг"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1607,11 +1563,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Дараагий үйл ажиллагааны огноо"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Ажиллаж байна"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1625,11 +1576,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Зип"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1641,7 +1587,7 @@ msgid "Month of call"
 msgstr "Дуудлагын сар"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1694,11 +1640,6 @@ msgstr "Утга"
 msgid "Customer Name"
 msgstr "Захиалагчийн нэр"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Утасны дуудлагыг Боломж руу"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1719,11 +1660,6 @@ msgstr "Боломж Шатаар"
 msgid "Prospect is converting to business partner"
 msgstr "Хэтийн төлөв бизнес харилцагч руу хөрвүүлэгдэж байна"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1857,11 +1793,6 @@ msgstr "Хамаарагч"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Сэжим болон Борлуулалтыг тусгаарлахад хэрэглэхэд төрөл"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Утасны дуудлага дээр суурилан харилагч үүсгэхдээ итгэлтэй байна уу?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1892,16 +1823,9 @@ msgid "Sales Teams"
 msgstr "Борлуулалтын баг"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Харилцагчийн Сэжим"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Сегментчлэл"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1913,12 +1837,6 @@ msgstr "Баг"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Шинэ төлөвтэй Сэжим/Боломж"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1930,12 +1848,6 @@ msgstr "Нөлөөгүй"
 msgid "Probability"
 msgstr "Магадлал"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Жагаалт харагдацаас нэгээс олон боломжийг сонгоно уу"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1951,6 +1863,12 @@ msgstr "Сар"
 msgid "Leads"
 msgstr "Сэжим"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1962,28 +1880,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Хийх"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2044,24 +1952,6 @@ msgstr "Шийд хүлээсэн"
 msgid "Prospect Opportunity"
 msgstr "Хэтийн Төлөвийн Боломж"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2110,17 +2000,15 @@ msgid "Mandatory Expression"
 msgstr "Шаардлагатай Илэрхийлэл"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Мэйл илгээх"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2150,11 +2038,6 @@ msgstr "Боломж Шинжилгээ"
 msgid "Misc"
 msgstr "Бусад"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Хэрэгийн Түүх дээрх Энгийн Илэрхийлэл"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2182,11 +2065,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Хариуцагч"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2198,21 +2076,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Хамгийн их харилцаа холбооны түүх"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Үүсгэсэн Он"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2281,7 +2160,6 @@ msgstr "Үргэлжлүүлэх"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2363,8 +2241,13 @@ msgid "Company"
 msgstr "Компани"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Ажиллаж байна"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2372,6 +2255,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Эзэнгүй сэжим"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2392,26 +2280,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Хөрвүүлэх"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2457,6 +2325,11 @@ msgstr ""
 "бүлэглэж шүүлт хийж болно. Мөн тайланд нэмж бүлэг оруулснаар мэдээллийн "
 "хэмжээг ихэсгэж болно."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2488,6 +2361,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Баталсан"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2520,6 +2398,24 @@ msgstr "Сонгох Илэрхийлэл"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2576,11 +2472,6 @@ msgstr "Сэжимээс Бизнес боломж үүсгэх"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Ангилалыг Тааруулах"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2625,9 +2516,10 @@ msgid "Qualification"
 msgstr "Магадлагдах"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Харилцагчийн Холбоо барих Имэйл"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2645,14 +2537,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Харилцагч үүсгэгдсэн байна"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "8 сар"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2748,17 +2642,10 @@ msgid "Logged Calls"
 msgstr "Хөтлөгдсөн Дуудлага"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Амжилттай"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Ноорог"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2770,7 +2657,6 @@ msgstr "Хэрэгүүд Борлуулалтын Багаар"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Уулзалт"
 
@@ -2779,11 +2665,6 @@ msgstr "Уулзалт"
 msgid "Category of Case"
 msgstr "Хэрэгийн Ангилал"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Боломж / Захиалагч"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2807,11 +2688,6 @@ msgstr "Гудамж2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Энэ харилцагч байхгүй байгаа эсэхийг та шалгах хэрэгтэй байх"
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2830,21 +2706,6 @@ msgstr "Хэрэглэгч"
 msgid "November"
 msgstr "11 сар"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Тохиролцох"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2868,11 +2729,6 @@ msgstr "Гэрээ"
 msgid "Twitter Ads"
 msgstr "Твиттер Реклам"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Бүх Багт Ерөнхий"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2884,14 +2740,9 @@ msgid "Planned Revenues"
 msgstr "Төлөвлөсөн орлого"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Утасны дуудлага"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Таамаг.Хаах"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2915,16 +2766,10 @@ msgid "Categorization"
 msgstr "Ангилал"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Дуудлага хөтлөх"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Үйл ажиллагааны дүрэм"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2948,7 +2793,6 @@ msgstr "Үүсгэсэн огноо"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2974,7 +2818,6 @@ msgid "Description"
 msgstr "Тайлбар"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3053,20 +2896,11 @@ msgstr "Хийх Ажлыг Шинэчлэх"
 msgid "Working Hours"
 msgstr "Ажлын цаг"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Утасны дуудлага"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Захиалагч"
 
@@ -3088,7 +2922,7 @@ msgid "Lost"
 msgstr "Ялагдсан"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3136,17 +2970,14 @@ msgid "Phone calls by user and section"
 msgstr "Утасны дуудлага хэрэглэгчээр, бүлгээр"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Тохиролцох"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Таамаг.Хаах"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Утасны дуудлага"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3164,10 +2995,10 @@ msgid "Proposition"
 msgstr "Санал болгох"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Хаах огноо"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Утасны дуудлага"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3181,6 +3012,11 @@ msgstr "Жил"
 msgid "Newsletter"
 msgstr "Сонин"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3194,6 +3030,9 @@ msgid ""
 "            "
 msgstr ""
 
+#~ msgid "Create Partner"
+#~ msgstr "Харилцагч үүсгэх"
+
 #~ msgid "History"
 #~ msgstr "Түүх"
 
@@ -3203,9 +3042,6 @@ msgstr ""
 #~ msgid "Created"
 #~ msgstr "Үүссэн"
 
-#~ msgid "Send Mail"
-#~ msgstr "Мэйл илгээх"
-
 #~ msgid "General"
 #~ msgstr "Ерөнхий"
 
@@ -3386,6 +3222,12 @@ msgstr ""
 #~ msgid "Years"
 #~ msgstr "Жил"
 
+#~ msgid "Continue"
+#~ msgstr "Үргэлжлэх"
+
+#~ msgid "Opportunity Name"
+#~ msgstr "Боломжийн нэр"
+
 #~ msgid "By day"
 #~ msgstr "Өдрөөр"
 
@@ -3470,6 +3312,9 @@ msgstr ""
 #~ msgid "Reminder"
 #~ msgstr "Сануулга"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Харилцагч үүсгэх"
+
 #~ msgid "Monday"
 #~ msgstr "Даваа"
 
@@ -3509,6 +3354,9 @@ msgstr ""
 #~ msgid "Wizard"
 #~ msgstr "Визард"
 
+#~ msgid "_Convert"
+#~ msgstr "_Хөрвүүлэх"
+
 #~ msgid "Saturday"
 #~ msgstr "Бямба"
 
@@ -3661,6 +3509,9 @@ msgstr ""
 #~ msgid "CRM - Statistics Dashboard"
 #~ msgstr "CRM- Статистик хянах самбар"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Хамгийн их харилцаа холбооны түүх"
+
 #~ msgid "Meeting Type"
 #~ msgstr "Уулзалтын төрөл"
 
@@ -3688,6 +3539,9 @@ msgstr ""
 #~ msgid "Opportunity Summary"
 #~ msgstr "Боломжийн товч утга"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Харилцагчийн утасны дуудлага"
+
 #~ msgid "Reply To"
 #~ msgstr "Хариулах"
 
@@ -3817,6 +3671,9 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "Үндсэн (0=None)"
 
+#~ msgid "Success Probability"
+#~ msgstr "Амжилттай"
+
 #~ msgid "From"
 #~ msgstr "Хаанаас"
 
@@ -3842,6 +3699,9 @@ msgstr ""
 #~ msgid "Partner Contact"
 #~ msgstr "Харилцагчийн холбоо"
 
+#~ msgid "Action Rules"
+#~ msgstr "Үйл ажиллагааны дүрэм"
+
 #~ msgid "Recurrency"
 #~ msgstr "Давталт"
 
@@ -3945,6 +3805,9 @@ msgstr ""
 #~ msgid "Leads/Opportunities created in current year"
 #~ msgstr "Энэ жил үүсгэгдсэн Сэжим/Боломж"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Харилцагчийн Сэжим"
+
 #~ msgid ""
 #~ "Track from where is coming your leads and opportunities by creating specific "
 #~ "channels that will be maintained at the creation of a document in the "
@@ -3982,6 +3845,9 @@ msgstr ""
 #~ "Орлого\", \"Таамаглагдсан Хаах Огноо\" талбаруудыг бөглөх ёстой. Түүнчлэн "
 #~ "\"Магадлалыг Атоматаар Өөрчлөх\" талбарын тайлбарыг мөн харахыг зөвлөе."
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Боломж / Захиалагч"
+
 #~ msgid "Mail Gateway"
 #~ msgstr "Mail Gateway"
 
@@ -4023,6 +3889,9 @@ msgstr ""
 #~ msgid "Days per Periode"
 #~ msgstr "Хугацааны муж дахь өдөр"
 
+#~ msgid "Set Team to"
+#~ msgstr "Багийг оноох"
+
 #~ msgid "Salesmans"
 #~ msgstr "Борлуулалтын ажилтан"
 
@@ -4110,6 +3979,9 @@ msgstr ""
 #~ msgid "End of recurrency"
 #~ msgstr "Давталтын төгсгөл"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Харилцагчийг Боломж руу"
+
 #, python-format
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "'%s' хэрэг хаагдсан."
@@ -4126,6 +3998,9 @@ msgstr ""
 #~ msgid "Define Sales Team"
 #~ msgstr "Борлуулалтын Багийг Тодорхойлох"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Хоёр Боломжийг Нийлүүлэх"
+
 #~ msgid ""
 #~ "Create specific partner categories which you can assign to your partners to "
 #~ "better manage your interactions with them. The segmentation tool is able to "
@@ -4169,6 +4044,9 @@ msgstr ""
 #~ msgid "The case '%s' has been opened."
 #~ msgstr "'%s' хэрэг нээгдсэн."
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Утасны дуудлагыг Боломж руу"
+
 #~ msgid "Optional linked partner, usually after conversion of the lead"
 #~ msgstr "Сонгох Холбогдсон харилцагч, ихэнхдээ сэжимийг хөрвүүлсэн дараа"
 
@@ -4198,6 +4076,9 @@ msgstr ""
 #~ "захиалга зэрэг нь хэрэглэгчийн баг дээр үндэслэн автоматаар шүүгдэж "
 #~ "харагдана."
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Утасны дуудлага дээр суурилан харилагч үүсгэхдээ итгэлтэй байна уу?"
+
 #, python-format
 #~ msgid "Changed Stage to: %s"
 #~ msgstr "Өөрчлөгдөх шат: %s"
@@ -4219,6 +4100,9 @@ msgstr ""
 #~ "  \n"
 #~ "Дуудлага хийгдэх хэрэгтэй бол 'Зогсоохгүй' төлөвтэй болно."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Хэрэгийн Түүх дээрх Энгийн Илэрхийлэл"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Магадлагдаагүй рүү Буцаах"
 
@@ -4228,6 +4112,10 @@ msgstr ""
 #~ msgid "Pending Opportunities"
 #~ msgstr "Хүлээгдэж байгаа Боломж"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Жагаалт харагдацаас нэгээс олон боломжийг сонгоно уу"
+
 #~ msgid "Scheduled Phonecalls"
 #~ msgstr "Товлосон Утасны Дуудлагууд"
 
@@ -4308,16 +4196,26 @@ msgstr ""
 #~ msgid "Repeat"
 #~ msgstr "Давтах"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Харилцагч үүсгэгдсэн байна"
+
 #~ msgid "Review Sales Stages"
 #~ msgstr "Борлуулалтын Шатуудын Ревюү"
 
 #~ msgid "Mail To"
 #~ msgstr "Майл Илгээх"
 
+#~ msgid "Set Category to"
+#~ msgstr "Ангилалыг Тааруулах"
+
 #, python-format
 #~ msgid "The case '%s' has been cancelled."
 #~ msgstr "'%s' хэрэг цуцлагдлаа."
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Энэ харилцагч байхгүй байгаа эсэхийг та шалгах хэрэгтэй байх"
+
 #~ msgid "Interest in Computer"
 #~ msgstr "Компьютерийн Сонирхол"
 
@@ -4333,6 +4231,9 @@ msgstr ""
 #~ msgid "Recurrent ID date"
 #~ msgstr "Давтагдсан ID-н огноо"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Бүх Багт Ерөнхий"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "'%s' боломж яллаа."
@@ -4508,6 +4409,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been marked as lost."
 #~ msgstr "'%s' боломж ялагдсанаар тэмдэглэгдсэн."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Боломж руу хөрвүүлэх "
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Боломж руу хөрвүүлэх"
 
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index 292758baf54..122b2a56c52 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 12:24+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -32,11 +32,13 @@ msgstr ""
 "fra innkommende e-poster."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Lead"
 
@@ -46,32 +48,37 @@ msgid "Title"
 msgstr "Tittel."
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Handling."
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Velg salgsmuligheter"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr "Administrere fondet øker."
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Konverter til muligheter."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -79,10 +86,10 @@ msgid "Delay to close"
 msgstr "Forsinket til lukking."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Ledelse har blitt </b>konvertert til en mulighet </ b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Fasenavn"
 
 #. module: crm
 #: view:crm.lead:0
@@ -97,11 +104,6 @@ msgstr "Salgsman."
 msgid "CRM Lead Analysis"
 msgstr "CRM Ledelse Analyse."
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Påminnelse på Ledelse: [[objekt.id]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -147,6 +149,12 @@ msgstr "Opprettelses dag."
 msgid "Rule Name"
 msgstr "Regelnavn"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -177,8 +185,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -205,7 +213,7 @@ msgid "Schedule Other Call"
 msgstr "Planlegge ny samtale"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -217,9 +225,14 @@ msgid "Opt-Out"
 msgstr "Mul-ut"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Skjule i visninger når tomt."
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Status"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -237,9 +250,9 @@ msgid "Excluded Answers :"
 msgstr "Utelukkede svar:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Seksjoner"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -249,7 +262,7 @@ msgid "Leads Analysis"
 msgstr "Leads analyse"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s En samtale</b> for <em>%s</em>."
@@ -260,16 +273,6 @@ msgstr "<b>%s En samtale</b> for <em>%s</em>."
 msgid "Campaigns"
 msgstr "Kampanjer"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Velg salgsmuligheter"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Status"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -292,7 +295,7 @@ msgid "Prospect Partner"
 msgstr "Prospekt partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Intet emne"
@@ -390,11 +393,17 @@ msgstr "Død."
 msgid "Unread Messages"
 msgstr "Uleste meldinger."
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentering"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Koble til en eksisterende kunde."
 
@@ -418,7 +427,6 @@ msgstr ""
 "stadiet kan bli en suksess"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -433,6 +441,13 @@ msgstr "Kategori"
 msgid "#Opportunities"
 msgstr "#Salgsmuligheter"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
@@ -441,10 +456,9 @@ msgstr ""
 "meg."
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Konvertering handling."
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Partners kontakt e-post"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -475,22 +489,13 @@ msgstr "Status."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Opprett salgsmulighet"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Fasenavn"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Konfigurer."
 
 #. module: crm
 #: view:crm.lead:0
@@ -503,9 +508,9 @@ msgid "Mailings"
 msgstr "E-poster"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Gjøremål"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -525,9 +530,9 @@ msgid "Planned Revenue"
 msgstr "Planlagt omsetning"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "CRM Telefonsamtale: Merk lest."
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Forventet omsetning"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -563,6 +568,11 @@ msgstr "Sammendrag"
 msgid "Merge"
 msgstr "Slå sammen."
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -573,11 +583,6 @@ msgstr "Sakskategori"
 msgid "Partner Contact Name"
 msgstr "Partner kontaktnavn"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "CRM Telefonsamtale: Merk som ulest."
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -600,6 +605,11 @@ msgstr "#Telefonsamtaler"
 msgid "The code of the sales team must be unique !"
 msgstr "Koden for salgsteamet må være unik!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Epost adressen til kontakten."
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -670,9 +680,9 @@ msgid "Partner Segmentation"
 msgstr "Partnersegmentering"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Varighet i minutter"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Valuta."
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -690,9 +700,9 @@ msgid "The name of the segmentation."
 msgstr "Navn på segmentering"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Ledelse fra USA."
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Sannsynlighet (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -710,13 +720,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistikk konsoll"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stadiet endret til <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -729,12 +733,6 @@ msgstr "Stadiet endret til <b>%s</b>."
 msgid "Opportunity"
 msgstr "Salgsmulighet"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "En møte har vært<b>planlagt<b>på <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -771,17 +769,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Navn på salgsmulighet"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Sett team til"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -793,25 +780,21 @@ msgid "Exclusive"
 msgstr "Utelukkende"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Fra %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Laget år"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Konverter til muligheter."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "Eller."
@@ -834,28 +817,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hallo [[objekt.bruker_ID.navn]],\n"
-"Kan du sjekke følgende ledelse, er det ikke åpne siden 5 dager?\n"
-"Ledelse:  [[Objekt.ID ]]\n"
-"Beskrivelse: \n"
-"[[objeckt.beskrivelse]]\n"
-"Takk,\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -863,9 +824,9 @@ msgid "Requirements"
 msgstr "Krav"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Konvertert til salgsmulighet "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postnummer"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -910,9 +871,9 @@ msgid "Mark Won"
 msgstr "Marker som vunnet"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Sannsynlighet (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Ledelse fra USA."
 
 #. module: crm
 #: view:crm.lead:0
@@ -937,7 +898,7 @@ msgid "Send Email"
 msgstr "Send e-post."
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -947,23 +908,12 @@ msgstr "Advarsel !"
 msgid "Days to Open"
 msgstr "Dager til åpning"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Opprett partner"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "Telefonsamtalen har blitt <b>tilbakestilt og satt til åpen <b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -989,11 +939,6 @@ msgstr "Brukt for å beregne åpne dager"
 msgid "Meetings"
 msgstr "Møter"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1001,6 +946,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Neste handling"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Utkast"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1069,14 +1027,6 @@ msgstr "Beregn segmentering"
 msgid "Lowest"
 msgstr "Laveste"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1086,10 +1036,10 @@ msgid "Creation Date"
 msgstr "Opprettet dato"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s har vært<b>opprettet</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1148,23 +1098,15 @@ msgid "Delete"
 msgstr "Slett."
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Forventet omsetning"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr "Jeg."
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1173,9 +1115,20 @@ msgid "September"
 msgstr "September"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Epost adressen til kontakten."
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1207,21 +1160,15 @@ msgid "Opening Date"
 msgstr "Åpningsdato"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Valuta."
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Varighet i minutter"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Kanalnavn"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Fortsett"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1252,6 +1199,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1261,14 +1214,6 @@ msgstr ""
 "Kryss av hvis du vil bruke denne fanen som en del av segmenteringsregelen. "
 "Hvis ikke avkrysset blir det ikke tatt hensyn til kriteriene under."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Opprett en partner"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1290,16 +1235,11 @@ msgid "unknown"
 msgstr "ukjent"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner til muligheten"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Er en følger."
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1309,13 +1249,6 @@ msgstr "Partner til muligheten"
 msgid "Date"
 msgstr "Dato"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Er en følger."
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1363,6 +1296,13 @@ msgid ""
 msgstr ""
 "Når du sender e-post, er standard e-postadressen tatt fra salgsteamet."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1374,7 +1314,7 @@ msgid "Lead Description"
 msgstr "Ledelse beskrivelse."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Sammenslåtte muligheter"
@@ -1418,13 +1358,9 @@ msgstr "Referanser"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Avbryt"
@@ -1445,14 +1381,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Leads/muligheter som er i en avventende status"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Slå sammen to muligheter"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Gjøremål"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefonsamtale til partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Relatert kunde."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1491,6 +1434,16 @@ msgstr "Leads/muligheter som har en åpen status"
 msgid "Users"
 msgstr "Brukere."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Seksjoner"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1540,6 +1493,12 @@ msgstr "Navn"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Lukkingsdato"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1576,17 +1535,6 @@ msgstr "Høy"
 msgid "Convert to prospect to business partner"
 msgstr "Konverter til prospekt til en partner"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "Mulighetene har blitt <b>vunnet</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Telefonsamtaler som er tildelt til meg eller mitt team (s)"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1623,6 +1571,7 @@ msgstr "Hovedteam"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Ikke koble til en kunde."
 
@@ -1631,11 +1580,6 @@ msgstr "Ikke koble til en kunde."
 msgid "Next Action Date"
 msgstr "Neste aksjonsdato"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Kjører"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1649,11 +1593,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Tildel muligheter til."
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postnummer"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1665,7 +1604,7 @@ msgid "Month of call"
 msgstr "Måned for samtale"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "Partner har blitt<b>Opprettet</b>."
@@ -1718,11 +1657,6 @@ msgstr "Verdi"
 msgid "Customer Name"
 msgstr "Kundenavn"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Telefonsamtale til mulighet"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1743,11 +1677,6 @@ msgstr "Salgsmuligheter per fase"
 msgid "Prospect is converting to business partner"
 msgstr "Prospektet konverterer til forretningspartner"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "CRM ledelse: Merk som ulest."
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1881,13 +1810,6 @@ msgstr "Referent"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Type brukes for å skille leads og muligheter"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Er du sikker på at du vil lage en samarbeidspartner basert på denne "
-"telefonsamtalen?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1918,16 +1840,9 @@ msgid "Sales Teams"
 msgstr "Salgsteam"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Lead til partner"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentering"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1939,12 +1854,6 @@ msgstr "Team"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Leads/muligheter som er i stadium Ny"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>Partner</b> er nå satt til<em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1956,12 +1865,6 @@ msgstr "Ikke gjennomført"
 msgid "Probability"
 msgstr "Sannsynlighet"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Vær vennlig å velg mer enn en mulighet fra listen"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1977,6 +1880,12 @@ msgstr "Måned"
 msgid "Leads"
 msgstr "Leads"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1988,28 +1897,18 @@ msgstr "Design."
 msgid "Merge with existing opportunities"
 msgstr "Slå sammen med eksisterende muligheter."
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Å gjøre"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2070,24 +1969,6 @@ msgstr "I påvente"
 msgid "Prospect Opportunity"
 msgstr "Prospekt salgsmulighet"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2136,18 +2017,16 @@ msgid "Mandatory Expression"
 msgstr "Obligatorisk uttrykk"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Opprett en ny kunde."
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Send e-post"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Relatert kunde."
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Opprett en ny kunde."
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2176,11 +2055,6 @@ msgstr "Analyse av muligheter"
 msgid "Misc"
 msgstr "Div."
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Vanlig uttrykk på sakshistorikken"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2208,11 +2082,6 @@ msgstr "Telefonsamtale ferdig."
 msgid "Responsible"
 msgstr "Ansvarlig"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Påminnelse til kunde."
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2224,21 +2093,22 @@ msgid "Product"
 msgstr "Produkt."
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "Telefonsamtalen har blitt <b> opprettet og åpnet</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimal kommunikasjonshistorikk"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Laget år"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Konverterings alternativer."
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2307,7 +2177,6 @@ msgstr "Fortsett prosess"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Konverter til muligheter."
 
@@ -2389,15 +2258,25 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Forholdene på kommunikasjon Historie."
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Kjører"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "Ikke fordelte leads"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2418,26 +2297,6 @@ msgstr "Tilbakestill."
 msgid "After-Sale Services"
 msgstr "Etter-salgs tjenester."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Konverter"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2483,6 +2342,11 @@ msgstr ""
 "henhold til flere kriterier og bore ned informasjon, ved å legge flere "
 "grupper i rapporten."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2514,6 +2378,11 @@ msgstr "Velg fører/Muligheter."
 msgid "Confirmed"
 msgstr "Bekreftet"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2546,6 +2415,24 @@ msgstr "Valgfritt uttrykk"
 msgid "Followers"
 msgstr "Følgere."
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2602,11 +2489,6 @@ msgstr "Opprette forretningsmuligheter fra Leads"
 msgid "Email Campaign - Products"
 msgstr "Epost kampanje - Produkter."
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Sett kategori til"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2651,9 +2533,10 @@ msgid "Qualification"
 msgstr "Kvalifikasjon"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Partners kontakt e-post"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Konvertering handling."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2671,15 +2554,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "En samarbeidspartner er allerede definert"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "August"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Konfigurer."
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2774,17 +2659,10 @@ msgid "Logged Calls"
 msgstr "Loggede samtaler"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Sannsynlighet for suksess"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Utkast"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2796,7 +2674,6 @@ msgstr "Hendelser pr. salgsteam"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Møte"
 
@@ -2805,11 +2682,6 @@ msgstr "Møte"
 msgid "Category of Case"
 msgstr "Kategori for hendelse"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Salgsmulighet / Kunde"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2833,11 +2705,6 @@ msgstr "Gate2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Du må kanskje bekrefte at denne partneren ikke allerede finnes."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2856,21 +2723,6 @@ msgstr "Bruker"
 msgid "November"
 msgstr "November"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Forhandling"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2894,11 +2746,6 @@ msgstr "Kontrakt"
 msgid "Twitter Ads"
 msgstr "Twitter-annonser"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Felles for alle team"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2910,14 +2757,9 @@ msgid "Planned Revenues"
 msgstr "Planlagt omsetning"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "CRM fører: Merk som lest."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefonsamtale til telefonsamtale"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Forventet lukking"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2941,16 +2783,10 @@ msgid "Categorization"
 msgstr "Kategorisering"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Logg samtale"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Handlingsregler"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2975,7 +2811,6 @@ msgstr "Opprettet dato"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "På."
 
@@ -3001,7 +2836,6 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3080,20 +2914,11 @@ msgstr "Tilbakestill til Å gjøre"
 msgid "Working Hours"
 msgstr "Arbeidstid"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonsamtaler"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Kunde"
 
@@ -3115,7 +2940,7 @@ msgid "Lost"
 msgstr "Tapt"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr "Stengt / Avbrutt fører kan ikke konverteres til muligheter."
@@ -3163,17 +2988,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefonsamtaler pr. bruker og seksjon"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Forhandling"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Forventet lukking"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefonsamtale til telefonsamtale"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3191,10 +3013,10 @@ msgid "Proposition"
 msgstr "Preposisjon"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Lukkingsdato"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonsamtaler"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3208,6 +3030,11 @@ msgstr "År"
 msgid "Newsletter"
 msgstr "Nyhetsbrev"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3257,12 +3084,18 @@ msgstr ""
 #~ msgid "Responsible User"
 #~ msgstr "Ansvarlig bruker"
 
+#~ msgid "Continue"
+#~ msgstr "Fortsett"
+
 #~ msgid "Days per Periode"
 #~ msgstr "Dager per periode"
 
 #~ msgid "Add Note"
 #~ msgstr "Legg til notat"
 
+#~ msgid "Create Partner"
+#~ msgstr "Opprett partner"
+
 #~ msgid "<"
 #~ msgstr "<"
 
@@ -3336,9 +3169,6 @@ msgstr ""
 #~ msgid ">"
 #~ msgstr ">"
 
-#~ msgid "Send Mail"
-#~ msgstr "Send e-post"
-
 #~ msgid "Months"
 #~ msgstr "Måneder"
 
@@ -3357,6 +3187,9 @@ msgstr ""
 #~ msgid "Send new email"
 #~ msgstr "Send ny e-post"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimal kommunikasjonshistorikk"
+
 #~ msgid "End Date"
 #~ msgstr "Sluttdato"
 
@@ -3896,6 +3729,12 @@ msgstr ""
 #~ msgid "Phonecalls during last 7 days"
 #~ msgstr "Telefonsamtaler siste 7 dager"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Opprett en partner"
+
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Salgsmulighet / Kunde"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been marked as lost."
 #~ msgstr "Salgsmuligheten '%s' ble markert som tapt"
@@ -3907,9 +3746,15 @@ msgstr ""
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "Lead '%s' har ble konvertert til en salgsmulighet"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Konvertert til salgsmulighet "
+
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Salgsmulighet pr kategori"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Navn på salgsmulighet"
+
 #~ msgid "Merge with existing Opportunity"
 #~ msgstr "Slå sammen med eksisterende salgsmulighet"
 
@@ -3983,6 +3828,9 @@ msgstr ""
 #~ msgid "Tue"
 #~ msgstr "Tir"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner til muligheten"
+
 #, python-format
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "Saken '%s' har blitt stengt."
@@ -4110,6 +3958,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Slå sammen to muligheter"
+
 #~ msgid "Mail"
 #~ msgstr "E-post"
 
@@ -4140,6 +3991,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Lørdag"
 
+#~ msgid "_Convert"
+#~ msgstr "_Konverter"
+
 #~ msgid "Meeting / Partner"
 #~ msgstr "Møte / partner"
 
@@ -4156,6 +4010,9 @@ msgstr ""
 #~ msgid "Invitation details"
 #~ msgstr "Invitasjonsdetaljer"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Telefonsamtale til mulighet"
+
 #~ msgid "Free"
 #~ msgstr "Fri"
 
@@ -4192,6 +4049,9 @@ msgstr ""
 #~ "\"forventet sluttdato.\" Du bør også ta en titt på verktøytipset på feltet "
 #~ "\"Endre Sannsynlighetsregning automatisk\"."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Vanlig uttrykk på sakshistorikken"
+
 #~ msgid ""
 #~ "Define sales teams to structure your sales organization and assign users to "
 #~ "each team. You should also define the sales stage to each team. As an "
@@ -4251,6 +4111,15 @@ msgstr ""
 #~ msgstr ""
 #~ "Lag ulike møtekategorier for å bedre organisere og klassifisere dine møter."
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Er du sikker på at du vil lage en samarbeidspartner basert på denne "
+#~ "telefonsamtalen?"
+
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Vær vennlig å velg mer enn en mulighet fra listen"
+
 #~ msgid "Repeat x times"
 #~ msgstr "Gjenta x ganger"
 
@@ -4317,6 +4186,9 @@ msgstr ""
 #~ msgid "Show countries"
 #~ msgstr "Vis land"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefonsamtale til partner"
+
 #~ msgid "E-mail address of the contact"
 #~ msgstr "E-postadresse til kontakt"
 
@@ -4350,6 +4222,10 @@ msgstr ""
 #~ msgid "Day of month"
 #~ msgstr "Dag i måneden"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "En samarbeidspartner er allerede definert"
+
 #~ msgid "Mail To"
 #~ msgstr "E-post til"
 
@@ -4362,12 +4238,21 @@ msgstr ""
 #~ msgid "Attendees"
 #~ msgstr "Deltakere"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Du må kanskje bekrefte at denne partneren ikke allerede finnes."
+
 #~ msgid "Need Consulting"
 #~ msgstr "Trenger rådgivning"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Felles for alle team"
+
 #~ msgid "_Add"
 #~ msgstr "_Legg til"
 
+#~ msgid "Action Rules"
+#~ msgstr "Handlingsregler"
+
 #~ msgid "Private"
 #~ msgstr "Privat"
 
@@ -4407,6 +4292,9 @@ msgstr ""
 #~ msgid "Pending Opportunities"
 #~ msgstr "Ventende Muligheter"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Lead til partner"
+
 #~ msgid "Internal Meeting"
 #~ msgstr "Internt møte"
 
@@ -4422,9 +4310,15 @@ msgstr ""
 #~ msgid "CRM Dashboard"
 #~ msgstr "CRM Dashboard"
 
+#~ msgid "Set Category to"
+#~ msgstr "Sett kategori til"
+
 #~ msgid "Invitation Detail"
 #~ msgstr "Invitasjonsdetaljer"
 
+#~ msgid "Success Probability"
+#~ msgstr "Sannsynlighet for suksess"
+
 #~ msgid "Public for Employees"
 #~ msgstr "Offentlig for ansatte"
 
@@ -4486,6 +4380,9 @@ msgstr ""
 #~ "Denne egenskapen definerer listen over dato-/klokkeslettunntakene for en "
 #~ "gjentagende kalenderkomponent."
 
+#~ msgid "Set Team to"
+#~ msgstr "Sett team til"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 9a0aa4bdf7b..7203d41bb9f 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 18:29+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:24+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,11 +31,13 @@ msgstr ""
 "maken van inkomende e-mails."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Lead"
 
@@ -45,22 +47,30 @@ msgid "Title"
 msgstr "Titel"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Actie"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
-"Telefoongesprek gekoppeld aan de prospect <em>%s</em>is <b>aangemaakt</b> en "
-"<b>ingepland</b> op <em>%s</em>."
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Selecteer prospects"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -68,11 +78,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Beheer fondsen werven"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Converteer naar prospects"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -80,10 +85,10 @@ msgid "Delay to close"
 msgstr "Vertraging tot sluiting"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Lead is <b>geconverteerd naar een prospect</b>"
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Naam fase"
 
 #. module: crm
 #: view:crm.lead:0
@@ -98,11 +103,6 @@ msgstr "Verkoper"
 msgid "CRM Lead Analysis"
 msgstr "CMR Lead analyse"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Herinnering van lead: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -148,6 +148,12 @@ msgstr "Aanmaakdag"
 msgid "Rule Name"
 msgstr "Naam regel"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -181,8 +187,8 @@ msgstr ""
 "ingevoegd."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -209,7 +215,7 @@ msgid "Schedule Other Call"
 msgstr "Plan ander telefoongesprek"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -221,9 +227,14 @@ msgid "Opt-Out"
 msgstr "Uitschrijven"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Verbergen in weergave indien leeg"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Status"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -241,9 +252,9 @@ msgid "Excluded Answers :"
 msgstr "Uitgesloten antwoorden:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secties"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -253,7 +264,7 @@ msgid "Leads Analysis"
 msgstr "Leads analyse"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s een telefoongesprek</b> voor <em>%s</em>."
@@ -264,16 +275,6 @@ msgstr "<b>%s een telefoongesprek</b> voor <em>%s</em>."
 msgid "Campaigns"
 msgstr "Campagnes"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Selecteer prospects"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Status"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -296,7 +297,7 @@ msgid "Prospect Partner"
 msgstr "Prospect naar relatie"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -422,11 +423,17 @@ msgstr "Dood"
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentatie"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Koppel aan een bestaande klant"
 
@@ -450,7 +457,6 @@ msgstr ""
 "voor succes met het dossier"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -465,6 +471,13 @@ msgstr "Categorie"
 msgid "#Opportunities"
 msgstr "#Prospects"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
@@ -473,10 +486,9 @@ msgstr ""
 "manager ben, of aan mijzelf."
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Conversie actie"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Partner contactpersoon e-mail"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -516,22 +528,13 @@ msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Maak prospect"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Augustus"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Naam fase"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configureren"
 
 #. module: crm
 #: view:crm.lead:0
@@ -544,9 +547,9 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Te doen"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -566,9 +569,9 @@ msgid "Planned Revenue"
 msgstr "Geraamde omzet"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "Relatiebeheer telefoongesprek: Markeer als gelezen"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Verwachte omzet"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -609,6 +612,11 @@ msgstr "Samenvatting"
 msgid "Merge"
 msgstr "Samenvoegen"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -619,11 +627,6 @@ msgstr "Dossiercategorie"
 msgid "Partner Contact Name"
 msgstr "Relatie contactnaam"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "Relatiebeheer telefoongesprek: Markeer als ongelezen"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -648,6 +651,11 @@ msgstr "#Telefoontjes"
 msgid "The code of the sales team must be unique !"
 msgstr "De verkoopteam code moet uniek zijn!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "E-mail adres van contactpersoon"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -718,9 +726,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentatie relaties"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duur in minuten"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -738,9 +746,9 @@ msgid "The name of the segmentation."
 msgstr "De naam van het segment"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Leads uit America"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Slagingskans (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -760,13 +768,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistisch dashboard"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Fase veranderd in <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -779,12 +781,6 @@ msgstr "Fase veranderd in <b>%s</b>."
 msgid "Opportunity"
 msgstr "Prospect"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Een afspraak is <b>ingepland</b> op <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -823,17 +819,6 @@ msgstr ""
 "leads/Prospects welke zijn toegewezen aan één van de verkoopteams waarvan ik "
 "de manager ben."
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Naam prospect"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Zet team op"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -845,25 +830,21 @@ msgid "Exclusive"
 msgstr "Exclusief"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Van %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Aanmaak jaar"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Converteer naar prospects"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "of"
@@ -888,32 +869,6 @@ msgstr ""
 "Koppeling tussen fases en verkoopteams. Wanneer aangevinkt wordt deze fase "
 "beperkt tot de geselecteerde verkoopteams."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hallo [[object.user_id.name]], \n"
-"Kun  je de navolgende lead controleren. Het is neiot meer geopend sinds 5 "
-"dagen?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Omschrijving:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Bedankt,\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -921,9 +876,9 @@ msgid "Requirements"
 msgstr "Vereisten"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Converteren naar prospect "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postcode"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -968,9 +923,9 @@ msgid "Mark Won"
 msgstr "Markeren als gewonnen"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Slagingskans (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Leads uit America"
 
 #. module: crm
 #: view:crm.lead:0
@@ -995,7 +950,7 @@ msgid "Send Email"
 msgstr "E-mail verzenden"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing!"
@@ -1005,23 +960,12 @@ msgstr "Waarschuwing!"
 msgid "Days to Open"
 msgstr "Dagen voor openen"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Maak relatie"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobiel"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "Telefoongesprek is <b>gereset en geopend</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -1049,11 +993,6 @@ msgstr "Gebruikt om open dagen te berekenen"
 msgid "Meetings"
 msgstr "Afspraken"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Voorwaarden op dossiervelden"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1061,6 +1000,19 @@ msgstr "Voorwaarden op dossiervelden"
 msgid "Next Action"
 msgstr "Volgende actie"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Nieuw"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1129,16 +1081,6 @@ msgstr "Bereken segmentatie"
 msgid "Lowest"
 msgstr "Laagste"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Afspraken gekoppeld aan het telefoongesprek <em>%s</em> is <b>aangemaakt</b> "
-"en <b>gepland</b> op <em>%s</em>."
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1148,10 +1090,10 @@ msgid "Creation Date"
 msgstr "Aanmaakdatum"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s is <b>aangemaakt</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1212,23 +1154,15 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Verwachte omzet"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr "í"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "Prospect is <b>verloren</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1237,9 +1171,20 @@ msgid "September"
 msgstr "September"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "E-mail adres van contactpersoon"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1272,21 +1217,15 @@ msgid "Opening Date"
 msgstr "Openingsdatum"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duur in minuten"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Kanaalnaam"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Doorgaan"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1321,6 +1260,12 @@ msgstr ""
 "leads en fases van prospects. Het is ook mogelijk om fases aan te maken voor "
 "beide soorten."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1331,14 +1276,6 @@ msgstr ""
 "segmentatieregel. Onaangevinkt zullen de onderliggende regels worden "
 "genegeerd"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Relatie aanmaken"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1360,18 +1297,11 @@ msgid "unknown"
 msgstr "onbekend"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-"Volgers van het verkoopteam volgen automatisch alle prospects gerelateerd "
-"aan dit verkoopteam."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Relatie naar prospects"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is een volger"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1381,13 +1311,6 @@ msgstr "Relatie naar prospects"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Is een volger"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1440,6 +1363,13 @@ msgstr ""
 "Wanneer een e-mail, wordt verstuurd, wordt het standaard adres van het "
 "verkoopteam gebruikt."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1451,7 +1381,7 @@ msgid "Lead Description"
 msgstr "Lead omschrijving"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Samengevoegde prospects"
@@ -1495,13 +1425,9 @@ msgstr "Referenties"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Annuleren"
@@ -1522,14 +1448,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Leads/Prospects met de status 'in afwachting'"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Twee prospects samenvoegen"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Te doen"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefoongesprek met relatie"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Gekoppelde klant"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1568,6 +1501,16 @@ msgstr "Leads/Prospects dien zich in de open fase bevinden"
 msgid "Users"
 msgstr "Gebruikers"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secties"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1617,6 +1560,12 @@ msgstr "Naam"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Leads/prospects welke aan mijzelf zijn toegewezen"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Afsluitdatum"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1653,17 +1602,6 @@ msgstr "Hoog"
 msgid "Convert to prospect to business partner"
 msgstr "Converteer naar prospect naar zakenrelatie"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "Prospect is  <b>gewonnen</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Telefoongesprekken welke zijn toegewezen aan mijzelf of mijn team(s)"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1700,6 +1638,7 @@ msgstr "Bovenliggende team"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Koppel niet aan een klant"
 
@@ -1708,11 +1647,6 @@ msgstr "Koppel niet aan een klant"
 msgid "Next Action Date"
 msgstr "Volgende actiedatum"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Lopend"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1730,11 +1664,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Toewijzen prospect aan"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postcode"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1746,7 +1675,7 @@ msgid "Month of call"
 msgstr "Maand van het telefoongesprek"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "relatie is <b>aangemaakt</b>."
@@ -1803,11 +1732,6 @@ msgstr "Waarde"
 msgid "Customer Name"
 msgstr "Klantnaam"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Telefoongesprek naar prospect"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1828,11 +1752,6 @@ msgstr "Prospects per fase"
 msgid "Prospect is converting to business partner"
 msgstr "Prospect word omgezet naar relatie"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "Relatiebeheer lead: Markeer als ongelezen"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1968,13 +1887,6 @@ msgstr "Doorverwijzer"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Soort wordt gebruikt om leads en prospects te scheiden"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Weet u zeker dat u een relatie wilt aanmaken op basis van dit "
-"telefoongesprek?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -2005,16 +1917,9 @@ msgid "Sales Teams"
 msgstr "Verkoopteams"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Lead naar relatie"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentatie"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -2026,12 +1931,6 @@ msgstr "Team"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Leads/Prospects dien zich in de nieuw fase bevinden"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>relatie</b> is nu ingesteld op <em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -2043,12 +1942,6 @@ msgstr "Niet opgeslagen"
 msgid "Probability"
 msgstr "Slagingskans"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Selecteer meer dan één prospect uit de lijstweergave."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -2064,6 +1957,12 @@ msgstr "Maand"
 msgid "Leads"
 msgstr "Leads"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -2075,44 +1974,18 @@ msgstr "Ontwerp"
 msgid "Merge with existing opportunities"
 msgstr "Samenvoegen met bestaande prospects"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Klik hier om een nieuwe prospect aan et maken\n"
-"            </p><p>\n"
-"              OpenERP helpt u bij het volgen van uw verkoop pijplijn en het "
-"opvolgen\n"
-"              van potentiële verkopen en tevens het inschatten van "
-"toekomstige opbrengsten.\n"
-"            </p><p>\n"
-"              U bent in staat om afspraken en telefoongesprekken te plannen "
-"van\n"
-"              prospects, deze te converteren naar offertes, het koppelen "
-"van\n"
-"              gerelateerde documenten, het volgen van discussies, en nog "
-"veel meer. \n"
-"            </p>\n"
-"          "
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Te doen"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2175,39 +2048,6 @@ msgstr "In afwachting"
 msgid "Prospect Opportunity"
 msgstr "Prospect"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Klik hier om een niet-gekwalificeerde lead aan te maken\n"
-"          </p><p>\n"
-"            Gebruik leads wanneer u een kwalificatiestap nodig heeft, voor\n"
-"            het aanmaken van een prospect of klant. Het kan bijvoorbeeld "
-"een\n"
-"            visitekaartje zijn welke u heeft ontvangen, een contactformulier "
-"\n"
-"            die iemand op uw website heeft ingevuld of een lijst met\n"
-"           niet-gekwalificeerde prospects welke u importeert.\n"
-"          </p><p>\n"
-"            Wanneer gekwalificeerd, kan de lead worden geconverteerd naar\n"
-"            een prospect en/of een nieuwe klant in uw adresboek.\n"
-"          </p>\n"
-"        "
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2256,18 +2096,16 @@ msgid "Mandatory Expression"
 msgstr "Verplichte expressie"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Maak een nieuwe klant"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Verstuur bericht"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Gekoppelde klant"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Maak een nieuwe klant"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2296,11 +2134,6 @@ msgstr "Prospects analyse"
 msgid "Misc"
 msgstr "Overig"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Reguliere expresse op dossier historie"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2328,11 +2161,6 @@ msgstr "Gesprek gereed"
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Herinnering naar klant"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2344,21 +2172,22 @@ msgid "Product"
 msgstr "Product"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "Telefoongesprek <b>is aangemaakt en geopend</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maximale communicatiegeschiedenis"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Aanmaak jaar"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Conversie opties"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2429,7 +2258,6 @@ msgstr "Vervolg proces"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Converteer naar prospect"
 
@@ -2524,15 +2352,25 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Condities en communicatiehistorie"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Lopend"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "Niet toegewezen leads"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2553,36 +2391,6 @@ msgstr "Reset"
 msgid "After-Sale Services"
 msgstr "Nazorg"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Hallo [[object.partner_id and object.partner_id.name or '']], \n"
-"De navolgende lead is niet meer geopend de afgelopen 5 dagen.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Omschrijving:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Bedankt,\n"
-"            "
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Omzetten"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2628,6 +2436,11 @@ msgstr ""
 "volgens verschillende criteria en gedetailleerder kijken door meer groepen "
 "toe te voegen."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2659,6 +2472,11 @@ msgstr "Selecteer leads/prospects"
 msgid "Confirmed"
 msgstr "Bevestigd"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2691,6 +2509,24 @@ msgstr "Optionele expressie"
 msgid "Followers"
 msgstr "Volgers"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2747,11 +2583,6 @@ msgstr "Prospects van leads maken"
 msgid "Email Campaign - Products"
 msgstr "Email Campagne - producten"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Zet categorie op"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2811,9 +2642,10 @@ msgid "Qualification"
 msgstr "Kwalificatie"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Partner contactpersoon e-mail"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Conversie actie"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2844,15 +2676,17 @@ msgstr ""
 "            "
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Een relatie is al gedefinieerd"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Augustus"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configureren"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2948,17 +2782,10 @@ msgid "Logged Calls"
 msgstr "Ontvangen telefoongesprekken"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Kans op succes"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Nieuw"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2970,7 +2797,6 @@ msgstr "Dossiers op verkoopteam"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Afspraak"
 
@@ -2979,11 +2805,6 @@ msgstr "Afspraak"
 msgid "Category of Case"
 msgstr "Dossiercategorie"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Prospect / Klant"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -3007,11 +2828,6 @@ msgstr "Straat2"
 msgid "Manage Helpdesk and Support"
 msgstr "Helpdesk and Supportmanagement"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "U dient te controleren of deze relatie niet al bestaat."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -3030,21 +2846,6 @@ msgstr "Gebruiker"
 msgid "November"
 msgstr "November"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Onderhandeling"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -3068,11 +2869,6 @@ msgstr "Contract"
 msgid "Twitter Ads"
 msgstr "Twitter Advertenties"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Algemeen voor alle teams"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -3084,14 +2880,9 @@ msgid "Planned Revenues"
 msgstr "Geplande omzet"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "Relatiebeheer lead: Markeer als gelezen"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefoongesprek naar telefoongesprek"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Verw.sluiting"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -3115,16 +2906,10 @@ msgid "Categorization"
 msgstr "Categoriseren"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Log telefoongesprek"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Actieregels"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -3151,7 +2936,6 @@ msgstr "Aanmaakdatum"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "om"
 
@@ -3177,7 +2961,6 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3271,20 +3054,11 @@ msgstr "Zet terug naar Te doen"
 msgid "Working Hours"
 msgstr "Werkuren"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefoongesprekken"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Klant"
 
@@ -3306,7 +3080,7 @@ msgid "Lost"
 msgstr "Verloren"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3356,19 +3130,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefoongesprekken op gebruiker en sectie"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Afspraak gekoppeld aan prospect <em>%s</em> is <b>aangemaakt</b> en "
-"<b>gepland</b> op <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Onderhandeling"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Verw.sluiting"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefoongesprek naar telefoongesprek"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3386,10 +3155,10 @@ msgid "Proposition"
 msgstr "Voorstel"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Afsluitdatum"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefoongesprekken"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3403,6 +3172,11 @@ msgstr "Jaar"
 msgid "Newsletter"
 msgstr "Nieuwsbrief"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3766,6 +3540,9 @@ msgstr ""
 #~ msgid "Watchers Emails"
 #~ msgstr "Email toeschouwers"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Voorwaarden op dossiervelden"
+
 #~ msgid "Maximim Priority"
 #~ msgstr "Hoogste prioriteit"
 
@@ -4023,6 +3800,9 @@ msgstr ""
 #~ "Vink dit aan wanneer u wilt dat de regel de gebruiker via de mail een "
 #~ "herinnering stuurt."
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maximale communicatiegeschiedenis"
+
 #~ msgid "Mail body"
 #~ msgstr "E-mail berichttekst"
 
@@ -4120,6 +3900,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Koppel aan bestaande relatie"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Reguliere expresse op dossier historie"
+
 #~ msgid "Internal Meeting"
 #~ msgstr "Interne bespreking"
 
@@ -4145,9 +3928,15 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Er is al een relatie voor dit telefoongesprek gedefinieerd."
 
+#~ msgid "Continue"
+#~ msgstr "Doorgaan"
+
 #~ msgid "Message"
 #~ msgstr "Bericht"
 
+#~ msgid "Create Partner"
+#~ msgstr "Maak relatie"
+
 #~ msgid "Gives the sequence order when displaying a list of case stages."
 #~ msgstr ""
 #~ "Bepaalt de volgorde bij het afbeelden van de lijst van dossier fases."
@@ -4190,9 +3979,6 @@ msgstr ""
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Terugzetten naar onbevestigd"
 
-#~ msgid "Send Mail"
-#~ msgstr "Verstuur bericht"
-
 #~ msgid "Claims"
 #~ msgstr "Klachten"
 
@@ -4218,6 +4004,12 @@ msgstr ""
 #~ msgid "Exception Date/Times"
 #~ msgstr "Uitzondering Data/tijden"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "U dient te controleren of deze relatie niet al bestaat."
+
+#~ msgid "Success Probability"
+#~ msgstr "Kans op succes"
+
 #~ msgid "Salesman"
 #~ msgstr "Verkoper"
 
@@ -4409,6 +4201,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "Op dag"
 
+#~ msgid "Set Team to"
+#~ msgstr "Zet team op"
+
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Agenda synchronisatie"
 
@@ -4506,6 +4301,9 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Maandag"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Relatie aanmaken"
+
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Beheert een helpdesk dienst."
 
@@ -4538,6 +4336,9 @@ msgstr ""
 #~ msgid "_Schedule"
 #~ msgstr "_Planning"
 
+#~ msgid "_Convert"
+#~ msgstr "_Omzetten"
+
 #~ msgid "Wizard"
 #~ msgstr "Assistent"
 
@@ -4600,6 +4401,14 @@ msgstr ""
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Weet u zeker dat u een relatie wilt aanmaken op basis van dit "
+#~ "telefoongesprek?"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "Lead naar relatie"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
@@ -4703,6 +4512,9 @@ msgstr ""
 #~ msgid "Sales Dashboard"
 #~ msgstr "Verkoop dashboard"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefoongesprek met relatie"
+
 #~ msgid "Set New State To"
 #~ msgstr "Nieuwe status gezet op"
 
@@ -4823,6 +4635,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "CRM Applicatie configuratie"
 
+#~ msgid "Set Category to"
+#~ msgstr "Zet categorie op"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Maand-1    "
 
@@ -4899,6 +4714,9 @@ msgstr ""
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "Dossier '%s' is gesloten."
 
+#~ msgid "Action Rules"
+#~ msgstr "Actieregels"
+
 #~ msgid "Recurrency"
 #~ msgstr "Herhaling"
 
@@ -5093,6 +4911,9 @@ msgstr ""
 #~ msgid "Communication & History"
 #~ msgstr "Communicatie & Geschiedenis"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Twee prospects samenvoegen"
+
 #, python-format
 #~ msgid ""
 #~ "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
@@ -5160,6 +4981,9 @@ msgstr ""
 #~ msgid "Mail Gateway"
 #~ msgstr "Mail Gateway"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Prospect / Klant"
+
 #~ msgid "Salesmans"
 #~ msgstr "Verkoper"
 
@@ -5260,6 +5084,13 @@ msgstr ""
 #~ msgid "Planned Revenue By Stage"
 #~ msgstr "Geplande opbrengst per fase"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Een relatie is al gedefinieerd"
+
+#~ msgid "Common to All Teams"
+#~ msgstr "Algemeen voor alle teams"
+
 #~ msgid "Phone calls made in current month"
 #~ msgstr "Telefoongesprekken gemaakt in de huidige maand"
 
@@ -5292,6 +5123,10 @@ msgstr ""
 #~ msgid "Review Sales Stages"
 #~ msgstr "Beoordeel verkoopfases"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Selecteer meer dan één prospect uit de lijstweergave."
+
 #, python-format
 #~ msgid ""
 #~ "You can not escalate, you are already at the top level regarding your sales-"
@@ -5371,10 +5206,16 @@ msgstr ""
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "Lead '%s' is omgezet in een prospect."
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Relatie naar prospects"
+
 #, python-format
 #~ msgid "The stage of opportunity '%s' has been changed to '%s'."
 #~ msgstr "De fase van de prospect '%s' is gewijzigd in '%s'."
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Telefoongesprek naar prospect"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been opened."
 #~ msgstr "Prospect '%s' is geopend."
@@ -5496,6 +5337,9 @@ msgstr ""
 #~ msgid "Schedule a Call"
 #~ msgstr "Plan een telefoongesprek"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Converteren naar prospect "
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Converteren naar prospect"
 
@@ -5521,6 +5365,9 @@ msgstr ""
 #~ "pijplijn beter kan organiseren. Fases geven de mogelijkheid om beter inzicht "
 #~ "te krijgen in waar een prospect zich bevindt in het verkoopproces."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Naam prospect"
+
 #~ msgid "Opportunity Analysis"
 #~ msgstr "Prospect analyse"
 
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index c44f154a30d..c4c54ae3ff7 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-02 07:29+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: nl\n"
 
 #. module: crm
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Lead"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Titel"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Actie"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Opportuniteiten kiezen"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Dagen tot afsluiten"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Fasenaam"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "Analyse CRM Leads"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr "Creatiedatum"
 msgid "Rule Name"
 msgstr "Regelnaam"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Nog een gesprek plannen"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Uitschrijven"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Status"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Uitgesloten antwoorden:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secties"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Leadanalyse"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campagnes"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Opportuniteiten kiezen"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Status"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Prospectrelatie"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentering"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgstr ""
 "deze fase."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,16 +439,22 @@ msgstr "Categorie"
 msgid "#Opportunities"
 msgstr "#Opportuniteiten"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "E-mail contactpersoon relatie"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -471,22 +485,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Opportuniteit maken"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Augustus"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Fasenaam"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,9 +504,9 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Nog te doen"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Geplande opbrengst"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Verwachte opbrengst"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Samenvatting"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Zaakcategorie"
 msgid "Partner Contact Name"
 msgstr "Contactpersoon relatie"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "#Telefoongesprekken"
 msgid "The code of the sales team must be unique !"
 msgstr "De code van het verkoopteam moet uniek zijn"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Relatiesegmentering"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duur in minuten"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "Naam van de segmentering"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Kans (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistiekdashboard"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Opportuniteit"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Opportuniteitnaam"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Team instellen op"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Exclusief"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Van %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Creatiejaar"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Vereisten"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Omzetten naar opportuniteit "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postcode"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Als gewonnen markeren"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Kans (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing"
@@ -929,23 +897,12 @@ msgstr "Waarschuwing"
 msgid "Days to Open"
 msgstr "Dagen tot openen"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Relatie maken"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Gsm"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr "Dient om dagen geopend te berekenen"
 msgid "Meetings"
 msgstr "Vergaderingen"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Volgende actie"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Nieuw"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Segmentering berekenen"
 msgid "Lowest"
 msgstr "Laagste"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Creatiedatum"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Verwachte opbrengst"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "September"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1189,21 +1149,15 @@ msgid "Opening Date"
 msgstr "Startdatum"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duur in minuten"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Kanaalnaam"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Doorgaan"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1234,6 +1188,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1243,14 +1203,6 @@ msgstr ""
 "Vink aan als u dit tabblad als onderdeel van een segmenteringsregel wilt "
 "gebruiken. Zoniet worden onderstaande criteria genegeerd."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Relatie maken"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1272,17 +1224,12 @@ msgid "unknown"
 msgstr "onbekend"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Relatie naar opportuniteit"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1291,13 +1238,6 @@ msgstr "Relatie naar opportuniteit"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1345,6 +1285,13 @@ msgid ""
 msgstr ""
 "E-mails worden verzonden naar het standaardmailadres van het verkoopteam."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1356,7 +1303,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Samengevoegde opportuniteiten"
@@ -1400,13 +1347,9 @@ msgstr "Referenties"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Annuleren"
@@ -1427,14 +1370,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Leads/opportuniteiten in status Wachtend."
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Twee opportuniteiten samenvoegen"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Nog te doen"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefoontje naar relatie"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1473,6 +1423,16 @@ msgstr "Leads/opportuniteiten in status Open."
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secties"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1521,6 +1481,12 @@ msgstr "Naam"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Afsluitdatum"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1557,17 +1523,6 @@ msgstr "Hoog"
 msgid "Convert to prospect to business partner"
 msgstr "Prospect omzetten naar relatie"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1604,6 +1559,7 @@ msgstr "Hoofdteam"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1612,11 +1568,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Volgende actiedatum"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Lopend"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1630,11 +1581,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postcode"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1646,7 +1592,7 @@ msgid "Month of call"
 msgstr "Maand van gesprek"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1699,11 +1645,6 @@ msgstr "Waarde"
 msgid "Customer Name"
 msgstr "Klantennaam"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Telefoongesprek naar opportuniteit"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1724,11 +1665,6 @@ msgstr "Opportuniteiten per fase"
 msgid "Prospect is converting to business partner"
 msgstr "Prospect wordt omgezet naar relatie"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1862,12 +1798,6 @@ msgstr "Doorverwijzer"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Type wordt gebruikt om leads van opportuniteiten te onderscheiden"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Bent u zeker dat u een relatie wilt maken op basis van dit telefoongesprek?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1898,16 +1828,9 @@ msgid "Sales Teams"
 msgstr "Verkoopteams"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Lead naar relatie"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentering"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1919,12 +1842,6 @@ msgstr "Team"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Leads/opportuniteiten in status Nieuw."
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1936,12 +1853,6 @@ msgstr "Niet uitgevoerd"
 msgid "Probability"
 msgstr "Kans"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Gelieve meer dan één opportuniteit te kiezen uit de lijst."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1957,6 +1868,12 @@ msgstr "Maand"
 msgid "Leads"
 msgstr "Leads"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1968,28 +1885,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Uit te voeren"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2050,24 +1957,6 @@ msgstr "Wachtend"
 msgid "Prospect Opportunity"
 msgstr "Opportuniteit"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2116,17 +2005,15 @@ msgid "Mandatory Expression"
 msgstr "Verplichte expressie"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2156,11 +2043,6 @@ msgstr "Opportuniteitenanalyse"
 msgid "Misc"
 msgstr "Diversen"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expressie op historiek van zaak"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2188,11 +2070,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2204,21 +2081,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maximale communicatiehistoriek"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Creatiejaar"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2287,7 +2165,6 @@ msgstr "Verder verwerken"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2369,8 +2246,13 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Lopend"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2378,6 +2260,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Niet-toegewezen leads"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2398,26 +2285,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Omzetten"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2463,6 +2330,11 @@ msgstr ""
 "diverse criteria en verder zoeken in de infrmatie door meer groepen toe te "
 "voegen."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2494,6 +2366,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Bevestigd"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2526,6 +2403,24 @@ msgstr "Optionele expressie"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2582,11 +2477,6 @@ msgstr "Opportuniteiten maken van leads"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Categorie instellen op"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2631,9 +2521,10 @@ msgid "Qualification"
 msgstr "Kwalificatie"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "E-mail contactpersoon relatie"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2651,14 +2542,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "De relatie bestaat al."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Augustus"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2755,17 +2648,10 @@ msgid "Logged Calls"
 msgstr "Genoteerde gesprekken"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Succesratio"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Nieuw"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2777,7 +2663,6 @@ msgstr "Zaken per verkoopteam"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Vergadering"
 
@@ -2786,11 +2671,6 @@ msgstr "Vergadering"
 msgid "Category of Case"
 msgstr "Zaakcategorie"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Opportuniteit / klant"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2814,11 +2694,6 @@ msgstr "Straat 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "U dient wellicht na te gaan of de relatie nog niet bestaat."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2837,21 +2712,6 @@ msgstr "Gebruiker"
 msgid "November"
 msgstr "November"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Onderhandeling"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2875,11 +2735,6 @@ msgstr "Contract"
 msgid "Twitter Ads"
 msgstr "Twitter Ads"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Voor alle teams"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2891,14 +2746,9 @@ msgid "Planned Revenues"
 msgstr "Geplande opbrengsten"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Gesprek naar gesprek"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Verw. sluiting"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2922,16 +2772,10 @@ msgid "Categorization"
 msgstr "Categorisering"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Gesprek noteren"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Actieregels"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2955,7 +2799,6 @@ msgstr "Creatiedatum"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2981,7 +2824,6 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3060,20 +2902,11 @@ msgstr "Terug naar Uit te voeren"
 msgid "Working Hours"
 msgstr "Werkuren"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefoongesprekken"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Klant"
 
@@ -3095,7 +2928,7 @@ msgid "Lost"
 msgstr "Verloren"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3143,17 +2976,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefoongesprekken per gebruik en sectie"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Onderhandeling"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Verw. sluiting"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Gesprek naar gesprek"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3171,10 +3001,10 @@ msgid "Proposition"
 msgstr "Voorstel"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Afsluitdatum"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefoongesprekken"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3188,6 +3018,11 @@ msgstr "Jaar"
 msgid "Newsletter"
 msgstr "Nieuwsbrief"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3292,6 +3127,9 @@ msgstr ""
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expressie op historiek van zaak"
+
 #, python-format
 #~ msgid "The lead '%s' has been opened."
 #~ msgstr "Lead '%s' is geopend."
@@ -3305,6 +3143,9 @@ msgstr ""
 #~ msgid "Select Action"
 #~ msgstr "Actie selecteren"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Opportuniteit / klant"
+
 #~ msgid "Privacy"
 #~ msgstr "Privacy"
 
@@ -3409,6 +3250,12 @@ msgstr ""
 #~ msgid "Month-1"
 #~ msgstr "Maand-1"
 
+#~ msgid "Continue"
+#~ msgstr "Doorgaan"
+
+#~ msgid "Set Team to"
+#~ msgstr "Team instellen op"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
@@ -3424,6 +3271,9 @@ msgstr ""
 #~ "Met dit kenmerk definieert u de lijst van uitzonderingen qua datum/tijd voor "
 #~ "een recurrent kalenderonderdeel."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Omzetten naar opportuniteit "
+
 #~ msgid "Recurrent Meeting"
 #~ msgstr "Recurrente vergadering"
 
@@ -3436,6 +3286,9 @@ msgstr ""
 #~ msgid "Phone calls made in current year"
 #~ msgstr "Telefoongesprekken van dit jaar"
 
+#~ msgid "Create Partner"
+#~ msgstr "Relatie maken"
+
 #~ msgid "<"
 #~ msgstr "<"
 
@@ -3521,6 +3374,9 @@ msgstr ""
 #~ "Maak specifieke gesprekscategorieën zodat u vlot de verschillende soorten "
 #~ "gesprekken kunt opvolgen."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Opportuniteitnaam"
+
 #~ msgid "Fri"
 #~ msgstr "Vrij"
 
@@ -3564,6 +3420,9 @@ msgstr ""
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "Zaak '%s' is gesloten."
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Relatie naar opportuniteit"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Opportuniteiten per categorie"
 
@@ -3586,6 +3445,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Twee opportuniteiten samenvoegen"
+
 #~ msgid "Exception Rule"
 #~ msgstr "Uitzonderingsregel"
 
@@ -3685,6 +3547,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Opportuniteiten per categorie"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Telefoongesprek naar opportuniteit"
+
 #~ msgid "Recurrency Option"
 #~ msgstr "Recurrentieoptie"
 
@@ -3736,6 +3601,10 @@ msgstr ""
 #~ msgid "Leads creating during last 7 days"
 #~ msgstr "Leads van de afgelopen 7 dagen"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Bent u zeker dat u een relatie wilt maken op basis van dit telefoongesprek?"
+
 #~ msgid ""
 #~ "Define a Sales Team to organize your different salesmen or sales departments "
 #~ "into separate teams. Each team will work in its own list of opportunities, "
@@ -3752,9 +3621,16 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "x keren herhalen"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Lead naar relatie"
+
 #~ msgid "Pending Opportunities"
 #~ msgstr "Wachtende opportuniteiten"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Gelieve meer dan één opportuniteit te kiezen uit de lijst."
+
 #~ msgid ""
 #~ "Leads allow you to manage and keep track of all initial contacts with a "
 #~ "prospect or partner showing interest in your products or services. A lead is "
@@ -3867,6 +3743,9 @@ msgstr ""
 #~ msgid "My Open Opportunities"
 #~ msgstr "Mijn openstaande opportuniteiten"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maximale communicatiehistoriek"
+
 #~ msgid "Invite People"
 #~ msgstr "Mensen uitnodigen"
 
@@ -3915,6 +3794,9 @@ msgstr ""
 #~ msgid "Leads/Opportunities created in current year"
 #~ msgstr "Leads/opportuniteiten van dit jaar"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefoontje naar relatie"
+
 #~ msgid "Set New State To"
 #~ msgstr "Zet nieuwe status op"
 
@@ -4070,6 +3952,9 @@ msgstr ""
 #~ msgid "Need Information"
 #~ msgstr "Heeft informatie nodig"
 
+#~ msgid "Set Category to"
+#~ msgstr "Categorie instellen op"
+
 #~ msgid "Mail To"
 #~ msgstr "Mail naar"
 
@@ -4085,6 +3970,10 @@ msgstr ""
 #~ msgid "Review Sales Stages"
 #~ msgstr "Verkoopfasen bekijken"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "De relatie bestaat al."
+
 #~ msgid "First"
 #~ msgstr "Eerste"
 
@@ -4138,6 +4027,9 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "Standaard (0=Geen)"
 
+#~ msgid "Success Probability"
+#~ msgstr "Succesratio"
+
 #~ msgid "Attendees"
 #~ msgstr "Deelnemers"
 
@@ -4155,6 +4047,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Vergadercategorieën"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "U dient wellicht na te gaan of de relatie nog niet bestaat."
+
 #, python-format
 #~ msgid "The case '%s' has been cancelled."
 #~ msgstr "Zaak '%s' is geannuleerd."
@@ -4163,6 +4058,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "Opportuniteit '%s' is gewonnen."
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Voor alle teams"
+
 #, python-format
 #~ msgid "Error"
 #~ msgstr "Fout"
@@ -4186,6 +4084,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Sluiten"
 
+#~ msgid "Action Rules"
+#~ msgstr "Actieregels"
+
 #~ msgid "Recurrency"
 #~ msgstr "Recurrentie"
 
@@ -4263,6 +4164,9 @@ msgstr ""
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "U kunt niet dezelfde leden maken."
 
+#~ msgid "Create a Partner"
+#~ msgstr "Relatie maken"
+
 #~ msgid "Mark as"
 #~ msgstr "Markeren als"
 
@@ -4278,6 +4182,9 @@ msgstr ""
 #~ msgid "Scheduled Phonecalls"
 #~ msgstr "Geplande telefoongesprekken"
 
+#~ msgid "_Convert"
+#~ msgstr "_Omzetten"
+
 #~ msgid "Opportunities By Categories"
 #~ msgstr "Opportuniteiten per categorie"
 
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 96fe22d9b4d..d146c10750e 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-17 21:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 13:35+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,11 +31,13 @@ msgstr ""
 "przychodzących wiadomości."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Sygnał"
 
@@ -45,22 +47,30 @@ msgid "Title"
 msgstr "Tytuł"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Akcja"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Rozmowa połaczona z szansą <em>%s</em> została <b>created</b> i "
-"<b>scheduled</b> na <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr "Ustaw zespół dla działu sprzedaży"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Wybierz Szansę"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -68,11 +78,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Zarządzaj funduszem"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Konwertuj do szansy"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -80,10 +85,10 @@ msgid "Delay to close"
 msgstr "Opóźnienie do zamknięcia"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Sygnał został <b>skonwertowany do szansy</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nazwa etapu"
 
 #. module: crm
 #: view:crm.lead:0
@@ -98,11 +103,6 @@ msgstr "Sprzedawca"
 msgid "CRM Lead Analysis"
 msgstr "Analiza sygnałów"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Przypomnienie sygnału: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -148,6 +148,12 @@ msgstr "Dzień utworzenia"
 msgid "Rule Name"
 msgstr "Nazwa reguły"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -181,8 +187,8 @@ msgstr ""
 "kanban."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -209,7 +215,7 @@ msgid "Schedule Other Call"
 msgstr "Zaplanuj inny telefon"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -221,9 +227,14 @@ msgid "Opt-Out"
 msgstr "Odmowa"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Ukryj w widokach kiedy puste"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stan"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr "# Spotkań"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -241,9 +252,9 @@ msgid "Excluded Answers :"
 msgstr "Wyłączając odpowiedzi :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekcje"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr "Połącz szanse"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -253,7 +264,7 @@ msgid "Leads Analysis"
 msgstr "Analiza sygnałów"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s rozmowa</b> dla <em>%s</em>."
@@ -264,16 +275,6 @@ msgstr "<b>%s rozmowa</b> dla <em>%s</em>."
 msgid "Campaigns"
 msgstr "Kampanie"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Wybierz Szansę"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stan"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -296,7 +297,7 @@ msgid "Prospect Partner"
 msgstr "Potencjalny partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Brak tematu"
@@ -409,11 +410,17 @@ msgstr "Martwe"
 msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentacja"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Link do istniejącego klienta"
 
@@ -436,7 +443,6 @@ msgstr ""
 "To definiuje średnie prawdopodobieństwo sukcesu sprawy na tym etapie."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -451,6 +457,13 @@ msgstr "Kategoria"
 msgid "#Opportunities"
 msgstr "#Szans"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
@@ -458,10 +471,9 @@ msgstr ""
 "Sygnały dowiązane do mnie lub do jednego z zespołów, do kŧórych należę"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Akcja konwersji"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "email partnera kontaktu"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -500,22 +512,13 @@ msgstr "Stan"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Utwórz szansę"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Sierpień"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nazwa etapu"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Konfiguruj"
 
 #. module: crm
 #: view:crm.lead:0
@@ -528,9 +531,9 @@ msgid "Mailings"
 msgstr "Wiadomości"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Do zrobienia"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr "Etap zmieniono"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -550,9 +553,9 @@ msgid "Planned Revenue"
 msgstr "Planowany dochód"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "Rozmowa: Zaznacz jako przeczytane"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Przew. dochód"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -588,6 +591,11 @@ msgstr "Podsumowanie"
 msgid "Merge"
 msgstr "Połącz"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr "Szansa ${object.name | h})"
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -598,11 +606,6 @@ msgstr "Kategoria sprawy"
 msgid "Partner Contact Name"
 msgstr "Nazwa kontaktu partnera"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "Rozmowa: Zaznacz jako nieprzeczytane"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -627,6 +630,11 @@ msgstr "# telefonów"
 msgid "The code of the sales team must be unique !"
 msgstr "Kod sprzedaży musi być unikalny !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Adres email kontaktu"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -698,9 +706,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentacja partnerów"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Czas trwania w minutach"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Waluta"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -718,9 +726,9 @@ msgid "The name of the segmentation."
 msgstr "Nazwa segmentacji"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Sygnały z USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Prawdop. (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -738,13 +746,7 @@ msgid "Statistics Dashboard"
 msgstr "Konsola statystyk"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etap zmieniony na <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -757,12 +759,6 @@ msgstr "Etap zmieniony na <b>%s</b>."
 msgid "Opportunity"
 msgstr "Szansa"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Spotkanie zostało <b>zaplanowane</b>  <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -786,7 +782,7 @@ msgstr "Zatrzymaj proces"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -799,17 +795,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr "Sygnały/Szanse związane z zespołem, którym zarządzam."
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nazwa szansy"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Ustaw zespół na"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -821,25 +806,21 @@ msgid "Exclusive"
 msgstr "Wyłączny"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Od %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Rok utworzenia"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Konwertuj do szansy"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "lub"
@@ -864,21 +845,6 @@ msgstr ""
 "Połączenie między etapami a zespołami sprzedaży. Jeśli ustawione, to "
 "ogranicza bieżący stan do wybranych zespołów."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -886,9 +852,9 @@ msgid "Requirements"
 msgstr "Wymagania"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Skonwertuj do szansy "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Kod poczt."
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -933,9 +899,9 @@ msgid "Mark Won"
 msgstr "Zaznacz jako sukces"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Prawdop. (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Sygnały z USA"
 
 #. module: crm
 #: view:crm.lead:0
@@ -960,7 +926,7 @@ msgid "Send Email"
 msgstr "Wyślij e-mail"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
@@ -970,24 +936,12 @@ msgstr "Ostrzeżenie !"
 msgid "Days to Open"
 msgstr "Dni do otwarcia"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Utwórz partnera"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Tel. komórkowy"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-"Rozmowa telefoniczna została <b>odnowiona i ustawiona jako otwarta</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -1014,11 +968,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Spotkania"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Warunki dla pól sprawy"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1026,6 +975,19 @@ msgstr "Warunki dla pól sprawy"
 msgid "Next Action"
 msgstr "Następna akcja"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr "<b>Partner</b> został ustawiony na <em>%s</em>."
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Projekt"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1094,14 +1056,6 @@ msgstr "Oblicz segmentację"
 msgid "Lowest"
 msgstr "Najniższy"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1111,10 +1065,10 @@ msgid "Creation Date"
 msgstr "Data utworzenia"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s został <b>uwtorzony</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr "Sygnał <b>skonwertowany do szansy</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1173,23 +1127,15 @@ msgid "Delete"
 msgstr "Usuń"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Przew. dochód"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr "Szansa utworzona"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "Szansa została <b>utracona</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1198,9 +1144,20 @@ msgid "September"
 msgstr "Wrzesień"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Adres email kontaktu"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1232,21 +1189,15 @@ msgid "Opening Date"
 msgstr "Data otwarcia"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Waluta"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Czas trwania w minutach"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nazwa kanału"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Dalej"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1276,6 +1227,14 @@ msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
+"To pole jest stosowane do rozróżniania etapów Sygnałów od etapów Szans. "
+"Można tez definiować etapy dla Sygnałów i Szans."
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr "Sygnał utworzony"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1286,14 +1245,6 @@ msgstr ""
 "Zaznacz, jeśli chcesz stosować tę zakładkę jako część reguły segmentacji. "
 "Jeśli nie zaznaczone, to kryteria poniżej zostaną zignorowane."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Utwórz partnera"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1315,16 +1266,11 @@ msgid "unknown"
 msgstr "nieznany"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner dla szansy"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Jest wypowiadającym się"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1334,13 +1280,6 @@ msgstr "Partner dla szansy"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Jest wypowiadającym się"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1388,6 +1327,13 @@ msgid ""
 msgstr ""
 "Przy wysyłaniu wiadomości domyślny adres jest pobierany z zespołu sprzedaży."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1399,7 +1345,7 @@ msgid "Lead Description"
 msgstr "Opis sygnału"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Połączone szanse"
@@ -1407,7 +1353,7 @@ msgstr "Połączone szanse"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Konsultacje"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1443,13 +1389,9 @@ msgstr "Odnośniki"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Anuluj"
@@ -1470,14 +1412,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Sygnały/Szanse w stanie oczekiwania"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Połącz dwie szanse"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Do zrobienia"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Rozmowa na Partnera"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr "Szansa utracona"
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Powiązany klient"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1516,6 +1465,16 @@ msgstr "Sygnały/Szanse w stanie Otwartym"
 msgid "Users"
 msgstr "Użytkownicy"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr "Zmieniono etap"
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekcje"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1564,6 +1523,12 @@ msgstr "Nazwa"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Sygnały/Szanse przypisane do mnie"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Data zamknięcia"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1600,17 +1565,6 @@ msgstr "Wysoki"
 msgid "Convert to prospect to business partner"
 msgstr "Konwertuj potencjalnego do partnera biznesowego"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "Szansa została <b>wygrana</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Rozmowy przypisane do mnie lub do moich zespołów"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1647,6 +1601,7 @@ msgstr "Zaspół nadrzędny"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Nie łącz z klientem"
 
@@ -1655,11 +1610,6 @@ msgstr "Nie łącz z klientem"
 msgid "Next Action Date"
 msgstr "Następna akcja"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Uruchomione"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1673,11 +1623,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Szanse przypisane do"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Kod poczt."
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1689,7 +1634,7 @@ msgid "Month of call"
 msgstr "Miesiąc rozmowy"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "Partner został <b>utworzony</b>."
@@ -1742,11 +1687,6 @@ msgstr "Wartość"
 msgid "Customer Name"
 msgstr "Nazwa Klienta"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Rozmowa na szansę"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1767,11 +1707,6 @@ msgstr "Szanse wg etapów"
 msgid "Prospect is converting to business partner"
 msgstr "Partner potencjalny jest konwertowany do partnera biznesowego."
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "Sygnał: oznacz jako nieprzeczytane"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1907,11 +1842,6 @@ msgstr "Odsyłacz"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ jest stosowany do rozróżnienia sygnałów od szans"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Chcesz utworzyć partnera na podstawie tej rozmowy ?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1942,16 +1872,9 @@ msgid "Sales Teams"
 msgstr "Zespoły sprzedaży"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Sygnał na Partnera"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentacja"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1963,12 +1886,6 @@ msgstr "Zespół"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Sygnały/Szanse w stanie nowym"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>partner</b> jest ustawiony na <em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1980,12 +1897,6 @@ msgstr "Nie odebrane"
 msgid "Probability"
 msgstr "Prawdopodobieństwo"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Wybierz kilka szans z listy"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -2001,6 +1912,12 @@ msgstr "Miesiąc"
 msgid "Leads"
 msgstr "Sygnały"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr "Połączone sygnały"
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -2012,39 +1929,18 @@ msgstr "Wygląd"
 msgid "Merge with existing opportunities"
 msgstr "Połącz z istniejącymi szansami."
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Kliknij, aby utworzyć nową szansę.\n"
-"            </p><p>\n"
-"              OpenERP pomoże ci śledzić twoje kontakty zpotencjalnymi\n"
-"              klientami i lepiej przewidywać sprzedaż i przychodzy.\n"
-"            </p><p>\n"
-"              Będziesz mógł planować rozmowy telefoniczne i spotkania,\n"
-"              konwertować szanse w oferty, załączać dokumenty, śledzić\n"
-"              dyskusje.\n"
-"            </p>\n"
-"          "
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Do zrobienia"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr "Sygnał do szansy"
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2107,36 +2003,6 @@ msgstr "Oczekiwanie"
 msgid "Prospect Opportunity"
 msgstr "Potencjalna szansa"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Kliknij, aby zarejestrować sygnał. \n"
-"          </p><p>\n"
-"            Stosuj sygnały jako potencjalne szanse do oceny ewentualnych\n"
-"            przychodów przed utworzeniem właściwej szansy lub klienta.\n"
-"            To może być wizytówka, informacje z internetu lub informacja\n"
-"            prywatna.\n"
-"          </p><p>\n"
-"            Po ocenie sygnał może być skonwertowany do szansy i/lub\n"
-"            partnera do dalszych działań.\n"
-"          </p>\n"
-"        "
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2185,18 +2051,16 @@ msgid "Mandatory Expression"
 msgstr "Wymagane wyrażenie"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Utwórz nowego klienta"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Wyślij wiadomość"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Powiązany klient"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Utwórz nowego klienta"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2225,11 +2089,6 @@ msgstr "Analiza szans"
 msgid "Misc"
 msgstr "Różne"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Wyrażenie regularne dla historii sprawy"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2257,11 +2116,6 @@ msgstr "Rozmowa wykonana"
 msgid "Responsible"
 msgstr "Odpowiedzialny"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Przypomnienie dla klienta"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2273,21 +2127,22 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "Rozmowa została <b>utworzona i otwarta</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimum historii komunikacji"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Rok utworzenia"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Opcje konwersji"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2354,7 +2209,6 @@ msgstr "Kontynuuj proces"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Konwertuj do szansy"
 
@@ -2438,15 +2292,25 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Warunki historii komunikacji"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Uruchomione"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr "Sygnał skonwertowany do szansy"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "Nieprzypisane sygnały"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr "Szansa wygrana"
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2467,26 +2331,6 @@ msgstr "Zresetuj"
 msgid "After-Sale Services"
 msgstr "Obsługa posprzedażna"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Konwertuj"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2531,6 +2375,11 @@ msgstr ""
 "ilości rozmów telefonicznych. Informacje możesz grupować i filtrować według "
 "różnych kryteriów."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr "Zwiń domyślnie"
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2562,6 +2411,11 @@ msgstr "Wybierz Sygnał/Szansę"
 msgid "Confirmed"
 msgstr "Potwierdzone"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2594,6 +2448,24 @@ msgstr "Opcjonalne wyrażenie"
 msgid "Followers"
 msgstr "Wypowiadający się"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2650,11 +2522,6 @@ msgstr "Tworzenie szansy z sygnału"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Ustaw kategorię na"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2699,9 +2566,10 @@ msgid "Qualification"
 msgstr "Kwalifikacje"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "email partnera kontaktu"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Akcja konwersji"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2719,15 +2587,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Partner już zdefiniowany"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Sierpień"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Konfiguruj"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr "Szansa przegrana"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2822,17 +2692,10 @@ msgid "Logged Calls"
 msgstr "Zarejestrowane rozmowy"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Prawdopodobieństwo sukcesu"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Projekt"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr "Szansa wygrana"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2844,7 +2707,6 @@ msgstr "Sprawy wg zespołów"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -2853,11 +2715,6 @@ msgstr "Spotkanie"
 msgid "Category of Case"
 msgstr "Kategoria sprawy"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Szansa / Klient"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2881,11 +2738,6 @@ msgstr "Ulica2"
 msgid "Manage Helpdesk and Support"
 msgstr "Zarządzaj helpdeskiem"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Powinieneś sprawdzić, czy ten partner już istnieje."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2904,21 +2756,6 @@ msgstr "Użytkownik"
 msgid "November"
 msgstr "Listopad"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negocjacje"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2942,11 +2779,6 @@ msgstr "Umowa"
 msgid "Twitter Ads"
 msgstr "Twitter Ads"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Wspólne dla wszystkich zespołów"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2958,14 +2790,9 @@ msgid "Planned Revenues"
 msgstr "Planowany dochód"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "Sygnał: Oznacz jako przeczytane"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefon do telefonu"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Spodz. zamknięcie"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2989,16 +2816,10 @@ msgid "Categorization"
 msgstr "Kategorie"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Zarejestruj rozmowę"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reguły akcji"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -3022,7 +2843,6 @@ msgstr "Data utworzenia"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -3048,7 +2868,6 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3127,20 +2946,11 @@ msgstr "Ustaw na Do zrobienia"
 msgid "Working Hours"
 msgstr "Godziny pracy"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Rozmowy tel."
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Klient"
 
@@ -3162,7 +2972,7 @@ msgid "Lost"
 msgstr "Porażka"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3210,17 +3020,14 @@ msgid "Phone calls by user and section"
 msgstr "Rozmowy wg użytkowników i sekcji"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negocjacje"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Spodz. zamknięcie"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefon do telefonu"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3238,10 +3045,10 @@ msgid "Proposition"
 msgstr "Propozycja"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Data zamknięcia"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Rozmowy tel."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3255,6 +3062,11 @@ msgstr "Rok"
 msgid "Newsletter"
 msgstr "Biuletyn"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr "Etap szansy zmieniono"
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3568,6 +3380,9 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Partner jest już zdefiniowany dla tej rozmowy."
 
+#~ msgid "Continue"
+#~ msgstr "Dalej"
+
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
@@ -3580,6 +3395,9 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "Wiadomość"
 
+#~ msgid "Create Partner"
+#~ msgstr "Utwórz partnera"
+
 #~ msgid "My Meetings"
 #~ msgstr "Moje spotkania"
 
@@ -3663,6 +3481,9 @@ msgstr ""
 #~ msgid "Recurrent Rule"
 #~ msgstr "Reguła rekurencyjna"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nazwa szansy"
+
 #~ msgid "Mail to responsible"
 #~ msgstr "Mail do odpowiedzialnych"
 
@@ -3724,8 +3545,11 @@ msgstr ""
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr "Musisz podac email pertnera, aby zastosować tę akcję!"
 
-#~ msgid "Send Mail"
-#~ msgstr "Wyślij wiadomość"
+#~ msgid "Success Probability"
+#~ msgstr "Prawdopodobieństwo sukcesu"
+
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Powinieneś sprawdzić, czy ten partner już istnieje."
 
 #~ msgid "Schedule Phone Call"
 #~ msgstr "Zaplanuj rozmowę telefoniczną"
@@ -3771,6 +3595,9 @@ msgstr ""
 #~ "Reguła stosuje operator I. Sprawa musi pasować do wszystkich niepustych pól, "
 #~ "aby została wykonana akcja zapisana w zakładce 'Akcje'."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Wyrażenie regularne dla historii sprawy"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -3951,6 +3778,9 @@ msgstr ""
 #~ "Nie znaleziono ID E-Mail dla partnera odpowiedzialnego lub brak adresu "
 #~ "zwrotnego w sekcji!"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Warunki dla pól sprawy"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
@@ -3968,6 +3798,9 @@ msgstr ""
 #~ msgid "%(case_user_email)s = Responsible email"
 #~ msgstr "%(case_user_email)s = Email odpowiedzialnego"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimum historii komunikacji"
+
 #~ msgid "%(email_from)s = Partner email"
 #~ msgstr "%(email_from)s = Email partnera"
 
@@ -4166,6 +3999,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "Co dzień"
 
+#~ msgid "Set Team to"
+#~ msgstr "Ustaw zespół na"
+
 #~ msgid "Years"
 #~ msgstr "Lat"
 
@@ -4190,6 +4026,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been won."
 #~ msgstr "Szansa '%s' zakończona sukcesem."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Skonwertuj do szansy "
+
 #~ msgid "Set an alarm at this time, before the event occurs"
 #~ msgstr "Ustaw alarm na czas przed wystąpieniem zdarzenia"
 
@@ -4290,9 +4129,18 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Poniedziałek"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Utwórz partnera"
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner dla szansy"
+
 #~ msgid "Frequency"
 #~ msgstr "Częstotliwość"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Połącz dwie szanse"
+
 #~ msgid "Current"
 #~ msgstr "Bieżące"
 
@@ -4312,6 +4160,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Sobota"
 
+#~ msgid "_Convert"
+#~ msgstr "_Konwertuj"
+
 #~ msgid "Wizard"
 #~ msgstr "Kreator"
 
@@ -4479,6 +4330,9 @@ msgstr ""
 #~ msgid "Confidential"
 #~ msgstr "Poufne"
 
+#~ msgid "Set Category to"
+#~ msgstr "Ustaw kategorię na"
+
 #~ msgid "Fed. State"
 #~ msgstr "woj."
 
@@ -4544,6 +4398,9 @@ msgstr ""
 #~ msgid "Merged into Opportunity: %s"
 #~ msgstr "Połaczona z szansą: %s"
 
+#~ msgid "Action Rules"
+#~ msgstr "Reguły akcji"
+
 #~ msgid "Recurrency"
 #~ msgstr "Rekurencja"
 
@@ -4693,6 +4550,9 @@ msgstr ""
 #~ msgid "The case '%s' has been opened."
 #~ msgstr "Sprawa '%s' została otwarta."
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Rozmowa na szansę"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Wybierz etapy dla tego zespołu sprzedaży"
 
@@ -4721,6 +4581,9 @@ msgstr ""
 #~ msgid "Mail Campaign 2"
 #~ msgstr "Kampania mailowa - 2"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Chcesz utworzyć partnera na podstawie tej rozmowy ?"
+
 #~ msgid "Recurrency Option"
 #~ msgstr "Opcje powtarzania"
 
@@ -4733,6 +4596,9 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Powtarzaj x razy"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Sygnał na Partnera"
+
 #~ msgid "_Schedule Call"
 #~ msgstr "_Zaplanuj rozmowę"
 
@@ -4761,6 +4627,9 @@ msgstr ""
 #~ msgid "My Win/Lost Ratio for the Last Year"
 #~ msgstr "Mój współczynnik sukces/porażka dla ostatniego roku"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Rozmowa na Partnera"
+
 #~ msgid "Set New State To"
 #~ msgstr "Ustaw nowy stan na"
 
@@ -5040,6 +4909,9 @@ msgstr ""
 #~ "przypisanie warunków przejścia do następnych stanów. Możesz również spojrzeć "
 #~ "na wskazówkę do pola Automatyczna zmiana prawdopodobieństwa."
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Szansa / Klient"
+
 #~ msgid "Mail Gateway"
 #~ msgstr "Bramka pocztowa"
 
@@ -5051,3 +4923,14 @@ msgstr ""
 
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Planuj/zapisz rozmowę"
+
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Wybierz kilka szans z listy"
+
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Partner już zdefiniowany"
+
+#~ msgid "Common to All Teams"
+#~ msgstr "Wspólne dla wszystkich zespołów"
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 271b5e1bfe1..9f6133e54eb 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 10:12+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Prospecto"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Título"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Ação"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Selecionar oportunidades"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr "Gerir angariação de fundos"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Converter em oportunidades"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "Tempo para fechar"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nome do Estágio"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr "Vendedor"
 msgid "CRM Lead Analysis"
 msgstr "Análise de Prospectos do CRM"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "Dia da Criação"
 msgid "Rule Name"
 msgstr "Nome da Regra"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Agendar outra chamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "Opção saída"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Respostas excluídas :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secções"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Análise de Prospectos"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campanhas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Selecionar oportunidades"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Estado"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "Parceiro potencial"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Sem assunto"
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr "Mensagens por ler"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentação"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -415,7 +424,6 @@ msgstr ""
 "esta etapa seja um sucesso"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -430,16 +438,22 @@ msgstr "Categoria"
 msgid "#Opportunities"
 msgstr "#Oportunidades"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Contato email do parceiro"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -470,22 +484,13 @@ msgstr "Estados"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Criar Oportunidade"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nome do Estágio"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -498,9 +503,9 @@ msgid "Mailings"
 msgstr "Mailings"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "A Fazer"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -520,9 +525,9 @@ msgid "Planned Revenue"
 msgstr "Receita planificada"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Retorno Esperado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,6 +563,11 @@ msgstr "Resumo"
 msgid "Merge"
 msgstr "Juntar"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -568,11 +578,6 @@ msgstr "Categoria de Processos"
 msgid "Partner Contact Name"
 msgstr "Nome de Contato do Parceiro"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -595,6 +600,11 @@ msgstr "Número de telefonemas"
 msgid "The code of the sales team must be unique !"
 msgstr "O código da equipa de vendas deve ser único!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Endereço de email do contacto"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -658,9 +668,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentação do parceiro"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duração em minutos"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Divisa"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -678,9 +688,9 @@ msgid "The name of the segmentation."
 msgstr "O nome da segmentação"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -698,13 +708,7 @@ msgid "Statistics Dashboard"
 msgstr "Painel estatístico"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -717,12 +721,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Foi <b>agendada</b> uma reunião para <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -759,17 +757,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nome da oportunidade"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Definir equipa para"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -781,25 +768,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "De %s: %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Ano de Criação"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Converter em oportunidades"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "ou"
@@ -822,21 +805,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -844,9 +812,9 @@ msgid "Requirements"
 msgstr "Requisitos"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Converter em oportunidade "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -891,9 +859,9 @@ msgid "Mark Won"
 msgstr "Marcar como ganho"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidade (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -918,7 +886,7 @@ msgid "Send Email"
 msgstr "Enviar mensagem"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -928,23 +896,12 @@ msgstr "Aviso!"
 msgid "Days to Open"
 msgstr "Dias para abrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Criar parceiro"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Telemóvel"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -972,11 +929,6 @@ msgstr "Usado para calcular dias abertos"
 msgid "Meetings"
 msgstr "Reuniões"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condições em campos de caso"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -984,6 +936,19 @@ msgstr "Condições em campos de caso"
 msgid "Next Action"
 msgstr "Próxima Ação"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Esboço"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1052,14 +1017,6 @@ msgstr "Calcular segmentação"
 msgid "Lowest"
 msgstr "Mais Baixo"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1069,10 +1026,10 @@ msgid "Creation Date"
 msgstr "Data de Criação"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s foi <b>criada</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1131,23 +1088,15 @@ msgid "Delete"
 msgstr "Apagar"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Retorno Esperado"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "<b>Perdeu-se</b> a oportunidade."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1156,9 +1105,20 @@ msgid "September"
 msgstr "Setembro"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Endereço de email do contacto"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1191,21 +1151,15 @@ msgid "Opening Date"
 msgstr "Data de abertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Divisa"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duração em minutos"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nome do Canal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continuar"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1236,6 +1190,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1245,14 +1205,6 @@ msgstr ""
 "Selecione se quiser utilizar este separador como parte da regra de "
 "segmentação. Se não for marcado, o critério abaixo será ignorado"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Criar um parceiro"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1274,16 +1226,11 @@ msgid "unknown"
 msgstr "desconhecido"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Parceiro para a oportunidade"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um seguidor"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1293,13 +1240,6 @@ msgstr "Parceiro para a oportunidade"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "É um seguidor"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1348,6 +1288,13 @@ msgstr ""
 "Ao enviar e-mails, o endereço de e-mail por omissão é retirado da equipa de "
 "vendas."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1359,7 +1306,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Oportunidades intercaladas"
@@ -1403,13 +1350,9 @@ msgstr "Referências"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1430,14 +1373,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Prospectos / Oportunidades que estejam no estado pendente"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Agregar duas oportunidades"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "A Fazer"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Telefonema para o parceiro"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Cliente relacionado"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1476,6 +1426,16 @@ msgstr "Prospectos / Oportunidades que estejam no estado aberto"
 msgid "Users"
 msgstr "Utilizadores"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secções"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1525,6 +1485,12 @@ msgstr "Nome"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Data de fecho"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1561,17 +1527,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr "Converter de expetativa para o parceiro de negócio"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "A oportunidade foi <b>ganha</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Telefonemas atribuídos a mim ou às minhas equipas"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1608,6 +1563,7 @@ msgstr "Equipa pai"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1616,11 +1572,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Próxima data de ação"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Em Execução"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1634,11 +1585,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Atribuir oportunidades a"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1650,7 +1596,7 @@ msgid "Month of call"
 msgstr "Mês da Chamada"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "O parceiro foi <b>criado</b>."
@@ -1703,11 +1649,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nome do cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Telefonema para oportunidade"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1728,11 +1669,6 @@ msgstr "Oportunidades por estágio"
 msgid "Prospect is converting to business partner"
 msgstr "A perspectiva é converter para o parceiro de negócios"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1866,11 +1802,6 @@ msgstr "Referência"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo é usado para separar prospectos e oportunidades"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Tem certeza que quer criar um parceiro com base neste telefonema?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1901,16 +1832,9 @@ msgid "Sales Teams"
 msgstr "Equipas de vendas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Prospecto para parceiro"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentação"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1922,12 +1846,6 @@ msgstr "Equipa"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Prospectos / Oportunidades que estejam num estado novo"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1939,12 +1857,6 @@ msgstr "Não realizada"
 msgid "Probability"
 msgstr "Probabilidade"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Por favor selecione mais que uma oportunidade da lista vista."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1960,6 +1872,12 @@ msgstr "Mês"
 msgid "Leads"
 msgstr "Prospectos"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1971,28 +1889,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr "Fundir com diferentes oportunidades"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "A fazer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2053,24 +1961,6 @@ msgstr "Pendente"
 msgid "Prospect Opportunity"
 msgstr "Oportunidade do Prospect"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2119,18 +2009,16 @@ msgid "Mandatory Expression"
 msgstr "Expressão obrigatória"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Criar um novo cliente"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Enviar Correio"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Cliente relacionado"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Criar um novo cliente"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2159,11 +2047,6 @@ msgstr "Análise de oportunidades"
 msgid "Misc"
 msgstr "Diversos"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expressão regular no histórico de casos"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2191,11 +2074,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsável"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Lembrete para o cliente"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2207,21 +2085,22 @@ msgid "Product"
 msgstr "Produto"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Histórico da comunicação Máxima"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Ano de Criação"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Opções de conversão"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2290,7 +2169,6 @@ msgstr "Continuar o processo"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Converter em oportunidade"
 
@@ -2372,8 +2250,13 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Em Execução"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2381,6 +2264,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Prospectos não atribuídos"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2401,26 +2289,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr "Serviço pós venda"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Converter"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2466,6 +2334,11 @@ msgstr ""
 "acordo com vários critérios e detalhar as informações, adicionando mais "
 "grupos no relatório."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2497,6 +2370,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2529,6 +2407,24 @@ msgstr "Expressão opcional"
 msgid "Followers"
 msgstr "Seguidores"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2585,11 +2481,6 @@ msgstr "Criar oportunidades de negócios a partir de prospectos"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Definir categoria como"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2634,9 +2525,10 @@ msgid "Qualification"
 msgstr "Qualificação"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Contato email do parceiro"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2654,15 +2546,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "O parceiro está definido."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurar"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2758,17 +2652,10 @@ msgid "Logged Calls"
 msgstr "Chamadas Registadas"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidade de sucesso"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Esboço"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2780,7 +2667,6 @@ msgstr "Casos por equipa de vendas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -2789,11 +2675,6 @@ msgstr "Reunião"
 msgid "Category of Case"
 msgstr "Categoria do caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Oportunidade / Cliente"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2817,11 +2698,6 @@ msgstr "Rua 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Terá que verificar se este parceiro já não existe."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2840,21 +2716,6 @@ msgstr "Utilizador"
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociação"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2878,11 +2739,6 @@ msgstr "Contrato"
 msgid "Twitter Ads"
 msgstr "Twitter Ads"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Comum a todas as equipas"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2894,14 +2750,9 @@ msgid "Planned Revenues"
 msgstr "Rendimentos planeados"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "De telefonema para telefonema"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Exp.Closing"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2925,16 +2776,10 @@ msgid "Categorization"
 msgstr "Categorização"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Registo Chamada"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Regras da Ação"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2958,7 +2803,6 @@ msgstr "Criar Data"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2984,7 +2828,6 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3063,20 +2906,11 @@ msgstr "Redefinir para Todo"
 msgid "Working Hours"
 msgstr "Horário de trabalho"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonemas"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3098,7 +2932,7 @@ msgid "Lost"
 msgstr "Perdido"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3146,17 +2980,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefonemas por utilizador e secção"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociação"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "De telefonema para telefonema"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3174,10 +3005,10 @@ msgid "Proposition"
 msgstr "Proposta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Data de fecho"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonemas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3191,6 +3022,11 @@ msgstr "Ano"
 msgid "Newsletter"
 msgstr "Notícias"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3244,6 +3080,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Evento dos terceiros"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condições em campos de caso"
+
 #~ msgid "Reset to Draft"
 #~ msgstr "Reverter para rascunho"
 
@@ -3671,9 +3510,15 @@ msgstr ""
 #~ msgid "A partner is already defined on this phonecall."
 #~ msgstr "Um parceiro já se encontra definido neste telefonema"
 
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
 #~ msgid "Message"
 #~ msgstr "Mensagem"
 
+#~ msgid "Create Partner"
+#~ msgstr "Criar parceiro"
+
 #~ msgid "My Meetings"
 #~ msgstr "Minhas reuniões"
 
@@ -3711,9 +3556,6 @@ msgstr ""
 #~ msgid "Customer Meeting"
 #~ msgstr "Reunião com Clientes"
 
-#~ msgid "Send Mail"
-#~ msgstr "Enviar Correio"
-
 #~ msgid "Claims"
 #~ msgstr "Reclamações"
 
@@ -4010,6 +3852,9 @@ msgstr ""
 #~ msgid "Supplier"
 #~ msgstr "Fornecedor"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Converter em oportunidade "
+
 #~ msgid "Previous Stage"
 #~ msgstr "Estágio prévio"
 
@@ -4047,6 +3892,9 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Fundir"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expressão regular no histórico de casos"
+
 #~ msgid "Convert/Merge Opportunity"
 #~ msgstr "Converter / fundir oportunidade"
 
@@ -4094,6 +3942,9 @@ msgstr ""
 #~ msgid "Set an alarm at this time, before the event occurs"
 #~ msgstr "Definir um alarme neste momento, antes da ocorrência do evento"
 
+#~ msgid "Set Team to"
+#~ msgstr "Definir equipa para"
+
 #~ msgid "Gives the sequence order when displaying a list of case stages."
 #~ msgstr "Dá a ordem sequencial ao exibir uma lista de estágios de caso."
 
@@ -4170,18 +4021,30 @@ msgstr ""
 #~ msgid "Fri"
 #~ msgstr "Sex"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Criar um parceiro"
+
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Gerir um serviço de \"heldesk\"."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nome da oportunidade"
+
 #~ msgid "Monday"
 #~ msgstr "Segunda"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Parceiro para a oportunidade"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Oportunidades por categorias"
 
 #~ msgid "Frequency"
 #~ msgstr "Frequência"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Agregar duas oportunidades"
+
 #~ msgid "Invite People"
 #~ msgstr "Convidar pessoas"
 
@@ -4215,6 +4078,9 @@ msgstr ""
 #~ msgid "Wed"
 #~ msgstr "Qua"
 
+#~ msgid "_Convert"
+#~ msgstr "_Converter"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -4228,6 +4094,9 @@ msgstr ""
 #~ msgid "Synchronization"
 #~ msgstr "Sincronização"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Telefonema para oportunidade"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "Selecione os estágios para esta equipa de vendas"
 
@@ -4265,6 +4134,9 @@ msgstr ""
 #~ msgid "Weeks"
 #~ msgstr "Semanas"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Tem certeza que quer criar um parceiro com base neste telefonema?"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Reverter para não confirmado"
 
@@ -4381,6 +4253,9 @@ msgstr ""
 #~ msgid "Weekday"
 #~ msgstr "Dia da semana"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Telefonema para o parceiro"
+
 #~ msgid "Set New State To"
 #~ msgstr "Definir novo estado como"
 
@@ -4451,6 +4326,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Configuração do CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Definir categoria como"
+
 #~ msgid "Thu"
 #~ msgstr "Qui"
 
@@ -4496,6 +4374,9 @@ msgstr ""
 #~ msgid "Contacts"
 #~ msgstr "Contatos"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilidade de sucesso"
+
 #~ msgid "Meeting Categories"
 #~ msgstr "Categorias de reunião"
 
@@ -4817,6 +4698,9 @@ msgstr ""
 #~ msgid "Max Interval"
 #~ msgstr "Intervalo Máximo"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Histórico da comunicação Máxima"
+
 #~ msgid "# of Emails"
 #~ msgstr "# of Emails"
 
@@ -4910,6 +4794,9 @@ msgstr ""
 #~ msgid "# Emails"
 #~ msgstr "# Emails"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Oportunidade / Cliente"
+
 #~ msgid "Recurrence termination"
 #~ msgstr "Rescisão da recorrência"
 
@@ -4965,6 +4852,10 @@ msgstr ""
 #~ msgid "CRM Dashboard"
 #~ msgstr "Painel do CRM"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "O parceiro está definido."
+
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Não pode ter dois utilizadores com o mesmo nome de utilizador!"
 
@@ -5048,6 +4939,9 @@ msgstr ""
 #~ msgid "Phone calls made in current month"
 #~ msgstr "Chamadas telefónicas feitas este mês"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Comum a todas as equipas"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "A oportunidade '%s' foi vencida."
@@ -5083,9 +4977,16 @@ msgstr ""
 #~ "Se o campo estiver definido como ativo verdadeiro, ele vai permitir que "
 #~ "oculte as informações do alarme do evento sem o remover."
 
+#~ msgid "Action Rules"
+#~ msgstr "Regras da Ação"
+
 #~ msgid "Select Salesman"
 #~ msgstr "Selecionar Vendedor"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Por favor selecione mais que uma oportunidade da lista vista."
+
 #~ msgid "Select Action"
 #~ msgstr "Selecione Ação"
 
@@ -5217,6 +5118,9 @@ msgstr ""
 #~ "Máximo\". Este é o estado inicial da mente por padrão se o parceiro não "
 #~ "tiver evento."
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Terá que verificar se este parceiro já não existe."
+
 #~ msgid "Leads/Opportunities created in last month"
 #~ msgstr "Prospectos / Oportunidades criadas no último mês"
 
@@ -5331,6 +5235,9 @@ msgstr ""
 #~ msgid "The stage of lead '%s' has been changed to '%s'."
 #~ msgstr "O estado do prospecto '%s' mudou para '%s'."
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Prospecto para parceiro"
+
 #~ msgid ""
 #~ "Track from where is coming your leads and opportunities by creating specific "
 #~ "channels that will be maintained at the creation of a document in the "
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 0508280fca5..d432357e766 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-17 02:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 00:33+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -32,11 +32,13 @@ msgstr ""
 "para e-mails recebidos."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Prospecto"
 
@@ -46,22 +48,35 @@ msgid "Title"
 msgstr "Tratamento"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+"Aviso de prospectos não processados a mais de 5 dias.\n"
+"Nome: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Descrição: [[object.description]]\n"
+"            "
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Ação"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Ligação Telefônica relacionada à oportunidade <em>%s</em> foi <b>criada</b> "
-"e <b>agendada</b> em <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr "Definir equipe para Departamento de Vendas"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Selecionar Oportunidades"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -69,11 +84,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr "Gerenciar Captação de Recursos"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Converter para Oportunidades"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -81,10 +91,10 @@ msgid "Delay to close"
 msgstr "Adiar o fechamento"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Prospecto foi <b>convertido para uma oportunidade</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nome do Estágio"
 
 #. module: crm
 #: view:crm.lead:0
@@ -99,11 +109,6 @@ msgstr "Vendedor"
 msgid "CRM Lead Analysis"
 msgstr "Análise das Prospecções do CRM"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Lembrete no Prospecto: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -149,6 +154,12 @@ msgstr "Dia de Criação"
 msgid "Rule Name"
 msgstr "Nome da Regra"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr "Só é possível converter uma ligação telefônica de cada vez."
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -182,8 +193,8 @@ msgstr ""
 "kanban."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -210,7 +221,7 @@ msgid "Schedule Other Call"
 msgstr "Agendar outra Ligação"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -222,9 +233,14 @@ msgid "Opt-Out"
 msgstr "Opt-Out"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Ocultar nas visualizações quando estiver vazio"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr "# Reuniões"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -242,9 +258,9 @@ msgid "Excluded Answers :"
 msgstr "Respostas Excluídas:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Seções"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr "Mesclar oportunidades"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -254,7 +270,7 @@ msgid "Leads Analysis"
 msgstr "Análise de Prospecções"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s realizou uma ligação</b> para <em>%s</em>."
@@ -265,16 +281,6 @@ msgstr "<b>%s realizou uma ligação</b> para <em>%s</em>."
 msgid "Campaigns"
 msgstr "Campanhas"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Selecionar Oportunidades"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Estado"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -297,7 +303,7 @@ msgid "Prospect Partner"
 msgstr "Parceiro do Prospecto"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -422,11 +428,17 @@ msgstr "Morta"
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentação"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Conectar a um cliente existente"
 
@@ -450,7 +462,6 @@ msgstr ""
 "este estágio seja um sucesso."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -465,6 +476,14 @@ msgstr "Categoria"
 msgid "#Opportunities"
 msgstr "Nº de Oportunidades"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+"Por favor escolha mais de um item (prospecto ou oportunidade) na listagem."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
@@ -473,10 +492,9 @@ msgstr ""
 "gerencio, ou para mim."
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Ação de Conversão"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "E-mail de Contato do Parceiro"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -517,22 +535,13 @@ msgstr "Situação"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Criar Oportunidade"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nome do Estágio"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -545,9 +554,9 @@ msgid "Mailings"
 msgstr "Mala Direta"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "A Fazer"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr "Estágio alterado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -567,9 +576,9 @@ msgid "Planned Revenue"
 msgstr "Receita Planejada"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "CRM Ligação Telefônica: Marcar como lida"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Receita Esperada"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -609,6 +618,11 @@ msgstr "Resumo"
 msgid "Merge"
 msgstr "Mesclar"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr "Oportunidade ${object.name | h})"
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -619,11 +633,6 @@ msgstr "Categoria do Caso"
 msgid "Partner Contact Name"
 msgstr "Nome de Contato do Parceiro"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "CRM Ligação Telefônica: Marcar como não Lida"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -648,6 +657,11 @@ msgstr "Nº de Ligações Telefônicas"
 msgid "The code of the sales team must be unique !"
 msgstr "O código da equipe de vendas precisa ser único!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Endereço de e-mail do contato"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -719,9 +733,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentação de Parceiros"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duração em Minutos"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "Moeda"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -739,9 +753,9 @@ msgid "The name of the segmentation."
 msgstr "O nome da segmentação."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr "Prospectos dos USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -759,13 +773,7 @@ msgid "Statistics Dashboard"
 msgstr "Painel de Estatísticas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Estágio alterado para <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -778,12 +786,6 @@ msgstr "Estágio alterado para <b>%s</b>."
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Uma reunião foi <b>agendada</b> em <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -822,17 +824,6 @@ msgstr ""
 "Prospectos/Oportunidades que foram atribuídos a alguém das equipes de vendas "
 "que eu gerencio"
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nome da Oportunidade"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Definir Equipe para"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -844,25 +835,21 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "De %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Ano de Criação"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Converter para Oportunidades"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "ou"
@@ -887,31 +874,6 @@ msgstr ""
 "Conexão entre estágios e equipes de vendas. Quando definido, ele limita o "
 "estágio atual às equipes de vendas selecionadas."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Olá [[object.user_id.name]], \n"
-"você pode verificar o seguinte prospecto, ele não está aberto a 5 dias?\n"
-"\n"
-"Prospecto: [[object.id ]]\n"
-"Descrição:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Obrigado,\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -919,9 +881,9 @@ msgid "Requirements"
 msgstr "Requisitos"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Converter para Oportunidade "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "CEP"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -966,9 +928,9 @@ msgid "Mark Won"
 msgstr "Ganhamos!"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidade (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr "Prospectos dos USA"
 
 #. module: crm
 #: view:crm.lead:0
@@ -993,7 +955,7 @@ msgid "Send Email"
 msgstr "Enviar E-mail"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -1003,23 +965,12 @@ msgstr "Aviso!"
 msgid "Days to Open"
 msgstr "Dias para Abrir"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Criar Parceiro"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Celular"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "A ligação telefônica foi <b>reiniciada e definida como aberta</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -1047,11 +998,6 @@ msgstr "Usado para calcular dias abertos"
 msgid "Meetings"
 msgstr "Reuniões"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Condições em Campos de Casos"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -1059,6 +1005,19 @@ msgstr "Condições em Campos de Casos"
 msgid "Next Action"
 msgstr "Próxima Ação"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr "<b>Parceiro</b> definido para <em>%s</em>."
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Provisório"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1129,16 +1088,6 @@ msgstr "Calcular Segmentação"
 msgid "Lowest"
 msgstr "Mínima"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"A reunião associada à ligação telefônica <em>%s</em> foi <b>criada</b> e "
-"<b>agendada</b> em <em>%s</em>."
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1148,10 +1097,10 @@ msgid "Creation Date"
 msgstr "Data de Criação"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s foi <b>criada</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr "Prospecto <b>convertido em uma Oportunidade</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1212,23 +1161,15 @@ msgid "Delete"
 msgstr "Excluir"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Receita Esperada"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr "Oportunidade criada"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr "í"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "A oportunidade foi <b>perdida</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1237,9 +1178,31 @@ msgid "September"
 msgstr "Setembro"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Endereço de e-mail do contato"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Clique para criar uma nova oportunidade.\n"
+"          </p><p>\n"
+"          O OpenERP te ajuda a rastrear o funil de vendas para acompanhar\n"
+"vendas em potencial e ter uma previsão das receitas futuras.\n"
+"          </p><p>\n"
+"          Você será capaz de planejar reuniões e telefonemas de\n"
+"           oportunidades, convertê-los em cotações, anexar documentos "
+"relacionados,\n"
+"         acompanhar todas as discussões, e muito mais.</p>\n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1272,21 +1235,15 @@ msgid "Opening Date"
 msgstr "Data de Abertura"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "Moeda"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duração em Minutos"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nome do Canal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continuar"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1320,6 +1277,12 @@ msgstr ""
 "estágios relacionados a Oportunidades, ou para especificar estágios "
 "disponíveis para ambos."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr "Prospecto Criado"
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1329,14 +1292,6 @@ msgstr ""
 "Marque se você quiser usar esta guia como parte da regra de segmentação. Se "
 "não estiver marcada, os critérios abaixo serão ignorados"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Criar um Parceiro"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1358,18 +1313,11 @@ msgid "unknown"
 msgstr "desconhecido"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-"Seguidores desta equipe de vendas seguem automaticamente todas as "
-"oportunidades relacionadas a ela."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Parceiro para Oportunidade"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um Seguidor"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1379,13 +1327,6 @@ msgstr "Parceiro para Oportunidade"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "É um Seguidor"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1437,6 +1378,15 @@ msgid ""
 msgstr ""
 "Ao enviar e-mails, o endereço de e-mail padrão é o da equipe de vendas."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+"Ligações Telefônicas atribuídos ao usuário atual ou com uma equipe que tem o "
+"usuário atual como líder da equipe"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1448,7 +1398,7 @@ msgid "Lead Description"
 msgstr "Descrição do Prospecto"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Oportunidades mescladas"
@@ -1492,13 +1442,9 @@ msgstr "Referências"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1519,14 +1465,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Prospectos/Oportunidades com situação pendente"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Mesclar duas Oportunidades"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "A Fazer"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Chamada Telefônica para Parceiro"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr "Oportunidade perdida"
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Cliente Relacionado"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1565,6 +1518,16 @@ msgstr "Prospectos/Oportunidades com situação em aberto"
 msgid "Users"
 msgstr "Usuários"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr "Estágio Alterado"
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Seções"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1614,6 +1577,12 @@ msgstr "Nome"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Prospectos/Oportunidades que foram atribuídas a mim"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Data de Fechamento"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1650,19 +1619,6 @@ msgstr "Alto"
 msgid "Convert to prospect to business partner"
 msgstr "Converter do prospecto para parceiro de negócio"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "A oportunidade foi <b>ganha</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-"Ligações Telefônicas que foram atribuídas a mim ou às minhas equipes de "
-"vendas."
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1699,6 +1655,7 @@ msgstr "Equipe Pai"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Não associe a um cliente"
 
@@ -1707,11 +1664,6 @@ msgstr "Não associe a um cliente"
 msgid "Next Action Date"
 msgstr "Data da Próxima Ação"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Executando"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1729,11 +1681,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Atribuir oportunidades a"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "CEP"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1745,7 +1692,7 @@ msgid "Month of call"
 msgstr "Mês da ligação"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "O parceiro foi <b>criado</b>."
@@ -1802,11 +1749,6 @@ msgstr "Valor"
 msgid "Customer Name"
 msgstr "Nome do Cliente"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Chamada Telefônica para Oportunidade"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1827,11 +1769,6 @@ msgstr "Oportunidades por Estágio"
 msgid "Prospect is converting to business partner"
 msgstr "Prospecto convertido em parceiro de negócio"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "CRM Prospecto: Marcar como não lido"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1966,12 +1903,6 @@ msgstr "Referência"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo é utilizado para separar Prospectos e Oportunidades"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Tem certeza que você quer criar um parceiro baseado nesta ligação telefônica?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -2002,16 +1933,9 @@ msgid "Sales Teams"
 msgstr "Equipe de Vendas"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Prospecto para Parceiro"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentação"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr "Padrão para Nova Equipe de Vendas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2023,12 +1947,6 @@ msgstr "Equipe"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Prospectos/Oportunidades com Estágio Novo"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>parceiro</b> foi definido para <em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -2040,12 +1958,6 @@ msgstr "Pendente"
 msgid "Probability"
 msgstr "Probabilidade"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Favor selecionar mais de uma oportunidade da listagem."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -2061,6 +1973,12 @@ msgstr "Mês"
 msgid "Leads"
 msgstr "Prospectos"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr "Prospectos Mesclados"
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -2072,40 +1990,18 @@ msgstr "Design"
 msgid "Merge with existing opportunities"
 msgstr "Mesclar com uma oportunidade existente"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Clique para criar uma nova oportunidade.\n"
-"            </p><p>\n"
-"              O OpenERP auxilia você a monitorar suas vendas para "
-"acompanhar\n"
-"              vendas em potencial e prever melhor suas futuras receitas.\n"
-"            </p><p>\n"
-"              Você poderá planejar reuniões e chamadas telefônicas a partir\n"
-"              de oportunidades, convertê-las em cotações, anexar documentos\n"
-"              relacionados, rastrear todas as discussões e muito mais.\n"
-"            </p>\n"
-"          "
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "A Fazer"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr "Prospecto para Oportunidade"
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2168,41 +2064,6 @@ msgstr "Pendente"
 msgid "Prospect Opportunity"
 msgstr "Oportunidade do Prospecto"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Clique para criar um prospecto não qualificado. \n"
-"          </p><p>\n"
-"            Utilize prospectos se você necessita de uma etapa de "
-"qualificação\n"
-"            antes de criar uma oportunidade ou um cliente. Pode ser um "
-"cartão\n"
-"            de visitas que você recebeu, um formulário de contato preenchido "
-"em\n"
-"            seu site, um arquivo de prospectos não qualificados que você "
-"importou, etc.\n"
-"          </p><p>\n"
-"            Um vez qualificado, o prospecto pode ser convertido em uma\n"
-"            oportunidade de negócios e/ou um novo cliente em seu livro \n"
-"            de endereços.\n"
-"          </p>\n"
-"        "
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2251,18 +2112,16 @@ msgid "Mandatory Expression"
 msgstr "Expressão Obrigatória"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Criar um novo cliente"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Enviar Email"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Cliente Relacionado"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Criar um novo cliente"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2291,11 +2150,6 @@ msgstr "Análise de Oportunidades"
 msgid "Misc"
 msgstr "Diversos"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expressão Regular no Histórico do Caso"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2323,11 +2177,6 @@ msgstr "Ligação Concluída"
 msgid "Responsible"
 msgstr "Responsável"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Lembrete para Cliente"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2339,21 +2188,24 @@ msgid "Product"
 msgstr "Produto"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "A Ligação Telefônica foi <b>criada e aberta</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Histórico Máximo de Comunicação"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Ano de Criação"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Opções de Conversão"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+"Siga esta equipe de vendas para rastrear os eventos associados aos usuários "
+"dessa equipe automaticamente."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2424,7 +2276,6 @@ msgstr "Continuar Processo"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Converter para Oportunidade"
 
@@ -2521,15 +2372,25 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "Condições no Histórico de Comunicações"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Executando"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr "Prospecto convertido para uma oportunidade"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "Propectos não Atribuídos"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr "Oportunidade ganha"
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2550,36 +2411,6 @@ msgstr "Reiniciar"
 msgid "After-Sale Services"
 msgstr "Serviços Pós-Venda"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Olá [[object.partner_id and object.partner_id.name or '']], \n"
-"o seu prospecto abaixo não está aberto há 5 dias.\n"
-"\n"
-"Prospecto: [[object.id ]]\n"
-"Descrição:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Atenciosamente,\n"
-"            "
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Converter"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2625,6 +2456,11 @@ msgstr ""
 "as informações de acordo com vários critérios e detalhamentos das "
 "informações, pela adição de mais grupos no relatório."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr "Dobre por Padrão"
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2656,6 +2492,12 @@ msgstr "Selecionar Prospetos/Oportunidades"
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+"Lidar com a associação ou geração dos parceiros nos assistentes do CRM"
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2688,6 +2530,38 @@ msgstr "Expressão Opcional"
 msgid "Followers"
 msgstr "Seguidores"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para criar um prospecto não qualificado.\n"
+"          </p><p>\n"
+"            Use os prospectos se você necessita de uma etapa de "
+"qualificação\n"
+"antes de criar uma oportunidade ou cliente. Pode ser um cartão de visitas,\n"
+"um formulário de contato no site, ou uma lista de prospectos a ser "
+"importada, etc.\n"
+"          </p><p>\n"
+"            Assim que qualificado, o prospecto pode ser convertido em uma "
+"Oportunidade\n"
+"de Negócios e/ou em um novo cliente na agenda de endereços.\n"
+"          </p>\n"
+"        "
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2744,11 +2618,6 @@ msgstr "Criar oportunidades de negócios a partir de prospectos"
 msgid "Email Campaign - Products"
 msgstr "Campanha por E-mail - Produtos"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Definir Categoria para"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2805,9 +2674,10 @@ msgid "Qualification"
 msgstr "Qualificação"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "E-mail de Contato do Parceiro"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Ação de Conversão"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2837,15 +2707,17 @@ msgstr ""
 "            "
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Um parceiro já foi definido."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurar"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr "Oportunidade Perdida"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2941,17 +2813,10 @@ msgid "Logged Calls"
 msgstr "Ligações Registradas"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidade de Sucesso"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Provisório"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr "Oportunidade Ganha"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2963,7 +2828,6 @@ msgstr "Casos por Equipe de Vendas"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -2972,11 +2836,6 @@ msgstr "Reunião"
 msgid "Category of Case"
 msgstr "Categoria do Caso"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Oportunidade / Cliente"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -3000,11 +2859,6 @@ msgstr "Complemento"
 msgid "Manage Helpdesk and Support"
 msgstr "Gerenciar Helpdesk e Suporte"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Verifique se este já não é um parceiro existente."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -3023,21 +2877,6 @@ msgstr "Usuário"
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociação"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -3061,11 +2900,6 @@ msgstr "Contrato"
 msgid "Twitter Ads"
 msgstr "Anúncios Twitter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Comum a Todas as Equipes"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -3077,14 +2911,9 @@ msgid "Planned Revenues"
 msgstr "Receitas Programadas"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "Prospecto: Marcar como Lido"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Ligação para Ligação"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Fechamento Esperado"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -3108,16 +2937,10 @@ msgid "Categorization"
 msgstr "Categorização"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Registrar Ligação"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Regras de Ação"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -3144,7 +2967,6 @@ msgstr "Data de Criação"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr "em"
 
@@ -3170,7 +2992,6 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3263,20 +3084,11 @@ msgstr "Devolver para A Fazer"
 msgid "Working Hours"
 msgstr "Horário de Trabalho"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Ligações Telefônicas"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -3298,7 +3110,7 @@ msgid "Lost"
 msgstr "Perdido"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3347,19 +3159,14 @@ msgid "Phone calls by user and section"
 msgstr "Ligações Telefônicas por usuário e seção"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-"Uma reunião relacionada à oportunidade <em>%s</em> foi <b>criada</b> e "
-"<b>agendada</b> em <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociação"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Fechamento Esperado"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Ligação para Ligação"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3377,10 +3184,10 @@ msgid "Proposition"
 msgstr "Proposta"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Data de Fechamento"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Ligações Telefônicas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3394,6 +3201,11 @@ msgstr "Ano"
 msgid "Newsletter"
 msgstr "Newsletter"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr "Estágio da Oportunidade Alterado"
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3486,6 +3298,9 @@ msgstr ""
 #~ msgid "Maximim Priority"
 #~ msgstr "Prioridade Máxima"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condições em Campos de Casos"
+
 #~ msgid "Case Communication History"
 #~ msgstr "Histórico do Processo Comunicação"
 
@@ -3830,6 +3645,9 @@ msgstr ""
 #~ "Não é possível enviar um e-mail com uma mensagem de corpo vazia, escreva a "
 #~ "mensagem"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Histórico Máximo de Comunicação"
+
 #~ msgid "My Draft "
 #~ msgstr "Meu Rascunho "
 
@@ -3928,6 +3746,12 @@ msgstr ""
 #~ msgid "Send New Email"
 #~ msgstr "Enviar Novo Email"
 
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
+#~ msgid "Create Partner"
+#~ msgstr "Criar Parceiro"
+
 #~ msgid "_Cancel"
 #~ msgstr "_Cancelar"
 
@@ -4082,9 +3906,6 @@ msgstr ""
 #~ msgid "Customer Meeting"
 #~ msgstr "Reunião com Cliente"
 
-#~ msgid "Send Mail"
-#~ msgstr "Enviar Email"
-
 #~ msgid "Claims"
 #~ msgstr "Reclamações"
 
@@ -4131,6 +3952,9 @@ msgstr ""
 #~ msgid "%(case_user)s = Responsible name"
 #~ msgstr "%(case_user)s = Nome do Responsável"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Nome da Oportunidade"
+
 #~ msgid "Your action"
 #~ msgstr "Sua Ação"
 
@@ -4147,6 +3971,9 @@ msgstr ""
 #~ msgid "Historize"
 #~ msgstr "Regitrar Histórico"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilidade de Sucesso"
+
 #~ msgid "Parent Section"
 #~ msgstr "Seção Pai"
 
@@ -4354,6 +4181,9 @@ msgstr ""
 #~ msgid "Add Note"
 #~ msgstr "Incluir Observação"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Converter para Oportunidade "
+
 #, python-format
 #~ msgid "The opportunity '%s' has been closed."
 #~ msgstr "A oportunidade '%s' foi encerrada."
@@ -4429,12 +4259,18 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Segunda"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Criar um Parceiro"
+
 #~ msgid "Frequency"
 #~ msgstr "Frequência"
 
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Mesclar duas Oportunidades"
+
 #~ msgid "Current"
 #~ msgstr "Atual"
 
@@ -4462,6 +4298,9 @@ msgstr ""
 #~ msgid "_Schedule"
 #~ msgstr "_Agendamento"
 
+#~ msgid "_Convert"
+#~ msgstr "_Converter"
+
 #~ msgid "Wizard"
 #~ msgstr "Assistente"
 
@@ -4496,6 +4335,9 @@ msgstr ""
 #~ msgid "Free"
 #~ msgstr "Livre"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Chamada Telefônica para Oportunidade"
+
 #~ msgid "Mail Campaign 2"
 #~ msgstr "Email Campanha 2"
 
@@ -4635,6 +4477,9 @@ msgstr ""
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Prospecção para Oportunidade"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Chamada Telefônica para Parceiro"
+
 #~ msgid "Set New State To"
 #~ msgstr "Definir Novo Estado para"
 
@@ -4721,6 +4566,9 @@ msgstr ""
 #~ msgid "Fed. State"
 #~ msgstr "Estado(UF)"
 
+#~ msgid "Set Category to"
+#~ msgstr "Definir Categoria para"
+
 #~ msgid "Thu"
 #~ msgstr "Qui"
 
@@ -4771,6 +4619,9 @@ msgstr ""
 #~ msgid "Merged into Opportunity: %s"
 #~ msgstr "Mesclar na Oportunidade: %s"
 
+#~ msgid "Action Rules"
+#~ msgstr "Regras de Ação"
+
 #~ msgid "Recurrent ID date"
 #~ msgstr "ID de data recorrente"
 
@@ -5195,6 +5046,9 @@ msgstr ""
 #~ msgid "_Send Reply"
 #~ msgstr "_Enviar Resposta"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Oportunidade / Cliente"
+
 #~ msgid "Company Currency"
 #~ msgstr "Moeda da Empresa"
 
@@ -5454,6 +5308,9 @@ msgstr ""
 #~ msgid "Can not add note!"
 #~ msgstr "Não é possível adicionar uma anotação!"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expressão Regular no Histórico do Caso"
+
 #~ msgid "Link to an existing partner"
 #~ msgstr "Associar a um Parceiro Existente"
 
@@ -5484,6 +5341,9 @@ msgstr ""
 #~ msgid "History Information"
 #~ msgstr "Histórico"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Parceiro para Oportunidade"
+
 #~ msgid "Define Sales Team"
 #~ msgstr "Definir Equipe de Vendas"
 
@@ -5541,9 +5401,33 @@ msgstr ""
 #~ msgid "Attendees"
 #~ msgstr "Participantes"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Verifique se este já não é um parceiro existente."
+
 #, python-format
 #~ msgid "No E-Mail Found for your Company address!"
 #~ msgstr "Email de sua Empresa não configurado!"
 
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "Erro! Você não pode criar membros associados recursivamente."
+
+#~ msgid "Set Team to"
+#~ msgstr "Definir Equipe para"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "Prospecto para Parceiro"
+
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Um parceiro já foi definido."
+
+#~ msgid "Common to All Teams"
+#~ msgstr "Comum a Todas as Equipes"
+
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Tem certeza que você quer criar um parceiro baseado nesta ligação telefônica?"
+
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Favor selecionar mais de uma oportunidade da listagem."
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index 3cac12cdd6b..10181516c5e 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 10:02+0000\n"
 "Last-Translator: Valentin <vali_ile@tybmad.com>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Pista"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Titlu"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Actiune"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Selectati Oportunitati"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "Intarziere la inchidere"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Numele Etapei"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr "Vânzător"
 msgid "CRM Lead Analysis"
 msgstr "Analiza MRC"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "Ziua crearii"
 msgid "Rule Name"
 msgstr "Numele regulii"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Avertisment!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Programeaza alt apel"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "Nu participati"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stare"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Răaspunsuri excluse :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sectiuni"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Analiza pistelor"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Campanii"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Selectati Oportunitati"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stare"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "Partener in perspectiva"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Nici un subiect"
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentare"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -415,7 +424,6 @@ msgstr ""
 "ca aceasta etapa sa aiba succes"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -430,16 +438,22 @@ msgstr "Categorie"
 msgid "#Opportunities"
 msgstr "#Oportunitati"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "E-mail Contact Partener"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -470,22 +484,13 @@ msgstr "Stare"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Creeaza Oportunitatea"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Numele Etapei"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Configurare"
 
 #. module: crm
 #: view:crm.lead:0
@@ -498,9 +503,9 @@ msgid "Mailings"
 msgstr "Corespondenta"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "De efectuat"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -520,9 +525,9 @@ msgid "Planned Revenue"
 msgstr "Venitul planificat"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Venituri estimate"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,6 +563,11 @@ msgstr "Rezumat"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -568,11 +578,6 @@ msgstr "Categorie caz"
 msgid "Partner Contact Name"
 msgstr "Nume Contact Partener"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -595,6 +600,11 @@ msgstr "#Apeluri telefonice"
 msgid "The code of the sales team must be unique !"
 msgstr "Codul echipei de vanzari trebuie sa fie unic!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -658,9 +668,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentare partener"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Durata in minute"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -678,9 +688,9 @@ msgid "The name of the segmentation."
 msgstr "Numele segmentarii."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Probabilitate (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -698,13 +708,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistica Tablou de bord"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -717,12 +721,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Oportunitate"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -759,17 +757,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Numele oportunitatii"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Setati echipa sa"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -781,25 +768,21 @@ msgid "Exclusive"
 msgstr "Exclusiv"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "De la %s: %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Anul crearii"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -822,21 +805,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -844,9 +812,9 @@ msgid "Requirements"
 msgstr "Cerinte"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Transforma in oportunitate "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Cod postal"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -891,9 +859,9 @@ msgid "Mark Won"
 msgstr "Marcheaza drept pCastigat"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Probabilitate (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -918,7 +886,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Avertizare !"
@@ -928,23 +896,12 @@ msgstr "Avertizare !"
 msgid "Days to Open"
 msgstr "Zile pana la deschidere"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Creeaza Partener"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -970,11 +927,6 @@ msgstr "Folosit pentru a calcula zilele portilor deschise"
 msgid "Meetings"
 msgstr "Intalniri"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -982,6 +934,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Urmatoarea actiune"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Ciorna"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1050,14 +1015,6 @@ msgstr "Calculeaza segmentarea"
 msgid "Lowest"
 msgstr "Cel mai scazut (cea mai scazuta)"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1067,9 +1024,9 @@ msgid "Creation Date"
 msgstr "Data crearii"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1129,23 +1086,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Venituri estimate"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1154,8 +1103,19 @@ msgid "September"
 msgstr "Septembrie"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1189,21 +1149,15 @@ msgid "Opening Date"
 msgstr "Data deschiderii"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Durata in minute"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Nume canal"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Continuati"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1234,6 +1188,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1243,14 +1203,6 @@ msgstr ""
 "Bifati daca doriti sa folositi acest tab ca parte a regulii de segmentare. "
 "Daca nu bifati, criteriile de mai jos vor fi ignorate"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Creati un Partener"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1272,17 +1224,12 @@ msgid "unknown"
 msgstr "necunoscut(a)"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partener la oportunitate"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1291,13 +1238,6 @@ msgstr "Partener la oportunitate"
 msgid "Date"
 msgstr "Data"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1346,6 +1286,13 @@ msgstr ""
 "Atunci cand trimitem e-mail-uri adresa predefinita este luata de la echipa "
 "de vanzari."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1357,7 +1304,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Oportunitati imbinate"
@@ -1401,13 +1348,9 @@ msgstr "Referinte"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Anuleaza"
@@ -1428,14 +1371,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Piste/Oportunitati care se afla in starea de asteptare"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Imbina doua Oportunitati"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "De efectuat"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Apel telefonic catre partener"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1474,6 +1424,16 @@ msgstr "Piste/Oportunitati care se afla in starea deschisa"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sectiuni"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1523,6 +1483,12 @@ msgstr "Nume"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Data inchiderii"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1559,17 +1525,6 @@ msgstr "Ridicat(a)"
 msgid "Convert to prospect to business partner"
 msgstr "Transforma din perspectiva in partener de afaceri"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1606,6 +1561,7 @@ msgstr "Echipa principala"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1614,11 +1570,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Data actiunii urmatoare"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "In executie"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1632,11 +1583,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Cod postal"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1648,7 +1594,7 @@ msgid "Month of call"
 msgstr "Luna apelului"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1701,11 +1647,6 @@ msgstr "Valoare"
 msgid "Customer Name"
 msgstr "Numele clientului"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Apel telefonic catre Oportunitate"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1726,11 +1667,6 @@ msgstr "Oportunitati dupa Etapa"
 msgid "Prospect is converting to business partner"
 msgstr "Prospectul devine partener de afaceri"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1864,13 +1800,6 @@ msgstr "Persoana care face o recomandare"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tip folosit pentru a separa Clientii potentiali si Oportunitatile"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Sunteti sigur ca doriti sa creati un partener pe baza acestui Apel telefonic "
-"?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1901,16 +1830,9 @@ msgid "Sales Teams"
 msgstr "Echipele de vanzari"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Client potential devenit partener"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentare"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1922,12 +1844,6 @@ msgstr "Echipa"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Piste/Oportunitati care se afla in starea Nou"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1939,13 +1855,6 @@ msgstr "Nu a fost retinut"
 msgid "Probability"
 msgstr "Probabilitate"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-"Va rugam sa selectati mai mult de o oportunitate din lista vizualizare."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1961,6 +1870,12 @@ msgstr "Luna"
 msgid "Leads"
 msgstr "Piste"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1972,28 +1887,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "De efectuat"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2054,24 +1959,6 @@ msgstr "In asteptare"
 msgid "Prospect Opportunity"
 msgstr "Oportunitate prospect"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2120,17 +2007,15 @@ msgid "Mandatory Expression"
 msgstr "Expresie obligatorie"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Trimite e-mail-ul"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2160,11 +2045,6 @@ msgstr "Analiza Oportunitatilor"
 msgid "Misc"
 msgstr "Diverse"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expresie standard in istoricul cazului"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2192,11 +2072,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Responsabil"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2208,21 +2083,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Istoric maxim al comunicarilor"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Anul crearii"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2291,7 +2167,6 @@ msgstr "Continua procesul"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2373,8 +2248,13 @@ msgid "Company"
 msgstr "Companie"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "In executie"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2382,6 +2262,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Piste neatribuite"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2402,26 +2287,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Transforma"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2467,6 +2332,11 @@ msgstr ""
 "informatiile in functie de mai multe criterii si detalia informatiile "
 "adaugand mai multe grupuri in raport."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2498,6 +2368,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmat(a)"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2530,6 +2405,24 @@ msgstr "Expresie optionala"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2586,11 +2479,6 @@ msgstr "Creare oportunitati de afaceri din piste"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Setati categoria pe"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2635,9 +2523,10 @@ msgid "Qualification"
 msgstr "Calificare"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "E-mail Contact Partener"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2655,15 +2544,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Deja este definit un partener."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "August"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Configurare"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2759,17 +2650,10 @@ msgid "Logged Calls"
 msgstr "Apeluri inregistrate"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilitatea de succes"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Ciorna"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2781,7 +2665,6 @@ msgstr "Cazuri dupa Echipa de vanzari"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Intalnire"
 
@@ -2790,11 +2673,6 @@ msgstr "Intalnire"
 msgid "Category of Case"
 msgstr "Categoria cazului"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Oportunitate / Client"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2818,11 +2696,6 @@ msgstr "Strada2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Poate trebuie sa verificati daca acest partener nu exista deja."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2841,21 +2714,6 @@ msgstr "Utilizator"
 msgid "November"
 msgstr "Noiembrie"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Negociere"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2879,11 +2737,6 @@ msgstr "Contract"
 msgid "Twitter Ads"
 msgstr "Publicitate Twitter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Comun Tuturor Echipelor"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2895,14 +2748,9 @@ msgid "Planned Revenues"
 msgstr "Venituri planificate"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Apel telefonic catre apel telefonic"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Inchidere estimata"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2926,16 +2774,10 @@ msgid "Categorization"
 msgstr "Categorizare"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Jurnal apeluri"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reguli de actiune"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2959,7 +2801,6 @@ msgstr "Data crearii"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2985,7 +2826,6 @@ msgid "Description"
 msgstr "Descriere"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3064,20 +2904,11 @@ msgstr "Resetati pe De efectuat"
 msgid "Working Hours"
 msgstr "Program de lucru"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Apeluri telefonice"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
@@ -3099,7 +2930,7 @@ msgid "Lost"
 msgstr "Pierdut"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3147,17 +2978,14 @@ msgid "Phone calls by user and section"
 msgstr "Apeluri telefonice dupa utilizator si sectiune"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Negociere"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Inchidere estimata"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Apel telefonic catre apel telefonic"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3175,10 +3003,10 @@ msgid "Proposition"
 msgstr "Propunere"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Data inchiderii"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Apeluri telefonice"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3192,6 +3020,11 @@ msgstr "An"
 msgid "Newsletter"
 msgstr "Buletin informativ"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3405,9 +3238,6 @@ msgstr ""
 #~ msgid "Weeks"
 #~ msgstr "Săptămâni"
 
-#~ msgid "Send Mail"
-#~ msgstr "Trimite e-mail-ul"
-
 #~ msgid "CC"
 #~ msgstr "CC"
 
@@ -3513,6 +3343,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Îmbunătăţiţi-vă aplicatia de bază MRC cu funcţionalităţi suplimentare."
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Expresie standard in istoricul cazului"
+
 #~ msgid "Set State To"
 #~ msgstr "Seteaza starea la"
 
@@ -3582,6 +3415,12 @@ msgstr ""
 #~ "Gestionează reclamatiile furnizorilor si ale clientilor, inclusiv actiunile "
 #~ "dumneavoastră corective sau preventive."
 
+#~ msgid "Continue"
+#~ msgstr "Continuati"
+
+#~ msgid "Set Team to"
+#~ msgstr "Setati echipa sa"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer (crm.program de instalare)"
 
@@ -3639,6 +3478,9 @@ msgstr ""
 #~ msgid "End of recurrency"
 #~ msgstr "Sfarsitul recurentei"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partener la oportunitate"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Rezumat oportunitate"
 
@@ -3678,6 +3520,9 @@ msgstr ""
 #~ "Echipa de vanzari caruia ii apartine cazul. Defineste utilizatorul "
 #~ "responsabil si adresa de email pentru mail gateway."
 
+#~ msgid "_Convert"
+#~ msgstr "_Transforma"
+
 #~ msgid ""
 #~ "With Meeting Invitations you can create and manage the meeting invitations "
 #~ "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
@@ -3754,6 +3599,11 @@ msgstr ""
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Sunteti sigur ca doriti sa creati un partener pe baza acestui Apel telefonic "
+#~ "?"
+
 #~ msgid ""
 #~ "Define a Sales Team to organize your different salesmen or sales departments "
 #~ "into separate teams. Each team will work in its own list of opportunities, "
@@ -3771,6 +3621,9 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "Repeta de x ori"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Client potential devenit partener"
+
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
@@ -3866,6 +3719,9 @@ msgstr ""
 #~ "de exemplu : In fiecare a doua luna, in ultima sambata din luna pentru 10 "
 #~ "evenimente: \t\tFRECV=LUNAR;INTERVAL=2;NUMAR=10;ZI=-1SU"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Istoric maxim al comunicarilor"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "Sunteti sigur ca doriti sa creati un parener pe baza acestei piste ?"
 
@@ -3909,6 +3765,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Configurati Aplicatia dumneavoastra MRC (Managementul Relatiilor cu Clientii)"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Apel telefonic catre partener"
+
 #~ msgid ""
 #~ "The name of the future partner that will be created while converting the "
 #~ "into opportunity"
@@ -4061,6 +3920,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Configurarea Aplicatiei MRC"
 
+#~ msgid "Set Category to"
+#~ msgstr "Setati categoria pe"
+
 #~ msgid "This module relates sale from opportunity cases in the CRM."
 #~ msgstr "Acest modul asociaza vanzarile din cazurile oportunitatilor in MRC."
 
@@ -4091,9 +3953,15 @@ msgstr ""
 #~ msgid "Invitation Detail"
 #~ msgstr "Detaliile invitatiei"
 
+#~ msgid "Success Probability"
+#~ msgstr "Probabilitatea de succes"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "Raport pista MRC"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Poate trebuie sa verificati daca acest partener nu exista deja."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr ""
@@ -4258,6 +4126,9 @@ msgstr ""
 #~ msgid "Mail Gateway"
 #~ msgstr "Mail Gateway"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Oportunitate / Client"
+
 #~ msgid "Phonecalls during last 7 days"
 #~ msgstr "Apeluri telefonice in timpul ultimelor 7 zile"
 
@@ -4340,6 +4211,12 @@ msgstr ""
 #~ msgid "Add Note"
 #~ msgstr "Adauga nota"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Transforma in oportunitate "
+
+#~ msgid "Create Partner"
+#~ msgstr "Creeaza Partener"
+
 #~ msgid "Phone calls made in current year"
 #~ msgstr "Apeluri telefonice realizate in anul curent"
 
@@ -4417,12 +4294,18 @@ msgstr ""
 #~ "Creeati categorii specifice pentru apelurile telefonice pentru a defini mai "
 #~ "bine tipul de apeluri urmarite in sistem."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Numele oportunitatii"
+
 #~ msgid "Write Date"
 #~ msgstr "Scrieti data"
 
 #~ msgid "crm.lead"
 #~ msgstr "pista.crm"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Creati un Partener"
+
 #~ msgid "Schedule a Call"
 #~ msgstr "Programati un Apel telefonic"
 
@@ -4441,6 +4324,9 @@ msgstr ""
 #~ msgid "Exception Rule"
 #~ msgstr "Exceptie Regula"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Imbina doua Oportunitati"
+
 #~ msgid "Mail"
 #~ msgstr "E-Mail"
 
@@ -4493,6 +4379,9 @@ msgstr ""
 #~ msgid "Free"
 #~ msgstr "Gratuit"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Apel telefonic catre Oportunitate"
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Transforma in Oportunitate"
 
@@ -4520,6 +4409,11 @@ msgstr ""
 #~ msgid "Pending Opportunities"
 #~ msgstr "Oportunitati in asteptare"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr ""
+#~ "Va rugam sa selectati mai mult de o oportunitate din lista vizualizare."
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Resetati pe Neconfirmat"
 
@@ -4677,6 +4571,10 @@ msgstr ""
 #~ msgid "CRM Dashboard"
 #~ msgstr "Tablou de bord MRC"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Deja este definit un partener."
+
 #~ msgid "Review Sales Stages"
 #~ msgstr "Verificati Etapele Vanzarii"
 
@@ -4719,10 +4617,16 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive profiles."
 #~ msgstr "Eroare! Nu puteti crea profile recursive."
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Comun Tuturor Echipelor"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "Oportunitatea '%s' a fost castigata."
 
+#~ msgid "Action Rules"
+#~ msgstr "Reguli de actiune"
+
 #~ msgid "To"
 #~ msgstr "Catre"
 
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 40aefd2535e..42ca2d598ba 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 09:26+0000\n"
 "Last-Translator: Denis Karataev <dskarataev@gmail.com>\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: 2012-12-06 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,11 +31,13 @@ msgstr ""
 "входящих сообщений электронной почты."
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Кандидат"
 
@@ -45,32 +47,37 @@ msgid "Title"
 msgstr "Обращение"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Действие"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Выберите предложения"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr "Управление сбором средств"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "Преобразовать в предложения"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -78,10 +85,10 @@ msgid "Delay to close"
 msgstr "Задержка закрытия"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "Кандидат был  <b>преобразован в предложение</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Название этапа"
 
 #. module: crm
 #: view:crm.lead:0
@@ -96,11 +103,6 @@ msgstr "Продавец"
 msgid "CRM Lead Analysis"
 msgstr "CRM анализ кандидатов"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "Напоминание о кандидате: [[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -146,6 +148,12 @@ msgstr "День создания"
 msgid "Rule Name"
 msgstr "Название правила"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -176,8 +184,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Внимание!"
@@ -204,7 +212,7 @@ msgid "Schedule Other Call"
 msgstr "Запланировать другой звонок"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -216,9 +224,14 @@ msgid "Opt-Out"
 msgstr "Без уведомлений"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "Скрыть вид, если пусто"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Состояние"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -236,9 +249,9 @@ msgid "Excluded Answers :"
 msgstr "Исключенные ответы :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Разделы"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -248,7 +261,7 @@ msgid "Leads Analysis"
 msgstr "Анализ  кандидатов"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr "<b>%s звонок</b>  <em>%s</em>."
@@ -259,16 +272,6 @@ msgstr "<b>%s звонок</b>  <em>%s</em>."
 msgid "Campaigns"
 msgstr "Кампании"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Выберите предложения"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Состояние"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -291,7 +294,7 @@ msgid "Prospect Partner"
 msgstr "Перспективный партнер"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Без темы"
@@ -389,11 +392,17 @@ msgstr "Мертвый"
 msgid "Unread Messages"
 msgstr "Непрочитанные сообщения"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Классификация"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "Ссылка на существующего заказчика"
 
@@ -417,7 +426,6 @@ msgstr ""
 "вопроса на данном этапе"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -432,16 +440,22 @@ msgstr "Категория"
 msgid "#Opportunities"
 msgstr "# Предложений"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr "Кандидат, распределенный мне или одному из моих отделов продаж"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "Действие преобразования"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Контактный e-mail партнёра"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -472,22 +486,13 @@ msgstr "Статус"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Создать предложение"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Название этапа"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Настроить"
 
 #. module: crm
 #: view:crm.lead:0
@@ -500,9 +505,9 @@ msgid "Mailings"
 msgstr "Рассылки"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Сделать"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -522,9 +527,9 @@ msgid "Planned Revenue"
 msgstr "Планируемая выручка"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ожидаемая прибыль"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -560,6 +565,11 @@ msgstr "Выводы"
 msgid "Merge"
 msgstr "Объединить"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -570,11 +580,6 @@ msgstr "Категория вопроса"
 msgid "Partner Contact Name"
 msgstr "Название контакта партнёра"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -597,6 +602,11 @@ msgstr "# Телефонных звонков"
 msgid "The code of the sales team must be unique !"
 msgstr "Код отдела продаж должен быть уникальным !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "Адрес электронной почты контакта"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -660,9 +670,9 @@ msgid "Partner Segmentation"
 msgstr "Классификация партнера"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Продолжительность в минутах"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -680,9 +690,9 @@ msgid "The name of the segmentation."
 msgstr "Название классификации"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Вероятность (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -700,13 +710,7 @@ msgid "Statistics Dashboard"
 msgstr "Панель статистики"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Этап изменен на <b>%s</b>."
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -719,12 +723,6 @@ msgstr "Этап изменен на <b>%s</b>."
 msgid "Opportunity"
 msgstr "Предложение"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "Мероприятие <b>назначено</b> на <em>%s</em>."
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -762,17 +760,6 @@ msgid ""
 msgstr ""
 "Кандидаты/Предложения которые распределены одному из моих отделов продаж"
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Название предложения"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Установить отдел"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -784,25 +771,21 @@ msgid "Exclusive"
 msgstr "Эксклюзивный"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "От %s : %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Год создания"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "Преобразовать в предложения"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "или"
@@ -827,31 +810,6 @@ msgstr ""
 "Связь между этапами и отделами продаж. При установке, ограничивает этап для "
 "выбранного отдела продаж."
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"Здравствуйте [[object.user_id.name]], \n"
-"Могли бы вы посмотреть кандидата, он не открывался 5 дней ?\n"
-"\n"
-"Кандидат: [[object.id ]]\n"
-"Описание:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Спасибо,\n"
-"            "
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -859,9 +817,9 @@ msgid "Requirements"
 msgstr "Требования"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Преобразовать в предложение "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Индекс"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -906,9 +864,9 @@ msgid "Mark Won"
 msgstr "Отметить \"Выиграна\""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Вероятность (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -933,7 +891,7 @@ msgid "Send Email"
 msgstr "Отправить письмо"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Внимание!"
@@ -943,23 +901,12 @@ msgstr "Внимание!"
 msgid "Days to Open"
 msgstr "Дней до открытия"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Создать партнера"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Мобильный"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "Звонок был <b>сброшен и открыт</b>."
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -985,11 +932,6 @@ msgstr "Используется для подсчёта открытых дне
 msgid "Meetings"
 msgstr "Встречи"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Условия для полей вопроса"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -997,6 +939,19 @@ msgstr "Условия для полей вопроса"
 msgid "Next Action"
 msgstr "Следующее действие"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Черновик"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1067,14 +1022,6 @@ msgstr "Вычислить классификацию"
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1084,10 +1031,10 @@ msgid "Creation Date"
 msgstr "Дата создания"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s <b>создано</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1148,23 +1095,15 @@ msgid "Delete"
 msgstr "Удалить"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ожидаемая прибыль"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "Предложение <b>проиграно</b>."
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1173,9 +1112,20 @@ msgid "September"
 msgstr "Сентябрь"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "Адрес электронной почты контакта"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1206,21 +1156,15 @@ msgid "Opening Date"
 msgstr "Дата открытия"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Продолжительность в минутах"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Название канала"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Продолжить"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1253,6 +1197,12 @@ msgstr ""
 "Это поле используется, чтобы различать этапы , связанные с кандидатами от "
 "этапов связанных с предложениями, или для определения этапов для обоих типов."
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1262,14 +1212,6 @@ msgstr ""
 "Отметьте, если хотите использовать правило классификации. Если не отмечено, "
 "следующий ниже критерий будет проигнорирован."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Создать партнера"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1291,16 +1233,11 @@ msgid "unknown"
 msgstr "неизвестный"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Партнер в Предложение"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Подписан"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1310,13 +1247,6 @@ msgstr "Партнер в Предложение"
 msgid "Date"
 msgstr "Дата"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Подписан"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1365,6 +1295,13 @@ msgstr ""
 "При отправке почты,адрес электронной почты по умолчанию берется из отдела "
 "продаж."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1376,7 +1313,7 @@ msgid "Lead Description"
 msgstr "Описание кандидата"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Объединенные предложения"
@@ -1420,13 +1357,9 @@ msgstr "Ссылки"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Отмена"
@@ -1447,14 +1380,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Кандидаты/Предложения в состоянии \"В ожидании\""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Объединить два предложения"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Сделать"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Звонок в партнера"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "Связанный заказчик"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1493,6 +1433,16 @@ msgstr "Открытые Кандидаты/Предложения"
 msgid "Users"
 msgstr "Пользователи"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Разделы"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1542,6 +1492,12 @@ msgstr "Название"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "Кандидаты/пользователи распределенные мне"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Дата закрытия"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1578,17 +1534,6 @@ msgstr "Высокая"
 msgid "Convert to prospect to business partner"
 msgstr "Преобразовать в возможного бизнес-партнера"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "Предложение <b>выиграно</b>."
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "Телефонные звонки, распределенные мне или моему отделу"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1625,6 +1570,7 @@ msgstr "Главный отдел"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "Не связан с заказчиком"
 
@@ -1633,11 +1579,6 @@ msgstr "Не связан с заказчиком"
 msgid "Next Action Date"
 msgstr "Дата следующего действия"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Выполняется"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1651,11 +1592,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "Распределить предложения"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Индекс"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1667,7 +1603,7 @@ msgid "Month of call"
 msgstr "Месяц звонка"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr "Партнер <b>создан</b>."
@@ -1720,11 +1656,6 @@ msgstr "Значение"
 msgid "Customer Name"
 msgstr "Название заказчика"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Звонок в Предложение"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1745,11 +1676,6 @@ msgstr "Предложения по этапам"
 msgid "Prospect is converting to business partner"
 msgstr "Перспектива преобразуется в бизнес-партнера"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1885,11 +1811,6 @@ msgstr "Указатель"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Тип используется для разделения кандидатов и предложений"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "Вы уверены, что хотите создать партнера используя этот звонок ?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1920,16 +1841,9 @@ msgid "Sales Teams"
 msgstr "Отделы продаж"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Кандидат в партнера"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Классификация"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1941,12 +1855,6 @@ msgstr "Команда"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Кандидаты/Предложения в стадии \"Новый\""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "%s <b>партнер</b> установлен в <em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1958,12 +1866,6 @@ msgstr "Не произведен"
 msgid "Probability"
 msgstr "Вероятность"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Пожалуйста, выберите более одного кандидата из списка."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1979,6 +1881,12 @@ msgstr "Месяц"
 msgid "Leads"
 msgstr "Кандидаты"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1990,28 +1898,18 @@ msgstr "Дизайн"
 msgid "Merge with existing opportunities"
 msgstr "Объединить с существующими предложениями"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Сделать"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2074,24 +1972,6 @@ msgstr "В ожидании"
 msgid "Prospect Opportunity"
 msgstr "Перспективы предложения"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2140,18 +2020,16 @@ msgid "Mandatory Expression"
 msgstr "Обязательное выражение"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "Создать нового заказчика"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Отправить письмо"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "Связанный заказчик"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "Создать нового заказчика"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2180,11 +2058,6 @@ msgstr "Анализ предложений"
 msgid "Misc"
 msgstr "Прочее"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Регулярное выражение по истории вопроса"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2212,11 +2085,6 @@ msgstr "Звонок сделан"
 msgid "Responsible"
 msgstr "Ответственный"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "Напоминание заказчику"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2228,21 +2096,22 @@ msgid "Product"
 msgstr "Товар"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "Звонок  <b>создан и открыт</b>."
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Максимальная история общения"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Год создания"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "Опции преобразования"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2311,7 +2180,6 @@ msgstr "Продолжение процесса"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "Преобразовать в возможность"
 
@@ -2393,8 +2261,13 @@ msgid "Company"
 msgstr "Компания"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Выполняется"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2402,6 +2275,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Нераспределенные кандидаты"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2422,26 +2300,6 @@ msgstr "Сброс"
 msgid "After-Sale Services"
 msgstr "Послепродажное обслуживание"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Преобразовать"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2487,6 +2345,11 @@ msgstr ""
 "информацию по нескольким критериям и детализировать информацию за счет "
 "добавления новых групп в отчет."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2518,6 +2381,11 @@ msgstr "Выбор кандидатов/возможностей"
 msgid "Confirmed"
 msgstr "Подтверждено"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2550,6 +2418,24 @@ msgstr "Необязательное выражение"
 msgid "Followers"
 msgstr "Подписчики"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2606,11 +2492,6 @@ msgstr "Создание предложений из кандидатов"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Установить категорию в"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2655,9 +2536,10 @@ msgid "Qualification"
 msgstr "Уточнение"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Контактный e-mail партнёра"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "Действие преобразования"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2675,15 +2557,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Партнёр уже существует."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Август"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Настроить"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2778,17 +2662,10 @@ msgid "Logged Calls"
 msgstr "Описанные звонки"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Вероятность успеха"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Черновик"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2800,7 +2677,6 @@ msgstr "Вопросы по отделам продаж"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Встреча"
 
@@ -2809,11 +2685,6 @@ msgstr "Встреча"
 msgid "Category of Case"
 msgstr "Категория вопроса"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Предложение / Заказчик"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2837,12 +2708,6 @@ msgstr "Улица (2-я строка)"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-"Возможно, вам придется убедиться, что этот партнер уже не существует."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2861,21 +2726,6 @@ msgstr "Пользователь"
 msgid "November"
 msgstr "Ноябрь"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Переговоры"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2899,11 +2749,6 @@ msgstr "Договор"
 msgid "Twitter Ads"
 msgstr "Реклама в Twitter"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Общее для всех отделов"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2915,14 +2760,9 @@ msgid "Planned Revenues"
 msgstr "Планируемая выручка"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Звонок в звонок"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Ожид.Закр."
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2946,16 +2786,10 @@ msgid "Categorization"
 msgstr "Категоризация"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Описать звонок"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Правила действий"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2980,7 +2814,6 @@ msgstr "Дата создания"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -3006,7 +2839,6 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3085,20 +2917,11 @@ msgstr "Установить в \"Сделать\""
 msgid "Working Hours"
 msgstr "Рабочие часы"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Звонки"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Заказчик"
 
@@ -3120,7 +2943,7 @@ msgid "Lost"
 msgstr "Проиграно"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3168,17 +2991,14 @@ msgid "Phone calls by user and section"
 msgstr "Звонки по пользователям и секциям"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Переговоры"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Ожид.Закр."
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Звонок в звонок"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3196,10 +3016,10 @@ msgid "Proposition"
 msgstr "Предложение"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Дата закрытия"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Звонки"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3213,6 +3033,11 @@ msgstr "Год"
 msgid "Newsletter"
 msgstr "Рассылка"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3596,9 +3421,15 @@ msgstr ""
 #~ msgid "Privacy"
 #~ msgstr "Конфиденциальность"
 
+#~ msgid "Continue"
+#~ msgstr "Продолжить"
+
 #~ msgid "Message"
 #~ msgstr "Сообщение"
 
+#~ msgid "Create Partner"
+#~ msgstr "Создать партнера"
+
 #~ msgid "My Meetings"
 #~ msgstr "Мои встречи"
 
@@ -3628,9 +3459,6 @@ msgstr ""
 #~ msgid "Location"
 #~ msgstr "Расположение"
 
-#~ msgid "Send Mail"
-#~ msgstr "Отправить письмо"
-
 #~ msgid "To"
 #~ msgstr "Кому"
 
@@ -3665,6 +3493,9 @@ msgstr ""
 #~ msgid "%(email_from)s = Partner email"
 #~ msgstr "%(email_from)s = эл. почта партнера"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Регулярное выражение по истории вопроса"
+
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = название партнера"
 
@@ -3704,6 +3535,9 @@ msgstr ""
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = описание вопроса"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Условия для полей вопроса"
+
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr "Отметьте, если хотите посылать партнеру напоминание по эл. почте."
@@ -3778,6 +3612,13 @@ msgstr ""
 #~ msgid "Delay after trigger date"
 #~ msgstr "Задержка после даты триггера"
 
+#~ msgid "Success Probability"
+#~ msgstr "Вероятность успеха"
+
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr ""
+#~ "Возможно, вам придется убедиться, что этот партнер уже не существует."
+
 #~ msgid "Responsible User"
 #~ msgstr "Ответственный пользователь"
 
@@ -3992,6 +3833,9 @@ msgstr ""
 #~ msgid "Monday"
 #~ msgstr "Понедельник"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Создать партнера"
+
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Управление техподдержкой"
 
@@ -4066,6 +3910,12 @@ msgstr ""
 #~ msgid "Decline"
 #~ msgstr "Отклонить"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "Вы уверены, что хотите создать партнера используя этот звонок ?"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "Кандидат в партнера"
+
 #~ msgid "The chosen company is not in the allowed companies for this user"
 #~ msgstr "Выбранная компания недоступна для этого пользователя"
 
@@ -4127,6 +3977,9 @@ msgstr ""
 #~ msgid "Reply To"
 #~ msgstr "Ответить"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Звонок в партнера"
+
 #~ msgid "Set New State To"
 #~ msgstr "Установить новое состояние в"
 
@@ -4201,6 +4054,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Настройка модуля CRM"
 
+#~ msgid "Set Category to"
+#~ msgstr "Установить категорию в"
+
 #~ msgid "Thu"
 #~ msgstr "Чт"
 
@@ -4259,6 +4115,9 @@ msgstr ""
 #~ msgid "Thursday"
 #~ msgstr "Четверг"
 
+#~ msgid "Action Rules"
+#~ msgstr "Правила действий"
+
 #~ msgid "Recurrency"
 #~ msgstr "Повторения"
 
@@ -4416,6 +4275,9 @@ msgstr ""
 #~ msgid "Recurrency period"
 #~ msgstr "Период повторения"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Максимальная история общения"
+
 #~ msgid ""
 #~ "Defines a rule or repeating pattern of time to exclude from the recurring "
 #~ "rule."
@@ -4438,6 +4300,9 @@ msgstr ""
 #~ "Это свойство определяет список исключений дат/времени для повторяющихся "
 #~ "элементов календаря."
 
+#~ msgid "Set Team to"
+#~ msgstr "Установить отдел"
+
 #~ msgid ""
 #~ "Sales team to which this case belongs to. Defines responsible user and e-"
 #~ "mail address for the mail gateway."
@@ -4565,9 +4430,18 @@ msgstr ""
 #~ msgid "Opportunity Analysis"
 #~ msgstr "Анализ предложений"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Партнер в Предложение"
+
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Преобразовать в предложение "
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Кратко о предложении"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Объединить два предложения"
+
 #, python-format
 #~ msgid ""
 #~ "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
@@ -4586,6 +4460,12 @@ msgstr ""
 #~ msgid "Opportunities by Categories"
 #~ msgstr "Предложения по категориям"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Название предложения"
+
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Звонок в Предложение"
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Преобразовать в предложение"
 
@@ -4798,6 +4678,9 @@ msgstr ""
 #~ msgid "_Schedule"
 #~ msgstr "_Запланировать"
 
+#~ msgid "_Convert"
+#~ msgstr "_Преобразовать"
+
 #~ msgid "_Add"
 #~ msgstr "_Добавить"
 
@@ -4901,6 +4784,9 @@ msgstr ""
 #~ msgid "Mail Gateway"
 #~ msgstr "Шлюз почты"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Предложение / Заказчик"
+
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Планировать/Описать звонок"
 
@@ -5084,6 +4970,10 @@ msgstr ""
 #~ msgid "Caldav URL"
 #~ msgstr "Адрес Caldav"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Пожалуйста, выберите более одного кандидата из списка."
+
 #~ msgid "Number of repetitions"
 #~ msgstr "Количество повторов"
 
@@ -5158,6 +5048,10 @@ msgstr ""
 #~ "Последний срок автоматически вычисляется как \"Дата начала\" + "
 #~ "\"Длительность\""
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Партнёр уже существует."
+
 #~ msgid "Condition on Communication History"
 #~ msgstr "Условие для истории общения"
 
@@ -5167,6 +5061,9 @@ msgstr ""
 #~ msgid "Salesman"
 #~ msgstr "Продавец"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Общее для всех отделов"
+
 #~ msgid "Public for Employees"
 #~ msgstr "Общий для работников"
 
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index ee63952762b..64a81be7372 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-30 17:09+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Iniciatíva"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Titul"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Akcia"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Vyberte príležitosti"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Názov etapy"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Názov pravidla"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Varovanie!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Naplánovať ostatné hovory"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Nezasielať"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stav"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekcie"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Analýza iniciatív"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampane"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Vyberte príležitosti"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stav"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Potenciálny partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -386,11 +389,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentácia"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -412,7 +421,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -427,15 +435,21 @@ msgstr "Kategória"
 msgid "#Opportunities"
 msgstr "#Príležitostí"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -467,22 +481,13 @@ msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Vytvoriť príležitosť"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Názov etapy"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Nastaviť"
 
 #. module: crm
 #: view:crm.lead:0
@@ -495,8 +500,8 @@ msgid "Mailings"
 msgstr "Korešpondencia"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -517,9 +522,9 @@ msgid "Planned Revenue"
 msgstr "Plánované príjmy"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Očakávaný príjem"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -555,6 +560,11 @@ msgstr "Názov"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -565,11 +575,6 @@ msgstr "Kategória udalosti"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -592,6 +597,11 @@ msgstr "#Telefónnych hovorov"
 msgid "The code of the sales team must be unique !"
 msgstr "Kód predajného tímu musí byť jedinečný!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -653,9 +663,9 @@ msgid "Partner Segmentation"
 msgstr "Segmentácia partnera"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Doba trvania v minútach"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -673,9 +683,9 @@ msgid "The name of the segmentation."
 msgstr "Názov segmentácie."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Pravdepodobnosť (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -693,13 +703,7 @@ msgid "Statistics Dashboard"
 msgstr "Nástenka štatistík"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -712,12 +716,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Príležitosť"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -754,17 +752,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Názov príležitosti"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Nastaviť tím"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -776,25 +763,21 @@ msgid "Exclusive"
 msgstr "Exkluzívny"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -817,21 +800,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -839,9 +807,9 @@ msgid "Requirements"
 msgstr "Požiadavky"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Zmeniť na príležitosť "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "PSČ"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -886,9 +854,9 @@ msgid "Mark Won"
 msgstr "Získaný"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Pravdepodobnosť (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -913,7 +881,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Pozor!"
@@ -923,23 +891,12 @@ msgstr "Pozor!"
 msgid "Days to Open"
 msgstr "Dni do otvorenia"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Vytvoriť partnera"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -965,11 +922,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Stretnutia"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Podmienky pre polia prípadu"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -977,6 +929,19 @@ msgstr "Podmienky pre polia prípadu"
 msgid "Next Action"
 msgstr "Ďalšie akcie"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Návrh"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1045,14 +1010,6 @@ msgstr ""
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1062,9 +1019,9 @@ msgid "Creation Date"
 msgstr "Dátum vytvorenia"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1124,23 +1081,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Očakávaný príjem"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1149,8 +1098,19 @@ msgid "September"
 msgstr "September"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1182,21 +1142,15 @@ msgid "Opening Date"
 msgstr "Dátum otvorenia"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Doba trvania v minútach"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Pokračovať"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1223,6 +1177,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1230,14 +1190,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Vytvoriť partnera"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1259,17 +1211,12 @@ msgid "unknown"
 msgstr "neznámy"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner pre príležitosť"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1278,13 +1225,6 @@ msgstr "Partner pre príležitosť"
 msgid "Date"
 msgstr "Dátum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1331,6 +1271,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1342,7 +1289,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1386,13 +1333,9 @@ msgstr "Ďalšie zdroje"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -1413,13 +1356,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Zlúčiť dve príležitosti"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1459,6 +1409,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekcie"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1503,6 +1463,12 @@ msgstr "Názov"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Dátum uzavretia"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1539,17 +1505,6 @@ msgstr "Vysoká"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1586,6 +1541,7 @@ msgstr "Hlavný tím"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1594,11 +1550,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Ďalší dátum s akciou"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Spustené"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1612,11 +1563,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "PSČ"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1628,7 +1574,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1681,11 +1627,6 @@ msgstr "Hodnota"
 msgid "Customer Name"
 msgstr "Meno zákazníka"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Telefónny hovor na príležitosť"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1706,11 +1647,6 @@ msgstr "Príležitostí podľa etapy"
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1844,12 +1780,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Ste si istí, že chcete vytvoriť partnera na základe tohto telefónneho hovoru?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1880,16 +1810,9 @@ msgid "Sales Teams"
 msgstr "Obchodné tímy"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Iniciatíva na partnera"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentácia"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1901,12 +1824,6 @@ msgstr "Tím"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1918,12 +1835,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1939,6 +1850,12 @@ msgstr "Mesiac"
 msgid "Leads"
 msgstr "Iniciatívy"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1950,28 +1867,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2032,24 +1939,6 @@ msgstr "Čaká sa"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2098,17 +1987,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Poslať e-mail"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2138,11 +2025,6 @@ msgstr "Analýza príležitostí"
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2170,11 +2052,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Zodpovedná osoba"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2186,21 +2063,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maximálna história komunikácie"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2267,7 +2145,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2349,8 +2226,13 @@ msgid "Company"
 msgstr "Spoločnosť"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Spustené"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2358,6 +2240,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2378,26 +2265,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convert"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2439,6 +2306,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2470,6 +2342,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrdené"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2502,6 +2379,24 @@ msgstr "Voliteľný výraz"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2554,11 +2449,6 @@ msgstr "Vytváranie obchodných príležitostí z iniciatívy"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2603,8 +2493,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2623,15 +2514,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "August"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Nastaviť"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2724,18 +2617,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Návrh"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2746,7 +2632,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2755,11 +2640,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2783,11 +2663,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2806,21 +2681,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2844,11 +2704,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2860,13 +2715,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2891,16 +2741,10 @@ msgid "Categorization"
 msgstr "Kategorizácia"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2924,7 +2768,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2950,7 +2793,6 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3029,20 +2871,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefónne hovory"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Zákazník"
 
@@ -3064,7 +2897,7 @@ msgid "Lost"
 msgstr "Stratená"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3112,16 +2945,13 @@ msgid "Phone calls by user and section"
 msgstr "Telefónne hovory podľa užívateľa a sekcie"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3140,10 +2970,10 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Dátum uzavretia"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefónne hovory"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3157,6 +2987,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3521,6 +3356,9 @@ msgstr ""
 #~ msgid "General"
 #~ msgstr "Všeobecné"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Podmienky pre polia prípadu"
+
 #~ msgid "Case history"
 #~ msgstr "História prípadu"
 
@@ -3564,6 +3402,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Link na existujúceho partnera"
 
+#~ msgid "Continue"
+#~ msgstr "Pokračovať"
+
 #~ msgid "Message"
 #~ msgstr "Správa"
 
@@ -3618,6 +3459,12 @@ msgstr ""
 #~ msgid "Do not create a partner"
 #~ msgstr "Nevytvárať partnera"
 
+#~ msgid "Create Partner"
+#~ msgstr "Vytvoriť partnera"
+
+#~ msgid "Create a Partner"
+#~ msgstr "Vytvoriť partnera"
+
 #~ msgid "Create a new partner"
 #~ msgstr "Vytvoriť nového partnera"
 
@@ -3631,9 +3478,16 @@ msgstr ""
 #~ msgstr ""
 #~ "Ste si istí, že chcete vytvoriť partnera založeného na tejto iniciatíve?"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Ste si istí, že chcete vytvoriť partnera na základe tohto telefónneho hovoru?"
+
 #~ msgid "Error ! You can not create recursive profiles."
 #~ msgstr "Chyba! Nemôžete vytvárať rekurzívne profily."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Zmeniť na príležitosť "
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Zmeniť na príležitosť"
 
@@ -3649,6 +3503,9 @@ msgstr ""
 #~ msgid "History Information"
 #~ msgstr "Informácie o histórii"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maximálna história komunikácie"
+
 #~ msgid "Communication & History"
 #~ msgstr "Komunikácia a história"
 
@@ -3775,9 +3632,6 @@ msgstr ""
 #~ msgid "Add Internal Note"
 #~ msgstr "Pridať internú poznámka"
 
-#~ msgid "Send Mail"
-#~ msgstr "Poslať e-mail"
-
 #, python-format
 #~ msgid "Unable to send mail. Please check SMTP is configured properly."
 #~ msgstr ""
@@ -3936,6 +3790,9 @@ msgstr ""
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer"
 
+#~ msgid "Set Team to"
+#~ msgstr "Nastaviť tím"
+
 #~ msgid "Supplier"
 #~ msgstr "Dodávateľ"
 
@@ -3966,9 +3823,15 @@ msgstr ""
 #~ msgid "crm.lead"
 #~ msgstr "crm.lead"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Názov príležitosti"
+
 #~ msgid "Monday"
 #~ msgstr "Pondelok"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner pre príležitosť"
+
 #~ msgid "Reminder"
 #~ msgstr "Pripomienka"
 
@@ -3984,6 +3847,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Zlúčiť dve príležitosti"
+
 #~ msgid "Choose day in the month where repeat the meeting"
 #~ msgstr "Vyberte deň v mesiaci, kedy sa opakuje stretnutie"
 
@@ -4008,6 +3874,9 @@ msgstr ""
 #~ msgid "Wed"
 #~ msgstr "St"
 
+#~ msgid "_Convert"
+#~ msgstr "_Convert"
+
 #~ msgid "Wizard"
 #~ msgstr "Sprievodca"
 
@@ -4018,6 +3887,9 @@ msgstr ""
 #~ msgid "Synchronization"
 #~ msgstr "Synchronizácia"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Telefónny hovor na príležitosť"
+
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Príležitosťi podľa kategórie"
 
@@ -4055,6 +3927,9 @@ msgstr ""
 #~ msgid "Caldav URL"
 #~ msgstr "Caldav URL"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Iniciatíva na partnera"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 1425c1cef22..1a255107b91 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 14:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Dejanje"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Ime pravila"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Razdelki"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Razčlenjenost"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,15 +432,21 @@ msgstr "Kategorija"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -464,21 +478,12 @@ msgstr "Stanje"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -492,8 +497,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -514,8 +519,8 @@ msgid "Planned Revenue"
 msgstr "Načrtovani prihodki"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -552,6 +557,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,8 +660,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -670,8 +680,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr "Ekskluzivno"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,8 +804,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -883,8 +851,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Opozorilo!"
@@ -920,23 +888,12 @@ msgstr "Opozorilo!"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr ""
 msgid "Lowest"
 msgstr "Najnižja"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr "Ustvarjeno dne"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,10 +1078,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1132,12 +1087,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,8 +1139,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1188,12 +1148,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,15 +1208,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1275,13 +1222,6 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1383,13 +1330,9 @@ msgstr "Sklici"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Prekliči"
@@ -1410,13 +1353,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1456,6 +1406,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Razdelki"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1500,6 +1460,12 @@ msgstr "Naziv"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1536,17 +1502,6 @@ msgstr "Visoka"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1583,6 +1538,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1591,11 +1547,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "V teku"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1609,11 +1560,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1625,7 +1571,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1678,11 +1624,6 @@ msgstr "Vrednost"
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1703,11 +1644,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1841,11 +1777,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1876,17 +1807,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Razčlenjenost"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1897,12 +1821,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1914,12 +1832,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1935,6 +1847,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1946,28 +1864,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2028,24 +1936,6 @@ msgstr "Na čakanju"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2094,17 +1984,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2134,11 +2022,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2166,11 +2049,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Odgovoren"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2182,14 +2060,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2197,6 +2069,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2263,7 +2142,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2345,8 +2223,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "V teku"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2354,6 +2237,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2374,26 +2262,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2435,6 +2303,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2466,6 +2339,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2498,6 +2376,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2550,11 +2446,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2599,8 +2490,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2619,14 +2511,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2720,18 +2614,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2742,7 +2629,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2751,11 +2637,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2779,11 +2660,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2802,21 +2678,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2840,11 +2701,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2856,13 +2712,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2887,16 +2738,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2920,7 +2765,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2946,7 +2790,6 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3025,20 +2868,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3060,7 +2894,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3108,16 +2942,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3136,9 +2967,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3153,6 +2984,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/sq.po b/addons/crm/i18n/sq.po
index 9334c7bdb36..a02395eeab0 100644
--- a/addons/crm/i18n/sq.po
+++ b/addons/crm/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -44,19 +46,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -65,11 +77,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,9 +84,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,8 +248,8 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,21 +479,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,8 +520,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -553,6 +558,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,8 +681,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,8 +805,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -884,8 +852,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -921,23 +889,12 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,10 +1079,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1133,12 +1088,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,15 +1209,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1276,13 +1223,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1384,13 +1331,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1411,13 +1354,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1457,6 +1407,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,15 +1808,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1898,12 +1822,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,14 +2061,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2198,6 +2070,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2447,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2491,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,14 +2512,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2721,16 +2615,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2743,7 +2630,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2752,11 +2638,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2661,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2679,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2702,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2713,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2739,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2766,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2791,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2869,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3061,7 +2895,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2943,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,9 +2968,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3154,6 +2985,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/sr.po b/addons/crm/i18n/sr.po
index b7eca563276..d7b8a434144 100644
--- a/addons/crm/i18n/sr.po
+++ b/addons/crm/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2010-11-04 09:33+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 08:22+0000\n"
+"Last-Translator: Vlado Zvijer <vlado.zvijer@iinet.rs>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Trag"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Naslov"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Akcija"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Izaberi Priliku"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Kasnjenje pre zatvaranja"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Ime Nivoa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Ime Pravila"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Zakazi ostale Pozive"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Opt-Out"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Iskljuceni Odgovori :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekcije"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Analiza Tragova"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampanje"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Izaberi Priliku"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stanje"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Prospekt Partnera"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentacija"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgstr ""
 "ovom nivou bude uspesan"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,15 +439,21 @@ msgstr "Kategorija"
 msgid "#Opportunities"
 msgstr "# Prilike"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -471,22 +485,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Kreiraj Priliku"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Avgust"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Ime Nivoa"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,8 +504,8 @@ msgid "Mailings"
 msgstr "E-poruke"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Planirani Prihod"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ocekivani Prihod"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Sumarno"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Kategorija Slucaja"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "#Tel Pozivi"
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Partnerova segmentacije"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Kasnjenje u Minutima"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "Ime segmentacije"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Mogucnost (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Glavna Tabla Statistike"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Prilika"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Ime Prilike"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Postavi Tim na"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Eksluzivno"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Zahtevi"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Konvertuj u Priliku "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postanski Br"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Markiraj Dobitak"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Mogucnost (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje !"
@@ -929,23 +897,12 @@ msgstr "Upozorenje !"
 msgid "Days to Open"
 msgstr "Dana do Otvaranja"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Kreiraj Partnera"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobilni"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Sastanci"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Sledeca Akcija"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Priprema"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Izracunaj Segmentaciju"
 msgid "Lowest"
 msgstr "Najnizi"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Datum Kreiranja"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ocekivani Prihod"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "Septembar"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Datum Otvaranja"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Kasnjenje u Minutima"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Nastavi"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1231,6 +1185,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "Oznaci ako zelis koristiti ovaj Tab kao deo segmentacionog pravila. Ukoliko "
 "nije cekirano kriterijumi ispod ce biti ignorisani"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Kreiraj Partnera"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "Nepoznato"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner kao Prilika"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Partner kao Prilika"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1396,13 +1343,9 @@ msgstr "Reference"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Otkazi"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Ujedini dve Prilike"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "TelPOziv za Partnera"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekcije"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1513,6 +1473,12 @@ msgstr "Ime"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Datum Zatvaranja"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1549,17 +1515,6 @@ msgstr "Visoki"
 msgid "Convert to prospect to business partner"
 msgstr "Konvertuj u prospekat biznis Partnera"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1596,6 +1551,7 @@ msgstr "Roditeljski Tim"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1604,11 +1560,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Datum sledece Akcije"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "U toku"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1622,11 +1573,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postanski Br"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1638,7 +1584,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1691,11 +1637,6 @@ msgstr "Vrednost"
 msgid "Customer Name"
 msgstr "Ime Klijenta"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Tel poziv ka Prilici"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1716,11 +1657,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr "Prospekt se koncertuje u Biznis Partnera"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1854,12 +1790,6 @@ msgstr "Smernica"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tip se koristi za razdvajanja Tragova od Prilika"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Jesi li siguran da zelis da kreiras Partnera baziranog na ovom tel razgovoru"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1890,16 +1820,9 @@ msgid "Sales Teams"
 msgstr "Prodajni Timovi"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Trag ka Partneru"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentacija"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1911,12 +1834,6 @@ msgstr "Tim"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1928,12 +1845,6 @@ msgstr "Ne Odrzivo"
 msgid "Probability"
 msgstr "Verovatnoca"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1949,6 +1860,12 @@ msgstr "Mesec"
 msgid "Leads"
 msgstr "Tragovi"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1960,28 +1877,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Za Uraditi"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2042,24 +1949,6 @@ msgstr "Nadolazeci"
 msgid "Prospect Opportunity"
 msgstr "Prospekt Prilika"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2108,17 +1997,15 @@ msgid "Mandatory Expression"
 msgstr "Obavezni izraz"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Posalji Email"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2148,11 +2035,6 @@ msgstr "Analiza Prilika"
 msgid "Misc"
 msgstr "Ostalo"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Regularna ekspresija u slucaju istorije"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2180,11 +2062,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Odgovoran"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2196,21 +2073,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimum komunikacione Istorije"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2277,7 +2155,6 @@ msgstr "Nastavi Proces"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2359,8 +2236,13 @@ msgid "Company"
 msgstr "Preduzece"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "U toku"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2368,6 +2250,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2388,26 +2275,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Konvertuj"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2449,6 +2316,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2480,6 +2352,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrdjeno"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2512,6 +2389,24 @@ msgstr "Opcioni Izrazi"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2569,11 +2464,6 @@ msgstr "Kreiranje  biznis prilika iz Tragova"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Postavi Kategoriju na"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2618,8 +2508,9 @@ msgid "Qualification"
 msgstr "Kvalifikacija"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2638,14 +2529,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Avgust"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2738,21 +2631,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
+msgstr "Забележени позиви"
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Mogucnost Uspesnosti"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Priprema"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2763,7 +2649,6 @@ msgstr "Slucajevi po Prodajnim Timovima"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Sastanak"
 
@@ -2772,11 +2657,6 @@ msgstr "Sastanak"
 msgid "Category of Case"
 msgstr "Kategorije Slucajeva"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2800,11 +2680,6 @@ msgstr "Ulica2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Moras potvrditi da ovaj partner vec ne postoji."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2823,21 +2698,6 @@ msgstr "Korisnik"
 msgid "November"
 msgstr "Novembar"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Pregovaranje"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2861,11 +2721,6 @@ msgstr "Ugovor"
 msgid "Twitter Ads"
 msgstr "Twitter Ads"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2877,14 +2732,9 @@ msgid "Planned Revenues"
 msgstr "Planirani Prihodi"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Tel Poziv za Tel Poziv"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Exp.Closing"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2908,16 +2758,10 @@ msgid "Categorization"
 msgstr "Kategorizacija"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Pravila Akcije"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2941,7 +2785,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2967,7 +2810,6 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3046,20 +2888,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Radnih Sati"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "TelPozivi"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Kupac"
 
@@ -3081,7 +2914,7 @@ msgid "Lost"
 msgstr "Izgubljen"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3129,17 +2962,14 @@ msgid "Phone calls by user and section"
 msgstr "TelPOzivi po Korisniku i sekciji"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Pregovaranje"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Tel Poziv za Tel Poziv"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3157,10 +2987,10 @@ msgid "Proposition"
 msgstr "Propozicija"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Datum Zatvaranja"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "TelPozivi"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3174,6 +3004,11 @@ msgstr "Godina"
 msgid "Newsletter"
 msgstr "Novine"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3249,6 +3084,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Veza ka postojecem partneru"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Regularna ekspresija u slucaju istorije"
+
 #~ msgid "Change Responsible"
 #~ msgstr "Promeni Odgovornost"
 
@@ -3333,12 +3171,21 @@ msgstr ""
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Sinhronizacija Kalendara"
 
+#~ msgid "Continue"
+#~ msgstr "Nastavi"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer"
 
 #~ msgid "By day"
 #~ msgstr "Po danu"
 
+#~ msgid "Set Team to"
+#~ msgstr "Postavi Tim na"
+
+#~ msgid "Opportunity Name"
+#~ msgstr "Ime Prilike"
+
 #~ msgid ""
 #~ "This property defines the list of date/time exceptions for a recurring "
 #~ "calendar component."
@@ -3346,6 +3193,9 @@ msgstr ""
 #~ "Ova osobina definise listu /datumavremena izuzetaka za ponavljanje stavke "
 #~ "kalendara."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Konvertuj u Priliku "
+
 #~ msgid "Set an alarm at this time, before the event occurs"
 #~ msgstr "Postavi Alarm na vreme, pre nego se dogadjaj desi"
 
@@ -3365,6 +3215,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been closed."
 #~ msgstr "Prilika '%s' je zatvorena."
 
+#~ msgid "Create Partner"
+#~ msgstr "Kreiraj Partnera"
+
 #~ msgid "My Meetings"
 #~ msgstr "Moji Sastanci"
 
@@ -3452,9 +3305,15 @@ msgstr ""
 #~ msgid "Reminder"
 #~ msgstr "Podsetnik"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Kreiraj Partnera"
+
 #~ msgid "Monday"
 #~ msgstr "Ponedeljak"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner kao Prilika"
+
 #~ msgid "History"
 #~ msgstr "Istorija"
 
@@ -3473,6 +3332,9 @@ msgstr ""
 #~ msgid "Search Meetings"
 #~ msgstr "Pretraga Sastanaka"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Ujedini dve Prilike"
+
 #~ msgid "Current"
 #~ msgstr "Trenutni"
 
@@ -3548,6 +3410,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Prilike po Kategorijama"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Tel poziv ka Prilici"
+
 #~ msgid "Minutes"
 #~ msgstr "Minuta"
 
@@ -3601,12 +3466,19 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "Greska !"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Jesi li siguran da zelis da kreiras Partnera baziranog na ovom tel razgovoru"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Trag ka Partneru"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Postavi na Nepotvrdjeno"
 
@@ -3634,9 +3506,6 @@ msgstr ""
 #~ msgid "Plug-In"
 #~ msgstr "Plug-In(dodatak)"
 
-#~ msgid "Send Mail"
-#~ msgstr "Posalji Email"
-
 #~ msgid "CC"
 #~ msgstr "CC"
 
@@ -3759,6 +3628,9 @@ msgstr ""
 #~ "U slucaju da slucaj treba da se ponovo razmotri tada se stanje postavlja na "
 #~ "'Na Cekanju'"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimum komunikacione Istorije"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "Jesi li siguran da zelis kreirati partnera baziranom na ovom tragu ?"
 
@@ -3783,6 +3655,9 @@ msgstr ""
 #~ msgid "Reply To"
 #~ msgstr "Odgovor Za"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "TelPOziv za Partnera"
+
 #~ msgid "Set New State To"
 #~ msgstr "Postavi Novo stanje NA"
 
@@ -3935,6 +3810,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Podesavanje CRM Aplikacije"
 
+#~ msgid "Set Category to"
+#~ msgstr "Postavi Kategoriju na"
+
 #~ msgid "Thu"
 #~ msgstr "Cetvr"
 
@@ -4006,6 +3884,9 @@ msgstr ""
 #~ msgid "Interest in Computer"
 #~ msgstr "Zainteresovan za racunare"
 
+#~ msgid "Success Probability"
+#~ msgstr "Mogucnost Uspesnosti"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "Izvestaj CRM Tragova"
 
@@ -4024,6 +3905,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Kategorije Sastanaka"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Moras potvrditi da ovaj partner vec ne postoji."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "NIje pronadjen Enmail ID za adresu Tvoje Kompanije"
@@ -4052,6 +3936,9 @@ msgstr ""
 #~ msgid "Merged into Opportunity: %s"
 #~ msgstr "Spojeno sa Prilikom: %s"
 
+#~ msgid "Action Rules"
+#~ msgstr "Pravila Akcije"
+
 #~ msgid "Recurrency"
 #~ msgstr "Ponavljanje"
 
@@ -4192,6 +4079,9 @@ msgstr ""
 #~ msgid "_Schedule"
 #~ msgstr "_Zakazi"
 
+#~ msgid "_Convert"
+#~ msgstr "_Konvertuj"
+
 #~ msgid "Condition Case Fields"
 #~ msgstr "Slucaj Uslova Polja"
 
diff --git a/addons/crm/i18n/sr@latin.po b/addons/crm/i18n/sr@latin.po
index ba6b1aa20f2..0190b7330b9 100644
--- a/addons/crm/i18n/sr@latin.po
+++ b/addons/crm/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-23 11:06+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Trag"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr "Naslov"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Akcija"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Izaberi Priliku"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr "Kasnjenje pre zatvaranja"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Ime Nivoa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Ime Pravila"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Zakazi ostale Pozive"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr "Opt-Out"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "Iskljuceni Odgovori :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sekcije"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Analiza Tragova"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampanje"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Izaberi Priliku"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Stanje"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -290,7 +293,7 @@ msgid "Prospect Partner"
 msgstr "Prospekt Partnera"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -388,11 +391,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentacija"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -416,7 +425,6 @@ msgstr ""
 "ovom nivou bude uspesan"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -431,15 +439,21 @@ msgstr "Kategorija"
 msgid "#Opportunities"
 msgstr "# Prilike"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -471,22 +485,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Kreiraj Priliku"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Avgust"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Ime Nivoa"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -499,8 +504,8 @@ msgid "Mailings"
 msgstr "E-poruke"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -521,9 +526,9 @@ msgid "Planned Revenue"
 msgstr "Planirani Prihod"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ocekivani Prihod"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -559,6 +564,11 @@ msgstr "Sumarno"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -569,11 +579,6 @@ msgstr "Kategorija Slucaja"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -596,6 +601,11 @@ msgstr "#Tel Pozivi"
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -659,9 +669,9 @@ msgid "Partner Segmentation"
 msgstr "Partnerova segmentacije"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Kasnjenje u Minutima"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -679,9 +689,9 @@ msgid "The name of the segmentation."
 msgstr "Ime segmentacije"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Mogucnost (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -699,13 +709,7 @@ msgid "Statistics Dashboard"
 msgstr "Glavna Tabla Statistike"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -718,12 +722,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Prilika"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -760,17 +758,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Ime Prilike"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Postavi Tim na"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -782,25 +769,21 @@ msgid "Exclusive"
 msgstr "Eksluzivno"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -823,21 +806,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -845,9 +813,9 @@ msgid "Requirements"
 msgstr "Zahtevi"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Konvertuj u Priliku "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postanski Br"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -892,9 +860,9 @@ msgid "Mark Won"
 msgstr "Markiraj Dobitak"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Mogucnost (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -919,7 +887,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje !"
@@ -929,23 +897,12 @@ msgstr "Upozorenje !"
 msgid "Days to Open"
 msgstr "Dana do Otvaranja"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Kreiraj Partnera"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobilni"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -971,11 +928,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Sastanci"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -983,6 +935,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Sledeca Akcija"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Priprema"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1051,14 +1016,6 @@ msgstr "Izracunaj Segmentaciju"
 msgid "Lowest"
 msgstr "Najnizi"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1068,9 +1025,9 @@ msgid "Creation Date"
 msgstr "Datum Kreiranja"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1130,23 +1087,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ocekivani Prihod"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1155,8 +1104,19 @@ msgid "September"
 msgstr "Septembar"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Datum Otvaranja"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Kasnjenje u Minutima"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Nastavi"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1231,6 +1185,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "Oznaci ako zelis koristiti ovaj Tab kao deo segmentacionog pravila. Ukoliko "
 "nije cekirano kriterijumi ispod ce biti ignorisani"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Kreiraj Partnera"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "Nepoznato"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Partner kao Prilika"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Partner kao Prilika"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1396,13 +1343,9 @@ msgstr "Reference"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Otkazi"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Ujedini dve Prilike"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "TelPOziv za Partnera"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sekcije"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1513,6 +1473,12 @@ msgstr "Ime"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Datum Zatvaranja"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1549,17 +1515,6 @@ msgstr "Visoki"
 msgid "Convert to prospect to business partner"
 msgstr "Konvertuj u prospekat biznis Partnera"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1596,6 +1551,7 @@ msgstr "Roditeljski Tim"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1604,11 +1560,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Datum sledece Akcije"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "U toku"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1622,11 +1573,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postanski Br"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1638,7 +1584,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1691,11 +1637,6 @@ msgstr "Vrednost"
 msgid "Customer Name"
 msgstr "Ime Klijenta"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Tel poziv ka Prilici"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1716,11 +1657,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr "Prospekt se koncertuje u Biznis Partnera"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1854,12 +1790,6 @@ msgstr "Smernica"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tip se koristi za razdvajanja Tragova od Prilika"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Jesi li siguran da zelis da kreiras Partnera baziranog na ovom tel razgovoru"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1890,16 +1820,9 @@ msgid "Sales Teams"
 msgstr "Prodajni Timovi"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Trag ka Partneru"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentacija"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1911,12 +1834,6 @@ msgstr "Tim"
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1928,12 +1845,6 @@ msgstr "Ne Odrzivo"
 msgid "Probability"
 msgstr "Verovatnoca"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1949,6 +1860,12 @@ msgstr "Mesec"
 msgid "Leads"
 msgstr "Tragovi"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1960,28 +1877,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Za Uraditi"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2042,24 +1949,6 @@ msgstr "Nadolazeci"
 msgid "Prospect Opportunity"
 msgstr "Prospekt Prilika"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2108,17 +1997,15 @@ msgid "Mandatory Expression"
 msgstr "Obavezni izraz"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Posalji Email"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2148,11 +2035,6 @@ msgstr "Analiza Prilika"
 msgid "Misc"
 msgstr "Ostalo"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Regularna ekspresija u slucaju istorije"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2180,11 +2062,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Odgovoran"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2196,21 +2073,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maksimum komunikacione Istorije"
-
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2277,7 +2155,6 @@ msgstr "Nastavi Proces"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2359,8 +2236,13 @@ msgid "Company"
 msgstr "Preduzece"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "U toku"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2368,6 +2250,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2388,26 +2275,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Konvertuj"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2449,6 +2316,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2480,6 +2352,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrdjeno"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2512,6 +2389,24 @@ msgstr "Opcioni Izrazi"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2569,11 +2464,6 @@ msgstr "Kreiranje  biznis prilika iz Tragova"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Postavi Kategoriju na"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2618,8 +2508,9 @@ msgid "Qualification"
 msgstr "Kvalifikacija"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2638,14 +2529,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Avgust"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2741,17 +2634,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Mogucnost Uspesnosti"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Priprema"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2763,7 +2649,6 @@ msgstr "Slucajevi po Prodajnim Timovima"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Sastanak"
 
@@ -2772,11 +2657,6 @@ msgstr "Sastanak"
 msgid "Category of Case"
 msgstr "Kategorije Slucajeva"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2800,11 +2680,6 @@ msgstr "Ulica2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Moras potvrditi da ovaj partner vec ne postoji."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2823,21 +2698,6 @@ msgstr "Korisnik"
 msgid "November"
 msgstr "Novembar"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Pregovaranje"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2861,11 +2721,6 @@ msgstr "Ugovor"
 msgid "Twitter Ads"
 msgstr "Twitter Ads"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2877,14 +2732,9 @@ msgid "Planned Revenues"
 msgstr "Planirani Prihodi"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Tel Poziv za Tel Poziv"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Exp.Closing"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2908,16 +2758,10 @@ msgid "Categorization"
 msgstr "Kategorizacija"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Pravila Akcije"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2941,7 +2785,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2967,7 +2810,6 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3046,20 +2888,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Radnih Sati"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "TelPozivi"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Kupac"
 
@@ -3081,7 +2914,7 @@ msgid "Lost"
 msgstr "Izgubljen"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3129,17 +2962,14 @@ msgid "Phone calls by user and section"
 msgstr "TelPOzivi po Korisniku i sekciji"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Pregovaranje"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Tel Poziv za Tel Poziv"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3157,10 +2987,10 @@ msgid "Proposition"
 msgstr "Propozicija"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Datum Zatvaranja"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "TelPozivi"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3174,6 +3004,11 @@ msgstr "Godina"
 msgid "Newsletter"
 msgstr "Novine"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3278,6 +3113,9 @@ msgstr ""
 #~ msgid "Link to an existing partner"
 #~ msgstr "Veza ka postojecem partneru"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Regularna ekspresija u slucaju istorije"
+
 #, python-format
 #~ msgid "The lead '%s' has been opened."
 #~ msgstr "Trag '%s' je otvoren."
@@ -3420,9 +3258,18 @@ msgstr ""
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "Sinhronizacija Kalendara"
 
+#~ msgid "Continue"
+#~ msgstr "Nastavi"
+
+#~ msgid "Opportunity Name"
+#~ msgstr "Ime Prilike"
+
 #~ msgid "By day"
 #~ msgstr "Po danu"
 
+#~ msgid "Set Team to"
+#~ msgstr "Postavi Tim na"
+
 #~ msgid "crm.installer"
 #~ msgstr "crm.installer"
 
@@ -3440,6 +3287,9 @@ msgstr ""
 #~ "Ova osobina definise listu /datumavremena izuzetaka za ponavljanje stavke "
 #~ "kalendara."
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Konvertuj u Priliku "
+
 #~ msgid "Gives the sequence order when displaying a list of case stages."
 #~ msgstr "Daje redosled sekvenci pri prikazu liste NIvoa slucajeva"
 
@@ -3459,6 +3309,9 @@ msgstr ""
 #~ msgid "Show time as"
 #~ msgstr "Prikazi vreme kao"
 
+#~ msgid "Create Partner"
+#~ msgstr "Kreiraj Partnera"
+
 #~ msgid "<"
 #~ msgstr "<"
 
@@ -3549,9 +3402,15 @@ msgstr ""
 #~ msgid "Reminder"
 #~ msgstr "Podsetnik"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Kreiraj Partnera"
+
 #~ msgid "Monday"
 #~ msgstr "Ponedeljak"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Partner kao Prilika"
+
 #~ msgid "History"
 #~ msgstr "Istorija"
 
@@ -3561,6 +3420,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Ujedini dve Prilike"
+
 #~ msgid "Current"
 #~ msgstr "Trenutni"
 
@@ -3605,6 +3467,9 @@ msgstr ""
 #~ "Prodajni Tim kojem ovaj slucaj pripada. definise odgovorne korisnike i E-"
 #~ "mail adrese za prosledjivanje."
 
+#~ msgid "_Convert"
+#~ msgstr "_Konvertuj"
+
 #~ msgid "Saturday"
 #~ msgstr "Subota"
 
@@ -3654,6 +3519,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "Prilike po Kategorijama"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Tel poziv ka Prilici"
+
 #~ msgid "Minutes"
 #~ msgstr "Minuta"
 
@@ -3710,6 +3578,13 @@ msgstr ""
 #~ msgid "Google Adwords 2"
 #~ msgstr "Google Adwords 2"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Jesi li siguran da zelis da kreiras Partnera baziranog na ovom tel razgovoru"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "Trag ka Partneru"
+
 #~ msgid "MS-Outlook"
 #~ msgstr "MS-Outlook"
 
@@ -3749,9 +3624,6 @@ msgstr ""
 #~ msgid "CC"
 #~ msgstr "CC"
 
-#~ msgid "Send Mail"
-#~ msgstr "Posalji Email"
-
 #~ msgid "Months"
 #~ msgstr "Meseci"
 
@@ -3829,6 +3701,9 @@ msgstr ""
 #~ msgid "Main Job"
 #~ msgstr "Glavni Posao"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maksimum komunikacione Istorije"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "Jesi li siguran da zelis kreirati partnera baziranom na ovom tragu ?"
 
@@ -3889,6 +3764,9 @@ msgstr ""
 #~ msgid "Opportunity Summary"
 #~ msgstr "Prilike Sumarno"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "TelPOziv za Partnera"
+
 #~ msgid "Set New State To"
 #~ msgstr "Postavi Novo stanje NA"
 
@@ -4035,6 +3913,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "Podesavanje CRM Aplikacije"
 
+#~ msgid "Set Category to"
+#~ msgstr "Postavi Kategoriju na"
+
 #~ msgid "Configuration"
 #~ msgstr "Podesavanje"
 
@@ -4112,6 +3993,9 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "Podrazumevamo (0= None)"
 
+#~ msgid "Success Probability"
+#~ msgstr "Mogucnost Uspesnosti"
+
 #~ msgid "From"
 #~ msgstr "Od"
 
@@ -4127,6 +4011,9 @@ msgstr ""
 #~ msgid "Meeting Categories"
 #~ msgstr "Kategorije Sastanaka"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Moras potvrditi da ovaj partner vec ne postoji."
+
 #, python-format
 #~ msgid "No E-Mail ID Found for your Company address!"
 #~ msgstr "NIje pronadjen Enmail ID za adresu Tvoje Kompanije"
@@ -4159,6 +4046,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Zatvori"
 
+#~ msgid "Action Rules"
+#~ msgstr "Pravila Akcije"
+
 #~ msgid "Recurrency"
 #~ msgstr "Ponavljanje"
 
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 8cfdf5f9ad5..3521b5d759d 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Kundämne"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Titel"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Action"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Välj affärsmöjligheter"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "Stängledtid"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Stegnamn"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "Kundämnesanalys"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "Registreringsdag"
 msgid "Rule Name"
 msgstr "Rule Name"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Schemalägg nytt samtal"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "Undantagen"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Status"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Exkluderade svar:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Sektioner"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Kundämnesanalys"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampanjer"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Välj affärsmöjligheter"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Status"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "Samarbetspartner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Ingen rubrik"
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentation"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -413,7 +422,6 @@ msgid ""
 msgstr "Procentsatsen anger sannolikheten för framgång i detta steg"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -428,16 +436,22 @@ msgstr "Kategori"
 msgid "#Opportunities"
 msgstr "# Affärsmöjligheter"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Företagskontakt e-post"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -468,22 +482,13 @@ msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Skapa affärstillfälle"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "augusti"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Stegnamn"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -496,9 +501,9 @@ msgid "Mailings"
 msgstr "Epost-korrespondens"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Att göra"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -518,9 +523,9 @@ msgid "Planned Revenue"
 msgstr "Planned Revenue"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Förväntad intäkt"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -556,6 +561,11 @@ msgstr "Summering"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -566,11 +576,6 @@ msgstr "Ärendekategori"
 msgid "Partner Contact Name"
 msgstr "Företagskontaktnamn"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -593,6 +598,11 @@ msgstr "# Telefonsamtal"
 msgid "The code of the sales team must be unique !"
 msgstr "Koden för säljlaget måste vara unikt!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -656,9 +666,9 @@ msgid "Partner Segmentation"
 msgstr "Företagssegmentering"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Varaktighet i minuter"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -676,9 +686,9 @@ msgid "The name of the segmentation."
 msgstr "The name of the segmentation."
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Sannolikhet (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -696,13 +706,7 @@ msgid "Statistics Dashboard"
 msgstr "Statistikinfopanel"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -715,12 +719,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Tillfälle"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -757,17 +755,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Affärsmöjlighetsnamn"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Sätt lag till"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -779,25 +766,21 @@ msgid "Exclusive"
 msgstr "Exclusive"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "Från %s: %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Registreringsår"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -820,21 +803,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -842,9 +810,9 @@ msgid "Requirements"
 msgstr "Krav"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Konvertera till affärsmöjlighet "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Postnummer"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -889,9 +857,9 @@ msgid "Mark Won"
 msgstr "Märk vinst"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Sannolikhet (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -916,7 +884,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Varning !"
@@ -926,23 +894,12 @@ msgstr "Varning !"
 msgid "Days to Open"
 msgstr "Dagar för att öppna"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Skapa företag"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Mobil"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -968,11 +925,6 @@ msgstr "Används för att beräkna antal öppna dagar"
 msgid "Meetings"
 msgstr "Möten"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Conditions on Case Fields"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -980,6 +932,19 @@ msgstr "Conditions on Case Fields"
 msgid "Next Action"
 msgstr "Nästa åtgärd"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Draft"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1048,14 +1013,6 @@ msgstr "Compute Segmentation"
 msgid "Lowest"
 msgstr "Lowest"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1065,9 +1022,9 @@ msgid "Creation Date"
 msgstr "Skapad datum"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1127,23 +1084,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Förväntad intäkt"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1152,8 +1101,19 @@ msgid "September"
 msgstr "september"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1187,21 +1147,15 @@ msgid "Opening Date"
 msgstr "Öppningsdatum"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Varaktighet i minuter"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Kanalnamn"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Fortsätt"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1231,6 +1185,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1240,14 +1200,6 @@ msgstr ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Skapa ett företag"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1269,17 +1221,12 @@ msgid "unknown"
 msgstr "okänd"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Företag till affärsmöjlighet"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1288,13 +1235,6 @@ msgstr "Företag till affärsmöjlighet"
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1341,6 +1281,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr "När e-post skickas hämtas avsändaradressen från säljlaget"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1352,7 +1299,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Sammanslagna affärsmöjligheter"
@@ -1396,13 +1343,9 @@ msgstr "Referenser"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Avbryt"
@@ -1423,14 +1366,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Vilande kundämnen/affärsmöjligheter"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Slå samman två affärsmöjigheter"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Att göra"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Samtal till företag"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1469,6 +1419,16 @@ msgstr "Öppna kundämnen/affärsmöjligheter"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Sektioner"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1518,6 +1478,12 @@ msgstr "Namn"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Avslutsdatum"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1554,17 +1520,6 @@ msgstr "Hög"
 msgid "Convert to prospect to business partner"
 msgstr "Konvertera affärsmöjlighet till företag"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1601,6 +1556,7 @@ msgstr "Förälderlag"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1609,11 +1565,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Nästa datum för åtgärd"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Pågående"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1627,11 +1578,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Postnummer"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1643,7 +1589,7 @@ msgid "Month of call"
 msgstr "Samtalets månad"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1696,11 +1642,6 @@ msgstr "Värde"
 msgid "Customer Name"
 msgstr "Kundnamn"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Samtal till affärsmöjlighet"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1721,11 +1662,6 @@ msgstr "Affärsmöjligheter per steg"
 msgid "Prospect is converting to business partner"
 msgstr "Kundämne konverteras till kund"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1859,12 +1795,6 @@ msgstr "Hänvisad från"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ är använd för att skilja kundämnen från affärsmöjligheter"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Är du säker på att du vill lägga upp ett företag utifrån detta samtal?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1895,16 +1825,9 @@ msgid "Sales Teams"
 msgstr "Säljlag"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Kundämne till kund"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1916,12 +1839,6 @@ msgstr "Lag"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Nya  kundämnen / affärsmöjligheter"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1933,12 +1850,6 @@ msgstr "Inte hållet"
 msgid "Probability"
 msgstr "Sannolikhet"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Vänligen välj mer en en affärsmöjlighet från listan"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1954,6 +1865,12 @@ msgstr "Månad"
 msgid "Leads"
 msgstr "Kundämnen"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1965,28 +1882,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Att göra"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2047,24 +1954,6 @@ msgstr "Väntande"
 msgid "Prospect Opportunity"
 msgstr "Söka affärsmöjligheter"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2113,17 +2002,15 @@ msgid "Mandatory Expression"
 msgstr "Mandatory Expression"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Skicka e-post"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2153,11 +2040,6 @@ msgstr "Affärsmöjlighetsanalys"
 msgid "Misc"
 msgstr "Övrigt"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Reguljära uttryck på ärendehistorik"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2185,11 +2067,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Ansvarig"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2201,21 +2078,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Registreringsår"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2284,7 +2162,6 @@ msgstr "Continue Process"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2366,8 +2243,13 @@ msgid "Company"
 msgstr "Företag"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Pågående"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2375,6 +2257,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Kunsämnen utan ansvarig"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2395,26 +2282,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Konvertera"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2459,6 +2326,11 @@ msgstr ""
 "deras telefonsamtal. Du kan gruppera eller filtrera på en mängd kriterier "
 "och borra i materialet genom att skapa fler grupper."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2490,6 +2362,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Bekräftad"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2522,6 +2399,24 @@ msgstr "Optional Expression"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2577,11 +2472,6 @@ msgstr "Skapa affärsmöjligheter från kundämnen"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Sätt kategori till"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2626,9 +2516,10 @@ msgid "Qualification"
 msgstr "Kvalificering"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Företagskontakt e-post"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2646,14 +2537,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Ett företag är redan definierat."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "augusti"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2750,17 +2643,10 @@ msgid "Logged Calls"
 msgstr "Loggade samtal"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Framgångssannolikhet"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2772,7 +2658,6 @@ msgstr "Ärenden per säljlag"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Möte"
 
@@ -2781,11 +2666,6 @@ msgstr "Möte"
 msgid "Category of Case"
 msgstr "Ärendekategori"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Möjligheter per kund"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2809,11 +2689,6 @@ msgstr "Gata 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Kontrollera att kunden inte redan finns."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2832,21 +2707,6 @@ msgstr "Användare"
 msgid "November"
 msgstr "november"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Förhandling"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2870,11 +2730,6 @@ msgstr "Kontrakt"
 msgid "Twitter Ads"
 msgstr "Twitterannonser"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Gemensamt med alla lag"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2886,14 +2741,9 @@ msgid "Planned Revenues"
 msgstr "Planerade intäkter"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefonsamtal till telefonsamtal"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Förv avslut"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2917,16 +2767,10 @@ msgid "Categorization"
 msgstr "Kategorisering"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Logga samtal"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Åtgärdsregler"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2950,7 +2794,6 @@ msgstr "Registreringsdatum"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2976,7 +2819,6 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3055,20 +2897,11 @@ msgstr "Återställd till att göra"
 msgid "Working Hours"
 msgstr "Arbetstimmar"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonsamtal"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Kund"
 
@@ -3090,7 +2923,7 @@ msgid "Lost"
 msgstr "Förlorade"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3138,17 +2971,14 @@ msgid "Phone calls by user and section"
 msgstr "Telefonsamtal per användate och sektion"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Förhandling"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Förv avslut"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefonsamtal till telefonsamtal"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3166,10 +2996,10 @@ msgid "Proposition"
 msgstr "Offert"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Avslutsdatum"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonsamtal"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3183,6 +3013,11 @@ msgstr "År"
 msgid "Newsletter"
 msgstr "nyhetsbrev"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3249,6 +3084,9 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "Meddelande"
 
+#~ msgid "Continue"
+#~ msgstr "Fortsätt"
+
 #~ msgid "Case Section"
 #~ msgstr "Ärende sektion"
 
@@ -3376,6 +3214,9 @@ msgstr ""
 #~ msgid "Partner Events"
 #~ msgstr "Partnerevenemang"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Conditions on Case Fields"
+
 #~ msgid "Deadline"
 #~ msgstr "Deadline"
 
@@ -3775,6 +3616,9 @@ msgstr ""
 #~ msgid "open"
 #~ msgstr "open"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Maximum Communication History"
+
 #~ msgid "All Canceled "
 #~ msgstr "All Canceled "
 
@@ -4093,9 +3937,6 @@ msgstr ""
 #~ msgid "Customer Meeting"
 #~ msgstr "Kundmöte"
 
-#~ msgid "Send Mail"
-#~ msgstr "Skicka e-post"
-
 #~ msgid "Uncertain"
 #~ msgstr "Osäker"
 
@@ -4227,6 +4068,9 @@ msgstr ""
 #~ msgid "Recurrent Rule"
 #~ msgstr "Återkommande regel"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Möjligheter per kund"
+
 #~ msgid "Opportunity Analysis"
 #~ msgstr "Prospektanalys"
 
@@ -4315,11 +4159,21 @@ msgstr ""
 #~ msgid "Todays's Phonecalls"
 #~ msgstr "Telefonsamtal gjorda idag"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Samtal till affärsmöjlighet"
+
 #~ msgid ""
 #~ "Create specific phone call categories to better define the type of calls "
 #~ "tracked in the system."
 #~ msgstr "Skapa samtalskategorier för att förbättra uppföljningen."
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Är du säker på att du vill lägga upp ett företag utifrån detta samtal?"
+
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Samtal till företag"
+
 #~ msgid "Phone calls made in last month"
 #~ msgstr "Telefonsamtal denna månad"
 
@@ -4376,6 +4230,15 @@ msgstr ""
 #~ msgid "The chosen company is not in the allowed companies for this user"
 #~ msgstr "Detta bolag är inte tillåtet för den här användaren"
 
+#~ msgid "Create Partner"
+#~ msgstr "Skapa företag"
+
+#~ msgid "Create a Partner"
+#~ msgstr "Skapa ett företag"
+
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Företag till affärsmöjlighet"
+
 #~ msgid "Mail to Partner"
 #~ msgstr "E-post till företaget"
 
@@ -4385,6 +4248,9 @@ msgstr ""
 #~ msgid "Meeting / Partner"
 #~ msgstr "Möte / företag"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Kundämne till kund"
+
 #~ msgid "Partner Contact"
 #~ msgstr "Företagskontakt"
 
@@ -4399,6 +4265,9 @@ msgstr ""
 #~ msgid "Opt-In"
 #~ msgstr "Deltar aktivt"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Konvertera till affärsmöjlighet "
+
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Konvertera till affärsmöjlighet"
 
@@ -4423,6 +4292,9 @@ msgstr ""
 #~ msgid "Communication & History"
 #~ msgstr "Kommunikation och historik"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Reguljära uttryck på ärendehistorik"
+
 #~ msgid "Recurrence termination"
 #~ msgstr "Upprepningen avbryts"
 
@@ -4449,6 +4321,9 @@ msgstr ""
 #~ "säljcykeln: prospektering, behovsanalys, lösningsförslag, offert, "
 #~ "förhandling, vinst/förlust."
 
+#~ msgid "Set Team to"
+#~ msgstr "Sätt lag till"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
@@ -4498,6 +4373,12 @@ msgstr ""
 #~ msgid "Let the event automatically repeat at that interval"
 #~ msgstr "Låt evenemanget återkomma automatiskt med det intervallet"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Affärsmöjlighetsnamn"
+
+#~ msgid "Merge two Opportunities"
+#~ msgstr "Slå samman två affärsmöjigheter"
+
 #, python-format
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "Ärendet '%s' är stängt."
@@ -4549,6 +4430,9 @@ msgstr ""
 #~ msgid "Invitation details"
 #~ msgstr "Inbjudningsdetaljer"
 
+#~ msgid "_Convert"
+#~ msgstr "_Konvertera"
+
 #~ msgid "The"
 #~ msgstr "Den"
 
@@ -4580,6 +4464,10 @@ msgstr ""
 #~ msgid "Total of Planned Revenue"
 #~ msgstr "Totala planerade intäkter"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Vänligen välj mer en en affärsmöjlighet från listan"
+
 #~ msgid "Repeat x times"
 #~ msgstr "Repetera x gånger"
 
@@ -4681,12 +4569,19 @@ msgstr ""
 #~ msgid "_Cancel"
 #~ msgstr "_Avbryt"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Ett företag är redan definierat."
+
 #~ msgid "Review Sales Stages"
 #~ msgstr "Granska säljcykeln"
 
 #~ msgid "Mail To"
 #~ msgstr "E-posta till"
 
+#~ msgid "Set Category to"
+#~ msgstr "Sätt kategori till"
+
 #~ msgid "Invitation Detail"
 #~ msgstr "Inbjudningsdetalj"
 
@@ -4696,6 +4591,9 @@ msgstr ""
 #~ msgid "Interest in Computer"
 #~ msgstr "Datorintresse"
 
+#~ msgid "Success Probability"
+#~ msgstr "Framgångssannolikhet"
+
 #, python-format
 #~ msgid "The case '%s' has been cancelled."
 #~ msgstr "Ärendet '%s' har avbrutits."
@@ -4719,6 +4617,9 @@ msgstr ""
 #~ msgid "Interest in Accessories"
 #~ msgstr "Intresse av tillbehör"
 
+#~ msgid "Action Rules"
+#~ msgstr "Åtgärdsregler"
+
 #~ msgid "Recurrency"
 #~ msgstr "Återkommandefrekvens"
 
@@ -4785,6 +4686,9 @@ msgstr ""
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Kontrollera att kunden inte redan finns."
+
 #, python-format
 #~ msgid "The stage of lead '%s' has been changed to '%s'."
 #~ msgstr "Status för kundämnet '%s' har ändrats till '%s'."
@@ -4893,6 +4797,9 @@ msgstr ""
 #~ msgid "Mon"
 #~ msgstr "mån"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Gemensamt med alla lag"
+
 #~ msgid "Wed"
 #~ msgstr "ons"
 
diff --git a/addons/crm/i18n/th.po b/addons/crm/i18n/th.po
index 79a258b9ca2..97f4d291320 100644
--- a/addons/crm/i18n/th.po
+++ b/addons/crm/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-16 16:48+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -44,19 +46,29 @@ msgid "Title"
 msgstr "คำนำหน้าชื่อ"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -65,11 +77,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,10 +84,10 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "ชื่อขั้นตอน"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "ชื่อกฎ"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "คำเตือน!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,9 +248,9 @@ msgid "Excluded Answers :"
 msgstr "คำตอบไม่รวม :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "หมวด"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "การวิเคราะห์ Lead"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "แคมเปญ"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr "ประเภท"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,22 +479,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "ชื่อขั้นตอน"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "การกำหนดค่า"
 
 #. module: crm
 #: view:crm.lead:0
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,8 +520,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -553,6 +558,11 @@ msgstr "สรุป"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr "รหัสของทีมขายต้องไม่ซ้ำกัน!"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,8 +681,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,8 +805,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -884,8 +852,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "คำเตือน !"
@@ -921,23 +889,12 @@ msgstr "คำเตือน !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,10 +1079,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1133,12 +1088,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,15 +1209,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1276,13 +1223,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1384,13 +1331,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1411,13 +1354,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1457,6 +1407,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "หมวด"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,15 +1808,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1898,12 +1822,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr "การวิเคราะห์โอกาส"
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,14 +2061,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2198,6 +2070,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2447,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2491,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,15 +2512,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "การกำหนดค่า"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2721,16 +2615,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2743,7 +2630,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2752,11 +2638,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2661,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2679,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2702,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2713,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2739,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2766,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2791,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2869,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3061,7 +2895,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2943,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,9 +2968,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3154,6 +2985,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/tlh.po b/addons/crm/i18n/tlh.po
index 6e2cc53dc17..e9ab095a3a0 100644
--- a/addons/crm/i18n/tlh.po
+++ b/addons/crm/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,8 +247,8 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,15 +432,21 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -464,21 +478,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -492,8 +497,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -514,8 +519,8 @@ msgid "Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -552,6 +557,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,8 +660,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -670,8 +680,8 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,8 +804,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -883,8 +851,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -920,23 +888,12 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr ""
 msgid "Lowest"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,10 +1078,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1132,12 +1087,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,8 +1139,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1188,12 +1148,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,15 +1208,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1275,13 +1222,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1383,13 +1330,9 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr ""
@@ -1410,13 +1353,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1456,6 +1406,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1500,6 +1460,12 @@ msgstr ""
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1536,17 +1502,6 @@ msgstr ""
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1583,6 +1538,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1591,11 +1547,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1609,11 +1560,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1625,7 +1571,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1678,11 +1624,6 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1703,11 +1644,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1841,11 +1777,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1876,15 +1807,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1897,12 +1821,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1914,12 +1832,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1935,6 +1847,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1946,28 +1864,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2028,24 +1936,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2094,17 +1984,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2134,11 +2022,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2166,11 +2049,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2182,14 +2060,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2197,6 +2069,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2263,7 +2142,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2345,8 +2223,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2354,6 +2237,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2374,26 +2262,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2435,6 +2303,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2466,6 +2339,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2498,6 +2376,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2550,11 +2446,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2599,8 +2490,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2619,14 +2511,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2720,16 +2614,9 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
 #. module: crm
@@ -2742,7 +2629,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2751,11 +2637,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2779,11 +2660,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2802,21 +2678,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2840,11 +2701,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2856,13 +2712,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2887,16 +2738,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2920,7 +2765,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2946,7 +2790,6 @@ msgid "Description"
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3025,20 +2868,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3060,7 +2894,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3108,16 +2942,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3136,9 +2967,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3153,6 +2984,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 7f271cf6a09..72d71b2ffc0 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-24 22:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:25+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Aday"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "Unvan"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "İşlem"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Fırsatları seç"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "Kapanmada gecikme"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Aşama Adı"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "CRM Fırsat Analizleri"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "Oluşturulma Tarihi"
 msgid "Rule Name"
 msgstr "Kural Adı"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "Başka bir çağrı planla"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "Çekildi"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "Durum"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "Hariç Tutulan Yanıtlar:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Bölümler"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "Adayların Analizi"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Kampanyalar"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Fırsatları seç"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "Durum"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -289,7 +292,7 @@ msgid "Prospect Partner"
 msgstr "Olası Paydaş"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "Konu Yok"
@@ -387,11 +390,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Bölümleme"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -415,7 +424,6 @@ msgstr ""
 "anlatır."
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -430,16 +438,22 @@ msgstr "Kategori"
 msgid "#Opportunities"
 msgstr "#Fırsatlar"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Paydaş İlgilisi Epostası"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -470,22 +484,13 @@ msgstr "Durum"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Fırsat oluştur"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Ağustos"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Aşama Adı"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Yapılandır"
 
 #. module: crm
 #: view:crm.lead:0
@@ -498,9 +503,9 @@ msgid "Mailings"
 msgstr "Postalama"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "Yapılacaklar"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -520,9 +525,9 @@ msgid "Planned Revenue"
 msgstr "Planlanan Gelir"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Beklenen Gelir"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -558,6 +563,11 @@ msgstr "Özet"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -568,11 +578,6 @@ msgstr "Durum Kategorisi"
 msgid "Partner Contact Name"
 msgstr "Paydaş İlgilisi Adı"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -595,6 +600,11 @@ msgstr "# Telefon görüşmeleri"
 msgid "The code of the sales team must be unique !"
 msgstr "Satış temsilcisinin kodu tek olmalı !"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -658,9 +668,9 @@ msgid "Partner Segmentation"
 msgstr "Paydaş Bölümlendirmesi"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Dakika olarak Süre"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -678,9 +688,9 @@ msgid "The name of the segmentation."
 msgstr "Bölümleme Adı"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Olasılık (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -698,13 +708,7 @@ msgid "Statistics Dashboard"
 msgstr "İstatistiksel Kontrol Paneli"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -717,12 +721,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Fırsat"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -759,17 +757,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Fırsat Adı"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Takımı ayarla"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -781,25 +768,21 @@ msgid "Exclusive"
 msgstr "Ayrıcalıklı"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "%s den: %s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "Oluşturulma Yılı"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -822,21 +805,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -844,9 +812,9 @@ msgid "Requirements"
 msgstr "Gereksinimler"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Fırsata dönüştür "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "PKod"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -891,9 +859,9 @@ msgid "Mark Won"
 msgstr "Kazanıldı İşaretle"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Olasılık (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -918,7 +886,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Uyarı !"
@@ -928,23 +896,12 @@ msgstr "Uyarı !"
 msgid "Days to Open"
 msgstr "Açılışa kadar Gün Sayısı"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "İş Ortağı Oluştur"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Cep"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -970,11 +927,6 @@ msgstr "Açık günleri hesaplamak için kullanılır"
 msgid "Meetings"
 msgstr "Toplantılar"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "Servis Talep Alanlarındaki Koşullar"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -982,6 +934,19 @@ msgstr "Servis Talep Alanlarındaki Koşullar"
 msgid "Next Action"
 msgstr "Sonraki Eylem"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Taslak"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1050,14 +1015,6 @@ msgstr "Bölimleme Hesabı"
 msgid "Lowest"
 msgstr "En düşük"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1067,9 +1024,9 @@ msgid "Creation Date"
 msgstr "Oluşturma Tarihi"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1129,23 +1086,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Beklenen Gelir"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1154,8 +1103,19 @@ msgid "September"
 msgstr "Eylül"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1188,21 +1148,15 @@ msgid "Opening Date"
 msgstr "Açılış Tarihi"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Dakika olarak Süre"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "Kanal Adı"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Devam et"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1233,6 +1187,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1242,14 +1202,6 @@ msgstr ""
 "Bu sekmeyi bölümleme kuralının bir parçası olarak kullanmak için burayı "
 "işaretleyin. Eğer işaretlenmezse, altındaki kriter yok sayılacaktır."
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "İş Ortağı Oluştur"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1271,17 +1223,12 @@ msgid "unknown"
 msgstr "Bilinmiyor"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Paydaşı Fırsata"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1290,13 +1237,6 @@ msgstr "Paydaşı Fırsata"
 msgid "Date"
 msgstr "Tarih"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1344,6 +1284,13 @@ msgid ""
 msgstr ""
 "E-posta gönderilirken, Öntanımlı e-posta adresi satış ekibinden alınır."
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1355,7 +1302,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "Birleştirilmiş Fırsatlar"
@@ -1399,13 +1346,9 @@ msgstr "Referanslar"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "İptal"
@@ -1426,14 +1369,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "Bekleyen durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "İki Fırsatı Birleştir"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "Yapılacaklar"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Paydaşa Telefon Çağrısı"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1472,6 +1422,16 @@ msgstr "Açık durumundaki Adaylar/Fırsatlar"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Bölümler"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1520,6 +1480,12 @@ msgstr "Adı"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Kapanış Tarihi"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1556,17 +1522,6 @@ msgstr "Yüksek"
 msgid "Convert to prospect to business partner"
 msgstr "Olasıyı iş ortağına dönüştür"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1603,6 +1558,7 @@ msgstr "Ana Takım"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1611,11 +1567,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "Bir sonraki İşlem Tarihi"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Çalışan"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1629,11 +1580,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "PKod"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1645,7 +1591,7 @@ msgid "Month of call"
 msgstr "Arama Ayı"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1698,11 +1644,6 @@ msgstr "Değer"
 msgid "Customer Name"
 msgstr "Müşteri Adı"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Fırsata Telefon Çağrısı"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1723,11 +1664,6 @@ msgstr "Aşamalara göre fırsatlar"
 msgid "Prospect is converting to business partner"
 msgstr "Olası Paydaşın iş ortağına dönüştürülüyor"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1861,13 +1797,6 @@ msgstr "Oneren"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tür, adaylar ve fırsatları ayırdetmek için kullanılır"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-"Bu telefon görüşmesini esas alarak bir iş ortağı oluşturmak istediğinize "
-"emin misiniz?"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1898,16 +1827,9 @@ msgid "Sales Teams"
 msgstr "Satış Takımları"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Adaydan Paydaşa"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Bölümleme"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1919,12 +1841,6 @@ msgstr "Takım"
 msgid "Leads/Opportunities which are in New state"
 msgstr "Yeni durumundaki Adaylar/Fırsatlar"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1936,12 +1852,6 @@ msgstr "Elde Değil"
 msgid "Probability"
 msgstr "Olasılık"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "Liste görünümünden lütfen birden çok fırsat seçin."
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1957,6 +1867,12 @@ msgstr "Ay"
 msgid "Leads"
 msgstr "Potansiyeller"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1968,28 +1884,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Yapılacaklar"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2050,24 +1956,6 @@ msgstr "Beklemede"
 msgid "Prospect Opportunity"
 msgstr "Beklenen Fırsat"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2116,17 +2004,15 @@ msgid "Mandatory Expression"
 msgstr "Zorunlu İfade"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "İletiyi Gönder"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2156,11 +2042,6 @@ msgstr "Fırsat Analizi"
 msgid "Misc"
 msgstr "Muhtelif"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Durum Geçmişinin Düzenli Anlatımı"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2188,11 +2069,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Sorumlu"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2204,21 +2080,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Max. İletişim Geçmişi"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "Oluşturulma Yılı"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2287,7 +2164,6 @@ msgstr "Devam Prosesi"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2369,8 +2245,13 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Çalışan"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2378,6 +2259,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "Atanmamış Adaylar"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2398,26 +2284,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Dönüştür"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2463,6 +2329,11 @@ msgstr ""
 "gruplandırabilir ya da süzebilirsiniz ve bu raporda daha çok grup ekleyerek "
 "bilgiyi derinleştirebilirsiniz."
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2494,6 +2365,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Onaylandı"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2526,6 +2402,24 @@ msgstr "Zorunlu Olmayan İfade"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2582,11 +2476,6 @@ msgstr "Adaylardan iş fırsatları oluşturma"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Kategoriyi şuna Ayarla"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2631,9 +2520,10 @@ msgid "Qualification"
 msgstr "Uygun"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "Paydaş İlgilisi Epostası"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2651,15 +2541,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "Bir paydaş zaten tanımlanmış"
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Ağustos"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Yapılandır"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2754,17 +2646,10 @@ msgid "Logged Calls"
 msgstr "Kayıtlı Aramalar"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Başarı Olasılığı"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Taslak"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2776,7 +2661,6 @@ msgstr "Satış Takımına göre Durumlar"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Toplantı"
 
@@ -2785,11 +2669,6 @@ msgstr "Toplantı"
 msgid "Category of Case"
 msgstr "Durum Kategorisi"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "Fırsat / Müşteri"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2813,11 +2692,6 @@ msgstr "Cadde 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Bu paydaşın halihazırda olmadığını doğrulamalızınız."
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2836,21 +2710,6 @@ msgstr "Kullanıcı"
 msgid "November"
 msgstr "Kasım"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Görüşme"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2874,11 +2733,6 @@ msgstr "Sözleşme"
 msgid "Twitter Ads"
 msgstr "Twitter Reklamları"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "Bütün Ekiplerde Ortak"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2890,14 +2744,9 @@ msgid "Planned Revenues"
 msgstr "Planlanan Gelir"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefonçağrısından Telefonçağrısına"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Bek. Kapanış"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2921,16 +2770,10 @@ msgid "Categorization"
 msgstr "Sınıflandırma"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "Çağrı Günlüğü"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Eylem Kuralları"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2954,7 +2797,6 @@ msgstr "Oluşturulma Tarihi"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2980,7 +2822,6 @@ msgid "Description"
 msgstr "Açıklama"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3059,20 +2900,11 @@ msgstr "Yapılacaklara Sıfırla"
 msgid "Working Hours"
 msgstr "Çalışma Saatleri"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Telefonçağrısı"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Müşteri"
 
@@ -3094,7 +2926,7 @@ msgid "Lost"
 msgstr "Kayıp"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3142,17 +2974,14 @@ msgid "Phone calls by user and section"
 msgstr "Kullanıcıya ve bölüme göre telefon çağrıları"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Görüşme"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Bek. Kapanış"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefonçağrısından Telefonçağrısına"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3170,10 +2999,10 @@ msgid "Proposition"
 msgstr "Önerme"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Kapanış Tarihi"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Telefonçağrısı"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3187,6 +3016,11 @@ msgstr "Yıl"
 msgid "Newsletter"
 msgstr "Habermektubu"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3391,6 +3225,9 @@ msgstr ""
 #~ msgid "Case Category Name"
 #~ msgstr "Servis Talep Kategori Adı"
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Servis Talep Alanlarındaki Koşullar"
+
 #~ msgid "Category of case"
 #~ msgstr "Servis Talep Grubu"
 
@@ -3439,6 +3276,9 @@ msgstr ""
 #~ msgid "General"
 #~ msgstr "Genel"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "Max. İletişim Geçmişi"
+
 #~ msgid "User Responsible"
 #~ msgstr "Sorumlu Kullanıcı"
 
@@ -3698,6 +3538,9 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "Detaylar"
 
+#~ msgid "Continue"
+#~ msgstr "Devam et"
+
 #~ msgid "By day"
 #~ msgstr "Güne göre"
 
@@ -3720,6 +3563,12 @@ msgstr ""
 #~ msgid "Add Note"
 #~ msgstr "Not Ekle"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "Fırsata dönüştür "
+
+#~ msgid "Create Partner"
+#~ msgstr "İş Ortağı Oluştur"
+
 #~ msgid "My Meetings"
 #~ msgstr "Toplantılarım"
 
@@ -3790,6 +3639,9 @@ msgstr ""
 #~ msgid "Fri"
 #~ msgstr "Cuma"
 
+#~ msgid "Create a Partner"
+#~ msgstr "İş Ortağı Oluştur"
+
 #~ msgid "Reminder"
 #~ msgstr "Hatırlatıcı"
 
@@ -3834,6 +3686,9 @@ msgstr ""
 #~ msgid "Saturday"
 #~ msgstr "Cumartesi"
 
+#~ msgid "_Convert"
+#~ msgstr "_Dönüştür"
+
 #~ msgid "Invitation details"
 #~ msgstr "Davet Detayları"
 
@@ -3877,6 +3732,11 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "x kere tekrarla"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr ""
+#~ "Bu telefon görüşmesini esas alarak bir iş ortağı oluşturmak istediğinize "
+#~ "emin misiniz?"
+
 #~ msgid "Reset to Unconfirmed"
 #~ msgstr "Onaylanmadı olarak yeniden ayarla"
 
@@ -3896,9 +3756,6 @@ msgstr ""
 #~ msgid "Customer Meeting"
 #~ msgstr "Müşteri Toplantısı"
 
-#~ msgid "Send Mail"
-#~ msgstr "İletiyi Gönder"
-
 #~ msgid "Uncertain"
 #~ msgstr "Belirsiz"
 
@@ -3970,6 +3827,9 @@ msgstr ""
 #~ msgid "Years"
 #~ msgstr "Yıllar"
 
+#~ msgid "Set Team to"
+#~ msgstr "Takımı ayarla"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been closed."
 #~ msgstr "'%s' fırsatı kapandı."
@@ -4007,9 +3867,15 @@ msgstr ""
 #~ msgid "Manages a Helpdesk service."
 #~ msgstr "Danışma Masası servisini yönetir."
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Fırsat Adı"
+
 #~ msgid "Exception Rule"
 #~ msgstr "İstisnai Kural"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "İki Fırsatı Birleştir"
+
 #~ msgid "Show as"
 #~ msgstr "Farklı Göster"
 
@@ -4073,6 +3939,9 @@ msgstr ""
 #~ msgid "E-Mail"
 #~ msgstr "E-Posta"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "Durum Geçmişinin Düzenli Anlatımı"
+
 #~ msgid "crm.lead"
 #~ msgstr "miy.aday"
 
@@ -4082,6 +3951,9 @@ msgstr ""
 #~ msgid "HTML formatting?"
 #~ msgstr "HTML formatı mı?"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "Paydaşı Fırsata"
+
 #~ msgid "Fix amout of times"
 #~ msgstr "Süre Miktarını Düzelt"
 
@@ -4104,6 +3976,9 @@ msgstr ""
 #~ msgid "Wed"
 #~ msgstr "Çrş"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "Fırsata Telefon Çağrısı"
+
 #~ msgid "Recurrency Option"
 #~ msgstr "Yineleme Seçeneği"
 
@@ -4150,6 +4025,9 @@ msgstr ""
 #~ "Bu özellik yinelenen takvim öğeleri için istisna tutulan tarih/saat "
 #~ "listesini belirtir."
 
+#~ msgid "Lead to Partner"
+#~ msgstr "Adaydan Paydaşa"
+
 #~ msgid "Internal Meeting"
 #~ msgstr "İç Toplantı"
 
@@ -4196,6 +4074,9 @@ msgstr ""
 #~ msgid "My Win/Lost Ratio for the Last Year"
 #~ msgstr "Geçen Yıl için Kazanım/Kayıp oranım"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "Paydaşa Telefon Çağrısı"
+
 #~ msgid "Reply To"
 #~ msgstr "Şuna Yanıt ver"
 
@@ -4282,6 +4163,9 @@ msgstr ""
 #~ msgid "CRM Application Configuration"
 #~ msgstr "MİY Uygulaması Yapılandırması"
 
+#~ msgid "Set Category to"
+#~ msgstr "Kategoriyi şuna Ayarla"
+
 #~ msgid "Thu"
 #~ msgstr "Perş"
 
@@ -4333,6 +4217,9 @@ msgstr ""
 #~ msgid "Attendees"
 #~ msgstr "Katılanlar"
 
+#~ msgid "Success Probability"
+#~ msgstr "Başarı Olasılığı"
+
 #~ msgid "CRM Lead Report"
 #~ msgstr "MİY Aday Raporu"
 
@@ -4375,6 +4262,9 @@ msgstr ""
 #~ msgid "_Add"
 #~ msgstr "_Ekle"
 
+#~ msgid "Action Rules"
+#~ msgstr "Eylem Kuralları"
+
 #~ msgid "Private"
 #~ msgstr "Özel"
 
@@ -4589,6 +4479,9 @@ msgstr ""
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "Bu paydaşın halihazırda olmadığını doğrulamalızınız."
+
 #, python-format
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "'%s' Durumu kapatılmıştır."
@@ -4775,6 +4668,9 @@ msgstr ""
 #~ msgid "Recurrence termination"
 #~ msgstr "Tekrarları sonlandırma"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "Fırsat / Müşteri"
+
 #~ msgid "Mail Gateway"
 #~ msgstr "Eposta Geçidi"
 
@@ -4853,6 +4749,9 @@ msgstr ""
 #~ msgid "CRM Dashboard"
 #~ msgstr "CRM Kontrol Paneli"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "Bütün Ekiplerde Ortak"
+
 #, python-format
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "'%s' Fırsatı kazanıldı."
@@ -4944,6 +4843,10 @@ msgstr ""
 #~ msgid "Leads/Opportunities created in current year"
 #~ msgstr "Geçerli yılda oluşturulan Adaylar/Fırsatlar"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "Liste görünümünden lütfen birden çok fırsat seçin."
+
 #~ msgid "Used to order stages."
 #~ msgstr "Aşamalrı sıralamak için kullanılır."
 
@@ -5045,6 +4948,10 @@ msgstr ""
 #~ msgid "Partner Contact"
 #~ msgstr "Paydaş İlgilisi"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "Bir paydaş zaten tanımlanmış"
+
 #~ msgid "Do not link to a partner"
 #~ msgstr "Bir paydaşa bağlama"
 
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index 03090de611e..680845714ea 100644
--- a/addons/crm/i18n/uk.po
+++ b/addons/crm/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:29+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr ""
 
@@ -43,19 +45,29 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Дія"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
@@ -64,11 +76,6 @@ msgstr ""
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,9 +83,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Назва правила"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Секції"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -385,11 +388,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Сегментація"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -411,7 +420,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -426,15 +434,21 @@ msgstr "Категорія"
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -466,21 +480,12 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -494,8 +499,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -516,8 +521,8 @@ msgid "Planned Revenue"
 msgstr "Запланований дохід"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
 msgstr ""
 
 #. module: crm
@@ -554,6 +559,11 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -564,11 +574,6 @@ msgstr "Категорія випадку"
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -591,6 +596,11 @@ msgstr ""
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -652,8 +662,8 @@ msgid "Partner Segmentation"
 msgstr "Сегментація партнерів"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -672,8 +682,8 @@ msgid "The name of the segmentation."
 msgstr "Назва сегментації"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
 msgstr ""
 
 #. module: crm
@@ -692,13 +702,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -711,12 +715,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -753,17 +751,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -775,25 +762,21 @@ msgid "Exclusive"
 msgstr "Ексклюзивний"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -816,21 +799,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -838,8 +806,8 @@ msgid "Requirements"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
 msgstr ""
 
 #. module: crm
@@ -885,8 +853,8 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
 msgstr ""
 
 #. module: crm
@@ -912,7 +880,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -922,23 +890,12 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -964,11 +921,6 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -976,6 +928,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Наступна дія"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Чорновик"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1044,14 +1009,6 @@ msgstr "Розрахувати сегментацію"
 msgid "Lowest"
 msgstr "Найнижчий"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1061,9 +1018,9 @@ msgid "Creation Date"
 msgstr "Дата створення"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1123,10 +1080,8 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
 msgstr ""
 
 #. module: crm
@@ -1134,12 +1089,6 @@ msgstr ""
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1148,8 +1097,19 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1181,8 +1141,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1190,12 +1150,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1222,6 +1176,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1229,14 +1189,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1258,15 +1210,10 @@ msgid "unknown"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1277,13 +1224,6 @@ msgstr ""
 msgid "Date"
 msgstr "Дата"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1330,6 +1270,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1341,7 +1288,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1385,13 +1332,9 @@ msgstr "Зв'язки"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Скасувати"
@@ -1412,13 +1355,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1458,6 +1408,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Секції"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1502,6 +1462,12 @@ msgstr "Назва"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1538,17 +1504,6 @@ msgstr "Високий"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1585,6 +1540,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1593,11 +1549,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Діючий"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1611,11 +1562,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1627,7 +1573,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1680,11 +1626,6 @@ msgstr "Значення"
 msgid "Customer Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1705,11 +1646,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1843,11 +1779,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1878,17 +1809,10 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Сегментація"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
@@ -1899,12 +1823,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1916,12 +1834,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1937,6 +1849,12 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1948,28 +1866,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2030,24 +1938,6 @@ msgstr "В очікуванні"
 msgid "Prospect Opportunity"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2096,17 +1986,15 @@ msgid "Mandatory Expression"
 msgstr "Обо'язковий вираз"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2136,11 +2024,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2168,11 +2051,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Відповідальний"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2184,14 +2062,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2199,6 +2071,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2265,7 +2144,6 @@ msgstr "Продовжити процес"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2347,8 +2225,13 @@ msgid "Company"
 msgstr ""
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Діючий"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2356,6 +2239,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2376,26 +2264,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2437,6 +2305,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2468,6 +2341,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2500,6 +2378,24 @@ msgstr "Додатковий вираз"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2552,11 +2448,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2601,8 +2492,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2621,14 +2513,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2722,18 +2616,11 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
 msgstr ""
 
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Чорновик"
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
@@ -2744,7 +2631,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr ""
 
@@ -2753,11 +2639,6 @@ msgstr ""
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2781,11 +2662,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2804,21 +2680,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2842,11 +2703,6 @@ msgstr ""
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2858,13 +2714,8 @@ msgid "Planned Revenues"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2889,16 +2740,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2922,7 +2767,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2948,7 +2792,6 @@ msgid "Description"
 msgstr "Опис"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3027,20 +2870,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -3062,7 +2896,7 @@ msgid "Lost"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3110,16 +2944,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3138,9 +2969,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3155,6 +2986,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
diff --git a/addons/crm/i18n/vi.po b/addons/crm/i18n/vi.po
index 6379727795e..7cfe1ab9d71 100644
--- a/addons/crm/i18n/vi.po
+++ b/addons/crm/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-04 18:43+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -30,11 +30,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "Đầu mối"
 
@@ -44,32 +46,37 @@ msgid "Title"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "Hành động"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "Chọn Các Cơ hội"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -77,9 +84,9 @@ msgid "Delay to close"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
 msgstr ""
 
 #. module: crm
@@ -95,11 +102,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -145,6 +147,12 @@ msgstr ""
 msgid "Rule Name"
 msgstr "Tên quy tắc"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -175,8 +183,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "Cảnh báo!"
@@ -203,7 +211,7 @@ msgid "Schedule Other Call"
 msgstr "Lên lịch cho cuộc gọi khác"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -215,8 +223,13 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -235,8 +248,8 @@ msgid "Excluded Answers :"
 msgstr "Các trả lời bị loại trừ"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
 msgstr ""
 
 #. module: crm
@@ -247,7 +260,7 @@ msgid "Leads Analysis"
 msgstr "Phân tích Đầu Mối"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -258,16 +271,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "Các chiến dịch"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "Chọn Các Cơ hội"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -288,7 +291,7 @@ msgid "Prospect Partner"
 msgstr "Đối tác Tiềm năng"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -384,11 +387,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -410,7 +419,6 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -425,15 +433,21 @@ msgstr "Phân loại"
 msgid "#Opportunities"
 msgstr "Số lượng Cơ hội"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
 msgstr ""
 
 #. module: crm
@@ -465,22 +479,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "Tạo Cơ hội"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Tháng Tám"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr ""
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "Cấu hình"
 
 #. module: crm
 #: view:crm.lead:0
@@ -493,8 +498,8 @@ msgid "Mailings"
 msgstr ""
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
 msgstr ""
 
 #. module: crm
@@ -515,9 +520,9 @@ msgid "Planned Revenue"
 msgstr "Kế hoạch doanh thu"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Doanh thu mong đợi"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -553,6 +558,11 @@ msgstr "Tóm tắt"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -563,11 +573,6 @@ msgstr ""
 msgid "Partner Contact Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -590,6 +595,11 @@ msgstr "Số cuộc gọi điện thoại"
 msgid "The code of the sales team must be unique !"
 msgstr ""
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -651,8 +661,8 @@ msgid "Partner Segmentation"
 msgstr ""
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: crm
@@ -671,9 +681,9 @@ msgid "The name of the segmentation."
 msgstr ""
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "Xác suất (%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -691,13 +701,7 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -710,12 +714,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "Cơ hội"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -752,17 +750,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Tên Cơ hội"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -774,25 +761,21 @@ msgid "Exclusive"
 msgstr "Độc quyền"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
 msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -815,21 +798,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -837,9 +805,9 @@ msgid "Requirements"
 msgstr "Yêu cầu"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr ""
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Mã bưu chính"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -884,9 +852,9 @@ msgid "Mark Won"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "Xác suất (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -911,7 +879,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -921,23 +889,12 @@ msgstr "Cảnh báo !"
 msgid "Days to Open"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "Tạo đối tác"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "Số di động"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -963,11 +920,6 @@ msgstr ""
 msgid "Meetings"
 msgstr "Các cuộc gặp"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -975,6 +927,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "Hành động kế tiếp"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "Nháp"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1043,14 +1008,6 @@ msgstr ""
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1060,9 +1017,9 @@ msgid "Creation Date"
 msgstr "Ngày tạo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1122,23 +1079,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Doanh thu mong đợi"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1147,8 +1096,19 @@ msgid "September"
 msgstr "Tháng Chín"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1180,8 +1140,8 @@ msgid "Opening Date"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
 msgstr ""
 
 #. module: crm
@@ -1189,12 +1149,6 @@ msgstr ""
 msgid "Channel Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Tiếp tục"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1221,6 +1175,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1228,14 +1188,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "Tạo một đối tác"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1257,15 +1209,10 @@ msgid "unknown"
 msgstr "chưa xác định"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: crm
@@ -1276,13 +1223,6 @@ msgstr ""
 msgid "Date"
 msgstr "Ngày"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1329,6 +1269,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1340,7 +1287,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1384,13 +1331,9 @@ msgstr "Các tham chiếu"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "Hủy bỏ"
@@ -1411,13 +1354,20 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
 msgstr ""
 
 #. module: crm
@@ -1457,6 +1407,16 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr "Tên"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr "Cao"
 msgid "Convert to prospect to business partner"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr ""
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "Đang thực hiện"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Mã bưu chính"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr "Giá trị"
 msgid "Customer Name"
 msgstr "Tên Khách hàng"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr ""
 msgid "Prospect is converting to business partner"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr ""
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,15 +1808,8 @@ msgid "Sales Teams"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
 msgstr ""
 
 #. module: crm
@@ -1898,12 +1822,6 @@ msgstr ""
 msgid "Leads/Opportunities which are in New state"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr "Tháng"
 msgid "Leads"
 msgstr "Các đầu mối"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "Việc cần làm"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr ""
 msgid "Prospect Opportunity"
 msgstr "Cơ hội Tiềm năng"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr ""
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "Gửi thư"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr "Phân tích Cơ hội"
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Chịu trách nhiệm"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,14 +2061,8 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
 msgstr ""
 
 #. module: crm
@@ -2198,6 +2070,13 @@ msgstr ""
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr "Công ty"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "Đang thực hiện"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Đã xác nhận"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2551,11 +2447,6 @@ msgstr ""
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2600,8 +2491,9 @@ msgid "Qualification"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
 msgstr ""
 
 #. module: crm
@@ -2620,15 +2512,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr ""
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Tháng Tám"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "Cấu hình"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2721,17 +2615,10 @@ msgid "Logged Calls"
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Xác suất thành công"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "Nháp"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2743,7 +2630,6 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "Cuộc họp"
 
@@ -2752,11 +2638,6 @@ msgstr "Cuộc họp"
 msgid "Category of Case"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2780,11 +2661,6 @@ msgstr ""
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2803,21 +2679,6 @@ msgstr "Người sử dụng"
 msgid "November"
 msgstr "Tháng Mười một"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "Đàm phán"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2841,11 +2702,6 @@ msgstr "Hợp đồng"
 msgid "Twitter Ads"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2857,13 +2713,8 @@ msgid "Planned Revenues"
 msgstr "Kế hoạch doanh thu"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: view:crm.lead:0
+msgid "Exp.Closing"
 msgstr ""
 
 #. module: crm
@@ -2888,16 +2739,10 @@ msgid "Categorization"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2921,7 +2766,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2947,7 +2791,6 @@ msgid "Description"
 msgstr "Mô tả"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3026,20 +2869,11 @@ msgstr ""
 msgid "Working Hours"
 msgstr "Giờ làm việc"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "Khách hàng"
 
@@ -3061,7 +2895,7 @@ msgid "Lost"
 msgstr "Thua"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3109,16 +2943,13 @@ msgid "Phone calls by user and section"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "Đàm phán"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
 msgstr ""
 
 #. module: crm
@@ -3137,9 +2968,9 @@ msgid "Proposition"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
 msgstr ""
 
 #. module: crm
@@ -3154,6 +2985,11 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3220,6 +3056,9 @@ msgstr ""
 #~ msgid "Supplier"
 #~ msgstr "Nhà cung cấp"
 
+#~ msgid "Create Partner"
+#~ msgstr "Tạo đối tác"
+
 #~ msgid "Deadline"
 #~ msgstr "Hạn chót"
 
@@ -3232,6 +3071,9 @@ msgstr ""
 #~ msgid "Reminder"
 #~ msgstr "Nhắc nhở"
 
+#~ msgid "Create a Partner"
+#~ msgstr "Tạo một đối tác"
+
 #~ msgid "Monday"
 #~ msgstr "Thứ hai"
 
@@ -3248,6 +3090,9 @@ msgstr ""
 #~ msgid "Default (0=None)"
 #~ msgstr "Mặc định (0=Không)"
 
+#~ msgid "Success Probability"
+#~ msgstr "Xác suất thành công"
+
 #~ msgid "From"
 #~ msgstr "Từ"
 
@@ -3356,6 +3201,9 @@ msgstr ""
 #~ msgid "Current Activity"
 #~ msgstr "Hoạt động hiện tại"
 
+#~ msgid "Continue"
+#~ msgstr "Tiếp tục"
+
 #~ msgid "By day"
 #~ msgstr "Theo ngày"
 
@@ -3404,6 +3252,9 @@ msgstr ""
 #~ msgid "crm.lead"
 #~ msgstr "crm.lead"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "Tên Cơ hội"
+
 #~ msgid "Opportunity Summary"
 #~ msgstr "Tóm tắt Cơ hội"
 
@@ -3514,9 +3365,6 @@ msgstr ""
 #~ msgid ">"
 #~ msgstr ">"
 
-#~ msgid "Send Mail"
-#~ msgstr "Gửi thư"
-
 #~ msgid "Claims"
 #~ msgstr "Các khiếu nại"
 
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index e23a0a304c0..e2649a42053 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 07:22+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
@@ -29,11 +29,13 @@ msgid ""
 msgstr "允许你设置接收邮件服务器，并从收到的邮件中创建线索"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "线索"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "标题"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "动作"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "选择商机"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr "管理集资"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr "转为商机"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "延迟关闭"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr "销售线索<b>已转换为商机</b>。"
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "阶段名称"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr "销售员"
 msgid "CRM Lead Analysis"
 msgstr "CRM 线索分析"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr "线索提醒：[[object.id ]]"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "报告日期"
 msgid "Rule Name"
 msgstr "规则名称"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "警告!"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "安排其它电话访问"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,9 +222,14 @@ msgid "Opt-Out"
 msgstr "退订"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
-msgstr "当空的时候在视图中隐藏"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "状态"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "排除的答案:"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "分类"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "线索分析"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "营销活动"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "选择商机"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "状态"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr "潜在业务伙伴"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "无主题"
@@ -391,11 +394,17 @@ msgstr "失去"
 msgid "Unread Messages"
 msgstr "未读信息"
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "细分"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr "链接到存在的客户"
 
@@ -417,7 +426,6 @@ msgid ""
 msgstr "这默认百分比描述业务在这阶段的平均的成功概率"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -432,16 +440,22 @@ msgstr "分类"
 msgid "#Opportunities"
 msgstr "#商机"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr "转换操作"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "合作伙伴邮箱"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -472,22 +486,13 @@ msgstr "状态"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "建立商机"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "阶段名称"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr "设置"
 
 #. module: crm
 #: view:crm.lead:0
@@ -500,9 +505,9 @@ msgid "Mailings"
 msgstr "邮件"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "待办事项"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -522,9 +527,9 @@ msgid "Planned Revenue"
 msgstr "计划收入"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr "CRM电话记录：标记为已读"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "预期收益"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -560,6 +565,11 @@ msgstr "摘要"
 msgid "Merge"
 msgstr "合并"
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -570,11 +580,6 @@ msgstr "业务分类"
 msgid "Partner Contact Name"
 msgstr "联系人姓名"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr "CRM电话记录：标记为未读"
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -597,6 +602,11 @@ msgstr "电话访问"
 msgid "The code of the sales team must be unique !"
 msgstr "销售团队编码必须唯一！"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr "联系人邮箱地址"
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -658,9 +668,9 @@ msgid "Partner Segmentation"
 msgstr "业务伙伴细分"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "持续时间（分钟）"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr "币种"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -678,9 +688,9 @@ msgid "The name of the segmentation."
 msgstr "细分的名称"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -698,13 +708,7 @@ msgid "Statistics Dashboard"
 msgstr "统计控制台"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "阶段已改为 <b>%s</b>"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -717,12 +721,6 @@ msgstr "阶段已改为 <b>%s</b>"
 msgid "Opportunity"
 msgstr "商机"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr "已为 <em>%s</em> 安排了一次会议。"
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -759,17 +757,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "商机名称"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "设定团队"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -781,25 +768,21 @@ msgid "Exclusive"
 msgstr "唯一的"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "发自: %s:%s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "报告年份"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr "转为商机"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr "或"
@@ -822,21 +805,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -844,9 +812,9 @@ msgid "Requirements"
 msgstr "必备条件"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "转换为商机 "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "邮政编码"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -891,9 +859,9 @@ msgid "Mark Won"
 msgstr "标记为已赢得"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "概率(%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -918,7 +886,7 @@ msgid "Send Email"
 msgstr "发送电子邮件"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -928,23 +896,12 @@ msgstr "警告！"
 msgid "Days to Open"
 msgstr "开启天数"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "创建业务伙伴"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "手机"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr "电话沟通已经被重置并设置为打开状态。"
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -970,11 +927,6 @@ msgstr "用于计算开放天数"
 msgid "Meetings"
 msgstr "会议"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr "业务个案条件字段"
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -982,6 +934,19 @@ msgstr "业务个案条件字段"
 msgid "Next Action"
 msgstr "下一动作"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1050,14 +1015,6 @@ msgstr "计算细分"
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1067,10 +1024,10 @@ msgid "Creation Date"
 msgstr "创建日期"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s<b>已创建</b>。"
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1129,23 +1086,15 @@ msgid "Delete"
 msgstr "删除"
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "预期收益"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr "商机<b>已丢失</b>。"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1154,9 +1103,20 @@ msgid "September"
 msgstr "9月"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
-msgstr "联系人邮箱地址"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1187,21 +1147,15 @@ msgid "Opening Date"
 msgstr "开启日期"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr "币种"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "持续时间（分钟）"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "渠道名称"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "继续"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1228,6 +1182,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1235,14 +1195,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr "勾选此项, 如果你要使用此标签上的细分规则. 如果不选下面的标准将被忽略"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "创建业务伙伴"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1264,16 +1216,11 @@ msgid "unknown"
 msgstr "未知"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "业务伙伴的商机"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr "是一个关注者"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1283,13 +1230,6 @@ msgstr "业务伙伴的商机"
 msgid "Date"
 msgstr "日期"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr "是一个关注者"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1336,6 +1276,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr "发送邮件的时候，默认的邮件地址来自销售团队。"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1347,7 +1294,7 @@ msgid "Lead Description"
 msgstr "销售线索描述"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "合并商机"
@@ -1391,13 +1338,9 @@ msgstr "参考"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "取消"
@@ -1418,14 +1361,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "线索/暂缓的商机"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "合并两个商机"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "待办事项"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "电话访问业务伙伴"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr "相关客户"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1464,6 +1414,16 @@ msgstr "线索/正在处理的商机"
 msgid "Users"
 msgstr "用户"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "分类"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1509,6 +1469,12 @@ msgstr "名称"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr "指派给我的线索和商机"
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1545,17 +1511,6 @@ msgstr "高"
 msgid "Convert to prospect to business partner"
 msgstr "把潜在客户转成业务伙伴"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr "<b>已赢得</b>商机。"
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr "指派给我或我的团队的电话沟通"
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1592,6 +1547,7 @@ msgstr "父团队"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr "不要链接到某个客户"
 
@@ -1600,11 +1556,6 @@ msgstr "不要链接到某个客户"
 msgid "Next Action Date"
 msgstr "下一动作日期"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "运行中"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1618,11 +1569,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr "指派商机给"
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "邮政编码"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1634,7 +1580,7 @@ msgid "Month of call"
 msgstr "通话月份"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1687,11 +1633,6 @@ msgstr "值"
 msgid "Customer Name"
 msgstr "客户名称"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "电话访问转换到商机"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1712,11 +1653,6 @@ msgstr "商机的阶段"
 msgid "Prospect is converting to business partner"
 msgstr "潜在客户转换为业务伙伴"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr "CRM 线索：标记为未读"
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1850,11 +1786,6 @@ msgstr "参考"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "类型用于区分销售线索和商机"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "你确定你基于这电话访问创建的业务伙伴？"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1885,16 +1816,9 @@ msgid "Sales Teams"
 msgstr "销售团队"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "线索转换为业务伙伴"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "细分"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1906,12 +1830,6 @@ msgstr "团队"
 msgid "Leads/Opportunities which are in New state"
 msgstr "线索/新建的商机"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr "<b>业务伙伴</b>%s已设置为<em>%s</em>."
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1923,12 +1841,6 @@ msgstr "不保留"
 msgid "Probability"
 msgstr "概率"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "请在列表中选择多个商机"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1944,6 +1856,12 @@ msgstr "月份"
 msgid "Leads"
 msgstr "线索"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1955,28 +1873,18 @@ msgstr "设计"
 msgid "Merge with existing opportunities"
 msgstr "与已存在的商机合并"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "待办"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2037,24 +1945,6 @@ msgstr "待处理"
 msgid "Prospect Opportunity"
 msgstr "探查商机"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2103,18 +1993,16 @@ msgid "Mandatory Expression"
 msgstr "强制的表达式1"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
-msgstr "创建新客户"
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr "发送邮件"
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
-msgstr "相关客户"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr "创建新客户"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2143,11 +2031,6 @@ msgstr "商机分析"
 msgid "Misc"
 msgstr "杂项"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "业务日志的规则表达式"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2175,11 +2058,6 @@ msgstr "呼叫完成"
 msgid "Responsible"
 msgstr "负责人"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr "提醒客户"
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2191,21 +2069,22 @@ msgid "Product"
 msgstr "产品"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr "电话沟通已创建并打开。"
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "最大的沟通日志"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "报告年份"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr "转换选项"
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2272,7 +2151,6 @@ msgstr "继续处理"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr "转换为商机"
 
@@ -2354,15 +2232,25 @@ msgid "Company"
 msgstr "公司"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
-msgstr "沟通记录的条件"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "运行中"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
 msgstr "未分配的线索"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2383,38 +2271,6 @@ msgstr "重置"
 msgid "After-Sale Services"
 msgstr "售后服务"
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-"[[object.partner_id and object.partner_id.name or '']]，您好：\n"
-"\n"
-"您下面的销售线索已经有 5 天没有打开了。 \n"
-"\n"
-"线索：[[object.id ]]\n"
-"描述：\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"\n"
-"谢谢！\n"
-"            "
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "转换(_C)"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2456,6 +2312,11 @@ msgid ""
 "the report."
 msgstr "在这报表中，你能分析你的销售团队在电话访问上的业绩。你能根据几个标准和向下钻取数据组织或过滤信息。它能在报表中加入更多的组。"
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2487,6 +2348,11 @@ msgstr "选择商机/线索"
 msgid "Confirmed"
 msgstr "已确认"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2519,6 +2385,24 @@ msgstr "可选表达式"
 msgid "Followers"
 msgstr "关注者"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2573,11 +2457,6 @@ msgstr "从线索创建商机"
 msgid "Email Campaign - Products"
 msgstr "电邮广告-产品"
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "设置分类为"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2622,9 +2501,10 @@ msgid "Qualification"
 msgstr "资格条件"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "合作伙伴邮箱"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr "转换操作"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2642,15 +2522,17 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "合作伙伴已创建."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "8月"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
-msgstr "设置"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2743,17 +2625,10 @@ msgid "Logged Calls"
 msgstr "通话日志"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "成功概率"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "草稿"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2765,7 +2640,6 @@ msgstr "该业务的销售团队"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "会议"
 
@@ -2774,11 +2648,6 @@ msgstr "会议"
 msgid "Category of Case"
 msgstr "业务分类"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "商机/客户"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2802,11 +2671,6 @@ msgstr "街道 2"
 msgid "Manage Helpdesk and Support"
 msgstr "管理帮助平台与客户支持"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "你可能要核实这个业务伙伴是否已不存在"
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2825,21 +2689,6 @@ msgstr "用户"
 msgid "November"
 msgstr "11月"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "谈判"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2863,11 +2712,6 @@ msgstr "合同"
 msgid "Twitter Ads"
 msgstr "Twitter地址"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "适用于所有团队"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2879,14 +2723,9 @@ msgid "Planned Revenues"
 msgstr "计划收入"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr "CRM 线索：标记为已读"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "电话访问到电话访问"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "结束中"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2910,16 +2749,10 @@ msgid "Categorization"
 msgstr "归类"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "记录通话日志"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "动作规则"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2943,7 +2776,6 @@ msgstr "发现日期"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2969,7 +2801,6 @@ msgid "Description"
 msgstr "说明"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3048,20 +2879,11 @@ msgstr "重置为计划呼叫"
 msgid "Working Hours"
 msgstr "工作时间"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "电话访问列表"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "客户"
 
@@ -3083,7 +2905,7 @@ msgid "Lost"
 msgstr "丢失"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr "已关闭或已取消的销售线索不能被转换为商机。"
@@ -3131,17 +2953,14 @@ msgid "Phone calls by user and section"
 msgstr "用户和业务分类的电话访问"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "谈判"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "结束中"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "电话访问到电话访问"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3159,10 +2978,10 @@ msgid "Proposition"
 msgstr "建议"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "结束日期"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "电话访问列表"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3176,6 +2995,11 @@ msgstr "年"
 msgid "Newsletter"
 msgstr "时事通信"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3401,6 +3225,9 @@ msgstr ""
 #~ msgid "New "
 #~ msgstr "新 "
 
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "业务个案条件字段"
+
 #~ msgid "Deadline"
 #~ msgstr "最后期限"
 
@@ -3560,9 +3387,15 @@ msgstr ""
 #~ msgid "Update The Proposed Menus To Be Created"
 #~ msgstr "更新创建的被提议的菜单"
 
+#~ msgid "Continue"
+#~ msgstr "继续"
+
 #~ msgid "Message"
 #~ msgstr "消息"
 
+#~ msgid "Create Partner"
+#~ msgstr "创建业务伙伴"
+
 #~ msgid "_Cancel"
 #~ msgstr "取消(_C)"
 
@@ -3768,9 +3601,6 @@ msgstr ""
 #~ "to the reminder email sent."
 #~ msgstr "勾选此项, 如果你想将业务个案的所有附属文档附在提醒电子邮件发送"
 
-#~ msgid "Send Mail"
-#~ msgstr "发送邮件"
-
 #~ msgid "Claims"
 #~ msgstr "索赔"
 
@@ -3793,6 +3623,9 @@ msgstr ""
 #~ msgid "Error!"
 #~ msgstr "错误!"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "商机名称"
+
 #~ msgid "E-Mail Reminders (includes the content of the case)"
 #~ msgstr "提醒电子邮件(含业务个案内容)"
 
@@ -3812,6 +3645,9 @@ msgstr ""
 #~ "在两个购买或者采购间的平均天数. 它主要用来检查一个业务伙伴没有采购或购买的最长时间. \r\n"
 #~ "如果很长那么我们假设他找了另一个供应商买到了好的货物对我们的满意度下降. 这个功能用在经常性的业务中."
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "你可能要核实这个业务伙伴是否已不存在"
+
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr "此动作需要业务伙伴的电子邮件地址!"
@@ -3819,6 +3655,9 @@ msgstr ""
 #~ msgid "Set section to"
 #~ msgstr "设置划分为"
 
+#~ msgid "Success Probability"
+#~ msgstr "成功概率"
+
 #~ msgid "Parent Section"
 #~ msgstr "上级划分"
 
@@ -3916,6 +3755,9 @@ msgstr ""
 #~ msgid "Supplier"
 #~ msgstr "供应商"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "转换为商机 "
+
 #, python-format
 #~ msgid "The opportunity '%s' has been closed."
 #~ msgstr "商机 '%s' 已关闭."
@@ -4006,6 +3848,9 @@ msgstr ""
 #~ msgid "Send New Email"
 #~ msgstr "发送新的电子邮件"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "业务日志的规则表达式"
+
 #~ msgid "E-Mail"
 #~ msgstr "电子邮件"
 
@@ -4083,6 +3928,9 @@ msgstr ""
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "同步日程"
 
+#~ msgid "Set Team to"
+#~ msgstr "设定团队"
+
 #, python-format
 #~ msgid "Can not add note!"
 #~ msgstr "添加备注不成功!"
@@ -4209,12 +4057,18 @@ msgstr ""
 #~ msgid "Fri"
 #~ msgstr "周五"
 
+#~ msgid "Create a Partner"
+#~ msgstr "创建业务伙伴"
+
 #~ msgid "End of recurrency"
 #~ msgstr "结束循环"
 
 #~ msgid "Monday"
 #~ msgstr "周一"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "业务伙伴的商机"
+
 #~ msgid "Frequency"
 #~ msgstr "频率"
 
@@ -4238,6 +4092,9 @@ msgstr ""
 #~ msgid "Fix amout of times"
 #~ msgstr "修改的时间"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "合并两个商机"
+
 #~ msgid "Current"
 #~ msgstr "当前的"
 
@@ -4272,6 +4129,9 @@ msgstr ""
 #~ "users, but also external parties, such as a customer."
 #~ msgstr "与会邀请你可以创建和管理会议邀请发送给你的同事、业务伙伴。你不仅能邀请系统的用户还可以邀请外部人士如客户。"
 
+#~ msgid "_Convert"
+#~ msgstr "转换(_C)"
+
 #~ msgid ""
 #~ "Sales team to which this case belongs to. Defines responsible user and e-"
 #~ "mail address for the mail gateway."
@@ -4328,6 +4188,9 @@ msgstr ""
 #~ msgid "Recurrent Meeting"
 #~ msgstr "循环性会议"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "电话访问转换到商机"
+
 #~ msgid "Select stages for this Sales Team"
 #~ msgstr "为销售团队选择阶段"
 
@@ -4365,6 +4228,12 @@ msgstr ""
 #~ "定义销售团队组织你不同的业务员或者销售部门成立一个独立的团队。每个团队工作在自己的商机‘销售单，如每个用户能设置默认的团队的客户偏好。商机和销售订单将根据"
 #~ "他的团队自动过滤。"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "你确定你基于这电话访问创建的业务伙伴？"
+
+#~ msgid "Lead to Partner"
+#~ msgstr "线索转换为业务伙伴"
+
 #~ msgid "Google Adwords 2"
 #~ msgstr "google 2"
 
@@ -4477,6 +4346,9 @@ msgstr ""
 #~ "当业务结束状态设为'完成'\n"
 #~ "如果业务需要审查状态设为'待定'"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "最大的沟通日志"
+
 #~ msgid "Are you sure you want to create a partner based on this lead ?"
 #~ msgstr "你确定要根据这条线索创建这业务伙伴？"
 
@@ -4509,6 +4381,9 @@ msgstr ""
 #~ msgid "Lead To Opportunity"
 #~ msgstr "线索转换为商机"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "电话访问业务伙伴"
+
 #~ msgid "Set New State To"
 #~ msgstr "设定新状态"
 
@@ -4785,6 +4660,9 @@ msgstr ""
 #~ msgid "_Add"
 #~ msgstr "添加"
 
+#~ msgid "Action Rules"
+#~ msgstr "动作规则"
+
 #~ msgid "Recurrency"
 #~ msgstr "循环"
 
@@ -4929,6 +4807,9 @@ msgstr ""
 #~ msgid "Mail Gateway"
 #~ msgstr "邮件网关"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "商机/客户"
+
 #~ msgid "Phonecalls during last 7 days"
 #~ msgstr "过去7天的通话记录"
 
@@ -4974,6 +4855,10 @@ msgstr ""
 #~ msgid "Todays' Leads"
 #~ msgstr "今天的线索"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "合作伙伴已创建."
+
 #, python-format
 #~ msgid "Closed/Cancelled Leads can not be converted into Opportunity"
 #~ msgstr "关闭或取消状态的线索不能转为商机"
@@ -5007,6 +4892,10 @@ msgstr ""
 #~ msgid "Schedule/Log a call"
 #~ msgstr "安排/记录一次沟通电话"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "请在列表中选择多个商机"
+
 #~ msgid "Used to order stages."
 #~ msgstr "用于对阶段排序"
 
@@ -5109,6 +4998,9 @@ msgstr ""
 #~ "这个工具可以让你迅速记录接到的电话。每次你接到的电话都会出现在客户的表单上用于记录你和业务伙伴的每次沟通。在沟通电话表单上，你可以安排另一次通话，或会面，"
 #~ "或新建一个商机。"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "适用于所有团队"
+
 #, python-format
 #~ msgid ""
 #~ "You can not escalate, you are already at the top level regarding your sales-"
@@ -5142,3 +5034,6 @@ msgstr ""
 
 #~ msgid "Opportunity by Categories"
 #~ msgstr "商机按分类分组"
+
+#~ msgid "Set Category to"
+#~ msgstr "设置分类为"
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index 6594035eaf7..0aa772bca9d 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-30 10:41+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,11 +29,13 @@ msgid ""
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:880
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
+#, python-format
 msgid "Lead"
 msgstr "潛在客戶"
 
@@ -43,32 +45,37 @@ msgid "Title"
 msgstr "標題"
 
 #. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
 #: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
 msgstr "動作"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid ""
-"Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr "選擇商機"
+
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
@@ -76,10 +83,10 @@ msgid "Delay to close"
 msgstr "延遲關閉"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "階段名稱"
 
 #. module: crm
 #: view:crm.lead:0
@@ -94,11 +101,6 @@ msgstr ""
 msgid "CRM Lead Analysis"
 msgstr "CRM 潛在客戶分析"
 
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -144,6 +146,12 @@ msgstr "報告日期"
 msgid "Rule Name"
 msgstr "規則名稱"
 
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.resource.type:0
 #: view:crm.lead:0
@@ -174,8 +182,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -202,7 +210,7 @@ msgid "Schedule Other Call"
 msgstr "安排其它電訪"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
@@ -214,8 +222,13 @@ msgid "Opt-Out"
 msgstr "不參加"
 
 #. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
 msgstr ""
 
 #. module: crm
@@ -234,9 +247,9 @@ msgid "Excluded Answers :"
 msgstr "已排除的答案 :"
 
 #. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "分類"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -246,7 +259,7 @@ msgid "Leads Analysis"
 msgstr "潛在客戶分析"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
@@ -257,16 +270,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr "行銷活動"
 
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr "選擇商機"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr "狀態"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,categ_ids:0
@@ -287,7 +290,7 @@ msgid "Prospect Partner"
 msgstr "潛在業務夥伴"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
 #, python-format
 msgid "No Subject"
 msgstr "無主題"
@@ -383,11 +386,17 @@ msgstr ""
 msgid "Unread Messages"
 msgstr ""
 
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentation"
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
 msgstr ""
 
@@ -409,7 +418,6 @@ msgid ""
 msgstr "此預設百分比描述業務在此階段的平均成功概率"
 
 #. module: crm
-#: field:base.action.rule,trg_categ_id:0
 #: view:crm.lead:0
 #: field:crm.opportunity2phonecall,categ_id:0
 #: field:crm.phonecall,categ_id:0
@@ -424,16 +432,22 @@ msgstr "分類"
 msgid "#Opportunities"
 msgstr "商機數"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
-msgstr ""
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "業務夥伴郵箱"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -464,22 +478,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
 msgid "Create Opportunity"
 msgstr "建立商機"
 
 #. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "階段名稱"
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -492,9 +497,9 @@ msgid "Mailings"
 msgstr "郵件"
 
 #. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
-msgstr "待辦事項"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -514,9 +519,9 @@ msgid "Planned Revenue"
 msgstr "計劃收入"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
-msgstr ""
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "預期收益"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -552,6 +557,11 @@ msgstr "摘要"
 msgid "Merge"
 msgstr ""
 
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
@@ -562,11 +572,6 @@ msgstr "業務分類"
 msgid "Partner Contact Name"
 msgstr "聯絡人姓名"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
 msgid ""
@@ -589,6 +594,11 @@ msgstr "電訪數"
 msgid "The code of the sales team must be unique !"
 msgstr "銷售團隊編碼必須唯一！"
 
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
@@ -650,9 +660,9 @@ msgid "Partner Segmentation"
 msgstr "業務夥伴細分"
 
 #. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "持續時間（分鐘）"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -670,9 +680,9 @@ msgid "The name of the segmentation."
 msgstr "細分的名稱"
 
 #. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -690,13 +700,7 @@ msgid "Statistics Dashboard"
 msgstr "統計控制台"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -709,12 +713,6 @@ msgstr ""
 msgid "Opportunity"
 msgstr "商機"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
@@ -751,17 +749,6 @@ msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
 
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "商機名稱"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "設定團隊"
-
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
@@ -773,25 +760,21 @@ msgid "Exclusive"
 msgstr "唯一的"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
 #, python-format
 msgid "From %s : %s"
 msgstr "發自: %s:%s"
 
 #. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
-msgstr "報告年份"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
 msgstr ""
@@ -814,21 +797,6 @@ msgid ""
 "stage to the selected sales teams."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid ""
-"Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
@@ -836,9 +804,9 @@ msgid "Requirements"
 msgstr "必備條件"
 
 #. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "轉換為商機 "
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "郵遞區號"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -883,9 +851,9 @@ msgid "Mark Won"
 msgstr "標記為成交"
 
 #. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
-msgstr "概率(%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -910,7 +878,7 @@ msgid "Send Email"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -920,23 +888,12 @@ msgstr "警告！"
 msgid "Days to Open"
 msgstr "開啟天數"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr "建立業務夥伴"
-
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
 msgstr "行動裝置"
 
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
@@ -962,11 +919,6 @@ msgstr "用於計算開放天數"
 msgid "Meetings"
 msgstr "會議"
 
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
@@ -974,6 +926,19 @@ msgstr ""
 msgid "Next Action"
 msgstr "下一動作"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1042,14 +1007,6 @@ msgstr "計算細分"
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid ""
-"Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,create_date:0
 #: view:crm.phonecall:0
@@ -1059,9 +1016,9 @@ msgid "Creation Date"
 msgstr "建立日期"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
 #, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
 
 #. module: crm
@@ -1121,23 +1078,15 @@ msgid "Delete"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "預期收益"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1146,8 +1095,19 @@ msgid "September"
 msgstr "9月"
 
 #. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: crm
@@ -1179,21 +1139,15 @@ msgid "Opening Date"
 msgstr "開啟日期"
 
 #. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
-msgstr ""
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "持續時間（分鐘）"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
 msgstr "管道名稱"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "繼續"
-
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
@@ -1220,6 +1174,12 @@ msgid ""
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
@@ -1227,14 +1187,6 @@ msgid ""
 "checked, the criteria beneath will be ignored"
 msgstr "勾選此項, 如果你要使用此標籤上的細分規則. 如果不選下面的條件將被忽略"
 
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
-msgstr "建立業務夥伴"
-
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
@@ -1256,17 +1208,12 @@ msgid "unknown"
 msgstr "未知"
 
 #. module: crm
-#: view:crm.case.section:0
-msgid ""
-"Followers of this salesteam follow automatically all opportunities related "
-"to this salesteam."
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "業務夥伴的商機"
-
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0
@@ -1275,13 +1222,6 @@ msgstr "業務夥伴的商機"
 msgid "Date"
 msgstr "日期"
 
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
@@ -1328,6 +1268,13 @@ msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr "發送郵件的時候，預設的郵件地址來自銷售團隊。"
 
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1339,7 +1286,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
 #, python-format
 msgid "Merged opportunities"
 msgstr "合併商機"
@@ -1383,13 +1330,9 @@ msgstr "參考"
 #: view:crm.lead:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
 #: view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
 #: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
 msgstr "取消"
@@ -1410,14 +1353,21 @@ msgid "Leads/Opportunities which are in pending state"
 msgstr "待處理狀態的潛在客戶/商機"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "合併兩個商機"
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr "待辦事項"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "電訪業務夥伴"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1456,6 +1406,16 @@ msgstr "開啟的潛在客戶/商機"
 msgid "Users"
 msgstr ""
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "分類"
+
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1501,6 +1461,12 @@ msgstr "名稱"
 msgid "Leads/Opportunities that are assigned to me"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
@@ -1537,17 +1503,6 @@ msgstr "高"
 msgid "Convert to prospect to business partner"
 msgstr "把潛在客戶轉成商業夥伴"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
@@ -1584,6 +1539,7 @@ msgstr "母團隊"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
 msgstr ""
 
@@ -1592,11 +1548,6 @@ msgstr ""
 msgid "Next Action Date"
 msgstr "下一動作日期"
 
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "運行中"
-
 #. module: crm
 #: help:crm.case.stage,state:0
 msgid ""
@@ -1610,11 +1561,6 @@ msgstr ""
 msgid "Assign opportunities to"
 msgstr ""
 
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "郵遞區號"
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
@@ -1626,7 +1572,7 @@ msgid "Month of call"
 msgstr "通話月份"
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
 msgstr ""
@@ -1679,11 +1625,6 @@ msgstr "值"
 msgid "Customer Name"
 msgstr "客戶名稱"
 
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "電訪轉成商機"
-
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
@@ -1704,11 +1645,6 @@ msgstr "商機的階段"
 msgid "Prospect is converting to business partner"
 msgstr "潛在客戶正轉成商業夥伴"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.channel:0
 #: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1842,11 +1778,6 @@ msgstr "參考"
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "類型用於區分潛在客戶和商機"
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "你確定你基於這電訪建立的業務夥伴？"
-
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
@@ -1877,16 +1808,9 @@ msgid "Sales Teams"
 msgstr "銷售團隊"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "潛在客戶轉成業務夥伴"
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1898,12 +1822,6 @@ msgstr "團隊"
 msgid "Leads/Opportunities which are in New state"
 msgstr "潛在客戶/新建的商機"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
@@ -1915,12 +1833,6 @@ msgstr "未撥"
 msgid "Probability"
 msgstr "概率"
 
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr "請在列表中選擇多個商機"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1936,6 +1848,12 @@ msgstr "月份"
 msgid "Leads"
 msgstr "潛在客戶"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
@@ -1947,28 +1865,18 @@ msgstr ""
 msgid "Merge with existing opportunities"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"              Click to create a new opportunity.\n"
-"            </p><p>\n"
-"              OpenERP helps you keep track of your sales pipeline to follow\n"
-"              up potential sales and better forecast your future revenues.\n"
-"            </p><p>\n"
-"              You will be able to plan meetings and phone calls from\n"
-"              opportunities, convert them into quotations, attach related\n"
-"              documents, track all discussions, and much more.\n"
-"            </p>\n"
-"          "
-msgstr ""
-
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
 msgstr "待辦"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
@@ -2029,24 +1937,6 @@ msgstr "待處理"
 msgid "Prospect Opportunity"
 msgstr "探查商機"
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create an unqualified lead. \n"
-"          </p><p>\n"
-"            Use leads if you need a qualification step before creating an\n"
-"            opportunity or a customer. It can be a business card you "
-"received,\n"
-"            a contact form filled in your website, or a file of unqualified\n"
-"            prospects you import, etc.\n"
-"          </p><p>\n"
-"            Once qualified, the lead can be converted into a business\n"
-"            opportunity and/or a new customer in your address book.\n"
-"          </p>\n"
-"        "
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
@@ -2095,17 +1985,15 @@ msgid "Mandatory Expression"
 msgstr "強制的表示式"
 
 #. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
 msgstr ""
 
 #. module: crm
@@ -2135,11 +2023,6 @@ msgstr "商機分析"
 msgid "Misc"
 msgstr "雜項"
 
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "案子歷史紀錄的正規表示式"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
@@ -2167,11 +2050,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "負責人"
 
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
@@ -2183,21 +2061,22 @@ msgid "Product"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "最大的溝通日誌"
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr "報告年份"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
 msgstr ""
 
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
@@ -2264,7 +2143,6 @@ msgstr "繼續處理"
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
 msgstr ""
 
@@ -2346,8 +2224,13 @@ msgid "Company"
 msgstr "公司"
 
 #. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "運行中"
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
 msgstr ""
 
 #. module: crm
@@ -2355,6 +2238,11 @@ msgstr ""
 msgid "Unassigned Leads"
 msgstr "未分配的潛在客戶"
 
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
@@ -2375,26 +2263,6 @@ msgstr ""
 msgid "After-Sale Services"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid ""
-"Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-"    [[object.description]]\n"
-"\n"
-"Thanks,\n"
-"            "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "轉換(_C)"
-
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
@@ -2436,6 +2304,11 @@ msgid ""
 "the report."
 msgstr "在這報表中，你能分析你的銷售團隊在電訪上的業績。你能在報表新增更多的群組以根據數個條件來分類或篩選資訊並深入分析資訊。"
 
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
@@ -2467,6 +2340,11 @@ msgstr ""
 msgid "Confirmed"
 msgstr "已確認"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
@@ -2499,6 +2377,24 @@ msgstr "選擇性的表示式"
 msgid "Followers"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
@@ -2553,11 +2449,6 @@ msgstr "從潛在客戶建立商機"
 msgid "Email Campaign - Products"
 msgstr ""
 
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "設置分類為"
-
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
 msgid ""
@@ -2602,9 +2493,10 @@ msgid "Qualification"
 msgstr "資格"
 
 #. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
-msgstr "業務夥伴郵箱"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2622,14 +2514,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
-msgstr "商業夥伴已建立."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "8月"
 
 #. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
 msgstr ""
 
 #. module: crm
@@ -2723,17 +2617,10 @@ msgid "Logged Calls"
 msgstr "通話日誌"
 
 #. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "成功概率"
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
-msgstr "草稿"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2745,7 +2632,6 @@ msgstr "該銷售團隊的業務"
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
 msgid "Meeting"
 msgstr "會議"
 
@@ -2754,11 +2640,6 @@ msgstr "會議"
 msgid "Category of Case"
 msgstr "業務分類"
 
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr "商機/客戶"
-
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
@@ -2782,11 +2663,6 @@ msgstr "街道 2"
 msgid "Manage Helpdesk and Support"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "你可能要確認這個業務夥伴是否已不存在"
-
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
@@ -2805,21 +2681,6 @@ msgstr "使用者"
 msgid "November"
 msgstr "11月"
 
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr "談判"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2843,11 +2704,6 @@ msgstr "合同"
 msgid "Twitter Ads"
 msgstr "Twitter地址"
 
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr "適用於所有團隊"
-
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
@@ -2859,14 +2715,9 @@ msgid "Planned Revenues"
 msgstr "計劃收入"
 
 #. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_read
-msgid "CRM Lead: Mark read"
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "電訪到電訪"
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "結束中"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2890,16 +2741,10 @@ msgid "Categorization"
 msgstr "歸類"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
 msgstr "記錄通話日誌"
 
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "動作規則"
-
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
@@ -2923,7 +2768,6 @@ msgstr "發現日期"
 
 #. module: crm
 #: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
 msgid "at"
 msgstr ""
 
@@ -2949,7 +2793,6 @@ msgid "Description"
 msgstr "說明"
 
 #. module: crm
-#: field:base.action.rule,trg_section_id:0
 #: field:crm.case.categ,section_id:0
 #: field:crm.case.resource.type,section_id:0
 #: view:crm.case.section:0
@@ -3028,20 +2871,11 @@ msgstr "重設為待辦"
 msgid "Working Hours"
 msgstr "工時"
 
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "電訪列表"
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
 msgid "Customer"
 msgstr "客戶"
 
@@ -3063,7 +2897,7 @@ msgid "Lost"
 msgstr "丟單"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
@@ -3111,17 +2945,14 @@ msgid "Phone calls by user and section"
 msgstr "按使用者及分類的電訪"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid ""
-"Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
-"<b>scheduled</b> on <em>%s</em>."
-msgstr ""
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr "談判"
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "結束中"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "電訪到電訪"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3139,10 +2970,10 @@ msgid "Proposition"
 msgstr "建議"
 
 #. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "結束日期"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "電訪列表"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3156,6 +2987,11 @@ msgstr "年"
 msgid "Newsletter"
 msgstr "電子報"
 
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
 msgid ""
@@ -3235,6 +3071,9 @@ msgstr ""
 #~ msgid "Days per Periode"
 #~ msgstr "期間日數"
 
+#~ msgid "Continue"
+#~ msgstr "繼續"
+
 #~ msgid "Calendar Synchronizing"
 #~ msgstr "同步行事曆"
 
@@ -3275,6 +3114,9 @@ msgstr ""
 #~ msgid "Fifth"
 #~ msgstr "第五"
 
+#~ msgid "_Convert"
+#~ msgstr "轉換(_C)"
+
 #~ msgid "Wizard"
 #~ msgstr "精靈"
 
@@ -3393,6 +3235,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "圖片"
 
+#~ msgid "Success Probability"
+#~ msgstr "成功概率"
+
 #~ msgid "Meeting Categories"
 #~ msgstr "會議分類"
 
@@ -3464,6 +3309,9 @@ msgstr ""
 #~ msgid "Current Activity"
 #~ msgstr "當前動態"
 
+#~ msgid "Action Rules"
+#~ msgstr "動作規則"
+
 #~ msgid "Monthly"
 #~ msgstr "月度"
 
@@ -3533,6 +3381,9 @@ msgstr ""
 #~ msgid "Delegate"
 #~ msgstr "委派"
 
+#~ msgid "Regular Expression on Case History"
+#~ msgstr "案子歷史紀錄的正規表示式"
+
 #, python-format
 #~ msgid "The lead '%s' has been opened."
 #~ msgstr "這潛在客戶'%s'已經開啟"
@@ -3543,6 +3394,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "週二"
 
+#~ msgid "Opportunity / Customer"
+#~ msgstr "商機/客戶"
+
 #~ msgid "Privacy"
 #~ msgstr "隱私"
 
@@ -3633,6 +3487,9 @@ msgstr ""
 #~ msgid "By day"
 #~ msgstr "按天"
 
+#~ msgid "Set Team to"
+#~ msgstr "設定團隊"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
@@ -3644,6 +3501,9 @@ msgstr ""
 #~ "calendar component."
 #~ msgstr "這屬性定義循環日程的日期/時間異常列表。"
 
+#~ msgid "Convert To Opportunity "
+#~ msgstr "轉換為商機 "
+
 #~ msgid "Recurrent Meeting"
 #~ msgstr "循環性會議"
 
@@ -3653,6 +3513,9 @@ msgstr ""
 #~ msgid "Phone calls made in current year"
 #~ msgstr "本年的電訪"
 
+#~ msgid "Create Partner"
+#~ msgstr "建立業務夥伴"
+
 #~ msgid "<"
 #~ msgstr "<"
 
@@ -3726,6 +3589,9 @@ msgstr ""
 #~ "tracked in the system."
 #~ msgstr "在系統中建立指定的電訪分類以方便定義電訪追蹤類型"
 
+#~ msgid "Opportunity Name"
+#~ msgstr "商機名稱"
+
 #~ msgid "Fri"
 #~ msgstr "週五"
 
@@ -3747,6 +3613,9 @@ msgstr ""
 #~ msgid "Schedule a Call"
 #~ msgstr "安排電訪"
 
+#~ msgid "Create a Partner"
+#~ msgstr "建立業務夥伴"
+
 #~ msgid ""
 #~ "The state is set to 'Todo', when a case is created.                          "
 #~ "        \n"
@@ -3768,6 +3637,9 @@ msgstr ""
 #~ msgid "The case '%s' has been closed."
 #~ msgstr "這業務'%s'已結束"
 
+#~ msgid "Partner To Opportunity"
+#~ msgstr "業務夥伴的商機"
+
 #~ msgid "Opportunities by Categories"
 #~ msgstr "商機分類"
 
@@ -3786,6 +3658,9 @@ msgstr ""
 #~ msgid "res.users"
 #~ msgstr "res.users"
 
+#~ msgid "Merge two Opportunities"
+#~ msgstr "合併兩個商機"
+
 #~ msgid "Exception Rule"
 #~ msgstr "例外規則"
 
@@ -3868,6 +3743,9 @@ msgstr ""
 #~ msgid "Opportunity by Categories"
 #~ msgstr "商機按分類分組"
 
+#~ msgid "Phonecall To Opportunity"
+#~ msgstr "電訪轉成商機"
+
 #~ msgid "Recurrency Option"
 #~ msgstr "循環選擇"
 
@@ -3914,6 +3792,9 @@ msgstr ""
 #~ msgid "Leads creating during last 7 days"
 #~ msgstr "前7天發現的潛在客戶"
 
+#~ msgid "Are you sure you want to create a partner based on this Phonecall ?"
+#~ msgstr "你確定你基於這電訪建立的業務夥伴？"
+
 #~ msgid ""
 #~ "Define a Sales Team to organize your different salesmen or sales departments "
 #~ "into separate teams. Each team will work in its own list of opportunities, "
@@ -3927,9 +3808,16 @@ msgstr ""
 #~ msgid "Repeat x times"
 #~ msgstr "重複 x 次"
 
+#~ msgid "Lead to Partner"
+#~ msgstr "潛在客戶轉成業務夥伴"
+
 #~ msgid "Pending Opportunities"
 #~ msgstr "待處理商機"
 
+#, python-format
+#~ msgid "Please select more than one opportunity from the list view."
+#~ msgstr "請在列表中選擇多個商機"
+
 #~ msgid ""
 #~ "Leads allow you to manage and keep track of all initial contacts with a "
 #~ "prospect or partner showing interest in your products or services. A lead is "
@@ -4022,6 +3910,9 @@ msgstr ""
 #~ msgid "My Open Opportunities"
 #~ msgstr "我開啟的商機"
 
+#~ msgid "Maximum Communication History"
+#~ msgstr "最大的溝通日誌"
+
 #~ msgid "Invite People"
 #~ msgstr "邀請他人"
 
@@ -4056,6 +3947,9 @@ msgstr ""
 #~ msgid "Leads/Opportunities created in current year"
 #~ msgstr "今年建立的潛在客戶/商機"
 
+#~ msgid "Phonecall to Partner"
+#~ msgstr "電訪業務夥伴"
+
 #~ msgid "Set New State To"
 #~ msgstr "設定新狀態為"
 
@@ -4182,6 +4076,9 @@ msgstr ""
 #~ msgid "CRM Dashboard"
 #~ msgstr "客戶關係管理控制台"
 
+#~ msgid "Set Category to"
+#~ msgstr "設置分類為"
+
 #~ msgid "Mail To"
 #~ msgstr "收信人"
 
@@ -4191,6 +4088,10 @@ msgstr ""
 #~ msgid "Review Sales Stages"
 #~ msgstr "檢查銷售階段"
 
+#, python-format
+#~ msgid "A partner is already defined."
+#~ msgstr "商業夥伴已建立."
+
 #~ msgid "Condition on Communication History"
 #~ msgstr "溝通日誌的條件"
 
@@ -4248,6 +4149,9 @@ msgstr ""
 #~ msgid "Closed/Cancelled Leads can not be converted into Opportunity"
 #~ msgstr "關閉或取消狀態的潛在客戶不能轉為商機"
 
+#~ msgid "You may have to verify that this partner does not exist already."
+#~ msgstr "你可能要確認這個業務夥伴是否已不存在"
+
 #, python-format
 #~ msgid "The case '%s' has been cancelled."
 #~ msgstr "這業務'%s'已取消"
@@ -4256,6 +4160,9 @@ msgstr ""
 #~ msgid "The opportunity '%s' has been been won."
 #~ msgstr "商機 '%s'  成交"
 
+#~ msgid "Common to All Teams"
+#~ msgstr "適用於所有團隊"
+
 #~ msgid "Need Consulting"
 #~ msgstr "需要諮詢"
 
diff --git a/addons/crm_claim/i18n/ar.po b/addons/crm_claim/i18n/ar.po
index 4939f72f891..806b8ac76b7 100644
--- a/addons/crm_claim/i18n/ar.po
+++ b/addons/crm_claim/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 13:17+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,14 +102,6 @@ msgstr "#شكوى"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"يوجد لمحة عامة لكل الشكاوي المقدمة في هذا النظام بترتيبهم بمعايير محددة."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -218,11 +210,6 @@ msgstr "متابعة"
 msgid "Preventive Action"
 msgstr "اجراء المنع"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "تخطي الموعد النهائي"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -311,10 +298,12 @@ msgid "Next Action Date"
 msgstr "تاريخ الحدث التالي"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"يوجد لمحة عامة لكل الشكاوي المقدمة في هذا النظام بترتيبهم بمعايير محددة."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -351,7 +340,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -608,12 +597,6 @@ msgstr "نوفمبر"
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -747,10 +730,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "تخطي الموعد النهائي"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -812,12 +794,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "عدد الرسائل"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/bg.po b/addons/crm_claim/i18n/bg.po
index 7d42d775065..bcf1f1c6a9d 100644
--- a/addons/crm_claim/i18n/bg.po
+++ b/addons/crm_claim/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-27 17:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "Следващо писмо в разговор"
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr "Ноември"
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,9 +726,8 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# Имейли"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/ca.po b/addons/crm_claim/i18n/ca.po
index eadc9f77411..e8638e816be 100644
--- a/addons/crm_claim/i18n/ca.po
+++ b/addons/crm_claim/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:42+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "Nº reclamació"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Obtingueu una visió global de totes les reclamacions processades en el "
-"sistema ordenant-les amb criteris específics."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Seguiment"
 msgid "Preventive Action"
 msgstr "Acció preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Data límit sobrepassada"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Data de la següent acció"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Obtingueu una visió global de totes les reclamacions processades en el "
+"sistema ordenant-les amb criteris específics."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "Novembre"
 msgid "Extended Filters..."
 msgstr "Filtres estesos..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Data límit sobrepassada"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -814,12 +796,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nº d'emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/da.po b/addons/crm_claim/i18n/da.po
index 6dcc476cab6..21a2c1eaa5f 100644
--- a/addons/crm_claim/i18n/da.po
+++ b/addons/crm_claim/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,9 +726,8 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po
index 1960125873d..3c652fab332 100644
--- a/addons/crm_claim/i18n/de.po
+++ b/addons/crm_claim/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 20:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
@@ -116,16 +116,6 @@ msgstr "Anzahl Reklamationen"
 msgid "Stage Name"
 msgstr "Bezeichnung Stufe"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Erhalten Sie einen Überblick über alle Reklamationen, indem Sie nach "
-"bestimmten Kriterien auswerten und damit die Effizienz bei der Bearbeitung "
-"von Vorgängen, aber auch die Häufigkeit von Reklamationen beurteilen können."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -236,11 +226,6 @@ msgstr "Vorgangsverfolgung"
 msgid "Preventive Action"
 msgstr "Aktion zur Prävention"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Überschrittene Frist"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -329,10 +314,14 @@ msgid "Next Action Date"
 msgstr "Datum nächste Aktion"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr "Reklamation wurde <b>erstellt</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+"Erhalten Sie einen Überblick über alle Reklamationen, indem Sie nach "
+"bestimmten Kriterien auswerten und damit die Effizienz bei der Bearbeitung "
+"von Vorgängen, aber auch die Häufigkeit von Reklamationen beurteilen können."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -369,7 +358,7 @@ msgid "Destination email for email gateway."
 msgstr "E-Mail Empfänger für Mailgateway"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr "Kein Betreff"
@@ -651,12 +640,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -792,10 +775,9 @@ msgid "Unassigned Claims"
 msgstr "Nicht zugeordnete Reklamationen"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr "Reklamation wurde <b> verworfen</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Überschrittene Frist"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -859,12 +841,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "E-Mails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stufe wurde geändert auf <b>%s</b>."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index 57abbe29526..b2f678de759 100644
--- a/addons/crm_claim/i18n/el.po
+++ b/addons/crm_claim/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 16:20+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "Παρακολούθηση"
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Περασμένη Προθεσμία"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "Επόμενη Ημερομηνία Ενέργειας"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr "Νοέμβριος"
 msgid "Extended Filters..."
 msgstr "Εκτεταμένα Φίλτρα..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,10 +726,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Περασμένη Προθεσμία"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index a2659fdf33e..4f40c561314 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:37+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -114,15 +114,6 @@ msgstr "Nº reclamación"
 msgid "Stage Name"
 msgstr "Nombre de etapa"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Obtenga una visión global de todas las reclamaciones procesadas en el "
-"sistema ordenándolas con criterios específicos."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -233,11 +224,6 @@ msgstr "Seguimiento"
 msgid "Preventive Action"
 msgstr "Acción preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Fecha límite excedida"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -326,10 +312,13 @@ msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr "La reclamación ha sido <b>creada</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+"Obtenga una visión global de todas las reclamaciones procesadas en el "
+"sistema ordenándolas con criterios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -366,7 +355,7 @@ msgid "Destination email for email gateway."
 msgstr "Email del destinatario para la pasarela de correo"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr "Sin Asunto"
@@ -641,12 +630,6 @@ msgstr "Noviembre"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -782,10 +765,9 @@ msgid "Unassigned Claims"
 msgstr "Reclamaciones no asignadas"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr "La reclamación ha sido <b>rechazada</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -848,12 +830,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nº de emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa cambiada a  <b>%s</b>."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/es_CR.po b/addons/crm_claim/i18n/es_CR.po
index 51e9e550b9f..6dc3c6efb8d 100644
--- a/addons/crm_claim/i18n/es_CR.po
+++ b/addons/crm_claim/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 19:37+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: crm_claim
@@ -103,15 +103,6 @@ msgstr "Nº reclamación"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Obtenga una visión global de todas las reclamaciones procesadas en el "
-"sistema ordenándolas con criterios específicos."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -220,11 +211,6 @@ msgstr "Seguimiento"
 msgid "Preventive Action"
 msgstr "Acción preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Fecha límite excedida"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -313,10 +299,13 @@ msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Obtenga una visión global de todas las reclamaciones procesadas en el "
+"sistema ordenándolas con criterios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -353,7 +342,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -610,12 +599,6 @@ msgstr "Noviembre"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -749,10 +732,9 @@ msgid "Unassigned Claims"
 msgstr "Reclamos no asignados"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -815,12 +797,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nº de emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/es_EC.po b/addons/crm_claim/i18n/es_EC.po
index 1f1006d1a57..dcdf1b8e9b6 100644
--- a/addons/crm_claim/i18n/es_EC.po
+++ b/addons/crm_claim/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-31 20:23+0000\n"
 "Last-Translator: Jose Luis <Unknown>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "# Reclamo"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr "Acción Preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Fecha límite excedida"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "Fecha próxima acción"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,10 +726,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/es_PY.po b/addons/crm_claim/i18n/es_PY.po
index 26330072687..4e1cb028afc 100644
--- a/addons/crm_claim/i18n/es_PY.po
+++ b/addons/crm_claim/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-18 13:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "Nº reclamación"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Obtenga una visión global de todas las reclamaciones procesadas en el "
-"sistema ordenándolas con criterios específicos."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Seguimiento"
 msgid "Preventive Action"
 msgstr "Acción preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Fecha límite excedida"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Fecha  de la próxima acción"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Obtenga una visión global de todas las reclamaciones procesadas en el "
+"sistema ordenándolas con criterios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "Noviembre"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -814,12 +796,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nº de emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/fi.po b/addons/crm_claim/i18n/fi.po
index 24da8b26900..925e6b751c9 100644
--- a/addons/crm_claim/i18n/fi.po
+++ b/addons/crm_claim/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 13:49+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "Reklamaation numero"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Näytä yleisnäkymä kaikista järjestelmässä käsitellyistä reklamaatioista "
-"järjestelemällä ne tiettyjen kriteerien mukaan."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Seuranta"
 msgid "Preventive Action"
 msgstr "Ennaltaehkäisevä toimenpide"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Ylitetty aikaraja"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Seuraava toiminnon päivä"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Näytä yleisnäkymä kaikista järjestelmässä käsitellyistä reklamaatioista "
+"järjestelemällä ne tiettyjen kriteerien mukaan."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "Marraskuu"
 msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr "Reklamaatiot joilla ei hoitajaa"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Ylitetty aikaraja"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -808,12 +790,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Sähköpostien määrä"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index cdd0e3741cd..e14f47db7cf 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:49+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
@@ -102,15 +102,6 @@ msgstr "Nb. de réclamation"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Présente une vue générale des réclamations traités par le système en les "
-"classant selon des critères particuliers."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Suivi"
 msgid "Preventive Action"
 msgstr "Action préventive"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Échéance dépassée"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Date de la Prochaine action"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Présente une vue générale des réclamations traités par le système en les "
+"classant selon des critères particuliers."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -608,12 +597,6 @@ msgstr "novembre"
 msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaires et courriels"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -747,10 +730,9 @@ msgid "Unassigned Claims"
 msgstr "Réclamations non-assignées"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Échéance dépassée"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -813,12 +795,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nb. de courriels"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/gl.po b/addons/crm_claim/i18n/gl.po
index 6c5ba7b6806..d1dda6712be 100644
--- a/addons/crm_claim/i18n/gl.po
+++ b/addons/crm_claim/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-07 07:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "Nº reclamación"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Obteña unha visión global de tódalas reclamacións procesadas no sistema "
-"ordenándoas con criterios específicos."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Seguimento"
 msgid "Preventive Action"
 msgstr "Acción preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Data límite excedida"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Fecha da próxima acción"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Obteña unha visión global de tódalas reclamacións procesadas no sistema "
+"ordenándoas con criterios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "Novembro"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Data límite excedida"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -814,12 +796,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nº de emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/gu.po b/addons/crm_claim/i18n/gu.po
index 8aabd31dad0..bbb846d3733 100644
--- a/addons/crm_claim/i18n/gu.po
+++ b/addons/crm_claim/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-20 11:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "ને અનુસરો"
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "આગળ ની ક્રિયા તારીખ"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr "નવેમ્બર"
 msgid "Extended Filters..."
 msgstr "વિસ્તૃત ગાળકો ..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,9 +726,8 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/hr.po b/addons/crm_claim/i18n/hr.po
index ab1b4cec726..0da0b1377e3 100644
--- a/addons/crm_claim/i18n/hr.po
+++ b/addons/crm_claim/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-28 21:37+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#Zahtjeva"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "Praćenje"
 msgid "Preventive Action"
 msgstr "Preventivna akcija"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Prekoračen rok"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "Datum slijedeće akcije"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -606,12 +595,6 @@ msgstr "Studeni"
 msgid "Extended Filters..."
 msgstr "Prošireni filteri..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -745,10 +728,9 @@ msgid "Unassigned Claims"
 msgstr "Neraspoređeni prigovori"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Prekoračen rok"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -809,12 +791,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "#E-mail-ova"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/hu.po b/addons/crm_claim/i18n/hu.po
index 84a6df67e82..543e481e9bc 100644
--- a/addons/crm_claim/i18n/hu.po
+++ b/addons/crm_claim/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 19:57+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -101,13 +101,6 @@ msgstr "Követelések száma"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -216,11 +209,6 @@ msgstr "Nyomon követés"
 msgid "Preventive Action"
 msgstr "Preventív művelet"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -309,9 +297,10 @@ msgid "Next Action Date"
 msgstr "Következő művelet időpontja"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -349,7 +338,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -603,12 +592,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -742,9 +725,8 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -802,12 +784,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "E-mailek száma"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index 27a1ca170d6..3a2fb6475fe 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:17+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
@@ -102,15 +102,6 @@ msgstr "# Reclami"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Per avere una visione generale di tutti i reclami processati nel sistema "
-"ordinando gli stesso per specifici criteri"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Follow Up"
 msgid "Preventive Action"
 msgstr "Azione preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Scadenza superata"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Data prossima azione"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Per avere una visione generale di tutti i reclami processati nel sistema "
+"ordinando gli stesso per specifici criteri"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -606,12 +595,6 @@ msgstr "Novembre"
 msgid "Extended Filters..."
 msgstr "Filtri estesi..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -745,10 +728,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Scadenza superata"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -805,12 +787,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# Email"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index 96614185d7b..14f65fe72ce 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-07 21:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "苦情の数"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr "全てのクレームを指定した基準で分類して一覧を表示する。"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "追求する"
 msgid "Preventive Action"
 msgstr "予防措置"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "締切日を経過"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,10 +298,11 @@ msgid "Next Action Date"
 msgstr "次のアクションの日付"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr ""
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "全てのクレームを指定した基準で分類して一覧を表示する。"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr "11月"
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,10 +726,9 @@ msgid "Unassigned Claims"
 msgstr "未割当てのクレーム"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "締切日を経過"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Eメールの数"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/lt.po b/addons/crm_claim/i18n/lt.po
index 677f35d6080..308f5e0a3c1 100644
--- a/addons/crm_claim/i18n/lt.po
+++ b/addons/crm_claim/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-07 19:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "Kito veiksmo data"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,9 +726,8 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/mn.po b/addons/crm_claim/i18n/mn.po
index d527cc4d048..a7aad9042a5 100644
--- a/addons/crm_claim/i18n/mn.po
+++ b/addons/crm_claim/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-17 12:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#Гомдол"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr "Урьдчилан сануулах үйлдэл"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "Дараагий үйлдлийн огноо"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,9 +726,8 @@ msgid "Unassigned Claims"
 msgstr "Тодорхойгүй гомдолууд"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/nb.po b/addons/crm_claim/i18n/nb.po
index 3915640fbb9..4c84efa1367 100644
--- a/addons/crm_claim/i18n/nb.po
+++ b/addons/crm_claim/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-20 12:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#Krav"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "Følg opp."
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Passert frist"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr "Neste aksjonsdato"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -606,12 +595,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Utvidet Filtere ..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -745,10 +728,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Passert frist"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -805,12 +787,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# E-poster"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 5035278e42a..0a427316389 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 13:01+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -115,15 +115,6 @@ msgstr "# Klacht"
 msgid "Stage Name"
 msgstr "Naam fase"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Krijg een algemeen overzicht van alle klachten in het systeem door ze "
-"volgens specifieke criteria te sorteren."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -235,11 +226,6 @@ msgstr "Opvolging"
 msgid "Preventive Action"
 msgstr "Preventieve actie"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Overschreden einddatum"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -328,10 +314,13 @@ msgid "Next Action Date"
 msgstr "Volgende actie datum"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr "Klacht is <b>aangemaakt</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+"Krijg een algemeen overzicht van alle klachten in het systeem door ze "
+"volgens specifieke criteria te sorteren."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -368,7 +357,7 @@ msgid "Destination email for email gateway."
 msgstr "bestemming e-mail voor de e-mail gateway"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -525,7 +514,7 @@ msgstr "Afwijzen"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "Partners Claim"
-msgstr "Relatie claim"
+msgstr "Klachten"
 
 #. module: crm_claim
 #: view:crm.claim.stage:0
@@ -649,12 +638,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -790,10 +773,9 @@ msgid "Unassigned Claims"
 msgstr "Niet toegewezen klachten"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr "Klacht is <b>afgewezen</>"
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Overschreden einddatum"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -855,12 +837,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# Emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Fase veranderd in <b>%s</b>."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/pl.po b/addons/crm_claim/i18n/pl.po
index 23fffb8b675..be91c860791 100644
--- a/addons/crm_claim/i18n/pl.po
+++ b/addons/crm_claim/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 19:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -114,13 +114,6 @@ msgstr "#Serwis"
 msgid "Stage Name"
 msgstr "Nazwa etapu"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr "Ogólny widok wykonanych serwisów  posortowanych wg kryteriów."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -232,11 +225,6 @@ msgstr "Postępowanie"
 msgid "Preventive Action"
 msgstr "Akcja prewencyjna"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Przekroczony termin"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -325,10 +313,11 @@ msgid "Next Action Date"
 msgstr "Data następnej akcji"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr "Serwis został <b>utworzony</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "Ogólny widok wykonanych serwisów  posortowanych wg kryteriów."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -365,7 +354,7 @@ msgid "Destination email for email gateway."
 msgstr "Mail docelowy dla bramy pocztowej"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr "Brak tematu"
@@ -639,12 +628,6 @@ msgstr "Listopad"
 msgid "Extended Filters..."
 msgstr "Rozszerzone filtry..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -780,10 +763,9 @@ msgid "Unassigned Claims"
 msgstr "Nieprzydzielone serwisy"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr "Serwis został <b>odrzucony</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Przekroczony termin"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -844,12 +826,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# wiadomości"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etap zmieniony na <b>%s</b>."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/pt.po b/addons/crm_claim/i18n/pt.po
index 4a92bfa5fe8..71b70bcaf2a 100644
--- a/addons/crm_claim/i18n/pt.po
+++ b/addons/crm_claim/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-11 23:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "#Pedido"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Tenha uma visão geral de todas as reivindicações tratadas no sistema, "
-"classificando-as com critérios específicos."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Seguimento"
 msgid "Preventive Action"
 msgstr "Ação preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Prazo ultrapassado"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Próxima data de ação"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Tenha uma visão geral de todas as reivindicações tratadas no sistema, "
+"classificando-as com critérios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "Novembro"
 msgid "Extended Filters..."
 msgstr "Filtros Avançados..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr "Reclamações não atribuídas"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Prazo ultrapassado"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -813,12 +795,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# Emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index a1ae4f43caf..e2cffe80283 100644
--- a/addons/crm_claim/i18n/pt_BR.po
+++ b/addons/crm_claim/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 02:19+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -116,15 +116,6 @@ msgstr "Nº da Solicitação"
 msgid "Stage Name"
 msgstr "Nome do Estágio"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Tenha uma visão geral de todas as solicitações processadas no sistema "
-"classificando-as com critérios específicos."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -236,11 +227,6 @@ msgstr "Lembrete"
 msgid "Preventive Action"
 msgstr "Ação Preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Prazo Ultrapassado"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -329,10 +315,13 @@ msgid "Next Action Date"
 msgstr "Data da Próxima Ação"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr "A solicitação foi <b>criada</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+"Tenha uma visão geral de todas as solicitações processadas no sistema "
+"classificando-as com critérios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -369,7 +358,7 @@ msgid "Destination email for email gateway."
 msgstr "Email de destino para o servidor de email."
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -647,12 +636,6 @@ msgstr "Novembro"
 msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -788,10 +771,9 @@ msgid "Unassigned Claims"
 msgstr "Solicitações em aberto"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr "A solicitação foi <b>recusada</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -854,12 +836,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "Nº de Emails"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Estágio alterado para <b>%s</b>."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/ro.po b/addons/crm_claim/i18n/ro.po
index da872d2febe..f58804e6fd4 100644
--- a/addons/crm_claim/i18n/ro.po
+++ b/addons/crm_claim/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-29 06:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "# Solicitare"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Aveti o vedere de ansamblu asupra tuturor solicitarilor procesate in sistem "
-"sortandu-le dupa criterii specifice."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Urmare"
 msgid "Preventive Action"
 msgstr "Actiune preventiva"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Termen limita depasit"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Data actiunii urmatoare"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Aveti o vedere de ansamblu asupra tuturor solicitarilor procesate in sistem "
+"sortandu-le dupa criterii specifice."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "Noiembrie"
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr "Solicitari neatribuite"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Termen limita depasit"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -814,12 +796,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# Email-uri"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index 393a310f5bc..c3d233fb03b 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-24 05:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "# претензий"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Иметь общее представление о всех претензиях обработанных в системе при "
-"помощи их сортировки по определенным критериям."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "К исполнению"
 msgid "Preventive Action"
 msgstr "Предупредительное действие"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Просрочено"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Дата следующего действия"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Иметь общее представление о всех претензиях обработанных в системе при "
+"помощи их сортировки по определенным критериям."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -608,12 +597,6 @@ msgstr "Ноябрь"
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -747,10 +730,9 @@ msgid "Unassigned Claims"
 msgstr "Не назначенные претензии"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Просрочено"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -812,12 +794,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# эл. писем"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/sq.po b/addons/crm_claim/i18n/sq.po
index 682ce850cf0..e3f96e80146 100644
--- a/addons/crm_claim/i18n/sq.po
+++ b/addons/crm_claim/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,9 +726,8 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -803,12 +785,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/sr.po b/addons/crm_claim/i18n/sr.po
index 1adf5f72503..1b6974970ba 100644
--- a/addons/crm_claim/i18n/sr.po
+++ b/addons/crm_claim/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-03 08:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#Zahtev"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr "Preventivna Akcija"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "prekoracen Krajnji Rok"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -606,12 +595,6 @@ msgstr "Novembar"
 msgid "Extended Filters..."
 msgstr "Prošireni Filteri ..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -745,10 +728,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "prekoracen Krajnji Rok"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -805,12 +787,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/sr@latin.po b/addons/crm_claim/i18n/sr@latin.po
index 22b240792cc..c67ae37340e 100644
--- a/addons/crm_claim/i18n/sr@latin.po
+++ b/addons/crm_claim/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-24 13:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#Zahtev"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr ""
 msgid "Preventive Action"
 msgstr "Preventivna Akcija"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "prekoracen Krajnji Rok"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,9 +298,10 @@ msgid "Next Action Date"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -606,12 +595,6 @@ msgstr "Novembar"
 msgid "Extended Filters..."
 msgstr "Prošireni Filteri ..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -745,10 +728,9 @@ msgid "Unassigned Claims"
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "prekoracen Krajnji Rok"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -805,12 +787,6 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index 2821015305f..58cfcc3247b 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 06:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "#Reklamationer"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Skapa en allmän översikt med alla reklamationer genom att sortera dem på "
-"specifika kriteria."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Följ upp"
 msgid "Preventive Action"
 msgstr "Förebyggande åtgärd"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Passerad tidsfrist"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Nästa datum för åtgärd"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Skapa en allmän översikt med alla reklamationer genom att sortera dem på "
+"specifika kriteria."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -609,12 +598,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Utökade filter..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -748,10 +731,9 @@ msgid "Unassigned Claims"
 msgstr "Reklamationer utan handläggare"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Passerad tidsfrist"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -813,12 +795,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "# e-postmeddelanden"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/tr.po b/addons/crm_claim/i18n/tr.po
index 4f85ac056b0..c227437dc8c 100644
--- a/addons/crm_claim/i18n/tr.po
+++ b/addons/crm_claim/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-24 22:26+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,15 +102,6 @@ msgstr "Şikayet Sayısı"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr ""
-"Sistemde oluşturulmuş tüm şikayetlere belirli kritere göre sıralayarak göz "
-"at."
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -219,11 +210,6 @@ msgstr "Takip et"
 msgid "Preventive Action"
 msgstr "Önlem/ Tedbir Eylemi"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Teslim Tarihi Geçen"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -312,10 +298,13 @@ msgid "Next Action Date"
 msgstr "Bir sonraki İşlem Tarihi"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
+"Sistemde oluşturulmuş tüm şikayetlere belirli kritere göre sıralayarak göz "
+"at."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -352,7 +341,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -608,12 +597,6 @@ msgstr "Kasım"
 msgid "Extended Filters..."
 msgstr "Genişletilmiş Filtreler..."
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -747,10 +730,9 @@ msgid "Unassigned Claims"
 msgstr "İşleme konmamış Şikayetler"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Teslim Tarihi Geçen"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -812,12 +794,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "E-postaların sayısı"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
index d2bde961580..0acb7590629 100644
--- a/addons/crm_claim/i18n/zh_CN.po
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 13:47+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#索赔"
 msgid "Stage Name"
 msgstr "阶段名称"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr "为系统内所有的索赔处理指定一个排序标准"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "跟进"
 msgid "Preventive Action"
 msgstr "预防措施的动作"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "超过截止日期"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,10 +298,11 @@ msgid "Next Action Date"
 msgstr "下一动作日期"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr ""
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "为系统内所有的索赔处理指定一个排序标准"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr "无主题"
@@ -604,12 +593,6 @@ msgstr "11月"
 msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,10 +726,9 @@ msgid "Unassigned Claims"
 msgstr "未分配的抱怨"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超过截止日期"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -805,12 +787,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "电子邮件"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
index c08ade0e7ad..8d80d052ded 100644
--- a/addons/crm_claim/i18n/zh_TW.po
+++ b/addons/crm_claim/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 03:01+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp. MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -102,13 +102,6 @@ msgstr "#索賠"
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid ""
-"Have a general overview of all claims processed in the system by sorting "
-"them with specific criteria."
-msgstr "為系統內所有的索賠處理指定一個排序標準"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
@@ -217,11 +210,6 @@ msgstr "跟進"
 msgid "Preventive Action"
 msgstr "預防措施的動作"
 
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "超過截止日期"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
@@ -310,10 +298,11 @@ msgid "Next Action Date"
 msgstr "下一動作日期"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
-msgstr ""
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "為系統內所有的索賠處理指定一個排序標準"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -350,7 +339,7 @@ msgid "Destination email for email gateway."
 msgstr ""
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -604,12 +593,6 @@ msgstr "11月"
 msgid "Extended Filters..."
 msgstr "增加篩選條件"
 
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
@@ -743,10 +726,9 @@ msgid "Unassigned Claims"
 msgstr "未分配的抱怨"
 
 #. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
-msgstr ""
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -805,12 +787,6 @@ msgstr ""
 msgid "# Emails"
 msgstr "電子郵件"
 
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
diff --git a/addons/crm_helpdesk/i18n/ar.po b/addons/crm_helpdesk/i18n/ar.po
index a0d3a008aad..a5b27a44a58 100644
--- a/addons/crm_helpdesk/i18n/ar.po
+++ b/addons/crm_helpdesk/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-17 03:11+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "تأخير الإغلاق"
 msgid "# of Cases"
 msgstr "الحالات"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "بدون موضوع"
@@ -487,12 +481,6 @@ msgstr "مرشحات مفصلة..."
 msgid "Helpdesk Requests"
 msgstr "طلبات مكتب المساعدة"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/bg.po b/addons/crm_helpdesk/i18n/bg.po
index 7bf720b2833..eec945a31de 100644
--- a/addons/crm_helpdesk/i18n/bg.po
+++ b/addons/crm_helpdesk/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-27 17:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr "Разширени филтри"
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/ca.po b/addons/crm_helpdesk/i18n/ca.po
index 54326cc0236..3f78b8c70ea 100644
--- a/addons/crm_helpdesk/i18n/ca.po
+++ b/addons/crm_helpdesk/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-03 15:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Retard per tancar"
 msgid "# of Cases"
 msgstr "# de casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -487,12 +481,6 @@ msgstr "Filtres estesos..."
 msgid "Helpdesk Requests"
 msgstr "Sol·licituds Helpdesk"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/da.po b/addons/crm_helpdesk/i18n/da.po
index 533a271584f..a668601cf7b 100644
--- a/addons/crm_helpdesk/i18n/da.po
+++ b/addons/crm_helpdesk/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index 605e9e9bf20..cd18d0353ab 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 16:16+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -26,12 +26,6 @@ msgstr "Zeit bis zur Beendigung"
 msgid "# of Cases"
 msgstr "Fälle"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr "Anfrage wurde <b>erstellt</b>."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -275,7 +269,7 @@ msgid "Month of helpdesk requests"
 msgstr "Monat der Helpdesk Anfrage"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Kein Betreff"
@@ -507,12 +501,6 @@ msgstr "Erweiterter Filter..."
 msgid "Helpdesk Requests"
 msgstr "Kundendienst Anfragen"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/el.po b/addons/crm_helpdesk/i18n/el.po
index bae96b6daa3..7745eaee688 100644
--- a/addons/crm_helpdesk/i18n/el.po
+++ b/addons/crm_helpdesk/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 16:38+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Καθυστέρηση για Κλείσιμο"
 msgid "# of Cases"
 msgstr "# από Υποθέσεις"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr "Εκτεταμένα Φίλτρα..."
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index dffa16dc8e1..5b343470dca 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:33+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Retraso para cerrar"
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr "El caso ha sido <b>creado</b>."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -275,7 +269,7 @@ msgid "Month of helpdesk requests"
 msgstr "Mes de las peticiones"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Sin asunto"
@@ -504,12 +498,6 @@ msgstr "Filtros extendidos..."
 msgid "Helpdesk Requests"
 msgstr "Solicitudes Helpdesk"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/es_CR.po b/addons/crm_helpdesk/i18n/es_CR.po
index 5d05c064e45..f6ba3e59f78 100644
--- a/addons/crm_helpdesk/i18n/es_CR.po
+++ b/addons/crm_helpdesk/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:01+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: crm_helpdesk
@@ -28,12 +28,6 @@ msgstr "Retraso para cerrar"
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -274,7 +268,7 @@ msgid "Month of helpdesk requests"
 msgstr "Mes de las solicitudes de ayuda"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Sin Asunto"
@@ -488,12 +482,6 @@ msgstr "Filtros extendidos..."
 msgid "Helpdesk Requests"
 msgstr "Solicitudes Helpdesk"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/es_PY.po b/addons/crm_helpdesk/i18n/es_PY.po
index f9b129379e1..a06e38f17f3 100644
--- a/addons/crm_helpdesk/i18n/es_PY.po
+++ b/addons/crm_helpdesk/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-19 13:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Tiempo restante para el cierre"
 msgid "# of Cases"
 msgstr "Nº de casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -487,12 +481,6 @@ msgstr "Filtros extendidos..."
 msgid "Helpdesk Requests"
 msgstr "Solicitudes Helpdesk"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/fi.po b/addons/crm_helpdesk/i18n/fi.po
index c40097fae88..aa1bfaef7d2 100644
--- a/addons/crm_helpdesk/i18n/fi.po
+++ b/addons/crm_helpdesk/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-28 09:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Sulkemisen viive"
 msgid "# of Cases"
 msgstr "Tapausten määrä"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Helpdesk pyyntöjen kuukausi"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Ei otsikkoa"
@@ -487,12 +481,6 @@ msgstr "Laajennetut Suotimet..."
 msgid "Helpdesk Requests"
 msgstr "Helpdesk pyynnöt"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/fr.po b/addons/crm_helpdesk/i18n/fr.po
index 4a33e1e56ca..b20a1ba0d79 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 16:44+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -26,12 +26,6 @@ msgstr "Délai pour clôturer"
 msgid "# of Cases"
 msgstr "Nb. de cas"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -272,7 +266,7 @@ msgid "Month of helpdesk requests"
 msgstr "Mois de la demande de support"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Pas de sujet"
@@ -485,12 +479,6 @@ msgstr "Filtres étendus..."
 msgid "Helpdesk Requests"
 msgstr "Requêtes d'assistance"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/gl.po b/addons/crm_helpdesk/i18n/gl.po
index 45eeb9129bc..596dfa80502 100644
--- a/addons/crm_helpdesk/i18n/gl.po
+++ b/addons/crm_helpdesk/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-08 16:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Atraso para pechar"
 msgid "# of Cases"
 msgstr "Nº de casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -487,12 +481,6 @@ msgstr "Filtros extendidos..."
 msgid "Helpdesk Requests"
 msgstr "Solicitudes Helpdesk"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/gu.po b/addons/crm_helpdesk/i18n/gu.po
index 21184f35860..43455268dbb 100644
--- a/addons/crm_helpdesk/i18n/gu.po
+++ b/addons/crm_helpdesk/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 11:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/hr.po b/addons/crm_helpdesk/i18n/hr.po
index 3f00560eaaf..67fdb07e394 100644
--- a/addons/crm_helpdesk/i18n/hr.po
+++ b/addons/crm_helpdesk/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 16:38+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr "# Slučaja"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr "Prošireni filtri..."
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/hu.po b/addons/crm_helpdesk/i18n/hu.po
index 508a0a05a3a..b0621a97a61 100644
--- a/addons/crm_helpdesk/i18n/hu.po
+++ b/addons/crm_helpdesk/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 20:24+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -26,12 +26,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr "Esetek száma"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -272,7 +266,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -483,12 +477,6 @@ msgstr "Kiterjesztett szűrők…"
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/it.po b/addons/crm_helpdesk/i18n/it.po
index 1de7ba97623..bed76bf0948 100644
--- a/addons/crm_helpdesk/i18n/it.po
+++ b/addons/crm_helpdesk/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 12:07+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Ritardo chiusura"
 msgid "# of Cases"
 msgstr "# di casi"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr "Il caso è stato <b>creato</b>"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Mede delle richeiste help desk"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Nessun Oggetto"
@@ -487,12 +481,6 @@ msgstr "Filtri estesi..."
 msgid "Helpdesk Requests"
 msgstr "Richieste Helpdesk"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 2e1c9881748..93b94a00192 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-06 04:05+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "締めを延期する"
 msgid "# of Cases"
 msgstr "事例の数"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "ヘルプデスク問合せの月"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "件名なし"
@@ -484,12 +478,6 @@ msgstr "拡張フィルタ…"
 msgid "Helpdesk Requests"
 msgstr "ヘルプデスクへの問合せ"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/lt.po b/addons/crm_helpdesk/i18n/lt.po
index 72474a619d1..da0a672542d 100644
--- a/addons/crm_helpdesk/i18n/lt.po
+++ b/addons/crm_helpdesk/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-09 08:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/lv.po b/addons/crm_helpdesk/i18n/lv.po
index 19e3d5d98e1..8437fa6b4dd 100644
--- a/addons/crm_helpdesk/i18n/lv.po
+++ b/addons/crm_helpdesk/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-20 08:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/mn.po b/addons/crm_helpdesk/i18n/mn.po
index bf6b1cb243c..441bdfa4ded 100644
--- a/addons/crm_helpdesk/i18n/mn.po
+++ b/addons/crm_helpdesk/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-18 18:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Хаахыг Азнах"
 msgid "# of Cases"
 msgstr "Хэрэгийн #"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/nb.po b/addons/crm_helpdesk/i18n/nb.po
index 36c8acbf6a8..793250df7d0 100644
--- a/addons/crm_helpdesk/i18n/nb.po
+++ b/addons/crm_helpdesk/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-21 11:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Forsinkelse til lukking"
 msgid "# of Cases"
 msgstr "# av Saker."
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Måned for kundestøtte forespørsler."
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Ingen emne."
@@ -486,12 +480,6 @@ msgstr "Utvidet Filtere ..."
 msgid "Helpdesk Requests"
 msgstr "Kundestøtte forespørsel."
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index 11f50c56049..90f13d9b8eb 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:57+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Vertraging tot sluiten"
 msgid "# of Cases"
 msgstr "# Aanvragen"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr "Dossier is <b>aangemaakt</b>"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -276,7 +270,7 @@ msgid "Month of helpdesk requests"
 msgstr "Maand van helpdesk verzoek"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -507,12 +501,6 @@ msgstr "Uitgebreide filters..."
 msgid "Helpdesk Requests"
 msgstr "Helpdesk aanvragen"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/pl.po b/addons/crm_helpdesk/i18n/pl.po
index da03da6b58e..8747108dc07 100644
--- a/addons/crm_helpdesk/i18n/pl.po
+++ b/addons/crm_helpdesk/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 19:43+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Opóźnienie do zamknięcia"
 msgid "# of Cases"
 msgstr "# spraw"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr "Sprawa została <b>utworzona</b>."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -276,7 +270,7 @@ msgid "Month of helpdesk requests"
 msgstr "Miesiąc zgłoszenia Helpesku"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Bez tematu"
@@ -505,12 +499,6 @@ msgstr "Rozszerzone filtry..."
 msgid "Helpdesk Requests"
 msgstr "Zgłoszenia helpdesku"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/pt.po b/addons/crm_helpdesk/i18n/pt.po
index 62462f75673..18f56e86d1e 100644
--- a/addons/crm_helpdesk/i18n/pt.po
+++ b/addons/crm_helpdesk/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 16:58+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Demora para fechar"
 msgid "# of Cases"
 msgstr "# dos Casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Mês dos pedidos de suporte"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -487,12 +481,6 @@ msgstr "Filtros avançados"
 msgid "Helpdesk Requests"
 msgstr "Pedidos de apoio ao cliente"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index 5dc31b16599..219a56bc8a6 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 23:04+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -28,12 +28,6 @@ msgstr "Adiar Fechamento"
 msgid "# of Cases"
 msgstr "# de Casos"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr "O caso foi <b>criado</b>."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -277,7 +271,7 @@ msgid "Month of helpdesk requests"
 msgstr "Mês dos chamados no helpdesk"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -508,12 +502,6 @@ msgstr "Filtros Extendidos..."
 msgid "Helpdesk Requests"
 msgstr "Pedidos de Chamados"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/ro.po b/addons/crm_helpdesk/i18n/ro.po
index d817987bc49..bd9640e4dbe 100644
--- a/addons/crm_helpdesk/i18n/ro.po
+++ b/addons/crm_helpdesk/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-21 16:57+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Intarziere la inchidere"
 msgid "# of Cases"
 msgstr "# din Cazuri"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Luna cererilor de asistenta tehnica"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Nici un subiect"
@@ -487,12 +481,6 @@ msgstr "Filtre Extinse..."
 msgid "Helpdesk Requests"
 msgstr "Cereri de asistenta tehnica"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index 620fe4dd2bc..678b04ebfaa 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-24 05:08+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Задержка закрытия"
 msgid "# of Cases"
 msgstr "кол-во вопросов"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Месяц запросов техподдержки"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Без темы"
@@ -487,12 +481,6 @@ msgstr "Расширенные фильтры..."
 msgid "Helpdesk Requests"
 msgstr "Запрос техподдержки"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/sl.po b/addons/crm_helpdesk/i18n/sl.po
index 91b42d70a90..649a03dbbc9 100644
--- a/addons/crm_helpdesk/i18n/sl.po
+++ b/addons/crm_helpdesk/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 11:24+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr "# primerov"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/sq.po b/addons/crm_helpdesk/i18n/sq.po
index c3d0bc321c0..370ced10987 100644
--- a/addons/crm_helpdesk/i18n/sq.po
+++ b/addons/crm_helpdesk/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr ""
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -484,12 +478,6 @@ msgstr ""
 msgid "Helpdesk Requests"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/sr.po b/addons/crm_helpdesk/i18n/sr.po
index e9209063a07..af534eed981 100644
--- a/addons/crm_helpdesk/i18n/sr.po
+++ b/addons/crm_helpdesk/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-02 07:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Kasnjenje do zatvaranja"
 msgid "# of Cases"
 msgstr "# Slucajeva"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -487,12 +481,6 @@ msgstr "Posebni Filteri"
 msgid "Helpdesk Requests"
 msgstr "HelpDesk Zahtevi"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/sr@latin.po b/addons/crm_helpdesk/i18n/sr@latin.po
index 525531bb17d..75ac17bfd57 100644
--- a/addons/crm_helpdesk/i18n/sr@latin.po
+++ b/addons/crm_helpdesk/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 16:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Kasnjenje do zatvaranja"
 msgid "# of Cases"
 msgstr "# Slucajeva"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr ""
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -487,12 +481,6 @@ msgstr "Posebni Filteri"
 msgid "Helpdesk Requests"
 msgstr "HelpDesk Zahtevi"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index 87466476005..095b0165181 100644
--- a/addons/crm_helpdesk/i18n/sv.po
+++ b/addons/crm_helpdesk/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-24 12:33+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Avslutsledtid"
 msgid "# of Cases"
 msgstr "# Ärenden"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Månad av kuntjänstärenden"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Ingen rubrik"
@@ -487,12 +481,6 @@ msgstr "Utökade filter..."
 msgid "Helpdesk Requests"
 msgstr "Kunstjänstärende"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/tr.po b/addons/crm_helpdesk/i18n/tr.po
index 654e2c1eba5..049fee78c3c 100644
--- a/addons/crm_helpdesk/i18n/tr.po
+++ b/addons/crm_helpdesk/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-24 22:32+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "Kapanmada gecikme"
 msgid "# of Cases"
 msgstr "Vak'aların sayısı"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "Destek taleplerinin ayı"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "Konu Yok"
@@ -486,12 +480,6 @@ msgstr "Genişletilmiş Filtreler..."
 msgid "Helpdesk Requests"
 msgstr "Danışma Masası Talepleri"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
index d9ff9a56ea2..27326b00b88 100644
--- a/addons/crm_helpdesk/i18n/zh_CN.po
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 13:33+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "延迟关闭"
 msgid "# of Cases"
 msgstr "# 业务"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "服务请求月份"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "无主题"
@@ -484,12 +478,6 @@ msgstr "增加筛选条件"
 msgid "Helpdesk Requests"
 msgstr "服务台请求"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/zh_TW.po b/addons/crm_helpdesk/i18n/zh_TW.po
index 2759c797e90..49359dbdb51 100644
--- a/addons/crm_helpdesk/i18n/zh_TW.po
+++ b/addons/crm_helpdesk/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 10:12+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -27,12 +27,6 @@ msgstr "延遲關閉"
 msgid "# of Cases"
 msgstr "# 業務量"
 
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
@@ -273,7 +267,7 @@ msgid "Month of helpdesk requests"
 msgstr "客服需求月份"
 
 #. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
 #, python-format
 msgid "No Subject"
 msgstr "無主題"
@@ -484,12 +478,6 @@ msgstr "增加篩選條件"
 msgid "Helpdesk Requests"
 msgstr "客服需求"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
 msgid ""
diff --git a/addons/crm_partner_assign/i18n/ar.po b/addons/crm_partner_assign/i18n/ar.po
index 4fab6cf4b5b..0dad9ef912b 100644
--- a/addons/crm_partner_assign/i18n/ar.po
+++ b/addons/crm_partner_assign/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-12 18:49+0000\n"
 "Last-Translator: Pioneer Solutions <wzaki_dotcom@yahoo.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "التالي"
 msgid "Geo Localize"
 msgstr "التمركز الجغرافي"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -256,18 +256,6 @@ msgstr "التالي"
 msgid "Priority"
 msgstr "أولوية"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -511,6 +499,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "عدد الفرص"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -794,6 +787,11 @@ msgstr "تخصيص شريك"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -888,8 +886,10 @@ msgid "Case Information"
 msgstr "معلومات عن الحالة"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
index eb4830dc690..664c7978df6 100644
--- a/addons/crm_partner_assign/i18n/bg.po
+++ b/addons/crm_partner_assign/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-27 17:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Препращане"
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "Следващ"
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "#Възможности"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
index 5a0e33392c2..66d538bde8e 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_partner_assign/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-03 15:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Endavant"
 msgid "Geo Localize"
 msgstr "Geo localitzar"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Següent"
 msgid "Priority"
 msgstr "Prioritat"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "nº oportunitats"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -796,6 +789,11 @@ msgstr "Empresa assignada"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -890,8 +888,10 @@ msgid "Case Information"
 msgstr "Informació del cas"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/da.po b/addons/crm_partner_assign/i18n/da.po
index 59e82d4b727..b9051767270 100644
--- a/addons/crm_partner_assign/i18n/da.po
+++ b/addons/crm_partner_assign/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr ""
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 8e4a20104b2..074d0805d22 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 16:20+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -67,6 +67,11 @@ msgstr "Weiterleiten"
 msgid "Geo Localize"
 msgstr "Geo-Lokalisierung"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -145,11 +150,6 @@ msgstr "Eindeutige Identifikation der Nachricht"
 msgid "Next Partner Review"
 msgstr "Nächste Partnerbewertung"
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Bevorzugter Verkäufer"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -259,20 +259,6 @@ msgstr "Weiter"
 msgid "Priority"
 msgstr "Priorität"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-"Verfasser der Mitteilung. Wenn nicht gesetzt kann die E-Mail Absenderadresse "
-"keinem Partner zugeordnet werden."
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Benutzer, die diese Nachricht in Ihren Favoriten verfolgen"
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -517,6 +503,11 @@ msgstr "Bewertungen"
 msgid "#Opportunities"
 msgstr "# Verkaufschancen"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -802,6 +793,11 @@ msgstr "Zugewiesener Partner"
 msgid "Partner Level"
 msgstr "Partner Level"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -898,10 +894,13 @@ msgid "Case Information"
 msgstr "Fall Information"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
-"Feld mit Funktion zur Suche der ungelesenen Mitteilungen des Benutzers"
+"Verfasser der Mitteilung. Wenn nicht gesetzt kann die E-Mail Absenderadresse "
+"keinem Partner zugeordnet werden."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
index f1bc25b75c5..f0cf08272c5 100644
--- a/addons/crm_partner_assign/i18n/el.po
+++ b/addons/crm_partner_assign/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 16:53+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Προώθηση"
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "Επόμενο"
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "# Ευκαιρίες"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index b139da52bb4..92c7cfecf3a 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-12 10:39+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:04+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -67,6 +67,11 @@ msgstr "Reenviar"
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr "Destacado"
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -145,11 +150,6 @@ msgstr "Identificador único del mensaje"
 msgid "Next Partner Review"
 msgstr "Próxima revisiónd de la empresa"
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favorito"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -261,20 +261,6 @@ msgstr "Siguiente"
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-"Autor del mensaje. Si no se establece, email_from puede contener una "
-"dirección de correo que no coincida con la de ningún cliente."
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Usuarios que marcan este mensaje en sus favoritos"
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -520,6 +506,12 @@ msgstr "Votos"
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+"El usuario actual tiene una notificación destacada asociada a este mensaje"
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -806,6 +798,12 @@ msgstr "Empresa asignada"
 msgid "Partner Level"
 msgstr "Nivel partner"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+"El usuario actual tiene una notificación sin leer asociada a este mensaje"
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -902,9 +900,13 @@ msgid "Case Information"
 msgstr "Información de caso"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr "Campo funcional para buscar mensajes que el usuario actual debe leer"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+"Autor del mensaje. Si no se establece, email_from puede contener una "
+"dirección de correo que no coincida con la de ningún cliente."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
diff --git a/addons/crm_partner_assign/i18n/es_CR.po b/addons/crm_partner_assign/i18n/es_CR.po
index 3ec75686b9e..f777225aaf4 100644
--- a/addons/crm_partner_assign/i18n/es_CR.po
+++ b/addons/crm_partner_assign/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:17+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: crm_partner_assign
@@ -66,6 +66,11 @@ msgstr "Reenviar"
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -142,11 +147,6 @@ msgstr "Identificador único del mensaje"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -258,18 +258,6 @@ msgstr "Siguiente"
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -513,6 +501,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -797,6 +790,11 @@ msgstr "Empresa asignada"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -891,8 +889,10 @@ msgid "Case Information"
 msgstr "Información de caso"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
index 2982010e4b8..884d269dbb1 100644
--- a/addons/crm_partner_assign/i18n/es_PY.po
+++ b/addons/crm_partner_assign/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-19 13:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Reenviar"
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Siguiente"
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -796,6 +789,11 @@ msgstr "Empresa asignada"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -890,8 +888,10 @@ msgid "Case Information"
 msgstr "Información de caso"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
index f80676d59ac..f71f159dfa2 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_partner_assign/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-17 13:31+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Eteenpäin"
 msgid "Geo Localize"
 msgstr "Alueellista"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "Seuraava"
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "Mahdollisuuksien määrä"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr "Tapauksen tiedot"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index 09c21d37d57..5ef43b2abae 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_partner_assign/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-21 20:39+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -66,6 +66,11 @@ msgstr "Transférer"
 msgid "Geo Localize"
 msgstr "Géolocalisation"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -142,11 +147,6 @@ msgstr "Identifiant unique de message"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -258,18 +258,6 @@ msgstr "Suivant"
 msgid "Priority"
 msgstr "Priorité"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -513,6 +501,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "Nb. d'opportunités"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -797,6 +790,11 @@ msgstr "Partenaire affecté"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -891,8 +889,10 @@ msgid "Case Information"
 msgstr "Information sur l'incident"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
index 34326796c95..44ce1ae15de 100644
--- a/addons/crm_partner_assign/i18n/gl.po
+++ b/addons/crm_partner_assign/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-09 08:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Reenviar"
 msgid "Geo Localize"
 msgstr "Xeolocalizar"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Seguinte"
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "Nº oportunidades"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -795,6 +788,11 @@ msgstr "Empresa asignada"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -889,8 +887,10 @@ msgid "Case Information"
 msgstr "Información do caso"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
index 4048265705a..504579c2e76 100644
--- a/addons/crm_partner_assign/i18n/hr.po
+++ b/addons/crm_partner_assign/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-30 20:01+0000\n"
 "Last-Translator: Ivan Vađić <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Proslijedi"
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index 5174d7ce963..fa83388a60f 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 21:15+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -64,6 +64,11 @@ msgstr ""
 msgid "Geo Localize"
 msgstr "Földrajzi fekvés meghatározása"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -140,11 +145,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -254,18 +254,6 @@ msgstr "Következő"
 msgid "Priority"
 msgstr "Prioritás"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -509,6 +497,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "Lehetőségek száma"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -792,6 +785,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -886,8 +884,10 @@ msgid "Case Information"
 msgstr "Eset információ"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index 57a16aa5820..f4d038766c9 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_partner_assign/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 12:10+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Inoltra"
 msgid "Geo Localize"
 msgstr "Geo localizzazione"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -143,11 +148,6 @@ msgstr "Identificativo univoco messaggio"
 msgid "Next Partner Review"
 msgstr "Prossuma revisione partner"
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Preferito"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -259,18 +259,6 @@ msgstr "Prossimo"
 msgid "Priority"
 msgstr "Priorità"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -514,6 +502,11 @@ msgstr "Voti"
 msgid "#Opportunities"
 msgstr "# Opportunità"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -797,6 +790,11 @@ msgstr "Partner assegnato"
 msgid "Partner Level"
 msgstr "Livello partner"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -891,8 +889,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index b1dc0ebe2ce..721a0422ca4 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-08 19:19+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "転送"
 msgid "Geo Localize"
 msgstr "ジオロカライゼーション"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "メッセージ識別番号"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "次へ"
 msgid "Priority"
 msgstr "優先度"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "商談の数"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr "割当てたパートナ"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr "事象情報"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/lt.po b/addons/crm_partner_assign/i18n/lt.po
index ef66b726ddd..bc17e745b95 100644
--- a/addons/crm_partner_assign/i18n/lt.po
+++ b/addons/crm_partner_assign/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-09 08:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr ""
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
index 15040ee9749..162e5da1fa3 100644
--- a/addons/crm_partner_assign/i18n/lv.po
+++ b/addons/crm_partner_assign/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 23:07+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Pārsūtīt"
 msgid "Geo Localize"
 msgstr "Ģeo. lokalizācija"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "Nākamais"
 msgid "Priority"
 msgstr "Prioritāte"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "Izdevību skaits"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr "Partneris, kam uzticēts"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr "Lietas informācija"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/nb.po b/addons/crm_partner_assign/i18n/nb.po
index 08bf8e4aa56..be2940e5870 100644
--- a/addons/crm_partner_assign/i18n/nb.po
+++ b/addons/crm_partner_assign/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 19:38+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Fremover."
 msgid "Geo Localize"
 msgstr "Geo lokalisert."
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -143,11 +148,6 @@ msgstr "Unik melding identifikator."
 msgid "Next Partner Review"
 msgstr "Neste partner anmeldelse."
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favoritt."
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,20 +257,6 @@ msgstr "Neste."
 msgid "Priority"
 msgstr "Prioritet."
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-"Forfatter av meldingen. Hvis det ikke er angitt, kan email_fra Mai holde en "
-"e-postadresse som ikke samsvarer med noen partner."
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Brukere som setter denne meldingen i sine favoritter."
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -515,6 +501,11 @@ msgstr "Stemmer."
 msgid "#Opportunities"
 msgstr "#Muligheter."
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -798,6 +789,11 @@ msgstr "Tilordnet partner."
 msgid "Partner Level"
 msgstr "Partner nivå."
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -892,9 +888,13 @@ msgid "Case Information"
 msgstr "Sakinformasjon."
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
+"Forfatter av meldingen. Hvis det ikke er angitt, kan email_fra Mai holde en "
+"e-postadresse som ikke samsvarer med noen partner."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
index 96bcf0dda6b..84cb889ad86 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_partner_assign/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 20:57+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -67,6 +67,11 @@ msgstr "Doorsturen"
 msgid "Geo Localize"
 msgstr "Geo lokaliseren"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -145,11 +150,6 @@ msgstr "Bericht unieke identifier"
 msgid "Next Partner Review"
 msgstr "Volgende relatie beoordeling"
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favoriet"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -261,20 +261,6 @@ msgstr "Volgende"
 msgid "Priority"
 msgstr "Prioriteit"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-"Schrijver van het bericht. Als deze niet ingesteld is, kan email_from een e-"
-"mailadres bevatten wat niet overeenkomt met een relatie."
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Gebruikers die dit bericht aan hun favorieten heeft toegevoegd"
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -520,6 +506,11 @@ msgstr "Stemmen"
 msgid "#Opportunities"
 msgstr "#Prospects"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -806,6 +797,11 @@ msgstr "Toegewezen relatie"
 msgid "Partner Level"
 msgstr "Relatie nivo"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -902,10 +898,13 @@ msgid "Case Information"
 msgstr "Dossier informatie"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
-"Functioneel veld om te zoeken naar een bericht welke de gebruiker moet lezen"
+"Schrijver van het bericht. Als deze niet ingesteld is, kan email_from een e-"
+"mailadres bevatten wat niet overeenkomt met een relatie."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
index c0c2625f984..2134134216a 100644
--- a/addons/crm_partner_assign/i18n/pl.po
+++ b/addons/crm_partner_assign/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 20:47+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Przekaż"
 msgid "Geo Localize"
 msgstr "Lokalizacja geograficzna"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "Unikalny identyfikator wiadomości"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Ulubione"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "Następny"
 msgid "Priority"
 msgstr "Priorytet"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr "Głosy"
 msgid "#Opportunities"
 msgstr "#Szans"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr "Przypisany partner"
 msgid "Partner Level"
 msgstr "Poziom partnera"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,10 +885,11 @@ msgid "Case Information"
 msgstr "Informacja o sprawie"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
-"Pole funkcyjne do szukania wiadomości, które użytkownik powinien przeczytać"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index d6269fbc1b7..b5e3e82a6b0 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_partner_assign/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 20:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Avançar"
 msgid "Geo Localize"
 msgstr "Localizar Geograficamente"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "Identificador de mensagem exclusivo"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Próximo"
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "#Oportunidades"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -795,6 +788,11 @@ msgstr "Parceiro Atribuído"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -889,8 +887,10 @@ msgid "Case Information"
 msgstr "Informações sobre o caso"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 2ea4f5f7a1b..f2b35befa55 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/i18n/pt_BR.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-17 21:56+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:14+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -69,6 +69,11 @@ msgstr "Encaminhar"
 msgid "Geo Localize"
 msgstr "Localização Geográfica"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr "Favoritos"
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -147,11 +152,6 @@ msgstr "Identificador da mensagem"
 msgid "Next Partner Review"
 msgstr "Próxima Revisão de Parceiro"
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favorito"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -263,20 +263,6 @@ msgstr "Próximo"
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-"Autor da mensagem. Se não definido, o campo email_from pode conter um "
-"endereço de e-mail que não corresponde a nenhum parceiro."
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Usuários que salvaram esta mensagem em seus favoritos"
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -521,6 +507,11 @@ msgstr "Votos"
 msgid "#Opportunities"
 msgstr "Nº de Oportunidades"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr "Usuário atual marcou uma notificação ligada a esta mensagem"
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -806,6 +797,11 @@ msgstr "Parceiro Atribuído"
 msgid "Partner Level"
 msgstr "Categoria do Parceiro"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr "Usuário atual tem uma notificação não lida ligada a esta mensagem"
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -902,10 +898,13 @@ msgid "Case Information"
 msgstr "Informação do Caso"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
-"Campo Funcional para pesquisar por mensagens não lidas do usuário atual"
+"Autor da mensagem. Se não definido, o campo email_from pode conter um "
+"endereço de e-mail que não corresponde a nenhum parceiro."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
index 3fee306f5c3..1505d2faf89 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_partner_assign/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 21:16+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Redirectionare"
 msgid "Geo Localize"
 msgstr "Localizare Geo"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "Identificator unic mesaj"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Urmatorul (urmatoarea)"
 msgid "Priority"
 msgstr "Prioritate"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "#Oportunitati"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -796,6 +789,11 @@ msgstr "Partener alocat"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -890,8 +888,10 @@ msgid "Case Information"
 msgstr "Informatii caz"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index e47547209f8..70d724e73b3 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-23 13:46+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Вперед"
 msgid "Geo Localize"
 msgstr "Геолоцировать"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "Уникальный идентификатор сообщения"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Следующий"
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "# Предложений"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -795,6 +788,11 @@ msgstr "Назначенный партнер"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -889,8 +887,10 @@ msgid "Case Information"
 msgstr "Информация о вопросе"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
index 6226191a63b..c349ce0a13b 100644
--- a/addons/crm_partner_assign/i18n/sq.po
+++ b/addons/crm_partner_assign/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-28 15:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr ""
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
index de2757bea25..4224445d5d8 100644
--- a/addons/crm_partner_assign/i18n/sr@latin.po
+++ b/addons/crm_partner_assign/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 16:30+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr ""
 msgid "Geo Localize"
 msgstr ""
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr ""
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr ""
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index c0b8c2a7917..2c9d0c6e3dc 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-20 07:27+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "Framåt"
 msgid "Geo Localize"
 msgstr "Geoplacering"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "Meddelandets unika identifierare"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -257,18 +257,6 @@ msgstr "Nästa"
 msgid "Priority"
 msgstr "Prioritet"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -512,6 +500,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "# Affärsmöjligheter"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -795,6 +788,11 @@ msgstr "Tilldelat företag"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -889,8 +887,10 @@ msgid "Case Information"
 msgstr "Ärendeinformation"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
index 93ff9443160..237fc6aed5f 100644
--- a/addons/crm_partner_assign/i18n/tr.po
+++ b/addons/crm_partner_assign/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-23 14:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "İlet"
 msgid "Geo Localize"
 msgstr "Coğrafi konumlama"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "Benzersiz mesaj tanımlayıcısı"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -256,18 +256,6 @@ msgstr "İleri"
 msgid "Priority"
 msgstr "Öncelik"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -511,6 +499,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "#Fırsatlar"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -794,6 +787,11 @@ msgstr "Atanmış Paydaş"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -888,8 +886,10 @@ msgid "Case Information"
 msgstr "Durum Bilgisi"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index 275509489c6..ffe5fdbedf3 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 13:50+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "跟进"
 msgid "Geo Localize"
 msgstr "geolocalization定位"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "消息唯一编号"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "下一个"
 msgid "Priority"
 msgstr "优先级"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "设置这些消息在收藏夹的用户"
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "#商机"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr "指定的业务伙伴"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr "业务信息"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
index 112c7a161ac..0ded16d0886 100644
--- a/addons/crm_partner_assign/i18n/zh_TW.po
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 10:14+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -65,6 +65,11 @@ msgstr "轉寄"
 msgid "Geo Localize"
 msgstr "Geo 定位"
 
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
@@ -141,11 +146,6 @@ msgstr "訊息唯一編號"
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
@@ -255,18 +255,6 @@ msgstr "下一個"
 msgid "Priority"
 msgstr "優先級"
 
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid ""
-"Author of the message. If not set, email_from may hold an email address that "
-"did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
@@ -510,6 +498,11 @@ msgstr ""
 msgid "#Opportunities"
 msgstr "#商機"
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
@@ -793,6 +786,11 @@ msgstr "指定的業務夥伴"
 msgid "Partner Level"
 msgstr ""
 
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
@@ -887,8 +885,10 @@ msgid "Case Information"
 msgstr "業務資訊"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_profiling/i18n/ar.po b/addons/crm_profiling/i18n/ar.po
index bd17cf85182..95a1ac08a13 100644
--- a/addons/crm_profiling/i18n/ar.po
+++ b/addons/crm_profiling/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:19+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/bg.po b/addons/crm_profiling/i18n/bg.po
index 335cb24cfb4..81bf4770076 100644
--- a/addons/crm_profiling/i18n/bg.po
+++ b/addons/crm_profiling/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/bs.po b/addons/crm_profiling/i18n/bs.po
index 77caa990db0..37ef4ed98e0 100644
--- a/addons/crm_profiling/i18n/bs.po
+++ b/addons/crm_profiling/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-16 02:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ca.po b/addons/crm_profiling/i18n/ca.po
index 8544abfdb73..60b403cd0bc 100644
--- a/addons/crm_profiling/i18n/ca.po
+++ b/addons/crm_profiling/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/cs.po b/addons/crm_profiling/i18n/cs.po
index eef59cedd72..1666126ddb4 100644
--- a/addons/crm_profiling/i18n/cs.po
+++ b/addons/crm_profiling/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/da.po b/addons/crm_profiling/i18n/da.po
index f0b522e6b2b..7d09827b36d 100644
--- a/addons/crm_profiling/i18n/da.po
+++ b/addons/crm_profiling/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index 6ef2224f9b6..2d81c218464 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 16:24+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index 8d08402b526..638b92fb743 100644
--- a/addons/crm_profiling/i18n/el.po
+++ b/addons/crm_profiling/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/crm_profiling/i18n/en_GB.po b/addons/crm_profiling/i18n/en_GB.po
index 2f4b2ad328b..0de23977125 100644
--- a/addons/crm_profiling/i18n/en_GB.po
+++ b/addons/crm_profiling/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index f7fc3a9a841..628e5b0bf9d 100644
--- a/addons/crm_profiling/i18n/es.po
+++ b/addons/crm_profiling/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 21:35+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_AR.po b/addons/crm_profiling/i18n/es_AR.po
index 91652969894..7e0b2976448 100644
--- a/addons/crm_profiling/i18n/es_AR.po
+++ b/addons/crm_profiling/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-14 20:57+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_CR.po b/addons/crm_profiling/i18n/es_CR.po
index 9a3f4aeaf81..ed6f0066432 100644
--- a/addons/crm_profiling/i18n/es_CR.po
+++ b/addons/crm_profiling/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:21+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/es_EC.po b/addons/crm_profiling/i18n/es_EC.po
index a72ead8e634..371c9e21478 100644
--- a/addons/crm_profiling/i18n/es_EC.po
+++ b/addons/crm_profiling/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:13+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_PY.po b/addons/crm_profiling/i18n/es_PY.po
index bba00d40afd..da9ac934357 100644
--- a/addons/crm_profiling/i18n/es_PY.po
+++ b/addons/crm_profiling/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-19 13:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/et.po b/addons/crm_profiling/i18n/et.po
index 1b261ed2284..35bf1bce24e 100644
--- a/addons/crm_profiling/i18n/et.po
+++ b/addons/crm_profiling/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/fi.po b/addons/crm_profiling/i18n/fi.po
index ba9938d1c27..f7b554ea03c 100644
--- a/addons/crm_profiling/i18n/fi.po
+++ b/addons/crm_profiling/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:44+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index 2da6e3dc7bb..5f369fcefaa 100644
--- a/addons/crm_profiling/i18n/fr.po
+++ b/addons/crm_profiling/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:50+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/gl.po b/addons/crm_profiling/i18n/gl.po
index 08fae09979e..19cbc79bbf5 100644
--- a/addons/crm_profiling/i18n/gl.po
+++ b/addons/crm_profiling/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:49+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/gu.po b/addons/crm_profiling/i18n/gu.po
index 2e8c359114e..1390a010dc9 100644
--- a/addons/crm_profiling/i18n/gu.po
+++ b/addons/crm_profiling/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-02 19:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/hr.po b/addons/crm_profiling/i18n/hr.po
index 4c4d45d3d32..d0a8b8b4b31 100644
--- a/addons/crm_profiling/i18n/hr.po
+++ b/addons/crm_profiling/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:50+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/hu.po b/addons/crm_profiling/i18n/hu.po
index 0be37ec1cd0..db7b06f5090 100644
--- a/addons/crm_profiling/i18n/hu.po
+++ b/addons/crm_profiling/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 20:57+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/id.po b/addons/crm_profiling/i18n/id.po
index d1c1a531135..d779306c6a9 100644
--- a/addons/crm_profiling/i18n/id.po
+++ b/addons/crm_profiling/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 13:48+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index 77cc2d41ff8..45ff2b6dd46 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:35+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
index 3f5f579df38..178020e1bfd 100644
--- a/addons/crm_profiling/i18n/ja.po
+++ b/addons/crm_profiling/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-06 04:06+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index ecfbbe0464c..94e65f11142 100644
--- a/addons/crm_profiling/i18n/ko.po
+++ b/addons/crm_profiling/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lt.po b/addons/crm_profiling/i18n/lt.po
index d72b56f2d38..c6b2fb5a2a4 100644
--- a/addons/crm_profiling/i18n/lt.po
+++ b/addons/crm_profiling/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:24+0000\n"
 "Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lv.po b/addons/crm_profiling/i18n/lv.po
index 12203906e72..e6a77ef4e2d 100644
--- a/addons/crm_profiling/i18n/lv.po
+++ b/addons/crm_profiling/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/mn.po b/addons/crm_profiling/i18n/mn.po
index 7c298dc30d5..f46dbc05620 100644
--- a/addons/crm_profiling/i18n/mn.po
+++ b/addons/crm_profiling/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nb.po b/addons/crm_profiling/i18n/nb.po
index f70e5242b90..4e567cd35db 100644
--- a/addons/crm_profiling/i18n/nb.po
+++ b/addons/crm_profiling/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-06 14:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index 142c677d832..4664cc20079 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 19:08+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nl_BE.po b/addons/crm_profiling/i18n/nl_BE.po
index 0b787d28333..6459fd4fa6f 100644
--- a/addons/crm_profiling/i18n/nl_BE.po
+++ b/addons/crm_profiling/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-14 02:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index 79ebe7faeee..9b9ee423695 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:25+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index 723b780be00..96b375c8f80 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:33+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index 345f9c663a3..9a45b534b5b 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 22:29+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ro.po b/addons/crm_profiling/i18n/ro.po
index aad1453e2ab..3de46b971b9 100644
--- a/addons/crm_profiling/i18n/ro.po
+++ b/addons/crm_profiling/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:55+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 3e9965b6e92..c6b5dfe6968 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sk.po b/addons/crm_profiling/i18n/sk.po
index 0b754641800..c835c7309f3 100644
--- a/addons/crm_profiling/i18n/sk.po
+++ b/addons/crm_profiling/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sl.po b/addons/crm_profiling/i18n/sl.po
index f86612b229b..ce524505811 100644
--- a/addons/crm_profiling/i18n/sl.po
+++ b/addons/crm_profiling/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:22+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sq.po b/addons/crm_profiling/i18n/sq.po
index 43a87ae9963..b45dad4473a 100644
--- a/addons/crm_profiling/i18n/sq.po
+++ b/addons/crm_profiling/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sr.po b/addons/crm_profiling/i18n/sr.po
index 14d26597147..f6b8c68d205 100644
--- a/addons/crm_profiling/i18n/sr.po
+++ b/addons/crm_profiling/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sr@latin.po b/addons/crm_profiling/i18n/sr@latin.po
index 207074a3a0d..f54997170a8 100644
--- a/addons/crm_profiling/i18n/sr@latin.po
+++ b/addons/crm_profiling/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 8efe088dac4..79099d3d2b1 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-31 22:44+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/tlh.po b/addons/crm_profiling/i18n/tlh.po
index 23624105596..14e02f7699a 100644
--- a/addons/crm_profiling/i18n/tlh.po
+++ b/addons/crm_profiling/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index 2c83e441aad..d32aac7643b 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:53+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/uk.po b/addons/crm_profiling/i18n/uk.po
index b0386f1b91b..9a772f44148 100644
--- a/addons/crm_profiling/i18n/uk.po
+++ b/addons/crm_profiling/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:56+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/vi.po b/addons/crm_profiling/i18n/vi.po
index 32c6767b4fb..999de1d2852 100644
--- a/addons/crm_profiling/i18n/vi.po
+++ b/addons/crm_profiling/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index 8438456e357..818da64a0ae 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 13:09+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index 9faf9f80afb..b81e35f1cc4 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-29 08:56+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_todo/i18n/ar.po b/addons/crm_todo/i18n/ar.po
index 9ebbfe8c678..842ac4bdf0d 100644
--- a/addons/crm_todo/i18n/ar.po
+++ b/addons/crm_todo/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:05+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/de.po b/addons/crm_todo/i18n/de.po
index ec9b1217728..79643ebc252 100644
--- a/addons/crm_todo/i18n/de.po
+++ b/addons/crm_todo/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 16:27+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/en_GB.po b/addons/crm_todo/i18n/en_GB.po
index dc2523ee0e3..13720658d19 100644
--- a/addons/crm_todo/i18n/en_GB.po
+++ b/addons/crm_todo/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-18 16:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/es.po b/addons/crm_todo/i18n/es.po
index 9470fd11171..d5b2053ce3d 100644
--- a/addons/crm_todo/i18n/es.po
+++ b/addons/crm_todo/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 21:39+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/es_CR.po b/addons/crm_todo/i18n/es_CR.po
index 501c515b8a0..c0a11afb224 100644
--- a/addons/crm_todo/i18n/es_CR.po
+++ b/addons/crm_todo/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:27+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/fi.po b/addons/crm_todo/i18n/fi.po
index 72a3c6c819d..010191c39d8 100644
--- a/addons/crm_todo/i18n/fi.po
+++ b/addons/crm_todo/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-26 09:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/fr.po b/addons/crm_todo/i18n/fr.po
index 5737d299ad1..3e00fb07e9c 100644
--- a/addons/crm_todo/i18n/fr.po
+++ b/addons/crm_todo/i18n/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:50+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
diff --git a/addons/crm_todo/i18n/gu.po b/addons/crm_todo/i18n/gu.po
index 239594b2170..ef8bc451374 100644
--- a/addons/crm_todo/i18n/gu.po
+++ b/addons/crm_todo/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 11:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/hr.po b/addons/crm_todo/i18n/hr.po
index 158895c48f7..60e6097e17c 100644
--- a/addons/crm_todo/i18n/hr.po
+++ b/addons/crm_todo/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:02+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/it.po b/addons/crm_todo/i18n/it.po
index 49d27012071..795bc5e077a 100644
--- a/addons/crm_todo/i18n/it.po
+++ b/addons/crm_todo/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 11:53+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
index 19d36c6356f..40549c1bd4a 100644
--- a/addons/crm_todo/i18n/ja.po
+++ b/addons/crm_todo/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-07 21:25+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/lt.po b/addons/crm_todo/i18n/lt.po
index 35fa2b4645b..ece9dcb1d96 100644
--- a/addons/crm_todo/i18n/lt.po
+++ b/addons/crm_todo/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-09 08:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/mn.po b/addons/crm_todo/i18n/mn.po
index 0ab01a728fd..8b215b79107 100644
--- a/addons/crm_todo/i18n/mn.po
+++ b/addons/crm_todo/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-17 12:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/nb.po b/addons/crm_todo/i18n/nb.po
index 2b033a669f8..a5ffc2fdd6f 100644
--- a/addons/crm_todo/i18n/nb.po
+++ b/addons/crm_todo/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-04 14:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/nl.po b/addons/crm_todo/i18n/nl.po
index a8420b47073..6a1b6ae66f2 100644
--- a/addons/crm_todo/i18n/nl.po
+++ b/addons/crm_todo/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:09+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pl.po b/addons/crm_todo/i18n/pl.po
index 165d2d1d8af..05d8e2b0442 100644
--- a/addons/crm_todo/i18n/pl.po
+++ b/addons/crm_todo/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-25 13:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pt.po b/addons/crm_todo/i18n/pt.po
index 55144c0d6d9..c034ff51a6d 100644
--- a/addons/crm_todo/i18n/pt.po
+++ b/addons/crm_todo/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-13 14:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po
index 6ec38a60b27..379d2f06ce8 100644
--- a/addons/crm_todo/i18n/pt_BR.po
+++ b/addons/crm_todo/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 22:32+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ro.po b/addons/crm_todo/i18n/ro.po
index 135fa0e6ff2..e934bb9face 100644
--- a/addons/crm_todo/i18n/ro.po
+++ b/addons/crm_todo/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-15 12:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ru.po b/addons/crm_todo/i18n/ru.po
index 89c3e6ec1d2..8e2ea049cf4 100644
--- a/addons/crm_todo/i18n/ru.po
+++ b/addons/crm_todo/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-14 06:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/sr@latin.po b/addons/crm_todo/i18n/sr@latin.po
index 80f74a9d674..21859344146 100644
--- a/addons/crm_todo/i18n/sr@latin.po
+++ b/addons/crm_todo/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-16 10:40+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/sv.po b/addons/crm_todo/i18n/sv.po
index a67e284df17..9f9d21fe39f 100644
--- a/addons/crm_todo/i18n/sv.po
+++ b/addons/crm_todo/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-08 16:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/tr.po b/addons/crm_todo/i18n/tr.po
index 34a89cc9eb0..0e912114de4 100644
--- a/addons/crm_todo/i18n/tr.po
+++ b/addons/crm_todo/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 22:07+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po
index d3d3a49fb90..b9c0a70545b 100644
--- a/addons/crm_todo/i18n/zh_CN.po
+++ b/addons/crm_todo/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 02:01+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/zh_TW.po b/addons/crm_todo/i18n/zh_TW.po
index 22b405fb859..9a27c143f8a 100644
--- a/addons/crm_todo/i18n/zh_TW.po
+++ b/addons/crm_todo/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-29 09:15+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/decimal_precision/i18n/ar.po b/addons/decimal_precision/i18n/ar.po
index 940531c1073..521686aa533 100644
--- a/addons/decimal_precision/i18n/ar.po
+++ b/addons/decimal_precision/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-07 23:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/bg.po b/addons/decimal_precision/i18n/bg.po
index 05d8aee0441..ca8b4253fea 100644
--- a/addons/decimal_precision/i18n/bg.po
+++ b/addons/decimal_precision/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-27 09:54+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ca.po b/addons/decimal_precision/i18n/ca.po
index a3c743a4ad7..10b5d25ce34 100644
--- a/addons/decimal_precision/i18n/ca.po
+++ b/addons/decimal_precision/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-15 15:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/cs.po b/addons/decimal_precision/i18n/cs.po
index fe76a5e42a0..da9ced9bfab 100644
--- a/addons/decimal_precision/i18n/cs.po
+++ b/addons/decimal_precision/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 05:28+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po
index e93331dde79..1fe1f2c6943 100644
--- a/addons/decimal_precision/i18n/da.po
+++ b/addons/decimal_precision/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 11:35+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index d35c6403b62..0b3e5a4307c 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 12:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/el.po b/addons/decimal_precision/i18n/el.po
index 40aa3c9fe1c..37612a3bbff 100644
--- a/addons/decimal_precision/i18n/el.po
+++ b/addons/decimal_precision/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 16:55+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/en_GB.po b/addons/decimal_precision/i18n/en_GB.po
index 134db238549..066c05ac678 100644
--- a/addons/decimal_precision/i18n/en_GB.po
+++ b/addons/decimal_precision/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-13 09:03+0000\n"
 "Last-Translator: John Bradshaw <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es.po b/addons/decimal_precision/i18n/es.po
index 943abf2c2d1..f99af6e722c 100644
--- a/addons/decimal_precision/i18n/es.po
+++ b/addons/decimal_precision/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-16 22:12+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_CR.po b/addons/decimal_precision/i18n/es_CR.po
index cf1c7a105a8..f882687a48a 100644
--- a/addons/decimal_precision/i18n/es_CR.po
+++ b/addons/decimal_precision/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:18+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: decimal_precision
diff --git a/addons/decimal_precision/i18n/es_EC.po b/addons/decimal_precision/i18n/es_EC.po
index 60446ae177e..fde9a8cd6f0 100644
--- a/addons/decimal_precision/i18n/es_EC.po
+++ b/addons/decimal_precision/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-27 16:31+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_MX.po b/addons/decimal_precision/i18n/es_MX.po
index cb487ab5080..80f37e88a0d 100644
--- a/addons/decimal_precision/i18n/es_MX.po
+++ b/addons/decimal_precision/i18n/es_MX.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-02 05:06+0000\n"
 "Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
 "<anegrinm@gmail.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_PY.po b/addons/decimal_precision/i18n/es_PY.po
index 2d9c1b4d263..935e2bafa18 100644
--- a/addons/decimal_precision/i18n/es_PY.po
+++ b/addons/decimal_precision/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-03 02:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/fi.po b/addons/decimal_precision/i18n/fi.po
index e5b4c366bbd..ef2273a55f1 100644
--- a/addons/decimal_precision/i18n/fi.po
+++ b/addons/decimal_precision/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 08:09+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index 86e24f01862..ffb1414e26e 100644
--- a/addons/decimal_precision/i18n/fr.po
+++ b/addons/decimal_precision/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 14:12+0000\n"
 "Last-Translator: Xavier Verbeke <Unknown>\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: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/gl.po b/addons/decimal_precision/i18n/gl.po
index c549773c103..0bb7c718afa 100644
--- a/addons/decimal_precision/i18n/gl.po
+++ b/addons/decimal_precision/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 21:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/gu.po b/addons/decimal_precision/i18n/gu.po
index 074ebd1a04f..600ef9bca5e 100644
--- a/addons/decimal_precision/i18n/gu.po
+++ b/addons/decimal_precision/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 11:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/hr.po b/addons/decimal_precision/i18n/hr.po
index 558903de0bc..5736c477e33 100644
--- a/addons/decimal_precision/i18n/hr.po
+++ b/addons/decimal_precision/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:03+0000\n"
 "Last-Translator: Domagoj Crljenko <crljenko@riteh.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/hu.po b/addons/decimal_precision/i18n/hu.po
index 80295449ce4..f65d8c72cf9 100644
--- a/addons/decimal_precision/i18n/hu.po
+++ b/addons/decimal_precision/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 21:20+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/id.po b/addons/decimal_precision/i18n/id.po
index de972c7d788..71c5938d1ec 100644
--- a/addons/decimal_precision/i18n/id.po
+++ b/addons/decimal_precision/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 18:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 8fc62c07eb1..4ad72b8bcf1 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 19:56+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ja.po b/addons/decimal_precision/i18n/ja.po
index 60a4abebf1c..929275c2fc5 100644
--- a/addons/decimal_precision/i18n/ja.po
+++ b/addons/decimal_precision/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-01 06:02+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/lt.po b/addons/decimal_precision/i18n/lt.po
index a7a83b46584..b06f48ed08a 100644
--- a/addons/decimal_precision/i18n/lt.po
+++ b/addons/decimal_precision/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-09 15:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/lv.po b/addons/decimal_precision/i18n/lv.po
index db6f4eca23e..91bf0aeaf4b 100644
--- a/addons/decimal_precision/i18n/lv.po
+++ b/addons/decimal_precision/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 22:59+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/mn.po b/addons/decimal_precision/i18n/mn.po
index 43e6028b649..fb74e008bfc 100644
--- a/addons/decimal_precision/i18n/mn.po
+++ b/addons/decimal_precision/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 20:07+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nb.po b/addons/decimal_precision/i18n/nb.po
index 93cd5171219..a911f62b250 100644
--- a/addons/decimal_precision/i18n/nb.po
+++ b/addons/decimal_precision/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-06 17:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nl.po b/addons/decimal_precision/i18n/nl.po
index f96253b3387..98a868c877f 100644
--- a/addons/decimal_precision/i18n/nl.po
+++ b/addons/decimal_precision/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po
index d1050d0244b..07d1a147c14 100644
--- a/addons/decimal_precision/i18n/nl_BE.po
+++ b/addons/decimal_precision/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 13:41+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pl.po b/addons/decimal_precision/i18n/pl.po
index f385fab18ad..2cc56d45677 100644
--- a/addons/decimal_precision/i18n/pl.po
+++ b/addons/decimal_precision/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-25 16:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pt.po b/addons/decimal_precision/i18n/pt.po
index 71b2c52ed23..fd6cfc413b5 100644
--- a/addons/decimal_precision/i18n/pt.po
+++ b/addons/decimal_precision/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-14 22:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pt_BR.po b/addons/decimal_precision/i18n/pt_BR.po
index 01a910c1ca9..c213478b90a 100644
--- a/addons/decimal_precision/i18n/pt_BR.po
+++ b/addons/decimal_precision/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-11 14:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ro.po b/addons/decimal_precision/i18n/ro.po
index 64dbf2e523e..31cb9fa5163 100644
--- a/addons/decimal_precision/i18n/ro.po
+++ b/addons/decimal_precision/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 17:27+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ru.po b/addons/decimal_precision/i18n/ru.po
index 35e3b5aa374..6857988ae00 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-14 18:48+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sk.po b/addons/decimal_precision/i18n/sk.po
index a7b46e63670..6cb9667a6d6 100644
--- a/addons/decimal_precision/i18n/sk.po
+++ b/addons/decimal_precision/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 21:18+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sl.po b/addons/decimal_precision/i18n/sl.po
index 7a2d0ec1b4f..ba1beb25a63 100644
--- a/addons/decimal_precision/i18n/sl.po
+++ b/addons/decimal_precision/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-13 19:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sr.po b/addons/decimal_precision/i18n/sr.po
index 8090dafcde2..4ac6bbc7976 100644
--- a/addons/decimal_precision/i18n/sr.po
+++ b/addons/decimal_precision/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-02 07:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sr@latin.po b/addons/decimal_precision/i18n/sr@latin.po
index 4714f81ba6a..39febac7f28 100644
--- a/addons/decimal_precision/i18n/sr@latin.po
+++ b/addons/decimal_precision/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-06 14:01+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sv.po b/addons/decimal_precision/i18n/sv.po
index 85817a42f4e..070ff7b0d22 100644
--- a/addons/decimal_precision/i18n/sv.po
+++ b/addons/decimal_precision/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-04 09:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/tr.po b/addons/decimal_precision/i18n/tr.po
index 879d062b418..baf418849f1 100644
--- a/addons/decimal_precision/i18n/tr.po
+++ b/addons/decimal_precision/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-27 17:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/vi.po b/addons/decimal_precision/i18n/vi.po
index a600ed55897..c0f9b572adf 100644
--- a/addons/decimal_precision/i18n/vi.po
+++ b/addons/decimal_precision/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-01 17:18+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/zh_CN.po b/addons/decimal_precision/i18n/zh_CN.po
index e7d69f2b7f8..1c39ae39905 100644
--- a/addons/decimal_precision/i18n/zh_CN.po
+++ b/addons/decimal_precision/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-14 00:49+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/zh_TW.po b/addons/decimal_precision/i18n/zh_TW.po
index 69eedf39027..0173b530a92 100644
--- a/addons/decimal_precision/i18n/zh_TW.po
+++ b/addons/decimal_precision/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-29 07:43+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 5fef246e1ba..edda920e90b 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-08 02:51+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "الوزن الصافي"
 msgid "Delivery Grid Line"
 msgstr "خط شبكة التسليم"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "امر تسليم"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "تعريف الشبكة"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr "عدد العبوات"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "لا يوجد شبكة متاحة !"
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "الامر غير موجود في حالة السحب !"
@@ -418,6 +406,27 @@ msgstr "متغير"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "سيستخدم اسلوب التسليم عندما تكون الفاتورة بالإختيار."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -482,7 +496,7 @@ msgid "Price"
 msgstr "السعر"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "لا توجد شبكة متوافقة مع هذا الناقل !"
@@ -499,7 +513,7 @@ msgid "Weight * Volume"
 msgstr "الوزن * المقدار"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "الناقل %s (id: %d( لا يوجد لديها شبكة تسليم!"
@@ -531,12 +545,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "معرّف"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "يُسجل حالة الامر كمسودة ليضاف الى خطوط التسليم."
@@ -567,6 +576,12 @@ msgstr ""
 msgid "States"
 msgstr "حالات"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -607,6 +622,9 @@ msgstr "نوع السعر"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "معرّف"
+
 #~ msgid "_Apply"
 #~ msgstr "تطبيق"
 
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 908e2d513c0..6ca73e92a53 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-01 20:40+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Нето тегло"
 msgid "Delivery Grid Line"
 msgstr "Ред от доставка"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Поръчка за доставка"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Задание на матрица"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "Брой пакети"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Поръчката не в състояние проект !"
@@ -419,6 +407,27 @@ msgstr ""
 "Този метод на доставка ще бъде използван при фактуриране от списък за "
 "товарене."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -456,6 +465,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -482,7 +496,7 @@ msgid "Price"
 msgstr "Цена"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Няма матрица която да отговаря на този транспорт !"
@@ -499,7 +513,7 @@ msgid "Weight * Volume"
 msgstr "Тегло * Обем"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Транспорт %s (идентификатор %d) няма таблица на доставки!"
@@ -531,12 +545,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -569,6 +578,12 @@ msgstr ""
 msgid "States"
 msgstr "Области"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -696,6 +711,9 @@ msgstr "Вид цена"
 #~ msgid "You try to assign a lot which is not from the same product"
 #~ msgstr "Опитвате да свържете партида, която не е от същия продукт"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "_Apply"
 #~ msgstr "_Прилагане"
 
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index ea0bd938b26..44160d70480 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 19:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 28ed518ddc6..09f47a63f8b 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 09:21+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Pes net"
 msgid "Delivery Grid Line"
 msgstr "Línia quadrícula lliurament"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Ordre de lliurament"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -217,7 +203,7 @@ msgid "Grid definition"
 msgstr "Definició de la quadrícula"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -343,7 +329,9 @@ msgstr "Número de paquets"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -364,7 +352,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "No hi ha una xarxa disponible!"
@@ -375,7 +363,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "L'ordre no està en estat borrador!"
@@ -424,6 +412,27 @@ msgstr ""
 "Aquest mètode de lliurament serà utilitzat quan es facturi a partir de "
 "l'albarà."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -462,6 +471,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -490,7 +504,7 @@ msgid "Price"
 msgstr "Preu"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "No concorda quadrícula per aquest transportista!"
@@ -507,7 +521,7 @@ msgid "Weight * Volume"
 msgstr "Pes * Volum"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "El transportista %s (id: %d) no disposa de quadrícula d'enviament!"
@@ -539,12 +553,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -576,6 +585,12 @@ msgstr ""
 msgid "States"
 msgstr "Estats"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -627,6 +642,9 @@ msgstr "Tipus de preu"
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Afegeix costos d'enviament"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carrier Partner"
 #~ msgstr "Empresa transportista"
 
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index c885330d342..b784563e9f0 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-25 14:16+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: delivery
@@ -48,6 +48,12 @@ msgstr "Čistá hmotnost"
 msgid "Delivery Grid Line"
 msgstr "Řádek dodací sítě"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Objednávka doručení"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Určení sítě"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -341,7 +327,9 @@ msgstr "Počet balíků"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -362,7 +350,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Žádná dostupná síť !"
@@ -373,7 +361,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Objednávka není ve stavu koncept !"
@@ -420,6 +408,27 @@ msgstr "Proměnné"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Dodací metoda bude použita při fakturaci z nasvádění."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -457,6 +466,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -485,7 +499,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Žádná síť odpovídající tomuto přepravci !"
@@ -502,7 +516,7 @@ msgid "Weight * Volume"
 msgstr "Hmotnost * Objem"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Přepravce %s (id: %d) nemá dodací síť!"
@@ -534,12 +548,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "Stav objednávky musí být koncept pro přidání dodacích řádků."
@@ -570,6 +579,12 @@ msgstr ""
 msgid "States"
 msgstr "Stavy"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -671,5 +686,8 @@ msgstr "Typ ceny"
 #~ msgid "_Apply"
 #~ msgstr "_Použít"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Přepravci a doručení"
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
index 4c54f297b56..80d82178e18 100644
--- a/addons/delivery/i18n/da.po
+++ b/addons/delivery/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 22:36+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Netto vægt"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -418,6 +406,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "Pris"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -581,3 +596,6 @@ msgstr ""
 
 #~ msgid "Weights"
 #~ msgstr "Vægte"
+
+#~ msgid "ID"
+#~ msgstr "ID"
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index a5601e7e790..0bfaff161f0 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 21:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Nettogewicht"
 msgid "Delivery Grid Line"
 msgstr "Liefertarifposition"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,43 +88,6 @@ msgstr "Der Partner der die Lieferung abwickelt"
 msgid "Delivery order"
 msgstr "Lieferauftrag"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie zur Erstellung einer neuen Liefermethode. \n"
-"              </p><p>\n"
-"                Jeder Paketversender (z.B. UPS) bietet unterschiedliche "
-"Liefermethoden an (z.B.\n"
-"                UPS Express, UPS Standard) mit verschiedenen Regelwerken für "
-"die Preisberechnung \n"
-"                der Methoden.   \n"
-"               </p><p>\n"
-"                 Die Methoden ermöglichen es nun, automatisch auf Basis "
-"Ihrer Einstellungen den Lieferpreis \n"
-"                 für die Auslieferung zu berechnen, und den Verkauf  "
-"(bezieht sich auf dieses  Angebot) oder die \n"
-"                 Rechnung (basierend auf den Lieferscheinen) automatisch "
-"inklusive dieser Kosten zu erstellen.\n"
-"              </p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -248,7 +217,7 @@ msgid "Grid definition"
 msgstr "Definition Auslieferungstarif"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -375,7 +344,9 @@ msgstr "Anzahl der Pakete"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -400,7 +371,7 @@ msgstr ""
 "abhängt"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Kein Tarif definiert!"
@@ -411,7 +382,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Auftrag nicht im Entwurf Stadium!"
@@ -460,6 +431,27 @@ msgstr ""
 "Diese Auslieferungsmethode wird angewendet, wenn vom Lieferauftrag auch die "
 "Rechnung erstellt wird."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -499,6 +491,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -526,7 +523,7 @@ msgid "Price"
 msgstr "Preis"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Kein Tarif für diesen Frachtführer definiert!"
@@ -543,7 +540,7 @@ msgid "Weight * Volume"
 msgstr "Gewicht * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Der Frachtführer %s (id: %d) hat kein passendes Tarifmodell!"
@@ -575,12 +572,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -612,11 +604,20 @@ msgstr ""
 msgid "States"
 msgstr "Staaten"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
 msgstr "Preistyp"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Lieferkosten Hinzufügen"
 
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 55111483a3f..bb257f953cc 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 17:31+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Καθαρό βάρος"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Εντολή παράδοσης"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Ορισμός πίνακα"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr "Αριθμός Πακέτων"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Η εντολή δεν βρίσκεται σε πρόχειρη κατάσταση!"
@@ -418,6 +406,27 @@ msgstr "Μεταβλητή"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "Τιμή"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Κανένας πίνακας δεν ταιριάζει με αυτόν τον μεταφορέα!"
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr "Βάρος * Όγκος"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Ο μεταφορέας %s (κωδ: %d) δεν έχει πίνακα παραδόσεων!"
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -568,6 +577,12 @@ msgstr ""
 msgid "States"
 msgstr "Καταστάσεις"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -624,6 +639,9 @@ msgstr "Τύπος Τιμής"
 #~ msgid "Notes"
 #~ msgstr "Σημειώσεις"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Προσθήκη Κόστους Παράδοσης"
 
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 0b3eedba9a5..86c837240f6 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 22:00+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\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: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Peso neto"
 msgid "Delivery Grid Line"
 msgstr "Línea cuadrícula envío"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,39 +87,6 @@ msgstr "Empresa que realiza el servicio de entrega."
 msgid "Delivery order"
 msgstr "Orden entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"    Pulse para crear un nuevo metodo de envío.\n"
-"</p>\n"
-"<p>\n"
-"    Cada transportista (p.e. UPS) puede tener varios metodos de envio (p.e. "
-"UPS Express, UPS Standard) con reglas de precios asociadas.\n"
-"</p>\n"
-"<p>\n"
-"    Estos métodos permiten automáticamente valorar el precio de entrega de "
-"acuerdo con su configuración; En la orden de venta (basada en un "
-"presupuesto) o en la factura (basada en los albaranes de entrega.)\n"
-"</p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -243,7 +216,7 @@ msgid "Grid definition"
 msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -375,7 +348,9 @@ msgstr "Número de bultos"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -399,7 +374,7 @@ msgstr ""
 "Dejar vacío si el precio depende de un precio anticipado por destino."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "¡No hay una cuadrícula disponible!"
@@ -410,7 +385,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "¡La orden no está en estado borrador!"
@@ -458,6 +433,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Este método de entrega será utilizado cuando se facture a partir del albarán."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -496,6 +492,11 @@ msgstr "Albaranes de entrada"
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -524,7 +525,7 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "¡No concuerda cuadrícula para este transportista!"
@@ -541,7 +542,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -573,12 +574,7 @@ msgid "Delivery Methods"
 msgstr "Formas de envío"
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
@@ -609,6 +605,12 @@ msgstr "Imprimir albarán de salida"
 msgid "States"
 msgstr "Provincias"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -660,6 +662,9 @@ msgstr "Tipo de precio"
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Añadir costes de envío"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carrier Partner"
 #~ msgstr "Empresa transportista"
 
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 4d971a44bd5..fb71094be63 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-16 04:48+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Definición de Grilla"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "¡La orden no está en estado borrador!"
@@ -417,6 +405,27 @@ msgstr "Variable"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "No concuerda la grilla para éste transportista"
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr "Provincias"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -613,6 +628,9 @@ msgstr "Tipo de Precio"
 #~ msgid "No grid avaible !"
 #~ msgstr "¡No hay cuadrícula disponible!"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Agregar costos de envío"
 
diff --git a/addons/delivery/i18n/es_CR.po b/addons/delivery/i18n/es_CR.po
index 04007b4abf7..4a923f7cc4d 100644
--- a/addons/delivery/i18n/es_CR.po
+++ b/addons/delivery/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:38+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: delivery
@@ -48,6 +48,12 @@ msgstr "Peso neto"
 msgid "Delivery Grid Line"
 msgstr "Línea cuadrícula envío"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr "El socio que está haciendo el servicio de entrega."
 msgid "Delivery order"
 msgstr "Orden entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -217,7 +203,7 @@ msgid "Grid definition"
 msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -347,7 +333,9 @@ msgstr "Número de bultos"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -372,7 +360,7 @@ msgstr ""
 "destino"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "¡No hay una cuadrícula disponible!"
@@ -383,7 +371,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "¡La orden no está en estado borrador!"
@@ -431,6 +419,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Este método de entrega será utilizado cuando se facture a partir del albarán."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -469,6 +478,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -497,7 +511,7 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "¡No concuerda cuadrícula para este transportista!"
@@ -514,7 +528,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -546,12 +560,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
@@ -582,6 +591,12 @@ msgstr ""
 msgid "States"
 msgstr "Provincias"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -635,6 +650,9 @@ msgstr "Tipo de precio"
 #~ msgid "_Apply"
 #~ msgstr "_Aplicar"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costes de envío"
 
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index ac282e7a14a..e6992f3c85a 100644
--- a/addons/delivery/i18n/es_EC.po
+++ b/addons/delivery/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-31 15:56+0000\n"
 "Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
 "<chris.ormaza@gmail.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Peso neto"
 msgid "Delivery Grid Line"
 msgstr "Línea cuadrícula envío"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr "La empresa que esta realizando el servicio de transporte"
 msgid "Delivery order"
 msgstr "Orden de Entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -217,7 +203,7 @@ msgid "Grid definition"
 msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -346,7 +332,9 @@ msgstr "Número de bultos"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -370,7 +358,7 @@ msgstr ""
 "Mantenga vacío si el precio deprende de el precio avanzado por destino"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "¡No hay una cuadrícula disponible!"
@@ -381,7 +369,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "¡La orden no está en estado borrador!"
@@ -429,6 +417,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "El método de envío sera usado cuando se facture desde la orden de entrega"
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -468,6 +477,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -496,7 +510,7 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "¡No concuerda cuadrícula para este transportista!"
@@ -513,7 +527,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -545,12 +559,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "Identificador"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
@@ -581,6 +590,12 @@ msgstr ""
 msgid "States"
 msgstr "Provincias"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -755,6 +770,9 @@ msgstr "Tipo de precio"
 #~ msgid "Create Deliveries"
 #~ msgstr "Crear envíos"
 
+#~ msgid "ID"
+#~ msgstr "Identificador"
+
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "Error! Usted no puede crear miembros asociados recursivos"
 
diff --git a/addons/delivery/i18n/es_PY.po b/addons/delivery/i18n/es_PY.po
index a797ded3d4f..f7e1e3fd9ec 100644
--- a/addons/delivery/i18n/es_PY.po
+++ b/addons/delivery/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-19 13:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Peso neto"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Orden entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -217,7 +203,7 @@ msgid "Grid definition"
 msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -343,7 +329,9 @@ msgstr "Número de bultos"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -364,7 +352,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -375,7 +363,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "¡La orden no está en estado borrador!"
@@ -423,6 +411,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Este método de entrega será utilizado cuando se facture a partir del albarán."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -461,6 +470,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -489,7 +503,7 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "¡No concuerda cuadrícula para este transportista!"
@@ -506,7 +520,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
@@ -538,12 +552,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
@@ -574,6 +583,12 @@ msgstr ""
 msgid "States"
 msgstr "Departamento:"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -672,6 +687,9 @@ msgstr "Tipo de precio"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Transportistas y envíos"
 
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index 143e80ae171..50117c26c0c 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-11 17:52+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Netokaal"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Tarnetellimus"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "Pakkide arv"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr "Muutuja"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr "Hind"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr "Kaal * Ruumala"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr "staatused"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -598,6 +613,9 @@ msgstr "Hinnatüüp"
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Lisa tarnemaksumus"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #, python-format
 #~ msgid "No price available !"
 #~ msgstr "Hinda pole saadaval !"
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index a3effb34976..0a0e32ba964 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 15:24+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Nettopaino"
 msgid "Delivery Grid Line"
 msgstr "Toimitus ruudukko"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr "Kumppani joka toteuttaa toimituspalvelun"
 msgid "Delivery order"
 msgstr "Toimitustilaus"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Taulukon määrittely"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -344,7 +330,9 @@ msgstr "Pakkausten määrä"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -369,7 +357,7 @@ msgstr ""
 "hinnoittelusta"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Ruudukkoa ei saatavilla !"
@@ -380,7 +368,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Tilaus ei ole luonnostilassa!"
@@ -427,6 +415,27 @@ msgstr "Muuttuva"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Tämä toimitustapa on käytössä kun laskutus tapahtuu keräilystä."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -466,6 +475,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -494,7 +508,7 @@ msgid "Price"
 msgstr "Hinta"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Kuljetusliikkeen taulukossa ei ole lähetystä vastaavia kohtia!"
@@ -511,7 +525,7 @@ msgid "Weight * Volume"
 msgstr "Paino * Tilavuus"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Kuljetusliikkeellä %s (tunnus: %d) ei ole taulukkoa kuljetuksille!"
@@ -543,12 +557,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -580,6 +589,12 @@ msgstr ""
 msgid "States"
 msgstr "Osavaltiot"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -651,6 +666,9 @@ msgstr "Hintatyyppi"
 #~ msgid "Carrier and delivery grids"
 #~ msgstr "Kuljetus- ja toimitustaulukot"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Kuljetusliikkeet ja toimitukset"
 
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 358985e046b..605ddd72d24 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 18:25+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
@@ -53,6 +53,12 @@ msgstr "Poids net"
 msgid "Delivery Grid Line"
 msgstr "Ligne du tarif de livraison"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -87,44 +93,6 @@ msgstr "Le partenaire qui assure la livraison"
 msgid "Delivery order"
 msgstr "Bon de livraison"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliquez pour créer un nouveau mode de livraison.\n"
-"              </p><p>\n"
-"                Chaque transporteur (par exemple UPS) peut avoir plusieurs "
-"modes\n"
-"                de livraison (UPS Express, UPS Standard, etc.), chacun "
-"possédant ses\n"
-"                propres règles de tarification.\n"
-"              </p><p>\n"
-"                Les différents modes de livraison permettent de calculer "
-"automatiquement\n"
-"                les frais de port, selon les paramètres que vous définissez, "
-"dans les commandes\n"
-"                de vente (fondées sur les devis), ou sur les factures "
-"(créées à partir de bons de\n"
-"                livraison).\n"
-"              </p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -256,7 +224,7 @@ msgid "Grid definition"
 msgstr "Définition des tarifs"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Attention !"
@@ -389,7 +357,9 @@ msgstr "Nombre de colis"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -413,7 +383,7 @@ msgstr ""
 "Gardez vide si le prix dépend de la tarification avancée par destination"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Pas de grille tarifaire disponible !"
@@ -424,7 +394,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "La commande n'est pas à l'état de brouillon"
@@ -473,6 +443,27 @@ msgstr ""
 "Cette méthode de livraison sera utilisée lorsqu'on facturera sur base du "
 "colisage."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -512,6 +503,11 @@ msgstr "Livraisons à recevoir"
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -540,7 +536,7 @@ msgid "Price"
 msgstr "Prix"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Aucun tarif correspondant pour ce transporteur !"
@@ -557,7 +553,7 @@ msgid "Weight * Volume"
 msgstr "Poids * volume"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Le transporteur %s (id: %d) n'a pas de tarif de livraison !"
@@ -589,12 +585,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -627,6 +618,12 @@ msgstr "Imprimer le bordereau de livraison"
 msgid "States"
 msgstr "États"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -670,6 +667,9 @@ msgstr "Type de prix"
 #~ msgid "No grid avaible !"
 #~ msgstr "Aucun tarif disponible !"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "This delivery method will be used when invoicing from packing."
 #~ msgstr ""
 #~ "Cette méthode de livraison sera utilisé lors de la facturation depuis les "
diff --git a/addons/delivery/i18n/gl.po b/addons/delivery/i18n/gl.po
index 8fb4acb0436..720cf953891 100644
--- a/addons/delivery/i18n/gl.po
+++ b/addons/delivery/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-28 11:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Peso neto"
 msgid "Delivery Grid Line"
 msgstr "Liña cuadrícula envío"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Orde de entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -216,7 +202,7 @@ msgid "Grid definition"
 msgstr "Definición da cuadrícula"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -342,7 +328,9 @@ msgstr "Número de vultos"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -363,7 +351,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Non hai unha cuadrícula dispoñible!"
@@ -374,7 +362,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "A orde non está en estado de borrador!"
@@ -422,6 +410,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Este método de entrega utilizarase cando se facture a partir do albará."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -459,6 +468,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -486,7 +500,7 @@ msgid "Price"
 msgstr "Prezo"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Non existe ningunha cuadrícula concordante para este transportista!"
@@ -503,7 +517,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volume"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "O transportista %s (id: %d) non dispón de cuadrícula de envío!"
@@ -535,12 +549,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "A orde debe estar en estado de borrador para engadir liñas de envío."
@@ -571,6 +580,12 @@ msgstr ""
 msgid "States"
 msgstr "Estados"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -667,6 +682,9 @@ msgstr "Tipo de prezo"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Transportistas e envíos"
 
diff --git a/addons/delivery/i18n/hi.po b/addons/delivery/i18n/hi.po
index 01ffddd6f6a..e9ac957393f 100644
--- a/addons/delivery/i18n/hi.po
+++ b/addons/delivery/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-20 10:00+0000\n"
 "Last-Translator: Tejas Tank (OpenERP) <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "अंतिम वजन"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -418,6 +406,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index dd02b0be344..81cd9c02027 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 21:09+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: delivery
@@ -48,6 +48,12 @@ msgstr "Neto težina"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Otpremnica"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Definicija mreže"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -339,7 +325,9 @@ msgstr "Broj paketa"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Nalog nije u nacrtu!"
@@ -418,6 +406,27 @@ msgstr "Varijabla"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr "Primke"
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "Cijena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr "Težina * Volumen"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr "Ispiši otpremnicu"
 msgid "States"
 msgstr "Stanja"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -577,6 +592,9 @@ msgstr "Vrsta Cijene"
 #~ msgid "Notes"
 #~ msgstr "Bilješke"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Delivery method"
 #~ msgstr "Način dostave"
 
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 22877744d29..2ef0815ad91 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 12:10+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Nettó súly"
 msgid "Delivery Grid Line"
 msgstr "Szállítási tarifatáblázat sor"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Szállítólevél"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Tarifatáblázat meghatározása"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "Csomagok száma"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Nincs tarifatáblázat!"
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "A megrendelés nincs tervezet állapotban!"
@@ -418,6 +406,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Ez a szállítási mód lesz használva, ha szállítólevél alapján számláznak."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "Ár"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Nincs ehhez a fuvarozóhoz illeszkedő tarifatáblázat!"
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr "Súly * térfogat"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "%s (kód: %d) fuvarozónak nincs szállítási tarifatáblázata!"
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -568,6 +577,12 @@ msgstr ""
 msgid "States"
 msgstr "Állapotok"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -656,5 +671,8 @@ msgstr "Ártípus"
 #~ "\n"
 #~ "     "
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Fuvarozók és szállítások"
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index 24c6cd48057..e0f6b83d3a5 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 02:49+0000\n"
 "Last-Translator: Budi Iskandar <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Definisi Grid"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "Jumlah Paket"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Order tidak dalam status Draft !"
@@ -417,6 +405,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index cac982e87a6..f76b3f1edd8 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:16+0000\n"
 "Last-Translator: lollo_Ge <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
@@ -47,6 +47,12 @@ msgstr "Peso Netto"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Ordine di Consegna"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Definizione Griglia"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "Numero di Colli"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "L'ordine non è in stato di bozza!"
@@ -418,6 +406,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Questo metodo di consegna sarà utilizzato quando si fattura da picking."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "Prezzo"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Non ci sono risultati nella ricerca per questo trasportatore !"
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volume"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Il trasportatore %s (id: %d) non ha una griglia di consegne !"
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -568,6 +577,12 @@ msgstr ""
 msgid "States"
 msgstr "Stati"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -580,6 +595,9 @@ msgstr "Tipo Prezzo"
 #~ msgid "Warning"
 #~ msgstr "Attenzione"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index f7c4cd86bea..b91e714a59f 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-28 04:08+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "正味重量"
 msgid "Delivery Grid Line"
 msgstr "配達グリッドライン"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr "配達サービスを行うパートナです。"
 msgid "Delivery order"
 msgstr "配達オーダー"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "グリッドの定義"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr "パッケージの数"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr "到着地ごとに前払い価格が決まっているのであれば、空白にします。"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "グリッドがありません。"
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "発注が予定状態ではありません。"
@@ -418,6 +406,27 @@ msgstr "変数"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "集荷から請求をするときに、この配達方法が使われます。"
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "価格"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "この運搬会社に合致するグリッドがありません。"
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr "重量×数量"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "運搬会社 %s（ID：%d）の配達グリッドがありません。"
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "配達ラインがを追加するために、オーダー状態はドラフトである必要があります。"
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr "状態"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -611,6 +626,9 @@ msgstr "価格タイプ"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "エラー：重複したメンバーを作ることはできません。"
 
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 2363e6cbfab..5c7fd5150ff 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:49+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "그리드 정의"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "주문이 드래프트 상태가 아님!"
@@ -418,6 +406,27 @@ msgstr "변수"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "가격"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "이 운송자에 부합하는 그리드가 없습니다 !"
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr "무게 + 체적"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "운송자 %s (id: %d) 는 배송 그리드가 없습니다."
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "배송 라인을 추가하려면, 주문 상태가 드래프트여야 합니다."
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr "상태"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -660,6 +675,9 @@ msgstr "가격 타입"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "에러: UOS는 UOM과 다른 카테고리에 있어야 합니다."
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr "에러: 디폴트 UOM과 구매 UOM은 같은 카테고리 속에 있어야 합니다."
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index f47acee44d1..f66dd311df4 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 15:22+0000\n"
 "Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/lv.po b/addons/delivery/i18n/lv.po
index 038bb0f1d61..ae7ebd10b34 100644
--- a/addons/delivery/i18n/lv.po
+++ b/addons/delivery/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-28 08:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -418,6 +406,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index e2912f38f21..1c3894b253a 100644
--- a/addons/delivery/i18n/mn.po
+++ b/addons/delivery/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-09 08:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Цэвэр жин"
 msgid "Delivery Grid Line"
 msgstr "Хүргэлтийн координат"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Хүргэх захиалга"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Хүснэгт тодорхойлох"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "Савлагааны дугаар"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Ноорог захиалга байхгүй !"
@@ -417,6 +405,27 @@ msgstr "Хувьсах"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr "Үнэ"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr "Жин * Эзлэхүүн"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr "Төлвүүд"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -602,6 +617,9 @@ msgstr "Үнийн төрөл"
 #~ msgstr ""
 #~ "Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Хүргэх өртөг нэмэх"
 
diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po
index 978f686d76f..170ed847f31 100644
--- a/addons/delivery/i18n/nb.po
+++ b/addons/delivery/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-05 22:53+0000\n"
 "Last-Translator: Rolv Råen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Nettovekt"
 msgid "Delivery Grid Line"
 msgstr "Levering Rutenettlinje"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr "Parteneren som utfører leveransen."
 msgid "Delivery order"
 msgstr "Leveringsordre"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Avgiftsdefinisjon"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -345,7 +331,9 @@ msgstr "Antall kolli"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -369,7 +357,7 @@ msgstr ""
 "Hold tom hvis prisingen er avhengig av avansert prising per destinasjon."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Ingen rutenett tilgjengelig !"
@@ -380,7 +368,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Ordren har ikke utkast-status!"
@@ -427,6 +415,27 @@ msgstr "Variabel"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Denne leveringsmetoden vil bli brukt ved fakturering fra plukking."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -465,6 +474,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -493,7 +507,7 @@ msgid "Price"
 msgstr "Pris"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "No grid matching for this carrier !"
@@ -510,7 +524,7 @@ msgid "Weight * Volume"
 msgstr "Vekt * Volum"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Transportøren %s (ID %d) har ingen leveringsnett!"
@@ -542,12 +556,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -579,6 +588,12 @@ msgstr ""
 msgid "States"
 msgstr "Bekreftelser"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -614,6 +629,9 @@ msgstr "Pristype"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Finn og e_rstatt"
 
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index e9c22916821..1c93d7b64e8 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-01 16:02+0000\n"
-"Last-Translator: Mario Gielissen <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 19:10+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Netto gewicht"
 msgid "Delivery Grid Line"
 msgstr "Afleverplanningsregel"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Maateenheid"
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,42 +87,6 @@ msgstr "De relatie die de afleveringsservice doet"
 msgid "Delivery order"
 msgstr "Uitgaande levering"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"               Klik hier om een aflevermethode te definiëren\n"
-"              </p><p>\n"
-"                Iedere vervoerder (bijv. UPS) kan verschillende "
-"aflevermethodes hebben\n"
-"                (Bijv. UPS Express, UPS Standard) met een set van regels "
-"eraan gekoppeld\n"
-"                 voor iedere methode\n"
-"              </p><p>\n"
-"                 Deze methodes geven u de mogelijkheid om automatisch de "
-"afleveringskosten\n"
-"                 te berekenen, volgens uw instellingen op de verkooporder "
-"(gebaseerd op de offerte)\n"
-"                 of de factuur (gebaseerd op de uitgaande levering).\n"
-"              </p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -247,7 +217,7 @@ msgid "Grid definition"
 msgstr "Planningsdefinitie"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -379,7 +349,9 @@ msgstr "Aantal pakketten"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -404,7 +376,7 @@ msgstr ""
 "bestemming"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Geen planning beschikbaar !"
@@ -415,7 +387,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Order niet in status \"Concept\"!"
@@ -463,6 +435,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Deze verzendwijze wordt gebruikt bij facturatie vanaf verzamelopdracht."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -502,6 +495,11 @@ msgstr "Inkomende leveringen"
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Maateenheid voor gewicht"
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -530,7 +528,7 @@ msgid "Price"
 msgstr "Bedrag"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Geen passende leveringsmatrix gevonden voor deze vervoerder!"
@@ -547,7 +545,7 @@ msgid "Weight * Volume"
 msgstr "Gewicht * Volume"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "De vervoerder %s (id: %d) heeft geen leveringsmatrix!"
@@ -579,12 +577,7 @@ msgid "Delivery Methods"
 msgstr "Leveringsmethodes"
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -616,11 +609,20 @@ msgstr "Afdrukken leveringsbon"
 msgid "States"
 msgstr "Provincies"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Maateenheid voor het gewicht"
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
 msgstr "Soort prijs"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #, python-format
 #~ msgid "No price available !"
 #~ msgstr "Geen prijs beschikbaar!"
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index 75bb0559a32..fe56233eee4 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 62bb08bd253..8b8d1d69125 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 19:15+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Waga netto"
 msgid "Delivery Grid Line"
 msgstr "Pozycja tabeli opłat za dostawy"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,39 +87,6 @@ msgstr "Partner, który świadczy usługi transportowe."
 msgid "Delivery order"
 msgstr "Wydanie zewnętrzne"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknij, aby utworzyć metodę dostawy. \n"
-"              </p><p>\n"
-"                Każdy przewoźnik (np. UPS) może mieć kilka metod dostawy "
-"(np.\n"
-"                UPS Express, UPS Standard), które mają swoje reguły cenowe.\n"
-"              </p><p>\n"
-"                Takie metody pozwalają automatycznie obliczać ceny dostaw\n"
-"                w zależności od ustawień na zamówieniu sprzedaży (na "
-"podstawie\n"
-"                oferty) lub w fakturze (na podstawie wydanń).\n"
-"              </p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -238,7 +211,7 @@ msgid "Grid definition"
 msgstr "Definicja tabeli"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -368,7 +341,9 @@ msgstr "Liczba paczek"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -392,7 +367,7 @@ msgstr ""
 "Pozostaw puste, jeśli cena zależy zaawansowanej wyceny wg miejsca docelowego."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Brak tabel !"
@@ -403,7 +378,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Zamówienie nie jest w stanie Projekt !"
@@ -450,6 +425,27 @@ msgstr "Zmienna"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Ta metoda dostawy będzie stosowana przy fakturowaniu z pobrania."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -488,6 +484,11 @@ msgstr "Przyjęcia zewnętrzne"
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -516,7 +517,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Brak tabeli opłat za dostawy dla tego przewoźnika !"
@@ -533,7 +534,7 @@ msgid "Weight * Volume"
 msgstr "Waga * Ilość"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Przewoźnik %s (id: %d) nie ma tabeli opłat za dostawy!"
@@ -565,12 +566,7 @@ msgid "Delivery Methods"
 msgstr "Metody dostaw"
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "Zamówienie musi być w stanie Projekt, aby dodawać pozycje dostaw"
@@ -601,6 +597,12 @@ msgstr "Drukuj zamówienie dostawy"
 msgid "States"
 msgstr "Regiony"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -676,6 +678,9 @@ msgstr "Typ ceny"
 #~ msgid "No grid avaible !"
 #~ msgstr "Brak tabel !"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #, python-format
 #~ msgid "No line matched this order in the choosed delivery grids !"
 #~ msgstr ""
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 53282e1a2e3..79d0d522072 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:38+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:42+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Peso líquido"
 msgid "Delivery Grid Line"
 msgstr "Linha da grelha de entrega"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr "O parceiro que está a fazer o serviço de entregas."
 msgid "Delivery order"
 msgstr "Ordem de entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Definição da grelha"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -344,7 +330,9 @@ msgstr "Número de embalagens"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -367,7 +355,7 @@ msgid ""
 msgstr "Mantenha vazio se o preço depende do preço avançado por destino"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Sem grade disponível!"
@@ -378,7 +366,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Ordem não se encontra no estado de rascunho !"
@@ -425,6 +413,27 @@ msgstr "Variável"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Este método de entrega será usado quando a faturação do picking."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -463,6 +472,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -491,7 +505,7 @@ msgid "Price"
 msgstr "Preço"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Nenhuma grelha correspondente a esta transportadora !"
@@ -508,7 +522,7 @@ msgid "Weight * Volume"
 msgstr "Peso * volume"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "A transportadora %s (id: %d) não tem grelha de entrega !"
@@ -540,12 +554,7 @@ msgid "Delivery Methods"
 msgstr "Métodos de entrega"
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -577,6 +586,12 @@ msgstr "Imprimir ordem de entrega"
 msgid "States"
 msgstr "Estados"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -597,6 +612,9 @@ msgstr "Tipo de Preço"
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "O IVA não parece estar correcto."
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Custos da Entrega"
 
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 101b42c1a2d..6977a80bc7c 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-10 15:22+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:08+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +48,12 @@ msgstr "Peso líquido"
 msgid "Delivery Grid Line"
 msgstr "Itens da Grade de Entrega"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidade de Medida"
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,41 +88,6 @@ msgstr "Parceiro que está efetuando o serviço de entrega."
 msgid "Delivery order"
 msgstr "Ordem de Entrega"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clique aqui para definir um novo método de entrega. \n"
-"              </p><p>\n"
-"                Cada transportadora (por exemplo: UPS) pode ter diversos "
-"métodos de entrega (por exemplo:\n"
-"                Expresso UPS, UPS Padrão) com um conjunto de regras de preço "
-"para cada método.\n"
-"              </p><p>\n"
-"                Estes métodos permitem calcular automaticamente o preço da "
-"entrega\n"
-"                de acordo com seus parâmetros; sobre pedido de venda "
-"(baseada na\n"
-"                cotação) ou a fatura (baseado sobre as ordens de entrega).\n"
-"              </p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -245,7 +217,7 @@ msgid "Grid definition"
 msgstr "Definição de grade"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -377,7 +349,9 @@ msgstr "Número de Pacotes"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -402,7 +376,7 @@ msgstr ""
 "destinação da mercadoria."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Sem grade disponível!"
@@ -413,7 +387,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "O Pedido não está como Provisório!"
@@ -461,6 +435,42 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Este método de entrega será usado quando faturar a partir da separação."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo método de entrega. \n"
+"              </p><p>\n"
+"Cada transportadora Correio (por exemplo) pode ter vários métodos de entrega "
+"(por exemplo,\n"
+"                 PAC, Sedex) com um conjunto de regras de preços ligados "
+"para cada método.\n"
+"              </p><p>\n"
+"                Estes métodos permitem calcular o valor do frete "
+"automaticamente\n"
+"                 de acordo com suas configurações, no pedido de venda (com "
+"base na\n"
+"                 cotação) ou na fatura (com base nas ordens de entrega).\n"
+"              </p>\n"
+"            "
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -499,6 +509,11 @@ msgstr "Recebimento de Mercadorias"
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unidade de medida de peso"
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -527,7 +542,7 @@ msgid "Price"
 msgstr "Preço"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Sem grade correspondentes para esta transportadora!"
@@ -544,7 +559,7 @@ msgid "Weight * Volume"
 msgstr "Peso * Volume"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "A transportadora %s (id: %d) não possui grade de entrega!"
@@ -576,12 +591,7 @@ msgid "Delivery Methods"
 msgstr "Métodos de Entrega"
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -614,6 +624,12 @@ msgstr "Imprimir Ordem de Expedição"
 msgid "States"
 msgstr "Situações"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Unidade de Medida é a unidade de medida para o Peso"
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -644,6 +660,9 @@ msgstr "Tipo de Preço"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Adicione as despesas de entrega"
 
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index eb444a32657..c62c75954fd 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 19:06+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Greutate neta"
 msgid "Delivery Grid Line"
 msgstr "Linie grila de livrare"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr "Partenerul care efectueaza serviciul de livrare."
 msgid "Delivery order"
 msgstr "Comanda de livrare"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Definitie grila"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -345,7 +331,9 @@ msgstr "Numar de pachete"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -370,7 +358,7 @@ msgstr ""
 "pretului pe destinatie"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Nici o grila disponibila !"
@@ -381,7 +369,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Comanda nu este in starea de ciorna !"
@@ -428,6 +416,27 @@ msgstr "Variabil(a)"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Metoda de livrare folosita va fi folosita la facturarea la ridicare."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -466,6 +475,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -494,7 +508,7 @@ msgid "Price"
 msgstr "Pret"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Nici o grila nu se potriveste cu acest transportator !"
@@ -511,7 +525,7 @@ msgid "Weight * Volume"
 msgstr "Greutate * Volum"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Transportatorul %s (id: %d) nu are nici o grila de livrari!"
@@ -543,12 +557,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -580,6 +589,12 @@ msgstr ""
 msgid "States"
 msgstr "Stari"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -591,6 +606,9 @@ msgstr "Tipul de pret"
 #~ msgid "="
 #~ msgstr "="
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Şi costuri livrare"
 
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index f1417891449..3f2237c4a3f 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-31 18:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Вес нетто"
 msgid "Delivery Grid Line"
 msgstr "Строка сетки доставки"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr "Партнёр оказывающий услуги доставки."
 msgid "Delivery order"
 msgstr "Заказ на доставку"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Определение сетки"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -344,7 +330,9 @@ msgstr "Количество упаковок"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -369,7 +357,7 @@ msgstr ""
 "назначения"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Доступных сеток нет !"
@@ -380,7 +368,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Заказ не в состоянии \"Черновик\" !"
@@ -429,6 +417,27 @@ msgstr ""
 "Этот способ доставки будет использоваться при выставление счета по "
 "комплектованию."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -468,6 +477,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -496,7 +510,7 @@ msgid "Price"
 msgstr "Цена"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Нет сетки, подходящей для этого перевозчика!"
@@ -513,7 +527,7 @@ msgid "Weight * Volume"
 msgstr "Вес * объем"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Перевозчик %s (ID: %d) не имеет доставочной сетки!"
@@ -545,12 +559,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "Идентификатор"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -582,6 +591,12 @@ msgstr ""
 msgid "States"
 msgstr "Cостояния"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -645,6 +660,9 @@ msgstr "Тип цены"
 #~ msgstr ""
 #~ "Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
 
+#~ msgid "ID"
+#~ msgstr "Идентификатор"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Добавить стоимость доставки"
 
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index 81631154fa2..bcdeb88fc4c 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 11:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr "Spremenljivka"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr "Teža * prostornina"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "Oznaka"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -617,6 +632,9 @@ msgstr "Vrsta cene"
 #~ msgid "Delivery Costs"
 #~ msgstr "Stroški dostave"
 
+#~ msgid "ID"
+#~ msgstr "Oznaka"
+
 #~ msgid "Delivery method"
 #~ msgstr "Način dostave"
 
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index 595c2afd715..2c43d46be91 100644
--- a/addons/delivery/i18n/sq.po
+++ b/addons/delivery/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -418,6 +406,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index 978cc37b88e..05921827685 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-02 07:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Neto Tezina"
 msgid "Delivery Grid Line"
 msgstr "Linija Isporuke"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Zahtev Isporuke"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Definicija mreže"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr "Broj Paketa"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Nema dostupnih linija"
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Zahtev nije u 'U pripremi' !"
@@ -418,6 +406,27 @@ msgstr "Promjenljiva"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Metod dostave ce se koristiti kada fakturises iz izborne liste."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -457,6 +466,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -483,7 +497,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Nijedna linija ne odgovara ovom prevozniku"
@@ -500,7 +514,7 @@ msgid "Weight * Volume"
 msgstr "Težina * Zapremina"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Prevoznik %s (id: %d) nema liniju dostave!"
@@ -532,12 +546,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -569,6 +578,12 @@ msgstr ""
 msgid "States"
 msgstr "Stanja"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -622,6 +637,9 @@ msgstr "Vrsta Cene"
 #~ msgid "Notes"
 #~ msgstr "Napomene"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid ""
 #~ "Allows you to add delivery methods in sales orders and packing. You can "
 #~ "define your own carrier and delivery grids for prices. When creating "
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index 26cab8a73d8..ebbe67fc93a 100644
--- a/addons/delivery/i18n/sr@latin.po
+++ b/addons/delivery/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 16:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "Neto Tezina"
 msgid "Delivery Grid Line"
 msgstr "Linija Isporuke"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "Zahtev Isporuke"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr "Definicija mreže"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr "Broj Paketa"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Nema dostupnih linija"
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Zahtev nije u 'U pripremi' !"
@@ -418,6 +406,27 @@ msgstr "Promjenljiva"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Metod dostave ce se koristiti kada fakturises iz izborne liste."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -457,6 +466,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -483,7 +497,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Nijedna linija ne odgovara ovom prevozniku"
@@ -500,7 +514,7 @@ msgid "Weight * Volume"
 msgstr "Težina * Zapremina"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Prevoznik %s (id: %d) nema liniju dostave!"
@@ -532,12 +546,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -569,6 +578,12 @@ msgstr ""
 msgid "States"
 msgstr "Stanja"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -654,6 +669,9 @@ msgstr "Vrsta Cene"
 #~ msgid "_Apply"
 #~ msgstr "_Prihvati"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Prijevoznici i Isporuke"
 
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 2bb472836b4..62920ba6de6 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-24 09:11+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Nettovikt"
 msgid "Delivery Grid Line"
 msgstr "Leveransmatrisrad"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr "Företaget gör själva leveransservicen."
 msgid "Delivery order"
 msgstr "Utgående Leverans"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Matrisdefinition"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -341,7 +327,9 @@ msgstr "Antal paket"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -365,7 +353,7 @@ msgstr ""
 "Håll tomt om prissättningen beror på avancerad prissättning per destination"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Inget rutnär tillgängligt !"
@@ -376,7 +364,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Ordern inte preleminär !"
@@ -423,6 +411,27 @@ msgstr "Variabel"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "Denna leveransmetod används då fakturering sker utifrån plockningen."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -462,6 +471,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -489,7 +503,7 @@ msgid "Price"
 msgstr "Pris"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Inget i rutnätet matchar denna transportör !"
@@ -506,7 +520,7 @@ msgid "Weight * Volume"
 msgstr "Vikt * Volym"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Transportören %s (id: %d) saknar leveransrutnät!"
@@ -538,12 +552,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -575,6 +584,12 @@ msgstr ""
 msgid "States"
 msgstr "Tillstånd"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -736,6 +751,9 @@ msgstr "Pristyp"
 #~ "återfakturera faktiska leveranskostnader när du fakturerar baserat på "
 #~ "leveransorder"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
diff --git a/addons/delivery/i18n/th.po b/addons/delivery/i18n/th.po
index 387cab533ba..f93c84c8589 100644
--- a/addons/delivery/i18n/th.po
+++ b/addons/delivery/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-17 07:15+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr "น้ำหนักสุทธิ"
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "ใบส่งสินค้า"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -418,6 +406,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index 47ada5397cf..11310c79788 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 9df801d57b2..27fa1653110 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 21:54+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "Net Ağırlık"
 msgid "Delivery Grid Line"
 msgstr "Teslimat Gridi Satırı"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr "Teslimat Servisini veren Cari"
 msgid "Delivery order"
 msgstr "Teslim Emri"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Grid tanımı"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -344,7 +330,9 @@ msgstr "Paket Sayısı"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -369,7 +357,7 @@ msgstr ""
 "yapacaksanız boş bırakın"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "Hiçbir grid mevcut değil!"
@@ -380,7 +368,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "Sipariş taslak modunda değil !"
@@ -428,6 +416,27 @@ msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 "Bu teslimat yöntemi, alımdan faturalandırma yaparken kullanılacaktır."
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -466,6 +475,11 @@ msgstr ""
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -494,7 +508,7 @@ msgid "Price"
 msgstr "Fiyat"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "Bu nakliyeciyle eşleşen hiçbir grid mevcut değil!"
@@ -511,7 +525,7 @@ msgid "Weight * Volume"
 msgstr "Ağırlık * Hacim"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Nakliyeci %s (id: %d) teslimat gridine sahip değil!"
@@ -543,12 +557,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "No"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -580,6 +589,12 @@ msgstr ""
 msgid "States"
 msgstr "Durumlar"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -606,6 +621,9 @@ msgstr "Fiyat Tipi"
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Teslimat Maliyeti Ekle"
 
+#~ msgid "ID"
+#~ msgstr "No"
+
 #~ msgid "Carriers and deliveries"
 #~ msgstr "Nakliyeler ve Teslimatlar"
 
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index dd100030481..a5001d446b1 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:25+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "Визначення сітки"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -417,6 +405,27 @@ msgstr "Змінна"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr "Ціна"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr "Вага * Об'єм"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr "Стани"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index 2c33e0dcd90..7a95a37df0c 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 15:17+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -48,6 +48,12 @@ msgstr ""
 msgid "Delivery Grid Line"
 msgstr ""
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -82,26 +88,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -215,7 +201,7 @@ msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -339,7 +325,9 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -360,7 +348,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -371,7 +359,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -418,6 +406,27 @@ msgstr ""
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -455,6 +464,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -481,7 +495,7 @@ msgid "Price"
 msgstr "Giá"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -498,7 +512,7 @@ msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -530,12 +544,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -566,6 +575,12 @@ msgstr ""
 msgid "States"
 msgstr ""
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index ba8ad1335f3..4d273403411 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-27 03:04+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 04:08+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "净重"
 msgid "Delivery Grid Line"
 msgstr "送货网络明细"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "计量单位"
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,37 +87,6 @@ msgstr "提供送货服务的业务伙伴"
 msgid "Delivery order"
 msgstr "送货单"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                单击 定义一个新的运输方法 \n"
-"              </p><p>\n"
-"                每个承运商人 (比如：UPS，顺风)可以几种运输方法 \n"
-"               (例如：UPS Express, UPS Standard ) ，每种方法可\n"
-"               以有一个定价规则.\n"
-"              </p><p>\n"
-"                在销售订单（基于报价单）或者发票（基于发运单），\n"
-"                这些方法可以根据你的设置自动计算运输价格；\n"
-"              </p>\n"
-"            "
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -232,7 +207,7 @@ msgid "Grid definition"
 msgstr "网络定义"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -356,7 +331,9 @@ msgstr "包装件数"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -377,7 +354,7 @@ msgid ""
 msgstr "默认的运费的价格，如果根据目的地定价，这里留空。"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "没有可用的送货网络"
@@ -388,7 +365,7 @@ msgid ">="
 msgstr ">="
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "单据不在草稿状态！"
@@ -435,6 +412,37 @@ msgstr "变量"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr "这个送货方式会在基于送货单开发票的时候使用。"
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击以定义一个新的运输方法. \n"
+"              </p><p>\n"
+"                每个承运人 (例如 UPS)可以有几种带有不同定价方案的运输方法\n"
+"             （例如UPS Express, UPS Standard).\n"
+"              </p><p>\n"
+"                这些方法允许你根据你的设置自动计算运输价格：在订单上（基\n"
+"                于报价单）或者在发票上（基于发运单）.\n"
+"              </p>\n"
+"            "
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -472,6 +480,11 @@ msgstr "入库"
 msgid "<="
 msgstr "<="
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "重量的计量单位"
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -498,7 +511,7 @@ msgid "Price"
 msgstr "价格"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr "没有送货网络适用于此承运方"
@@ -515,7 +528,7 @@ msgid "Weight * Volume"
 msgstr "重量* 体积"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "承运方 %s (id: %d) 没有送货网络！"
@@ -547,12 +560,7 @@ msgid "Delivery Methods"
 msgstr "运输方法"
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "只能对草稿状态的订单增加送货明细"
@@ -583,6 +591,12 @@ msgstr "打印送货单"
 msgid "States"
 msgstr "状态"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "计量单位 是测量重量的单位"
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -648,6 +662,9 @@ msgstr "价格类型"
 #~ msgid "Carrier and delivery grids"
 #~ msgstr "货运公司和交货表格"
 
+#~ msgid "ID"
+#~ msgstr "ID"
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "增加交货成本"
 
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index f4b6ca5a74b..e52c63081ce 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-27 10:27+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -47,6 +47,12 @@ msgstr "淨重"
 msgid "Delivery Grid Line"
 msgstr "交貨格線"
 
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
@@ -81,26 +87,6 @@ msgstr ""
 msgid "Delivery order"
 msgstr "交貨單"
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sale order (based on the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
@@ -214,7 +200,7 @@ msgid "Grid definition"
 msgstr "格線定義"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -338,7 +324,9 @@ msgstr "包裝數"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: report:sale.shipping:0
+#: view:stock.move:0
 #: field:stock.move,weight:0
+#: view:stock.picking:0
 #: field:stock.picking,weight:0
 #: field:stock.picking.in,weight:0
 #: field:stock.picking.out,weight:0
@@ -359,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid available !"
 msgstr "無可用網格 !"
@@ -370,7 +358,7 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "Order not in draft state !"
 msgstr "訂單不在草稿階段 !"
@@ -417,6 +405,27 @@ msgstr "變量"
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allows to automaticaly compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
@@ -454,6 +463,11 @@ msgstr ""
 msgid "<="
 msgstr ""
 
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
@@ -480,7 +494,7 @@ msgid "Price"
 msgstr "價格"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -497,7 +511,7 @@ msgid "Weight * Volume"
 msgstr "重量 * 體積"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -529,12 +543,7 @@ msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "訂單狀態要是草稿才能添加交貨明細。"
@@ -565,6 +574,12 @@ msgstr ""
 msgid "States"
 msgstr "狀態"
 
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index 09ea05d730f..afe854605fd 100644
--- a/addons/document/i18n/ar.po
+++ b/addons/document/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: walid sayed <mashyuser@hotmail.com>\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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "الدليل الأب"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "الدليل يحتوي علي رموز خاصة"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "لوحة المستندات"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "طرف المعالجات"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "تجميع حسب ..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "نوع محتوي الدليل"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "محتوي الدليل"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "النص التلقائي"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,13 +109,13 @@ msgstr ""
 "الدينامية"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "المسار"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "اسم الدليل يجب أن يكون فريدا"
@@ -158,7 +142,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -169,13 +152,6 @@ msgstr "دلائل"
 msgid "Files details by Users"
 msgstr "الملفات حسب المستخدمين"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "خطأ !"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -227,14 +203,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "دليل الوثيقة"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "التحقق من صلاحية الخطأ"
@@ -251,19 +222,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "الوثائق"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "مخزن"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "نموذج المصدر"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -275,22 +239,20 @@ msgstr "حجم الملف"
 msgid "Content Type"
 msgstr "نوع المحتوي"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "النوع"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -323,11 +285,6 @@ msgstr "إسم حقل"
 msgid "Context fields"
 msgstr "حقول السياق"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "تخزين أسم الملف"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -355,7 +312,7 @@ msgid "Virtual Files"
 msgstr "الملفات التخيلية"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "خطأ في الكتابة علي ملف الورد"
@@ -392,7 +349,6 @@ msgstr "السرية"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "اخر مستخدم قام بالتعديل"
@@ -415,7 +371,6 @@ msgstr "النطاق"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "تاريخ التعديل"
@@ -458,10 +413,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "قم بتعريف كلمات معينة لتظهر في كل الدلائل والملفات الفرعية"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "محتوي التخزين سيظهر لكل المستخدمين في حالة تنشيط هذا الزر"
+#: view:document.directory:0
+msgid "Static"
+msgstr "ثابت"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -471,7 +425,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -490,16 +443,10 @@ msgstr "المحتويات"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "تاريخ الإنشاء"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "معرف المصدر"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -510,17 +457,6 @@ msgstr ""
 "أختر هذا الحقل اذا كنت تريد اسم الملف ليشمل اسم التسجيل.\n"
 "اذا وُضعت سيصبح المجلد مصدر له."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -537,11 +473,6 @@ msgstr "مضمنا أسم الحقل"
 msgid "Model Id"
 msgstr "هوية النموذج"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "مُتصل"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -572,9 +503,9 @@ msgid "August"
 msgstr "أغسطس"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "النص التلقائي"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -588,7 +519,6 @@ msgstr "يونيو"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "المجموعات"
 
@@ -602,11 +532,6 @@ msgstr "نشِط"
 msgid "November"
 msgstr "نوفمبر"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "البيانات"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -635,23 +560,17 @@ msgid "Seq."
 msgstr "التسلسل"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "قاعدة البيانات"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "جميع ملفات المستخدمين"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "يناير"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "للقراءة فقط"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "مسار الوثائق"
 
@@ -667,7 +586,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "المُنشئ"
 
@@ -683,7 +601,6 @@ msgstr ""
 "المستندات."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -705,19 +622,9 @@ msgid "Children"
 msgstr "الادلة الداخلية"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "مخزن الملف الخارجي"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "لتخزين الملفات، المسار الجذري للتخزين"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "معرف المصدر"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -735,28 +642,17 @@ msgid "Parent Model"
 msgstr "موديل الشريك"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-"اسم الحقل. لاحظ أنه سيتم إرفاق مسبقا البادئة \"dctx_\" على ما كتبته هنا."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "هيكل شجري"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr "لاتطبق علي المجموعات الداخلية , لكل مجموعة صلاحيات وصول خاصة بها"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "مايو"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "جميع ملفات المستخدمين"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -772,18 +668,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "ثابت"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr "لاتطبق علي المجموعات الداخلية , لكل مجموعة صلاحيات وصول خاصة بها"
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -810,25 +694,14 @@ msgstr "فبراير"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "الإسم"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "مسار التخزين يجب أن يكون فريدا"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "الحقول"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "للقراءة فقط اذا تم التنشيط"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -841,9 +714,9 @@ msgid "# of Files"
 msgstr "عدد الملفات"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "نوع محتوي الدليل"
 
 #. module: document
 #: view:document.directory:0
@@ -875,9 +748,9 @@ msgid "File Name"
 msgstr "إسم الملف"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "التخزين الداخلي للملف"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "هيكل شجري"
 
 #. module: document
 #: view:document.configuration:0
@@ -896,10 +769,7 @@ msgid "Year"
 msgstr "السنة"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "وسائط التخزين"
 
@@ -923,6 +793,13 @@ msgstr "نوع الوثيقة"
 #~ msgid "This Year"
 #~ msgstr "هذا العام"
 
+#~ msgid "Path"
+#~ msgstr "المسار"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "خطأ !"
+
 #~ msgid "Sale Order"
 #~ msgstr "طلب بيع"
 
@@ -932,6 +809,9 @@ msgstr "نوع الوثيقة"
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "التهيئة التلقائية للدليل المنتجات"
 
+#~ msgid "Document directory"
+#~ msgstr "دليل الوثيقة"
+
 #~ msgid "Configure Resource Directory"
 #~ msgstr "تهيئة الدلائل"
 
@@ -944,6 +824,9 @@ msgstr "نوع الوثيقة"
 #~ msgid "Created"
 #~ msgstr "تمّ إنشاءه"
 
+#~ msgid "Stored Filename"
+#~ msgstr "تخزين أسم الملف"
+
 #~ msgid "Modified"
 #~ msgstr "معدّل"
 
@@ -985,6 +868,10 @@ msgstr "نوع الوثيقة"
 #~ msgid "Image"
 #~ msgstr "صورة"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "محتوي التخزين سيظهر لكل المستخدمين في حالة تنشيط هذا الزر"
+
 #~ msgid "Auto Configure Directory"
 #~ msgstr "التهيئة التلقائية للدليل"
 
@@ -994,12 +881,21 @@ msgstr "نوع الوثيقة"
 #~ msgid "User"
 #~ msgstr "المستخدم"
 
+#~ msgid "Online"
+#~ msgstr "مُتصل"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "التهيئة التلقائية للدليل المشروعات"
 
+#~ msgid "Data"
+#~ msgstr "البيانات"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "نظام ادارة الوثائق المتكامل"
 
+#~ msgid "Database"
+#~ msgstr "قاعدة البيانات"
+
 #~ msgid "Related to"
 #~ msgstr "علاقة مع"
 
@@ -1009,6 +905,9 @@ msgstr "نوع الوثيقة"
 #~ msgid "Dashboard"
 #~ msgstr "اللوحة الرئيسية"
 
+#~ msgid "Read Only"
+#~ msgstr "للقراءة فقط"
+
 #~ msgid "Attached To"
 #~ msgstr "مرفق ل"
 
@@ -1038,6 +937,12 @@ msgstr "نوع الوثيقة"
 #~ msgid "Notes"
 #~ msgstr "ملاحظات"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "للقراءة فقط اذا تم التنشيط"
+
+#~ msgid "Internal File storage"
+#~ msgstr "التخزين الداخلي للملف"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "أسم الملف يجب أن يكون فريدا"
@@ -1051,12 +956,18 @@ msgstr "نوع الوثيقة"
 #~ msgid "Search Document storage"
 #~ msgstr "البحث عن مخزن الوثائق"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "مسار التخزين يجب أن يكون فريدا"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "سير الإعدادات"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "خطأ ! لايمكنك إنشاء مسارات متداخلة."
 
+#~ msgid "Storage"
+#~ msgstr "مخزن"
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(نسخة)"
@@ -1073,6 +984,9 @@ msgstr "نوع الوثيقة"
 #~ msgid "Files details by Partners"
 #~ msgstr "تفاصيل ملفات الشركاء"
 
+#~ msgid "External file storage"
+#~ msgstr "مخزن الملف الخارجي"
+
 #~ msgid "Files By Partner"
 #~ msgstr "ملفات الشريك"
 
@@ -1083,6 +997,15 @@ msgstr "نوع الوثيقة"
 #~ msgid "Last Posted Time"
 #~ msgstr "وقت أخر موضوع"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "لتخزين الملفات، المسار الجذري للتخزين"
+
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "اسم الحقل. لاحظ أنه سيتم إرفاق مسبقا البادئة \"dctx_\" على ما كتبته هنا."
+
 #~ msgid "Knowledge Management"
 #~ msgstr "إدارة المعارف"
 
@@ -1092,5 +1015,11 @@ msgstr "نوع الوثيقة"
 #~ msgid "All Months Files"
 #~ msgstr "ملفات كل الشهور"
 
+#~ msgid "Document board"
+#~ msgstr "لوحة المستندات"
+
 #~ msgid "Indexed Content - experimental"
 #~ msgstr "المحتويات المفهرسة - تجريبية"
+
+#~ msgid "Process Node"
+#~ msgstr "طرف المعالجات"
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index 66b07075a92..07aa737dc4d 100644
--- a/addons/document/i18n/bg.po
+++ b/addons/document/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Горна директория"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Името на директорията съдържа специални символи!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Групирай по"
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Тип на съдържанието в директорията"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr "Съдържание на директорията"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Път"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Името на директорията трябва да бъде уникално!"
@@ -154,7 +138,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -165,13 +148,6 @@ msgstr "Директории"
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Грешка!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -223,14 +199,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Директория с документи"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -247,19 +218,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Документи"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Хранилище"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -271,22 +235,20 @@ msgstr "Размер на файл"
 msgid "Content Type"
 msgstr "Вид съдържание"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -319,11 +281,6 @@ msgstr "Име на поле"
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -351,7 +308,7 @@ msgid "Virtual Files"
 msgstr "Виртуални файлове"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Грешка при писане!"
@@ -386,7 +343,6 @@ msgstr "Сигурност"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -409,7 +365,6 @@ msgstr "Домейн"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Дата на промяна"
@@ -452,12 +407,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Ако не в отметнато, медията в момента е извън линия съдържанието й не е "
-"налично"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Статичен"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -467,7 +419,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -486,16 +437,10 @@ msgstr "Съдържание"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Дата на създаване"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Идентификатор на ресурса"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -504,17 +449,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -531,11 +465,6 @@ msgstr ""
 msgid "Model Id"
 msgstr "Модел ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Режим „На линия“"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -563,8 +492,8 @@ msgid "August"
 msgstr "Август"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -579,7 +508,6 @@ msgstr "Юни"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Групи"
 
@@ -593,11 +521,6 @@ msgstr "Активен"
 msgid "November"
 msgstr "Ноември"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Данни"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -623,23 +546,17 @@ msgid "Seq."
 msgstr "Посл."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "База данни"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr ""
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Януари"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Само за четене"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -655,7 +572,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Създател"
 
@@ -669,7 +585,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -691,19 +606,9 @@ msgid "Children"
 msgstr "Деца"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Идентификатор на ресурса"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -721,27 +626,17 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Дървовидна структура"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Май"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -757,18 +652,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Статичен"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -791,25 +674,14 @@ msgstr "Февруари"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Име"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Полета"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -822,9 +694,9 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Тип на съдържанието в директорията"
 
 #. module: document
 #: view:document.directory:0
@@ -856,9 +728,9 @@ msgid "File Name"
 msgstr "Име на файл"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Дървовидна структура"
 
 #. module: document
 #: view:document.configuration:0
@@ -877,10 +749,7 @@ msgid "Year"
 msgstr "Година"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Носители"
 
@@ -895,6 +764,9 @@ msgstr "Тип на документа"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Невалиден XML за преглед на архитектурата"
 
+#~ msgid "Data"
+#~ msgstr "Данни"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -916,6 +788,13 @@ msgstr "Тип на документа"
 #~ msgid "This Year"
 #~ msgstr "Тази година"
 
+#~ msgid "Path"
+#~ msgstr "Път"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Грешка!"
+
 #~ msgid "Sale Order"
 #~ msgstr "Поръчка за продажба"
 
@@ -925,12 +804,18 @@ msgstr "Тип на документа"
 #~ msgid "Files by Users"
 #~ msgstr "Файлове от потребителя"
 
+#~ msgid "Document directory"
+#~ msgstr "Директория с документи"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Грешка! Не мжете да създавате директории реурсивно."
 
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Настройки на директория с ресурси"
 
+#~ msgid "Storage"
+#~ msgstr "Хранилище"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Файлове за партньор"
 
@@ -955,12 +840,21 @@ msgstr "Тип на документа"
 #~ msgid "Attachment"
 #~ msgstr "Прикрепен файл"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Ако не в отметнато, медията в момента е извън линия съдържанието й не е "
+#~ "налично"
+
 #~ msgid "Auto Configure Directory"
 #~ msgstr "Автоматично конфигуриране на директория"
 
 #~ msgid "User"
 #~ msgstr "Потребител"
 
+#~ msgid "Online"
+#~ msgstr "Режим „На линия“"
+
 #~ msgid "Related to"
 #~ msgstr "Свързан със"
 
@@ -970,12 +864,18 @@ msgstr "Тип на документа"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Автоматична конфигурация на директория за проекти"
 
+#~ msgid "Database"
+#~ msgstr "База данни"
+
 #~ msgid "Files By Users"
 #~ msgstr "Фаилове за потребител"
 
 #~ msgid "Dashboard"
 #~ msgstr "Табло"
 
+#~ msgid "Read Only"
+#~ msgstr "Само за четене"
+
 #~ msgid "Attached To"
 #~ msgstr "Прикрепен към"
 
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index a1a1b48d69d..643963dbcdb 100644
--- a/addons/document/i18n/bs.po
+++ b/addons/document/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 06:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,13 +41,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -407,7 +363,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -450,9 +405,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,8 +490,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -575,7 +506,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -589,11 +519,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,8 +544,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -628,14 +553,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,18 +604,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -717,15 +624,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -733,11 +635,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,8 +692,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -852,8 +726,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index 7881a6e5e98..478f24b69ff 100644
--- a/addons/document/i18n/ca.po
+++ b/addons/document/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Directori pare"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "El nom del directori conté caràcters especials!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Tauler de documents"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Node procés"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupa per..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipus de contingut del directori"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Contingut directori"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Context dinàmic"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "referència al registre actual en directoris dinàmics."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ruta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "El nom del directori ha de ser únic!"
@@ -160,7 +144,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -171,13 +154,6 @@ msgstr "Directoris"
 msgid "Files details by Users"
 msgstr "Fitxers detallats per usuaris"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Error!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -229,14 +205,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directori document"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validació"
@@ -253,19 +224,12 @@ msgstr "ir.accions.informe.xml"
 msgid "Documents"
 msgstr "Documents"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Emmagatzematge"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Model de recurs"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -277,22 +241,20 @@ msgstr "Mida del fitxer"
 msgid "Content Type"
 msgstr "Tipus de contingut"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipus"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -329,11 +291,6 @@ msgstr "Camp nom"
 msgid "Context fields"
 msgstr "Camps de contexte"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nom del fitxer desat"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -361,7 +318,7 @@ msgid "Virtual Files"
 msgstr "Fitxers virtuals"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Error d'escriptura en el document!"
@@ -396,7 +353,6 @@ msgstr "Seguretat"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuari última modificació"
@@ -419,7 +375,6 @@ msgstr "Domini"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data de modificació"
@@ -463,12 +418,9 @@ msgstr ""
 "Defineix paraules en el context per a tots els directoris i fitxers fills"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Si no es marca, el mitjà d'emmagatzematge està actualment fora de línia i el "
-"seu contingut no està disponible."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estàtic"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -478,7 +430,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -497,16 +448,10 @@ msgstr "Continguts"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data creació"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID recurs"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -518,17 +463,6 @@ msgstr ""
 "registre.\n"
 "Si està marcat, el directori té que ser un recurs."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -545,11 +479,6 @@ msgstr "Incloure nom de registre"
 msgid "Model Id"
 msgstr "ID model"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "En línia"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -581,9 +510,9 @@ msgid "August"
 msgstr "Agost"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Context dinàmic"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -597,7 +526,6 @@ msgstr "Juny"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grups"
 
@@ -611,11 +539,6 @@ msgstr "Actiu"
 msgid "November"
 msgstr "Novembre"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Dades"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -645,23 +568,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de dades"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Fitxers de tots els usuaris"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Gener"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Només de lectura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -677,7 +594,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -691,7 +607,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -713,19 +628,9 @@ msgid "Children"
 msgstr "Fills"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Emmagatzematge extern"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Per a l'emmagatzematge de fitxers, la ruta arrel on s'emmagatzemen."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID recurs"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -743,29 +648,19 @@ msgid "Parent Model"
 msgstr "Model pare"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"El nom del fitxer. Tingueu en compte que el prefix \"dctx_\" es posarà al "
-"davant del que escriviu aquí."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estructura arbre"
+"Però, aquests grups no s'apliquen als directoris fills, els quals han de "
+"definir el seus propis grups."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maig"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Fitxers de tots els usuaris"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -782,20 +677,6 @@ msgstr "ir.adjunt"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estàtic"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Però, aquests grups no s'apliquen als directoris fills, els quals han de "
-"definir el seus propis grups."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -823,25 +704,14 @@ msgstr "Febrer"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nom"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "La ruta d'emmagatzematge ha de ser única!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Camps"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Si està marcat, el mitjà d'emmagatzematge només és de lectura."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -854,9 +724,9 @@ msgid "# of Files"
 msgstr "Núm. de fitxers"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipus de contingut del directori"
 
 #. module: document
 #: view:document.directory:0
@@ -890,9 +760,9 @@ msgid "File Name"
 msgstr "Nom del fitxer"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Emmagatzematge intern"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura arbre"
 
 #. module: document
 #: view:document.configuration:0
@@ -911,10 +781,7 @@ msgid "Year"
 msgstr "Any"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Suports d'emmagatzematge"
 
@@ -962,6 +829,9 @@ msgstr "Tipus de document"
 #~ msgid "Browse Files"
 #~ msgstr "Navega pels fitxers"
 
+#~ msgid "Document directory"
+#~ msgstr "Directori document"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Error! No podeu crear directoris recursius."
 
@@ -974,6 +844,9 @@ msgstr "Tipus de document"
 #~ msgid "Server Address"
 #~ msgstr "Adreça del servidor"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nom del fitxer desat"
+
 #~ msgid "Link"
 #~ msgstr "Enllaç"
 
@@ -1001,6 +874,12 @@ msgstr "Tipus de document"
 #~ msgid "Configure"
 #~ msgstr "Configuració"
 
+#~ msgid "Data"
+#~ msgstr "Dades"
+
+#~ msgid "Database"
+#~ msgstr "Base de dades"
+
 #~ msgid "Others Info"
 #~ msgstr "Altres info."
 
@@ -1073,6 +952,10 @@ msgstr "Tipus de document"
 #~ msgid "Auto-Generated Files"
 #~ msgstr "Fitxers auto-generats"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Error!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "El nom de fitxer ha de ser únic!"
@@ -1119,9 +1002,18 @@ msgstr "Tipus de document"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Configuració automàtica de directoris"
 
+#~ msgid "Document board"
+#~ msgstr "Tauler de documents"
+
+#~ msgid "Process Node"
+#~ msgstr "Node procés"
+
 #~ msgid "This Year"
 #~ msgstr "Aquest any"
 
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configuració automàtica dels directoris per a productes."
 
@@ -1155,6 +1047,9 @@ msgstr "Tipus de document"
 #~ msgid "Files by Partner"
 #~ msgstr "Fitxers per empresa"
 
+#~ msgid "Online"
+#~ msgstr "En línia"
+
 #~ msgid ""
 #~ "This is a complete document management system:\n"
 #~ "    * User Authentication\n"
@@ -1190,6 +1085,12 @@ msgstr "Tipus de document"
 #~ "la base de dades,\n"
 #~ "      sinó en el directori arrel del servidor com /server/bin/filestore.\n"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Si no es marca, el mitjà d'emmagatzematge està actualment fora de línia i el "
+#~ "seu contingut no està disponible."
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progrés de la configuració"
 
@@ -1206,6 +1107,15 @@ msgstr "Tipus de document"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configuració automàtica de directoris per a projectes."
 
+#~ msgid "Read Only"
+#~ msgstr "Només de lectura"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Per a l'emmagatzematge de fitxers, la ruta arrel on s'emmagatzemen."
+
+#~ msgid "External file storage"
+#~ msgstr "Emmagatzematge extern"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1219,6 +1129,9 @@ msgstr "Tipus de document"
 #~ msgid "Product"
 #~ msgstr "Producte"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Si està marcat, el mitjà d'emmagatzematge només és de lectura."
+
 #~ msgid "Statistics by User"
 #~ msgstr "Estadístiques per usuari"
 
@@ -1228,6 +1141,15 @@ msgstr "Tipus de document"
 #~ "Configuració automàtica de directoris per a pressupostos i comandes de venda "
 #~ "amb informes."
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "La ruta d'emmagatzematge ha de ser única!"
+
+#~ msgid "Storage"
+#~ msgstr "Emmagatzematge"
+
+#~ msgid "Internal File storage"
+#~ msgstr "Emmagatzematge intern"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Cercar emmagatzematge documents"
 
@@ -1237,6 +1159,13 @@ msgstr "Tipus de document"
 #~ msgid "Dashboard"
 #~ msgstr "Taulell"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "El nom del fitxer. Tingueu en compte que el prefix \"dctx_\" es posarà al "
+#~ "davant del que escriviu aquí."
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(copia)"
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index a4db40cf029..07fd7e1306a 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:49+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: document
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Nadřazená složka"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Název adresáře obsahuje nepovolené znaky!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Nástěnka dokumentů"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Uzel procesu"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Seskupit podle..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Typ obsahu adresáře"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Obsah adresáře"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynamický kontext"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "odkaz na aktuální záznam, v dynamických složkách"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Cesta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Název adresáře musí být unikátní!"
@@ -160,7 +144,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -171,13 +154,6 @@ msgstr "Adresáře"
 msgid "Files details by Users"
 msgstr "Detaily souborů podle uživatelů"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Chyba!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -229,14 +205,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Adresář s dokumenty"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Chyba kontroly"
@@ -253,19 +224,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokumenty"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Úložiště"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Model zdroje"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -277,22 +241,20 @@ msgstr "Velikost souboru"
 msgid "Content Type"
 msgstr "Typ obsahu"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,11 +289,6 @@ msgstr "Pole názvu"
 msgid "Context fields"
 msgstr "Pole obsahu"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Uložené jméno souboru"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -359,7 +316,7 @@ msgid "Virtual Files"
 msgstr "Virtuální soubory"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Chyba při zápisu dokumentu!"
@@ -396,7 +353,6 @@ msgstr "Zabezpečení"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Naposledy upraveno uživatelem"
@@ -419,7 +375,6 @@ msgstr "Doména"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum změny"
@@ -462,11 +417,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Definuje slova v kontextu, pro všechny podřízené adresáře a soubory"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Pokud není zaškrtnuto, médium je aktuálně offline a jeho obsahu nedostupný"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statický"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -476,7 +429,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -495,16 +447,10 @@ msgstr "Obsah"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Datum vytvoření"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID zdroje"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -516,17 +462,6 @@ msgstr ""
 "záznamu.\n"
 "Pokud je nastavení, adresář bude jako zdroje."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -543,11 +478,6 @@ msgstr "Začlenit název záznamu"
 msgid "Model Id"
 msgstr "ID modulu"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -579,9 +509,9 @@ msgid "August"
 msgstr "Srpen"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamický kontext"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -595,7 +525,6 @@ msgstr "Červen"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -609,11 +538,6 @@ msgstr "Aktivní"
 msgid "November"
 msgstr "Listopad"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Data"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -643,23 +567,17 @@ msgid "Seq."
 msgstr "Poř."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Databáze"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Soubory všech uživatelů"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Leden"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Pouze ke čtení"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Adresář dokumentů"
 
@@ -675,7 +593,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Tvůrce"
 
@@ -693,7 +610,6 @@ msgstr ""
 "Tento nástroj vytvoří automaticky adresář podle instalovaných modulů."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -715,19 +631,9 @@ msgid "Children"
 msgstr "Potomci"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Externí úložiště souborů"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Pro úložiště souborů - kořenový adresář"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID zdroje"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -745,29 +651,19 @@ msgid "Parent Model"
 msgstr "Nadřazený model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Název pole. Mějte na paměti, že před to, co sem napíšete, bude vložena "
-"předpona \"dctx_\"."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Stromová struktura"
+"Tyto skupiny se ale nevztahují k podřízeným adresářům, které musí mít "
+"definovány vlastní skupiny."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Květen"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Soubory všech uživatelů"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -784,20 +680,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statický"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Tyto skupiny se ale nevztahují k podřízeným adresářům, které musí mít "
-"definovány vlastní skupiny."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -825,25 +707,14 @@ msgstr "Únor"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Název"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Cesta úložiště musí být unikátní!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Pole"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Pokud je toto nastaveno, médium je jen pro čtení"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -856,9 +727,9 @@ msgid "# of Files"
 msgstr "Počet souborů"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Typ obsahu adresáře"
 
 #. module: document
 #: view:document.directory:0
@@ -891,9 +762,9 @@ msgid "File Name"
 msgstr "Název souboru"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Interní úložiště souborů"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Stromová struktura"
 
 #. module: document
 #: view:document.configuration:0
@@ -912,10 +783,7 @@ msgid "Year"
 msgstr "Rok"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Úložné zařízení"
 
@@ -950,6 +818,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalidní XML pro zobrazení architektury!"
 
+#~ msgid "Database"
+#~ msgstr "Databáze"
+
 #~ msgid "Storing Method"
 #~ msgstr "Způsob skladování"
 
@@ -974,6 +845,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Automatická konfigurace adresářů"
 
+#~ msgid "Process Node"
+#~ msgstr "Uzel procesu"
+
 #~ msgid "Files per Month"
 #~ msgstr "Souborů za měsíc"
 
@@ -983,21 +857,37 @@ msgstr "Typ dokumentu"
 #~ msgid "This Year"
 #~ msgstr "Letos"
 
+#~ msgid "Path"
+#~ msgstr "Cesta"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Chyba!"
+
 #~ msgid "Project"
 #~ msgstr "Projekt"
 
 #~ msgid "Files by Users"
 #~ msgstr "Soubory podle uživatelů"
 
+#~ msgid "Document directory"
+#~ msgstr "Adresář s dokumenty"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Chyba! Nemůžete vytvářet rekurzivní adresáře."
 
+#~ msgid "Storage"
+#~ msgstr "Úložiště"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Soubory podle partnerů"
 
 #~ msgid "Created"
 #~ msgstr "Vytvořeno"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Uložené jméno souboru"
+
 #~ msgid "Modified"
 #~ msgstr "Změněno"
 
@@ -1013,15 +903,27 @@ msgstr "Typ dokumentu"
 #~ msgid "User"
 #~ msgstr "Uživatel"
 
+#~ msgid "Online"
+#~ msgstr "Online"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Automatická konfigurace adresářů pro projekty."
 
+#~ msgid "Data"
+#~ msgstr "Data"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integrovaný systém správy dokumentů"
 
+#~ msgid "Read Only"
+#~ msgstr "Pouze ke čtení"
+
 #~ msgid "Files By Users"
 #~ msgstr "Soubory podle uživatelů"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Pro úložiště souborů - kořenový adresář"
+
 #~ msgid "Last Posted Time"
 #~ msgstr "Čas posledního odeslání"
 
@@ -1031,6 +933,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Files details by Partners"
 #~ msgstr "Detaily souborů podle partnerů"
 
+#~ msgid "External file storage"
+#~ msgstr "Externí úložiště souborů"
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Uživatelé, kteří měsíc neuložili žádný soubor"
 
@@ -1040,6 +945,13 @@ msgstr "Typ dokumentu"
 #~ msgid "This Month"
 #~ msgstr "Tento měsíc"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Název pole. Mějte na paměti, že před to, co sem napíšete, bude vložena "
+#~ "předpona \"dctx_\"."
+
 #~ msgid "New Files"
 #~ msgstr "Nové soubory"
 
@@ -1053,6 +965,9 @@ msgstr "Typ dokumentu"
 #~ "Úložiště Documents vám umožňuje přístup ke všem přílohám, jako jsou maily, "
 #~ "projektové dokumenty, faktury atd."
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Pokud je toto nastaveno, médium je jen pro čtení"
+
 #~ msgid "Statistics by User"
 #~ msgstr "Statistika podle uživatelů"
 
@@ -1068,6 +983,9 @@ msgstr "Typ dokumentu"
 #~ msgid "(copy)"
 #~ msgstr "(kopie)"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Interní úložiště souborů"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Adresář musí mít rodiče nebo úložiště"
 
@@ -1077,6 +995,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Search Document storage"
 #~ msgstr "Hledej v úložišti dokumentů"
 
+#~ msgid "Document board"
+#~ msgstr "Nástěnka dokumentů"
+
 #~ msgid "Sale Order"
 #~ msgstr "Prodejní objednávka"
 
@@ -1126,6 +1047,11 @@ msgstr "Typ dokumentu"
 #~ "    - Po instalaci tohoto modulu dále nejsou PDF uchovány v databázi,\n"
 #~ "      ale na serveru v adresáři jako /server/bin/filestore.\n"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Pokud není zaškrtnuto, médium je aktuálně offline a jeho obsahu nedostupný"
+
 #~ msgid "Related to"
 #~ msgstr "Souvisí s"
 
@@ -1144,6 +1070,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Product"
 #~ msgstr "Výrobek"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Cesta úložiště musí být unikátní!"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "Správa znalostí"
 
diff --git a/addons/document/i18n/da.po b/addons/document/i18n/da.po
index 3528a9131a5..34b1e8d7eb0 100644
--- a/addons/document/i18n/da.po
+++ b/addons/document/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,18 +605,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 2c01deed1e1..4a4de88d1c4 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 22:12+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Hauptverzeichnis"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Der Verzeichnisname enthält spezielle Zeichen!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Pinnwand Dokumente"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Prozessknoten"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "Verzeichnis sollte entweder Oberverzeichnis oder Speicher haben"
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Verzeichnis Inhaltsstyp"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Modifikation"
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Inhaltsverzeichnis"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynamischer Kontext"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Meine Dokumente"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -128,13 +112,13 @@ msgstr ""
 "werden."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Pfad"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Verzeichnisname muss eindeutig sein"
@@ -161,7 +145,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -172,13 +155,6 @@ msgstr "Verzeichnisse"
 msgid "Files details by Users"
 msgstr "Dokumenteninhalt nach Benutzer"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -237,14 +213,9 @@ msgstr ""
 "        "
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokumentenverzeichnis"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "ValidierungsFehler"
@@ -261,19 +232,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokumente"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Speicher"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Ressourcenmodell"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -285,22 +249,20 @@ msgstr "Datei Grösse"
 msgid "Content Type"
 msgstr "Berichtsinhalt"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Modifikation"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copy)"
@@ -337,11 +299,6 @@ msgstr "Namensfeld"
 msgid "Context fields"
 msgstr "Kontext Felder"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Abgespeicherter Dateiname"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -369,7 +326,7 @@ msgid "Virtual Files"
 msgstr "Virtuelle Dokumente"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Schreibe eine Dokumentation"
@@ -406,7 +363,6 @@ msgstr "Sicherheit"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Letzte Änderung"
@@ -429,7 +385,6 @@ msgstr "Domain"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Änderungsdatum"
@@ -474,12 +429,9 @@ msgstr ""
 "berücksichtigt werden"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Wenn keine Aktivierung erfolgt, sind die Medien aktuell offline und deren "
-"Inhalt"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statisches Verzeichnis"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -489,7 +441,6 @@ msgstr "unbekannt"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -508,16 +459,10 @@ msgstr "Inhalte"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Erstellt am"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Ressource ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -529,17 +474,6 @@ msgstr ""
 "beinhalten soll.\n"
 "Falls aktiviert, muss das Verzeichnis vom Typ"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Knowledge"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Dokumenten Speicher"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -556,11 +490,6 @@ msgstr "Inklusive Beitragsbezeichnung"
 msgid "Model Id"
 msgstr "Vorlage ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -592,9 +521,9 @@ msgid "August"
 msgstr "August"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Meine Dokumente"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamischer Kontext"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -608,7 +537,6 @@ msgstr "Juni"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -622,11 +550,6 @@ msgstr "Aktiv"
 msgid "November"
 msgstr "November"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Persönliche Daten"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -656,23 +579,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Datenbank"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Alle Benutzer Dokumente"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "NUR LESEN"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Dokumentenverzeichnis"
 
@@ -688,7 +605,6 @@ msgstr "Anhänge"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Urheber"
 
@@ -707,7 +623,6 @@ msgstr ""
 "angelegt."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -729,20 +644,9 @@ msgid "Children"
 msgstr "Kindelemente"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Dateien nach Benutzer"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Externer Dateispeicher"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
-"Zur Speicherung von Dateien, der Root Pfad für diesen Dokumentenspeicher"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Ressource ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -760,29 +664,19 @@ msgid "Parent Model"
 msgstr "Hauptvorlage"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Der Name des Feldes. Bitte beachten Sie das Präfix 'dctx_' wird dem "
-"vorangestellt, was hier eingegeben wird."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Baumstruktur"
+"Diese Gruppen können jedoch nicht bei Unterverzeichnisse angewendt werden, "
+"die über die eigenen Gruppen zu definieren ist."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Alle Benutzer Dokumente"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -799,20 +693,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr "Benutzer Datei"
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statisches Verzeichnis"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Diese Gruppen können jedoch nicht bei Unterverzeichnisse angewendt werden, "
-"die über die eigenen Gruppen zu definieren ist."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -841,25 +721,14 @@ msgstr "Februar"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Der Speicherpfad muss eindeutig sein!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Felder"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Falls aktiviert, sind die Medien lediglich mit Leserechten versehen."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -872,9 +741,9 @@ msgid "# of Files"
 msgstr "# Dokumente"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Suche Dokumentenspeicher"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Verzeichnis Inhaltsstyp"
 
 #. module: document
 #: view:document.directory:0
@@ -908,9 +777,9 @@ msgid "File Name"
 msgstr "Dokumentenbezeichnung"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Interner Dateispeicher"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Baumstruktur"
 
 #. module: document
 #: view:document.configuration:0
@@ -929,10 +798,7 @@ msgid "Year"
 msgstr "Jahr"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Speicher Medien"
 
@@ -980,6 +846,9 @@ msgstr "Dokumententyp"
 #~ msgid "Browse Files"
 #~ msgstr "Dateien durchsuchen"
 
+#~ msgid "Document directory"
+#~ msgstr "Dokumentenverzeichnis"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
 
@@ -992,6 +861,9 @@ msgstr "Dokumententyp"
 #~ msgid "Server Address"
 #~ msgstr "Serveradresse"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Abgespeicherter Dateiname"
+
 #~ msgid "Link"
 #~ msgstr "Link"
 
@@ -1028,6 +900,12 @@ msgstr "Dokumententyp"
 #~ msgid "Configure"
 #~ msgstr "Konfiguriere"
 
+#~ msgid "Data"
+#~ msgstr "Persönliche Daten"
+
+#~ msgid "Database"
+#~ msgstr "Datenbank"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integrierte Dokumentenverwaltung"
 
@@ -1128,24 +1006,40 @@ msgstr "Dokumententyp"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Auto Konfigurator Verzeichnisse"
 
+#~ msgid "Document board"
+#~ msgstr "Pinnwand Dokumente"
+
+#~ msgid "Process Node"
+#~ msgstr "Prozessknoten"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #~ msgid "This Year"
 #~ msgstr "Akt. Jahr"
 
+#~ msgid "Path"
+#~ msgstr "Pfad"
+
 #~ msgid "Sale Order"
 #~ msgstr "Verkaufsauftrag"
 
 #~ msgid "Project"
 #~ msgstr "Projekt"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Fehler!"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Automatisches Verzeichnis für Produkte"
 
 #~ msgid "Files by Users"
 #~ msgstr "Dokumente nach Benutzern"
 
+#~ msgid "Storage"
+#~ msgstr "Speicher"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Dokumente nach Partnern"
 
@@ -1202,6 +1096,15 @@ msgstr "Dokumententyp"
 #~ "Datenbank gespeichert,\n"
 #~ "   sondern im Server Rootverzeichnis, z.B. /server/bin/filestore.\n"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Wenn keine Aktivierung erfolgt, sind die Medien aktuell offline und deren "
+#~ "Inhalt"
+
+#~ msgid "Online"
+#~ msgstr "Online"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Automatische Verzeichnis Konfiguration für Projekte."
 
@@ -1211,12 +1114,29 @@ msgstr "Dokumententyp"
 #~ msgid "Dashboard"
 #~ msgstr "Pinnwand"
 
+#~ msgid "Read Only"
+#~ msgstr "NUR LESEN"
+
+#~ msgid "External file storage"
+#~ msgstr "Externer Dateispeicher"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr ""
+#~ "Zur Speicherung von Dateien, der Root Pfad für diesen Dokumentenspeicher"
+
 #~ msgid "Product"
 #~ msgstr "Produkt"
 
 #~ msgid "New Files"
 #~ msgstr "Neue Dateien"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Der Name des Feldes. Bitte beachten Sie das Präfix 'dctx_' wird dem "
+#~ "vorangestellt, was hier eingegeben wird."
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
@@ -1226,10 +1146,16 @@ msgstr "Dokumententyp"
 #~ msgid "Statistics by User"
 #~ msgstr "Statistik nach Benutzern"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Falls aktiviert, sind die Medien lediglich mit Leserechten versehen."
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Datei muss eindeutig benannt sein!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Interner Dateispeicher"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Suche Dokumentenspeicher"
 
@@ -1245,6 +1171,9 @@ msgstr "Dokumententyp"
 #~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
 #~ "haben"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Der Speicherpfad muss eindeutig sein!"
+
 #~ msgid "Choose the following Resouces to auto directory configuration."
 #~ msgstr "Wählen Sie die folgenden Ressourcen für eine automatische Anbindung."
 
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index e9ecf1df596..36a70bbaf58 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:42+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Γονικός κατάλογος"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Το όνομα του φακέλλου περιέχει ειδικούς χαρακτήρες!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Πίνακας εγγράφου"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Κόμβος Διεργασίας"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Ομαδοποίηση ανά..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Τύπος Περιεχόμενου Φακέλου"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "Περιεχόμενο Φακέλου"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Δυναμικό Περιεχόμενο"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Διαδρομή"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Το όνομα του φακέλου θα πρέπει να είναι μοναδικό!"
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr "Φάκελλοι"
 msgid "Files details by Users"
 msgstr "Λεπτομέρειες Αρχείων από Χρήστες"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Σφάλμα!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Φάκελος Εγγράφου"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr "Έγγραφα"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Αποθηκευτικός χώρος"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr "Μέγεθος Αρχείου"
 msgid "Content Type"
 msgstr "Τύπος Περιεχόμενου"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Τύπος"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -320,11 +282,6 @@ msgstr "Όνομα πεδίου"
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Αποθηκευμένο Όνομα Αρχείου"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -352,7 +309,7 @@ msgid "Virtual Files"
 msgstr "Εικονικά Αρχεία"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -387,7 +344,6 @@ msgstr "Ασφάλεια"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Τελευταίος Χρήστης Τροποποίησης"
@@ -410,7 +366,6 @@ msgstr "Τομέας"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Ημερομηνία Τροποποίησης"
@@ -453,10 +408,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
+#: view:document.directory:0
+msgid "Static"
+msgstr "Στατικό"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -466,7 +420,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -485,16 +438,10 @@ msgstr "Περιεχόμενα"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Ημερομηνία Δημιουργίας"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Κωδ. Πόρου"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -503,17 +450,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -530,11 +466,6 @@ msgstr "Συμπερίληψη Ονόματος Εγγραφής"
 msgid "Model Id"
 msgstr "Κωδ. Μοντέλου"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Σε σύνδεση"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -564,9 +495,9 @@ msgid "August"
 msgstr "Αύγουστος"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Δυναμικό Περιεχόμενο"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -580,7 +511,6 @@ msgstr "Ιούνιος"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Ομάδες"
 
@@ -594,11 +524,6 @@ msgstr "Ενεργό"
 msgid "November"
 msgstr "Νοέμβριος"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Πληροφορία"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -624,23 +549,17 @@ msgid "Seq."
 msgstr "Αλληλ."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Βάση Δεδομένων"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Όλα τα αρχεία Χρήστη"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Ιανουάριος"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Μόνο για Ανάγνωση"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -656,7 +575,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Δημιουργός"
 
@@ -670,7 +588,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -692,19 +609,9 @@ msgid "Children"
 msgstr "Υποκατηγορίες"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Κωδ. Πόρου"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -722,27 +629,17 @@ msgid "Parent Model"
 msgstr "Μοντέλο Γονέα"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Δομή Δένδρου"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Μάιος"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Όλα τα αρχεία Χρήστη"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -758,18 +655,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Στατικό"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -792,25 +677,14 @@ msgstr "Φεβρουάριος"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Όνομα"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Πεδία"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -823,9 +697,9 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Τύπος Περιεχόμενου Φακέλου"
 
 #. module: document
 #: view:document.directory:0
@@ -857,9 +731,9 @@ msgid "File Name"
 msgstr "Όνομα Αρχείου"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Δομή Δένδρου"
 
 #. module: document
 #: view:document.configuration:0
@@ -878,10 +752,7 @@ msgid "Year"
 msgstr "Έτος"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Μέσο αποθήκευσης"
 
@@ -941,6 +812,9 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "Resource Title"
 #~ msgstr "Τίτλος Πόρου"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Αποθηκευμένο Όνομα Αρχείου"
+
 #~ msgid "Link"
 #~ msgstr "Σύνδεση"
 
@@ -973,6 +847,9 @@ msgstr "Τύπος Εγγράφου"
 #~ "Τοποθετήστε εδώ την διεύθυνση του διακομιστή ή την IP. Διατηρήστε το "
 #~ "localhost εάν δεν γνωρίζετε τί να γράψετε."
 
+#~ msgid "Data"
+#~ msgstr "Πληροφορία"
+
 #~ msgid "Notes"
 #~ msgstr "Σημειώσεις"
 
@@ -990,6 +867,9 @@ msgstr "Τύπος Εγγράφου"
 #~ "    * User Authentication\n"
 #~ "    * Document Indexation\n"
 
+#~ msgid "Database"
+#~ msgstr "Βάση Δεδομένων"
+
 #~ msgid "Filesystem"
 #~ msgstr "Σύστημα Αρχείων"
 
@@ -1002,6 +882,9 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "Attached To"
 #~ msgstr "Επισυναπτόμενο σε"
 
+#~ msgid "Document directory"
+#~ msgstr "Φάκελος Εγγράφου"
+
 #~ msgid "History"
 #~ msgstr "Ιστορικό"
 
@@ -1043,9 +926,18 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
+#~ msgid "Document board"
+#~ msgstr "Πίνακας εγγράφου"
+
+#~ msgid "Process Node"
+#~ msgstr "Κόμβος Διεργασίας"
+
 #~ msgid "Files per Month"
 #~ msgstr "Αρχεία ανά Μήνα"
 
+#~ msgid "Path"
+#~ msgstr "Διαδρομή"
+
 #~ msgid "Sale Order"
 #~ msgstr "Εντολή Πώλησης"
 
@@ -1055,6 +947,10 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "This Year"
 #~ msgstr "Αυτό το έτος"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Σφάλμα!"
+
 #~ msgid "Project"
 #~ msgstr "Έργο"
 
@@ -1064,6 +960,9 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "Files Per Partner"
 #~ msgstr "Αρχεία ανά Συνεργάτη"
 
+#~ msgid "Storage"
+#~ msgstr "Αποθηκευτικός χώρος"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Πίνακας Εγγραφών"
 
@@ -1079,6 +978,9 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "Configuration Progress"
 #~ msgstr "Πρόοδος Παραμετροποίησης"
 
+#~ msgid "Online"
+#~ msgstr "Σε σύνδεση"
+
 #~ msgid "Image"
 #~ msgstr "Εικόνα"
 
@@ -1094,6 +996,9 @@ msgstr "Τύπος Εγγράφου"
 #~ msgid "Related to"
 #~ msgstr "Συσχετίζεται με"
 
+#~ msgid "Read Only"
+#~ msgstr "Μόνο για Ανάγνωση"
+
 #~ msgid "Wall of Shame"
 #~ msgstr "Τείχος της Ντροπής"
 
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index cd51dbfd928..060ea1c494a 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-12 10:40+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:05+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Directorio padre"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "¡El nombre del directorio contiene caracteres especiales!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Tablero de documentos"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nodo proceso"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "El directorio debe tener un padre o almacenamiento"
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de contenido del directorio"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Modificación"
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Contenido directorio"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinámico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Mis documentos"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "como referencia al registro actual en directorios dinámicos."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ruta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr "El nombre del campo."
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "¡El nombre del directorio debe ser único!"
@@ -160,7 +144,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -171,13 +154,6 @@ msgstr "Directorios"
 msgid "Files details by Users"
 msgstr "Archivos detallados por usuarios"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -236,14 +212,9 @@ msgstr ""
 "        "
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directorio documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -260,19 +231,12 @@ msgstr "ir.acciones.informe.xml"
 msgid "Documents"
 msgstr "Documentos"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Almacenamiento"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modelo de recurso"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -284,22 +248,20 @@ msgstr "Tamaño del archivo"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Modificación"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr "¡El nombre de archivo debe ser único en un directorio!"
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copiar)"
@@ -336,11 +298,6 @@ msgstr "Campo nombre"
 msgid "Context fields"
 msgstr "Campos de contexto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nombre del archivo guardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -368,7 +325,7 @@ msgid "Virtual Files"
 msgstr "Archivos virtuales"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "¡Error de escritura en el documento!"
@@ -405,7 +362,6 @@ msgstr "Seguridad"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario de la última modificación"
@@ -428,7 +384,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha de modificación"
@@ -472,12 +427,9 @@ msgstr ""
 "Define palabras en el contexto para todos los directorios y archivos hijos"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
-"su contenido no está disponible."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -487,7 +439,6 @@ msgstr "Desconocido"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -506,16 +457,10 @@ msgstr "Contenidos"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Fecha de creación"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -527,17 +472,6 @@ msgstr ""
 "registro.\n"
 "Si está marcado, el directorio tiene que ser un recurso."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Conocimiento"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Almacenaje de documentos"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -554,11 +488,6 @@ msgstr "Incluir nombre de registro"
 msgid "Model Id"
 msgstr "ID modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "En línea"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -590,9 +519,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Mis documentos"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -606,7 +535,6 @@ msgstr "Junio"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -620,11 +548,6 @@ msgstr "Activo"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Datos"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -653,23 +576,17 @@ msgid "Seq."
 msgstr "Sec."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de datos"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Sólo lectura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Directorio de documentos"
 
@@ -685,7 +602,6 @@ msgstr "Adjuntos"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -704,7 +620,6 @@ msgstr ""
 "automáticamente conforme a los módulos instalados."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -726,19 +641,9 @@ msgid "Children"
 msgstr "Hijos"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Ficheros por usuario"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Almacenamiento externo"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -756,29 +661,19 @@ msgid "Parent Model"
 msgstr "Modelo padre"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
-"antepondrá a lo que escriba aquí."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estructura árbol"
+"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
+"deben definir sus propios grupos."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Archivos de todos los usuarios"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -795,20 +690,6 @@ msgstr "ir.adjunto"
 msgid "Users File"
 msgstr "Fichero usuarios"
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estático"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
-"deben definir sus propios grupos."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -836,25 +717,14 @@ msgstr "Febrero"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "¡La ruta de almacenamiento debe ser única!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campos"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -867,9 +737,9 @@ msgid "# of Files"
 msgstr "Núm. de archivos"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Buscar almacenaje documentos"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
 
 #. module: document
 #: view:document.directory:0
@@ -903,9 +773,9 @@ msgid "File Name"
 msgstr "Nombre del archivo"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Almacenamiento interno"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura árbol"
 
 #. module: document
 #: view:document.configuration:0
@@ -924,10 +794,7 @@ msgid "Year"
 msgstr "Año"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medio de almacenamiento"
 
@@ -975,6 +842,9 @@ msgstr "Tipo de documento"
 #~ msgid "Browse Files"
 #~ msgstr "Navegar por los archivos"
 
+#~ msgid "Document directory"
+#~ msgstr "Directorio documento"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear directorios recursivos."
 
@@ -987,6 +857,9 @@ msgstr "Tipo de documento"
 #~ msgid "Server Address"
 #~ msgstr "Dirección servidor"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nombre del archivo guardado"
+
 #~ msgid "Link"
 #~ msgstr "Enlace"
 
@@ -1011,6 +884,12 @@ msgstr "Tipo de documento"
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "Data"
+#~ msgstr "Datos"
+
+#~ msgid "Database"
+#~ msgstr "Base de datos"
+
 #~ msgid "Others Info"
 #~ msgstr "Otras info."
 
@@ -1083,6 +962,10 @@ msgstr "Tipo de documento"
 #~ msgid "Document Configuration"
 #~ msgstr "Configuración de documentos"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "¡Error!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "¡El nombre de archivo debe ser único!"
@@ -1138,24 +1021,39 @@ msgstr "Tipo de documento"
 #~ msgid "Files by Partner"
 #~ msgstr "Archivos por empresa"
 
+#~ msgid "Document board"
+#~ msgstr "Tablero de documentos"
+
 #~ msgid "This Year"
 #~ msgstr "Este año"
 
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
 #~ msgid "Project"
 #~ msgstr "Proyecto"
 
+#~ msgid "Storage"
+#~ msgstr "Almacenamiento"
+
 #~ msgid "Files by Users"
 #~ msgstr "Archivos por usuarios"
 
 #~ msgid "Document Dashboard"
 #~ msgstr "Tablero de documentos"
 
+#~ msgid "Online"
+#~ msgstr "En línea"
+
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
 #~ msgid "Dashboard"
 #~ msgstr "Tablero"
 
+#~ msgid "External file storage"
+#~ msgstr "Almacenamiento externo"
+
 #~ msgid "Product"
 #~ msgstr "Producto"
 
@@ -1169,6 +1067,9 @@ msgstr "Tipo de documento"
 #~ msgid "Statistics by User"
 #~ msgstr "Estadísticas por usuario"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Almacenamiento interno"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "El directorio debe tener un padre o un almacenamiento."
 
@@ -1178,12 +1079,25 @@ msgstr "Tipo de documento"
 #~ msgid "Sale Order"
 #~ msgstr "Pedido de venta"
 
+#~ msgid "Read Only"
+#~ msgstr "Sólo lectura"
+
 #~ msgid "Related to"
 #~ msgstr "Relacionado con"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "¡La ruta de almacenamiento debe ser única!"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Buscar almacenamiento documentos"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
+#~ "antepondrá a lo que escriba aquí."
+
 #~ msgid ""
 #~ "This is a complete document management system:\n"
 #~ "    * User Authentication\n"
@@ -1222,6 +1136,12 @@ msgstr "Tipo de documento"
 #~ msgid "New Files"
 #~ msgstr "Nuevos archivos"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+
+#~ msgid "Process Node"
+#~ msgstr "Nodo proceso"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configuración automática de directorios para proyectos."
 
@@ -1243,6 +1163,15 @@ msgstr "Tipo de documento"
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso de la configuración"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
+#~ "su contenido no está disponible."
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
+
 #~ msgid "Choose the following Resouces to auto directory configuration."
 #~ msgstr ""
 #~ "Seleccione los siguientes recursos para configurar directorios automáticos."
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index a458c490fe8..a5739cbdd8a 100644
--- a/addons/document/i18n/es_AR.po
+++ b/addons/document/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-22 16:21+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de contenido del directorio"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr "Contenido del directorio"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr "Directorios"
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directorio del documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr "Tamaño del archivo"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nombre del archivo guardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr "Archivos virtuales"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr "Seguridad"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario de la última modificación"
@@ -408,7 +364,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha de modificación"
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr "Índice"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Fecha de creación"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID del Recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr "Incluir nombre de registro"
 msgid "Model Id"
 msgstr "ID del modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -562,8 +493,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -578,7 +509,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -592,11 +522,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Datos"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -622,23 +547,17 @@ msgid "Seq."
 msgstr "Secuencia"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de datos"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr ""
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -654,7 +573,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Creador"
 
@@ -668,7 +586,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -690,19 +607,9 @@ msgid "Children"
 msgstr "Hijos"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID del Recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -720,27 +627,17 @@ msgid "Parent Model"
 msgstr "Modelo padre"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estructura de árbol"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -756,18 +653,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -790,25 +675,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -821,9 +695,9 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
 
 #. module: document
 #: view:document.directory:0
@@ -855,9 +729,9 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura de árbol"
 
 #. module: document
 #: view:document.configuration:0
@@ -876,10 +750,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -971,6 +842,9 @@ msgstr "Tipo de documento"
 #~ msgid "Resource Title"
 #~ msgstr "Título del recurso"
 
+#~ msgid "Data"
+#~ msgstr "Datos"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
 
@@ -992,6 +866,9 @@ msgstr "Tipo de documento"
 #~ "    * Autenticación del usuario\n"
 #~ "    *Indezación de documentos\n"
 
+#~ msgid "Database"
+#~ msgstr "Base de datos"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Sistema de gestión de documentos integrada"
 
@@ -1029,6 +906,9 @@ msgstr "Tipo de documento"
 #~ msgid "Server Address"
 #~ msgstr "Dirección del servidor"
 
+#~ msgid "Document directory"
+#~ msgstr "Directorio del documento"
+
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
@@ -1040,3 +920,6 @@ msgstr "Tipo de documento"
 
 #~ msgid "Auto-Generated Files"
 #~ msgstr "Archivos auto-generados"
+
+#~ msgid "Stored Filename"
+#~ msgstr "Nombre del archivo guardado"
diff --git a/addons/document/i18n/es_CR.po b/addons/document/i18n/es_CR.po
index bc81ccaf454..a4dd5dab19e 100644
--- a/addons/document/i18n/es_CR.po
+++ b/addons/document/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:42+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: document
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Directorio padre"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "¡El nombre del directorio contiene caracteres especiales!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Tablero de documentos"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nodo proceso"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de contenido del directorio"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Contenido directorio"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinámico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "como referencia al registro actual en directorios dinámicos."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ruta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "¡El nombre del directorio debe ser único!"
@@ -161,7 +145,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -172,13 +155,6 @@ msgstr "Directorios"
 msgid "Files details by Users"
 msgstr "Archivos detallados por usuarios"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -230,14 +206,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directorio documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -254,19 +225,12 @@ msgstr "ir.acciones.informe.xml"
 msgid "Documents"
 msgstr "Documentos"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Almacenamiento"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modelo de recurso"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -278,22 +242,20 @@ msgstr "Tamaño del archivo"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -330,11 +292,6 @@ msgstr "Campo nombre"
 msgid "Context fields"
 msgstr "Campos de contexto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nombre del archivo guardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -362,7 +319,7 @@ msgid "Virtual Files"
 msgstr "Archivos virtuales"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "¡Error de escritura en el documento!"
@@ -399,7 +356,6 @@ msgstr "Seguridad"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario de la última modificación"
@@ -422,7 +378,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha de modificación"
@@ -466,12 +421,9 @@ msgstr ""
 "Define palabras en el contexto para todos los directorios y archivos hijos"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
-"su contenido no está disponible."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -481,7 +433,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -500,16 +451,10 @@ msgstr "Contenidos"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Fecha de creación"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -521,17 +466,6 @@ msgstr ""
 "registro.\n"
 "Si está marcado, el directorio tiene que ser un recurso."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -548,11 +482,6 @@ msgstr "Incluir nombre de registro"
 msgid "Model Id"
 msgstr "ID modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "En línea"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -584,9 +513,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -600,7 +529,6 @@ msgstr "Junio"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -614,11 +542,6 @@ msgstr "Activo"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Datos"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -647,23 +570,17 @@ msgid "Seq."
 msgstr "Sec."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de datos"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Sólo lectura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Directorio de Documento"
 
@@ -679,7 +596,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -698,7 +614,6 @@ msgstr ""
 "forma automática de acuerdo a los módulos instalados."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -720,19 +635,9 @@ msgid "Children"
 msgstr "Hijos"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Almacenamiento externo"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -750,29 +655,19 @@ msgid "Parent Model"
 msgstr "Modelo padre"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
-"antepondrá a lo que escriba aquí."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estructura árbol"
+"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
+"deben definir sus propios grupos."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Archivos de todos los usuarios"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -789,20 +684,6 @@ msgstr "ir.adjunto"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estático"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
-"deben definir sus propios grupos."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -830,25 +711,14 @@ msgstr "Febrero"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "¡La ruta de almacenamiento debe ser única!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campos"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -861,9 +731,9 @@ msgid "# of Files"
 msgstr "Núm. de archivos"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
 
 #. module: document
 #: view:document.directory:0
@@ -897,9 +767,9 @@ msgid "File Name"
 msgstr "Nombre del archivo"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Almacenamiento interno"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura árbol"
 
 #. module: document
 #: view:document.configuration:0
@@ -918,10 +788,7 @@ msgid "Year"
 msgstr "Año"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medio de almacenamiento"
 
@@ -930,6 +797,12 @@ msgstr "Medio de almacenamiento"
 msgid "Document Type"
 msgstr "Tipo de documento"
 
+#~ msgid "Document board"
+#~ msgstr "Tablero de documentos"
+
+#~ msgid "Process Node"
+#~ msgstr "Nodo proceso"
+
 #~ msgid "Files per Month"
 #~ msgstr "Archivos por mes"
 
@@ -939,15 +812,31 @@ msgstr "Tipo de documento"
 #~ msgid "This Year"
 #~ msgstr "Este año"
 
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "¡Error!"
+
 #~ msgid "Files by Users"
 #~ msgstr "Archivos por usuarios"
 
+#~ msgid "Document directory"
+#~ msgstr "Directorio documento"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear directorios recursivos."
 
+#~ msgid "Storage"
+#~ msgstr "Almacenamiento"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Archivos por empresa"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nombre del archivo guardado"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Tablero de documentos"
 
@@ -960,12 +849,27 @@ msgstr "Tipo de documento"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
+#~ "su contenido no está disponible."
+
 #~ msgid "Attachment"
 #~ msgstr "Adjunto"
 
+#~ msgid "Online"
+#~ msgstr "En línea"
+
 #~ msgid "User"
 #~ msgstr "Usuario"
 
+#~ msgid "Data"
+#~ msgstr "Datos"
+
+#~ msgid "Database"
+#~ msgstr "Base de datos"
+
 #~ msgid "Related to"
 #~ msgstr "Relacionado con"
 
@@ -978,12 +882,21 @@ msgstr "Tipo de documento"
 #~ msgid "Files By Users"
 #~ msgstr "Archivos por usuarios"
 
+#~ msgid "Read Only"
+#~ msgstr "Sólo lectura"
+
 #~ msgid "Last Posted Time"
 #~ msgstr "Hora del último archivo añadido"
 
+#~ msgid "External file storage"
+#~ msgstr "Almacenamiento externo"
+
 #~ msgid "Wall of Shame"
 #~ msgstr "Muro de la vergüenza"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+
 #~ msgid "Files details by Partners"
 #~ msgstr "Archivos detallados por empresas"
 
@@ -1018,6 +931,19 @@ msgstr "Tipo de documento"
 #~ msgid "Statistics by User"
 #~ msgstr "Estadísticas por usuario"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
+#~ "antepondrá a lo que escriba aquí."
+
+#~ msgid "The storage path must be unique!"
+#~ msgstr "¡La ruta de almacenamiento debe ser única!"
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(copia)"
@@ -1026,6 +952,9 @@ msgstr "Tipo de documento"
 #~ msgid "File name must be unique!"
 #~ msgstr "¡El nombre de archivo debe ser único!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Almacenamiento interno"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "El directorio debe tener un padre o un almacenamiento."
 
diff --git a/addons/document/i18n/es_EC.po b/addons/document/i18n/es_EC.po
index 6bb7db7a47b..174be5ce0b8 100644
--- a/addons/document/i18n/es_EC.po
+++ b/addons/document/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-17 19:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de contenido del directorio"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr "Contenido directorio"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr "Directorios"
 msgid "Files details by Users"
 msgstr "Archivos detallados por usuarios"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directorio documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr "Tamaño del archivo"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -320,11 +282,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nombre del archivo guardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -352,7 +309,7 @@ msgid "Virtual Files"
 msgstr "Archivos virtuales"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -387,7 +344,6 @@ msgstr "Seguridad"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario última modificación"
@@ -410,7 +366,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha modificación"
@@ -453,9 +408,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -466,7 +420,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -485,16 +438,10 @@ msgstr "Contenidos"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Fecha creación"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -503,17 +450,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -530,11 +466,6 @@ msgstr "Incluir nombre de registro"
 msgid "Model Id"
 msgstr "ID modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -564,8 +495,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -580,7 +511,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -594,11 +524,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Datos"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -624,23 +549,17 @@ msgid "Seq."
 msgstr "Sec."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de datos"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -656,7 +575,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -670,7 +588,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -692,19 +609,9 @@ msgid "Children"
 msgstr "Hijos"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -722,27 +629,17 @@ msgid "Parent Model"
 msgstr "Modelo padre"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estructura árbol"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Archivos de todos los usuarios"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -758,18 +655,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -792,25 +677,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -823,9 +697,9 @@ msgid "# of Files"
 msgstr "Núm. de archivos"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
 
 #. module: document
 #: view:document.directory:0
@@ -857,9 +731,9 @@ msgid "File Name"
 msgstr "Nombre del archivo"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura árbol"
 
 #. module: document
 #: view:document.configuration:0
@@ -878,10 +752,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -939,6 +810,9 @@ msgstr "Tipo de documento"
 #~ msgid "File Information"
 #~ msgstr "Información del archivo"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nombre del archivo guardado"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
@@ -977,6 +851,9 @@ msgstr "Tipo de documento"
 #~ "Este asistente configurará automáticamente el sistema de gestión de "
 #~ "documentos según los módulos instalados en su sistema."
 
+#~ msgid "Data"
+#~ msgstr "Datos"
+
 #~ msgid "Notes"
 #~ msgstr "Notas"
 
@@ -994,6 +871,9 @@ msgstr "Tipo de documento"
 #~ "    * Autenticación de usuarios\n"
 #~ "    * Indexación de documentos\n"
 
+#~ msgid "Database"
+#~ msgstr "Base de datos"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Sistema de gestión integrada de documentos"
 
@@ -1031,6 +911,9 @@ msgstr "Tipo de documento"
 #~ msgid "Browse Files"
 #~ msgstr "Navegar por los archivos"
 
+#~ msgid "Document directory"
+#~ msgstr "Directorio documento"
+
 #~ msgid "Auto-Generated Files"
 #~ msgstr "Archivos auto-generados"
 
diff --git a/addons/document/i18n/es_PY.po b/addons/document/i18n/es_PY.po
index e1bbdf7d1b0..97b3d1b1cb6 100644
--- a/addons/document/i18n/es_PY.po
+++ b/addons/document/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-19 14:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Carpeta Superior"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "¡El nombre del directorio contiene caracteres especiales!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Panel de Control de Documentos"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nodo proceso"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de contenido del directorio"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Contenido Carpetas"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinámico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "como referencia al registro actual en directorios dinámicos."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ruta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "¡El nombre del directorio debe ser único!"
@@ -161,7 +145,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -172,13 +155,6 @@ msgstr "Carpetas"
 msgid "Files details by Users"
 msgstr "Archivos detallados por usuarios"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -230,14 +206,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directorio documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Error de validación"
@@ -254,19 +225,12 @@ msgstr "ir.acciones.informe.xml"
 msgid "Documents"
 msgstr "Documentos"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Almacenamiento"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modelo de recurso"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -278,22 +242,20 @@ msgstr "Tamaño del archivo"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -330,11 +292,6 @@ msgstr "Campo nombre"
 msgid "Context fields"
 msgstr "Campos de contexto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nombre del archivo guardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -362,7 +319,7 @@ msgid "Virtual Files"
 msgstr "Archivos virtuales"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "¡Error de escritura en el documento!"
@@ -397,7 +354,6 @@ msgstr "Seguridad"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario de la última modificación"
@@ -420,7 +376,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha de modificación"
@@ -464,12 +419,9 @@ msgstr ""
 "Define palabras en el contexto para todas las carpetas y archivos hijos"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
-"su contenido no está disponible."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -479,7 +431,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -498,16 +449,10 @@ msgstr "Contenidos"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Fecha de creación"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID del recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -519,17 +464,6 @@ msgstr ""
 "registro.\n"
 "Si está marcado, el directorio tiene que ser un recurso."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -546,11 +480,6 @@ msgstr "Incluir nombre de registro"
 msgid "Model Id"
 msgstr "ID modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "En línea"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -582,9 +511,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -598,7 +527,6 @@ msgstr "Junio"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -612,11 +540,6 @@ msgstr "Activo"
 msgid "November"
 msgstr "Noviembre"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Datos"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -645,23 +568,17 @@ msgid "Seq."
 msgstr "Sec."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de datos"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Sólo lectura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -677,7 +594,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -691,7 +607,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -713,19 +628,9 @@ msgid "Children"
 msgstr "Hijos"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Almacenamiento externo"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID del recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -743,29 +648,19 @@ msgid "Parent Model"
 msgstr "Modelo padre"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
-"antepondrá a lo que escriba aquí."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estructura árbol"
+"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
+"deben definir sus propios grupos."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "may"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Archivos de todos los usuarios"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -782,20 +677,6 @@ msgstr "ir.adjunto"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estático"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
-"deben definir sus propios grupos."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -823,25 +704,14 @@ msgstr "Febrero"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "¡La ruta de almacenamiento debe ser única!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campos"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -854,9 +724,9 @@ msgid "# of Files"
 msgstr "Núm. de archivos"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
 
 #. module: document
 #: view:document.directory:0
@@ -890,9 +760,9 @@ msgid "File Name"
 msgstr "Nombre del archivo"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Almacenamiento interno"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura árbol"
 
 #. module: document
 #: view:document.configuration:0
@@ -911,10 +781,7 @@ msgid "Year"
 msgstr "Año"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medio de almacenamiento"
 
@@ -926,12 +793,25 @@ msgstr "Tipo de documento"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Configuración automática de carpetas"
 
+#~ msgid "Document board"
+#~ msgstr "Panel de Control de Documentos"
+
+#~ msgid "Process Node"
+#~ msgstr "Nodo proceso"
+
 #~ msgid "Files per Month"
 #~ msgstr "Archivos por mes"
 
 #~ msgid "title"
 #~ msgstr "título"
 
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "¡Error!"
+
 #~ msgid "Sale Order"
 #~ msgstr "Pedido de venta"
 
@@ -947,15 +827,24 @@ msgstr "Tipo de documento"
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configuración automática de los directorios para productos."
 
+#~ msgid "Document directory"
+#~ msgstr "Directorio documento"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear directorios recursivos."
 
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Configurar directorio de recursos"
 
+#~ msgid "Storage"
+#~ msgstr "Almacenamiento"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "panel de control de documentos"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nombre del archivo guardado"
+
 #~ msgid "Modified"
 #~ msgstr "Modificado(s)"
 
@@ -1009,18 +898,36 @@ msgstr "Tipo de documento"
 #~ "base de datos,\n"
 #~ "      sino en el directorio raíz del servidor como /server/bin/filestore.\n"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
+#~ "su contenido no está disponible."
+
 #~ msgid "Auto Configure Directory"
 #~ msgstr "Configuración automática de directorios"
 
 #~ msgid "User"
 #~ msgstr "Usuario"
 
+#~ msgid "Online"
+#~ msgstr "En línea"
+
 #~ msgid "Related to"
 #~ msgstr "Relacionado con"
 
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configuración automática de directorios para proyectos."
 
+#~ msgid "Data"
+#~ msgstr "Datos"
+
+#~ msgid "Database"
+#~ msgstr "Base de datos"
+
+#~ msgid "Read Only"
+#~ msgstr "Sólo lectura"
+
 #~ msgid "Dashboard"
 #~ msgstr "Panel de Control"
 
@@ -1046,6 +953,12 @@ msgstr "Tipo de documento"
 #~ msgid "Wall of Shame"
 #~ msgstr "Muro de la vergüenza"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+
+#~ msgid "External file storage"
+#~ msgstr "Almacenamiento externo"
+
 #~ msgid "Files by users"
 #~ msgstr "Archivos por usuarios"
 
@@ -1064,6 +977,13 @@ msgstr "Tipo de documento"
 #~ msgid "Files By Partner"
 #~ msgstr "Archivos por empresa"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
+#~ "antepondrá a lo que escriba aquí."
+
 #~ msgid "New Files"
 #~ msgstr "Nuevos archivos"
 
@@ -1086,10 +1006,19 @@ msgstr "Tipo de documento"
 #~ "Configuración automática de directorios para presupuestos y pedidos de venta "
 #~ "con informes."
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "¡La ruta de almacenamiento debe ser única!"
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "¡El nombre de archivo debe ser único!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Almacenamiento interno"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "La Carpeta debe tener un padre o un almacenamiento."
 
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index ac736ab0703..60daea678d8 100644
--- a/addons/document/i18n/et.po
+++ b/addons/document/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:16+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Kaustanimi sisaldab erisümboleid!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Kataloogi sisu tüüp"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr "Kaustasisu"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Kataloogi nimi peab olema ainulaadne"
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr "Kataloogid"
 msgid "Files details by Users"
 msgstr "Failid Detailselt Kasutajajärgi"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Viga!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokumendi kataloog"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr "Failisuurus"
 msgid "Content Type"
 msgstr "Sisu tüüp"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tüüp"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -319,11 +281,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Salvestatud failinimi"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -351,7 +308,7 @@ msgid "Virtual Files"
 msgstr "Virtuaalsed failid"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -386,7 +343,6 @@ msgstr "Turvalisus"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Viimati muutnud kasutaja"
@@ -409,7 +365,6 @@ msgstr "Domeen"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Muutmise kuupäev"
@@ -452,9 +407,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -465,7 +419,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -484,16 +437,10 @@ msgstr "Sisukord"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Loomise kuupäev"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Vahend ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -502,17 +449,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -529,11 +465,6 @@ msgstr "Kaasa kirje nimi"
 msgid "Model Id"
 msgstr "Mudeli ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -563,8 +494,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -579,7 +510,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupid"
 
@@ -593,11 +523,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Andmed"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -623,23 +548,17 @@ msgid "Seq."
 msgstr "Jada"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Andmebaas"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Kõik Kasutajate Failid"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -655,7 +574,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Looja"
 
@@ -669,7 +587,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -691,19 +608,9 @@ msgid "Children"
 msgstr "Alam"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Vahend ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -721,27 +628,17 @@ msgid "Parent Model"
 msgstr "Ülemmudel"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Puu struktuur"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Kõik Kasutajate Failid"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -757,18 +654,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -791,25 +676,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nimi"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -822,9 +696,9 @@ msgid "# of Files"
 msgstr "Failide arv"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Kataloogi sisu tüüp"
 
 #. module: document
 #: view:document.directory:0
@@ -856,9 +730,9 @@ msgid "File Name"
 msgstr "Failinimi"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Puu struktuur"
 
 #. module: document
 #: view:document.configuration:0
@@ -877,10 +751,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -920,6 +791,9 @@ msgstr "Dokumendi tüüp"
 #~ msgid "Browse Files"
 #~ msgstr "Sirvi faile"
 
+#~ msgid "Document directory"
+#~ msgstr "Dokumendi kataloog"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Viga! Sa ei saa luua regrussiivseid kaustu."
 
@@ -932,6 +806,9 @@ msgstr "Dokumendi tüüp"
 #~ msgid "Server Address"
 #~ msgstr "Serveri aadress"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Salvestatud failinimi"
+
 #~ msgid "Link"
 #~ msgstr "Viit"
 
@@ -962,6 +839,12 @@ msgstr "Dokumendi tüüp"
 #~ msgid "Configure"
 #~ msgstr "Seadista"
 
+#~ msgid "Data"
+#~ msgstr "Andmed"
+
+#~ msgid "Database"
+#~ msgstr "Andmebaas"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integreeritud dokumendi haldussüsteem"
 
@@ -1008,6 +891,10 @@ msgstr "Dokumendi tüüp"
 #~ msgid "Auto Configure"
 #~ msgstr "Automaatne seadistamine"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Viga!"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 727f8a47398..74cb732705e 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Yläkansio"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Kansion nimi sisältää erikoismerkkejä!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Dokumenttien työpöytä"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Prosessisolmu"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Ryhmittely.."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Hakemiston sisällön tyyppi"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Hakemiston sisältö"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynaaminen konteksti"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "viitteenä nykyiseen tietueeseen dynaamisissa hakemistoissa"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Polku"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Kansionimen tulee olla ainutkertainen!"
@@ -160,7 +144,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -171,13 +154,6 @@ msgstr "Hakemistot"
 msgid "Files details by Users"
 msgstr "Tiedoston yksityiskohdat käyttäjittäin"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Virhe!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -229,14 +205,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokumenttihakemisto"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Tarkistusvirhe"
@@ -253,19 +224,12 @@ msgstr ""
 msgid "Documents"
 msgstr "Asiakirjat"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Tallennus"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Resurssimalli"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -277,22 +241,20 @@ msgstr "Tiedostokoko"
 msgid "Content Type"
 msgstr "Sisällön tyyppi"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tyyppi"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -328,11 +290,6 @@ msgstr "Nimikenttä"
 msgid "Context fields"
 msgstr "Kontekstikentät"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Tallennettu tiedostonnimi"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -360,7 +317,7 @@ msgid "Virtual Files"
 msgstr "Virtuaaliset tiedostot"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Virhe kirjoitettaessa asiakirjaa !"
@@ -395,7 +352,6 @@ msgstr "Turvallisuus"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Viimeksi muuttanut käyttäjä"
@@ -418,7 +374,6 @@ msgstr "Toimialue"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Muokkauspäivä"
@@ -462,11 +417,9 @@ msgstr ""
 "Määrittele kontekstin sanat kaikille alatason hakemistoille ja tiedostoille"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Jos ei valittu, media on pois käytöstä ja sen sisältö ei ole saatavilla"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Kiinteä"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -476,7 +429,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -495,16 +447,10 @@ msgstr "Sisältö"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Luontipäivä"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Resurssin tunnus"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -516,17 +462,6 @@ msgstr ""
 "nimen.\n"
 "Jos asetettu, hakemiston on oltava resurssityyppinen."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -543,11 +478,6 @@ msgstr "Sisällytä tietueen nimi"
 msgid "Model Id"
 msgstr "Mallin tunnus"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online-tilassa"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -579,9 +509,9 @@ msgid "August"
 msgstr "Elokuu"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynaaminen konteksti"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -595,7 +525,6 @@ msgstr "Kesäkuu"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Ryhmät"
 
@@ -609,11 +538,6 @@ msgstr "Aktiivinen"
 msgid "November"
 msgstr "Marraskuu"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Data"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -642,23 +566,17 @@ msgid "Seq."
 msgstr "Sarja"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Tietokanta"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Kaikki käyttäjän tiedostot"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Tammikuu"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Vain luku"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Dokumenttihakemisto"
 
@@ -674,7 +592,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Tekijä"
 
@@ -688,7 +605,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -710,19 +626,9 @@ msgid "Children"
 msgstr "Alatunnukset"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Ulkoinen tietovarasto"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Tietovaraston peruspolku"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Resurssin tunnus"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -740,28 +646,19 @@ msgid "Parent Model"
 msgstr "Ylätason malli"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Kentän nimi. Huomaa että etuliite \"dctx_\" lisätään tähän kirjoitetun eteen"
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Puurakenne"
+"Nämä ryhmät eivät kuitenkaan vaikuta alatason hakemistoihin, vaan niihin on "
+"määriteltävä omat ryhmät"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Toukokuu"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Kaikki käyttäjän tiedostot"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -779,20 +676,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Kiinteä"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Nämä ryhmät eivät kuitenkaan vaikuta alatason hakemistoihin, vaan niihin on "
-"määriteltävä omat ryhmät"
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -821,25 +704,14 @@ msgstr "Helmikuu"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nimi"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Talletuspaikan polun tulee olla uniikki!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Kentät"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Jos asetettu, media on vain lukemista varten"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -852,9 +724,9 @@ msgid "# of Files"
 msgstr "Tiedostojen määrä"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Hakemiston sisällön tyyppi"
 
 #. module: document
 #: view:document.directory:0
@@ -887,9 +759,9 @@ msgid "File Name"
 msgstr "Tiedostonimi"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Sisäinen tietovarasto"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Puurakenne"
 
 #. module: document
 #: view:document.configuration:0
@@ -908,10 +780,7 @@ msgid "Year"
 msgstr "Vuosi"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Tallennusmedia"
 
@@ -938,6 +807,10 @@ msgstr "Dokumenttityyppi"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Virhe!"
+
 #~ msgid "Filesystem"
 #~ msgstr "Tiedostojärjestelmä"
 
@@ -953,6 +826,9 @@ msgstr "Dokumenttityyppi"
 #~ msgid "Server Address"
 #~ msgstr "Palvelimen osoite"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Tallennettu tiedostonnimi"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
 
@@ -971,12 +847,18 @@ msgstr "Dokumenttityyppi"
 #~ msgid "Auto Configure Directory"
 #~ msgstr "Määritä hakemistoasetukset automaattisesti"
 
+#~ msgid "Data"
+#~ msgstr "Data"
+
 #~ msgid "History"
 #~ msgstr "Historia"
 
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integroitu tiedostonhallintajärjestelmä"
 
+#~ msgid "Database"
+#~ msgstr "Tietokanta"
+
 #~ msgid "Attached To"
 #~ msgstr "Liitetty kohteeseen"
 
@@ -1016,9 +898,18 @@ msgstr "Dokumenttityyppi"
 #~ msgid "Notes"
 #~ msgstr "Huomautukset"
 
+#~ msgid "Path"
+#~ msgstr "Polku"
+
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Automaattinen hakemistojen konfigurointi"
 
+#~ msgid "Document board"
+#~ msgstr "Dokumenttien työpöytä"
+
+#~ msgid "Process Node"
+#~ msgstr "Prosessisolmu"
+
 #~ msgid "This Year"
 #~ msgstr "Tänä vuonna"
 
@@ -1040,12 +931,18 @@ msgstr "Dokumenttityyppi"
 #~ msgid "Files by Users"
 #~ msgstr "Tiedostoja käyttäjittäin"
 
+#~ msgid "Document directory"
+#~ msgstr "Dokumenttihakemisto"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Tiedostoja yhteistyökumppania kohden"
 
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Konfiguroi resurssin hakemisto"
 
+#~ msgid "Storage"
+#~ msgstr "Tallennus"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Dokumenttien työpöytä"
 
@@ -1061,12 +958,20 @@ msgstr "Dokumenttityyppi"
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguraation eteneminen"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Jos ei valittu, media on pois käytöstä ja sen sisältö ei ole saatavilla"
+
 #~ msgid "Image"
 #~ msgstr "Kuva"
 
 #~ msgid "User"
 #~ msgstr "Käyttäjä"
 
+#~ msgid "Online"
+#~ msgstr "Online-tilassa"
+
 #~ msgid "Files By Users"
 #~ msgstr "Tiedostot käyttäjittäin"
 
@@ -1083,6 +988,9 @@ msgstr "Dokumenttityyppi"
 #~ msgstr ""
 #~ "Valitse seuraavat resurssit automaattista hakemiston konfiguraatiota varten."
 
+#~ msgid "Read Only"
+#~ msgstr "Vain luku"
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr ""
 #~ "Käyttäjät jotka eivät ole lisänneet dokumentteja viimeisen kuukauden aikana"
@@ -1108,6 +1016,12 @@ msgstr "Dokumenttityyppi"
 #~ "Automaattinen hakemiston konfiguraatio myyntitilauksille ja tarjouksille "
 #~ "raportteineen."
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Kentän nimi. Huomaa että etuliite \"dctx_\" lisätään tähän kirjoitetun eteen"
+
 #~ msgid "Files By Partner"
 #~ msgstr "Tiedostot yhteistyökumppaneittain"
 
@@ -1118,6 +1032,9 @@ msgstr "Dokumenttityyppi"
 #~ "Dokumenttivarasto antaa sinulle pääsyn kaikkiin liitteisiin, kuten "
 #~ "sähköposteihin, projektidokumetteihin, laskuihin yms."
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Jos asetettu, media on vain lukemista varten"
+
 #~ msgid "Statistics by User"
 #~ msgstr "Tilastot käyttäjittäin"
 
@@ -1125,15 +1042,27 @@ msgstr "Dokumenttityyppi"
 #~ msgid "(copy)"
 #~ msgstr "(kopio)"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Talletuspaikan polun tulee olla uniikki!"
+
 #~ msgid "Last Posted Time"
 #~ msgstr "Viimeisin lisäysajankohta"
 
+#~ msgid "External file storage"
+#~ msgstr "Ulkoinen tietovarasto"
+
 #~ msgid "Wall of Shame"
 #~ msgstr "Häpeäseinä"
 
 #~ msgid "Files details by Partners"
 #~ msgstr "Tiedostojen yksityiskohdat yhteistyökumppaneittain"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Sisäinen tietovarasto"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Tietovaraston peruspolku"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Hakemistolla täytyy olla ylätason hakemisto tai tietovarasto"
 
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 0b9d188371b..8c6f57297e0 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:51+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Répertoire parent"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Le nom du répertoire contient des caractères spéciaux!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Tableau des documents"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Noeud de processus"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "Un répertoire doit avoir un parent ou un stockage."
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Regrouper par..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Type de Contenu du Répertoire"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Modification"
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Contenu du Répertoire"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexte dynamique"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Mes documents(s)"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -128,13 +112,13 @@ msgstr ""
 "répertoires dynamiques."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Chemin"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Le nom du répertoire doit être unique!"
@@ -162,7 +146,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -173,13 +156,6 @@ msgstr "Répertoires"
 msgid "Files details by Users"
 msgstr "Détail des Fichiers par Utilisateurs"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Erreur !"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -240,14 +216,9 @@ msgstr ""
 "        "
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Répertoire du Document"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Valider l'erreur"
@@ -264,19 +235,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Documents"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Stockage"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modèle de ressource"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -288,22 +252,20 @@ msgstr "Taille du Fichier"
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Modification"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -340,11 +302,6 @@ msgstr "Nom du champ"
 msgid "Context fields"
 msgstr "Champs contextuels"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nom du Fichier Enregistré"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -372,7 +329,7 @@ msgid "Virtual Files"
 msgstr "Fichiers Virtuels"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Erreur lors de l'écriture du document"
@@ -409,7 +366,6 @@ msgstr "Sécurité"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Utilisateur ayant réaliser la dernière modification"
@@ -432,7 +388,6 @@ msgstr "Domaine"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Date de Modification"
@@ -477,12 +432,9 @@ msgstr ""
 "enfants"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Si cette case n'est pas cochée, le média est actuellement hors connexion et "
-"son contenu n'est pas disponible."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statique"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -492,7 +444,6 @@ msgstr "inconnu"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -511,16 +462,10 @@ msgstr "Contenus"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Date de Création"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID de la ressource"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -533,17 +478,6 @@ msgstr ""
 "Si vous cochez cette case, le répertoire doit être un répertoire de "
 "ressources."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Connaisssance"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Stockage de document"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -560,11 +494,6 @@ msgstr "Inclure le Nom de l'Enregistrement"
 msgid "Model Id"
 msgstr "Identifiant du modèle"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Connecté"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -596,9 +525,9 @@ msgid "August"
 msgstr "Août"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Mes documents(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexte dynamique"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -612,7 +541,6 @@ msgstr "Juin"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Groupes"
 
@@ -626,11 +554,6 @@ msgstr "Actif"
 msgid "November"
 msgstr "Novembre"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Données"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -660,23 +583,17 @@ msgid "Seq."
 msgstr "Séq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de données"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Fichiers de tous les Utilisateurs"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Janvier"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Lecture seule"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Répertoire de document"
 
@@ -692,7 +609,6 @@ msgstr "Pièce(s) jointe(s)"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Créateur"
 
@@ -711,7 +627,6 @@ msgstr ""
 "installés."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -733,19 +648,9 @@ msgid "Children"
 msgstr "Enfants"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Fichiers par utilisateur"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Stockage externe des fichiers"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Pour le stockage des fichiers, le chemin d'accès du stockage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID de la ressource"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -763,29 +668,19 @@ msgid "Parent Model"
 msgstr "Modèle parent"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Le nom du champ. Notez que le préfixe \"dctx_\" sera ajouté à ce qui est "
-"saisi ici."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Structure arborescente"
+"Cependant, ces groupes ne s'appliquent PAS aux répertoires enfants, qui "
+"devront définir leurs propres groupes."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Fichiers de tous les Utilisateurs"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -803,20 +698,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr "Utilisateur du fichier"
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statique"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Cependant, ces groupes ne s'appliquent PAS aux répertoires enfants, qui "
-"devront définir leurs propres groupes."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -845,25 +726,14 @@ msgstr "Février"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nom"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Le chemin de stockage doit être unique !"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Champs"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Si coché, le média est en lecture seule"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -876,9 +746,9 @@ msgid "# of Files"
 msgstr "# de Fichiers"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Chercher dans le stockage de fichiers"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Type de Contenu du Répertoire"
 
 #. module: document
 #: view:document.directory:0
@@ -912,9 +782,9 @@ msgid "File Name"
 msgstr "Nom du Fichier"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Stockage interne des fichiers"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Structure arborescente"
 
 #. module: document
 #: view:document.configuration:0
@@ -933,10 +803,7 @@ msgid "Year"
 msgstr "Année"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Support de stockage"
 
@@ -985,6 +852,9 @@ msgstr "Type de document"
 #~ msgid "Browse Files"
 #~ msgstr "Parcourir les fichiers"
 
+#~ msgid "Document directory"
+#~ msgstr "Répertoire du Document"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Erreur ! Vous ne pouvez pas créer de Répertoires récursivement."
 
@@ -997,6 +867,9 @@ msgstr "Type de document"
 #~ msgid "Server Address"
 #~ msgstr "Adresse du serveur"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nom du Fichier Enregistré"
+
 #~ msgid "Link"
 #~ msgstr "Lien"
 
@@ -1027,6 +900,12 @@ msgstr "Type de document"
 #~ msgid "Configure"
 #~ msgstr "Configurer"
 
+#~ msgid "Data"
+#~ msgstr "Données"
+
+#~ msgid "Database"
+#~ msgstr "Base de données"
+
 #~ msgid "Others Info"
 #~ msgstr "Autres informations"
 
@@ -1093,12 +972,18 @@ msgstr "Type de document"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Configuration automatique des répertoires"
 
+#~ msgid "Document board"
+#~ msgstr "Tableau des documents"
+
 #~ msgid "Files per Month"
 #~ msgstr "Fichiers par mois"
 
 #~ msgid "This Year"
 #~ msgstr "Cette année"
 
+#~ msgid "Path"
+#~ msgstr "Chemin"
+
 #~ msgid "Sale Order"
 #~ msgstr "Commande de vente"
 
@@ -1108,6 +993,9 @@ msgstr "Type de document"
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configuration automatique des répertoires pour les produits."
 
+#~ msgid "Storage"
+#~ msgstr "Stockage"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Fichiers par partenaire"
 
@@ -1126,12 +1014,21 @@ msgstr "Type de document"
 #~ msgid "Image"
 #~ msgstr "Image"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Si cette case n'est pas cochée, le média est actuellement hors connexion et "
+#~ "son contenu n'est pas disponible."
+
 #~ msgid "Dashboard"
 #~ msgstr "Tableau de bord"
 
 #~ msgid "Related to"
 #~ msgstr "Associé à"
 
+#~ msgid "Read Only"
+#~ msgstr "Lecture seule"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1150,9 +1047,19 @@ msgstr "Type de document"
 #~ msgid "Files By Partner"
 #~ msgstr "Fichiers par partenaire"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Si coché, le média est en lecture seule"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Recherche dans le stockage des documents"
 
+#~ msgid "Process Node"
+#~ msgstr "Noeud de processus"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Erreur !"
+
 #~ msgid "Files by Users"
 #~ msgstr "Fichiers par utilisateur"
 
@@ -1194,18 +1101,34 @@ msgstr "Type de document"
 #~ "stockés dans la base de données mais dans des\n"
 #~ "        serveurs rootpad, par exemple /server/bin/filestore.\n"
 
+#~ msgid "Online"
+#~ msgstr "Connecté"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configuration automatique des répertoires pour les projets."
 
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Système de gestion intégrée des documents"
 
+#~ msgid "External file storage"
+#~ msgstr "Stockage externe des fichiers"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Pour le stockage des fichiers, le chemin d'accès du stockage"
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
 #~ "Configuration automatique des répertoires pour les commandes de ventes et "
 #~ "les devis avec un rapport."
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Le nom du champ. Notez que le préfixe \"dctx_\" sera ajouté à ce qui est "
+#~ "saisi ici."
+
 #~ msgid "Statistics by User"
 #~ msgstr "Statistiques par utilisateur"
 
@@ -1213,6 +1136,12 @@ msgstr "Type de document"
 #~ msgid "File name must be unique!"
 #~ msgstr "Le nom du fichier doit être unique !"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Stockage interne des fichiers"
+
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Le chemin de stockage doit être unique !"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Le répertoire doit avoir un parent ou un stockage"
 
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
index 0f0015f5b87..9763f3f5184 100644
--- a/addons/document/i18n/gl.po
+++ b/addons/document/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Cartafol superior"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "O nome do directorio contén caracteres especiais!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Taboleiro de documentos"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nodo do proceso"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de contido do directorio"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Contido do directorio"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinámico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "actual en directorios dinámicos."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ruta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "O nome do directorio debe ser único!"
@@ -160,7 +144,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -171,13 +154,6 @@ msgstr "Directorios"
 msgid "Files details by Users"
 msgstr "Ficheiros detallados por usuarios"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -229,14 +205,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Directorio do documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Produciuse un erro de validación"
@@ -253,19 +224,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Documentos"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Almacenamento"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modelo de recurso"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -277,22 +241,20 @@ msgstr "Tamaño do ficheiro:"
 msgid "Content Type"
 msgstr "Tipo de contido"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -328,11 +290,6 @@ msgstr "Campo nome"
 msgid "Context fields"
 msgstr "Campos de contexto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nome do ficheiro gardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -360,7 +317,7 @@ msgid "Virtual Files"
 msgstr "Ficheiros virtuais"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Erro de escritura no documento!"
@@ -395,7 +352,6 @@ msgstr "Seguranza"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario da última modificación"
@@ -418,7 +374,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data de modificación"
@@ -462,12 +417,9 @@ msgstr ""
 "Define palabras no contexto para todos os directorios e ficheiros fillo"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Se non se marca, o medio de almacenamento está actualmente fóra de liña e o "
-"seu contido non está dispoñíbel."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -477,7 +429,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -496,16 +447,10 @@ msgstr "Contidos"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data de creación"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID do recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -516,17 +461,6 @@ msgstr ""
 "Marque este campo se desexa que o nome do ficheiro conteña o nome do "
 "rexistro. Se está marcado, o directorio ten que ser un recurso."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -543,11 +477,6 @@ msgstr "Incluír o nome do rexistro"
 msgid "Model Id"
 msgstr "ID modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "En liña"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -579,9 +508,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -595,7 +524,6 @@ msgstr "xuño"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -609,11 +537,6 @@ msgstr "Activo"
 msgid "November"
 msgstr "novembro"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Datos"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -643,23 +566,17 @@ msgid "Seq."
 msgstr "Sec."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Bases de datos"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Ficheiros de todos os usuarios"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "xaneiro"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Só lectura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -675,7 +592,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -689,7 +605,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -711,19 +626,9 @@ msgid "Children"
 msgstr "Fillos"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Almacenamento externo"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Para o almacenamento de ficheiros, a ruta raíz onde se almacenan."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID do recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -741,29 +646,19 @@ msgid "Parent Model"
 msgstr "Modelo pai"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"O nome do ficheiro. Teña en conta que o prefixo «dctx_» anteporase ao que "
-"escriba aquí."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estrutura árbore"
+"Porén, estes grupos non se aplican aos directorios fillos, que deben definir "
+"os seus propios grupos."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "maio"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Ficheiros de todos os usuarios"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -780,20 +675,6 @@ msgstr "ir.adxunto"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estático"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Porén, estes grupos non se aplican aos directorios fillos, que deben definir "
-"os seus propios grupos."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -821,25 +702,14 @@ msgstr "febreiro"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "A ruta de almacenamento debe ser única!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campos"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Se está marcado, o medio de almacenamento é só de lectura."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -852,9 +722,9 @@ msgid "# of Files"
 msgstr "Núm. de ficheiros"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contido do directorio"
 
 #. module: document
 #: view:document.directory:0
@@ -888,9 +758,9 @@ msgid "File Name"
 msgstr "Nome do ficheiro"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Almacenamento interno"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estrutura árbore"
 
 #. module: document
 #: view:document.configuration:0
@@ -909,10 +779,7 @@ msgid "Year"
 msgstr "Ano"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medios de almacenamento"
 
@@ -924,12 +791,25 @@ msgstr "Tipo de documento"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Configuración automática de directorios"
 
+#~ msgid "Document board"
+#~ msgstr "Taboleiro de documentos"
+
+#~ msgid "Process Node"
+#~ msgstr "Nodo do proceso"
+
 #~ msgid "title"
 #~ msgstr "título"
 
 #~ msgid "This Year"
 #~ msgstr "Este ano"
 
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Erro!"
+
 #~ msgid "Sale Order"
 #~ msgstr "Pedido de venda"
 
@@ -939,12 +819,18 @@ msgstr "Tipo de documento"
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configuración automática dos directorios para produtos."
 
+#~ msgid "Document directory"
+#~ msgstr "Directorio do documento"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Erro! Non se poden crear directorios recorrentes."
 
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Configurar directorio de recursos"
 
+#~ msgid "Storage"
+#~ msgstr "Almacenamento"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Taboleiro de documentos"
 
@@ -966,15 +852,27 @@ msgstr "Tipo de documento"
 #~ msgid "User"
 #~ msgstr "Usuario"
 
+#~ msgid "Online"
+#~ msgstr "En liña"
+
 #~ msgid "Related to"
 #~ msgstr "Relacionado con"
 
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configuración automática de directorios para proxectos."
 
+#~ msgid "Data"
+#~ msgstr "Datos"
+
+#~ msgid "Database"
+#~ msgstr "Bases de datos"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Sistema de xestión integrada de documentos"
 
+#~ msgid "Read Only"
+#~ msgstr "Só lectura"
+
 #~ msgid "Dashboard"
 #~ msgstr "Panel de control"
 
@@ -985,6 +883,9 @@ msgstr "Tipo de documento"
 #~ msgid "Attached To"
 #~ msgstr "Adxunto a"
 
+#~ msgid "External file storage"
+#~ msgstr "Almacenamento externo"
+
 #~ msgid "Wall of Shame"
 #~ msgstr "Muro da vergoña"
 
@@ -1000,6 +901,9 @@ msgstr "Tipo de documento"
 #~ msgid "Notes"
 #~ msgstr "Notas"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Se está marcado, o medio de almacenamento é só de lectura."
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
@@ -1009,6 +913,12 @@ msgstr "Tipo de documento"
 #~ msgid "Statistics by User"
 #~ msgstr "Estatísticas por usuario"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "A ruta de almacenamento debe ser única!"
+
+#~ msgid "Internal File storage"
+#~ msgstr "Almacenamento interno"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "O directorio debe ter un pai ou un almacenamento."
 
@@ -1024,6 +934,9 @@ msgstr "Tipo de documento"
 #~ msgid "Files Per Partner"
 #~ msgstr "Ficheiros por empresa"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nome do ficheiro gardado"
+
 #~ msgid "Files by Partner"
 #~ msgstr "Ficheiros por empresa"
 
@@ -1065,6 +978,12 @@ msgstr "Tipo de documento"
 #~ msgid "Image"
 #~ msgstr "imaxe"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Se non se marca, o medio de almacenamento está actualmente fóra de liña e o "
+#~ "seu contido non está dispoñíbel."
+
 #~ msgid "Files By Users"
 #~ msgstr "Ficheiros por usuarios"
 
@@ -1074,12 +993,22 @@ msgstr "Tipo de documento"
 #~ msgid "Files details by Partners"
 #~ msgstr "Ficheiros detallados por empresas"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Para o almacenamento de ficheiros, a ruta raíz onde se almacenan."
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Usuarios que non inseriron documentos desde hai un mes"
 
 #~ msgid "Files by users"
 #~ msgstr "Ficheiros por usuarios"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "O nome do ficheiro. Teña en conta que o prefixo «dctx_» anteporase ao que "
+#~ "escriba aquí."
+
 #~ msgid "Files By Partner"
 #~ msgstr "Ficheiros por empresa"
 
diff --git a/addons/document/i18n/gu.po b/addons/document/i18n/gu.po
index c4464eaa0f5..433c00b8fd5 100644
--- a/addons/document/i18n/gu.po
+++ b/addons/document/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-06 18:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "ગ્રુપ દ્વારા..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "પથ"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr "ડિરેક્ટરીઓ"
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr "દસ્તાવેજો"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "સંગ્રહસ્થાન"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr "ફાઈલનું માપ"
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "પ્રકાર"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr "સુરક્ષા"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr "શરતી અવકાશ"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "ફેરફાર કર્યાની તારીખ"
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr "સમાવિષ્ટો"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "બનાવ્યાની તારીખ"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "ઓનલાઇન"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr "ઑગસ્ટ"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr "જૂન"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "સમૂહો"
 
@@ -590,11 +520,6 @@ msgstr "કાર્યશીલ"
 msgid "November"
 msgstr "નવેમ્બર"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "માહિતી"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,18 +605,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -892,6 +763,12 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "આ વર્ષ"
 
+#~ msgid "Path"
+#~ msgstr "પથ"
+
+#~ msgid "Storage"
+#~ msgstr "સંગ્રહસ્થાન"
+
 #~ msgid "Modified"
 #~ msgstr "સુધારેલ"
 
@@ -901,8 +778,14 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "ચિત્ર"
 
+#~ msgid "Online"
+#~ msgstr "ઓનલાઇન"
+
 #~ msgid "Attachment"
 #~ msgstr "જોડાણ"
 
 #~ msgid "User"
 #~ msgstr "વપરાશકર્તા"
+
+#~ msgid "Data"
+#~ msgstr "માહિતી"
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index 1882a73f8f1..7d6188eb6f4 100644
--- a/addons/document/i18n/hi.po
+++ b/addons/document/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-13 09:58+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "तारीख़ को बनाया गया"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "संसाधन आईडी"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr "रिकार्ड का नाम शामिल करे"
 msgid "Model Id"
 msgstr "मॉडल आईडी"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,19 +605,9 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "संसाधन आईडी"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index c6edc0cf6fa..2f1b166c174 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:10+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: document
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Vrsta sadržaja u mapi"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Izmjena"
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "Sadržaj mape"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dinamički sadržaj"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Moji dokumenti"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Putanja"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr "Mape"
 msgid "Files details by Users"
 msgstr "Detalji Spisa prema Korisnicima"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Greška!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Mapa dokumenta"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr "Dokumenti"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Spremište"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr "Veličina datoteke"
 msgid "Content Type"
 msgstr "Vrsta datoteke"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Izmjena"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -320,11 +282,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Pohranjeni naziv datoteke"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -352,7 +309,7 @@ msgid "Virtual Files"
 msgstr "Virtualne datoteke"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -387,7 +344,6 @@ msgstr "Sigurnost"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Korisnik posljednje promjene"
@@ -410,7 +366,6 @@ msgstr "Domena"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum izmjene"
@@ -453,9 +408,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -466,7 +420,6 @@ msgstr "nepoznato"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -485,16 +438,10 @@ msgstr "Sadržaji"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Datum stvaranja"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID resursa"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -503,17 +450,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Znanje"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -530,11 +466,6 @@ msgstr "Uključi naziv zapisa"
 msgid "Model Id"
 msgstr "ID modela"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -564,9 +495,9 @@ msgid "August"
 msgstr "Kolovoz"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Moji dokumenti"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dinamički sadržaj"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -580,7 +511,6 @@ msgstr "Lipanj"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupe"
 
@@ -594,11 +524,6 @@ msgstr "Aktivan"
 msgid "November"
 msgstr "Studeni"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Podaci"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -624,23 +549,17 @@ msgid "Seq."
 msgstr "Redoslijed"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Baza podataka"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Svi Spisi Korisnika"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Siječanj"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Samo za čitanje"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -656,7 +575,6 @@ msgstr "Privici"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -670,7 +588,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -692,19 +609,9 @@ msgid "Children"
 msgstr "Slijedne stavke"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID resursa"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -722,27 +629,17 @@ msgid "Parent Model"
 msgstr "Ishodni Model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Struktura stabla"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Svibanj"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Svi Spisi Korisnika"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -758,18 +655,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -792,25 +677,14 @@ msgstr "Veljača"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Naziv"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Polja"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -823,9 +697,9 @@ msgid "# of Files"
 msgstr "# Spisa"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Vrsta sadržaja u mapi"
 
 #. module: document
 #: view:document.directory:0
@@ -857,9 +731,9 @@ msgid "File Name"
 msgstr "Ime Spisa"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struktura stabla"
 
 #. module: document
 #: view:document.configuration:0
@@ -878,10 +752,7 @@ msgid "Year"
 msgstr "Godina"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -922,6 +793,9 @@ msgstr "Vrsta dokumenta"
 #~ msgid "Directorie's Structure"
 #~ msgstr "Struktura mape"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Pohranjeni naziv datoteke"
+
 #~ msgid "Link"
 #~ msgstr "Poveznica"
 
@@ -949,6 +823,9 @@ msgstr "Vrsta dokumenta"
 #~ "Ovdje upišite adresu poslužitelja ili IP adresu. Ostavite localhost ako ne "
 #~ "znate što biste napisali."
 
+#~ msgid "Data"
+#~ msgstr "Podaci"
+
 #~ msgid "Notes"
 #~ msgstr "Bilješke"
 
@@ -973,6 +850,9 @@ msgstr "Vrsta dokumenta"
 #~ "    * Autentifikacija korisnika\n"
 #~ "    * Indeksiranje dokumenata\n"
 
+#~ msgid "Database"
+#~ msgstr "Baza podataka"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integrirani sustav za upravljanje dokumentima"
 
@@ -1022,6 +902,9 @@ msgstr "Vrsta dokumenta"
 #~ msgid "Browse Files"
 #~ msgstr "Pretraži Datoteke"
 
+#~ msgid "Document directory"
+#~ msgstr "Mapa dokumenta"
+
 #~ msgid "Preview"
 #~ msgstr "Pregled"
 
@@ -1075,3 +958,16 @@ msgstr "Vrsta dokumenta"
 
 #~ msgid "Last Posted Time"
 #~ msgstr "Zadnje postavljeno Vrijeme"
+
+#~ msgid "Path"
+#~ msgstr "Putanja"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Greška!"
+
+#~ msgid "Storage"
+#~ msgstr "Spremište"
+
+#~ msgid "Read Only"
+#~ msgstr "Samo za čitanje"
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index 5f7fa4329f4..879fb544f0e 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:40+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Főkönyvtár"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "A könyvtár neve speciális karaktereket tartalmaz!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Folyamat csomópont"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,13 +41,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Csoportosítás..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -103,9 +87,9 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dinamikus környezet"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Útvonal"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Könyvtár nevének egyedinek kell lennie!"
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr "Könyvtárak"
 msgid "Files details by Users"
 msgstr "Fájl részletek felhasználók szerint"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Hiba!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokumentumkönyvtár"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Érvényesítési hiba"
@@ -245,19 +216,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokumentumok"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Tárolás"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Erőforrás modell"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr "Fájlméret"
 msgid "Content Type"
 msgstr "Tartalomtípus"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Típus"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr "Név mező"
 msgid "Context fields"
 msgstr "Összefüggés mezők"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Tárolt fájlnév"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr "Virtuális fájlok"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr "Biztonság"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -407,7 +363,6 @@ msgstr "Domain"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Módosítás dátuma"
@@ -450,10 +405,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statikus"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr "Tartalmak"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Létrehozás dátuma"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Erőforrás ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr ""
 msgid "Model Id"
 msgstr "Modell ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,9 +490,9 @@ msgid "August"
 msgstr "Augusztus"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dinamikus környezet"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -575,7 +506,6 @@ msgstr "Június"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Csoportok"
 
@@ -589,11 +519,6 @@ msgstr "Aktív"
 msgid "November"
 msgstr "November"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Adat"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,23 +544,17 @@ msgid "Seq."
 msgstr "Sorsz."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Adatbázis"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Minden felhasználói fájl"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Január"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Csak olvasható"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Létrehozta"
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,19 +604,9 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Erőforrás ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -717,27 +624,17 @@ msgid "Parent Model"
 msgstr "Forrásmodell"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Fastruktúra"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Május"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Minden felhasználói fájl"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statikus"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr "Február"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Név"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Mezők"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,8 +692,8 @@ msgid "# of Files"
 msgstr "Fájlok száma"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -852,9 +726,9 @@ msgid "File Name"
 msgstr "Fájl neve"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Belső fájl tárolása"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Fastruktúra"
 
 #. module: document
 #: view:document.configuration:0
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr "Év"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -891,39 +762,67 @@ msgstr "Dokumentumtípus"
 #~ msgid "Attachment"
 #~ msgstr "Melléklet"
 
+#~ msgid "Database"
+#~ msgstr "Adatbázis"
+
+#~ msgid "Data"
+#~ msgstr "Adat"
+
 #~ msgid "Attached To"
 #~ msgstr "Csatolva ehhez"
 
+#~ msgid "Process Node"
+#~ msgstr "Folyamat csomópont"
+
 #~ msgid "This Year"
 #~ msgstr "Tárgyév"
 
 #~ msgid "Files per Month"
 #~ msgstr "Fájlok/Hónap"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Hiba!"
+
 #~ msgid "Project"
 #~ msgstr "Projekt"
 
+#~ msgid "Document directory"
+#~ msgstr "Dokumentumkönyvtár"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Fájlok/Partner"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Hiba! Nem hozhat létre körkörös mappahivatkozást."
 
+#~ msgid "Storage"
+#~ msgstr "Tárolás"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Dokumentum vezérlőpult"
 
 #~ msgid "Modified"
 #~ msgstr "Módosítva"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Tárolt fájlnév"
+
 #~ msgid "Files by Partner"
 #~ msgstr "Fájlok partnerek szerint"
 
 #~ msgid "Image"
 #~ msgstr "Kép"
 
+#~ msgid "Online"
+#~ msgstr "Online"
+
 #~ msgid "User"
 #~ msgstr "Felhasználó"
 
+#~ msgid "Read Only"
+#~ msgstr "Csak olvasható"
+
 #~ msgid "Dashboard"
 #~ msgstr "Vezérlőpult"
 
@@ -967,6 +866,12 @@ msgstr "Dokumentumtípus"
 #~ msgid "Files by Resource Type"
 #~ msgstr "Fájlok forrástípusok szerint"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Belső fájl tárolása"
+
+#~ msgid "Path"
+#~ msgstr "Útvonal"
+
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Automatikus könyvtárbeállítás"
 
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index b59374c56f4..51cfc64f65d 100644
--- a/addons/document/i18n/id.po
+++ b/addons/document/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:29+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,13 +41,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -407,7 +363,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -450,9 +405,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,8 +490,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -575,7 +506,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -589,11 +519,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,8 +544,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -628,14 +553,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,18 +604,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -717,15 +624,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -733,11 +635,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,8 +692,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -852,8 +726,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index c1fa3e4ab23..bc6de478ed3 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 23:05+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Cartella Superiore"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Il nome della cartella contiene caratteri speciali !"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Board documenti"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nodo Processo"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "La cartella deve avere un superiore o un archivio."
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo di Contenuto della Cartella"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Modifica"
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Contenuto della Cartella"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contesto dinamico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Miei Documenti"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "come riferimento al record corrente, nelle cartelle dinamiche."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Percorso"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Il nome della cartella deve essere univoco!"
@@ -159,7 +143,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +153,6 @@ msgstr "Cartelle"
 msgid "Files details by Users"
 msgstr "Dettaglio files per utente"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Errore!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -228,14 +204,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Cartella Documenti"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Errore convalida"
@@ -252,19 +223,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Documenti"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Storage"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modello risorsa"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -276,22 +240,20 @@ msgstr "Dimensione File"
 msgid "Content Type"
 msgstr "Tipo Di Contenuto"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Modifica"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -327,11 +289,6 @@ msgstr "Nome campo"
 msgid "Context fields"
 msgstr "Campi contesto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nome file Memorizzati"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -359,7 +316,7 @@ msgid "Virtual Files"
 msgstr "File Virtuali"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Errore durante la scrittura del documento!"
@@ -396,7 +353,6 @@ msgstr "Sicurezza"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Ultimo utente che ha modificato"
@@ -419,7 +375,6 @@ msgstr "Dominio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data modifica"
@@ -463,12 +418,9 @@ msgstr ""
 "Definire parole nel contesto, per tutte le cartelle figlie e per i files"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Se non spuntato, il supporto è attualmente off line e il suo contenuto non "
-"disponibile"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statico"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -478,7 +430,6 @@ msgstr "sconosciuto"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -497,16 +448,10 @@ msgstr "Contenuti"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data di creazione"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID Risorsa"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -518,17 +463,6 @@ msgstr ""
 "nome del record.\n"
 "Se impostata, la cartella dovrà essere una risorsa."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Knowledge"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Archivio Documenti"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -545,11 +479,6 @@ msgstr "Includi il nome della registrazione"
 msgid "Model Id"
 msgstr "ID Modello"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "On line"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -581,9 +510,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Miei Documenti"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contesto dinamico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -597,7 +526,6 @@ msgstr "Giugno"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -611,11 +539,6 @@ msgstr "Attivo"
 msgid "November"
 msgstr "Novembre"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Dati"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -645,23 +568,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Tutti i files utente"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Gennaio"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Sola lettura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Cartella Documenti"
 
@@ -677,7 +594,6 @@ msgstr "Allegati"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autore"
 
@@ -696,7 +612,6 @@ msgstr ""
 "adeguate ai moduli installati."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -718,19 +633,9 @@ msgid "Children"
 msgstr "Figlio"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "File per utente"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Archivio file esterno"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Per l'archiviazione dei file, il percorso dell'archivio"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID Risorsa"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -748,29 +653,19 @@ msgid "Parent Model"
 msgstr "Modello Padre"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Il nome del campo. Notare che il previsso \"dctx_\" verrà preposto a quello "
-"che verra scritto qui."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Struttura ad Albero"
+"Questi gruppi, comunque, NON si applicano alle cartelle figlie, per le quali "
+"bisogna definire i loro gruppi."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maggio"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Tutti i files utente"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -786,20 +681,6 @@ msgstr "r.attachment"
 msgid "Users File"
 msgstr "File Utente"
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statico"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Questi gruppi, comunque, NON si applicano alle cartelle figlie, per le quali "
-"bisogna definire i loro gruppi."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -827,25 +708,14 @@ msgstr "Febbraio"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Il percorso di memorizzazione deve essere unico!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campi"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Se impostato i \"media\" sono in sola lettura"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -858,9 +728,9 @@ msgid "# of Files"
 msgstr "Num. di files"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Ricerca Archivio Documenti"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo di Contenuto della Cartella"
 
 #. module: document
 #: view:document.directory:0
@@ -894,9 +764,9 @@ msgid "File Name"
 msgstr "Nome File"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Deposito file interno"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struttura ad Albero"
 
 #. module: document
 #: view:document.configuration:0
@@ -915,10 +785,7 @@ msgid "Year"
 msgstr "Anno"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Supporto di archiviazione"
 
@@ -958,6 +825,9 @@ msgstr "Tipo di documento"
 #~ msgid "Browse Files"
 #~ msgstr "Sfoglia file"
 
+#~ msgid "Document directory"
+#~ msgstr "Cartella Documenti"
+
 #~ msgid "Document Management System."
 #~ msgstr "Sistema di Gestione Documentale"
 
@@ -967,6 +837,9 @@ msgstr "Tipo di documento"
 #~ msgid "Server Address"
 #~ msgstr "Indirizzo del Server"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nome file Memorizzati"
+
 #~ msgid "Link"
 #~ msgstr "Collegamento"
 
@@ -997,6 +870,12 @@ msgstr "Tipo di documento"
 #~ msgid "Configure"
 #~ msgstr "Configura"
 
+#~ msgid "Data"
+#~ msgstr "Dati"
+
+#~ msgid "Database"
+#~ msgstr "Database"
+
 #~ msgid "Others Info"
 #~ msgstr "Altre Informazioni"
 
@@ -1115,6 +994,13 @@ msgstr "Tipo di documento"
 #~ "Seleziona un oggetto qui e Open ERP creerà un abbinamento per tutti questi "
 #~ "oggetti, usando il dominio fornito, quando verrà sfogliato attraverso FTP."
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Errore!"
+
+#~ msgid "Path"
+#~ msgstr "Percorso"
+
 #~ msgid "This Year"
 #~ msgstr "Questo anno"
 
@@ -1136,9 +1022,15 @@ msgstr "Tipo di documento"
 #~ msgid "Files by Partner"
 #~ msgstr "Files per Partner"
 
+#~ msgid "Online"
+#~ msgstr "On line"
+
 #~ msgid "Image"
 #~ msgstr "Immagine"
 
+#~ msgid "Read Only"
+#~ msgstr "Sola lettura"
+
 #~ msgid "Dashboard"
 #~ msgstr "Dashboard"
 
@@ -1161,6 +1053,9 @@ msgstr "Tipo di documento"
 #~ msgid "Product"
 #~ msgstr "Prodotto"
 
+#~ msgid "External file storage"
+#~ msgstr "Archivio file esterno"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1168,6 +1063,12 @@ msgstr "Tipo di documento"
 #~ "Il \"deposito\" documenti fornisce l'accesso a tutti gli allegati, come: "
 #~ "email, documentazione di progetto, fatture ecc."
 
+#~ msgid "Internal File storage"
+#~ msgstr "Deposito file interno"
+
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Il percorso di memorizzazione deve essere unico!"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "La Directory deve avere un padre o un deposito"
 
@@ -1218,22 +1119,47 @@ msgstr "Tipo di documento"
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Configura directory risorsa"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Il nome del campo. Notare che il previsso \"dctx_\" verrà preposto a quello "
+#~ "che verra scritto qui."
+
 #~ msgid "Choose the following Resouces to auto directory configuration."
 #~ msgstr ""
 #~ "Scegliere le seguenti risorse per configurare automaticamente la directory"
 
+#~ msgid "Document board"
+#~ msgstr "Board documenti"
+
+#~ msgid "Process Node"
+#~ msgstr "Nodo Processo"
+
+#~ msgid "Storage"
+#~ msgstr "Storage"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Cerca deposito documenti"
 
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configurazione automatica directory per progetti"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Se non spuntato, il supporto è attualmente off line e il suo contenuto non "
+#~ "disponibile"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configurazione automatica directory per prodotti"
 
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Configurazione automatica directory"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Se impostato i \"media\" sono in sola lettura"
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
@@ -1243,3 +1169,6 @@ msgstr "Tipo di documento"
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(copia)"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Per l'archiviazione dei file, il percorso dell'archivio"
diff --git a/addons/document/i18n/ja.po b/addons/document/i18n/ja.po
index 5a1d6ba4763..b8840b2f3f9 100644
--- a/addons/document/i18n/ja.po
+++ b/addons/document/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "親ディレクトリ"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "ディレクトリ名に特殊文字が含まれています。"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "ドキュメントボード"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "処理ノード"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr "リソースディレクトリの名称として使う項目。空白に
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "グループ化…"
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "内容のタイプのディレクトリ"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "ディレクトリの内容"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "ダイナミックな文脈"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,13 +109,13 @@ msgstr ""
 "を使うことができます。"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "パス"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "ディレクトリ名は固有でなければいけません。"
@@ -156,7 +140,6 @@ msgstr "そうであれば，このリソースに合致する全ての添付を
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -167,13 +150,6 @@ msgstr "ディレクトリ"
 msgid "Files details by Users"
 msgstr "ユーザごとのファイルの詳細"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "エラー"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -225,14 +201,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "文書ディレクトリ"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "検証エラー"
@@ -249,19 +220,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "文書"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "ストレージ"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "リソースモデル"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -273,22 +237,20 @@ msgstr "ファイルサイズ"
 msgid "Content Type"
 msgstr "内容タイプ"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "タイプ"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -321,11 +283,6 @@ msgstr "名前項目"
 msgid "Context fields"
 msgstr "文脈項目"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "記憶されたファイル名"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -353,7 +310,7 @@ msgid "Virtual Files"
 msgstr "仮想ファイル"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "文書の書込みエラー"
@@ -388,7 +345,6 @@ msgstr "セキュリティ"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "前回，修正したユーザ"
@@ -411,7 +367,6 @@ msgstr "ドメイン"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "変更日"
@@ -454,10 +409,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "全ての子ディレクトリとファイルのために、文脈の単語を定義して下さい。"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "これをチェックしないと、メディアはオフラインになってその内容は参照できません。"
+#: view:document.directory:0
+msgid "Static"
+msgstr "静的"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -467,7 +421,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -486,16 +439,10 @@ msgstr "内容"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "作成日"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "リソースID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -506,17 +453,6 @@ msgstr ""
 "ファイル名にレコード名を含めるのであれば、これをチェックして下さい。\n"
 "そうすると、ディレクトリはリソースディレクトリになります。"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -533,11 +469,6 @@ msgstr "レコード名を含める"
 msgid "Model Id"
 msgstr "モデルID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "オンライン"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -565,9 +496,9 @@ msgid "August"
 msgstr "8月"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "ダイナミックな文脈"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -581,7 +512,6 @@ msgstr "6月"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "グループ"
 
@@ -595,11 +525,6 @@ msgstr "活動中"
 msgid "November"
 msgstr "11月"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "データ"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -627,23 +552,17 @@ msgid "Seq."
 msgstr "順序"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "データベース"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "全てのユーザのファイル"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "読取り専用"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "文書ディレクトリ"
 
@@ -659,7 +578,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "作成者"
 
@@ -675,7 +593,6 @@ msgstr ""
 "書を印刷したりダウンロードしたりするのに使うことができます。このツールは、インストールされたモデルによってディレクトリを自動的に作成します。"
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -697,19 +614,9 @@ msgid "Children"
 msgstr "子"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "外部ファイルストレージ"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "ファイルストレージのルートパス"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "リソースID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -727,27 +634,17 @@ msgid "Parent Model"
 msgstr "親モデル"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr "項目名。ここで指定したものの前に接頭語\"dctx_\"が追加されます。"
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "ツリー構造"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr "これらのグループには、子ディレクトリを適用できません。独自のグループを定義しなければいけません。"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "全てのユーザのファイル"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -763,18 +660,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "静的"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr "これらのグループには、子ディレクトリを適用できません。独自のグループを定義しなければいけません。"
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -799,25 +684,14 @@ msgstr "2月"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "名前"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "ストレージパスは固有でなければいけません。"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "項目"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "これを指定すると、メディアは読取りのみに設定されます。"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -830,9 +704,9 @@ msgid "# of Files"
 msgstr "ファイル数"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "内容のタイプのディレクトリ"
 
 #. module: document
 #: view:document.directory:0
@@ -864,9 +738,9 @@ msgid "File Name"
 msgstr "ファイル名"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "内部ファイルストレージ"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "ツリー構造"
 
 #. module: document
 #: view:document.configuration:0
@@ -885,10 +759,7 @@ msgid "Year"
 msgstr "年"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "ストレージメディア"
 
@@ -897,6 +768,12 @@ msgstr "ストレージメディア"
 msgid "Document Type"
 msgstr "文書タイプ"
 
+#~ msgid "Document board"
+#~ msgstr "ドキュメントボード"
+
+#~ msgid "Process Node"
+#~ msgstr "処理ノード"
+
 #~ msgid "Files per Month"
 #~ msgstr "月別のファイル"
 
@@ -906,18 +783,31 @@ msgstr "文書タイプ"
 #~ msgid "This Year"
 #~ msgstr "今年度"
 
+#~ msgid "Path"
+#~ msgstr "パス"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "エラー"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "知識管理"
 
 #~ msgid "Files by Users"
 #~ msgstr "ユーザ別のファイル"
 
+#~ msgid "Document directory"
+#~ msgstr "文書ディレクトリ"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "パートナ別のファイル"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "エラー：ディレクトリを重複して作ることはできません。"
 
+#~ msgid "Storage"
+#~ msgstr "ストレージ"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "文書ダッシュボード"
 
@@ -927,24 +817,43 @@ msgstr "文書タイプ"
 #~ msgid "Created"
 #~ msgstr "作成済み"
 
+#~ msgid "Stored Filename"
+#~ msgstr "記憶されたファイル名"
+
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "これをチェックしないと、メディアはオフラインになってその内容は参照できません。"
+
 #~ msgid "Image"
 #~ msgstr "画像"
 
+#~ msgid "Online"
+#~ msgstr "オンライン"
+
 #~ msgid "Attachment"
 #~ msgstr "添付"
 
 #~ msgid "User"
 #~ msgstr "ユーザ"
 
+#~ msgid "Data"
+#~ msgstr "データ"
+
 #~ msgid "Files By Users"
 #~ msgstr "ユーザ別のファイル"
 
 #~ msgid "Related to"
 #~ msgstr "次に関連"
 
+#~ msgid "Read Only"
+#~ msgstr "読取り専用"
+
 #~ msgid "Dashboard"
 #~ msgstr "ダッシュボード"
 
+#~ msgid "Database"
+#~ msgstr "データベース"
+
 #~ msgid "Attached To"
 #~ msgstr "次に添付"
 
@@ -957,6 +866,12 @@ msgstr "文書タイプ"
 #~ msgid "Files details by Partners"
 #~ msgstr "パートナ別のファイルの詳細"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "ファイルストレージのルートパス"
+
+#~ msgid "External file storage"
+#~ msgstr "外部ファイルストレージ"
+
 #~ msgid "Files by users"
 #~ msgstr "ユーザ別のファイル"
 
@@ -992,10 +907,16 @@ msgstr "文書タイプ"
 #~ msgid "Indexed Content - experimental"
 #~ msgstr "索引付き内容 - 実験"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "これを指定すると、メディアは読取りのみに設定されます。"
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(コピー)"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "ストレージパスは固有でなければいけません。"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "ファイル名は固有でなければいけません。"
@@ -1003,6 +924,9 @@ msgstr "文書タイプ"
 #~ msgid "Files by Resource Type"
 #~ msgstr "リソースタイプ別ファイル"
 
+#~ msgid "Internal File storage"
+#~ msgstr "内部ファイルストレージ"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "ディレクトリは親あるいはストレージを持っていなければなりません。"
 
@@ -1011,3 +935,8 @@ msgstr "文書タイプ"
 
 #~ msgid "Search Document storage"
 #~ msgstr "ディレクトリストレージを検索する"
+
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr "項目名。ここで指定したものの前に接頭語\"dctx_\"が追加されます。"
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 5c61a84b121..cb76c358d53 100644
--- a/addons/document/i18n/ko.po
+++ b/addons/document/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "디렉토리 이름이 특수 문자를 포함하고 있습니다 !"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "디렉토리 컨텐트 타입"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr "디렉토리 컨텐트"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "디렉토리 이름은 고유해야 합니다!"
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr "디렉토리"
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "문서 디렉토리"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr "파일 크기"
 msgid "Content Type"
 msgstr "컨텐트 타입"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "타입"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "보관된 파일 이름"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr "가상 파일"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr "보안"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "최종 수정 사용자"
@@ -408,7 +364,6 @@ msgstr "도메인"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "날짜가 수정됨"
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr "컨텐트"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "생성 날짜"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "리소스 ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr "리코드 이름 포함"
 msgid "Model Id"
 msgstr "모델 ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "그룹"
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "데이터"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,23 +545,17 @@ msgid "Seq."
 msgstr "시퀀스"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "데이터베이스"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr ""
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "만든 이"
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,19 +605,9 @@ msgid "Children"
 msgstr "칠드런"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "리소스 ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -718,27 +625,17 @@ msgid "Parent Model"
 msgstr "페어런트 모델"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "트리 구조"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "이름"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,9 +693,9 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "디렉토리 컨텐트 타입"
 
 #. module: document
 #: view:document.directory:0
@@ -853,9 +727,9 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "트리 구조"
 
 #. module: document
 #: view:document.configuration:0
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -930,6 +801,9 @@ msgstr "문서 타입"
 #~ msgid "Resource Title"
 #~ msgstr "리소스 제목"
 
+#~ msgid "Stored Filename"
+#~ msgstr "보관된 파일 이름"
+
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -955,6 +829,9 @@ msgstr "문서 타입"
 #~ "write."
 #~ msgstr "서버 주소 또는 IP를 기록하십시오. 잘 모르겠으면 localhost로 설정하십시오."
 
+#~ msgid "Data"
+#~ msgstr "데이터"
+
 #~ msgid "Notes"
 #~ msgstr "노트"
 
@@ -969,6 +846,9 @@ msgstr "문서 타입"
 #~ "    * 사용자 인증\n"
 #~ "    * 문서 인덱스 생성\n"
 
+#~ msgid "Database"
+#~ msgstr "데이터베이스"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "통합 문서 관리 시스템"
 
@@ -978,6 +858,9 @@ msgstr "문서 타입"
 #~ msgid "Attached To"
 #~ msgstr "첨부 대상"
 
+#~ msgid "Document directory"
+#~ msgstr "문서 디렉토리"
+
 #~ msgid "History"
 #~ msgstr "히스토리"
 
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index f3f8b7cda59..d801193e275 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:06+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Katalogo pavadinime yra specialiųjų simbolių!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Katalogo turinio tipas"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr "Katalogo turinys"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Katalogo pavadinimas turi būti unikalus!"
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr "Katalogai"
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Klaida!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokumentų katalogas"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Patvirtinimo klaida"
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr "Failo dydis"
 msgid "Content Type"
 msgstr "Turinio tipas"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipas"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Išsaugotas failo vardas"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr "Virtualūs failai"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr "Saugumas"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Paskutinis pakeitęs naudotojas"
@@ -408,7 +364,6 @@ msgstr "Sritis"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Modifikavimo data"
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr "Turinys"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Sukūrimo data"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Šaltinio ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr "Įtraukti įrašo pavadinimą"
 msgid "Model Id"
 msgstr "Modelio ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -562,8 +493,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -578,7 +509,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupės"
 
@@ -592,11 +522,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Duomenys"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -622,23 +547,17 @@ msgid "Seq."
 msgstr "Seka"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Duomenų bazė"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr ""
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -654,7 +573,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Kūrėjas"
 
@@ -668,7 +586,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -690,19 +607,9 @@ msgid "Children"
 msgstr "Vaikai"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Šaltinio ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -720,27 +627,17 @@ msgid "Parent Model"
 msgstr "Tėvinis modelis"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Medžio struktūra"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -756,18 +653,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -790,25 +675,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Pavadinimas"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -821,9 +695,9 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Katalogo turinio tipas"
 
 #. module: document
 #: view:document.directory:0
@@ -855,9 +729,9 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Medžio struktūra"
 
 #. module: document
 #: view:document.configuration:0
@@ -876,10 +750,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -903,9 +774,15 @@ msgstr "Dokumento tipas"
 #~ msgid "Link"
 #~ msgstr "Nuoroda"
 
+#~ msgid "Data"
+#~ msgstr "Duomenys"
+
 #~ msgid "Notes"
 #~ msgstr "Pastabos"
 
+#~ msgid "Database"
+#~ msgstr "Duomenų bazė"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integruota dokumentų valdymo sistema"
 
@@ -921,6 +798,9 @@ msgstr "Dokumento tipas"
 #~ msgid "Auto-Generated Files"
 #~ msgstr "Automatiškai sugeneruoti failai"
 
+#~ msgid "Document directory"
+#~ msgstr "Dokumentų katalogas"
+
 #~ msgid ""
 #~ "Select an object here and Open ERP will create a mapping for each of these "
 #~ "objects, using the given domain, when browsing through FTP."
@@ -948,6 +828,10 @@ msgstr "Dokumento tipas"
 #~ msgid "Resource Title"
 #~ msgstr "Resurso antraštė"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Klaida!"
+
 #~ msgid "document.configuration.wizard"
 #~ msgstr "Dokumentų konfigūracija"
 
@@ -963,6 +847,9 @@ msgstr "Dokumento tipas"
 #~ msgid "Storing Method"
 #~ msgstr "Laikymo metodas"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Išsaugotas failo vardas"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Netinkamas XML peržiūros architektūrai!"
 
diff --git a/addons/document/i18n/lv.po b/addons/document/i18n/lv.po
index 32820e6dd35..9f33abf7625 100644
--- a/addons/document/i18n/lv.po
+++ b/addons/document/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:16+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Visrmape"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Mapes nosaukumā ir speciālie simboli!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Dokumentu instrumentu panelis"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Procesa mezgls"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupēt pēc..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Mapes satura tips"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "Mapes saturs"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dinamisks konteksts"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ceļš"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Mapes nosaukumam jābūt unikālam!"
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr "Mapes"
 msgid "Files details by Users"
 msgstr "Failu info pēc lietotājiem"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Kļūda!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokumentu mape"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Validācijas Kļūda"
@@ -246,19 +217,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokumenti"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Glabātuve"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Resursa modelis"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr "Faila izmērs"
 msgid "Content Type"
 msgstr "Satura tips"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tips"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -320,11 +282,6 @@ msgstr "Nosaukuma lauks"
 msgid "Context fields"
 msgstr "Konteksta lauki"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Saglabātais faila nosaukums"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -352,7 +309,7 @@ msgid "Virtual Files"
 msgstr "Virtuāli faili"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Klūda rakstot dokumentu!"
@@ -387,7 +344,6 @@ msgstr "Drošība"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Pēdējo izmaiņu lietotājs"
@@ -410,7 +366,6 @@ msgstr "Joma"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Izmaiņu datums"
@@ -453,10 +408,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Definēt vārdus visu apakšmapju un failu kontekstā"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statisks"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -466,7 +420,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -485,16 +438,10 @@ msgstr "Saturs"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Izveides datums"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Resursa ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -503,17 +450,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -530,11 +466,6 @@ msgstr "Iekļaut ieraksta nosaukumu"
 msgid "Model Id"
 msgstr "Modeļa ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Tiešsaistē"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -562,9 +493,9 @@ msgid "August"
 msgstr "Augusts"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dinamisks konteksts"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -578,7 +509,6 @@ msgstr "Jūnijs"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupas"
 
@@ -592,11 +522,6 @@ msgstr "Aktīvs"
 msgid "November"
 msgstr "Novembris"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Dati"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -622,23 +547,17 @@ msgid "Seq."
 msgstr "Sec."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Datubāze"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Visu lietotāju faili"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Janvāris"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Tikai lasāms"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -654,7 +573,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autors"
 
@@ -668,7 +586,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -690,19 +607,9 @@ msgid "Children"
 msgstr "Bērni"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Ārēja failu glabātuve"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Failu glabāšanai - glabātuves saknes ceļs"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Resursa ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -720,29 +627,17 @@ msgid "Parent Model"
 msgstr "Virsmodelis"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Lauka nosaukums. Ievērojiet, ka tam kas ir uzrakstīts šeit tiks pievienots "
-"prefikss \"dctx_\"."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Koka struktūra"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maijs"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Visu lietotāju faili"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -758,18 +653,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statisks"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -792,25 +675,14 @@ msgstr "Februāris"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nosaukums"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Lauki"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Ja iestatīts, mēdijs ir tikai lasīšanai"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -823,9 +695,9 @@ msgid "# of Files"
 msgstr "Failu skaits"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Mapes satura tips"
 
 #. module: document
 #: view:document.directory:0
@@ -858,9 +730,9 @@ msgid "File Name"
 msgstr "Faila nosaukums"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Iekšēja failu glabātuve"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Koka struktūra"
 
 #. module: document
 #: view:document.configuration:0
@@ -879,10 +751,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -891,6 +760,12 @@ msgstr ""
 msgid "Document Type"
 msgstr ""
 
+#~ msgid "Document board"
+#~ msgstr "Dokumentu instrumentu panelis"
+
+#~ msgid "Process Node"
+#~ msgstr "Procesa mezgls"
+
 #~ msgid "Files per Month"
 #~ msgstr "Faili mēnesī"
 
@@ -900,18 +775,31 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Šajā gadā"
 
+#~ msgid "Path"
+#~ msgstr "Ceļš"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Kļūda!"
+
 #~ msgid "Project"
 #~ msgstr "Projekts"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Kļūda! Nevar veidot rekursīvas mapes."
 
+#~ msgid "Storage"
+#~ msgstr "Glabātuve"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Dokumentu instrumentu panelis"
 
 #~ msgid "Created"
 #~ msgstr "Izveidota"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Saglabātais faila nosaukums"
+
 #~ msgid "Modified"
 #~ msgstr "Mainīts"
 
@@ -927,6 +815,18 @@ msgstr ""
 #~ msgid "User"
 #~ msgstr "Lietotājs"
 
+#~ msgid "Online"
+#~ msgstr "Tiešsaistē"
+
+#~ msgid "Data"
+#~ msgstr "Dati"
+
+#~ msgid "Database"
+#~ msgstr "Datubāze"
+
+#~ msgid "Read Only"
+#~ msgstr "Tikai lasāms"
+
 #~ msgid "Dashboard"
 #~ msgstr "Instrumentu panelis"
 
@@ -948,6 +848,9 @@ msgstr ""
 #~ msgid "New Files"
 #~ msgstr "Jauni faili"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Ja iestatīts, mēdijs ir tikai lasīšanai"
+
 #~ msgid "Statistics by User"
 #~ msgstr "Statistika pēc lietotāja"
 
@@ -961,6 +864,9 @@ msgstr ""
 #~ msgid "Files by Resource Type"
 #~ msgstr "Faili pēc resursu tipa"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Iekšēja failu glabātuve"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Automātiska mapju konfigurācija pēc produktiem."
 
@@ -1003,6 +909,9 @@ msgstr ""
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integrēta dokumentu vadības sistēma"
 
+#~ msgid "External file storage"
+#~ msgstr "Ārēja failu glabātuve"
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Lietotāji, kas nav pievienojuši dokumentus pēdēja mēneša laikā"
 
@@ -1012,9 +921,19 @@ msgstr ""
 #~ msgid "Files By Partner"
 #~ msgstr "Faili pēc partnera"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Lauka nosaukums. Ievērojiet, ka tam kas ir uzrakstīts šeit tiks pievienots "
+#~ "prefikss \"dctx_\"."
+
 #~ msgid "Files by users"
 #~ msgstr "Faili pēc lietotājiem"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Failu glabāšanai - glabātuves saknes ceļs"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1024,3 +943,6 @@ msgstr ""
 
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Automātiska mapes konfigurācija"
+
+#~ msgid "Document directory"
+#~ msgstr "Dokumentu mape"
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 67d808120fc..de16e38c346 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Эцэг хавтас"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Хавтасны нэр онцгой тэмдэгт агуулж болно!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Баримтын самбар"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Process Node"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Хавтасын агуулгын төрөл"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Хавтасын агуулга"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Динамик утга"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "to the current record, in dynamic folders"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Зам"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Хавтасны нэр давхцахгүй!"
@@ -159,7 +143,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +153,6 @@ msgstr "Хавтасууд"
 msgid "Files details by Users"
 msgstr "Файлын дэлгэрэнгүй, хэрэглэгчээр"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Алдаа!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -228,14 +204,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Баримтын хавтас"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -252,19 +223,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Баримт"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Хадгалалт"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Нөөц модел"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -276,22 +240,20 @@ msgstr "Файлын хэмжээ"
 msgid "Content Type"
 msgstr "Агуулгын төрөл"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Төрөл"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -326,11 +288,6 @@ msgstr "Нэр талбар"
 msgid "Context fields"
 msgstr "Агуулга талбар"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Нөөцөлсөн файлын нэр"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -358,7 +315,7 @@ msgid "Virtual Files"
 msgstr "Виртуаль файлууд"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Бичих алдаа!"
@@ -395,7 +352,6 @@ msgstr "Аюулгүй байдал"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Сүүлд зассан хэрэглэгч"
@@ -418,7 +374,6 @@ msgstr "Домэйн"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Зассан огноо"
@@ -461,11 +416,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Define words in the context, for all child directories and files"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Статик"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -475,7 +428,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -494,16 +446,10 @@ msgstr "Агуулга"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Үүсгэсэн огноо"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Нөөц ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -515,17 +461,6 @@ msgstr ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -542,11 +477,6 @@ msgstr "Бичлэгийн нэрийг багтаах"
 msgid "Model Id"
 msgstr "Модель Id"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Онлайн"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -578,9 +508,9 @@ msgid "August"
 msgstr "8 сар"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Динамик утга"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -594,7 +524,6 @@ msgstr "6 сар"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Группүүд"
 
@@ -608,11 +537,6 @@ msgstr "Идэвхтэй"
 msgid "November"
 msgstr "11 сар"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Өгөгдөл"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -642,23 +566,17 @@ msgid "Seq."
 msgstr "Д/д."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Өгөгдлийн сан"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Бүх хэрэглэгчийн файлууд"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "1 сар"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Зөвхөн уншина"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Баримтын Директор"
 
@@ -674,7 +592,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Үүсгэгч"
 
@@ -692,7 +609,6 @@ msgstr ""
 "суулгасан модулиудын дагууд директоруудыг үүсгэнэ."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -714,19 +630,9 @@ msgid "Children"
 msgstr "Дэд"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Гадна хадгалах файл"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Нөөц ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -744,29 +650,19 @@ msgid "Parent Model"
 msgstr "Толгой модель"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Мод бүтэц"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "5 сар"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Бүх хэрэглэгчийн файлууд"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -782,20 +678,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Статик"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -823,25 +705,14 @@ msgstr "2 сар"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Нэр"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Хадгалах зам нь давхцаж болохгүй!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Талбар"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "If set, media is for reading only"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -854,9 +725,9 @@ msgid "# of Files"
 msgstr "Файлын тоо"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Хавтасын агуулгын төрөл"
 
 #. module: document
 #: view:document.directory:0
@@ -890,9 +761,9 @@ msgid "File Name"
 msgstr "Файлын нэр"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Дотор хадгалах файл"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Мод бүтэц"
 
 #. module: document
 #: view:document.configuration:0
@@ -911,10 +782,7 @@ msgid "Year"
 msgstr "Жил"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Хадгалах ой"
 
@@ -962,9 +830,15 @@ msgstr "Баримтын төрөл"
 #~ msgid "Link"
 #~ msgstr "Холбоос"
 
+#~ msgid "Data"
+#~ msgstr "Өгөгдөл"
+
 #~ msgid "Notes"
 #~ msgstr "Тэмдэглэл"
 
+#~ msgid "Database"
+#~ msgstr "Өгөгдлийн сан"
+
 #~ msgid "Filesystem"
 #~ msgstr "Файлсистем"
 
@@ -974,6 +848,9 @@ msgstr "Баримтын төрөл"
 #~ msgid "Server Address"
 #~ msgstr "Сервер хаяг"
 
+#~ msgid "Document directory"
+#~ msgstr "Баримтын хавтас"
+
 #~ msgid "Search a File"
 #~ msgstr "Файл хайх"
 
@@ -1064,6 +941,9 @@ msgstr "Баримтын төрөл"
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Нэг сараас хойш баримт оруулаагүй хэрэглэгчид"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Нөөцөлсөн файлын нэр"
+
 #~ msgid "Attached To"
 #~ msgstr "Хавсаргах"
 
@@ -1073,9 +953,19 @@ msgstr "Баримтын төрөл"
 #~ msgid "Configure"
 #~ msgstr "Тохиргоо"
 
+#~ msgid "Document board"
+#~ msgstr "Баримтын самбар"
+
 #~ msgid "This Year"
 #~ msgstr "Энэ жил"
 
+#~ msgid "Path"
+#~ msgstr "Зам"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Алдаа!"
+
 #~ msgid "Project"
 #~ msgstr "Төсөл"
 
@@ -1085,6 +975,9 @@ msgstr "Баримтын төрөл"
 #~ msgid "Image"
 #~ msgstr "Зураг"
 
+#~ msgid "Online"
+#~ msgstr "Онлайн"
+
 #~ msgid "Dashboard"
 #~ msgstr "Хянах самбар"
 
@@ -1115,6 +1008,9 @@ msgstr "Баримтын төрөл"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Автомат тохиргооны хавтас"
 
+#~ msgid "Process Node"
+#~ msgstr "Process Node"
+
 #~ msgid "Sale Order"
 #~ msgstr "Борлуулалтын захиалга"
 
@@ -1124,6 +1020,9 @@ msgstr "Баримтын төрөл"
 #~ msgid "Files by Users"
 #~ msgstr "Хэрэгдэгчийн файл"
 
+#~ msgid "Storage"
+#~ msgstr "Хадгалалт"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Харилцагч бүрийн файл"
 
@@ -1174,6 +1073,12 @@ msgstr "Баримтын төрөл"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Төслийн автомат тохиргооны хавтас"
 
+#~ msgid "Read Only"
+#~ msgstr "Зөвхөн уншина"
+
+#~ msgid "External file storage"
+#~ msgstr "Гадна хадгалах файл"
+
 #~ msgid "New Files"
 #~ msgstr "Шинэ файл"
 
@@ -1184,9 +1089,20 @@ msgstr "Баримтын төрөл"
 #~ msgid "File name must be unique!"
 #~ msgstr "Файлын нэр давхцахгүй!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Дотор хадгалах файл"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Хайх"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Хадгалах зам нь давхцаж болохгүй!"
+
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "If not checked, media is currently offline and its contents not available"
+
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -1194,6 +1110,9 @@ msgstr "Баримтын төрөл"
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "For file storage, the root path of the storage"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1201,11 +1120,21 @@ msgstr "Баримтын төрөл"
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "If set, media is for reading only"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Directory must have a parent or a storage"
 
diff --git a/addons/document/i18n/nb.po b/addons/document/i18n/nb.po
index 4a9ea425402..12cd2595c49 100644
--- a/addons/document/i18n/nb.po
+++ b/addons/document/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-26 14:59+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Overordnede katalog."
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "Katalog må ha en overordnede eller en lagringsplass."
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupper etter ..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Katalog Innholdstype."
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Endring."
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Katalog innhold."
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynamisk sammenheng"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Mine dokumenter."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -124,13 +108,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Bane"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Bedriftskatalog navnet må være unikt!"
@@ -157,7 +141,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -168,13 +151,6 @@ msgstr "Kataloger"
 msgid "Files details by Users"
 msgstr "Fil detaljer av brukere."
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Feil!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -226,14 +202,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Dokument katalog."
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -250,19 +221,12 @@ msgstr "ir.handlinger.rapport.xml"
 msgid "Documents"
 msgstr "Dokumenter"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Lagring"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Ressurs modellen."
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -274,22 +238,20 @@ msgstr "Filstørrelse"
 msgid "Content Type"
 msgstr "Innholdstype"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Endring."
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopi)"
@@ -322,11 +284,6 @@ msgstr "Felt navn."
 msgid "Context fields"
 msgstr "Kontekst felt."
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Lagring filnavn."
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -354,7 +311,7 @@ msgid "Virtual Files"
 msgstr "Virtuelle filer."
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Feil på doc skrive!"
@@ -389,7 +346,6 @@ msgstr "Sikkerhet"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Siste endring bruker."
@@ -412,7 +368,6 @@ msgstr "Domene"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Dato endret."
@@ -455,11 +410,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Definere ord i sammenheng, for alle underordnede kataloger og filer."
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Hvis det ikke er merket, er media offline og dens innhold ikke tilgjengelig."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statisk"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -469,7 +422,6 @@ msgstr "Ukjent."
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -488,16 +440,10 @@ msgstr "Innhold"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Dato opprettet"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Ressurs ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -506,17 +452,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Kunnskap."
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Dokument lager."
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -533,11 +468,6 @@ msgstr "Inkludert rekord navn."
 msgid "Model Id"
 msgstr "Modell ID."
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Pålogget"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -565,9 +495,9 @@ msgid "August"
 msgstr "August"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Mine dokumenter."
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamisk sammenheng"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -581,7 +511,6 @@ msgstr "Juni"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupper"
 
@@ -595,11 +524,6 @@ msgstr "Aktiv"
 msgid "November"
 msgstr "November"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Data"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -625,23 +549,17 @@ msgid "Seq."
 msgstr "Sekvens"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Filene til alle brukerne."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Bare lesing"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Dokument katalog."
 
@@ -657,7 +575,6 @@ msgstr "Vedlegg."
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Forfatter"
 
@@ -671,7 +588,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -693,19 +609,9 @@ msgid "Children"
 msgstr "Underordnede"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Filer av bruker."
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Ekstern fillagring."
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "For fil lagring, rotbanen Av lagring."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Ressurs ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -723,27 +629,17 @@ msgid "Parent Model"
 msgstr "Overordnede modell."
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "trestruktur."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Filene til alle brukerne."
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -759,18 +655,6 @@ msgstr "ir.vedlegg"
 msgid "Users File"
 msgstr "Brukerens fil."
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statisk"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -793,25 +677,14 @@ msgstr "Februar"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Navn"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Lagrings stien må være unik!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Felter"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Hvis innstilt, er media for lesing bare."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -824,9 +697,9 @@ msgid "# of Files"
 msgstr "# av filer."
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Søk dokument lagring."
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Katalog Innholdstype."
 
 #. module: document
 #: view:document.directory:0
@@ -860,9 +733,9 @@ msgid "File Name"
 msgstr "Filnavn"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Intern Fillagring."
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "trestruktur."
 
 #. module: document
 #: view:document.configuration:0
@@ -881,10 +754,7 @@ msgid "Year"
 msgstr "År"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Lagringsmedium"
 
@@ -902,36 +772,58 @@ msgstr "Dokumenttype."
 #~ msgid "This Year"
 #~ msgstr "Dette året."
 
+#~ msgid "Path"
+#~ msgstr "Bane"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Feil!"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "Kunnskaps håndtering"
 
 #~ msgid "Files by Users"
 #~ msgstr "Filer av brukere."
 
+#~ msgid "Document directory"
+#~ msgstr "Dokument katalog."
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Filer per partner."
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Feil! Du kan opprette rekursive kataloger."
 
+#~ msgid "Storage"
+#~ msgstr "Lagring"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Dokument kontrollbord."
 
 #~ msgid "Created"
 #~ msgstr "Opprettet"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Lagring filnavn."
+
 #~ msgid "Modified"
 #~ msgstr "Modifisert"
 
 #~ msgid "Image"
 #~ msgstr "Bilde"
 
+#~ msgid "Online"
+#~ msgstr "Pålogget"
+
 #~ msgid "Attachment"
 #~ msgstr "Vedlegg."
 
 #~ msgid "User"
 #~ msgstr "Bruker"
 
+#~ msgid "Data"
+#~ msgstr "Data"
+
 #~ msgid "Files By Users"
 #~ msgstr "Filer av brukere."
 
@@ -941,6 +833,12 @@ msgstr "Dokumenttype."
 #~ msgid "Related to"
 #~ msgstr "Relatert til."
 
+#~ msgid "Read Only"
+#~ msgstr "Bare lesing"
+
+#~ msgid "Database"
+#~ msgstr "Database"
+
 #~ msgid "Attached To"
 #~ msgstr "Knyttet til."
 
@@ -981,6 +879,9 @@ msgstr "Dokumenttype."
 #~ msgid "(copy)"
 #~ msgstr "(kopi)"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Lagrings stien må være unik!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Fil navnet må være unikt!"
@@ -996,3 +897,20 @@ msgstr "Dokumenttype."
 
 #~ msgid "All Months Files"
 #~ msgstr "Alle filene denne måneden."
+
+#~ msgid "External file storage"
+#~ msgstr "Ekstern fillagring."
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Hvis innstilt, er media for lesing bare."
+
+#~ msgid "Internal File storage"
+#~ msgstr "Intern Fillagring."
+
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Hvis det ikke er merket, er media offline og dens innhold ikke tilgjengelig."
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "For fil lagring, rotbanen Av lagring."
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index e4872f1383c..26b282a5ff4 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 13:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 19:12+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Bovenliggende folder"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Mapnaam bevat speciale tekens!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Document board"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Proces knooppunt"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "Directory moet een bovenliggende map hebben of een opslag."
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Soort inhoud map"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Wijziging"
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Inhoud map"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynamische context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Mijn document(en)"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "referentie naar het huidige record, in dynamische mappen"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Pad"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr "De naam van het veld"
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Mapnaam moet uniek zijn"
@@ -159,7 +143,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +153,6 @@ msgstr "Mappen"
 msgid "Files details by Users"
 msgstr "Bestandsdetails per gebruiker"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Fout!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -235,14 +211,9 @@ msgstr ""
 "        "
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Documentenmap"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Validatiefout"
@@ -259,19 +230,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Documenten"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Opslag"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Resource model"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -283,22 +247,20 @@ msgstr "Bestandsgrootte"
 msgid "Content Type"
 msgstr "Soort inhoud"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Wijziging"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Soort"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr "De bestandsnaam moet uniek zijn per bedrijf!"
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -334,11 +296,6 @@ msgstr "Naam veld"
 msgid "Context fields"
 msgstr "Context velden"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Opgeslagen bestandsnaam"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -366,7 +323,7 @@ msgid "Virtual Files"
 msgstr "Virtuele bestanden"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Fout bij schrijven document !"
@@ -403,7 +360,6 @@ msgstr "Beveiliging"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Laatste wijziging door gebruiker"
@@ -426,7 +382,6 @@ msgstr "Domein"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Wijzigingsdatum"
@@ -470,11 +425,9 @@ msgstr ""
 "Definieer woorden in de context, voor alle dochtermappen en bestanden"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Indien niet aangevinkt, is medium offline en de inhoud niet beschikbaar"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statisch"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -484,7 +437,6 @@ msgstr "onbekend"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -503,16 +455,10 @@ msgstr "Inhoud"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Aanmaakdatum"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Resource ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -524,17 +470,6 @@ msgstr ""
 "bevat.\n"
 "In dat geval moet de map een resource zijn."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Kennis"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Document opslag"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -551,11 +486,6 @@ msgstr "Naam record invoegen"
 msgid "Model Id"
 msgstr "Model ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -587,9 +517,9 @@ msgid "August"
 msgstr "Augustus"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Mijn document(en)"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamische context"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -603,7 +533,6 @@ msgstr "Juni"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Groepen"
 
@@ -617,11 +546,6 @@ msgstr "Actief"
 msgid "November"
 msgstr "November"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Gegevens"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -651,23 +575,17 @@ msgid "Seq."
 msgstr "Volgnr."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Alle gebruikersbestanden"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Januari"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Alleen lezen"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Document mappen"
 
@@ -683,7 +601,6 @@ msgstr "Bijlagen"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Gemaakt door"
 
@@ -702,7 +619,6 @@ msgstr ""
 "geïnstalleerde modules."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -724,19 +640,9 @@ msgid "Children"
 msgstr "Dochters"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Bestanden per gebruiker"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Externe opslag (herkenbare bestandsnamen)"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Voor bestandsopslag, het hoofdpad van de opslag"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Resource ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -754,29 +660,19 @@ msgid "Parent Model"
 msgstr "Bovenliggend model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"De naam van het veld. Merk op dat het voorvoegsel \"dctx_\" aan het begin "
-"wordt gezet van de tekst die hier wordt ingevuld."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Boomstructuur"
+"Deze groepen gelden echter NIET voor onderliggende mappen, die hun eigen "
+"groepen moeten definiëren."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mei"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Alle gebruikersbestanden"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -793,20 +689,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr "Gebruijers bestand"
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statisch"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Deze groepen gelden echter NIET voor onderliggende mappen, die hun eigen "
-"groepen moeten definiëren."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -834,25 +716,14 @@ msgstr "Februari"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Naam"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Het opslagpad moet uniek zijn !"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Velden"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Indien ingesteld is medium alleen lezen"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -865,9 +736,9 @@ msgid "# of Files"
 msgstr "# bestanden"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Zoek in document opslag"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Soort inhoud map"
 
 #. module: document
 #: view:document.directory:0
@@ -900,9 +771,9 @@ msgid "File Name"
 msgstr "Bestandsnaam"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Interne opslag (willekeurige bestandsnamen)"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Boomstructuur"
 
 #. module: document
 #: view:document.configuration:0
@@ -921,10 +792,7 @@ msgid "Year"
 msgstr "Jaar"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Opslagmedium"
 
@@ -939,6 +807,9 @@ msgstr "Soort document"
 #~ msgid "Attachment"
 #~ msgstr "Bijlage"
 
+#~ msgid "Data"
+#~ msgstr "Gegevens"
+
 #~ msgid "Attached To"
 #~ msgstr "Gekoppeld aan"
 
@@ -948,6 +819,12 @@ msgstr "Soort document"
 #~ msgid "File Information"
 #~ msgstr "Bestandsinformatie"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Opgeslagen bestandsnaam"
+
+#~ msgid "Database"
+#~ msgstr "Database"
+
 #~ msgid "Filesystem"
 #~ msgstr "Bestandssysteem"
 
@@ -966,6 +843,9 @@ msgstr "Soort document"
 #~ msgid "Browse Files"
 #~ msgstr "Bladeren"
 
+#~ msgid "Document directory"
+#~ msgstr "Documentenmap"
+
 #~ msgid "Others Info"
 #~ msgstr "Overige info"
 
@@ -1076,6 +956,10 @@ msgstr "Soort document"
 #~ msgid "Auto Configure"
 #~ msgstr "Automatisch instellen"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Fout!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Bestandsnaam moet uniek zijn!"
@@ -1113,9 +997,18 @@ msgstr "Soort document"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Auto map configuratie"
 
+#~ msgid "Document board"
+#~ msgstr "Document board"
+
+#~ msgid "Process Node"
+#~ msgstr "Proces knooppunt"
+
 #~ msgid "This Year"
 #~ msgstr "Dit jaar"
 
+#~ msgid "Path"
+#~ msgstr "Pad"
+
 #~ msgid "Sale Order"
 #~ msgstr "Verkooporder"
 
@@ -1128,6 +1021,9 @@ msgstr "Soort document"
 #~ msgid "Files by Users"
 #~ msgstr "Bestanden per gebruiker"
 
+#~ msgid "Storage"
+#~ msgstr "Opslag"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Bestanden per relatie"
 
@@ -1184,6 +1080,14 @@ msgstr "Soort document"
 #~ msgid "Image"
 #~ msgstr "Afbeelding"
 
+#~ msgid "Online"
+#~ msgstr "Online"
+
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Indien niet aangevinkt, is medium offline en de inhoud niet beschikbaar"
+
 #~ msgid "Files By Users"
 #~ msgstr "Bestanden per gebruiker"
 
@@ -1196,6 +1100,9 @@ msgstr "Soort document"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Auto map configuratie voor projecten."
 
+#~ msgid "Read Only"
+#~ msgstr "Alleen lezen"
+
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -1204,6 +1111,9 @@ msgstr "Soort document"
 #~ "verschijnen. Plaats geen bovenliggende map als u een bovenliggend model "
 #~ "kiest."
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Voor bestandsopslag, het hoofdpad van de opslag"
+
 #~ msgid "New Files"
 #~ msgstr "Nieuwe bestanden"
 
@@ -1217,9 +1127,22 @@ msgstr "Soort document"
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr "Auto map configuratie voor verkooporders en offerte met overzicht."
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "De naam van het veld. Merk op dat het voorvoegsel \"dctx_\" aan het begin "
+#~ "wordt gezet van de tekst die hier wordt ingevuld."
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Indien ingesteld is medium alleen lezen"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Zoek documentopslag"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Het opslagpad moet uniek zijn !"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Map moet een bovenliggende map hebben of opslag zijn"
 
@@ -1257,3 +1180,9 @@ msgstr "Soort document"
 
 #~ msgid "Reporting"
 #~ msgstr "Rapportages"
+
+#~ msgid "External file storage"
+#~ msgstr "Externe opslag (herkenbare bestandsnamen)"
+
+#~ msgid "Internal File storage"
+#~ msgstr "Interne opslag (willekeurige bestandsnamen)"
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index 3936cb1ccc6..58774d4eb0a 100644
--- a/addons/document/i18n/nl_BE.po
+++ b/addons/document/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 12:17+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,13 +41,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -407,7 +363,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -450,9 +405,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,8 +490,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -575,7 +506,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -589,11 +519,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,8 +544,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -628,14 +553,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,18 +604,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -717,15 +624,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -733,11 +635,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,8 +692,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -852,8 +726,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index ff3509dd7b6..f1d45e104b7 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 10:30+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Katalog nadrzędny"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Nazwa katalogu zawiera znaki specjalne !"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Konsola dokumentów"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Węzeł procesu"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Typ zawartości katalogu"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Modyfikacja"
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Zawartość katalogu"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynamiczny kontekst"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Moje dokumenty"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -123,13 +107,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ścieżka"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Nazwa katalogu musi być unikalna!"
@@ -154,7 +138,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -165,13 +148,6 @@ msgstr "Katalogi"
 msgid "Files details by Users"
 msgstr "Szczegóły plików wg użytkowników"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Błąd!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -223,14 +199,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Katalog dokumentu"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -247,19 +218,12 @@ msgstr ""
 msgid "Documents"
 msgstr "Dokumenty"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Nośnik"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -271,22 +235,20 @@ msgstr "Rozmiar pliku"
 msgid "Content Type"
 msgstr "Typ zawartości"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Modyfikacja"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -319,11 +281,6 @@ msgstr "Nazwa pola"
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nazwa zapisanego pliku"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -351,7 +308,7 @@ msgid "Virtual Files"
 msgstr "Pliki wirtualne"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Błąd zapisu pliku doc !"
@@ -386,7 +343,6 @@ msgstr "Uprawnienia"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Autor ostatniej modyfikacji"
@@ -409,7 +365,6 @@ msgstr "Domena"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data modyfikacji"
@@ -453,10 +408,9 @@ msgstr ""
 "Definiuj wyrazy do kontekstu dla wszystkich podrzędnych katalogów i plików"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "jeśli zaznaczone, to pliki będą niedostępne."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statyczne"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -466,7 +420,6 @@ msgstr "nieznane"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -485,16 +438,10 @@ msgstr "Zawartości"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data utworzenia"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID zasobu"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -503,17 +450,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Wiedza"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -530,11 +466,6 @@ msgstr "Włącznie z nazwą rekordu"
 msgid "Model Id"
 msgstr "ID modelu"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Dostępny"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -562,9 +493,9 @@ msgid "August"
 msgstr "Sierpień"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Moje dokumenty"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamiczny kontekst"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -578,7 +509,6 @@ msgstr "Czerwiec"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupy"
 
@@ -592,11 +522,6 @@ msgstr "Aktywne"
 msgid "November"
 msgstr "Listopad"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Dane"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -622,23 +547,17 @@ msgid "Seq."
 msgstr "Num."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Baza danych"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Wszystkie pliki użytkowników"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Styczeń"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Tylko do Odczytu"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Katalog Dokumentu"
 
@@ -654,7 +573,6 @@ msgstr "Załączniki"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Utworzył"
 
@@ -668,7 +586,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -690,19 +607,9 @@ msgid "Children"
 msgstr "Podrzędne"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID zasobu"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -720,27 +627,17 @@ msgid "Parent Model"
 msgstr "Model nadrzędny"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Struktura drzewa"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Wszystkie pliki użytkowników"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -756,18 +653,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statyczne"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -790,25 +675,14 @@ msgstr "Luty"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nazwa"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Pola"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -821,9 +695,9 @@ msgid "# of Files"
 msgstr "# plików"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Typ zawartości katalogu"
 
 #. module: document
 #: view:document.directory:0
@@ -855,9 +729,9 @@ msgid "File Name"
 msgstr "Nazwa pliku"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struktura drzewa"
 
 #. module: document
 #: view:document.configuration:0
@@ -876,10 +750,7 @@ msgid "Year"
 msgstr "Rok"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Nośnik danych"
 
@@ -903,6 +774,12 @@ msgstr "Typ dokumentu"
 #~ msgid "Preview"
 #~ msgstr "Podgląd"
 
+#~ msgid "Data"
+#~ msgstr "Dane"
+
+#~ msgid "Database"
+#~ msgstr "Baza danych"
+
 #~ msgid "History"
 #~ msgstr "Historia"
 
@@ -939,6 +816,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Resource Title"
 #~ msgstr "Tytuł zasobu"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nazwa zapisanego pliku"
+
 #~ msgid "Link"
 #~ msgstr "Łącznik"
 
@@ -967,6 +847,9 @@ msgstr "Typ dokumentu"
 #~ msgid "Filesystem"
 #~ msgstr "System plików"
 
+#~ msgid "Document directory"
+#~ msgstr "Katalog dokumentu"
+
 #~ msgid "Others Info"
 #~ msgstr "Inne informacje"
 
@@ -1047,9 +930,18 @@ msgstr "Typ dokumentu"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Autokonfiguracja katalogu"
 
+#~ msgid "Document board"
+#~ msgstr "Konsola dokumentów"
+
+#~ msgid "Process Node"
+#~ msgstr "Węzeł procesu"
+
 #~ msgid "This Year"
 #~ msgstr "W tym roku"
 
+#~ msgid "Path"
+#~ msgstr "Ścieżka"
+
 #~ msgid "Sale Order"
 #~ msgstr "Zamówienie sprzedaży"
 
@@ -1059,9 +951,16 @@ msgstr "Typ dokumentu"
 #~ msgid "title"
 #~ msgstr "tytuł"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Błąd!"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Autokonfiguracja katalogu dla produktów"
 
+#~ msgid "Storage"
+#~ msgstr "Nośnik"
+
 #~ msgid "Files by Users"
 #~ msgstr "Pliku wg użytkowników"
 
@@ -1086,6 +985,16 @@ msgstr "Typ dokumentu"
 #~ msgid "Image"
 #~ msgstr "Obraz"
 
+#~ msgid "Online"
+#~ msgstr "Dostępny"
+
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "jeśli zaznaczone, to pliki będą niedostępne."
+
+#~ msgid "Read Only"
+#~ msgstr "Tylko do Odczytu"
+
 #~ msgid "Dashboard"
 #~ msgstr "Konsola"
 
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index 07b9569bb48..50b3879d2a7 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:40+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Pasta ascendente"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "O nome da pasta contém carateres especiais!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Painel Documento"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nó do Processo"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de conteúdo da pasta"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "Conteúdo da pasta"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinâmico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Os meus documentos"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,13 +109,13 @@ msgstr ""
 "referência para o registo atual em pastas dinâmicas"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Caminho"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "O nome da pasta tem de ser único"
@@ -158,7 +142,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -169,13 +152,6 @@ msgstr "Pastas"
 msgid "Files details by Users"
 msgstr "Detalhes dos ficheiros por utilizadores"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -227,14 +203,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Pasta Documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Erro de Validação"
@@ -251,19 +222,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Documentos"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Armazenamento"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modelo do registo"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -275,22 +239,20 @@ msgstr "Tamanho do ficheiro"
 msgid "Content Type"
 msgstr "Tipo de conteúdo"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -325,11 +287,6 @@ msgstr "Campo nome"
 msgid "Context fields"
 msgstr "Campos do contexto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nome do ficheiro guardado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -357,7 +314,7 @@ msgid "Virtual Files"
 msgstr "Ficheiros virtuais"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Erro ao escrever o documento"
@@ -394,7 +351,6 @@ msgstr "Segurança"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Utilizador da última modificação"
@@ -417,7 +373,6 @@ msgstr "Domínio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data da modificação"
@@ -462,12 +417,9 @@ msgstr ""
 "descendentes"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Se não assinalado, o suporte encontra-se desligado e o seu conteúdo não "
-"disponível"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -477,7 +429,6 @@ msgstr "desconhecido"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -496,16 +447,10 @@ msgstr "Conteúdo"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data de criação"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Id do registo"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -517,17 +462,6 @@ msgstr ""
 "registo.\n"
 "Se for definido, o diretório terá de ser um recurso."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Armazenamento de ficheiros"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -544,11 +478,6 @@ msgstr "Inclui nome do registo"
 msgid "Model Id"
 msgstr "ID do modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Em linha"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -580,9 +509,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Os meus documentos"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinâmico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -596,7 +525,6 @@ msgstr "Junho"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -610,11 +538,6 @@ msgstr "Ativo"
 msgid "November"
 msgstr "Novembro"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Dados"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -644,23 +567,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Base de dados"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Ficheiros de todos os utilizadores"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Janeiro"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Leitura apenas"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Directório do Documento"
 
@@ -676,7 +593,6 @@ msgstr "Anexos"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Autor"
 
@@ -695,7 +611,6 @@ msgstr ""
 "de acordo com os módulos instalados."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -717,19 +632,9 @@ msgid "Children"
 msgstr "Descendentes"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Ficheiros por utilizador"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Armazenamento de ficheiros externo"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Para armazenamento de ficheiros, o caminho da raiz do armazenamento."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Id do registo"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -747,29 +652,19 @@ msgid "Parent Model"
 msgstr "Modelo ascendente"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"O nome do campo. Note que o prefixo \"dctx_\" será apenso ao que escrever "
-"aqui."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estrutura em árvore"
+"Estes grupos, não se aplicam porém às pastas descendentes, que devem ter os "
+"seus próprios grupos definidos."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Ficheiros de todos os utilizadores"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -785,20 +680,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estático"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Estes grupos, não se aplicam porém às pastas descendentes, que devem ter os "
-"seus próprios grupos definidos."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -825,25 +706,14 @@ msgstr "Fevereiro"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "O caminho do armazenamento tem de ser único!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campos"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Se estiver marcado, o armazenamento é só de leitura."
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -856,9 +726,9 @@ msgid "# of Files"
 msgstr "# dos ficheiros"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Procurar nos ficheiros armazenados"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de conteúdo da pasta"
 
 #. module: document
 #: view:document.directory:0
@@ -891,9 +761,9 @@ msgid "File Name"
 msgstr "Nome do ficheiro"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Armazenamento interno de ficheiros"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estrutura em árvore"
 
 #. module: document
 #: view:document.configuration:0
@@ -912,10 +782,7 @@ msgid "Year"
 msgstr "Ano"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Suporte de armazenamento"
 
@@ -936,6 +803,9 @@ msgstr "Tipo de documento"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura da vista"
 
+#~ msgid "Database"
+#~ msgstr "Base de dados"
+
 #~ msgid "document.configuration.wizard"
 #~ msgstr "document.configuration.wizard"
 
@@ -954,6 +824,9 @@ msgstr "Tipo de documento"
 #~ msgid "Attachment"
 #~ msgstr "Anexo"
 
+#~ msgid "Data"
+#~ msgstr "Dados"
+
 #~ msgid "Attached To"
 #~ msgstr "Ligado a"
 
@@ -983,6 +856,9 @@ msgstr "Tipo de documento"
 #~ "Assinale este campo se quer que o nome do ficheiro comece pelo nome do "
 #~ "registo."
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nome do ficheiro guardado"
+
 #~ msgid ""
 #~ "This is a complete document management system:\n"
 #~ "    * FTP Interface\n"
@@ -1067,6 +943,9 @@ msgstr "Tipo de documento"
 #~ msgid "Auto Configure"
 #~ msgstr "Auto Configuração"
 
+#~ msgid "Document board"
+#~ msgstr "Painel Documento"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
 
@@ -1079,6 +958,13 @@ msgstr "Tipo de documento"
 #~ msgid "This Year"
 #~ msgstr "Este ano"
 
+#~ msgid "Path"
+#~ msgstr "Caminho"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Erro!"
+
 #~ msgid "Sale Order"
 #~ msgstr "Ordem de venda"
 
@@ -1088,6 +974,12 @@ msgstr "Tipo de documento"
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configuração automática de pastas para os artigos"
 
+#~ msgid "Document directory"
+#~ msgstr "Pasta Documento"
+
+#~ msgid "Storage"
+#~ msgstr "Armazenamento"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Ficheiros por parceiro"
 
@@ -1112,6 +1004,9 @@ msgstr "Tipo de documento"
 #~ msgid "User"
 #~ msgstr "Utilizador"
 
+#~ msgid "Online"
+#~ msgstr "Em linha"
+
 #~ msgid "Related to"
 #~ msgstr "Relacionado com"
 
@@ -1127,6 +1022,9 @@ msgstr "Tipo de documento"
 #~ msgid "Dashboard"
 #~ msgstr "Painel"
 
+#~ msgid "Read Only"
+#~ msgstr "Leitura apenas"
+
 #~ msgid "Files details by Partners"
 #~ msgstr "Detalhes dos ficheiros por parceiros"
 
@@ -1142,6 +1040,9 @@ msgstr "Tipo de documento"
 #~ msgid "Wall of Shame"
 #~ msgstr "Muro da vergonha"
 
+#~ msgid "External file storage"
+#~ msgstr "Armazenamento de ficheiros externo"
+
 #~ msgid "Product"
 #~ msgstr "Artigo"
 
@@ -1157,6 +1058,13 @@ msgstr "Tipo de documento"
 #~ msgid "Files By Partner"
 #~ msgstr "Ficheiros por parceiro"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "O nome do campo. Note que o prefixo \"dctx_\" será apenso ao que escrever "
+#~ "aqui."
+
 #~ msgid "New Files"
 #~ msgstr "Novos ficheiros"
 
@@ -1169,6 +1077,12 @@ msgstr "Tipo de documento"
 #~ "Configuração automática de pastas para ordens de venda e cotações, com "
 #~ "relatório."
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "O caminho do armazenamento tem de ser único!"
+
+#~ msgid "Internal File storage"
+#~ msgstr "Armazenamento interno de ficheiros"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "A pasta tem de ter um ascendente ou um armazenamento"
 
@@ -1178,6 +1092,15 @@ msgstr "Tipo de documento"
 #~ msgid "Search Document storage"
 #~ msgstr "Pesquisar armazenamento do documento"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Se não assinalado, o suporte encontra-se desligado e o seu conteúdo não "
+#~ "disponível"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Para armazenamento de ficheiros, o caminho da raiz do armazenamento."
+
 #~ msgid ""
 #~ "This is a complete document management system:\n"
 #~ "    * User Authentication\n"
@@ -1214,6 +1137,9 @@ msgstr "Tipo de documento"
 #~ msgid "title"
 #~ msgstr "título"
 
+#~ msgid "Process Node"
+#~ msgstr "Nó do Processo"
+
 #~ msgid "Project"
 #~ msgstr "Projecto"
 
@@ -1224,6 +1150,9 @@ msgstr "Tipo de documento"
 #~ msgstr ""
 #~ "Escolha os Recursos a seguir para configuração automática da directoria."
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Se estiver marcado, o armazenamento é só de leitura."
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(cópia)"
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 610b738a649..55238f0e93a 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-04 16:03+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:15+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Diretório Superior"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Nome do diretório contém caracteres especias!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Painel de Documentos"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nó do processo"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "O diretório deve possuir um pai ou um local de armazenamento"
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tipo de Conteúdo do Diretório"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "Modificação"
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +90,9 @@ msgid "Directory Content"
 msgstr "Conteúdo do Diretório"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinâmico"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "Meus Documentos"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +111,13 @@ msgstr ""
 "referência para o registro atual, em pastas dinâmicas"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Caminho"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr "O nome do campo."
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Nome do diretório deve ser único!"
@@ -159,7 +144,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +154,6 @@ msgstr "Diretórios"
 msgid "Files details by Users"
 msgstr "Detalhes de arquivos por Usuários"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -235,14 +212,9 @@ msgstr ""
 "        "
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Diretório de Documento"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Erro de Validação"
@@ -259,19 +231,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Documentos"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Armazenamento"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Modelo de recurso"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -283,22 +248,20 @@ msgstr "Tamanho do Arquivo:"
 msgid "Content Type"
 msgstr "Tipo de Conteúdo"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "Modificação"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr "O nome do arquivo deve ser único em um diretório!"
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -334,11 +297,6 @@ msgstr "Nome do Campo"
 msgid "Context fields"
 msgstr "Campos de Contexto"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nome do Arquivo Armazenado"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -366,7 +324,7 @@ msgid "Virtual Files"
 msgstr "Arquivos Virtuais"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Erro na gravação do documento!"
@@ -403,7 +361,6 @@ msgstr "Segurança"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuário da Última Modificação"
@@ -426,7 +383,6 @@ msgstr "Domínio"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data de Modificação"
@@ -469,12 +425,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Defina palavras no contexo, para todos os subdiretório e Arquivos"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Se não estiver marcado, a mídia está atualmente offline e seu conteúdo não "
-"disponível."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -484,7 +437,6 @@ msgstr "desconhecido"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -503,16 +455,10 @@ msgstr "Conteúdo"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data de Criação"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID do Recurso"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -524,17 +470,6 @@ msgstr ""
 "registro\n"
 "Se sim, o diretório deverá ser do tipo recurso."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "Conhecimento"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "Armazenamento dos Documentos"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -551,11 +486,6 @@ msgstr "Incluir Nome do Registro"
 msgid "Model Id"
 msgstr "ID do Modelo"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -587,9 +517,9 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "Meus Documentos"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinâmico"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -603,7 +533,6 @@ msgstr "Junho"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -617,11 +546,6 @@ msgstr "Ativo"
 msgid "November"
 msgstr "Novembro"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Dados"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -651,23 +575,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Banco de Dados"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Todos os Arquivos do Usuário"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Janeiro"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Somente Leitura"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Diretório de Documentos"
 
@@ -683,7 +601,6 @@ msgstr "Anexos"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Criador"
 
@@ -702,7 +619,6 @@ msgstr ""
 "automaticamente de acordo com os módulos instalados."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -724,19 +640,9 @@ msgid "Children"
 msgstr "Subdiretório"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr "Arquivos por usuário"
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Armazenamento externo de arquivo"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Para armazenamento de arquivos, o caminho raiz do armazenamento"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID do Recurso"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -754,29 +660,19 @@ msgid "Parent Model"
 msgstr "Modelo Principal"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Nome do campo. Note que o prefixo \"dctx_\" será preposto ao que for "
-"digitado aqui."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Estrutura em Árvore"
+"Estes grupos, no entanto, NÃO se aplicam a diretórios filhos, que precisam "
+"definir seus próprios grupos."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Todos os Arquivos do Usuário"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -792,20 +688,6 @@ msgstr "Anexo"
 msgid "Users File"
 msgstr "Arquivo do Usuário"
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Estático"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Estes grupos, no entanto, NÃO se aplicam a diretórios filhos, que precisam "
-"definir seus próprios grupos."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -833,25 +715,14 @@ msgstr "Fevereiro"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "O Caminho de armazenamento deve ser único!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campos"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Se marcado, será somente leitura"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -864,9 +735,9 @@ msgid "# of Files"
 msgstr "Nº de Arquivos"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr "Pesquisar Armazenamento de Documentos"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de Conteúdo do Diretório"
 
 #. module: document
 #: view:document.directory:0
@@ -900,9 +771,9 @@ msgid "File Name"
 msgstr "Nome do Arquivo"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Armazenamento interno de arquivo"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estrutura em Árvore"
 
 #. module: document
 #: view:document.configuration:0
@@ -921,10 +792,7 @@ msgid "Year"
 msgstr "Ano"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Mídia de Armazenamento"
 
@@ -939,6 +807,9 @@ msgstr "Tipo de Documento"
 #~ msgid "Preview"
 #~ msgstr "Pré-visualizar"
 
+#~ msgid "Data"
+#~ msgstr "Dados"
+
 #~ msgid "Attached To"
 #~ msgstr "Anexado a"
 
@@ -969,6 +840,9 @@ msgstr "Tipo de Documento"
 #~ msgid "Notes"
 #~ msgstr "Observações"
 
+#~ msgid "Database"
+#~ msgstr "Banco de Dados"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
@@ -987,15 +861,28 @@ msgstr "Tipo de Documento"
 #~ msgid "This Year"
 #~ msgstr "Este Ano"
 
+#~ msgid "Path"
+#~ msgstr "Caminho"
+
 #~ msgid "Project"
 #~ msgstr "Projeto"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Erro!"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configuração automática de diretório para Produtos."
 
 #~ msgid "Files by Users"
 #~ msgstr "Arquivos por Usuários"
 
+#~ msgid "Document directory"
+#~ msgstr "Diretório de Documento"
+
+#~ msgid "Storage"
+#~ msgstr "Armazenamento"
+
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Configurar Diretório de Recurso"
 
@@ -1020,6 +907,9 @@ msgstr "Tipo de Documento"
 #~ msgid "Auto Configure Directory"
 #~ msgstr "Auto Configuração do Diretório"
 
+#~ msgid "Online"
+#~ msgstr "Online"
+
 #~ msgid "User"
 #~ msgstr "Usuário"
 
@@ -1035,6 +925,9 @@ msgstr "Tipo de Documento"
 #~ msgid "Dashboard"
 #~ msgstr "Painel"
 
+#~ msgid "Read Only"
+#~ msgstr "Somente Leitura"
+
 #~ msgid "Last Posted Time"
 #~ msgstr "Última Publicação"
 
@@ -1061,10 +954,16 @@ msgstr "Tipo de Documento"
 #~ msgid "Statistics by User"
 #~ msgstr "Estatísticas por Usuário"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "O Caminho de armazenamento deve ser único!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Nome do Arquivo deve ser único!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Armazenamento interno de arquivo"
+
 #~ msgid "Files by Resource Type"
 #~ msgstr "Arquivos por Tipo de Recursos"
 
@@ -1093,6 +992,15 @@ msgstr "Tipo de Documento"
 #~ msgid "Sale Order"
 #~ msgstr "Pedido de Venda"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Se não estiver marcado, a mídia está atualmente offline e seu conteúdo não "
+#~ "disponível."
+
+#~ msgid "Process Node"
+#~ msgstr "Nó do processo"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "Gestão de Conhecimento"
 
@@ -1100,6 +1008,9 @@ msgstr "Tipo de Documento"
 #~ msgid "(copy)"
 #~ msgstr "(copiar)"
 
+#~ msgid "External file storage"
+#~ msgstr "Armazenamento externo de arquivo"
+
 #~ msgid "This Months Files"
 #~ msgstr "Arquivos Deste Mês"
 
@@ -1109,6 +1020,9 @@ msgstr "Tipo de Documento"
 #~ msgid "Wall of Shame"
 #~ msgstr "Mural da Vergonha"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Para armazenamento de arquivos, o caminho raiz do armazenamento"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1116,6 +1030,13 @@ msgstr "Tipo de Documento"
 #~ "O repositório de documentos lhe dá acesso a todos os anexos, como emails, "
 #~ "documentos de projetos, faturas, etc"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Nome do campo. Note que o prefixo \"dctx_\" será preposto ao que for "
+#~ "digitado aqui."
+
 #~ msgid "Indexed Content - experimental"
 #~ msgstr "Conteúdo Indexado - experimental"
 
@@ -1125,6 +1046,9 @@ msgstr "Tipo de Documento"
 #~ msgid "All Months Files"
 #~ msgstr "Arquivos de todos os meses"
 
+#~ msgid "Document board"
+#~ msgstr "Painel de Documentos"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Painel dos Documentos"
 
@@ -1136,3 +1060,9 @@ msgstr "Tipo de Documento"
 
 #~ msgid "Files By Partner"
 #~ msgstr "Arquivos por Parceiro"
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Se marcado, será somente leitura"
+
+#~ msgid "Stored Filename"
+#~ msgstr "Nome do Arquivo Armazenado"
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index b1b975cf7a4..27342ee9d48 100644
--- a/addons/document/i18n/ro.po
+++ b/addons/document/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Director principal"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Numele directorului contine caractere speciale!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Panou documente"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Nod proces"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupeaza dupa..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tip de continut director"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Continut director"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Context dinamic"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "referinta a inregistrarii actuale, in fisiere dinamice"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Ruta"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Numele directorului trebuie sa fie unic!"
@@ -159,7 +143,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +153,6 @@ msgstr "Directoare"
 msgid "Files details by Users"
 msgstr "Detalii fisiere dupa Utilizator"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Eroare!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -228,14 +204,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Director documente"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "Eroare de Validare"
@@ -252,19 +223,12 @@ msgstr "ir.actiuni.raport.xml"
 msgid "Documents"
 msgstr "Documente"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Depozit"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Model resursa"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -276,22 +240,20 @@ msgstr "Dimensiunea fisierului"
 msgid "Content Type"
 msgstr "Tip continut"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -328,11 +290,6 @@ msgstr "Nume camp"
 msgid "Context fields"
 msgstr "Campuri context"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Nume fisier stocat"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -360,7 +317,7 @@ msgid "Virtual Files"
 msgstr "Fisiere virtuale"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Eroare la scrierea documentului!"
@@ -397,7 +354,6 @@ msgstr "Securitate"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Utilizatorul ultimei modificari"
@@ -420,7 +376,6 @@ msgstr "Domeniu"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data modificarii"
@@ -465,12 +420,9 @@ msgstr ""
 "subordonate"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Daca nu bifati, mediile sunt offline in prezent, iar continutul lor nu este "
-"disponibil"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Static"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -480,7 +432,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -499,16 +450,10 @@ msgstr "Cuprins"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Data crearii"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "ID resursa"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -520,17 +465,6 @@ msgstr ""
 "inregistrarii.\n"
 "Daca este setat, directorul va trebui sa fie o resursa."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -547,11 +481,6 @@ msgstr "Include Numele Inregistrarii"
 msgid "Model Id"
 msgstr "Id model"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -583,9 +512,9 @@ msgid "August"
 msgstr "August"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Context dinamic"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -599,7 +528,6 @@ msgstr "Iunie"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupuri"
 
@@ -613,11 +541,6 @@ msgstr "Activ(a)"
 msgid "November"
 msgstr "Noiembrie"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Data"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -647,23 +570,17 @@ msgid "Seq."
 msgstr "Secv."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Baza de date"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Fisierele tuturor utilizatorilor"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Ianuarie"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Doar citire"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Director Documente"
 
@@ -679,7 +596,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Creator"
 
@@ -698,7 +614,6 @@ msgstr ""
 "functie de modulele instalate."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -720,19 +635,9 @@ msgid "Children"
 msgstr "Subordonati"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Stocare fisiere externe"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Pentru stocarea fisierelor, root path a stocarii"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID resursa"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -750,29 +655,19 @@ msgid "Parent Model"
 msgstr "Model parinte"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Numele campului. Observati ca prefixul \"dctx_\" va fi adaugat la ceea ce "
-"este scris aici."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Structura arbore"
+"Aceste grupuri, totusi, NU se aplica directoarelor subordonate, care trebuie "
+"sa isi defineasca propriile grupuri."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Fisierele tuturor utilizatorilor"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -789,20 +684,6 @@ msgstr "ir.atasament"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Static"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Aceste grupuri, totusi, NU se aplica directoarelor subordonate, care trebuie "
-"sa isi defineasca propriile grupuri."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -830,25 +711,14 @@ msgstr "Februarie"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Nume"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Calea de stocare trebuie sa fie unica!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Campuri"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Daca sunt setate, media (mijloacele) sunt doar pentru citire"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -861,9 +731,9 @@ msgid "# of Files"
 msgstr "# Fişiere"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tip de continut director"
 
 #. module: document
 #: view:document.directory:0
@@ -897,9 +767,9 @@ msgid "File Name"
 msgstr "Nume fisier"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Stocare Fisier intern"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Structura arbore"
 
 #. module: document
 #: view:document.configuration:0
@@ -918,10 +788,7 @@ msgid "Year"
 msgstr "An"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medii de stocare"
 
@@ -951,12 +818,19 @@ msgstr "Tipul documentului"
 #~ msgid "User"
 #~ msgstr "Utilizator"
 
+#~ msgid "Process Node"
+#~ msgstr "Nod proces"
+
 #~ msgid "This Year"
 #~ msgstr "Acest an"
 
 #~ msgid "title"
 #~ msgstr "titlu"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Eroare!"
+
 #~ msgid "Sale Order"
 #~ msgstr "Comadă vânzare"
 
@@ -975,6 +849,15 @@ msgstr "Tipul documentului"
 #~ msgid "Image"
 #~ msgstr "Imagine"
 
+#~ msgid "Online"
+#~ msgstr "Online"
+
+#~ msgid "Data"
+#~ msgstr "Data"
+
+#~ msgid "Read Only"
+#~ msgstr "Doar citire"
+
 #~ msgid "Dashboard"
 #~ msgstr "Tablou de bord"
 
@@ -987,9 +870,15 @@ msgstr "Tipul documentului"
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Configurare auto director pentru Produse."
 
+#~ msgid "Document directory"
+#~ msgstr "Director documente"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Fisiere per Partener"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Nume fisier stocat"
+
 #~ msgid ""
 #~ "This is a complete document management system:\n"
 #~ "    * User Authentication\n"
@@ -1041,6 +930,19 @@ msgstr "Tipul documentului"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Configurare auto director pentru Proiecte."
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Numele campului. Observati ca prefixul \"dctx_\" va fi adaugat la ceea ce "
+#~ "este scris aici."
+
+#~ msgid "External file storage"
+#~ msgstr "Stocare fisiere externe"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Pentru stocarea fisierelor, root path a stocarii"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1048,6 +950,9 @@ msgstr "Tipul documentului"
 #~ "Depozitarea documentelor va da acces la toate atasamentele, cum ar fi email-"
 #~ "uri, documente proiecte, facturi etc."
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Daca sunt setate, media (mijloacele) sunt doar pentru citire"
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
@@ -1057,10 +962,16 @@ msgstr "Tipul documentului"
 #~ msgid "(copy)"
 #~ msgstr "(copie)"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Calea de stocare trebuie sa fie unica!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Numele fisierului trebuie sa fie unic!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Stocare Fisier intern"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Cautare arhiva documente"
 
@@ -1070,9 +981,15 @@ msgstr "Tipul documentului"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Configurare auto Director"
 
+#~ msgid "Document board"
+#~ msgstr "Panou documente"
+
 #~ msgid "Files per Month"
 #~ msgstr "Fisiere pe luna"
 
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "Managementul Cunostintelor"
 
@@ -1082,6 +999,9 @@ msgstr "Tipul documentului"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Eroare! Nu puteti crea Directoare recursive."
 
+#~ msgid "Storage"
+#~ msgstr "Depozit"
+
 #~ msgid "Modified"
 #~ msgstr "Modificat(a)"
 
@@ -1094,6 +1014,9 @@ msgstr "Tipul documentului"
 #~ msgid "Files By Users"
 #~ msgstr "Fisiere dupa Utilizatori"
 
+#~ msgid "Database"
+#~ msgstr "Baza de date"
+
 #~ msgid "Attached To"
 #~ msgstr "Anexeaza la"
 
@@ -1135,3 +1058,9 @@ msgstr "Tipul documentului"
 
 #~ msgid "All Months Files"
 #~ msgstr "Toate fisierele lunilor"
+
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Daca nu bifati, mediile sunt offline in prezent, iar continutul lor nu este "
+#~ "disponibil"
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 0038243dcca..68a059347e9 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:18+0000\n"
 "Last-Translator: devcode <brestows@gmail.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Родительский каталог"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Имя каталога содержит специальные символы !"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Доска документов"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Узел процесса"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Объединять по..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Тип содержимого каталога"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Содержимое папки"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Динамический контекст"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "качестве обозначения текущей записи, в динамических каталогах."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Путь"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Имя каталога должно быть уникальным!"
@@ -159,7 +143,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +153,6 @@ msgstr "Каталоги"
 msgid "Files details by Users"
 msgstr "Детали файлов по пользователям"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Ошибка !"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -228,14 +204,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Каталог документов"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -252,19 +223,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Документы"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Хранилище"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Модель ресурса"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -276,22 +240,20 @@ msgstr "Размер файла"
 msgid "Content Type"
 msgstr "Тип данных"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,11 +289,6 @@ msgstr "Название поля"
 msgid "Context fields"
 msgstr "Контекстные поля"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Сохраненное имя файла"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -359,7 +316,7 @@ msgid "Virtual Files"
 msgstr "Виртуальные файлы"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Ошибка записи документа!"
@@ -396,7 +353,6 @@ msgstr "Безопасность"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Последние изменения пользователя"
@@ -419,7 +375,6 @@ msgstr "Домен"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Дата изменения"
@@ -462,10 +417,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Определить слова в контексте, для всех дочерних каталогов и файлов"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "Если не установлен, носитель отключен и его содержимое не доступно"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Статический"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -475,7 +429,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -494,16 +447,10 @@ msgstr "Содержание"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Дата создания"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Идентификатор ресурса"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -514,17 +461,6 @@ msgstr ""
 "Отметьте, если требуется, чтобы название файла содержало название записи.\n"
 "Если установлено, каталог должен быть ресурсом."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -541,11 +477,6 @@ msgstr "Включать название записи"
 msgid "Model Id"
 msgstr "Идентификатор модели"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Подключен"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -577,9 +508,9 @@ msgid "August"
 msgstr "Август"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Динамический контекст"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -593,7 +524,6 @@ msgstr "Июнь"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Группы"
 
@@ -607,11 +537,6 @@ msgstr "Активно"
 msgid "November"
 msgstr "Ноябрь"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Данные"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -641,23 +566,17 @@ msgid "Seq."
 msgstr "Посл."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "База данных"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Файлы всех пользователей"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Январь"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Только чтение"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Каталог документов"
 
@@ -673,7 +592,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Автор"
 
@@ -692,7 +610,6 @@ msgstr ""
 "с установленными модулями."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -714,19 +631,9 @@ msgid "Children"
 msgstr "Дочерний"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Внешнее хранилище файлов"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Для хранилища файлов, корневой каталог хранилища"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Идентификатор ресурса"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -744,29 +651,19 @@ msgid "Parent Model"
 msgstr "Родительская модель"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Название поля. Обратите внимание: написанное здесь будет префиксировано "
-"символами \"dctx_\""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Древовидная структура"
+"Однако, эти группы не применяются к вложенным директориям, для которых "
+"должны быть созданы собственные группы."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Май"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Файлы всех пользователей"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -782,20 +679,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Статический"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Однако, эти группы не применяются к вложенным директориям, для которых "
-"должны быть созданы собственные группы."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -823,25 +706,14 @@ msgstr "Февраль"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Имя"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Путь хранения должен быть уникальным !"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Поля"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Если установлено, носитель только для чтения"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -854,9 +726,9 @@ msgid "# of Files"
 msgstr "# файлов"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Тип содержимого каталога"
 
 #. module: document
 #: view:document.directory:0
@@ -889,9 +761,9 @@ msgid "File Name"
 msgstr "Имя файла"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Внутреннее хранилище файлов"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Древовидная структура"
 
 #. module: document
 #: view:document.configuration:0
@@ -910,10 +782,7 @@ msgid "Year"
 msgstr "Год"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Сменный носитель"
 
@@ -925,6 +794,9 @@ msgstr "Тип документа"
 #~ msgid "Notes"
 #~ msgstr "Примечания"
 
+#~ msgid "Data"
+#~ msgstr "Данные"
+
 #~ msgid "Preview"
 #~ msgstr "Предварительный просмотр"
 
@@ -958,6 +830,9 @@ msgstr "Тип документа"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра структуры!"
 
+#~ msgid "Database"
+#~ msgstr "База данных"
+
 #~ msgid "Filesystem"
 #~ msgstr "Файловая система"
 
@@ -1003,9 +878,19 @@ msgstr "Тип документа"
 #~ msgid "Files by Resource Type"
 #~ msgstr "Файлы по типам ресурсов"
 
+#~ msgid "Document board"
+#~ msgstr "Доска документов"
+
 #~ msgid "This Year"
 #~ msgstr "Этот год"
 
+#~ msgid "Path"
+#~ msgstr "Путь"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Ошибка !"
+
 #~ msgid "Sale Order"
 #~ msgstr "Заказ на продажу"
 
@@ -1015,6 +900,9 @@ msgstr "Тип документа"
 #~ msgid "Files by Users"
 #~ msgstr "Файлы по пользователям"
 
+#~ msgid "Storage"
+#~ msgstr "Хранилище"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "Панель документов"
 
@@ -1036,6 +924,9 @@ msgstr "Тип документа"
 #~ msgid "Related to"
 #~ msgstr "Связан с"
 
+#~ msgid "Read Only"
+#~ msgstr "Только чтение"
+
 #~ msgid "Dashboard"
 #~ msgstr "Панель"
 
@@ -1055,21 +946,40 @@ msgstr "Тип документа"
 #~ msgid "New Files"
 #~ msgstr "Новые файлы"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Если установлено, носитель только для чтения"
+
 #~ msgid "Statistics by User"
 #~ msgstr "Статистика по пользователям"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Путь хранения должен быть уникальным !"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Автоматическая настройка каталога для ТМЦ."
 
+#~ msgid "Document directory"
+#~ msgstr "Каталог документов"
+
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Настройка каталога ресурсов"
 
 #~ msgid "Files Per Partner"
 #~ msgstr "Файлы по контрагенту"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Сохраненное имя файла"
+
 #~ msgid "Auto Configure Directory"
 #~ msgstr "Автоматическая настройка каталога"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "Если не установлен, носитель отключен и его содержимое не доступно"
+
+#~ msgid "Online"
+#~ msgstr "Подключен"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Автоматическая настройка каталога для проектов."
 
@@ -1079,6 +989,12 @@ msgstr "Тип документа"
 #~ msgid "Files details by Partners"
 #~ msgstr "Детали файлов по партнерам"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Для хранилища файлов, корневой каталог хранилища"
+
+#~ msgid "External file storage"
+#~ msgstr "Внешнее хранилище файлов"
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Пользователи, не поместившие документы за месяц"
 
@@ -1098,12 +1014,18 @@ msgstr "Тип документа"
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Каталог должен иметь родителя или хранилище"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Внутреннее хранилище файлов"
+
 #~ msgid "Search Document storage"
 #~ msgstr "Поиск по хранилищу документов"
 
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Автоматическая настройка каталога"
 
+#~ msgid "Process Node"
+#~ msgstr "Узел процесса"
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
@@ -1120,6 +1042,13 @@ msgstr "Тип документа"
 #~ msgid "(copy)"
 #~ msgstr "(copy)"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Название поля. Обратите внимание: написанное здесь будет префиксировано "
+#~ "символами \"dctx_\""
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Выполнение настройки"
 
diff --git a/addons/document/i18n/sk.po b/addons/document/i18n/sk.po
index 8940f9fbeab..57ec85b7949 100644
--- a/addons/document/i18n/sk.po
+++ b/addons/document/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-22 19:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr "Dokumenty"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,18 +605,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index 44199d1d515..1e227559cdf 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tip vsebine imenika"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr "Vsebina imenika"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr "Imeniki"
 msgid "Files details by Users"
 msgstr "Podrobnosti datotek po uporabnikih"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Imenik dokumenta"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr "Velikost datoteke"
 msgid "Content Type"
 msgstr "Tip vsebine"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Ime shranjene datoteke"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr "Navidezne datoteke"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr "Varnost"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Uporabnik, ki je zadnji spreminjal"
@@ -407,7 +363,6 @@ msgstr "Domena"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum spremembe"
@@ -450,9 +405,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr "Vsebina"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Ustvarjeno"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Oznaka vira"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr "Vključi ime zapisa"
 msgid "Model Id"
 msgstr "Oznaka modela"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,8 +490,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -575,7 +506,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Skupine"
 
@@ -589,11 +519,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Podatki"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,23 +544,17 @@ msgid "Seq."
 msgstr "Zap."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Zbirka podatkov"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Vse uporabniške datoteke"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Avtor"
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,19 +604,9 @@ msgid "Children"
 msgstr "Otroci"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Oznaka vira"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -717,27 +624,17 @@ msgid "Parent Model"
 msgstr "Nadrejeni model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Drevesna struktura"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Vse uporabniške datoteke"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Ime"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,9 +692,9 @@ msgid "# of Files"
 msgstr "# datotek"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tip vsebine imenika"
 
 #. module: document
 #: view:document.directory:0
@@ -852,9 +726,9 @@ msgid "File Name"
 msgstr "Ime datoteke"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr ""
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Drevesna struktura"
 
 #. module: document
 #: view:document.configuration:0
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -891,6 +762,9 @@ msgstr "Vrsta dokumenta"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
 
+#~ msgid "Data"
+#~ msgstr "Podatki"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -911,6 +785,9 @@ msgstr "Vrsta dokumenta"
 #~ msgid "Link"
 #~ msgstr "Povezava"
 
+#~ msgid "Database"
+#~ msgstr "Zbirka podatkov"
+
 #~ msgid "History"
 #~ msgstr "Zgodovina"
 
@@ -944,6 +821,9 @@ msgstr "Vrsta dokumenta"
 #~ msgid "Search a File"
 #~ msgstr "Išči datoteke"
 
+#~ msgid "Document directory"
+#~ msgstr "Imenik dokumenta"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Napaka! Ne morete izdelati rekurzivnih imenikov."
 
@@ -968,6 +848,9 @@ msgstr "Vrsta dokumenta"
 #~ msgid "Resource Title"
 #~ msgstr "Naslov vira"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Ime shranjene datoteke"
+
 #~ msgid "Attached To"
 #~ msgstr "Pripet k"
 
diff --git a/addons/document/i18n/sq.po b/addons/document/i18n/sq.po
index 1e6de9b1a07..7136647696b 100644
--- a/addons/document/i18n/sq.po
+++ b/addons/document/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,18 +605,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po
index 7ee53288011..3e6b09192aa 100644
--- a/addons/document/i18n/sr.po
+++ b/addons/document/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:20+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Roditeljski Direktorijum"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Ime Direktorijuma sadrzi specijalne karaktere!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Tabla Dokumenata"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Procesni Cvor"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupisano po..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tip sadržaja Direktoriuma"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Sadržaj Direktorijuma"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dinamicki kontekst"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "reference za dati zapis, u dinamickim folderima."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Putanja"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "IMe Direktorijuma mora biti jedinstveno!"
@@ -161,7 +145,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -172,13 +155,6 @@ msgstr "Direktorijumi"
 msgid "Files details by Users"
 msgstr "Detalji fajlova po Korisnicima"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Greska!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -230,14 +206,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Direktorijum dokumenta"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "PotvrdiGresku"
@@ -254,19 +225,12 @@ msgstr "Copy text \t ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokumenti"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Skladiste"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Model Resursa"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -278,22 +242,20 @@ msgstr "Veličina Datoteke"
 msgid "Content Type"
 msgstr "Tip Sadrzaja"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -330,11 +292,6 @@ msgstr "Ime Polja"
 msgid "Context fields"
 msgstr "Polja Konteksta"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Sacuvano IMe Fajla"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -362,7 +319,7 @@ msgid "Virtual Files"
 msgstr "Virtualne datoteke"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Greska pri pisanju dokumenta!"
@@ -397,7 +354,6 @@ msgstr "Bezbednost"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Korisnik poslednje promene"
@@ -420,7 +376,6 @@ msgstr "Domen"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum Izmene"
@@ -463,12 +418,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Definise rec u kontekstu za sve pod direktorijume i fajlove"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Ukoliko nije cekirani, medijum nije trenutno ukljucen, i sadrzaj istog nije "
-"dostupan."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Staticki"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -478,7 +430,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -497,16 +448,10 @@ msgstr "Sadržaj"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Datum kreiranja"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Šifra resursa"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -517,17 +462,6 @@ msgstr ""
 "Cekiraj ovo polje ukoliko zelis da ime polja sadrzi ime zapisa.\n"
 "Ako ga postavis cekiranim, direktorijum ce postati jedan resurs."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -544,11 +478,6 @@ msgstr "Uključi naziv zapisa"
 msgid "Model Id"
 msgstr "ID modela"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Na Liniji"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -578,9 +507,9 @@ msgid "August"
 msgstr "Avgust"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dinamicki kontekst"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -594,7 +523,6 @@ msgstr "Juni"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupe"
 
@@ -608,11 +536,6 @@ msgstr "Aktivan"
 msgid "November"
 msgstr "Novembar"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Podaci"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -638,23 +561,17 @@ msgid "Seq."
 msgstr "Sekv."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Baza Podataka"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Svi Korisnikovi fajlovi"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "samo za Citanje"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -670,7 +587,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Kreator"
 
@@ -684,7 +600,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -706,19 +621,9 @@ msgid "Children"
 msgstr "Podređeni"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Spoljnje skladiste fajlova"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Za skladiste fajlova, osnovna putanja do istog"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Šifra resursa"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -736,29 +641,19 @@ msgid "Parent Model"
 msgstr "Roditeljski Model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Ime Polja, Upamtite da ce se prefiks \" dctx_\"  dodati na ono sto je ovde "
-"napisano."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Struktura Stabla"
+"kako god, Ove grupe, NE apliciraju za pod direktorijume, koji moraju "
+"definisati svoje sopstvene grupe."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Svi Korisnikovi fajlovi"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -775,20 +670,6 @@ msgstr "Copy text \t ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Staticki"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"kako god, Ove grupe, NE apliciraju za pod direktorijume, koji moraju "
-"definisati svoje sopstvene grupe."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -816,25 +697,14 @@ msgstr "Februar"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Ime"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Polja"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Ako je postavljeno, Medijum je dostupan samo za citanje"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -847,9 +717,9 @@ msgid "# of Files"
 msgstr "# Fajlova"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tip sadržaja Direktoriuma"
 
 #. module: document
 #: view:document.directory:0
@@ -883,9 +753,9 @@ msgid "File Name"
 msgstr "Ime fajla"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Interno skladiste Fajlova"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struktura Stabla"
 
 #. module: document
 #: view:document.configuration:0
@@ -904,10 +774,7 @@ msgid "Year"
 msgstr "Godina"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medijum za Skladistenje"
 
@@ -966,6 +833,9 @@ msgstr "Tip Dokumenta"
 #~ msgid "Directorie's Structure"
 #~ msgstr "Struktura Direktorijuma"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Sacuvano IMe Fajla"
+
 #~ msgid "Link"
 #~ msgstr "Veza"
 
@@ -993,6 +863,9 @@ msgstr "Tip Dokumenta"
 #~ "Ovdje upišite adresu servera ili IP adresu. Ostavite localhost ako ne znate "
 #~ "šta da napisete."
 
+#~ msgid "Data"
+#~ msgstr "Podaci"
+
 #~ msgid "Notes"
 #~ msgstr "Napomene"
 
@@ -1017,6 +890,9 @@ msgstr "Tip Dokumenta"
 #~ "* Autentifikacija korisnika\n"
 #~ "* Indeksiranje dokumenata\n"
 
+#~ msgid "Database"
+#~ msgstr "Baza Podataka"
+
 #~ msgid "Attached To"
 #~ msgstr "Pridruženo"
 
@@ -1063,6 +939,9 @@ msgstr "Tip Dokumenta"
 #~ msgid "Browse Files"
 #~ msgstr "Pretraži Fajlove"
 
+#~ msgid "Document directory"
+#~ msgstr "Direktorijum dokumenta"
+
 #~ msgid "Files by users"
 #~ msgstr "Fajlovi po Korisniku"
 
@@ -1102,18 +981,34 @@ msgstr "Tip Dokumenta"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Auto Podesavanje Direktorijuma"
 
+#~ msgid "Document board"
+#~ msgstr "Tabla Dokumenata"
+
+#~ msgid "Process Node"
+#~ msgstr "Procesni Cvor"
+
 #~ msgid "This Year"
 #~ msgstr "Ove Godine"
 
+#~ msgid "Path"
+#~ msgstr "Putanja"
+
 #~ msgid "Sale Order"
 #~ msgstr "Zahtev Prodaje"
 
 #~ msgid "Project"
 #~ msgstr "Projekat"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Greska!"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Auto Podesavanje Direktorijuma za Proizvode"
 
+#~ msgid "Storage"
+#~ msgstr "Skladiste"
+
 #~ msgid "Files by Users"
 #~ msgstr "Fajlovi po Korisnicima"
 
@@ -1166,35 +1061,66 @@ msgstr "Tip Dokumenta"
 #~ "    -Nakon instalacije ovog modula PDFovi se vise ne nalaze u databazi, \n"
 #~ "       vec ce se nalaziti na adresi servera npr /server/bin/filestore.\n"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Ukoliko nije cekirani, medijum nije trenutno ukljucen, i sadrzaj istog nije "
+#~ "dostupan."
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Napredak Podesavanja"
 
 #~ msgid "Image"
 #~ msgstr "Slika"
 
+#~ msgid "Read Only"
+#~ msgstr "samo za Citanje"
+
 #~ msgid "Related to"
 #~ msgstr "Vezano za"
 
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Auto POdesavanje Direktorijuma za Projekte."
 
+#~ msgid "Online"
+#~ msgstr "Na Liniji"
+
 #~ msgid "Dashboard"
 #~ msgstr "UpravljackaTabla"
 
 #~ msgid "Product"
 #~ msgstr "Proizvod"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Za skladiste fajlova, osnovna putanja do istog"
+
+#~ msgid "External file storage"
+#~ msgstr "Spoljnje skladiste fajlova"
+
 #~ msgid ""
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr ""
 #~ "Auto Podesavanje Direktorijuma za Zahteve Prodaje i upite sa Izvestajima."
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Ime Polja, Upamtite da ce se prefiks \" dctx_\"  dodati na ono sto je ovde "
+#~ "napisano."
+
 #~ msgid "Statistics by User"
 #~ msgstr "Statistika po korisniku"
 
 #~ msgid "New Files"
 #~ msgstr "Novi Fajlovi"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Ako je postavljeno, Medijum je dostupan samo za citanje"
+
+#~ msgid "Internal File storage"
+#~ msgstr "Interno skladiste Fajlova"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Ime Polja mora biti jedinstveno!"
diff --git a/addons/document/i18n/sr@latin.po b/addons/document/i18n/sr@latin.po
index 6c70e08f440..bd9be6ee9e3 100644
--- a/addons/document/i18n/sr@latin.po
+++ b/addons/document/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr "Glavni Direktorijum"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Ime Direktorijuma sadrzi specijalne karaktere!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Tabla Dokumenata"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Procesni Cvor"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -59,14 +44,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Grupisano po..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Tip sadržaja Direktoriuma"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -106,9 +90,9 @@ msgid "Directory Content"
 msgstr "Sadržaj Direktorijuma"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dinamicki kontekst"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -127,13 +111,13 @@ msgstr ""
 "reference za dati zapis, u dinamickim folderima."
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Putanja"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "IMe Direktorijuma mora biti jedinstveno!"
@@ -161,7 +145,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -172,13 +155,6 @@ msgstr "Direktorijumi"
 msgid "Files details by Users"
 msgstr "Detalji fajlova po Korisnicima"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Greska!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -230,14 +206,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Direktorijum dokumenta"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "PotvrdiGresku"
@@ -254,19 +225,12 @@ msgstr "Copy text \t ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokumenti"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Skladiste"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Model Resursa"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -278,22 +242,20 @@ msgstr "Veličina Datoteke"
 msgid "Content Type"
 msgstr "Tip Sadrzaja"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -330,11 +292,6 @@ msgstr "Ime Polja"
 msgid "Context fields"
 msgstr "Polja Konteksta"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Sacuvano IMe Fajla"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -362,7 +319,7 @@ msgid "Virtual Files"
 msgstr "Virtualne datoteke"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Greska pri pisanju dokumenta!"
@@ -397,7 +354,6 @@ msgstr "Bezbednost"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Korisnik poslednje promene"
@@ -420,7 +376,6 @@ msgstr "Domen"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum Izmene"
@@ -463,12 +418,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Definise rec u kontekstu za sve pod direktorijume i fajlove"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Ukoliko nije cekirani, medijum nije trenutno ukljucen, i sadrzaj istog nije "
-"dostupan."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Staticki"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -478,7 +430,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -497,16 +448,10 @@ msgstr "Sadržaj"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Datum kreiranja"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Šifra resursa"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -517,17 +462,6 @@ msgstr ""
 "Cekiraj ovo polje ukoliko zelis da ime polja sadrzi ime zapisa.\n"
 "Ako ga postavis cekiranim, direktorijum ce postati jedan resurs."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -544,11 +478,6 @@ msgstr "Uključi naziv zapisa"
 msgid "Model Id"
 msgstr "ID modela"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Na Liniji"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -578,9 +507,9 @@ msgid "August"
 msgstr "Avgust"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dinamicki kontekst"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -594,7 +523,6 @@ msgstr "Juni"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Grupe"
 
@@ -608,11 +536,6 @@ msgstr "Aktivan"
 msgid "November"
 msgstr "Novembar"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Podaci"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -638,23 +561,17 @@ msgid "Seq."
 msgstr "Sekv."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Baza Podataka"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Svi Korisnikovi fajlovi"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "samo za Citanje"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -670,7 +587,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Kreator"
 
@@ -684,7 +600,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -706,19 +621,9 @@ msgid "Children"
 msgstr "Podređeni"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Spoljnje skladiste fajlova"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Za skladiste fajlova, osnovna putanja do istog"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Šifra resursa"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -736,29 +641,19 @@ msgid "Parent Model"
 msgstr "Roditeljski Model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Ime Polja, Upamtite da ce se prefiks \" dctx_\"  dodati na ono sto je ovde "
-"napisano."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Struktura Stabla"
+"kako god, Ove grupe, NE apliciraju za pod direktorijume, koji moraju "
+"definisati svoje sopstvene grupe."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Svi Korisnikovi fajlovi"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -775,20 +670,6 @@ msgstr "Copy text \t ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Staticki"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"kako god, Ove grupe, NE apliciraju za pod direktorijume, koji moraju "
-"definisati svoje sopstvene grupe."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -816,25 +697,14 @@ msgstr "Februar"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Ime"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Polja"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Ako je postavljeno, Medijum je dostupan samo za citanje"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -847,9 +717,9 @@ msgid "# of Files"
 msgstr "# Fajlova"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tip sadržaja Direktoriuma"
 
 #. module: document
 #: view:document.directory:0
@@ -883,9 +753,9 @@ msgid "File Name"
 msgstr "Ime fajla"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Interno skladiste Fajlova"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struktura Stabla"
 
 #. module: document
 #: view:document.configuration:0
@@ -904,10 +774,7 @@ msgid "Year"
 msgstr "Godina"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Medijum za Skladistenje"
 
@@ -919,6 +786,12 @@ msgstr "Tip Dokumenta"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Auto Podesavanje Direktorijuma"
 
+#~ msgid "Document board"
+#~ msgstr "Tabla Dokumenata"
+
+#~ msgid "Process Node"
+#~ msgstr "Procesni Cvor"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
@@ -928,24 +801,40 @@ msgstr "Tip Dokumenta"
 #~ msgid "This Year"
 #~ msgstr "Ove Godine"
 
+#~ msgid "Path"
+#~ msgstr "Putanja"
+
 #~ msgid "Sale Order"
 #~ msgstr "Zahtev Prodaje"
 
 #~ msgid "Project"
 #~ msgstr "Projekat"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Greska!"
+
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Auto Podesavanje Direktorijuma za Proizvode"
 
 #~ msgid "Files by Users"
 #~ msgstr "Fajlovi po Korisnicima"
 
+#~ msgid "Document directory"
+#~ msgstr "Direktorijum dokumenta"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Greška! Ne možete kreirati rekurzivne direktorijume."
 
+#~ msgid "Storage"
+#~ msgstr "Skladiste"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Fajlovi po Partneru"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Sacuvano IMe Fajla"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
@@ -1001,12 +890,27 @@ msgstr "Tip Dokumenta"
 #~ "    -Nakon instalacije ovog modula PDFovi se vise ne nalaze u databazi, \n"
 #~ "       vec ce se nalaziti na adresi servera npr /server/bin/filestore.\n"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Ukoliko nije cekirani, medijum nije trenutno ukljucen, i sadrzaj istog nije "
+#~ "dostupan."
+
 #~ msgid "Attachment"
 #~ msgstr "Dodatak"
 
+#~ msgid "Online"
+#~ msgstr "Na Liniji"
+
 #~ msgid "User"
 #~ msgstr "Korisnik"
 
+#~ msgid "Data"
+#~ msgstr "Podaci"
+
+#~ msgid "Database"
+#~ msgstr "Baza Podataka"
+
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "Auto POdesavanje Direktorijuma za Projekte."
 
@@ -1025,6 +929,9 @@ msgstr "Tip Dokumenta"
 #~ msgid "Files By Users"
 #~ msgstr "Fajlovi po Korisnicima"
 
+#~ msgid "Read Only"
+#~ msgstr "samo za Citanje"
+
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -1036,6 +943,9 @@ msgstr "Tip Dokumenta"
 #~ msgid "Last Posted Time"
 #~ msgstr "Zadnje postavljeno Vrijeme"
 
+#~ msgid "External file storage"
+#~ msgstr "Spoljnje skladiste fajlova"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1044,6 +954,9 @@ msgstr "Tip Dokumenta"
 #~ msgid "Wall of Shame"
 #~ msgstr "Zid Srama"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Za skladiste fajlova, osnovna putanja do istog"
+
 #~ msgid "Files details by Partners"
 #~ msgstr "Detalji Fajlova po Partneru"
 
@@ -1065,6 +978,13 @@ msgstr "Tip Dokumenta"
 #~ msgid "Files By Partner"
 #~ msgstr "Fajlovi po Partneru"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Ime Polja, Upamtite da ce se prefiks \" dctx_\"  dodati na ono sto je ovde "
+#~ "napisano."
+
 #~ msgid "This Month"
 #~ msgstr "Ovog meseca"
 
@@ -1079,10 +999,16 @@ msgstr "Tip Dokumenta"
 #~ msgid "Statistics by User"
 #~ msgstr "Statistika po korisniku"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Ako je postavljeno, Medijum je dostupan samo za citanje"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Ime Polja mora biti jedinstveno!"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Interno skladiste Fajlova"
+
 #~ msgid "Files by Resource Type"
 #~ msgstr "Fajlovi po Tipu Izvora"
 
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 0b048d7ed65..59fb85e11f8 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Överliggande katalog"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Katalognamnet innehåller specialtecken!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Dokumentpanel"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "Process Node"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -58,14 +43,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Gruppera på..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Kataloginnehållstyp"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -105,9 +89,9 @@ msgid "Directory Content"
 msgstr "Directory Content"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dynamiskt sammanhang"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -126,13 +110,13 @@ msgstr ""
 "en hänvisning till den aktuella posten, i dynamiska mappar"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Sökväg"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Directory name must be unique!"
@@ -159,7 +143,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -170,13 +153,6 @@ msgstr "Kataloger"
 msgid "Files details by Users"
 msgstr "Fildetaljer per användare"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Error!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -228,14 +204,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Document directory"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "ValidateError"
@@ -252,19 +223,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Dokument"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Lagring"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Resursklass"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -276,22 +240,20 @@ msgstr "File Size"
 msgid "Content Type"
 msgstr "Content Type"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,11 +289,6 @@ msgstr "Namnfält"
 msgid "Context fields"
 msgstr "Kontextuella fält"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Stored Filename"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -359,7 +316,7 @@ msgid "Virtual Files"
 msgstr "Virtual Files"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Fel vid skrivning av dokumentet!"
@@ -396,7 +353,6 @@ msgstr "Security"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Last Modification User"
@@ -419,7 +375,6 @@ msgstr "Domain"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Date Modified"
@@ -463,12 +418,9 @@ msgstr ""
 "Definiera ord i detta kontext, för alla underliggande kataloger och filer"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr ""
-"Om inte ikryssad, media är förnärvarande offline och innehållet "
-"otillgängligt."
+#: view:document.directory:0
+msgid "Static"
+msgstr "Statisk"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -478,7 +430,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -497,16 +448,10 @@ msgstr "Contents"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Date Created"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Resource ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -518,17 +463,6 @@ msgstr ""
 "namn.\n"
 "Om angivet, tvingas katalogen vara en resurs."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -545,11 +479,6 @@ msgstr "Include Record Name"
 msgid "Model Id"
 msgstr "Model Id"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Online"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -581,9 +510,9 @@ msgid "August"
 msgstr "Augusti"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamiskt sammanhang"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -597,7 +526,6 @@ msgstr "Juni"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Groups"
 
@@ -611,11 +539,6 @@ msgstr "Aktiv"
 msgid "November"
 msgstr "November"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Data"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -645,23 +568,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Alla användares filer"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Januari"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Skrivskyddad"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Dokumentkatalog"
 
@@ -677,7 +594,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Creator"
 
@@ -696,7 +612,6 @@ msgstr ""
 "enligt installerade moduler."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -718,20 +633,9 @@ msgid "Children"
 msgstr "Children"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Extern fillagring"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr ""
-"För fillagring, root-katalog för sökvägem i filsystemet förlagringsplatsen"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Resource ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -749,29 +653,19 @@ msgid "Parent Model"
 msgstr "Parent Model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Namnet på fältet. Observera att prefixet \"dctx_\" kommer att föregås till "
-"vad som skrivs här."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Tree Structure"
+"Dessa grupper är dock inte tillämpliga på barn kataloger, som måste "
+"definiera sina egna grupper."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Alla användares filer"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -787,20 +681,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Statisk"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Dessa grupper är dock inte tillämpliga på barn kataloger, som måste "
-"definiera sina egna grupper."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -828,25 +708,14 @@ msgstr "Februari"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Name"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Sögvägen till lagringsplatsen måste vara unik!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Fält"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Om angiven, media är bara läsbart"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -859,9 +728,9 @@ msgid "# of Files"
 msgstr "# av filer"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Kataloginnehållstyp"
 
 #. module: document
 #: view:document.directory:0
@@ -895,9 +764,9 @@ msgid "File Name"
 msgstr "Filnamn"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "Intern fillagring"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Tree Structure"
 
 #. module: document
 #: view:document.configuration:0
@@ -916,10 +785,7 @@ msgid "Year"
 msgstr "År"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Lagringsmedia"
 
@@ -966,6 +832,10 @@ msgstr "Document Type"
 #~ msgid "Resource Title"
 #~ msgstr "Resource Title"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Error!"
+
 #~ msgid "document.configuration.wizard"
 #~ msgstr "document.configuration.wizard"
 
@@ -975,6 +845,9 @@ msgstr "Document Type"
 #~ msgid "Browse Files"
 #~ msgstr "Bläddra filer"
 
+#~ msgid "Document directory"
+#~ msgstr "Document directory"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Error! Du kan inte skapa rekursiva kataloger."
 
@@ -987,6 +860,9 @@ msgstr "Document Type"
 #~ msgid "Server Address"
 #~ msgstr "Server Address"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Stored Filename"
+
 #~ msgid "Link"
 #~ msgstr "Link"
 
@@ -1024,6 +900,12 @@ msgstr "Document Type"
 #~ msgid "Configure"
 #~ msgstr "Configure"
 
+#~ msgid "Data"
+#~ msgstr "Data"
+
+#~ msgid "Database"
+#~ msgstr "Database"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Integrated Document Management System"
 
@@ -1075,12 +957,18 @@ msgstr "Document Type"
 #~ msgid "This Year"
 #~ msgstr "Innevarande år"
 
+#~ msgid "Path"
+#~ msgstr "Sökväg"
+
 #~ msgid "Sale Order"
 #~ msgstr "Försäljningsorder"
 
 #~ msgid "Project"
 #~ msgstr "Projekt"
 
+#~ msgid "Storage"
+#~ msgstr "Lagring"
+
 #~ msgid "Modified"
 #~ msgstr "Ändrad"
 
@@ -1096,6 +984,9 @@ msgstr "Document Type"
 #~ msgid "User"
 #~ msgstr "Användare"
 
+#~ msgid "Online"
+#~ msgstr "Online"
+
 #~ msgid "Dashboard"
 #~ msgstr "Huvudmeny"
 
@@ -1105,6 +996,9 @@ msgstr "Document Type"
 #~ msgid "Wall of Shame"
 #~ msgstr "Skamvrån"
 
+#~ msgid "External file storage"
+#~ msgstr "Extern fillagring"
+
 #~ msgid "Product"
 #~ msgstr "Produkt"
 
@@ -1120,6 +1014,15 @@ msgstr "Document Type"
 #~ msgid "New Files"
 #~ msgstr "Nya filer"
 
+#~ msgid "Internal File storage"
+#~ msgstr "Intern fillagring"
+
+#~ msgid "Document board"
+#~ msgstr "Dokumentpanel"
+
+#~ msgid "Process Node"
+#~ msgstr "Process Node"
+
 #~ msgid "Files per Month"
 #~ msgstr "Filer per månad"
 
@@ -1135,6 +1038,15 @@ msgstr "Document Type"
 #~ msgid "Files by Users"
 #~ msgstr "Användarfiler"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr ""
+#~ "Om inte ikryssad, media är förnärvarande offline och innehållet "
+#~ "otillgängligt."
+
+#~ msgid "Read Only"
+#~ msgstr "Skrivskyddad"
+
 #~ msgid "Files By Users"
 #~ msgstr "Filer per användare"
 
@@ -1144,6 +1056,10 @@ msgstr "Document Type"
 #~ msgid "Files details by Partners"
 #~ msgstr "Fildetaljer per företag"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr ""
+#~ "För fillagring, root-katalog för sökvägem i filsystemet förlagringsplatsen"
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Användare som inte infört några nya dokument senaste månaden"
 
@@ -1166,9 +1082,19 @@ msgstr "Document Type"
 #~ msgid "This Months Files"
 #~ msgstr "Denna månads filer"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Om angiven, media är bara läsbart"
+
 #~ msgid "Files by Resource Type"
 #~ msgstr "Filer per resurstyp"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Namnet på fältet. Observera att prefixet \"dctx_\" kommer att föregås till "
+#~ "vad som skrivs här."
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(kopia)"
@@ -1176,6 +1102,9 @@ msgstr "Document Type"
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Katalogen måste ha en förälder eller en lagringsplats"
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Sögvägen till lagringsplatsen måste vara unik!"
+
 #~ msgid "All Months Files"
 #~ msgstr "Månadens alla filer"
 
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index 5810e96b9cd..d5023be7ed9 100644
--- a/addons/document/i18n/tlh.po
+++ b/addons/document/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,13 +41,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -407,7 +363,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -450,9 +405,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,8 +490,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -575,7 +506,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -589,11 +519,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,8 +544,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -628,14 +553,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,18 +604,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -717,15 +624,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -733,11 +635,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,8 +692,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -852,8 +726,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index ef5e89f9c12..6272eaf37b6 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:53+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "Ana Dizin"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Klasör adında özel karakterler var!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "Döküman Paneli"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "İşlem Düğümü"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,14 +42,13 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Gruplandır..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Klasör İçerik Tipi"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -104,9 +88,9 @@ msgid "Directory Content"
 msgstr "Klasör İçeriği"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Dinamik İçerik"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,13 +109,13 @@ msgstr ""
 "olarak 'res_id', 'res_model' i kullan"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "Yol"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "Klasör adı eşsiz olmalı !"
@@ -158,7 +142,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -169,13 +152,6 @@ msgstr "Dizinler"
 msgid "Files details by Users"
 msgstr "Kullanıcıya göre dosya ayrıntıları"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Hata!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -227,14 +203,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Belge Dizini"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "DoğrulamaHatası"
@@ -251,19 +222,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "Belgeler"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "Saklama"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "Kaynak model"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -275,22 +239,20 @@ msgstr "Dosya Boyutu"
 msgid "Content Type"
 msgstr "İçerik Türü"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "Tür"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,11 +289,6 @@ msgstr "Ad alanı"
 msgid "Context fields"
 msgstr "Bağlam Alanları"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Saklanan Dosya adı"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -359,7 +316,7 @@ msgid "Virtual Files"
 msgstr "Sanal Dosyalar"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "Belge yazımında hata !"
@@ -396,7 +353,6 @@ msgstr "Güvenlik"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Son Değiştiren Kullanıcı"
@@ -419,7 +375,6 @@ msgstr "Etki alanı"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Değiştirilme Tarihi"
@@ -462,10 +417,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "Bütün alt dizinler ve dosyalar için içerik kelimelerini tanımla"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "Eğer işaretlenmediyse, ortam kapalı durumdadır ve içeriği görülmez"
+#: view:document.directory:0
+msgid "Static"
+msgstr "Durağan"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -475,7 +429,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -494,16 +447,10 @@ msgstr "İçindekiler"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "Oluşturulma Tarihi"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Kaynak Kimliği"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -514,17 +461,6 @@ msgstr ""
 "Dosya adının kayıt adını içermesini istiyorsanız bu alanı işaretleyin.\n"
 "Eğer ayarlandıysa, dizin kaynak olandan olmalı."
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -541,11 +477,6 @@ msgstr "Kayıt Adı İçerilsin"
 msgid "Model Id"
 msgstr "Model No"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "Çevrimiçi"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -577,9 +508,9 @@ msgid "August"
 msgstr "Ağustos"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dinamik İçerik"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -593,7 +524,6 @@ msgstr "Haziran"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Gruplar"
 
@@ -607,11 +537,6 @@ msgstr "Etkin"
 msgid "November"
 msgstr "Kasım"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Veri"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -640,23 +565,17 @@ msgid "Seq."
 msgstr "Dizi"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "Veritabanı"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Tüm Kullancı dosyaları"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "Ocak"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "Salt Okunur"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "Dökümanlar Klasörü"
 
@@ -672,7 +591,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "Oluşturan"
 
@@ -691,7 +609,6 @@ msgstr ""
 "oluşturacaktır."
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -713,19 +630,9 @@ msgid "Children"
 msgstr "Alt öğeler"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "Dış dosya saklama"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "Dosya saklamak için, saklama için kök yoldur."
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Kaynak Kimliği"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -743,28 +650,18 @@ msgid "Parent Model"
 msgstr "Ana Model"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
-"Alanın adı. \"dctx_\" önekinin burada yazılanın ekleneceğine dikkat edin."
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Ağaç Yapısı"
+"Bu gruplar, alt dizinlere değil de sadece kendi gruplarını tanımlamalıdırlar."
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "Mayıs"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "Tüm Kullancı dosyaları"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -780,19 +677,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "Durağan"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-"Bu gruplar, alt dizinlere değil de sadece kendi gruplarını tanımlamalıdırlar."
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -819,25 +703,14 @@ msgstr "Şubat"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "Adı"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "Saklama yolu eşsiz olmalı!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "Alanlar"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "Ayarlandıysa, ortam salt okunurdur"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -850,9 +723,9 @@ msgid "# of Files"
 msgstr "Dosya Sayısı"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Klasör İçerik Tipi"
 
 #. module: document
 #: view:document.directory:0
@@ -884,9 +757,9 @@ msgid "File Name"
 msgstr "Dosya Adı"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "İç Dosya saklama"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Ağaç Yapısı"
 
 #. module: document
 #: view:document.configuration:0
@@ -905,10 +778,7 @@ msgid "Year"
 msgstr "Yıl"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "Saklama Ortamı"
 
@@ -983,6 +853,10 @@ msgstr "Belge Türü"
 #~ msgid "This Year"
 #~ msgstr "Bu Yıl"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Hata!"
+
 #~ msgid "Project"
 #~ msgstr "Proje"
 
@@ -992,6 +866,15 @@ msgstr "Belge Türü"
 #~ msgid "Attachment"
 #~ msgstr "Ek"
 
+#~ msgid "Online"
+#~ msgstr "Çevrimiçi"
+
+#~ msgid "Database"
+#~ msgstr "Veritabanı"
+
+#~ msgid "Read Only"
+#~ msgstr "Salt Okunur"
+
 #~ msgid "Product"
 #~ msgstr "Ürün"
 
@@ -1005,27 +888,45 @@ msgstr "Belge Türü"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "Otomatik Klasör Yapılandırması"
 
+#~ msgid "Document board"
+#~ msgstr "Döküman Paneli"
+
+#~ msgid "Process Node"
+#~ msgstr "İşlem Düğümü"
+
 #~ msgid "title"
 #~ msgstr "unvan"
 
+#~ msgid "Path"
+#~ msgstr "Yol"
+
 #~ msgid "Files by Users"
 #~ msgstr "Kullanıcıya göre Dosyalar"
 
 #~ msgid "Auto directory configuration for Products."
 #~ msgstr "Ürünler için otomatik dizin yapılandırması"
 
+#~ msgid "Document directory"
+#~ msgstr "Belge Dizini"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Hata! Yinelenen Dizinler oluşturamazsınız."
 
 #~ msgid "Configure Resource Directory"
 #~ msgstr "Kaynak Dizini Yapılandırması"
 
+#~ msgid "Storage"
+#~ msgstr "Saklama"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "Paydaş başına Dosya"
 
 #~ msgid "Document Dashboard"
 #~ msgstr "Belge Paneli"
 
+#~ msgid "Stored Filename"
+#~ msgstr "Saklanan Dosya adı"
+
 #~ msgid "Modified"
 #~ msgstr "Değiştirilmiş"
 
@@ -1072,12 +973,19 @@ msgstr "Belge Türü"
 #~ msgid "Image"
 #~ msgstr "Resim"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "Eğer işaretlenmediyse, ortam kapalı durumdadır ve içeriği görülmez"
+
 #~ msgid "Auto Configure Directory"
 #~ msgstr "Dizini Otomatik Yapılandır"
 
 #~ msgid "Related to"
 #~ msgstr "Bağlı olduğu"
 
+#~ msgid "Data"
+#~ msgstr "Veri"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "Entegre Edilen BelgeYönetim Sistemi"
 
@@ -1102,12 +1010,24 @@ msgstr "Belge Türü"
 #~ msgid "Files details by Partners"
 #~ msgstr "Paydaşa göre Dosya Ayrıntıları"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "Dosya saklamak için, saklama için kök yoldur."
+
+#~ msgid "External file storage"
+#~ msgstr "Dış dosya saklama"
+
 #~ msgid "Users that did not inserted documents since one month"
 #~ msgstr "Bir aydan beri dosya eklemeyen kullanıcılar"
 
 #~ msgid "Files by users"
 #~ msgstr "Kullanıcıya göre dosyalar"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr ""
+#~ "Alanın adı. \"dctx_\" önekinin burada yazılanın ekleneceğine dikkat edin."
+
 #~ msgid "Files By Partner"
 #~ msgstr "Paydaşa göre Dosyalar"
 
@@ -1121,6 +1041,9 @@ msgstr "Belge Türü"
 #~ "Belge havuzu bütün eklere, postalar, proje belgeleri, faturalar, vb. gibi, "
 #~ "erişmenizi sağlar."
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "Ayarlandıysa, ortam salt okunurdur"
+
 #~ msgid "Statistics by User"
 #~ msgstr "Kullanıcıya göre İstatistikler"
 
@@ -1129,6 +1052,9 @@ msgstr "Belge Türü"
 #~ msgstr ""
 #~ "Bu rapordaki Satış Siparişleri ve Tekliflerin otomatik dizin yapılandırması."
 
+#~ msgid "The storage path must be unique!"
+#~ msgstr "Saklama yolu eşsiz olmalı!"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "Dosya adı eşsiz olmalı !"
@@ -1136,6 +1062,9 @@ msgstr "Belge Türü"
 #~ msgid "Files by Resource Type"
 #~ msgstr "Kaynak Türüne göre Dosyalar"
 
+#~ msgid "Internal File storage"
+#~ msgstr "İç Dosya saklama"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Dizin ana ya da saklama dizini olmalıdır"
 
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index aa1998b933b..4c33f47a2ad 100644
--- a/addons/document/i18n/uk.po
+++ b/addons/document/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "Назва папки містить спеціальні символи!"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,13 +41,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -103,8 +87,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -121,13 +105,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -152,7 +136,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -163,13 +146,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -221,14 +197,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -245,19 +216,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -269,22 +233,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -317,11 +279,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -349,7 +306,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -384,7 +341,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -407,7 +363,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -450,9 +405,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -463,7 +417,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -482,16 +435,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -500,17 +447,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -527,11 +463,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -559,8 +490,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -575,7 +506,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -589,11 +519,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "Дані"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -619,8 +544,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -628,14 +553,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -651,7 +570,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -665,7 +583,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -687,18 +604,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -717,15 +624,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -733,11 +635,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -753,18 +650,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -787,25 +672,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -818,8 +692,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -852,8 +726,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -873,10 +747,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -894,6 +765,9 @@ msgstr ""
 #~ msgid "Preview"
 #~ msgstr "Попередній перегляд"
 
+#~ msgid "Data"
+#~ msgstr "Дані"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/document/i18n/vi.po b/addons/document/i18n/vi.po
index 13671d964d2..4272ca1f4b3 100644
--- a/addons/document/i18n/vi.po
+++ b/addons/document/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "Nhóm theo..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "Lỗi!"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr "Tháng Tám"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr "Tháng Sáu"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "Các nhóm"
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr "Tháng Giêng"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,18 +605,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr "Tháng Năm"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr "Tháng Hai"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
@@ -886,5 +757,9 @@ msgstr ""
 msgid "Document Type"
 msgstr ""
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Lỗi!"
+
 #~ msgid "Product"
 #~ msgstr "Sản phẩm"
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 77c4d65086d..37e681fb284 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 13:11+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "父目录"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "目录名中有特殊字符！"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "文档仪表盘"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "流程节点"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr "目录必须有一个上级或者存储器"
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr "在资源目录中这字段用作名称。若为空则使用“name”
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "分组..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "目录里内容的类型"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr "修改"
 
 #. module: document
 #: view:document.directory:0
@@ -103,9 +87,9 @@ msgid "Directory Content"
 msgstr "目录内容"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "动态上下文"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr "我的文档"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -123,13 +107,13 @@ msgstr ""
 "在动态目录中，可以用'dir_id'表示当前目录，用'res_id', 'res_model' 来表示当前记录。"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "路径"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "目录名必须唯一！"
@@ -154,7 +138,6 @@ msgstr "如勾选，所有与该记录匹配的附件都会被找到。如不选
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -165,13 +148,6 @@ msgstr "目录"
 msgid "Files details by Users"
 msgstr "用户的文件详情"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "错误！"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -223,14 +199,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "文档目录"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "验证错误"
@@ -247,19 +218,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "文档"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "储存空间"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "资源模型"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -271,22 +235,20 @@ msgstr "文件大小"
 msgid "Content Type"
 msgstr "内容类型"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr "修改"
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "类型"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -319,11 +281,6 @@ msgstr "名称字段"
 msgid "Context fields"
 msgstr "上下文字段"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "保存文件名"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -351,7 +308,7 @@ msgid "Virtual Files"
 msgstr "虚拟文件"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "写入文档时发生错误！"
@@ -386,7 +343,6 @@ msgstr "安全设定"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "最近修改用户"
@@ -409,7 +365,6 @@ msgstr "过滤条件"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "修改日期"
@@ -452,10 +407,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "输入上下文文本，会适用于所有子目录和文件"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "如果没有选中，那么介质目前是脱机的且里面的内容不可用。"
+#: view:document.directory:0
+msgid "Static"
+msgstr "静态目录"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -465,7 +419,6 @@ msgstr "未知"
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -484,16 +437,10 @@ msgstr "内容"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "创建日期"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "资源ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -504,17 +451,6 @@ msgstr ""
 "如果需要文件名包含记录的名称值，勾这个勾\n"
 "要让这个选项生效，你的目录必须是对应的对象"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr "知识管理"
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr "文档存储器"
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -531,11 +467,6 @@ msgstr "含记录名称"
 msgid "Model Id"
 msgstr "模块ID"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "在线"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -563,9 +494,9 @@ msgid "August"
 msgstr "8月"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr "我的文档"
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "动态上下文"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -579,7 +510,6 @@ msgstr "6月"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "组"
 
@@ -593,11 +523,6 @@ msgstr "生效"
 msgid "November"
 msgstr "11月"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "数据"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -624,23 +549,17 @@ msgid "Seq."
 msgstr "序列"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "数据库"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "所有用户的文件"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "只读"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "文档目录"
 
@@ -656,7 +575,6 @@ msgstr "附件"
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "创建者"
 
@@ -672,7 +590,6 @@ msgstr ""
 "的文档管理系统支持为文档映射虚拟文件夹。单据的虚拟文件夹将用于管理该单据的附件文件，或者用于打印和下载任何报表。此工具将按照已安装的模块自动创建目录。"
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -694,19 +611,9 @@ msgid "Children"
 msgstr "子目录"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "外部文件存储设区"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "文件存储区的根目录"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "资源ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -724,27 +631,17 @@ msgid "Parent Model"
 msgstr "上级模型"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr "字段的名称。注意前缀\"dctx_\"会加在你输入的文字前。"
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "树结构"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr "这个组不会带到下级目录，你需要为它们单独定义组。"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "所有用户的文件"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -760,18 +657,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "静态目录"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr "这个组不会带到下级目录，你需要为它们单独定义组。"
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -795,25 +680,14 @@ msgstr "2月"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "名称"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "存储路径必须唯一！"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "字段列表"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "如果设置，该介质就是只读的。"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -826,9 +700,9 @@ msgid "# of Files"
 msgstr "# 文件"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "目录里内容的类型"
 
 #. module: document
 #: view:document.directory:0
@@ -860,9 +734,9 @@ msgid "File Name"
 msgstr "文件名"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "内部文件存储区"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "树结构"
 
 #. module: document
 #: view:document.configuration:0
@@ -881,10 +755,7 @@ msgid "Year"
 msgstr "年"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "存储介质"
 
@@ -917,12 +788,21 @@ msgstr "文档类型"
 #~ msgid "Link"
 #~ msgstr "链接"
 
+#~ msgid "Data"
+#~ msgstr "数据"
+
 #~ msgid "Notes"
 #~ msgstr "备注"
 
+#~ msgid "Database"
+#~ msgstr "数据库"
+
 #~ msgid "Filesystem"
 #~ msgstr "文件系统"
 
+#~ msgid "Document directory"
+#~ msgstr "文档目录"
+
 #~ msgid "Directories Mapped to Objects"
 #~ msgstr "目录映射到对象"
 
@@ -954,6 +834,9 @@ msgstr "文档类型"
 #~ msgid "Parent Item"
 #~ msgstr "上级"
 
+#~ msgid "Stored Filename"
+#~ msgstr "保存文件名"
+
 #~ msgid "Configure"
 #~ msgstr "设置"
 
@@ -1052,12 +935,25 @@ msgstr "文档类型"
 #~ msgid "title"
 #~ msgstr "标题"
 
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "错误！"
+
 #~ msgid "This Year"
 #~ msgstr "该年"
 
+#~ msgid "Path"
+#~ msgstr "路径"
+
 #~ msgid "Project"
 #~ msgstr "项目"
 
+#~ msgid "Storage"
+#~ msgstr "储存空间"
+
+#~ msgid "Online"
+#~ msgstr "在线"
+
 #~ msgid "Image"
 #~ msgstr "图像"
 
@@ -1067,22 +963,44 @@ msgstr "文档类型"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "项目的自动目录配置"
 
+#~ msgid "Read Only"
+#~ msgstr "只读"
+
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "文件存储区的根目录"
+
+#~ msgid "External file storage"
+#~ msgstr "外部文件存储设区"
+
 #~ msgid "New Files"
 #~ msgstr "新文件"
 
 #~ msgid "Product"
 #~ msgstr "产品"
 
+#~ msgid "If set, media is for reading only"
+#~ msgstr "如果设置，该介质就是只读的。"
+
+#~ msgid "The storage path must be unique!"
+#~ msgstr "存储路径必须唯一！"
+
 #, python-format
 #~ msgid "File name must be unique!"
 #~ msgstr "文件名必须唯一！"
 
+#~ msgid "Internal File storage"
+#~ msgstr "内部文件存储区"
+
 #~ msgid "Search Document storage"
 #~ msgstr "搜索文档存储区"
 
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "目录必须具有上级目录或一个存储区"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "如果没有选中，那么介质目前是脱机的且里面的内容不可用。"
+
 #~ msgid ""
 #~ "The Documents repository gives you access to all attachments, such as mails, "
 #~ "project documents, invoices etc."
@@ -1126,6 +1044,11 @@ msgstr "文档类型"
 #~ "Auto directory configuration for Sale Orders and Quotation with report."
 #~ msgstr "针对销售订单或已打印的报价单自动创建目录的配置"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr "字段的名称。注意前缀\"dctx_\"会加在你输入的文字前。"
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "（副本）"
@@ -1133,6 +1056,9 @@ msgstr "文档类型"
 #~ msgid "Reporting"
 #~ msgstr "报告"
 
+#~ msgid "Process Node"
+#~ msgstr "流程节点"
+
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "自动目录设置"
 
@@ -1184,6 +1110,9 @@ msgstr "文档类型"
 #~ msgid "Document Dashboard"
 #~ msgstr "文档仪表盘"
 
+#~ msgid "Document board"
+#~ msgstr "文档仪表盘"
+
 #~ msgid "Knowledge Management"
 #~ msgstr "知识管理"
 
diff --git a/addons/document/i18n/zh_HK.po b/addons/document/i18n/zh_HK.po
index 5551d771373..a64db3b89c1 100644
--- a/addons/document/i18n/zh_HK.po
+++ b/addons/document/i18n/zh_HK.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-27 13:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -23,26 +23,11 @@ msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -57,13 +42,12 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
 msgstr ""
 
 #. module: document
@@ -104,8 +88,8 @@ msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
@@ -122,13 +106,13 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -153,7 +137,6 @@ msgstr ""
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -164,13 +147,6 @@ msgstr ""
 msgid "Files details by Users"
 msgstr ""
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -222,14 +198,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -246,19 +217,12 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -270,22 +234,20 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -318,11 +280,6 @@ msgstr ""
 msgid "Context fields"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -350,7 +307,7 @@ msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -385,7 +342,6 @@ msgstr "保安"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
@@ -408,7 +364,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
@@ -451,9 +406,8 @@ msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
 msgstr ""
 
 #. module: document
@@ -464,7 +418,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -483,16 +436,10 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr ""
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -501,17 +448,6 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -528,11 +464,6 @@ msgstr ""
 msgid "Model Id"
 msgstr ""
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -560,8 +491,8 @@ msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
@@ -576,7 +507,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -590,11 +520,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -620,8 +545,8 @@ msgid "Seq."
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
@@ -629,14 +554,8 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr ""
 
@@ -652,7 +571,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr ""
 
@@ -666,7 +584,6 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -688,18 +605,8 @@ msgid "Children"
 msgstr ""
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
@@ -718,15 +625,10 @@ msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 msgstr ""
 
 #. module: document
@@ -734,11 +636,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -754,18 +651,6 @@ msgstr ""
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr ""
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -788,25 +673,14 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr ""
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr ""
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -819,8 +693,8 @@ msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
@@ -853,8 +727,8 @@ msgid "File Name"
 msgstr ""
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
@@ -874,10 +748,7 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr ""
 
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index 561dff895e2..7fc1b0f66d7 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 11:51+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -22,26 +22,11 @@ msgid "Parent Directory"
 msgstr "上層目錄"
 
 #. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr "目錄名稱有特殊字元！"
 
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr "文件佈告欄"
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr "處理節點"
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
@@ -56,14 +41,13 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。
 
 #. module: document
 #: view:document.directory:0
-#: view:document.storage:0
 msgid "Group By..."
 msgstr "分類方式..."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "目錄內容類型"
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
 
 #. module: document
 #: view:document.directory:0
@@ -103,9 +87,9 @@ msgid "Directory Content"
 msgstr "目錄內容"
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "動態背景"
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -124,13 +108,13 @@ msgstr ""
 "to the current record, in dynamic folders"
 
 #. module: document
-#: field:document.storage,path:0
-msgid "Path"
-msgstr "路徑"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
 #, python-format
 msgid "Directory name must be unique!"
 msgstr "目錄名不能重覆！"
@@ -155,7 +139,6 @@ msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，
 
 #. module: document
 #: view:document.directory:0
-#: field:document.storage,dir_ids:0
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
@@ -166,13 +149,6 @@ msgstr "目錄"
 msgid "Files details by Users"
 msgstr "各使用者檔案詳情"
 
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr "錯誤！"
-
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
@@ -224,14 +200,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "文件目錄"
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
 #, python-format
 msgid "ValidateError"
 msgstr "檢驗錯誤"
@@ -248,19 +219,12 @@ msgstr "ir.actions.report.xml"
 msgid "Documents"
 msgstr "文件"
 
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr "存儲器"
-
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
 msgstr "資源模型"
 
 #. module: document
-#: field:ir.attachment,file_size:0
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 msgid "File Size"
@@ -272,22 +236,20 @@ msgstr "檔案大小"
 msgid "Content Type"
 msgstr "內容類型"
 
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
 msgid "Type"
 msgstr "類型"
 
 #. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -320,11 +282,6 @@ msgstr "名稱欄位"
 msgid "Context fields"
 msgstr "內文欄位"
 
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "儲存名稱"
-
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -352,7 +309,7 @@ msgid "Virtual Files"
 msgstr "虛擬檔案"
 
 #. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
 #, python-format
 msgid "Error at doc write!"
 msgstr "文件書寫錯誤!"
@@ -387,7 +344,6 @@ msgstr "安全"
 
 #. module: document
 #: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "最後修改使用者"
@@ -410,7 +366,6 @@ msgstr "領域"
 
 #. module: document
 #: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "修改日期"
@@ -453,10 +408,9 @@ msgid "Define words in the context, for all child directories and files"
 msgstr "在內文中定義所有的子目錄及檔案"
 
 #. module: document
-#: help:document.storage,online:0
-msgid ""
-"If not checked, media is currently offline and its contents not available"
-msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
+#: view:document.directory:0
+msgid "Static"
+msgstr "靜態"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -466,7 +420,6 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
 #: view:ir.attachment:0
 #: field:ir.attachment,user_id:0
 #: field:report.document.user,user_id:0
@@ -485,16 +438,10 @@ msgstr "內容"
 
 #. module: document
 #: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
 msgstr "產生的日期"
 
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "資源ID"
-
 #. module: document
 #: help:document.directory.content,include_name:0
 msgid ""
@@ -505,17 +452,6 @@ msgstr ""
 "如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n"
 "如果設定, 這個目錄將會是第一個資源"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -532,11 +468,6 @@ msgstr "包含紀錄名稱"
 msgid "Model Id"
 msgstr "模型 Id"
 
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr "在線上"
-
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -564,9 +495,9 @@ msgid "August"
 msgstr "八月"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
-msgstr ""
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "動態背景"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -580,7 +511,6 @@ msgstr "六月"
 
 #. module: document
 #: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
 msgid "Groups"
 msgstr "群組"
 
@@ -594,11 +524,6 @@ msgstr "啟用"
 msgid "November"
 msgstr "十一月"
 
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr "資料"
-
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
 msgid ""
@@ -626,23 +551,17 @@ msgid "Seq."
 msgstr "Seq."
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Database"
-msgstr "資料庫"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "January"
 msgstr "一月"
 
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr "唯讀"
-
 #. module: document
 #: view:document.directory:0
-#: view:process.node:0
 msgid "Document Directory"
 msgstr "文件目錄"
 
@@ -658,7 +577,6 @@ msgstr ""
 
 #. module: document
 #: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
 msgid "Creator"
 msgstr "建置者"
 
@@ -674,7 +592,6 @@ msgstr ""
 "文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。"
 
 #. module: document
-#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
@@ -696,19 +613,9 @@ msgid "Children"
 msgstr "子目錄"
 
 #. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr "外部檔案儲存"
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
-msgstr "關於檔案儲存，儲存的根路徑"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "資源ID"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -726,27 +633,17 @@ msgid "Parent Model"
 msgstr "母模型"
 
 #. module: document
-#: help:document.directory.dctx,field:0
+#: view:document.directory:0
 msgid ""
-"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
-"what is typed here."
-msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "樹狀結構"
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
 
 #. module: document
 #: selection:report.document.user,month:0
 msgid "May"
 msgstr "五月"
 
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr "所有使用者檔案"
-
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
@@ -762,18 +659,6 @@ msgstr "ir.attachment"
 msgid "Users File"
 msgstr ""
 
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr "靜態"
-
-#. module: document
-#: view:document.directory:0
-msgid ""
-"These groups, however, do NOT apply to children directories, which must "
-"define their own groups."
-msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
-
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
@@ -798,25 +683,14 @@ msgstr "二月"
 
 #. module: document
 #: field:document.directory,name:0
-#: field:document.storage,name:0
 msgid "Name"
 msgstr "名稱"
 
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr "儲存路徑不能重複!"
-
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
 msgstr "欄位"
 
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr "如果設定，媒體只能唯讀。"
-
 #. module: document
 #: selection:report.document.user,month:0
 msgid "April"
@@ -829,9 +703,9 @@ msgid "# of Files"
 msgstr "檔案數"
 
 #. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
-msgstr ""
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "目錄內容類型"
 
 #. module: document
 #: view:document.directory:0
@@ -863,9 +737,9 @@ msgid "File Name"
 msgstr "檔案名稱"
 
 #. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
-msgstr "內部文件儲存"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "樹狀結構"
 
 #. module: document
 #: view:document.configuration:0
@@ -884,10 +758,7 @@ msgid "Year"
 msgstr "年份"
 
 #. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
 #: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
 msgstr "儲存媒體"
 
@@ -899,12 +770,25 @@ msgstr "文件類型"
 #~ msgid "Auto Directory Configuration"
 #~ msgstr "自動目錄配置"
 
+#~ msgid "Process Node"
+#~ msgstr "處理節點"
+
+#~ msgid "Path"
+#~ msgstr "路徑"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "錯誤！"
+
 #~ msgid "Sale Order"
 #~ msgstr "銷售訂單"
 
 #~ msgid "Project"
 #~ msgstr "專案"
 
+#~ msgid "Document directory"
+#~ msgstr "文件目錄"
+
 #~ msgid "Configure Resource Directory"
 #~ msgstr "配置資源目錄"
 
@@ -929,9 +813,18 @@ msgstr "文件類型"
 #~ msgid "Auto directory configuration for Projects."
 #~ msgstr "自動為專案配置目錄"
 
+#~ msgid "Data"
+#~ msgstr "資料"
+
 #~ msgid "Integrated Document Management System"
 #~ msgstr "複合文件管理系統"
 
+#~ msgid "Database"
+#~ msgstr "資料庫"
+
+#~ msgid "Read Only"
+#~ msgstr "唯讀"
+
 #~ msgid "Last Posted Time"
 #~ msgstr "最後發佈時間"
 
@@ -960,6 +853,9 @@ msgstr "文件類型"
 #~ msgid "Search Document storage"
 #~ msgstr "搜尋文件儲存"
 
+#~ msgid "Document board"
+#~ msgstr "文件佈告欄"
+
 #~ msgid "Files per Month"
 #~ msgstr "當月文件"
 
@@ -978,9 +874,15 @@ msgstr "文件類型"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "錯誤! 您不可以建立循環目錄。"
 
+#~ msgid "Storage"
+#~ msgstr "存儲器"
+
 #~ msgid "Files Per Partner"
 #~ msgstr "夥伴文件"
 
+#~ msgid "Stored Filename"
+#~ msgstr "儲存名稱"
+
 #~ msgid "Document Dashboard"
 #~ msgstr "文件控制台"
 
@@ -990,6 +892,13 @@ msgstr "文件類型"
 #~ msgid "Modified"
 #~ msgstr "已修改"
 
+#~ msgid ""
+#~ "If not checked, media is currently offline and its contents not available"
+#~ msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
+
+#~ msgid "Online"
+#~ msgstr "在線上"
+
 #~ msgid "User"
 #~ msgstr "使用者"
 
@@ -1002,9 +911,15 @@ msgstr "文件類型"
 #~ msgid "Files By Users"
 #~ msgstr "各使用者檔案"
 
+#~ msgid "External file storage"
+#~ msgstr "外部檔案儲存"
+
 #~ msgid "Wall of Shame"
 #~ msgstr "排行榜"
 
+#~ msgid "For file storage, the root path of the storage"
+#~ msgstr "關於檔案儲存，儲存的根路徑"
+
 #~ msgid "Files by users"
 #~ msgstr "各使用者檔案"
 
@@ -1031,6 +946,17 @@ msgstr "文件類型"
 #~ msgid "Statistics by User"
 #~ msgstr "各使用者統計"
 
+#~ msgid ""
+#~ "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+#~ "what is typed here."
+#~ msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
+
+#~ msgid "The storage path must be unique!"
+#~ msgstr "儲存路徑不能重複!"
+
+#~ msgid "If set, media is for reading only"
+#~ msgstr "如果設定，媒體只能唯讀。"
+
 #, python-format
 #~ msgid "(copy)"
 #~ msgstr "(copy)"
@@ -1038,5 +964,8 @@ msgstr "文件類型"
 #~ msgid "All Months Files"
 #~ msgstr "所有月份文件"
 
+#~ msgid "Internal File storage"
+#~ msgstr "內部文件儲存"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "目錄必須要有母目錄或儲存"
diff --git a/addons/document_ftp/i18n/ar.po b/addons/document_ftp/i18n/ar.po
index 8a661762aae..986cf2f71e1 100644
--- a/addons/document_ftp/i18n/ar.po
+++ b/addons/document_ftp/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:32+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/bg.po b/addons/document_ftp/i18n/bg.po
index 2c5880138c0..dafdf8ef9dc 100644
--- a/addons/document_ftp/i18n/bg.po
+++ b/addons/document_ftp/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-02 09:48+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/ca.po b/addons/document_ftp/i18n/ca.po
index e175a7eda74..2989898c1a8 100644
--- a/addons/document_ftp/i18n/ca.po
+++ b/addons/document_ftp/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-15 16:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/cs.po b/addons/document_ftp/i18n/cs.po
index ffb5fcf91db..759004cb6f3 100644
--- a/addons/document_ftp/i18n/cs.po
+++ b/addons/document_ftp/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:13+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/da.po b/addons/document_ftp/i18n/da.po
index 12c2fd5606f..b1eece2915f 100644
--- a/addons/document_ftp/i18n/da.po
+++ b/addons/document_ftp/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index b3e6a9d8dec..81f63f9aba4 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 06:50+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/el.po b/addons/document_ftp/i18n/el.po
index 05e7222b097..28886d605bd 100644
--- a/addons/document_ftp/i18n/el.po
+++ b/addons/document_ftp/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 17:13+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/en_GB.po b/addons/document_ftp/i18n/en_GB.po
index 45ff7346516..25739c8a39c 100644
--- a/addons/document_ftp/i18n/en_GB.po
+++ b/addons/document_ftp/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-25 17:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index 60f6e719c5e..566bf068f6d 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 22:05+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/es_CR.po b/addons/document_ftp/i18n/es_CR.po
index bead5359546..c70502cb001 100644
--- a/addons/document_ftp/i18n/es_CR.po
+++ b/addons/document_ftp/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 19:19+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/es_EC.po b/addons/document_ftp/i18n/es_EC.po
index 39e61227f8d..c7a0c6e53b4 100644
--- a/addons/document_ftp/i18n/es_EC.po
+++ b/addons/document_ftp/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:17+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/es_PY.po b/addons/document_ftp/i18n/es_PY.po
index 220357e86c1..fca9bad3aef 100644
--- a/addons/document_ftp/i18n/es_PY.po
+++ b/addons/document_ftp/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-21 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/et.po b/addons/document_ftp/i18n/et.po
index 2de5aa1fe7e..17d634d9d60 100644
--- a/addons/document_ftp/i18n/et.po
+++ b/addons/document_ftp/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-11 18:05+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
index a81559132f4..b10bcccfa02 100644
--- a/addons/document_ftp/i18n/fi.po
+++ b/addons/document_ftp/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-27 06:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 950c3020f95..c12d617009c 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/gl.po b/addons/document_ftp/i18n/gl.po
index 9700b251ac3..121b389f7e8 100644
--- a/addons/document_ftp/i18n/gl.po
+++ b/addons/document_ftp/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-24 01:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/hr.po b/addons/document_ftp/i18n/hr.po
index 7bd86eb8f0a..c466ee3bbe3 100644
--- a/addons/document_ftp/i18n/hr.po
+++ b/addons/document_ftp/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-28 20:42+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/hu.po b/addons/document_ftp/i18n/hu.po
index a1f146922bd..032d8b26173 100644
--- a/addons/document_ftp/i18n/hu.po
+++ b/addons/document_ftp/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 12:46+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index 9d611f8fc69..00759f82b83 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 23:09+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/ja.po b/addons/document_ftp/i18n/ja.po
index ba59215e1e4..3670289a660 100644
--- a/addons/document_ftp/i18n/ja.po
+++ b/addons/document_ftp/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-21 16:39+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/mn.po b/addons/document_ftp/i18n/mn.po
index 269addf8f2f..29dba692b99 100644
--- a/addons/document_ftp/i18n/mn.po
+++ b/addons/document_ftp/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-22 03:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/nb.po b/addons/document_ftp/i18n/nb.po
index 1a6bb9fa59d..074503090e3 100644
--- a/addons/document_ftp/i18n/nb.po
+++ b/addons/document_ftp/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-06 14:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index 9599ab0495d..7b129951328 100644
--- a/addons/document_ftp/i18n/nl.po
+++ b/addons/document_ftp/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 21:49+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index 0c1adc1a936..1c17a8ca800 100644
--- a/addons/document_ftp/i18n/pl.po
+++ b/addons/document_ftp/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-07 20:16+0000\n"
 "Last-Translator: Andrzej Król <andrzej.krol@poczta.onet.eu>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index 0688676d0c1..78db1c846fd 100644
--- a/addons/document_ftp/i18n/pt.po
+++ b/addons/document_ftp/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 17:33+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index a5b309c8308..e2795677096 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 15:06+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/ro.po b/addons/document_ftp/i18n/ro.po
index ce9436f5efa..06f7df34aca 100644
--- a/addons/document_ftp/i18n/ro.po
+++ b/addons/document_ftp/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-04 13:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index 2126cf43758..936ec2a28ae 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-16 00:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/sk.po b/addons/document_ftp/i18n/sk.po
index d6ab3a8d405..0863adee422 100644
--- a/addons/document_ftp/i18n/sk.po
+++ b/addons/document_ftp/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-09 09:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/sl.po b/addons/document_ftp/i18n/sl.po
index bc42a20b140..69f7d2f0935 100644
--- a/addons/document_ftp/i18n/sl.po
+++ b/addons/document_ftp/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-19 07:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
index c4fc6be7d9a..89f62e4f00d 100644
--- a/addons/document_ftp/i18n/sr.po
+++ b/addons/document_ftp/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-14 08:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index 766cf2054ff..441398bc9d5 100644
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-05 15:29+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index 2e5faee73c4..e8d9e05cfd8 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 11:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/tr.po b/addons/document_ftp/i18n/tr.po
index 224b3a37846..71986625138 100644
--- a/addons/document_ftp/i18n/tr.po
+++ b/addons/document_ftp/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-23 19:32+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
index 7d919cd410a..9f645a96687 100644
--- a/addons/document_ftp/i18n/zh_CN.po
+++ b/addons/document_ftp/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 15:11+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_ftp/i18n/zh_TW.po b/addons/document_ftp/i18n/zh_TW.po
index 9bd8e5f859a..fcf818fdc00 100644
--- a/addons/document_ftp/i18n/zh_TW.po
+++ b/addons/document_ftp/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-29 09:46+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/document_page/i18n/ar.po b/addons/document_page/i18n/ar.po
index 2ce147eaf21..b5fcf6c1496 100644
--- a/addons/document_page/i18n/ar.po
+++ b/addons/document_page/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/bg.po b/addons/document_page/i18n/bg.po
index 4389e072170..82f2af7d4f3 100644
--- a/addons/document_page/i18n/bg.po
+++ b/addons/document_page/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/bs.po b/addons/document_page/i18n/bs.po
index 40416cef5cb..070c9988839 100644
--- a/addons/document_page/i18n/bs.po
+++ b/addons/document_page/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/ca.po b/addons/document_page/i18n/ca.po
index 853324b1c53..f0c30aa8a24 100644
--- a/addons/document_page/i18n/ca.po
+++ b/addons/document_page/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:13+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/cs.po b/addons/document_page/i18n/cs.po
index a8ce2b606bf..b7a86be3e4c 100644
--- a/addons/document_page/i18n/cs.po
+++ b/addons/document_page/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/da.po b/addons/document_page/i18n/da.po
index c42372963bf..9ac2869bf56 100644
--- a/addons/document_page/i18n/da.po
+++ b/addons/document_page/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/de.po b/addons/document_page/i18n/de.po
index 010935ef939..fec9d81c066 100644
--- a/addons/document_page/i18n/de.po
+++ b/addons/document_page/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 06:54+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/el.po b/addons/document_page/i18n/el.po
index 2a288d454cd..89e9deb4183 100644
--- a/addons/document_page/i18n/el.po
+++ b/addons/document_page/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/document_page/i18n/es.po b/addons/document_page/i18n/es.po
index a138bc30919..386b9b4ba61 100644
--- a/addons/document_page/i18n/es.po
+++ b/addons/document_page/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 21:47+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\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: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/et.po b/addons/document_page/i18n/et.po
index e539bb73583..72e020fe1d5 100644
--- a/addons/document_page/i18n/et.po
+++ b/addons/document_page/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:11+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/fi.po b/addons/document_page/i18n/fi.po
index 37d5b82525d..4390a72f8bd 100644
--- a/addons/document_page/i18n/fi.po
+++ b/addons/document_page/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:13+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po
index 6f2f9999059..4b89a184834 100644
--- a/addons/document_page/i18n/fr.po
+++ b/addons/document_page/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:39+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/gl.po b/addons/document_page/i18n/gl.po
index 253ab6b3ac2..06b369dca9c 100644
--- a/addons/document_page/i18n/gl.po
+++ b/addons/document_page/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiki-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/hr.po b/addons/document_page/i18n/hr.po
index b9f9e5ad20a..08d6e09f00e 100644
--- a/addons/document_page/i18n/hr.po
+++ b/addons/document_page/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:11+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/hu.po b/addons/document_page/i18n/hu.po
index 662dcd339af..3e63e889e50 100644
--- a/addons/document_page/i18n/hu.po
+++ b/addons/document_page/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:16+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/id.po b/addons/document_page/i18n/id.po
index 5024f47fef2..4f4bb6bef64 100644
--- a/addons/document_page/i18n/id.po
+++ b/addons/document_page/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:08+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/it.po b/addons/document_page/i18n/it.po
index d1f160fe0c3..8c92f813641 100644
--- a/addons/document_page/i18n/it.po
+++ b/addons/document_page/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 23:11+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/ja.po b/addons/document_page/i18n/ja.po
index d5207b955bf..3eea42f292d 100644
--- a/addons/document_page/i18n/ja.po
+++ b/addons/document_page/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:11+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/ko.po b/addons/document_page/i18n/ko.po
index 499bccb1171..dc5ce2904c7 100644
--- a/addons/document_page/i18n/ko.po
+++ b/addons/document_page/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:14+0000\n"
 "Last-Translator: CSro <choongsan@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/lt.po b/addons/document_page/i18n/lt.po
index 82b87bc5c2e..b47e82d277c 100644
--- a/addons/document_page/i18n/lt.po
+++ b/addons/document_page/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:14+0000\n"
 "Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: lt\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/lv.po b/addons/document_page/i18n/lv.po
index 75d6d6e1c9a..66bfd44d0ea 100644
--- a/addons/document_page/i18n/lv.po
+++ b/addons/document_page/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:13+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/mn.po b/addons/document_page/i18n/mn.po
index db3e3d62be1..81ca1ff2e67 100644
--- a/addons/document_page/i18n/mn.po
+++ b/addons/document_page/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:13+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/nb.po b/addons/document_page/i18n/nb.po
index d4692c53be0..5cae05b7448 100644
--- a/addons/document_page/i18n/nb.po
+++ b/addons/document_page/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:14+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/nl.po b/addons/document_page/i18n/nl.po
index 8ef76687231..8302c33664e 100644
--- a/addons/document_page/i18n/nl.po
+++ b/addons/document_page/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 13:05+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/pl.po b/addons/document_page/i18n/pl.po
index 86b17782569..098e0053f6e 100644
--- a/addons/document_page/i18n/pl.po
+++ b/addons/document_page/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 10:25+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/pt.po b/addons/document_page/i18n/pt.po
index 16c8e135032..6d3348b43b0 100644
--- a/addons/document_page/i18n/pt.po
+++ b/addons/document_page/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:52+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/pt_BR.po b/addons/document_page/i18n/pt_BR.po
index 9a236d9504d..edd8494e701 100644
--- a/addons/document_page/i18n/pt_BR.po
+++ b/addons/document_page/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 15:32+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/ro.po b/addons/document_page/i18n/ro.po
index 56bb4eec6c3..c9a456bb6f2 100644
--- a/addons/document_page/i18n/ro.po
+++ b/addons/document_page/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/ru.po b/addons/document_page/i18n/ru.po
index 4b3d691f870..d0a4140c3d7 100644
--- a/addons/document_page/i18n/ru.po
+++ b/addons/document_page/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-24 05:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/sk.po b/addons/document_page/i18n/sk.po
index 29d1726e78e..9b8b2fa9550 100644
--- a/addons/document_page/i18n/sk.po
+++ b/addons/document_page/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:13+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/sl.po b/addons/document_page/i18n/sl.po
index 04865649732..c4909ad2c27 100644
--- a/addons/document_page/i18n/sl.po
+++ b/addons/document_page/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/sq.po b/addons/document_page/i18n/sq.po
index 40100b1e70c..1d8a709778b 100644
--- a/addons/document_page/i18n/sq.po
+++ b/addons/document_page/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/sr.po b/addons/document_page/i18n/sr.po
index dc5fdd34810..fa9b020944c 100644
--- a/addons/document_page/i18n/sr.po
+++ b/addons/document_page/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:13+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/sr@latin.po b/addons/document_page/i18n/sr@latin.po
index 31bd862c2d5..5146a214c3e 100644
--- a/addons/document_page/i18n/sr@latin.po
+++ b/addons/document_page/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:14+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/sv.po b/addons/document_page/i18n/sv.po
index 0a287669118..f7c6fee99ef 100644
--- a/addons/document_page/i18n/sv.po
+++ b/addons/document_page/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/tlh.po b/addons/document_page/i18n/tlh.po
index 5024f47fef2..4f4bb6bef64 100644
--- a/addons/document_page/i18n/tlh.po
+++ b/addons/document_page/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:08+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/tr.po b/addons/document_page/i18n/tr.po
index be2455ea3ec..d688ed893bf 100644
--- a/addons/document_page/i18n/tr.po
+++ b/addons/document_page/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:12+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/uk.po b/addons/document_page/i18n/uk.po
index 32f8328377b..c377cc735a8 100644
--- a/addons/document_page/i18n/uk.po
+++ b/addons/document_page/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:11+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/vi.po b/addons/document_page/i18n/vi.po
index 1caf0608ef3..66f1451a131 100644
--- a/addons/document_page/i18n/vi.po
+++ b/addons/document_page/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-13 12:09+0000\n"
 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/zh_CN.po b/addons/document_page/i18n/zh_CN.po
index a934b92203f..514177566a1 100644
--- a/addons/document_page/i18n/zh_CN.po
+++ b/addons/document_page/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-08 13:10+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_page/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
index cc7b99064d7..a23045e880d 100644
--- a/addons/document_page/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 09:36+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
diff --git a/addons/document_webdav/i18n/ar.po b/addons/document_webdav/i18n/ar.po
index f672e03a9b7..bc8d0d00c7a 100644
--- a/addons/document_webdav/i18n/ar.po
+++ b/addons/document_webdav/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:19+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "ستضاف هذه الخصائص إلى طلبات صفحة الويب D
 msgid "DAV Properties for Documents"
 msgstr "خصائص DAV للوثائق"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "خطأ استيراد PyWebDAV"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "مجلدات"
 msgid "WebDAV properties"
 msgstr "خصائص الويبDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"الرجاء تثبيت PyWebDAV من "
-"http://code.google.com/p/pywebdav/downloads/detail؟name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -204,3 +186,17 @@ msgstr "استبدال"
 
 #~ msgid "WebDAV server for Document Management"
 #~ msgstr "خدمة الويبDAV لإدارة الوثائق"
+
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "الرجاء تثبيت PyWebDAV من "
+#~ "http://code.google.com/p/pywebdav/downloads/detail؟name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "خطأ استيراد PyWebDAV"
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index 8d35ace9623..10b0bd18a21 100644
--- a/addons/document_webdav/i18n/bg.po
+++ b/addons/document_webdav/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-01 20:38+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
index 53799a83090..d31ee2b51b0 100644
--- a/addons/document_webdav/i18n/ca.po
+++ b/addons/document_webdav/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:43+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Aquestes propietats s'afegiran a les peticions WebDAV"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Error d'importació PyWebDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "Propietats WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instal·leu PyWebDAV des de "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -181,6 +163,10 @@ msgstr ""
 msgid "Substitute"
 msgstr "Substitut"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Error d'importació PyWebDAV!"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Error! No podeu crear directoris recursius."
 
@@ -196,6 +182,16 @@ msgstr "Substitut"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "El nom de directori ha de ser únic!"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Instal·leu PyWebDAV des de "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Context dinàmic"
 
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
index f2427d8b9d4..7f7187a0f7f 100644
--- a/addons/document_webdav/i18n/cs.po
+++ b/addons/document_webdav/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:52+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
index 439cace5499..2f33b09e775 100644
--- a/addons/document_webdav/i18n/da.po
+++ b/addons/document_webdav/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-08 21:52+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index b05cf48283c..c7296417fc6 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 06:49+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
@@ -73,12 +73,6 @@ msgstr "Diese Eigenschaften werden bei WebDav Anfragen angefügt"
 msgid "DAV Properties for Documents"
 msgstr "DAV Eigenschaften für Dokumente"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV Import Fehler!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Verzeichnisse"
 msgid "WebDAV properties"
 msgstr "WebDav Eigenschaften"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Bitte installieren Sie PyWebDAV von hier:  "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -204,5 +186,19 @@ msgstr "Substituiere"
 #~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
 #~ "haben"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Bitte installieren Sie PyWebDAV von hier:  "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV Import Fehler!"
+
 #~ msgid "DAV properties for documents"
 #~ msgstr "DAV Eigenschaften für Dokumente"
diff --git a/addons/document_webdav/i18n/el.po b/addons/document_webdav/i18n/el.po
index 2d44aa2f052..b6efcce98f3 100644
--- a/addons/document_webdav/i18n/el.po
+++ b/addons/document_webdav/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:09+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/en_GB.po b/addons/document_webdav/i18n/en_GB.po
index 127138023c0..8c207bb7ea9 100644
--- a/addons/document_webdav/i18n/en_GB.po
+++ b/addons/document_webdav/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 15:26+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "These properties will be added to WebDAV requests"
 msgid "DAV Properties for Documents"
 msgstr "DAV Properties for Documents"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV Import Error!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Folders"
 msgid "WebDAV properties"
 msgstr "WebDAV properties"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -190,6 +172,20 @@ msgstr "Substitute"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "The directory name must be unique !"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV Import Error!"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Dynamic context"
 
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index 116b8d0df4e..0536ad00234 100644
--- a/addons/document_webdav/i18n/es.po
+++ b/addons/document_webdav/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 10:42+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
 msgid "DAV Properties for Documents"
 msgstr "Propiedades DAV para los documentos"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "¡Error de importación PyWebDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Carpetas"
 msgid "WebDAV properties"
 msgstr "Propiedades WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instale PyWebDAV desde "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -184,6 +166,10 @@ msgstr "Substituir"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "¡El nombre de directorio debe ser único!"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "¡Error de importación PyWebDAV!"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear directorios recursivos."
 
@@ -199,6 +185,16 @@ msgstr "Substituir"
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "¡El directorio no puede ser su propio padre!"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Instale PyWebDAV desde "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Contexto dinámico"
 
diff --git a/addons/document_webdav/i18n/es_CR.po b/addons/document_webdav/i18n/es_CR.po
index e1adff65c26..6c5dbbe2595 100644
--- a/addons/document_webdav/i18n/es_CR.po
+++ b/addons/document_webdav/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:44+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: document_webdav
@@ -74,12 +74,6 @@ msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
 msgid "DAV Properties for Documents"
 msgstr "DAV Propiedades para Documentos"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "¡Error de importación PyWebDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -96,18 +90,6 @@ msgstr "Directorios"
 msgid "WebDAV properties"
 msgstr "Propiedades WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instale PyWebDAV desde "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -185,6 +167,10 @@ msgstr "Substituir"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear directorios recursivos."
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "¡Error de importación PyWebDAV!"
+
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "¡El directorio no puede ser su propio padre!"
 
@@ -194,6 +180,16 @@ msgstr "Substituir"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "¡El nombre de directorio debe ser único!"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Instale PyWebDAV desde "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "El directorio debe tener un padre o un almacenamiento."
 
diff --git a/addons/document_webdav/i18n/es_EC.po b/addons/document_webdav/i18n/es_EC.po
index 34b95a5f4f1..4f9365c8dd0 100644
--- a/addons/document_webdav/i18n/es_EC.po
+++ b/addons/document_webdav/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-17 19:10+0000\n"
 "Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/es_PY.po b/addons/document_webdav/i18n/es_PY.po
index 9edae0a6119..0890281afa3 100644
--- a/addons/document_webdav/i18n/es_PY.po
+++ b/addons/document_webdav/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-21 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "¡Error de importación PyWebDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "Propiedades WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instale PyWebDAV desde "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -181,6 +163,10 @@ msgstr ""
 msgid "Substitute"
 msgstr "Substituir"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "¡Error de importación PyWebDAV!"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear carpetas recursivos."
 
@@ -196,6 +182,16 @@ msgstr "Substituir"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "¡El nombre de carpeta debe ser único!"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Instale PyWebDAV desde "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Contexto dinámico"
 
diff --git a/addons/document_webdav/i18n/et.po b/addons/document_webdav/i18n/et.po
index 753630818b8..fbda01a60f4 100644
--- a/addons/document_webdav/i18n/et.po
+++ b/addons/document_webdav/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:12+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
index 2eb8bbc6690..2cfc573bdae 100644
--- a/addons/document_webdav/i18n/eu.po
+++ b/addons/document_webdav/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-08 07:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/fi.po b/addons/document_webdav/i18n/fi.po
index fbacfb98ee5..2eb0909ac61 100644
--- a/addons/document_webdav/i18n/fi.po
+++ b/addons/document_webdav/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-20 10:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Nämä ominaisuudet lisätään WebDAV pyyntöihin"
 msgid "DAV Properties for Documents"
 msgstr "Dokumenttien DAV ominaisuudet"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV tuontivirhe !"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Hakemistot"
 msgid "WebDAV properties"
 msgstr "WebDAV ominaisuudet"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Asenna PyWebDAV osoitteesta "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -193,6 +175,10 @@ msgstr "Korvaa"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Hakemiston nimen tulee olla uniikki !"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV tuontivirhe !"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Dynaaminen konteksti"
 
@@ -204,3 +190,13 @@ msgstr "Korvaa"
 
 #~ msgid "DAV properties for folders"
 #~ msgstr "DAV ominaisuudet hakemistoille"
+
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Asenna PyWebDAV osoitteesta "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
diff --git a/addons/document_webdav/i18n/fr.po b/addons/document_webdav/i18n/fr.po
index 5ddc0976504..bced5c07dcf 100644
--- a/addons/document_webdav/i18n/fr.po
+++ b/addons/document_webdav/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-13 17:53+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 13:47+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -31,7 +31,7 @@ msgstr "Documents"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "Propriétés du document"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -73,12 +73,6 @@ msgstr "Ces propriétés seront ajoutées aux requêtes WebDAV"
 msgid "DAV Properties for Documents"
 msgstr "Propriétés DAV pour les documents"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Erreur d'import PyWebDAV !"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Répertoires"
 msgid "WebDAV properties"
 msgstr "Propriétés WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Installer PyWebDAV à partir de l'URL : "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -168,7 +150,7 @@ msgstr "Créateur"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "Propriétés du document"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
@@ -196,9 +178,23 @@ msgstr "Remplacer"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Le nom du répertoire doit être unique !"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Installer PyWebDAV à partir de l'URL : "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Le répertoire doit avoir un parent ou un espace de stockage"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Erreur d'import PyWebDAV !"
+
 #~ msgid "DAV properties for documents"
 #~ msgstr "Propriétés DAV (Distributed Authoring and Versioning) du document"
 
diff --git a/addons/document_webdav/i18n/gl.po b/addons/document_webdav/i18n/gl.po
index bcb938d5d17..c28b27764da 100644
--- a/addons/document_webdav/i18n/gl.po
+++ b/addons/document_webdav/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-24 01:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Estas propiedades engadiranse as peticións WebDAV"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Erro de importación PyWebDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "Propiedades WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instale PyWebDAV desde "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -181,6 +163,10 @@ msgstr ""
 msgid "Substitute"
 msgstr "Substituto"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Erro de importación PyWebDAV!"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Erro! Non se pode crear directorios recursivos."
 
@@ -190,6 +176,16 @@ msgstr "Substituto"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "O nome do directorio debe ser único!"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Instale PyWebDAV desde "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "O directorio non pode ser o seu propio pai!"
 
diff --git a/addons/document_webdav/i18n/gu.po b/addons/document_webdav/i18n/gu.po
index 941861b75e4..dfcb7fe6b38 100644
--- a/addons/document_webdav/i18n/gu.po
+++ b/addons/document_webdav/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-23 09:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr "ફોલ્ડર્સ"
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/hr.po b/addons/document_webdav/i18n/hr.po
index c07659bd60e..5a045468ffb 100644
--- a/addons/document_webdav/i18n/hr.po
+++ b/addons/document_webdav/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-21 14:46+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/hu.po b/addons/document_webdav/i18n/hu.po
index f041c6db661..ab25a20ed33 100644
--- a/addons/document_webdav/i18n/hu.po
+++ b/addons/document_webdav/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 13:30+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -72,12 +72,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -94,15 +88,6 @@ msgstr "Könyvtárak"
 msgid "WebDAV properties"
 msgstr "WebDAV tulajdonságok"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/id.po b/addons/document_webdav/i18n/id.po
index f222f9df9b3..14107824f4b 100644
--- a/addons/document_webdav/i18n/id.po
+++ b/addons/document_webdav/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-17 09:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
index 4c49248a7b9..05cf4e27e25 100644
--- a/addons/document_webdav/i18n/it.po
+++ b/addons/document_webdav/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 13:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Queste proprietà verranno aggiunte alle richieste WebDAV"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV: errore importazione!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "Proprietà WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Per favore installare PyWebDAV dall'indirizzo: "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -199,6 +181,20 @@ msgstr "Sostituire"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Il nome della cartella deve essere univoco!"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Per favore installare PyWebDAV dall'indirizzo: "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV: errore importazione!"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "La Cartella deve avere un padre o uno storage"
 
diff --git a/addons/document_webdav/i18n/ja.po b/addons/document_webdav/i18n/ja.po
index 8bc67979fa2..32fe3d7dd5e 100644
--- a/addons/document_webdav/i18n/ja.po
+++ b/addons/document_webdav/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-21 00:03+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "これらの特性はWebDAV要求に追加されます。"
 msgid "DAV Properties for Documents"
 msgstr "文書のDAV特性"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAVの取込みエラー"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "フォルダ"
 msgid "WebDAV properties"
 msgstr "WebDAV特性"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"下記のサイトから PyWebDAV をインストールしてください。 "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -187,6 +169,20 @@ msgstr "代替"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "ディレクトリ名は固有でなければいけません。"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "下記のサイトから PyWebDAV をインストールしてください。 "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAVの取込みエラー"
+
 #~ msgid "Dynamic context"
 #~ msgstr "ダイナミックな文脈"
 
diff --git a/addons/document_webdav/i18n/mn.po b/addons/document_webdav/i18n/mn.po
index add54846eb3..12f7797839f 100644
--- a/addons/document_webdav/i18n/mn.po
+++ b/addons/document_webdav/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 11:14+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr "Хавтсууд"
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/nb.po b/addons/document_webdav/i18n/nb.po
index 7366fb9b72b..e951a383ff1 100644
--- a/addons/document_webdav/i18n/nb.po
+++ b/addons/document_webdav/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-07 17:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Disse egenskapene vil bli lagt til WebDAV-forespørsler"
 msgid "DAV Properties for Documents"
 msgstr "DAV Eiendommer for Dokumenter."
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV importere Feil!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Mapper"
 msgid "WebDAV properties"
 msgstr "WebDAV egenskaper."
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Vennligst installer PyWebDAV fra "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -184,12 +166,26 @@ msgstr "Erstatte"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Feil! Du kan opprette rekursive kataloger."
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Vennligst installer PyWebDAV fra "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "Katalogen kan ikke være overordnede av seg selv!"
 
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Katalogen Navnet må være unikt!"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV importere Feil!"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Dynamisk sammenheng"
 
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
index 5a8fdd2c68c..ae337c41957 100644
--- a/addons/document_webdav/i18n/nl.po
+++ b/addons/document_webdav/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 21:00+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Deze eigenschappen worden toegevoegd bij WebDAV aanvragen"
 msgid "DAV Properties for Documents"
 msgstr "DAV instellingen voor documenten"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV import fout!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Mappen"
 msgid "WebDAV properties"
 msgstr "WebDAV eigenschappen"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Installeer aub PyWebDAV vanaf "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -202,5 +184,19 @@ msgstr "Vervangen"
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Map moet een bovenliggende map hebben of opslag zijn"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Installeer aub PyWebDAV vanaf "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV import fout!"
+
 #~ msgid "DAV properties for documents"
 #~ msgstr "DAV eigenschappen voor documenten"
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
index c960305284c..1bab0b249d6 100644
--- a/addons/document_webdav/i18n/pl.po
+++ b/addons/document_webdav/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-28 09:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Te właściwości zostaną dodane do zgłoszeń WebDAV"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Błąd importu PyWebDAV"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "Właściwości WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -181,6 +166,10 @@ msgstr "Subsytut"
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "Katalog nie może być nadrzędny dla samego siebie !"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Błąd importu PyWebDAV"
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych katalogów."
 
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index 32736ef6929..64c4a6a8460 100644
--- a/addons/document_webdav/i18n/pt.po
+++ b/addons/document_webdav/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 14:02+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Estas propriedades serão adicionadas às solicitações WebDAV"
 msgid "DAV Properties for Documents"
 msgstr "Propriedades DAV para documentos"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV Erro de importação!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Pastas"
 msgid "WebDAV properties"
 msgstr "WebDAV propriedades"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Por favor instale PyWebDAV de "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -184,6 +166,10 @@ msgstr "Substituir"
 #~ msgid "DAV properties for documents"
 #~ msgstr "DAV propriedades de documentos"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV Erro de importação!"
+
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "Uma pasta não pode ser ascendente de sí própria"
 
@@ -193,6 +179,16 @@ msgstr "Substituir"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "O nome da pasta tem de ser único !"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Por favor instale PyWebDAV de "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "DAV properties for folders"
 #~ msgstr "DAV propriedades de pastas"
 
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index 87c03949e3a..b94125b823d 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 18:01+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Estas propriedades serão adicionadas para requisições WebDAV"
 msgid "DAV Properties for Documents"
 msgstr "Propriedades DAV para Documentos"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Erro de Iimportação PyWEbDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Pastas"
 msgid "WebDAV properties"
 msgstr "Propriedades WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Por favor instale o PyWebDAV de "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -193,5 +175,19 @@ msgstr "Substituto"
 #~ msgid "Dynamic context"
 #~ msgstr "Contexo dinâmico"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Por favor instale o PyWebDAV de "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Erro de Iimportação PyWEbDAV!"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "O diretório precisa ter um pai ou um armazenamento"
diff --git a/addons/document_webdav/i18n/ro.po b/addons/document_webdav/i18n/ro.po
index 08076460120..801039f42b1 100644
--- a/addons/document_webdav/i18n/ro.po
+++ b/addons/document_webdav/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-04 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Aceste proprietati vor fi adaugate cererilor WebDAV"
 msgid "DAV Properties for Documents"
 msgstr "Proprietati DAV pentru Documente"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Eroare Import PyWebDAV!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Foldere"
 msgid "WebDAV properties"
 msgstr "Proprietari WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Va rugam sa instalati PyWebDAV de la adresa "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -196,6 +178,10 @@ msgstr "Inlocuitor"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Numele directorului trebuie sa fie unic !"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Eroare Import PyWebDAV!"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Context dinamic"
 
@@ -204,3 +190,13 @@ msgstr "Inlocuitor"
 
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "Directorul trebuie sa aiba un parinte sau o arhiva"
+
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Va rugam sa instalati PyWebDAV de la adresa "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
diff --git a/addons/document_webdav/i18n/ru.po b/addons/document_webdav/i18n/ru.po
index cd4586e9ab0..19fa88491a1 100644
--- a/addons/document_webdav/i18n/ru.po
+++ b/addons/document_webdav/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-16 00:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Эти свойства будут добавлены к запроса
 msgid "DAV Properties for Documents"
 msgstr "Свойства DAV для документов"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "Ошибка импорта PyWebDAV"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Папки"
 msgid "WebDAV properties"
 msgstr "Настройки WebDAV"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Требуется установить PyWebDAV с адреса "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -190,6 +172,10 @@ msgstr "Заменить"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Имя каталога должно быть уникальным!"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "Ошибка импорта PyWebDAV"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Динамический контекст"
 
@@ -199,6 +185,16 @@ msgstr "Заменить"
 #~ msgid "WebDAV server for Document Management"
 #~ msgstr "Сервер WebDAV для управления документами"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Требуется установить PyWebDAV с адреса "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "DAV properties for folders"
 #~ msgstr "DAV-свойства папок"
 
diff --git a/addons/document_webdav/i18n/sl.po b/addons/document_webdav/i18n/sl.po
index c3a259c4ae5..2f5c5907262 100644
--- a/addons/document_webdav/i18n/sl.po
+++ b/addons/document_webdav/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:12+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr ""
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
index 3fe9bf42198..b278cbb9295 100644
--- a/addons/document_webdav/i18n/sr.po
+++ b/addons/document_webdav/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-03 07:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Ova ce svojstva biti dodana WebDAV zahtevima"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "WebDAV Svojstva"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/sr@latin.po b/addons/document_webdav/i18n/sr@latin.po
index e4d4b334abd..52290c3c87a 100644
--- a/addons/document_webdav/i18n/sr@latin.po
+++ b/addons/document_webdav/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 16:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Ova ce svojstva biti dodana WebDAV zahtevima"
 msgid "DAV Properties for Documents"
 msgstr ""
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,15 +89,6 @@ msgstr ""
 msgid "WebDAV properties"
 msgstr "WebDAV Svojstva"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index 7e9b797f797..5aaacc94745 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-30 17:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Dessa attribut adderas till WebDAV-anropen"
 msgid "DAV Properties for Documents"
 msgstr "DAV-attribut för dokument"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV importfel!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Mappar"
 msgid "WebDAV properties"
 msgstr "WebDAV-attribut"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Vänligen installera PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -187,9 +169,23 @@ msgstr "Ersätt"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Fel! Ni kan inte skapa rekursiva kataloger"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV importfel!"
+
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Katalognamnet måste vara unikt !"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Vänligen installera PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Dynamiskt sammanhang"
 
diff --git a/addons/document_webdav/i18n/tr.po b/addons/document_webdav/i18n/tr.po
index 3abf95ad926..602bc57f602 100644
--- a/addons/document_webdav/i18n/tr.po
+++ b/addons/document_webdav/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 17:22+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "Özellikler WebDAV isteklerine aklenecektir"
 msgid "DAV Properties for Documents"
 msgstr "Belgeler için DAV Özellikleri"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV İçeaktarma Hatası!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,18 +89,6 @@ msgstr "Klasörler"
 msgid "WebDAV properties"
 msgstr "WebDAV özellikleri"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Lütfen PyWebDAV2 "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/ adresinden kurun"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -184,12 +166,26 @@ msgstr "Yedek"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Hata! Yinelenen Dizinler oluşturamazsınız."
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV İçeaktarma Hatası!"
+
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "Dizin kendisinin üstü olamaz!"
 
 #~ msgid "The directory name must be unique !"
 #~ msgstr "Dizin adı eşsiz olmalı"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "Lütfen PyWebDAV2 "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/ adresinden kurun"
+
 #~ msgid "Dynamic context"
 #~ msgstr "Dinamik içerik"
 
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index 4a5bf8f76e3..f3d8af3af80 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 16:44+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -72,12 +72,6 @@ msgstr "这些属性将被添加到WebDAV请求上"
 msgid "DAV Properties for Documents"
 msgstr "文档的DAV属性"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV导入错误！"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -94,18 +88,6 @@ msgstr "目录"
 msgid "WebDAV properties"
 msgstr "webDAV 属性"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"请从这里下载安装PyWebDAV \r\n"
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -183,6 +165,10 @@ msgstr "替换"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "错误:你无法建立递归的目录"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV导入错误！"
+
 #~ msgid "DAV properties for documents"
 #~ msgstr "文档的DAV属性"
 
@@ -192,6 +178,16 @@ msgstr "替换"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "目录名必须唯一！"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "请从这里下载安装PyWebDAV \r\n"
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+
 #~ msgid "WebDAV server for Document Management"
 #~ msgstr "文档管理系统的WebDAV服务器"
 
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
index f941bccb965..a113b565e18 100644
--- a/addons/document_webdav/i18n/zh_TW.po
+++ b/addons/document_webdav/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 11:51+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -73,12 +73,6 @@ msgstr "這些內容將被加到 WebDAV 請求"
 msgid "DAV Properties for Documents"
 msgstr "文件的DAV 內容"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "PyWebDAV 匯入錯誤!"
-
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
@@ -95,17 +89,6 @@ msgstr "檔案夾"
 msgid "WebDAV properties"
 msgstr "WebDAV 內容"
 
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
-
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
@@ -183,6 +166,10 @@ msgstr "替代項目"
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "錯誤! 您不能建立循環的目錄"
 
+#, python-format
+#~ msgid "PyWebDAV Import Error!"
+#~ msgstr "PyWebDAV 匯入錯誤!"
+
 #~ msgid "Directory cannot be parent of itself!"
 #~ msgstr "目錄不能成為自己的母目錄!"
 
@@ -192,5 +179,14 @@ msgstr "替代項目"
 #~ msgid "The directory name must be unique !"
 #~ msgstr "目錄名不能重覆！"
 
+#, python-format
+#~ msgid ""
+#~ "Please install PyWebDAV from "
+#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/"
+#~ msgstr ""
+#~ "從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+#~ "0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
+
 #~ msgid "Directory must have a parent or a storage"
 #~ msgstr "目錄必須要有母目錄或儲存室"
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
index b375d0c4aa6..18419ef120e 100644
--- a/addons/edi/i18n/ar.po
+++ b/addons/edi/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:47+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/de.po b/addons/edi/i18n/de.po
index 320aeb5a9bc..0cddedeefad 100644
--- a/addons/edi/i18n/de.po
+++ b/addons/edi/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-16 08:48+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/es.po b/addons/edi/i18n/es.po
index ddc67791586..1bac318ad7c 100644
--- a/addons/edi/i18n/es.po
+++ b/addons/edi/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 11:14+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/es_CR.po b/addons/edi/i18n/es_CR.po
index d76fcb6b5e0..3d6d11c0221 100644
--- a/addons/edi/i18n/es_CR.po
+++ b/addons/edi/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 20:56+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/fi.po b/addons/edi/i18n/fi.po
index 961aa23a90a..2f92965b494 100644
--- a/addons/edi/i18n/fi.po
+++ b/addons/edi/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 10:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/fr.po b/addons/edi/i18n/fr.po
index e641fd8fa46..f8fb986d3df 100644
--- a/addons/edi/i18n/fr.po
+++ b/addons/edi/i18n/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:20+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
diff --git a/addons/edi/i18n/hr.po b/addons/edi/i18n/hr.po
index be940c5e295..6844c0987ac 100644
--- a/addons/edi/i18n/hr.po
+++ b/addons/edi/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:08+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/it.po b/addons/edi/i18n/it.po
index 5eac42d6af0..b0ea030dc7e 100644
--- a/addons/edi/i18n/it.po
+++ b/addons/edi/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 14:01+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/ja.po b/addons/edi/i18n/ja.po
index 030725138f6..3e3fb924c5c 100644
--- a/addons/edi/i18n/ja.po
+++ b/addons/edi/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-20 23:50+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/mn.po b/addons/edi/i18n/mn.po
index 24be5c5c8d5..b01708f5136 100644
--- a/addons/edi/i18n/mn.po
+++ b/addons/edi/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-19 17:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/nb.po b/addons/edi/i18n/nb.po
index 79767052c96..ccc15d2bf05 100644
--- a/addons/edi/i18n/nb.po
+++ b/addons/edi/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-08 19:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/nl.po b/addons/edi/i18n/nl.po
index 1a884263ad3..6b11717d26f 100644
--- a/addons/edi/i18n/nl.po
+++ b/addons/edi/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 13:07+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/nl_BE.po b/addons/edi/i18n/nl_BE.po
index 10a55f27447..ee702cd86d4 100644
--- a/addons/edi/i18n/nl_BE.po
+++ b/addons/edi/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-02 08:10+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/pl.po b/addons/edi/i18n/pl.po
index 1b51665b775..2cb3b1e91b7 100644
--- a/addons/edi/i18n/pl.po
+++ b/addons/edi/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 15:13+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/pt.po b/addons/edi/i18n/pt.po
index e3a42830c3e..486c974b7e1 100644
--- a/addons/edi/i18n/pt.po
+++ b/addons/edi/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 14:11+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/pt_BR.po b/addons/edi/i18n/pt_BR.po
index c38e7832eac..409938f3435 100644
--- a/addons/edi/i18n/pt_BR.po
+++ b/addons/edi/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 00:39+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/ro.po b/addons/edi/i18n/ro.po
index b4eb2cdb2ca..4f00465594a 100644
--- a/addons/edi/i18n/ro.po
+++ b/addons/edi/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-15 17:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/ru.po b/addons/edi/i18n/ru.po
index cd1465881e3..6e848a5f977 100644
--- a/addons/edi/i18n/ru.po
+++ b/addons/edi/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 15:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/sv.po b/addons/edi/i18n/sv.po
index 341cb9db3ec..64e0d5527ca 100644
--- a/addons/edi/i18n/sv.po
+++ b/addons/edi/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 10:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po
index 9128ce29e1e..9ec8b3842a9 100644
--- a/addons/edi/i18n/tr.po
+++ b/addons/edi/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 22:29+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po
index b544c035e14..798031686dc 100644
--- a/addons/edi/i18n/zh_CN.po
+++ b/addons/edi/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:46+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/edi/i18n/zh_TW.po b/addons/edi/i18n/zh_TW.po
index 4265e93a11a..033c5af8203 100644
--- a/addons/edi/i18n/zh_TW.po
+++ b/addons/edi/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 11:51+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
diff --git a/addons/email_template/i18n/ar.po b/addons/email_template/i18n/ar.po
index 9b0be178e4b..07184e21840 100644
--- a/addons/email_template/i18n/ar.po
+++ b/addons/email_template/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-07 22:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -116,7 +116,7 @@ msgid "Body"
 msgstr "النص"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -391,7 +391,7 @@ msgid "Attachments"
 msgstr "مرفقات"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "فشل في حذف سجل التأثير"
@@ -420,7 +420,7 @@ msgid "Email Details"
 msgstr "تفاصيل الرسالة"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "ارسل بريد (%s)"
@@ -456,7 +456,7 @@ msgstr ""
 "المستند المستلم (نمط-فرعي)"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "تحذير"
diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po
index 5aee6d35ac0..cf7c0e64640 100644
--- a/addons/email_template/i18n/bg.po
+++ b/addons/email_template/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-14 16:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "Тяло"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr "Прикачени файлове"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Предупреждение"
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index a25ea6f725e..1fccb8dc7d8 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 21:33+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "Missatge"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr "Adjunts"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Envia mail (%s)"
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Avís"
diff --git a/addons/email_template/i18n/da.po b/addons/email_template/i18n/da.po
index 04eb61b68fc..627a9d155d7 100644
--- a/addons/email_template/i18n/da.po
+++ b/addons/email_template/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr ""
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 64349fd3135..20274e3b2f2 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 10:57+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -116,7 +116,7 @@ msgid "Body"
 msgstr "Hauptteil"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copy)"
@@ -401,7 +401,7 @@ msgid "Attachments"
 msgstr "Anhänge"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Das Löschen des Datensatzes schlug fehl."
@@ -430,7 +430,7 @@ msgid "Email Details"
 msgstr "E-mail Details"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Versende Mail (%s)"
@@ -467,7 +467,7 @@ msgstr ""
 "Zielfeld der Relation auswählen (sub-model)"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Warnung"
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 2bdcafeddd7..de9d6a86c9f 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 19:59+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -118,7 +118,7 @@ msgid "Body"
 msgstr "Cuerpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copiar)"
@@ -411,7 +411,7 @@ msgid "Attachments"
 msgstr "Adjuntos"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Borrado del registro de la acción fallido"
@@ -440,7 +440,7 @@ msgid "Email Details"
 msgstr "Detalles del email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar mail (%s)"
@@ -479,7 +479,7 @@ msgstr ""
 "modelo)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po
index 60b3d169e24..642618d37a0 100644
--- a/addons/email_template/i18n/es_CL.po
+++ b/addons/email_template/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-20 03:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "¡Atención!"
diff --git a/addons/email_template/i18n/es_CR.po b/addons/email_template/i18n/es_CR.po
index fe147f72740..0fca55f41eb 100644
--- a/addons/email_template/i18n/es_CR.po
+++ b/addons/email_template/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 21:23+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: email_template
@@ -119,7 +119,7 @@ msgid "Body"
 msgstr "Cuerpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Attachments"
 msgstr "Adjuntos"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Eliminación del registro de la acción fracasó."
@@ -437,7 +437,7 @@ msgid "Email Details"
 msgstr "Detalles del email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar mail (%s)"
@@ -475,7 +475,7 @@ msgstr ""
 "destino (sub-modelo)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po
index 6f8dc10e279..12641e3077a 100644
--- a/addons/email_template/i18n/es_EC.po
+++ b/addons/email_template/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-27 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr ""
diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po
index ebc058f8764..af45659f388 100644
--- a/addons/email_template/i18n/et.po
+++ b/addons/email_template/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-11 18:04+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "Sisu"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Hoiatus"
diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po
index 1b9020ac28b..5de5480cebd 100644
--- a/addons/email_template/i18n/fi.po
+++ b/addons/email_template/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-08 10:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -115,7 +115,7 @@ msgid "Body"
 msgstr "Sisältö"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -381,7 +381,7 @@ msgid "Attachments"
 msgstr "Liitteet"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Toimintotietueen poisto epäonnistui"
@@ -410,7 +410,7 @@ msgid "Email Details"
 msgstr "Sähköpostin yksityiskohdat"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Lähetä sähköposti (%s)"
@@ -443,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Varoitus"
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index 2685265d747..f3a25914105 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:15+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
@@ -116,7 +116,7 @@ msgid "Body"
 msgstr "Corps"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -401,7 +401,7 @@ msgid "Attachments"
 msgstr "Pièces jointes"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "La suppression de l'action a échoué."
@@ -430,7 +430,7 @@ msgid "Email Details"
 msgstr "Détails des courriels"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Envoyer le courriel (%s)"
@@ -467,7 +467,7 @@ msgstr ""
 "destination (sous-modèle)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Attention"
diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po
index 75f85d3b996..2e9204edf89 100644
--- a/addons/email_template/i18n/hr.po
+++ b/addons/email_template/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 17:08+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "Sadržaj"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index e0677b2827d..1bd66d45e91 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 15:51+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -112,7 +112,7 @@ msgid "Body"
 msgstr "Levéltörzs"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -378,7 +378,7 @@ msgid "Attachments"
 msgstr "Mellékletek"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -407,7 +407,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Levél küldése (%s)"
@@ -439,7 +439,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index b171e1f8080..394dc625db6 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 14:31+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -402,7 +402,7 @@ msgid "Attachments"
 msgstr "Allegati"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Eliminazione dell'azione fallita."
@@ -431,7 +431,7 @@ msgid "Email Details"
 msgstr "Dettagli email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Invio Email (%s)"
@@ -469,7 +469,7 @@ msgstr ""
 "selezionare un campo del model del documento destinazione (sotto-modello)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Attenzione"
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index 48563abf0f4..e6d91b1edfa 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-25 04:53+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -385,7 +385,7 @@ msgid "Attachments"
 msgstr "添付"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "活動レコードを削除できません。"
@@ -414,7 +414,7 @@ msgid "Email Details"
 msgstr "Eメールの詳細"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Eメールを送信する (%s)"
@@ -446,7 +446,7 @@ msgid ""
 msgstr "最初の項目として関係項目を選ぶと、送り先の文書モデル（サブモデル）の中から目標項目を指定することができます。"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "警告"
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index 083e13551bd..95fd65f07f5 100644
--- a/addons/email_template/i18n/mn.po
+++ b/addons/email_template/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 14:03+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"Last-Translator: soyoko <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr "Их бие"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -398,7 +398,7 @@ msgid "Attachments"
 msgstr "Хавсралтууд"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Үйлдлийн бичлэгийг устгах үйлдэл бүтсэнгүй."
@@ -427,7 +427,7 @@ msgid "Email Details"
 msgstr "Имэйл Дэлгэрэнгүй"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Мэйл илгээх (%s)"
@@ -464,7 +464,7 @@ msgstr ""
 "баримтын моделийн зорилто талбарыг сонгох боломжтой."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Анхааруулга"
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index b4f189d4311..73e22652fad 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-06 17:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr "Innhold"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -399,7 +399,7 @@ msgid "Attachments"
 msgstr "Vedlegg"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Sletting av handlingen posten mislyktes."
@@ -428,7 +428,7 @@ msgid "Email Details"
 msgstr "E-post detaljer."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Send e-post(%s)"
@@ -464,7 +464,7 @@ msgstr ""
 "målet feltet innen måldokumentet modellen (sub-modell)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Advarsel"
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index 930a5f2a747..a23b65e6ce1 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 18:28+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -118,7 +118,7 @@ msgid "Body"
 msgstr "Berichttekst"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -405,7 +405,7 @@ msgid "Attachments"
 msgstr "Bijlagen"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Verwijderen van de actieregel is mislukt."
@@ -434,7 +434,7 @@ msgid "Email Details"
 msgstr "E-maildetails"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Verstuur mail (%s)"
@@ -471,7 +471,7 @@ msgstr ""
 "doelveld selecteren binnen de bestemming document model (sub-model)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Waarschuwing"
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index 414643d468d..5af86a71c13 100644
--- a/addons/email_template/i18n/pl.po
+++ b/addons/email_template/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 19:11+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -116,7 +116,7 @@ msgid "Body"
 msgstr "Treść"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -395,7 +395,7 @@ msgid "Attachments"
 msgstr "Załączniki"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Usunięcie rekordu akcji nie udało się."
@@ -424,7 +424,7 @@ msgid "Email Details"
 msgstr "Szczegóły e-mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Wyślij wiadomość (%s)"
@@ -460,7 +460,7 @@ msgstr ""
 "pole docelowe w docelowym modelu (podmodelu)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index 5ea535be755..8d2def4810b 100644
--- a/addons/email_template/i18n/pt.po
+++ b/addons/email_template/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:55+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -403,7 +403,7 @@ msgid "Attachments"
 msgstr "Anexos"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Exclusão do registo da ação falhou."
@@ -432,7 +432,7 @@ msgid "Email Details"
 msgstr "Detalhes da mensagem"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar o correio (%s)"
@@ -470,7 +470,7 @@ msgstr ""
 "de destino (sub-modelo)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index c55e378dab7..1af234e2651 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 17:45+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
@@ -118,7 +118,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -405,7 +405,7 @@ msgid "Attachments"
 msgstr "Anexos"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Falha ao excluir o registro"
@@ -434,7 +434,7 @@ msgid "Email Details"
 msgstr "Detalhes do Email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar Email (%s)"
@@ -472,7 +472,7 @@ msgstr ""
 "modelo)"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index 8a67f75a312..bc012bdc3d4 100644
--- a/addons/email_template/i18n/ro.po
+++ b/addons/email_template/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 09:05+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr "Conţinut"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -403,7 +403,7 @@ msgid "Attachments"
 msgstr "Atasamente"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Stergerea inregistrarii actiunii a esuat."
@@ -432,7 +432,7 @@ msgid "Email Details"
 msgstr "Detalii e-mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Trimite email (%s)"
@@ -470,7 +470,7 @@ msgstr ""
 "destinatie (sub-model)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Atentionare"
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 15119c7d98c..ad3f698a9a5 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-05 11:59+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr "Тело"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -402,7 +402,7 @@ msgid "Attachments"
 msgstr "Вложения"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Удаление действия не удалось."
@@ -431,7 +431,7 @@ msgid "Email Details"
 msgstr "Подробности письма"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Отправить почту (%s)"
@@ -467,7 +467,7 @@ msgstr ""
 "поля в пределах модели целевого документа (под-модели)."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Предупреждение"
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index 264f1689e82..4f241201bfb 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-03 07:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "Sadrzaj"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr "Prilozi"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Slanje POruke (%s)"
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index 257486f5ffa..88132fe7ad5 100644
--- a/addons/email_template/i18n/sr@latin.po
+++ b/addons/email_template/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-24 13:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "Sadrzaj"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -379,7 +379,7 @@ msgid "Attachments"
 msgstr "Prilozi"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Email Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Slanje POruke (%s)"
@@ -440,7 +440,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 8b82a74de71..1a88ce9e97e 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-01 23:20+0000\n"
 "Last-Translator: Stefan Lind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -117,7 +117,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Attachments"
 msgstr "Bilagor"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Radering av åtgärdsposten misslyckades."
@@ -425,7 +425,7 @@ msgid "Email Details"
 msgstr "E-postdetaljer"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Skicka e-post (%s)"
@@ -462,7 +462,7 @@ msgstr ""
 "i destinationsobjetet (sub-model)"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Varning"
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 60397fb23d2..9c283c07a26 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:31+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -116,7 +116,7 @@ msgid "Body"
 msgstr "Gövde"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +394,7 @@ msgid "Attachments"
 msgstr "Ekler"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "Eylem kaydının silinemedi."
@@ -423,7 +423,7 @@ msgid "Email Details"
 msgstr "E-posta Ayrıntıları"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "İletiyi Gönder (%s)"
@@ -459,7 +459,7 @@ msgstr ""
 "hedef alanını seçmenizi sağlar."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "Uyarı"
diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po
index 52f94de73b9..1a518e5aa44 100644
--- a/addons/email_template/i18n/zh_CN.po
+++ b/addons/email_template/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:31+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr "内容"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -385,7 +385,7 @@ msgid "Attachments"
 msgstr "附件"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "删除动作记录失败"
@@ -414,7 +414,7 @@ msgid "Email Details"
 msgstr "邮件详情"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "发送邮件（ %s）"
@@ -446,7 +446,7 @@ msgid ""
 msgstr "如果首先选择了一个关系型字段，这个字段可用于选择目标单据类型的目标字段。"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "警告"
diff --git a/addons/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
index 4be71d3d66f..d2c0934447a 100644
--- a/addons/email_template/i18n/zh_TW.po
+++ b/addons/email_template/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 10:19+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -113,7 +113,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -386,7 +386,7 @@ msgid "Attachments"
 msgstr "附件"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
 msgstr "刪除的動作記錄失敗"
@@ -415,7 +415,7 @@ msgid "Email Details"
 msgstr "郵件詳情"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "傳送郵件 (%s)"
@@ -447,7 +447,7 @@ msgid ""
 msgstr "當相關欄位已被選擇為第一欄位, 這欄位，讓您選擇目標欄位內的目標文件類型（子類型型）。"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Warning"
 msgstr "警告"
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
index b95375a51ac..e101701e3f7 100644
--- a/addons/event/i18n/ar.po
+++ b/addons/event/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-12 20:40+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "تاريخ التسجيل"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "التسجيلات"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "أوبرا فيردي"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "مايو"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "شريك"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "بريد إلكتروني"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "عدد المشاريع"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "إلغي المشروع"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "سبتمبر"
 msgid "December"
 msgstr "ديسمبر"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "تاريخ البدء"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "المستخدم المسؤول"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "احداث في المقاطعة الجديدة"
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,33 +753,24 @@ msgid "My Registrations"
 msgstr "تسجيلاتي"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "نوفمبر"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "أكتوبر"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "يناير"
 
 #. module: event
 #: view:event.event:0
@@ -834,12 +779,13 @@ msgstr "وضع كمسودة"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "أكد التسجيل"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "خطأ ! لايمكن وضع تاريخ الغلق قبل تاريخ الابتداء."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "المستخدم المسؤول"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr "مكبر صوت"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,10 +941,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "مايو"
 
 #. module: event
 #: view:res.partner:0
@@ -1025,16 +955,6 @@ msgstr "اشتراك الأحداث"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "يناير"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr "الاسم"
 msgid "Country"
 msgstr "دولة"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "نوفمبر"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr "المعرّف"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "اشترك"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,9 +1092,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "اشترك"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
index c939782c7e9..38220ed4bda 100644
--- a/addons/event/i18n/bg.po
+++ b/addons/event/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:12+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Дата на регистрация"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Регистрации"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Грешка!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Опера на Верди"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Май"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Партньор"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "Имейл"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Брой събития"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Spreker welke een toespraak zal geven tijdens het evenement"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Отказ на събитие"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Септември"
 msgid "December"
 msgstr "Декември"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Начална дата"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Отговорен потребител"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "Gebeurtenissen met status 'Nieuw'"
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Моите регистрации"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Ноември"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Октомври"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Януари"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Изпратено в проект"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Потвърждаване на регистрация"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -897,16 +838,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Грешка! Крайната дата е преди началнта."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Отговорен потребител"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -929,7 +865,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -979,12 +915,6 @@ msgstr "Оратор"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -992,6 +922,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1011,10 +942,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Май"
 
 #. module: event
 #: view:res.partner:0
@@ -1026,16 +956,6 @@ msgstr "Регистрация за събитие"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Януари"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1076,11 +996,6 @@ msgstr "Име"
 msgid "Country"
 msgstr "Държава"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Ноември"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1133,12 +1048,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Записване"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1184,9 +1093,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Записване"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
index 753ef971b2e..89d87d6d94d 100644
--- a/addons/event/i18n/bs.po
+++ b/addons/event/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
index 84927e317ee..0715e03460f 100644
--- a/addons/event/i18n/ca.po
+++ b/addons/event/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 08:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Data del registre"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Registres"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Òpera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maig"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Avís!"
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Correu electrònic"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Número d'esdeveniments"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancel·la esdeveniment"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Setembre"
 msgid "December"
 msgstr "Desembre"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Data d'inici"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Usuari responsable"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Els meus registres"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtres estesos..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Octubre"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Gener"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Estableix en esborrany"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmació registre"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Error! La data de tancament no pot ser anterior a la d'inici."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Usuari responsable"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Ponent"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maig"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Registre d'esdeveniments"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Gener"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Nom"
 msgid "Country"
 msgstr "País"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembre"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Subscriure"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Subscriure"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
index 1eee911db20..1dd04fe7c1d 100644
--- a/addons/event/i18n/cs.po
+++ b/addons/event/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-25 10:45+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech  <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: event
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Datum registrace"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Registrace"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Chyba!"
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdiho opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Květen"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Počet událostí"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Zrušit událost"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Září"
 msgid "December"
 msgstr "Prosinec"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Počáteční datum"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Odpovědný uživatel"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Moje registrace"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Listopad"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Rozšířené filtry..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Říjen"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Leden"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Nastavit na koncept"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Potvrdit registraci"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Chyba ! Datum uzavření nemůže být nastaven přes datum zahájení."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Odpovědný uživatel"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Řečník"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Květen"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Registrace událostí"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Leden"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Jméno"
 msgid "Country"
 msgstr "Země"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Listopad"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Upsat se"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Upsat se"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
index 06beda747f9..321423d1c0e 100644
--- a/addons/event/i18n/da.po
+++ b/addons/event/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-09 21:21+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maj"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "September"
 msgid "December"
 msgstr "December"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,33 +753,24 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktober"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: event
 #: view:event.event:0
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,10 +941,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maj"
 
 #. module: event
 #: view:res.partner:0
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januar"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr ""
 msgid "Country"
 msgstr "Land"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "November"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index 93c0bc961e6..b3ae7ef4fea 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 07:09+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
@@ -60,22 +60,11 @@ msgstr ""
 "Bei geringer Anzahl Anmeldungen kann die Veranstaltung nicht bestätigt "
 "werden (tragen Sie einfach 0 ein, um diese Regel zu umgehen)"
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr "Veranstaltung wurde <b>abgebrochen</b>."
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Anmeldedatum"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr "Bezeichnung des Auftrags der Vorlage für  Anmeldung ist"
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -123,10 +112,9 @@ msgid "Default Maximum Registration"
 msgstr "Standard maximale Anmeldungen"
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
+#: view:report.event.registration:0
+msgid "Display"
+msgstr "Anzeige"
 
 #. module: event
 #: field:event.event,register_avail:0
@@ -202,9 +190,9 @@ msgid "Registrations"
 msgstr "Anmeldungen"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -239,9 +227,10 @@ msgid "Opera of Verdi"
 msgstr "Verdi Oper"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
-msgstr "Anzeige"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
 
 #. module: event
 #: view:report.event.registration:0
@@ -259,11 +248,6 @@ msgstr "Tickets"
 msgid "False"
 msgstr "Ungültig"
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr "Neue Anmeldungen"
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -280,19 +264,14 @@ msgstr ""
 "Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt "
 "zu werden."
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mai"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Bestätigte oder erledigte Anmeldungen"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -311,9 +290,11 @@ msgid "Partner"
 msgstr "Kunde"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
-msgstr "Veranstaltung: Als gelesen markieren"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
+msgstr ""
+"Die minimale Anzahl der Teilnehmer wird  als Standard bei der Auswahl der "
+"Veranstaltung hinterlegt"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -411,7 +392,7 @@ msgid "Email"
 msgstr "EMail"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr "Neue Anmeldebestätigung: %s"
@@ -479,28 +460,11 @@ msgstr "Anzahl Veranstaltungen"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Referent der Veranstaltung"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr "Anmeldung wurde <b>erstellt</b>."
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Veranstaltung stornieren"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr "Status geändert auf erledigt"
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr "Anmeldung zu Veranstaltung: Markiere als gelesen"
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -548,6 +512,11 @@ msgstr "September"
 msgid "December"
 msgstr "Dezember"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -595,19 +564,13 @@ msgstr "Beginn am"
 msgid "or"
 msgstr "oder"
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr "Veranstaltung wurde <b>beendet</b>."
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr "Aktivieren Sie dieses Feld, wenn der Kontakt ein Referent ist"
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr "Keine Tickets verfügbar !"
@@ -663,13 +626,12 @@ msgstr ""
 "ignorieren)."
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr "Die Anmeldung ist erfasst als <b>Entwurf</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Manager Veranstaltung"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -710,12 +672,6 @@ msgstr "Neue Veranstaltungen"
 msgid "Events which are in New state"
 msgstr "Neue Veranstaltungen"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr "Status geändert zu Abgebrochen"
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -847,33 +803,24 @@ msgid "My Registrations"
 msgstr "Meine Anmeldungen"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr "Die Veranstaltung wurde geändert auf <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktober"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr "Veranstaltung Anmeldung: Markiere als ungelesen"
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: event
 #: view:event.event:0
@@ -882,12 +829,13 @@ msgstr "Setze auf Entwurf"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Bestätige Anmeldung"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -912,12 +860,6 @@ msgstr "EMail Konfiguration"
 msgid "Default Minimum Registration"
 msgstr "Standard Mindestanzahl Anmeldungen"
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr "Anmeldung bestätigt"
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -940,6 +882,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr "An Veranstaltung teilgenommen"
 
@@ -949,17 +892,12 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Fehler ! Ende der Veranstaltung kann nicht vor Beginn sein."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 "Sie müssen für diese Aktion bis zum Start Datum der Veranstaltung warten."
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Manager Veranstaltung"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -982,7 +920,7 @@ msgid "Reply-to Email"
 msgstr "Antwort An EMail"
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr "Nur %d Teilnahmeplätze sind verfügbar !"
@@ -1032,12 +970,6 @@ msgstr "Referent"
 msgid "Upcoming events from today"
 msgstr "Zukünftige Veranstaltungen ab heute"
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr "Veranstaltung wurde <b>erstellt</b>."
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -1045,6 +977,7 @@ msgstr "ERP Konferenz"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr "Neue Anmeldung"
 
@@ -1064,10 +997,9 @@ msgid "Participant / Contact Name"
 msgstr "Teilnehmer / Kontakt Name"
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr "Veranstaltung wurde <b>bestätigt</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mai"
 
 #. module: event
 #: view:res.partner:0
@@ -1079,18 +1011,6 @@ msgstr "Anmeldung Veranstaltung"
 msgid "No ticket available."
 msgstr "Kein Ticket vorhanden"
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-"Die minimale Anzahl der Teilnehmer wird  als Standard bei der Auswahl der "
-"Veranstaltung hinterlegt"
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januar"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1131,11 +1051,6 @@ msgstr "Bezeichnung"
 msgid "Country"
 msgstr "Land"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "November"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1190,12 +1105,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr "Standard Antwort An Adresse"
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Abonnieren"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1255,9 +1164,10 @@ msgstr ""
 "Gateway verwenden möchten."
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr "Veranstaltung: Markiere als ungelesen"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Abonnieren"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/el.po b/addons/event/i18n/el.po
index 627ef1099b0..c07edc68d95 100644
--- a/addons/event/i18n/el.po
+++ b/addons/event/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-28 19:46+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,9 +753,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -809,22 +762,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,9 +941,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index 30ed8623ad7..f4521ba19ff 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-12 11:47+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:06+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:42+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -60,22 +60,11 @@ msgstr ""
 "las inscripciones suficientes no podrá confirmar su evento. (Ponga 0 para "
 "ignorar esta regla)"
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr "El evento ha sido  <b>cancelado</b>."
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Fecha de registro"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr "Nombre dle pedido de venta que creó el registro"
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -123,10 +112,9 @@ msgid "Default Maximum Registration"
 msgstr "Registro máximo por defecto"
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Si se marca, los nuevos mensajes requieren su atención"
+#: view:report.event.registration:0
+msgid "Display"
+msgstr "Mostrar"
 
 #. module: event
 #: field:event.event,register_avail:0
@@ -201,9 +189,9 @@ msgid "Registrations"
 msgstr "Registros"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -238,9 +226,10 @@ msgid "Opera of Verdi"
 msgstr "Ópera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
-msgstr "Mostrar"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Si se marca, los nuevos mensajes requieren su atención"
 
 #. module: event
 #: view:report.event.registration:0
@@ -258,11 +247,6 @@ msgstr "Tickets"
 msgid "False"
 msgstr "Falso"
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr "Nuevos registros"
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -278,19 +262,14 @@ msgstr ""
 "Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mayo"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Inscripciones en estado 'Confirmada' o 'Realizada'"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -309,9 +288,9 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
-msgstr "Eventos: marcar leido"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
+msgstr "Seleccionará este valor mínimo por defecto cuando escoja este evento"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -409,7 +388,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr "Nuevo registro confirmado: %s."
@@ -477,28 +456,11 @@ msgstr "Número de eventos"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Ponente que dará la charla en el evento"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr "El registro ha sido  <b>creado</b>."
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancelar evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr "Estado establecido a Realizado"
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr "Registro de evneto: Marcar leído"
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -546,6 +508,11 @@ msgstr "Setiembre"
 msgid "December"
 msgstr "Diciembre"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr "Referencia del pedido de venta que creó la inscripción"
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -593,19 +560,13 @@ msgstr "Fecha inicial"
 msgid "or"
 msgstr "o"
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr "El evento ha sido  <b>realizado</b>."
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr "Haga click si este contacto es un interlocutor."
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr "No hay tickets disponibles"
@@ -657,13 +618,12 @@ msgstr ""
 "registro, no podrá confirmar su evento. (Ponga 0 para ignorar esta regla)"
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr "El registro ha sido establecido a  <b>borrador</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -704,12 +664,6 @@ msgstr "Eventos en estado 'Nuevo'"
 msgid "Events which are in New state"
 msgstr "Eventos que están en estado 'Nuevo'"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr "Estado establecido a cancelado"
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -840,33 +794,24 @@ msgid "My Registrations"
 msgstr "Mis registros"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr "El evento ha sido establecido a  <b>borrador</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Noviembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Octubre"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr "Registro de eventos: Marcar sin leer"
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Enero"
 
 #. module: event
 #: view:event.event:0
@@ -875,12 +820,13 @@ msgstr "Establecer en borrador"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmación registro"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -904,12 +850,6 @@ msgstr "Configuración de correo electronico"
 msgid "Default Minimum Registration"
 msgstr "Mínimo registros por defecto"
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr "Registro confirmado"
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -932,6 +872,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr "Asistir al evento"
 
@@ -941,16 +882,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "¡Error! La fecha de cierre no puede ser anterior a la de inicio."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr "Debe esperar al día de inicio del evento para realizar esta acción."
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Usuario responsable"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -973,7 +909,7 @@ msgid "Reply-to Email"
 msgstr "Dirección de respuesta"
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr "Solo hay disponibles %d plazas"
@@ -1023,12 +959,6 @@ msgstr "Ponente"
 msgid "Upcoming events from today"
 msgstr "Siguientes eventos desde hoy"
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr "El evento ha sido   <b>creado</b>."
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -1036,6 +966,7 @@ msgstr "Conferencia sobre negocio ERP"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr "Nuevo registro"
 
@@ -1055,10 +986,9 @@ msgid "Participant / Contact Name"
 msgstr "Nombre participante / contacto"
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr "El evento ha sido  <b>confirmado</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mayo"
 
 #. module: event
 #: view:res.partner:0
@@ -1070,16 +1000,6 @@ msgstr "Registro de eventos"
 msgid "No ticket available."
 msgstr "No hay tickets disponibles"
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr "Seleccionará este valor mínimo por defecto cuando escoja este evento"
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Enero"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1120,11 +1040,6 @@ msgstr "Nombre"
 msgid "Country"
 msgstr "País"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Noviembre"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1178,12 +1093,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr "Dirección de respuesta por defecto"
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Suscribir"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1242,9 +1151,10 @@ msgstr ""
 "también la dirección de su pasarela de correo si usa una."
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr "Evento: Marcar no leído"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Suscribir"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
index ad8e28de0ec..a3dd3f240f2 100644
--- a/addons/event/i18n/es_AR.po
+++ b/addons/event/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-22 18:33+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Registros"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Ópera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Número de eventos"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancelar evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr "Establecer como borrador"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmación registro"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "Nombre"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/es_CR.po b/addons/event/i18n/es_CR.po
index 28bae3fb8bd..cea998b2ca6 100644
--- a/addons/event/i18n/es_CR.po
+++ b/addons/event/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 21:38+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: event
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Fecha de registro"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Registros"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Ópera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mayo"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Inscripciones en el estado confirmado o listas"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Número de eventos"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Expositor que va a dar discurso en el evento."
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancelar evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Setiembre"
 msgid "December"
 msgstr "Diciembre"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Fecha inicial"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr "Eventos en estado de Nuevo"
 msgid "Events which are in New state"
 msgstr "Eventos que se encuentran en el estado de Nueva"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Mis registros"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Noviembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Octubre"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Enero"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Establecer en borrador"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmación registro"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "¡Error! La fecha de cierre no puede ser anterior a la de inicio."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Usuario responsable"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Ponente"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mayo"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Registro de eventos"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Enero"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Nombre"
 msgid "Country"
 msgstr "País"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Noviembre"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Suscribir"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Suscribir"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/es_EC.po b/addons/event/i18n/es_EC.po
index bc9a6db29cc..6179c9bcf1f 100644
--- a/addons/event/i18n/es_EC.po
+++ b/addons/event/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-17 19:10+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Registros"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Ópera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Número de eventos"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancelar evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr "Establecer en borrador"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmación registro"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "Nombre"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index 4433a3da549..957b24b583b 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:13+0000\n"
 "Last-Translator: lyyser <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Registreerimised"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Viga!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Verdi ooper"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Sündmuste arv"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Loobu sündmusest"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr "Sea mustandiks"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Kinnita registreerimine"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "Nimi"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
index e109728501b..7c522cdebea 100644
--- a/addons/event/i18n/fi.po
+++ b/addons/event/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-17 09:06+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Ilmottautumispäivä"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Rekisteröinnit"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdin ooppera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Toukokuu"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Ilmoittautumiset jotka ovat vahvistettu tai valmis tilassa"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Sähköposti"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Tapahtumien lukumäärä"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Tilaisuuden puhuja"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Peruuta tapahtuma"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Syyskuu"
 msgid "December"
 msgstr "Joulukuu"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Aloituspvm"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Vastuukäyttäjä"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr "Tapahtumat jotka ovat 'uusi' tilassa"
 msgid "Events which are in New state"
 msgstr "Tapahtumat jotka ovat 'üusi' tilassa"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Omat osallistumiset"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Marraskuu"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Lokakuu"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Tammikuu"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Aseta luonnokseksi"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Vahvista rekisteröinti"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Virhe ! Päättymispäivä ei voi olla aikaisempi kuin alkupäivä"
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Vastuukäyttäjä"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Puhuja"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Toukokuu"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Tapahtumiin ilmoittautuminen"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Tammikuu"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Nimi"
 msgid "Country"
 msgstr "Maa"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Marraskuu"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr "TUNNISTE (ID)"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Tilaa"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Tilaa"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index b1eed54571d..eab95706d1d 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-19 15:51+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 14:28+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
@@ -26,12 +25,12 @@ msgstr "Mes évènements"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Participants"
-msgstr ""
+msgstr "Nombre de participants"
 
 #. module: event
 #: field:event.event,register_attended:0
 msgid "# of Participations"
-msgstr ""
+msgstr "# de participation"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -58,26 +57,15 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Date d'inscription"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
-msgstr ""
+msgstr "Type d'evenement"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -99,7 +87,7 @@ msgstr "Mars"
 #. module: event
 #: view:event.registration:0
 msgid "Send Email"
-msgstr ""
+msgstr "Envoyer un courriel"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -113,23 +101,22 @@ msgstr "Société"
 #: field:event.event,email_confirmation_id:0
 #: field:event.type,default_email_event:0
 msgid "Event Confirmation Email"
-msgstr ""
+msgstr "Email de confirmation de l'evenement"
 
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "Nombre maximum d'inscription par défaut"
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
+#: view:report.event.registration:0
+msgid "Display"
+msgstr "Afficher"
 
 #. module: event
 #: field:event.event,register_avail:0
 msgid "Available Registrations"
-msgstr ""
+msgstr "Inscriptions disponible"
 
 #. module: event
 #: view:event.registration:0
@@ -140,12 +127,12 @@ msgstr "Inscription de l'Évenement"
 #. module: event
 #: model:ir.module.category,description:event.module_category_event_management
 msgid "Helps you manage your Events."
-msgstr ""
+msgstr "Vous aide à gérer vos évenements"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: event
 #: view:report.event.registration:0
@@ -179,7 +166,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id_registration:0
 msgid "Register"
-msgstr ""
+msgstr "S'inscrire"
 
 #. module: event
 #: field:event.event,message_ids:0
@@ -198,9 +185,9 @@ msgid "Registrations"
 msgstr "Inscriptions"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Erreur!"
@@ -227,7 +214,7 @@ msgstr "Annulée"
 #. module: event
 #: view:event.event:0
 msgid "ticket"
-msgstr ""
+msgstr "Ticket"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -235,35 +222,31 @@ msgid "Opera of Verdi"
 msgstr "Opéra de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
-msgstr ""
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Si cochée, de nouveau messages requierent votre attention"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,registration_state:0
 msgid "Registration State"
-msgstr ""
+msgstr "Etat d'inscription"
 
 #. module: event
 #: view:event.event:0
 msgid "tickets"
-msgstr ""
+msgstr "Tickets"
 
 #. module: event
 #: view:res.partner:0
 msgid "False"
-msgstr ""
-
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
+msgstr "Faux"
 
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Date de fin d'évènement"
 
 #. module: event
 #: help:event.event,message_summary:0
@@ -272,11 +255,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mai"
+"Gère l'historique de \"Chatter\" (nombre de messages, ...). Cet historique "
+"est au format HTML pour permettre son utilisation dans la vue kanban"
 
 #. module: event
 #: view:report.event.registration:0
@@ -284,11 +264,11 @@ msgid "Registrations in confirmed or done state"
 msgstr "Inscriptions en statut confirmé ou terminé"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement!"
 
 #. module: event
 #: view:event.event:0
@@ -304,8 +284,8 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -336,7 +316,7 @@ msgstr "Confirmé"
 #. module: event
 #: view:event.registration:0
 msgid "Participant"
-msgstr ""
+msgstr "Participant(e)"
 
 #. module: event
 #: view:event.registration:0
@@ -347,12 +327,12 @@ msgstr "Confirmer"
 #. module: event
 #: view:event.event:0
 msgid "Organized by"
-msgstr ""
+msgstr "Organisé par"
 
 #. module: event
 #: view:event.event:0
 msgid "Register with this event"
-msgstr ""
+msgstr "S'inscrire à cet évenement"
 
 #. module: event
 #: help:event.type,default_email_registration:0
@@ -360,17 +340,19 @@ msgid ""
 "It will select this default confirmation registration mail value when you "
 "choose this event"
 msgstr ""
+"Identifie le mail de confirmation envoyé par défaut lorsque vous choisissez "
+"cet évenement"
 
 #. module: event
 #: view:event.event:0
 msgid "Only"
-msgstr ""
+msgstr "Uniquement"
 
 #. module: event
 #: field:event.event,message_follower_ids:0
 #: field:event.registration,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Abonnés"
 
 #. module: event
 #: view:event.event:0
@@ -383,7 +365,7 @@ msgstr "Lieu"
 #: view:event.registration:0
 #: field:event.registration,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Messages non-lus"
 
 #. module: event
 #: view:event.registration:0
@@ -402,15 +384,15 @@ msgid "Email"
 msgstr "Courriel"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
-msgstr ""
+msgstr "Nouvelle inscription confirmée: %s."
 
 #. module: event
 #: view:event.event:0
 msgid "Upcoming"
-msgstr ""
+msgstr "A venir"
 
 #. module: event
 #: field:event.registration,create_date:0
@@ -421,7 +403,7 @@ msgstr "Date de création"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Event Responsible"
-msgstr ""
+msgstr "Responsable de l'évenement"
 
 #. module: event
 #: view:event.event:0
@@ -438,7 +420,7 @@ msgstr "Juillet"
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To Email"
-msgstr ""
+msgstr "Email de réponse"
 
 #. module: event
 #: view:event.registration:0
@@ -448,7 +430,7 @@ msgstr "Inscriptions confirmées"
 #. module: event
 #: view:event.event:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: event
 #: view:event.event:0
@@ -470,28 +452,11 @@ msgstr "Nombre d'évènements"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Intervenants à l'événement"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Annuler l'évènement"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -501,7 +466,7 @@ msgstr "État de réservation des événements"
 #. module: event
 #: view:event.event:0
 msgid "Event Category"
-msgstr ""
+msgstr "Catégorie d'évenement"
 
 #. module: event
 #: field:event.event,register_prospect:0
@@ -517,7 +482,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,event_state:0
 msgid "Event State"
-msgstr ""
+msgstr "Etat de l'évenement"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -539,6 +504,11 @@ msgstr "Septembre"
 msgid "December"
 msgstr "Décembre"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -548,7 +518,7 @@ msgstr " Nombre d'inscrption en brouillon"
 #: field:event.event,email_registration_id:0
 #: field:event.type,default_email_registration:0
 msgid "Registration Confirmation Email"
-msgstr ""
+msgstr "Email de confirmation de l'évenement."
 
 #. module: event
 #: view:report.event.registration:0
@@ -564,7 +534,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Finish Event"
-msgstr ""
+msgstr "Terminer l'évenement."
 
 #. module: event
 #: view:event.registration:0
@@ -574,7 +544,7 @@ msgstr "Inscriptions en statut non-confirmé"
 #. module: event
 #: view:event.event:0
 msgid "Event Description"
-msgstr ""
+msgstr "Description de l'évènement"
 
 #. module: event
 #: field:event.event,date_begin:0
@@ -584,24 +554,18 @@ msgstr "Date de début"
 #. module: event
 #: view:event.confirm:0
 msgid "or"
-msgstr ""
-
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
+msgstr "ou"
 
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
-msgstr ""
+msgstr "Cocher c'est case sur le contact est un intervenant"
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
-msgstr ""
+msgstr "Plus de tickets disponible!"
 
 #. module: event
 #: help:event.event,state:0
@@ -611,6 +575,11 @@ msgid ""
 "status is set to 'Done'.If event is cancelled the status is set to "
 "'Cancelled'."
 msgstr ""
+"Si l'évenement est créé, le status est positionné à \"Brouillon\". Si "
+"l'évenement est confirmé pour des dates particulières, les status est "
+"positionné à \"Confirmé\". Si l'évenement est dépassé, le status est "
+"positionné à \"Terminé\". Si l'évenement est annulé, le status est "
+"positionné à \"Annulé\""
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -626,6 +595,16 @@ msgid ""
 "             </p>\n"
 "           "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Click to add a new event.\n"
+"             </p><p>\n"
+"              OpenERP vous permet d'organiser et de planifier vos "
+"évenements:\n"
+"              Suivre les inscriptions et la participation, automatiser "
+"l'envoi des emails de confirmation,\n"
+"              vendre des billets/tickets, etc ...\n"
+"             </p>\n"
+"           "
 
 #. module: event
 #: help:event.event,register_max:0
@@ -636,13 +615,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Responsable"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +656,6 @@ msgstr "Événements au stade brouillon"
 msgid "Events which are in New state"
 msgstr "Événements en statut nouveau"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -708,7 +680,7 @@ msgstr "Statut"
 #. module: event
 #: field:event.event,city:0
 msgid "city"
-msgstr ""
+msgstr "Ville"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -718,7 +690,7 @@ msgstr "Août"
 #. module: event
 #: field:event.event,zip:0
 msgid "zip"
-msgstr ""
+msgstr "Code postal"
 
 #. module: event
 #: field:res.partner,event_ids:0
@@ -729,7 +701,7 @@ msgstr "inconnue"
 #. module: event
 #: field:event.event,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Rue (suite)"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -753,7 +725,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Tél."
 
 #. module: event
 #: model:email.template,body_html:event.confirmation_event
@@ -773,13 +745,13 @@ msgstr ""
 #: field:event.event,message_is_follower:0
 #: field:event.registration,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Est un abonné"
 
 #. module: event
 #: field:event.registration,user_id:0
 #: model:res.groups,name:event.group_event_user
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: event
 #: view:event.confirm:0
@@ -801,33 +773,24 @@ msgid "My Registrations"
 msgstr "Mes Inscriptions"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Octobre"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Janvier"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +799,13 @@ msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmer l'inscription"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -856,19 +820,13 @@ msgstr "Date"
 #. module: event
 #: view:event.event:0
 msgid "Email Configuration"
-msgstr ""
+msgstr "Configuration de l'envoi de courriels"
 
 #. module: event
 #: field:event.type,default_registration_min:0
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +847,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -899,16 +858,11 @@ msgstr ""
 "Erreur ! La date de fermeture ne peut pas être inférieure à la date de début."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Responsable"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -931,7 +885,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -951,12 +905,12 @@ msgstr ""
 #: view:event.event:0
 #: field:event.event,is_subscribed:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Abonné"
 
 #. module: event
 #: view:event.event:0
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Se désabonner"
 
 #. module: event
 #: view:event.event:0
@@ -981,12 +935,6 @@ msgstr "Orateur"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -994,6 +942,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1013,10 +962,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mai"
 
 #. module: event
 #: view:res.partner:0
@@ -1028,16 +976,6 @@ msgstr "Inscription aux évènements"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Janvier"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1078,11 +1016,6 @@ msgstr "Nom"
 msgid "Country"
 msgstr "Pays"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembre"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1091,7 +1024,7 @@ msgstr "Clôturer les inscriptions"
 #. module: event
 #: field:event.registration,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Document d'origine"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -1135,16 +1068,10 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "S'inscrire"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
-msgstr ""
+msgstr "disponible"
 
 #. module: event
 #: field:event.registration,event_begin_date:0
@@ -1186,19 +1113,20 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "S'inscrire"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
 msgid "Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: event
 #: field:event.event,street:0
 msgid "Street"
-msgstr ""
+msgstr "Rue"
 
 #. module: event
 #: view:event.confirm:0
diff --git a/addons/event/i18n/gu.po b/addons/event/i18n/gu.po
index 02fa845bfcc..f455a99d90b 100644
--- a/addons/event/i18n/gu.po
+++ b/addons/event/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-15 19:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "મે"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "ઈ-મેઈલ"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "સપ્ટેમ્બર"
 msgid "December"
 msgstr "ડિસેમ્બર"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "શરુઆતની તારીખ"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,33 +753,24 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "નવેમ્બર"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "ઑક્ટોબર"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "જાન્યુઆરી"
 
 #. module: event
 #: view:event.event:0
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr "બોલનાર"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,10 +941,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "મે"
 
 #. module: event
 #: view:res.partner:0
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "જાન્યુઆરી"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr "નામ"
 msgid "Country"
 msgstr "દેશ"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "નવેમ્બર"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr "ઓળખ"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "ઉમેદવારી નોંધાવો"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,9 +1092,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "ઉમેદવારી નોંધાવો"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
index f13cb88d011..7674ca20c3e 100644
--- a/addons/event/i18n/hi.po
+++ b/addons/event/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:14+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdi के ओपेरा"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,9 +753,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -809,22 +762,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,9 +941,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr "नाम"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index 08bfebead65..9676cdecdd4 100644
--- a/addons/event/i18n/hr.po
+++ b/addons/event/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 17:09+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index 028f2f3e1f3..7f00bba4cd2 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 15:08+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Regisztráció idopontja"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Regisztrációk"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Verdi-opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Május"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Rendezvények száma"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Rendezvény törlése"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Szeptember"
 msgid "December"
 msgstr "December"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Kezdő dátum"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Felelős felhasználó"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Regisztációim"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Október"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Január"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Beállítás tervezetnek"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Regisztráció megerősítése"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgstr ""
 "Hiba ! A befejezés időpontja nem lehet előbb mint a kezdés időpontja."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Felelős felhasználó"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Előadó"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Május"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Rendezvények regisztrációja"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Január"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Név"
 msgid "Country"
 msgstr "Ország"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "November"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Feliratkozás"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Feliratkozás"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
index d7ae0a432ba..b3eaa49555d 100644
--- a/addons/event/i18n/id.po
+++ b/addons/event/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 17:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index bda691e39db..f2ded585825 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 20:58+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Data di registrazione"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Registrazioni"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Opera di Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maggio"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Numero degli Eventi"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Annulla Evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Settembre"
 msgid "December"
 msgstr "Dicembre"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Data inizio"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Utente Responsabile"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Le mie registrazioni"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtri estesi..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Ottobre"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Gennaio"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Imposta per Bozza"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Conferma Registrazione"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgstr ""
 "Errore! La data di chiusura non può essere prima di quella dell'apertura."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Utente Responsabile"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Speaker"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maggio"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Registrazione eventi"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Gennaio"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Nome"
 msgid "Country"
 msgstr "Paese"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembre"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Iscriviti"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Iscriviti"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/ja.po b/addons/event/i18n/ja.po
index 3760cea6150..f686184e64e 100644
--- a/addons/event/i18n/ja.po
+++ b/addons/event/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-20 18:20+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "登録日"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "参加者"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdiのオペラ"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "5月"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "確定あるいは終了したイベントの参加者"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "取引先"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Eメール"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "イベントの数"
 msgid "Speaker who will be giving speech at the event."
 msgstr "イベントで講演する講演者"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "イベントをキャンセルする"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "9月"
 msgid "December"
 msgstr "12月"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "開始日"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "ユーザ責任者"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr "新しいイベント"
 msgid "Events which are in New state"
 msgstr "新規のイベント"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,33 +753,24 @@ msgid "My Registrations"
 msgstr "私の登録"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "10月"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "1月"
 
 #. module: event
 #: view:event.event:0
@@ -834,12 +779,13 @@ msgstr "予定に設定"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "登録を確定する"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "エラー：終了日を開始日の前に指定することはできません。"
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "ユーザ責任者"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr "講演者"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,10 +941,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
@@ -1025,16 +955,6 @@ msgstr "イベント参加者"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "1月"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr "氏名"
 msgid "Country"
 msgstr "国名"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "11月"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "予約購読する"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,9 +1092,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "予約購読する"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
index f866166c2be..87de4d3fabe 100644
--- a/addons/event/i18n/ko.po
+++ b/addons/event/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-05 14:55+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "등록"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "에러!"
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "이벤트 수"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "이벤트 취소"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,9 +753,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -809,22 +762,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -834,12 +779,13 @@ msgstr "드래프트로 설정"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "등록 확정"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,9 +941,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr "이름"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
index 9135da9c9ed..84d3373c508 100644
--- a/addons/event/i18n/lt.po
+++ b/addons/event/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/mn.po b/addons/event/i18n/mn.po
index 2f0b6ba9bcd..bf7c2628b44 100644
--- a/addons/event/i18n/mn.po
+++ b/addons/event/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-24 09:26+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Бүртгүүлсэн огноо"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Бүртгэлүүд"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdi-н дуурь"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "5-р сар"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Батлагдсан эсвэл хийгдсэн төлөвтэй бүртгэлүүд"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Имэйл"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Үйл ажиллагааны дугаар"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Үйл явдал дээр илтгэл хийх илтгэгч"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Үйл ажиллагаа цуцлах"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "9-р сар"
 msgid "December"
 msgstr "12-р сар"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Эхлэл огноо"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Хариуцагч хэрэглэгч"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr "Үйл ажиллагааын шинэ төлөв"
 msgid "Events which are in New state"
 msgstr "Шинэ төлөвтэй үйл явдлууд"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Миний бүртгэлүүд"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "11-р сар"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Өргөтгөсөн Шүүлтүүр..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "10-р сар"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "1-р сар"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Ноороглох"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Бүртгэлийг батлах"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Алдаа ! Хаагдах огноо нь Эхлэх огнооноос өмнө байж болохгүй."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Хариуцагч хэрэглэгч"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Илтгэгч"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "5-р сар"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Үйл явдлын бүртгэл"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "1-р сар"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Нэр"
 msgid "Country"
 msgstr "Улс"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "11-р сар"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Бүртгүүлэх"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Бүртгүүлэх"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/nb.po b/addons/event/i18n/nb.po
index 4e9bd3dad3d..6490c18952d 100644
--- a/addons/event/i18n/nb.po
+++ b/addons/event/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 10:23+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr "Arrangementet har blitt <b> kansellert </ b>."
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Registreringsdato"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,10 +110,9 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Hvis det er merket nye meldinger så krever dette din oppmerksomhet."
+#: view:report.event.registration:0
+msgid "Display"
+msgstr "Skjerm."
 
 #. module: event
 #: field:event.event,register_avail:0
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Registreringer"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Feil!"
@@ -235,9 +223,10 @@ msgid "Opera of Verdi"
 msgstr "Verdis opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
-msgstr "Skjerm."
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Hvis det er merket nye meldinger så krever dette din oppmerksomhet."
 
 #. module: event
 #: view:report.event.registration:0
@@ -255,11 +244,6 @@ msgstr "Billetter."
 msgid "False"
 msgstr "Usant."
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr "Nye registreringer."
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mai"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Registreringer i bekreftet eller gjort staten."
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -304,9 +283,9 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
-msgstr "Arrangementet: Merk lest."
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
+msgstr ""
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "E-post"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr "Ny registrering bekreftet: %s."
@@ -470,28 +449,11 @@ msgstr "Antall arrangementer"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Foredragsholder som skal gi tale på arrangementet."
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr "Registreringen har blitt<b>Opprettet</b>."
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Kanseller arrangement"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr "Stat er satt som ferdig."
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr "Arrangement registrering : Merk som lest."
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "September"
 msgid "December"
 msgstr "Desember"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Startdato"
 msgid "or"
 msgstr "Eller."
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr "Arrangementet har blitt<b>ferdig</b>."
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr "Kryss av her hvis denne kontakten er foredragsholder."
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr "Ingen billetter tilgjengelig!"
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr "Registreringen er angitt som <b> utkast </ b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Ansvarlig bruker"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr "Hendelser i ny stat."
 msgid "Events which are in New state"
 msgstr "Hendelser som er i ny staten."
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr "Stat satt til kanseller."
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Mine registreringer"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr "Arrangementet har blitt satt til<b>kladd</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Utvidede filtre ..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktober"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr "Arrangementregistrering: Merk som ulest."
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Satt til utkast."
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Bekreft registrering"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr "E-post konfigurasjon."
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr "Registrering bekreftet."
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr "Deltok på arrangementet."
 
@@ -898,17 +839,12 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Feil ! Sluttdato kan ikke settes før startdato."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 "Du må vente til start dagen av arrangementet for å gjøre denne handlingen."
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Ansvarlig bruker"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -931,7 +867,7 @@ msgid "Reply-to Email"
 msgstr "Svar-til epost."
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr "Bare% d seter er tilgjengelig!"
@@ -981,12 +917,6 @@ msgstr "Taler"
 msgid "Upcoming events from today"
 msgstr "Kommende arrangementer fra idag."
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr "Arrangementet har blitt <b>opprettet</b>."
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -994,6 +924,7 @@ msgstr "Konferanse om ERP Forretninger."
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr "Ny registrering."
 
@@ -1013,10 +944,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr "Arrangementet har blitt <b>bekreftet</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mai"
 
 #. module: event
 #: view:res.partner:0
@@ -1028,16 +958,6 @@ msgstr "Arrangemnetsregistrering"
 msgid "No ticket available."
 msgstr "Ingen billetter tilgjengelig."
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januar"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1078,11 +998,6 @@ msgstr "Navn"
 msgid "Country"
 msgstr "Land"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "November"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1135,12 +1050,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr "Standard svar- til."
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Abonner"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1186,9 +1095,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr "Arrangement: Merk som ulest."
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Abonner"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index d90a8cc3bde..6571bae91c2 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 16:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr "Evenement is <b>geannuleerd</b>"
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Registratiedatum"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,10 +109,9 @@ msgid "Default Maximum Registration"
 msgstr "Standaard maximum registraties"
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
+#: view:report.event.registration:0
+msgid "Display"
+msgstr "Tonen"
 
 #. module: event
 #: field:event.event,register_avail:0
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Inschrijvingen"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -234,9 +222,10 @@ msgid "Opera of Verdi"
 msgstr "Opera van Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
-msgstr "Tonen"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
 
 #. module: event
 #: view:report.event.registration:0
@@ -254,11 +243,6 @@ msgstr "tickets"
 msgid "False"
 msgstr "Onwaar"
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr "Nieuwe registraties"
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -275,19 +259,14 @@ msgstr ""
 "samenvatting is direct in html formaat om zo in de kanban weergave te worden "
 "ingevoegd."
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mei"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Registraties in de bevestigde of gereed status"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -306,8 +285,8 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -404,7 +383,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -472,28 +451,11 @@ msgstr "Aantal evenementen"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Spreker welke een speech zal geven tijdens het evenement"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr "Registratie is <b>aangemaakt</b>."
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Annuleer evenement"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr "Status ingesteld op 'Gereed'"
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -541,6 +503,11 @@ msgstr "September"
 msgid "December"
 msgstr "December"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -588,19 +555,13 @@ msgstr "Startdatum"
 msgid "or"
 msgstr "of"
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr "Vink dit aan als het contactpersoon een spreker is."
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr "Geen tickets beschikbaar."
@@ -638,13 +599,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Verantwoordelijke gebruiker"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -680,12 +640,6 @@ msgstr "Evenementen in een 'Nieuw' status"
 msgid "Events which are in New state"
 msgstr "Evenementen in de 'Nieuw' status"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr "Status ingesteld op 'Geannuleerd'"
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -803,33 +757,24 @@ msgid "My Registrations"
 msgstr "Mijn inschrijvingen"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktober"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januari"
 
 #. module: event
 #: view:event.event:0
@@ -838,12 +783,13 @@ msgstr "Zet in concept"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Bevestig inschrijving"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -865,12 +811,6 @@ msgstr "Email instellingen"
 msgid "Default Minimum Registration"
 msgstr "Standaard minimaal aantal registraties."
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr "Registratie bevestigd."
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -891,6 +831,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr "Was aanwezig bij dit evenement."
 
@@ -900,16 +841,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Fout ! Sluitingsdatum kan niet voor startdatum liggen."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Verantwoordelijke gebruiker"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -932,7 +868,7 @@ msgid "Reply-to Email"
 msgstr "Antwoord aan e-mail."
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -982,12 +918,6 @@ msgstr "Spreker"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -995,6 +925,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1014,10 +945,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mei"
 
 #. module: event
 #: view:res.partner:0
@@ -1029,16 +959,6 @@ msgstr "Inschrijven evenementen"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januari"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1079,11 +999,6 @@ msgstr "Naam"
 msgid "Country"
 msgstr "Land"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "November"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1136,12 +1051,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Inschrijvingen"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1187,9 +1096,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Inschrijvingen"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
index 4ee0c219979..9d40c8eb2ea 100644
--- a/addons/event/i18n/nl_BE.po
+++ b/addons/event/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 14:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,9 +753,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -809,22 +762,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,9 +941,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
index 841341a8a03..09686c36dc8 100644
--- a/addons/event/i18n/pl.po
+++ b/addons/event/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-05 14:37+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Data rejestracji"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Rejestracje"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Liczba wydarzeń"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Anuluj wydarzenie"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Wrzesień"
 msgid "December"
 msgstr "Grudzień"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Data początkowa"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Użytkownik odpowiedzialny"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,33 +752,24 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Listopad"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Zaawansowane filtry..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Październik"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Styczeń"
 
 #. module: event
 #: view:event.event:0
@@ -833,12 +778,13 @@ msgstr "Ustaw na projekt"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Zatwierdź rejestrację"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Błąd ! Data końcowa nie może być przed datą początkową."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Użytkownik odpowiedzialny"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr "Wykładowca"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Styczeń"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "Nazwa"
 msgid "Country"
 msgstr "Kraj"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Listopad"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Subskrybuj"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,9 +1091,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Subskrybuj"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
index 04d3965900d..e1dd8857cce 100644
--- a/addons/event/i18n/pt.po
+++ b/addons/event/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 17:03+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:42+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr "O evento foi <b>cancelado</b>."
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Data de registo"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Registos"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Erro !"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Ópera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr "Falso"
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr "Novas inscrições"
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maio"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Registos em estado confirmado ou concluído"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Aviso !"
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Número de Eventos"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Orador que irá fazer o discurso no evento."
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancelar Evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Setembro"
 msgid "December"
 msgstr "Dezembro"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Data de início"
 msgid "or"
 msgstr "ou"
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Utilizador responsável"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "Eventos em estado Novo"
 msgid "Events which are in New state"
 msgstr "Eventos que estejam num estado novo"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "As minhas inscrições"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembro"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtros avançados"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Outubro"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Janeiro"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Definir Para Rascunho"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmar Registro"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -897,16 +838,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Erro! A data de fim não pode ser anterior à data de início."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Utilizador responsável"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -929,7 +865,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -979,12 +915,6 @@ msgstr "Orador"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -992,6 +922,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr "Nova inscrição"
 
@@ -1011,10 +942,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maio"
 
 #. module: event
 #: view:res.partner:0
@@ -1026,16 +956,6 @@ msgstr "Inscrição em eventos"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Janeiro"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1076,11 +996,6 @@ msgstr "Nome"
 msgid "Country"
 msgstr "País"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembro"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1133,12 +1048,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Subscrever"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1184,9 +1093,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Subscrever"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index ca892ac47e0..21242f2f893 100644
--- a/addons/event/i18n/pt_BR.po
+++ b/addons/event/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-16 14:01+0000\n"
 "Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Data de Inscrição"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Inscritos"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Ópera de Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maio"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Inscrições que estão como confirmadas ou concluídas"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Número De Eventos"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Palestrante que estará apresentando o evento"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Cancelar Evento"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Setembro"
 msgid "December"
 msgstr "Dezembro"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Data de Início"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Usuário Responsável"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "Eventos Novos"
 msgid "Events which are in New state"
 msgstr "Eventos Novos"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Minhas Inscrições"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembro"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Outubro"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Janeiro"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Marcar como Rascunho"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirmar Inscrição"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -897,16 +838,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Erro! A Data de Encerramento não pode ser anterior a Data de Início."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Usuário Responsável"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -929,7 +865,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -979,12 +915,6 @@ msgstr "Orador"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -992,6 +922,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1011,10 +942,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maio"
 
 #. module: event
 #: view:res.partner:0
@@ -1026,16 +956,6 @@ msgstr "Inscrições de Eventos"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Janeiro"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1076,11 +996,6 @@ msgstr "Nome"
 msgid "Country"
 msgstr "País"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembro"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1133,12 +1048,6 @@ msgstr "ID (identificação)"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Inscrever"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1184,9 +1093,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Inscrever"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
index bf9c9b255d5..abd249ce76a 100644
--- a/addons/event/i18n/ro.po
+++ b/addons/event/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 21:55+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Data inregistrarii"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Inregistrari"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Opera lui Verdi"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mai"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Inregistrari in starea confirmat sau efectuat"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Partener"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Numar de evenimente"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Vorbitorul care va tine un discurs la eveniment"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Anuleaza evenimentul"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Septembrie"
 msgid "December"
 msgstr "Decembrie"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Data de incepere"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Utilizator responsabil"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "Evenimente in stadiu nou"
 msgid "Events which are in New state"
 msgstr "Evenimente care se afla in stare Nou"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Inregistrarile mele"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Noiembrie"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Octombrie"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Ianuarie"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Setare ca Ciorna"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Confirma Inregistrarea"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgstr ""
 "Eroare ! Data de inchidere nu poate fi setata inaintea Datei de incepere."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Utilizator responsabil"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr "Vorbitor"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mai"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr "Inregistrare evenimente"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Ianuarie"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr "Nume"
 msgid "Country"
 msgstr "Tara"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Noiembrie"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Abonare"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,9 +1094,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Abonare"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index 89afb0d23d1..ed8b7200c64 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 22:33+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Дата регистрации"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Регистрации"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Опера Верди"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Май"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Контрагент"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "Эл. почта"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Кол-во событий"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Отменить событие"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Сентябрь"
 msgid "December"
 msgstr "Декабрь"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Дата начала"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Ответственный пользователь"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Мои регистрации"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Ноябрь"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Октябрь"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Январь"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Установть в 'Черновик'"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Подтвердить регистрацию"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -897,16 +838,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Ошибка! Дата завершения не может быть установлена до даты начала."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Ответственный пользователь"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -929,7 +865,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -979,12 +915,6 @@ msgstr "Выступающий"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -992,6 +922,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1011,10 +942,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Май"
 
 #. module: event
 #: view:res.partner:0
@@ -1026,16 +956,6 @@ msgstr "Регистрация мероприятий"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Январь"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1076,11 +996,6 @@ msgstr "Название"
 msgid "Country"
 msgstr "Страна"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Ноябрь"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1133,12 +1048,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Подписаться"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1184,9 +1093,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Подписаться"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
index df647711645..63f24fce97a 100644
--- a/addons/event/i18n/sk.po
+++ b/addons/event/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:53+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdiho opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Počet akcií"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Zrušenie udalosti"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,9 +753,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -809,22 +762,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,9 +941,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
index 15be5c27744..5bbebd120d3 100644
--- a/addons/event/i18n/sl.po
+++ b/addons/event/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 03:54+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Registracije"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Napaka!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Verdijeva opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Število dogodkov"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Odpovej dogodek"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Potrdi registracijo"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "Ime"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/sq.po b/addons/event/i18n/sq.po
index 90d67722324..4caee276646 100644
--- a/addons/event/i18n/sq.po
+++ b/addons/event/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -799,9 +753,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -809,22 +762,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -834,12 +779,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -861,12 +807,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -887,6 +827,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -896,16 +837,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -928,7 +864,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -978,12 +914,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -991,6 +921,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1010,9 +941,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1025,16 +955,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1075,11 +995,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1132,12 +1047,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1183,8 +1092,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/sr.po b/addons/event/i18n/sr.po
index 2ffdcaacd66..5c168a2a27a 100644
--- a/addons/event/i18n/sr.po
+++ b/addons/event/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-03 08:07+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Datum Registracije"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Registracije"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdijeva Opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maj"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Broj Dogadjaja"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Otkazi Dogadjaj"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Septembar"
 msgid "December"
 msgstr "Decembar"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Pocetni Datum"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Odgovorni Korisnik"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Moja Registracija"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembar"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Prosireni Filteri"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktobar"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Postavi u \"U Pripremi'"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Posalji na Pripremu"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -900,16 +841,11 @@ msgstr ""
 "Datuma Pocetka"
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Odgovorni Korisnik"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -932,7 +868,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -982,12 +918,6 @@ msgstr "Govornik"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -995,6 +925,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1014,10 +945,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maj"
 
 #. module: event
 #: view:res.partner:0
@@ -1029,16 +959,6 @@ msgstr "Registracioni Dogadjaj"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januar"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1079,11 +999,6 @@ msgstr "Ime"
 msgid "Country"
 msgstr "Zemlja"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembar"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1136,12 +1051,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Pretplati se"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1187,9 +1096,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Pretplati se"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/sr@latin.po b/addons/event/i18n/sr@latin.po
index 2c12b6aadd7..548308410f9 100644
--- a/addons/event/i18n/sr@latin.po
+++ b/addons/event/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 13:56+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Datum Registracije"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr "Registracije"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr "Verdijeva Opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maj"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr "Broj Dogadjaja"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Otkazi Dogadjaj"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Septembar"
 msgid "December"
 msgstr "Decembar"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr "Pocetni Datum"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Odgovorni Korisnik"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr "Moja Registracija"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Novembar"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Prosireni Filteri"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktobar"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr "Postavi u \"U Pripremi'"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Posalji na Pripremu"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -900,16 +841,11 @@ msgstr ""
 "Datuma Pocetka"
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Odgovorni Korisnik"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -932,7 +868,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -982,12 +918,6 @@ msgstr "Govornik"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -995,6 +925,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1014,10 +945,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maj"
 
 #. module: event
 #: view:res.partner:0
@@ -1029,16 +959,6 @@ msgstr "Registracioni Dogadjaj"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januar"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1079,11 +999,6 @@ msgstr "Ime"
 msgid "Country"
 msgstr "Zemlja"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Novembar"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1136,12 +1051,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Pretplati se"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1187,9 +1096,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Pretplati se"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index 7ee54425117..37dff05e249 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-03 14:09+0000\n"
 "Last-Translator: Stefan Lind <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Registreringsdatum"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Anmälan"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Verdis opera"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Maj"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Bekräftade eller klara anmälningar"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "Epost"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Antal evenemang"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Talare som kommer framträda på evenemanget"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Avbryt evenemang"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "September"
 msgid "December"
 msgstr "December"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Startdatum"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Ansvarig användare"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "Nya evenemang"
 msgid "Events which are in New state"
 msgstr "Nya evenemang"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Mina anmälningar"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Utökat filter..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Oktober"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januari"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Sätt till preliminär"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Bekräfta anmälan"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -897,16 +838,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Fel ! Slutdatum kan inte sättas före startdatum."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Ansvarig användare"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -929,7 +865,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -979,12 +915,6 @@ msgstr "Talare"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -992,6 +922,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1011,10 +942,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maj"
 
 #. module: event
 #: view:res.partner:0
@@ -1026,16 +956,6 @@ msgstr "Evenemangsanmälan"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Januari"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1076,11 +996,6 @@ msgstr "Namn"
 msgid "Country"
 msgstr "Land"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "November"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1133,12 +1048,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Prenumerera"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1184,9 +1093,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Prenumerera"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
index 5d370c19c5b..8596c12737e 100644
--- a/addons/event/i18n/tlh.po
+++ b/addons/event/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
index ff463404a5c..e0e69146798 100644
--- a/addons/event/i18n/tr.po
+++ b/addons/event/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-07 01:28+0000\n"
 "Last-Translator: oguzhan <tazmanyacanawari@hotmail.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "Kayıt Tarihi"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Kayıtlar"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Hata!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Verdi Operası"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Mayıs"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "Kayıtlar onaylanmış ya da bitmiş durumdadır"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "Paydaş"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "Eposta"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Etkinlik Sayısı"
 msgid "Speaker who will be giving speech at the event."
 msgstr "Bu etkinlikte konuşmayı yapacak konuşmacı."
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Etkinliği İptal Et"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "Eylül"
 msgid "December"
 msgstr "Aralık"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "Başlama Tarihi"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Sorumlu Kullanıcı"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "Yeni durumundaki Etkinlikler"
 msgid "Events which are in New state"
 msgstr "Yeni durumundaki etkinlikler"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -800,33 +754,24 @@ msgid "My Registrations"
 msgstr "Kayıtlarım"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Kasım"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Genişletilmiş Süzgeçler..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Ekim"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Ocak"
 
 #. module: event
 #: view:event.event:0
@@ -835,12 +780,13 @@ msgstr "Taslak İçin Ayarla"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Kaydı Onayla"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -862,12 +808,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -888,6 +828,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -897,16 +838,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Hata ! Kapanış Tarihi, Başlama Tarihinden önceye ayarlanamaz."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "Sorumlu Kullanıcı"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -929,7 +865,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -979,12 +915,6 @@ msgstr "Konuşmacı"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -992,6 +922,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1011,10 +942,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mayıs"
 
 #. module: event
 #: view:res.partner:0
@@ -1026,16 +956,6 @@ msgstr "Etkinlik Kaydı"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Ocak"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1076,11 +996,6 @@ msgstr "Adı"
 msgid "Country"
 msgstr "Ülke"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Kasım"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1133,12 +1048,6 @@ msgstr "ID"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "Abone ol"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1184,9 +1093,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Abone ol"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
index 40eb19cd88e..35566549673 100644
--- a/addons/event/i18n/uk.po
+++ b/addons/event/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-05 14:54+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "Реєстрації"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "Помилка!"
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "Опера Верді"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr ""
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "Кількість Подій"
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Відмінити Подію"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,9 +752,8 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
 msgstr ""
 
 #. module: event
@@ -808,22 +761,14 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
 msgstr ""
 
 #. module: event
@@ -833,12 +778,13 @@ msgstr "Встановити як Чорновик"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "Підтвердити Реєстрацію"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,9 +940,8 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
 msgstr ""
 
 #. module: event
@@ -1024,16 +954,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "Назва"
 msgid "Country"
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,8 +1091,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/vi.po b/addons/event/i18n/vi.po
index f013f03cce9..062d47b4d0b 100644
--- a/addons/event/i18n/vi.po
+++ b/addons/event/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 17:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -58,22 +58,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr ""
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -121,9 +110,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -198,9 +186,9 @@ msgid "Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -235,8 +223,9 @@ msgid "Opera of Verdi"
 msgstr ""
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -255,11 +244,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -273,19 +257,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "Tháng Năm"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -304,8 +283,8 @@ msgid "Partner"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -402,7 +381,7 @@ msgid "Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -470,28 +449,11 @@ msgstr ""
 msgid "Speaker who will be giving speech at the event."
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "Hủy bỏ Sự kiện"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -539,6 +501,11 @@ msgstr "Tháng Chín"
 msgid "December"
 msgstr "Tháng Mười hai"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -586,19 +553,13 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -636,13 +597,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -678,12 +638,6 @@ msgstr ""
 msgid "Events which are in New state"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -801,33 +755,24 @@ msgid "My Registrations"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Tháng Mười một"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "Bộ lọc mở rộng..."
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "Tháng Mười"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Tháng Một"
 
 #. module: event
 #: view:event.event:0
@@ -836,12 +781,13 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -863,12 +809,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -889,6 +829,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -898,16 +839,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "Lỗi ! Ngày Đóng cửa không thể trước Ngày Bắt đầu."
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -930,7 +866,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -980,12 +916,6 @@ msgstr ""
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -993,6 +923,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1012,10 +943,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Tháng Năm"
 
 #. module: event
 #: view:res.partner:0
@@ -1027,16 +957,6 @@ msgstr ""
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "Tháng Một"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1077,11 +997,6 @@ msgstr ""
 msgid "Country"
 msgstr "Quốc gia"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "Tháng Mười một"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1134,12 +1049,6 @@ msgstr ""
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1185,8 +1094,9 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
 msgstr ""
 
 #. module: event
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index 33c5b665e1c..72432c38b99 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 11:10+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr "活动 <b>已经被取消</b>."
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "活动日期"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr "源销售单摘要"
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,10 +109,9 @@ msgid "Default Maximum Registration"
 msgstr "默认最多的注册者"
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息，勾选此项"
+#: view:report.event.registration:0
+msgid "Display"
+msgstr "显示"
 
 #. module: event
 #: field:event.event,register_avail:0
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "登记记录"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr "错误!"
@@ -234,9 +222,10 @@ msgid "Opera of Verdi"
 msgstr "Verdi歌剧"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
-msgstr "显示"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: event
 #: view:report.event.registration:0
@@ -254,11 +243,6 @@ msgstr "门票"
 msgid "False"
 msgstr "False"
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr "新登记者"
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "5月"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "在已确认或已完成状态的报名者"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -303,9 +282,9 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
-msgstr ""
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
+msgstr "当你选择这个活动，将选择默认最小值"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "电子邮件"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr "已确认的登记: %s."
@@ -469,28 +448,11 @@ msgstr "活动数量"
 msgid "Speaker who will be giving speech at the event."
 msgstr "要在这次活动上发言的演讲者"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr "登记被 <b>创建</b>."
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "取消活动"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr "状态设置为完成"
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "9月"
 msgid "December"
 msgstr "12月"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "开始日期"
 msgid "or"
 msgstr "or"
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr "活动已经 <b>完成</b>"
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr "如果联系人是演讲者，选中此项"
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr "没有可用的门票"
@@ -641,13 +602,12 @@ msgid ""
 msgstr "你能为每个活动定义最大的登记水平。如果你有太多的登记，你不能确认你的活动。（输入0忽略这个规则）"
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr "登记 会设为“草稿”"
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "责任用户"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -683,12 +643,6 @@ msgstr "在新建状态的活动"
 msgid "Events which are in New state"
 msgstr "新建状态的活动"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr "状态设为取消"
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -804,33 +758,24 @@ msgid "My Registrations"
 msgstr "我的登记记录"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr "活动被设置为“草稿”状态"
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "10月"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "1月"
 
 #. module: event
 #: view:event.event:0
@@ -839,12 +784,13 @@ msgstr "设为草稿"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "确认登记记录"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -866,12 +812,6 @@ msgstr "邮箱配置"
 msgid "Default Minimum Registration"
 msgstr "默认最小登记数"
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr "登记确认。"
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -892,6 +832,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr "参加活动"
 
@@ -901,16 +842,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "错误！结束日期不能在开始日期前。"
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr "你必须等待活动开始才能做这些动作"
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "责任用户"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -933,7 +869,7 @@ msgid "Reply-to Email"
 msgstr "回复email"
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr "只有 %d 个座位可用！"
@@ -983,12 +919,6 @@ msgstr "关注者"
 msgid "Upcoming events from today"
 msgstr "今天将开始的活动"
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr "活动已经被'创建'"
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -996,6 +926,7 @@ msgstr "ERP 商务会议"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr "新的登记"
 
@@ -1015,10 +946,9 @@ msgid "Participant / Contact Name"
 msgstr "参与者/联系人名字"
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr "活动已经被'确认'"
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
@@ -1030,16 +960,6 @@ msgstr "活动登记记录"
 msgid "No ticket available."
 msgstr "没有可用的入场券"
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr "当你选择这个活动，将选择默认最小值"
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "1月"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1080,11 +1000,6 @@ msgstr "名称"
 msgid "Country"
 msgstr "国家"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "11月"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1137,12 +1052,6 @@ msgstr "标识"
 msgid "Default Reply-To"
 msgstr "默认回复给"
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "订阅"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1188,9 +1097,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "订阅"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index ffe4fa343ca..01206b8fa6a 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-30 10:20+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -57,22 +57,11 @@ msgid ""
 "ignore this rule )"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
 msgstr "登錄日期"
 
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
@@ -120,9 +109,8 @@ msgid "Default Maximum Registration"
 msgstr ""
 
 #. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
 msgstr ""
 
 #. module: event
@@ -197,9 +185,9 @@ msgid "Registrations"
 msgstr "登記記錄"
 
 #. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -234,8 +222,9 @@ msgid "Opera of Verdi"
 msgstr "威爾第歌劇"
 
 #. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: event
@@ -254,11 +243,6 @@ msgstr ""
 msgid "False"
 msgstr ""
 
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
@@ -272,19 +256,14 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "May"
-msgstr "5月"
-
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
 msgstr "在已確認或已完成狀態的報名者"
 
 #. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -303,8 +282,8 @@ msgid "Partner"
 msgstr "業務夥伴"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
 msgstr ""
 
 #. module: event
@@ -401,7 +380,7 @@ msgid "Email"
 msgstr "電子郵件"
 
 #. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
 msgstr ""
@@ -469,28 +448,11 @@ msgstr "事件數"
 msgid "Speaker who will be giving speech at the event."
 msgstr "要在這次活動上發言的演講者"
 
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
 msgstr "取消事件"
 
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-msgid "State set to Done"
-msgstr ""
-
-#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_read
-msgid "Event registration : Mark read"
-msgstr ""
-
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
@@ -538,6 +500,11 @@ msgstr "9月"
 msgid "December"
 msgstr "12月"
 
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
@@ -585,19 +552,13 @@ msgstr "開始日期"
 msgid "or"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
 msgstr ""
@@ -635,13 +596,12 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "責任用戶"
 
 #. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
 #, python-format
 msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
@@ -677,12 +637,6 @@ msgstr "在新建狀態的活動"
 msgid "Events which are in New state"
 msgstr "新建狀態的活動"
 
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -798,33 +752,24 @@ msgid "My Registrations"
 msgstr "我的登記記錄"
 
 #. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
 msgstr "增加篩選條件"
 
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
 msgstr "10月"
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "1月"
 
 #. module: event
 #: view:event.event:0
@@ -833,12 +778,13 @@ msgstr "設為草稿"
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 #: view:res.partner:0
 msgid "Confirm Registration"
 msgstr "確認登記記錄"
 
 #. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
 #, python-format
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
@@ -860,12 +806,6 @@ msgstr ""
 msgid "Default Minimum Registration"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
@@ -886,6 +826,7 @@ msgstr ""
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
 msgid "Attended the Event"
 msgstr ""
 
@@ -895,16 +836,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr "錯誤！結束日期不能在開始日期前。"
 
 #. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
 msgstr ""
 
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr "責任用戶"
-
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,event_state:0
@@ -927,7 +863,7 @@ msgid "Reply-to Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
 msgstr ""
@@ -977,12 +913,6 @@ msgstr "關注者"
 msgid "Upcoming events from today"
 msgstr ""
 
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
@@ -990,6 +920,7 @@ msgstr ""
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
 msgstr ""
 
@@ -1009,10 +940,9 @@ msgid "Participant / Contact Name"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
-msgstr ""
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
@@ -1024,16 +954,6 @@ msgstr "事件登記記錄"
 msgid "No ticket available."
 msgstr ""
 
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr "1月"
-
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
@@ -1074,11 +994,6 @@ msgstr "名稱"
 msgid "Country"
 msgstr "國家"
 
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr "11月"
-
 #. module: event
 #: view:res.partner:0
 msgid "Close Registration"
@@ -1131,12 +1046,6 @@ msgstr "標識"
 msgid "Default Reply-To"
 msgstr ""
 
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr "訂閱"
-
 #. module: event
 #: view:event.event:0
 msgid "available."
@@ -1182,9 +1091,10 @@ msgid ""
 msgstr ""
 
 #. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
-msgstr ""
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "訂閱"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
diff --git a/addons/event_moodle/i18n/de.po b/addons/event_moodle/i18n/de.po
index 401844fa338..b5dfab8311d 100644
--- a/addons/event_moodle/i18n/de.po
+++ b/addons/event_moodle/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
diff --git a/addons/event_moodle/i18n/es.po b/addons/event_moodle/i18n/es.po
index 18c46163526..78ec44bc561 100644
--- a/addons/event_moodle/i18n/es.po
+++ b/addons/event_moodle/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 20:43+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
diff --git a/addons/event_moodle/i18n/fr.po b/addons/event_moodle/i18n/fr.po
index 1b1b565b41b..105582e3073 100644
--- a/addons/event_moodle/i18n/fr.po
+++ b/addons/event_moodle/i18n/fr.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-20 14:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 13:44+0000\n"
+"Last-Translator: Fabian Pilard <contact@imaugis.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
 msgid "Connection with username and password"
-msgstr ""
+msgstr "Connexion avec identifiant et mot de passe"
 
 #. module: event_moodle
 #: model:ir.model,name:event_moodle.model_event_moodle_config_wiz
@@ -33,27 +33,29 @@ msgid ""
 "URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
 "'http://localhost'"
 msgstr ""
+"L'Url de votre serveur Moodle. Par exemple : 'http://127.0.0.1' ou "
+"http://localhost'"
 
 #. module: event_moodle
 #: field:event.registration,moodle_user_password:0
 msgid "Password for Moodle User"
-msgstr ""
+msgstr "Mot de passe de l'utilisateur Moodle"
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,moodle_password:0
 msgid "Moodle Password"
-msgstr ""
+msgstr "Mot de passe Moodle"
 
 #. module: event_moodle
 #: code:addons/event_moodle/event_moodle.py:137
 #, python-format
 msgid "Your email '%s' is wrong."
-msgstr ""
+msgstr "Votre email '%s' est incorrect"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
 msgid "Connection with a Token"
-msgstr ""
+msgstr "Connexion avec une session d'authentification (Token)"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
@@ -62,21 +64,24 @@ msgid ""
 "'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
 "application."
 msgstr ""
+"La manière la plus simple de se connecter à OpenERP avec un serveur moodle "
+"est de créer une session d'authentification  (token). Ceci permet "
+"d'authentifier OpenERP comme une application de confiance"
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,url:0
 msgid "URL to Moodle Server"
-msgstr ""
+msgstr "URL  du serveur Moodle"
 
 #. module: event_moodle
 #: help:event.moodle.config.wiz,url:0
 msgid "The url that will be used for the connection with moodle in xml-rpc"
-msgstr ""
+msgstr "L'url qui sera utilisé pour la connexion de Moodle en xml-rpc"
 
 #. module: event_moodle
 #: model:ir.model,name:event_moodle.model_event_registration
 msgid "Event Registration"
-msgstr ""
+msgstr "Inscription à l'événement"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
@@ -84,26 +89,28 @@ msgid ""
 "Another approach is to create a user for OpenERP in Moodle. If you do so, "
 "make sure that this user has appropriate access rights."
 msgstr ""
+"Une autre approche est de créer un utilisateur pour OpenERP sur Moodle. Si "
+"vous faîtes cela, vérifier que l'utilisateur a des droits d'accés appropriés"
 
 #. module: event_moodle
 #: field:event.registration,moodle_uid:0
 msgid "Moodle User ID"
-msgstr ""
+msgstr "Identifiant de l'utilisateur Moodle"
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,server_moodle:0
 msgid "Moodle Server"
-msgstr ""
+msgstr "Serveur Moodle"
 
 #. module: event_moodle
 #: field:event.event,moodle_id:0
 msgid "Moodle ID"
-msgstr ""
+msgstr "Identifiant Moodle"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
 msgid "Server"
-msgstr ""
+msgstr "Serveur"
 
 #. module: event_moodle
 #: code:addons/event_moodle/event_moodle.py:57
@@ -111,30 +118,30 @@ msgstr ""
 #: code:addons/event_moodle/event_moodle.py:137
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur!"
 
 #. module: event_moodle
 #: code:addons/event_moodle/event_moodle.py:105
 #, python-format
 msgid "You must configure your moodle connection."
-msgstr ""
+msgstr "Vous devez configurer votre connexion moodle"
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,moodle_username:0
 #: field:event.registration,moodle_username:0
 msgid "Moodle Username"
-msgstr ""
+msgstr "Nom de l'utilisateur Moodle"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
 #: model:ir.actions.act_window,name:event_moodle.configure_moodle
 msgid "Configure Moodle"
-msgstr ""
+msgstr "Configurer Moodle"
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,moodle_token:0
 msgid "Moodle Token"
-msgstr ""
+msgstr "Session d'authentification (Token)"
 
 #. module: event_moodle
 #: help:event.moodle.config.wiz,moodle_username:0
@@ -142,6 +149,8 @@ msgid ""
 "You can also connect with your username that you define when you create a "
 "token"
 msgstr ""
+"Vous pouvez aussi vous connecter avec votre identifiant que vous avez défini "
+"lors de la création d'un Token"
 
 #. module: event_moodle
 #: help:event.event,moodle_id:0
@@ -156,18 +165,18 @@ msgstr ""
 #. module: event_moodle
 #: model:ir.ui.menu,name:event_moodle.wizard_moodle
 msgid "Moodle Configuration"
-msgstr ""
+msgstr "Configuration Moodle"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: event_moodle
 #: code:addons/event_moodle/event_moodle.py:57
 #, python-format
 msgid "First configure your moodle connection."
-msgstr ""
+msgstr "Première configuration de votre connexion Moodle"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
@@ -177,9 +186,9 @@ msgstr ""
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: event_moodle
 #: model:ir.model,name:event_moodle.model_event_event
 msgid "Event"
-msgstr ""
+msgstr "Évènement"
diff --git a/addons/event_moodle/i18n/hr.po b/addons/event_moodle/i18n/hr.po
index 2fb9065e184..a96d8cb1ad1 100644
--- a/addons/event_moodle/i18n/hr.po
+++ b/addons/event_moodle/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:12+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
diff --git a/addons/event_moodle/i18n/nl.po b/addons/event_moodle/i18n/nl.po
index 6bb0ea0461f..946e4564f52 100644
--- a/addons/event_moodle/i18n/nl.po
+++ b/addons/event_moodle/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 20:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
diff --git a/addons/event_sale/i18n/ar.po b/addons/event_sale/i18n/ar.po
index 391d36970a5..20f190fd2e7 100644
--- a/addons/event_sale/i18n/ar.po
+++ b/addons/event_sale/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 10:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,7 +26,7 @@ msgstr ""
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
 
 #. module: event_sale
@@ -36,11 +36,6 @@ msgid ""
 "event."
 msgstr ""
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr ""
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -49,7 +44,13 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
 msgstr ""
 
 #. module: event_sale
@@ -57,12 +58,6 @@ msgstr ""
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -78,6 +73,12 @@ msgstr ""
 msgid "Technical Training"
 msgstr ""
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/de.po b/addons/event_sale/i18n/de.po
index e2d0c74bbd0..f9361f99a3b 100644
--- a/addons/event_sale/i18n/de.po
+++ b/addons/event_sale/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:46+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -27,10 +27,8 @@ msgstr "Produkt"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
-"Legen Sie fest, inwieweit ein Produkt automatisch eine Anmeldung auslösen "
-"soll, wenn ein Auftrag im Verkauf bestätigt wird."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -41,11 +39,6 @@ msgstr ""
 "Wählen Sie eine Veranstaltung aus, um automatisch eine Anmeldung zu "
 "generieren."
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Typ der Veranstaltung"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -54,22 +47,20 @@ msgstr "Technisches Training"
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
-"Filter auf die Veranstaltungen dieser Kategorie in der Auswahl von "
-"Auftragspositionen"
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Typ der Veranstaltung"
 
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr "Die Anmeldung %s wurde ausgelöst durch den Auftrag %s."
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -85,6 +76,12 @@ msgstr "Veranstaltungstyp"
 msgid "Technical Training"
 msgstr "Technisches Training"
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/es.po b/addons/event_sale/i18n/es.po
index e1dc0f0f1fb..d9483a22a3d 100644
--- a/addons/event_sale/i18n/es.po
+++ b/addons/event_sale/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 21:53+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,10 +26,8 @@ msgstr "Producto"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
-"Determine si un producto necesita crear automáticamente un registro de "
-"evento y la confirmación de una línea de pedido de venta."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -39,11 +37,6 @@ msgid ""
 msgstr ""
 "Escoja un evento y cree automáticamente un registro para este evento."
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Tipo de Evento"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -52,21 +45,20 @@ msgstr "Formación técnica en Grand-Rosiere"
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
-"Filtre la lista de eventos solo de esta categoría en las líneas de pedido"
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Tipo de Evento"
 
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr "event_ok"
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr "El registro %s ha sido creado desde el pedido de venta %s."
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -82,6 +74,12 @@ msgstr "Tipo de evento"
 msgid "Technical Training"
 msgstr "Formación técnica"
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/fr.po b/addons/event_sale/i18n/fr.po
index 207d1c86c03..32d051785bd 100644
--- a/addons/event_sale/i18n/fr.po
+++ b/addons/event_sale/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:52+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
@@ -27,10 +27,8 @@ msgstr "Article"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
-"Détermine si un article doit créer automatiquement un enregistrement "
-"d’événement à la confirmation de la ligne de commande."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -39,11 +37,6 @@ msgid ""
 "event."
 msgstr ""
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr ""
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -52,7 +45,13 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
 msgstr ""
 
 #. module: event_sale
@@ -60,12 +59,6 @@ msgstr ""
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -81,6 +74,12 @@ msgstr ""
 msgid "Technical Training"
 msgstr ""
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/hr.po b/addons/event_sale/i18n/hr.po
index 27de850d1d7..2adbeecdd2d 100644
--- a/addons/event_sale/i18n/hr.po
+++ b/addons/event_sale/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 08:11+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,7 +26,7 @@ msgstr "Proizvod"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
 
 #. module: event_sale
@@ -36,11 +36,6 @@ msgid ""
 "event."
 msgstr ""
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr ""
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -49,7 +44,13 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
 msgstr ""
 
 #. module: event_sale
@@ -57,12 +58,6 @@ msgstr ""
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -78,6 +73,12 @@ msgstr ""
 msgid "Technical Training"
 msgstr ""
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/it.po b/addons/event_sale/i18n/it.po
index 3612bb71cc9..dc6e60c8de9 100644
--- a/addons/event_sale/i18n/it.po
+++ b/addons/event_sale/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 09:07+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,7 +26,7 @@ msgstr "Prodotto"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
 
 #. module: event_sale
@@ -36,11 +36,6 @@ msgid ""
 "event."
 msgstr ""
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Tipo Evento"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -49,20 +44,20 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
 
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Tipo Evento"
+
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -78,6 +73,12 @@ msgstr "Tipo di evento"
 msgid "Technical Training"
 msgstr ""
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/nl.po b/addons/event_sale/i18n/nl.po
index 7679d21f913..7e5628f8e3e 100644
--- a/addons/event_sale/i18n/nl.po
+++ b/addons/event_sale/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 20:07+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,7 +26,7 @@ msgstr "Product"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
 
 #. module: event_sale
@@ -36,11 +36,6 @@ msgid ""
 "event."
 msgstr ""
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Soort evenement"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -49,20 +44,20 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
 
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Soort evenement"
+
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr "event_ok"
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -78,6 +73,12 @@ msgstr "Soort evenement"
 msgid "Technical Training"
 msgstr "Technisch training"
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/pl.po b/addons/event_sale/i18n/pl.po
index 363ade4c8b6..0295b0e012a 100644
--- a/addons/event_sale/i18n/pl.po
+++ b/addons/event_sale/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 21:03+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,10 +26,8 @@ msgstr "Produkt"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
-"Określ, czy produkt po potwierdzeniu pozycji zamówienia sprzedaży ma "
-"automatycznie tworzyć rejestrację wydarzenie."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -40,11 +38,6 @@ msgstr ""
 "Wybierz wydarzenie, a to automatycznie utworzy rejestrację dla tego "
 "wydarzenia."
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Typ wydarzenia"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -53,20 +46,20 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
 
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Typ wydarzenia"
+
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -82,6 +75,12 @@ msgstr "Typ wydarzenia"
 msgid "Technical Training"
 msgstr "Szkolenie techniczne"
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/pt.po b/addons/event_sale/i18n/pt.po
index ca6350825aa..4ea86ea49b9 100644
--- a/addons/event_sale/i18n/pt.po
+++ b/addons/event_sale/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 17:19+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,7 +26,7 @@ msgstr "Produto"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
 
 #. module: event_sale
@@ -36,11 +36,6 @@ msgid ""
 "event."
 msgstr ""
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Tipo de evento"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -49,20 +44,20 @@ msgstr "Formação técnica em Grand-Rosiere (Bélgica)"
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
 
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Tipo de evento"
+
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr "event_ok"
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -78,6 +73,12 @@ msgstr "Tipo de evento"
 msgid "Technical Training"
 msgstr "Formação técnica"
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/pt_BR.po b/addons/event_sale/i18n/pt_BR.po
index fd2ea6ffcfd..b677fe0583e 100644
--- a/addons/event_sale/i18n/pt_BR.po
+++ b/addons/event_sale/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 19:28+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,10 +26,8 @@ msgstr "Produto"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
+"at the confirmation of a sales order line."
 msgstr ""
-"Determina se um produto precisa criar automaticamente um registro de evento "
-"na confirmação de uma linha de ordem de venda."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -39,11 +37,6 @@ msgid ""
 msgstr ""
 "Escolha um evento e será criado automaticamente um registro para ele."
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "Tipo de Evento"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -52,22 +45,20 @@ msgstr "Treinamento técnico em Grand-Rosiere"
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
 msgstr ""
-"Filtrar a lista de eventos somente desta categoria nas linhas de ordens de "
-"vendas"
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Tipo de Evento"
 
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr "event_ok"
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr "O registro %s foi criado pela Ordem de Venda %s."
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -83,6 +74,12 @@ msgstr "Tipo de Evento"
 msgid "Technical Training"
 msgstr "Treinamento Técnico"
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/event_sale/i18n/zh_CN.po b/addons/event_sale/i18n/zh_CN.po
index a527d39e3b0..d99fff4bc16 100644
--- a/addons/event_sale/i18n/zh_CN.po
+++ b/addons/event_sale/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 01:53+0000\n"
 "Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -26,8 +26,8 @@ msgstr "产品"
 #: help:product.product,event_ok:0
 msgid ""
 "Determine if a product needs to create automatically an event registration "
-"at the confirmation of a sale order line."
-msgstr "销售订单确认时自动创建产品的相关活动."
+"at the confirmation of a sales order line."
+msgstr ""
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -36,11 +36,6 @@ msgid ""
 "event."
 msgstr "选择活动"
 
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr "活动类型"
-
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
@@ -49,20 +44,20 @@ msgstr ""
 #. module: event_sale
 #: help:product.product,event_type_id:0
 msgid ""
-"Filter the list of event on this category only, in the sale order lines"
-msgstr "仅在此类中过滤."
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "活动类型"
 
 #. module: event_sale
 #: field:sale.order.line,event_ok:0
 msgid "event_ok"
 msgstr ""
 
-#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
-msgstr ""
-
 #. module: event_sale
 #: field:product.product,event_ok:0
 msgid "Event Subscription"
@@ -78,6 +73,12 @@ msgstr "活动类型"
 msgid "Technical Training"
 msgstr ""
 
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
 #. module: event_sale
 #: field:sale.order.line,event_id:0
 msgid "Event"
diff --git a/addons/fetchmail/i18n/ar.po b/addons/fetchmail/i18n/ar.po
index 2281fa12f5a..f929026fdd2 100644
--- a/addons/fetchmail/i18n/ar.po
+++ b/addons/fetchmail/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:20+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "اسم الخادم"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "سكربت"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "بروتوكول POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -67,9 +67,9 @@ msgstr ""
 "إرسال. هذه عادة تضاعف حجم قاعدة بيانات الرسائل"
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "بروتوكول POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -157,6 +157,11 @@ msgstr "خيارات متقدمة"
 msgid "Configuration"
 msgstr "إعدادات"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "سكربت"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index 25c9087b675..ad39df03abf 100644
--- a/addons/fetchmail/i18n/bg.po
+++ b/addons/fetchmail/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-14 16:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index 36baa18fbf7..61071b0f1db 100644
--- a/addons/fetchmail/i18n/ca.po
+++ b/addons/fetchmail/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-10 14:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/da.po b/addons/fetchmail/i18n/da.po
index 5a268dd9cfd..2499d0291ce 100644
--- a/addons/fetchmail/i18n/da.po
+++ b/addons/fetchmail/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,8 +28,8 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
+#: view:fetchmail.server:0
+msgid "POP"
 msgstr ""
 
 #. module: fetchmail
@@ -63,8 +63,8 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
 msgstr ""
 
 #. module: fetchmail
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index 0277236f36d..64941bc45c0 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 07:10+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
@@ -27,9 +27,9 @@ msgid "Server Name"
 msgstr "Servername"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Skript"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -68,9 +68,9 @@ msgstr ""
 "angehängt werden soll. Die wird den Platzbedarf in der Datenbank verdoppeln."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -158,6 +158,11 @@ msgstr "Erweiterte Optionen"
 msgid "Configuration"
 msgstr "Konfiguration"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Skript"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index ff7e043d817..45cd05525f1 100644
--- a/addons/fetchmail/i18n/el.po
+++ b/addons/fetchmail/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-22 23:50+0000\n"
 "Last-Translator: emmsarris <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,8 +28,8 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
+#: view:fetchmail.server:0
+msgid "POP"
 msgstr ""
 
 #. module: fetchmail
@@ -63,8 +63,8 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
 msgstr ""
 
 #. module: fetchmail
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
index cefaae3a65d..03338ea2158 100644
--- a/addons/fetchmail/i18n/en_GB.po
+++ b/addons/fetchmail/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:14+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Server Name"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -68,9 +68,9 @@ msgstr ""
 "your message database."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -158,6 +158,11 @@ msgstr "Advanced Options"
 msgid "Configuration"
 msgstr "Configuration"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index 494e2671894..91a15a36fcf 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-12 11:22+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 12:07+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Nombre del servidor"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -70,9 +70,9 @@ msgstr ""
 "espacio ocupado por la base de datos de mensajes."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr "Configurar la pasarela de correo electrónico entrante"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -160,6 +160,11 @@ msgstr "Opciones avanzadas"
 msgid "Configuration"
 msgstr "Configuración:"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/es_CR.po b/addons/fetchmail/i18n/es_CR.po
index ea7ee97c2db..0c5bb05ae96 100644
--- a/addons/fetchmail/i18n/es_CR.po
+++ b/addons/fetchmail/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 21:54+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: fetchmail
@@ -29,9 +29,9 @@ msgid "Server Name"
 msgstr "Nombre de servidor"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -71,9 +71,9 @@ msgstr ""
 "se duplicará el tamaño de su base de datos de mensaje."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -161,6 +161,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuración"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/et.po b/addons/fetchmail/i18n/et.po
index 0a525fbca06..7616c3342a7 100644
--- a/addons/fetchmail/i18n/et.po
+++ b/addons/fetchmail/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-11 18:02+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index 6badee31915..e276d004d2f 100644
--- a/addons/fetchmail/i18n/fi.po
+++ b/addons/fetchmail/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-04 10:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Palvelimen nimi"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Skripti"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -67,9 +67,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Määritykset"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Skripti"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index dcb874cd7fd..e4d0beffed0 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 15:52+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
@@ -27,9 +27,9 @@ msgid "Server Name"
 msgstr "Nom du serveur"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -69,9 +69,9 @@ msgstr ""
 "de la taille de votre base de données des messages."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -160,6 +160,11 @@ msgstr "Options avancées"
 msgid "Configuration"
 msgstr "Configuration"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index def37317c24..641849db918 100644
--- a/addons/fetchmail/i18n/gl.po
+++ b/addons/fetchmail/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-22 22:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/hr.po b/addons/fetchmail/i18n/hr.po
index 749127f523f..62c8ed9b3ef 100644
--- a/addons/fetchmail/i18n/hr.po
+++ b/addons/fetchmail/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 09:36+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Ime Servera"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Skripta"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -67,9 +67,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -155,6 +155,11 @@ msgstr "Napredne mogućnosti"
 msgid "Configuration"
 msgstr "Postava"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Skripta"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 4ccea4d621e..54524bb204b 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 00:07+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -27,9 +27,9 @@ msgid "Server Name"
 msgstr "Kiszolgálónév"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Szkript"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr "Haladó beállítások"
 msgid "Configuration"
 msgstr "Beállítás"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Szkript"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index 66acbf25125..20e5ebbff7c 100644
--- a/addons/fetchmail/i18n/it.po
+++ b/addons/fetchmail/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 00:30+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Nome Server"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -69,9 +69,9 @@ msgstr ""
 "duplica il peso del database dei messaggi."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -159,6 +159,11 @@ msgstr "Impostazioni avanzate"
 msgid "Configuration"
 msgstr "Configurazione"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/ja.po b/addons/fetchmail/i18n/ja.po
index c6ed72edca9..b9d9a4ed023 100644
--- a/addons/fetchmail/i18n/ja.po
+++ b/addons/fetchmail/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:18+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "サーバ名"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "スクリプト"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr "Eメールの原本を保存して、処理済みメッセージを添付するかどうかの指定。これを指定すると、メッセージ・データベースのサイズが倍になります。"
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr "高度なオプション"
 msgid "Configuration"
 msgstr "設定"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "スクリプト"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index 00f0d91259d..6c1a66842a5 100644
--- a/addons/fetchmail/i18n/lt.po
+++ b/addons/fetchmail/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-16 21:18+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index dba28fbad37..49ee373562a 100644
--- a/addons/fetchmail/i18n/lv.po
+++ b/addons/fetchmail/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 22:58+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/mk.po b/addons/fetchmail/i18n/mk.po
index 592ad6b51c5..c31c8f882be 100644
--- a/addons/fetchmail/i18n/mk.po
+++ b/addons/fetchmail/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-18 16:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 2c588dcac64..505c0088fc2 100644
--- a/addons/fetchmail/i18n/mn.po
+++ b/addons/fetchmail/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 14:04+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"Last-Translator: soyoko <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Серверийн Нэр"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Скрипт"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -74,9 +74,9 @@ msgstr ""
 "your message database."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -164,6 +164,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Тохиргоо"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Скрипт"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/nb.po b/addons/fetchmail/i18n/nb.po
index 6eab383feb7..c1f439a346a 100644
--- a/addons/fetchmail/i18n/nb.po
+++ b/addons/fetchmail/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-08 18:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Tjener navn"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Manus"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -69,9 +69,9 @@ msgstr ""
 "meldingen database."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Manus"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 6d338e31a14..cdbf3946e4d 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 19:08+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 19:13+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Servernaam"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -69,9 +69,9 @@ msgstr ""
 "zal meestal de grootte van uw berichtendatabase verdubbelen."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr "De inkomende molestverzekering instellen."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -159,6 +159,11 @@ msgstr "Geavanceerde opties"
 msgid "Configuration"
 msgstr "Instellingen"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index fbdecce05bd..7dfb609a649 100644
--- a/addons/fetchmail/i18n/pl.po
+++ b/addons/fetchmail/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-10 08:36+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,8 +28,8 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
+#: view:fetchmail.server:0
+msgid "POP"
 msgstr ""
 
 #. module: fetchmail
@@ -63,8 +63,8 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
 msgstr ""
 
 #. module: fetchmail
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index dc58b15e8f7..041c2bd13a4 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 16:37+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Nome do Servidor"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -70,9 +70,9 @@ msgstr ""
 "tamanho da sua base de dados de mensagens."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -160,6 +160,11 @@ msgstr "Opções avançadas"
 msgid "Configuration"
 msgstr "Configuração"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 4553a196454..6e49cad4fc2 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 00:43+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -29,9 +29,9 @@ msgid "Server Name"
 msgstr "Nome do Servidor"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -71,9 +71,9 @@ msgstr ""
 "espaço de mensagens"
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -161,6 +161,11 @@ msgstr "Opções Avançadas"
 msgid "Configuration"
 msgstr "Configuração"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index c789c0c894c..13ba0148688 100644
--- a/addons/fetchmail/i18n/ro.po
+++ b/addons/fetchmail/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-26 06:05+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Numele Serverului"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -69,9 +69,9 @@ msgstr ""
 "dubla dimensiunea bazei d-voastra de date de mesaje."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -160,6 +160,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configurare"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index 49deebd6ad5..c478df063a4 100644
--- a/addons/fetchmail/i18n/ru.po
+++ b/addons/fetchmail/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Название сервера"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Скрипт"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -69,9 +69,9 @@ msgstr ""
 "размер базы данных сообщений."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -159,6 +159,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Конфигурация"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Скрипт"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
index 0beada67006..abe1bc5892f 100644
--- a/addons/fetchmail/i18n/sl.po
+++ b/addons/fetchmail/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-22 16:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index 9656c70c382..7271edf5350 100644
--- a/addons/fetchmail/i18n/sr.po
+++ b/addons/fetchmail/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-17 07:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,8 +28,8 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
+#: view:fetchmail.server:0
+msgid "POP"
 msgstr ""
 
 #. module: fetchmail
@@ -63,8 +63,8 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
 msgstr ""
 
 #. module: fetchmail
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index 81f7ca3a4fd..4c8b45dd5a7 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 16:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,8 +28,8 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
+#: view:fetchmail.server:0
+msgid "POP"
 msgstr ""
 
 #. module: fetchmail
@@ -63,8 +63,8 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
 msgstr ""
 
 #. module: fetchmail
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index 0a4738ac2a3..73e39559ab5 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-27 14:41+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Servernamn"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Skript"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -68,9 +68,9 @@ msgstr ""
 "göra din meddelandedatabas dubbelt så stor."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -158,6 +158,11 @@ msgstr ""
 msgid "Configuration"
 msgstr "Inställningar"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Skript"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index 48a42810263..a1f0842a861 100644
--- a/addons/fetchmail/i18n/tr.po
+++ b/addons/fetchmail/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "Sunucu Adı"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "Script"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -68,9 +68,9 @@ msgstr ""
 "çıkaracaktır."
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -158,6 +158,11 @@ msgstr "Gelişmiş seçenekler"
 msgid "Configuration"
 msgstr "Yapılandırma"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Script"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 47586212d35..5c76f14bbc8 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-20 08:02+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr ""
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr ""
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 9a2ff824da7..1d7147d73da 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-27 03:49+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 03:34+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -28,9 +28,9 @@ msgid "Server Name"
 msgstr "服务器名称"
 
 #. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
-msgstr "脚本"
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
@@ -63,9 +63,9 @@ msgid ""
 msgstr "是不是把每个邮件的内容复制并附加到每次处理内容上。这一般会占用双倍的消息数据库。"
 
 #. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
-msgstr "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr "配置收取邮件网关"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -151,6 +151,11 @@ msgstr "高级选项"
 msgid "Configuration"
 msgstr "配置"
 
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "脚本"
+
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
diff --git a/addons/fleet/i18n/es.po b/addons/fleet/i18n/es.po
index 7bf3d8c7366..08b33e4c700 100644
--- a/addons/fleet/i18n/es.po
+++ b/addons/fleet/i18n/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 01:27+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
@@ -85,6 +85,7 @@ msgstr "Reflotar rotores"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
@@ -141,10 +142,9 @@ msgid "Liter"
 msgstr "Litro"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
-msgstr "Padre"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
 
 #. module: fleet
 #: view:board.board:0
@@ -172,7 +172,7 @@ msgid "Refueling Details"
 msgstr "Detalles de reabastecimiento de combustible"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr "¡%s contrato(s) necesita(n) ser renovado(s) o cerrado(s)!"
@@ -298,6 +298,11 @@ msgstr "¡Operación no permitida!"
 msgid "Messages"
 msgstr "Mensajes"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -387,7 +392,7 @@ msgid "Transmission Used by the vehicle"
 msgstr "Transmisión usada por el vehículo"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -530,6 +535,11 @@ msgstr "Contratista"
 msgid "License Plate"
 msgstr "Matrícula"
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr "Para cerrar"
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -567,7 +577,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr "Total de contratos vencidos o casi vencidos"
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -592,7 +602,7 @@ msgid "Car Wash"
 msgstr "Lavado de coche"
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr "Conductor del vehículo"
 
@@ -719,7 +729,7 @@ msgid "Brake Inspection"
 msgstr "Inspección de frenos"
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr "Estado actual del vehículo"
 
@@ -734,7 +744,7 @@ msgid "Wheel Bearing Replacement"
 msgstr "Repuesto de la rueda del cojinete"
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr "Tipo de coste comprado con este coste"
 
@@ -786,13 +796,9 @@ msgstr "Neumáticos de nieve"
 msgid "Date when the cost has been executed"
 msgstr "Fecha en la que se ha ejecutado el coste"
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr "Pedido"
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr "Costes de los vehículos"
 
@@ -836,18 +842,13 @@ msgid "Other Maintenance"
 msgstr "Otro mantenimiento"
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr "Modelo"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr "Padre"
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr "Foto pequeña"
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr "Estado"
@@ -969,10 +970,9 @@ msgid "Services Logs"
 msgstr "Registros de los servicios"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
-msgstr "Vaciar el valor del odómetro de un vehículo no está permitido."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
@@ -1054,6 +1054,12 @@ msgstr "Tipo de combustible"
 msgid "Fuel Injector Replacement"
 msgstr "Repuesto del inyector de combustible"
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1080,7 +1086,7 @@ msgid "Rotor Replacement"
 msgstr "Repuesto del rotor"
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr "Marca del vehículo"
 
@@ -1117,7 +1123,7 @@ msgid "Odometer Details"
 msgstr "Detalles del odómetro"
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr "Conductor"
 
@@ -1198,10 +1204,22 @@ msgid "Odometer Values Per Month"
 msgstr "Valores del odómetro por mes"
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos electrónicos"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un nuevo modelo.\n"
+"</p><p>\n"
+"Puede definir varios modelos (por ejemplo, A3, A4) para cada marca (Audi).\n"
+"</p>\n"
+"            "
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1346,6 +1364,11 @@ msgstr ""
 msgid "Emissions"
 msgstr "Emisiones"
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr "Modelo de un vehículo"
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1379,6 +1402,7 @@ msgstr "Valor del coche"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1481,9 +1505,9 @@ msgid "Oil Change"
 msgstr "Cambio de aceite"
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr "Para cerrar"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr "Foto pequeña"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
@@ -1519,22 +1543,10 @@ msgstr ""
 "            "
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear un nuevo modelo.\n"
-"</p><p>\n"
-"Puede definir varios modelos (por ejemplo, A3, A4) para cada marca (Audi).\n"
-"</p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr "Modelo"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1566,12 +1578,6 @@ msgstr "En proceso"
 msgid "Yearly"
 msgstr "Anualmente"
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr "Estados del vehículo"
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1724,6 +1730,12 @@ msgstr "¡El vehículo %s ha sido añadido a la flota!"
 msgid "Price"
 msgstr "Precio"
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr "Valor del odómetro"
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1918,6 +1930,11 @@ msgstr "Repuesto del/de los limpiaparabrisas"
 msgid "Generated Costs"
 msgstr "Costes generados"
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1948,9 +1965,10 @@ msgid "Services Costs"
 msgstr "Costes de los servicios"
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
-msgstr "Modelo de un vehículo"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr "Vaciar el valor del odómetro de un vehículo no está permitido."
 
 #. module: fleet
 #: help:fleet.vehicle,seats:0
@@ -1958,10 +1976,9 @@ msgid "Number of seats of the vehicle"
 msgstr "Nº de asientos del vehículo"
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
-msgstr "Valor del odómetro"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
diff --git a/addons/fleet/i18n/fr.po b/addons/fleet/i18n/fr.po
index c36a8b9b1f1..5ac65b27c64 100644
--- a/addons/fleet/i18n/fr.po
+++ b/addons/fleet/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 15:53+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
@@ -84,6 +84,7 @@ msgstr "Machiner les rotors"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Grouper par..."
 
@@ -140,9 +141,8 @@ msgid "Liter"
 msgstr "Litre"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
 msgstr ""
 
 #. module: fleet
@@ -171,7 +171,7 @@ msgid "Refueling Details"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr "%s contrat(s) à renouveler et/ou à clôturer!"
@@ -294,6 +294,11 @@ msgstr "Vous n'avez pas la permission d'effectuer cette opération !"
 msgid "Messages"
 msgstr "Messages"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -383,7 +388,7 @@ msgid "Transmission Used by the vehicle"
 msgstr "Transmission de ce véhicule"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -527,6 +532,11 @@ msgstr "Contractant"
 msgid "License Plate"
 msgstr "Plaque d'immatriculatin"
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr "à clôturer"
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -564,7 +574,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr "Type"
 
@@ -589,7 +599,7 @@ msgid "Car Wash"
 msgstr "Lavage de voiture"
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr "Conducteur du véhicule"
 
@@ -715,7 +725,7 @@ msgid "Brake Inspection"
 msgstr "Inspection des freins"
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr "Status actuel du véhicule"
 
@@ -730,7 +740,7 @@ msgid "Wheel Bearing Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr "Type de dépense"
 
@@ -782,13 +792,9 @@ msgstr "Pneu hivers/contacte"
 msgid "Date when the cost has been executed"
 msgstr "Date de réalisation de la dépense"
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr "Commande"
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr "Coûts des véhicules"
 
@@ -833,18 +839,13 @@ msgid "Other Maintenance"
 msgstr "Autre maintenance"
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr "Modèle de voiture"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr "Photo (petite taille)"
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr "État"
@@ -968,10 +969,9 @@ msgid "Services Logs"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
-msgstr "La remise à zéro du kilométrage du véhicule est interdite."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
@@ -1053,6 +1053,12 @@ msgstr "Type de carburant"
 msgid "Fuel Injector Replacement"
 msgstr ""
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1079,7 +1085,7 @@ msgid "Rotor Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr "Marque du véhicule"
 
@@ -1116,7 +1122,7 @@ msgid "Odometer Details"
 msgstr "Détail kilométrique"
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr "Conducteur"
 
@@ -1197,10 +1203,23 @@ msgid "Odometer Values Per Month"
 msgstr "Kilomètrage par mois"
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaires et emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Cliquer ici pour ajouter un nouveau modèle.\n"
+"              </p><p>\n"
+"               Vous pouvez ajouter différentes modèles (e.g. A3, A4) pour "
+"chaque marque (Audi).\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1347,6 +1366,11 @@ msgstr ""
 msgid "Emissions"
 msgstr ""
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr "Modèle d'un véhicule"
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1382,6 +1406,7 @@ msgstr "Valeur de la voiture"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1484,9 +1509,9 @@ msgid "Oil Change"
 msgstr "Vidange"
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr "à clôturer"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr "Photo (petite taille)"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
@@ -1524,23 +1549,10 @@ msgstr ""
 "            "
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"               Cliquer ici pour ajouter un nouveau modèle.\n"
-"              </p><p>\n"
-"               Vous pouvez ajouter différentes modèles (e.g. A3, A4) pour "
-"chaque marque (Audi).\n"
-"              </p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr "Modèle de voiture"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1572,12 +1584,6 @@ msgstr "En cours"
 msgid "Yearly"
 msgstr "Annuel"
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr "Etats du véhicule"
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1730,6 +1736,12 @@ msgstr "Le véhicule %s à été ajouter à la flotte"
 msgid "Price"
 msgstr "Prix"
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr "Kilomètrage"
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1926,6 +1938,11 @@ msgstr ""
 msgid "Generated Costs"
 msgstr "Coût"
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1956,9 +1973,10 @@ msgid "Services Costs"
 msgstr "Coût des interventions"
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
-msgstr "Modèle d'un véhicule"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr "La remise à zéro du kilométrage du véhicule est interdite."
 
 #. module: fleet
 #: help:fleet.vehicle,seats:0
@@ -1966,10 +1984,9 @@ msgid "Number of seats of the vehicle"
 msgstr "Numbre de places dans le véhicule"
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
-msgstr "Kilomètrage"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
diff --git a/addons/fleet/i18n/hr.po b/addons/fleet/i18n/hr.po
index 6ad43aa3293..1a8fa5ab112 100644
--- a/addons/fleet/i18n/hr.po
+++ b/addons/fleet/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-13 14:24+0000\n"
 "Last-Translator: Dario Meniss <dario.meniss@slobodni-programi.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -83,6 +83,7 @@ msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
@@ -139,10 +140,9 @@ msgid "Liter"
 msgstr "Litra"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
-msgstr "Nadređeni"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
 
 #. module: fleet
 #: view:board.board:0
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr ""
@@ -293,6 +293,11 @@ msgstr ""
 msgid "Messages"
 msgstr "Poruke"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -382,7 +387,7 @@ msgid "Transmission Used by the vehicle"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -504,6 +509,11 @@ msgstr ""
 msgid "License Plate"
 msgstr ""
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -541,7 +551,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr ""
 
@@ -566,7 +576,7 @@ msgid "Car Wash"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr ""
 
@@ -684,7 +694,7 @@ msgid "Brake Inspection"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr ""
 
@@ -699,7 +709,7 @@ msgid "Wheel Bearing Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr ""
 
@@ -747,13 +757,9 @@ msgstr ""
 msgid "Date when the cost has been executed"
 msgstr ""
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr ""
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr ""
 
@@ -795,18 +801,13 @@ msgid "Other Maintenance"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr ""
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr "Nadređeni"
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr ""
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr ""
@@ -920,9 +921,8 @@ msgid "Services Logs"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
 msgstr ""
 
 #. module: fleet
@@ -1003,6 +1003,12 @@ msgstr ""
 msgid "Fuel Injector Replacement"
 msgstr ""
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1029,7 +1035,7 @@ msgid "Rotor Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr ""
 
@@ -1066,7 +1072,7 @@ msgid "Odometer Details"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr ""
 
@@ -1144,9 +1150,15 @@ msgid "Odometer Values Per Month"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: fleet
@@ -1265,6 +1277,11 @@ msgstr ""
 msgid "Emissions"
 msgstr ""
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1289,6 +1306,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1388,8 +1406,8 @@ msgid "Oil Change"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
 msgstr ""
 
 #. module: fleet
@@ -1420,15 +1438,9 @@ msgid ""
 msgstr ""
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
 msgstr ""
 
 #. module: fleet
@@ -1461,12 +1473,6 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr ""
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1619,6 +1625,12 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1799,6 +1811,11 @@ msgstr ""
 msgid "Generated Costs"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1822,8 +1839,9 @@ msgid "Services Costs"
 msgstr ""
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
 msgstr ""
 
 #. module: fleet
@@ -1832,9 +1850,8 @@ msgid "Number of seats of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
 msgstr ""
 
 #. module: fleet
diff --git a/addons/fleet/i18n/it.po b/addons/fleet/i18n/it.po
index feafa5d1e39..b09eeee8e3d 100644
--- a/addons/fleet/i18n/it.po
+++ b/addons/fleet/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 23:13+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
@@ -83,6 +83,7 @@ msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
@@ -139,10 +140,9 @@ msgid "Liter"
 msgstr "Litro"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
-msgstr "Genitore"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
 
 #. module: fleet
 #: view:board.board:0
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr "Dettagli Rifornimento"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr "contratto/i %s necessita/no di essere rinnovato/i e/o chiuso/i!"
@@ -293,6 +293,11 @@ msgstr "Operazione non permessa!"
 msgid "Messages"
 msgstr "Messaggi"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -382,7 +387,7 @@ msgid "Transmission Used by the vehicle"
 msgstr "Trasmissione utilizzata dal veicolo"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -506,6 +511,11 @@ msgstr "Contraente"
 msgid "License Plate"
 msgstr "Targa"
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -543,7 +553,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -568,7 +578,7 @@ msgid "Car Wash"
 msgstr "Lavaggio macchina"
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr "Conducente del veicolo"
 
@@ -686,7 +696,7 @@ msgid "Brake Inspection"
 msgstr "Ispezione freni"
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr "Stato attuale del veicolo"
 
@@ -701,7 +711,7 @@ msgid "Wheel Bearing Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr ""
 
@@ -749,13 +759,9 @@ msgstr "Gomme da neve"
 msgid "Date when the cost has been executed"
 msgstr "Data del sostenimento del costo"
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr "Ordine"
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr "Costi veicoli"
 
@@ -797,18 +803,13 @@ msgid "Other Maintenance"
 msgstr "Altre manutenzioni"
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr "Marchio modello"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr "Genitore"
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr "Fototessera"
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr "Stato"
@@ -922,9 +923,8 @@ msgid "Services Logs"
 msgstr "Log servizi"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
 msgstr ""
 
 #. module: fleet
@@ -1007,6 +1007,12 @@ msgstr "Tipo di carburante"
 msgid "Fuel Injector Replacement"
 msgstr ""
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1033,7 +1039,7 @@ msgid "Rotor Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr ""
 
@@ -1070,7 +1076,7 @@ msgid "Odometer Details"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr ""
 
@@ -1148,9 +1154,15 @@ msgid "Odometer Values Per Month"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: fleet
@@ -1269,6 +1281,11 @@ msgstr ""
 msgid "Emissions"
 msgstr ""
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1293,6 +1310,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1392,9 +1410,9 @@ msgid "Oil Change"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr ""
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr "Fototessera"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
@@ -1424,16 +1442,10 @@ msgid ""
 msgstr ""
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
-msgstr ""
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr "Marchio modello"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1465,12 +1477,6 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr ""
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1623,6 +1629,12 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1803,6 +1815,11 @@ msgstr ""
 msgid "Generated Costs"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1826,8 +1843,9 @@ msgid "Services Costs"
 msgstr ""
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
 msgstr ""
 
 #. module: fleet
@@ -1836,9 +1854,8 @@ msgid "Number of seats of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
 msgstr ""
 
 #. module: fleet
diff --git a/addons/fleet/i18n/nl.po b/addons/fleet/i18n/nl.po
index ce2d2d0e61a..b5be1f7cb40 100644
--- a/addons/fleet/i18n/nl.po
+++ b/addons/fleet/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 13:59+0000\n"
 "Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
@@ -83,6 +83,7 @@ msgstr "Reviseren remschijven"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
@@ -139,10 +140,9 @@ msgid "Liter"
 msgstr "Liter"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
-msgstr "Bovenliggende"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
 
 #. module: fleet
 #: view:board.board:0
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr "Tankbeurt gegevens"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr "%s contract(en) moet(en) vernieuwd en/of afgelosten worden!"
@@ -297,6 +297,11 @@ msgstr "Handeling niet toegestaan!"
 msgid "Messages"
 msgstr "Berichten"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -386,7 +391,7 @@ msgid "Transmission Used by the vehicle"
 msgstr "Transmissie van het voertuig"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -534,6 +539,11 @@ msgstr ""
 msgid "License Plate"
 msgstr "Kentekenplaat"
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr "Te sluiten"
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -571,7 +581,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr "Type"
 
@@ -596,7 +606,7 @@ msgid "Car Wash"
 msgstr "Car Wash"
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr "Bestuurder van het voertuig"
 
@@ -724,7 +734,7 @@ msgid "Brake Inspection"
 msgstr "Reminspectie"
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr "Huidige staat van het voertuig"
 
@@ -739,7 +749,7 @@ msgid "Wheel Bearing Replacement"
 msgstr "Wiellager vervangen"
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr ""
 
@@ -791,13 +801,9 @@ msgstr "Winterbanden"
 msgid "Date when the cost has been executed"
 msgstr "Datum waarop de kosten zijn gemaakt"
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr ""
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr "Voertuig kosten"
 
@@ -841,18 +847,13 @@ msgid "Other Maintenance"
 msgstr "Overig onderhoud"
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr "Merk"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr "Bovenliggende"
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr "Kleine foto"
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr "Status"
@@ -975,12 +976,9 @@ msgid "Services Logs"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
 msgstr ""
-"Het opnieuw instellen van de kilometerstand van een voertuig is niet "
-"toegestaan."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
@@ -1062,6 +1060,12 @@ msgstr "Brandstof type"
 msgid "Fuel Injector Replacement"
 msgstr "Brandstof injector vervangen"
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1088,7 +1092,7 @@ msgid "Rotor Replacement"
 msgstr "Rotor vervangen"
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr "Merk van het voertuig"
 
@@ -1125,7 +1129,7 @@ msgid "Odometer Details"
 msgstr "Kilometer details"
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr "Bestuurder"
 
@@ -1206,10 +1210,23 @@ msgid "Odometer Values Per Month"
 msgstr "Km-standen per maand"
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een nieuw model aan te makenl.\n"
+"              </p><p>\n"
+"                U kunt verschillende modellen definiëren (bijv. A3, A4) voor "
+"ieder merk (Audi).\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1354,6 +1371,11 @@ msgstr ""
 msgid "Emissions"
 msgstr "Emissies"
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr "Model van een voertuig"
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1390,6 +1412,7 @@ msgstr "Voertuig waarde"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1492,9 +1515,9 @@ msgid "Oil Change"
 msgstr "Olie verversen"
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr "Te sluiten"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr "Kleine foto"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
@@ -1530,23 +1553,10 @@ msgstr ""
 "            "
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik om een nieuw model aan te makenl.\n"
-"              </p><p>\n"
-"                U kunt verschillende modellen definiëren (bijv. A3, A4) voor "
-"ieder merk (Audi).\n"
-"              </p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr "Merk"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1578,12 +1588,6 @@ msgstr "In behandeling"
 msgid "Yearly"
 msgstr "Jaarlijks"
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr "Voertuig statussen"
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1736,6 +1740,12 @@ msgstr "Voertuig %s is toegevoegd aan het wagenpark!"
 msgid "Price"
 msgstr "Prijs"
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr "Kilometerstand"
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1933,6 +1943,11 @@ msgstr "Ruitenwisser(s) vervangen"
 msgid "Generated Costs"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1963,9 +1978,12 @@ msgid "Services Costs"
 msgstr "Service kosten"
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
-msgstr "Model van een voertuig"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+"Het opnieuw instellen van de kilometerstand van een voertuig is niet "
+"toegestaan."
 
 #. module: fleet
 #: help:fleet.vehicle,seats:0
@@ -1973,10 +1991,9 @@ msgid "Number of seats of the vehicle"
 msgstr "Aantal zitplaatsen van het voertuig"
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
-msgstr "Kilometerstand"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
diff --git a/addons/fleet/i18n/pl.po b/addons/fleet/i18n/pl.po
index 806442af9ad..318aba60063 100644
--- a/addons/fleet/i18n/pl.po
+++ b/addons/fleet/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-13 21:08+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -83,6 +83,7 @@ msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
@@ -139,10 +140,9 @@ msgid "Liter"
 msgstr "Litr"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
-msgstr "Nadrzędne"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
 
 #. module: fleet
 #: view:board.board:0
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr ""
@@ -293,6 +293,11 @@ msgstr ""
 msgid "Messages"
 msgstr "Wiadomości"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -382,7 +387,7 @@ msgid "Transmission Used by the vehicle"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -504,6 +509,11 @@ msgstr ""
 msgid "License Plate"
 msgstr ""
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -541,7 +551,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr ""
 
@@ -566,7 +576,7 @@ msgid "Car Wash"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr ""
 
@@ -684,7 +694,7 @@ msgid "Brake Inspection"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr ""
 
@@ -699,7 +709,7 @@ msgid "Wheel Bearing Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr ""
 
@@ -747,13 +757,9 @@ msgstr ""
 msgid "Date when the cost has been executed"
 msgstr ""
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr ""
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr ""
 
@@ -795,18 +801,13 @@ msgid "Other Maintenance"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr ""
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr "Nadrzędne"
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr ""
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr ""
@@ -920,9 +921,8 @@ msgid "Services Logs"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
 msgstr ""
 
 #. module: fleet
@@ -1003,6 +1003,12 @@ msgstr ""
 msgid "Fuel Injector Replacement"
 msgstr ""
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1029,7 +1035,7 @@ msgid "Rotor Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr ""
 
@@ -1066,7 +1072,7 @@ msgid "Odometer Details"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr ""
 
@@ -1144,9 +1150,15 @@ msgid "Odometer Values Per Month"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: fleet
@@ -1265,6 +1277,11 @@ msgstr ""
 msgid "Emissions"
 msgstr ""
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1289,6 +1306,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1388,8 +1406,8 @@ msgid "Oil Change"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
 msgstr ""
 
 #. module: fleet
@@ -1420,15 +1438,9 @@ msgid ""
 msgstr ""
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
 msgstr ""
 
 #. module: fleet
@@ -1461,12 +1473,6 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr ""
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1619,6 +1625,12 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1799,6 +1811,11 @@ msgstr ""
 msgid "Generated Costs"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1822,8 +1839,9 @@ msgid "Services Costs"
 msgstr ""
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
 msgstr ""
 
 #. module: fleet
@@ -1832,9 +1850,8 @@ msgid "Number of seats of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
 msgstr ""
 
 #. module: fleet
diff --git a/addons/fleet/i18n/pt.po b/addons/fleet/i18n/pt.po
index 62ab6d482b6..2c8f817f08e 100644
--- a/addons/fleet/i18n/pt.po
+++ b/addons/fleet/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 10:39+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -83,6 +83,7 @@ msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
@@ -139,9 +140,8 @@ msgid "Liter"
 msgstr "Litro"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
 msgstr ""
 
 #. module: fleet
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr "Detalhes de reabastecimento"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr ""
@@ -293,6 +293,11 @@ msgstr "Operação não permitida!"
 msgid "Messages"
 msgstr "Mensagens"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -382,7 +387,7 @@ msgid "Transmission Used by the vehicle"
 msgstr "Tipo de transmissão usada no veículo"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -504,6 +509,11 @@ msgstr ""
 msgid "License Plate"
 msgstr "Matrícula"
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -541,7 +551,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -566,7 +576,7 @@ msgid "Car Wash"
 msgstr "Lavagem de carro"
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr "Condutor do veículo"
 
@@ -684,7 +694,7 @@ msgid "Brake Inspection"
 msgstr "Inspeção aos travões"
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr "Estado atual do veículo"
 
@@ -699,7 +709,7 @@ msgid "Wheel Bearing Replacement"
 msgstr "Substituição do rolamento da roda"
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr ""
 
@@ -747,13 +757,9 @@ msgstr "Pneus de neve"
 msgid "Date when the cost has been executed"
 msgstr ""
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr ""
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr "Custos do veículo"
 
@@ -795,18 +801,13 @@ msgid "Other Maintenance"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr "Marca do modelo"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr "Foto de tamanho pequeno"
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr ""
@@ -920,9 +921,8 @@ msgid "Services Logs"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
 msgstr ""
 
 #. module: fleet
@@ -1003,6 +1003,12 @@ msgstr "Tipo de combustível"
 msgid "Fuel Injector Replacement"
 msgstr ""
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1029,7 +1035,7 @@ msgid "Rotor Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr "Marca do veículo"
 
@@ -1066,7 +1072,7 @@ msgid "Odometer Details"
 msgstr "Detalhes do conta quilómetros"
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr "Condutor"
 
@@ -1144,10 +1150,16 @@ msgid "Odometer Values Per Month"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1265,6 +1277,11 @@ msgstr ""
 msgid "Emissions"
 msgstr ""
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1289,6 +1306,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1388,9 +1406,9 @@ msgid "Oil Change"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr ""
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr "Foto de tamanho pequeno"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
@@ -1420,16 +1438,10 @@ msgid ""
 msgstr ""
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
-msgstr ""
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr "Marca do modelo"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1461,12 +1473,6 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr ""
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1619,6 +1625,12 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1799,6 +1811,11 @@ msgstr ""
 msgid "Generated Costs"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1822,8 +1839,9 @@ msgid "Services Costs"
 msgstr ""
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
 msgstr ""
 
 #. module: fleet
@@ -1832,9 +1850,8 @@ msgid "Number of seats of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
 msgstr ""
 
 #. module: fleet
diff --git a/addons/fleet/i18n/ru.po b/addons/fleet/i18n/ru.po
index 441dacb8cf7..facf9efa968 100644
--- a/addons/fleet/i18n/ru.po
+++ b/addons/fleet/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-30 19:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -83,6 +83,7 @@ msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr ""
 
@@ -139,9 +140,8 @@ msgid "Liter"
 msgstr ""
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
 msgstr ""
 
 #. module: fleet
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr ""
@@ -293,6 +293,11 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -382,7 +387,7 @@ msgid "Transmission Used by the vehicle"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -504,6 +509,11 @@ msgstr ""
 msgid "License Plate"
 msgstr ""
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -541,7 +551,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr ""
 
@@ -566,7 +576,7 @@ msgid "Car Wash"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr ""
 
@@ -684,7 +694,7 @@ msgid "Brake Inspection"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr ""
 
@@ -699,7 +709,7 @@ msgid "Wheel Bearing Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr ""
 
@@ -747,13 +757,9 @@ msgstr ""
 msgid "Date when the cost has been executed"
 msgstr ""
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr ""
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr ""
 
@@ -795,18 +801,13 @@ msgid "Other Maintenance"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr ""
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr ""
@@ -920,9 +921,8 @@ msgid "Services Logs"
 msgstr ""
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
 msgstr ""
 
 #. module: fleet
@@ -1003,6 +1003,12 @@ msgstr ""
 msgid "Fuel Injector Replacement"
 msgstr ""
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1029,7 +1035,7 @@ msgid "Rotor Replacement"
 msgstr ""
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr ""
 
@@ -1066,7 +1072,7 @@ msgid "Odometer Details"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr ""
 
@@ -1144,9 +1150,15 @@ msgid "Odometer Values Per Month"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: fleet
@@ -1265,6 +1277,11 @@ msgstr ""
 msgid "Emissions"
 msgstr ""
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1289,6 +1306,7 @@ msgstr ""
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1388,8 +1406,8 @@ msgid "Oil Change"
 msgstr ""
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
 msgstr ""
 
 #. module: fleet
@@ -1420,15 +1438,9 @@ msgid ""
 msgstr ""
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
 msgstr ""
 
 #. module: fleet
@@ -1461,12 +1473,6 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr ""
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1619,6 +1625,12 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1799,6 +1811,11 @@ msgstr ""
 msgid "Generated Costs"
 msgstr ""
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1822,8 +1839,9 @@ msgid "Services Costs"
 msgstr ""
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
 msgstr ""
 
 #. module: fleet
@@ -1832,9 +1850,8 @@ msgid "Number of seats of the vehicle"
 msgstr ""
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
 msgstr ""
 
 #. module: fleet
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po
index 660ab4702c1..2cbcf3bba0e 100644
--- a/addons/fleet/i18n/zh_CN.po
+++ b/addons/fleet/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-06 13:05+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 05:12+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -83,6 +83,7 @@ msgstr "重置转轮"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Group By..."
 msgstr "分组于..."
 
@@ -139,10 +140,9 @@ msgid "Liter"
 msgstr "升"
 
 #. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
-msgstr "上一级"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
 
 #. module: fleet
 #: view:board.board:0
@@ -170,7 +170,7 @@ msgid "Refueling Details"
 msgstr "加油明细"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
 msgstr "%s续期的合同或需要终止！"
@@ -293,6 +293,11 @@ msgstr "不允许的操作！"
 msgid "Messages"
 msgstr "消息"
 
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
@@ -343,7 +348,7 @@ msgstr "选择合同是否依旧有效"
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Automatic"
-msgstr "自动"
+msgstr "自动档"
 
 #. module: fleet
 #: help:fleet.vehicle,message_unread:0
@@ -382,7 +387,7 @@ msgid "Transmission Used by the vehicle"
 msgstr "车辆的变速器"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
 #: view:fleet.vehicle.log.contract:0
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
@@ -501,7 +506,11 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"\t\t 单击，创建一个新的费用。\n"
+"                                       单击，创建一个新的成本费用。\n"
+"                          </p><p>\n"
+"                           OpenERP 帮你管理不同车辆的成本费用. 成本费用被自动从\n"
+"                            服务，合同（固定或者定期的）和加油记录中创建.\n"
+"              </p>\n"
 "            "
 
 #. module: fleet
@@ -519,6 +528,11 @@ msgstr "承包人"
 msgid "License Plate"
 msgstr "车辆牌照"
 
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr "将关闭"
+
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
@@ -556,7 +570,7 @@ msgid "Total of contracts due or overdue minus one"
 msgstr "到期或逾期合同汇总"
 
 #. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Type"
 msgstr "类型"
 
@@ -581,7 +595,7 @@ msgid "Car Wash"
 msgstr "洗车"
 
 #. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
 msgid "Driver of the vehicle"
 msgstr "车辆驾驶员"
 
@@ -705,14 +719,14 @@ msgid "Brake Inspection"
 msgstr "检查制动器"
 
 #. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
 msgid "Current state of the vehicle"
 msgstr "车辆的当前状态"
 
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Manual"
-msgstr "手册"
+msgstr "手动档"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_52
@@ -720,7 +734,7 @@ msgid "Wheel Bearing Replacement"
 msgstr "更换轮毂轴承"
 
 #. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
 msgid "Cost type purchased with this cost"
 msgstr "本笔费用与购买的成本类型"
 
@@ -772,13 +786,9 @@ msgstr "雪地胎"
 msgid "Date when the cost has been executed"
 msgstr "费用已形成的日期"
 
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr "次序"
-
 #. module: fleet
 #: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
 msgid "Vehicles costs"
 msgstr "车辆费用"
 
@@ -820,18 +830,13 @@ msgid "Other Maintenance"
 msgstr "其他维护"
 
 #. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr "品牌型号"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr "上一级"
 
 #. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
-msgstr "小尺寸图片"
-
-#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
 #: view:fleet.vehicle.state:0
 msgid "State"
 msgstr "状态"
@@ -952,10 +957,9 @@ msgid "Services Logs"
 msgstr "服务日志"
 
 #. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
-msgstr "不允许私自清空车辆的里程表值。"
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
@@ -1035,6 +1039,12 @@ msgstr "燃油类型"
 msgid "Fuel Injector Replacement"
 msgstr "更换化油器"
 
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
@@ -1061,7 +1071,7 @@ msgid "Rotor Replacement"
 msgstr "更换转子"
 
 #. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
 msgid "Brand of the vehicle"
 msgstr "车辆的品牌"
 
@@ -1098,7 +1108,7 @@ msgid "Odometer Details"
 msgstr "里程表详细信息"
 
 #. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
 msgid "Driver"
 msgstr "驾驶员"
 
@@ -1176,10 +1186,22 @@ msgid "Odometer Values Per Month"
 msgstr "每月里程表值"
 
 #. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击添加新的型号。\n"
+"              </p><p>\n"
+"                你能为每个品牌(Audi)定义多个型号(例如：A3, A4)。\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1312,6 +1334,11 @@ msgstr "定期支付费用，这取决于成本的频率。]如果成本频率
 msgid "Emissions"
 msgstr "排量"
 
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr "车辆型号"
+
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1345,6 +1372,7 @@ msgstr "车辆价值"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
 #: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
@@ -1444,9 +1472,9 @@ msgid "Oil Change"
 msgstr "用油变化"
 
 #. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
-msgstr "将关闭"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr "小尺寸图片"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
@@ -1478,22 +1506,10 @@ msgstr ""
 "            "
 
 #. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new model.\n"
-"              </p><p>\n"
-"                You can define several models (e.g. A3, A4) for each brand "
-"(Audi).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                单击添加新的型号。\n"
-"              </p><p>\n"
-"                你能为每个品牌(Audi)定义多个型号(例如：A3, A4)。\n"
-"              </p>\n"
-"            "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr "品牌型号"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1525,12 +1541,6 @@ msgstr "进行中"
 msgid "Yearly"
 msgstr "年度"
 
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr "车辆状态"
-
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
@@ -1683,6 +1693,12 @@ msgstr "车辆%s 加入车队"
 msgid "Price"
 msgstr "价格"
 
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr "行驶里程数"
+
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.cost:0
@@ -1874,6 +1890,11 @@ msgstr "更换雨刷"
 msgid "Generated Costs"
 msgstr "已产生的费用"
 
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
@@ -1902,9 +1923,10 @@ msgid "Services Costs"
 msgstr "服务成本"
 
 #. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
-msgstr "车辆型号"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr "不允许私自清空车辆的里程表值。"
 
 #. module: fleet
 #: help:fleet.vehicle,seats:0
@@ -1912,10 +1934,9 @@ msgid "Number of seats of the vehicle"
 msgstr "车辆座位数"
 
 #. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
-msgstr "行驶里程数"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
diff --git a/addons/google_base_account/i18n/ar.po b/addons/google_base_account/i18n/ar.po
index 46102882059..e5ca40c5927 100644
--- a/addons/google_base_account/i18n/ar.po
+++ b/addons/google_base_account/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 00:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/de.po b/addons/google_base_account/i18n/de.po
index 617e7a3b03b..dc4d94f71c0 100644
--- a/addons/google_base_account/i18n/de.po
+++ b/addons/google_base_account/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 07:02+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
diff --git a/addons/google_base_account/i18n/es.po b/addons/google_base_account/i18n/es.po
index 47f3a3289d6..7453933b5ea 100644
--- a/addons/google_base_account/i18n/es.po
+++ b/addons/google_base_account/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 22:01+0000\n"
 "Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/es_CR.po b/addons/google_base_account/i18n/es_CR.po
index 69da6a3f470..1cd55d6d01b 100644
--- a/addons/google_base_account/i18n/es_CR.po
+++ b/addons/google_base_account/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 22:13+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/fi.po b/addons/google_base_account/i18n/fi.po
index 6adea28ab69..ce73c27d83b 100644
--- a/addons/google_base_account/i18n/fi.po
+++ b/addons/google_base_account/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-19 12:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/fr.po b/addons/google_base_account/i18n/fr.po
index e472f409c9e..4b9db5f35b2 100644
--- a/addons/google_base_account/i18n/fr.po
+++ b/addons/google_base_account/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-12 21:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/hr.po b/addons/google_base_account/i18n/hr.po
index 23505ff5e0b..e0237ad8f7c 100644
--- a/addons/google_base_account/i18n/hr.po
+++ b/addons/google_base_account/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:22+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/it.po b/addons/google_base_account/i18n/it.po
index b581fc960bd..0c72105891c 100644
--- a/addons/google_base_account/i18n/it.po
+++ b/addons/google_base_account/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 20:51+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ja.po b/addons/google_base_account/i18n/ja.po
index 2dad35b3cb7..ce81aacf925 100644
--- a/addons/google_base_account/i18n/ja.po
+++ b/addons/google_base_account/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 06:48+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/mn.po b/addons/google_base_account/i18n/mn.po
index b23391e2fc9..418d51b2edf 100644
--- a/addons/google_base_account/i18n/mn.po
+++ b/addons/google_base_account/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-08 03:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/nb.po b/addons/google_base_account/i18n/nb.po
index 8bb45f9ae7c..23b93d7a626 100644
--- a/addons/google_base_account/i18n/nb.po
+++ b/addons/google_base_account/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-07 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/nl.po b/addons/google_base_account/i18n/nl.po
index b2757274ca0..fb9b43178e9 100644
--- a/addons/google_base_account/i18n/nl.po
+++ b/addons/google_base_account/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 19:09+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pl.po b/addons/google_base_account/i18n/pl.po
index 28fbfece3df..3f6586c7962 100644
--- a/addons/google_base_account/i18n/pl.po
+++ b/addons/google_base_account/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-02 14:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pt.po b/addons/google_base_account/i18n/pt.po
index 6f65c6f7fcd..5b300e671b1 100644
--- a/addons/google_base_account/i18n/pt.po
+++ b/addons/google_base_account/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:52+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
index 617274741d6..10fcac795f1 100644
--- a/addons/google_base_account/i18n/pt_BR.po
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 22:43+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ro.po b/addons/google_base_account/i18n/ro.po
index 183912bc566..5243155cf9a 100644
--- a/addons/google_base_account/i18n/ro.po
+++ b/addons/google_base_account/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-13 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ru.po b/addons/google_base_account/i18n/ru.po
index 36f4495324e..cb46324272a 100644
--- a/addons/google_base_account/i18n/ru.po
+++ b/addons/google_base_account/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-26 14:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sl.po b/addons/google_base_account/i18n/sl.po
index 918367bc221..09e517077c5 100644
--- a/addons/google_base_account/i18n/sl.po
+++ b/addons/google_base_account/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-13 22:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sr@latin.po b/addons/google_base_account/i18n/sr@latin.po
index be0a0ccdadb..fe145226a23 100644
--- a/addons/google_base_account/i18n/sr@latin.po
+++ b/addons/google_base_account/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-05 15:32+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
index 9af28fd9cf5..5381eed707e 100644
--- a/addons/google_base_account/i18n/sv.po
+++ b/addons/google_base_account/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-04 09:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/tr.po b/addons/google_base_account/i18n/tr.po
index 7c39f419717..eccc6892595 100644
--- a/addons/google_base_account/i18n/tr.po
+++ b/addons/google_base_account/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 22:04+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/zh_CN.po b/addons/google_base_account/i18n/zh_CN.po
index 7a1d8ffd646..39499de29cb 100644
--- a/addons/google_base_account/i18n/zh_CN.po
+++ b/addons/google_base_account/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 15:28+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_docs/i18n/de.po b/addons/google_docs/i18n/de.po
index c9b5d26fa8e..5fde2e4201a 100644
--- a/addons/google_docs/i18n/de.po
+++ b/addons/google_docs/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 11:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "Fehler im 'Key' !"
@@ -106,7 +106,7 @@ msgstr ""
 "ist die ID die folgende `spreadsheet:123456789`"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
@@ -115,21 +115,21 @@ msgstr ""
 "docs URL finden."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr "Es kann nur ein google doc zur gleichen Zeit bearbeitet werden"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "Google Docs Fehler !"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -160,7 +160,7 @@ msgid "User Google credentials are not yet set."
 msgstr "Die google Anmeldedaten wurden noch nicht hinterlegt."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr "Ihr google doc Bezeichnungsmuster konnte hier nicht gefunden werden"
diff --git a/addons/google_docs/i18n/es.po b/addons/google_docs/i18n/es.po
index 787308ffb38..067a5de15ab 100644
--- a/addons/google_docs/i18n/es.po
+++ b/addons/google_docs/i18n/es.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 12:51+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "¡Error de clave!"
@@ -106,7 +106,7 @@ msgstr ""
 "el id. es `spreadsheet:123456789`"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
@@ -115,22 +115,22 @@ msgstr ""
 "docs."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
 "Crear un documento google solo puede ser hecho por uno al mismo tiempo."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "¡Error Google Dos!"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -160,7 +160,7 @@ msgid "User Google credentials are not yet set."
 msgstr "Las credenciales de usuario Google aún no se han establecido."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/google_docs/i18n/fr.po b/addons/google_docs/i18n/fr.po
index d7637ea6d25..c142246abc2 100644
--- a/addons/google_docs/i18n/fr.po
+++ b/addons/google_docs/i18n/fr.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-19 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 13:47+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "Erreur de clé!"
@@ -106,7 +106,7 @@ msgstr ""
 " l'ID est `spreadsheet:123456789`"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
@@ -115,21 +115,21 @@ msgstr ""
 "l'url associée document Google."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr "Vous ne pouvez créer qu'un seul document google à la fois."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "Erreur Google Docs!"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -162,7 +162,7 @@ msgstr ""
 "été configurés"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr "Le nom du document google associé n'a pas été trouvé dans cet objet."
@@ -227,4 +227,4 @@ msgstr "ir.attachment"
 #. module: google_docs
 #: field:google.docs.config,name_template:0
 msgid "Google Doc Name Pattern"
-msgstr ""
+msgstr "Motif de nom de document Google"
diff --git a/addons/google_docs/i18n/hr.po b/addons/google_docs/i18n/hr.po
index 570863480ea..ab824c8072a 100644
--- a/addons/google_docs/i18n/hr.po
+++ b/addons/google_docs/i18n/hr.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:25+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr ""
@@ -89,28 +89,28 @@ msgid ""
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "Google Docs greška!"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -139,7 +139,7 @@ msgid "User Google credentials are not yet set."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/google_docs/i18n/it.po b/addons/google_docs/i18n/it.po
index a545f2673ee..4a29169753e 100644
--- a/addons/google_docs/i18n/it.po
+++ b/addons/google_docs/i18n/it.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 22:11+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "Errore Chiave!"
@@ -105,7 +105,7 @@ msgstr ""
 "l'ID è `spreadsheet:123456789`"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
@@ -113,22 +113,22 @@ msgstr ""
 "Il vostro ID risorsa non è corretto. Potete trovarlo nell'URL di google docs"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
 "La creazione di documenti google può essere fatto solo uno alla volta."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "Errore Google Docs!"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -159,7 +159,7 @@ msgid "User Google credentials are not yet set."
 msgstr "Credenziali utente google non ancora impostate."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/google_docs/i18n/nl.po b/addons/google_docs/i18n/nl.po
index 0e78c20dcee..ba9aa0534bd 100644
--- a/addons/google_docs/i18n/nl.po
+++ b/addons/google_docs/i18n/nl.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 16:42+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "Key fout!"
@@ -89,28 +89,28 @@ msgid ""
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "Google Docs fout!"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -139,7 +139,7 @@ msgid "User Google credentials are not yet set."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/google_docs/i18n/pl.po b/addons/google_docs/i18n/pl.po
index 5cf104cc964..5241d7dc20c 100644
--- a/addons/google_docs/i18n/pl.po
+++ b/addons/google_docs/i18n/pl.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:28+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "Błąd klucza"
@@ -89,28 +89,28 @@ msgid ""
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -139,7 +139,7 @@ msgid "User Google credentials are not yet set."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/google_docs/i18n/pt.po b/addons/google_docs/i18n/pt.po
index d43da575fc7..2737bab7d7e 100644
--- a/addons/google_docs/i18n/pt.po
+++ b/addons/google_docs/i18n/pt.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 17:49+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr ""
@@ -89,28 +89,28 @@ msgid ""
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -139,7 +139,7 @@ msgid "User Google credentials are not yet set."
 msgstr ""
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/google_docs/i18n/pt_BR.po b/addons/google_docs/i18n/pt_BR.po
index f3cb6eda1b8..06a3aee036e 100644
--- a/addons/google_docs/i18n/pt_BR.po
+++ b/addons/google_docs/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 22:47+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Key Error!"
 msgstr "Erro de Chave!"
@@ -106,7 +106,7 @@ msgstr ""
 "o ID é `spreadsheet:123456789`"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
 #, python-format
 msgid ""
 "Your resource id is not correct. You can find the id in the google docs URL."
@@ -114,21 +114,21 @@ msgstr ""
 "Sua id de recurso não está correta. Você encontra a id na url do google docs."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr "A criação de documentos do google deve ser feita um de cada vez."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
 #, python-format
 msgid "Google Docs Error!"
 msgstr "Erro do Google Docs!"
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
@@ -159,7 +159,7 @@ msgid "User Google credentials are not yet set."
 msgstr "As credenciais de usuário do Google ainda não foram definidas."
 
 #. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index d60f00b8c44..b031752d48d 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "القسم"
 
@@ -365,12 +366,6 @@ msgstr "شكل الموظفين و الهيئة"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "فئات الموظفين"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "قسم الموارد البشرية"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1086,6 +1076,9 @@ msgstr ""
 #~ "يمكنك تعزيز تطبيق قاعدة الموارد البشرية بتثبيت قليل من الموارد البشرية "
 #~ "المتعلقة بالوظائف."
 
+#~ msgid "hr.department"
+#~ msgstr "قسم الموارد البشرية"
+
 #~ msgid "Categories structure"
 #~ msgstr "هيكل الفئات"
 
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index dfa5604a968..68ea07c28e7 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Отдел"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Категории на служители"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "отдел чов. ресурси"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1017,6 +1007,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Вторник"
 
+#~ msgid "hr.department"
+#~ msgstr "отдел чов. ресурси"
+
 #~ msgid "Day of week"
 #~ msgstr "Ден от седмицата"
 
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 7faec944183..1e4c18291cd 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-21 12:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali <bn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "বিভাগ"
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 943026b22db..9c315a931f9 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Odjeljenje"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorije uposlenika"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "Odjeljenje ljudskih resursa"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1025,6 +1015,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Utorak"
 
+#~ msgid "hr.department"
+#~ msgstr "Odjeljenje ljudskih resursa"
+
 #~ msgid "Day of week"
 #~ msgstr "Dan u sedmici"
 
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 57ab3eddd88..26a76053262 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departament"
 
@@ -366,12 +367,6 @@ msgstr "Formulari i estructura de l'empleat"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categories d'empleats"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1032,6 +1022,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Dimarts"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Monday"
 #~ msgstr "Dilluns"
 
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index fa7497e1e53..b9689959ac5 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Oddělení"
 
@@ -367,12 +368,6 @@ msgstr "Formulář a struktura zaměstnance"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorie zaměstnanců"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1103,6 +1093,9 @@ msgstr ""
 #~ "Umožní vám vytvořit nebo spravovat pravidelné vyhodnocení a přehledy "
 #~ "výkonnosti zaměstnanců."
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Je spojeno s vedoucím oddělení"
 
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index b2a0440d81b..39ebd40ec21 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr ""
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 08a219c7e1b..c5b0513e714 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 14:36+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -95,6 +95,7 @@ msgstr "Regelmässige Mitarbeiter Beurteilung"
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Abteilung"
 
@@ -379,12 +380,6 @@ msgstr "Mitarbeiter Formular und Struktur"
 msgid "Manage employees expenses"
 msgstr "Verwalte Spesen der Mitarbeiter"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr "Stellenbesetzung für diese Position nach erfolgreicher Einstellung."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -744,10 +739,10 @@ msgid "This installs the module hr_timesheet."
 msgstr "Hierdurch wird das Modul hr_timesheet installiert."
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr "Stellenbesetzung für diese Position nach erfolgreicher Einstellung."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -813,11 +808,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Mitarbeiter Kategorien"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1116,6 +1106,9 @@ msgstr "Anwenden"
 #~ msgid "Tuesday"
 #~ msgstr "Dienstag"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Monday"
 #~ msgstr "Montag"
 
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index fcd9b219896..1f9ffa2c8f3 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -94,6 +94,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Τμήμα"
 
@@ -367,12 +368,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -690,9 +685,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -745,11 +740,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Κατηγορίες Εργαζομένων"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "Τμήμα Ανθρωπίνων Πόρων"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1025,6 +1015,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Τρίτη"
 
+#~ msgid "hr.department"
+#~ msgstr "Τμήμα Ανθρωπίνων Πόρων"
+
 #~ msgid "Monday"
 #~ msgstr "Δευτέρα"
 
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index ef480674a92..add47b66e10 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-04 11:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr ""
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index 075f0067306..0f3bff99845 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Department"
 
@@ -367,12 +368,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -690,9 +685,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -745,11 +740,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1111,6 +1101,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuration Progress"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "It is linked with manager of Department"
 
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 348a0f2d60a..fb4e43a5f00 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-12 12:42+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 23:05+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -94,6 +94,7 @@ msgstr "Organice las evaluaciones periodicas de los empleados."
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -378,13 +379,6 @@ msgstr "Formulario y estructura del empleado"
 msgid "Manage employees expenses"
 msgstr "Gestión de gastos de los empleados"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-"Número previsto de empleados para este puesto tras las nuevas contrataciones."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -733,10 +727,11 @@ msgid "This installs the module hr_timesheet."
 msgstr "Se instalará el módulo hr_timesheet."
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
+"Número previsto de empleados para este puesto tras las nuevas contrataciones."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -798,11 +793,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorías de empleados"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.departamento"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -866,7 +856,7 @@ msgstr "Notas"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Subordinate Hierarchy"
-msgstr "Jerarquía subirdinada"
+msgstr "Jerarquía subordinada"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -1090,6 +1080,9 @@ msgstr "Aplicar"
 #~ msgid "Tuesday"
 #~ msgstr "martes"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.departamento"
+
 #~ msgid "Monday"
 #~ msgstr "lunes"
 
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index 9dbf6dd9190..6da2fe6e1a4 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-15 20:12+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorías de empleados"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1004,6 +994,9 @@ msgstr ""
 #~ msgid "Maried"
 #~ msgstr "Casado"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Create openerp user"
 #~ msgstr "Crear usuario OpenERP"
 
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index 4674d9b744f..8011dcacde9 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 04:34+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -366,12 +367,6 @@ msgstr "Formulario y estructura del empleado"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorías de empleados"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.departamento"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1113,6 +1103,9 @@ msgstr ""
 #~ "Le permite crear y gestionar la evaluación periódica y revisión de la "
 #~ "productividad de los empleados."
 
+#~ msgid "hr.department"
+#~ msgstr "hr.departamento"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Está vinculado con el director del departamento."
 
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index fd499ca9ca6..458b455b417 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-15 22:19+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: hr
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -367,12 +368,6 @@ msgstr "Formulario y estructura del empleado"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,9 +687,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorías de empleados"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.departamento"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1041,6 +1031,9 @@ msgstr ""
 #~ msgid "Categories of Employee"
 #~ msgstr "Categorías de empleado"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.departamento"
+
 #~ msgid ""
 #~ "Here you can manage your work force by creating employees and assigning them "
 #~ "specific properties in the system. Maintain all employee related information "
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 4d0359a16ef..1cb3fd06f05 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-10 17:20+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -367,14 +368,6 @@ msgstr "Formulario y estructura del empleado"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-"Número de Empleados para este puesto de trabajo después de las nuevas "
-"contrataciones"
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -694,10 +687,12 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Número de Empleados para este puesto de trabajo después de las nuevas "
+"contrataciones"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -749,11 +744,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorías de empleados"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "Departamento"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1029,6 +1019,9 @@ msgstr ""
 #~ msgid "Maried"
 #~ msgstr "Casado"
 
+#~ msgid "hr.department"
+#~ msgstr "Departamento"
+
 #~ msgid "Create openerp user"
 #~ msgstr "Crear usuario OpenERP"
 
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 5a83f1c3886..43b276428c5 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Osakond"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Töötajate kategooriad"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 89e2c02f204..3f6019e9400 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:05+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Osasto"
 
@@ -367,12 +368,6 @@ msgstr "Työntekijälomake ja rakenne"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -690,9 +685,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -745,11 +740,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Työntekijöiden kategoriat"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1092,6 +1082,9 @@ msgstr ""
 #~ msgid "Working Time Category"
 #~ msgstr "Työaika kategoria"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Employee Complete Form"
 #~ msgstr "Työntekijän täysi lomake"
 
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 3927c24d806..0befa8e7400 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Département"
 
@@ -366,12 +367,6 @@ msgstr "Formulaire et structure des employés"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Catégories des employés"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1032,6 +1022,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Mardi"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Monday"
 #~ msgstr "Lundi"
 
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index ce37bd14cc9..1f3cc22a4c9 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-29 14:12+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: French (Belgium) <fr_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr ""
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index 0a1e95578f7..a7ba15a9bca 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:31+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -367,12 +368,6 @@ msgstr "Formulario e estrutura do empregado"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,9 +687,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorías de empregados"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.departamento"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1120,6 +1110,9 @@ msgstr ""
 #~ "Permítelle crear e xestionar a avaliación periódica e revisión da "
 #~ "productividade dos empregados."
 
+#~ msgid "hr.department"
+#~ msgstr "hr.departamento"
+
 #~ 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"
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index 8f49bdbced3..c46387443fc 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-28 09:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "વિભાગ"
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index 38f0a08572d..3f2e42c78dc 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 04:56+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "विभाग"
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 2a7f691ec0f..8a30104d5fe 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 10:27+0000\n"
 "Last-Translator: Velimir Valjetic <velimir.valjetic@procudo.hr>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -95,6 +95,7 @@ msgstr "Organiziraj periodične procjene radnika."
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Odjel"
 
@@ -378,13 +379,6 @@ msgstr "Forma i struktura djelatnika"
 msgid "Manage employees expenses"
 msgstr "Upravljaj troškovima radnika"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-"Očekivani broj radnika za ovo radno mjesto nakon novog procesa zapošljavanja."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -747,10 +741,11 @@ msgid "This installs the module hr_timesheet."
 msgstr "Ovo instalira modul hr_timesheet."
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
+"Očekivani broj radnika za ovo radno mjesto nakon novog procesa zapošljavanja."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -817,11 +812,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorije djelatnika"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1305,6 +1295,9 @@ msgstr "Primjeni"
 #~ "Omogućava kreiranje i upravljanje periodičkom procjenom i provjerom "
 #~ "učinkovitosti djelatnika."
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Povezano je s upraviteljem odjela"
 
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index 57b207a5598..82805ae8b7f 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Osztály, részleg"
 
@@ -364,12 +365,6 @@ msgstr "Alkalmazotti űrlap és struktúra"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -689,9 +684,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -744,11 +739,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Munkavállalói kategóriák"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1024,6 +1014,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Kép"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "HR menedzser vezérlőpult"
 
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index 1c7b2791529..b08e095efc9 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departemen"
 
@@ -366,12 +367,6 @@ msgstr "Formulir karyawan dan struktur"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategori Karyawan"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "departemen hr"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1247,6 +1237,9 @@ msgstr ""
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "Dasbor Manager HR"
 
+#~ msgid "hr.department"
+#~ msgstr "departemen hr"
+
 #~ msgid "Create your Employees"
 #~ msgstr "Buat Karyawan"
 
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 3514ae99c6c..50356a87174 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 19:47+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
@@ -93,6 +93,7 @@ msgstr "Organizza la valutazione periodica dei dipendenti"
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -374,14 +375,6 @@ msgstr "Modulo dipendenti e struttura"
 msgid "Manage employees expenses"
 msgstr "Gestisci i rimborsi ai dipendenti"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-"Numero atteso di dipendenti per questa posizione lavorativa dopo le nuove "
-"assunzioni."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -738,10 +731,12 @@ msgid "This installs the module hr_timesheet."
 msgstr "Installa il modulo hr_timesheet."
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
+"Numero atteso di dipendenti per questa posizione lavorativa dopo le nuove "
+"assunzioni."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -804,11 +799,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorie Dipendenti"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1109,6 +1099,9 @@ msgstr "Applica"
 #~ msgid "Tuesday"
 #~ msgstr "Martedì"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Monday"
 #~ msgstr "Lunedì"
 
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index f2814c22fe4..6d939b2c784 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:16+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "部門"
 
@@ -365,12 +366,6 @@ msgstr "従業員票と構造"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "従業員カテゴリー"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1031,6 +1021,9 @@ msgstr ""
 #~ msgid "Create your Employees"
 #~ msgstr "従業員を作成する。"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "人事マネジャのダッシュボード"
 
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 9097d766cf9..0cfa491eb21 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:21+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "부서"
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "직원 카테고리"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "인사부서"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1029,6 +1019,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "화요일"
 
+#~ msgid "hr.department"
+#~ msgstr "인사부서"
+
 #~ msgid "Create openerp user"
 #~ msgstr "Openerp 사용자 만들기"
 
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index d09ef45a725..6c8b0ebc6b1 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 13:41+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "ຫ້ອງການ"
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 0d1efb595c0..4ade6847606 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-22 07:48+0000\n"
 "Last-Translator: nanothole <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Padalinys"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Darbuotojų kategorijos"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "Padalinys"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1073,6 +1063,9 @@ msgstr ""
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Užpildyti darbuotojo kontaktinę informaciją"
 
+#~ msgid "hr.department"
+#~ msgstr "Padalinys"
+
 #~ msgid "Create OpenERP User"
 #~ msgstr "Sukurti OpenERP naudotoją"
 
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index 066e9079647..d3f18c1f1cd 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departaments"
 
@@ -367,12 +368,6 @@ msgstr "Darbinieka forma un struktūra"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,9 +687,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Darbinieku Kategorijas"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1033,6 +1023,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Otrdiena"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Create openerp user"
 #~ msgstr "Izveidot Openerp lietotāju"
 
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index 5c75b47848e..c0b6b315817 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:31+0000\n"
 "Last-Translator: Nikola Stojanoski <nstojanoski@vion.mk>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Сектор"
 
@@ -368,12 +369,6 @@ msgstr "Структура на вработените"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -693,9 +688,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -748,11 +743,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Категории на вработените"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1251,6 +1241,9 @@ msgstr ""
 #~ "Генерички систем на Платните Списоци интегрирани со Сметководствената Бизнис "
 #~ "Апликација."
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Create your Employees"
 #~ msgstr "Креирајте ги Вработените"
 
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 14f71956a12..950d969ad20 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Unurjargal <unuruu25@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -98,6 +98,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Хэлтэс"
 
@@ -373,12 +374,6 @@ msgstr "Ажилтны маягт, бүтэц"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -696,9 +691,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -751,11 +746,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Ажилчдын зэрэглэл"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "Хэлтэс"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1278,6 +1268,9 @@ msgstr ""
 #~ msgid "Generic Payroll system Integrated with Accountings."
 #~ msgstr "Санхүү бүртгэлтэй нэгдмэл цалингийн ерөнхий систем"
 
+#~ msgid "hr.department"
+#~ msgstr "Хэлтэс"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for human resource management. You can manage:\n"
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index 2aafa4fc137..fb106187cc8 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:16+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Avdeling"
 
@@ -367,12 +368,6 @@ msgstr "Ansatt form og struktur."
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,9 +687,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Ansattkategorier"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1018,6 +1008,9 @@ msgstr ""
 #~ msgid "Categories of Employee"
 #~ msgstr "Ansattgrupper"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Recruitment Process"
 #~ msgstr "Rekurtteringsprosess"
 
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index e595f00e012..bcd9decdbd0 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 15:03+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -94,6 +94,7 @@ msgstr "Organiseer periodieke werknemer beoordelingen"
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Afdeling"
 
@@ -379,12 +380,6 @@ msgstr "Werknemerformulier en structuur"
 msgid "Manage employees expenses"
 msgstr "Beheers werknemers declaraties"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -708,10 +703,10 @@ msgid "This installs the module hr_timesheet."
 msgstr "Dit installeert de module hr_timesheet."
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -765,11 +760,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorieën werknemers"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1084,6 +1074,9 @@ msgstr "Toepassen"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor weergave!"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Day of week"
 #~ msgstr "Dag van de week"
 
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index d59df9f4272..07977890a4e 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-10 10:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr ""
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 77b286dff3c..f734fcef031 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 14:19+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Dział"
 
@@ -366,12 +367,6 @@ msgstr "Formularz pracownika"
 msgid "Manage employees expenses"
 msgstr "Wydatki pracownika"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -689,10 +684,10 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -744,11 +739,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorie pracowników"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 6345d5f7abe..cc29884e48d 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 17:21+0000\n"
 "Last-Translator: Alien Group Lda <aires.silvestre@gmail.com>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr "Organizar avaliação periódica de empregados"
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -371,12 +372,6 @@ msgstr "Formulário e estrutura do funcionário"
 msgid "Manage employees expenses"
 msgstr "Gerir despesas de empregados"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr "Número de empregados neste cargo após novo recrutamento."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -696,10 +691,10 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr "Número de empregados neste cargo após novo recrutamento."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -753,11 +748,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorias de funcionários"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1156,6 +1146,9 @@ msgstr "Aplicar"
 #~ msgid "Employee's timesheet group"
 #~ msgstr "Grupo de horários dos Funcionários"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Birthday"
 #~ msgstr "Data de Nascimento"
 
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index fb23e1a5abc..80fe8d8c532 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-16 23:42+0000\n"
 "Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departamento"
 
@@ -366,13 +367,6 @@ msgstr "Formulário de Funcionários e estrutura"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-"Número de empregados para esta posição após o novo processo de contratação."
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,10 +686,11 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Número de empregados para esta posição após o novo processo de contratação."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorias de Colaboradores"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "departamento.rh"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1063,6 +1053,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para Arquitetura da View"
 
+#~ msgid "hr.department"
+#~ msgstr "departamento.rh"
+
 #~ msgid "Employee's timesheet group"
 #~ msgstr "Grupo da Folha de Ponto de Colaboradores"
 
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index 1a7920d255a..fdf4c5d9350 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Departament"
 
@@ -366,12 +367,6 @@ msgstr "Formular si structura angajati"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Categorii Salariati"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "departament.resurse_umane"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1338,6 +1328,9 @@ msgstr ""
 #~ msgid "Create your Employees"
 #~ msgstr "Creati-va Angajatii"
 
+#~ msgid "hr.department"
+#~ msgstr "departament.resurse_umane"
+
 #~ msgid ""
 #~ "Your departments structure is used to manage all documents related to "
 #~ "employees by departments: expenses and timesheet validation, leaves "
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 3426d98c4c2..8a8d658d4fe 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:38+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Подразделение"
 
@@ -366,12 +367,6 @@ msgstr "??Форма и структура сотрудника"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,11 +741,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Категории сотрудников"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1228,6 +1218,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "Планируется сотрудников"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Связано с руководителем подразделения"
 
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 6ca07c59cbb..3892b7d94a0 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:14+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Oddelenie"
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Zamestnanecké kategórie"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1020,6 +1010,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Utorok"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Create openerp user"
 #~ msgstr "Vytvoriť používateľa openerp"
 
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index 9e503858918..9ccc895c426 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 04:58+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Oddelek"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorije zaposlenih"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1066,6 +1056,9 @@ msgstr ""
 #~ msgid "Job Information"
 #~ msgstr "informacije o poslu"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 #~ msgstr "Napaka! Ne morete izdelati rekurzivne hierarhije zaposlencev."
 
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index 82eb5ee180a..41cc20ed1bd 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr ""
 
@@ -365,12 +366,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index a62c7911fc9..aeaf09474dd 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 08:52+0000\n"
+"Last-Translator: Vlado Zvijer <vlado.zvijer@iinet.rs>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -50,7 +50,7 @@ msgstr "SIN Br"
 #: model:ir.ui.menu,name:hr.menu_hr_root
 #: model:ir.ui.menu,name:hr.menu_human_resources_configuration
 msgid "Human Resources"
-msgstr "Ljudski Resursi"
+msgstr "Људски ресурси"
 
 #. module: hr
 #: help:hr.employee,image_medium:0
@@ -69,7 +69,7 @@ msgstr ""
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr "Grupisano Po..."
+msgstr "Груписано по..."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Odeljenje"
 
@@ -367,12 +368,6 @@ msgstr "Forma Zapošljenih i struktura"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,9 +687,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorije zapošljenih"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1091,6 +1081,9 @@ msgstr ""
 #~ "Omogućava ti da kreiraš i upravljaš sa periodičnom procenama i performansama "
 #~ "pregleda zapošljenih."
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
 
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index 4fd78412676..4ae7b2f5dae 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:16+0000\n"
 "Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Odeljenje"
 
@@ -367,12 +368,6 @@ msgstr "Forma Zaposlenih i struktura"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -692,9 +687,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -747,11 +742,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Kategorije zaposlenih"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1024,6 +1014,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Slika"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Povezano je sa Menadžerom Odeljenja"
 
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 2aba653036c..2ac37c0a63f 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:16+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Avdelning"
 
@@ -366,12 +367,6 @@ msgstr "Anställdsformulär och struktur"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -639,7 +634,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr "adress"
+msgstr "ArbetsAdress"
 
 #. module: hr
 #: view:hr.employee:0
@@ -691,9 +686,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -746,15 +741,10 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Anställningskategorier"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Hemadress"
+msgstr "HemAdress"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
@@ -1106,6 +1096,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Employee Complete Form"
 #~ msgstr "Employee Complete Form"
 
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 06f4a280f3a..47f421c1250 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:49+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -92,6 +92,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "แผนก"
 
@@ -365,12 +366,6 @@ msgstr "โครงสร้างและรูปแบบพนักงา
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -688,9 +683,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -743,11 +738,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index b5aa98ae3d1..9020894982e 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr ""
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr ""
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index f6522306fc9..fa2271d7d43 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:31+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Bölüm"
 
@@ -366,12 +367,6 @@ msgstr "Çalışan formu ve yapısı"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -689,9 +684,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -744,11 +739,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Çalışanların Kategorileri"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "ik.bölümü"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1138,6 +1128,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Yapılandırma İşlemi"
 
+#~ msgid "hr.department"
+#~ msgstr "ik.bölümü"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Bölümün Müdürüne bağlanmıştır"
 
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index bbf2075c587..3d1356509e2 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Підрозділ"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Категорії працівників"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index c6f4dbe402d..8f1e719273a 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:14+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -97,6 +97,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "Phòng/Ban"
 
@@ -372,12 +373,6 @@ msgstr "hình thức và cấu trúc của nhân viên"
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -697,9 +692,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -752,11 +747,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "Loại nhân viên"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1110,6 +1100,9 @@ msgstr ""
 #~ msgid "Tuesday"
 #~ msgstr "Thứ ba"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "Timesheets"
 #~ msgstr "Bảng chấm công"
 
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index f0589308cb7..1edfb381530 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-06 03:12+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -96,6 +96,7 @@ msgstr "组织员工定期评估"
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "部门"
 
@@ -369,12 +370,6 @@ msgstr "员工组成与结构"
 msgid "Manage employees expenses"
 msgstr "管理员工的费用"
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr "新的招聘后这个工作岗位上期望的员工人数"
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -714,10 +709,10 @@ msgid "This installs the module hr_timesheet."
 msgstr "为此要安装模块hr_timesheet."
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr "新的招聘后这个工作岗位上期望的员工人数"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -777,11 +772,6 @@ msgstr "允许基于计工单开票（销售应用模块将被安装）"
 msgid "Employees Categories"
 msgstr "员工分类"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr "hr.department"
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
@@ -1193,6 +1183,9 @@ msgstr "接受"
 #~ msgid "Generic Payroll system."
 #~ msgstr "通用工资表系统"
 
+#~ msgid "hr.department"
+#~ msgstr "hr.department"
+
 #~ msgid "The chosen company is not in the allowed companies for this user"
 #~ msgstr "选择的公司不属于此用户允许访问的公司。"
 
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 22b4f23b81f..b962b5e623e 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -91,6 +91,7 @@ msgstr ""
 #: field:hr.employee,department_id:0
 #: view:hr.job:0
 #: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
 msgid "Department"
 msgstr "部門"
 
@@ -364,12 +365,6 @@ msgstr ""
 msgid "Manage employees expenses"
 msgstr ""
 
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid ""
-"Expected number of employees for this job position after new recruitment."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
@@ -687,9 +682,9 @@ msgid "This installs the module hr_timesheet."
 msgstr ""
 
 #. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -742,11 +737,6 @@ msgstr ""
 msgid "Employees Categories"
 msgstr "員工分類"
 
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
diff --git a/addons/hr_attendance/i18n/ar.po b/addons/hr_attendance/i18n/ar.po
index b3d85728cc0..4c87752c668 100644
--- a/addons/hr_attendance/i18n/ar.po
+++ b/addons/hr_attendance/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "اطبع تقرير الحضور شهرياً"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr "تجميع حسب..."
 msgid "October"
 msgstr "أكتوبر"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr "تحذير"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr "يونيو"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/bg.po b/addons/hr_attendance/i18n/bg.po
index cffca7b2e24..9931c567ce2 100644
--- a/addons/hr_attendance/i18n/bg.po
+++ b/addons/hr_attendance/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr "Групиране по..."
 msgid "October"
 msgstr "Октомври"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr "Предупреждение"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr "Юни"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/bs.po b/addons/hr_attendance/i18n/bs.po
index 351c3b5b9bd..4cff0fa1f82 100644
--- a/addons/hr_attendance/i18n/bs.po
+++ b/addons/hr_attendance/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/ca.po b/addons/hr_attendance/i18n/ca.po
index 84ec77861f5..de9215f863d 100644
--- a/addons/hr_attendance/i18n/ca.po
+++ b/addons/hr_attendance/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:21+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimeix informe d'assistència mensualment"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Agrupa per..."
 msgid "October"
 msgstr "Octubre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Avís"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Juny"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/cs.po b/addons/hr_attendance/i18n/cs.po
index 0021ee324bb..d410a7aa557 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:15+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: czech\n"
 
 #. module: hr_attendance
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Tisknout výkaz docházky měsíčně"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Seskupit podle..."
 msgid "October"
 msgstr "Říjen"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Varování"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Červen"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/da.po b/addons/hr_attendance/i18n/da.po
index 2423b5eee0b..5b33f9cc147 100644
--- a/addons/hr_attendance/i18n/da.po
+++ b/addons/hr_attendance/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index 620c5fd7d61..ac68bc76ecd 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 14:58+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -71,7 +71,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Druck Anwesenheitszeit des Monats"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "Anwesenheitszeiten der Woche"
@@ -96,6 +96,11 @@ msgstr "Gruppierung..."
 msgid "October"
 msgstr "Oktober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -176,11 +181,6 @@ msgstr "Warnung"
 msgid "Allocates attendance group to all users."
 msgstr "Zuweisen der Berechtigung zur Arbeitszeiteingabe für alle Benutzer"
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "unbekannt"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -192,7 +192,7 @@ msgid "June"
 msgstr "Juni"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "Anwesenheitszeiten des Monats"
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index 3840cd41fa1..6dd67f3fdd6 100644
--- a/addons/hr_attendance/i18n/el.po
+++ b/addons/hr_attendance/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 17:41+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -72,7 +72,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -97,6 +97,11 @@ msgstr "Ομαδοποίηση ανά..."
 msgid "October"
 msgstr "Οκτώβριος"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -177,11 +182,6 @@ msgstr "Warning"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -193,7 +193,7 @@ msgid "June"
 msgstr "Ιούνιος"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index f3b3eee6c85..bc2e1c3f707 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 11:56+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir informe de asistencia mensualmente"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "Asistencias por semana"
@@ -94,6 +94,11 @@ msgstr "Agrupar por..."
 msgid "October"
 msgstr "Octubre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Aviso"
 msgid "Allocates attendance group to all users."
 msgstr "Asigna asistencia en grupo para todos los usuarios"
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "desconocido"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Junio"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "Asistencias por mes"
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index f1bfa01188f..cef805b71b3 100644
--- a/addons/hr_attendance/i18n/es_AR.po
+++ b/addons/hr_attendance/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-15 20:45+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr ""
 msgid "October"
 msgstr "Octubre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Aviso"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Junio"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/es_CL.po b/addons/hr_attendance/i18n/es_CL.po
index 6eac5de65d6..a99e7abd915 100644
--- a/addons/hr_attendance/i18n/es_CL.po
+++ b/addons/hr_attendance/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-25 14:27+0000\n"
 "Last-Translator: Juano <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr "Agrupar por..."
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "Alerta"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "junio"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/es_CR.po b/addons/hr_attendance/i18n/es_CR.po
index e01ac8107e1..288fec6f7a9 100644
--- a/addons/hr_attendance/i18n/es_CR.po
+++ b/addons/hr_attendance/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 22:21+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: hr_attendance
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir informe de asistencia mensualmente"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Agrupar por..."
 msgid "October"
 msgstr "Octubre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Aviso"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Junio"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/es_EC.po b/addons/hr_attendance/i18n/es_EC.po
index 1e23b611924..76eb6649d8c 100644
--- a/addons/hr_attendance/i18n/es_EC.po
+++ b/addons/hr_attendance/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 00:40+0000\n"
 "Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
 "<chris.ormaza@gmail.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir informe de asistencia mensuales"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Agrupar por..."
 msgid "October"
 msgstr "Octubre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Alerta"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Junio"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/es_PY.po b/addons/hr_attendance/i18n/es_PY.po
index 959dd61eee6..2d27e1c5f71 100644
--- a/addons/hr_attendance/i18n/es_PY.po
+++ b/addons/hr_attendance/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-07 02:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir informe de presencia mensualmente"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Agrupar por..."
 msgid "October"
 msgstr "Octubre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Advertencia"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Junio"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index 412e2d23bf6..87b6b117a58 100644
--- a/addons/hr_attendance/i18n/et.po
+++ b/addons/hr_attendance/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr "Oktoober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "Juuni"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index bc2ff8de9b1..99a85b2c1a7 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Jenny Perttola <jenny.perttola@uta.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Tulosta läsnäoloraportti kuukausittain"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Ryhmittely.."
 msgid "October"
 msgstr "Lokakuu"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Varoitus"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Kesäkuu"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index 939659b16ce..a020dcd2055 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #, python-format
 #~ msgid "The Sign-in date must be in the past"
@@ -81,7 +81,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimer le rapport des présences par mois"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -106,6 +106,11 @@ msgstr "Regrouper par..."
 msgid "October"
 msgstr "Octobre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -186,11 +191,6 @@ msgstr "Avertissement"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -202,7 +202,7 @@ msgid "June"
 msgstr "Juin"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/gl.po b/addons/hr_attendance/i18n/gl.po
index 32f28724a2b..76e85c3f764 100644
--- a/addons/hr_attendance/i18n/gl.po
+++ b/addons/hr_attendance/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir informe de asistencia mensualmente"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Agrupar por..."
 msgid "October"
 msgstr "Outubro"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Aviso"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Xuño"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/he.po b/addons/hr_attendance/i18n/he.po
index bffdff5ae66..e525d6ceb1f 100644
--- a/addons/hr_attendance/i18n/he.po
+++ b/addons/hr_attendance/i18n/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-08 20:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/hr.po b/addons/hr_attendance/i18n/hr.po
index e3e43472a7e..aeaa24eecb1 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 13:07+0000\n"
 "Last-Translator: Velimir Valjetic <velimir.valjetic@procudo.hr>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "Prisutnost po tjednima"
@@ -94,6 +94,11 @@ msgstr "Grupiraj po..."
 msgid "October"
 msgstr "Listopad"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Upozorenje"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "nepoznato"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Lipanj"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "Prisutnost po mjesecima"
diff --git a/addons/hr_attendance/i18n/hu.po b/addons/hr_attendance/i18n/hu.po
index 00d7724032a..d712530c0e5 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 16:53+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Havi jelenléti ív nyomtatása"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr "Csoportosítás..."
 msgid "October"
 msgstr "Október"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr "Figyelmeztetés"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr "Június"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/id.po b/addons/hr_attendance/i18n/id.po
index 9fbef19f5ce..0476dc5d72d 100644
--- a/addons/hr_attendance/i18n/id.po
+++ b/addons/hr_attendance/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 06:35+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Cetak Kehadiran Laporan Bulanan"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Dikelompokan berdasarkan ..."
 msgid "October"
 msgstr "Oktober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Peringatan"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Juni"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index 9b7a7488aa7..4539d124909 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 14:05+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Stampa report presenze mensili"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "Presenza per settimana"
@@ -94,6 +94,11 @@ msgstr "Raggruppa per..."
 msgid "October"
 msgstr "Ottobre"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Attenzione"
 msgid "Allocates attendance group to all users."
 msgstr "Assegna il gruppo presenze a tutti gli utenti."
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "sconosciuto"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Giugno"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "Presenze per mese"
diff --git a/addons/hr_attendance/i18n/ja.po b/addons/hr_attendance/i18n/ja.po
index c0cefa873fe..cbc32a8d76b 100644
--- a/addons/hr_attendance/i18n/ja.po
+++ b/addons/hr_attendance/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:14+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "月間勤怠報告書を印刷"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr "グループ化…"
 msgid "October"
 msgstr "10月"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "警告"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "6月"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index 2a1bda3016a..fe535cbbdf6 100644
--- a/addons/hr_attendance/i18n/ko.po
+++ b/addons/hr_attendance/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:36+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr "10월"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "경고"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "6월"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/lt.po b/addons/hr_attendance/i18n/lt.po
index cb4e5e36da4..efc1ef6c2b3 100644
--- a/addons/hr_attendance/i18n/lt.po
+++ b/addons/hr_attendance/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/lv.po b/addons/hr_attendance/i18n/lv.po
index 89f07d30586..2c162ae2844 100644
--- a/addons/hr_attendance/i18n/lv.po
+++ b/addons/hr_attendance/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:07+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Drukāt Apmeklējuma Atskati (Mēnesis)"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Grupēt pēc..."
 msgid "October"
 msgstr "Oktobris"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Brīdinājums"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Jūnijs"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/mk.po b/addons/hr_attendance/i18n/mk.po
index 7eb1d33b9eb..e59d17feabb 100644
--- a/addons/hr_attendance/i18n/mk.po
+++ b/addons/hr_attendance/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Nikola Stojanoski <nstojanoski@vion.mk>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Испечатете Извештај за Присутноста по Месец"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Групирај По..."
 msgid "October"
 msgstr "Октомври"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Предупредување"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Јуни"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po
index e3a38e65628..3a827709529 100644
--- a/addons/hr_attendance/i18n/mn.po
+++ b/addons/hr_attendance/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:21+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Сар бүрийн ирцийн тайланг хэвлэх"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr "Бүлэглэх..."
 msgid "October"
 msgstr "10 сар"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "Анхааруулга"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "6 сар"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/nb.po b/addons/hr_attendance/i18n/nb.po
index b07d4821407..3e86346f873 100644
--- a/addons/hr_attendance/i18n/nb.po
+++ b/addons/hr_attendance/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Skriv ut Oppmøte Rapporter Månedlig."
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -95,6 +95,11 @@ msgstr "Grupper etter ..."
 msgid "October"
 msgstr "Oktober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Advarsel"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Juni"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index de2401b6693..c757fe83172 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 14:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
@@ -70,7 +70,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Maandelijks afdrukken aanwezigheidsoverzicht"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "Aanwezigheid per week"
@@ -95,6 +95,11 @@ msgstr "Groepeer op..."
 msgid "October"
 msgstr "Oktober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -175,11 +180,6 @@ msgstr "Waarschuwing"
 msgid "Allocates attendance group to all users."
 msgstr "Aanwezigheidsgroep toewijzen aan alle gebruikers."
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "onbekend"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -191,7 +191,7 @@ msgid "June"
 msgstr "Juni"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "Aanwezigheid per maand"
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index b11d82c3c83..ddd71772414 100644
--- a/addons/hr_attendance/i18n/nl_BE.po
+++ b/addons/hr_attendance/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-10 10:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index a8e53c44a6c..6ed5fd745ba 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 12:31+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "Obecności wg tygodni"
@@ -94,6 +94,11 @@ msgstr "Grupuj wg..."
 msgid "October"
 msgstr "Październik"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Ostrzeżenie"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "nieznane"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Czerwiec"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "Obecności w miesiącu"
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 291f02eb454..8e378d7fd56 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:55+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir Relatório de assiduidade Mensalmente"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Agrupar Por..."
 msgid "October"
 msgstr "Outubro"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Aviso"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Junho"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index a77acf2d47c..413ce27d40e 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:06+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Imprimir Relatório de Frequência Mensal"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Agrupar Por..."
 msgid "October"
 msgstr "Outubro"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Atenção"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Junho"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/ro.po b/addons/hr_attendance/i18n/ro.po
index 80964ef1786..f9b4ce7d179 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Tipariti Raportul Lunar de Prezenta"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Grupeaza dupa..."
 msgid "October"
 msgstr "Octombrie"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Atentionare"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Iunie"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index f24a065e398..313770119ae 100644
--- a/addons/hr_attendance/i18n/ru.po
+++ b/addons/hr_attendance/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -69,7 +69,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Печатать отчёт посещаемости ежемесячно"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -94,6 +94,11 @@ msgstr "Объединять по..."
 msgid "October"
 msgstr "Октябрь"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -174,11 +179,6 @@ msgstr "Предупреждение"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -190,7 +190,7 @@ msgid "June"
 msgstr "Июнь"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index 69df83dfbb0..ba210c80d0a 100644
--- a/addons/hr_attendance/i18n/sl.po
+++ b/addons/hr_attendance/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 05:36+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr "oktober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr "junij"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/sq.po b/addons/hr_attendance/i18n/sq.po
index 7f1d755eb98..38aea206ff0 100644
--- a/addons/hr_attendance/i18n/sq.po
+++ b/addons/hr_attendance/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/sr.po b/addons/hr_attendance/i18n/sr.po
index edfe0e07737..821d5eb0ff8 100644
--- a/addons/hr_attendance/i18n/sr.po
+++ b/addons/hr_attendance/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-17 23:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/sr@latin.po b/addons/hr_attendance/i18n/sr@latin.po
index ae167ef3c05..e0c8c06619a 100644
--- a/addons/hr_attendance/i18n/sr@latin.po
+++ b/addons/hr_attendance/i18n/sr@latin.po
@@ -7,37 +7,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2010-12-10 16:45+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 20:22+0000\n"
+"Last-Translator: Vlado Zvijer <vlado.zvijer@iinet.rs>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Štampanje mesečnog izveštaja prisutnosti"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "Pretraga prisutnosti"
 
 #. module: hr_attendance
 #: field:hr.employee,last_sign:0
 msgid "Last Sign"
-msgstr ""
+msgstr "Poslednja prijava"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr ""
+msgstr "Prisutnost"
 
 #. module: hr_attendance
 #. openerp-web
@@ -54,7 +54,7 @@ msgstr ""
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Obrazloženje razloga za prijavu/odjavu"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -65,13 +65,13 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Mesečno štampanje izveštaja prisutnosti"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
-msgstr ""
+msgstr "Nedeljna prisutnost"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -93,6 +93,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index b0dfd5fa8a7..a3000afd2f9 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-16 15:25+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Skriv ut månatlig närvarorapport"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr "Gruppera på..."
 msgid "October"
 msgstr "oktober"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "Varning"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "juni"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index d022f3340c2..655b8d86e4f 100644
--- a/addons/hr_attendance/i18n/tlh.po
+++ b/addons/hr_attendance/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 9ca7a690490..303a913d728 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "Devamlılık Raporunu Aylık olara Yazdır"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr "Gruplandır..."
 msgid "October"
 msgstr "Ekim"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "Uyarı"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "Haziran"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index a6c3d2c3f79..31ab63981d8 100644
--- a/addons/hr_attendance/i18n/uk.po
+++ b/addons/hr_attendance/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/vi.po b/addons/hr_attendance/i18n/vi.po
index e73af3f9dbd..4b7b5cbe25e 100644
--- a/addons/hr_attendance/i18n/vi.po
+++ b/addons/hr_attendance/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-20 08:34+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -68,7 +68,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -93,6 +93,11 @@ msgstr "Nhóm theo..."
 msgid "October"
 msgstr "Tháng Mười"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -173,11 +178,6 @@ msgstr "Cảnh báo"
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -189,7 +189,7 @@ msgid "June"
 msgstr "Tháng Sáu"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 37cf5420538..b3ceed41202 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 13:59+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr "打印每月考勤报表"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr "按周考勤"
@@ -92,6 +92,11 @@ msgstr "分组..."
 msgid "October"
 msgstr "10月"
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr "警告"
 msgid "Allocates attendance group to all users."
 msgstr "分配出席组给全体用户"
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr "未知"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr "6月"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr "月度出勤率"
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index 9afebb1162e..8c89a0909a4 100644
--- a/addons/hr_attendance/i18n/zh_TW.po
+++ b/addons/hr_attendance/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-23 17:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -67,7 +67,7 @@ msgid "Print Attendance Report Monthly"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
 msgstr ""
@@ -92,6 +92,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
 #: selection:hr.attendance,action:0
@@ -172,11 +177,6 @@ msgstr ""
 msgid "Allocates attendance group to all users."
 msgstr ""
 
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
@@ -188,7 +188,7 @@ msgid "June"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
 msgstr ""
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 9cc7d3d82cb..ec30f272924 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:48+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index c0223d9e3b0..db3c7ea84fb 100644
--- a/addons/hr_contract/i18n/bg.po
+++ b/addons/hr_contract/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index b8206d4516e..a257457c0dd 100644
--- a/addons/hr_contract/i18n/bs.po
+++ b/addons/hr_contract/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index 1f5734befd9..43bd0bc3d5c 100644
--- a/addons/hr_contract/i18n/ca.po
+++ b/addons/hr_contract/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 05:40+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index 4076a5e483e..96a18a78630 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openeobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 05:09+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/da.po b/addons/hr_contract/i18n/da.po
index e372237f8a5..41b7c38c996 100644
--- a/addons/hr_contract/i18n/da.po
+++ b/addons/hr_contract/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 6a642cdbc2d..720ca64da33 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 15:13+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index ed4734dc71d..c47e9c9c8bf 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 05:41+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index a9ac1269e35..a0171a88461 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 11:20+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index a8698152b4e..abe3166e7de 100644
--- a/addons/hr_contract/i18n/es_AR.po
+++ b/addons/hr_contract/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-15 20:56+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_CR.po b/addons/hr_contract/i18n/es_CR.po
index 910dbe7c70b..8efaf66f653 100644
--- a/addons/hr_contract/i18n/es_CR.po
+++ b/addons/hr_contract/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-15 22:23+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index c92e35be80e..df83e3ac11f 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-19 00:01+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_PY.po b/addons/hr_contract/i18n/es_PY.po
index 10a4a97df8e..cca0467489d 100644
--- a/addons/hr_contract/i18n/es_PY.po
+++ b/addons/hr_contract/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-06 02:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index 022997a9cc7..6735affcf54 100644
--- a/addons/hr_contract/i18n/et.po
+++ b/addons/hr_contract/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 17:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index 9547acad7c2..c711be525f4 100644
--- a/addons/hr_contract/i18n/fi.po
+++ b/addons/hr_contract/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 05:41+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index aa00e869370..29dbb3a0787 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 08:56+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/gl.po b/addons/hr_contract/i18n/gl.po
index 439ecb5d501..1abba2bd662 100644
--- a/addons/hr_contract/i18n/gl.po
+++ b/addons/hr_contract/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-23 23:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/gu.po b/addons/hr_contract/i18n/gu.po
index 3ea26ad924f..7031766bedc 100644
--- a/addons/hr_contract/i18n/gu.po
+++ b/addons/hr_contract/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-02 19:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index 2d2cd2472f8..7dd5adba124 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 05:41+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index 559eb532c00..e2a741aaea2 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 17:01+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
index 799658cd357..d4a19e2ebfe 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 17:24+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index 202da5a9577..3f1410fcfeb 100644
--- a/addons/hr_contract/i18n/id.po
+++ b/addons/hr_contract/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-07 07:46+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index 47d45602f55..baa744c9f53 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 20:55+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ja.po b/addons/hr_contract/i18n/ja.po
index 70e153eed6b..f07b94580a0 100644
--- a/addons/hr_contract/i18n/ja.po
+++ b/addons/hr_contract/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 21:02+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index a7c67673517..de8dab8c811 100644
--- a/addons/hr_contract/i18n/ko.po
+++ b/addons/hr_contract/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:33+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lo.po b/addons/hr_contract/i18n/lo.po
index e2f4af20659..2f2ef941190 100644
--- a/addons/hr_contract/i18n/lo.po
+++ b/addons/hr_contract/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-19 16:01+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index 92199c4e4fd..71c5fbdebf5 100644
--- a/addons/hr_contract/i18n/lt.po
+++ b/addons/hr_contract/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index 657aee61df5..24393e25428 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-10-22 14:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/mk.po b/addons/hr_contract/i18n/mk.po
index 08a4da00cfb..75ebcde3aa8 100644
--- a/addons/hr_contract/i18n/mk.po
+++ b/addons/hr_contract/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-09 08:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index 01d94d10408..f7170d59e54 100644
--- a/addons/hr_contract/i18n/mn.po
+++ b/addons/hr_contract/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-18 07:43+0000\n"
 "Last-Translator: Unurjargal <unuruu25@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nb.po b/addons/hr_contract/i18n/nb.po
index 730788fab53..b52faf45582 100644
--- a/addons/hr_contract/i18n/nb.po
+++ b/addons/hr_contract/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-08 18:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index b6c3ed984f9..3a9a991fb53 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-19 12:41+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 086066d2656..01c739b8686 100644
--- a/addons/hr_contract/i18n/nl_BE.po
+++ b/addons/hr_contract/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index 4258a0e9fb6..1fc602a3c2c 100644
--- a/addons/hr_contract/i18n/pl.po
+++ b/addons/hr_contract/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-07 20:15+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index ba5d8240626..e4b0a53953b 100644
--- a/addons/hr_contract/i18n/pt.po
+++ b/addons/hr_contract/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 15:32+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index 49f9f0953d5..beb8c052f1b 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-20 17:33+0000\n"
 "Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index e5361c8d672..034ef4f9a0f 100644
--- a/addons/hr_contract/i18n/ro.po
+++ b/addons/hr_contract/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:37+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 4fc5bdc9f75..9cbd8fd6bff 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-27 05:15+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index 10386fe1c10..109dd67cb6a 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 05:43+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
index c8f9a8d4710..ebe1faf239b 100644
--- a/addons/hr_contract/i18n/sq.po
+++ b/addons/hr_contract/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index 40e658be883..0c6ac595e4f 100644
--- a/addons/hr_contract/i18n/sr.po
+++ b/addons/hr_contract/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-12-28 10:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sr@latin.po b/addons/hr_contract/i18n/sr@latin.po
index 0e3aa93e700..65a1f4fc6f8 100644
--- a/addons/hr_contract/i18n/sr@latin.po
+++ b/addons/hr_contract/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-21 11:41+0000\n"
 "Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index 6d8661e08eb..1252e89dfe9 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-23 09:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index 3bc6b0387cf..da3d1ff7c9e 100644
--- a/addons/hr_contract/i18n/tlh.po
+++ b/addons/hr_contract/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index d498bbb4fc5..1269dd98708 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 7b82418527a..7bdba24c705 100644
--- a/addons/hr_contract/i18n/uk.po
+++ b/addons/hr_contract/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 12:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
index ba4fd55e361..c8f4c79e68b 100644
--- a/addons/hr_contract/i18n/vi.po
+++ b/addons/hr_contract/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-25 13:59+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 88fc56dd111..410baf79e91 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 03:09+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index 35d70adabe5..3b93c0b0bcd 100644
--- a/addons/hr_contract/i18n/zh_TW.po
+++ b/addons/hr_contract/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-30 13:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_evaluation/i18n/ar.po b/addons/hr_evaluation/i18n/ar.po
index 0d3c10290e4..b878622db38 100644
--- a/addons/hr_evaluation/i18n/ar.po
+++ b/addons/hr_evaluation/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -174,7 +174,7 @@ msgid "Send to Employees"
 msgstr "ارسل الى الموظفين"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -218,8 +218,8 @@ msgid "Deadline"
 msgstr "الموعد النهائي"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -245,7 +245,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "متعلق "
@@ -568,14 +568,6 @@ msgstr "نوفمبر"
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -612,22 +604,6 @@ msgstr "تاريخ"
 msgid "Survey"
 msgstr "إستفتاء"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -844,7 +820,7 @@ msgid "Is Appraisal?"
 msgstr "هل هو تقييم؟"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "لا يمكنك بدء التقييم بدون تقييم مسبق"
@@ -855,7 +831,7 @@ msgid "Employee to Interview"
 msgstr "الموظف الذي سيتم عمل له المقابلة"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -872,6 +848,22 @@ msgstr "إبريل"
 msgid "Appraisal Plan Phases"
 msgstr "أطوار خطة التقييم"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index b9097384dc0..f9c750bfd72 100644
--- a/addons/hr_evaluation/i18n/bg.po
+++ b/addons/hr_evaluation/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -174,7 +174,7 @@ msgid "Send to Employees"
 msgstr "Изпращане до служителите"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -218,8 +218,8 @@ msgid "Deadline"
 msgstr "Краен срок"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -245,7 +245,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Относно "
@@ -564,14 +564,6 @@ msgstr "Ноември"
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -608,22 +600,6 @@ msgstr "Дата"
 msgid "Survey"
 msgstr "Проучване"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -840,7 +816,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -851,7 +827,7 @@ msgid "Employee to Interview"
 msgstr "Служител да бъде интервюиран"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -868,6 +844,22 @@ msgstr "Април"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index 5aefd285ba7..b66956385d3 100644
--- a/addons/hr_evaluation/i18n/ca.po
+++ b/addons/hr_evaluation/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Envia a empleats"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -234,8 +234,8 @@ msgid "Deadline"
 msgstr "Data limit"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -261,7 +261,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Referent a "
@@ -584,14 +584,6 @@ msgstr "Novembre"
 msgid "Extended Filters..."
 msgstr "Filtres extesos..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -628,22 +620,6 @@ msgstr "Data"
 msgid "Survey"
 msgstr "Enquesta"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -862,7 +838,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -873,7 +849,7 @@ msgid "Employee to Interview"
 msgstr "Empleat a entrevistar"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -890,6 +866,22 @@ msgstr "Abril"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/da.po b/addons/hr_evaluation/i18n/da.po
index cd903c26287..51bde448829 100644
--- a/addons/hr_evaluation/i18n/da.po
+++ b/addons/hr_evaluation/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -216,8 +216,8 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -562,14 +562,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -606,22 +598,6 @@ msgstr ""
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -838,7 +814,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -849,7 +825,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -866,6 +842,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index b05bfba0897..bd040fd2a8d 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 23:18+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
@@ -177,7 +177,7 @@ msgid "Send to Employees"
 msgstr "Sende an Mitarbeiter"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -239,8 +239,8 @@ msgid "Deadline"
 msgstr "Frist"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -266,7 +266,7 @@ msgid "Interviews"
 msgstr "Interviews"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Bezüglich "
@@ -603,14 +603,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -647,35 +639,6 @@ msgstr "Datum"
 msgid "Survey"
 msgstr "Umfrage"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie zur Erstellung einer Befragung im Kontext einer "
-"Beurteilung eines Mitarbeiters. \n"
-"              </p><p>\n"
-"                Diese Interviews werden normalerweise durch das dem "
-"Mitarbeiter zugewiesene Vorgehen \n"
-"                zur Beurteilung direkt in OpenERP generiert. Jeder "
-"Mitarbeiter erhält dadurch automatisch\n"
-"                und in regelmässigen Zeitabständen Anfragen um die "
-"Mitarbeiter in regelmässigen Abständen\n"
-"                zu beurteilen. \n"
-"              </p>\n"
-"            "
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -912,7 +875,7 @@ msgid "Is Appraisal?"
 msgstr "Ist Beurteilung?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Ohne Beurteilung können Sie keine den Vorgang nicht starten"
@@ -923,7 +886,7 @@ msgid "Employee to Interview"
 msgstr "Zu beurteilender Mitarbeiter"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -942,6 +905,22 @@ msgstr "April"
 msgid "Appraisal Plan Phases"
 msgstr "Phasen des Beurteilungsplanes"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index c3eaa12c6db..383bc2eeb57 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 12:48+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Enviar a empleados"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -236,8 +236,8 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -263,7 +263,7 @@ msgid "Interviews"
 msgstr "Entrevistas"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Referente a "
@@ -595,14 +595,6 @@ msgstr "Noviembre"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -639,32 +631,6 @@ msgstr "Fecha"
 msgid "Survey"
 msgstr "Encuesta"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear una nueva petición de entrevista relacionada con una "
-"evaluación personal.\n"
-"</p><p>\n"
-"Las peticiones de entrevista normalmente se generan automáticamente por "
-"OpenERP de acuerdo al plan de evaluación de OpenERP. Cada usuario recibe "
-"correos electrónicos automáticos y peticiones para evaluar a sus compañeros "
-"periódicamente.\n"
-"</p>\n"
-"            "
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -895,7 +861,7 @@ msgid "Is Appraisal?"
 msgstr "¿Es evaluación?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "No puede comenzar el proceso de evaluación sin la evaluación"
@@ -906,7 +872,7 @@ msgid "Employee to Interview"
 msgstr "Empleado a entrevistar"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -925,6 +891,22 @@ msgstr "Abril"
 msgid "Appraisal Plan Phases"
 msgstr "Fases del plan de evaluación"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/es_CR.po b/addons/hr_evaluation/i18n/es_CR.po
index bb1f73e5e98..7f301545f3d 100644
--- a/addons/hr_evaluation/i18n/es_CR.po
+++ b/addons/hr_evaluation/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-15 22:49+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: hr_evaluation
@@ -176,7 +176,7 @@ msgid "Send to Employees"
 msgstr "Enviar a empleados"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -235,8 +235,8 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -262,7 +262,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Referente a "
@@ -585,14 +585,6 @@ msgstr "Noviembre"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -629,22 +621,6 @@ msgstr "Fecha"
 msgid "Survey"
 msgstr "Encuesta"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -865,7 +841,7 @@ msgid "Is Appraisal?"
 msgstr "¿Es Evaluación?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "No se puede iniciar la evaluación sin una valoración."
@@ -876,7 +852,7 @@ msgid "Employee to Interview"
 msgstr "Empleado a entrevistar"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -893,6 +869,22 @@ msgstr "Abril"
 msgid "Appraisal Plan Phases"
 msgstr "Evaluación de Fases de plan"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index c660eb98597..788990899e1 100644
--- a/addons/hr_evaluation/i18n/es_EC.po
+++ b/addons/hr_evaluation/i18n/es_EC.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-19 00:01+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -173,7 +173,7 @@ msgid "Send to Employees"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -217,8 +217,8 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -244,7 +244,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -563,14 +563,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -607,22 +599,6 @@ msgstr "Fecha"
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -839,7 +815,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -850,7 +826,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -867,6 +843,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index 26247c8f19f..ebed509f4f7 100644
--- a/addons/hr_evaluation/i18n/et.po
+++ b/addons/hr_evaluation/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-05-05 21:37+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -216,8 +216,8 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -562,14 +562,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -606,22 +598,6 @@ msgstr "Kuupäev"
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -838,7 +814,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -849,7 +825,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -866,6 +842,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index 635642713fe..3fb8fb9356b 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -173,7 +173,7 @@ msgid "Send to Employees"
 msgstr "Lähetä työntekijöille"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -232,8 +232,8 @@ msgid "Deadline"
 msgstr "Määräaika"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -259,7 +259,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Koskien "
@@ -582,14 +582,6 @@ msgstr "Marraskuu"
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -626,22 +618,6 @@ msgstr "Päiväys"
 msgid "Survey"
 msgstr "Kysely"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -862,7 +838,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -873,7 +849,7 @@ msgid "Employee to Interview"
 msgstr "Haastateltava työntekijä"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -890,6 +866,22 @@ msgstr "Huhtikuu"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 30b181818f5..ef156fb625d 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -176,7 +176,7 @@ msgid "Send to Employees"
 msgstr "Envoyer aux employés"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -235,8 +235,8 @@ msgid "Deadline"
 msgstr "Echéance"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -262,7 +262,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Concernant "
@@ -585,14 +585,6 @@ msgstr "Novembre"
 msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -629,22 +621,6 @@ msgstr "Date"
 msgid "Survey"
 msgstr "Enquête"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -865,7 +841,7 @@ msgid "Is Appraisal?"
 msgstr "Est une évaluation?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -878,7 +854,7 @@ msgid "Employee to Interview"
 msgstr "Employé à voir en entretien"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -895,6 +871,22 @@ msgstr "Avril"
 msgid "Appraisal Plan Phases"
 msgstr "Phases de campagnes d'évaluation"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index 992cc5a98f3..795bf134020 100644
--- a/addons/hr_evaluation/i18n/gl.po
+++ b/addons/hr_evaluation/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Enviar a empregados"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -225,8 +225,8 @@ msgid "Deadline"
 msgstr "Data límite"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Referente a "
@@ -574,14 +574,6 @@ msgstr "Novembro"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -618,22 +610,6 @@ msgstr "Data"
 msgid "Survey"
 msgstr "Enquisa"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -852,7 +828,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -863,7 +839,7 @@ msgid "Employee to Interview"
 msgstr "Empregado a entrevistar"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -880,6 +856,22 @@ msgstr "Abril"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 6651bd5385d..56c7ae4034d 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 15:02+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -218,8 +218,8 @@ msgid "Deadline"
 msgstr "Krajnji rok"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -245,7 +245,7 @@ msgid "Interviews"
 msgstr "Intervjui"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -564,14 +564,6 @@ msgstr "Studeni"
 msgid "Extended Filters..."
 msgstr "Prošireni filteri..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -608,22 +600,6 @@ msgstr "Datum"
 msgid "Survey"
 msgstr "Anketa"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -840,7 +816,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -851,7 +827,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -868,6 +844,22 @@ msgstr "Travanj"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 643356d224d..43dd86c96a2 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:24+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -171,7 +171,7 @@ msgid "Send to Employees"
 msgstr "Küldés az alkalmazottaknak"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -215,8 +215,8 @@ msgid "Deadline"
 msgstr "Határidő"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -242,7 +242,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Kapcsolatos "
@@ -561,14 +561,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -605,22 +597,6 @@ msgstr "Dátum"
 msgid "Survey"
 msgstr "Felmérés"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -837,7 +813,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -848,7 +824,7 @@ msgid "Employee to Interview"
 msgstr "Munkavállalói interjú"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -865,6 +841,22 @@ msgstr "Április"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index ec25b5ef86f..9aef3a16434 100644
--- a/addons/hr_evaluation/i18n/id.po
+++ b/addons/hr_evaluation/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:29+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Kirim untuk Karyawan"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -219,8 +219,8 @@ msgid "Deadline"
 msgstr "Batas waktu"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -246,7 +246,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Perihal "
@@ -569,14 +569,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Filter Tambahan"
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -613,22 +605,6 @@ msgstr "Tanggal"
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -847,7 +823,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -858,7 +834,7 @@ msgid "Employee to Interview"
 msgstr "Karyawan untuk Wawancara"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -875,6 +851,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 6b742525c45..f5e9e969bfe 100644
--- a/addons/hr_evaluation/i18n/it.po
+++ b/addons/hr_evaluation/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:38+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr "Invia agli impiegati"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -216,8 +216,8 @@ msgid "Deadline"
 msgstr "Scadenza"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -562,14 +562,6 @@ msgstr "Novembre"
 msgid "Extended Filters..."
 msgstr "Filtri estesi..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -606,22 +598,6 @@ msgstr "Data"
 msgid "Survey"
 msgstr "Sondaggio"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -838,7 +814,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -849,7 +825,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -866,6 +842,22 @@ msgstr "Aprile"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
index 69d94eb802f..bec66752c90 100644
--- a/addons/hr_evaluation/i18n/ja.po
+++ b/addons/hr_evaluation/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-23 16:41+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr "従業員に送る。"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -229,8 +229,8 @@ msgid "Deadline"
 msgstr "期限"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "次に関して "
@@ -575,14 +575,6 @@ msgstr "11月"
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -619,22 +611,6 @@ msgstr "日付"
 msgid "Survey"
 msgstr "調査"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -851,7 +827,7 @@ msgid "Is Appraisal?"
 msgstr "査定ですか？"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "査定なしでは評価を開始できません。"
@@ -862,7 +838,7 @@ msgid "Employee to Interview"
 msgstr "面接する従業員"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -879,6 +855,22 @@ msgstr "4月"
 msgid "Appraisal Plan Phases"
 msgstr "査定計画の段階"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 20458eefb0f..fea11b9378f 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-21 04:37+0000\n"
 "Last-Translator: lhagvajargal <jagaapu@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Ажилтнуудад илгээх"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -234,8 +234,8 @@ msgid "Deadline"
 msgstr "Тов"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -261,7 +261,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Холбоотой "
@@ -583,14 +583,6 @@ msgstr "11 сар"
 msgid "Extended Filters..."
 msgstr "Өргөтгөсөн хайлт..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -627,22 +619,6 @@ msgstr "Огноо"
 msgid "Survey"
 msgstr "Санал асуулга"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -863,7 +839,7 @@ msgid "Is Appraisal?"
 msgstr "Үнэлгээ юу?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Үнэлгээгээр дүгнэлтийг эхлүүлж болохгүй."
@@ -874,7 +850,7 @@ msgid "Employee to Interview"
 msgstr "Ярилцах ажилтан"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -891,6 +867,22 @@ msgstr "4 сар"
 msgid "Appraisal Plan Phases"
 msgstr "Үнэлгээний Төлөвлөгөөний Шатууд"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index 31b77e95a02..eb2825b50da 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-26 14:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -176,7 +176,7 @@ msgid "Send to Employees"
 msgstr "Versturen aan werknemers"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -235,8 +235,8 @@ msgid "Deadline"
 msgstr "Einddatum"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -262,7 +262,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Betreffend "
@@ -584,14 +584,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -628,22 +620,6 @@ msgstr "Datum"
 msgid "Survey"
 msgstr "Enquête"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -864,7 +840,7 @@ msgid "Is Appraisal?"
 msgstr "Is beoordeling?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Het is niet mogelijk een evaluatie te starten zonder beoordeling."
@@ -875,7 +851,7 @@ msgid "Employee to Interview"
 msgstr "Werknemer voor gesprek"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -892,6 +868,22 @@ msgstr "April"
 msgid "Appraisal Plan Phases"
 msgstr "Beoordelingsplanfases"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index b9a74121317..101c9d471fc 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 12:27+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -176,7 +176,7 @@ msgid "Send to Employees"
 msgstr "Enviar para os funcionários"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -235,8 +235,8 @@ msgid "Deadline"
 msgstr "Prazo limite"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -262,7 +262,7 @@ msgid "Interviews"
 msgstr "Entrevistas"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Tendo em conta "
@@ -585,14 +585,6 @@ msgstr "Novembro"
 msgid "Extended Filters..."
 msgstr "Filtros avançados..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -629,22 +621,6 @@ msgstr "Data"
 msgid "Survey"
 msgstr "Inquérito"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -865,7 +841,7 @@ msgid "Is Appraisal?"
 msgstr "É avaliavél?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Não pode arrancar uma avaliação sem Validação"
@@ -876,7 +852,7 @@ msgid "Employee to Interview"
 msgstr "Funcionário a entrevistar"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -893,6 +869,22 @@ msgstr "Abril"
 msgid "Appraisal Plan Phases"
 msgstr "Fases do Plano de Avaliação"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index 7cc01438ac5..2d7ba1eca1c 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 00:10+0000\n"
 "Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -176,7 +176,7 @@ msgid "Send to Employees"
 msgstr "Enviar para Funcionários"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -236,8 +236,8 @@ msgid "Deadline"
 msgstr "Prazo final"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -263,7 +263,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "A respeito de "
@@ -586,14 +586,6 @@ msgstr "Novembro"
 msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -630,22 +622,6 @@ msgstr "Data"
 msgid "Survey"
 msgstr "Avaliação"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -866,7 +842,7 @@ msgid "Is Appraisal?"
 msgstr "É uma Avaliação?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Você não pode iniciar um teste sem avaliação."
@@ -877,7 +853,7 @@ msgid "Employee to Interview"
 msgstr "Funcionários a Entrevistar"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -894,6 +870,22 @@ msgstr "Abril"
 msgid "Appraisal Plan Phases"
 msgstr "Fases do Plano de Avaliação"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/ro.po b/addons/hr_evaluation/i18n/ro.po
index 55e8806f956..8e7a1ae7782 100644
--- a/addons/hr_evaluation/i18n/ro.po
+++ b/addons/hr_evaluation/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Trimiteti angajatilor"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -234,8 +234,8 @@ msgid "Deadline"
 msgstr "Termen limita"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -261,7 +261,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Referitor la "
@@ -584,14 +584,6 @@ msgstr "Noiembrie"
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -628,22 +620,6 @@ msgstr "Data"
 msgid "Survey"
 msgstr "Sondaj"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -864,7 +840,7 @@ msgid "Is Appraisal?"
 msgstr "Este Evaluare?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Nu puteti incepe evaluarea fara Apreciere."
@@ -875,7 +851,7 @@ msgid "Employee to Interview"
 msgstr "Angajatul care va fi intervievat"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -892,6 +868,22 @@ msgstr "Aprilie"
 msgid "Appraisal Plan Phases"
 msgstr "Etapele Planului de Apreciere"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index a776f2e8ffe..d4b18cf1cb2 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Отправить сотрудникам"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -234,8 +234,8 @@ msgid "Deadline"
 msgstr "Последний срок"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -261,7 +261,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -584,14 +584,6 @@ msgstr "Ноябрь"
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -628,22 +620,6 @@ msgstr "Дата"
 msgid "Survey"
 msgstr "Опрос"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -860,7 +836,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -871,7 +847,7 @@ msgid "Employee to Interview"
 msgstr "Сотрудник на собеседование"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -888,6 +864,22 @@ msgstr "Апрель"
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index 5a5992d505c..fa5e210171d 100644
--- a/addons/hr_evaluation/i18n/sr.po
+++ b/addons/hr_evaluation/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 23:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -216,8 +216,8 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -562,14 +562,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -606,22 +598,6 @@ msgstr ""
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -838,7 +814,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -849,7 +825,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -866,6 +842,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 0742ce1a3bb..f6e441890d4 100644
--- a/addons/hr_evaluation/i18n/sr@latin.po
+++ b/addons/hr_evaluation/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-12-10 16:48+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 20:05+0000\n"
+"Last-Translator: Vlado Zvijer <vlado.zvijer@iinet.rs>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -216,8 +216,8 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -562,14 +562,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -606,22 +598,6 @@ msgstr ""
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -809,7 +785,7 @@ msgstr ""
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "Završni intervju"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
@@ -838,7 +814,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -846,10 +822,10 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "Intervju zaposlenog"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -866,6 +842,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index 80106653524..75e30136674 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-09 09:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -175,7 +175,7 @@ msgid "Send to Employees"
 msgstr "Skicka till anställda"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -234,8 +234,8 @@ msgid "Deadline"
 msgstr "Tidsfrist"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -261,7 +261,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Beträffande "
@@ -584,14 +584,6 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Utöka filter..."
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -628,22 +620,6 @@ msgstr "Datum"
 msgid "Survey"
 msgstr "Undersökning"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -864,7 +840,7 @@ msgid "Is Appraisal?"
 msgstr "Är Bedömning?"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "Du kan inte starta Utvärdering utan Bedömning."
@@ -875,7 +851,7 @@ msgid "Employee to Interview"
 msgstr "Anställd att Intervjua"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -892,6 +868,22 @@ msgstr "April"
 msgid "Appraisal Plan Phases"
 msgstr "Bedömning Plan faser"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
index c8178e1e489..1cf5b802e94 100644
--- a/addons/hr_evaluation/i18n/tr.po
+++ b/addons/hr_evaluation/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-25 17:22+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr "Değerlendirilen ile paylaş"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -216,8 +216,8 @@ msgid "Deadline"
 msgstr "Bitiş tarihi"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Interviews"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "Hakkında "
@@ -562,14 +562,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -606,22 +598,6 @@ msgstr ""
 msgid "Survey"
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -838,7 +814,7 @@ msgid "Is Appraisal?"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr ""
@@ -849,7 +825,7 @@ msgid "Employee to Interview"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -866,6 +842,22 @@ msgstr ""
 msgid "Appraisal Plan Phases"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index a26b8a381f8..1f4b4c36edc 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-30 14:35+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -172,7 +172,7 @@ msgid "Send to Employees"
 msgstr "发送给员工"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
 #, python-format
 msgid ""
 "\n"
@@ -228,8 +228,8 @@ msgid "Deadline"
 msgstr "截止日期"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -255,7 +255,7 @@ msgid "Interviews"
 msgstr "面试"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
 #, python-format
 msgid "Regarding "
 msgstr "关于 "
@@ -582,14 +582,6 @@ msgstr "11月"
 msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -626,29 +618,6 @@ msgstr "日期"
 msgid "Survey"
 msgstr "问卷"
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new interview request related to a "
-"personnal evaluation. \n"
-"              </p><p>\n"
-"                Interview requests are usually generated automatically by\n"
-"                OpenERP according to an employee's appraisal plan. Each "
-"user\n"
-"                receives automatic emails and requests to evaluate their\n"
-"                colleagues periodically.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"               单击创建一个新的跟个人评估关联的面谈要求。\n"
-"              </p><p>\n"
-"                 面谈要求通常是根据员工的评估计划自动生成的。\n"
-"                 每个用户会自动定期收到要求评估他们的同事的Email。\n"
-"              </p>\n"
-"            "
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
@@ -874,7 +843,7 @@ msgid "Is Appraisal?"
 msgstr "是否评估？"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
 msgstr "没有评估计划无法开始评估"
@@ -885,7 +854,7 @@ msgid "Employee to Interview"
 msgstr "面谈员工"
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
 #, python-format
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
@@ -902,6 +871,22 @@ msgstr "4月"
 msgid "Appraisal Plan Phases"
 msgstr "评估计划阶段"
 
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new interview request related to a "
+"personal evaluation. \n"
+"              </p><p>\n"
+"                Interview requests are usually generated automatically by\n"
+"                OpenERP according to an employee's appraisal plan. Each "
+"user\n"
+"                receives automatic emails and requests to evaluate their\n"
+"                colleagues periodically.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index 91e2b3503d8..176759556d2 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "خط المصروف"
 msgid "The accoutant reimburse the expenses"
 msgstr "المحاسب يسدد النفقات"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "حفظ كمسودة"
 msgid "To Pay"
 msgstr "للدفع"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "بعض التكلفة سيعاد عمل الفاتورة لها للعميل"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "بعد انشاء الفاتورة, يسدد النفقة"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr "تاريخ الصلاحية"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr "شهر"
 msgid "Currency"
 msgstr "العملة"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "المستخدم"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr "يرمز الموظف لكل مصروفاته"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "مسودة"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "المستخدم"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "مقبول"
@@ -782,6 +801,7 @@ msgstr "# الحسابات"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "مرفوض"
@@ -791,6 +811,11 @@ msgstr "مرفوض"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "الاسم"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "مسلسل"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "للموافقة"
 
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index 94f1c386b80..cb56d3ff603 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-04 05:50+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Пращане в проект"
 msgid "To Pay"
 msgstr "За плащане"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr "Дата на валидиране"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr "Месец"
 msgid "Currency"
 msgstr "Валута"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Потребител"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "Чернова"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Потребител"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Одобрен"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Отказан"
@@ -791,6 +811,11 @@ msgstr "Отказан"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "Име"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Последователност"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "За одобрение"
 
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index e663be5f3dd..b1a92c97940 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "Skica"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Odobren"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Odbijeno"
@@ -791,6 +811,11 @@ msgstr "Odbijeno"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "Ime"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 95193561f26..c21963ec2e7 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Línia de despesa"
 msgid "The accoutant reimburse the expenses"
 msgstr "El comptable reemborsa les despeses"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Canvia a esborrany"
 msgid "To Pay"
 msgstr "A pagar"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -221,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -329,7 +348,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alguns costos poden ser refacturats al client"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -384,7 +403,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Després de crear factura, reemborsar despeses"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -401,7 +420,7 @@ msgid "Validation Date"
 msgstr "Data de validació"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -456,11 +475,6 @@ msgstr "Mes"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Usuari"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -477,7 +491,7 @@ msgid "Employee encode all his expenses"
 msgstr "Empleat codifica totes les seves despeses"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -505,7 +519,7 @@ msgid "Draft"
 msgstr "Esborrany"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -570,9 +584,13 @@ msgid "Extended Filters..."
 msgstr "Filtres estesos..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -745,6 +763,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprovat"
@@ -787,6 +806,7 @@ msgstr "Núm. de comptes"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Rebutjada"
@@ -796,6 +816,11 @@ msgstr "Rebutjada"
 msgid "Can be Expensed"
 msgstr "Pot ser una despesa"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -828,7 +853,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -873,11 +898,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Seqüència"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -904,6 +924,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Per aprovar"
 
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index db77a62cd12..758ef74693a 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/da.po b/addons/hr_expense/i18n/da.po
index a6c38962881..426666d138e 100644
--- a/addons/hr_expense/i18n/da.po
+++ b/addons/hr_expense/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -792,6 +812,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 454a22efab6..3f120fa8393 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 16:24+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "Spesenposition"
 msgid "The accoutant reimburse the expenses"
 msgstr "Der Finanzbuchhalter erstattet die Spesen"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "Setze auf Entwurf"
 msgid "To Pay"
 msgstr "Zu Bezahlen"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -137,12 +150,18 @@ msgid "Messages"
 msgstr "Mitteilungen"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -238,7 +257,7 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Warnung !"
@@ -345,7 +364,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Einige Aufwendungen können an Kunde weiterberechnet werden"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr "Der Mitarbeiter muss eine Privatanschrift haben."
@@ -400,7 +419,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Nach der Rechnungserstellung erfolgt die Erstattung."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -417,7 +436,7 @@ msgid "Validation Date"
 msgstr "Genehmigungsdatum"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr "Personalspesen Ausgabebeleg"
@@ -472,11 +491,6 @@ msgstr "Monat"
 msgid "Currency"
 msgstr "Währung"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Benutzer"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -493,7 +507,7 @@ msgid "Employee encode all his expenses"
 msgstr "Mitarbeiter erfasst alle seine Spesen"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -523,7 +537,7 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -590,10 +604,14 @@ msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -783,6 +801,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Genehmigt"
@@ -825,6 +844,7 @@ msgstr "# Konten"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Abgelehnt"
@@ -834,6 +854,11 @@ msgstr "Abgelehnt"
 msgid "Can be Expensed"
 msgstr "Als Ausgabe verwendbar"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -866,7 +891,7 @@ msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr "Sie können nur Spesenabrechnungen im Entwurf löschen"
@@ -911,11 +936,6 @@ msgstr "Nachrichten und Kommunikations-Historie"
 msgid "Sequence"
 msgstr "Sequenz"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr "Ausgabentypen"
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -942,6 +962,7 @@ msgstr "Finanzbuchhaltung"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Erwarte Genehmigung"
 
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index 77538d7c5a6..488dffa9c74 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -35,6 +35,11 @@ msgstr "Γραμμή Κόστους"
 msgid "The accoutant reimburse the expenses"
 msgstr "Το Λογιστήριο αποδίδει τα έξοδα"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -103,6 +108,14 @@ msgstr "Ορισμός ως Πρόχειρο"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -137,12 +150,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -221,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -328,7 +347,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Κάποια έξοδα μπορεί να είναι ανατιμολογήσεις στον πελάτη"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -383,7 +402,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Αποδώστε έξοδα αφού δημιουργήσετε το Τιμολόγιο"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -400,7 +419,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -455,11 +474,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Νόμισμα"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Χρήστης"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -476,7 +490,7 @@ msgid "Employee encode all his expenses"
 msgstr "Ο υπάλληλος κωδικοποιεί όλα τα έξοδά του"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -504,7 +518,7 @@ msgid "Draft"
 msgstr "Πρόχειρα"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -569,9 +583,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Χρήστης"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -746,6 +764,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Εγκρίθηκε"
@@ -788,6 +807,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Απορριφθέντα"
@@ -797,6 +817,11 @@ msgstr "Απορριφθέντα"
 msgid "Can be Expensed"
 msgstr "Μπορούν να δαπανηθούν"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -829,7 +854,7 @@ msgid "Name"
 msgstr "Όνομα"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -874,11 +899,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Αρίθμηση"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -905,6 +925,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index f49cc12f778..84da8430548 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 12:58+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Línea de gasto"
 msgid "The accoutant reimburse the expenses"
 msgstr "El contable reembolsa los gastos"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Cambiar a borrador"
 msgid "To Pay"
 msgstr "A pagar"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -227,7 +246,7 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Advertencia"
@@ -334,7 +353,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costes pueden ser refacturados al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr "El empleado debe tener una dirección de casa."
@@ -389,7 +408,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Después de crear factura, reembolsar gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -406,7 +425,7 @@ msgid "Validation Date"
 msgstr "Fecha de validación"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr "Recibo del gasto"
@@ -461,11 +480,6 @@ msgstr "Mes"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Usuario"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -482,7 +496,7 @@ msgid "Employee encode all his expenses"
 msgstr "Empleado codifica todos sus gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -512,7 +526,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -579,10 +593,14 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -767,6 +785,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprobado"
@@ -809,6 +828,7 @@ msgstr "Nº de cuentas"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Rechazado"
@@ -818,6 +838,11 @@ msgstr "Rechazado"
 msgid "Can be Expensed"
 msgstr "Puede ser un gasto"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -850,7 +875,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr "¡Sólo puede borrar gastos en borrador!"
@@ -895,11 +920,6 @@ msgstr "Mensajes e historial de comunicación"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr "Tipos de gastos"
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -928,6 +948,7 @@ msgstr "Contabilidad"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Para aprobar"
 
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 88ce723d4cc..b924dadd54a 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-22 18:58+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Línea de gasto"
 msgid "The accoutant reimburse the expenses"
 msgstr "Contaduría reembolsa los gastos"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Establecer como Borrador"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costos pueden ser refacturaciones al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Después de crear factura, reembolsar gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Usuario"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr "El empleado codifica todos sus gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprobado"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Rechazado"
@@ -791,6 +811,11 @@ msgstr "Rechazado"
 msgid "Can be Expensed"
 msgstr "Puede ser un gasto"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/es_CR.po b/addons/hr_expense/i18n/es_CR.po
index 1ee9f3ea6ee..299c397e73f 100644
--- a/addons/hr_expense/i18n/es_CR.po
+++ b/addons/hr_expense/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-15 22:58+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Línea de gasto"
 msgid "The accoutant reimburse the expenses"
 msgstr "El contable reembolsa los gastos"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Cambiar a borrador"
 msgid "To Pay"
 msgstr "A pagar"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -222,7 +241,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -329,7 +348,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costes pueden ser refacturados al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -384,7 +403,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Después de crear factura, reembolsar gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -401,7 +420,7 @@ msgid "Validation Date"
 msgstr "Fecha de validación"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -456,11 +475,6 @@ msgstr "Mes"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Usuario"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -477,7 +491,7 @@ msgid "Employee encode all his expenses"
 msgstr "Empleado codifica todos sus gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -505,7 +519,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -570,9 +584,13 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -751,6 +769,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprobado"
@@ -793,6 +812,7 @@ msgstr "Nº de cuentas"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Rechazado"
@@ -802,6 +822,11 @@ msgstr "Rechazado"
 msgid "Can be Expensed"
 msgstr "Puede ser un gasto"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -834,7 +859,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -879,11 +904,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -910,6 +930,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Para aprobar"
 
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index 83eba9a4aa6..1b7adeaa062 100644
--- a/addons/hr_expense/i18n/es_EC.po
+++ b/addons/hr_expense/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-19 00:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "Línea de gasto"
 msgid "The accoutant reimburse the expenses"
 msgstr "El contable reembolsa los gastos"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "Cambiar a borrador"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costes pueden ser refacturados al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Después de crear factura, reembolsar gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Usuario"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr "Empleado codifica todos sus gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprobado"
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Rechazado"
@@ -792,6 +812,11 @@ msgstr "Rechazado"
 msgid "Can be Expensed"
 msgstr "Puede ser un gasto"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index 8be6484906e..0651adb63ff 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Kulurida"
 msgid "The accoutant reimburse the expenses"
 msgstr "Raamatupidaja hüvitab kulud"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Sea mustandiks"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Mõned kulud võivad olla taasarvedused kliendile"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Pärast arve loomist hüvita kulud"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Valuuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Kasutaja"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr "Töötaja kodeerib kõik oma kulud"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "Mustand"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Heakskiidetud"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Tagasi lükatud"
@@ -791,6 +811,11 @@ msgstr "Tagasi lükatud"
 msgid "Can be Expensed"
 msgstr "Võib maksustada"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "Nimi"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Järjekord"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index 42e62f8cf5d..3e472331f21 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "Kustannusrivi"
 msgid "The accoutant reimburse the expenses"
 msgstr "Tilinhoitaja hyvittää kustannukset"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "Aseta luonnokseksi"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Laskun luonnin jälkeen hyväksy kustannukset"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Valuutta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Käyttäjä"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr "Työntekijä suojaa kaikki kustannuksensa"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "Luonnos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Hyväksytty"
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Hylätty"
@@ -792,6 +812,11 @@ msgstr "Hylätty"
 msgid "Can be Expensed"
 msgstr "Kustannuskelpoinen"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr "Nimi"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 827cbdcedfd..e85cb70a370 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:43+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Lignes de frais"
 msgid "The accoutant reimburse the expenses"
 msgstr "Le comptable rembourse les notes de frais"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Mettre en brouillon"
 msgid "To Pay"
 msgstr "À payer"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -222,7 +241,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -329,7 +348,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Certains coûts peuvent être refacturés au client"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -384,7 +403,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Après avoir créé la facture, remboursez les frais"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -401,7 +420,7 @@ msgid "Validation Date"
 msgstr "Date de validation"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -456,11 +475,6 @@ msgstr "Mois"
 msgid "Currency"
 msgstr "Devise"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Utilisateur"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -477,7 +491,7 @@ msgid "Employee encode all his expenses"
 msgstr "L'employé saisit tous ses frais"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -505,7 +519,7 @@ msgid "Draft"
 msgstr "Brouillon"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -570,9 +584,13 @@ msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -751,6 +769,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Approuvé"
@@ -793,6 +812,7 @@ msgstr "Nombre de comptes"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Refusée"
@@ -802,6 +822,11 @@ msgstr "Refusée"
 msgid "Can be Expensed"
 msgstr "Peut être inséré dans une note de frais"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -834,7 +859,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -879,11 +904,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -910,6 +930,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "À approuver"
 
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index cad3f378129..46fa3b4a3a7 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 08:20+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Redak troškova"
 msgid "The accoutant reimburse the expenses"
 msgstr "Računovođa isplaćuje troškove"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Postavi na neodobreno"
 msgid "To Pay"
 msgstr "Za isplatu"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr "Poruke"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Upozoranje"
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Nakon generiranja računa, isplati troškove"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr "Mjesec"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr "Djelatnik je šifrirao sve svoje troškove"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "Nacrt"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,10 +579,14 @@ msgid "Extended Filters..."
 msgstr "Dodatni filteri..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i e-pošta."
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Odobreno"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Odbijen"
@@ -791,6 +811,11 @@ msgstr "Odbijen"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "Naziv"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr "Računovodstvo"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Za odobriti"
 
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index e3c7a9ddf22..c2d8d7ef90b 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:29+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Költségtételek"
 msgid "The accoutant reimburse the expenses"
 msgstr "A könyvelő megtéríti a költségeket"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Beállítás tervezetnek"
 msgid "To Pay"
 msgstr "Fizetendő"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -223,7 +242,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -331,7 +350,7 @@ msgstr ""
 "A költségek egy részét valószínűleg tovább lehet számlázni a vevőknek"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -386,7 +405,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "A költségek megtérítése a számla elkészülte után"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -403,7 +422,7 @@ msgid "Validation Date"
 msgstr "Jóváhagyás dátuma"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -458,11 +477,6 @@ msgstr "Hónap"
 msgid "Currency"
 msgstr "Pénznem"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Felhasználó"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -479,7 +493,7 @@ msgid "Employee encode all his expenses"
 msgstr "Az alkalmazott berögzíti minden költségét"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -507,7 +521,7 @@ msgid "Draft"
 msgstr "Tervezet"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -572,9 +586,13 @@ msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Felhasználó"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -749,6 +767,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Jóváhagyott"
@@ -791,6 +810,7 @@ msgstr "Számlák száma"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Elutasított"
@@ -800,6 +820,11 @@ msgstr "Elutasított"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -832,7 +857,7 @@ msgid "Name"
 msgstr "Név"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -877,11 +902,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sorszám"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -908,6 +928,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Jóváhagyandó"
 
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index 207a8803387..01b93f4fcbf 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-09 13:50+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Sebagai Konsep"
 msgid "To Pay"
 msgstr "Untuk membayar"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Disetujui"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 9d2cf263a73..ce16b8f319b 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Riga Spesa"
 msgid "The accoutant reimburse the expenses"
 msgstr "Il contabile rimborsa le spese"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Imposta come Bozza"
 msgid "To Pay"
 msgstr "Da pagare"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -221,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -330,7 +349,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alcuni costi devono essere rifatturati al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -385,7 +404,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Dopo avercreato la fattura, rimborsare le spese"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -402,7 +421,7 @@ msgid "Validation Date"
 msgstr "Data di convalida"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -457,11 +476,6 @@ msgstr "Mese"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Utente"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -478,7 +492,7 @@ msgid "Employee encode all his expenses"
 msgstr "Il dipendente dichiara tutte le sue spese"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -506,7 +520,7 @@ msgid "Draft"
 msgstr "Bozza"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -571,9 +585,13 @@ msgid "Extended Filters..."
 msgstr "Filtri estesi..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -746,6 +764,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Approvato"
@@ -788,6 +807,7 @@ msgstr "Numero di conti"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Rifiutato"
@@ -797,6 +817,11 @@ msgstr "Rifiutato"
 msgid "Can be Expensed"
 msgstr "Può essere addebitato"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -829,7 +854,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -874,11 +899,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -905,6 +925,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Da Approvare"
 
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index b04dc881875..94d28160b2e 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-29 01:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "経費明細"
 msgid "The accoutant reimburse the expenses"
 msgstr "会計担当が経費を精算する。"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "草稿に設定"
 msgid "To Pay"
 msgstr "支払い"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "顧客にはある程度の経費を追加請求することになるでしょう。"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "請求書を作成後、経費を精算する。"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr "検証日"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr "月"
 msgid "Currency"
 msgstr "通貨"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "ユーザ"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr "従業員は自分の経費を記録する。"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "草案"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -743,6 +761,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "承認済み"
@@ -785,6 +804,7 @@ msgstr "アカウントの数"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "拒否"
@@ -794,6 +814,11 @@ msgstr "拒否"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -826,7 +851,7 @@ msgid "Name"
 msgstr "氏名"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -871,11 +896,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "順序"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -902,6 +922,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "承認する。"
 
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index 23b261223c4..d1bdff72617 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "비용 라인"
 msgid "The accoutant reimburse the expenses"
 msgstr "회계사가 비용을 환급합니다."
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "초안으로 설정"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "일부 비요은 고객에게 재차 인보이스될 수 있습니다."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "이보이스 생성 후, 비용 환급"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr "통화"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "사용자"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr "직원이 자신의 모든 비용을 인코드합니다."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "초안"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "사용자"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "승인됨"
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "거부됨"
@@ -792,6 +812,11 @@ msgstr "거부됨"
 msgid "Can be Expensed"
 msgstr "비용으로 처리될 수 있음"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr "이름"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "시퀀스"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index b6e9a6e7d60..758ef74693a 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index c4128d9f818..72dd876ea1a 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "Avansa Norēķinu rinda"
 msgid "The accoutant reimburse the expenses"
 msgstr "Tiek atmaksāti izdevumi."
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "Atzīmēt kā Melnrakstu"
 msgid "To Pay"
 msgstr "Apmaksai"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -137,12 +150,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -222,7 +241,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -329,7 +348,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Atsevišķas izmaksas var tikt piestādītas tālāk klientam."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -384,7 +403,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Tiek atmaksāti izdevumi pēc rēķina izveides"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -401,7 +420,7 @@ msgid "Validation Date"
 msgstr "Apstiprināšanas Datums"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -456,11 +475,6 @@ msgstr "Mēnesis"
 msgid "Currency"
 msgstr "Valūta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Lietotājs"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -477,7 +491,7 @@ msgid "Employee encode all his expenses"
 msgstr "Darbinieki ievada avansa norēķinus."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -505,7 +519,7 @@ msgid "Draft"
 msgstr "Uzmetums"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -570,9 +584,13 @@ msgid "Extended Filters..."
 msgstr "Paplašinātie filtri..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Lietotājs"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -745,6 +763,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Apstiprināts"
@@ -787,6 +806,7 @@ msgstr "Kontu nr."
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Atteikts"
@@ -796,6 +816,11 @@ msgstr "Atteikts"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -828,7 +853,7 @@ msgid "Name"
 msgstr "Nosaukums"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -873,11 +898,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Secība"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -904,6 +924,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Jāapstiprina"
 
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 1a16ed05b13..ba75e4ea00f 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:38+0000\n"
 "Last-Translator: Unurjargal <unuruu25@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Зардлын мөр"
 msgid "The accoutant reimburse the expenses"
 msgstr "Зардлуудыг нөхөн төлөх данс"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Ноороглох"
 msgid "To Pay"
 msgstr "Төлөх"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -223,7 +242,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -330,7 +349,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Зарим үнүүдийг харилцагч дахин нэхэмжилж магадгүй"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -385,7 +404,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Нэхэмжилэлийг үүсгэсэн дараа зардлыг нөхөн төлөх"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -402,7 +421,7 @@ msgid "Validation Date"
 msgstr "Батламжилсан огноо"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -457,11 +476,6 @@ msgstr "Сар"
 msgid "Currency"
 msgstr "Валют"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Хэрэглэгч"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -478,7 +492,7 @@ msgid "Employee encode all his expenses"
 msgstr "Ажилчдын бүх зардлыг бүртгэх"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -506,7 +520,7 @@ msgid "Draft"
 msgstr "Ноорог"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -571,9 +585,13 @@ msgid "Extended Filters..."
 msgstr "Өргөтгөсөн Шүүлтүүр..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -753,6 +771,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Зөвшөөрсөн"
@@ -795,6 +814,7 @@ msgstr "Дансны тоо"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Татгалзсан"
@@ -804,6 +824,11 @@ msgstr "Татгалзсан"
 msgid "Can be Expensed"
 msgstr "Зарлага болгох"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -836,7 +861,7 @@ msgid "Name"
 msgstr "Нэр"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -881,11 +906,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Дараалал"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -912,6 +932,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Зөвшөөрөх"
 
diff --git a/addons/hr_expense/i18n/nb.po b/addons/hr_expense/i18n/nb.po
index 5b469aeb395..9a4adbf5422 100644
--- a/addons/hr_expense/i18n/nb.po
+++ b/addons/hr_expense/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 16:30+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "Utgift linje."
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "Sett som utkast."
 msgid "To Pay"
 msgstr "Å betale."
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr "Meldinger."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "Feil!"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Advarsel."
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Noen kostnader kan være fakturaer til kunden."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr "Ansatt må ha en hjemme adresse."
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr "Validering dato."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr "Utgift kvittering."
@@ -452,11 +471,6 @@ msgstr "Måned."
 msgid "Currency"
 msgstr "Valuta."
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Bruker."
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "Kladd."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,10 +580,14 @@ msgid "Extended Filters..."
 msgstr "Utvidet Filtere ..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentarer og E-poster."
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Bruker."
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Godkjent."
@@ -783,6 +802,7 @@ msgstr "# av kontoer."
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Avvist."
@@ -792,6 +812,11 @@ msgstr "Avvist."
 msgid "Can be Expensed"
 msgstr "Kan utgiftsføres."
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr "Navn."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr "Du kan bare slette utkast utgifter!"
@@ -869,11 +894,6 @@ msgstr "Meldinger og kommunikasjon historie."
 msgid "Sequence"
 msgstr "Sekvens."
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr "Regnskap."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Til Godkjenning."
 
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 2c4264b6fbe..1efd8c9c58a 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-25 13:11+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Declaratieregel"
 msgid "The accoutant reimburse the expenses"
 msgstr "De accountant vergoedt de declaratie"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Zet op concept"
 msgid "To Pay"
 msgstr "Te betalen"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr "Berichten"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -224,7 +243,7 @@ msgstr ""
 "ingevoegd."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -332,7 +351,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Sommige kosten kunnen doorbelast worden aan de klant"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr "Voor de werknemer moet een huisadres zijn ingesteld."
@@ -387,7 +406,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Na aanmaken factuur, kosten vergoeden"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -404,7 +423,7 @@ msgid "Validation Date"
 msgstr "Controledatum"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr "Declaratie bon"
@@ -459,11 +478,6 @@ msgstr "Maand"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Gebruiker"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -480,7 +494,7 @@ msgid "Employee encode all his expenses"
 msgstr "Werknemer declareert al diens onkosten"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -510,7 +524,7 @@ msgid "Draft"
 msgstr "Concept"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -575,10 +589,14 @@ msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -755,6 +773,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Goedgekeurd"
@@ -797,6 +816,7 @@ msgstr "# rekeningen"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Geweigerd"
@@ -806,6 +826,11 @@ msgstr "Geweigerd"
 msgid "Can be Expensed"
 msgstr "Kan gedeclareerd worden"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -838,7 +863,7 @@ msgid "Name"
 msgstr "Naam"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr "U kunt alleen declaraties in de conceptfase verwijderen."
@@ -883,11 +908,6 @@ msgstr "Berichten en communicatie historie"
 msgid "Sequence"
 msgstr "Volgorde"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -914,6 +934,7 @@ msgstr "Financieel"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Goed te keuren"
 
@@ -969,9 +990,6 @@ msgstr "Doorbelasten"
 #~ msgid "My expenses waiting validation"
 #~ msgstr "Mijn declaraties wachtend op goedkeuring"
 
-#~ msgid "UoM"
-#~ msgstr "Meeteenheid"
-
 #~ msgid "Validation"
 #~ msgstr "Controle"
 
@@ -1188,3 +1206,6 @@ msgstr "Doorbelasten"
 
 #~ msgid "Can Constitute an Expense"
 #~ msgstr "Declaratie product"
+
+#~ msgid "UoM"
+#~ msgstr "Maateenheid"
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index 0e5135c5b95..69e3bd22510 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index 2e92bc32c11..10a758bdfdb 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 17:51+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
@@ -32,6 +32,11 @@ msgstr "Pozycja wydatków"
 msgid "The accoutant reimburse the expenses"
 msgstr "Księgowość zwraca wydatki"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Ustaw na projekt"
 msgid "To Pay"
 msgstr "Do zapłacenia"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr "Wiadomości"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -222,7 +241,7 @@ msgstr ""
 "kanban."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -329,7 +348,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Część kosztów może być refakturowana na klienta"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr "Pracownik musi mieć adres domowy"
@@ -384,7 +403,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Po utworzeniu faktury zwrot wydatków"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -401,7 +420,7 @@ msgid "Validation Date"
 msgstr "Data zatwierdzenia"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr "Potwierdzenie wydatku"
@@ -456,11 +475,6 @@ msgstr "Miesiąc"
 msgid "Currency"
 msgstr "Waluta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Użytkownik"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -477,7 +491,7 @@ msgid "Employee encode all his expenses"
 msgstr "Pracownik wprowadza swoje wydatki"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -507,7 +521,7 @@ msgid "Draft"
 msgstr "Projekt"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -572,10 +586,14 @@ msgid "Extended Filters..."
 msgstr "Rozszerzone filtry..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -761,6 +779,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Zatwierdzone"
@@ -803,6 +822,7 @@ msgstr "# kont"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Odrzucono"
@@ -812,6 +832,11 @@ msgstr "Odrzucono"
 msgid "Can be Expensed"
 msgstr "Może być wydatkiem"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -844,7 +869,7 @@ msgid "Name"
 msgstr "Nazwa"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr "Możesz usuwać jedynie projekty wydatków!"
@@ -889,11 +914,6 @@ msgstr "Wiadomości i historia komunikacji"
 msgid "Sequence"
 msgstr "Numeracja"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -920,6 +940,7 @@ msgstr "Księgowość"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Do aprobaty"
 
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 82118ab4b17..0a9e12741cc 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 16:55+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Linha de Despesa"
 msgid "The accoutant reimburse the expenses"
 msgstr "O contabilista reembolsa as despesas"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Definir como Rascunho"
 msgid "To Pay"
 msgstr "Para pagar"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -220,7 +239,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -328,7 +347,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alguns custos podem ser re-faturados para o cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr "O empregado deve ter um endereço de casa"
@@ -383,7 +402,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Após ter criado a fatura, reembolsar despesas"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -400,7 +419,7 @@ msgid "Validation Date"
 msgstr "Data de validação"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -455,11 +474,6 @@ msgstr "Mês"
 msgid "Currency"
 msgstr "Moeda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Utilizador"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -476,7 +490,7 @@ msgid "Employee encode all his expenses"
 msgstr "Funcionário codifica todos os seus gastos"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -504,7 +518,7 @@ msgid "Draft"
 msgstr "Rascunho"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -569,10 +583,14 @@ msgid "Extended Filters..."
 msgstr "Filtros avançados..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -749,6 +767,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprovado"
@@ -791,6 +810,7 @@ msgstr "Número de Contas"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Recusado"
@@ -800,6 +820,11 @@ msgstr "Recusado"
 msgid "Can be Expensed"
 msgstr "Pode ser Despesa"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -832,7 +857,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -877,11 +902,6 @@ msgstr "Histórico de mensagens e comunicação"
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -908,6 +928,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Para aprovar"
 
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 4e8e41d7e76..7c6de9e9f25 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Linha de Despesa"
 msgid "The accoutant reimburse the expenses"
 msgstr "A conta para reembolso de despesas"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Definir como Provisório"
 msgid "To Pay"
 msgstr "A pagar"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -221,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -329,7 +348,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alguns custos podem ser refaturados para o cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -384,7 +403,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Depois de criar a fatura, reimbolsar despesas"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -401,7 +420,7 @@ msgid "Validation Date"
 msgstr "Data de Validação"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -456,11 +475,6 @@ msgstr "Mês"
 msgid "Currency"
 msgstr "Moeda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Usuário"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -477,7 +491,7 @@ msgid "Employee encode all his expenses"
 msgstr "Funcionário codifica todas suas despesas"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -505,7 +519,7 @@ msgid "Draft"
 msgstr "Provisório"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -570,9 +584,13 @@ msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuário"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -750,6 +768,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprovado"
@@ -792,6 +811,7 @@ msgstr "No de Contas"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Recusado"
@@ -801,6 +821,11 @@ msgstr "Recusado"
 msgid "Can be Expensed"
 msgstr "Pode conter despesa"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -833,7 +858,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -878,11 +903,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sequencia"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -909,6 +929,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Para Aprovar"
 
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index 00e36b99292..c4644ac2cb0 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:10+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Linie de cheltuieli"
 msgid "The accoutant reimburse the expenses"
 msgstr "Contabilul ramburseaza cheltuielile"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Setati ca ciorna"
 msgid "To Pay"
 msgstr "De platit"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -223,7 +242,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -331,7 +350,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Anumite costuri ar putea fi refacturate clientului"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -386,7 +405,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Dupa crearea facturii, rambursati cheltuielile"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -403,7 +422,7 @@ msgid "Validation Date"
 msgstr "Data validarii"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -458,11 +477,6 @@ msgstr "Luna"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Utilizator"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -479,7 +493,7 @@ msgid "Employee encode all his expenses"
 msgstr "Salariatul isi inregistreaza toate cheltuielile"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -507,7 +521,7 @@ msgid "Draft"
 msgstr "Ciorna"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -572,9 +586,13 @@ msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Utilizator"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -753,6 +771,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Aprobat(a)"
@@ -795,6 +814,7 @@ msgstr "# de Conturi"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Respins"
@@ -804,6 +824,11 @@ msgstr "Respins"
 msgid "Can be Expensed"
 msgstr "Poate fi cheltuit"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -836,7 +861,7 @@ msgid "Name"
 msgstr "Nume"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -881,11 +906,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Secventa"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -912,6 +932,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "De aprobat"
 
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index 742807e7b2d..f4b7052adc8 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Позиция расходов"
 msgid "The accoutant reimburse the expenses"
 msgstr "Бухгалтер возмещает расходы"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Установить в 'Черновик'"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Некоторые расходы могут быть пересчитаны клиенту"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "После создания счета, возмещать расходы"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Валюта"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Пользователь"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr "Сотрудник описывает все свои расходы"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "Черновик"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Пользователь"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Утвержден"
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Отклонено"
@@ -792,6 +812,11 @@ msgstr "Отклонено"
 msgid "Can be Expensed"
 msgstr "Может быть расходом"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr "Название"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 7e4b3649fc5..613a0f4c797 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 12:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Postavka izdatkov"
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Preklopi v pripravo"
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Uporabnik"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "Osnutek"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Odobreno"
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Zavrnjeno"
@@ -791,6 +811,11 @@ msgstr "Zavrnjeno"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr "Ime"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Zaporedje"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index 941bc9099bb..203eeb7c06c 100644
--- a/addons/hr_expense/i18n/sq.po
+++ b/addons/hr_expense/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -792,6 +812,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index 92c31c2adaa..02b8eaa0f73 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-12-28 10:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -792,6 +812,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index 8d6068db767..4d2e5e5a4f5 100644
--- a/addons/hr_expense/i18n/sr@latin.po
+++ b/addons/hr_expense/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr "Linija troškova"
 msgid "The accoutant reimburse the expenses"
 msgstr "Računovođa isplaćuje troškove"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr "Postavi kao Nacrt"
 msgid "To Pay"
 msgstr "Za plaćanje"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -220,7 +239,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -327,7 +346,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Neki troškovi mogu da budu prefakturisani na kupca"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -382,7 +401,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Nakon fakturisanja ,nadoknađeni troškovi"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -399,7 +418,7 @@ msgid "Validation Date"
 msgstr "Datum odobrenja"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -454,11 +473,6 @@ msgstr "Mesec"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -475,7 +489,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -503,7 +517,7 @@ msgid "Draft"
 msgstr "Nacrt"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -568,9 +582,13 @@ msgid "Extended Filters..."
 msgstr "Prošireni uslovi..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -743,6 +761,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Odobreno"
@@ -785,6 +804,7 @@ msgstr "# računa"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Odbijeno"
@@ -794,6 +814,11 @@ msgstr "Odbijeno"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -826,7 +851,7 @@ msgid "Name"
 msgstr "Ime"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -871,11 +896,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -902,6 +922,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Dozvoliti"
 
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 1ac5a1d263b..3d98093b802 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-20 15:22+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Utgiftsrad"
 msgid "The accoutant reimburse the expenses"
 msgstr "Bokföraren ersätter utläggen"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Sätt till utkast"
 msgid "To Pay"
 msgstr "Att Betala"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -136,12 +149,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -221,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -328,7 +347,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Vissa kostnader kan faktureras kunden"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -383,7 +402,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "Efter skapandet av faktura, ersätt kostnader"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -400,7 +419,7 @@ msgid "Validation Date"
 msgstr "Bekräftad datum"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -455,11 +474,6 @@ msgstr "Månad"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Användare"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -476,7 +490,7 @@ msgid "Employee encode all his expenses"
 msgstr "Anställd koda alla hans utgifter"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -504,7 +518,7 @@ msgid "Draft"
 msgstr "Preliminär"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -569,9 +583,13 @@ msgid "Extended Filters..."
 msgstr "Utökade filter..."
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Användare"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -750,6 +768,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Godkänd"
@@ -792,6 +811,7 @@ msgstr "# konton"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Nekad"
@@ -801,6 +821,11 @@ msgstr "Nekad"
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -833,7 +858,7 @@ msgid "Name"
 msgstr "Namn"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -878,11 +903,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Nummerserie"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -909,6 +929,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "Att godkänna"
 
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index 1f1687c1ecd..ebdad8724c8 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 67ee521c599..d58c9f10e4c 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "Gider Öğesi"
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "Taslağa  Ayarla"
 msgid "To Pay"
 msgstr "Ödenecek"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Para Birimi"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "Kullanıcı"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr "Taslak"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Kullanıcı"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -792,6 +812,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr "Gider Olabilir"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sıra No"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index bc91128fc2a..b111a13b112 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-04 05:50+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index 2ddfe9144c3..2148449b4a1 100644
--- a/addons/hr_expense/i18n/vi.po
+++ b/addons/hr_expense/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -33,6 +33,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -101,6 +106,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -135,12 +148,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -218,7 +237,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -325,7 +344,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -380,7 +399,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -397,7 +416,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -452,11 +471,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -473,7 +487,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -501,7 +515,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -566,9 +580,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -741,6 +759,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -783,6 +802,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -792,6 +812,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -824,7 +849,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -869,11 +894,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -900,6 +920,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 4574db0ec31..5707f2abbd3 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr "费用明细"
 msgid "The accoutant reimburse the expenses"
 msgstr "财务报销这费用"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr "设为草稿"
 msgid "To Pay"
 msgstr "支付"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "有些成本可能要重开发票给客户"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr "创建发票后报销费用"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr "审核日期"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr "月份"
 msgid "Currency"
 msgstr "币种"
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr "用户"
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr "员工所有的费用"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr "草稿"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -742,6 +760,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "已审批"
@@ -784,6 +803,7 @@ msgstr "# 科目"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "已拒绝"
@@ -793,6 +813,11 @@ msgstr "已拒绝"
 msgid "Can be Expensed"
 msgstr "可支出"
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -825,7 +850,7 @@ msgid "Name"
 msgstr "名称"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -870,11 +895,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "序列"
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -901,6 +921,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr "待审批"
 
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index 4fe939ebe42..1f893457d14 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-01-30 13:19+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -32,6 +32,11 @@ msgstr ""
 msgid "The accoutant reimburse the expenses"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
@@ -100,6 +105,14 @@ msgstr ""
 msgid "To Pay"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
@@ -134,12 +147,18 @@ msgid "Messages"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
@@ -217,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -324,7 +343,7 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
 msgstr ""
@@ -379,7 +398,7 @@ msgid "After creating invoice, reimburse expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -396,7 +415,7 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
 msgstr ""
@@ -451,11 +470,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
@@ -472,7 +486,7 @@ msgid "Employee encode all his expenses"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -500,7 +514,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase: "
@@ -565,9 +579,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
 msgstr ""
 
 #. module: hr_expense
@@ -740,6 +758,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr ""
@@ -782,6 +801,7 @@ msgstr ""
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr ""
@@ -791,6 +811,11 @@ msgstr ""
 msgid "Can be Expensed"
 msgstr ""
 
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
@@ -823,7 +848,7 @@ msgid "Name"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
 msgstr ""
@@ -868,11 +893,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_product
-msgid "Types of Expenses"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
@@ -899,6 +919,7 @@ msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
 msgid "To Approve"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index ad17b5ee1fa..e635b1b3c8d 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-12 20:01+0000\n"
 "Last-Translator: Pioneer Solutions <wzaki_dotcom@yahoo.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "في انتظار الموافقة الثانية"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "مقبول"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "ارفض"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "اجازة حسب الإدارة"
 msgid "Second Approval"
 msgstr "الموافقة الثانية"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -275,12 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -318,7 +312,7 @@ msgid "Sick Leaves"
 msgstr "أعطال مرضية"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -379,9 +373,9 @@ msgid "Leaves by Type"
 msgstr "اجازة حسب النوع"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "سالمون خفيف"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -389,7 +383,7 @@ msgid "Wheat"
 msgstr "قمحي"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -413,7 +407,7 @@ msgid "Number of Days"
 msgstr "عدد الأيام"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -430,11 +424,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "بحث بنوع الاجازة"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -445,11 +434,6 @@ msgstr "في انتظار الموافقة"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "الحد الاقصى المسموح"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -480,6 +464,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -519,7 +509,7 @@ msgid "Start Date"
 msgstr "تاريخ البدء"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -660,12 +650,6 @@ msgstr "المستخدم"
 msgid "Active"
 msgstr "نشط"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -719,9 +703,8 @@ msgid "My Department Leaves"
 msgstr "قسمي للمغادرات"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -775,7 +758,7 @@ msgid "Validated"
 msgstr "تم التحقق"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -839,7 +822,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -848,6 +831,7 @@ msgid "Leave Request"
 msgstr "طلب الاجازة"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "الوصف"
@@ -860,6 +844,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "مرفوض"
 
@@ -901,9 +886,9 @@ msgid "Violet"
 msgstr "بنفسجي"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "سالمون خفيف"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "الحد الاقصى المسموح"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -936,8 +921,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -948,12 +933,6 @@ msgstr ""
 msgid "Leave"
 msgstr "مغادرة"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1014,13 +993,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "للموافقة"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1033,12 +1012,6 @@ msgstr "الأسباب"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "الأعياد"
 
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index c6941d6a516..09890a4889a 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 09:21+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Чакащи второ одобрение"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Одобрена"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Отказ"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Напускащи по отдел"
 msgid "Second Approval"
 msgstr "Второ одобрение"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr "Отпуски по тип"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr "Брой дни"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Терсене по тип отпуск"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr "Чака одобрение"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Максимално разрешени"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr "Начална дата"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr "Потребител"
 msgid "Active"
 msgstr "Активен"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr "Проверен"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr "Молба за отпуск"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Описание"
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Отказана"
 
@@ -898,9 +883,9 @@ msgid "Violet"
 msgstr "Виолетов"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr ""
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Максимално разрешени"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Напускане"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "За одобрение"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr "Причини"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Потвърждение"
 
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index b9527f8e614..ef6d0961d2d 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-09 13:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -898,8 +883,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1027,9 +1006,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 7cf0f23ab40..6ac656d4437 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-08-06 12:11+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "A l'espera de segona aprovació"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprovada"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Rebutja"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Ausencias por departamento"
 msgid "Second Approval"
 msgstr "Segona aprovació"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -276,12 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Avís!"
@@ -319,7 +313,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -380,9 +374,9 @@ msgid "Leaves by Type"
 msgstr "Absències per tipus"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmó clar"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -390,7 +384,7 @@ msgid "Wheat"
 msgstr "Groc palla"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -414,7 +408,7 @@ msgid "Number of Days"
 msgstr "Número de dies"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -431,11 +425,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Cerca tipus d'absència"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -446,11 +435,6 @@ msgstr "Esperant aprovació"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Màxim permès"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -481,6 +465,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -520,7 +510,7 @@ msgid "Start Date"
 msgstr "Data d'inici"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -663,12 +653,6 @@ msgstr "Usuari/a"
 msgid "Active"
 msgstr "Actiu"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -722,9 +706,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -779,7 +762,7 @@ msgid "Validated"
 msgstr "Validat"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -843,7 +826,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -852,6 +835,7 @@ msgid "Leave Request"
 msgstr "Petició d'absència"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descripció"
@@ -864,6 +848,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Rebutjada"
 
@@ -907,9 +892,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmó clar"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Màxim permès"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -942,8 +927,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -954,12 +939,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Absència"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1020,13 +999,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Per aprovar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1039,12 +1018,6 @@ msgstr "Raons"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Confirma"
 
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 48af1910858..3c2f1bf38c7 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-10-17 08:27+0000\n"
 "Last-Translator: Chronos <Unknown>\n"
 "Language-Team: openerp-i18n-czech  <openerp-i18n-czech@lists.launchpad.net "
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
@@ -34,7 +34,7 @@ msgid "Waiting Second Approval"
 msgstr "Čekající na druhé schválení"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -110,6 +110,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -150,6 +155,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Scháleno"
 
@@ -164,13 +170,7 @@ msgid "Refuse"
 msgstr "Odmítnout"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -216,12 +216,6 @@ msgstr "Uvolnění podle oddělení"
 msgid "Second Approval"
 msgstr "Druhé schválení"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -278,12 +272,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
@@ -321,7 +315,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -382,9 +376,9 @@ msgid "Leaves by Type"
 msgstr "Uvolnění podle typu"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Světle lososová"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -392,7 +386,7 @@ msgid "Wheat"
 msgstr "Pšeničná"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -416,7 +410,7 @@ msgid "Number of Days"
 msgstr "Počet dní"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -433,11 +427,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Hledat typ uvolnění"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -448,11 +437,6 @@ msgstr "Čekající na schválení"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Nejvíce povolených"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -483,6 +467,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -522,7 +512,7 @@ msgid "Start Date"
 msgstr "Počáteční datum"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -665,12 +655,6 @@ msgstr "Uživatel"
 msgid "Active"
 msgstr "Aktivní"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -724,9 +708,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -781,7 +764,7 @@ msgid "Validated"
 msgstr "Ověřeno"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -845,7 +828,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -854,6 +837,7 @@ msgid "Leave Request"
 msgstr "Požavek na uvolnění"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Popis"
@@ -866,6 +850,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Odmítnuto"
 
@@ -908,9 +893,9 @@ msgid "Violet"
 msgstr "Fialová"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Světle lososová"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Nejvíce povolených"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -943,8 +928,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -955,12 +940,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Uvolnění"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1021,13 +1000,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Ke schválení"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1040,12 +1019,6 @@ msgstr "Důvody"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Allocation Type"
 #~ msgstr "Typ přidělení"
 
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index ed6895fc427..df9254ea2ba 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 48ac0b2ae4a..e48523069f6 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 23:20+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "Zweite Genehmigung"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -115,6 +115,11 @@ msgstr ""
 "Sie können selbstverständlich diese Grundeinstellung auf Ihren Bedarf hin "
 "anpassen."
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -157,6 +162,7 @@ msgstr "Genehmigt"
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Genehmigt"
 
@@ -171,15 +177,7 @@ msgid "Refuse"
 msgstr "Abgelehnt"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-"Urlaub wurde <b>beantragt</b>, erwartet wird Prüfung und Genehmigung durch "
-"den Vorgesetzten."
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -226,12 +224,6 @@ msgstr "Urlaub nach Abteilung"
 msgid "Second Approval"
 msgstr "Zweite Genehmigung"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr "Die Anfrage wurde <b>genehmigt</b>."
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -293,12 +285,12 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -336,7 +328,7 @@ msgid "Sick Leaves"
 msgstr "Krankheitsstände"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Abwesenheitsanfrage für %s"
@@ -397,9 +389,9 @@ msgid "Leaves by Type"
 msgstr "Abwesenheit nach Typ"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr "Urlaub: Markiere als ungelesen"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Hell Rosa"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -407,7 +399,7 @@ msgid "Wheat"
 msgstr "Weiss"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Zuteilung für %s"
@@ -439,7 +431,7 @@ msgid "Number of Days"
 msgstr "Anzahl Tage"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -465,11 +457,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Suche Abwesenheitstyp"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr "Urlaub: Markiere als gelesen"
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -480,11 +467,6 @@ msgstr "Erwarte Genehmigung"
 msgid "Employee Tag"
 msgstr "Mitarbeiter 'Tag'"
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maximal zulässige"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -526,6 +508,13 @@ msgstr ""
 "Sobald eine Urlaubsanfrage genehmigt wird, trägt OpenERP dieses unmittelbar "
 "in den Kalender als Abwesenheit ein."
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+"Sie müssen mindestens eine Abteilung zuweisen. Versuchen Sie es erneut."
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -565,7 +554,7 @@ msgid "Start Date"
 msgstr "Start am"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -731,12 +720,6 @@ msgstr "Benutzer"
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -790,10 +773,9 @@ msgid "My Department Leaves"
 msgstr "Urlaube meiner Abteilung"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
-msgstr "Antrag wurde <b>erstellt</b>, Genehmigung wird erwartet"
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
+msgstr ""
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
@@ -847,7 +829,7 @@ msgid "Validated"
 msgstr "Bestätigt"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr "Sie können keine Anfrage im %s Status stornieren"
@@ -914,7 +896,7 @@ msgid "To Submit"
 msgstr "Zu bestätigen"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -923,6 +905,7 @@ msgid "Leave Request"
 msgstr "Urlaubsanfrage"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Beschreibung"
@@ -935,6 +918,7 @@ msgstr "Nach Mitarbeiter 'Tag'"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Abgelehnt"
 
@@ -978,9 +962,9 @@ msgid "Violet"
 msgstr "Violett"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Hell Rosa"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maximal zulässige"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -1013,8 +997,8 @@ msgid "Messages and communication history"
 msgstr "Nachrichten und Kommunikations-Historie"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -1025,12 +1009,6 @@ msgstr "Das Start Datum muss vor dem Ende Datum sein"
 msgid "Leave"
 msgstr "Urlaub"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr "Anfrage wurde<b>abgelehnt</b>"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1097,15 +1075,14 @@ msgstr "Dauer"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Zu Genehmigen"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
-"Sie müssen mindestens eine Abteilung zuweisen. Versuchen Sie es erneut."
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
@@ -1117,12 +1094,6 @@ msgstr "Abwesenheitsgrund"
 msgid "Select Leave Type"
 msgstr "Auswahl des Abwesenheitstypen"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr "Anfrage wurde <b>genehmigt</b>"
-
 #~ msgid "Set to Draft"
 #~ msgstr "Setze auf Entwurf"
 
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 1768f546fb1..4e5bf7e39c2 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 11:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -35,7 +35,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -111,6 +111,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -151,6 +156,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Εγκεκριμένη"
 
@@ -165,13 +171,7 @@ msgid "Refuse"
 msgstr "Απόρριψη"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -217,12 +217,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -276,12 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -319,7 +313,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -380,9 +374,9 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Ανοικτό Σομόν"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -390,7 +384,7 @@ msgid "Wheat"
 msgstr "Σιταρένιο"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -414,7 +408,7 @@ msgid "Number of Days"
 msgstr "Ημέρες"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -431,11 +425,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -446,11 +435,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -481,6 +465,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -520,7 +510,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -661,12 +651,6 @@ msgstr "Χρήστης"
 msgid "Active"
 msgstr "Ενεργό"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -720,9 +704,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -775,7 +758,7 @@ msgid "Validated"
 msgstr "Επικυρωμένη"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -839,7 +822,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -848,6 +831,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Περιγραφή"
@@ -860,6 +844,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Απορριφθείσα"
 
@@ -901,9 +886,9 @@ msgid "Violet"
 msgstr "Μωβ"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Ανοικτό Σομόν"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -934,8 +919,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -946,12 +931,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1012,13 +991,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1031,12 +1010,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Set to Draft"
 #~ msgstr "Ορισμός ως Πρόχειρο"
 
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 8df2c82f561..f5fd612a1d1 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 22:46+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "A la espera de segunda aprobación"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -112,6 +112,11 @@ msgstr ""
 "El horario laboral por defecto es de 8 horas. Puede modificarlo si es "
 "necesario."
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -152,6 +157,7 @@ msgstr "Validar"
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprobada"
 
@@ -166,14 +172,7 @@ msgid "Refuse"
 msgstr "Rechazar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-"La petición se ha <b>enviado</b>. Esperando a la validación del responsable."
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr "Petición <b>aprobación</b>. Esperando una segunda validación."
@@ -219,12 +218,6 @@ msgstr "Ausencias por departamento"
 msgid "Second Approval"
 msgstr "Segunda aprobación"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr "La petición ha sido <b>aprobada</b>."
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -284,12 +277,12 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -327,7 +320,7 @@ msgid "Sick Leaves"
 msgstr "Ausencias por enfermedad"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Petición de ausencia para %s"
@@ -388,9 +381,9 @@ msgid "Leaves by Type"
 msgstr "Ausencias por tipo"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr "Vacaciones: Marcar como no leídos"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmón claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -398,7 +391,7 @@ msgid "Wheat"
 msgstr "Amarillo"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Asignación para %s"
@@ -426,7 +419,7 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -452,11 +445,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Buscar tipo de ausencia"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr "Vacaciones: Marcar como leídos"
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -467,11 +455,6 @@ msgstr "Esperando aprobación"
 msgid "Employee Tag"
 msgstr "Etiqueta del empleado"
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Máximo permitido"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -511,6 +494,12 @@ msgstr ""
 "Una vez que una ausencia es validada, OpenERP marcará estas fechas en el "
 "calendario."
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr "Debe seleccionar al menos un departamento y probar otra vez."
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -550,7 +539,7 @@ msgid "Start Date"
 msgstr "Fecha inicio"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -709,12 +698,6 @@ msgstr "Usuario"
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -768,10 +751,9 @@ msgid "My Department Leaves"
 msgstr "Ausencias de mi departamento"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
-msgstr "Petición <b>creada</b>. Esperando confirmación."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
+msgstr ""
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
@@ -825,7 +807,7 @@ msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr "No puede eliminar una ausencia que está en estado %s."
@@ -892,7 +874,7 @@ msgid "To Submit"
 msgstr "A enviar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -901,6 +883,7 @@ msgid "Leave Request"
 msgstr "Petición de ausencia"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descripción"
@@ -913,6 +896,7 @@ msgstr "Por etiqueta de empleado"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Rechazada"
 
@@ -956,9 +940,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmón claro"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Máximo permitido"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -992,8 +976,8 @@ msgid "Messages and communication history"
 msgstr "Mensajes e historial de comunicación"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -1004,12 +988,6 @@ msgstr "La fecha de inicio debe ser anterior a la fecha de fin."
 msgid "Leave"
 msgstr "Ausencia"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr "Petición <b>rehusada</b>"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1075,14 +1053,14 @@ msgstr "Duración"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Para aprobar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
-msgstr "Debe seleccionar al menos un departamento y probar otra vez."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
+msgstr ""
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
@@ -1094,12 +1072,6 @@ msgstr "Razones"
 msgid "Select Leave Type"
 msgstr "Seleccione tipo de ausencia"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr "Petición <b>validada</b>."
-
 #~ msgid "Confirm"
 #~ msgstr "Confirmar"
 
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 66e8d7d431e..754fba9a827 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-22 19:19+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
 "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprobado"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Rechazar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,9 +372,9 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmón claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr "Trigo"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "Cantidad de días"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "Usuario"
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descripción"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -899,9 +884,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmón claro"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Vacaciones"
 
diff --git a/addons/hr_holidays/i18n/es_CR.po b/addons/hr_holidays/i18n/es_CR.po
index e96825d7735..462a8cc4c72 100644
--- a/addons/hr_holidays/i18n/es_CR.po
+++ b/addons/hr_holidays/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-16 15:29+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: hr_holidays
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "A la espera de segunda aprobación"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprobado"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Rechazar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Ausencias por departamento"
 msgid "Second Approval"
 msgstr "Segunda aprobación"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -278,12 +272,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -321,7 +315,7 @@ msgid "Sick Leaves"
 msgstr "Permisos de"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Requisito para permiso %s"
@@ -382,9 +376,9 @@ msgid "Leaves by Type"
 msgstr "Ausencias por tipo"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmón claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -392,7 +386,7 @@ msgid "Wheat"
 msgstr "Amarillo"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Asignación para %s"
@@ -416,7 +410,7 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -442,11 +436,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Buscar tipo de ausencia"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -457,11 +446,6 @@ msgstr "Esperando aprobación"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Máximo permitido"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -492,6 +476,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -531,7 +521,7 @@ msgid "Start Date"
 msgstr "Fecha inicio"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -674,12 +664,6 @@ msgstr "Usuario"
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -733,9 +717,8 @@ msgid "My Department Leaves"
 msgstr "Mi departamento de permisos"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -790,7 +773,7 @@ msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -854,7 +837,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -863,6 +846,7 @@ msgid "Leave Request"
 msgstr "Petición de ausencia"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descripción"
@@ -875,6 +859,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -918,9 +903,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmón claro"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Máximo permitido"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -954,8 +939,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -966,12 +951,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Ausencia"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1032,13 +1011,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Para aprobar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1051,12 +1030,6 @@ msgstr "Razones"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Allocation Type"
 #~ msgstr "Tipo de asignación"
 
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index 1a95e14d214..2bf1444a1e2 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-19 00:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprobado"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Rechazar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,9 +372,9 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmón claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr "Trigo"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "Usuario"
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descripción"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -899,9 +884,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmón claro"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Vacaciones"
 
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index 1a156d92c3a..b474e95e56f 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 11:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Heakskiidetud"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Keeldu"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,9 +371,9 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Helekollane"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr "Nisukarva"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr "Päevade arv"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr "Kasutaja"
 msgid "Active"
 msgstr "Aktiivne"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr "Kinnitatud"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Kirjeldus"
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Tagasi lükatud"
 
@@ -898,9 +883,9 @@ msgid "Violet"
 msgstr "Violetne"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Helekollane"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "General"
 #~ msgstr "Üldine"
 
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 41e8b2f9158..24d37ad3065 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 13:06+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "Odottaa toista hyväksyntää"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Hyväksytty"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Hylkää"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Poissaolot osastoittain"
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,9 +372,9 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Kirkas lohenpunainen"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "Päivien lukumäärä"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "Käyttäjä"
 msgid "Active"
 msgstr "Aktiivinen"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr "Vahvistettu"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Kuvaus"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Hylätty"
 
@@ -899,9 +884,9 @@ msgid "Violet"
 msgstr "Violetti"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Kirkas lohenpunainen"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Poissaolo"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Both Validated and Confirmed"
 #~ msgstr "Kummatkin - Tarkistetut ja Vahvistetut"
 
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 42d0f64e2a2..a343e04dde1 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 14:36+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "En attente d'une deuxième approbation"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Approuvée"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Refuser"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Congés par département"
 msgid "Second Approval"
 msgstr "Deuxième approbation"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -279,12 +273,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Avertissement !"
@@ -322,7 +316,7 @@ msgid "Sick Leaves"
 msgstr "Arrêts maladie"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Demande de congés pour %s"
@@ -383,9 +377,9 @@ msgid "Leaves by Type"
 msgstr "Congés par type"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Saumon clair"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -393,7 +387,7 @@ msgid "Wheat"
 msgstr "Blé"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Allocation pour %s"
@@ -417,7 +411,7 @@ msgid "Number of Days"
 msgstr "Nombre de jours"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -442,11 +436,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Rechercher un type d'absence"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -457,11 +446,6 @@ msgstr "En attente d'approbation"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maximum permis"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -492,6 +476,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -531,7 +521,7 @@ msgid "Start Date"
 msgstr "Date de début"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -674,12 +664,6 @@ msgstr "Utilisateur"
 msgid "Active"
 msgstr "Actif"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -733,9 +717,8 @@ msgid "My Department Leaves"
 msgstr "Les congés de mon département"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -790,7 +773,7 @@ msgid "Validated"
 msgstr "Validé"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -854,7 +837,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -863,6 +846,7 @@ msgid "Leave Request"
 msgstr "Demande de congé"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Description"
@@ -875,6 +859,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Refusée"
 
@@ -918,9 +903,9 @@ msgid "Violet"
 msgstr "Violet"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Saumon clair"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maximum permis"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -954,8 +939,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -966,12 +951,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Congé"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1032,13 +1011,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "À approuver"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1051,12 +1030,6 @@ msgstr "Raisons"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Vacances"
 
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
index 4a03b8833b5..a44fb356fa3 100644
--- a/addons/hr_holidays/i18n/gu.po
+++ b/addons/hr_holidays/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-25 06:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "મંજૂર થઇ ચૂકી છે"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "નકારવા"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "ચેતવણી!"
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "વપરાશકર્તા"
 msgid "Active"
 msgstr "સક્રિય"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "વર્ણન"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr "છોડો"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Allocation Type"
 #~ msgstr "ફાળવણી પ્રકાર"
 
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index 59532c9ae22..87696b64b72 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 15:13+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "स्वीकृत"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "अस्वीकार"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "दिनों की संख्या"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "उपयोगकर्ता"
 msgid "Active"
 msgstr "सक्रिय"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "विवरण"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "मना कर दिया"
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "छुट्टियां"
 
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index b8be10ce875..2c31ea46200 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 11:47+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Odobreno"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Odbijeni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -898,8 +883,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Godišnji odmori"
 
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index bee06b33958..1c5803a6269 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-03 18:08+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Várakozás a második jóváhagyásra"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Jóváhagyott"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Elutasít"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Szabadságok osztályonként"
 msgid "Second Approval"
 msgstr "Második jóváhagyás"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Vigyázat!"
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,9 +371,9 @@ msgid "Leaves by Type"
 msgstr "Szabadságok típusonként"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Világoslazacszín"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr "Búzaszín"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr "Napok száma"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Szabadságtípusok keresése"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr "Várakozás a  jóváhagyásra"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maximum engedélyezett"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr "Kezdő dátum"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr "Felhasználó"
 msgid "Active"
 msgstr "aktív"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr "Érvényesített"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr "Szabadságolási kérelem"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Leírás"
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Elutasított"
 
@@ -898,9 +883,9 @@ msgid "Violet"
 msgstr "Lila"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Világoslazacszín"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maximum engedélyezett"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Szabadság"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Jóváhagyandó"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr "Okok"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Allocation Type"
 #~ msgstr "Juttatás típusa"
 
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index d669276978f..0299e63a065 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-08 07:35+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Menunggu Persetujuan Kedua"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Disetujui"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Tolak"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Cuti dari Departemen"
 msgid "Second Approval"
 msgstr "Persetujuan Kedua"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -284,12 +278,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Peringatan!"
@@ -327,7 +321,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -388,9 +382,9 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Cuti Menurut Jenis"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -398,7 +392,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -422,7 +416,7 @@ msgid "Number of Days"
 msgstr "Jumlah Hari"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -439,11 +433,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Cari Jenis Cuti"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -454,11 +443,6 @@ msgstr "Menunggu Persetujuan"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maksimum Diperbolehkan"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -489,6 +473,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -528,7 +518,7 @@ msgid "Start Date"
 msgstr "Tanggal Mulai"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -671,12 +661,6 @@ msgstr "Pengguna"
 msgid "Active"
 msgstr "Aktif"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -730,9 +714,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -787,7 +770,7 @@ msgid "Validated"
 msgstr "Sudah DIvalidasi"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -851,7 +834,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -860,6 +843,7 @@ msgid "Leave Request"
 msgstr "Permohonan Cuti"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Keterangan"
@@ -872,6 +856,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Ditolak"
 
@@ -915,9 +900,9 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Cuti Menurut Jenis"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maksimum Diperbolehkan"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -950,8 +935,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -962,12 +947,6 @@ msgstr ""
 msgid "Leave"
 msgstr "cuti"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1028,13 +1007,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Untuk Disetujui"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1047,12 +1026,6 @@ msgstr "Alasan"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Konfirmasi"
 
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 870a0456ae7..e2e96843462 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 20:59+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "In attesa della seconda approvazione"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Approvato"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Rifiuta"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Permessi per Dipartimento"
 msgid "Second Approval"
 msgstr "Seconda approvazione"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -277,12 +271,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -320,7 +314,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -381,9 +375,9 @@ msgid "Leaves by Type"
 msgstr "Permessi per tipo"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmone Chiaro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -391,7 +385,7 @@ msgid "Wheat"
 msgstr "Beige"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -415,7 +409,7 @@ msgid "Number of Days"
 msgstr "Numero Giorni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -432,11 +426,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Cerca tipo di permesso"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -447,11 +436,6 @@ msgstr "In attesa di approvazione"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Massimo concesso"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -482,6 +466,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -521,7 +511,7 @@ msgid "Start Date"
 msgstr "Data inizio"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -664,12 +654,6 @@ msgstr "Utente"
 msgid "Active"
 msgstr "Attivo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -723,9 +707,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -780,7 +763,7 @@ msgid "Validated"
 msgstr "Convalidata"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -844,7 +827,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -853,6 +836,7 @@ msgid "Leave Request"
 msgstr "Richiesta permesso"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descrizione"
@@ -865,6 +849,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Rifiutato"
 
@@ -907,9 +892,9 @@ msgid "Violet"
 msgstr "Violetto"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmone Chiaro"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Massimo concesso"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -942,8 +927,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -954,12 +939,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Permesso"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1020,13 +999,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Da Approvare"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1039,12 +1018,6 @@ msgstr "Motivazioni"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Conferma"
 
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index 482d32721eb..c304b6c49fc 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-16 01:12+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "2番目の承認待ち"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "承認済み"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "拒否"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "部門別の休暇"
 msgid "Second Approval"
 msgstr "第2の承認"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -276,12 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "警告"
@@ -319,7 +313,7 @@ msgid "Sick Leaves"
 msgstr "病欠"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "%s の休暇申請"
@@ -380,9 +374,9 @@ msgid "Leaves by Type"
 msgstr "タイプ別の休暇"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "薄桃色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -390,7 +384,7 @@ msgid "Wheat"
 msgstr "小麦色"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "%s の割当て"
@@ -414,7 +408,7 @@ msgid "Number of Days"
 msgstr "日数"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -434,11 +428,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "休暇タイプを検索"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -449,11 +438,6 @@ msgstr "承認待ち"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "最大許容数"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -484,6 +468,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -523,7 +513,7 @@ msgid "Start Date"
 msgstr "開始日"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -664,12 +654,6 @@ msgstr "ユーザ"
 msgid "Active"
 msgstr "有効"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -723,9 +707,8 @@ msgid "My Department Leaves"
 msgstr "私の部門の休暇"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -778,7 +761,7 @@ msgid "Validated"
 msgstr "承諾済み"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -842,7 +825,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -851,6 +834,7 @@ msgid "Leave Request"
 msgstr "休暇申請"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "詳細"
@@ -863,6 +847,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "拒否"
 
@@ -904,9 +889,9 @@ msgid "Violet"
 msgstr "スミレ色"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "薄桃色"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "最大許容数"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -937,8 +922,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -949,12 +934,6 @@ msgstr ""
 msgid "Leave"
 msgstr "休暇"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1015,13 +994,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "承認する"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1034,12 +1013,6 @@ msgstr "理由"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid ""
 #~ "Leave Manager can let this field empty if this leave request/allocation is "
 #~ "for every employee"
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index b40158de0b1..79a7f1f3a30 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 08:43+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "승인됨"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "거부"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr "밀"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "일 수"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "사용자"
 msgid "Active"
 msgstr "활성"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr "검증됨"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "설명"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "거부됨"
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "휴일"
 
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 3325ab6ea01..11261f41580 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 14:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Patvirtintas"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Atmesti"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr "Dienų skaičius"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr "Naudotojas"
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr "Patvirtintos"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Aprašymas"
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Atmestos"
 
@@ -898,8 +883,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Atostogos"
 
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 98ab95ad83c..b21782c67a4 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-10-22 14:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/mk.po b/addons/hr_holidays/i18n/mk.po
index e41bc322b28..b9fba1150a9 100644
--- a/addons/hr_holidays/i18n/mk.po
+++ b/addons/hr_holidays/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-09 08:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "Се чека на второ одобрување"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Одобрено"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Одбиј"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Отсуства по Сектор"
 msgid "Second Approval"
 msgstr "Второ Одобрување"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -277,12 +271,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Предупредување!"
@@ -320,7 +314,7 @@ msgid "Sick Leaves"
 msgstr "Отсуства за боледување"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Барање за Отсуство за %s"
@@ -381,8 +375,8 @@ msgid "Leaves by Type"
 msgstr "Отсуства по Тип"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -391,7 +385,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Распределба за %s"
@@ -415,7 +409,7 @@ msgid "Number of Days"
 msgstr "Број на денови"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -432,11 +426,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Пребарај Тип на Отсуство"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -447,11 +436,6 @@ msgstr "Се чека на одобрување"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Максимално дозволени"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -482,6 +466,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -521,7 +511,7 @@ msgid "Start Date"
 msgstr "Почетен датум"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -664,12 +654,6 @@ msgstr "Корисник"
 msgid "Active"
 msgstr "Активен"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -723,9 +707,8 @@ msgid "My Department Leaves"
 msgstr "Мои Секторски Отсуства"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -778,7 +761,7 @@ msgid "Validated"
 msgstr "Валидирано"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -842,7 +825,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -851,6 +834,7 @@ msgid "Leave Request"
 msgstr "Барање за Отсуство"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Опис"
@@ -863,6 +847,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Одбиени"
 
@@ -904,9 +889,9 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr ""
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Максимално дозволени"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -937,8 +922,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -949,12 +934,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Отсуство"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1015,13 +994,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "За Одобрување"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1034,12 +1013,6 @@ msgstr "Причини"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Requests Approve"
 #~ msgstr "Одобри Барања"
 
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index 0a47382f625..c56c434da70 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-03 09:03+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "2 дахь зөвшөөрлийг хүлээж байна"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Зөвшөөрсөн"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Татгалзах"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Хэлтсийн амралт, чөлөө"
 msgid "Second Approval"
 msgstr "2 дахь зөвшөөрөл"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -277,12 +271,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Анхааруулга!"
@@ -320,7 +314,7 @@ msgid "Sick Leaves"
 msgstr "Өвчний чөлөө"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "%s-н амралт, чөлөөний хүсэлт"
@@ -381,9 +375,9 @@ msgid "Leaves by Type"
 msgstr "Амралт, чөлөө төрөлөөр"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Цайвар улбар шар"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -391,7 +385,7 @@ msgid "Wheat"
 msgstr "Үр тарианы өнгө"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "%s хуваарилалт"
@@ -415,7 +409,7 @@ msgid "Number of Days"
 msgstr "Хоногийн тоо"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -438,11 +432,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Амралт, чөлөөний Төрөл хайх"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -453,11 +442,6 @@ msgstr "Зөвшөөрөл хүлээж байгаа"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Зөвшөөрөгдөх хамгийн их"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -488,6 +472,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -527,7 +517,7 @@ msgid "Start Date"
 msgstr "Эхэлсэн огноо"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -670,12 +660,6 @@ msgstr "Хэрэглэгч"
 msgid "Active"
 msgstr "Идэвхтэй"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -729,9 +713,8 @@ msgid "My Department Leaves"
 msgstr "Миний хэлтсийн амралт, чөлөөнүүд"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -786,7 +769,7 @@ msgid "Validated"
 msgstr "Батламжилсан"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -850,7 +833,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -859,6 +842,7 @@ msgid "Leave Request"
 msgstr "Амралт, чөлөөний хүсэлт"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Тайлбар"
@@ -871,6 +855,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Татгалзсан"
 
@@ -914,9 +899,9 @@ msgid "Violet"
 msgstr "Нил ягаан"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Цайвар улбар шар"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Зөвшөөрөгдөх хамгийн их"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -950,8 +935,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -962,12 +947,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Амралт, чөлөө"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1028,13 +1007,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Зөвшөөрөх"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1047,12 +1026,6 @@ msgstr "Амралт, чөлөөний шалтгаан"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Sick Leave"
 #~ msgstr "Өвчний улмаас ирээгүй"
 
diff --git a/addons/hr_holidays/i18n/nb.po b/addons/hr_holidays/i18n/nb.po
index 620ed3ce622..e71d760e706 100644
--- a/addons/hr_holidays/i18n/nb.po
+++ b/addons/hr_holidays/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-21 11:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Godkjent."
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Nekt"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Etterlat forespørsel for %s"
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr "Etterlater av type."
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Avsetning for% s"
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "Antall dager."
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr "Venter på godkjenning."
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "Bruker."
 msgid "Active"
 msgstr "Aktiv."
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Avvist"
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Requests Approve"
 #~ msgstr "Godta forespørsler ."
 
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 9073ec5c4cb..b64875ba40d 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 15:39+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Wacht op tweede goedkeuring"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr "Bevestig"
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Goedgekeurd"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Weigeren"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Verlof per afdeling"
 msgid "Second Approval"
 msgstr "Tweede goedkeuring"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -281,12 +275,12 @@ msgstr ""
 "ingevoegd."
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -324,7 +318,7 @@ msgid "Sick Leaves"
 msgstr "Ziekteverlof"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Verlofaanvraag voor %s"
@@ -385,9 +379,9 @@ msgid "Leaves by Type"
 msgstr "Verlof per soort"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Lichtzalm"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -395,7 +389,7 @@ msgid "Wheat"
 msgstr "Tarwe"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Reservering voor %s"
@@ -419,7 +413,7 @@ msgid "Number of Days"
 msgstr "Aantal dagen"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -445,11 +439,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Verlofsoort zoeken"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -460,11 +449,6 @@ msgstr "Wacht op goedkeuring"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maximum toegestaan"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -495,6 +479,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -534,7 +524,7 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -677,12 +667,6 @@ msgstr "Gebruiker"
 msgid "Active"
 msgstr "Actief"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -736,9 +720,8 @@ msgid "My Department Leaves"
 msgstr "Mijn afdelingsverloven"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -793,7 +776,7 @@ msgid "Validated"
 msgstr "Goedgekeurd"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -857,7 +840,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -866,6 +849,7 @@ msgid "Leave Request"
 msgstr "Verlofaanvraag"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Omschrijving"
@@ -878,6 +862,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Geweigerd"
 
@@ -921,9 +906,9 @@ msgid "Violet"
 msgstr "Lila"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Lichtzalm"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maximum toegestaan"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -957,8 +942,8 @@ msgid "Messages and communication history"
 msgstr "Berichten en communicatie historie"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -969,12 +954,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Verlof"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr "Aanvraag <b>geewijgerd</b>"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1037,13 +1016,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Goed te keuren"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1056,12 +1035,6 @@ msgstr "Redenen"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Bevestigen"
 
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 17322aa954b..b485c383ebe 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-04 12:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 6c8879a5940..0f165556f79 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 12:51+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Oczekuje na drugą aprobatę"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -110,6 +110,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -150,6 +155,7 @@ msgstr "Zatwierdź"
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Zaaprobowane"
 
@@ -164,14 +170,7 @@ msgid "Refuse"
 msgstr "Odmów"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-"Wniosek <b>wystawiony</b>, oczekuje na zatwierdzenie przez menedżera."
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr "Wniosek <b>zaaprobowany</b>, oczekuje na drugie zatwierdzenie."
@@ -217,12 +216,6 @@ msgstr "Nieobecności wg działów"
 msgid "Second Approval"
 msgstr "Druga aprobata"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr "Wniosek został <b>zaaprobowany</b>."
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -281,12 +274,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -324,7 +317,7 @@ msgid "Sick Leaves"
 msgstr "Zwolnienie lekarskie"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Wniosek urlopowy dla %s"
@@ -385,9 +378,9 @@ msgid "Leaves by Type"
 msgstr "Nieobecności wg typów"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr "Urlopy: Oznacz jako nieprzeczytane"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Jasno-łososiowy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -395,7 +388,7 @@ msgid "Wheat"
 msgstr "Pszenny"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Przydział dla %s"
@@ -419,7 +412,7 @@ msgid "Number of Days"
 msgstr "Liczba dni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -436,11 +429,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr "Urlopy: Oznacz jao przeczytane"
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -451,11 +439,6 @@ msgstr "Oczekuje na aprobatę"
 msgid "Employee Tag"
 msgstr "Tag pracownika"
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maksymalnie"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -488,6 +471,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -527,7 +516,7 @@ msgid "Start Date"
 msgstr "Data początkowa"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -670,12 +659,6 @@ msgstr "Użytkownik"
 msgid "Active"
 msgstr "Aktywny"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -729,10 +712,9 @@ msgid "My Department Leaves"
 msgstr "Nieobecności mojego działu"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
-msgstr "Wniosek <b>utworzony</b>, czeka na zatwierdzenie."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
+msgstr ""
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
@@ -784,7 +766,7 @@ msgid "Validated"
 msgstr "Zatwierdzony"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr "Nie możesz usunąć nieobecności, która jest w stanie %s."
@@ -848,7 +830,7 @@ msgid "To Submit"
 msgstr "Do wysłania"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -857,6 +839,7 @@ msgid "Leave Request"
 msgstr "Wniosek urlopowy"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Opis"
@@ -869,6 +852,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Odmówiono"
 
@@ -910,9 +894,9 @@ msgid "Violet"
 msgstr "Fioletowy"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Jasno-łososiowy"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maksymalnie"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -946,8 +930,8 @@ msgid "Messages and communication history"
 msgstr "Wiadomości i historia komunikacji"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -958,12 +942,6 @@ msgstr "Data początkowa musi być przed datą końcową."
 msgid "Leave"
 msgstr "Nieobecność"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr "Wniosek <b>odrzucony</b>"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1024,13 +1002,13 @@ msgstr "Czas trwania"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Do aprobaty"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1043,12 +1021,6 @@ msgstr "Powody"
 msgid "Select Leave Type"
 msgstr "Wybierz typ nieobecności"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr "Wniosek <b>zatwierdzony</b>."
-
 #~ msgid "Set to Draft"
 #~ msgstr "Ustaw na projekt"
 
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 682ba0d7d5e..e072e912024 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 14:42+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "A aguardar confirmação da aprovação"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr "Validar"
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprovado"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Recusar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Ausências por Departamento"
 msgid "Second Approval"
 msgstr "Confirmação de aprovação"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -277,12 +271,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
@@ -320,7 +314,7 @@ msgid "Sick Leaves"
 msgstr "Ausências por Doença"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Pedido de Ausência para %s"
@@ -381,9 +375,9 @@ msgid "Leaves by Type"
 msgstr "Ausências por Tipo"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmão claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -391,7 +385,7 @@ msgid "Wheat"
 msgstr "Trigo"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Alocação para %s"
@@ -415,7 +409,7 @@ msgid "Number of Days"
 msgstr "Numero de dias"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -437,11 +431,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Pesquisar tipo Leave"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -452,11 +441,6 @@ msgstr "Aguardando aprovação"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Máximo permitido"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -487,6 +471,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -526,7 +516,7 @@ msgid "Start Date"
 msgstr "Data de início"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -669,12 +659,6 @@ msgstr "Utilizador"
 msgid "Active"
 msgstr "Ativo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -728,9 +712,8 @@ msgid "My Department Leaves"
 msgstr "Ausências do Departamento"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -785,7 +768,7 @@ msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -849,7 +832,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -858,6 +841,7 @@ msgid "Leave Request"
 msgstr "Pedido de Ausência"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descrição"
@@ -870,6 +854,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Recusado"
 
@@ -913,9 +898,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmão claro"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Máximo permitido"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -948,8 +933,8 @@ msgid "Messages and communication history"
 msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -960,12 +945,6 @@ msgstr "A data de início deve ser anterior à de término"
 msgid "Leave"
 msgstr "Baixa"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1026,13 +1005,13 @@ msgstr "Duração"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Para aprovar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1045,12 +1024,6 @@ msgstr "Razões"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Confirmar"
 
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 2f3f401d59e..51df4430d46 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 00:16+0000\n"
 "Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "Aguardando Segunda Aprovação"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprovado"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Recusar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Folgas por Departamento"
 msgid "Second Approval"
 msgstr "Segunda Aprovação"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -278,12 +272,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -321,7 +315,7 @@ msgid "Sick Leaves"
 msgstr "Folgas por Doença"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Folga Solicitada por %s"
@@ -382,9 +376,9 @@ msgid "Leaves by Type"
 msgstr "Folgas por Tipo"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmão Leve"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -392,7 +386,7 @@ msgid "Wheat"
 msgstr "Bege"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Alocação para %s"
@@ -416,7 +410,7 @@ msgid "Number of Days"
 msgstr "Número de Dias"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -441,11 +435,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Procurar tipo de Folga"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -456,11 +445,6 @@ msgstr "Aguardando Aprovação"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Máximo Permitido"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -491,6 +475,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -530,7 +520,7 @@ msgid "Start Date"
 msgstr "Data Inicial"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -673,12 +663,6 @@ msgstr "Usuário"
 msgid "Active"
 msgstr "Ativo"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -732,9 +716,8 @@ msgid "My Department Leaves"
 msgstr "Folgas em meu Departamento"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -789,7 +772,7 @@ msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -853,7 +836,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -862,6 +845,7 @@ msgid "Leave Request"
 msgstr "Pedido de Folga"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descrição"
@@ -874,6 +858,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Recusado"
 
@@ -917,9 +902,9 @@ msgid "Violet"
 msgstr "Violeta"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Salmão Leve"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Máximo Permitido"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -952,8 +937,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -964,12 +949,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Folga"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1032,13 +1011,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Para Aprovar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1051,12 +1030,6 @@ msgstr "Motivos"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Feriados"
 
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index ecbfb7b953d..87f65c060d1 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-02 15:18+0000\n"
 "Last-Translator: Ciprian Panaite <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Se asteapta a doua aprobare"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Aprobat(e)"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Respingeti"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr "Concedii dupa Departament"
 msgid "Second Approval"
 msgstr "A doua aprobare"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -278,12 +272,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Avertizare!"
@@ -321,7 +315,7 @@ msgid "Sick Leaves"
 msgstr "Concedii medicale"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Cerere de concediu pentru %s"
@@ -382,9 +376,9 @@ msgid "Leaves by Type"
 msgstr "Concedii dupa Tip"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Somon deschis"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -392,7 +386,7 @@ msgid "Wheat"
 msgstr "Grau"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Alocare pentru %s"
@@ -416,7 +410,7 @@ msgid "Number of Days"
 msgstr "Numar de zile"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -442,11 +436,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Cautati Tipul concediului"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -457,11 +446,6 @@ msgstr "Asteapta aprobare"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Maximul Permis"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -492,6 +476,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -531,7 +521,7 @@ msgid "Start Date"
 msgstr "Data de inceput"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -674,12 +664,6 @@ msgstr "Utilizator"
 msgid "Active"
 msgstr "Activ(a)"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -733,9 +717,8 @@ msgid "My Department Leaves"
 msgstr "Concediile din Departamentul meu"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -790,7 +773,7 @@ msgid "Validated"
 msgstr "Validat(a)"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -854,7 +837,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -863,6 +846,7 @@ msgid "Leave Request"
 msgstr "Cerere de concediu"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Descriere"
@@ -875,6 +859,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Respins"
 
@@ -918,9 +903,9 @@ msgid "Violet"
 msgstr "Violet"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Somon deschis"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Maximul Permis"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -954,8 +939,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -966,12 +951,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Concediu"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1032,13 +1011,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "De aprobat"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1051,12 +1030,6 @@ msgstr "Motive"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "General"
 #~ msgstr "General"
 
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index 9212cd386e0..e6902f260d8 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 11:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "Ожидает второго подтверждения"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Утвержденный"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Отклонить"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Отгулы по отделу"
 msgid "Second Approval"
 msgstr "Второе утверждение"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,9 +372,9 @@ msgid "Leaves by Type"
 msgstr "Отгулы по типу"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Светлый оранжево-розовый"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr "Пшеничный"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "Кол-во дней"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Искать по типу отгула"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr "Ожидает утверждения"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Максимум разрешено"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "Пользователь"
 msgid "Active"
 msgstr "Активно"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr "Проверено"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr "Заявка на отгул"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Описание"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Отклонено"
 
@@ -899,9 +884,9 @@ msgid "Violet"
 msgstr "Фиолетовый"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Светлый оранжево-розовый"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Максимум разрешено"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -934,8 +919,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -946,12 +931,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Отгул"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1012,13 +991,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1031,12 +1010,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Подтвердить"
 
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 99c74a667d0..3a130bd0499 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 10:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Odobreno"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Zavrni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr "Pšenična"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr "Število dni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr "Uporabnik"
 msgid "Active"
 msgstr "Aktivno"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr "Potrjeno"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Opis"
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Zavrnjeno"
 
@@ -898,8 +883,8 @@ msgid "Violet"
 msgstr "Vijolična"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Confirm"
 #~ msgstr "Potrdi"
 
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index d1b0baf9caf..604fe85294d 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index be7e400536d..d97b99c212d 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-12-28 10:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index 23113f1bfc5..640d6b8a3b6 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-10 16:50+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "U Očekivanju Druge POtvrde"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index a4a7d63ac74..8a19fec9ebb 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-23 09:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Väntar på Andra godkännandet"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Godkänd"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "Vägra"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -199,7 +199,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr "Ledighetsansökan att godkänna"
+msgstr "LedighetsFörfrågningar att Godkänna"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -214,12 +214,6 @@ msgstr "Ledighet per avdelning"
 msgid "Second Approval"
 msgstr "Andra godkännandet"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -276,12 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -319,7 +313,7 @@ msgid "Sick Leaves"
 msgstr "Sjukfrånvaro"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Ledighetsbegäran för %s"
@@ -380,9 +374,9 @@ msgid "Leaves by Type"
 msgstr "Ledighetstyp"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Ljusrosa"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -390,7 +384,7 @@ msgid "Wheat"
 msgstr "Vete"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "Tilldelning för %s"
@@ -414,7 +408,7 @@ msgid "Number of Days"
 msgstr "Antal dagar"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,10 +422,10 @@ msgstr ""
 "Funktionen bakom fältet 'Kvarvarande Semester' kan endast användas när det "
 "bara finns en ledighetstyp med alternativet 'Tillåt att överskrida gränsen' "
 "ej är markerad. (%s hittades). Annars är uppdateringen tvetydig eftersom vi "
-"inte kan besluta om vilken ledighetstyp uppdateringen måste göras för. \n"
-"Du kanske föredrar att använda de klassiska menyer 'Ledighetsbegäran' och "
+"inte kan besluta om vilken ledighetstyp uppdateringen måste göras för.\n"
+"Du kanske föredrar att använda de vanliga menyerna 'Ledighetsbegäran' och "
 "'Tilldela Ledighet' som ligger i 'Personal \\ Frånvaro' för att hantera "
-"semesterdagar för de anställda om konfigurationen inte tillåter att använda "
+"semesterdagar för de anställda, om konfigurationen inte tillåter att använda "
 "detta fält."
 
 #. module: hr_holidays
@@ -439,11 +433,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "Sök LedighetsTyp"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -454,11 +443,6 @@ msgstr "Väntar på godkännande"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "Högsta tillåtna"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -489,6 +473,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -514,7 +504,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr "LedighetsBegäran"
+msgstr "LedighetsFörfrågningar"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -528,7 +518,7 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -671,12 +661,6 @@ msgstr "Användare"
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -730,9 +714,8 @@ msgid "My Department Leaves"
 msgstr "Min avdelnings ledighet"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -787,7 +770,7 @@ msgid "Validated"
 msgstr "Bekräftad"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -851,7 +834,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -860,6 +843,7 @@ msgid "Leave Request"
 msgstr "Lämna förfrågan"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Beskrivning"
@@ -872,6 +856,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Nekad"
 
@@ -915,9 +900,9 @@ msgid "Violet"
 msgstr "Violett"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "Ljusrosa"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Högsta tillåtna"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -950,8 +935,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -962,12 +947,6 @@ msgstr ""
 msgid "Leave"
 msgstr "Ledig"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1028,13 +1007,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "Att godkänna"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1047,12 +1026,6 @@ msgstr "Anledningar"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Holidays"
 #~ msgstr "Semestrar"
 
@@ -1094,9 +1067,6 @@ msgstr ""
 #~ msgid "Allocation Type"
 #~ msgstr "Typ av Ledighetstilldelning"
 
-#~ msgid "Requests Approve"
-#~ msgstr "Begär Godkännande"
-
 #~ msgid ""
 #~ "Leave Manager can let this field empty if this leave request/allocation is "
 #~ "for every employee"
@@ -1240,3 +1210,6 @@ msgstr ""
 
 #~ msgid "HR Holidays Summary Report By Department"
 #~ msgstr "HR Holidays sammanfattande rapport avdelningen"
+
+#~ msgid "Requests Approve"
+#~ msgstr "Ledighet att Godkänna"
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index ca19e9b5497..68355d91c4e 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 10:02+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "กำลังรอการอนุมัติระดับที่สอง"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "อนุมัติแล้ว"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "ปฏิเสธ"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "การลาออกแบ่งตามแผนก"
 msgid "Second Approval"
 msgstr "การอนุมัติระดับที่สอง"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "คำเตือน!"
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr "การลาแยกตามประเภท"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr "สีเหลืองอ่อน"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "จำนวนวัน"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "ค้นหาประเภทการลา"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr "กำลังรอการอนุมัติ"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "สูงสุดที่อนุญาต"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr "วันที่เริ่มต้น"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "ผู้ใช้งาน"
 msgid "Active"
 msgstr "เปิดใช้งาน"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr "ผ่านการตรวจสอบแล้ว"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr "ยื่นใบลา"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "รายละเอียด"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "ถูกปฏิเสธ"
 
@@ -899,9 +884,9 @@ msgid "Violet"
 msgstr "สีม่วง"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr ""
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "สูงสุดที่อนุญาต"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr "ลา"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "ให้การอนุมัติ"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr "เหตุผล"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Sick Leave"
 #~ msgstr "ลาป่วย"
 
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index c4a7d3f897b..71434b8806a 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-04 09:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Klingon; tlhIngan-Hol <tlh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 600d58d2dcd..27ebc934440 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 09:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "İkinci Onayı Bekliyor"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Onaylanmış"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr "Gün Sayısı"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr "Kullanıcı"
 msgid "Active"
 msgstr "Aktif"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr "Doğrulanmış"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Açıklama"
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Reddedildi"
 
@@ -898,8 +883,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,12 +1007,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Set to Draft"
 #~ msgstr "Taslak olarak Ayarla"
 
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index a89cdc25212..ddff57bdd3c 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-04 09:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1028,9 +1007,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index a33dd550bbb..9df9d207b08 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-04 23:20+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -33,7 +33,7 @@ msgid "Waiting Second Approval"
 msgstr "Đang chờ Chấp thuận Thứ hai"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,6 +109,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -149,6 +154,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "Được chấp thuận"
 
@@ -163,13 +169,7 @@ msgid "Refuse"
 msgstr "Từ chối"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -215,12 +215,6 @@ msgstr "Ngày nghỉ theo Phòng ban"
 msgid "Second Approval"
 msgstr "Chấp thuận Lần 2"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -274,12 +268,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "Cảnh báo!"
@@ -317,7 +311,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -378,8 +372,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -388,7 +382,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -412,7 +406,7 @@ msgid "Number of Days"
 msgstr "Số ngày"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -429,11 +423,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -444,11 +433,6 @@ msgstr "Đang chờ Chấp thuận"
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -479,6 +463,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -518,7 +508,7 @@ msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -659,12 +649,6 @@ msgstr "Người sử dụng"
 msgid "Active"
 msgstr "Hoạt động"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -718,9 +702,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -773,7 +756,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -837,7 +820,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -846,6 +829,7 @@ msgid "Leave Request"
 msgstr "Yêu cầu Nghỉ"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "Mô tả"
@@ -858,6 +842,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "Đã từ chối"
 
@@ -899,8 +884,8 @@ msgid "Violet"
 msgstr "Tím sẫm"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -932,8 +917,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -944,12 +929,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1010,13 +989,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1029,12 +1008,6 @@ msgstr ""
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Sick Leave"
 #~ msgstr "Nghỉ Ốm"
 
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 76dac620f6f..187a7069f68 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 03:07+0000\n"
 "Last-Translator: jerryzhang <jerry.zhangzhe@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "等待第二次审批"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr "开始时间与结束时间之间的默认时间间隔是8小时，你可以根据实际情况进行调整。"
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr "已审批"
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr "拒绝"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr "申请<b>已提交</b>，等待经理确认。"
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr "申请<b>已通过审核</b>，等待二次确认。"
@@ -214,12 +214,6 @@ msgstr "部门的准假"
 msgid "Second Approval"
 msgstr "第二次审批"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr "此申请已<b>通过审核</b>."
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -275,12 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -318,7 +312,7 @@ msgid "Sick Leaves"
 msgstr "病假"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr "%s 的请假申请"
@@ -379,9 +373,9 @@ msgid "Leaves by Type"
 msgstr "准假类型"
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
-msgstr "假期：设置为未读"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "浅橙红色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -389,7 +383,7 @@ msgid "Wheat"
 msgstr "麦黄色"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr "%s 的年假"
@@ -417,7 +411,7 @@ msgid "Number of Days"
 msgstr "天数"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -437,11 +431,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr "查找准假类型"
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr "假期：设置为已读"
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -452,11 +441,6 @@ msgstr "等待审批"
 msgid "Employee Tag"
 msgstr "员工类型"
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr "最大允许"
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -492,6 +476,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -531,7 +521,7 @@ msgid "Start Date"
 msgstr "开始日期"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -672,12 +662,6 @@ msgstr "用户"
 msgid "Active"
 msgstr "生效"
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -731,9 +715,8 @@ msgid "My Department Leaves"
 msgstr "我部门的请假"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -786,7 +769,7 @@ msgid "Validated"
 msgstr "已生效"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -850,7 +833,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -859,6 +842,7 @@ msgid "Leave Request"
 msgstr "准假申请"
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr "说明"
@@ -871,6 +855,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr "已拒绝"
 
@@ -912,9 +897,9 @@ msgid "Violet"
 msgstr "紫色"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr "浅橙红色"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "最大允许"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -945,8 +930,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -957,12 +942,6 @@ msgstr ""
 msgid "Leave"
 msgstr "准假"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1023,13 +1002,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr "待审批"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1042,12 +1021,6 @@ msgstr "原因"
 msgid "Select Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
 #~ msgid "Set to Draft"
 #~ msgstr "设为草稿"
 
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 3ef7ece85a0..69f1328e80e 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-04 09:45+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -108,6 +108,11 @@ msgid ""
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
 
+#. module: hr_holidays
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
@@ -148,6 +153,7 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
 msgid "Approved"
 msgstr ""
 
@@ -162,13 +168,7 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
 msgstr ""
@@ -214,12 +214,6 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
@@ -273,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -316,7 +310,7 @@ msgid "Sick Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
 #, python-format
 msgid "Leave Request for %s"
 msgstr ""
@@ -377,8 +371,8 @@ msgid "Leaves by Type"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
 msgstr ""
 
 #. module: hr_holidays
@@ -387,7 +381,7 @@ msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
 #, python-format
 msgid "Allocation for %s"
 msgstr ""
@@ -411,7 +405,7 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -428,11 +422,6 @@ msgstr ""
 msgid "Search Leave Type"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "Waiting Approval"
@@ -443,11 +432,6 @@ msgstr ""
 msgid "Employee Tag"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
@@ -478,6 +462,12 @@ msgid ""
 "this type in the calendar."
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
@@ -517,7 +507,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -658,12 +648,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.employee:0
 #: field:hr.employee,remaining_leaves:0
@@ -717,9 +701,8 @@ msgid "My Department Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,7 +755,7 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr ""
@@ -836,7 +819,7 @@ msgid "To Submit"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -845,6 +828,7 @@ msgid "Leave Request"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays:0
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
@@ -857,6 +841,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
 msgid "Refused"
 msgstr ""
 
@@ -898,8 +883,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
 msgstr ""
 
 #. module: hr_holidays
@@ -931,8 +916,8 @@ msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
@@ -943,12 +928,6 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -1009,13 +988,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
 msgid "To Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
 msgstr ""
 
 #. module: hr_holidays
@@ -1027,9 +1006,3 @@ msgstr ""
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
 msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
diff --git a/addons/hr_payroll/i18n/ar.po b/addons/hr_payroll/i18n/ar.po
index 61aa2106402..f3b5f93b012 100644
--- a/addons/hr_payroll/i18n/ar.po
+++ b/addons/hr_payroll/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-01 18:12+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/bg.po b/addons/hr_payroll/i18n/bg.po
index a1356829aa2..657017a9aa5 100644
--- a/addons/hr_payroll/i18n/bg.po
+++ b/addons/hr_payroll/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-27 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ca.po b/addons/hr_payroll/i18n/ca.po
index 42f8ec63f9d..bfbcae0e6cd 100644
--- a/addons/hr_payroll/i18n/ca.po
+++ b/addons/hr_payroll/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-25 17:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/cs.po b/addons/hr_payroll/i18n/cs.po
index 1370a43aa6e..d7ab0ca1628 100644
--- a/addons/hr_payroll/i18n/cs.po
+++ b/addons/hr_payroll/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-29 13:31+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/da.po b/addons/hr_payroll/i18n/da.po
index efcc2aaee52..3d89545c624 100644
--- a/addons/hr_payroll/i18n/da.po
+++ b/addons/hr_payroll/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index bb2085cff91..ec64c526874 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 17:42+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/en_GB.po b/addons/hr_payroll/i18n/en_GB.po
index 4c1da60526b..ca9da7be687 100644
--- a/addons/hr_payroll/i18n/en_GB.po
+++ b/addons/hr_payroll/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-21 07:36+0000\n"
 "Last-Translator: Gerhard du Toit <gdutoit@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index b7bb4c5ff65..ac534bf16ca 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 12:38+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es_CR.po b/addons/hr_payroll/i18n/es_CR.po
index 7c2f877a536..db3da2a3f81 100644
--- a/addons/hr_payroll/i18n/es_CR.po
+++ b/addons/hr_payroll/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-16 16:41+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po
index 35b27c41372..1c09d8b4264 100644
--- a/addons/hr_payroll/i18n/es_EC.po
+++ b/addons/hr_payroll/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 04:38+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es_MX.po b/addons/hr_payroll/i18n/es_MX.po
index 73ebbdce684..a3eb446554a 100644
--- a/addons/hr_payroll/i18n/es_MX.po
+++ b/addons/hr_payroll/i18n/es_MX.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-10 21:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po
index b4296a5a118..161f2e76ea3 100644
--- a/addons/hr_payroll/i18n/et.po
+++ b/addons/hr_payroll/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-06-25 17:48+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/fi.po b/addons/hr_payroll/i18n/fi.po
index 1c87d2d0798..7a815fbe410 100644
--- a/addons/hr_payroll/i18n/fi.po
+++ b/addons/hr_payroll/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-23 15:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index 04f35189029..2aa4b025df0 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 15:38+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/gl.po b/addons/hr_payroll/i18n/gl.po
index 3d62c0b2ba5..5774c99ce6b 100644
--- a/addons/hr_payroll/i18n/gl.po
+++ b/addons/hr_payroll/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-11 08:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/gu.po b/addons/hr_payroll/i18n/gu.po
index c37c3fc6f0a..a2db11d7d4d 100644
--- a/addons/hr_payroll/i18n/gu.po
+++ b/addons/hr_payroll/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-06 18:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/he.po b/addons/hr_payroll/i18n/he.po
index 11993c3cccd..8e510e81a01 100644
--- a/addons/hr_payroll/i18n/he.po
+++ b/addons/hr_payroll/i18n/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-31 03:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po
index d06549684e0..522afb2d0f7 100644
--- a/addons/hr_payroll/i18n/hr.po
+++ b/addons/hr_payroll/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 14:15+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/hu.po b/addons/hr_payroll/i18n/hu.po
index 317fa98e3fe..10920f66914 100644
--- a/addons/hr_payroll/i18n/hu.po
+++ b/addons/hr_payroll/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-03 22:21+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po
index 9ad4e22c052..c8fe4959db4 100644
--- a/addons/hr_payroll/i18n/id.po
+++ b/addons/hr_payroll/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-09 03:59+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/it.po b/addons/hr_payroll/i18n/it.po
index 26cab3ebf4e..86450cf12ae 100644
--- a/addons/hr_payroll/i18n/it.po
+++ b/addons/hr_payroll/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 15:21+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index 48a3d941026..bc4a351dc92 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lo.po b/addons/hr_payroll/i18n/lo.po
index 3612f4fed06..599abf9494c 100644
--- a/addons/hr_payroll/i18n/lo.po
+++ b/addons/hr_payroll/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-19 15:58+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lt.po b/addons/hr_payroll/i18n/lt.po
index b2a55438440..1423bba83d7 100644
--- a/addons/hr_payroll/i18n/lt.po
+++ b/addons/hr_payroll/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-09 15:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lv.po b/addons/hr_payroll/i18n/lv.po
index 57e73492316..a714be99178 100644
--- a/addons/hr_payroll/i18n/lv.po
+++ b/addons/hr_payroll/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-04 14:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 9668649878e..321fdedd2f6 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-28 08:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/nb.po b/addons/hr_payroll/i18n/nb.po
index f00f527a97b..7925dc0c928 100644
--- a/addons/hr_payroll/i18n/nb.po
+++ b/addons/hr_payroll/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-28 16:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po
index 189682d4e41..48f7c3d6a46 100644
--- a/addons/hr_payroll/i18n/nl.po
+++ b/addons/hr_payroll/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-09-03 17:17+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index 45aebab40d4..48496b32546 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-16 12:00+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index 5f5696187a3..4ba94c0b020 100644
--- a/addons/hr_payroll/i18n/pt.po
+++ b/addons/hr_payroll/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-20 11:01+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po
index e3cfac19627..ea5c294f9be 100644
--- a/addons/hr_payroll/i18n/pt_BR.po
+++ b/addons/hr_payroll/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:07+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ro.po b/addons/hr_payroll/i18n/ro.po
index 948f6c770cc..dba66fdd231 100644
--- a/addons/hr_payroll/i18n/ro.po
+++ b/addons/hr_payroll/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-29 06:37+0000\n"
 "Last-Translator: Fekete Mihai <mihai.fekete@etotalpc.ro>\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: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po
index 07e041c92d8..9dba04734ae 100644
--- a/addons/hr_payroll/i18n/ru.po
+++ b/addons/hr_payroll/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sr.po b/addons/hr_payroll/i18n/sr.po
index 18c22436c5b..8982da221d6 100644
--- a/addons/hr_payroll/i18n/sr.po
+++ b/addons/hr_payroll/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 23:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po
index 75d0904eaa8..e4eca0c247c 100644
--- a/addons/hr_payroll/i18n/sr@latin.po
+++ b/addons/hr_payroll/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-21 13:19+0000\n"
 "Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index 8e1ec88916a..7872bb8d775 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-27 17:56+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/tr.po b/addons/hr_payroll/i18n/tr.po
index 1dc8013424b..612d5df6441 100644
--- a/addons/hr_payroll/i18n/tr.po
+++ b/addons/hr_payroll/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-25 17:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
index 165159d0319..2ce2599c865 100644
--- a/addons/hr_payroll/i18n/vi.po
+++ b/addons/hr_payroll/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-20 09:43+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 444f2685804..07be97b10f7 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 11:14+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll_account/i18n/ar.po b/addons/hr_payroll_account/i18n/ar.po
index 2992d65cc17..e995cb5c57d 100644
--- a/addons/hr_payroll_account/i18n/ar.po
+++ b/addons/hr_payroll_account/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 17:44+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/bg.po b/addons/hr_payroll_account/i18n/bg.po
index 72a8e462426..d2b961086fd 100644
--- a/addons/hr_payroll_account/i18n/bg.po
+++ b/addons/hr_payroll_account/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-27 14:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
index eca3d6ada14..dcf02e70a68 100644
--- a/addons/hr_payroll_account/i18n/ca.po
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:44+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/da.po b/addons/hr_payroll_account/i18n/da.po
index c0f496a2d28..efd108f12e8 100644
--- a/addons/hr_payroll_account/i18n/da.po
+++ b/addons/hr_payroll_account/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index 59155e6841d..a3cd93140ea 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-14 16:27+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/en_GB.po b/addons/hr_payroll_account/i18n/en_GB.po
index 9d96800bc47..ebaf283b671 100644
--- a/addons/hr_payroll_account/i18n/en_GB.po
+++ b/addons/hr_payroll_account/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 13:36+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 7f962df6673..ecb9a44b1dd 100644
--- a/addons/hr_payroll_account/i18n/es.po
+++ b/addons/hr_payroll_account/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 13:54+0000\n"
 "Last-Translator: Marcelo Zunino <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/es_CR.po b/addons/hr_payroll_account/i18n/es_CR.po
index 3edf69ec3ab..6883cfdc0a0 100644
--- a/addons/hr_payroll_account/i18n/es_CR.po
+++ b/addons/hr_payroll_account/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-16 16:47+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_payroll_account/i18n/es_EC.po b/addons/hr_payroll_account/i18n/es_EC.po
index 946c440f756..a4a5a533989 100644
--- a/addons/hr_payroll_account/i18n/es_EC.po
+++ b/addons/hr_payroll_account/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-09 03:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/es_PY.po b/addons/hr_payroll_account/i18n/es_PY.po
index d91f256d061..320031a94f7 100644
--- a/addons/hr_payroll_account/i18n/es_PY.po
+++ b/addons/hr_payroll_account/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-06 02:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/fr.po b/addons/hr_payroll_account/i18n/fr.po
index f85f8cf0963..392a8ce5854 100644
--- a/addons/hr_payroll_account/i18n/fr.po
+++ b/addons/hr_payroll_account/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 15:41+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/gl.po b/addons/hr_payroll_account/i18n/gl.po
index 3fe057710d4..9d4ceb33cde 100644
--- a/addons/hr_payroll_account/i18n/gl.po
+++ b/addons/hr_payroll_account/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-24 00:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/gu.po b/addons/hr_payroll_account/i18n/gu.po
index 18ab32e9806..54e5777817a 100644
--- a/addons/hr_payroll_account/i18n/gu.po
+++ b/addons/hr_payroll_account/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-06 18:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/hr.po b/addons/hr_payroll_account/i18n/hr.po
index d2a12456aaf..f9e9fbd1dea 100644
--- a/addons/hr_payroll_account/i18n/hr.po
+++ b/addons/hr_payroll_account/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 12:38+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/hu.po b/addons/hr_payroll_account/i18n/hu.po
index 872f0c90b34..17e0f13ae39 100644
--- a/addons/hr_payroll_account/i18n/hu.po
+++ b/addons/hr_payroll_account/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-03 23:18+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/id.po b/addons/hr_payroll_account/i18n/id.po
index 2b9e1344f03..8cbe249db77 100644
--- a/addons/hr_payroll_account/i18n/id.po
+++ b/addons/hr_payroll_account/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-09 05:18+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/it.po b/addons/hr_payroll_account/i18n/it.po
index 31cc617d16a..71950fc5e9f 100644
--- a/addons/hr_payroll_account/i18n/it.po
+++ b/addons/hr_payroll_account/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 21:00+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/ja.po b/addons/hr_payroll_account/i18n/ja.po
index 4b3723b53d7..c10f2a63cad 100644
--- a/addons/hr_payroll_account/i18n/ja.po
+++ b/addons/hr_payroll_account/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-18 19:11+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/lv.po b/addons/hr_payroll_account/i18n/lv.po
index 3b78bc72f7a..ce1e66dc0b6 100644
--- a/addons/hr_payroll_account/i18n/lv.po
+++ b/addons/hr_payroll_account/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-01 07:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index 5a6b5a8eadc..159d865e78f 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-25 19:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/nb.po b/addons/hr_payroll_account/i18n/nb.po
index 8f6402f2ed4..cc300317b19 100644
--- a/addons/hr_payroll_account/i18n/nb.po
+++ b/addons/hr_payroll_account/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-07 19:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/nl.po b/addons/hr_payroll_account/i18n/nl.po
index e229e6eae6e..3f2e8c555db 100644
--- a/addons/hr_payroll_account/i18n/nl.po
+++ b/addons/hr_payroll_account/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 21:22+0000\n"
 "Last-Translator: Mario Gielissen <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/pl.po b/addons/hr_payroll_account/i18n/pl.po
index a9d24f974b7..0cbde71bfd9 100644
--- a/addons/hr_payroll_account/i18n/pl.po
+++ b/addons/hr_payroll_account/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-05 13:35+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/pt.po b/addons/hr_payroll_account/i18n/pt.po
index d08f386f69d..34a855806a4 100644
--- a/addons/hr_payroll_account/i18n/pt.po
+++ b/addons/hr_payroll_account/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 17:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/pt_BR.po b/addons/hr_payroll_account/i18n/pt_BR.po
index ce8a811a601..047c283d8bf 100644
--- a/addons/hr_payroll_account/i18n/pt_BR.po
+++ b/addons/hr_payroll_account/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-26 22:43+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/ro.po b/addons/hr_payroll_account/i18n/ro.po
index 3e4590c6bd3..264001143cb 100644
--- a/addons/hr_payroll_account/i18n/ro.po
+++ b/addons/hr_payroll_account/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-06 15:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/ru.po b/addons/hr_payroll_account/i18n/ru.po
index 97735040b76..fdebe6b3a65 100644
--- a/addons/hr_payroll_account/i18n/ru.po
+++ b/addons/hr_payroll_account/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-12 22:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/sr@latin.po b/addons/hr_payroll_account/i18n/sr@latin.po
index ca04edd64d9..0b80994fa37 100644
--- a/addons/hr_payroll_account/i18n/sr@latin.po
+++ b/addons/hr_payroll_account/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-05 16:13+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 37cc02cab93..45febd95d9b 100644
--- a/addons/hr_payroll_account/i18n/sv.po
+++ b/addons/hr_payroll_account/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 11:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/tr.po b/addons/hr_payroll_account/i18n/tr.po
index 084e68ff6db..155c5e3acbe 100644
--- a/addons/hr_payroll_account/i18n/tr.po
+++ b/addons/hr_payroll_account/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 17:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
index 01cc724594e..607bae29661 100644
--- a/addons/hr_payroll_account/i18n/zh_CN.po
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 03:05+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
diff --git a/addons/hr_recruitment/i18n/ar.po b/addons/hr_recruitment/i18n/ar.po
index 53afd0d794f..c4bb7681d0a 100644
--- a/addons/hr_recruitment/i18n/ar.po
+++ b/addons/hr_recruitment/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-08 14:34+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -117,7 +117,7 @@ msgid "Sources of Applicants"
 msgstr "مصادر مقدمين الطلبات"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "يجب أن تحدد الوظيفة المقدم لها هذا الطلب."
@@ -290,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -301,9 +301,10 @@ msgid "Salary Proposed"
 msgstr "الراتب المقترح"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "شريك"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -324,10 +325,9 @@ msgid "Proposed Salary"
 msgstr "الراتب المقترح"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "مصدر مقدمين الطلبات"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -354,25 +354,26 @@ msgstr "الموظفين المعينيين"
 msgid "Job Description"
 msgstr "وصف العمل"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "جديد"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "المصدر"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "موقع مونستر"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -416,6 +417,11 @@ msgstr ""
 msgid "Good"
 msgstr "جيد"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "أغسطس"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -429,11 +435,6 @@ msgstr "تاريخ الإنشاء"
 msgid "Create Employee"
 msgstr "إنشاء حساب موظف"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "الهاتف"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -492,7 +493,7 @@ msgid "Applicants"
 msgstr "الراتب المتوقع"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "بدون موضوع"
@@ -523,10 +524,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "الراتب المتوقع من قبل المتقدم، مزايا إضافية"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "شريك"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -560,6 +565,11 @@ msgstr "جاري التقدم"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -571,9 +581,9 @@ msgid "Probability"
 msgstr "الإحتمال"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "إبريل"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -613,9 +623,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "درجة التوظيف"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "المقابلة الاولى"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -640,9 +650,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "وظائف البحث"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -749,9 +759,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "أغسطس"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -764,25 +775,15 @@ msgid "Degree"
 msgstr "المؤهل"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "الهاتف"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "يونيو"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -833,12 +834,6 @@ msgstr ""
 msgid "Response"
 msgstr "رد"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -854,11 +849,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "راتب إضافي مقترح"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -871,10 +861,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "مراجعة مراحل التوظيف"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -882,9 +871,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "وظائف البحث"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -927,18 +916,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "المصدر"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -966,11 +943,6 @@ msgstr "سنة"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1001,6 +973,11 @@ msgstr "موضوع / مقدم الطلب"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "ويعطي امر المتتابعة عند عرض قائمة الدرجات."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1026,7 +1003,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1041,9 +1018,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "الحالات حسب المرحلة والتقديرات"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "مصدر مقدمين الطلبات"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "جديد"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1051,22 +1032,11 @@ msgstr "مصدر مقدمين الطلبات"
 msgid "Interview"
 msgstr "المقابلة"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "مراجعة مراحل التوظيف"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "اسم المصدر"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1078,9 +1048,9 @@ msgid "Description"
 msgstr "الوصف"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "تعيينات غير محددة"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1144,9 +1114,9 @@ msgid "On Average"
 msgstr "في المتوسط"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "المقابلة الاولى"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "درجة التوظيف"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1202,9 +1172,9 @@ msgid "These people will receive email."
 msgstr "هؤلاء سيصلهم بريد إلكتروني."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "إبريل"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1216,15 +1186,20 @@ msgstr "في إنتظار التعيين"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "موقع مونستر"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1242,26 +1217,19 @@ msgstr "جاري التوظيف"
 msgid "Sequence"
 msgstr "مسلسل"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "درجة البكالريوس"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "تعيينات غير محددة"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/bg.po b/addons/hr_recruitment/i18n/bg.po
index 8af0d0fb14f..6f22fb5fa53 100644
--- a/addons/hr_recruitment/i18n/bg.po
+++ b/addons/hr_recruitment/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-27 15:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr "Предложена заплата"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,25 +351,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Описание на работата"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Нов"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr "Добро"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Август"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "Дата на създаване"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Телефон"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Контрагент"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "В развитие"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,9 +578,9 @@ msgid "Probability"
 msgstr "Вероятност"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Април"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -610,9 +620,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr ""
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Първо интервю"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,9 +753,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Август"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -758,25 +769,15 @@ msgid "Degree"
 msgstr "Научна степен"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Телефон"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Юни"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr "Отговор"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr "Година"
 msgid "Cancel"
 msgstr "Отмяна"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,9 +1010,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Нов"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr "Интервю"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,9 +1106,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Първо интервю"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1194,9 +1164,9 @@ msgid "These people will receive email."
 msgstr "Тези хора ще получат имейл."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Април"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr "Последователност"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/ca.po b/addons/hr_recruitment/i18n/ca.po
index 7d81a258c4e..f58f714a4ce 100644
--- a/addons/hr_recruitment/i18n/ca.po
+++ b/addons/hr_recruitment/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-21 16:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -289,7 +289,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -300,9 +300,10 @@ msgid "Salary Proposed"
 msgstr "Salari proposat"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -323,9 +324,8 @@ msgid "Proposed Salary"
 msgstr "Salari proposat"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -353,25 +353,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Descripció de la feina"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nou"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -415,6 +416,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bé"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agost"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -428,11 +434,6 @@ msgstr "Data creació"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telèfon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -491,7 +492,7 @@ msgid "Applicants"
 msgstr "Candidats"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -522,10 +523,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -559,6 +564,11 @@ msgstr "En curs"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -570,9 +580,9 @@ msgid "Probability"
 msgstr "Probabilitat"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -612,9 +622,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Progrés del procés de selecció"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primera entrevista"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -639,9 +649,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Cerca Feines"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -748,9 +758,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Agost"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -763,25 +774,15 @@ msgid "Degree"
 msgstr "Títol"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telèfon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Juny"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -832,12 +833,6 @@ msgstr ""
 msgid "Response"
 msgstr "Resposta"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -853,11 +848,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -870,9 +860,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -881,9 +870,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Cerca Feines"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -924,18 +913,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -963,11 +940,6 @@ msgstr "Any"
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -998,6 +970,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Estableix l'ordre de seqüència en mostrar una llista de titulacions."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1023,7 +1000,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1038,9 +1015,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Casos per etapes i estimacions"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nou"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1048,22 +1029,11 @@ msgstr ""
 msgid "Interview"
 msgstr "Entrevista"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1075,8 +1045,8 @@ msgid "Description"
 msgstr "Descripció"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1141,9 +1111,9 @@ msgid "On Average"
 msgstr "De mitjana"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primera entrevista"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Progrés del procés de selecció"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1199,9 +1169,9 @@ msgid "These people will receive email."
 msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Abril"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1213,14 +1183,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1239,26 +1214,19 @@ msgstr ""
 msgid "Sequence"
 msgstr "Seqüència"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/da.po b/addons/hr_recruitment/i18n/da.po
index 77bacfc35b7..7dcd4637220 100644
--- a/addons/hr_recruitment/i18n/da.po
+++ b/addons/hr_recruitment/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,8 +298,9 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: hr_recruitment
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,24 +351,25 @@ msgstr ""
 msgid "Job Description"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
 msgstr ""
 
 #. module: hr_recruitment
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr ""
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,9 +521,13 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
 msgstr ""
 
 #. module: hr_recruitment
@@ -557,6 +562,11 @@ msgstr ""
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,8 +753,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -758,8 +769,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -767,16 +778,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,8 +1010,12 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,8 +1164,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index 0e07e03704c..973c0d2e781 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 20:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -120,7 +120,7 @@ msgid "Sources of Applicants"
 msgstr "Herkunft der Bewerber"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Sie müssen den beantragten Job für diesen Bewerber definieren."
@@ -317,7 +317,7 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
@@ -328,9 +328,10 @@ msgid "Salary Proposed"
 msgstr "Gehaltsvorschlag"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr "Bearbeiten ..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -351,10 +352,9 @@ msgid "Proposed Salary"
 msgstr "Gehaltsvorschlag"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr "Diese Bewerbung wurde geändert auf <b>in Bearbeitung</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Herkunft der ABewerber"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -381,25 +381,26 @@ msgstr "Aufgenommene Mitarbeiter"
 msgid "Job Description"
 msgstr "Stellenbeschreibung"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr "Personal Bewerbung: Markiere als gelesen"
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr "Bewerbung ist  <b>Neu</b>."
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Neu"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Herkunft"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr "Followers"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -456,6 +457,11 @@ msgstr ""
 msgid "Good"
 msgstr "Gut"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "August"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -469,11 +475,6 @@ msgstr "Datum Erstellung"
 msgid "Create Employee"
 msgstr "Erstelle Mitarbeiter"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -532,7 +533,7 @@ msgid "Applicants"
 msgstr "Bewerber"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Kein Betreff"
@@ -565,10 +566,19 @@ msgstr ""
 "Dinesverhältniss"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+"Der Status wird auf 'Entwurf' geändert, wenn der Vorfall gespeichert wurde. "
+"Durch die Vorgangsbearbeitung ändert sich der Status auf 'In Bearbeitung'. "
+"Durch Abschluss wird der Status auf 'Erledigt' geändert. Wenn der Vorfall "
+"eine weitere Bearbeitung zu einem späteren Zeitpunkt erfordert, ändert man "
+"den Status am Besten auf 'Wiedervorlage'."
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -602,6 +612,11 @@ msgstr "In Bearbeitung"
 msgid "Hire & Create Employee"
 msgstr "Einstellen & Erstellen Mitarbeiter"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -613,9 +628,9 @@ msgid "Probability"
 msgstr "Wahrscheinlichkeit"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "April"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -655,9 +670,9 @@ msgid "Answer related job question"
 msgstr "Beantworte das Bewerberinterview"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Ausbildungsabschluss"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Erstes Bewerberinterview"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -682,9 +697,9 @@ msgid "or"
 msgstr "oder"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Suche Stellen"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -792,9 +807,10 @@ msgid "Schedule interview with this applicant"
 msgstr "Terminiere ein Interview mit Bewerber"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -807,30 +823,15 @@ msgid "Degree"
 msgstr "Abschluss"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr "Personal Bewerber: Markiere als ungelesen"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Juni"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-"Der Status wird auf 'Entwurf' geändert, wenn der Vorfall gespeichert wurde. "
-"Durch die Vorgangsbearbeitung ändert sich der Status auf 'In Bearbeitung'. "
-"Durch Abschluss wird der Status auf 'Erledigt' geändert. Wenn der Vorfall "
-"eine weitere Bearbeitung zu einem späteren Zeitpunkt erfordert, ändert man "
-"den Status am Besten auf 'Wiedervorlage'."
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -889,12 +890,6 @@ msgstr ""
 msgid "Response"
 msgstr "Rückmeldung"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -910,11 +905,6 @@ msgstr "Ermöglicht die automatische Indizierung der Zusammenfassung"
 msgid "Proposed Salary Extra"
 msgstr "Vorgeschlagene ausserordentliche Bezüge"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr "Angestellter wurde eingestellt"
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -927,10 +917,9 @@ msgid "A contact is already existing with the same name."
 msgstr "Ein Kontakt existiert bereits unter einem anderen Namen"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr "Der Bewerber wurde letzlich <b>eingestellt</b>"
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Überprüfe Einstellungsphasen"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -938,9 +927,9 @@ msgid "Contact:"
 msgstr "Kontakt:"
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Suche Stellen"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -984,19 +973,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Einstellungen"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-"Bewerber wurde <b>eingestellt</b> und als neuer Mitarbeiter angelegt."
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Herkunft"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -1024,11 +1000,6 @@ msgstr "Jahr"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr "Followers"
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1067,6 +1038,11 @@ msgstr ""
 "Anzeige der Reihenfolge bei Ausgabe der Liste von Ausbildungs- und "
 "Schulabschlüssen"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1092,7 +1068,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr "Neue Bewerbung"
 
@@ -1107,9 +1083,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Fälle nach Stufe und Gehalt"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Herkunft der ABewerber"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Neu"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1117,22 +1097,11 @@ msgstr "Herkunft der ABewerber"
 msgid "Interview"
 msgstr "Fragebogen"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Überprüfe Einstellungsphasen"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Bezeichnung der Herkunft"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stufe wurde geändert auf <b>%s</b>"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1144,9 +1113,9 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "nicht zugeordnete Einstellungen"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1214,9 +1183,9 @@ msgid "On Average"
 msgstr "Durchschnittlich"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Erstes Bewerberinterview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Ausbildungsabschluss"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1272,9 +1241,9 @@ msgid "These people will receive email."
 msgstr "Diese Personen erhalten Email"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr "Alias"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1286,15 +1255,20 @@ msgstr "Wartende Einstellungen"
 msgid "Contract"
 msgstr "Vertrag"
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr "Zusammenfassung"
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr "Nachrichten und Kommunikations-Historie"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1312,28 +1286,21 @@ msgstr "Einstellung in Bearbeitung"
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr "Neuer Mitarbeiter in Unternehmen %s eingestellt."
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Bachelor Grad"
 
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "nicht zugeordnete Einstellungen"
+
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_config_settings
 msgid "hr.config.settings"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
-msgstr "Bewerbung wurde <b> erstellt</b>"
-
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,state:0
 msgid ""
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 0fa5c6b074d..235927e3ee3 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 12:28+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -119,7 +119,7 @@ msgid "Sources of Applicants"
 msgstr "Orígen de los solicitantes"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Debe definir el puesto a aplicar para este solicitante"
@@ -310,7 +310,7 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -321,9 +321,10 @@ msgid "Salary Proposed"
 msgstr "Salario propuesto"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr "Editar…"
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -344,10 +345,9 @@ msgid "Proposed Salary"
 msgstr "Salario propuesto"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr "El solicitante se ha establecido a <b>en proceso</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Origen de los solicitantes"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -374,25 +374,26 @@ msgstr "Empleados contratados"
 msgid "Job Description"
 msgstr "Descripción del trabajo"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr "Solicitante de RRHH: Marcar como leído"
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr "El solicitante se ha establecido como <b>nuevo</b>."
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nuevo"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Origen"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Enlace ficha Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -446,6 +447,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bueno"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -459,11 +465,6 @@ msgstr "Fecha creación"
 msgid "Create Employee"
 msgstr "Crear empleado"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -522,7 +523,7 @@ msgid "Applicants"
 msgstr "Candidatos"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Sin sujeto"
@@ -553,10 +554,18 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Salario esperado por el solicitante, más ventajas adicionales"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+"El estado se establece a 'borrador', cuando se crea un caso. Si el caso está "
+"en progreso el estado, se establece a 'Abierto'. Cuando el caso finaliza, el "
+"estado se establece a 'Cerrado'. Si el caso necesita ser revisado, entonces "
+"el estado se establece a 'Pendiente'."
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -590,6 +599,11 @@ msgstr "En curso"
 msgid "Hire & Create Employee"
 msgstr "Contratar y crear empleado"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -601,9 +615,9 @@ msgid "Probability"
 msgstr "Probabilidad"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr "Apodo"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -643,9 +657,9 @@ msgid "Answer related job question"
 msgstr "Responder pregunta relativa al puesto"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Progreso del proceso de selección"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primera entrevista"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -670,9 +684,9 @@ msgid "or"
 msgstr "o"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Buscar trabajos"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -779,9 +793,10 @@ msgid "Schedule interview with this applicant"
 msgstr "Planificar reunión con este solicitante"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Agosto"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -794,29 +809,15 @@ msgid "Degree"
 msgstr "Título"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr "Solicitante de RRHH: Marcar como no leído"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-"El estado se establece a 'borrador', cuando se crea un caso. Si el caso está "
-"en progreso el estado, se establece a 'Abierto'. Cuando el caso finaliza, el "
-"estado se establece a 'Cerrado'. Si el caso necesita ser revisado, entonces "
-"el estado se establece a 'Pendiente'."
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -874,12 +875,6 @@ msgstr ""
 msgid "Response"
 msgstr "Respuesta"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -895,11 +890,6 @@ msgstr "Permitir la indexación automática de CV"
 msgid "Proposed Salary Extra"
 msgstr "Salario extra propuesto"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr "Empleado contratado"
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -912,10 +902,9 @@ msgid "A contact is already existing with the same name."
 msgstr "Ya existe un contacto con el mismo nombre."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr "El solicitante ha sido <b>contratado</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Revisar fases de reclutamiento"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -923,9 +912,9 @@ msgid "Contact:"
 msgstr "Contacto:"
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Buscar trabajos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -969,18 +958,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Configurar"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr "El solicitante ha sido <b>contratado</b> y creado como empleado."
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Origen"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -1008,11 +985,6 @@ msgstr "Año"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr "Seguidores"
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1049,6 +1021,11 @@ msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 "Establece el orden de secuencia al mostrar una lista de titulaciones."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1074,7 +1051,7 @@ msgid "LinkedIn"
 msgstr "Enlace ficha LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr "Nuevo solicitante"
 
@@ -1089,9 +1066,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Casos por etapa y estimaciones"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Origen de los solicitantes"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nuevo"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1099,22 +1080,11 @@ msgstr "Origen de los solicitantes"
 msgid "Interview"
 msgstr "Entrevista"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Revisar fases de reclutamiento"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Nombre del origen"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa cambiada a  <b>%s</b>."
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1126,9 +1096,9 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Reclutamiento sin asignar"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1198,9 +1168,9 @@ msgid "On Average"
 msgstr "En promedio"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primera entrevista"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Progreso del proceso de selección"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1256,9 +1226,9 @@ msgid "These people will receive email."
 msgstr "Estas personas recibirán un email."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Abril"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr "Apodo"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1270,15 +1240,20 @@ msgstr "Reclutamiento pendiente"
 msgid "Contract"
 msgstr "Contrato"
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr "Mensajes e historial de comunicación"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Enlace ficha Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1296,28 +1271,21 @@ msgstr "Reclutamiento en proceso"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr "Un nuevo empleado se ha unido a la compañía %s."
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Licenciatura"
 
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Reclutamiento sin asignar"
+
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_config_settings
 msgid "hr.config.settings"
 msgstr "Parámetros de configuración de RRHH"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
-msgstr "El solicitante ha sido <b>creado</b>."
-
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,state:0
 msgid ""
diff --git a/addons/hr_recruitment/i18n/es_CR.po b/addons/hr_recruitment/i18n/es_CR.po
index 3daa56a13c9..b70bfb9084b 100644
--- a/addons/hr_recruitment/i18n/es_CR.po
+++ b/addons/hr_recruitment/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-16 17:32+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -117,7 +117,7 @@ msgid "Sources of Applicants"
 msgstr "Fuentes de los solicitantes"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Debe definir el trabajo aplicado para el solicitante."
@@ -291,7 +291,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -302,9 +302,10 @@ msgid "Salary Proposed"
 msgstr "Salario propuesto"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -325,10 +326,9 @@ msgid "Proposed Salary"
 msgstr "Salario propuesto"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Origen de los aplicantes"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -355,25 +355,26 @@ msgstr "Empleados contratados"
 msgid "Job Description"
 msgstr "Descripción del trabajo"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nuevo"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Texto original"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monstruo"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -417,6 +418,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bueno"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -430,11 +436,6 @@ msgstr "Fecha de Creación"
 msgid "Create Employee"
 msgstr "Crear empleado"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -493,7 +494,7 @@ msgid "Applicants"
 msgstr "Candidatos"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Sin Asunto"
@@ -524,10 +525,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Salario esperado por el solicitante, ventajas adicionales"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -561,6 +566,11 @@ msgstr "En progreso"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -572,9 +582,9 @@ msgid "Probability"
 msgstr "Probabilidad"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -614,9 +624,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Progreso del proceso de selección"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primera entrevista"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -641,9 +651,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Buscar trabajos"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -750,9 +760,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Agosto"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -765,25 +776,15 @@ msgid "Degree"
 msgstr "Título"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -834,12 +835,6 @@ msgstr ""
 msgid "Response"
 msgstr "Respuesta"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -855,11 +850,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Propuesta de salario adicional"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -872,10 +862,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Revisar las etapas de contratación"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -883,9 +872,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Buscar trabajos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -929,18 +918,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Texto original"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -968,11 +945,6 @@ msgstr "Año"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1004,6 +976,11 @@ msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 "Establece el orden de secuencia al mostrar una lista de titulaciones."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1029,7 +1006,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1044,9 +1021,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Casos por etapa y estimaciones"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Origen de los aplicantes"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nuevo"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1054,22 +1035,11 @@ msgstr "Origen de los aplicantes"
 msgid "Interview"
 msgstr "Entrevista"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Revisar las etapas de contratación"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Nombre de la fuente"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1081,9 +1051,9 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Contrataciones sin asignar"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1147,9 +1117,9 @@ msgid "On Average"
 msgstr "En promedio"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primera entrevista"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Progreso del proceso de selección"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1205,9 +1175,9 @@ msgid "These people will receive email."
 msgstr "Estas personas recibirán un email."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Abril"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1219,15 +1189,20 @@ msgstr "Contratación en espera"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monstruo"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1245,26 +1220,19 @@ msgstr "Contratación en progreso"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Grado bachiller"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Contrataciones sin asignar"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index 0e768357976..87962842836 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-18 16:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -117,7 +117,7 @@ msgid "Sources of Applicants"
 msgstr "Origines des candidats"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -290,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Attention!"
@@ -301,9 +301,10 @@ msgid "Salary Proposed"
 msgstr "Proposition salariale"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partenaire"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -324,10 +325,9 @@ msgid "Proposed Salary"
 msgstr "Salaire proposé"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Origine des candidats"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -354,25 +354,26 @@ msgstr "Employés recrutés"
 msgid "Job Description"
 msgstr "Description du poste"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nouveau"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Origine"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -416,6 +417,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bon"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Août"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -429,11 +435,6 @@ msgstr "Date de création"
 msgid "Create Employee"
 msgstr "Créer un employé"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Téléphone"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -492,7 +493,7 @@ msgid "Applicants"
 msgstr "Candidats"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Aucun objet"
@@ -523,10 +524,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Salaire espéré par le candidat, avantages supplémentaires"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partenaire"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -560,6 +565,11 @@ msgstr "En cours"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -571,9 +581,9 @@ msgid "Probability"
 msgstr "Probabilité"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Avril"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -613,9 +623,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Degré de recrutement"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Premier entretien"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -640,9 +650,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Recherche d'emploi"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -749,9 +759,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Août"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -764,25 +775,15 @@ msgid "Degree"
 msgstr "Niveau d'étude"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Téléphone"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Juin"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -833,12 +834,6 @@ msgstr ""
 msgid "Response"
 msgstr "Réponse"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -854,11 +849,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Supplément de salaire proposé"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -871,10 +861,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Révision des étapes de recrutement"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -882,9 +871,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Recherche d'emploi"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -928,18 +917,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Origine"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -967,11 +944,6 @@ msgstr "Année"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1002,6 +974,11 @@ msgstr "Sujet / candidat"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Donne l'ordre d'apparition dans la liste des niveaux d'étude"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1027,7 +1004,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1042,9 +1019,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Cas par étape et estimations"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Origine des candidats"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nouveau"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1052,22 +1033,11 @@ msgstr "Origine des candidats"
 msgid "Interview"
 msgstr "Entretien"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Révision des étapes de recrutement"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Nom de l'origine"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1079,9 +1049,9 @@ msgid "Description"
 msgstr "Description"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Recrutements non-assignés"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1145,9 +1115,9 @@ msgid "On Average"
 msgstr "En moyenne"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Premier entretien"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Degré de recrutement"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1203,9 +1173,9 @@ msgid "These people will receive email."
 msgstr "Ces personnes recevront un courriel"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Avril"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1217,15 +1187,20 @@ msgstr "Recrutements en attente"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1243,26 +1218,19 @@ msgstr "Recrutements en cours"
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Licence"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Recrutements non-assignés"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/hi.po b/addons/hr_recruitment/i18n/hi.po
index ccce5a5e18a..e1cd8cd2b4c 100644
--- a/addons/hr_recruitment/i18n/hi.po
+++ b/addons/hr_recruitment/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-26 08:53+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr "वेतन प्रस्तावित"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "साथी"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,25 +351,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "नौकरी विवरण"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "नया"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr "अच्छा"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "निर्माण दिनांक"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr "आवेदकों"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "साथी"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "प्रगति पर है"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr "संभावना"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,8 +753,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -758,8 +769,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -767,16 +778,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,9 +1010,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "नया"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,8 +1164,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/hr.po b/addons/hr_recruitment/i18n/hr.po
index 4597b85c23e..e778c04656a 100644
--- a/addons/hr_recruitment/i18n/hr.po
+++ b/addons/hr_recruitment/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 17:04+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -117,7 +117,7 @@ msgid "Sources of Applicants"
 msgstr "Izvori kandidata za posao"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -291,7 +291,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -302,9 +302,10 @@ msgid "Salary Proposed"
 msgstr "Predložena plaća"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr "Uredi ..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -325,10 +326,9 @@ msgid "Proposed Salary"
 msgstr "Predložena plaća"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Izvor kandidata"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -355,25 +355,26 @@ msgstr "Djelatnici"
 msgid "Job Description"
 msgstr "Opis posla"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Novi"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Izvor"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr "Pratitelji"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Čudovište"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -417,6 +418,11 @@ msgstr ""
 msgid "Good"
 msgstr "Dobro"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Kolovoz"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -430,11 +436,6 @@ msgstr "Datum kreiranja"
 msgid "Create Employee"
 msgstr "Kreiraj djelatnika"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -493,7 +494,7 @@ msgid "Applicants"
 msgstr "Kandidati"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Nema naslova"
@@ -524,10 +525,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Plaća koju očekuje kandidat, plus dodaci"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -561,6 +566,11 @@ msgstr "U toku"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -572,9 +582,9 @@ msgid "Probability"
 msgstr "Vjerojatnost"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr "Nadimak"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Travanj"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -614,9 +624,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Stupanj zapošljavanja"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Prvi razgovor"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -641,9 +651,9 @@ msgid "or"
 msgstr "ili"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Traži poslove"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -749,9 +759,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Kolovoz"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -764,25 +775,15 @@ msgid "Degree"
 msgstr "Stupanj"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Lipanj"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -833,12 +834,6 @@ msgstr ""
 msgid "Response"
 msgstr "Odgovor"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -854,11 +849,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Predložen bonus"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -871,10 +861,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Recenzija faza zapošljavanja"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -882,9 +871,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr "Sažetak"
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Traži poslove"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -928,18 +917,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Postavke"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Izvor"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -967,11 +944,6 @@ msgstr "Godina"
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr "Pratitelji"
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1002,6 +974,11 @@ msgstr "Subjekt / kandidat"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Daje redosljed kod listanja stupnjeva"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1027,7 +1004,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1042,9 +1019,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Slučajevi po fazi i procjenama"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Izvor kandidata"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Novi"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1052,22 +1033,11 @@ msgstr "Izvor kandidata"
 msgid "Interview"
 msgstr "Razgovor za posao"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Recenzija faza zapošljavanja"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Naziv izvora"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1079,9 +1049,9 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Nerazvrstana zapošljavanja"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1145,9 +1115,9 @@ msgid "On Average"
 msgstr "U prosjeku"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Prvi razgovor"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Stupanj zapošljavanja"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1203,9 +1173,9 @@ msgid "These people will receive email."
 msgstr "Ove će osobe primiti e-poštu."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Travanj"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr "Nadimak"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1217,15 +1187,20 @@ msgstr "Zapošljavanje na čekanju"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr "Sažetak"
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Čudovište"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1243,26 +1218,19 @@ msgstr "Zapošljavanje u toku"
 msgid "Sequence"
 msgstr "Sekvenca"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Prvostupnik"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Nerazvrstana zapošljavanja"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/hu.po b/addons/hr_recruitment/i18n/hu.po
index 02db266f9d1..2f1ac628677 100644
--- a/addons/hr_recruitment/i18n/hu.po
+++ b/addons/hr_recruitment/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-17 13:22+0000\n"
 "Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\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: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -115,7 +115,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -286,7 +286,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -297,9 +297,10 @@ msgid "Salary Proposed"
 msgstr "Javasolt fizetés"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -320,9 +321,8 @@ msgid "Proposed Salary"
 msgstr "Javasolt fizetés"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -350,25 +350,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Munkaköri leírás"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Új"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -412,6 +413,11 @@ msgstr ""
 msgid "Good"
 msgstr "Jó"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Augusztus"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -425,11 +431,6 @@ msgstr "Létrehozás dátuma"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -488,7 +489,7 @@ msgid "Applicants"
 msgstr "Pályázók"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -519,10 +520,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -556,6 +561,11 @@ msgstr "Folyamatban"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -567,9 +577,9 @@ msgid "Probability"
 msgstr "Valószínűség"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Április"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -609,9 +619,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr ""
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Első interjú"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -636,9 +646,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Munkák keresése"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -742,9 +752,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Augusztus"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -757,25 +768,15 @@ msgid "Degree"
 msgstr "Diploma"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Június"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -826,12 +827,6 @@ msgstr ""
 msgid "Response"
 msgstr "Válasz"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -847,11 +842,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -864,9 +854,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -875,9 +864,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Munkák keresése"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -918,18 +907,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -957,11 +934,6 @@ msgstr "Év"
 msgid "Cancel"
 msgstr "Mégse"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -992,6 +964,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1017,7 +994,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1032,9 +1009,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Új"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1042,22 +1023,11 @@ msgstr ""
 msgid "Interview"
 msgstr "Interjú"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1069,8 +1039,8 @@ msgid "Description"
 msgstr "Leírás"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1135,9 +1105,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Első interjú"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1193,9 +1163,9 @@ msgid "These people will receive email."
 msgstr "Ezek az emberek fogják megkapni az e-mailt."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Április"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1207,14 +1177,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1233,26 +1208,19 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sorszám"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/id.po b/addons/hr_recruitment/i18n/id.po
index b0d428ff000..415aa572904 100644
--- a/addons/hr_recruitment/i18n/id.po
+++ b/addons/hr_recruitment/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-09 08:30+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -289,7 +289,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -300,9 +300,10 @@ msgid "Salary Proposed"
 msgstr "Usulan Gaji"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Rekanan"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -323,9 +324,8 @@ msgid "Proposed Salary"
 msgstr "Usulan gaji"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -353,25 +353,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Deskripsi Pekerjaan"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Baru"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -415,6 +416,11 @@ msgstr ""
 msgid "Good"
 msgstr "Baik"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -428,11 +434,6 @@ msgstr "Tanggal dibuat"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -491,7 +492,7 @@ msgid "Applicants"
 msgstr "Pelamar"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -522,10 +523,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Rekanan"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -559,6 +564,11 @@ msgstr "Dalam proses"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -570,8 +580,8 @@ msgid "Probability"
 msgstr "Probabilitas"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -612,9 +622,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr ""
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Wawancara kedua"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -639,9 +649,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Cari Pekerjaan"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -748,8 +758,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -763,8 +774,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -772,16 +783,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -832,12 +833,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -853,11 +848,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -870,9 +860,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -881,9 +870,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Cari Pekerjaan"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -924,18 +913,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -963,11 +940,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -998,6 +970,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1023,7 +1000,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1038,9 +1015,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Baru"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1048,22 +1029,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1075,8 +1045,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1141,9 +1111,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Wawancara kedua"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1199,8 +1169,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1213,14 +1183,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1239,26 +1214,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/it.po b/addons/hr_recruitment/i18n/it.po
index 20cd2c9a1bc..eba4f9443d2 100644
--- a/addons/hr_recruitment/i18n/it.po
+++ b/addons/hr_recruitment/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 23:11+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -289,7 +289,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -300,9 +300,10 @@ msgid "Salary Proposed"
 msgstr "Stipendio proposto"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -323,9 +324,8 @@ msgid "Proposed Salary"
 msgstr "Stipendio Proposto"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -353,25 +353,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Descrizione lavoro"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nuovo"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -415,6 +416,11 @@ msgstr ""
 msgid "Good"
 msgstr "Buono"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -428,11 +434,6 @@ msgstr "Data creazione"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefono"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -491,7 +492,7 @@ msgid "Applicants"
 msgstr "Candidati"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -522,10 +523,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -559,6 +564,11 @@ msgstr "In corso"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -570,9 +580,9 @@ msgid "Probability"
 msgstr "Probabililtà"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Aprile"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -612,9 +622,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Gradi del Processo di assunzione"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primo colloquio"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -639,9 +649,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Cerca lavori"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -748,9 +758,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Agosto"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -763,25 +774,15 @@ msgid "Degree"
 msgstr "Grado"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefono"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Giugno"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -832,12 +833,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -853,11 +848,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -870,9 +860,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -881,9 +870,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Cerca lavori"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -924,18 +913,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -963,11 +940,6 @@ msgstr "Anno"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -998,6 +970,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Fornisce l'ordinamento quando viene visualizzata una lista di gradi."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1023,7 +1000,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1038,9 +1015,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Casi per stadi e stime"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nuovo"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1048,22 +1029,11 @@ msgstr ""
 msgid "Interview"
 msgstr "Colloquio"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1075,8 +1045,8 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1141,9 +1111,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primo colloquio"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Gradi del Processo di assunzione"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1199,9 +1169,9 @@ msgid "These people will receive email."
 msgstr "Queste persone riceveranno email."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Aprile"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1213,14 +1183,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1239,26 +1214,19 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index e75c90b82f5..bb3ba2225a6 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-22 03:20+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr "応募者の情報源"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "この応募者のための業務を定義しなければいけません。"
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "警告"
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr "提示した 給与"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,10 +322,9 @@ msgid "Proposed Salary"
 msgstr "提案された給与"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "応募者の情報源"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -351,25 +351,26 @@ msgstr "採用した従業員"
 msgid "Job Description"
 msgstr "職務内容"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "新規"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "ソース"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "強力な候補"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr "良"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "8月"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "作成日"
 msgid "Create Employee"
 msgstr "従業員を作成"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "電話"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr "応募者"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "件名なし"
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "応募者が期待する給与、その他の利点"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "パートナ"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "進行中"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,9 +578,9 @@ msgid "Probability"
 msgstr "確信度"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "4月"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -610,9 +620,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "採用の度合い"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "最初の面接"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -637,9 +647,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "仕事を探す"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -743,9 +753,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "8月"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -758,25 +769,15 @@ msgid "Degree"
 msgstr "学位"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "電話"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr "応答"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "提案された追加給与"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,10 +855,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "採用段階のレビュー"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -876,9 +865,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "仕事を探す"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -919,18 +908,6 @@ msgstr "次の段階が採用プロセスに合致するのであれば、チェ
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "ソース"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr "年"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr "主題 / 応募者"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "学位の一覧が表示されたら、順番を指定してください。"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,9 +1010,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "段階と見積りの事例"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "応募者の情報源"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "新規"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1043,22 +1024,11 @@ msgstr "応募者の情報源"
 msgid "Interview"
 msgstr "面接"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "採用段階のレビュー"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "情報源の名前"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,9 +1040,9 @@ msgid "Description"
 msgstr "詳細"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "未割当ての採用"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1136,9 +1106,9 @@ msgid "On Average"
 msgstr "平均"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "最初の面接"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "採用の度合い"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1194,9 +1164,9 @@ msgid "These people will receive email."
 msgstr "これらの人がEメールを受け取ります。"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "4月"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1208,15 +1178,20 @@ msgstr "採用保留"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "強力な候補"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1234,26 +1209,19 @@ msgstr "進行中の採用"
 msgid "Sequence"
 msgstr "順序"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "学士"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "未割当ての採用"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/mk.po b/addons/hr_recruitment/i18n/mk.po
index 7c8f5ab68ba..992dc9e0c44 100644
--- a/addons/hr_recruitment/i18n/mk.po
+++ b/addons/hr_recruitment/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-08 10:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -290,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Предупредување!"
@@ -301,9 +301,10 @@ msgid "Salary Proposed"
 msgstr "Предложена плата"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "партнер"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -324,9 +325,8 @@ msgid "Proposed Salary"
 msgstr "Предложена плата"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -354,25 +354,26 @@ msgstr ""
 msgid "Job Description"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Нов"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -416,6 +417,11 @@ msgstr ""
 msgid "Good"
 msgstr "Добро"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Август"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -429,11 +435,6 @@ msgstr "Датум на креирање"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Телефон"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -492,7 +493,7 @@ msgid "Applicants"
 msgstr "апликанти"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Нема наслов"
@@ -523,10 +524,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "очекувана плата по кандидат, екстра предности"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "партнер"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -560,6 +565,11 @@ msgstr "Во тек"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -571,8 +581,8 @@ msgid "Probability"
 msgstr "Веројатност"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -613,9 +623,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr ""
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Прво интервју"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -640,9 +650,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "барај работни места"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -749,9 +759,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Август"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -764,25 +775,15 @@ msgid "Degree"
 msgstr "Диплома"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Телефон"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Јуни"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -833,12 +834,6 @@ msgstr ""
 msgid "Response"
 msgstr "Одговор"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -854,11 +849,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Предложена екстра плата"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -871,10 +861,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Прегледај ги етапите за вработување"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -882,9 +871,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "барај работни места"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -928,18 +917,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -967,11 +944,6 @@ msgstr "Година"
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1002,6 +974,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1027,7 +1004,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1042,9 +1019,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Нов"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1052,22 +1033,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Прегледај ги етапите за вработување"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1079,8 +1049,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1145,9 +1115,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Прво интервју"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1203,8 +1173,8 @@ msgid "These people will receive email."
 msgstr "Овие луѓе ќе добијат емаил"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1217,14 +1187,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1243,26 +1218,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/mn.po b/addons/hr_recruitment/i18n/mn.po
index d6420f61822..e3d569d37f5 100644
--- a/addons/hr_recruitment/i18n/mn.po
+++ b/addons/hr_recruitment/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-25 19:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -117,7 +117,7 @@ msgid "Sources of Applicants"
 msgstr "Горилогчдын Сурвалж"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Энэ горилогчид Өргөдөл гаргасан Ажлыг нь тодорхойлох ёстой."
@@ -290,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Анхааруулга!"
@@ -301,9 +301,10 @@ msgid "Salary Proposed"
 msgstr "Санал болгож байгаа цалин"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -324,10 +325,9 @@ msgid "Proposed Salary"
 msgstr "Санал болгосон цалин"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Горилогчийн Сурвалж"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -354,25 +354,26 @@ msgstr "Цалинт ажилтан"
 msgid "Job Description"
 msgstr "Ажлын байрны тодорхойлолт"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Шинэ"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Эх үүсвэр"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -416,6 +417,11 @@ msgstr ""
 msgid "Good"
 msgstr "Сайн"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "8 сар"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -429,11 +435,6 @@ msgstr "Үүсгэсэн огноо"
 msgid "Create Employee"
 msgstr "Ажилчин үүсгэх"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Утас"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -492,7 +493,7 @@ msgid "Applicants"
 msgstr "Горилогчид"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Гарчиг үгүй"
@@ -523,10 +524,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Өргөдөл гаргагчийн хүсч буй цалин болон нэмэлт хангамжууд"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Харилцагч"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -560,6 +565,11 @@ msgstr "Эхэлсэн"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -571,9 +581,9 @@ msgid "Probability"
 msgstr "Магадлал"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "4 сар"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -613,9 +623,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Боловсролын түвшин"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Эхний ярилцлага"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -640,9 +650,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Ажлын байр хайх"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -748,9 +758,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "8 сар"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -763,25 +774,15 @@ msgid "Degree"
 msgstr "Боловсролын түвшин"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Утас"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "6 сар"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -832,12 +833,6 @@ msgstr ""
 msgid "Response"
 msgstr "Хариулт"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -853,11 +848,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Санал болгосон хамгийн их цалин"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -870,10 +860,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Хүний нөөцийн бүрдүүлэлтийн шатуудыг харах"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -881,9 +870,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Ажлын байр хайх"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -927,18 +916,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Эх үүсвэр"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -966,11 +943,6 @@ msgstr "Он"
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1001,6 +973,11 @@ msgstr "Гарчиг / Өргөдөл гаргагч"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Боловсролын түвшинг харах үедээ тэдгээрт дарааллыг олгодог"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1026,7 +1003,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1041,9 +1018,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Үе шат ба тооцооллоор ангилсан тохиолдлууд"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Горилогчийн Сурвалж"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Шинэ"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1051,22 +1032,11 @@ msgstr "Горилогчийн Сурвалж"
 msgid "Interview"
 msgstr "Ярилцлага"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Хүний нөөцийн бүрдүүлэлтийн шатуудыг харах"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Сурвалжийн Нэр"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1078,9 +1048,9 @@ msgid "Description"
 msgstr "Тайлбар"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Тодорхойгүй хүний нөөцийн бүрдүүлэлт"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1144,9 +1114,9 @@ msgid "On Average"
 msgstr "Дундажаар"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Эхний ярилцлага"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Боловсролын түвшин"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1202,9 +1172,9 @@ msgid "These people will receive email."
 msgstr "Эдгээр хүмүүс э-мэйл хүлээж авна"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "4 сар"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1216,15 +1186,20 @@ msgstr "Хүлээгдэж байгаа хүний нөөц бүрдүүлэлт
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1242,26 +1217,19 @@ msgstr "Явагдаж буй хүний нөөц бүрдүүлэлт"
 msgid "Sequence"
 msgstr "Дараалал"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Баклавр"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Тодорхойгүй хүний нөөцийн бүрдүүлэлт"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/nb.po b/addons/hr_recruitment/i18n/nb.po
index f6c95e1662a..df558c4193b 100644
--- a/addons/hr_recruitment/i18n/nb.po
+++ b/addons/hr_recruitment/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-23 14:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr "Kilder til søkere."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,25 +351,26 @@ msgstr "Ansatt ansatte."
 msgid "Job Description"
 msgstr "Jobb beskrivelse."
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Ny."
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Kilde."
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr "Godt"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "August."
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "Opprettelses dato."
 msgid "Create Employee"
 msgstr "Opprett ansatte."
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr "Søkere."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Ingen emne."
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Lønn forventet av søkeren, ekstra fordeler."
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partner."
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "Under arbeid."
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr "Sannsynlighet."
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,9 +620,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr ""
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Første intervju."
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -637,9 +647,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Søk jobber."
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -745,9 +755,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "August."
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -760,25 +771,15 @@ msgid "Degree"
 msgstr "Grad."
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Juni."
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -829,12 +830,6 @@ msgstr ""
 msgid "Response"
 msgstr "Svar."
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -850,11 +845,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -867,10 +857,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Gjennomgå rekruttering faser."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -878,9 +867,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Søk jobber."
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -921,18 +910,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Kilde."
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -960,11 +937,6 @@ msgstr "År."
 msgid "Cancel"
 msgstr "Avbryt."
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -995,6 +967,11 @@ msgstr "Emne / søker."
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1020,7 +997,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1035,9 +1012,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Ny."
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1045,22 +1026,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Gjennomgå rekruttering faser."
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1072,8 +1042,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1138,9 +1108,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Første intervju."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1196,8 +1166,8 @@ msgid "These people will receive email."
 msgstr "Disse personene vil motta e-post."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1210,14 +1180,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1236,26 +1211,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/nl.po b/addons/hr_recruitment/i18n/nl.po
index a654affb800..6760abeb711 100644
--- a/addons/hr_recruitment/i18n/nl.po
+++ b/addons/hr_recruitment/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 21:32+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr "Bron van aanvragers"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "U moet 'Gesolliciteerd op vacature' definiëren voor deze sollicitant"
@@ -295,7 +295,7 @@ msgstr ""
 "ingevoegd."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -306,9 +306,10 @@ msgid "Salary Proposed"
 msgstr "Voorgesteld salaris"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr "Bewerken..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -329,10 +330,9 @@ msgid "Proposed Salary"
 msgstr "Voorgesteld salaris"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Bron van aanvragers"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -359,25 +359,26 @@ msgstr "Aangenomen werknemers"
 msgid "Job Description"
 msgstr "Functieomschrijving"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nieuw"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Bron"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -421,6 +422,11 @@ msgstr ""
 msgid "Good"
 msgstr "Goed"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Augustus"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -434,11 +440,6 @@ msgstr "Datum gemaakt"
 msgid "Create Employee"
 msgstr "Werknemer aanmaken"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefoon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -497,7 +498,7 @@ msgid "Applicants"
 msgstr "Kandidaten"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -528,10 +529,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Verwacht salaris door sollicitant, overige arbeidsvoorwaarden"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Relatie"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -565,6 +570,11 @@ msgstr "In behandeling"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -576,9 +586,9 @@ msgid "Probability"
 msgstr "Waarschijnlijkheid"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "April"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -618,9 +628,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Mate van werving"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Eerste gesprek"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -645,9 +655,9 @@ msgid "or"
 msgstr "of"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Kandidaten zoeken"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -754,9 +764,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Augustus"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -769,25 +780,15 @@ msgid "Degree"
 msgstr "Diploma"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefoon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Juni"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -838,12 +839,6 @@ msgstr ""
 msgid "Response"
 msgstr "Antwoord"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -859,11 +854,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Voorgesteld extra salaris"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -876,10 +866,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Bekijk werving fases"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -887,9 +876,9 @@ msgid "Contact:"
 msgstr "Contactpersoon:"
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Kandidaten zoeken"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -932,18 +921,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Instellen"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Bron"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -971,11 +948,6 @@ msgstr "Jaar"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr "Volgers"
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1006,6 +978,11 @@ msgstr "Onderwerp / Sollicitant"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Bepaalt de volgorde bij het afbeelden van de lijst van diploma's"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1031,7 +1008,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1046,9 +1023,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Kandidaten per stadium en schattingen"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Bron van aanvragers"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nieuw"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1056,22 +1037,11 @@ msgstr "Bron van aanvragers"
 msgid "Interview"
 msgstr "Gesprek"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Bekijk werving fases"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Naam van bron"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1083,9 +1053,9 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Niet toegewezen wervingen"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1149,9 +1119,9 @@ msgid "On Average"
 msgstr "Gemiddeld"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Eerste gesprek"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Mate van werving"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1207,9 +1177,9 @@ msgid "These people will receive email."
 msgstr "Deze personen zullen email ontvangen."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr "Alias"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1221,15 +1191,20 @@ msgstr "Wervingen in afwachting"
 msgid "Contract"
 msgstr "Contract"
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr "Berichten en communicatie historie"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1247,28 +1222,21 @@ msgstr "Wervingen in behandeling"
 msgid "Sequence"
 msgstr "Volgnummer"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Bachelor diploma"
 
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Niet toegewezen wervingen"
+
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_config_settings
 msgid "hr.config.settings"
 msgstr "hr.config.settings"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,state:0
 msgid ""
diff --git a/addons/hr_recruitment/i18n/pl.po b/addons/hr_recruitment/i18n/pl.po
index 769821f5379..c2ee53ffa5b 100644
--- a/addons/hr_recruitment/i18n/pl.po
+++ b/addons/hr_recruitment/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-12 09:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,8 +298,9 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: hr_recruitment
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,24 +351,25 @@ msgstr ""
 msgid "Job Description"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
 msgstr ""
 
 #. module: hr_recruitment
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr ""
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,9 +521,13 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
 msgstr ""
 
 #. module: hr_recruitment
@@ -557,6 +562,11 @@ msgstr ""
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,8 +753,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -758,8 +769,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -767,16 +778,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,8 +1010,12 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,8 +1164,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/pt.po b/addons/hr_recruitment/i18n/pt.po
index e30d9b835ad..23362a5d8c8 100644
--- a/addons/hr_recruitment/i18n/pt.po
+++ b/addons/hr_recruitment/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 14:50+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr "Candidaturas"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Deve definir um trabalho aplicado a este candidato."
@@ -292,7 +292,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -303,9 +303,10 @@ msgid "Salary Proposed"
 msgstr "Salário proposto"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr "Editar..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -326,10 +327,9 @@ msgid "Proposed Salary"
 msgstr "Salário proposto"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Candidaturas"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -356,25 +356,26 @@ msgstr "Funcionários contratados"
 msgid "Job Description"
 msgstr "Descrição do Cargo"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Novo"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Origem"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monstro"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -418,6 +419,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bom"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -431,11 +437,6 @@ msgstr "Data de criação"
 msgid "Create Employee"
 msgstr "Criar funcionário"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefone"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -494,7 +495,7 @@ msgid "Applicants"
 msgstr "Candidatos"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -525,10 +526,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Salário esperado por candidato, vantagens extra"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -562,6 +567,11 @@ msgstr "Em curso"
 msgid "Hire & Create Employee"
 msgstr "Contrar & criar empregado"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -573,9 +583,9 @@ msgid "Probability"
 msgstr "Probabilidade"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr "Nome alternativo"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -615,9 +625,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Grau do Recrutamento"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primeira entrevista"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -642,9 +652,9 @@ msgid "or"
 msgstr "ou"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Pesquisa de Emprego"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -751,9 +761,10 @@ msgid "Schedule interview with this applicant"
 msgstr "Marcar entrevista com este candidato"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Agosto"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -766,25 +777,15 @@ msgid "Degree"
 msgstr "Grau"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefone"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Junho"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -835,12 +836,6 @@ msgstr ""
 msgid "Response"
 msgstr "Resposta"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -856,11 +851,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Salário Extra Proposto"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -873,10 +863,9 @@ msgid "A contact is already existing with the same name."
 msgstr "Já existe um contacto com o mesmo nome."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr "O candidato foi <b>contratado</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Rever etapas de recrutamento"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -884,9 +873,9 @@ msgid "Contact:"
 msgstr "Contacto:"
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Pesquisa de Emprego"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -930,18 +919,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Configurar"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr "O candidato foi <b>contratado</b> e tornado empregado."
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Origem"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -969,11 +946,6 @@ msgstr "Ano"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr "Seguidores"
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1004,6 +976,11 @@ msgstr "Assunto / Requerente"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Dá a sequência é ordenada ao exibir uma lista de graus."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1029,7 +1006,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr "Novo candidato"
 
@@ -1044,9 +1021,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Casos por etapa e Estimativas"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Candidaturas"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Novo"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1054,22 +1035,11 @@ msgstr "Candidaturas"
 msgid "Interview"
 msgstr "Entrevista"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Rever etapas de recrutamento"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Nome da Origem"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1081,9 +1051,9 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Recrutamentos não atribuidos"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1147,9 +1117,9 @@ msgid "On Average"
 msgstr "Em méda"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primeira entrevista"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Grau do Recrutamento"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1205,9 +1175,9 @@ msgid "These people will receive email."
 msgstr "Estas pessoas vão receber email"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Abril"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr "Nome alternativo"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1219,15 +1189,20 @@ msgstr "Recrutamento pendente"
 msgid "Contract"
 msgstr "Contrato"
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monstro"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1245,28 +1220,21 @@ msgstr "Recrutamento em progresso"
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Bacharelato"
 
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Recrutamentos não atribuidos"
+
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_config_settings
 msgid "hr.config.settings"
 msgstr "hr.config.settings"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,state:0
 msgid ""
diff --git a/addons/hr_recruitment/i18n/pt_BR.po b/addons/hr_recruitment/i18n/pt_BR.po
index b88ef99185c..c32a267c186 100644
--- a/addons/hr_recruitment/i18n/pt_BR.po
+++ b/addons/hr_recruitment/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-19 02:23+0000\n"
 "Last-Translator: Cintia Sayuri Sato - http://www.tompast.com.br <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr "Fontes de Candidatos"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Você deve definir o trabalho aplicado para este candidato."
@@ -292,7 +292,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
@@ -303,9 +303,10 @@ msgid "Salary Proposed"
 msgstr "Proposta Salarial"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -326,10 +327,9 @@ msgid "Proposed Salary"
 msgstr "Salário Proposto"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Fonte de Candidatos"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -356,25 +356,26 @@ msgstr "Funcionários Contratados"
 msgid "Job Description"
 msgstr "Descritivo da Função"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Novo"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Origem"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Sites de Emprego"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -418,6 +419,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bom"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -431,11 +437,6 @@ msgstr "Data de Criação"
 msgid "Create Employee"
 msgstr "Criar Empregado"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefone"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -494,7 +495,7 @@ msgid "Applicants"
 msgstr "Candidatos"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -525,10 +526,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Salários Esperados por Candidatos, vantagens extras"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -562,6 +567,11 @@ msgstr "Em andamento"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -573,9 +583,9 @@ msgid "Probability"
 msgstr "Probabilidade"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -615,9 +625,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Grau de Recrutamento"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primeira entrevista"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -642,9 +652,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Pesquisar Trabalhos"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -751,9 +761,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Agosto"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -766,25 +777,15 @@ msgid "Degree"
 msgstr "Grau"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefone"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Junho"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -835,12 +836,6 @@ msgstr ""
 msgid "Response"
 msgstr "Resposta"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -856,11 +851,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Salário Extra Proposto"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -873,10 +863,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Reveja os Estágios de Recrutamento"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -884,9 +873,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Pesquisar Trabalhos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -930,18 +919,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Origem"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -969,11 +946,6 @@ msgstr "Ano"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1005,6 +977,11 @@ msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 "Informe a ordem sequencial para exibir uma lista de graus de instrução."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1030,7 +1007,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1045,9 +1022,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Casos por Estágio e Estimativas"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Fonte de Candidatos"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Novo"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1055,22 +1036,11 @@ msgstr "Fonte de Candidatos"
 msgid "Interview"
 msgstr "Entrevista"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Reveja os Estágios de Recrutamento"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Nome da Fonte"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1082,9 +1052,9 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Recrutamentos sem assinar"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1148,9 +1118,9 @@ msgid "On Average"
 msgstr "Na Média"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primeira entrevista"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Grau de Recrutamento"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1206,9 +1176,9 @@ msgid "These people will receive email."
 msgstr "Essas pessoas receberão e-mail."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Abril"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1220,15 +1190,20 @@ msgstr "Recrutamento Pendente"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Sites de Emprego"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1246,26 +1221,19 @@ msgstr "Recrutamento em progresso"
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Bacharel"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Recrutamentos sem assinar"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/ro.po b/addons/hr_recruitment/i18n/ro.po
index 7a6aa763c15..a9b22475900 100644
--- a/addons/hr_recruitment/i18n/ro.po
+++ b/addons/hr_recruitment/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-06 15:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr "Surse Candidati"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Trebuie sa definiti 'A aplicat' pentru acest candidat."
@@ -292,7 +292,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Avertizare!"
@@ -303,9 +303,10 @@ msgid "Salary Proposed"
 msgstr "Salariul Propus"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partener"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -326,10 +327,9 @@ msgid "Proposed Salary"
 msgstr "Salariul propus"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Sursa Candidati"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -356,25 +356,26 @@ msgstr "Salariati angajati"
 msgid "Job Description"
 msgstr "Fisa postului"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Nou(a)"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Sursa"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monstru"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -418,6 +419,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bun/bine"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "August"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -431,11 +437,6 @@ msgstr "Data crearii"
 msgid "Create Employee"
 msgstr "Creati Angajatul"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -494,7 +495,7 @@ msgid "Applicants"
 msgstr "Candidati"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Nici un subiect"
@@ -525,10 +526,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Salariul dorit de candidat, plus beneficii"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Partener"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -562,6 +567,11 @@ msgstr "In desfasurare"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -573,9 +583,9 @@ msgid "Probability"
 msgstr "Probabilitate"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Aprilie"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -615,9 +625,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Gradul de recrutare"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primul interviu"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -642,9 +652,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Cautati Locuri de muncă"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -751,9 +761,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -766,25 +777,15 @@ msgid "Degree"
 msgstr "Diploma"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Iunie"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -835,12 +836,6 @@ msgstr ""
 msgid "Response"
 msgstr "Raspuns"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -856,11 +851,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Salariul propus suplimentar"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -873,10 +863,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Verificati Etapele de Recrutare"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -884,9 +873,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Cautati Locuri de muncă"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -930,18 +919,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Sursa"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -969,11 +946,6 @@ msgstr "An"
 msgid "Cancel"
 msgstr "Anulati"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1004,6 +976,11 @@ msgstr "Subiect / Candidat"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Da ordinea secventei atunci cand afisează o lista de diplome."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1029,7 +1006,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1044,9 +1021,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Cazuri dupa Etapa si Estimari"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Sursa Candidati"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Nou(a)"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1054,22 +1035,11 @@ msgstr "Sursa Candidati"
 msgid "Interview"
 msgstr "Interviu"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Verificati Etapele de Recrutare"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Nume sursa"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1081,9 +1051,9 @@ msgid "Description"
 msgstr "Descriere"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Recrutari nealocate"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1147,9 +1117,9 @@ msgid "On Average"
 msgstr "In medie"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Primul interviu"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Gradul de recrutare"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1205,9 +1175,9 @@ msgid "These people will receive email."
 msgstr "Aceste persoane vor primi e-mail."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Aprilie"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1219,15 +1189,20 @@ msgstr "Recrutare in asteptare"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monstru"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1245,26 +1220,19 @@ msgstr "Recrutare in desfasurare"
 msgid "Sequence"
 msgstr "Secventa"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Diploma de licenta"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Recrutari nealocate"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/ru.po b/addons/hr_recruitment/i18n/ru.po
index b5fb5cd2560..23a78f45e27 100644
--- a/addons/hr_recruitment/i18n/ru.po
+++ b/addons/hr_recruitment/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-29 07:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr "Предлагаемая зарплата"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,25 +351,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Описание работы"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Новый"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Август"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "Дата создания"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Телефон"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Партнер"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "В процессе"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,9 +578,9 @@ msgid "Probability"
 msgstr "Вероятность"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Апрель"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,9 +753,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Август"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -758,25 +769,15 @@ msgid "Degree"
 msgstr "Степень"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Телефон"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Июнь"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr "Ответ"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Отменить"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,9 +1010,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Новый"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr "Собеседование"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,9 +1164,9 @@ msgid "These people will receive email."
 msgstr "Эти люди получат эл. письма."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Апрель"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/sr.po b/addons/hr_recruitment/i18n/sr.po
index bb2aa9ab329..14f2df07f98 100644
--- a/addons/hr_recruitment/i18n/sr.po
+++ b/addons/hr_recruitment/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-17 23:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,8 +298,9 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: hr_recruitment
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,24 +351,25 @@ msgstr ""
 msgid "Job Description"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
 msgstr ""
 
 #. module: hr_recruitment
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr ""
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,9 +521,13 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
 msgstr ""
 
 #. module: hr_recruitment
@@ -557,6 +562,11 @@ msgstr ""
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,8 +753,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -758,8 +769,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -767,16 +778,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,8 +1010,12 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,8 +1164,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/sr@latin.po b/addons/hr_recruitment/i18n/sr@latin.po
index b87f12f0183..7f5eaffe104 100644
--- a/addons/hr_recruitment/i18n/sr@latin.po
+++ b/addons/hr_recruitment/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-10 16:55+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,8 +298,9 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: hr_recruitment
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,24 +351,25 @@ msgstr ""
 msgid "Job Description"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
 msgstr ""
 
 #. module: hr_recruitment
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr ""
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,9 +521,13 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
 msgstr ""
 
 #. module: hr_recruitment
@@ -557,6 +562,11 @@ msgstr ""
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,8 +753,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -758,8 +769,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -767,16 +778,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,8 +1010,12 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,8 +1164,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/sv.po b/addons/hr_recruitment/i18n/sv.po
index ebc482f4d16..a316dd46c63 100644
--- a/addons/hr_recruitment/i18n/sv.po
+++ b/addons/hr_recruitment/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-16 00:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -118,7 +118,7 @@ msgid "Sources of Applicants"
 msgstr "Källor för sökande"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Du måste definiera sökta jobb för denna sökande."
@@ -292,7 +292,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -303,9 +303,10 @@ msgid "Salary Proposed"
 msgstr "Föreslagen lön"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Företag"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -326,10 +327,9 @@ msgid "Proposed Salary"
 msgstr "Föreslagen lön"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "Källor för sökande"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -356,25 +356,26 @@ msgstr "Antsällda medarbetare"
 msgid "Job Description"
 msgstr "Arbetsbeskrivning"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Ny"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "Källa"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -418,6 +419,11 @@ msgstr ""
 msgid "Good"
 msgstr "Bra"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "augusti"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -431,11 +437,6 @@ msgstr "Skapad datum"
 msgid "Create Employee"
 msgstr "Lägg upp anställd"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Telefon"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -494,7 +495,7 @@ msgid "Applicants"
 msgstr "Sökande"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Inget ämne"
@@ -525,10 +526,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "Sökandens förväntad lön och extra förmåner"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Företag"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -562,6 +567,11 @@ msgstr "Pågående"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -573,9 +583,9 @@ msgid "Probability"
 msgstr "Sannolikhet"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "april"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -615,9 +625,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "Grad av rekrytering"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Första intervjuen"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -642,9 +652,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Sök arbeten"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -751,9 +761,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "augusti"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -766,25 +777,15 @@ msgid "Degree"
 msgstr "Examen"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "juni"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -835,12 +836,6 @@ msgstr ""
 msgid "Response"
 msgstr "Svar"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -856,11 +851,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "Föreslagna förmåner"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -873,10 +863,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "Granska etapperna i rektryteringsprocessen"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -884,9 +873,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Sök arbeten"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -929,18 +918,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "Källa"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -968,11 +945,6 @@ msgstr "År"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -1003,6 +975,11 @@ msgstr "Rubrik / Sökande"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "Ger sorteringsordningen när listan med examina visas."
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1028,7 +1005,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1043,9 +1020,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "Ärenden per etapp och estimat"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "Källor för sökande"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Ny"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1053,22 +1034,11 @@ msgstr "Källor för sökande"
 msgid "Interview"
 msgstr "Intervju"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "Granska etapperna i rektryteringsprocessen"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "Källnamn"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1080,9 +1050,9 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "Icke tilldelade rekryteringar"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1146,9 +1116,9 @@ msgid "On Average"
 msgstr "I medeltal"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Första intervjuen"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Grad av rekrytering"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1204,9 +1174,9 @@ msgid "These people will receive email."
 msgstr "De här personerna kommer att ta emot e-post."
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "april"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1218,15 +1188,20 @@ msgstr "Vilande rekryteringar"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1244,26 +1219,19 @@ msgstr "Pågående rekrytering"
 msgid "Sequence"
 msgstr "Sekvens"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "Kandidatexamen"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "Icke tilldelade rekryteringar"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/tr.po b/addons/hr_recruitment/i18n/tr.po
index b496d4ac5f2..b02cd541051 100644
--- a/addons/hr_recruitment/i18n/tr.po
+++ b/addons/hr_recruitment/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-25 17:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,8 +298,9 @@ msgid "Salary Proposed"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: hr_recruitment
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,24 +351,25 @@ msgstr ""
 msgid "Job Description"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
 msgstr ""
 
 #. module: hr_recruitment
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr ""
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,9 +521,13 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
 msgstr ""
 
 #. module: hr_recruitment
@@ -557,6 +562,11 @@ msgstr ""
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,8 +578,8 @@ msgid "Probability"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_recruitment
@@ -610,8 +620,8 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
 msgstr ""
 
 #. module: hr_recruitment
@@ -637,8 +647,8 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -743,8 +753,9 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
 msgstr ""
 
 #. module: hr_recruitment
@@ -758,8 +769,8 @@ msgid "Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
 msgstr ""
 
 #. module: hr_recruitment
@@ -767,16 +778,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,8 +865,8 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
 msgstr ""
 
 #. module: hr_recruitment
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,8 +1010,12 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,8 +1106,8 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1194,8 +1164,8 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/vi.po b/addons/hr_recruitment/i18n/vi.po
index f13017e5900..5f8c74e1558 100644
--- a/addons/hr_recruitment/i18n/vi.po
+++ b/addons/hr_recruitment/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-09 09:19+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr ""
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr "Mức lương Đề nghị"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Đối tác"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,9 +322,8 @@ msgid "Proposed Salary"
 msgstr "Mức lương đề nghị"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
 msgstr ""
 
 #. module: hr_recruitment
@@ -351,25 +351,26 @@ msgstr ""
 msgid "Job Description"
 msgstr "Mô tả công việc"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "Mới"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr "Tốt"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Tháng Tám"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "Ngày tạo"
 msgid "Create Employee"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "Điện thoại"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr "Các ứng viên"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "Đối tác"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "Đang tiến hành"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,9 +578,9 @@ msgid "Probability"
 msgstr "Xác suất"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Tháng Tư"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -610,9 +620,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr ""
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Phỏng vấn lần một"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -637,9 +647,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "Tìm kiếm Các công việc"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -743,9 +753,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "Tháng Tám"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -758,25 +769,15 @@ msgid "Degree"
 msgstr "Bằng Cấp"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Điện thoại"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "Tháng Sáu"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr "Hồi đáp"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr ""
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,9 +855,8 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
 msgstr ""
 
 #. module: hr_recruitment
@@ -876,9 +865,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Tìm kiếm Các công việc"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -919,18 +908,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,9 +1010,13 @@ msgid "Cases By Stage and Estimates"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr ""
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "Mới"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1043,22 +1024,11 @@ msgstr ""
 msgid "Interview"
 msgstr "Phỏng vấn"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,8 +1040,8 @@ msgid "Description"
 msgstr "Mô tả"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1136,9 +1106,9 @@ msgid "On Average"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "Phỏng vấn lần một"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1194,9 +1164,9 @@ msgid "These people will receive email."
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "Tháng Tư"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1208,14 +1178,19 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
 msgstr ""
 
 #. module: hr_recruitment
@@ -1234,26 +1209,19 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index d1bd8ebe5d5..ef0c41aaacb 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-11 15:26+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -116,7 +116,7 @@ msgid "Sources of Applicants"
 msgstr "应聘者来源"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "你必须指定应聘者应聘的岗位"
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -298,9 +298,10 @@ msgid "Salary Proposed"
 msgstr "提议薪酬"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
-msgstr ""
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -321,10 +322,9 @@ msgid "Proposed Salary"
 msgstr "提议薪酬"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
-msgstr ""
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr "应聘者来源"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -351,25 +351,26 @@ msgstr "聘用的员工"
 msgid "Job Description"
 msgstr "职位描述"
 
-#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
-msgstr "新建"
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "来源"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr "Monster"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -413,6 +414,11 @@ msgstr ""
 msgid "Good"
 msgstr "好"
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "8月"
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -426,11 +432,6 @@ msgstr "创建日期"
 msgid "Create Employee"
 msgstr "新建员工"
 
-#. module: hr_recruitment
-#: field:hr.applicant,partner_phone:0
-msgid "Phone"
-msgstr "电话"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
@@ -489,7 +490,7 @@ msgid "Applicants"
 msgstr "申请人"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "无主题"
@@ -520,10 +521,14 @@ msgid "Salary Expected by Applicant, extra advantages"
 msgstr "应聘者的期望薪酬"
 
 #. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
-msgstr "业务伙伴"
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -557,6 +562,11 @@ msgstr "进行中"
 msgid "Hire & Create Employee"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
@@ -568,9 +578,9 @@ msgid "Probability"
 msgstr "概率"
 
 #. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
-msgstr ""
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "4月"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -610,9 +620,9 @@ msgid "Answer related job question"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
-msgstr "招聘的学历"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "初次面试"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
@@ -637,9 +647,9 @@ msgid "or"
 msgstr ""
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
-msgstr "查找职位"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -743,9 +753,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
-msgstr "8月"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -758,25 +769,15 @@ msgid "Degree"
 msgstr "学历"
 
 #. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
-msgstr ""
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "电话"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid ""
-"The status is set to 'Draft', when a case is created.                      "
-"If the case is in progress the status is set to 'Open'.                      "
-"When the case is over, the status is set to 'Done'.                      If "
-"the case needs to be reviewed then the status is                       set "
-"to 'Pending'."
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
@@ -827,12 +828,6 @@ msgstr ""
 msgid "Response"
 msgstr "回复"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
@@ -848,11 +843,6 @@ msgstr ""
 msgid "Proposed Salary Extra"
 msgstr "薪酬标准"
 
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
@@ -865,10 +855,9 @@ msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
-msgstr ""
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr "查看招聘阶段"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -876,9 +865,9 @@ msgid "Contact:"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "查找职位"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -919,18 +908,6 @@ msgstr "检查以下阶段是否复核你的招聘流程。如果您每个岗位
 msgid "Configure"
 msgstr ""
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> and created as an employee."
-msgstr ""
-
-#. module: hr_recruitment
-#: view:hr.applicant:0
-#: field:hr.applicant,source_id:0
-msgid "Source"
-msgstr "来源"
-
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
@@ -958,11 +935,6 @@ msgstr "年"
 msgid "Cancel"
 msgstr "取消"
 
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
@@ -993,6 +965,11 @@ msgstr "专业"
 msgid "Gives the sequence order when displaying a list of degrees."
 msgstr "定义一个显示学历列表的序列"
 
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
@@ -1018,7 +995,7 @@ msgid "LinkedIn"
 msgstr "LinkedIn"
 
 #. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
 msgstr ""
 
@@ -1033,9 +1010,13 @@ msgid "Cases By Stage and Estimates"
 msgstr "按阶段和评估的事务"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
-msgstr "应聘者来源"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "新建"
 
 #. module: hr_recruitment
 #: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
@@ -1043,22 +1024,11 @@ msgstr "应聘者来源"
 msgid "Interview"
 msgstr "面谈"
 
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr "查看招聘阶段"
-
 #. module: hr_recruitment
 #: field:hr.recruitment.source,name:0
 msgid "Source Name"
 msgstr "源名称"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
@@ -1070,9 +1040,9 @@ msgid "Description"
 msgstr "简介"
 
 #. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
-msgstr "未指定的招聘"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1136,9 +1106,9 @@ msgid "On Average"
 msgstr "平均"
 
 #. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr "初次面试"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "招聘的学历"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -1194,9 +1164,9 @@ msgid "These people will receive email."
 msgstr "这些人将收到电子邮件。"
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
-msgstr "4月"
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1208,15 +1178,20 @@ msgstr "暂停的招聘"
 msgid "Contract"
 msgstr ""
 
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
 msgstr ""
 
 #. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
-msgstr "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1234,26 +1209,19 @@ msgstr "正在进行的招聘"
 msgid "Sequence"
 msgstr "序列"
 
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
 msgid "Bachelor Degree"
 msgstr "本科"
 
 #. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
-msgstr ""
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr "未指定的招聘"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index 914f57d00ce..b6897ade794 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:49+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "حدد مهمة الموظف كمنتج مع نوع ‘خدمة‘."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "التكلفة الكلية"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr "تعريف هيكلك التحليلي"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "تسجيل الدخول / تسجيل الخروج"
 
@@ -411,7 +413,7 @@ msgid "August"
 msgstr "أغسطس"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -604,7 +606,7 @@ msgid "Sign Out By Project"
 msgstr "سجل خروج من المشروع"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 1f100b2841a..973d7131153 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 06:15+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Вход/Изход"
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr "Август"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index 19247cf8541..3308e885a9b 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 21:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index a608460c78a..9936ede2b88 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:15+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -192,10 +192,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -290,7 +290,7 @@ msgstr ""
 "Especifica la designació de l'empleat com un producte de tipus 'servei'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -303,7 +303,7 @@ msgid "Total cost"
 msgstr "Cost total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -374,7 +374,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Registra entrada/sortida"
 
@@ -412,7 +414,7 @@ msgid "August"
 msgstr "Agost"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -606,7 +608,7 @@ msgid "Sign Out By Project"
 msgstr "Surt d'un projecte"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index b4be3e361d7..2ca23c119ae 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_timesheet
@@ -192,10 +192,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -289,7 +289,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Určuje zařazení zaměstnance jako výrobek s typem 'služba'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -302,7 +302,7 @@ msgid "Total cost"
 msgstr "Celková cena"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -373,7 +373,9 @@ msgid "Define your Analytic Structure"
 msgstr "Určit vaši analytickou strukturu"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Přihlásit / Odhlásit"
 
@@ -414,7 +416,7 @@ msgid "August"
 msgstr "Srpen"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -608,7 +610,7 @@ msgid "Sign Out By Project"
 msgstr "Odhlášení podle projektu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index 778ecf0274c..75608e57971 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index a1007ec56d2..e7a33278df9 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 01:30+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
@@ -214,10 +214,10 @@ msgid "Costs and Revenues"
 msgstr "Kosten und Erlöse"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -325,7 +325,7 @@ msgstr ""
 "für den Mitarbeiter"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -341,7 +341,7 @@ msgid "Total cost"
 msgstr "Gesamtkosten"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -415,7 +415,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definieren Sie die Struktur derKostenstellen"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Anmelden / Abmelden"
 
@@ -456,7 +458,7 @@ msgid "August"
 msgstr "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -653,7 +655,7 @@ msgid "Sign Out By Project"
 msgstr "Abmeldung von Projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index c3d691948df..ceda761b98d 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 06:50+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "Συνολικό Κόστος"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Προσέλευση / Αναχώρηση"
 
@@ -409,7 +411,7 @@ msgid "August"
 msgstr "Αύγουστος"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -599,7 +601,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index c8e0b1a1e75..a8ff05fb3f6 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 22:27+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -210,10 +210,10 @@ msgid "Costs and Revenues"
 msgstr "Costes e ingresos"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -317,7 +317,7 @@ msgstr ""
 "Especifica la designación del empleado como un producto de tipo 'servicio'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -332,7 +332,7 @@ msgid "Total cost"
 msgstr "Coste total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -406,7 +406,9 @@ msgid "Define your Analytic Structure"
 msgstr "Defina su estructura analítica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Registrar entrada/salida"
 
@@ -447,7 +449,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -643,7 +645,7 @@ msgid "Sign Out By Project"
 msgstr "Salir de un proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 8b384f8edbf..7d117432594 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-23 17:59+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Costo total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Registrar entrada/salida"
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/es_CR.po b/addons/hr_timesheet/i18n/es_CR.po
index 336d3380869..90c1dd086bc 100644
--- a/addons/hr_timesheet/i18n/es_CR.po
+++ b/addons/hr_timesheet/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-16 17:43+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -192,10 +192,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -290,7 +290,7 @@ msgstr ""
 "Especifica la designación del empleado como un producto de tipo 'servicio'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -303,7 +303,7 @@ msgid "Total cost"
 msgstr "Coste total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -374,7 +374,9 @@ msgid "Define your Analytic Structure"
 msgstr "Defina su estructura analítica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Registrar entrada/salida"
 
@@ -416,7 +418,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -610,7 +612,7 @@ msgid "Sign Out By Project"
 msgstr "Salir de un proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
index 42dcf19db40..a4c2b022a28 100644
--- a/addons/hr_timesheet/i18n/es_EC.po
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-27 14:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -192,10 +192,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -290,7 +290,7 @@ msgstr ""
 "Especifica la designación del empleado como un producto de tipo 'servicio'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -303,7 +303,7 @@ msgid "Total cost"
 msgstr "Coste total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -374,7 +374,9 @@ msgid "Define your Analytic Structure"
 msgstr "Defina su estructura analítica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Registrar entrada/salida"
 
@@ -415,7 +417,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -609,7 +611,7 @@ msgid "Sign Out By Project"
 msgstr "Salir de un proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index 36111fb32ca..9c6c214b748 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 14:24+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Kogukulu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Logi Sisse / Välja"
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 41259e693d5..8c6c2cefdd8 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Määritä tuote työntekijälle. Tuotteen tyyppi 'palvelu'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr "Lopullinen kustannus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr "Määrittele analyyttinen rakenne"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Kirjaudu sisään / Kirjaudu ulos"
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr "Elokuu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr "Kijraudu ulos projektilta"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 6c770050426..7f0a3271e04 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:43+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
@@ -194,10 +194,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -292,7 +292,7 @@ msgstr ""
 "Définit la qualification d'un employé comme un produit de type 'service'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -305,7 +305,7 @@ msgid "Total cost"
 msgstr "Coût total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -376,7 +376,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definissez votre structure analytique"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Pointer en entrée / en sortie"
 
@@ -417,7 +419,7 @@ msgid "August"
 msgstr "août"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -612,7 +614,7 @@ msgid "Sign Out By Project"
 msgstr "Sortie par projet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/gl.po b/addons/hr_timesheet/i18n/gl.po
index a3c4e4926fd..eaffbdbd5d4 100644
--- a/addons/hr_timesheet/i18n/gl.po
+++ b/addons/hr_timesheet/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -192,10 +192,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -290,7 +290,7 @@ msgstr ""
 "Especifica a designación do empregado como un produto de tipo 'servizo'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -303,7 +303,7 @@ msgid "Total cost"
 msgstr "Custo total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -374,7 +374,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Rexistrar entrada/saída"
 
@@ -412,7 +414,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -606,7 +608,7 @@ msgid "Sign Out By Project"
 msgstr "Saír dun proxecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index 1083bdc1e61..ea0122e9277 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 08:24+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: hr_timesheet
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr "Troškovi i prihodi"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr "Ukupni trošak"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Prijava / Odjava"
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr "Kolovoz"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index 4968e58cf48..3b3e35edc94 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:49+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -290,7 +290,7 @@ msgstr ""
 "ki."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -303,7 +303,7 @@ msgid "Total cost"
 msgstr "Összes költség"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -374,7 +374,9 @@ msgid "Define your Analytic Structure"
 msgstr "Gyűjtőkód szerkezet beállítása"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Bejelentkezés / Kijelentkezés"
 
@@ -412,7 +414,7 @@ msgid "August"
 msgstr "Augusztus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -606,7 +608,7 @@ msgid "Sign Out By Project"
 msgstr "Kijelentkezés a projektből"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index 6ae19ae5e74..82dbb13a7be 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Total biaya"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index eece49ad53c..4f9d8ed88e3 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 14:49+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr "Costi e ricavi"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -289,7 +289,7 @@ msgstr ""
 "Specifica la designazione dell'impiegato come un prodotto di tipo servizio."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -305,7 +305,7 @@ msgid "Total cost"
 msgstr "Costo Totale"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -379,7 +379,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definire la struttura analitica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Entrata / Uscita"
 
@@ -420,7 +422,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -616,7 +618,7 @@ msgid "Sign Out By Project"
 msgstr "Uscita per Progetto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 13e719b1124..3bfd0d6ced8 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-15 01:40+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "従業員の割当てを「サービス」という製品項目で指定する。"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "経費の合計"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr "分析方法を指定"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "サインイン / サインアウト"
 
@@ -409,7 +411,7 @@ msgid "August"
 msgstr "8月"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -601,7 +603,7 @@ msgid "Sign Out By Project"
 msgstr "プロジェクトをサインアウト"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index cfde0845ce5..5faca0ae6d9 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 14:54+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr "총 원가"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "퇴근"
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr "8월"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 39bccdab68c..f1998fcfc59 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 08:53+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\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: 2012-12-06 04:40+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Bendros sąnaudos"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index 752b459ca3f..62b3f141a4a 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -288,7 +288,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Definē sistēmā darbinieku kā produktu, kura tips ir \"serviss\"."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -301,7 +301,7 @@ msgid "Total cost"
 msgstr "Kopējās izmaksas"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -372,7 +372,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Piereģistrēties / Izrakstīties"
 
@@ -410,7 +412,7 @@ msgid "August"
 msgstr "Augusts"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -603,7 +605,7 @@ msgid "Sign Out By Project"
 msgstr "Iziet Projekta Ietvaros"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/mk.po b/addons/hr_timesheet/i18n/mk.po
index e0d99e41275..2cc27001e79 100644
--- a/addons/hr_timesheet/i18n/mk.po
+++ b/addons/hr_timesheet/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-20 13:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Најава / Одјава"
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr "Август"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index 35eb7e0b33f..cc60f04878b 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Ажилтны албан тушаалыг 'Үйлчилгээ' төрлийн бараа шиг тодорхойлно."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "Нийт өртөг"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr "Шинжилгээний Бүтэцээ Тодорхойлно уу"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Нэвтрэх / Гарах"
 
@@ -412,7 +414,7 @@ msgid "August"
 msgstr "8 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -606,7 +608,7 @@ msgid "Sign Out By Project"
 msgstr "Гарсан үйлдлийг төслөөр харах"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
index ff184cd5a9a..7b6bcf8d297 100644
--- a/addons/hr_timesheet/i18n/nb.po
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-04-07 06:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -288,7 +288,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Angir ansattes betegnelse som et produkt med type \"service\"."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -301,7 +301,7 @@ msgid "Total cost"
 msgstr "Totalkostnad"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -372,7 +372,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definer Dine Analytiske Strukturer."
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Logg inn / Logg ut"
 
@@ -413,7 +415,7 @@ msgid "August"
 msgstr "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -608,7 +610,7 @@ msgid "Sign Out By Project"
 msgstr "Logg ut av prosjekt."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index ad714530875..4e6d1e5a1f2 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-24 21:46+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 19:14+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -129,7 +129,7 @@ msgstr "Vr"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Urenstaking activiteiten"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -188,13 +188,13 @@ msgstr "Kostenplaats"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Costs and Revenues"
-msgstr ""
+msgstr "Kosten en opbrengsten"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -289,7 +289,7 @@ msgstr ""
 "Specificeert de naam van de werknemer als product van het type 'dienst'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -302,7 +302,7 @@ msgid "Total cost"
 msgstr "Totale kosten"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -373,7 +373,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definieer uw kostenplaatsstructuur"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Inschrijven/Uitschrijven"
 
@@ -414,7 +416,7 @@ msgid "August"
 msgstr "Augustus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -608,7 +610,7 @@ msgid "Sign Out By Project"
 msgstr "Uitklokken op project"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index a1ab6a4d36c..4b78a4ecb8f 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 10:01+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr "Koszty i przychody"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Określa powiązanie pracownika z produktem typu 'usługa'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "Suma kasztów"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr "Zdefiniuj swoją strukturę analityczną"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Wejście / Wyjście"
 
@@ -411,7 +413,7 @@ msgid "August"
 msgstr "Sierpień"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -604,7 +606,7 @@ msgid "Sign Out By Project"
 msgstr "Wyjście wg projektu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index c72773802bc..d73e9d01089 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 17:29+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -289,7 +289,7 @@ msgstr ""
 "Especifica a designação do Funcionário como um artigo com 'serviço' tipo."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -302,7 +302,7 @@ msgid "Total cost"
 msgstr "Custo total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -373,7 +373,9 @@ msgid "Define your Analytic Structure"
 msgstr "Defina a sua estrutura analítica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Sign in / Sign out"
 
@@ -414,7 +416,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -609,7 +611,7 @@ msgid "Sign Out By Project"
 msgstr "Sign Out por Projeto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 5d92fcc5208..d31079284ed 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 17:44+0000\n"
 "Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -192,10 +192,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -290,7 +290,7 @@ msgstr ""
 "Especifica a designação do funcionário como um produto do tipo \"serviço\"."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -303,7 +303,7 @@ msgid "Total cost"
 msgstr "Custo total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -374,7 +374,9 @@ msgid "Define your Analytic Structure"
 msgstr "Defina sua Estrutura Analítica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Entrada / Saída"
 
@@ -415,7 +417,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -609,7 +611,7 @@ msgid "Sign Out By Project"
 msgstr "Saídas por Projeto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index 62a1238718f..cd0c16f0ffe 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:50+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -288,7 +288,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Specifica numirea angajatului drept un produs de tipul 'servici'."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -301,7 +301,7 @@ msgid "Total cost"
 msgstr "Cost total"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -372,7 +372,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definiti-va Structura Analitica"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Pontaj Intrare / Iesire"
 
@@ -414,7 +416,7 @@ msgid "August"
 msgstr "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -608,7 +610,7 @@ msgid "Sign Out By Project"
 msgstr "Pontaj la iesire dupa Proiect"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index b095a5a768d..cde825461de 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:06+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -191,10 +191,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -288,7 +288,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -301,7 +301,7 @@ msgid "Total cost"
 msgstr "Общая стоимость"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -372,7 +372,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Регистрация / выход"
 
@@ -410,7 +412,7 @@ msgid "August"
 msgstr "Август"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -604,7 +606,7 @@ msgid "Sign Out By Project"
 msgstr "Выход от проекта"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index f5469d2f1d8..a9496358cd3 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 09:11+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Skupni strošek"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Prijava/Odjava"
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr "avgust"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index 265b9ccf7ef..cbea7630a38 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 15:16+0000\n"
 "Last-Translator: heroid <heroid@ayih.org>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Kyqu / Qkyqu"
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/sr@latin.po b/addons/hr_timesheet/i18n/sr@latin.po
index ce7614acc6d..bcb9022bfe1 100644
--- a/addons/hr_timesheet/i18n/sr@latin.po
+++ b/addons/hr_timesheet/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-10 17:01+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index 72566945c66..3e20243c455 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:01+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "Anger den anställda som en produkt av typen 'tjänst'"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "Total kostnad"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr "Definiera din objektkontostruktur"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Logga in / Logga ut"
 
@@ -412,7 +414,7 @@ msgid "August"
 msgstr "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -605,7 +607,7 @@ msgid "Sign Out By Project"
 msgstr "Logga utper projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index 2f4413464d4..617c81de5a8 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 04a6cf77d1f..ae44ecea532 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-25 17:24+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Toplam maliyet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index 2295f189752..255c93d1b2a 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 20:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr "Загальна вартість"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "Відмітки входу/виходу"
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index 60c2b0a3759..4c7066c3d0d 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-21 14:05+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -188,10 +188,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -285,7 +285,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -298,7 +298,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -369,7 +369,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -407,7 +409,7 @@ msgid "August"
 msgstr "Tháng Tám"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -597,7 +599,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index fedf5a12703..941dcab2033 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 07:13+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
@@ -190,10 +190,10 @@ msgid "Costs and Revenues"
 msgstr "收支情况"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -287,7 +287,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr "为员工指定的产品其类型必须是“服务”。"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -300,7 +300,7 @@ msgid "Total cost"
 msgstr "总成本"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -371,7 +371,9 @@ msgid "Define your Analytic Structure"
 msgstr "设置分析结构"
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr "签入/ 签出"
 
@@ -409,7 +411,7 @@ msgid "August"
 msgstr "8月"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -602,7 +604,7 @@ msgid "Sign Out By Project"
 msgstr "项目签出"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index b1c0b24cdfb..2f123c0155f 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-01-30 13:18+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -187,10 +187,10 @@ msgid "Costs and Revenues"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
@@ -284,7 +284,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
 #, python-format
 msgid ""
 "No analytic account is defined on the project.\n"
@@ -297,7 +297,7 @@ msgid "Total cost"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
 #, python-format
 msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
@@ -368,7 +368,9 @@ msgid "Define your Analytic Structure"
 msgstr ""
 
 #. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
 #: view:hr.sign.in.project:0
+#, python-format
 msgid "Sign in / Sign out"
 msgstr ""
 
@@ -406,7 +408,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
 #, python-format
 msgid ""
 "No analytic journal defined for '%s'.\n"
@@ -596,7 +598,7 @@ msgid "Sign Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
 #, python-format
 msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 914c453231d..143f76602bb 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "سجل الدوام عن كل يوم"
 msgid "March"
 msgstr "مارس"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "الربح"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "لا يمكن التعديل في خط الفاتورة التحليلي!"
@@ -125,11 +116,6 @@ msgstr "معدل الفاتورة"
 msgid "Display time in the history of works"
 msgstr "اعرض الوقت في تاريخ الاعمال"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "اليوميات"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "كمية الفاتورة"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "مشروع"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "المقدار"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "سيتم عرض تفاصيل كل عمل مكتمل على الفاتورة"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "تاريخ انتهاء الفاتورة"
 msgid "Analytic account to close"
 msgstr "غلق الحساب التحليلي"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "الموعد النهائي"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "القيم الى الفاتورة"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr "سجل الدوام للمستخدم"
 msgid "To Invoice"
 msgstr "في انتظار الفوترة"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr "شهر"
 msgid "Currency"
 msgstr "العملة"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "مستخدمين"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr "يناير"
 msgid "Date"
 msgstr "تاريخ"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,9 +628,9 @@ msgid "General Account"
 msgstr "الحساب العام"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "اطبع فائدة سجل الدوام"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -667,9 +638,10 @@ msgid "Totals:"
 msgstr "المجاميع الكلية:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "الخطوط التحليلية للفاتورة"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr "سجلات الدوام للفاتورة"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr "يومية"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "المنتج الذي سيتم استخدامه لفاتورة المبلغ المتبقي"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr "سجل الدوام اليومي لكل حاسب"
 msgid "Sale price"
 msgstr "سعر مخفض"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "اطبع فائدة سجل الدوام"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr "إبريل"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,10 +887,11 @@ msgid "Units"
 msgstr "الوحدات"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "الخطوط التحليلية للفاتورة"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -982,6 +938,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "هذا العام"
 
+#~ msgid "Journals"
+#~ msgstr "اليوميات"
+
 #~ msgid "UoM"
 #~ msgstr "وحدة القياس"
 
@@ -1010,6 +969,9 @@ msgstr ""
 #~ msgid "Printing date"
 #~ msgstr "تاريخ الطباعة"
 
+#~ msgid "Users"
+#~ msgstr "مستخدمين"
+
 #~ msgid "Period to"
 #~ msgstr "الفترة إلي"
 
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 1e9c5783feb..9eed5c40a1f 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "График по ден"
 msgid "March"
 msgstr "Март"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Журнали"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Сума по фактура"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Проект"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Количество"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Краен срок"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Превърни \"разходи\" на фактура"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr "График според потребител"
 msgid "To Invoice"
 msgstr "За фактуриране"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "Месец"
 msgid "Currency"
 msgstr "Валута"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr "Януари"
 msgid "Date"
 msgstr "Дата"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr "Основна сметка"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr "Превърни графици във фактура"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Журнал"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr "Дневен график според сметка"
 msgid "Sale price"
 msgstr "Продажна цена"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr "Април"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr "Единици"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -1014,6 +970,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Тази година"
 
+#~ msgid "Journals"
+#~ msgstr "Журнали"
+
 #~ msgid "Sale Pricelist"
 #~ msgstr "Продажна цена"
 
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index d0078353851..2416f680587 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 17:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index dce5bbf71c0..d32b13ff223 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:44+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Full de serveis per dia"
 msgid "March"
 msgstr "Març"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Benefici"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr "Impost de facturació"
 msgid "Display time in the history of works"
 msgstr "Mostra temps en l'historial de treballs"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Diaris"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Import facturat"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Projecte"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Import"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "El detall de cada treball realitzat es mostrarà en la factura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Període fins data final"
 msgid "Analytic account to close"
 msgstr "Compte analític a tancar"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Data límit"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Costos a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -338,12 +325,6 @@ msgstr "Full de serveis per usuari"
 msgid "To Invoice"
 msgstr "A facturar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -465,11 +446,6 @@ msgstr "Mes"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Usuaris"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -622,11 +598,6 @@ msgstr "Gener"
 msgid "Date"
 msgstr "Data"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -658,9 +629,9 @@ msgid "General Account"
 msgstr "Compte general"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimeix benefici del full de serveis"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -668,9 +639,10 @@ msgid "Totals:"
 msgstr "Totals:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Línies analítiques a facturar"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -769,13 +741,7 @@ msgid "Timesheets to invoice"
 msgstr "Fulls de serveis a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -823,12 +789,6 @@ msgstr "Diari"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "El producte que s'utilitzarà per facturar l'import restant."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -883,11 +843,6 @@ msgstr "Full de serveis diària per compte"
 msgid "Sale price"
 msgstr "Preu venda"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimeix benefici del full de serveis"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -903,7 +858,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -933,10 +888,11 @@ msgid "Units"
 msgstr "Unitats"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Línies analítiques a facturar"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1220,6 +1176,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Aquest any"
 
+#~ msgid "Journals"
+#~ msgstr "Diaris"
+
 #~ msgid ""
 #~ "The product to invoice is defined on the employee form, the price will be "
 #~ "deduced by this pricelist on the product."
@@ -1343,3 +1302,6 @@ msgstr ""
 
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Error! No podeu crear comptes analítics recursius."
+
+#~ msgid "Users"
+#~ msgstr "Usuaris"
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 8af498a6a66..3f3cd9e130a 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 15:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/da.po b/addons/hr_timesheet_invoice/i18n/da.po
index 5578854021e..215b84f0b24 100644
--- a/addons/hr_timesheet_invoice/i18n/da.po
+++ b/addons/hr_timesheet_invoice/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 08:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,8 +628,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -667,8 +638,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,9 +887,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 9e6a35196a9..18527f106c7 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-21 01:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
@@ -99,27 +99,13 @@ msgstr "Tägliche Zeiterfassung"
 msgid "March"
 msgstr "März"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-"Normalerweise werden 100% der aufgewendeten Zeiten in Rechnung gestellt. "
-"Wenn Sie jedoch Pauschalangebote und projektzeiten-basierte Abrechnungen "
-"mischen, benötigen Sie ein anderes Abrechnungsverhältnis. Wenn Sie z.B. 20% "
-"vorab abrechnen (fixer Betrag, basierend auf einem Angebot) können Sie den "
-"Restbetrag mit einem 80% Verhältnis abrechnen."
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Gewinn"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Sie können keine abgerechnete Kostenstellenbuchung ändern"
@@ -134,11 +120,6 @@ msgstr "Quote Abrechnung"
 msgid "Display time in the history of works"
 msgstr "Anzeige der Zeit in der Liste erledigter Aufgaben"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Journale"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -202,7 +183,7 @@ msgid "Invoiced Amount"
 msgstr "Abgerechneter Betrag"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr "Die Kostenstelle ist unvollständig!"
@@ -213,11 +194,9 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
+msgstr "Rechnung auf Basis von Zeiterfassungsoptionen"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -229,12 +208,6 @@ msgstr "Betrag"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Details der erledigten Aufgaben werden auf der Rechnung ausgegeben."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr "Der Vertrag wurde auf <b>schwebend</b> gesetzt"
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -255,6 +228,15 @@ msgstr "bis Periode"
 msgid "Analytic account to close"
 msgstr "Abzuschliessende Kostenstellen"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -280,7 +262,7 @@ msgid "Deadline"
 msgstr "Frist"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfehler!"
@@ -317,7 +299,7 @@ msgid "Costs to invoice"
 msgstr "Abzurechnende Kosten"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr "Bitte legen Sie ein Ertragskonto für das Produkt '%s' fest."
@@ -364,12 +346,6 @@ msgstr "Zeiterfassung nach Benutzer"
 msgid "To Invoice"
 msgstr "Abrechenbar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr "Der Vertrag wurde <b>beendet</b>"
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -491,11 +467,6 @@ msgstr "Monat"
 msgid "Currency"
 msgstr "Währung"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Benutzer"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -648,11 +619,6 @@ msgstr "Januar"
 msgid "Date"
 msgstr "Datum"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr "Abgeschlossen"
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -684,9 +650,9 @@ msgid "General Account"
 msgstr "Sachkonto"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr "Rechnung auf Basis von Zeiterfassungsoptionen"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Drucke meine Arbeitszeitaufzeichnung"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -694,9 +660,10 @@ msgid "Totals:"
 msgstr "Summen:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr "Abgebrochen"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Kostenstellen Buchungen zur Abrechnung"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -797,13 +764,7 @@ msgid "Timesheets to invoice"
 msgstr "Abrechenbare Zeiterfassungen"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr "Vertrag wurde <b>abgebrochen</b>"
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -855,12 +816,6 @@ msgstr ""
 "Dieses Produkt wird für die Berechnung des noch offenen Rechnungsbetrags "
 "verwendet"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr "Vertrag wurde <b>geöffnet</b>."
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -916,11 +871,6 @@ msgstr "Tägliche Zeiterfassung nach Konto"
 msgid "Sale price"
 msgstr "Verkaufspreis"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Drucke meine Arbeitszeitaufzeichnung"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -936,7 +886,7 @@ msgid "April"
 msgstr "April"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -968,10 +918,11 @@ msgid "Units"
 msgstr "Einheiten"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Kostenstellen Buchungen zur Abrechnung"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr "Fehler!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1223,6 +1174,9 @@ msgstr "Dauer"
 #~ msgid "This Year"
 #~ msgstr "Aktuelles Jahr"
 
+#~ msgid "Journals"
+#~ msgstr "Journale"
+
 #~ msgid "UoM"
 #~ msgstr "ME"
 
@@ -1379,6 +1333,9 @@ msgstr "Dauer"
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "Rechnungen aufgrund von Analyse Buchungen"
 
+#~ msgid "Users"
+#~ msgstr "Benutzer"
+
 #~ msgid "Wrong credit or debit value in accounting entry !"
 #~ msgstr "Falscher Debit oder Kreditwert im Buchungseintrag!"
 
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index 8e0e9aadd98..a93a5e970da 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:18+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -98,22 +98,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Κέρδος"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -128,11 +119,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr "Ένδειξη χρόνου στο ιστορικό δεδουλευμένων"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -179,7 +165,7 @@ msgid "Invoiced Amount"
 msgstr "Αξία Τιμολογίου"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -190,10 +176,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -207,12 +191,6 @@ msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 "Οι λεπτομέρειες κάθε ολοκληρωμένης εργασίας θα αναγράφονται στο τιμολόγιο"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -233,6 +211,15 @@ msgstr "Ως τη λήξη περιόδου"
 msgid "Analytic account to close"
 msgstr "Αναλυτικός λογαριασμός προς κλείσιμο"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -258,7 +245,7 @@ msgid "Deadline"
 msgstr "Χρονικό Όριο"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -295,7 +282,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -340,12 +327,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -467,11 +448,6 @@ msgstr "Μήνας"
 msgid "Currency"
 msgstr "Νόμισμα"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -624,11 +600,6 @@ msgstr ""
 msgid "Date"
 msgstr "Ημερ/νία"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -660,8 +631,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -670,9 +641,10 @@ msgid "Totals:"
 msgstr "Σύνολα:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Γραμμές Αναλυτικές προς Τιμολόγηση"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -771,13 +743,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -825,12 +791,6 @@ msgstr "Ημερολόγιο"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -885,11 +845,6 @@ msgstr ""
 msgid "Sale price"
 msgstr "Τιμή Πώλησης"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -905,7 +860,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -935,10 +890,11 @@ msgid "Units"
 msgstr "Μονάδες"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Γραμμές Αναλυτικές προς Τιμολόγηση"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index f80e63e3ba7..85448846f58 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-11 15:28+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 23:50+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -97,26 +97,13 @@ msgstr "Hoja de servicios por día"
 msgid "March"
 msgstr "Marzo"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-"Normalmente se factura el 100% de los partes de horas. Pero si mezcla precio "
-"fijo y facturación por tiempos, podría utilizar otro ratio. Por ejemplo, si "
-"realizar un 20% de avance de factura (precio fijo, basado en el pedido de "
-"venta), debería facturar el resto basado en tiempos con un 80% de ratio."
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Beneficio"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "¡No puede modificar una línea analítica facturada!"
@@ -131,11 +118,6 @@ msgstr "Tasa de facturación"
 msgid "Display time in the history of works"
 msgstr "Mostrar tiempo en el historial de trabajos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Diarios"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -193,7 +175,7 @@ msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr "¡Cuenta analítica incompleta!"
@@ -204,11 +186,9 @@ msgid "Project"
 msgstr "Proyecto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
+msgstr "Opciones de factura sobre tiempos"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -220,12 +200,6 @@ msgstr "Importe"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "El detalle de cada trabajo realizado se mostrará en la factura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr "Los contratos se han establecido como <b>pendientes</b>."
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -246,6 +220,20 @@ msgstr "Periodo hasta fecha final"
 msgid "Analytic account to close"
 msgstr "Cuenta analítica a cerrar"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+"Normalmente se factura el 100% de los partes de horas. Pero si se combina un "
+"precio fijo y facturación por partes de horas, puede ser necesario usar otra "
+"proporción. Por ejemplo, si se hace un factura avanzada de un 20% (precio "
+"fijo, basado en un pedido de venta), se debería facturar el resto del parte "
+"de horas con una proporción de un 80%."
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -271,7 +259,7 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -308,7 +296,7 @@ msgid "Costs to invoice"
 msgstr "Costos a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr "Por favor defina una cuenta de ingresos para el producto '%s'."
@@ -355,12 +343,6 @@ msgstr "Hoja de servicios por usuario"
 msgid "To Invoice"
 msgstr "A facturar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr "El contrato ha sido <b>cerrado</b>."
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -482,11 +464,6 @@ msgstr "Mes"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Usuarios"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -639,11 +616,6 @@ msgstr "Enero"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr "finalizado"
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -675,9 +647,9 @@ msgid "General Account"
 msgstr "Cuenta general"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr "Opciones de factura sobre tiempos"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir beneficio de la hoja de servicios"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -685,9 +657,10 @@ msgid "Totals:"
 msgstr "Totales:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr "cancelado"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -788,13 +761,7 @@ msgid "Timesheets to invoice"
 msgstr "Hojas de servicios a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr "El contrato ha sido <b>cancelado</b>"
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -843,12 +810,6 @@ msgstr "Diario"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "El producto que se utilizará para facturar el importe restante."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr "El contrato ha sido <b>abierto</b>"
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -904,11 +865,6 @@ msgstr "Hoja de servicios diaria por cuenta"
 msgid "Sale price"
 msgstr "Precio venta"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimir beneficio de la hoja de servicios"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -924,7 +880,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -956,10 +912,11 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Líneas analíticas para facturar"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1243,6 +1200,9 @@ msgstr "Duración"
 #~ msgid "This Year"
 #~ msgstr "Este año"
 
+#~ msgid "Journals"
+#~ msgstr "Diarios"
+
 #~ msgid "Accounts to invoice"
 #~ msgstr "Cuentas a facturar"
 
@@ -1366,6 +1326,9 @@ msgstr "Duración"
 #~ msgid "hr.timesheet.analytic.cost.ledger"
 #~ msgstr "rrhh.partehoras.analitica.coste.libro"
 
+#~ msgid "Users"
+#~ msgstr "Usuarios"
+
 #~ msgid "Wrong credit or debit value in accounting entry !"
 #~ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index eb2a8966f2c..ce6e1b88aca 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-23 18:37+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Beneficio"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr "Mostrar tiempo en el historial de trabajos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "El detalle de cada trabajo realizado se mostrará en la factura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Periodo hasta fecha final"
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr "Fecha"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr "Totales:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Libro diario"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/es_CR.po b/addons/hr_timesheet_invoice/i18n/es_CR.po
index 1389577d879..fe1976121ff 100644
--- a/addons/hr_timesheet_invoice/i18n/es_CR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 14:57+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: hr_timesheet_invoice
@@ -96,22 +96,13 @@ msgstr "Hoja de servicios por día"
 msgid "March"
 msgstr "Marzo"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Beneficio"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "¡No se puede modificar una línea de factura analítica!"
@@ -126,11 +117,6 @@ msgstr "Tasa de facturación"
 msgid "Display time in the history of works"
 msgstr "Mostrar tiempo en el historial de trabajos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Diarios"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr "Proyecto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr "Importe"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "El detalle de cada trabajo realizado se mostrará en la factura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "Periodo hasta fecha final"
 msgid "Analytic account to close"
 msgstr "Cuenta analítica a cerrar"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr "Costos a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -339,12 +326,6 @@ msgstr "Hoja de servicios por usuario"
 msgid "To Invoice"
 msgstr "A facturar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -466,11 +447,6 @@ msgstr "Mes"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Usuarios"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -623,11 +599,6 @@ msgstr "Enero"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -659,9 +630,9 @@ msgid "General Account"
 msgstr "Cuenta general"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir beneficio de la hoja de servicios"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -669,9 +640,10 @@ msgid "Totals:"
 msgstr "Totales:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -770,13 +742,7 @@ msgid "Timesheets to invoice"
 msgstr "Hojas de servicios a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -824,12 +790,6 @@ msgstr "Diario"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "El producto que se utilizará para facturar el importe restante."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -884,11 +844,6 @@ msgstr "Hoja de servicios diaria por cuenta"
 msgid "Sale price"
 msgstr "Precio venta"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimir beneficio de la hoja de servicios"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -904,7 +859,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -934,10 +889,11 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Líneas analíticas para facturar"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -997,6 +953,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Este año"
 
+#~ msgid "Journals"
+#~ msgstr "Diarios"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -1072,6 +1031,9 @@ msgstr ""
 #~ "Complete este campo sólo si quiere obligar a utilizar un producto "
 #~ "específico. Déjelo vacío para utilizar el producto real que viene del coste."
 
+#~ msgid "Users"
+#~ msgstr "Usuarios"
+
 #~ msgid "Period to"
 #~ msgstr "Periodo hasta"
 
diff --git a/addons/hr_timesheet_invoice/i18n/es_EC.po b/addons/hr_timesheet_invoice/i18n/es_EC.po
index c77ed99e5df..0ac7710ff54 100644
--- a/addons/hr_timesheet_invoice/i18n/es_EC.po
+++ b/addons/hr_timesheet_invoice/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-08 22:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr "Hoja de servicios por día"
 msgid "March"
 msgstr "Marzo"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Beneficio"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "No se puede modificar una línea de factura analítica"
@@ -126,11 +117,6 @@ msgstr "Tasa de facturación"
 msgid "Display time in the history of works"
 msgstr "Mostrar tiempo en el historial de trabajos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Diarios"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr "Proyecto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr "Monto"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "El detalle de cada trabajo realizado se mostrará en la factura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "Periodo hasta fecha final"
 msgid "Analytic account to close"
 msgstr "Cuenta analítica a cerrar"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr "Costos a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -339,12 +326,6 @@ msgstr "Hoja de servicios por usuario"
 msgid "To Invoice"
 msgstr "A facturar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -466,11 +447,6 @@ msgstr "Month"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Usuarios"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -623,11 +599,6 @@ msgstr "Enero"
 msgid "Date"
 msgstr "Fecha"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -659,9 +630,9 @@ msgid "General Account"
 msgstr "Cuenta general"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir beneficio de la hoja de servicios"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -669,9 +640,10 @@ msgid "Totals:"
 msgstr "Totales:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -770,13 +742,7 @@ msgid "Timesheets to invoice"
 msgstr "Hojas de servicios a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -824,12 +790,6 @@ msgstr "Diario"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "El producto que se utilizará para facturar el importe restante."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -884,11 +844,6 @@ msgstr "Hoja de servicios diaria por cuenta"
 msgid "Sale price"
 msgstr "Precio venta"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimir beneficio de la hoja de servicios"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -904,7 +859,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -934,10 +889,11 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Líneas analíticas para facturar"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -994,6 +950,9 @@ msgstr ""
 #~ "El producto a facturar se define en el formulario de empleado, el precio se "
 #~ "deducirá del producto mediante esta lista de precios."
 
+#~ msgid "Journals"
+#~ msgstr "Diarios"
+
 #~ msgid "Name of entry"
 #~ msgstr "Nombre de la entrada"
 
@@ -1084,6 +1043,9 @@ msgstr ""
 #~ "Usted debería eliminar la moneda secundaria de la cuenta o asignar una vista "
 #~ "de multi-moneda al diario."
 
+#~ msgid "Users"
+#~ msgstr "Usuarios"
+
 #~ msgid "Daily Timesheets for this year"
 #~ msgstr "Horario diario para este año"
 
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index 96cc7870cb3..cabf84e0e2d 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Tööajakaart päeva kohta"
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Kasum"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr "Kuva aeg tööde ajaloos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Arveldatud kogus"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Kogus"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Iga tehtud töö detailid kuvatakse arvel."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Periood lõppkuupäevani"
 msgid "Analytic account to close"
 msgstr "Analüütiline konto sulgeda"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Tähtaeg"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Kulud arveldamiseks"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr "Tööajakaart kasutaja järgi"
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "Kuu"
 msgid "Currency"
 msgstr "Valuuta"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr "Kuupäev"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr "Üldine konto"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,9 +637,10 @@ msgid "Totals:"
 msgstr "Kogusummad:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Analüütilised read arveldada"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr "Tääajakaardid arveldamiseks"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Päevik"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr "Igapäevane tööajakaart konto järgi"
 msgid "Sale price"
 msgstr "Müügihind"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,10 +886,11 @@ msgid "Units"
 msgstr "Ühikud"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Analüütilised read arveldada"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 183d56368b5..0c04a82a169 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:19+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr "Tuntilistat päivien mukaan"
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Tuotto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr "Näytä aika töiden historiassa"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Jokaisen tehdyn työn yksityiskohdat näytetään laskussa"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "Loppupäivämäärän aikajakso"
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr "Tuntilistat käyttäjän mukaan"
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr "Tammikuu"
 msgid "Date"
 msgstr "Päivämäärä"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,9 +628,9 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Tulosta tuntilistan tuotto"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -667,8 +638,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Tulosta tuntilistan tuotto"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,9 +887,10 @@ msgid "Units"
 msgstr "Yksikköä"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 867e93772a0..3de04138a1c 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 16:04+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
@@ -97,22 +97,13 @@ msgstr "Feuille de présence par jour"
 msgid "March"
 msgstr "Mars"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Profit"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Vous ne pouvez pas modifier une ligne analytique facturée !"
@@ -127,11 +118,6 @@ msgstr "Taux de facturation"
 msgid "Display time in the history of works"
 msgstr "Afficher le temps dans l'historique des travaux"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Journaux"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -181,7 +167,7 @@ msgid "Invoiced Amount"
 msgstr "Montant facturé"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -192,10 +178,8 @@ msgid "Project"
 msgstr "Projet"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -208,12 +192,6 @@ msgstr "Montant"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Chaque travail terminé sera détaillé sur la facture"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -234,6 +212,15 @@ msgstr "Période à la date de fin"
 msgid "Analytic account to close"
 msgstr "Comptes analytiques à clôturer"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -259,7 +246,7 @@ msgid "Deadline"
 msgstr "Echéance"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -296,7 +283,7 @@ msgid "Costs to invoice"
 msgstr "Coûts à facturer"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr "Veuillez définir le compte de revenus de l'article \"%s\"."
@@ -343,12 +330,6 @@ msgstr "Feuilles de présences par Utilisateur"
 msgid "To Invoice"
 msgstr "À facturer"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -470,11 +451,6 @@ msgstr "Mois"
 msgid "Currency"
 msgstr "Devise"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Utilisateurs"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -627,11 +603,6 @@ msgstr "Janvier"
 msgid "Date"
 msgstr "Date"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -663,9 +634,9 @@ msgid "General Account"
 msgstr "Compte général"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimer le profit des feuilles de temps"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -673,9 +644,10 @@ msgid "Totals:"
 msgstr "Totals :"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Lignes analytique à facturer"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -774,13 +746,7 @@ msgid "Timesheets to invoice"
 msgstr "Timesheet à facturer"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -828,12 +794,6 @@ msgstr "Journal"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "L'article qui sera utilisé pour facturer le montant restant"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -888,11 +848,6 @@ msgstr "Timesheet journalière par compte"
 msgid "Sale price"
 msgstr "Prix de vente"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimer le profit des feuilles de temps"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -908,7 +863,7 @@ msgid "April"
 msgstr "Avril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -938,10 +893,11 @@ msgid "Units"
 msgstr "Unités"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Lignes analytique à facturer"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1205,6 +1161,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Cette année"
 
+#~ msgid "Journals"
+#~ msgstr "Journaux"
+
 #~ msgid "Reactivate Account"
 #~ msgstr "Réactiver le compte"
 
@@ -1327,6 +1286,9 @@ msgstr ""
 #~ msgid "Type of Invoicing"
 #~ msgstr "Type de facturation"
 
+#~ msgid "Users"
+#~ msgstr "Utilisateurs"
+
 #~ msgid "Timesheet lines in this year"
 #~ msgstr "Lignes de feuilles de temps de cette année"
 
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index c621f334a03..0e34d178e1b 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 22:11+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -97,27 +97,13 @@ msgstr "Raspored po danu"
 msgid "March"
 msgstr "Ožujak"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-"Obično se fakturira 100% iznosa kontrolne kartice, ali ako se pomiješa "
-"fiksna cijena i faktiruranje kontrolne kartice, može se koristiti i "
-"drugačiji omjer. Na primjer, ako napravite račun sa 20% avansa (fiksna "
-"cijena, bazirana na ponudi), ostatak ćete fakturirati na liniji kontrolne "
-"kartice sa 80% iznosa."
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Dobit"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Ne možete mijenjati fakturiranu analitičku liniju!"
@@ -132,11 +118,6 @@ msgstr "Stopa računa"
 msgid "Display time in the history of works"
 msgstr "Prikaz vremena u povijesti djela"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Dnevnici"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -186,7 +167,7 @@ msgid "Invoiced Amount"
 msgstr "Fakturirani iznos"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr "Analitički račun nepotpun!"
@@ -197,11 +178,9 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
-msgstr "Greška!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -213,12 +192,6 @@ msgstr "Iznos"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Detalj svakog obavljenog posla bit će prikazan na računu"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr "Ugovor je postavljen kao <b> na čekanju </ b>."
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -239,6 +212,15 @@ msgstr "Razdoblje do kraja datuma"
 msgid "Analytic account to close"
 msgstr "Analitički konto koji treba zatvoriti"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -264,7 +246,7 @@ msgid "Deadline"
 msgstr "Krajnji rok"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr "Greška u konfiguraciji!"
@@ -301,7 +283,7 @@ msgid "Costs to invoice"
 msgstr "Troškovi za fakturiranje"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr "Definirajte račun dohotka za proizvod '%s'."
@@ -348,12 +330,6 @@ msgstr "Kontrolna kartica po korisniku"
 msgid "To Invoice"
 msgstr "Za fakturiranje"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr "Ugovor je <b>zatvoren</b>."
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -475,11 +451,6 @@ msgstr "Mjesec"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Korisnici"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -632,11 +603,6 @@ msgstr "Siječanj"
 msgid "Date"
 msgstr "Datum"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr "završeno"
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -668,9 +634,9 @@ msgid "General Account"
 msgstr "Konto glavne knjige"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Ispiši dobit po kontrolnim karticama"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -678,9 +644,10 @@ msgid "Totals:"
 msgstr "Ukupno:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr "Poništeno"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Analitičke stavke za fakturiranje"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -781,13 +748,7 @@ msgid "Timesheets to invoice"
 msgstr "Kontrolne kartice za fakturiranje"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr "Ugovor je <b>otkazan</b>."
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -835,12 +796,6 @@ msgstr "Dnevnik"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "Proizvod koji će se koristiti za fakturiranje preostalog iznosa"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr "Ugovor je <b>otvoren</b>."
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -896,11 +851,6 @@ msgstr "Dnevni Raspored po Kupcu"
 msgid "Sale price"
 msgstr "Prodajna cijena"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Ispiši dobit po kontrolnim karticama"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -916,7 +866,7 @@ msgid "April"
 msgstr "Travanj"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -948,10 +898,11 @@ msgid "Units"
 msgstr "Mjerne jedinice"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Analitičke stavke za fakturiranje"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1020,3 +971,9 @@ msgstr "Trajanje"
 
 #~ msgid "This Month"
 #~ msgstr "Ovaj Mjesec"
+
+#~ msgid "Journals"
+#~ msgstr "Dnevnici"
+
+#~ msgid "Users"
+#~ msgstr "Korisnici"
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 93f96d70251..b75c13c3b76 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-03 15:08+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Naponkénti munkaidő-kimutatás"
 msgid "March"
 msgstr "Március"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Nyereség"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr "Számlázási ráta"
 msgid "Display time in the history of works"
 msgstr "Az elvégzett munkára fordított időtartam megjelenítése"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Naplók"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Kiszámlázott összeg"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Összeg"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Minden elvégzett munka részletezése megjelenik a számlában"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Időszak a záró dátumig"
 msgid "Analytic account to close"
 msgstr "Lezárandó gyűjtőkód"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Határidő"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Kiszámlázandó költségek"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -338,12 +325,6 @@ msgstr "Felhasználó szerinti munkaidő-kimutatás"
 msgid "To Invoice"
 msgstr "Számlázandó"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -465,11 +446,6 @@ msgstr "Hónap"
 msgid "Currency"
 msgstr "Pénznem"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -622,11 +598,6 @@ msgstr "Január"
 msgid "Date"
 msgstr "Dátum"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -658,9 +629,9 @@ msgid "General Account"
 msgstr "Főkönyvi számla"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Munkaidő-kimutatás eredménylevezetésének nyomtatása"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -668,9 +639,10 @@ msgid "Totals:"
 msgstr "Összesen:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Kiszámlázandó gyűjtőkód tételek"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -769,13 +741,7 @@ msgid "Timesheets to invoice"
 msgstr "Kiszámlázandó munkaidő-kimutatások"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -823,12 +789,6 @@ msgstr "Napló"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "Termék, amelynek a jogcímén a maradványösszeg kiszámlázásra kerül"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -883,11 +843,6 @@ msgstr "Gyűjtőkód szerinti napi munkaidő-kimutatás"
 msgid "Sale price"
 msgstr "Eladási ár"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Munkaidő-kimutatás eredménylevezetésének nyomtatása"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -903,7 +858,7 @@ msgid "April"
 msgstr "Április"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -933,10 +888,11 @@ msgid "Units"
 msgstr "Egységek"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Kiszámlázandó gyűjtőkód tételek"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -989,6 +945,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Tárgyév"
 
+#~ msgid "Journals"
+#~ msgstr "Naplók"
+
 #~ msgid "UoM"
 #~ msgstr "ME"
 
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index c85f7f27297..c53bc57f4e3 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:19+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 59267aa8e64..669bf464e69 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-13 12:32+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 14:00+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -25,7 +25,7 @@ msgstr "Orari di Lavoro da Utente"
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
 msgid "Internal Name"
-msgstr ""
+msgstr "Nome Interno"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -38,18 +38,20 @@ msgid ""
 "The product to invoice is defined on the employee form, the price will be "
 "deducted by this pricelist on the product."
 msgstr ""
+"Il prodotto da fatturare è definito nella scheda dipendente, il prezzo sarà "
+"preso da questo listino prezzi sul prodotto."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No record(s) found for this report."
-msgstr ""
+msgstr "Nessun record trovato per questo report."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dati Insufficienti!"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -69,17 +71,17 @@ msgstr "Entrata"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
 msgid "Log of Activity"
-msgstr ""
+msgstr "Log delle Attività"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Ri-apri Progetto"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unità di misura"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -95,25 +97,16 @@ msgstr "Orari di Lavoro giornalieri"
 msgid "March"
 msgstr "Marzo"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Profitto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
-msgstr ""
+msgstr "Non è possibile modificare una linea analitica fatturata!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
@@ -125,11 +118,6 @@ msgstr "Tasso di fatturazione"
 msgid "Display time in the history of works"
 msgstr "Mostra le tempistiche nello storico dei lavori"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Libri giornali"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -142,6 +130,8 @@ msgid ""
 "Fill this field only if you want to force to use a specific product. Keep "
 "empty to use the real product that comes from the cost."
 msgstr ""
+"Completare questo campo solo per forzare l'uso di un prodotto specifico. "
+"Lasciare vuoto per usare il prodotto vero che proviene dal costo."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -159,6 +149,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliccare per aggiungere un nuovo tipo di fatturazione.\n"
+"              </p><p>\n"
+"                OpenERP permette di creare tipi di fatturazione standard. E' "
+"possibile\n"
+"                aver bisogno di assegnare regolarmente sconti per uno "
+"specifico contratto\n"
+"                o accordo con un cliente. Da questo menu, è possibile creare "
+"tipi \n"
+"                aggiuntivi di fatturazione per velocizzare le \n"
+"                fatturazioni.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -176,10 +179,10 @@ msgid "Invoiced Amount"
 msgstr "Importo Fatturato"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
-msgstr ""
+msgstr "Conto Analitico incompleto !"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -187,11 +190,9 @@ msgid "Project"
 msgstr "Progetto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
-msgstr ""
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
+msgstr "Fattura sulle Opzioni dell'Orario di Lavoro"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -203,16 +204,10 @@ msgstr "Importo"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Il dettaglio di ciascun lavoro sarà mostrato sulla fattura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Listino Prezzi"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
@@ -229,6 +224,20 @@ msgstr "Periodo da data finale"
 msgid "Analytic account to close"
 msgstr "Contabilità Analitica da Chiudere"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+"Solitamente viene fatturato il 100% delle ore lavorate. Ma nel caso venga "
+"utilizzata la fatturazione sia con prezzi fissi che con orari lavorativi, è "
+"possibile usare un altro tasso. Per esempio, se viene emessa una fattura di "
+"acconto del 20% (prezzi fissi, basata sugli ordini di vendita), è possibile "
+"fatturare il resto sulle ore lavorate con un tasso dell'80%."
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,10 +263,10 @@ msgid "Deadline"
 msgstr "Scadenza"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Errore di configurazione!"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -272,7 +281,7 @@ msgstr "Le tempistiche di ciascun lavoro saranno mostrate nella fattura"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Cancel Contract"
-msgstr ""
+msgstr "Annulla Contratto"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,date_from:0
@@ -291,10 +300,10 @@ msgid "Costs to invoice"
 msgstr "Costi da Fatturare"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
-msgstr ""
+msgstr "E' necessario definire un conto ricavi per il prodotto '%s'."
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,account_id:0
@@ -324,7 +333,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Force to use a special product"
-msgstr ""
+msgstr "Forza l'uso di un prodotto speciale"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
@@ -338,12 +347,6 @@ msgstr "Orari di Lavoro da Utente"
 msgid "To Invoice"
 msgstr "Da fatturare"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -355,12 +358,12 @@ msgstr "Profitto dal Foglio ore"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
 msgid "Force Product"
-msgstr ""
+msgstr "Forza Prodotto"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Contract Finished"
-msgstr ""
+msgstr "Contratti Conclusi"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -374,13 +377,13 @@ msgstr "Luglio"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Fatturabile"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -396,7 +399,7 @@ msgstr "Teorico"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
 msgid "Free of charge"
-msgstr ""
+msgstr "Gratis"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -427,7 +430,7 @@ msgstr "Sì (100%)"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by users"
-msgstr ""
+msgstr "Orari di lavoro per utenti"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:58
@@ -448,7 +451,7 @@ msgstr "Dicembre"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Invoice contract"
-msgstr ""
+msgstr "Fattura contratto"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -465,11 +468,6 @@ msgstr "Mese"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Utenti"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -560,7 +558,7 @@ msgstr "Orari di Lavoro da Contabilità"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Voci sezionale"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -622,11 +620,6 @@ msgstr "Gennaio"
 msgid "Date"
 msgstr "Data"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -634,7 +627,7 @@ msgstr ""
 #: field:report_timesheet.invoice,quantity:0
 #: field:report_timesheet.user,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "Ora"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
@@ -658,9 +651,9 @@ msgid "General Account"
 msgstr "Contabilità Generale"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Stampa il profitto del timesheet"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -668,9 +661,10 @@ msgid "Totals:"
 msgstr "Totali:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Righe Analitiche da Fatturare"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -678,6 +672,8 @@ msgid ""
 "It allows to set the discount while making invoice, keep empty if the "
 "activities should not be invoiced."
 msgstr ""
+"Permette di impostare lo sconto facendo le fatture, lasciare vuoto se le "
+"attività non dovrebbero essere fatturate."
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_max:0
@@ -687,7 +683,7 @@ msgstr "Prezzo Massimo Fattura"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Tasso di Fatturazione degli Orari di Lavoro"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -738,7 +734,7 @@ msgstr "A"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Do you want to show details of work in invoice?"
-msgstr ""
+msgstr "E' necessario visualizzare i dettagli del lavoro nella fattura?"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -746,7 +742,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
 msgid "Create Invoice"
-msgstr ""
+msgstr "Crea Fattura"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
@@ -769,17 +765,13 @@ msgid "Timesheets to invoice"
 msgstr "Orari di Lavoro da Fatturare"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
 msgstr ""
+"Contratto incompleto. E' necessario completare i campi Cliente e Listino "
+"Prezzi."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
@@ -823,26 +815,22 @@ msgstr "Registro"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "Il prodotto che verrà utilizzato per fatture l'importo rimenente"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Tempo impiegato"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
 msgid "Keep empty if this contract is not limited to a total fixed price."
 msgstr ""
+"Lasciare vuoto se questo contratto non è limitato a un totale prefissato di "
+"prezzo."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Do you want to show details of each activity to your customer?"
-msgstr ""
+msgstr "E' necessario mostrare i dettagli di ogni attività del cliente?"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
@@ -871,7 +859,7 @@ msgstr "Nome"
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Linee Analitiche"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
@@ -883,11 +871,6 @@ msgstr "Orario di Lavoro giornaliero da Contabilità"
 msgid "Sale price"
 msgstr "Prezzo di Vendita"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Stampa il profitto del timesheet"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -903,12 +886,14 @@ msgid "April"
 msgstr "Aprile"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
 "the wizard."
 msgstr ""
+"Non ci sono prodotti definiti. E' necessario selezionarne uno o forzare il "
+"prodotto tramite la procedura guidata."
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
@@ -919,7 +904,7 @@ msgstr "Sconto in percentuale"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56
 #, python-format
 msgid "Invoice is already linked to some of the analytic line(s)!"
-msgstr ""
+msgstr "La fattura è già collegata ad una o più linee analitiche!"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,name:0
@@ -933,22 +918,23 @@ msgid "Units"
 msgstr "Unità"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Righe Analitiche da Fatturare"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr "Errore!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
 msgid "80%"
-msgstr ""
+msgstr "80%"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: view:hr.timesheet.invoice.create:0
 #: view:hr.timesheet.invoice.create.final:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
@@ -978,7 +964,7 @@ msgstr "Anno"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Duration"
-msgstr ""
+msgstr "Durata"
 
 #~ msgid "%"
 #~ msgstr "%"
@@ -1265,6 +1251,9 @@ msgstr ""
 #~ msgid "Type of Invoicing"
 #~ msgstr "Tipo di fatturazione"
 
+#~ msgid "Journals"
+#~ msgstr "Libri giornali"
+
 #~ msgid "Accounts to invoice"
 #~ msgstr "Conti da Fatturare"
 
@@ -1312,3 +1301,6 @@ msgstr ""
 #~ "Questo lista vi mostra ogni attività fatturabile al cliente. Selezionare le "
 #~ "linee d'azione e fare clic sul pulsante per generare automaticamente le "
 #~ "fatture."
+
+#~ msgid "Users"
+#~ msgstr "Utenti"
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index 9c7ad0e9751..cafb0acea4c 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-15 06:00+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr "日々の勤務表"
 msgid "March"
 msgstr "3月"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "利益"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "請求書を発行済みの分析行を変更することはできません。"
@@ -126,11 +117,6 @@ msgstr "請求書発行率"
 msgid "Display time in the history of works"
 msgstr "作業履歴の時間を表示"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "ジャーナル"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr "請求額"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr "プロジェクト"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr "金額"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "請求書には各作業の詳細が表示されます。"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "終了日までの期間"
 msgid "Analytic account to close"
 msgstr "終了する分析アカウント"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr "期限"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr "請求書へ計上する経費"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr "ユーザごとの勤務表"
 msgid "To Invoice"
 msgstr "請求書発行"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr "月"
 msgid "Currency"
 msgstr "通貨"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "ユーザ"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr "1月"
 msgid "Date"
 msgstr "日付"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,9 +628,9 @@ msgid "General Account"
 msgstr "一般アカウント"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "勤務表プロファイルの印刷"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -667,9 +638,10 @@ msgid "Totals:"
 msgstr "合計:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "請求すべき分析行"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr "請求する勤務表"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr "仕訳"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "残高の請求に使われる製品"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr "アカウントごとの日々の勤務表"
 msgid "Sale price"
 msgstr "販売価格"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "勤務表プロファイルの印刷"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr "4月"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,10 +887,11 @@ msgid "Units"
 msgstr "単位"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "請求すべき分析行"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -996,6 +952,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "今年度"
 
+#~ msgid "Journals"
+#~ msgstr "ジャーナル"
+
 #~ msgid "Name of entry"
 #~ msgstr "入力の名称"
 
@@ -1075,6 +1034,9 @@ msgstr ""
 #~ msgid "Invoice on Timesheet & Costs"
 #~ msgstr "勤務表と経費の請求書"
 
+#~ msgid "Users"
+#~ msgstr "ユーザ"
+
 #~ msgid ""
 #~ "Complete this field only if you want to force to use a specific product. "
 #~ "Keep empty to use the real product that comes from the cost."
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index 0163bb769df..a3f2c50bcf6 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:21+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "이익"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr "작업 히스토리에 시간 표시"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr "인보이스 금액"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr "금액"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "완료된 작업의 상세 사항이 인보이스에 표시됩니다."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "마감 날짜까지의 기간"
 msgid "Analytic account to close"
 msgstr "마감할 분석 계정"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr "마감시한"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr "월"
 msgid "Currency"
 msgstr "통화"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr ""
 msgid "Date"
 msgstr "날짜"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,8 +628,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -667,9 +638,10 @@ msgid "Totals:"
 msgstr "합계:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "인보이스할 분석 라인들"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr "저널"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr "판매 가격"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,10 +887,11 @@ msgid "Units"
 msgstr "단위"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "인보이스할 분석 라인들"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index b3eafa86e1c..f1dbd9896f8 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr "Kovas"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Suma, kuriai išrašyta sąskaita-faktūra"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Projektas"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 88af9fdaca5..2b43427ed3f 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-10-22 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,8 +628,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -667,8 +638,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,9 +887,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 0199b1dc8a9..a854f4c1b9f 100644
--- a/addons/hr_timesheet_invoice/i18n/mn.po
+++ b/addons/hr_timesheet_invoice/i18n/mn.po
@@ -16,15 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-21 04:33+0000\n"
 "Last-Translator: lhagvajargal <jagaapu@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -105,22 +105,13 @@ msgstr "Цаг бүртгэлийг өдрөөр харах"
 msgid "March"
 msgstr "3 сар"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Ашиг"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Нэхэмжлэгдсэн шинжилгээний мөрийг засах боломжгүй!"
@@ -135,11 +126,6 @@ msgstr "Нэхэмжлэхийн харьцаа"
 msgid "Display time in the history of works"
 msgstr "Ажлын түүх дээр цагийг харуулах"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Журналууд"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -186,7 +172,7 @@ msgid "Invoiced Amount"
 msgstr "Нэхэмжилсэн дүн"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -197,10 +183,8 @@ msgid "Project"
 msgstr "Төсөл"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -213,12 +197,6 @@ msgstr "Дүн"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Хийсэн ажил бүрийн мэдээллийг нэхэмжлэх дээр харуулна"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -239,6 +217,15 @@ msgstr "Дуусах огноо хүртэлх мөчлөг"
 msgid "Analytic account to close"
 msgstr "Хаах шаардлагатай аналитик данс"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -264,7 +251,7 @@ msgid "Deadline"
 msgstr "Тогтсон өдөр"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -301,7 +288,7 @@ msgid "Costs to invoice"
 msgstr "Нэхэмжлэх үнийн дүн"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -348,12 +335,6 @@ msgstr "Цаг бүртгэлийг хэрэгдэгчээр харах"
 msgid "To Invoice"
 msgstr "Нэхэмжлэх"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -475,11 +456,6 @@ msgstr "Сар"
 msgid "Currency"
 msgstr "Валют"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Хэрэглэгчид"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -632,11 +608,6 @@ msgstr "1 сар"
 msgid "Date"
 msgstr "Огноо"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -668,9 +639,9 @@ msgid "General Account"
 msgstr "Ерөнхий данс"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Цаг бүртгэлийн ашгийг хэвлэх"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -678,9 +649,10 @@ msgid "Totals:"
 msgstr "Бүгд :"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Аналитик мөрөөс нэхэмжлэл рүү"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -779,13 +751,7 @@ msgid "Timesheets to invoice"
 msgstr "Нэхэмжлэх цаг бүртгэл"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -833,12 +799,6 @@ msgstr "Журнал"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "Энэ барааг үлдсэн дүнг нэхэмжлэхэд хэрэглэдэг"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -893,11 +853,6 @@ msgstr "Өдөр бүрийн цаг бүртгэлийг дансаар хар
 msgid "Sale price"
 msgstr "Борлуулалтын үнэ"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Цаг бүртгэлийн ашгийг хэвлэх"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -913,7 +868,7 @@ msgid "April"
 msgstr "4 сар"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -943,10 +898,11 @@ msgid "Units"
 msgstr "Нэгжүүд"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Аналитик мөрөөс нэхэмжлэл рүү"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1019,6 +975,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Энэ жил"
 
+#~ msgid "Journals"
+#~ msgstr "Журналууд"
+
 #~ msgid "Sale Pricelist"
 #~ msgstr "Борлуулалтын үнийн жагсаалт"
 
@@ -1287,6 +1246,9 @@ msgstr ""
 #~ "Аналитик дансаарх үнийн жагсаалт үүсгэж, таамаглаж байгаа орлогын тайланг\n"
 #~ "үүсгэж болно."
 
+#~ msgid "Users"
+#~ msgstr "Хэрэглэгчид"
+
 #, python-format
 #~ msgid "Configuration Error"
 #~ msgstr "Тохиргооны алдаа"
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index fcddae540e9..77f8abab98d 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:53+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Urenstaat per dag"
 msgid "March"
 msgstr "Maart"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Winst"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr "Factuurtarief"
 msgid "Display time in the history of works"
 msgstr "Toon tijd in de verricht werk-historie"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Dagboeken"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr "Gefactureerd bedrag"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr "Project"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr "Bedrag"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "De details van elk verricht werk zal getoond worden op de factuur"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "Periode t/m"
 msgid "Analytic account to close"
 msgstr "Te sluiten kostenplaatsen"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr "Deadline"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr "Nog te ontvangen facturen"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -339,12 +326,6 @@ msgstr "Urenstaat op gebruiker"
 msgid "To Invoice"
 msgstr "Te factureren"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -466,11 +447,6 @@ msgstr "Maand"
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Gebruikers"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -623,11 +599,6 @@ msgstr "Januari"
 msgid "Date"
 msgstr "Datum"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -659,9 +630,9 @@ msgid "General Account"
 msgstr "Algemene rekening"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Urenstaat resultaat afdrukken"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -669,9 +640,10 @@ msgid "Totals:"
 msgstr "Totalen:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Te factureren kostenplaatsboekingen"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -771,13 +743,7 @@ msgid "Timesheets to invoice"
 msgstr "Urenstaten voor facturatie"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -826,12 +792,6 @@ msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 "Het product dat gebruikt wordt voor het factureren van het resterende bedrag"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -886,11 +846,6 @@ msgstr "Dagelijkse urenstaat per kostenplaats"
 msgid "Sale price"
 msgstr "Verkoopprijs"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Urenstaat resultaat afdrukken"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -906,7 +861,7 @@ msgid "April"
 msgstr "April"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -936,10 +891,11 @@ msgid "Units"
 msgstr "Eenheden"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Te factureren kostenplaatsboekingen"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1172,6 +1128,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Dit jaar"
 
+#~ msgid "Journals"
+#~ msgstr "Dagboeken"
+
 #~ msgid "It allows to set the discount while making invoice"
 #~ msgstr "Laat u een korting instellen bij het maken van de factuur"
 
@@ -1300,6 +1259,9 @@ msgstr ""
 #~ msgid "Balance product needed"
 #~ msgstr "Balans product noodzakelijk"
 
+#~ msgid "Users"
+#~ msgstr "Gebruikers"
+
 #, python-format
 #~ msgid "Please fill a Balance product in the wizard"
 #~ msgstr "Aub balans product invullen in assistent."
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index e208ec56dfa..1c8eebf43d0 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 5ebc31cabd4..515b9f5579e 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 20:55+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -97,26 +97,13 @@ msgstr "Karta czasu pracy na dzień"
 msgid "March"
 msgstr "Marzec"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-"Zwykle fakturujesz 100% czasu z karty pracy. Ale jeśli stosujesz stałe ceny "
-"i fakturowanie czasu, to możesz stosować współczynniki. Na przykład: jeśli "
-"bierzesz zaliczkę 20% według stałych cen z oferty, to powinieneś fakturować "
-"resztę jako 80%."
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Zysk"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Nie możesz modyfikować zafakturowanej pozycji analitycznej !"
@@ -131,11 +118,6 @@ msgstr "Współczynnik fakturowania"
 msgid "Display time in the history of works"
 msgstr "Wyświetlaj czas w historii prac"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Dzienniki"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -184,7 +166,7 @@ msgid "Invoiced Amount"
 msgstr "Kwota zafakturowana"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr "Niekompletne konto analityczne !"
@@ -195,11 +177,9 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
-msgstr "Błąd!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
+msgstr "Opcje fakturowania wg kart pracy"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -211,12 +191,6 @@ msgstr "Kwota"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Szczegóły każdej wykonanej pracy będą widoczne w fakturze"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr "Umowa została ustawiona na <b>oczekiwanie</b>."
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -237,6 +211,15 @@ msgstr "Okres do daty końcowej"
 msgid "Analytic account to close"
 msgstr "Konto analityczne do zamknięcia"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -262,7 +245,7 @@ msgid "Deadline"
 msgstr "Termin"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr "Błąd konfiguracji!"
@@ -299,7 +282,7 @@ msgid "Costs to invoice"
 msgstr "Koszty do faktury"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr "Zdefiniuj konto przychodów dla produktu '%s'."
@@ -346,12 +329,6 @@ msgstr "Karta czasu pracy wg użytkownika"
 msgid "To Invoice"
 msgstr "Do zafakturowania"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr "Umowa została <b>zamknięta</b>."
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -473,11 +450,6 @@ msgstr "Miesiąc"
 msgid "Currency"
 msgstr "Waluta"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Użytkownicy"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -630,11 +602,6 @@ msgstr "Styczeń"
 msgid "Date"
 msgstr "Data"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr "zakończono"
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -666,9 +633,9 @@ msgid "General Account"
 msgstr "Konto ogólne"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr "Opcje fakturowania wg kart pracy"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Drukuj zysk karty pracy"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -676,9 +643,10 @@ msgid "Totals:"
 msgstr "Sumy:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr "anulowano"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Pozycje analityczne do zafakturowania"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -779,13 +747,7 @@ msgid "Timesheets to invoice"
 msgstr "Karta czasu pracy do zafakturowania"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr "Umowa została <b>anulowana</b>."
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -833,12 +795,6 @@ msgstr "Dziennik"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "Produkt, który będzie stosowany do fakturowania pozostałej kwoty."
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr "Umowa została <b>otwarta</b>."
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -893,11 +849,6 @@ msgstr "Dzienna karta czasu pracy wg konta"
 msgid "Sale price"
 msgstr "Cena sprzedaży"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Drukuj zysk karty pracy"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -913,7 +864,7 @@ msgid "April"
 msgstr "Kwiecień"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -944,10 +895,11 @@ msgid "Units"
 msgstr "Jednostki"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Pozycje analityczne do zafakturowania"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr "Błąd!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1212,6 +1164,9 @@ msgstr "Czas trwania"
 #~ msgid "This Year"
 #~ msgstr "Ten rok"
 
+#~ msgid "Journals"
+#~ msgstr "Dzienniki"
+
 #~ msgid "Daily Timesheets for this year"
 #~ msgstr "Dzienne karty czasu pracy na ten rok"
 
@@ -1248,6 +1203,9 @@ msgstr "Czas trwania"
 #~ "Wybrane konto wymaga podania drugiej waluty. Powinieneś usunąć drugą walutę "
 #~ "z konta lub wybrać wielowalutowy widok w dzienniku."
 
+#~ msgid "Users"
+#~ msgstr "Użytkownicy"
+
 #~ msgid "Bill Tasks Works"
 #~ msgstr "Fakturuj przebieg zadania"
 
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 546c12e76be..9b40e9d5147 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 15:30+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Folha de Horas por dia"
 msgid "March"
 msgstr "Março"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Lucro"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Não pode modificar uma linha analítica faturada!"
@@ -125,11 +116,6 @@ msgstr "Taxa da fatura"
 msgid "Display time in the history of works"
 msgstr "Apresentar tempo no histórico de trabalhos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Diários"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Montante Faturado"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,11 +173,9 @@ msgid "Project"
 msgstr "Projeto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -203,12 +187,6 @@ msgstr "Montante"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "O detalhe de cada trabalho concluído vai ser apresentado na fatura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Perído para data final"
 msgid "Analytic account to close"
 msgstr "Conta da contabilidade analítica a fechar"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Prazo Limite"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de configuração!"
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Custos a Faturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -338,12 +325,6 @@ msgstr "Folha de Horas por utilizador"
 msgid "To Invoice"
 msgstr "Para Faturar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -465,11 +446,6 @@ msgstr "Mês"
 msgid "Currency"
 msgstr "Moeda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Utilizadores"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -622,11 +598,6 @@ msgstr "Janeiro"
 msgid "Date"
 msgstr "Data"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr "terminado"
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -658,9 +629,9 @@ msgid "General Account"
 msgstr "Conta Geral"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir Lucro da Folha de Horas"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -668,9 +639,10 @@ msgid "Totals:"
 msgstr "Totais:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Linhas analíticas a faturar"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -769,13 +741,7 @@ msgid "Timesheets to invoice"
 msgstr "Folha de Horas a Faturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr "O contrato foi <b>cancelado</b>."
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -823,12 +789,6 @@ msgstr "Diário"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "O artigo que será utilizado para faturar o montante remanescente"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -883,11 +843,6 @@ msgstr "Folha de Horas diária por conta"
 msgid "Sale price"
 msgstr "Preço de venda"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimir Lucro da Folha de Horas"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -903,7 +858,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -933,10 +888,11 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Linhas analíticas a faturar"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1175,6 +1131,9 @@ msgstr "Duração"
 #~ msgid "This Year"
 #~ msgstr "Este ano"
 
+#~ msgid "Journals"
+#~ msgstr "Diários"
+
 #~ msgid "Reactivate Account"
 #~ msgstr "Reactivar Conta"
 
@@ -1221,6 +1180,9 @@ msgstr "Duração"
 #~ "Complete este campo somente se quer forçar o uso de um artigo específico. "
 #~ "Manter vazio para usar o artigo real que vem a partir do custo."
 
+#~ msgid "Users"
+#~ msgstr "Utilizadores"
+
 #, python-format
 #~ msgid "Please fill in the Address field in the Partner: %s."
 #~ msgstr "Por favor preencher no campo Endereço no Parceiro: %s"
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 6bf67d95d35..9fa305abd5f 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 17:43+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr "Planilha de tempo por dia"
 msgid "March"
 msgstr "Março"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Lucro"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Você não pode modificar uma linha analítica na fatura!"
@@ -126,11 +117,6 @@ msgstr "Taxa de Fatura"
 msgid "Display time in the history of works"
 msgstr "Mostrar tempo no histórico de trabalhos"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Diários"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr "Valor Faturado"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr "Projeto"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr "Montante"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "O  detalhe de cada trabalho realizado será mostrado na fatura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr "Período até a data final"
 msgid "Analytic account to close"
 msgstr "Conta analítica a ser fechada"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr "Prazo final"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr "Custos para fatura"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -339,12 +326,6 @@ msgstr "Planilha de Horas por Usuário"
 msgid "To Invoice"
 msgstr "Para Faturar"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -466,11 +447,6 @@ msgstr "Mês"
 msgid "Currency"
 msgstr "Moeda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Usuários"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -623,11 +599,6 @@ msgstr "Janeiro"
 msgid "Date"
 msgstr "Data"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -659,9 +630,9 @@ msgid "General Account"
 msgstr "Conta geral"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir Lucro do Quadro de Horas"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -669,9 +640,10 @@ msgid "Totals:"
 msgstr "Totais:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Linhas Analíticas para faturar"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -770,13 +742,7 @@ msgid "Timesheets to invoice"
 msgstr "Planilhas de Horas a faturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -824,12 +790,6 @@ msgstr "Diário"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "O produto que será usado para cobrar o valor restante"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -885,11 +845,6 @@ msgstr "Planilhas de horas diárias por conta"
 msgid "Sale price"
 msgstr "Preço de Venda"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimir Lucro do Quadro de Horas"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -905,7 +860,7 @@ msgid "April"
 msgstr "Abril"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -935,10 +890,11 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Linhas Analíticas para faturar"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1126,6 +1082,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Este Ano"
 
+#~ msgid "Journals"
+#~ msgstr "Diários"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -1232,6 +1191,9 @@ msgstr ""
 #~ "secundária. Você deve remover a moeda secundária na conta ou selecione uma "
 #~ "visão multi-moeda no diário."
 
+#~ msgid "Users"
+#~ msgstr "Usuários"
+
 #~ msgid "You can not create journal items on closed account."
 #~ msgstr "Você não pode criar ítens de diário em uma conta fechada."
 
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index 99a3d5f6ab1..13c25abf72b 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-27 08:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Fisa de pontaj pe zi"
 msgid "March"
 msgstr "Martie"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Profit"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "Nu puteti modifica o linie analitica a facturii!"
@@ -125,11 +116,6 @@ msgstr "Rata factura"
 msgid "Display time in the history of works"
 msgstr "Afisajeaza perioada in istoricul activitatilor"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Jurnale"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Suma facturata"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Proiect"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Suma"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "Detaliile fiecarei activitati prestate vor aparea pe factura"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Perioada pana la data de sfarsit"
 msgid "Analytic account to close"
 msgstr "Cont analitic de inchis"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Termen limita"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Costuri de facturat"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -338,12 +325,6 @@ msgstr "Fisa de pontaj dupa Utilizator"
 msgid "To Invoice"
 msgstr "De facturat"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -465,11 +446,6 @@ msgstr "Luna"
 msgid "Currency"
 msgstr "Moneda"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "Utilizatori"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -622,11 +598,6 @@ msgstr "Ianuarie"
 msgid "Date"
 msgstr "Data"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -658,9 +629,9 @@ msgid "General Account"
 msgstr "Cont General"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimati Profitul Fisei de pontaj"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -668,9 +639,10 @@ msgid "Totals:"
 msgstr "Total:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Linii Analitice de Facturat"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -769,13 +741,7 @@ msgid "Timesheets to invoice"
 msgstr "Fise de pontaj de facturat"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -823,12 +789,6 @@ msgstr "Jurnal"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "Produsul care va fi folosit pentru a factura suma ramasa"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -884,11 +844,6 @@ msgstr "Fisa de pontaj zilnica dupa cont"
 msgid "Sale price"
 msgstr "Pret de vanzare"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "Imprimati Profitul Fisei de pontaj"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -904,7 +859,7 @@ msgid "April"
 msgstr "Aprilie"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -934,10 +889,11 @@ msgid "Units"
 msgstr "Unitati"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Linii Analitice de Facturat"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -997,6 +953,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Anul acesta"
 
+#~ msgid "Journals"
+#~ msgstr "Jurnale"
+
 #~ msgid "UoM"
 #~ msgstr "UdeM"
 
@@ -1191,6 +1150,9 @@ msgstr ""
 #~ "Costul fiecărei activităti efectuate va fi tipărit pe factura. Probabil că "
 #~ "nu doriti să bifati această optiune."
 
+#~ msgid "Users"
+#~ msgstr "Utilizatori"
+
 #~ msgid "Timesheet lines in this year"
 #~ msgstr "Linii fise de pontaj din acest an"
 
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index f2f725da832..bddcfd94020 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-29 07:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Табель по дням"
 msgid "March"
 msgstr "Март"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Прибыль"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Журналы"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Сумма к оплате"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Проект"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Количество"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr "Счет аналитики к закрытию"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Срок"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Расходы для выставления счетов"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr "Табель по пользователям"
 msgid "To Invoice"
 msgstr "В счет"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "Месяц"
 msgid "Currency"
 msgstr "Валюта"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr "Январь"
 msgid "Date"
 msgstr "Дата"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr "Базовый счет"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,9 +637,10 @@ msgid "Totals:"
 msgstr "Итоги:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Позиции аналитики к выставлению счетов"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr "Табели для выставления счетов"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Книга"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr "Дневные табели по счетам"
 msgid "Sale price"
 msgstr "Цена продажи"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,10 +886,11 @@ msgid "Units"
 msgstr "Единицы"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Позиции аналитики к выставлению счетов"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1086,6 +1042,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Этот год"
 
+#~ msgid "Journals"
+#~ msgstr "Журналы"
+
 #~ msgid "Accounts to invoice"
 #~ msgstr "Счета к выставлению"
 
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 380524b265c..d0ee49f8bdc 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:11+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Dobiček"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Zaračunani znesek"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr "Valuta"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr "Skupaj:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Dnevnik"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr "Enote"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sq.po b/addons/hr_timesheet_invoice/i18n/sq.po
index 481b60b794a..22d503bbda5 100644
--- a/addons/hr_timesheet_invoice/i18n/sq.po
+++ b/addons/hr_timesheet_invoice/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,8 +628,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -667,8 +638,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,9 +887,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sr@latin.po b/addons/hr_timesheet_invoice/i18n/sr@latin.po
index b82ec698172..78c1158ea87 100644
--- a/addons/hr_timesheet_invoice/i18n/sr@latin.po
+++ b/addons/hr_timesheet_invoice/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 17:02+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Dobit"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,8 +628,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -667,8 +638,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,9 +887,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index c49f068a876..0559fb8ffc2 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-22 20:59+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr "mars"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Profit"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr "Display time in the history of works"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "Journaler"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Invoiced Amount"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Belopp"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "The detail of each work done will be displayed on the invoice"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "Period to enddate"
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Tidsfrist"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr "Att fakturera"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "Månad"
 msgid "Currency"
 msgstr "Currency"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr "Date"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr "Totals:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Journal"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr "Units"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -1205,6 +1161,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "Innevarande år"
 
+#~ msgid "Journals"
+#~ msgstr "Journaler"
+
 #~ msgid "UoM"
 #~ msgstr "Måttenhet"
 
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index f8298a0af19..f20d3749442 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 5d5781c6dfe..4f037bbfc42 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Fatura Tutarı"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Proje"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "Miktar"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Son Teslim Tarihi"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Faturalanacak Maliyetler"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "Ay"
 msgid "Currency"
 msgstr "Para Birimi"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr "Tarih"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr "Genel Hesap"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,9 +637,10 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Fatura Analitik Kalemleri"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Yevmiye"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr "Satış Fiyatı"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,10 +886,11 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Fatura Analitik Kalemleri"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index 10e2c942b8d..e2807f8a8db 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 06:24+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "Табель за днем"
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "Прибуток"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "Заінвойсована сума"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "Проект"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr "Аналітичний рахунок до закриття"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "Кінцевий термін"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "Кошти для інвойсування"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr "Табель за користувачами"
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "Місяць"
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr "Дата"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,9 +637,10 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Аналітичні рядки Рахунку-Фактури"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr "Табель за накладними"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "Журнал"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr "Щоденний табель за рахунком"
 msgid "Sale price"
 msgstr "Ціна продажу"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,10 +886,11 @@ msgid "Units"
 msgstr "Одиниць"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "Аналітичні рядки Рахунку-Фактури"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
diff --git a/addons/hr_timesheet_invoice/i18n/vi.po b/addons/hr_timesheet_invoice/i18n/vi.po
index cdd866e7012..10db3efea9e 100644
--- a/addons/hr_timesheet_invoice/i18n/vi.po
+++ b/addons/hr_timesheet_invoice/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -96,22 +96,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -126,11 +117,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -177,7 +163,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -188,10 +174,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -204,12 +188,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -230,6 +208,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -255,7 +242,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -292,7 +279,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -337,12 +324,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -464,11 +445,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -621,11 +597,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -657,8 +628,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -667,8 +638,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -768,13 +740,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -822,12 +788,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -882,11 +842,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -902,7 +857,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -932,9 +887,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 656e99e8d59..b4ee7c41767 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:01+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr "每天计工单"
 msgid "March"
 msgstr "3月"
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr "利润"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr "你不能修改发票的成本行"
@@ -125,11 +116,6 @@ msgstr "开票税率"
 msgid "Display time in the history of works"
 msgstr "在工作日志显示时间"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr "账簿"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr "已开票金额"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr "项目"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr "金额"
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr "每个完成的工作将显示在发票上"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr "期末日期"
 msgid "Analytic account to close"
 msgstr "关闭辅助核算项"
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr "截止日期"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr "成本发票"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr "用户计工单"
 msgid "To Invoice"
 msgstr "开票"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr "月份"
 msgid "Currency"
 msgstr "币别"
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr "用户"
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr "1月"
 msgid "Date"
 msgstr "日期"
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,9 +627,9 @@ msgid "General Account"
 msgstr "辅助核算项"
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "打印计工单收益"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -666,9 +637,10 @@ msgid "Totals:"
 msgstr "合计:"
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "辅助核算明细的发票"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr "给计工单开发票"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr "账簿"
 msgid "The product that will be used to invoice the remaining amount"
 msgstr "将作为发票的剩余金额"
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr "辅助核算项每天的计工单"
 msgid "Sale price"
 msgstr "售价"
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr "打印计工单收益"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr "4月"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,10 +886,11 @@ msgid "Units"
 msgstr "单位"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr "辅助核算明细的发票"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
@@ -1151,6 +1107,9 @@ msgstr ""
 #~ msgid "Invoice Balance amount"
 #~ msgstr "发票余额的金额"
 
+#~ msgid "Users"
+#~ msgstr "用户"
+
 #, python-format
 #~ msgid "Error"
 #~ msgstr "错误"
@@ -1215,6 +1174,9 @@ msgstr ""
 #~ msgid "This Year"
 #~ msgstr "该年"
 
+#~ msgid "Journals"
+#~ msgstr "账簿"
+
 #~ msgid "Name of entry"
 #~ msgstr "名称"
 
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index 8e5fc0d5b3a..3bc6999180e 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-30 13:17+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,22 +95,13 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,to_invoice:0
-msgid ""
-"You usually invoice 100% of the timesheets. But if you mix fixed price and "
-"timesheet invoicing, you may use another ratio. For instance, if you do a "
-"20% advance invoice (fixed price, based on a sale order), you should invoice "
-"the rest on timesheet with a 80% ratio."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
 msgstr ""
@@ -125,11 +116,6 @@ msgstr ""
 msgid "Display time in the history of works"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
@@ -176,7 +162,7 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
 msgstr ""
@@ -187,10 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -203,12 +187,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
@@ -229,6 +207,15 @@ msgstr ""
 msgid "Analytic account to close"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"You usually invoice 100% of the timesheets. But if you mix fixed price and "
+"timesheet invoicing, you may use another ratio. For instance, if you do a "
+"20% advance invoice (fixed price, based on a sales order), you should "
+"invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
@@ -254,7 +241,7 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -291,7 +278,7 @@ msgid "Costs to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
 msgstr ""
@@ -336,12 +323,6 @@ msgstr ""
 msgid "To Invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -463,11 +444,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
@@ -620,11 +596,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -656,8 +627,8 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -666,8 +637,9 @@ msgid "Totals:"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -767,13 +739,7 @@ msgid "Timesheets to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
 #, python-format
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
@@ -821,12 +787,6 @@ msgstr ""
 msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
@@ -881,11 +841,6 @@ msgstr ""
 msgid "Sale price"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -901,7 +856,7 @@ msgid "April"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid ""
 "There is no product defined. Please select one or force the product through "
@@ -931,9 +886,10 @@ msgid "Units"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 9acdd9026e0..f785c261765 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-13 19:19+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "بناءًا على سجل الدوام"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -249,9 +249,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -492,11 +492,6 @@ msgstr "#سجل الدوام الكلي"
 msgid "hr.timesheet.current.open"
 msgstr "الموارد البشرية.سجل الدوام.الجاري.افتح"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "تمت الموافقة"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -715,10 +710,9 @@ msgid "Timesheet range"
 msgstr "مجموعة سجل الدوام"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "المجموع الكلي لحضور في الاسبوع"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -800,7 +794,7 @@ msgid "Search Account"
 msgstr "ابحث عن حساب"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -862,9 +856,9 @@ msgid "Cancel"
 msgstr "إلغاء"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "المجموع الكلي لحضور في الاسبوع"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "تمت الموافقة"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -971,9 +965,9 @@ msgid "May"
 msgstr "مايو"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "يومية"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "ويحدد ملخص العمل للمهمة"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1071,8 +1065,8 @@ msgid "Invoice rate"
 msgstr "معدل الفاتورة"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1153,9 +1147,9 @@ msgid "Total"
 msgstr "الإجمالي"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "ويحدد ملخص العمل للمهمة"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "يومية"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index 68dba10bbfc..4731fc09a37 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 11:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Проверен"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,9 +849,9 @@ msgid "Cancel"
 msgstr "Отказ"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr ""
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Проверен"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -964,9 +958,9 @@ msgid "May"
 msgstr "Май"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Журнал"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,9 +1140,9 @@ msgid "Total"
 msgstr "Общо"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr ""
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Журнал"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index 98252102eb5..53e12af5aac 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-13 09:50+0000\n"
 "Last-Translator: Haris Kovacevic <haris.kovacevic@edu.fit.ba>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 51a58646001..9eeee3919f5 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-16 05:22+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr "Basat en el full d'assistència"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -252,9 +252,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -495,11 +495,6 @@ msgstr "#Total full assistència"
 msgid "hr.timesheet.current.open"
 msgstr "rrhh.fullassistència.actual.obrir"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validat"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -720,10 +715,9 @@ msgid "Timesheet range"
 msgstr "Rang full d'assistència"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "La meva assistència total per setmana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -805,7 +799,7 @@ msgid "Search Account"
 msgstr "Cerca compte"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -868,9 +862,9 @@ msgid "Cancel"
 msgstr "Canceŀla"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "La meva assistència total per setmana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validat"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -978,9 +972,9 @@ msgid "May"
 msgstr "Maig"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Diari"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Defineix el resum del treball d'una tasca"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1078,8 +1072,8 @@ msgid "Invoice rate"
 msgstr "Taxa factura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1160,9 +1154,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Defineix el resum del treball d'una tasca"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diari"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index b11fe33f37c..028917139fa 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-16 00:04+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po
index e89735207b7..7c9f7042bc1 100644
--- a/addons/hr_timesheet_sheet/i18n/da.po
+++ b/addons/hr_timesheet_sheet/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 08:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -711,9 +706,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -796,7 +790,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -856,8 +850,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -965,8 +959,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1065,8 +1059,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1147,8 +1141,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index c6321c313f0..d8d6eb4d030 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 01:35+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
@@ -149,8 +149,8 @@ msgid "Based on the timesheet"
 msgstr "Basierend auf Zeiterfassung"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -207,8 +207,8 @@ msgstr ""
 "Bitte legen Sie einen Mitarbeiter an und weisen Sie ihm einen Benutzer zu."
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -270,9 +270,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -522,11 +522,6 @@ msgstr "# Projektstunden"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Genehmigt"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -766,10 +761,9 @@ msgid "Timesheet range"
 msgstr "Zeiterfassung Zeitraum"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Meine Gesamtanwesenheit nach Wochen"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -858,7 +852,7 @@ msgid "Search Account"
 msgstr "Suche Konto"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr "Sie können keinen Eintrag in einer bestätigten Zeiterfassung ändern"
@@ -922,9 +916,9 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Meine Gesamtanwesenheit nach Wochen"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Genehmigt"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -1034,9 +1028,9 @@ msgid "May"
 msgstr "Mai"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Beschreibt die erledigte Aufgabe"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1146,8 +1140,8 @@ msgid "Invoice rate"
 msgstr "Quote Abrechnung"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr "Benutzerfehler!"
@@ -1228,9 +1222,9 @@ msgid "Total"
 msgstr "Betrag gesammt"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Beschreibt die erledigte Aufgabe"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Journal"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index e3bedfc3eaf..33a0787de42 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 06:27+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -144,8 +144,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -200,8 +200,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -247,9 +247,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -490,11 +490,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -713,9 +708,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -798,7 +792,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -858,8 +852,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -967,8 +961,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1067,8 +1061,8 @@ msgid "Invoice rate"
 msgstr "Τιμή χρέωσης τιμολογίου"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1149,8 +1143,8 @@ msgid "Total"
 msgstr "Σύνολο"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index b3055ad615a..7fb5c85d5b6 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 15:13+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -146,8 +146,8 @@ msgid "Based on the timesheet"
 msgstr "Basado en la hoja de asistencia"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr "No puede modificar una entrada en un parte de horas confirmado."
@@ -202,8 +202,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr "Por favor, cree un empleado y asócielo con este usuario."
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -264,9 +264,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -513,11 +513,6 @@ msgstr "#Total hoja asistencia"
 msgid "hr.timesheet.current.open"
 msgstr "rrhh.hojaasistencia.actual.abrir"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validado"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -753,10 +748,9 @@ msgid "Timesheet range"
 msgstr "Rango hoja de asistencia"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Mi asistencia total por semana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -843,7 +837,7 @@ msgid "Search Account"
 msgstr "Buscar Cuenta"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr "No puede modificar una entrada en un parte de horas confirmado."
@@ -907,9 +901,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Mi asistencia total por semana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -1016,9 +1010,9 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Diario"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Define el resumen del trabajo de una tarea"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1124,8 +1118,8 @@ msgid "Invoice rate"
 msgstr "Tasa factura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr "¡Error de usuario!"
@@ -1206,9 +1200,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Define el resumen del trabajo de una tarea"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diario"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index a2c4ed65b78..9ba17914b47 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-23 20:21+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr "Tarifa de la factura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po
index bc7ac46623f..d819ee119f2 100644
--- a/addons/hr_timesheet_sheet/i18n/es_CR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-17 15:21+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr "Basado en la hoja de asistencia"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -252,9 +252,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -495,11 +495,6 @@ msgstr "#Total hoja asistencia"
 msgid "hr.timesheet.current.open"
 msgstr "rrhh.hojaasistencia.actual.abrir"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validado"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -720,10 +715,9 @@ msgid "Timesheet range"
 msgstr "Rango hoja de asistencia"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Mi asistencia total por semana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -805,7 +799,7 @@ msgid "Search Account"
 msgstr "Buscar Cuenta"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -867,9 +861,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Mi asistencia total por semana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -976,9 +970,9 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Diario"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Define el resumen del trabajo de una tarea"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1076,8 +1070,8 @@ msgid "Invoice rate"
 msgstr "Tasa factura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1158,9 +1152,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Define el resumen del trabajo de una tarea"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diario"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/es_EC.po b/addons/hr_timesheet_sheet/i18n/es_EC.po
index 0f8b08a1746..ef332555947 100644
--- a/addons/hr_timesheet_sheet/i18n/es_EC.po
+++ b/addons/hr_timesheet_sheet/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-12 14:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr "Basado en la hoja de servicios"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -252,9 +252,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -495,11 +495,6 @@ msgstr "#Total hoja servicios"
 msgid "hr.timesheet.current.open"
 msgstr "rrhh.hojaasistencia.actual.abrir"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -718,9 +713,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -803,7 +797,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -863,8 +857,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -972,8 +966,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1072,8 +1066,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1154,8 +1148,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index a473644eb2b..c2a9585d1e9 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-16 03:29+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr "Arve määr"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr "Kokku"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 3854ae90db8..99335848108 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 06:27+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr "Perustuu tuntilistaan"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr "Tuntilista yhteensä"
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Vahvistettu"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -712,10 +707,9 @@ msgid "Timesheet range"
 msgstr "Tuntilistan jakso"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Oma kokonaisläsnäolo viikoittain"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -797,7 +791,7 @@ msgid "Search Account"
 msgstr "Hae tiliä"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -859,9 +853,9 @@ msgid "Cancel"
 msgstr "Peruuta"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Oma kokonaisläsnäolo viikoittain"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Vahvistettu"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -968,9 +962,9 @@ msgid "May"
 msgstr "Toukokuu"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Loki"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Määrittelee tehtävän töiden yhteenvedon"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1068,8 +1062,8 @@ msgid "Invoice rate"
 msgstr "Laskutusmäärä"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1150,9 +1144,9 @@ msgid "Total"
 msgstr "Yhteensä"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Määrittelee tehtävän töiden yhteenvedon"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Loki"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index b17f7f99fd1..0ac54ebcd2d 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 16:05+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Basé sur la feuille de temps"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -252,9 +252,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -495,11 +495,6 @@ msgstr "Total des feuilles de temps"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validé"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -724,10 +719,9 @@ msgid "Timesheet range"
 msgstr "Plage de la feuille de temps"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Ma présence totale par semaine"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -809,7 +803,7 @@ msgid "Search Account"
 msgstr "Recherche de comptes"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -872,9 +866,9 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Ma présence totale par semaine"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validé"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -981,9 +975,9 @@ msgid "May"
 msgstr "Mai"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Définit le résumé du travail pour la tâche"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1081,8 +1075,8 @@ msgid "Invoice rate"
 msgstr "Taux de facturation"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1163,9 +1157,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Définit le résumé du travail pour la tâche"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Journal"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 22c15dc7d4b..bd8d3071239 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 12:35+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Bazirano na kontrolnoj kartici"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr "Ne možete modificirati polje u potvrđenoj kontrolnoj kartici."
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr "Kreirajte zaposlenika i pridružite ga sa ovim korisnikom."
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -489,11 +489,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Potvrđeno"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -712,10 +707,9 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i e-pošta."
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -797,7 +791,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -857,9 +851,9 @@ msgid "Cancel"
 msgstr "Poništi"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr ""
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Potvrđeno"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -966,8 +960,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1066,8 +1060,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr "Greška korisnika!"
@@ -1148,8 +1142,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index ce4a33f13a6..8f91b58a6f5 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-04 14:31+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Munkaidő-kimutatás alapján"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -251,9 +251,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -494,11 +494,6 @@ msgstr "Munkaidő-kimutatás összesen"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Jóváhagyott"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -719,10 +714,9 @@ msgid "Timesheet range"
 msgstr "Munkaidő-kimutatás időintervalluma"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Összes jelenlétem hetek szerint"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -804,7 +798,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -867,9 +861,9 @@ msgid "Cancel"
 msgstr "Mégsem"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Összes jelenlétem hetek szerint"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Jóváhagyott"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -977,9 +971,9 @@ msgid "May"
 msgstr "Május"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Napló"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Meghatározza a feladat munkaösszesítését"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1077,8 +1071,8 @@ msgid "Invoice rate"
 msgstr "Számlázási ráta"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1159,9 +1153,9 @@ msgid "Total"
 msgstr "Összesen"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Meghatározza a feladat munkaösszesítését"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Napló"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 13c853aa43a..5bb7fa356ef 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-09 13:50+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 6bc6e39bf6d..9870dec2d64 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 18:55+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Basato su timesheet"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Convalidato"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -712,10 +707,9 @@ msgid "Timesheet range"
 msgstr "Range timesheet"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "La mia presenza totale per settimana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -797,7 +791,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -857,9 +851,9 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "La mia presenza totale per settimana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Convalidato"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -966,9 +960,9 @@ msgid "May"
 msgstr "Maggio"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr ""
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Definisce un riepilogo lavoro sull'attività"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1066,8 +1060,8 @@ msgid "Invoice rate"
 msgstr "Tasso di fatturazione"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1148,9 +1142,9 @@ msgid "Total"
 msgstr "Totale"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Definisce un riepilogo lavoro sull'attività"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index 310cae617fd..cc256010b37 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-18 19:08+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr "勤務表に基づく"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -248,9 +248,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -491,11 +491,6 @@ msgstr "勤務表の合計"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "承諾済み"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -714,10 +709,9 @@ msgid "Timesheet range"
 msgstr "勤務表の範囲"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "週ごとの私の全ての出勤"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -799,7 +793,7 @@ msgid "Search Account"
 msgstr "アカウントを検索"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -859,9 +853,9 @@ msgid "Cancel"
 msgstr "キャンセル"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "週ごとの私の全ての出勤"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "承諾済み"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -968,9 +962,9 @@ msgid "May"
 msgstr "5月"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "仕訳帳"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "仕事の作業要約を定義します。"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1068,8 +1062,8 @@ msgid "Invoice rate"
 msgstr "請求率"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1150,9 +1144,9 @@ msgid "Total"
 msgstr "合計"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "仕事の作業要約を定義します。"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "仕訳帳"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index 89519c5640f..774bfc61547 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 13:57+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -711,9 +706,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -796,7 +790,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -856,8 +850,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -965,8 +959,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1065,8 +1059,8 @@ msgid "Invoice rate"
 msgstr "인보이스 비율"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1147,8 +1141,8 @@ msgid "Total"
 msgstr "합계"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 801f18c6332..25beed7313c 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr "Sąskaitos faktūros koeficientas"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr "Iš viso"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index 0412be5c106..c12206bc0fc 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-10-22 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -711,9 +706,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -796,7 +790,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -856,8 +850,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -965,8 +959,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1065,8 +1059,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1147,8 +1141,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/mk.po b/addons/hr_timesheet_sheet/i18n/mk.po
index 8e90cdebffe..40e301615c6 100644
--- a/addons/hr_timesheet_sheet/i18n/mk.po
+++ b/addons/hr_timesheet_sheet/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-22 12:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -711,9 +706,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -796,7 +790,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -856,8 +850,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -965,8 +959,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1065,8 +1059,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1147,8 +1141,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 094ab6e899d..c415490dd57 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -20,15 +20,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 14:02+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -155,8 +155,8 @@ msgid "Based on the timesheet"
 msgstr "Үндсэн цагийн хуудас"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -211,8 +211,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -264,9 +264,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -507,11 +507,6 @@ msgstr "#Нийт цагийн хуудас"
 msgid "hr.timesheet.current.open"
 msgstr "Одоогийн нээлттэй цаг бүртгэл"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Батлах"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -732,10 +727,9 @@ msgid "Timesheet range"
 msgstr "Цаг бүртгэлийн хүрээ"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Өөрийн бүх цаг бүртгэлийг 7 хоногоор харах"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -817,7 +811,7 @@ msgid "Search Account"
 msgstr "Данс Хайх"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -879,9 +873,9 @@ msgid "Cancel"
 msgstr "Цуцлах"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Өөрийн бүх цаг бүртгэлийг 7 хоногоор харах"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Батлах"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -988,9 +982,9 @@ msgid "May"
 msgstr "5 сар"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Журнал"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Даалгавар дах ажлын товчоог тодорхойлно!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1088,8 +1082,8 @@ msgid "Invoice rate"
 msgstr "Нэхэмжлэлийн хөнгөлөлтийн харьцаа"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1170,9 +1164,9 @@ msgid "Total"
 msgstr "Нийт"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Даалгавар дах ажлын товчоог тодорхойлно!"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Журнал"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index 0e6b2bb9e27..699be1e7e4e 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-01 16:26+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Gebaseerd op de urenstaat"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr "U kunt geen wijziging doen in een geaccordeerde tijdsregistratie."
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr "Maak een personeelslid aan en koppel deze aan de gebruiker."
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -251,9 +251,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -497,11 +497,6 @@ msgstr "#Totaal urenstaat"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Gecontroleerd"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -722,10 +717,9 @@ msgid "Timesheet range"
 msgstr "Urenstaat bereik"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Mijn totale aanwezigheid per week"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -807,7 +801,7 @@ msgid "Search Account"
 msgstr "Rekening zoeken"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -870,9 +864,9 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Mijn totale aanwezigheid per week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Gecontroleerd"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -979,9 +973,9 @@ msgid "May"
 msgstr "Mei"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Dagboek"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Definieert de werk samenvatting van de taak"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1079,8 +1073,8 @@ msgid "Invoice rate"
 msgstr "Factuur tarief"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr "Gebruikersfout!"
@@ -1161,9 +1155,9 @@ msgid "Total"
 msgstr "Totaal"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Definieert de werk samenvatting van de taak"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Dagboek"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index 0aa62c2ca3e..c2f1bdc53b0 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-10 10:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index ea55c9fb64d..ed3b4746f28 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 20:58+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -146,8 +146,8 @@ msgid "Based on the timesheet"
 msgstr "Na podstawie karty"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr "Nie możesz modyfikować zapisów w potwierdzonej karcie pracy."
@@ -202,8 +202,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr "Utwórz pracownika i przypisz do tego użytkownika."
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -260,9 +260,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -509,11 +509,6 @@ msgstr "#Suma czasu pracy"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Zatwierdzone"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -752,10 +747,9 @@ msgid "Timesheet range"
 msgstr "Zakres kart"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Moja suma ibecności wg tygodni"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -840,7 +834,7 @@ msgid "Search Account"
 msgstr "Szukaj konta"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr "Nie możesz modyfikować zapisu w potwierdzonej karcie pracy"
@@ -904,9 +898,9 @@ msgid "Cancel"
 msgstr "Anulowanie"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Moja suma ibecności wg tygodni"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Zatwierdzone"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -1013,9 +1007,9 @@ msgid "May"
 msgstr "Maj"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Dziennik"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Definiuje podsumowanie pracy w zadaniu"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1114,8 +1108,8 @@ msgid "Invoice rate"
 msgstr "Współczynnik fakturowania"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr "Błąd użytkownika!"
@@ -1196,9 +1190,9 @@ msgid "Total"
 msgstr "Suma"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Definiuje podsumowanie pracy w zadaniu"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Dziennik"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 08902d5f6a9..74fee68d4b4 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 16:53+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Baseado na Folha de Horas"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -250,9 +250,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -493,11 +493,6 @@ msgstr "#Total Timesheet"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validado"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -718,10 +713,9 @@ msgid "Timesheet range"
 msgstr "Série da Folha de Horas"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Total de Presenças por Semana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -803,7 +797,7 @@ msgid "Search Account"
 msgstr "Pesquisar Conta"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -865,9 +859,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Total de Presenças por Semana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -974,9 +968,9 @@ msgid "May"
 msgstr "Maio"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Diário"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Define as tarefas do sumário de trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1074,8 +1068,8 @@ msgid "Invoice rate"
 msgstr "Taxa da Fatura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr "Erro do utilizador!"
@@ -1156,9 +1150,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Define as tarefas do sumário de trabalho"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diário"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 4fe0d59a19a..c284394382e 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 14:56+0000\n"
 "Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr "Baseado na planilha de apontamento"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -252,9 +252,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -495,11 +495,6 @@ msgstr "#Folha de Horas Totais"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validado"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -720,10 +715,9 @@ msgid "Timesheet range"
 msgstr "Faixa da Folha de Horas"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Minha Presença por Semana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -805,7 +799,7 @@ msgid "Search Account"
 msgstr "Buscar Conta"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -868,9 +862,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Minha Presença por Semana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -977,9 +971,9 @@ msgid "May"
 msgstr "Maio"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Diário"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Define o resumo de trabalho da tarefa"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1077,8 +1071,8 @@ msgid "Invoice rate"
 msgstr "Taxa da Fatura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1159,9 +1153,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Define o resumo de trabalho da tarefa"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diário"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index 89054ba01b0..f4f79c49236 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Bazat pe fisa de pontaj"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -251,9 +251,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -494,11 +494,6 @@ msgstr "#Total Fise de pontaj"
 msgid "hr.timesheet.current.open"
 msgstr "ru.deschide.fisa de pontaj.curenta"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validat(a)"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -719,10 +714,9 @@ msgid "Timesheet range"
 msgstr "Limita fisei de pontaj"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Prezenta mea totala dupa Saptamana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -804,7 +798,7 @@ msgid "Search Account"
 msgstr "Cautati Cont"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -866,9 +860,9 @@ msgid "Cancel"
 msgstr "Anulati"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Prezenta mea totala dupa Saptamana"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validat(a)"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -975,9 +969,9 @@ msgid "May"
 msgstr "Mai"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Jurnal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Defineste rezumatul activitatii"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1075,8 +1069,8 @@ msgid "Invoice rate"
 msgstr "Rata factura"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1157,9 +1151,9 @@ msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Defineste rezumatul activitatii"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Jurnal"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index b6fdb572abe..8d261862da7 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "На основе расписания"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -251,9 +251,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -494,11 +494,6 @@ msgstr "#Итого расписание"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Проверено"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -719,10 +714,9 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Моя посещаемость за неделю"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -804,7 +798,7 @@ msgid "Search Account"
 msgstr "Поиск счёта"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -864,9 +858,9 @@ msgid "Cancel"
 msgstr "Отменить"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Моя посещаемость за неделю"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Проверено"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -973,8 +967,8 @@ msgid "May"
 msgstr "Май"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1073,8 +1067,8 @@ msgid "Invoice rate"
 msgstr "Ставка счета"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1155,8 +1149,8 @@ msgid "Total"
 msgstr "Всего"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index 6fc35004ce4..7f8ef40fa08 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-16 02:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr "Skupaj"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 1ae43a443dd..e20216533ce 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -711,9 +706,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -796,7 +790,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -856,8 +850,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -965,8 +959,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1065,8 +1059,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1147,8 +1141,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index ad67f36d03d..589acbdb103 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-16 15:49+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "Baserat på tidrapporten"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -250,9 +250,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -493,11 +493,6 @@ msgstr "# Totalt Tidrapport"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "Validerad"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -718,10 +713,9 @@ msgid "Timesheet range"
 msgstr "Tidrapport område"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Min totala närvaro per vecka"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -803,7 +797,7 @@ msgid "Search Account"
 msgstr "Sök Konto"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -865,9 +859,9 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "Min totala närvaro per vecka"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validerad"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -974,9 +968,9 @@ msgid "May"
 msgstr "Maj"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Definierar arbetssammanfattningen av uppgiften"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1074,8 +1068,8 @@ msgid "Invoice rate"
 msgstr "Fakturakostnad"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1156,9 +1150,9 @@ msgid "Total"
 msgstr "Totalt"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "Definierar arbetssammanfattningen av uppgiften"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Journal"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 80bb4b1d647..d6272da1600 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 4c3489788e9..0b58ab29ef8 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr "Toplam"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index fad8b1987dd..78981288936 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 11:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr "Норма накладних"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index f4f60acfa4d..668f432a7f6 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-25 15:26+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -142,8 +142,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -198,8 +198,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -245,9 +245,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -488,11 +488,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -711,9 +706,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -796,7 +790,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -856,8 +850,8 @@ msgid "Cancel"
 msgstr "Hủy bỏ"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -965,8 +959,8 @@ msgid "May"
 msgstr "Tháng Năm"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1065,8 +1059,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1147,8 +1141,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index bd71e52ef2f..5a50766454a 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-01 08:13+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr "根据计工单"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -246,9 +246,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -489,11 +489,6 @@ msgstr "# 总计工单"
 msgid "hr.timesheet.current.open"
 msgstr "hr.timesheet.current.open"
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr "已生效"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -712,10 +707,9 @@ msgid "Timesheet range"
 msgstr "计工单范围"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "周我的总考勤"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -797,7 +791,7 @@ msgid "Search Account"
 msgstr "查找辅助核算项"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -857,9 +851,9 @@ msgid "Cancel"
 msgstr "取消"
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
-msgstr "周我的总考勤"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "已生效"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -966,9 +960,9 @@ msgid "May"
 msgstr "5月"
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
-msgstr "账簿"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "定义任务的工作摘要"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1066,8 +1060,8 @@ msgid "Invoice rate"
 msgstr "发票税率"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1148,9 +1142,9 @@ msgid "Total"
 msgstr "合计"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
-msgstr "定义任务的工作摘要"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "账簿"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index 85383e9e846..86c67352d94 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-01-30 13:14+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -141,8 +141,8 @@ msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
@@ -197,8 +197,8 @@ msgid "Please create an employee and associate it with this user."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
@@ -244,9 +244,9 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
@@ -487,11 +487,6 @@ msgstr ""
 msgid "hr.timesheet.current.open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
 #, python-format
@@ -710,9 +705,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -795,7 +789,7 @@ msgid "Search Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
@@ -855,8 +849,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -964,8 +958,8 @@ msgid "May"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -1064,8 +1058,8 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -1146,8 +1140,8 @@ msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
-msgid "Defines the work summary of task"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/knowledge/i18n/ar.po b/addons/knowledge/i18n/ar.po
index fdaf64d7d81..ee8cf7be998 100644
--- a/addons/knowledge/i18n/ar.po
+++ b/addons/knowledge/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-01 18:48+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/bg.po b/addons/knowledge/i18n/bg.po
index 1e41ae1f526..44d61d79386 100644
--- a/addons/knowledge/i18n/bg.po
+++ b/addons/knowledge/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-18 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/ca.po b/addons/knowledge/i18n/ca.po
index 90ca3ff7d40..d49b7d013c0 100644
--- a/addons/knowledge/i18n/ca.po
+++ b/addons/knowledge/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-06 21:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/cs.po b/addons/knowledge/i18n/cs.po
index 09b0cdb424c..0ca5018be5c 100644
--- a/addons/knowledge/i18n/cs.po
+++ b/addons/knowledge/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-05 17:16+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po
index fbd4ca94e52..340b41ddcc2 100644
--- a/addons/knowledge/i18n/da.po
+++ b/addons/knowledge/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-09 21:31+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index cd501c600e9..eb3acff4c90 100644
--- a/addons/knowledge/i18n/de.po
+++ b/addons/knowledge/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 21:53+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/en_GB.po b/addons/knowledge/i18n/en_GB.po
index 43b726ff5c4..1b7c90780d6 100644
--- a/addons/knowledge/i18n/en_GB.po
+++ b/addons/knowledge/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-13 09:03+0000\n"
 "Last-Translator: John Bradshaw <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index f744b32be17..616a2b6f69b 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 14:37+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/es_AR.po b/addons/knowledge/i18n/es_AR.po
index 290d831a5f8..f591323ee0e 100644
--- a/addons/knowledge/i18n/es_AR.po
+++ b/addons/knowledge/i18n/es_AR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-18 18:39+0000\n"
 "Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
 "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/es_CR.po b/addons/knowledge/i18n/es_CR.po
index feb358fcba7..fc5c80a86d9 100644
--- a/addons/knowledge/i18n/es_CR.po
+++ b/addons/knowledge/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-16 22:57+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/et.po b/addons/knowledge/i18n/et.po
index 334f0a345d1..fb5014c18c7 100644
--- a/addons/knowledge/i18n/et.po
+++ b/addons/knowledge/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-30 16:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/fi.po b/addons/knowledge/i18n/fi.po
index b286635745c..ce0bef22d22 100644
--- a/addons/knowledge/i18n/fi.po
+++ b/addons/knowledge/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 14:15+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index 4228d3b443d..22240109a63 100644
--- a/addons/knowledge/i18n/fr.po
+++ b/addons/knowledge/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 19:22+0000\n"
 "Last-Translator: Fabrice (OpenERP) <Unknown>\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: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/gl.po b/addons/knowledge/i18n/gl.po
index 3d79abc2f31..19fa2901c52 100644
--- a/addons/knowledge/i18n/gl.po
+++ b/addons/knowledge/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-22 22:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index e30b175b3df..cbd6c720f90 100644
--- a/addons/knowledge/i18n/hi.po
+++ b/addons/knowledge/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-05 07:27+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/hr.po b/addons/knowledge/i18n/hr.po
index 21c8d1042bb..7b8bcf87624 100644
--- a/addons/knowledge/i18n/hr.po
+++ b/addons/knowledge/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 20:33+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/hu.po b/addons/knowledge/i18n/hu.po
index 05fb6ac1115..d34305492f8 100644
--- a/addons/knowledge/i18n/hu.po
+++ b/addons/knowledge/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-01 10:13+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 77cd728772f..44ff625674a 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 22:35+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/ja.po b/addons/knowledge/i18n/ja.po
index 980eeb52de1..c40130eed77 100644
--- a/addons/knowledge/i18n/ja.po
+++ b/addons/knowledge/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-29 04:54+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/lo.po b/addons/knowledge/i18n/lo.po
index 44ab8863319..661652383cf 100644
--- a/addons/knowledge/i18n/lo.po
+++ b/addons/knowledge/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-19 09:09+0000\n"
 "Last-Translator: Phoxaysy <Unknown>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/lv.po b/addons/knowledge/i18n/lv.po
index be7306324e6..7531d89c109 100644
--- a/addons/knowledge/i18n/lv.po
+++ b/addons/knowledge/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-28 12:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 5d29f32282d..8f06a0378d0 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-19 23:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/nb.po b/addons/knowledge/i18n/nb.po
index 5d20f0ea832..24258fbef24 100644
--- a/addons/knowledge/i18n/nb.po
+++ b/addons/knowledge/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-23 10:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index fa9920eabbf..a0b33f1477f 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 14:14+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/nl_BE.po b/addons/knowledge/i18n/nl_BE.po
index 11070498f0c..4261f606a2e 100644
--- a/addons/knowledge/i18n/nl_BE.po
+++ b/addons/knowledge/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-02 07:31+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/pl.po b/addons/knowledge/i18n/pl.po
index de4be1b21c1..d6ede17d6ec 100644
--- a/addons/knowledge/i18n/pl.po
+++ b/addons/knowledge/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 10:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index 0fd88acbeaf..4327c377300 100644
--- a/addons/knowledge/i18n/pt.po
+++ b/addons/knowledge/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 17:01+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index f5d05c9e705..09aa5679907 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 16:47+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/ro.po b/addons/knowledge/i18n/ro.po
index 8cbc2736774..8038c4197e7 100644
--- a/addons/knowledge/i18n/ro.po
+++ b/addons/knowledge/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-20 20:11+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/ru.po b/addons/knowledge/i18n/ru.po
index fdc43f48eb2..d3751d3565f 100644
--- a/addons/knowledge/i18n/ru.po
+++ b/addons/knowledge/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-28 09:17+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/sk.po b/addons/knowledge/i18n/sk.po
index 4a9f50eaa2a..cf7ee703699 100644
--- a/addons/knowledge/i18n/sk.po
+++ b/addons/knowledge/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-23 13:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
index e324fbeb9ba..7ce13d52887 100644
--- a/addons/knowledge/i18n/sr.po
+++ b/addons/knowledge/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-14 07:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index cc9fc97ca4c..d4ad7c81659 100644
--- a/addons/knowledge/i18n/sr@latin.po
+++ b/addons/knowledge/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-19 11:56+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 2a60873e8fe..e10fd13895b 100644
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-12 01:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/tr.po b/addons/knowledge/i18n/tr.po
index f4a066b7739..c46a74cd444 100644
--- a/addons/knowledge/i18n/tr.po
+++ b/addons/knowledge/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-12 08:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index 8e6896c96a0..f1dbf805ee4 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 08:39+0000\n"
 "Last-Translator: hifly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/knowledge/i18n/zh_TW.po b/addons/knowledge/i18n/zh_TW.po
index 4ce217ba6a2..4e7d994a174 100644
--- a/addons/knowledge/i18n/zh_TW.po
+++ b/addons/knowledge/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-19 10:38+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
diff --git a/addons/lunch/i18n/ar.po b/addons/lunch/i18n/ar.po
index 5563bac754f..183e41bfcb5 100644
--- a/addons/lunch/i18n/ar.po
+++ b/addons/lunch/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-12 22:03+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/bg.po b/addons/lunch/i18n/bg.po
index 48f02ab5f6f..6ec10a523fd 100644
--- a/addons/lunch/i18n/bg.po
+++ b/addons/lunch/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-22 19:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/ca.po b/addons/lunch/i18n/ca.po
index bd571bdb38e..3e7a298b539 100644
--- a/addons/lunch/i18n/ca.po
+++ b/addons/lunch/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/cs.po b/addons/lunch/i18n/cs.po
index e434e94329a..90ea8c9c876 100644
--- a/addons/lunch/i18n/cs.po
+++ b/addons/lunch/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: lunch
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Nový"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/da.po b/addons/lunch/i18n/da.po
index 0edfe72561f..091fb485955 100644
--- a/addons/lunch/i18n/da.po
+++ b/addons/lunch/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index cab1e677e75..1f31fe603d7 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Ferdinand-camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Neu"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index 6ed6db7c01f..2997076d036 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-14 16:08+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 11:14+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -218,7 +218,7 @@ msgid "Lunch Alert"
 msgstr "Alerta de comida"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -276,7 +276,7 @@ msgid "New"
 msgstr "Nuevo"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr "Ésta es la primera vez que pide una comida"
@@ -332,11 +332,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr "Cuentas de control"
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr "Pago de los empleados"
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -503,7 +498,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr "Añadir"
@@ -783,7 +778,7 @@ msgstr ""
 "            "
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr "Sus comidas favoritas se crearán en base a los últimos pedidos."
@@ -828,7 +823,7 @@ msgid "Recurrency"
 msgstr "Recurrencia"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr "No olvide las alertas mostradas en el área rojiza."
@@ -888,6 +883,11 @@ msgstr "Árbol de movimientos de caja"
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr "Cancelar una comida significa que no la ha recibido del proveedor."
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr "Pagos de los empleados"
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/es_CR.po b/addons/lunch/i18n/es_CR.po
index 7f1b3b96450..425d73f3c8f 100644
--- a/addons/lunch/i18n/es_CR.po
+++ b/addons/lunch/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 19:52+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: lunch
@@ -198,7 +198,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -255,7 +255,7 @@ msgid "New"
 msgstr "Nuevo"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -309,11 +309,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -453,7 +448,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -697,7 +692,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -731,7 +726,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -791,6 +786,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/es_PY.po b/addons/lunch/i18n/es_PY.po
index 4f95e688194..66887360aaf 100644
--- a/addons/lunch/i18n/es_PY.po
+++ b/addons/lunch/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-21 16:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/fi.po b/addons/lunch/i18n/fi.po
index ebc5645687b..fb81e43282a 100644
--- a/addons/lunch/i18n/fi.po
+++ b/addons/lunch/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-19 16:47+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index 536311bcdb3..d0856491f98 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 15:04+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Nouveau"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/gl.po b/addons/lunch/i18n/gl.po
index b2637a0e4d8..0c87d8c9be4 100644
--- a/addons/lunch/i18n/gl.po
+++ b/addons/lunch/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/hr.po b/addons/lunch/i18n/hr.po
index 45f8c3e5fa5..fd4dfac06fa 100644
--- a/addons/lunch/i18n/hr.po
+++ b/addons/lunch/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 17:25+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/hu.po b/addons/lunch/i18n/hu.po
index b18eb4185ab..fc179487f2e 100644
--- a/addons/lunch/i18n/hu.po
+++ b/addons/lunch/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:38+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -196,7 +196,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -253,7 +253,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -307,11 +307,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -451,7 +446,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -695,7 +690,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -729,7 +724,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -789,6 +784,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/it.po b/addons/lunch/i18n/it.po
index 1c22d5c2aed..f36d1eb9707 100644
--- a/addons/lunch/i18n/it.po
+++ b/addons/lunch/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:14+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
index bd56ac9b563..381b2811f5d 100644
--- a/addons/lunch/i18n/ja.po
+++ b/addons/lunch/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:44+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "新規"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/nl.po b/addons/lunch/i18n/nl.po
index 4614cfe649c..a8f7c084d7b 100644
--- a/addons/lunch/i18n/nl.po
+++ b/addons/lunch/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-29 09:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Nieuw"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/pt.po b/addons/lunch/i18n/pt.po
index 4d71f6475c9..e826782420e 100644
--- a/addons/lunch/i18n/pt.po
+++ b/addons/lunch/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 14:55+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Novo"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr "Recorrência"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po
index 310622d7bf1..f4f7757a0e1 100644
--- a/addons/lunch/i18n/pt_BR.po
+++ b/addons/lunch/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-17 00:27+0000\n"
 "Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Novo"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/ro.po b/addons/lunch/i18n/ro.po
index 1cd349e8fc9..231e1500a14 100644
--- a/addons/lunch/i18n/ro.po
+++ b/addons/lunch/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Nou(a)"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po
index 89ce878fd4b..a71caa1218d 100644
--- a/addons/lunch/i18n/ru.po
+++ b/addons/lunch/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:01+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/sr@latin.po b/addons/lunch/i18n/sr@latin.po
index 887ccfcec88..c88e5084f83 100644
--- a/addons/lunch/i18n/sr@latin.po
+++ b/addons/lunch/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 18:23+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/sv.po b/addons/lunch/i18n/sv.po
index 253ab1e2fbc..1ed7a7d478c 100644
--- a/addons/lunch/i18n/sv.po
+++ b/addons/lunch/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-27 11:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "Ny"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/tr.po b/addons/lunch/i18n/tr.po
index b05681d8176..d28982e76cc 100644
--- a/addons/lunch/i18n/tr.po
+++ b/addons/lunch/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 17:28+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index bbdc5865ed5..4c4025369bd 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 11:04+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr "午餐提醒"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr "新建"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr "这是你第一次订购食品"
@@ -310,11 +310,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr "员工的支付"
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -454,7 +449,7 @@ msgid "Note"
 msgstr "说明"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr "新增"
@@ -698,7 +693,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr "你食物收藏夹基于最后一次订单创建。"
@@ -732,7 +727,7 @@ msgid "Recurrency"
 msgstr "循环"
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr "不要忘记红色区域显示的提示信息。"
@@ -792,6 +787,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr "取消我们不能从供应商出接收的食物。"
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/lunch/i18n/zh_TW.po b/addons/lunch/i18n/zh_TW.po
index f5d9a182d42..efd0a6f610c 100644
--- a/addons/lunch/i18n/zh_TW.po
+++ b/addons/lunch/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-09-27 08:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -197,7 +197,7 @@ msgid "Lunch Alert"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
@@ -254,7 +254,7 @@ msgid "New"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
 msgstr ""
@@ -308,11 +308,6 @@ msgstr ""
 msgid "Control Accounts"
 msgstr ""
 
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
@@ -452,7 +447,7 @@ msgid "Note"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
 msgstr ""
@@ -696,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
@@ -730,7 +725,7 @@ msgid "Recurrency"
 msgstr ""
 
 #. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
 msgstr ""
@@ -790,6 +785,11 @@ msgstr ""
 msgid "Cancel a meal means that we didn't receive it from the supplier."
 msgstr ""
 
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index dff485090b1..3bdeef17679 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-10 21:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "تفاصيل الرسالة"
 msgid "Message recipients"
 msgstr "رسالة المستلمين"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "رسالة جديدة"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr "مراجع"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "من"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "الرسائل"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "شهر"
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "نسخة"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "إلى"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr "oh]l الرسائل المرسلة"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "الرسائل"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 6c34bf906e8..9b9babf96e0 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/i18n/bg.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-28 20:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr ""
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr "Отпратки"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "От"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Съобщения"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Месец"
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Копие до"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "До"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Съобщения"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index 88ea3fc7145..fbbd8708483 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/i18n/ca.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-26 05:41+0000\n"
 "Last-Translator: cubells <vicent@vcubells.net>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Detalls del missatge"
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr "Referències"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "De"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Missatges"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Mes"
 msgid "Email Search"
 msgstr "Cerca email"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Per"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Missatges"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 7509f9a1a3e..6973e9b6b0c 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr ""
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr ""
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr ""
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index b2fd73623f9..510ef7dcef2 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 14:43+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,14 +15,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Feeds per E-Mail erhalten"
-
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
@@ -49,6 +44,11 @@ msgstr "Details Nachricht"
 msgid "Message recipients"
 msgstr "Mitteilung Empfänger"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -82,10 +82,10 @@ msgid "Compose Email"
 msgstr "Email schreiben"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -123,6 +123,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "E-Mail Assistent"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -132,16 +144,11 @@ msgstr "Ungelesene Nachrichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "Anzeigen"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Beitritt zur Gruppe wird im Standard überprüft"
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -154,7 +161,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Wollen Sie diese Nachricht wirklich löschen?"
@@ -172,13 +179,13 @@ msgstr "Gruppen suchen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "Followers"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Zugriff verweigert"
@@ -194,17 +201,38 @@ msgstr ""
 "heruntergerechnet unter Beibehaltung der Seitenverhältnisse. Benutzen Sie "
 "dieses Feld für Formulare oder in Kanban Ansichten."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Unterstützung"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+"Der gewünschte Vorgang kann aufgrund Sicherheitsbeschränkungen nicht "
+"ausgeführt werden. Bitte kontaktieren Sie den System Administrator.\n"
+"\n"
+"(Dokumenten Typ: %s, Vorgang: %s)"
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Empfangen"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Rich-Text Inhalt"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -241,7 +269,7 @@ msgstr "Referenzen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Keine Nachrichten"
@@ -261,10 +289,10 @@ msgstr "hochladen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Zurück in Inbox verschieben"
+msgid "more."
+msgstr ""
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -277,9 +305,12 @@ msgstr ""
 "Kommentar für andere Mitteilungen wie Diskussionsbeiträgen von Benutzern."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Einladungsassistent"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -335,14 +366,14 @@ msgstr "Nicht mehr folgen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "zeige weitere Nachricht"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ungültige Aktion!"
@@ -390,6 +421,11 @@ msgstr ""
 "Antwort auf einen bereits bestehenden Vorgang ist, erzeugt einen neuen "
 "Datensatz (z.B. Projekt Aufgabe)."
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -436,23 +472,11 @@ msgstr "Von"
 msgid "Email message"
 msgstr "EMail Nachricht"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Benutzer, die diese Nachricht in Ihren Favoriten verfolgen"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "ungelesen"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -460,7 +484,7 @@ msgstr "Senden"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "Keine Followers"
@@ -470,14 +494,9 @@ msgstr "Keine Followers"
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Won"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -497,19 +516,22 @@ msgstr "Archive"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Diesen Anhang löschen"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Nachricht-ID"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Antworten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Ein Follower"
@@ -538,12 +560,12 @@ msgid "Comments and Emails"
 msgstr "Kommentare und E-Mails"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Favorisierte Nachrichten"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Standardeinstellungen"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s ist dem %s Netzwerk beigetreten."
@@ -567,7 +589,7 @@ msgstr "Empfänger"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -634,7 +656,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "R&D"
 
@@ -656,21 +678,26 @@ msgid "Advanced"
 msgstr "Erweitert"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Antworten"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "ungelesen"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
@@ -679,16 +706,6 @@ msgstr ""
 "Sie können keinen neuen Benutzer anlegen. Um einen neuen Benutzer anzulegen "
 "benutzen Sie bitte das Menu \"Einstellungen > Benutzer\"."
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -697,7 +714,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "gefällt mir"
@@ -746,7 +763,7 @@ msgid "on"
 msgstr "am"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -764,6 +781,11 @@ msgstr ""
 "Ein Python Dictionary, das ausgewertet wird, wenn neue Datensätze für dieses "
 "Alias angelegt werden."
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -801,7 +823,7 @@ msgstr "ist Ankündigung"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht anlegen"
@@ -836,7 +858,7 @@ msgstr "Bild"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -868,23 +890,12 @@ msgstr "Monat"
 msgid "Email Search"
 msgstr "Suche EMail"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Abgebrochen"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "Kommentare"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr "Funkitonsfeld zur Suche ungelesener Nachrichten des Benutzers"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -897,21 +908,13 @@ msgstr "Benutzer"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Nachricht"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Zu erledigen"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -930,6 +933,13 @@ msgstr "Inhalte"
 msgid "Aliases"
 msgstr "Aliase"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -941,6 +951,12 @@ msgstr "Bewertungen"
 msgid "Group"
 msgstr "Gruppe"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -952,9 +968,11 @@ msgid "Notification"
 msgstr "Benachrichtigung"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Unterstützung"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -962,9 +980,9 @@ msgid "Add Followers"
 msgstr "Follower hinzufügen"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Geschlossen"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1070,7 +1088,7 @@ msgid "by"
 msgstr "durch"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "Bewährte Verkaufspraxis"
 
@@ -1088,9 +1106,7 @@ msgstr "Ist ein Follower"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
@@ -1122,16 +1138,6 @@ msgstr "Senden"
 msgid "Extended Filters..."
 msgstr "Erweiterte Filter..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1141,7 +1147,7 @@ msgstr "An:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Nachricht an meine Follower"
@@ -1158,18 +1164,28 @@ msgstr "Standard"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "Mehr Nachrichten anzeigen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Als zu erledigen markieren"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Einladungsassistent"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1177,6 +1193,12 @@ msgstr "Als zu erledigen markieren"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1190,9 +1212,16 @@ msgstr "Subtyp"
 msgid "Group Form"
 msgstr "Gruppen Formular"
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "mehr Nachrichten"
@@ -1233,9 +1262,17 @@ msgstr ""
 "diese Adresse gefunden wird."
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
-msgstr "Favorisierte Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Nachricht-ID"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1262,6 +1299,11 @@ msgstr "Nachrichten Name"
 msgid "Cc"
 msgstr "CC"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1283,17 +1325,11 @@ msgstr "Diskussionsgruppe"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "Erledigt"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr "Bezug zu Datenmodel: Im Fehlerfall existiert dieser Subtyp bereits."
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1307,7 +1343,12 @@ msgid "Follow"
 msgstr "Folgen"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Gesamtes Unternehmen"
 
@@ -1331,7 +1372,7 @@ msgstr "Monat Erstellung"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Eine neue Nachricht verfassen"
@@ -1351,34 +1392,12 @@ msgstr "Inhalt"
 msgid "To"
 msgstr "An"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "mail_message_subtype"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Privat"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Neu"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Benachrichtigter Partner"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "Andere einladen"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1389,10 +1408,17 @@ msgstr ""
 "mit dem Einladungsbutton hinzufügen."
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr "Vorstandssitzungen"
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1406,33 +1432,21 @@ msgstr "Eindeutige Identifikation der Nachricht"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Beschreibung"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "Stufe wurde geändert"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "Beleg Follower"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
-"Der gewünschte Vorgang kann aufgrund Sicherheitsbeschränkungen nicht "
-"ausgeführt werden. Bitte kontaktieren Sie den System Administrator.\n"
-"\n"
-"(Dokumenten Typ: %s, Vorgang: %s)"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1445,7 +1459,7 @@ msgid "Outgoing mail server"
 msgstr "Ausgehender Mailserver"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr "Partner E-Mail Adressen wurden nicht gefunden"
@@ -1457,11 +1471,15 @@ msgid "Sent"
 msgstr "Gesendet"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "Favoriten"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Rich-Text Inhalt"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1490,6 +1508,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1504,7 +1529,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Auf zu Erledigen setzen"
@@ -1522,14 +1547,9 @@ msgid "Filters"
 msgstr "Filter"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "Verloren"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Standardeinstellungen"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Feeds per E-Mail erhalten"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1541,18 +1561,28 @@ msgstr ""
 "OpenERP Server verknüpft ist, tragen Sie hier den Domain Namen ein."
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favoriten"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Nachrichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "andere ..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1627,7 +1657,7 @@ msgstr "zugehöriges Dokumenten-Modell"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1659,9 +1689,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Fehler bei der Kommunikation mit dem Supportserver aufgetreten."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr ""
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Privat"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1703,7 +1733,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "HR Richtlinien"
 
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index a27d2eb2769..13d53102b47 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-14 16:45+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 12:00+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Recibir feeds por correo electrónico"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Detalles del mensaje"
 msgid "Message recipients"
 msgstr "Destinatarios del mensaje"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr "Activado por defecto en la suscripción."
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -81,13 +81,11 @@ msgid "Compose Email"
 msgstr "Componer correo electrónico"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
-msgstr ""
-"Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': "
-"'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr "Añadirlos a los destinatarios y seguidores"
 
 #. module: mail
 #: view:mail.group:0
@@ -124,6 +122,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Asistente de redacción de correo electrónico."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr "Añadir otros"
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr "Padre"
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -133,16 +143,11 @@ msgstr "Mensajes sin leer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "mostrar"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Marcado por defecto cuando se suscribe."
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -155,7 +160,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "¿Realmente desea eliminar este mensaje?"
@@ -173,13 +178,13 @@ msgstr "Grupos de busqueda"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "seguidores"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Acceso denegado"
@@ -195,17 +200,38 @@ msgstr ""
 "128x128px manteniedo el ratio de aspecto. Use este campo en las vista de "
 "formulario y kanban."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr "Error de subida"
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Soporte"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+"La operación no ha podido ser completada por restricciones de seguridad. Por "
+"favor contacte con su administrador de sistema.\n"
+"\n"
+"(Tipo de documento: %s, Operación: %s)"
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Recibido"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Contenido con texto enriquecido"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -242,7 +268,7 @@ msgstr "Referencias"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Sin mensajes."
@@ -262,10 +288,10 @@ msgstr "subiendo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Volver a la bandeja de entrada"
+msgid "more."
+msgstr "más."
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -278,9 +304,15 @@ msgstr ""
 "de sistema, comment para otros tipos de mensaje como respuestas de usuarios."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Asistente de invitación"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+"Campo usado para enlazar el modelo relacionado al modelo de subtipo cuando "
+"se utiliza suscripción automática en el documento relacionado. El campo se "
+"usa para calcular getattr(relacionado.campo_relacionado)."
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -336,14 +368,14 @@ msgstr "Dejar de seguir"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "Mostrar un mensaje mas"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "¡Acción no válida!"
@@ -390,6 +422,11 @@ msgstr ""
 "correo entrante que no sea una respuesta de uno existente creará un nuevo "
 "registro de este modelo (p.e. una tarea de proyecto)"
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr "Campo relación"
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -436,23 +473,11 @@ msgstr "De"
 msgid "Email message"
 msgstr "Mensaje email"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Usuarios que marcan este mensaje en sus favoritos"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "Para leer"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -460,7 +485,7 @@ msgstr "Enviar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "No seguidores"
@@ -470,14 +495,9 @@ msgstr "No seguidores"
 msgid "Failed"
 msgstr "Fallido"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Ganado"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -497,19 +517,22 @@ msgstr "Archivados"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Eliminar este adjunto"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Id del mensaje"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Responder"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Un seguidor"
@@ -538,12 +561,12 @@ msgid "Comments and Emails"
 msgstr "Comentarios y correos electrónicos"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Mensajes favoritos"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Valores por defecto"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s se ha unido a la red %s."
@@ -567,7 +590,7 @@ msgstr "Destinatarios"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -633,7 +656,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "R&D"
 
@@ -655,21 +678,26 @@ msgid "Advanced"
 msgstr "Avanzado"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr "Mover a la bandeja de entrada"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Responder"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "Para leer"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
@@ -678,16 +706,6 @@ msgstr ""
 "No puede crear el usuario. Para crear un usuario debe usar el menú "
 "\"Configuración > Usuarios\"."
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -696,7 +714,7 @@ msgstr "Modelo del recurso seguido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "como"
@@ -743,7 +761,7 @@ msgid "on"
 msgstr "en"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -761,6 +779,11 @@ msgstr ""
 "Diccionario Python a evaluar para proporcionar valores por defecto cuando un "
 "nuevo registro se cree para este alias."
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr "Subtipos de mensaje"
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -807,7 +830,7 @@ msgstr "Es una notificación"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Redactar un nuevo mensaje"
@@ -842,7 +865,7 @@ msgstr "Foto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -874,23 +897,12 @@ msgstr "Mes"
 msgid "Email Search"
 msgstr "Buscar email"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Cancelado"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "Mensajes hijos"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr "Campo funcional para buscar mensajes que el usuario actual debe leer"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -903,21 +915,13 @@ msgstr "Usuarios"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Mensaje"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Por realizar"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -936,6 +940,15 @@ msgstr "Contenidos"
 msgid "Aliases"
 msgstr "Alias"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+"Descripción que se añadirá en el mensaje mandado para este subtipo. Si no se "
+"rellena, se pondrá el nombre en su lugar."
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -947,6 +960,13 @@ msgstr "Votos"
 msgid "Group"
 msgstr "Grupo"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+"El usuario actual tiene una notificación destacada asociada a este mensaje"
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -958,9 +978,11 @@ msgid "Notification"
 msgstr "Notificación"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Soporte"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr "Complete por favor la información de la empresa"
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -968,9 +990,9 @@ msgid "Add Followers"
 msgstr "Añadir seguidores"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Cerrado"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr "Seguidores de los elementos seleccionados y"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1075,7 +1097,7 @@ msgid "by"
 msgstr "por"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "Buenas prácticas de ventas"
 
@@ -1093,9 +1115,7 @@ msgstr "Es un seguidor"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Usuario"
 
@@ -1127,16 +1147,6 @@ msgstr "Enviado"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos electrónicos"
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1146,7 +1156,7 @@ msgstr "Para:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Escribir a mis seguidores"
@@ -1163,18 +1173,28 @@ msgstr "Por defecto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "ver más mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marcar 'Por realizar'"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr "Subtipo del padre, usado para la suscripción automática."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Asistente de invitación"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1182,6 +1202,14 @@ msgstr "Marcar 'Por realizar'"
 msgid "Summary"
 msgstr "Resumen"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+"Modelo al que aplica el subtipo. Si no está establecido, este subtipo aplica "
+"a todos los modelos."
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1195,9 +1223,16 @@ msgstr "Subtipo"
 msgid "Group Form"
 msgstr "Formulario de grupo"
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr "Destacado"
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "más mensajes"
@@ -1237,9 +1272,17 @@ msgstr ""
 "cuenta de administrador si no se encuentra un usuario para esa dirección."
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
-msgstr "Formulario de favorito"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr "Y"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Id del mensaje"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1268,6 +1311,11 @@ msgstr "Nombre de registro del mensaje"
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr "Mensaje destacado que va al buzón 'Por realizar'"
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1289,19 +1337,11 @@ msgstr "Grupo de debate"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "Hecho"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-"Modelo relacionado al subtipo. Si es falso, el subtipo existe para todos los "
-"modelos."
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1315,7 +1355,12 @@ msgid "Follow"
 msgstr "Seguir"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Compañia completa"
 
@@ -1339,7 +1384,7 @@ msgstr "Mes de creación"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Redactar un nuevo mensaje"
@@ -1359,34 +1404,12 @@ msgstr "Contenido"
 msgid "To"
 msgstr "Para"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "Subtipo de mensaje de correo"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Privado"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Nuevo"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Empresas notificadas"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "invitar a otros"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1397,10 +1420,19 @@ msgstr ""
 "añadir miembros a través del botón invitar."
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr "Tablero de citas"
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+"Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': "
+"'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1414,33 +1446,21 @@ msgstr "Identificador único del mensaje"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Descripción"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "Fase cambiada"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "Seguidores del documento"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
-msgstr ""
-"La operación no ha podido ser completada por restricciones de seguridad. Por "
-"favor contacte con su administrador de sistema.\n"
-"\n"
-"(Tipo de documento: %s, Operación: %s)"
+msgid "Remove this follower"
+msgstr "Eliminar este seguidor"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1453,7 +1473,7 @@ msgid "Outgoing mail server"
 msgstr "Servidor de correos salientes"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr "Dirección de correo de la empresa no encontrada"
@@ -1465,11 +1485,16 @@ msgid "Sent"
 msgstr "Enviado"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "Favoritos"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Contenido con texto enriquecido"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+"El usuario actual tiene una notificación sin leer asociada a este mensaje"
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1497,6 +1522,13 @@ msgstr ""
 "</p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr "Por favor, espere mientras el archivo sube."
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1510,7 +1542,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Restablecer a 'Por realizar'"
@@ -1528,14 +1560,9 @@ msgid "Filters"
 msgstr "Filtros"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "Perdido"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Valores por defecto"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Recibir feeds por correo electrónico"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1547,18 +1574,28 @@ msgstr ""
 "de OpenERP, introduzca el nombre del dominio aquí."
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favorito"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "otros..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr "Por realizar"
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1636,7 +1673,7 @@ msgstr "Model de documento relacionado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr "no es como"
@@ -1670,9 +1707,9 @@ msgstr ""
 "OpenERP."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr "Votación de correo"
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Privado"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1713,7 +1750,7 @@ msgid "Initial thread message."
 msgstr "Mensaje inicial del hilo"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "Políticas de RRHH"
 
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index 706e399925f..5c0f06428ad 100644
--- a/addons/mail/i18n/es_CR.po
+++ b/addons/mail/i18n/es_CR.po
@@ -7,22 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-17 20:07+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
-
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
@@ -49,6 +44,11 @@ msgstr "Detalles del mensaje"
 msgid "Message recipients"
 msgstr "Destinatarios del mensaje"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -80,10 +80,10 @@ msgid "Compose Email"
 msgstr "Componer correo electrónico"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -119,6 +119,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -128,16 +140,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -147,7 +154,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -165,13 +172,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,17 +191,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Recibido"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -231,7 +255,7 @@ msgstr "Referencias"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -251,9 +275,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -265,8 +289,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -323,14 +350,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -372,6 +399,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -418,23 +450,11 @@ msgstr "De"
 msgid "Email message"
 msgstr "Mensaje email"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -442,7 +462,7 @@ msgstr "Enviar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -452,14 +472,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Fallido"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -479,19 +494,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Id del mensaje"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Responder"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -520,12 +538,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -546,7 +564,7 @@ msgstr "Destinatarios"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -605,7 +623,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -627,37 +645,32 @@ msgid "Advanced"
 msgstr "Avanzado"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Responder"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -666,7 +679,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -713,7 +726,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -727,6 +740,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -763,7 +781,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -794,7 +812,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -824,23 +842,12 @@ msgstr "Mes"
 msgid "Email Search"
 msgstr "Buscar email"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -853,21 +860,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -886,6 +885,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -897,6 +903,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -908,8 +920,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -918,8 +932,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1008,7 +1022,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1026,9 +1040,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Usuario"
 
@@ -1060,16 +1072,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1079,7 +1081,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1096,18 +1098,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1115,6 +1127,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1128,9 +1146,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1164,10 +1189,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Id del mensaje"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1193,6 +1226,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1214,17 +1252,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1238,7 +1270,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1262,7 +1299,7 @@ msgstr "Mes de creación"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1282,34 +1319,12 @@ msgstr ""
 msgid "To"
 msgstr "Para"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1318,10 +1333,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1335,28 +1357,20 @@ msgstr "Identificador único del mensaje"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1370,7 +1384,7 @@ msgid "Outgoing mail server"
 msgstr "Servidor de correos salientes"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1382,10 +1396,14 @@ msgid "Sent"
 msgstr "Enviar"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1409,6 +1427,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1420,7 +1445,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1438,13 +1463,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1455,18 +1475,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1541,7 +1571,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1571,8 +1601,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1606,7 +1636,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index 0ea146cce4e..84289d61b84 100644
--- a/addons/mail/i18n/es_PY.po
+++ b/addons/mail/i18n/es_PY.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-22 10:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr ""
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr ""
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr ""
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po
index 2750fbccc5e..0af8415e25e 100644
--- a/addons/mail/i18n/et.po
+++ b/addons/mail/i18n/et.po
@@ -7,21 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 20:42+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
-
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
@@ -48,6 +43,11 @@ msgstr "Sõnumid detailid"
 msgid "Message recipients"
 msgstr "Sõnumi saajad"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Koosta e-kiri"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr "Lugemata sõnumid"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "näita"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Juurdepääs keelatud"
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Vastu võetud"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Viited"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Sõnumeid pole."
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr "Lõpeta jälgimine"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr ""
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Saada"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr "Arhiivid"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Üks jälgija"
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Saajad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -610,7 +628,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -632,37 +650,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -671,7 +684,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -718,7 +731,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -732,6 +745,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -777,7 +795,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Koosta uus sõnum"
@@ -808,7 +826,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -838,23 +856,12 @@ msgstr ""
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -867,21 +874,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Teha"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -900,6 +899,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -911,6 +917,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -922,8 +934,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -932,8 +946,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1022,7 +1036,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1040,9 +1054,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1074,16 +1086,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1093,7 +1095,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Kirjuta minu jälgijatele"
@@ -1110,18 +1112,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Märgi tegemist vajavaks"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1129,6 +1141,12 @@ msgstr "Märgi tegemist vajavaks"
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1142,9 +1160,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1178,8 +1203,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1207,6 +1240,11 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1227,17 +1265,11 @@ msgstr "Arutelu Grupp"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1251,7 +1283,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Terve Ettevõte"
 
@@ -1275,7 +1312,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Koosta uus sõnum"
@@ -1295,34 +1332,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Isiklik"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "Kutsu teisi"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1331,10 +1346,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1348,28 +1370,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1383,7 +1397,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1395,10 +1409,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1422,6 +1440,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1433,7 +1458,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1451,13 +1476,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1468,18 +1488,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1552,7 +1582,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1582,9 +1612,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr ""
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Isiklik"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1617,7 +1647,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index 98350180c9b..fc524caa556 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-20 10:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Viestin tiedot"
 msgid "Message recipients"
 msgstr "Viestin vastaanottajat"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Luo sähköposti"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Vastaanotettu"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Viitteet"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Lähettäjä"
 msgid "Email message"
 msgstr "Sähköpostiviesti"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Lähetä"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Viestin ID"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Vastaa"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Vastaanottajat"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Lisäasetukset"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Viite:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Vastaa"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Viestit"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Kuukausi"
 msgid "Email Search"
 msgstr "Sähköpostin haku"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Laajennetut suodattimet..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Viestin ID"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Kopio"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1213,17 +1251,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1237,7 +1269,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1261,7 +1298,7 @@ msgstr "Luontikuukausi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1281,34 +1318,12 @@ msgstr ""
 msgid "To"
 msgstr "Vastaanottaja"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1317,10 +1332,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1334,28 +1356,20 @@ msgstr "Viestin uniikki tunniste"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1369,7 +1383,7 @@ msgid "Outgoing mail server"
 msgstr "Lähtevän postin palvelin"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1381,10 +1395,14 @@ msgid "Sent"
 msgstr "Lähetetty"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1408,6 +1426,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1419,7 +1444,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1437,13 +1462,8 @@ msgid "Filters"
 msgstr "Suotimet"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1454,18 +1474,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1538,7 +1568,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1568,8 +1598,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1603,7 +1633,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 026e2a46c7f..9104da09435 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -7,21 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 14:34+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Flux à recevoir par courriel"
-
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
@@ -48,6 +43,11 @@ msgstr "Détails du message"
 msgid "Message recipients"
 msgstr "Destinataires du message"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,13 +79,11 @@ msgid "Compose Email"
 msgstr "Rédiger un courriel"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
-"Expression invalide : une définition litérale d'un dictionnaire Python est "
-"attendue, par exemple \"{'field': 'value'}\""
 
 #. module: mail
 #: view:mail.group:0
@@ -122,6 +120,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Assistant de composition de courriel"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -131,16 +141,11 @@ msgstr "Messages non lus"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "montrer"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -152,7 +157,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce message ?"
@@ -170,13 +175,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "abonnés"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Accès refusé"
@@ -192,17 +197,34 @@ msgstr ""
 "préservant les proportions. Utilisez ce champ dans les formulaires ou dans "
 "les vues Kanban."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Reçu"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -239,7 +261,7 @@ msgstr "Références"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Aucun message"
@@ -259,9 +281,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -273,8 +295,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -331,14 +356,14 @@ msgstr "Ne plus suivre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "afficher un message de plus"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Action invalide !"
@@ -380,6 +405,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -426,23 +456,11 @@ msgstr "De"
 msgid "Email message"
 msgstr "Message du courriel"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "À lire"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -450,7 +468,7 @@ msgstr "Envoyé"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -460,14 +478,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Échec"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Gagné"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -487,19 +500,22 @@ msgstr "Archives"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Supprimer cette pièce jointe"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "ID du message"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Répondre"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Un abonné"
@@ -528,12 +544,12 @@ msgid "Comments and Emails"
 msgstr "Commentaires et courriels"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Messages favoris"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s a rejoint le réseau %s."
@@ -554,7 +570,7 @@ msgstr "Destinataires"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -620,7 +636,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -642,37 +658,32 @@ msgid "Advanced"
 msgstr "Avancée"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Répondre"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "À lire"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Messages"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -681,7 +692,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "comme"
@@ -728,7 +739,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -742,6 +753,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -790,7 +806,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Rédiger un nouveau message"
@@ -821,7 +837,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -851,23 +867,12 @@ msgstr "Mois"
 msgid "Email Search"
 msgstr "Recherche des emails"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -880,21 +885,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "À faire"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -913,6 +910,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -924,6 +928,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -935,8 +945,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -945,8 +957,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1035,7 +1047,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1053,9 +1065,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
@@ -1087,16 +1097,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1106,7 +1106,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Écrire à mes abonnés"
@@ -1123,18 +1123,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marqué comme 'À faire'"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1142,6 +1152,12 @@ msgstr "Marqué comme 'À faire'"
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1155,9 +1171,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1191,10 +1214,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "ID du message"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1220,6 +1251,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Copie à (CC)"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1240,17 +1276,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1264,7 +1294,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Toute la société"
 
@@ -1288,7 +1323,7 @@ msgstr "Mois de création"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1308,34 +1343,12 @@ msgstr ""
 msgid "To"
 msgstr "À"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1344,10 +1357,19 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+"Expression invalide : une définition litérale d'un dictionnaire Python est "
+"attendue, par exemple \"{'field': 'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1361,28 +1383,20 @@ msgstr "Identifiant unique de message"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1396,7 +1410,7 @@ msgid "Outgoing mail server"
 msgstr "Serveur courriel sortant"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1408,10 +1422,14 @@ msgid "Sent"
 msgstr "Envoyé"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1435,6 +1453,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1446,7 +1471,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Remettre dans 'À faire'"
@@ -1464,14 +1489,9 @@ msgid "Filters"
 msgstr "Filtres"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr ""
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Flux à recevoir par courriel"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1481,18 +1501,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Messages"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1566,7 +1596,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1596,8 +1626,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1631,7 +1661,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index da176670708..67f9bac0e01 100644
--- a/addons/mail/i18n/gl.po
+++ b/addons/mail/i18n/gl.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-22 10:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Detalles da mensaxe"
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr "Referencias"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Desde"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mensaxes"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Mes"
 msgid "Email Search"
 msgstr "Buscar e-mail"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Ata"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index dc5b3bacbf0..f34a2a4cbf7 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-11 16:27+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Detalji porukue"
 msgid "Message recipients"
 msgstr "Primatelji poruke"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Sastavi e-poštu"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Čarobnjak za sastavljanje e-pošte"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr "Nepročitane poruke"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "prikaži"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Primljeno"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Formatirani tekst"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Reference"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Nema poruka."
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr "Ne slijedi više"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Od"
 msgid "Email message"
 msgstr "Poruka e-pošte"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Pošalji"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Neuspjelo"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr "Arhive"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Obriši privitak"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr ""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Odgovor"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Jedan pratitelj"
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr "Komentari i mailovi"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Primatelji"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Napredno"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Odgovor"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Poruke"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Mjesec"
 msgid "Email Search"
 msgstr "Pretraga e-pošte"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Prošireni filteri..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr "Mjesec kreiranja"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Za"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr "Jedinstveni identifikator poruke"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr "Izlazni poslužitelj e-pošte"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr "Poslano"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Formatirani tekst"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr "Filteri"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr "Povezani model dokumenta"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index ee5933dabc7..65385c23ef0 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -6,20 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-16 09:20+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 10:09+0000\n"
 "Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -47,6 +42,11 @@ msgstr "Üzenet részletei"
 msgid "Message recipients"
 msgstr "Üzenet címzettjei"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -78,10 +78,10 @@ msgid "Compose Email"
 msgstr "Email írás"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -117,6 +117,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Email varázsló"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -126,16 +138,11 @@ msgstr "Olvasatlan üzenetek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "mutat"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -145,7 +152,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Valóban törölni kívánja ezt az üzenetet?"
@@ -163,13 +170,13 @@ msgstr "Csoportok keresése"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "Követők"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Hozzáférés megtagadva"
@@ -182,17 +189,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Fogadott"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -229,7 +253,7 @@ msgstr "Hivatkozások"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -249,9 +273,9 @@ msgstr "feltöltés"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -263,8 +287,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -321,14 +348,14 @@ msgstr "Követés leállításA"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -370,6 +397,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -385,7 +417,7 @@ msgstr "Partner"
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_my_stuff
 msgid "Organizer"
-msgstr ""
+msgstr "Szervező"
 
 #. module: mail
 #: field:mail.compose.message,subject:0
@@ -416,23 +448,11 @@ msgstr "Feladó"
 msgid "Email message"
 msgstr "Email üzenet"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -440,7 +460,7 @@ msgstr "Küldés"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -450,14 +470,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Sikertelen"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -472,24 +487,27 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr ""
+msgstr "Archívum"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr ""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Válasz"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -518,12 +536,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -544,7 +562,7 @@ msgstr "Címzettek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -603,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -625,37 +643,32 @@ msgid "Advanced"
 msgstr "Speciális"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Válasz"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Üzenetek"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -664,7 +677,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -711,7 +724,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -725,6 +738,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -761,7 +779,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -792,7 +810,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -822,23 +840,12 @@ msgstr "Hónap"
 msgid "Email Search"
 msgstr "E-mail keresésée"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -851,21 +858,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -884,6 +883,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -895,6 +901,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -906,8 +918,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -916,8 +930,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1006,7 +1020,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1024,9 +1038,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
@@ -1058,16 +1070,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1077,7 +1079,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1094,16 +1096,26 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
+msgstr "Megjelölés feladatkét"
+
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
 msgstr ""
 
 #. module: mail
@@ -1113,6 +1125,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1126,9 +1144,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1162,8 +1187,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1191,6 +1224,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Másolat"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1211,17 +1249,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1235,7 +1267,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Teljes vállalat"
 
@@ -1259,7 +1296,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1279,34 +1316,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1315,10 +1330,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1332,28 +1354,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1367,7 +1381,7 @@ msgid "Outgoing mail server"
 msgstr "Kimenő levelező szerver"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1379,10 +1393,14 @@ msgid "Sent"
 msgstr "Elküldött"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1406,6 +1424,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1417,10 +1442,10 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Visszahelyezés a feladatokhoz"
 
 #. module: mail
 #. openerp-web
@@ -1435,13 +1460,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1452,18 +1472,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Üzenetek"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1489,7 +1519,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Üzenetek"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1536,7 +1566,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1566,8 +1596,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1601,7 +1631,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
@@ -1614,7 +1644,7 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_inbox_feeds
 #: model:ir.ui.menu,name:mail.mail_inboxfeeds
 msgid "Inbox"
-msgstr ""
+msgstr "Beérkezett üzenetek"
 
 #. module: mail
 #. openerp-web
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index 14b46a9d762..9a662a7c9f8 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 13:57+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Ricevi Feeds via Email"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Dettagli messaggio"
 msgid "Message recipients"
 msgstr "Destinatario messaggio"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -81,13 +81,11 @@ msgid "Compose Email"
 msgstr "Componi Email"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
-"Espressione non valida, deve essere un dizionario python, es: "
-"\"{'field':'value'}\""
 
 #. module: mail
 #: view:mail.group:0
@@ -124,6 +122,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Wizard composizione email"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -133,16 +143,11 @@ msgstr "Messaggi Non Letti"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "mostra"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Selezionato di default durante la sottoscrizione."
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -155,7 +160,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Vuoi veramente cancellare questi messaggi?"
@@ -173,13 +178,13 @@ msgstr "Cerca Gruppi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "followers"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Accesso Negato"
@@ -194,17 +199,38 @@ msgstr ""
 "Foto grandezza media del gruppo. Viene automaticamente ridimensionata a "
 "128x128px, preservando le proporzioni. Usata su alcuni form e viste kanban."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Supporto"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+"L'operazione richiesta non può essere completata per questioni di sicurezza. "
+"Si prega di contattare l'amministratore di sistema.\n"
+"\n"
+"(TIpo documento: %s, Operazione: %s)"
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Ricevuti"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Contenuto Rich-text"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -241,7 +267,7 @@ msgstr "Riferimenti"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Nessun messaggio."
@@ -261,10 +287,10 @@ msgstr "Caricamento"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Reimposta a Inbox"
+msgid "more."
+msgstr ""
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -277,9 +303,12 @@ msgstr ""
 "commento per altri messaggi come le risposte degli utenti."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Wizard invito"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -335,14 +364,14 @@ msgstr "Non seguire più"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "Mostra un nuovo messaggio"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Azione non valida!"
@@ -390,6 +419,11 @@ msgstr ""
 "esistente creeranno un nuovo record con questo model (es. un'attività di "
 "progetto)"
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -436,23 +470,11 @@ msgstr "Da"
 msgid "Email message"
 msgstr "Messaggio email"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Utenti che hanno messo questo messaggio nei loro favoriti"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "Da leggere"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -460,7 +482,7 @@ msgstr "Invia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "Nessun follower"
@@ -470,14 +492,9 @@ msgstr "Nessun follower"
 msgid "Failed"
 msgstr "Fallito"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Vinto"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -497,19 +514,22 @@ msgstr "Archivi"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Elimina questo allegato"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Rispondi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Un follower"
@@ -538,12 +558,12 @@ msgid "Comments and Emails"
 msgstr "Commenti ed Emails"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Messaggi preferiti"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Valori Predefiniti"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s si è unito alla rete %s."
@@ -567,7 +587,7 @@ msgstr "Destinatari"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -632,7 +652,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "R&D"
 
@@ -654,21 +674,26 @@ msgid "Advanced"
 msgstr "Avanzate"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Rispondi"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "Da leggere"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
@@ -677,16 +702,6 @@ msgstr ""
 "Non dovresti creare un utente. Per creare nuovi utenti dovresti usare il "
 "menù \"Configurazioni > Utenti\"."
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Messaggi"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -695,7 +710,7 @@ msgstr "Model della risorsa seguita"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "like"
@@ -743,7 +758,7 @@ msgid "on"
 msgstr "in data"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -761,6 +776,11 @@ msgstr ""
 "Un dizionario Python che verrà usato per fornire valori di default durante "
 "la creazione di nuovi record per questi alias."
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -808,7 +828,7 @@ msgstr "E' una notifica"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Componi un nuovo messaggio"
@@ -843,7 +863,7 @@ msgstr "Foto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -875,24 +895,12 @@ msgstr "Mese"
 msgid "Email Search"
 msgstr "Cerca email"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Annullato"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "Messaggi Figli"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-"Campo funzione per ricercare i messaggi che l'utente corrente ha già letto"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -905,21 +913,13 @@ msgstr "Utenti"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Messaggio"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Da fare"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -938,6 +938,13 @@ msgstr "Contenuti"
 msgid "Aliases"
 msgstr "Alias"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -949,6 +956,12 @@ msgstr "Voti"
 msgid "Group"
 msgstr "Gruppo"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -960,9 +973,11 @@ msgid "Notification"
 msgstr "Notifica"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Supporto"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -970,9 +985,9 @@ msgid "Add Followers"
 msgstr "Aggiungi Followers"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Chiuso"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1078,7 +1093,7 @@ msgid "by"
 msgstr "da"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "Best Sales Practices"
 
@@ -1096,9 +1111,7 @@ msgstr "E' un Follower"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Utente"
 
@@ -1130,16 +1143,6 @@ msgstr "Pubblica"
 msgid "Extended Filters..."
 msgstr "Filtri Estesi..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1149,7 +1152,7 @@ msgstr "A:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Scrivi ai miei followers"
@@ -1166,18 +1169,28 @@ msgstr "Predefinito"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "Mostra ulteriori messaggi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Segna da fare"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Wizard invito"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1185,6 +1198,12 @@ msgstr "Segna da fare"
 msgid "Summary"
 msgstr "Riepilogo"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1198,9 +1217,16 @@ msgstr "Sottotipo"
 msgid "Group Form"
 msgstr "Form Gruppo"
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "altri messaggi"
@@ -1240,9 +1266,17 @@ msgstr ""
 "amministratore se nessun utente verrà trovato per quell'indirizzo."
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
-msgstr "Form Preferiti"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Message-Id"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1271,6 +1305,11 @@ msgstr "Nome record messaggio"
 msgid "Cc"
 msgstr "CC"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1293,19 +1332,11 @@ msgstr "Gruppo Discussioni"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "Completato"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-"Model relativo al sottotipo. Se Falso, questo sottotipo è valido per tutti i "
-"models."
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1319,7 +1350,12 @@ msgid "Follow"
 msgstr "Segui"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Tutta l'azienda"
 
@@ -1343,7 +1379,7 @@ msgstr "Mese di Creazione"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Componi nuovo Messaggio"
@@ -1363,34 +1399,12 @@ msgstr "Contenuto"
 msgid "To"
 msgstr "A"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "mail_message_subtype"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Privato"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Nuovo"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Partners notificati"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "Invita altri"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1401,10 +1415,19 @@ msgstr ""
 "membri tramite il pulsante invita."
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr "Appuntamenti CdA"
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+"Espressione non valida, deve essere un dizionario python, es: "
+"\"{'field':'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1418,33 +1441,21 @@ msgstr "Identificativo univoco messaggio"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Descrizione"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "Stato Cambiato"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "Followers del Documento"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
-"L'operazione richiesta non può essere completata per questioni di sicurezza. "
-"Si prega di contattare l'amministratore di sistema.\n"
-"\n"
-"(TIpo documento: %s, Operazione: %s)"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1457,7 +1468,7 @@ msgid "Outgoing mail server"
 msgstr "Mail server in Uscita"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr "Indirizzi email Partner non trovati"
@@ -1469,11 +1480,15 @@ msgid "Sent"
 msgstr "Inviato"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "Preferiti"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Contenuto Rich-text"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1502,6 +1517,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1515,7 +1537,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Ripristina a Da Fare"
@@ -1533,14 +1555,9 @@ msgid "Filters"
 msgstr "Filtri"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "Perso"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Valori Predefiniti"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Ricevi Feeds via Email"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1552,18 +1569,28 @@ msgstr ""
 "inserire il dominio qui."
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Preferito"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Messaggi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "altri..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1640,7 +1667,7 @@ msgstr "Model documento relativo"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr "unlike"
@@ -1672,9 +1699,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Errore nella comunicazione con il server di garanzia dell'editore."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr "Voto Email"
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Privato"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1716,7 +1743,7 @@ msgid "Initial thread message."
 msgstr "Messaggio iniziale della discussione"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "Politiche HR"
 
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 35fa8da773f..9b0ac1c6763 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-25 05:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "メッセージ詳細"
 msgid "Message recipients"
 msgstr "メッセージの受取人"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Eメール作成"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "受信済"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "リッチテキストのコンテンツ"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "参照"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "送信者"
 msgid "Email message"
 msgstr "Eメールメッセージ"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "送信"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "失敗"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "メッセージID"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "返信"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "宛先"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "高度"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re："
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "返信"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "メッセージ"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "月"
 msgid "Email Search"
 msgstr "Eメール検索"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "ユーザ"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "メッセージID"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "写し(CC)"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr "作成月"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "宛先"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr "メッセージ識別番号"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr "送信メールサーバ"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr "送信済"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "リッチテキストのコンテンツ"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr "フィルタ"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "メッセージ"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr "関連する文書モデル"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 8b58d771cdc..b287d261797 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-16 11:31+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Žinutės detalės"
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr "Nuorodos"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Nuo"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Žinutė"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Mėnuo"
 msgid "Email Search"
 msgstr "El. pašto paieška"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Kam"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Žinutė"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index 369374fc1a2..c1d933f63cb 100644
--- a/addons/mail/i18n/lv.po
+++ b/addons/mail/i18n/lv.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 23:09+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Ziņojuma sīkāka informācija"
 msgid "Message recipients"
 msgstr "Ziņojuma saņēmēji"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Rakstīt vēstuli"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Saņemts"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Atsauces"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "No"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Sūtīt"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Neizdevās"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr ""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Atbildēt"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Adresāti"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Paplašināti"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Atb.:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Atbildēt"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Ziņojumi"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Mēnesis"
 msgid "Email Search"
 msgstr "Meklēt e-pastā"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Lietotājs"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Paplašinātie Filtri..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "CC"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Kam"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr "Ziņojuma unikālais identifikators"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr "Izejošais vēstuļu serveris"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr "Nosūtīts"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr "Filtri"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Ziņojumi"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index 3c5347c8c16..88c3e672591 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-19 17:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Зурвасын дэлгэрэнгүй"
 msgid "Message recipients"
 msgstr "Зурвас хүлээн авагчид"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Имэйл Зохиох"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Хүлээн авсан"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Сурвалж"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Хэнээс"
 msgid "Email message"
 msgstr "Имэйл зурвас"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Илгээх"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Бүтэлгүйтсэн"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Зурвас-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Хариулах"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Хүлээн авагчид"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Дэвшилтэт"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Хариу:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Хариулах"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Зурвас"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Сар"
 msgid "Email Search"
 msgstr "Имэйл хайх"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Хэрэглэгч"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Өргөтгөсөн хайлт..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Зурвас-Id"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1213,17 +1251,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1237,7 +1269,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1261,7 +1298,7 @@ msgstr "Үүсгэсэн сар"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1281,34 +1318,12 @@ msgstr ""
 msgid "To"
 msgstr "Хэнд"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1317,10 +1332,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1334,28 +1356,20 @@ msgstr "Мессежийн цор ганц хувийн дугаар"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1369,7 +1383,7 @@ msgid "Outgoing mail server"
 msgstr "Мэйл серверийн гаралт"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1381,10 +1395,14 @@ msgid "Sent"
 msgstr "Илгээгдсэн"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1408,6 +1426,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1419,7 +1444,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1437,13 +1462,8 @@ msgid "Filters"
 msgstr "Шүүлтүүр"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1454,18 +1474,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1538,7 +1568,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1568,8 +1598,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1603,7 +1633,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index f7e6cb308bb..b0cf5ec9fe7 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 14:34+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Bericht details"
 msgid "Message recipients"
 msgstr "Ontvangers van het bericht"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Email opstellen"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -120,6 +120,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "E-mail samenstellen wizard"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -129,16 +141,11 @@ msgstr "Ongelezen berichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "toon"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Standaard aangevinkt wanneer ingeschreven"
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -148,7 +155,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Weet u zeker dat u dit bericht wilt verwijderen?"
@@ -166,13 +173,13 @@ msgstr "Zoek groepen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "volgers"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Toegang geweigerd"
@@ -185,17 +192,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Ondersteuning"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Ontvangen"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Rich-tekst inhoud"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -232,7 +256,7 @@ msgstr "Referenties"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Geen berichten"
@@ -252,10 +276,10 @@ msgstr "uploaden"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Terug zetten in Inbox"
+msgid "more."
+msgstr ""
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -266,8 +290,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -324,14 +351,14 @@ msgstr "Niet volgen"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie!"
@@ -376,6 +403,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -422,23 +454,11 @@ msgstr "Van"
 msgid "Email message"
 msgstr "E-mail bericht"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "Te lezen"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -446,7 +466,7 @@ msgstr "Verzend"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "Geen volgers"
@@ -456,14 +476,9 @@ msgstr "Geen volgers"
 msgid "Failed"
 msgstr "Mislukt"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Gewonnen"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -483,19 +498,22 @@ msgstr "Archieven"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Verwijder deze bijlage"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Bericht-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Beantwoorden"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Één volger"
@@ -524,12 +542,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Favoriete berichten"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Standaardwaarden"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s heeft zich aangesloten bij het %s netwerk."
@@ -550,7 +568,7 @@ msgstr "Ontvangers"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -609,7 +627,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "R&D"
 
@@ -631,37 +649,32 @@ msgid "Advanced"
 msgstr "Geavanceerd"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Antw:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Beantwoorden"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "Te lezen"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -670,7 +683,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "like"
@@ -717,7 +730,7 @@ msgid "on"
 msgstr "op"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -731,6 +744,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -767,7 +785,7 @@ msgstr "Is melding"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Maak een nieuw bericht"
@@ -798,7 +816,7 @@ msgstr "Foto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -828,23 +846,12 @@ msgstr "Maand"
 msgid "Email Search"
 msgstr "Email zoeken"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Geannuleerd"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "Onderliggende berichten"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -857,21 +864,13 @@ msgstr "Gebruikers"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Bericht"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Nog te doen"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -890,6 +889,13 @@ msgstr "Inhoud"
 msgid "Aliases"
 msgstr "Aliassen"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -901,6 +907,12 @@ msgstr "Stemmen"
 msgid "Group"
 msgstr "Groep"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -912,9 +924,11 @@ msgid "Notification"
 msgstr "Melding"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Ondersteuning"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -922,9 +936,9 @@ msgid "Add Followers"
 msgstr "Volgers toevoegen"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Gesloten"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1012,7 +1026,7 @@ msgid "by"
 msgstr "door"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1030,9 +1044,7 @@ msgstr "Is een volger"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
@@ -1064,16 +1076,6 @@ msgstr "Post"
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1083,7 +1085,7 @@ msgstr "Naar:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Schrijf aan mijn volgers"
@@ -1100,18 +1102,28 @@ msgstr "Standaard"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "geef meer berichten weer"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Markeer als nog te doen"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1119,6 +1131,12 @@ msgstr "Markeer als nog te doen"
 msgid "Summary"
 msgstr "Samenvatting"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1132,9 +1150,16 @@ msgstr "Subtype"
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "meer berichten"
@@ -1168,10 +1193,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Bericht-Id"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1197,6 +1230,11 @@ msgstr ""
 msgid "Cc"
 msgstr "CC"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1218,17 +1256,11 @@ msgstr "Discussie groep"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "Gereed"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1242,7 +1274,12 @@ msgid "Follow"
 msgstr "Volgen"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Gehele bedrijf"
 
@@ -1266,7 +1303,7 @@ msgstr "Aanmaak maand"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Maak een nieuw bericht"
@@ -1286,34 +1323,12 @@ msgstr "Inhoud"
 msgid "To"
 msgstr "Aan"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "mail_message_subtype"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Privé"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Nieuw"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Op de hoogte gebrachte relaties"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "Anderen uitnodigen"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1322,10 +1337,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1339,28 +1361,20 @@ msgstr "Bericht unieke identifier"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Omschrijving"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "Fase veranderd"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "Document volgers"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1374,7 +1388,7 @@ msgid "Outgoing mail server"
 msgstr "Uitgaande mailserver"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1386,11 +1400,15 @@ msgid "Sent"
 msgstr "Verzonden"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "Favorieten"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Rich-tekst inhoud"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1417,6 +1435,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1428,7 +1453,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Zet terug naar nog te doen"
@@ -1446,14 +1471,9 @@ msgid "Filters"
 msgstr "Filters"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "Verloren"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Standaardwaarden"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1463,18 +1483,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favoriet"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "anderen..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1547,7 +1577,7 @@ msgstr "Gerelateerde Document model"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr "unlike"
@@ -1577,9 +1607,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Fout tijdens communicatie met de uitgevers garantie server."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr "E-mail stem"
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Privé"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1612,7 +1642,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "HR beleid"
 
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index e45f044f417..0d1318a5ab0 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 19:55+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Otrzymuj zgłoszenia mailowo"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Szczegóły wiadomości"
 msgid "Message recipients"
 msgstr "Odbiorcy wiadomości"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -81,13 +81,11 @@ msgid "Compose Email"
 msgstr "Utwórz wiadomość e-mail"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
-"Niedozwolone wyrażenie, to musi być python dictionary np. \"{'field': "
-"'value'}\""
 
 #. module: mail
 #: view:mail.group:0
@@ -124,6 +122,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Kreator email"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -133,16 +143,11 @@ msgstr "Nieprzeczytane wiadomości"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "pokaż"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Zaznaczone domyślnie kiedy jest subskrypcja."
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -154,7 +159,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Chcesz usunąć tę wiadomość?"
@@ -172,13 +177,13 @@ msgstr "Szukaj grup"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "obserwatorzy"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Brak dostępu"
@@ -194,17 +199,38 @@ msgstr ""
 "z zachowaniem proporcji. Stosuj to pole w widokach formularza i niektórych "
 "kanban."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Wsparcie"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+"Operacja nie może być wykonana z powodu ograniczeń odstępu. Skontaktuj się "
+"ze swoim administratorem.\n"
+"\n"
+"(Typ dokumentu: %s, Operacja: %s)"
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Odebrane"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Zawartość Rich-text"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -241,7 +267,7 @@ msgstr "Odnośniki"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Brak wiadomości"
@@ -261,10 +287,10 @@ msgstr "wysyłanie"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Ustaw z powrotem do Odebranych"
+msgid "more."
+msgstr ""
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -277,9 +303,12 @@ msgstr ""
 "systemowa, komentarz jako odpowiedź na inne wiadomości."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Kreator zaproszenia"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -335,14 +364,14 @@ msgstr "Przestań obserwować"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "pokaż jeszcze jedną wiadomość"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Niedozwolona akcja!"
@@ -390,6 +419,11 @@ msgstr ""
 "które nie są odpowiedzią do istniejących rekordów spowodują utworzenie "
 "nowego rekordu w tym modelu np. Zadanie w projekcie."
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -436,23 +470,11 @@ msgstr "Od"
 msgid "Email message"
 msgstr "Wiadomość"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Uzytkownicy, którzy ustawili tę wiadomość jako ulubioną"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "Do przeczytania"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -460,7 +482,7 @@ msgstr "Wyślij"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "Brak obserwatorów"
@@ -470,14 +492,9 @@ msgstr "Brak obserwatorów"
 msgid "Failed"
 msgstr "Nie udało się"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Sukces"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -497,19 +514,22 @@ msgstr "Archiwum"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Usuń ten załącznik"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr ""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Odpowiedz"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Jeden obserwator"
@@ -538,12 +558,12 @@ msgid "Comments and Emails"
 msgstr "Komentarze i emaile"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Ulubione wiadomości"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Wartości domyślne"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s dołączył do sieci %s."
@@ -567,7 +587,7 @@ msgstr "Odbiorcy"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -632,7 +652,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -654,21 +674,26 @@ msgid "Advanced"
 msgstr "Zaawansowane"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Odp:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Odpowiedz"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "Do przeczytania"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
@@ -677,16 +702,6 @@ msgstr ""
 "Nie możesz utworzyć użytkownika. Do tworzenia użytkownika służy menu "
 "\"Ustawienia - Użytkownicy\"."
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Wiadomości"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -695,7 +710,7 @@ msgstr "Model następnego zasobu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "lubię"
@@ -744,7 +759,7 @@ msgid "on"
 msgstr "na"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -760,6 +775,11 @@ msgstr ""
 "Słownik (dictionary) python, który będzie wyliczony i zastosowany jako "
 "wartości domyślne do tworzenia nowego rekordu w tym aliasie."
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -796,7 +816,7 @@ msgstr "Jest powiadomieniem"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Utwórz nową wiadomość"
@@ -829,7 +849,7 @@ msgstr "Zdjęcie"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -860,24 +880,12 @@ msgstr "Miesiąc"
 msgid "Email Search"
 msgstr "Przeszukaj wiadomości"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Anulowano"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "Wiadomości podrzędne"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-"Pole funkcyjne do szukania wiadomości, które użytkownik powinien przeczytać"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -890,21 +898,13 @@ msgstr "Użytkownicy"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Wiadomość"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Do zrobienia"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -923,6 +923,13 @@ msgstr "Zawartość"
 msgid "Aliases"
 msgstr "Aliasy"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -934,6 +941,12 @@ msgstr "Głosy"
 msgid "Group"
 msgstr "Grupa"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -945,9 +958,11 @@ msgid "Notification"
 msgstr "Powiadomienie"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Wsparcie"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -955,9 +970,9 @@ msgid "Add Followers"
 msgstr "Dodaj obserwatorów"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Zamknięte"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1059,7 +1074,7 @@ msgid "by"
 msgstr "przez"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "Najlepsze praktyki sprzedaży"
 
@@ -1077,9 +1092,7 @@ msgstr "Jest obserwatorem"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
@@ -1111,16 +1124,6 @@ msgstr "Wyślij"
 msgid "Extended Filters..."
 msgstr "Rozszerzone filtry..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1130,7 +1133,7 @@ msgstr "Do:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Napisz do moich obserwatorów"
@@ -1147,18 +1150,28 @@ msgstr "Domyślne"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "pokaż więcej wiadomości"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Oznacz jako Do zrobienia"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Kreator zaproszenia"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1166,6 +1179,12 @@ msgstr "Oznacz jako Do zrobienia"
 msgid "Summary"
 msgstr "Podsumowanie"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1179,9 +1198,16 @@ msgstr "Podtyp"
 msgid "Group Form"
 msgstr "Formularz grupy"
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "więcej wiadomości"
@@ -1218,9 +1244,17 @@ msgstr ""
 "nadawcy. Jeśli nie znajdzie takiego użytkownika, to przypisze Administratora."
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
-msgstr "Ulubiony formularz"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1248,6 +1282,11 @@ msgstr "Nazwa rekordu wiadomości"
 msgid "Cc"
 msgstr "Kopia"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1268,19 +1307,11 @@ msgstr "Grupa dyskusyjna"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "Wykonano"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-"Model dla podtypu. Jeśli pole jest puste, to podtyp dotyczy wszystkich "
-"modeli."
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1294,7 +1325,12 @@ msgid "Follow"
 msgstr "Obserwuj"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Cała firma"
 
@@ -1318,7 +1354,7 @@ msgstr "Miesiąc tworzenia"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Utwórz nową wiadomość"
@@ -1338,34 +1374,12 @@ msgstr "Treść"
 msgid "To"
 msgstr "Do"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Prywatne"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Nowe"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Powiadomieni partnerzy"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "Zaproś innych"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1376,10 +1390,19 @@ msgstr ""
 "członków przez przycisk zaproszenia."
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr "Spotkania"
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+"Niedozwolone wyrażenie, to musi być python dictionary np. \"{'field': "
+"'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1393,33 +1416,21 @@ msgstr "Unikalny identyfikator wiadomości"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Opis"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "Zmieniono etap"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "Obserwatorzy dokumentu"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
-"Operacja nie może być wykonana z powodu ograniczeń odstępu. Skontaktuj się "
-"ze swoim administratorem.\n"
-"\n"
-"(Typ dokumentu: %s, Operacja: %s)"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1432,7 +1443,7 @@ msgid "Outgoing mail server"
 msgstr "Serwer poczty wychodzącej"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr "Nie znaleziono adresów partnerów"
@@ -1444,11 +1455,15 @@ msgid "Sent"
 msgstr "Wysłano"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "Ulubione"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Zawartość Rich-text"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1475,6 +1490,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1490,7 +1512,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Ustaw z powrotem na Do zrobienia"
@@ -1508,14 +1530,9 @@ msgid "Filters"
 msgstr "Filtry"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "Porażka"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Wartości domyślne"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Otrzymuj zgłoszenia mailowo"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1527,18 +1544,28 @@ msgstr ""
 "tę domenę tutaj."
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Ulubione"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "inni..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1614,7 +1641,7 @@ msgstr "Powiązany model dokumentu"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr "nie lubię"
@@ -1646,9 +1673,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr "Głosowanie nad mailem"
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Prywatne"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1690,7 +1717,7 @@ msgid "Initial thread message."
 msgstr "Wiadomość inicjująca wątek"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "Zasady kadrowe"
 
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index 1b93969542e..8e5ce58303a 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 18:18+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Detalhes da mensagem"
 msgid "Message recipients"
 msgstr "Destinatários da mensagem"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Compor Email"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "mostrar"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Deseja mesmo apagar esta mensagem?"
@@ -164,13 +171,13 @@ msgstr "Pesquisar grupos"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Acesso negado"
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Suporte"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Recebido"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Referências"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "mostrar mais uma mensagem"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação inválida!"
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "De"
 msgid "Email message"
 msgstr "Mensagem Email"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Enviar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Falhou"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Apagar este anexo"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Id mensagem"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Responder"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr ""
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Valores predefinidos"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Destinatários"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Avançado"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Responder"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr "É notificação"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Mês"
 msgid "Email Search"
 msgstr "Pesquisa de email"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Cancelado"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr "Utilizadores"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Mensagem"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr "Conteúdos"
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr "Votos"
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,9 +919,11 @@ msgid "Notification"
 msgstr "Notificação"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Suporte"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Filtros Avançados..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr "Para:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr "Predefinido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr "Resumo"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr "Subtipo"
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "mais mensagens"
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Id mensagem"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1213,17 +1251,11 @@ msgstr "Grupo de discussão"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1237,7 +1269,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1261,7 +1298,7 @@ msgstr "Mês de Criação"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1281,34 +1318,12 @@ msgstr "Conteúdo"
 msgid "To"
 msgstr "Para"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "mail_message_subtype"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Privado"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Novo"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1317,10 +1332,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1334,28 +1356,20 @@ msgstr "Identificador de mensagem exclusivo"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Descrição"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1369,7 +1383,7 @@ msgid "Outgoing mail server"
 msgstr "Servidor de Outgoing mail"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1381,10 +1395,14 @@ msgid "Sent"
 msgstr "Enviado"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1408,6 +1426,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1419,7 +1444,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1437,15 +1462,10 @@ msgid "Filters"
 msgstr "Filtros"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Valores predefinidos"
-
 #. module: mail
 #: help:base.config.settings,alias_domain:0
 msgid ""
@@ -1454,18 +1474,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favorito"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "outros..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1539,7 +1569,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1569,9 +1599,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr ""
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Privado"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1604,7 +1634,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 77ba29be6e3..2f3c0c2f8f6 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -7,20 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 12:28+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 01:24+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Receber Feeds por E-mail"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +44,11 @@ msgstr "Detalhes da Mensagem"
 msgid "Message recipients"
 msgstr "Destinatários da mensagem"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr "Ativado por padrão na inscrição"
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -81,13 +82,11 @@ msgid "Compose Email"
 msgstr "Escrever E-mail"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
-msgstr ""
-"Expressão inválida, deve ser uma definição literal de dicionário estilo "
-"python como \"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr "Adicioná-los em recipientes e seguidores"
 
 #. module: mail
 #: view:mail.group:0
@@ -124,6 +123,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Assistente de composição de e-mail"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr "Adicionar outros"
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr "Superior"
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -133,16 +144,11 @@ msgstr "Mensagens Não Lidas"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "mostrar"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Marcado por padrão na inscrição."
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -154,7 +160,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Deseja realmente excluir esta mensagem?"
@@ -172,13 +178,13 @@ msgstr "Grupos de Pesquisa"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "Seguidores"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Acesso Negado"
@@ -194,17 +200,38 @@ msgstr ""
 "para 128x128 pixels, com a relação de aspecto preservada. Utilize este campo "
 "nas visões de formulário ou em algumas visões kanban."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr "Erro no upload"
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Suporte"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+"A operação solicitada não pode ser completado devido a restrições de "
+"segurança. Por favor, informe o administrador do sistema..\n"
+"\n"
+"(Tipo de documento: %s, Operação: %s)"
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Recebida"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Conteúdo Rich-text"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -241,7 +268,7 @@ msgstr "Referências"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Sem mensagens."
@@ -261,10 +288,10 @@ msgstr "enviando"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Devolva para a Caixa de Entrada"
+msgid "more."
+msgstr "mais."
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -278,9 +305,15 @@ msgstr ""
 "usuário."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Assistente de Convite"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+"Campo usado para associar o modelo relacionado ao subtipo do modelo ao usar "
+"subscrição automática de um documento relacionado. O campo usado para "
+"calcular é getattr(related_document.relation_field)."
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -336,14 +369,14 @@ msgstr "Não Participar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "Mostrar mais uma mensagem"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação Inválida!"
@@ -391,6 +424,11 @@ msgstr ""
 "Qualquer e-mail recebido que não responda a um registro existente causará a "
 "criação de um novo registro deste modelo (ex: Tarefa de Projeto)"
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr "Campo da Relação"
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -437,23 +475,11 @@ msgstr "De"
 msgid "Email message"
 msgstr "Mensagem de E-mail"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Usuários que definem esta mensagem em seus favoritos"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "Configurações"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "Não lidas"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -461,7 +487,7 @@ msgstr "Enviar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "Sem seguidores"
@@ -471,14 +497,9 @@ msgstr "Sem seguidores"
 msgid "Failed"
 msgstr "Falhou"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Venceu"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -498,19 +519,22 @@ msgstr "Arquivos"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Excluir este anexo"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Cód da Mensagem"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Responder"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Um seguidor"
@@ -539,12 +563,12 @@ msgid "Comments and Emails"
 msgstr "Comentários e E-mails"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Mensagens favoritas"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "Valores Padrão"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s conectou-se à rede de %s."
@@ -568,7 +592,7 @@ msgstr "Destinatários"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -633,7 +657,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "R&D"
 
@@ -655,21 +679,26 @@ msgid "Advanced"
 msgstr "Avançado"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr "Mover para Caixa de Entrada"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Responder"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "Não lidas"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
@@ -678,16 +707,6 @@ msgstr ""
 "Você não pode criar um usuário. Para criar usuários, você deve utilizar o "
 "menu \"Configurações > Usuários\"."
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -696,7 +715,7 @@ msgstr "Modelo do recurso seguido"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "como"
@@ -745,7 +764,7 @@ msgid "on"
 msgstr "em"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -763,6 +782,11 @@ msgstr ""
 "Um dicionário python que será avaliado para gerar valores padrão quando "
 "forem criados novos registros para este apelido."
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr "Subtipos de Mensagem"
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -809,7 +833,7 @@ msgstr "É Notificação"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Escrever uma nova mensagem"
@@ -844,7 +868,7 @@ msgstr "Foto"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -876,24 +900,12 @@ msgstr "Mês"
 msgid "Email Search"
 msgstr "Pesquisar E-mail"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Cancelada"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "Mensagens Filhas"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-"Campo Funcional para pesquisar por mensagens não lidas do usuário atual"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -906,21 +918,13 @@ msgstr "Usuários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Mensagem"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "A Fazer"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -939,6 +943,15 @@ msgstr "Conteúdo"
 msgid "Aliases"
 msgstr "Apelidos"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+"Descrição que será adicionada na mensagem enviada para este subtipo. Se "
+"vazio, o nome será adicionado em seu lugar."
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -950,6 +963,12 @@ msgstr "Votos"
 msgid "Group"
 msgstr "Grupo"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr "Usuário atual marcou uma notificação ligada a esta mensagem"
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -961,9 +980,11 @@ msgid "Notification"
 msgstr "Notificação"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Suporte"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr "Por favor complete as informações do parceiro"
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -971,9 +992,9 @@ msgid "Add Followers"
 msgstr "Adicionar Seguidores"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Fechado"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr "Seguidores dos itens selecionados e"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1078,7 +1099,7 @@ msgid "by"
 msgstr "por"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "Melhores Práticas de Vendas"
 
@@ -1096,9 +1117,7 @@ msgstr "É um Seguidor"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Usuário"
 
@@ -1130,16 +1149,6 @@ msgstr "Postar"
 msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1149,7 +1158,7 @@ msgstr "Para:"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "Escrever aos meus seguidores"
@@ -1166,18 +1175,28 @@ msgstr "Padrão"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "mostrar mais mensagens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "Marcar como A Fazer"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr "Subtipo de pai, usado para inscrição automática."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Assistente de Convite"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1185,6 +1204,14 @@ msgstr "Marcar como A Fazer"
 msgid "Summary"
 msgstr "Sumário"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+"Modelo do subtipo a que se aplica. Se falso, este subtipo se aplica a todos "
+"os modelos."
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1198,9 +1225,16 @@ msgstr "Subtipo"
 msgid "Group Form"
 msgstr "Formulário do Grupo"
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr "Marcados com estrela"
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "mais mensagens"
@@ -1241,9 +1275,17 @@ msgstr ""
 "endereço."
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
-msgstr "Formulário de Favorito"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr "E"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Cód da Mensagem"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1272,6 +1314,11 @@ msgstr "Nome do Registro da Mensagem"
 msgid "Cc"
 msgstr "Cc"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr "Mensagem marcada que irá para a caixa de A Fazer"
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1293,19 +1340,11 @@ msgstr "Grupo de Discussão"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "Concluído"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-"Modelo relacionado ao subtipo. Se falso, este subtipo existe para todos os "
-"modelos."
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1319,7 +1358,12 @@ msgid "Follow"
 msgstr "Seguir"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "Toda a Empresa"
 
@@ -1343,7 +1387,7 @@ msgstr "Mês de Criação"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "Escrever nova Mensagem"
@@ -1363,34 +1407,12 @@ msgstr "Conteúdo"
 msgid "To"
 msgstr "Para"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "Subtipo da Mensagem"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "Particular"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "Novo"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Parceiros notificados"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "Convidar outros"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1401,10 +1423,19 @@ msgstr ""
 "membros através do botão convidar."
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr "Reuniões"
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+"Expressão inválida, deve ser uma definição literal de dicionário estilo "
+"python como \"{'field': 'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1418,33 +1449,21 @@ msgstr "Identificador da mensagem"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "Descrição"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "Estágio Alterado"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "Seguidores do Documento"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
-msgstr ""
-"A operação solicitada não pode ser completado devido a restrições de "
-"segurança. Por favor, informe o administrador do sistema..\n"
-"\n"
-"(Tipo de documento: %s, Operação: %s)"
+msgid "Remove this follower"
+msgstr "Remover este Seguidor"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1457,7 +1476,7 @@ msgid "Outgoing mail server"
 msgstr "Servidor de envio"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr "Endereço de e-mail do parceiro não encontrado"
@@ -1469,11 +1488,15 @@ msgid "Sent"
 msgstr "Enviada"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "Favoritos"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Conteúdo Rich-text"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr "O usuário atual tem uma notificação não lida ligada a esta mensagem"
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1501,6 +1524,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr "Por favor, aguarde enquanto o arquivo está sendo carregado."
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1516,7 +1546,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "Devolver a A Fazer"
@@ -1534,14 +1564,9 @@ msgid "Filters"
 msgstr "Filtros"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "Perdido"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "Valores Padrão"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Receber Feeds por E-mail"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1553,18 +1578,28 @@ msgstr ""
 "servidor OpenERP, informe o nome do domínio aqui."
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "Favorito"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "outros..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr "A Fazer"
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1642,7 +1677,7 @@ msgstr "Modelo de Documento Relacionado"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr "não como"
@@ -1674,9 +1709,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "Erro durante a comunicação com o servidor de suporte."
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr "Votação de E-mail"
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Particular"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1717,7 +1752,7 @@ msgid "Initial thread message."
 msgstr "Mensagem inicial do tópico."
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "Políticas de RH"
 
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index 71eb470cf4f..691af6c3ae2 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-24 15:23+0000\n"
 "Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Detalii mesaj"
 msgid "Message recipients"
 msgstr "Destinatari mesaj"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Compune e-mail"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Primit"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Referinte"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "De la"
 msgid "Email message"
 msgstr "Mesaj e-mail"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Trimite"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Esuat"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Id-Mesaj"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Raspunde"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Destinatari"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Avansat"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Raspunde"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mesaje"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Luna"
 msgid "Email Search"
 msgstr "Cautare e-mail"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Utilizator"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Id-Mesaj"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Cc (copie carbon)"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1213,17 +1251,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1237,7 +1269,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1261,7 +1298,7 @@ msgstr "Creare Luna"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1281,34 +1318,12 @@ msgstr ""
 msgid "To"
 msgstr "Catre"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1317,10 +1332,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1334,28 +1356,20 @@ msgstr "Identificator unic mesaj"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1369,7 +1383,7 @@ msgid "Outgoing mail server"
 msgstr "Server trimitere e-mail-uri"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1381,10 +1395,14 @@ msgid "Sent"
 msgstr "Trimis"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1408,6 +1426,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1419,7 +1444,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1437,13 +1462,8 @@ msgid "Filters"
 msgstr "Filtre"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1454,18 +1474,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mesaje"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1538,7 +1568,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1568,8 +1598,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1603,7 +1633,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index ccab28898da..aa5dcd2e6cb 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 09:23+0000\n"
 "Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "Получать Ленты по эл. почте"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Подробности сообщения"
 msgid "Message recipients"
 msgstr "Получатели сообщения"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,13 +79,11 @@ msgid "Compose Email"
 msgstr "Написать письмо"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
-"Неправильное выражение, здесь должен быть объявление словаря python например "
-"\"{'field': 'value'}\""
 
 #. module: mail
 #: view:mail.group:0
@@ -122,6 +120,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr "Мастер составления эл. почты"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -131,16 +141,11 @@ msgstr "Непрочитанные сообщения"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "показать"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "Отмеченный по умолчанию при подписке."
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -153,7 +158,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "Вы действительно хотите удалить это сообщение?"
@@ -171,13 +176,13 @@ msgstr "Поиск групп"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "подписчики"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "Доступ запрещен"
@@ -193,17 +198,34 @@ msgstr ""
 "128 пикселей, с сохранением соотношения сторон. Используйте это поле в видах "
 "форм или видах kanban."
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Поддержка"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Получено"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Форматированное содержимое"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -240,7 +262,7 @@ msgstr "Ссылки"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "Нет сообщений."
@@ -260,10 +282,10 @@ msgstr "отправка данных"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "Вернуть во входящие"
+msgid "more."
+msgstr ""
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -277,9 +299,12 @@ msgstr ""
 "пользователя"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "Мастер приглашений"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -335,14 +360,14 @@ msgstr "Отписаться"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "показать еще одно сообщение"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "Неверное действие!"
@@ -384,6 +409,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -430,23 +460,11 @@ msgstr "От"
 msgid "Email message"
 msgstr "Сообщение эл. почты"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "Пользователи которые добавили это сообщение себе в избранное"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "Прочитать"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -454,7 +472,7 @@ msgstr "Отправить"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "Нет подписчиков"
@@ -464,14 +482,9 @@ msgstr "Нет подписчиков"
 msgid "Failed"
 msgstr "Ошибка"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "Выиграно"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -491,19 +504,22 @@ msgstr "Архивы"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "Удалить вложение"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "ID сообщения"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Ответить"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "Один подписчик"
@@ -532,12 +548,12 @@ msgid "Comments and Emails"
 msgstr "Комментарии и эл. почта"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "Избранные сообщения"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s присоединился к сети %s."
@@ -561,7 +577,7 @@ msgstr "Получатели"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -620,7 +636,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "НИОКР"
 
@@ -642,21 +658,26 @@ msgid "Advanced"
 msgstr "Дополнительно"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Ответ:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Ответить"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "Прочитать"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
@@ -665,16 +686,6 @@ msgstr ""
 "Вы не можете создать пользователя. Для создания новых пользователей вы "
 "должны использовать меню Настройки > Пользователи."
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Сообщения"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -683,7 +694,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "как"
@@ -732,7 +743,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -748,6 +759,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -793,7 +809,7 @@ msgstr "это уведомление"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "Написать новое сообщение"
@@ -828,7 +844,7 @@ msgstr "Фото"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -860,25 +876,12 @@ msgstr "Месяц"
 msgid "Email Search"
 msgstr "Искать эл. почту"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "Отменено"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-"Функциональное поле для поиска сообщений текущего пользователя которые "
-"должны быть прочитаны"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -891,21 +894,13 @@ msgstr "Пользователи"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "Сообщение"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "Задачи"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -924,6 +919,13 @@ msgstr "Содержание"
 msgid "Aliases"
 msgstr "Псевдонимы"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -935,6 +937,12 @@ msgstr "Голоса"
 msgid "Group"
 msgstr "Группа"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -946,9 +954,11 @@ msgid "Notification"
 msgstr "Уведомление"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "Поддержка"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -956,9 +966,9 @@ msgid "Add Followers"
 msgstr "Добавить подписчиков"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "Закрыто"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1064,7 +1074,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "Лучшие практики продаж"
 
@@ -1082,9 +1092,7 @@ msgstr "Подписан"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
@@ -1116,16 +1124,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1135,7 +1133,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1152,18 +1150,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "Мастер приглашений"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1171,6 +1179,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1184,9 +1198,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1220,10 +1241,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "ID сообщения"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1249,6 +1278,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Копия"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1269,17 +1303,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1293,7 +1321,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1317,7 +1350,7 @@ msgstr "Месяц создания"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1337,34 +1370,12 @@ msgstr ""
 msgid "To"
 msgstr "Кому"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1373,10 +1384,19 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+"Неправильное выражение, здесь должен быть объявление словаря python например "
+"\"{'field': 'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1390,28 +1410,20 @@ msgstr "Уникальный идентификатор сообщения"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1425,7 +1437,7 @@ msgid "Outgoing mail server"
 msgstr "Сервер исходящей почты"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1437,10 +1449,14 @@ msgid "Sent"
 msgstr "Отправлено"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Форматированное содержимое"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1464,6 +1480,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1475,7 +1498,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1493,14 +1516,9 @@ msgid "Filters"
 msgstr "Фильтры"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr ""
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "Получать Ленты по эл. почте"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1510,18 +1528,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1594,7 +1622,7 @@ msgstr "Модель связанного документа"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1624,8 +1652,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1659,7 +1687,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index d9a2b5d5ada..726cbaecaf5 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-16 17:40+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Podrobnosti sporočila"
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Od"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr ""
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Za"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index 339e8e32686..cdb24298b68 100644
--- a/addons/mail/i18n/sr@latin.po
+++ b/addons/mail/i18n/sr@latin.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-10 18:25+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr ""
 msgid "Message recipients"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -184,14 +191,31 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
 msgstr ""
 
 #. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
 msgstr ""
 
 #. module: mail
@@ -230,7 +254,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Od"
 msgid "Email message"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr ""
 msgid "Email Search"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr ""
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,8 +1188,16 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
 msgstr ""
 
 #. module: mail
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr ""
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index a4662346081..e6994aa8e43 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-24 23:17+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Meddelandedetaljer"
 msgid "Message recipients"
 msgstr "Mottagare"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "Skriv e-post"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Mottaget"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr ""
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Referenser"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Från"
 msgid "Email message"
 msgstr "E-postmeddelande"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Skicka"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Misslyckades"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Meddelande-id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Besvara"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Mottagare"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Avancerat"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Re:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Besvara"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Meddelanden"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Månad"
 msgid "Email Search"
 msgstr "Sök e-post"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Användare"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Utökade filter..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Meddelande-id"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "Kopia"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1213,17 +1251,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1237,7 +1269,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1261,7 +1298,7 @@ msgstr "Månad skapad"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1281,34 +1318,12 @@ msgstr ""
 msgid "To"
 msgstr "Till"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1317,10 +1332,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1334,28 +1356,20 @@ msgstr "Meddelandets unika identifierare"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1369,7 +1383,7 @@ msgid "Outgoing mail server"
 msgstr "Utgående mailserver"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1381,10 +1395,14 @@ msgid "Sent"
 msgstr "Skickat"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1408,6 +1426,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1419,7 +1444,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1437,13 +1462,8 @@ msgid "Filters"
 msgstr "Filter"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1454,18 +1474,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1538,7 +1568,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1568,8 +1598,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1603,7 +1633,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 4a046e4b14d..30d88dffd00 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "Mesaj Detayları"
 msgid "Message recipients"
 msgstr "Mesaj Alıcıları"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,10 +79,10 @@ msgid "Compose Email"
 msgstr "E-posta Yaz"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
 msgstr ""
 
 #. module: mail
@@ -118,6 +118,18 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr ""
@@ -164,13 +171,13 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr ""
@@ -183,17 +190,34 @@ msgid ""
 "kanban views."
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "Alınan"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "Zengin-metin İçerik"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -230,7 +254,7 @@ msgstr "Referanslar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr ""
@@ -250,9 +274,9 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
+msgid "more."
 msgstr ""
 
 #. module: mail
@@ -264,8 +288,11 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
 msgstr ""
 
 #. module: mail
@@ -322,14 +349,14 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr ""
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -371,6 +398,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +449,11 @@ msgstr "Kimden"
 msgid "Email message"
 msgstr "E-posta mesajı"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +461,7 @@ msgstr "Gönder"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr ""
@@ -451,14 +471,9 @@ msgstr ""
 msgid "Failed"
 msgstr "Başarısız"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +493,22 @@ msgstr ""
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Mesaj-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "Cevapla"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr ""
@@ -519,12 +537,12 @@ msgid "Comments and Emails"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr ""
@@ -545,7 +563,7 @@ msgstr "Alıcılar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr ""
@@ -604,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr ""
 
@@ -626,37 +644,32 @@ msgid "Advanced"
 msgstr "Gelişmiş"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "Yanıt:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "Cevapla"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "Mesajlar"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -665,7 +678,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr ""
@@ -712,7 +725,7 @@ msgid "on"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -726,6 +739,11 @@ msgid ""
 "creating new records for this alias."
 msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -762,7 +780,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr ""
@@ -793,7 +811,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -823,23 +841,12 @@ msgstr "Ay"
 msgid "Email Search"
 msgstr "E-posta Ara"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -852,21 +859,13 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr ""
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -885,6 +884,13 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -896,6 +902,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -907,8 +919,10 @@ msgid "Notification"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
 msgstr ""
 
 #. module: mail
@@ -917,8 +931,8 @@ msgid "Add Followers"
 msgstr ""
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
 msgstr ""
 
 #. module: mail
@@ -1007,7 +1021,7 @@ msgid "by"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr ""
 
@@ -1025,9 +1039,7 @@ msgstr ""
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "Kullanıcı"
 
@@ -1059,16 +1071,6 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr "Gelişmiş Filtreler..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr ""
@@ -1095,18 +1097,28 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1114,6 +1126,12 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1127,9 +1145,16 @@ msgstr ""
 msgid "Group Form"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr ""
@@ -1163,10 +1188,18 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
 msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Mesaj-Id"
+
 #. module: mail
 #: help:mail.group,image:0
 msgid ""
@@ -1192,6 +1225,11 @@ msgstr ""
 msgid "Cc"
 msgstr "İlgili Kopyası (CC)"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1212,17 +1250,11 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr ""
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1236,7 +1268,12 @@ msgid "Follow"
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr ""
 
@@ -1260,7 +1297,7 @@ msgstr "Oluşturma Ayı"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr ""
@@ -1280,34 +1317,12 @@ msgstr ""
 msgid "To"
 msgstr "Kime"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1316,10 +1331,17 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr ""
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1333,28 +1355,20 @@ msgstr "Tekil mesaj tanımlayıcısı"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr ""
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
 msgstr ""
 
 #. module: mail
@@ -1368,7 +1382,7 @@ msgid "Outgoing mail server"
 msgstr "giden mail sunucusu"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr ""
@@ -1380,10 +1394,14 @@ msgid "Sent"
 msgstr "Gönderilmiş"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "Zengin-metin İçerik"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
 #. module: mail
@@ -1407,6 +1425,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1418,7 +1443,7 @@ msgstr ""
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr ""
@@ -1436,13 +1461,8 @@ msgid "Filters"
 msgstr "Filtreler"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
 msgstr ""
 
 #. module: mail
@@ -1453,18 +1473,28 @@ msgid ""
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "Mesajlar"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr ""
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1537,7 +1567,7 @@ msgstr "İlgili Döküman Modeli"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr ""
@@ -1567,8 +1597,8 @@ msgid "Error during communication with the publisher warranty server."
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
 msgstr ""
 
 #. module: mail
@@ -1602,7 +1632,7 @@ msgid "Initial thread message."
 msgstr ""
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr ""
 
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 768967e15e5..af46475ac28 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -7,20 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 04:23+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 11:23+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
-
-#. module: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr "通过 Email接收订阅"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -48,6 +43,11 @@ msgstr "消息详情"
 msgid "Message recipients"
 msgstr "收件人"
 
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr "订阅时，默认激活"
+
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
@@ -79,11 +79,11 @@ msgid "Compose Email"
 msgstr "编辑邮件"
 
 #. module: mail
-#: constraint:mail.alias:0
-msgid ""
-"Invalid expression, it must be a literal python dictionary definition e.g. "
-"\"{'field': 'value'}\""
-msgstr "错误的表达式，必须是 python 字典定义，例如： \"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr "将他们加入到收件人和关注者"
 
 #. module: mail
 #: view:mail.group:0
@@ -118,6 +118,18 @@ msgstr "发送者的Email地址。当收取的email没有对应的合作伙伴
 msgid "Email composition wizard"
 msgstr "电子邮件撰写向导"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr "加入其它的"
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr "上级"
+
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
@@ -127,16 +139,11 @@ msgstr "未读信息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "show"
 msgstr "显示"
 
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr "订阅时默认选中"
-
 #. module: mail
 #: help:mail.group,group_ids:0
 msgid ""
@@ -146,7 +153,7 @@ msgstr "这些群组的成员将自动添加为关注者。注意, 如果有必
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
 #, python-format
 msgid "Do you really want to delete this message?"
 msgstr "你确信要删除这些消息吗？"
@@ -164,13 +171,13 @@ msgstr "搜索群组"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
 #, python-format
 msgid "followers"
 msgstr "关注者"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
 #, python-format
 msgid "Access Denied"
 msgstr "访问被拒绝"
@@ -183,17 +190,37 @@ msgid ""
 "kanban views."
 msgstr "群组的中等尺寸照片。它们被缩放为128x128px，纵横比保留。表单视图或者一些看板视图使用这个字段。"
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr "上传错误"
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "支持"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+"由于安全限制，请求的操作不能被完成。请联系你的系统管理员。\n"
+"\n"
+"(单据类型: %s, 操作: %s)"
+
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
 msgstr "已接收"
 
-#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
-msgstr "富文本内容"
-
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
@@ -204,7 +231,7 @@ msgstr "线程"
 #: code:addons/mail/static/src/xml/mail.xml:37
 #, python-format
 msgid "Open the full mail composer"
-msgstr ""
+msgstr "新邮件的完整界面"
 
 #. module: mail
 #. openerp-web
@@ -230,7 +257,7 @@ msgstr "引用"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "No messages."
 msgstr "没有消息"
@@ -250,10 +277,10 @@ msgstr "上传中"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
-msgid "Set back to Inbox"
-msgstr "设置回收件箱"
+msgid "more."
+msgstr "更多."
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -264,9 +291,12 @@ msgid ""
 msgstr "消息类型：Email 用于 邮件消息， 通知用户系统消息，评论用于其他消息，例如用户回复。"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
-msgstr "邀请向导"
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -322,14 +352,14 @@ msgstr "取消关注"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
 #, python-format
 msgid "show one more message"
 msgstr "显示一个或多个消息"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid "Invalid Action!"
 msgstr "非法的动作"
@@ -371,6 +401,11 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr "相应于这个别名对应的模型（Openerp的单据种类）。任何一封没有回复某个存在的记录的来邮，将导致此模块中新记录的创立。"
 
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr "关联字段"
+
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
@@ -417,23 +452,11 @@ msgstr "发件人"
 msgid "Email message"
 msgstr "邮件内容"
 
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr "设置这些消息在收藏夹的用户"
-
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr "阅读"
-
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
@@ -441,7 +464,7 @@ msgstr "发送"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
 #, python-format
 msgid "No followers"
 msgstr "没有关注者"
@@ -451,14 +474,9 @@ msgstr "没有关注者"
 msgid "Failed"
 msgstr "失败的"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr "已赢得"
-
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
 #: model:ir.actions.act_window,name:mail.action_view_followers
 #: model:ir.ui.menu,name:mail.menu_email_followers
 #: view:mail.followers:0
@@ -478,19 +496,22 @@ msgstr "存档"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
 #, python-format
 msgid "Delete this attachment"
 msgstr "删除这个附件"
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
-msgstr "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "回复"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
 #, python-format
 msgid "One follower"
 msgstr "一个关注者"
@@ -519,12 +540,12 @@ msgid "Comments and Emails"
 msgstr "评论和Email"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
-msgstr "感兴趣的消息"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "默认值"
 
 #. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
 #, python-format
 msgid "%s has joined the %s network."
 msgstr "%s 加入到 %s 网络."
@@ -545,7 +566,7 @@ msgstr "收件人"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
 msgstr "<<<"
@@ -555,7 +576,7 @@ msgstr "<<<"
 #: code:addons/mail/static/src/xml/mail.xml:43
 #, python-format
 msgid "Write to the followers of this document..."
-msgstr ""
+msgstr "写给这些单据的关注者"
 
 #. module: mail
 #: field:mail.group,group_public_id:0
@@ -611,7 +632,7 @@ msgstr ""
 "            "
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
 msgid "R&D"
 msgstr "研究与开发"
 
@@ -633,37 +654,32 @@ msgid "Advanced"
 msgstr "高级"
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr "移动到收件箱"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
 #, python-format
 msgid "Re:"
 msgstr "回复:"
 
 #. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
-#, python-format
-msgid "Reply"
-msgstr "回复"
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "阅读"
 
 #. module: mail
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
 #, python-format
 msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr "你不可能创建一个用户。要创建新用户，你将使用菜单：“设置>用户”"
 
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
-msgstr "消息"
-
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
@@ -672,7 +688,7 @@ msgstr "关注资源的模型"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
 #, python-format
 msgid "like"
 msgstr "+1"
@@ -689,7 +705,7 @@ msgstr "取消"
 #: code:addons/mail/static/src/xml/mail.xml:44
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "分享给我的关注者"
 
 #. module: mail
 #: field:mail.notification,partner_id:0
@@ -701,7 +717,7 @@ msgstr "联系人"
 msgid ""
 "Only the invited followers can read the\n"
 "                                    discussions on this group."
-msgstr ""
+msgstr "该组中，只有受邀请的关注者可以阅读这些讨论"
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
@@ -719,7 +735,7 @@ msgid "on"
 msgstr "在"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
 #, python-format
 msgid ""
 "The following partners chosen as recipients for the email have no email "
@@ -733,6 +749,11 @@ msgid ""
 "creating new records for this alias."
 msgstr "当创建别名的新记录时，一个Python字典被提供作为默认值"
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr "消息子类型"
+
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
@@ -775,7 +796,7 @@ msgstr "是通知"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
 #, python-format
 msgid "Compose a new message"
 msgstr "发送新消息"
@@ -806,7 +827,7 @@ msgstr "照片"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 #, python-format
@@ -836,23 +857,12 @@ msgstr "月"
 msgid "Email Search"
 msgstr "电子邮件搜索"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr "已作废"
-
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
 msgstr "子信息"
 
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr "函数字段，用来搜索当前用户读过的消息"
-
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
@@ -865,21 +875,13 @@ msgstr "用户"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
 #: field:mail.mail,mail_message_id:0
 #: view:mail.message:0
 #: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
 msgstr "消息"
 
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr "待办事项"
-
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
@@ -898,6 +900,13 @@ msgstr "内容"
 msgid "Aliases"
 msgstr "别名"
 
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
@@ -909,6 +918,12 @@ msgstr "投票"
 msgid "Group"
 msgstr "群组"
 
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr "当前用户用 星号 提醒关联到这条消息"
+
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
@@ -920,9 +935,11 @@ msgid "Notification"
 msgstr "通知"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
-msgstr "支持"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr "请完成上级的信息"
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -930,9 +947,9 @@ msgid "Add Followers"
 msgstr "增加关注者"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
-msgstr "已关闭"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr "选中项目的关注者和"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1028,7 +1045,7 @@ msgid "by"
 msgstr "作者"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
 msgstr "最佳销售实践"
 
@@ -1046,9 +1063,7 @@ msgstr "是一个关注者"
 
 #. module: mail
 #: view:mail.alias:0
-#: field:mail.favorite,user_id:0
 #: view:mail.mail:0
-#: field:mail.vote,user_id:0
 msgid "User"
 msgstr "用户"
 
@@ -1080,16 +1095,6 @@ msgstr "发送"
 msgid "Extended Filters..."
 msgstr "扩展过滤器..."
 
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
@@ -1099,7 +1104,7 @@ msgstr "到："
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
 msgstr "写给我的关注者"
@@ -1116,18 +1121,28 @@ msgstr "默认"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
 msgstr "显示更多消息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
 msgstr "标记为待办事项"
 
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr "上级子类型，用来自动订阅"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr "邀请向导"
+
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
@@ -1135,6 +1150,12 @@ msgstr "标记为待办事项"
 msgid "Summary"
 msgstr "摘要"
 
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr "子类型适用的模型：如果 假，子类型适用于所有模块"
+
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
 #: field:mail.followers,subtype_ids:0
@@ -1148,9 +1169,16 @@ msgstr "子类型"
 msgid "Group Form"
 msgstr "群组表单"
 
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr "加星的邮件"
+
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
 msgstr "更多消息"
@@ -1186,9 +1214,17 @@ msgstr ""
 "若此字段无设置，系统将依据收发地址来寻找正确的所有者，如果在那个地址上没有系统使用者可以找到的话，将使用admin账户。"
 
 #. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
-msgstr "收藏夹表单"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr "与"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr "Message-Id"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1215,6 +1251,11 @@ msgstr "消息记录名称"
 msgid "Cc"
 msgstr "抄送"
 
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr "加星号的消息进入到 待办事项 邮箱"
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:110
@@ -1235,17 +1276,11 @@ msgstr "讨论群组"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
 msgstr "完成"
 
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid ""
-"Related model of the subtype. If False, this subtype exists for all models."
-msgstr "子类型的相关模型，如果是False，子类型存在于所有的模型"
-
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
@@ -1259,7 +1294,12 @@ msgid "Follow"
 msgstr "关注"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr "姓名"
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
 msgstr "整个公司"
 
@@ -1283,7 +1323,7 @@ msgstr "创建月份"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
 msgstr "写新消息"
@@ -1303,34 +1343,12 @@ msgstr "内容"
 msgid "To"
 msgstr "收件人"
 
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr "mail_message_subtype"
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr "私有的"
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr "新建"
-
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "通知合作伙伴"
 
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr "邀请其他人"
-
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
@@ -1339,10 +1357,17 @@ msgid ""
 msgstr "这个群组对非成员是可见的。不可见的群组能通过邀请 按钮增加成员。"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
 msgid "Board meetings"
 msgstr "董事会议"
 
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr "错误的表达式，必须是 python 字典定义，例如： \"{'field': 'value'}\""
+
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
@@ -1356,32 +1381,21 @@ msgstr "消息唯一编号"
 
 #. module: mail
 #: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
 msgid "Description"
 msgstr "说明"
 
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr "阶段改变"
-
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
 msgstr "文档关注者"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
-msgid ""
-"The requested operation cannot be completed due to security restrictions. "
-"Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
-msgstr ""
-"由于安全限制，请求的操作不能被完成。请联系你的系统管理员。\n"
-"\n"
-"(单据类型: %s, 操作: %s)"
+msgid "Remove this follower"
+msgstr "取消此关注者"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1394,7 +1408,7 @@ msgid "Outgoing mail server"
 msgstr "邮件发送服务器"
 
 #. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
 msgstr "合作伙伴邮件地址没找到"
@@ -1406,11 +1420,15 @@ msgid "Sent"
 msgstr "已发送"
 
 #. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
-msgstr "收藏夹"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr "富文本内容"
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr "当前用户有关联到这条消息的未读的提醒"
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1437,6 +1455,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr "当文件上传时，请等待。"
+
 #. module: mail
 #: view:mail.group:0
 msgid ""
@@ -1445,10 +1470,12 @@ msgid ""
 "installed\n"
 "                                    the portal module."
 msgstr ""
+"这个群主所有人可见。\n"
+"          如果你安装了门户模块，包括你的客户"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
 msgstr "设置回待办事项"
@@ -1466,14 +1493,9 @@ msgid "Filters"
 msgstr "过滤器"
 
 #. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr "丢失"
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
-msgstr "默认值"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr "通过 Email接收订阅"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1483,18 +1505,28 @@ msgid ""
 msgstr "如果 设置Email域全方位地重定向到这个Openerp服务器，输入域名在这里。"
 
 #. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
-msgstr "收藏夹"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "消息"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
 msgstr "其它..."
 
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr "待办事项"
+
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.alias,alias_name:0
@@ -1567,7 +1599,7 @@ msgstr "相关单据模型"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
 msgstr "-1"
@@ -1597,9 +1629,9 @@ msgid "Error during communication with the publisher warranty server."
 msgstr "当与保障服务器通信时发生错误。"
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
-msgstr "邮件投票"
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "私有的"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1614,6 +1646,13 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>没有待办事项</b>\n"
+"                </p><p>\n"
+"                    当你处理收件箱里的消息时，你能标记一些消息作为<i>待办事项</i>. \n"
+"                    从这个菜单，你能处理你所有的待办事项。\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -1632,7 +1671,7 @@ msgid "Initial thread message."
 msgstr "初始化线索消息"
 
 #. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
 msgstr "人力资源政策"
 
diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po
new file mode 100644
index 00000000000..8aa848be885
--- /dev/null
+++ b/addons/mail/i18n/zh_TW.po
@@ -0,0 +1,1683 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 07:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.my.openerp.com>"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:262
+#, python-format
+msgid "show"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:869
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:156
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:726
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:37
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:37
+#, python-format
+msgid "&ograve"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:188
+#, python-format
+msgid "No messages."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_group
+msgid "Discussion group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:83
+#: code:addons/mail/static/src/xml/mail.xml:95
+#, python-format
+msgid "uploading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:36
+#, python-format
+msgid "<div>You have been invited to follow %s.</div>"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_unread:0
+#: help:mail.thread,message_unread:0
+#: help:res.partner,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
+#: model:ir.ui.menu,name:mail.mail_tomefeeds
+msgid "To: me"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:261
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:71
+#: code:addons/mail/res_users.py:79
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+#: view:mail.mail:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:152
+#, python-format
+msgid "No followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:154
+#, python-format
+msgid "One follower"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr ""
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:100
+#, python-format
+msgid "%s has joined the %s network."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:127
+#, python-format
+msgid "<<<"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:43
+#, python-format
+msgid "Write to the followers of this document..."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:39
+#, python-format
+msgid "<div>You have been invited to follow a new document.</div>"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,parent_id:0
+#: field:mail.message,parent_id:0
+msgid "Parent Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0
+#: field:mail.followers,res_id:0
+#: field:mail.message,res_id:0
+#: field:mail.wizard.invite,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_to_me_feeds
+msgid ""
+"<p>\n"
+"                    <b>No private message.</b>\n"
+"                </p><p>\n"
+"                    This list contains messages sent to you.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_rd
+msgid "R&D"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:61
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:79
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:286
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.mail:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:44
+#, python-format
+msgid "Share with my followers..."
+msgstr ""
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+"                                    discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:916
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notified_partner_ids:0
+#: help:mail.message,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:170
+#, python-format
+msgid "Compose a new message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:71
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:173
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_alias
+#: model:ir.ui.menu,name:mail.mail_alias_menu
+msgid "Aliases"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_force_thread_id:0
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_group_root
+msgid "My Groups"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_archives_feeds
+msgid ""
+"<p>\n"
+"                    No message found and no message sent yet.\n"
+"                </p><p>\n"
+"                    Click on the top-right icon to compose a message. This\n"
+"                    message will be sent by email if it's an internal "
+"contact.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: field:mail.mail,state:0
+msgid "Status"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "All feeds"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,record_name:0
+#: help:mail.message,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_notifications
+#: model:ir.model,name:mail.model_mail_notification
+#: model:ir.ui.menu,name:mail.menu_email_notifications
+#: field:mail.compose.message,notification_ids:0
+#: view:mail.message:0
+#: field:mail.message,notification_ids:0
+#: view:mail.notification:0
+msgid "Notifications"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+msgid "Search Alias"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_force_thread_id:0
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,name:0
+msgid ""
+"Message subtype gives a more precise type on the message, especially for "
+"system notifications. For example, it can be a notification related to a new "
+"record (New), or to a stage change in a process (Stage change). Message "
+"subtypes allow to precisely tune the notifications the user want to receive "
+"on its wall."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "by"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_best_sales_practices
+msgid "Best Sales Practices"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Selected Group Only"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_is_follower:0
+#: field:mail.thread,message_is_follower:0
+#: field:res.partner,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Groups"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Messages Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0
+#: field:mail.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:34
+#, python-format
+msgid "Post"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, python-format
+msgid "To:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:175
+#, python-format
+msgid "Write to my followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,default:0
+msgid "Default"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:260
+#, python-format
+msgid "show more message"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:228
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_summary:0
+#: field:mail.thread,message_summary:0
+#: field:res.partner,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Form"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:262
+#, python-format
+msgid "more messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:13
+#, python-format
+msgid "Following"
+msgstr ""
+
+#. module: mail
+#: sql_constraint:mail.alias:0
+msgid ""
+"Unfortunately this email alias is already used, please choose a unique one"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_user_id:0
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image:0
+msgid ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,attachment_ids:0
+#: view:mail.mail:0
+#: field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,record_name:0
+#: field:mail.message,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:110
+#: view:mail.compose.message:0
+#, python-format
+msgid "Followers of"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_group_feeds
+msgid "Discussion Group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:224
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_comment
+msgid "Discussions"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:11
+#, python-format
+msgid "Follow"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
+msgid "Whole Company"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:116
+#: view:mail.compose.message:0
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,body_html:0
+msgid "Rich-text/HTML message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:272
+#, python-format
+msgid "Compose new Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,menu_id:0
+msgid "Related Menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Content"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,notified_partner_ids:0
+#: field:mail.message,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,public:0
+msgid ""
+"This group is visible by non members.             Invisible groups can add "
+"members through the invite button."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_board
+msgid "Board meetings"
+msgstr ""
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_model_id:0
+msgid "Aliased Model"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0
+#: help:mail.message,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
+msgid "Description"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_followers
+msgid "Document Followers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
+#, python-format
+msgid "Remove this follower"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Never"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:920
+#, python-format
+msgid "Partners email addresses not found"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: help:res.partner,notification_email_send:0
+msgid ""
+"Choose in which case you want to receive an email when you receive new feeds."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_groups
+#: model:ir.ui.menu,name:mail.mail_allgroups
+msgid "Join a group"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_group_feeds
+msgid ""
+"<p>\n"
+"                    No message in this group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"This group is visible by everyone,\n"
+"                                    including your customers if you "
+"installed\n"
+"                                    the portal module."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:225
+#, python-format
+msgid "Set back to Todo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:113
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
+
+#. module: mail
+#: help:base.config.settings,alias_domain:0
+msgid ""
+"If you have setup a catch-all email domain redirected to the OpenERP server, "
+"enter the domain name here."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:126
+#, python-format
+msgid "others..."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.alias,alias_name:0
+#: field:mail.group,alias_id:0
+#: field:res.users,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notification_ids:0
+#: help:mail.message,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_feeds
+#: model:ir.ui.menu,name:mail.mail_feeds_main
+msgid "Messaging"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.message.subtype,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,subtype_ids:0
+msgid ""
+"Message subtypes followed, meaning subtypes that will be pushed onto the "
+"user's Wall."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_ids:0
+#: help:mail.thread,message_ids:0
+#: help:res.partner,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0
+#: field:mail.followers,res_model:0
+#: field:mail.message,model:0
+#: field:mail.wizard.invite,res_model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:287
+#, python-format
+msgid "unlike"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_domain:0
+msgid "Alias domain"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid ""
+"<p>\n"
+"                    <b>No todo.</b>\n"
+"                </p><p>\n"
+"                    When you process messages in your inbox, you can mark "
+"some\n"
+"                    as <i>todo</i>. From this menu, you can process all your "
+"todo.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,parent_id:0
+#: help:mail.message,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_hr_policies
+msgid "HR Policies"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Emails only"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
+#: model:ir.ui.menu,name:mail.mail_inboxfeeds
+msgid "Inbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:58
+#, python-format
+msgid "File"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/many2many_tags_email.js:63
+#, python-format
+msgid "Please complete partner's informations and Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_message_subtype
+#: model:ir.ui.menu,name:mail.menu_message_subtype
+msgid "Subtypes"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_alias
+msgid "Email Aliases"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_small:0
+msgid "Small-sized photo"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/marketing/i18n/ar.po b/addons/marketing/i18n/ar.po
index 2bf73c267b8..c70b5145ad4 100644
--- a/addons/marketing/i18n/ar.po
+++ b/addons/marketing/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-10 22:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "التسويق"
diff --git a/addons/marketing/i18n/bg.po b/addons/marketing/i18n/bg.po
index ba200cebb94..de7519db1ec 100644
--- a/addons/marketing/i18n/bg.po
+++ b/addons/marketing/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-10 15:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Маркетинг"
diff --git a/addons/marketing/i18n/ca.po b/addons/marketing/i18n/ca.po
index 7ab7445c6f2..d8727719058 100644
--- a/addons/marketing/i18n/ca.po
+++ b/addons/marketing/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-17 20:45+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Màrqueting"
diff --git a/addons/marketing/i18n/cs.po b/addons/marketing/i18n/cs.po
index 71d5c9e156b..ac7663cc125 100644
--- a/addons/marketing/i18n/cs.po
+++ b/addons/marketing/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 05:18+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr ""
diff --git a/addons/marketing/i18n/da.po b/addons/marketing/i18n/da.po
index a9ca087a6ab..a75df917226 100644
--- a/addons/marketing/i18n/da.po
+++ b/addons/marketing/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr ""
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index 1f84a989743..56e776f464c 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 07:08+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
@@ -39,6 +39,7 @@ msgid "Configure Marketing"
 msgstr "Konfiguriere Mrketing"
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/el.po b/addons/marketing/i18n/el.po
index c913bc8fb20..69433c42685 100644
--- a/addons/marketing/i18n/el.po
+++ b/addons/marketing/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-20 14:30+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Μάρκετινγκ"
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index b12176b49a5..3ff1ece077b 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:35+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -40,6 +40,7 @@ msgid "Configure Marketing"
 msgstr "Configurar Marketing"
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/es_CR.po b/addons/marketing/i18n/es_CR.po
index b2d314184b9..ba46f3e3420 100644
--- a/addons/marketing/i18n/es_CR.po
+++ b/addons/marketing/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:08+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: marketing
@@ -38,6 +38,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/fi.po b/addons/marketing/i18n/fi.po
index 077818eff1a..84ff0675510 100644
--- a/addons/marketing/i18n/fi.po
+++ b/addons/marketing/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-17 12:38+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Markkinointi"
diff --git a/addons/marketing/i18n/fr.po b/addons/marketing/i18n/fr.po
index 70d249d4888..c60a6727ddc 100644
--- a/addons/marketing/i18n/fr.po
+++ b/addons/marketing/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 09:04+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/gl.po b/addons/marketing/i18n/gl.po
index 357a24371e2..3b7215fdd68 100644
--- a/addons/marketing/i18n/gl.po
+++ b/addons/marketing/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-04 18:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Márketing"
diff --git a/addons/marketing/i18n/hr.po b/addons/marketing/i18n/hr.po
index 4405873282b..da5665d8b4d 100644
--- a/addons/marketing/i18n/hr.po
+++ b/addons/marketing/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-28 21:55+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/hu.po b/addons/marketing/i18n/hu.po
index 1666fea4216..48acf144f2e 100644
--- a/addons/marketing/i18n/hu.po
+++ b/addons/marketing/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-31 14:00+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -36,6 +36,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
index 5f2299224eb..cedc1645122 100644
--- a/addons/marketing/i18n/id.po
+++ b/addons/marketing/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-19 15:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Pemasaran"
diff --git a/addons/marketing/i18n/it.po b/addons/marketing/i18n/it.po
index 4ea20dfc786..4ed457b047f 100644
--- a/addons/marketing/i18n/it.po
+++ b/addons/marketing/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 12:33+0000\n"
 "Last-Translator: Martino Barbon <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/ja.po b/addons/marketing/i18n/ja.po
index 0b81774c275..992b32f6f4c 100644
--- a/addons/marketing/i18n/ja.po
+++ b/addons/marketing/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-24 21:01+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr ""
diff --git a/addons/marketing/i18n/lt.po b/addons/marketing/i18n/lt.po
index 36ea65c3b48..55cb86867e3 100644
--- a/addons/marketing/i18n/lt.po
+++ b/addons/marketing/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-15 13:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr ""
diff --git a/addons/marketing/i18n/lv.po b/addons/marketing/i18n/lv.po
index 7aaf0a14733..903cb95f86f 100644
--- a/addons/marketing/i18n/lv.po
+++ b/addons/marketing/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 23:05+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Mārketings"
diff --git a/addons/marketing/i18n/mn.po b/addons/marketing/i18n/mn.po
index 2ca6186f222..dc2173c3f27 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 13:43+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Маркетинг"
diff --git a/addons/marketing/i18n/nb.po b/addons/marketing/i18n/nb.po
index 5aa9a28b950..72d1598f917 100644
--- a/addons/marketing/i18n/nb.po
+++ b/addons/marketing/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-24 20:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr ""
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index 959d48579d8..5b9cdf68629 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 18:15+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
@@ -40,6 +40,7 @@ msgid "Configure Marketing"
 msgstr "Configureer Marketing"
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/pl.po b/addons/marketing/i18n/pl.po
index d5a8e0612da..2fbdc6ccfaa 100644
--- a/addons/marketing/i18n/pl.po
+++ b/addons/marketing/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 21:09+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr "Konfiguruj marketing"
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index a89aa507984..c42556a263f 100644
--- a/addons/marketing/i18n/pt.po
+++ b/addons/marketing/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 14:56+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr "Configuração"
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index 1f674ddca56..d3ca02b1a47 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 17:48+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
@@ -41,6 +41,7 @@ msgid "Configure Marketing"
 msgstr "Configurar Marketing"
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/ro.po b/addons/marketing/i18n/ro.po
index 9d62735d792..58bbff8112e 100644
--- a/addons/marketing/i18n/ro.po
+++ b/addons/marketing/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-25 14:47+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
index fbbec97f2dd..72426ea90a2 100644
--- a/addons/marketing/i18n/ru.po
+++ b/addons/marketing/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-28 14:15+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Маркетинг"
diff --git a/addons/marketing/i18n/sk.po b/addons/marketing/i18n/sk.po
index 768dd10d9d0..74480ad193e 100644
--- a/addons/marketing/i18n/sk.po
+++ b/addons/marketing/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 15:02+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Reklama"
diff --git a/addons/marketing/i18n/sl.po b/addons/marketing/i18n/sl.po
index c322ad109a8..ce354736a17 100644
--- a/addons/marketing/i18n/sl.po
+++ b/addons/marketing/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-10-11 16:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/sr.po b/addons/marketing/i18n/sr.po
index 2c24d70ca3e..8b87395f681 100644
--- a/addons/marketing/i18n/sr.po
+++ b/addons/marketing/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-04 08:50+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/sr@latin.po b/addons/marketing/i18n/sr@latin.po
index 974cff36989..34a9dd67c58 100644
--- a/addons/marketing/i18n/sr@latin.po
+++ b/addons/marketing/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 14:27+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marketing"
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index f54d9b63eda..5e3bd099148 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-24 07:36+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -36,6 +36,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Marknadsföring"
diff --git a/addons/marketing/i18n/th.po b/addons/marketing/i18n/th.po
index e27cd3938c6..347d590f636 100644
--- a/addons/marketing/i18n/th.po
+++ b/addons/marketing/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 11:16+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "การตลาด"
diff --git a/addons/marketing/i18n/tr.po b/addons/marketing/i18n/tr.po
index fe9f4a55c31..93922e0cfdb 100644
--- a/addons/marketing/i18n/tr.po
+++ b/addons/marketing/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 23:19+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "Pazarlama"
diff --git a/addons/marketing/i18n/zh_CN.po b/addons/marketing/i18n/zh_CN.po
index 49b19c719dc..5331d3619f1 100644
--- a/addons/marketing/i18n/zh_CN.po
+++ b/addons/marketing/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 07:40+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr "市场营销管理"
diff --git a/addons/marketing/i18n/zh_TW.po b/addons/marketing/i18n/zh_TW.po
index c6062a0cc6b..54d28db381c 100644
--- a/addons/marketing/i18n/zh_TW.po
+++ b/addons/marketing/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-19 10:41+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -37,6 +37,7 @@ msgid "Configure Marketing"
 msgstr ""
 
 #. module: marketing
+#: view:crm.lead:0
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
 msgid "Marketing"
 msgstr ""
diff --git a/addons/marketing_campaign/i18n/ar.po b/addons/marketing_campaign/i18n/ar.po
index 9d49cc63a65..a4e28b0c16b 100644
--- a/addons/marketing_campaign/i18n/ar.po
+++ b/addons/marketing_campaign/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-08 15:06+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/bg.po b/addons/marketing_campaign/i18n/bg.po
index 5283029f305..dd240f9bc51 100644
--- a/addons/marketing_campaign/i18n/bg.po
+++ b/addons/marketing_campaign/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-10 15:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ca.po b/addons/marketing_campaign/i18n/ca.po
index 0a520ca32f5..17ac858fc8f 100644
--- a/addons/marketing_campaign/i18n/ca.po
+++ b/addons/marketing_campaign/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-05 21:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/da.po b/addons/marketing_campaign/i18n/da.po
index bd9c3b68a0b..48b2951b325 100644
--- a/addons/marketing_campaign/i18n/da.po
+++ b/addons/marketing_campaign/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index eb3dd4dfb74..43ffed535d2 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 08:09+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/el.po b/addons/marketing_campaign/i18n/el.po
index 6ea9b19ceee..b3bec4669cc 100644
--- a/addons/marketing_campaign/i18n/el.po
+++ b/addons/marketing_campaign/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-08 19:40+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index b4b322b57f0..1c76a6ce42c 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 15:04+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es_CR.po b/addons/marketing_campaign/i18n/es_CR.po
index 02a70964193..ae98f5626c7 100644
--- a/addons/marketing_campaign/i18n/es_CR.po
+++ b/addons/marketing_campaign/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:16+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/fi.po b/addons/marketing_campaign/i18n/fi.po
index 6d88472c045..493944507e1 100644
--- a/addons/marketing_campaign/i18n/fi.po
+++ b/addons/marketing_campaign/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-24 14:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index 5d8434abe50..8b2a3c8da55 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 11:05+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hi.po b/addons/marketing_campaign/i18n/hi.po
index 175ac6f1491..8aac3631f1a 100644
--- a/addons/marketing_campaign/i18n/hi.po
+++ b/addons/marketing_campaign/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-29 12:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hr.po b/addons/marketing_campaign/i18n/hr.po
index 2f275404d59..70f1800fd77 100644
--- a/addons/marketing_campaign/i18n/hr.po
+++ b/addons/marketing_campaign/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 17:31+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hu.po b/addons/marketing_campaign/i18n/hu.po
index 966540e5dfa..460d35dd20e 100644
--- a/addons/marketing_campaign/i18n/hu.po
+++ b/addons/marketing_campaign/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-04 14:42+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/it.po b/addons/marketing_campaign/i18n/it.po
index 51004680ad6..f740f5987cc 100644
--- a/addons/marketing_campaign/i18n/it.po
+++ b/addons/marketing_campaign/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-06 12:48+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ja.po b/addons/marketing_campaign/i18n/ja.po
index d6bfbeb2d9b..32e8b3ee2df 100644
--- a/addons/marketing_campaign/i18n/ja.po
+++ b/addons/marketing_campaign/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:46+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/lv.po b/addons/marketing_campaign/i18n/lv.po
index 3c82aa6d440..1d6ff133352 100644
--- a/addons/marketing_campaign/i18n/lv.po
+++ b/addons/marketing_campaign/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 23:08+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/mn.po b/addons/marketing_campaign/i18n/mn.po
index 30ac0acf8ab..74094733f0d 100644
--- a/addons/marketing_campaign/i18n/mn.po
+++ b/addons/marketing_campaign/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 13:59+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"Last-Translator: soyoko <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po
index 82f1b2a8493..553a94232e6 100644
--- a/addons/marketing_campaign/i18n/nl.po
+++ b/addons/marketing_campaign/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-18 20:30+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pl.po b/addons/marketing_campaign/i18n/pl.po
index b4be9a315fc..dff40d0435f 100644
--- a/addons/marketing_campaign/i18n/pl.po
+++ b/addons/marketing_campaign/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 09:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pt.po b/addons/marketing_campaign/i18n/pt.po
index a2f90b44d25..02d46dc6585 100644
--- a/addons/marketing_campaign/i18n/pt.po
+++ b/addons/marketing_campaign/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-11 19:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pt_BR.po b/addons/marketing_campaign/i18n/pt_BR.po
index 04912d21eeb..53b12569fc5 100644
--- a/addons/marketing_campaign/i18n/pt_BR.po
+++ b/addons/marketing_campaign/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 21:18+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/ro.po b/addons/marketing_campaign/i18n/ro.po
index 3166bcc772e..c0603d058b5 100644
--- a/addons/marketing_campaign/i18n/ro.po
+++ b/addons/marketing_campaign/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-29 07:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
index 9cc19b98441..109fa73a8d1 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-07 22:35+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/sr@latin.po b/addons/marketing_campaign/i18n/sr@latin.po
index 6f533e306f3..24202d96ba8 100644
--- a/addons/marketing_campaign/i18n/sr@latin.po
+++ b/addons/marketing_campaign/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 18:26+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index bb1ca4f99d0..c0070cc873e 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-28 01:00+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/tr.po b/addons/marketing_campaign/i18n/tr.po
index 2ab0c6f4697..98efd0dfaf9 100644
--- a/addons/marketing_campaign/i18n/tr.po
+++ b/addons/marketing_campaign/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 17:28+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/zh_CN.po b/addons/marketing_campaign/i18n/zh_CN.po
index c2282ade673..c8b672e7956 100644
--- a/addons/marketing_campaign/i18n/zh_CN.po
+++ b/addons/marketing_campaign/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 08:14+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign_crm_demo/i18n/ar.po b/addons/marketing_campaign_crm_demo/i18n/ar.po
index 35d4381b95d..b2f0c8ec172 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ar.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-17 10:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/bg.po b/addons/marketing_campaign_crm_demo/i18n/bg.po
index 1b43b94c30a..220e3683524 100644
--- a/addons/marketing_campaign_crm_demo/i18n/bg.po
+++ b/addons/marketing_campaign_crm_demo/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-27 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/ca.po b/addons/marketing_campaign_crm_demo/i18n/ca.po
index a26a7cce417..59b3e664130 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ca.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-13 00:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/da.po b/addons/marketing_campaign_crm_demo/i18n/da.po
index c372e7561cb..b863c1b0ee6 100644
--- a/addons/marketing_campaign_crm_demo/i18n/da.po
+++ b/addons/marketing_campaign_crm_demo/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
index 4705f352109..b81e091c8df 100644
--- a/addons/marketing_campaign_crm_demo/i18n/de.po
+++ b/addons/marketing_campaign_crm_demo/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 11:25+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/es.po b/addons/marketing_campaign_crm_demo/i18n/es.po
index 2f0c80bd513..132bc57195b 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 11:01+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/es_CR.po b/addons/marketing_campaign_crm_demo/i18n/es_CR.po
index 67d6d22288c..ee46af3818c 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es_CR.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 00:18+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/marketing_campaign_crm_demo/i18n/fr.po b/addons/marketing_campaign_crm_demo/i18n/fr.po
index 785b88fd919..7c4d8e0771d 100644
--- a/addons/marketing_campaign_crm_demo/i18n/fr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-25 10:31+0000\n"
 "Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/gl.po b/addons/marketing_campaign_crm_demo/i18n/gl.po
index 374ec3ecc50..0cb17894ae7 100644
--- a/addons/marketing_campaign_crm_demo/i18n/gl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-22 11:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/hr.po b/addons/marketing_campaign_crm_demo/i18n/hr.po
index ea2a8ee9ffa..85690dbd61d 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 17:32+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/hu.po b/addons/marketing_campaign_crm_demo/i18n/hu.po
index 50509283b96..8c3b1bb2be9 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hu.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-21 15:22+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/it.po b/addons/marketing_campaign_crm_demo/i18n/it.po
index 25296836dec..d3501db18af 100644
--- a/addons/marketing_campaign_crm_demo/i18n/it.po
+++ b/addons/marketing_campaign_crm_demo/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 18:54+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/ja.po b/addons/marketing_campaign_crm_demo/i18n/ja.po
index 508d4524d7a..d6e5af9d979 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ja.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-25 22:02+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/nb.po b/addons/marketing_campaign_crm_demo/i18n/nb.po
index 3f21b532b68..b75e484e798 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nb.po
+++ b/addons/marketing_campaign_crm_demo/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index ed658326f2d..a6b70fe2c78 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-18 07:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt.po b/addons/marketing_campaign_crm_demo/i18n/pt.po
index 44173bb4d12..bed6459aba2 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt.po
+++ b/addons/marketing_campaign_crm_demo/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-12 09:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt_BR.po b/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
index 29e70d934bd..75a6ee47c25 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
+++ b/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 21:32+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/marketing_campaign_crm_demo/i18n/ro.po b/addons/marketing_campaign_crm_demo/i18n/ro.po
index e9a87a52053..f5e0524f933 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ro.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-07 10:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/ru.po b/addons/marketing_campaign_crm_demo/i18n/ru.po
index e633fce9c12..60af6256a9c 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ru.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-28 14:22+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr.po b/addons/marketing_campaign_crm_demo/i18n/sr.po
index d507bd58493..cc00b960dc8 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-04 09:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
index 7e704c4ea0f..61a09ec0104 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 16:10+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/tr.po b/addons/marketing_campaign_crm_demo/i18n/tr.po
index fae05bb3116..85065915d52 100644
--- a/addons/marketing_campaign_crm_demo/i18n/tr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-25 17:29+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
index 5c529ca1555..f7c42468b88 100644
--- a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
+++ b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-29 16:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index 24d562d71b3..865e9a52c0c 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr "التاريخ النهائي للعضوية"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr "تحليل الأعضاء"
 msgid "End Membership Date"
 msgstr "تاريخ انتهاء العضوية"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index c5b33701df9..9b4f0f0224c 100644
--- a/addons/membership/i18n/bg.po
+++ b/addons/membership/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 10:50+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Дата за"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Дата от"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Информация"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr "Май"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Година"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -802,6 +794,9 @@ msgstr ""
 #~ msgid "Configuration"
 #~ msgstr "Настройка"
 
+#~ msgid "Information"
+#~ msgstr "Информация"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -817,6 +812,12 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Грешка: Невалиден европейски баркод"
 
+#~ msgid "Date to"
+#~ msgstr "Дата за"
+
+#~ msgid "Date from"
+#~ msgstr "Дата от"
+
 #, python-format
 #~ msgid "Error !"
 #~ msgstr "Грешка!"
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index 61708ff6786..af071d32298 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:59+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Do datuma:"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Od datuma:"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Poništi"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informacije"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Godina"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -853,6 +845,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
+#~ msgid "Information"
+#~ msgstr "Informacije"
+
 #~ msgid "Current members"
 #~ msgstr "Aktivni članovi"
 
@@ -901,6 +896,12 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: nevažeći EAN kod"
 
+#~ msgid "Date to"
+#~ msgstr "Do datuma:"
+
+#~ msgid "Date from"
+#~ msgstr "Od datuma:"
+
 #~ msgid "Configuration"
 #~ msgstr "Podešavanje"
 
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
index 2f0a319fdd6..985b048502a 100644
--- a/addons/membership/i18n/ca.po
+++ b/addons/membership/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:19+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Data fins"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Data de finalització com a soci"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr "Anàlisi dels socis"
 msgid "End Membership Date"
 msgstr "Data de finalització com a soci"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data des de"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -466,11 +462,6 @@ msgstr "Data en la qual el membre s'ha convertit en soci."
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Data de finalització com a soci"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -664,11 +655,6 @@ msgstr "Cancel·la"
 msgid "All non Members"
 msgstr "Tots no socis"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informació"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -700,6 +686,7 @@ msgid "May"
 msgstr "Maig"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -789,6 +776,11 @@ msgstr "Membre cancel·lat"
 msgid "Year"
 msgstr "Any"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -797,12 +789,18 @@ msgstr "Ingrés realitzat"
 #~ msgid "Currency"
 #~ msgstr "Moneda"
 
+#~ msgid "Date to"
+#~ msgstr "Data fins"
+
 #~ msgid "Associate member"
 #~ msgstr "Soci beneficiari"
 
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Error! No es poden crear comptes recursius."
 
+#~ msgid "Date from"
+#~ msgstr "Data des de"
+
 #~ msgid "Free members"
 #~ msgstr "Socis gratis"
 
@@ -890,6 +888,9 @@ msgstr "Ingrés realitzat"
 #~ msgid "Paid members"
 #~ msgstr "Socis pagats"
 
+#~ msgid "Information"
+#~ msgstr "Informació"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index 88f95f1d73c..2d95f68612b 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-25 12:33+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: membership
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Datum do"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Datum ukončení členství"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr "Analýza členů"
 msgid "End Membership Date"
 msgstr "Datum ukončení členství"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Počáteční datum"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -465,11 +461,6 @@ msgstr "Datum, kdy se člen připojil k členství"
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Datum ukončení členství"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -663,11 +654,6 @@ msgstr ""
 msgid "All non Members"
 msgstr "Všichni nečlenové"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informace"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -699,6 +685,7 @@ msgid "May"
 msgstr "Květen"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -788,6 +775,11 @@ msgstr "Zrušený člen"
 msgid "Year"
 msgstr "Rok"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -799,9 +791,15 @@ msgstr "Příjem proveden"
 #~ msgid "Configuration"
 #~ msgstr "Konfigurace"
 
+#~ msgid "Information"
+#~ msgstr "Informace"
+
 #~ msgid "Confirm"
 #~ msgstr "Potvrdit"
 
+#~ msgid "Date to"
+#~ msgstr "Datum do"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatné jméno modelu v definici akce."
 
@@ -814,6 +812,9 @@ msgstr "Příjem proveden"
 #~ msgid "Associate member"
 #~ msgstr "Přidružený člen"
 
+#~ msgid "Date from"
+#~ msgstr "Počáteční datum"
+
 #~ msgid ""
 #~ "It indicates the membership state.\n"
 #~ "                    -Non Member: A member who has not applied for any "
diff --git a/addons/membership/i18n/da.po b/addons/membership/i18n/da.po
index af9a91d8071..9e13a789836 100644
--- a/addons/membership/i18n/da.po
+++ b/addons/membership/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index c95ac9324c3..a3b433a7444 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-14 15:12+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr "Enddatum der Mitgliedsschaft"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Bis"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Ende Mitgliedschaft"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr "Analyse Mitglieder"
 msgid "End Membership Date"
 msgstr "Ende Mitgliedschaft am"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Von"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -464,11 +460,6 @@ msgstr "Eintrittsdatum des Mitglied"
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Ende Mitgliedschaft"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -662,11 +653,6 @@ msgstr "Abbrechen"
 msgid "All non Members"
 msgstr "Alle Nichtmitglieder"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Information"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -698,6 +684,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -787,6 +774,11 @@ msgstr "Ehemalige Mitglieder"
 msgid "Year"
 msgstr "Jahr"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -795,12 +787,18 @@ msgstr "Generierter Umsatz"
 #~ msgid "Currency"
 #~ msgstr "Währung"
 
+#~ msgid "Date to"
+#~ msgstr "Bis"
+
 #~ msgid "Associate member"
 #~ msgstr "Verbundenes Mitglied"
 
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Fehler! Sie können keine rekursiven Konten definieren."
 
+#~ msgid "Date from"
+#~ msgstr "Von"
+
 #~ msgid "Free members"
 #~ msgstr "Freie Mitglieder"
 
@@ -882,6 +880,9 @@ msgstr "Generierter Umsatz"
 #~ msgid "Paid members"
 #~ msgstr "Zahlende Mitglieder"
 
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index 85a0621a5f9..08539589dff 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-13 11:14+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 11:14+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr "Fecha final de socio"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Fecha hasta"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Fecha finalización como socio."
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr "Fecha fin de asociación"
@@ -197,11 +198,6 @@ msgstr "Análisis socios"
 msgid "End Membership Date"
 msgstr "Fecha finalización como socio."
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Fecha desde"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -467,11 +463,6 @@ msgstr "Fecha en la que el miembro se ha convertido en socio."
 msgid "Membership Status"
 msgstr "Estado de asociación"
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Fecha finalización como socio."
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -681,11 +672,6 @@ msgstr "Cancelar"
 msgid "All non Members"
 msgstr "Todos no socios"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Información"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -717,6 +703,7 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr "Fecha de inicio de la asociación"
@@ -806,6 +793,11 @@ msgstr "Miembro cancelado"
 msgid "Year"
 msgstr "Año"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -814,12 +806,18 @@ msgstr "Ingreso realizado"
 #~ msgid "Currency"
 #~ msgstr "Moneda"
 
+#~ msgid "Date to"
+#~ msgstr "Fecha hasta"
+
 #~ msgid "Associate member"
 #~ msgstr "Socio beneficiario"
 
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "¡Error! No se pueden crear cuentas recursivas."
 
+#~ msgid "Date from"
+#~ msgstr "Fecha desde"
+
 #~ msgid "Free members"
 #~ msgstr "Socios gratis"
 
@@ -907,6 +905,9 @@ msgstr "Ingreso realizado"
 #~ msgid "Paid members"
 #~ msgstr "Socios pagados"
 
+#~ msgid "Information"
+#~ msgstr "Información"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index d2288bcb798..3dcd584aacd 100644
--- a/addons/membership/i18n/es_AR.po
+++ b/addons/membership/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-24 17:35+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Fecha hasta"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Fecha desde"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -464,11 +460,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -662,11 +653,6 @@ msgstr "Cancelar"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Información"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -698,6 +684,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -787,6 +774,11 @@ msgstr ""
 msgid "Year"
 msgstr "Año"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -795,12 +787,18 @@ msgstr ""
 #~ msgid "Partners"
 #~ msgstr "Partners"
 
+#~ msgid "Information"
+#~ msgstr "Información"
+
 #~ msgid "Currency"
 #~ msgstr "Moneda"
 
 #~ msgid "Free members"
 #~ msgstr "Socios gratis"
 
+#~ msgid "Date from"
+#~ msgstr "Fecha desde"
+
 #~ msgid "Associate member"
 #~ msgstr "Socio beneficiario"
 
@@ -906,6 +904,9 @@ msgstr ""
 #~ msgid "Current membership state"
 #~ msgstr "Estado actual del socio"
 
+#~ msgid "Date to"
+#~ msgstr "Fecha hasta"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
 
diff --git a/addons/membership/i18n/es_CR.po b/addons/membership/i18n/es_CR.po
index f5ae7107846..691228931df 100644
--- a/addons/membership/i18n/es_CR.po
+++ b/addons/membership/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:23+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: membership
@@ -97,11 +97,12 @@ msgid "Ending Date Of Membership"
 msgstr "Fecha de finalización de la membresía"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Fecha hasta"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Fecha finalización como socio."
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -198,11 +199,6 @@ msgstr "Análisis socios"
 msgid "End Membership Date"
 msgstr "Fecha finalización como socio."
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Fecha desde"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -468,11 +464,6 @@ msgstr "Fecha en la que el miembro se ha convertido en socio."
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Fecha finalización como socio."
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -666,11 +657,6 @@ msgstr "Cancelar"
 msgid "All non Members"
 msgstr "Todos no socios"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Información"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -702,6 +688,7 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -791,11 +778,19 @@ msgstr "Miembro cancelado"
 msgid "Year"
 msgstr "Año"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
 msgstr "Ingreso realizado"
 
+#~ msgid "Date to"
+#~ msgstr "Fecha hasta"
+
 #~ msgid "Stop membership date"
 #~ msgstr "Fecha final de afiliación"
 
@@ -805,6 +800,9 @@ msgstr "Ingreso realizado"
 #~ msgid "Associate member"
 #~ msgstr "Socio beneficiario"
 
+#~ msgid "Date from"
+#~ msgstr "Fecha desde"
+
 #~ msgid "Partners"
 #~ msgstr "Socios"
 
@@ -918,6 +916,9 @@ msgstr "Ingreso realizado"
 #~ msgid "Close"
 #~ msgstr "Cerrar"
 
+#~ msgid "Information"
+#~ msgstr "Información"
+
 #~ msgid "Categorization"
 #~ msgstr "Categorización"
 
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index 5ad23e2e194..183499de21f 100644
--- a/addons/membership/i18n/et.po
+++ b/addons/membership/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 07:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Kuupäevani"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Kuupäevast"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Tühista"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informatsioon"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Aasta"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -816,14 +808,23 @@ msgstr ""
 #~ msgstr ""
 #~ "Viga: vaikimisi mõõtühik ja ostu mõõtühik peavad olema samast kategooriast."
 
+#~ msgid "Information"
+#~ msgstr "Informatsioon"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
+#~ msgid "Date to"
+#~ msgstr "Kuupäevani"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
+#~ msgid "Date from"
+#~ msgstr "Kuupäevast"
+
 #~ msgid "Free members"
 #~ msgstr "Tasuta liikmed"
 
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index 6a4ff054fae..d47ef1083f4 100644
--- a/addons/membership/i18n/fi.po
+++ b/addons/membership/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 07:22+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Päiväys alkaen"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr "Peru"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Tietoa"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr ""
 msgid "Year"
 msgstr "Vuosi"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -872,6 +864,9 @@ msgstr ""
 #~ msgid "Currency"
 #~ msgstr "Valuutta"
 
+#~ msgid "Date from"
+#~ msgstr "Päiväys alkaen"
+
 #~ msgid "Configuration"
 #~ msgstr "Asetukset"
 
@@ -905,5 +900,8 @@ msgstr ""
 #~ msgid "Paid"
 #~ msgstr "Maksettu"
 
+#~ msgid "Information"
+#~ msgstr "Tietoa"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Virhe: Virheellinen EAN-koodi"
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index 52faa0b3e6c..d81141f3ad2 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 16:07+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2012-12-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr "Date de fin de l'adhésion"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Date de fin"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Date de fin de l'adhésion"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr "Analyse des membres"
 msgid "End Membership Date"
 msgstr "Date de fin d'adhésion"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Date de début"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -465,11 +461,6 @@ msgstr "Date à laquelle l'adhésion du membre a été effective."
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Date de fin de l'adhésion"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -663,11 +654,6 @@ msgstr "Annuler"
 msgid "All non Members"
 msgstr "Tous les non-membres"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Information"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -699,6 +685,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -789,6 +776,11 @@ msgstr "Adhésion annulée"
 msgid "Year"
 msgstr "Année"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -800,9 +792,15 @@ msgstr "Revenu final"
 #~ msgid "Currency"
 #~ msgstr "Devise"
 
+#~ msgid "Date to"
+#~ msgstr "Date de fin"
+
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Erreur ! Vous ne pouvez pas créer d'écritures récursives."
 
+#~ msgid "Date from"
+#~ msgstr "Date de début"
+
 #~ msgid "Free members"
 #~ msgstr "Membres Libres"
 
@@ -866,6 +864,9 @@ msgstr "Revenu final"
 #~ msgid "Paid members"
 #~ msgstr "Membres Cotisants"
 
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/gl.po b/addons/membership/i18n/gl.po
index 1acbf5874c3..36dcf80ccd4 100644
--- a/addons/membership/i18n/gl.po
+++ b/addons/membership/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-11 16:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Data ata"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Data remate como socio."
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr "Análise socios"
 msgid "End Membership Date"
 msgstr "Data remate como socio."
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data dende"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -465,11 +461,6 @@ msgstr "Data na que o membro se converteu en socio."
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Data remate como socio."
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -663,11 +654,6 @@ msgstr "Cancelar"
 msgid "All non Members"
 msgstr "Todos non socios"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Información"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -699,6 +685,7 @@ msgid "May"
 msgstr "Maio"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -788,6 +775,11 @@ msgstr "Membro cancelado"
 msgid "Year"
 msgstr "Ano"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -799,6 +791,9 @@ msgstr "Ingreso realizado"
 #~ msgid "Currency"
 #~ msgstr "Moeda"
 
+#~ msgid "Date to"
+#~ msgstr "Data ata"
+
 #~ msgid "Associate member"
 #~ msgstr "Socio Asociado"
 
@@ -808,6 +803,9 @@ msgstr "Ingreso realizado"
 #~ msgid "Error: BVR reference is required."
 #~ msgstr "Erro: referencia BVR é necesaria."
 
+#~ msgid "Date from"
+#~ msgstr "Data dende"
+
 #~ msgid "Free members"
 #~ msgstr "Socios gratis"
 
@@ -902,6 +900,9 @@ msgstr "Ingreso realizado"
 #~ msgid "Paid members"
 #~ msgstr "Socios pagados"
 
+#~ msgid "Information"
+#~ msgstr "Información"
+
 #~ msgid "Canceled Member"
 #~ msgstr "Socio cancelado"
 
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index 6d5ff18dbc5..99e0aa143ac 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-19 17:33+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index e0b5ade2620..43088b8300e 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-04 15:05+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Dátumig"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Dátumtól"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Információ"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr "Május"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Év"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -793,6 +785,12 @@ msgstr "Bevétel kész"
 #~ msgid "Partners"
 #~ msgstr "Partnerek"
 
+#~ msgid "Date to"
+#~ msgstr "Dátumig"
+
+#~ msgid "Date from"
+#~ msgstr "Dátumtól"
+
 #, python-format
 #~ msgid "Error !"
 #~ msgstr "Hiba !"
@@ -836,6 +834,9 @@ msgstr "Bevétel kész"
 #~ msgid "Close"
 #~ msgstr "Zárás"
 
+#~ msgid "Information"
+#~ msgstr "Információ"
+
 #~ msgid "Categorization"
 #~ msgstr "Kategorizálás"
 
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 9e323f16964..2a9a81600c9 100644
--- a/addons/membership/i18n/id.po
+++ b/addons/membership/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 17:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index 5b49917eccc..d936c13def5 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-06 10:46+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr "Data di fine dell'iscrizione"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Fino a"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Data fine iscrizione"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr "Analisi membri"
 msgid "End Membership Date"
 msgstr "Data fine Iscrizione"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data Da"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Data fine iscrizione"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Annulla"
 msgid "All non Members"
 msgstr "Tutti i non membri"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informazioni"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr "Maggio"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr "Iscrizione annullata"
 msgid "Year"
 msgstr "Anno"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -793,6 +785,12 @@ msgstr ""
 #~ msgid "Currency"
 #~ msgstr "Valuta"
 
+#~ msgid "Date to"
+#~ msgstr "Fino a"
+
+#~ msgid "Date from"
+#~ msgstr "Data Da"
+
 #~ msgid "Free members"
 #~ msgstr "Membri Gratuiti"
 
@@ -876,6 +874,9 @@ msgstr ""
 #~ msgid "Paid members"
 #~ msgstr "Membri che hanno pagato"
 
+#~ msgid "Information"
+#~ msgstr "Informazioni"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
index ad69914e172..acfc9e8b4fa 100644
--- a/addons/membership/i18n/ja.po
+++ b/addons/membership/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-07 17:00+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr "会員の終了日"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "終了日"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "会員終了日"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr "会員分析"
 msgid "End Membership Date"
 msgstr "会員の終了日"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "開始日"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr "会員となった日付"
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "会員終了日"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr ""
 msgid "All non Members"
 msgstr "全非会員"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "情報"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr "5月"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr "キャンセル済会員"
 msgid "Year"
 msgstr "年"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -806,9 +798,15 @@ msgstr "売上完了"
 #~ msgid "   Month   "
 #~ msgstr "   月   "
 
+#~ msgid "Date to"
+#~ msgstr "終了日"
+
 #~ msgid "Partners"
 #~ msgstr "パートナ"
 
+#~ msgid "Date from"
+#~ msgstr "開始日"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    月-1    "
 
@@ -923,6 +921,9 @@ msgstr "売上完了"
 #~ msgid "General"
 #~ msgstr "一般"
 
+#~ msgid "Information"
+#~ msgstr "情報"
+
 #~ msgid "Free member"
 #~ msgstr "無料会員"
 
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index 9aaa8489d01..5995c30467a 100644
--- a/addons/membership/i18n/ko.po
+++ b/addons/membership/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 12:57+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "종료 날짜"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "시작 날짜"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr "취소"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "정보"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr ""
 msgid "Year"
 msgstr "년도"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -800,6 +792,9 @@ msgstr ""
 #~ msgid "Free members"
 #~ msgstr "자유 멤버"
 
+#~ msgid "Date from"
+#~ msgstr "시작 날짜"
+
 #~ msgid "Associate member"
 #~ msgstr "연관 멤버"
 
@@ -809,6 +804,9 @@ msgstr ""
 #~ msgid "Error: BVR reference is required."
 #~ msgstr "에러: BVR 참조가 필요합니다."
 
+#~ msgid "Date to"
+#~ msgstr "종료 날짜"
+
 #, python-format
 #~ msgid "Error !"
 #~ msgstr "에러!"
@@ -891,6 +889,9 @@ msgstr ""
 #~ msgid "Canceled Member"
 #~ msgstr "취쇤 멤버"
 
+#~ msgid "Information"
+#~ msgstr "정보"
+
 #~ msgid "Current members"
 #~ msgstr "현재 멤버들"
 
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index f5cf1ff4d08..8da7706b829 100644
--- a/addons/membership/i18n/lt.po
+++ b/addons/membership/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 10:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/mn.po b/addons/membership/i18n/mn.po
index 4a59b32155f..8bdcaa91328 100644
--- a/addons/membership/i18n/mn.po
+++ b/addons/membership/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-14 08:44+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr "Гишүүнчлэлийн дуусах огноо"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Хүртэл огноо"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Гишүүнчлэл дуусах огноо"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr "Гишүүдийн Шинжилгээ"
 msgid "End Membership Date"
 msgstr "Гишүүнчлэлийн дуусах огноо"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Эхлэх огноо"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -465,11 +461,6 @@ msgstr "Гишүүнийн гишүүнчлэлээр холбогдсон ог
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Гишүүнчлэл дуусах огноо"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -663,11 +654,6 @@ msgstr "Цуцлах"
 msgid "All non Members"
 msgstr "Бүх гишүүн бишүүд"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Мэдээлэл"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -699,6 +685,7 @@ msgid "May"
 msgstr "5-р сар"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -788,6 +775,11 @@ msgstr "Цуцлагдсан гишүүн"
 msgid "Year"
 msgstr "Жил"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -885,6 +877,9 @@ msgstr "Орлого хийгдсэн"
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
 
+#~ msgid "Information"
+#~ msgstr "Мэдээлэл"
+
 #~ msgid "Current members"
 #~ msgstr "Одоогийн гишүүд"
 
@@ -897,6 +892,9 @@ msgstr "Орлого хийгдсэн"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Алдаа: Буруу зураасан код"
 
+#~ msgid "Date to"
+#~ msgstr "Хүртэл огноо"
+
 #~ msgid "   Month   "
 #~ msgstr "   Сар   "
 
@@ -906,6 +904,9 @@ msgstr "Орлого хийгдсэн"
 #~ msgid "Associate member"
 #~ msgstr "Гишүүнийг холбох"
 
+#~ msgid "Date from"
+#~ msgstr "Эхлэх огноо"
+
 #~ msgid "Events created in current month"
 #~ msgstr "Энэ сард үүсгэгдсэн үйл явдал"
 
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index 76d71511a2b..c812deb86a3 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 19:10+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr "Einddatum van lidmaatschap"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Datum t/m"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Einddatum lidmaatschap"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr "Lidmaatschap einddatum"
@@ -197,11 +198,6 @@ msgstr "Leden analyse"
 msgid "End Membership Date"
 msgstr "Einddatum Lidmaatschap"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Datum vanaf"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -465,11 +461,6 @@ msgstr "Datum waarop het lid zijn lidmaatschap is aangegaan."
 msgid "Membership Status"
 msgstr "Lidmaatschap status"
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Einddatum lidmaatschap"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -663,11 +654,6 @@ msgstr "Annuleren"
 msgid "All non Members"
 msgstr "Alle niet-leden"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informatie"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -699,6 +685,7 @@ msgid "May"
 msgstr "Mei"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr "Lidmaatschap startdatum"
@@ -789,6 +776,11 @@ msgstr "Opgezegd lid"
 msgid "Year"
 msgstr "Jaar"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -800,11 +792,8 @@ msgstr "Ontvangen inkomsten"
 #~ msgid "Configuration"
 #~ msgstr "Instellingen"
 
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fout: de standaard meeteenheid en de inkoopeenheid moet in de zelfde "
-#~ "categorie liggen."
+#~ msgid "Information"
+#~ msgstr "Informatie"
 
 #~ msgid "Currency"
 #~ msgstr "Valuta"
@@ -812,6 +801,9 @@ msgstr "Ontvangen inkomsten"
 #~ msgid "Partners"
 #~ msgstr "Relaties"
 
+#~ msgid "Date from"
+#~ msgstr "Datum vanaf"
+
 #~ msgid "Free members"
 #~ msgstr "Gratis leden"
 
@@ -1109,3 +1101,12 @@ msgstr "Ontvangen inkomsten"
 
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Factuurnummer moet uniek zijn per bedrijf!"
+
+#~ msgid "Date to"
+#~ msgstr "Datum t/m"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Fout: de standaard maateenheid en de inkoopeenheid moet in de zelfde "
+#~ "categorie liggen."
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index a3960d721e2..f03934c20be 100644
--- a/addons/membership/i18n/nl_BE.po
+++ b/addons/membership/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-10 09:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index b5422032752..6b4b36d4d13 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 09:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Data do"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data od"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Anuluj"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informacja"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Rok"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -818,12 +810,18 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Błąd: Niedozwolony kod EAN"
 
+#~ msgid "Date to"
+#~ msgstr "Data do"
+
 #~ msgid "Currency"
 #~ msgstr "Waluta"
 
 #~ msgid "Free members"
 #~ msgstr "Wolni członkowie"
 
+#~ msgid "Date from"
+#~ msgstr "Data od"
+
 #~ msgid "Associate member"
 #~ msgstr "Powiązany członek"
 
@@ -902,6 +900,9 @@ msgstr ""
 #~ msgid "Associated members"
 #~ msgstr "Powiązani członkowie"
 
+#~ msgid "Information"
+#~ msgstr "Informacja"
+
 #~ msgid "Current members"
 #~ msgstr "Aktualni członkowie"
 
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
index 9dce02bd0d7..88d2c74d141 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 17:19+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Data para"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data de"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Cancelar"
 msgid "All non Members"
 msgstr "Todos os não membros"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informação"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr "Maio"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr "Membro Cancelado"
 msgid "Year"
 msgstr "Ano"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -793,9 +785,15 @@ msgstr ""
 #~ msgid "Currency"
 #~ msgstr "Moeda"
 
+#~ msgid "Date to"
+#~ msgstr "Data para"
+
 #~ msgid "Associate member"
 #~ msgstr "Associar membro"
 
+#~ msgid "Date from"
+#~ msgstr "Data de"
+
 #~ msgid "Free members"
 #~ msgstr "Membros livres"
 
@@ -847,6 +845,9 @@ msgstr ""
 #~ msgid "Paid members"
 #~ msgstr "Membros pagos"
 
+#~ msgid "Information"
+#~ msgstr "Informação"
+
 #~ msgid "Canceled Member"
 #~ msgstr "Membro cancelado"
 
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index fd7a9e32907..8863928d4bf 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-20 21:46+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:27+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr "Data Final de Composição"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Data até"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Data de término da Associação"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr "Data Final da Associação"
@@ -197,11 +198,6 @@ msgstr "Análise dos Membros"
 msgid "End Membership Date"
 msgstr "Finalizar Data do Grupo"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data de"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -465,11 +461,6 @@ msgstr "Data na qual o membro entrou para a associação"
 msgid "Membership Status"
 msgstr "Situação da Associação"
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Data de término da Associação"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -685,11 +676,6 @@ msgstr "Cancelar"
 msgid "All non Members"
 msgstr "Todos não Membros"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informação"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -721,6 +707,7 @@ msgid "May"
 msgstr "Maio"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr "Data de Início da Associação"
@@ -810,6 +797,11 @@ msgstr "Membro cancelado"
 msgid "Year"
 msgstr "Ano"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr "Contabilidade"
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -832,6 +824,9 @@ msgstr "Receita Concluída"
 #~ "Erro: Unidade de venda precisa ser de categoria diferente da unidade de "
 #~ "medida"
 
+#~ msgid "Information"
+#~ msgstr "Informação"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -912,9 +907,15 @@ msgstr "Receita Concluída"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN inválido"
 
+#~ msgid "Date from"
+#~ msgstr "Data de"
+
 #~ msgid "Membership amount"
 #~ msgstr "Quantidade de adesões"
 
+#~ msgid "Date to"
+#~ msgstr "Data até"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo Inválido na definição da ação"
 
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index 2c535e3e1ba..3106668c63d 100644
--- a/addons/membership/i18n/ro.po
+++ b/addons/membership/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 07:25+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr "Data de sfarsit a calitatii de membru"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Data pana la"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Data de incheiere a calitătii de membru"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr "Analiza Membrilor"
 msgid "End Membership Date"
 msgstr "Data de incetare a calitatii de membru"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Data de la"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -464,11 +460,6 @@ msgstr "Data aderarii membrului"
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "Data de incheiere a calitătii de membru"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -662,11 +653,6 @@ msgstr "Revocare"
 msgid "All non Members"
 msgstr "Toti non-membrii"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informatii"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -698,6 +684,7 @@ msgid "May"
 msgstr "Mai"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -787,6 +774,11 @@ msgstr "Membru anulat"
 msgid "Year"
 msgstr "An"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -801,6 +793,9 @@ msgstr "Venituri efectuate"
 #~ msgid "Free members"
 #~ msgstr "Membri fără plată"
 
+#~ msgid "Date from"
+#~ msgstr "Data de la"
+
 #~ msgid "Associate member"
 #~ msgstr "Membru asociat"
 
@@ -969,6 +964,9 @@ msgstr "Venituri efectuate"
 #~ msgid "Purchase Description"
 #~ msgstr "Descriere achizitie"
 
+#~ msgid "Date to"
+#~ msgstr "Data pana la"
+
 #~ msgid "Stop membership date"
 #~ msgstr "Data de incetare a calitatii de membru"
 
@@ -1093,6 +1091,9 @@ msgstr "Venituri efectuate"
 #~ msgid "Close"
 #~ msgstr "Inchide"
 
+#~ msgid "Information"
+#~ msgstr "Informatii"
+
 #~ msgid "Sale Taxes"
 #~ msgstr "Taxe vanzare"
 
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index 71c3f60cff7..57d3a5369c0 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-29 07:21+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Дата до"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Дата с"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Отмена"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Информация"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr "Май"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Год"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -793,9 +785,15 @@ msgstr ""
 #~ msgid "Currency"
 #~ msgstr "Валюта"
 
+#~ msgid "Date to"
+#~ msgstr "Дата до"
+
 #~ msgid "Associate member"
 #~ msgstr "Ассоциированный член"
 
+#~ msgid "Date from"
+#~ msgstr "Дата с"
+
 #~ msgid "Partners"
 #~ msgstr "Партнеры"
 
@@ -859,6 +857,9 @@ msgstr ""
 #~ msgid "Paid members"
 #~ msgstr "Оплатившие члены"
 
+#~ msgid "Information"
+#~ msgstr "Информация"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index 7b547bceef7..65a89fd5b48 100644
--- a/addons/membership/i18n/sk.po
+++ b/addons/membership/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 07:25+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Dátum do"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,11 +773,19 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
 msgstr ""
 
+#~ msgid "Date to"
+#~ msgstr "Dátum do"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatný názov modelu v akcii definície."
 
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
index 1c805e5fddb..346fdd3df55 100644
--- a/addons/membership/i18n/sl.po
+++ b/addons/membership/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 13:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Prekliči"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Informacije"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "Leto"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -809,6 +801,9 @@ msgstr ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
 
+#~ msgid "Information"
+#~ msgstr "Informacije"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/sq.po b/addons/membership/i18n/sq.po
index 96ca9731c66..6f20ba1f386 100644
--- a/addons/membership/i18n/sq.po
+++ b/addons/membership/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/sr@latin.po b/addons/membership/i18n/sr@latin.po
index 42e6fbc3751..3b58f79c188 100644
--- a/addons/membership/i18n/sr@latin.po
+++ b/addons/membership/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 18:37+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index f70ef0175ce..3c151afc7d5 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-23 09:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr "Avslutsdatum för medlemskap"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr "Datum som personen blev medlem"
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "Avbryt"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Information"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr "År"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -813,6 +805,9 @@ msgstr ""
 #~ msgid "Waiting"
 #~ msgstr "Väntar"
 
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #~ msgid "Current members"
 #~ msgstr "Nuvarande medlemmar"
 
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
index be3964586db..2fb1d59a709 100644
--- a/addons/membership/i18n/tlh.po
+++ b/addons/membership/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index c3cafe5bb1a..840633851d6 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "Bitiş Tarihi"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "Başlangıç Tarihi"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "İptal"
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Bilgi"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -799,9 +791,15 @@ msgstr ""
 #~ msgid "Currency"
 #~ msgstr "Para Birimi"
 
+#~ msgid "Date to"
+#~ msgstr "Bitiş Tarihi"
+
 #~ msgid "Associate member"
 #~ msgstr "Ortak Üye"
 
+#~ msgid "Date from"
+#~ msgstr "Başlangıç Tarihi"
+
 #~ msgid "Free members"
 #~ msgstr "Free Üyeler"
 
@@ -862,6 +860,9 @@ msgstr ""
 #~ msgid "Paid members"
 #~ msgstr "Ücretli Üyeler"
 
+#~ msgid "Information"
+#~ msgstr "Bilgi"
+
 #~ msgid "Canceled Member"
 #~ msgstr "İptal Edilen Üye"
 
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index 0d601469c79..1ec22e175f6 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 10:50+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "Інформація"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -802,6 +794,9 @@ msgstr ""
 #~ msgid "Configuration"
 #~ msgstr "Налаштування"
 
+#~ msgid "Information"
+#~ msgstr "Інформація"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/membership/i18n/vi.po b/addons/membership/i18n/vi.po
index 50c75905d13..4779763be26 100644
--- a/addons/membership/i18n/vi.po
+++ b/addons/membership/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -96,11 +96,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -197,11 +198,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -463,11 +459,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -661,11 +652,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -697,6 +683,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -786,6 +773,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 6c697357662..8b2584f6901 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-13 08:39+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr "会员资格终止日期"
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
-msgstr "日期到"
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "会员资格结束日期"
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr "会员分析"
 msgid "End Membership Date"
 msgstr "会员资格结束日期"
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr "日期格式"
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr "客户加入会员资格的日期"
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr "会员资格结束日期"
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr "取消"
 msgid "All non Members"
 msgstr "所有非会员"
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr "信息"
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr "5月"
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr "已取消的会员"
 msgid "Year"
 msgstr "年"
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
@@ -799,6 +791,9 @@ msgstr "已实现收入"
 #~ msgid "Configuration"
 #~ msgstr "设置"
 
+#~ msgid "Information"
+#~ msgstr "信息"
+
 #~ msgid "Currency"
 #~ msgstr "货币"
 
@@ -818,9 +813,15 @@ msgstr "已实现收入"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在这动作定义中无效的模块名"
 
+#~ msgid "Date to"
+#~ msgstr "日期到"
+
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "错误!你不能创建递归的账户"
 
+#~ msgid "Date from"
+#~ msgstr "日期格式"
+
 #~ msgid "Free members"
 #~ msgstr "免费会员"
 
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 34698580e3e..46d31eaa59b 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-24 06:17+0000\n"
 "Last-Translator: Rossi Liu <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -95,11 +95,12 @@ msgid "Ending Date Of Membership"
 msgstr ""
 
 #. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_to:0
 #: field:res.partner,membership_stop:0
 msgid "Membership End Date"
 msgstr ""
@@ -196,11 +197,6 @@ msgstr ""
 msgid "End Membership Date"
 msgstr ""
 
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
@@ -462,11 +458,6 @@ msgstr ""
 msgid "Membership Status"
 msgstr ""
 
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
@@ -660,11 +651,6 @@ msgstr ""
 msgid "All non Members"
 msgstr ""
 
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
@@ -696,6 +682,7 @@ msgid "May"
 msgstr ""
 
 #. module: membership
+#: field:product.product,membership_date_from:0
 #: field:res.partner,membership_start:0
 msgid "Membership Start Date"
 msgstr ""
@@ -785,6 +772,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 8c0cd613f76..4f88f2ce8d5 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -153,13 +153,6 @@ msgstr "للشراء"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr "ويطلق النظام تلقائيًا طلب التسعير للمورد المفضل."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -197,13 +190,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "للمواد المشتراه"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -270,6 +268,21 @@ msgstr "بيانات الاستاذ"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -434,6 +447,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "تنوع قيمة المخزون اسبوعيًا"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -442,7 +476,7 @@ msgid "Scheduled Date"
 msgstr "تاريخ مجدول"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -453,14 +487,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "فاتورة المواد"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -482,12 +508,6 @@ msgstr "تنوع قيمة المخزون"
 msgid "Bill of Materials Structure"
 msgstr "فاتورة تركيب المواد"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -620,12 +640,6 @@ msgid ""
 msgstr ""
 "اذا كان وضع الحقل الفعال هو خطأ, سيسمح لك بإخفاء المسار بدون ازالتها."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -646,7 +660,7 @@ msgid "Work Center Load"
 msgstr "تحميل مركز العمل"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "لا يوجد فاتورة للمواد محددة لهذا المنتج !"
@@ -719,12 +733,6 @@ msgstr "في الانتاج"
 msgid "Master Bill of Materials"
 msgstr "استاذ فاتورة المواد"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "اوامر العمل"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -748,30 +756,6 @@ msgstr "طباعة"
 msgid "Type"
 msgstr "نوع"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -815,8 +799,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "يعني العامل 0.9 المفقود من 10% خلال عملية الانتاج."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -881,7 +865,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "تصنيع الطلبيات التي تنتظر المواد الخام."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -892,6 +876,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "امر التصنيع"
@@ -957,7 +942,7 @@ msgid "BoM Type"
 msgstr "علامة فاتورة القياس"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -980,7 +965,7 @@ msgid "Companies"
 msgstr "الشركات"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1303,7 +1288,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1348,7 +1333,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1388,27 +1373,6 @@ msgid ""
 "purchase order."
 msgstr "اذا كانت حالة عرض المنتج هي شراء, ينشأ النظام امر الشراء."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1478,12 +1442,6 @@ msgstr "طريقة"
 msgid "Pending"
 msgstr "معلّق"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1521,12 +1479,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "مرجع الوثيقة التي انشأت طلب امر المنتج هذا."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1547,12 +1499,6 @@ msgstr "غير كمية المنتجات"
 msgid "Drives the procurement orders for raw material."
 msgstr "ويقود اوامر المشتريات للمادة الخام."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1569,7 +1515,7 @@ msgid "SO Number"
 msgstr "رقم امر البيع"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1616,6 +1562,31 @@ msgstr "اوامر التصنيع للبدء"
 msgid "Work Center"
 msgstr "مركز العمل"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1756,20 +1727,6 @@ msgstr "المنتجات المضافة للجدول"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1784,9 +1741,10 @@ msgstr ""
 "تنتهي أمر الإنتاج عندما يتم إنتاج إجمالي الكميات المطلوبة."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "اوامر العمل"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1818,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1857,7 +1815,6 @@ msgstr "الوقت للدورة 1 (الساعه)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1881,7 +1838,7 @@ msgid "Compute Data"
 msgstr "حساب البيانات"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1927,7 +1884,7 @@ msgid "Manufacturing Lead Time"
 msgstr "وقت قيادة التصنيع"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2170,17 +2127,7 @@ msgid "BOM Ref"
 msgstr "مرجع فاتورة المواد"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2218,7 +2165,7 @@ msgid "Bill of Materials"
 msgstr "فاتورة المواد"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 4655799af2c..f330eba6c9f 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 07:29+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -155,13 +155,6 @@ msgstr "За закупуване"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr "Системата стартира автоматично запитване към предпочитан доставчик."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -201,13 +194,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "За закупени суровини"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -274,6 +272,21 @@ msgstr "Шаблон"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -438,6 +451,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Седмични промени на стойността"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -446,7 +480,7 @@ msgid "Scheduled Date"
 msgstr "Планирана дата"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -457,14 +491,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Списък на суровини"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -487,12 +513,6 @@ msgstr "Вариации на стокова наличност"
 msgid "Bill of Materials Structure"
 msgstr "Списък на суровините структура"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -626,12 +646,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -652,7 +666,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -722,12 +736,6 @@ msgstr "В производство"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Работни поръчки"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -751,30 +759,6 @@ msgstr "Печат"
 msgid "Type"
 msgstr "Тип"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -818,8 +802,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -882,7 +866,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -893,6 +877,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Нареждане за производство"
@@ -958,7 +943,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -980,7 +965,7 @@ msgid "Companies"
 msgstr "Фирми"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1300,7 +1285,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1343,7 +1328,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1383,27 +1368,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1473,12 +1437,6 @@ msgstr "Метод"
 msgid "Pending"
 msgstr "Висящи"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1516,12 +1474,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1542,12 +1494,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1564,7 +1510,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1611,6 +1557,31 @@ msgstr ""
 msgid "Work Center"
 msgstr "Работен център"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1746,20 +1717,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1771,9 +1728,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Работни поръчки"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1805,7 +1763,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1842,7 +1800,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1866,7 +1823,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1912,7 +1869,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Производствен срок за доставка"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2152,17 +2109,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2200,7 +2147,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 8c3c4c859bb..ff2b36d3832 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 19:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 6099e54157a..a48a2b3edac 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 11:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -157,13 +157,6 @@ msgstr ""
 "El sistema crea automàticament una petició de pressupost al proveïdor "
 "preferit."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -203,13 +196,18 @@ msgstr "Unitat de mesura"
 msgid "For purchased material"
 msgstr "Per material comprat"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -276,6 +274,21 @@ msgstr "Dades principals"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -442,6 +455,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variació del valor de l'estoc setmanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -450,7 +484,7 @@ msgid "Scheduled Date"
 msgstr "Data prevista"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -461,14 +495,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Llista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -491,12 +517,6 @@ msgstr "Variació del valor d'estoc"
 msgid "Bill of Materials Structure"
 msgstr "Estructura llista de materials"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -631,12 +651,6 @@ msgid ""
 msgstr ""
 "Si el camp actiu es desmarca, permet ocultar la ruta sense eliminar-la."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -657,7 +671,7 @@ msgid "Work Center Load"
 msgstr "Carga centre de producción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "No s'ha definit LdM per aquest producte!"
@@ -731,12 +745,6 @@ msgstr "En producció"
 msgid "Master Bill of Materials"
 msgstr "Llista de materials mestra"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ordres de producció"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -760,30 +768,6 @@ msgstr "Imprimeix"
 msgid "Type"
 msgstr "Tipus"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -828,8 +812,8 @@ msgstr ""
 "Un factor de 0.9 indica una pèrdua del 10% en el procés de producció."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -896,7 +880,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -907,6 +891,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Ordre de fabricació"
@@ -972,7 +957,7 @@ msgid "BoM Type"
 msgstr "Tipus de llista de materials"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -994,7 +979,7 @@ msgid "Companies"
 msgstr "Companyies"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1326,7 +1311,7 @@ msgstr ""
 "automàticament pre-acabat."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1372,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1414,27 +1399,6 @@ msgstr ""
 "En cas que el mètode de subministrament del producte sigui Compra, el "
 "sistema crea una comanda de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1504,12 +1468,6 @@ msgstr "Mètode"
 msgid "Pending"
 msgstr "Pendent"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1549,12 +1507,6 @@ msgstr ""
 "Referència al document que va generar aquesta sol·licitud d'ordre de "
 "producció."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1575,12 +1527,6 @@ msgstr "Canvia quantitat de productes"
 msgid "Drives the procurement orders for raw material."
 msgstr "Guia les ordres de proveïment per matèries primeres."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1597,7 +1543,7 @@ msgid "SO Number"
 msgstr "Número venda"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1644,6 +1590,31 @@ msgstr "Ordres de producció a iniciar"
 msgid "Work Center"
 msgstr "Centre de treball"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1787,20 +1758,6 @@ msgstr "Productes planificats"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1817,9 +1774,10 @@ msgstr ""
 "quan el total de les unitats sol·licitades s'han produït."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ordres de producció"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1851,7 +1809,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1891,7 +1849,6 @@ msgstr "Temps per 1 cicle(hores)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1915,7 +1872,7 @@ msgid "Compute Data"
 msgstr "Calcula dades"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1961,7 +1918,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Termini de lliurament de fabricació"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2206,17 +2163,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2254,7 +2201,7 @@ msgid "Bill of Materials"
 msgstr "Llista de materials (LdM)"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index fe458bad4ed..b3d15c01bcf 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-15 02:28+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp
@@ -152,13 +152,6 @@ msgstr "K nákupu"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -197,13 +190,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pro nakoupený materiál"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -270,6 +268,21 @@ msgstr "Hlavní data"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -432,6 +445,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Změna týdenní hodnoty zásob"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -440,7 +474,7 @@ msgid "Scheduled Date"
 msgstr "Srpen"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -451,14 +485,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Soupiska materiálu"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -477,12 +503,6 @@ msgstr "Odchylka hodnoty skladu"
 msgid "Bill of Materials Structure"
 msgstr "Struktura Soupisky materiálu"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -616,12 +636,6 @@ msgstr ""
 "Pokud je pole nastaveno na Nepravda, tak umožní skrýt směrování bez jeho "
 "odebrání."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -642,7 +656,7 @@ msgid "Work Center Load"
 msgstr "Vytížení pracovního centra"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Pro tento výrobek nebyl definován BoM !"
@@ -712,12 +726,6 @@ msgstr "Ve výrobě"
 msgid "Master Bill of Materials"
 msgstr "Hlavní Soupiska materiálu"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Pracovní příkazy"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -741,30 +749,6 @@ msgstr "Tisk"
 msgid "Type"
 msgstr "Typ"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -808,8 +792,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "Činitel 0.9 znamená ztrátu 10% výrobního procesu."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -872,7 +856,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -883,6 +867,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Výrobní příkaz"
@@ -948,7 +933,7 @@ msgid "BoM Type"
 msgstr "Typ BoM"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -970,7 +955,7 @@ msgid "Companies"
 msgstr "Společnosti"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1293,7 +1278,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1336,7 +1321,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1376,27 +1361,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1466,12 +1430,6 @@ msgstr "Metoda"
 msgid "Pending"
 msgstr "Čekající"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1509,12 +1467,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1535,12 +1487,6 @@ msgstr "Změnit množství výrobků"
 msgid "Drives the procurement orders for raw material."
 msgstr "Řídi zásobovací příkazy pro surový materiál."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1557,7 +1503,7 @@ msgid "SO Number"
 msgstr "Číslo SO"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1604,6 +1550,31 @@ msgstr "Výrobní příkazy pro spuštění"
 msgid "Work Center"
 msgstr "Pracovní centrum"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1745,20 +1716,6 @@ msgstr "Plánované výrobky"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1770,9 +1727,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Pracovní příkazy"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1804,7 +1762,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1841,7 +1799,6 @@ msgstr "Čas na jeden cykl (hodiny)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1865,7 +1822,7 @@ msgid "Compute Data"
 msgstr "Spočítat datum"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1911,7 +1868,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Výrobní čekací lhůta"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2153,17 +2110,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2201,7 +2148,7 @@ msgid "Bill of Materials"
 msgstr "Soupiska materiálu"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index a85ce38bed4..386c0bcd5f9 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-09 21:53+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Stykliste"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "Stykliste struktur"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr "Virksomheder"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr "Stykliste"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 668a75efe3a..81858854651 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 02:08+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
@@ -169,15 +169,6 @@ msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 "Das System generiert automatsch eine Anfrage an den bevorzugten Lieferanten."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-"Die Auswahl der richtigen Stückliste hängt ab von der Eigenschaft, die im "
-"Auftrag  ausgewählt wird und eine Stückliste spezifiziert."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -217,13 +208,18 @@ msgstr "Mengeneinheit"
 msgid "For purchased material"
 msgstr "Für eingekauftes Material"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "Detaillierte Planung von Arbeitsaufträgen vornehmen"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "Fertigungsauftrag kann nicht abgebrochen werden!"
@@ -302,6 +298,21 @@ msgstr "Stücklisten"
 msgid "Produce several products from one manufacturing order"
 msgstr "Herstellung von Kuppelprodukten ermöglichen"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -494,6 +505,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Wöchentliche Bestandsveränderung"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -502,7 +534,7 @@ msgid "Scheduled Date"
 msgstr "Geplantes Datum"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "Fertigungsauftrag <em>%s</em> wurde erstellt."
@@ -513,16 +545,6 @@ msgstr "Fertigungsauftrag <em>%s</em> wurde erstellt."
 msgid "Bill Of Material"
 msgstr "Stückliste"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-"Fertigungsauftrag wurde <b>bestätigt</b> und ist <b>geplant</b> für den "
-"<em>%s</em>."
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -546,12 +568,6 @@ msgstr "Bestandswert Änderungen"
 msgid "Bill of Materials Structure"
 msgstr "Stücklistenstruktur"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "Fertigungsauftrag wurde <b>abgebrochen</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -695,12 +711,6 @@ msgid ""
 "without removing it."
 msgstr "Durch Deaktivierung können Sie den Arbeitsplan ausblenden."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr "Stückliste wurde <b>erstellt</b> für das Produkt <em>%s</em>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -721,7 +731,7 @@ msgid "Work Center Load"
 msgstr "Arbeitsplatz Auslastung"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Keine Stückliste für dieses Produkt definiert."
@@ -807,12 +817,6 @@ msgstr "Produktion begonnen"
 msgid "Master Bill of Materials"
 msgstr "Basisdaten Stückliste"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Arbeitsaufträge"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -842,48 +846,6 @@ msgstr "Druck"
 msgid "Type"
 msgstr "Typ"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie zur Erstellung von Merkmalsgruppen.\n"
-"              </p><p>\n"
-"                Definieren Sie spezifische Merkmalsgruppen, die dann bei "
-"Stücklisten und \n"
-"                Verkaufsaufträgen zuordenbar sind.\n"
-"                und\n"
-"              </p><p>\n"
-"                Sie können zum Beispiel in der Merkmalsgruppe \"Garantie\" "
-"zwei Merkmale haben:\n"
-"                1 Jahr Garantie, 3 Jahre Garantie. Abhängig von dieser "
-"Auswahl durch den Vertrieb\n"
-"                bei der Auftragseingabe, wird dann durch OpenERP automatisch "
-"gesteuert, welche\n"
-"                der beiden Stücklisten für die Auftragsbearbeitung verwendet "
-"wird. \n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -941,8 +903,8 @@ msgstr ""
 "anfallen wird."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
@@ -1012,7 +974,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Fertigungsaufträge in Erwartung von Material"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -1025,6 +987,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Fertigungsauftrag"
@@ -1107,7 +1070,7 @@ msgid "BoM Type"
 msgstr "Stücklisten Typ"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1131,7 +1094,7 @@ msgid "Companies"
 msgstr "Unternehmen"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1470,7 +1433,7 @@ msgstr ""
 "vorausgefüllt."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ungültige Aktion!"
@@ -1518,7 +1481,7 @@ msgstr ""
 "Erstellung eines Endprodukts."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
@@ -1560,44 +1523,6 @@ msgstr ""
 "Für den Fall, dass für dieses Produkt die Beschaffungsmethode 'Einkauf' ist, "
 "generiert das System eine Anfrage eines Angebots."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie zur Erstellung eines neuen Merkmals.\n"
-"              </p><p>\n"
-"                Die Merkmale werden in OpenERP benötigt, um die korrekte "
-"Stückliste zur\n"
-"                Erstellung eines Produkts zu verwenden, wenn es verschiedene "
-"Möglichkeiten\n"
-"                gibt, das gleiche Produkt zu erstellen. Sie können "
-"verschiedene Merkmale zu\n"
-"                jeder Stückliste zuweisen. Wenn ein Verkäufer einen Auftrag "
-"eingibt, kann\n"
-"                er hierbei auch die entsprechenden Merkmale zuweisen, "
-"wodurch OpenERP\n"
-"                dann die korrekte Auswahl der Stückliste selbständig "
-"vornimmt.\n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1667,12 +1592,6 @@ msgstr "Methode"
 msgid "Pending"
 msgstr "Wiedervorlage"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr "Fertigungsauftrag ist im Status<b>Produktion begonnen</b>."
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1714,12 +1633,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Referenz zu Dokument, welches den Fertigungsauftrag ausgelöst hat."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "Fertigungsauftrag wurde <b>erledigt</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1740,12 +1653,6 @@ msgstr "Ändere die Mengen für die Produkte"
 msgid "Drives the procurement orders for raw material."
 msgstr "Löst Beschaffungsaufträge für Komponenten aus ."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr "Fertigungsauftrag ist <b>Startbereit für Fertigung</b>."
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1762,7 +1669,7 @@ msgid "SO Number"
 msgstr "Verkaufsauftrag"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "Ein Fertigungsauftrag mit Status '%s' kann nicht gelöscht werden."
@@ -1809,6 +1716,31 @@ msgstr "Startbereit für Fertigung"
 msgid "Work Center"
 msgstr "Arbeitsplatz"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1952,23 +1884,6 @@ msgstr "Planbedarf"
 msgid "Manager"
 msgstr "Manager"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-"Bei Vornahme eines Verkauf für dieses Produkt, wird der Auslieferauftrag\n"
-"                                         die Komponenten beinhalten, "
-"anstelle des fertigen Produkts."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "Fertigungsauftrag wurde <b>erstellt</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1986,9 +1901,10 @@ msgstr ""
 "vollständig produziert wurde."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr "Auftragsplanung"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Arbeitsaufträge"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -2024,7 +1940,7 @@ msgstr ""
 "Es wird das Modul mrp_operations installiert."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -2066,7 +1982,6 @@ msgstr "Zeit für 1 Zyklus (Stunden)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -2090,7 +2005,7 @@ msgid "Compute Data"
 msgstr "Berechne Daten"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -2136,7 +2051,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Durchlaufzeit Fertigung"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Warnung"
@@ -2396,17 +2311,7 @@ msgid "BOM Ref"
 msgstr "Stückliste Referenz"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2446,7 +2351,7 @@ msgid "Bill of Materials"
 msgstr "Stückliste"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr "Es konnte keine Stückliste gefunden werden."
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 4e71a9defe1..bdd82452ae1 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 11:08+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: l10n_chart_gr <l10n_chart_gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -154,13 +154,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -198,13 +191,18 @@ msgstr "Μονάδα Μέτρησης"
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -271,6 +269,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -431,6 +444,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Εβδομαδιαία απόκλιση αξίας αποθέματος"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -439,7 +473,7 @@ msgid "Scheduled Date"
 msgstr "Προγραμματισμένη Ημερομηνία"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -450,14 +484,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Kατάσταση Υλικών"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -480,12 +506,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "Δομή Κατάστασης Υλικών"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -617,12 +637,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -643,7 +657,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Δεν έχει οριστεί Κ.Υ. για το Προϊόν!"
@@ -713,12 +727,6 @@ msgstr "Σε Παραγωγή"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Εντολές Εργασίας"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -742,30 +750,6 @@ msgstr "Εκτύπωση"
 msgid "Type"
 msgstr "Τύπος"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -809,8 +793,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -873,7 +857,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -884,6 +868,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -949,7 +934,7 @@ msgid "BoM Type"
 msgstr "Τύπος Κ.Υ."
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -971,7 +956,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1289,7 +1274,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1332,7 +1317,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1372,27 +1357,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1462,12 +1426,6 @@ msgstr "Μέθοδος"
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1505,12 +1463,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1531,12 +1483,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1553,7 +1499,7 @@ msgid "SO Number"
 msgstr "Αριθμός ΠΠ"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1600,6 +1546,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1736,20 +1707,6 @@ msgstr "Προγραμματισμένα Προϊόντα"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1761,9 +1718,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Εντολές Εργασίας"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1795,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1832,7 +1790,6 @@ msgstr "Χρόνος ενός κύκλου (ώρα)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1856,7 +1813,7 @@ msgid "Compute Data"
 msgstr "Υπολογισμός Δεδομένων"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1902,7 +1859,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2142,17 +2099,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2190,7 +2137,7 @@ msgid "Bill of Materials"
 msgstr "Κατάσταση Υλικών"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index fa9838eb175..ce1f5c3b2dd 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-14 18:23+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 11:22+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -167,15 +167,6 @@ msgstr ""
 "El sistema crea automáticamente una petición de presupuesto al proveedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-"La selección de la lista de materiales a usar depende de las propiedades "
-"especificadas en el pedido de venta y en la lista de materiales."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -215,13 +206,18 @@ msgstr "Unidad de medida"
 msgid "For purchased material"
 msgstr "Para material comprado"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr "Planificación de la orden"
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "Permitir planificación detallada de la orden de trabajo"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "¡No se puede cancelar la orden de producción!"
@@ -297,6 +293,25 @@ msgstr "Datos principales"
 msgid "Produce several products from one manufacturing order"
 msgstr "Fabricar varios productos de una sola orden de fabricación"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+"La selección de la lista de materiales correcta a usar dependerá de las "
+"propiedades especificadas en el pedido de venta y en la lista de materiales."
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+"Cuando se procese un pedido de venta para este producto, la orden de entrega "
+"contendrá las materias primas, en lugar del producto final."
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -484,6 +499,38 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variación del valor del stock semanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una nueva propiedad.\n"
+"</p><p>\n"
+"Las propiedades en OpenERP se usan para seleccionar la lista adecuada de "
+"materiales para la fabricación de un producto cuando se tienen diferentes "
+"forma de construir el mismo producto. Puede asignar diferentes propiedades a "
+"cada lista de materiales. Cuando un comercial crea un pedido de venta, puede "
+"relacionarlo con varias  propiedades, y OpenERP seleccionará automáticamente "
+"la LdM a usar de acuerdo a las necesidades.\n"
+"</p>\n"
+"            "
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -492,7 +539,7 @@ msgid "Scheduled Date"
 msgstr "Fecha programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "La orden de producción <em>%s</em> ha sido creada."
@@ -503,16 +550,6 @@ msgstr "La orden de producción <em>%s</em> ha sido creada."
 msgid "Bill Of Material"
 msgstr "Lista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-"La orden de producción ha sido <b>confirmada</b> y está <b>programada</b> "
-"para <em>%s</em>."
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -535,12 +572,6 @@ msgstr "Variación del valor de stock"
 msgid "Bill of Materials Structure"
 msgstr "Estructura lista de materiales"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "La orden de producción ha sido <b>cancelada</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -685,13 +716,6 @@ msgid ""
 msgstr ""
 "Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-"La lista de materiales ha sido  <b>creada</b> para el producto <em>%s</em>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -712,7 +736,7 @@ msgid "Work Center Load"
 msgstr "Carga centro de producción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "¡No se ha definido LdM para este producto!"
@@ -797,12 +821,6 @@ msgstr "En producción"
 msgid "Master Bill of Materials"
 msgstr "Lista de materiales maestra"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Órdenes de trabajo"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -832,44 +850,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear un grupo de propiedades.\n"
-"</p><p>\n"
-"Define grupos específicos de propiedades que pueden ser asignados a una "
-"lista de materiales y pedidos de venta. Las propiedades permiten a OpenERP "
-"asignar automáticamente la lista de materiales adecuada de acuerdo a las "
-"propiedades seleccionadas en el pedido de venta por parte del comercial.\n"
-"</p><p>\n"
-"Por ejemplo, en el grupo de propiedades \"Garantía\", tiene dos propiedades: "
-"1 año de garantía, 3 años de garantía. Dependiendo de la propiedad "
-"seleccionada en el pedido de venta, OpenERP planificará una fabricación "
-"usando la lista de materiales correspondiente.\n"
-"</p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -924,8 +904,8 @@ msgstr ""
 "Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -994,7 +974,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Órdenes de fabricación en espera de materias primas"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -1007,6 +987,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Órden de producción"
@@ -1086,7 +1067,7 @@ msgid "BoM Type"
 msgstr "Tipo de lista de materiales"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1109,7 +1090,7 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1447,7 +1428,7 @@ msgstr ""
 "automáticamente completada."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "¡Acción no válida!"
@@ -1495,7 +1476,7 @@ msgstr ""
 "requeridas para realizar un producto final."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -1537,38 +1518,6 @@ msgstr ""
 "En caso de que el método de suministro del producto sea 'Comprar', el "
 "sistema crea un pedido de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear una nueva propiedad.\n"
-"</p><p>\n"
-"Las propiedades en OpenERP se usan para seleccionar la lista de materiales "
-"adecuada para la fabricación de un producto cuando se tienen diversas formas "
-"de construir el mismo producto. Puede asignar diversas propiedades a cada "
-"lista de materiales. Cuando un comercial crea un pedido de venta, puede "
-"relacionarlo a diversas propiedades, y OpenERP seleccionará automáticamente "
-"la lista de materiales de acuerdo a esas propiedades.\n"
-"</p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1638,12 +1587,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr "La orden de fabricación está <b>en producción</b>."
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1686,12 +1629,6 @@ msgid ""
 msgstr ""
 "Referencia al documento que generó esta solicitud de orden de producción."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "La orden de fabricación se ha <b>realizado</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1712,12 +1649,6 @@ msgstr "Cambiar cantidad de productos"
 msgid "Drives the procurement orders for raw material."
 msgstr "Guía las órdenes de abastecimiento para materias primas."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr "La orden de fabricación está <b>lista para fabricar</b>."
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1734,7 +1665,7 @@ msgid "SO Number"
 msgstr "Número venta"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "No se puede eliminar una orden de fabricación en estado '%s'."
@@ -1781,6 +1712,45 @@ msgstr "Órdenes de producción a iniciar"
 msgid "Work Center"
 msgstr "Centro de producción"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un grupo de propiedades.\n"
+"</p><p>\n"
+"Defina grupos de propiedades específicas  que se pueden asignar las listas "
+"de materiales y a los pedidos de venta. Las propiedades permiten a OpenERP "
+"seleccionar automáticamente la lista de materiales  adecuada de acuerdo a "
+"las propiedades seleccionadas en el pedido de venta por el comercial.\n"
+"</p><p>\n"
+"Por ejemplo, en el grupo de propiedades \"Garantía\", puede tener dos "
+"propiedades: 1 año de garantía y 3 años de garantía. Dependiendo de las "
+"propiedades seleccionadas en el pedido de venta, OpenERP planificará la "
+"fabricación usando la lista de materiales que coincida.\n"
+"</p>\n"
+"            "
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1926,22 +1896,6 @@ msgstr "Productos planificados"
 msgid "Manager"
 msgstr "Gerente"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-"Cuando se procese un pedido de venta para este producto, la orden de entrega "
-"contendrá las materias primas, en lugar del producto final."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "La orden de fabricación ha sido <b>creada</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1958,9 +1912,10 @@ msgstr ""
 "cuando el total de las cantidades solicitadas se han producido."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr "Planificación de órdenes"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1996,7 +1951,7 @@ msgstr ""
 "Esto instalará el módulo 'mrp_operations'."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -2038,7 +1993,6 @@ msgstr "Tiempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -2062,7 +2016,7 @@ msgid "Compute Data"
 msgstr "Calcular datos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -2108,7 +2062,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tiempo entrega de fabricación"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Advertencia"
@@ -2368,17 +2322,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2418,7 +2362,7 @@ msgid "Bill of Materials"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr "No se ha encontrado ninguna lista de materiales para este producto."
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index bfb4f5f43b6..bcef249f779 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-11 22:02+0000\n"
 "Last-Translator: jpdborgna <Unknown>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -157,13 +157,6 @@ msgstr ""
 "El sistema crea automáticamente una petición de presupuesto al proveedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -203,13 +196,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -276,6 +274,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -440,6 +453,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variación del stock semanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -448,7 +482,7 @@ msgid "Scheduled Date"
 msgstr "Fecha programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -459,14 +493,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -489,12 +515,6 @@ msgstr "Variación de stock"
 msgid "Bill of Materials Structure"
 msgstr "Estructura lista de materiales"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -626,12 +646,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -652,7 +666,7 @@ msgid "Work Center Load"
 msgstr "Carga del centro de producción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "¡No se ha definido LdM para este producto!"
@@ -722,12 +736,6 @@ msgstr "En Producción"
 msgid "Master Bill of Materials"
 msgstr "Lista de materiales maestra"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Órdenes de trabajo"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -751,30 +759,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -819,8 +803,8 @@ msgstr ""
 "Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -887,7 +871,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -898,6 +882,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Órden de producción"
@@ -963,7 +948,7 @@ msgid "BoM Type"
 msgstr "Tipo de lista de materiales"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -986,7 +971,7 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1307,7 +1292,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1353,7 +1338,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1393,27 +1378,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1483,12 +1447,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1526,12 +1484,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1552,12 +1504,6 @@ msgstr "Cambiar cantidad de productos"
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1574,7 +1520,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1621,6 +1567,31 @@ msgstr ""
 msgid "Work Center"
 msgstr "Centro de trabajo"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1758,20 +1729,6 @@ msgstr "Productos programados"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1783,9 +1740,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1817,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1857,7 +1815,6 @@ msgstr "Tiempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1881,7 +1838,7 @@ msgid "Compute Data"
 msgstr "Calcular datos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1927,7 +1884,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2172,17 +2129,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2220,7 +2167,7 @@ msgid "Bill of Materials"
 msgstr "Lista de materiales"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/es_CL.po b/addons/mrp/i18n/es_CL.po
index 6bd38da418a..784cd99457a 100644
--- a/addons/mrp/i18n/es_CL.po
+++ b/addons/mrp/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 04:35+0000\n"
 "Last-Translator: doingit.cl <Unknown>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -157,13 +157,6 @@ msgstr ""
 "El sistema crea automáticamente una petición de presupuesto al proveedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -203,13 +196,18 @@ msgstr "Unidad de medida"
 msgid "For purchased material"
 msgstr "Para material comprado"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -276,6 +274,21 @@ msgstr "Datos principales"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -442,6 +455,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variación del valor del stock semanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -450,7 +484,7 @@ msgid "Scheduled Date"
 msgstr "Fecha programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -461,14 +495,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -491,12 +517,6 @@ msgstr "Variación del valor de stock"
 msgid "Bill of Materials Structure"
 msgstr "Estructura lista de materiales"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -633,12 +653,6 @@ msgid ""
 msgstr ""
 "Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -659,7 +673,7 @@ msgid "Work Center Load"
 msgstr "Carga centro de producción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "¡No se ha definido LdM para este producto!"
@@ -736,12 +750,6 @@ msgstr "En producción"
 msgid "Master Bill of Materials"
 msgstr "Lista de materiales maestra"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Órdenes de trabajo"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -765,30 +773,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -833,8 +817,8 @@ msgstr ""
 "Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Atención!"
@@ -901,7 +885,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Órdenes de producción que esperan por materias primas."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -912,6 +896,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Órden de producción"
@@ -977,7 +962,7 @@ msgid "BoM Type"
 msgstr "Tipo de lista de materiales"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1000,7 +985,7 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1334,7 +1319,7 @@ msgstr ""
 "(centros de trabajo) serán automáticamente pre-terminado."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1380,7 +1365,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1422,27 +1407,6 @@ msgstr ""
 "En caso de que el método de suministro del producto se Compra, el sistema "
 "crea un pedido de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1512,12 +1476,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1556,12 +1514,6 @@ msgid ""
 msgstr ""
 "Referencia al documento que generó esta solicitud de orden de producción."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1582,12 +1534,6 @@ msgstr "Cambiar cantidad de productos"
 msgid "Drives the procurement orders for raw material."
 msgstr "Guía las órdenes de abastecimiento para materias primas."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1604,7 +1550,7 @@ msgid "SO Number"
 msgstr "Número venta"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1651,6 +1597,31 @@ msgstr "Órdenes de producción a iniciar"
 msgid "Work Center"
 msgstr "Centro de producción"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1796,20 +1767,6 @@ msgstr "Productos planificados"
 msgid "Manager"
 msgstr "Administrador"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1826,9 +1783,10 @@ msgstr ""
 "cuando el total de las cantidades solicitadas se han producido."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1860,7 +1818,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1902,7 +1860,6 @@ msgstr "Tiempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1926,7 +1883,7 @@ msgid "Compute Data"
 msgstr "Calcular datos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1972,7 +1929,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tiempo entrega de fabricación"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2217,17 +2174,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2267,7 +2214,7 @@ msgid "Bill of Materials"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/es_CR.po b/addons/mrp/i18n/es_CR.po
index 46dcd7faef4..f3d9975d189 100644
--- a/addons/mrp/i18n/es_CR.po
+++ b/addons/mrp/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-17 20:36+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: mrp
@@ -158,13 +158,6 @@ msgstr ""
 "El sistema crea automáticamente una petición de presupuesto al proveedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -204,13 +197,18 @@ msgstr "Unidad de medida"
 msgid "For purchased material"
 msgstr "Para material comprado"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -277,6 +275,21 @@ msgstr "Datos principales"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -443,6 +456,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variación del valor del stock semanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -451,7 +485,7 @@ msgid "Scheduled Date"
 msgstr "Fecha programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -462,14 +496,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -492,12 +518,6 @@ msgstr "Variación del valor de stock"
 msgid "Bill of Materials Structure"
 msgstr "Estructura lista de materiales"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -634,12 +654,6 @@ msgid ""
 msgstr ""
 "Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -660,7 +674,7 @@ msgid "Work Center Load"
 msgstr "Carga centro de producción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "¡No se ha definido LdM para este producto!"
@@ -736,12 +750,6 @@ msgstr "En producción"
 msgid "Master Bill of Materials"
 msgstr "Lista de materiales maestra"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Órdenes de trabajo"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -765,30 +773,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -833,8 +817,8 @@ msgstr ""
 "Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -901,7 +885,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Órdenes de fabricación en espera de materias primas"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -912,6 +896,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Órden de producción"
@@ -977,7 +962,7 @@ msgid "BoM Type"
 msgstr "Tipo de lista de materiales"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1000,7 +985,7 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1334,7 +1319,7 @@ msgstr ""
 "automáticamente completada."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1380,7 +1365,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1422,27 +1407,6 @@ msgstr ""
 "En caso de que el método de suministro del producto se Compra, el sistema "
 "crea un pedido de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1512,12 +1476,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1556,12 +1514,6 @@ msgid ""
 msgstr ""
 "Referencia al documento que generó esta solicitud de orden de producción."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1582,12 +1534,6 @@ msgstr "Cambiar cantidad de productos"
 msgid "Drives the procurement orders for raw material."
 msgstr "Guía las órdenes de abastecimiento para materias primas."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1604,7 +1550,7 @@ msgid "SO Number"
 msgstr "Número venta"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1651,6 +1597,31 @@ msgstr "Órdenes de producción a iniciar"
 msgid "Work Center"
 msgstr "Centro de producción"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1796,20 +1767,6 @@ msgstr "Productos planificados"
 msgid "Manager"
 msgstr "Gerente"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1826,9 +1783,10 @@ msgstr ""
 "cuando el total de las cantidades solicitadas se han producido."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1860,7 +1818,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1902,7 +1860,6 @@ msgstr "Tiempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1926,7 +1883,7 @@ msgid "Compute Data"
 msgstr "Calcular datos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1972,7 +1929,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tiempo entrega de fabricación"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2217,17 +2174,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2267,7 +2214,7 @@ msgid "Bill of Materials"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index c27158deab0..ee590fa85c4 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 14:19+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -157,13 +157,6 @@ msgstr ""
 "El sistema crea automáticamente una petición de presupuesto al proveedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -203,13 +196,18 @@ msgstr "Unidad de medida"
 msgid "For purchased material"
 msgstr "Para material comprado"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -276,6 +274,21 @@ msgstr "Datos principales"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -440,6 +453,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variación del valor del stock semanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -448,7 +482,7 @@ msgid "Scheduled Date"
 msgstr "Fecha programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -459,14 +493,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -489,12 +515,6 @@ msgstr "Variación del valor de stock"
 msgid "Bill of Materials Structure"
 msgstr "Estructura lista de materiales"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -629,12 +649,6 @@ msgid ""
 msgstr ""
 "Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -655,7 +669,7 @@ msgid "Work Center Load"
 msgstr "Carga centro de producción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "¡No se ha definido LdM para este producto!"
@@ -730,12 +744,6 @@ msgstr "En producción"
 msgid "Master Bill of Materials"
 msgstr "Lista de materiales maestra"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Órdenes de producción"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -759,30 +767,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -827,8 +811,8 @@ msgstr ""
 "Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -895,7 +879,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -906,6 +890,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Órden de producción"
@@ -971,7 +956,7 @@ msgid "BoM Type"
 msgstr "Tipo de lista de materiales"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -994,7 +979,7 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1319,7 +1304,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1365,7 +1350,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1407,27 +1392,6 @@ msgstr ""
 "En caso de que el método de suministro del producto se Compra, el sistema "
 "crea un pedido de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1497,12 +1461,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1541,12 +1499,6 @@ msgid ""
 msgstr ""
 "Referencia al documento que generó esta solicitud de orden de producción."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1567,12 +1519,6 @@ msgstr "Cambiar cantidad de productos"
 msgid "Drives the procurement orders for raw material."
 msgstr "Guía las órdenes de abastecimiento para materias primas."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1589,7 +1535,7 @@ msgid "SO Number"
 msgstr "Número venta"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1636,6 +1582,31 @@ msgstr "Órdenes de producción a iniciar"
 msgid "Work Center"
 msgstr "Centro de producción"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1779,20 +1750,6 @@ msgstr "Productos planificados"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1809,9 +1766,10 @@ msgstr ""
 "cuando el total de las cantidades solicitadas se han producido."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de producción"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1843,7 +1801,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1883,7 +1841,6 @@ msgstr "Tiempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1907,7 +1864,7 @@ msgid "Compute Data"
 msgstr "Calcular datos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1953,7 +1910,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Plazo de entrega de fabricación"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2198,17 +2155,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2246,7 +2193,7 @@ msgid "Bill of Materials"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 233e97e8865..2e74457bc2c 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 09:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr "Mõõtühik"
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Nädalased laoväärtuse muutused"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Materjali maksumus"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "Kaubakoosluse struktuur"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr "Tootmises"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr "Trüki"
 msgid "Type"
 msgstr "Liik"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr "Meetod"
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 17b5ec7c0e3..6d37ac70af8 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 09:50+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -157,13 +157,6 @@ msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 "Järjestelmä luo automaattisesti tarjouspyynnön suositetulle toimittajalle"
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -202,13 +195,18 @@ msgstr "Mittayksikkö"
 msgid "For purchased material"
 msgstr "Ostettaville materiaaleille"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -275,6 +273,21 @@ msgstr "Perustiedot"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -440,6 +453,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Varastoarvoero viikkotasolla"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -448,7 +482,7 @@ msgid "Scheduled Date"
 msgstr "Suunniteltu päivämäärä"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -459,14 +493,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Osaluettelo"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -488,12 +514,6 @@ msgstr "Varastoarvoero"
 msgid "Bill of Materials Structure"
 msgstr "Osaluettelon rakenne"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -627,12 +647,6 @@ msgstr ""
 "Jos kentän arvo on epätosi (false), sallii reitityksen piilottamisen ilman "
 "sen poistamista"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -653,7 +667,7 @@ msgid "Work Center Load"
 msgstr "Työpisteen kuormitus"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Tuotteelle ei ole määritetty osalistaa!"
@@ -723,12 +737,6 @@ msgstr "Tuotannossa"
 msgid "Master Bill of Materials"
 msgstr "Pääosaluettelo"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Työtilaukset"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -752,30 +760,6 @@ msgstr "Tulosta"
 msgid "Type"
 msgstr "Tyyppi"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -819,8 +803,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "Tekijä 0.9 tarkoittaa 10%:n tuotantohävikkiä."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Varoitus!"
@@ -883,7 +867,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Valmistustilaukset jotka odottavat raaka-aineita."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -894,6 +878,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Valmistustilaus"
@@ -959,7 +944,7 @@ msgid "BoM Type"
 msgstr "Osalistan tyyppi"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -982,7 +967,7 @@ msgid "Companies"
 msgstr "Yritykset"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1310,7 +1295,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1356,7 +1341,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1398,27 +1383,6 @@ msgstr ""
 "Tuotteelle, jonka hankintatapa on 'Osto', järjestelmä muodostaa "
 "ostotilauksen."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1488,12 +1452,6 @@ msgstr "Tapa"
 msgid "Pending"
 msgstr "Odottava"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1531,12 +1489,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Viittaus dokumenttiin, joka synnytti tämän valmistustilauspyynnön."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1557,12 +1509,6 @@ msgstr "Muuta tuotteiden määrää"
 msgid "Drives the procurement orders for raw material."
 msgstr "Ohjaa raaka-aineiden hankintaa."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1579,7 +1525,7 @@ msgid "SO Number"
 msgstr "Myyntitilaus nro"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1626,6 +1572,31 @@ msgstr "Aloitettavat valmistustilaukset"
 msgid "Work Center"
 msgstr "Työpiste"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1763,20 +1734,6 @@ msgstr "Aikataulutetut tuotteet"
 msgid "Manager"
 msgstr "Päällikkö"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1788,9 +1745,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Työtilaukset"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1822,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1861,7 +1819,6 @@ msgstr "Yhden kierron aika (tuntia)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1885,7 +1842,7 @@ msgid "Compute Data"
 msgstr "Laske tiedot"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1931,7 +1888,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tuotannon läpimenoaika"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2176,17 +2133,7 @@ msgid "BOM Ref"
 msgstr "BOM viite"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2226,7 +2173,7 @@ msgid "Bill of Materials"
 msgstr "Osaluettelo"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 9d4b2f56b15..79841249965 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 14:30+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -169,13 +169,6 @@ msgstr ""
 "Le système lance automatiquement un appel d'offre auprès du fournisseur "
 "principal"
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -215,13 +208,18 @@ msgstr "Unité de Mesure"
 msgid "For purchased material"
 msgstr "Pour un produit acheté"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -288,6 +286,21 @@ msgstr "Données de base"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -454,6 +467,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variation de valeur de stock hebdomadaire"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -462,7 +496,7 @@ msgid "Scheduled Date"
 msgstr "Date planifiée"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -473,14 +507,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Nomenclature des Matériaux"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -502,12 +528,6 @@ msgstr "Variation de la valeur de stock"
 msgid "Bill of Materials Structure"
 msgstr "Structure de la nomenclature"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -645,12 +665,6 @@ msgstr ""
 "Si la valeur du champs est a faux, cela vous autorise a désactiver le "
 "routage sans le supprimer."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -671,7 +685,7 @@ msgid "Work Center Load"
 msgstr "Occupation du poste de charge"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Pas de nomenclature définie pour cet article !"
@@ -747,12 +761,6 @@ msgstr "En production"
 msgid "Master Bill of Materials"
 msgstr "Nomenclature maîtresse"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ordres de Travail"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -776,30 +784,6 @@ msgstr "Imprimer"
 msgid "Type"
 msgstr "Type"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -844,8 +828,8 @@ msgstr ""
 "Un facteur de 0.9 signifie une perte de 10% au cours de la fabrication."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Avertissement!"
@@ -912,7 +896,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Ordres de fabrication en attente de matières premières."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -923,6 +907,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Ordre de fabrication"
@@ -988,7 +973,7 @@ msgid "BoM Type"
 msgstr "Type de Nomenclature"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1012,7 +997,7 @@ msgid "Companies"
 msgstr "Sociétés"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1344,7 +1329,7 @@ msgstr ""
 "fabrication (postes de charge) sera automatiquement pré-remplie."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1391,7 +1376,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1433,43 +1418,6 @@ msgstr ""
 "Dans le cas où la méthode de fourniture de l'article est \"Acheter\", le "
 "système va créer un ordre d'achat."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliquez pour créer une nouvelle propriété.\n"
-"              </p><p>\n"
-"                Dans OpenERP, les propriétés permettent de choisir le bonne "
-"nomenclature\n"
-"                pour fabriquer un article lorsque celui-ci peut être "
-"assemblé de plusieurs\n"
-"                manières.  Vous pouvez assigner plusieurs\n"
-"                propriétés à chaque nomenclature. Lorsqu'un vendeur\n"
-"                créer une commande de vente, il peut lui faire correspondre "
-"plusieurs propriétés\n"
-"                et OpenERP choisira automatiquement la nomenclature à "
-"utiliser en fonction\n"
-"                des besoins.\n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1539,12 +1487,6 @@ msgstr "Méthode"
 msgid "Pending"
 msgstr "En attente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1583,12 +1525,6 @@ msgid ""
 msgstr ""
 "Référence du document à l'origine de la demande d'ordre de production"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1609,12 +1545,6 @@ msgstr "Modifier les quantités d'articles"
 msgid "Drives the procurement orders for raw material."
 msgstr "Pilote la gestion des approvisionnement en matières premières"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1631,7 +1561,7 @@ msgid "SO Number"
 msgstr "Numéro de la Commande Client"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1678,6 +1608,31 @@ msgstr "Ordres de fabrication à lancer"
 msgid "Work Center"
 msgstr "Poste de charge"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1814,20 +1769,6 @@ msgstr "Produits Plannifiés"
 msgid "Manager"
 msgstr "Responsable"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1844,9 +1785,10 @@ msgstr ""
 "quantités totales prévues auront été produites."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ordres de Travail"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1878,7 +1820,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1920,7 +1862,6 @@ msgstr "Temps pour 1 cycle (en heures)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1944,7 +1885,7 @@ msgid "Compute Data"
 msgstr "Calculer les Données"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1990,7 +1931,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Délai de fabrication"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2250,17 +2191,7 @@ msgid "BOM Ref"
 msgstr "Référence nomenclature"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2300,7 +2231,7 @@ msgid "Bill of Materials"
 msgstr "Nomenclature"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/gl.po b/addons/mrp/i18n/gl.po
index 13fd68a091f..5aff9ced1e7 100644
--- a/addons/mrp/i18n/gl.po
+++ b/addons/mrp/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 10:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -158,13 +158,6 @@ msgstr ""
 "O sistema crea automaticamente unha petición de presuposto ó provedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -204,13 +197,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material mercado"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -277,6 +275,21 @@ msgstr "Datos principais"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -442,6 +455,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variación do valor do stock semanal"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -450,7 +484,7 @@ msgid "Scheduled Date"
 msgstr "Data planificada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -461,14 +495,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Material"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -490,12 +516,6 @@ msgstr "Variación do valor de stock"
 msgid "Bill of Materials Structure"
 msgstr "Estrutura lista de materiais"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -629,12 +649,6 @@ msgid ""
 "without removing it."
 msgstr "Se se desmarca o campo activo, permite ocultar a ruta sen eliminala."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -655,7 +669,7 @@ msgid "Work Center Load"
 msgstr "Carga centro de produción"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Non se definiu LdM para este produto!"
@@ -729,12 +743,6 @@ msgstr "En produción"
 msgid "Master Bill of Materials"
 msgstr "Lista mestra de materiais"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ordes de traballo"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -758,30 +766,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -825,8 +809,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "Un factor de 0,9 indica unha perda do 10% no proceso de produción."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -893,7 +877,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -904,6 +888,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Orde de fabricación"
@@ -969,7 +954,7 @@ msgid "BoM Type"
 msgstr "Tipo de lista de materiais"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -992,7 +977,7 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1317,7 +1302,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1363,7 +1348,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1405,27 +1390,6 @@ msgstr ""
 "Se se merca o método de subministración do produto, o sistema crea un pedido "
 "de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1495,12 +1459,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1539,12 +1497,6 @@ msgid ""
 msgstr ""
 "Referencia ó documento que xerou esta solicitude de orde de produción."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1565,12 +1517,6 @@ msgstr "Cambiar cantidade de produtos"
 msgid "Drives the procurement orders for raw material."
 msgstr "Guía as ordes de abastecemento para materias primas."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1587,7 +1533,7 @@ msgid "SO Number"
 msgstr "Número venda"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1634,6 +1580,31 @@ msgstr "Ordes de produción a iniciar"
 msgid "Work Center"
 msgstr "Centro de produción"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1774,20 +1745,6 @@ msgstr "Produtos planificados"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1803,9 +1760,10 @@ msgstr ""
 "cantidades pedidas."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ordes de traballo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1837,7 +1795,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1876,7 +1834,6 @@ msgstr "Tempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1900,7 +1857,7 @@ msgid "Compute Data"
 msgstr "Calcular datos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1946,7 +1903,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tempo de fabricación"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2191,17 +2148,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2239,7 +2186,7 @@ msgid "Bill of Materials"
 msgstr "Lista de materiais"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 256fbe0e7c2..bfa6d27896d 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 08:21+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr "अनुसूचित तिथि"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr "उत्पादन में"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr "प्रिंट"
 msgid "Type"
 msgstr "प्रकार"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 51c018b8d4e..34f9d19e01b 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 20:53+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -155,13 +155,6 @@ msgstr "Za nabaviti"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr "Sustav automatski pokreče RFQ na preferiranog dobavljača."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -201,13 +194,18 @@ msgstr "Jedinica mjere"
 msgid "For purchased material"
 msgstr "Za nabavljeni materijal"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "Detaljno planiranje radova za radne naloge"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -274,6 +272,21 @@ msgstr "Glavni podaci"
 msgid "Produce several products from one manufacturing order"
 msgstr "Više proizvoda iz jednog naloga za proizvodnju"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -440,6 +453,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Tjedna varijacija vrijednosti zalihe"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -448,7 +482,7 @@ msgid "Scheduled Date"
 msgstr "Planirani datum"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -459,14 +493,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Sastavnica"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -488,12 +514,6 @@ msgstr "Stock Value Variation"
 msgid "Bill of Materials Structure"
 msgstr "Struktura sastavnice"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -629,12 +649,6 @@ msgstr ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -655,7 +669,7 @@ msgid "Work Center Load"
 msgstr "Opterećenje radnog centra"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Proizvod nema sastavnicu!"
@@ -729,12 +743,6 @@ msgstr "U proizvodnji"
 msgid "Master Bill of Materials"
 msgstr "Glavna sastavnica"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Radni nalozi"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -758,30 +766,6 @@ msgstr "Ispis"
 msgid "Type"
 msgstr "Vrsta"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -825,8 +809,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "A factor of 0.9 means a loss of 10% within the production process."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -892,7 +876,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -903,6 +887,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Nalog proizvodnje"
@@ -968,7 +953,7 @@ msgid "BoM Type"
 msgstr "BoM Type"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -990,7 +975,7 @@ msgid "Companies"
 msgstr "Organizacije"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1317,7 +1302,7 @@ msgstr ""
 "will be automatically pre-completed."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1363,7 +1348,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -1403,27 +1388,6 @@ msgid ""
 "purchase order."
 msgstr "Kada je Metoda nabave \"Kupi\", sistem kreira nalog za nabavu."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1493,12 +1457,6 @@ msgstr "Metoda"
 msgid "Pending"
 msgstr "Na čekanju"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1536,12 +1494,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Dokument koji je generirao ovaj nalog za proizvodnju."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1562,12 +1514,6 @@ msgstr "Promijeni količine proizvoda"
 msgid "Drives the procurement orders for raw material."
 msgstr "Upravlja nalozima nabave za sirovine."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1584,7 +1530,7 @@ msgid "SO Number"
 msgstr "SO Number"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1631,6 +1577,31 @@ msgstr "Ne pokrenuti nalozi proizvodnje"
 msgid "Work Center"
 msgstr "Radni centar"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1772,20 +1743,6 @@ msgstr "Planirani proizvodi"
 msgid "Manager"
 msgstr "Voditelj"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1802,9 +1759,10 @@ msgstr ""
 "ordered quantities are produced."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Radni nalozi"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1836,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1876,7 +1834,6 @@ msgstr "Time for 1 cycle (hour)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1900,7 +1857,7 @@ msgid "Compute Data"
 msgstr "Compute Data"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1946,7 +1903,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Pripremno vrijeme proizvodnje"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -2191,17 +2148,7 @@ msgid "BOM Ref"
 msgstr "Ozn. sastavnice"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i e-pošta."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2239,7 +2186,7 @@ msgid "Bill of Materials"
 msgstr "Sastavnica"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 123163a1c60..b01656764de 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 11:47+0000\n"
 "Last-Translator: krnkris <Unknown>\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: 2012-12-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -168,15 +168,6 @@ msgstr ""
 "A rendszer automatikusan kiküld egy ajánlatkérési felhívást a kiválasztott "
 "beszállítónak."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-"A darabjegyzéken és a megrendelésen részletezett tulajdonságokon alapul a "
-"használathoz megfelelően kiválasztott darabjegyzék."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -216,13 +207,18 @@ msgstr "Mértékegység"
 msgid "For purchased material"
 msgstr "Vásárolt termékhez"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "Részletes munka megrendelés tervezést engedélyez."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "Nem lehet érvényteleníteni a gyártási megrendelést."
@@ -300,6 +296,21 @@ msgstr "Törzsadatok"
 msgid "Produce several products from one manufacturing order"
 msgstr "Egyes termékek előállítása gy munka megrendelésből"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -466,6 +477,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Heti készletérték változása"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -474,7 +506,7 @@ msgid "Scheduled Date"
 msgstr "Tervezett dátum"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "Gyártási rendelés <em>%s</em> létrehozva."
@@ -485,16 +517,6 @@ msgstr "Gyártási rendelés <em>%s</em> létrehozva."
 msgid "Bill Of Material"
 msgstr "Anyagjegyzék"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-"Gyártási rendelés ekkor <b>visszaigazolt</b> és ekkorra <b>scheduled</b> "
-"ehhet <em>%s</em>."
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -516,12 +538,6 @@ msgstr "Készletérték változása"
 msgid "Bill of Materials Structure"
 msgstr "Anyagjegyzék-struktúra"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "Gyártási megrendelés törölve lett <b>canceled</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -657,13 +673,6 @@ msgstr ""
 "Ha az aktív mezőt \"Hamis\"-ra állítja, akkor törlés nélkül el tudja rejteni "
 "a gyártási eljárást."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-"Darabjegyzék lett létrehozva <b>created</b> ehhez <em>%s</em> a termékhez."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -684,7 +693,7 @@ msgid "Work Center Load"
 msgstr "Munkaállomás terheltsége"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Az adott termékhez nincsen anyagjegyzék megadva!"
@@ -759,12 +768,6 @@ msgstr "Gyártás alatt"
 msgid "Master Bill of Materials"
 msgstr "Fő anyagjegyzékek"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Munka megbízások"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -788,30 +791,6 @@ msgstr "Nyomtatás"
 msgid "Type"
 msgstr "Típus"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -856,8 +835,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "A 0,9-es érték 10%-os veszteséget jelent a gyártási folyamatban."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -923,7 +902,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Gyártáasi rendelések, melyek nyersanyagra várnak."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -934,6 +913,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Gyártási rendelés"
@@ -999,7 +979,7 @@ msgid "BoM Type"
 msgstr "Anyagjegyzék tipusa"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1022,7 +1002,7 @@ msgid "Companies"
 msgstr "Vállalatok"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1346,7 +1326,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Érvénytelen lépés!"
@@ -1394,7 +1374,7 @@ msgstr ""
 "meghatározását."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (másolat)"
@@ -1436,27 +1416,6 @@ msgstr ""
 "Ha a termék ellátási módszere \"Vásárlás\", a rendszer szállítói "
 "megrendelést hoz létre."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1526,12 +1485,6 @@ msgstr "Módszer"
 msgid "Pending"
 msgstr "Függőben lévő"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr "Gyártás megrendelés gyártás alatt  <b>in production</b>."
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1570,12 +1523,6 @@ msgid ""
 msgstr ""
 "A dokumentum hivatkozása hozta létre ezt a gyártási rendelési megbízást."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "Gyártási megrendelés elvégezve <b>done</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1596,12 +1543,6 @@ msgstr "Termékek mennyiségének megváltoztatása"
 msgid "Drives the procurement orders for raw material."
 msgstr "Kezeli az alapanyagok beszerzési rendeléseit."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr "Gyártás megrendelés készenáll a gyártásra <b>ready to produce</b>."
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1618,7 +1559,7 @@ msgid "SO Number"
 msgstr "Értékesítési megbízás száma"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "Nem lehet a gyártási megrendelést törölni ezen az állapoton '%s'."
@@ -1665,6 +1606,31 @@ msgstr "Elkezdésre váró gyártási rendelések"
 msgid "Work Center"
 msgstr "Munkaállomás"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1808,23 +1774,6 @@ msgstr "Tervezett termékek"
 msgid "Manager"
 msgstr "Igazgató"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-"He vevői megrendelés jön erre a termékre, a szállítási megbízás\n"
-"                                az nyersanyagot fogja tartalmazni, a kész "
-"termék helyett."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "Gyártási megrendelés elkészítve <b>created</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1841,9 +1790,10 @@ msgstr ""
 "amikor a teljes megrendelt mennyiség legyártásra került."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr "Megrendelések tervezése"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Munka megbízások"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1875,7 +1825,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1917,7 +1867,6 @@ msgstr "Ciklusidő (óra)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1941,7 +1890,7 @@ msgid "Compute Data"
 msgstr "Adatok kiszámítása"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1987,7 +1936,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Gyártási átfutási idő"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Figyelem"
@@ -2232,17 +2181,7 @@ msgid "BOM Ref"
 msgstr "Anyagjegyzék hivatkozás"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2280,7 +2219,7 @@ msgid "Bill of Materials"
 msgstr "Anyagjegyzékek"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 5321c260cce..2b66b0be750 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 08:22+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index a9cf41cde0b..30eaa6bc42c 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 09:57+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -169,15 +169,6 @@ msgstr ""
 "Il sistema crea automaticamente una richiesta ordine verso il fornitore "
 "preferenziale."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-"La scelta della BoM corretta dipende dalle proprietà specificate sull'ordine "
-"di vendita e sulla BoM."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -217,13 +208,18 @@ msgstr "Unità di misura"
 msgid "For purchased material"
 msgstr "Per materiali acquistati"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "Consente una pianificazione dettagliata degli ordini di lavoro"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "Impossibile annullare gli ordini di produzione!"
@@ -301,6 +297,21 @@ msgstr "Distinte Base"
 msgid "Produce several products from one manufacturing order"
 msgstr "Produce diversi prodotti da un unico ordine di produzione"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -489,6 +500,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variazione Settimanale Valore Stock"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -497,7 +529,7 @@ msgid "Scheduled Date"
 msgstr "Data prevista"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "Ordine di Produzione <em>%s</em> creato."
@@ -508,16 +540,6 @@ msgstr "Ordine di Produzione <em>%s</em> creato."
 msgid "Bill Of Material"
 msgstr "Distinta Base (BOM)"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-"L'Ordine di Produzione è stato <b>confermato</b> e <b>pianificato</b> per la "
-"<em>%s</em>."
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -540,12 +562,6 @@ msgstr "Variazione Valore Magazzino"
 msgid "Bill of Materials Structure"
 msgstr "Struttura Distinta Base"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "L'Ordine di Produzione è stato <b>annullato</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -689,12 +705,6 @@ msgstr ""
 "Se il campo \"attivo\" è False, consentirà di nascondere ilrouting senza "
 "rimuoverlo."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr "La BoM è stata <b>creata</b> per <em>%s</em> prodotto."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -715,7 +725,7 @@ msgid "Work Center Load"
 msgstr "Carico Centro di Lavoro"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Non è stata definita la distinta base per questo prodotto!"
@@ -803,12 +813,6 @@ msgstr "In Produzione"
 msgid "Master Bill of Materials"
 msgstr "Distinta base principale"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ordini di Lavorazione"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -838,51 +842,6 @@ msgstr "Stampa"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clicca per creare un gruppo di proprietà.\n"
-"              </p><p>\n"
-"                Definisci specifici gruppi di proprietà che verranno "
-"assegnati\n"
-"                alle distinte base e ordini di vendita. Le proprietà "
-"consento ad\n"
-"                OpenERP di selezionare la distinta base corretta in base "
-"alle\n"
-"                proprietà selezionate dai commerciali sugli ordini di "
-"vendita.\n"
-"              </p><p>\n"
-"                Per esempio, nel gruppo di proprietà \"Garanzia\", puoi "
-"trovare\n"
-"                due proprietà: 1 anno di garanzia, 3 anni di garanzia. In "
-"base alle\n"
-"                proprietà selezionate sull'ordine di vendita, OpenERP "
-"pianificherà\n"
-"                la produzione usando la distinta base corrispondente.\n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -940,8 +899,8 @@ msgstr ""
 "Un fattore di 0.9 indica una perdita del 10% nel processo di produzione."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -1009,7 +968,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Ordini di Produzione in attesa di materiale."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -1022,6 +981,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Ordine di Produzione"
@@ -1103,7 +1063,7 @@ msgid "BoM Type"
 msgstr "Tipo di Distinta base"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1127,7 +1087,7 @@ msgid "Companies"
 msgstr "Aziende"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1471,7 +1431,7 @@ msgstr ""
 "produzione (centri di lavoro) verrà automaticamente pre-compilato."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Azione non valida!"
@@ -1519,7 +1479,7 @@ msgstr ""
 "per creare i prodotti finiti."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -1561,43 +1521,6 @@ msgstr ""
 "Nel caso in cui il medoto di approvvigionamento del prodotto sia \"Compra\", "
 "il sistema creerà un ordine di acquisto."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliccare per creare una nuova proprietà.\n"
-"              </p><p>\n"
-"                Le proprietà in OpenERP vengono usate per selezionare la "
-"distinta base\n"
-"                corretta quanto l'ordine di produzione ha differenti modi di "
-"produrre\n"
-"                lo stesso prodotto. Puoi associare differenti proprietà alla "
-"distinta base.\n"
-"                Quando un commerciale crea un ordine di vendita, può "
-"associare diverse\n"
-"                proprietà e OpenERP selezionerà automaticamente la BoM da "
-"usare in\n"
-"                relazione alle necessità.\n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1667,12 +1590,6 @@ msgstr "Metodo"
 msgid "Pending"
 msgstr "In attesa"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr "L'Ordine di Produzione è <b>in produzione</b>."
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1713,12 +1630,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Documento che ha generato questo ordine di produzione."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "L'Ordine di Produzione è stato <b>completato</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1739,12 +1650,6 @@ msgstr "Cambia Quantità dei Prodotti"
 msgid "Drives the procurement orders for raw material."
 msgstr "Coordina gli ordini di approvvigionamento della materia prima."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr "L'Ordine di Produzione è <b>pronto per entrare in produzione</b>."
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1761,7 +1666,7 @@ msgid "SO Number"
 msgstr "Numero Ordine di Vendita"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "Impossibile eliminare un ordine di produzione in stato '%s'."
@@ -1808,6 +1713,31 @@ msgstr "Ordini di Produzione da Eseguire"
 msgid "Work Center"
 msgstr "Centro di lavoro"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1953,22 +1883,6 @@ msgstr "Prodotti Programmati"
 msgid "Manager"
 msgstr "Manager"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-"Processando un ordine di produzione per questo prodotto, l'ordine di "
-"consegna conterrà la materia prima, invece che il prodotto finito."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "L'Ordine di Produzione è stato <b>creato</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1985,9 +1899,10 @@ msgstr ""
 "ordinata sarà stata prodotta."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr "Pianificazione Ordini"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ordini di Lavorazione"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -2022,7 +1937,7 @@ msgstr ""
 "Installa il modulo mrp_operations."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -2064,7 +1979,6 @@ msgstr "Tempistiche per un ciclo (ore)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -2088,7 +2002,7 @@ msgid "Compute Data"
 msgstr "Elabora Dati"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -2134,7 +2048,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tempi di Produzione"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Attenzione"
@@ -2396,17 +2310,7 @@ msgid "BOM Ref"
 msgstr "Rif distinta base"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2446,7 +2350,7 @@ msgid "Bill of Materials"
 msgstr "Distinta Base"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr "Impossibile trovare una distinta base per questo prodotto."
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index 4ca4da8e6c0..24ac4281f5a 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-08 02:52+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr "購入のため"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr "システムは優先仕入先にRFQ（見積依頼）を自動的に起こします。"
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "仕入済材料"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr "マスターデータ"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "週次在庫価値変動"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr "予定日"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "部品表"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -476,12 +502,6 @@ msgstr "在庫価値変動"
 msgid "Bill of Materials Structure"
 msgstr "構造の部品表"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -613,12 +633,6 @@ msgid ""
 "without removing it."
 msgstr "このアクティブ項目をFalseに設定すると、経路は削除することなく非表示にすることができます。"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -639,7 +653,7 @@ msgid "Work Center Load"
 msgstr "作業センタの負荷"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "この製品のための部品表が定義されていません。"
@@ -711,12 +725,6 @@ msgstr "製造中"
 msgid "Master Bill of Materials"
 msgstr "マスター部品表"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "作業オーダー"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -740,30 +748,6 @@ msgstr "印刷"
 msgid "Type"
 msgstr "タイプ"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -807,8 +791,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "0.9の数は製造過程の中での10％の損失を意味します。"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "警告"
@@ -873,7 +857,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "原材料を待っている製造オーダーです。"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -884,6 +868,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "製造オーダー"
@@ -949,7 +934,7 @@ msgid "BoM Type"
 msgstr "部品表タイプ"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -971,7 +956,7 @@ msgid "Companies"
 msgstr "会社"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1291,7 +1276,7 @@ msgstr ""
 "。"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1334,7 +1319,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1374,27 +1359,6 @@ msgid ""
 "purchase order."
 msgstr "製品の供給方法が購入の場合、システムは発注オーダーを作成します。"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1464,12 +1428,6 @@ msgstr "方法"
 msgid "Pending"
 msgstr "保留中"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1507,12 +1465,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "この製造オーダー要求を生成したドキュメントへの参照"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1533,12 +1485,6 @@ msgstr "製品の数量変更"
 msgid "Drives the procurement orders for raw material."
 msgstr "原材料の調達オーダーを起こす"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1555,7 +1501,7 @@ msgid "SO Number"
 msgstr "受注番号"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1602,6 +1548,31 @@ msgstr "製造オーダー開始"
 msgid "Work Center"
 msgstr "作業センタ"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1739,20 +1710,6 @@ msgstr "予定済製品"
 msgid "Manager"
 msgstr "マネジャ"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1766,9 +1723,10 @@ msgstr ""
 "消費と生産モードでは、製品を選択した数量製造すると同様に消費もされます。そして合計注文量が製造された時に製造オーダーが終わります。"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "作業オーダー"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1800,7 +1758,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1839,7 +1797,6 @@ msgstr "サイクル当りの時間（時）"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1863,7 +1820,7 @@ msgid "Compute Data"
 msgstr "データ計算"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1909,7 +1866,7 @@ msgid "Manufacturing Lead Time"
 msgstr "製造リードタイム"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2149,17 +2106,7 @@ msgid "BOM Ref"
 msgstr "部品表参照"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2199,7 +2146,7 @@ msgid "Bill of Materials"
 msgstr "部品表"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 264c6516af2..2edca9a551f 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 11:08+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr "측정 단위"
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "BoM"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -476,12 +502,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "BoM 구조"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -613,12 +633,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -639,7 +653,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "이 상품에 정의된 BoM이 없습니다 !"
@@ -709,12 +723,6 @@ msgstr "생산 중"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "작업 지시"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -738,30 +746,6 @@ msgstr "출력"
 msgid "Type"
 msgstr "유형"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -805,8 +789,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -869,7 +853,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -880,6 +864,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -945,7 +930,7 @@ msgid "BoM Type"
 msgstr "BoM 유형"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -967,7 +952,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1285,7 +1270,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1328,7 +1313,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1368,27 +1353,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1458,12 +1422,6 @@ msgstr "방법"
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1501,12 +1459,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1527,12 +1479,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1549,7 +1495,7 @@ msgid "SO Number"
 msgstr "SO 번호"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1596,6 +1542,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1731,20 +1702,6 @@ msgstr "계획된 상품"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1756,9 +1713,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "작업 지시"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1790,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1827,7 +1785,6 @@ msgstr "1 사이클 시간"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1851,7 +1808,7 @@ msgid "Compute Data"
 msgstr "데이터 계산"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1897,7 +1854,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2137,17 +2094,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2185,7 +2132,7 @@ msgid "Bill of Materials"
 msgstr "BoM"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 841178e900a..3f9b9181480 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 10:26+0000\n"
 "Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: lt\n"
 
 #. module: mrp
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr "Matavimo vienetas"
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Komplektavimo specifikacija"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -477,12 +503,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "KS struktūra"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -614,12 +634,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -640,7 +654,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Šiam produktui nenustatyta komplektavimo specifikacija!"
@@ -710,12 +724,6 @@ msgstr "Gaminama"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Darbo užsakymai"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -739,30 +747,6 @@ msgstr "Spausdinti"
 msgid "Type"
 msgstr "Tipas"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -806,8 +790,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -870,7 +854,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -881,6 +865,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -946,7 +931,7 @@ msgid "BoM Type"
 msgstr "KS tipas"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -968,7 +953,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1286,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1329,7 +1314,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1369,27 +1354,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1459,12 +1423,6 @@ msgstr "Metodas"
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1502,12 +1460,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1528,12 +1480,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1550,7 +1496,7 @@ msgid "SO Number"
 msgstr "Pardavimo užsakymo numeris"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1597,6 +1543,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1733,20 +1704,6 @@ msgstr "Suplanuoti produktai"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1758,9 +1715,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Darbo užsakymai"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1792,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1829,7 +1787,6 @@ msgstr "Laikas vienam ciklui (valandomis)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1853,7 +1810,7 @@ msgid "Compute Data"
 msgstr "Apskaičiuoti duomenis"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1899,7 +1856,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2139,17 +2096,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2187,7 +2134,7 @@ msgid "Bill of Materials"
 msgstr "Komplektavimo specifikacijos"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
index ba644b2f023..c487e3195a9 100644
--- a/addons/mrp/i18n/lv.po
+++ b/addons/mrp/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-28 13:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po
index 3c2b942936a..fde24033727 100644
--- a/addons/mrp/i18n/mn.po
+++ b/addons/mrp/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-21 12:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -158,13 +158,6 @@ msgstr ""
 "Систем харгалзах нийлүүлэгч рүү автоматаар үнийн саналын хүсэлт (ҮСХ-RFQ)-"
 "ийг үүсгэнэ."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -204,13 +197,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Худалдан авсан материалын хувьд"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -277,6 +275,21 @@ msgstr "Мастер Өгөгдөл"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -443,6 +456,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Долооног тутамын Нөөцийн Үнийн Хазайлт"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -451,7 +485,7 @@ msgid "Scheduled Date"
 msgstr "Товлогдсон огноо"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -462,14 +496,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Жор"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -491,12 +517,6 @@ msgstr "Нөөцийн Үнийн Хазайлт"
 msgid "Bill of Materials Structure"
 msgstr "Жорын Бүтэц"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -630,12 +650,6 @@ msgstr ""
 "Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал машрутыг устгалгүйгээр "
 "нуудаг."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -656,7 +670,7 @@ msgid "Work Center Load"
 msgstr "Дамжлагын Ачаалал"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Энэ бараанд жор тодорхойлогдоогүй байна !"
@@ -729,12 +743,6 @@ msgstr "Үйлдвэрлэгдэж буй"
 msgid "Master Bill of Materials"
 msgstr "Мастер жор"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ажлын Захиалгууд"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -758,30 +766,6 @@ msgstr "Хэвлэх"
 msgid "Type"
 msgstr "Төрөл"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -826,8 +810,8 @@ msgstr ""
 "Коэффициент 0.9 гэдэг нь үйлдвэрлэлийн явц дахь алдагдал 10% гэсэн үг юм."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Анхааруулга!"
@@ -893,7 +877,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Түүхий эд хүлээж байгаа үйлдвэрлэлийн захиалгууд"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -904,6 +888,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Үйлдвэрлэлийн Захиалга"
@@ -969,7 +954,7 @@ msgid "BoM Type"
 msgstr "Жорын төрөл"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -992,7 +977,7 @@ msgid "Companies"
 msgstr "Компаниуд"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1322,7 +1307,7 @@ msgstr ""
 "хавтас автоматаар бөглөгддөг."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1367,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1409,27 +1394,6 @@ msgstr ""
 "Барааны нийлүүлэх арга нь худалдан авах байвал систем нь худалдан авах "
 "захиалгыг үүсгэдэг."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1499,12 +1463,6 @@ msgstr "Метод"
 msgid "Pending"
 msgstr "Хүлээгдэж буй"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1542,12 +1500,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Энэ үйлдвэрлэлийн захиалгын хүсэлтийг үүсгэсэн баримтын код"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1568,12 +1520,6 @@ msgstr "Бараануудын Тоо хэмжээг өөрчлөх"
 msgid "Drives the procurement orders for raw material."
 msgstr "Түүхийн эдийн татан авах захиалгуудыг хөтлөнө."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1590,7 +1536,7 @@ msgid "SO Number"
 msgstr "БЗ Дугаар"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1637,6 +1583,31 @@ msgstr "Эхлүүлэх Үйлдвэрлэлийн Захиалгууд"
 msgid "Work Center"
 msgstr "Дамжлага"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1777,20 +1748,6 @@ msgstr "Товлогдсон Бараанууд"
 msgid "Manager"
 msgstr "Менежер"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1806,9 +1763,10 @@ msgstr ""
 "үйлдвэрлэлийн захиалгыг дуусгана."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ажлын Захиалгууд"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1840,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1881,7 +1839,6 @@ msgstr "1 циклийн хугацаа (цагаар)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1905,7 +1862,7 @@ msgid "Compute Data"
 msgstr "Өгөгдлийг Тооцоолох"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1951,7 +1908,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Үйлдвэрлэлийн урьтал хугацаа"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2194,17 +2151,7 @@ msgid "BOM Ref"
 msgstr "Жорын код"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2244,7 +2191,7 @@ msgid "Bill of Materials"
 msgstr "Жорууд"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/nb.po b/addons/mrp/i18n/nb.po
index 2f5071057ea..d2b52dc9835 100644
--- a/addons/mrp/i18n/nb.po
+++ b/addons/mrp/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 11:04+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -158,13 +158,6 @@ msgstr ""
 "Systemet starter automatisk en forespørsel for tilbud til den foretrukne "
 "leverandøren."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -204,13 +197,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "For innkjøpt materiale"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -277,6 +275,21 @@ msgstr "Hoved data"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -443,6 +456,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Ukentlig Lagerverdi Variasjon"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -451,7 +485,7 @@ msgid "Scheduled Date"
 msgstr "Planlagt Dato"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -462,14 +496,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Materialliste"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -492,12 +518,6 @@ msgstr "Lagerverdi Variasjon"
 msgid "Bill of Materials Structure"
 msgstr "Materialliste Struktur"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -633,12 +653,6 @@ msgstr ""
 "Hvis det aktive feltet settes til falskt, vil det tillate deg å skjule ruten "
 "uten å måtte fjerne den."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -659,7 +673,7 @@ msgid "Work Center Load"
 msgstr "Arbeidssenter belastning"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Ingen Materialliste er definert for dette produktet !"
@@ -733,12 +747,6 @@ msgstr "I Produksjon"
 msgid "Master Bill of Materials"
 msgstr "Hoved Materiallister"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Arbeidsordre"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -762,30 +770,6 @@ msgstr "Skriv ut"
 msgid "Type"
 msgstr "Type"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -829,8 +813,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "En faktor på 0.9 betyr et tap på 10 % i produksjonsprosessen."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -896,7 +880,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Produksjonsordre som venter på råvarer"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -907,6 +891,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Produksjonsordre"
@@ -972,7 +957,7 @@ msgid "BoM Type"
 msgstr "Materialliste Type"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -996,7 +981,7 @@ msgid "Companies"
 msgstr "Firmaer"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1322,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1367,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1409,27 +1394,6 @@ msgstr ""
 "I tilfelle hvor Anskaffelsesmetoden for produktet er Kjøp, oppretter "
 "systemet en innkjøpsordre."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1499,12 +1463,6 @@ msgstr "Metode"
 msgid "Pending"
 msgstr "Ventende"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1543,12 +1501,6 @@ msgid ""
 msgstr ""
 "Referanse til dokumentet som genererte produksjonsordre forespørslen."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1569,12 +1521,6 @@ msgstr "Endre Antall Produkter"
 msgid "Drives the procurement orders for raw material."
 msgstr "Styrer anskaffelsesordre for råmaterialer."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1591,7 +1537,7 @@ msgid "SO Number"
 msgstr "SO Nummer"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1638,6 +1584,31 @@ msgstr "Produksjonsordre å starte"
 msgid "Work Center"
 msgstr "Arbeidssenter"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1777,20 +1748,6 @@ msgstr "Planlagte Produkter"
 msgid "Manager"
 msgstr "Manager"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1806,9 +1763,10 @@ msgstr ""
 "bestilte antallet er produsert."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Arbeidsordre"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1840,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1879,7 +1837,6 @@ msgstr "Tid for en syklus(timer)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1903,7 +1860,7 @@ msgid "Compute Data"
 msgstr "Beregn Data"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1949,7 +1906,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Produksjon Ledetid"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2191,17 +2148,7 @@ msgid "BOM Ref"
 msgstr "Materialliste Ref"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2239,7 +2186,7 @@ msgid "Bill of Materials"
 msgstr "Stykklister"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 5f6151643e1..7d99dd43660 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 19:07+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -42,12 +42,12 @@ msgstr "Locatie waar het systeem zoekt voor componeten"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "Werkplek gebruik"
+msgstr "Productiestap gebruik"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Werkplek routering"
+msgstr "Productie route"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -110,8 +110,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
-"Aantal iteraties die deze werkplek heeft te doen in de specifieke verwerking "
-"van de productiestap."
+"Aantal herhalingen die deze productiestap heeft te doen in de specifieke "
+"verwerking van de productie route."
 
 #. module: mrp
 #: view:product.product:0
@@ -160,13 +160,6 @@ msgstr ""
 "Het systeem maakt automatisch een offerte aanvraag aan voor de voorkeur "
 "leverancier."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -206,13 +199,18 @@ msgstr "Meeteenheid"
 msgid "For purchased material"
 msgstr "Voor ingekocht materiaal"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "Het is niet mogelijk de productieorder te annuleren!"
@@ -241,7 +239,7 @@ msgstr "Capaciteitsinformatie"
 #. module: mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr "Werkplekken"
+msgstr "Productiestappen"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_routing_action
@@ -279,6 +277,21 @@ msgstr "Stamgegevens"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -329,7 +342,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr "Werkplek gebruik"
+msgstr "Productiestap gebruik"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -380,7 +393,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr "Werkplek product"
+msgstr "Productiestap product"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -446,6 +459,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Wekelijkse voorraadwaarde variatie"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -454,7 +488,7 @@ msgid "Scheduled Date"
 msgstr "Geplande datum"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "Productieorder <em>%s</em> aangemaakt."
@@ -465,14 +499,6 @@ msgstr "Productieorder <em>%s</em> aangemaakt."
 msgid "Bill Of Material"
 msgstr "Materiaallijst"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -494,12 +520,6 @@ msgstr "Voorraadwaarde verandering"
 msgid "Bill of Materials Structure"
 msgstr "Materiaallijststructuur"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -508,7 +528,7 @@ msgstr "Productsoort is service"
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr "Specificeer de kosten van de werkplek per cyclus."
+msgstr "Specificeer de kosten van de productiestap per cyclus."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -541,8 +561,8 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
-"De materiaallijst is gekoppeld aan een routing, dat wil zeggen de opvolging "
-"van werkplekken."
+"De materiaallijst is gekoppeld aan een productie route, dat wil zeggen de "
+"opeenvolgende productiestappen."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -586,8 +606,8 @@ msgstr "Zoek productie"
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
-"Geeft de volgorde weer bij het weergeven van een lijst van werkplekken in "
-"een productiestap."
+"Geeft de volgorde weer bij het weergeven van een lijst van productiestappen "
+"in een productie route"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -626,7 +646,7 @@ msgstr "Materiaallijstregels"
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr "Tijd vóór prod."
+msgstr "Tijd vóór productie (uur)"
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -637,12 +657,6 @@ msgstr ""
 "Indien het actief veld is uitgevinkt heeft u de mogelijkheid om de routing "
 "te verbergen, zonder deze te verwijderen."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -660,10 +674,10 @@ msgstr "Verbruikte producten"
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Werkplek belasting"
+msgstr "Productiestap belasting"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Geen materiaallijst opgegeven voor dit product !"
@@ -698,10 +712,10 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
-"De lijst van de bewerkingen (lijst van de werkplekken) om het eindproduct te "
-"vervaardigen. De routing wordt vooral gebruikt om de kosten van werkplekken "
-"te berekenen tijdens bewerkingen en de toekomstige belastingen op de "
-"werkplekken door middel van planningssystemen."
+"De lijst van de bewerkingen (lijst van de productiestappen) om het "
+"eindproduct te vervaardigen. De productie route wordt vooral gebruikt om de "
+"kosten van werkplekken te berekenen tijdens bewerkingen en de toekomstige "
+"belastingen op de productiestappen door middel van planningssystemen."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -739,12 +753,6 @@ msgstr "In productie"
 msgid "Master Bill of Materials"
 msgstr "Hoofd materialenlijst"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Werkorders"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -768,30 +776,6 @@ msgstr "Afdrukken"
 msgid "Type"
 msgstr "Soort"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -836,8 +820,8 @@ msgstr ""
 "Een factor van 0,9 betekend een verlies van 10% in het productieproces."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -904,7 +888,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Productieorders welke wachten op grondstoffen."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -915,6 +899,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Productieorder"
@@ -980,7 +965,7 @@ msgid "BoM Type"
 msgstr "Materiaallijst soort"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1004,7 +989,7 @@ msgid "Companies"
 msgstr "Bedrijven"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1037,7 +1022,7 @@ msgstr "Voorraadartikel"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Work Center name"
-msgstr "Werkplek naam"
+msgstr "Productiestap naam"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1158,7 +1143,7 @@ msgstr "Berichten en communicatie historie"
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
 msgid "Amount measuring unit"
-msgstr "Hoeveelheid meeteenheid"
+msgstr "Hoeveelheid maateenheid"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_jit:0
@@ -1173,7 +1158,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr "Specificeer de kosten per werkplek per uur."
+msgstr "Specificeer de kosten per productiestap per uur."
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1181,9 +1166,9 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
-"Het aantal van bewerkingen dat deze werkplek parallel kan doen. Indien de "
-"werkplek een aantal van 5 werknemers vertegenwoordigd, dan is de capaciteit "
-"per cyclus 5."
+"Het aantal bewerkingen dat deze productiestap parallel kan uitvoeren. Indien "
+"de productiestap een aantal van 5 werknemers vertegenwoordigd, dan is de "
+"capaciteit per cyclus 5."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1243,8 +1228,8 @@ msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
 msgstr ""
-"Tijd in uren voor deze werkplek om de bewerking uit te voeren in de "
-"gespecificeerde productiestap."
+"Tijd in uren voor deze productiestap om de bewerking uit te voeren in de "
+"gespecificeerde productie route."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1281,7 +1266,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr "Werkplek verwerkingen"
+msgstr "Productiestappen"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1317,7 +1302,7 @@ msgstr "Producten"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr "Werkplek belasting"
+msgstr "Productiestap belasting"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1331,12 +1316,13 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
-"Productiestappen geven alle gebruikte werkplekken weer, voor hoe lang en/of "
-"cycly. Indien een routing is aangegeven dan wordt het derde tabblad van een "
-"productieorder (Werkplekken) automatisch van tevoren ingevuld."
+"Productie routes geven alle gebruikte productiestappen weer, voor hoe lang "
+"en/of cycly. Indien een productie route is aangegeven dan wordt het derde "
+"tabblad van een productieorder (productiestappen) automatisch van tevoren "
+"ingevuld."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie!"
@@ -1382,7 +1368,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -1424,27 +1410,6 @@ msgstr ""
 "Indien de bevoorradingsmethode van het product, kopen is, zal het systeem "
 "een inkooporder aanmaken."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1470,12 +1435,12 @@ msgstr "Componenten leverancier"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr "Productie werkplekken"
+msgstr "Productiestappen"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr "Zoek naar een productie werkplek"
+msgstr "Zoek naar een productiestap"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1514,12 +1479,6 @@ msgstr "Methode"
 msgid "Pending"
 msgstr "In afwachting"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1539,7 +1498,7 @@ msgstr ""
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr "Werkplek belastingen"
+msgstr "Productiestap belastingen"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1559,12 +1518,6 @@ msgstr ""
 "Referentie van het document dat het verzoek voor deze productieorder heeft "
 "gedaan."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1585,12 +1538,6 @@ msgstr "Wijzig de hoeveelheid van producten"
 msgid "Drives the procurement orders for raw material."
 msgstr "Stuurt de inkoop orders voor grondstoffen."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1607,7 +1554,7 @@ msgid "SO Number"
 msgstr "Nummer verkoopopdracht"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1652,7 +1599,32 @@ msgstr "Productieorders te starten"
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr "Werkplek"
+msgstr "Productiestap"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1717,7 +1689,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
-"Omschrijving van de werkplek. Leg uit wat een cyclus is voor deze werkplek."
+"Omschrijving van de productiestap. Leg uit wat een cyclus is voor deze "
+"productiestap."
 
 #. module: mrp
 #: field:mrp.production,date_finished:0
@@ -1755,10 +1728,10 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
-"De lijst van bewerkingen (werkplekken) om een gereed product te produceren. "
-"De productiestappen worden voornamelijk gebruikt om werkplek kosten "
-"gedurende de bewerkingen en toekomstige werkbelasting van de werkplekken te "
-"berekenen gebaseerd op de planning."
+"De lijst van bewerkingen (productiestap) om een gereed product te "
+"produceren. De productie route worden voornamelijk gebruikt om productiestap "
+"kosten gedurende de bewerkingen en toekomstige werkbelasting van de "
+"productiestappen te berekenen gebaseerd op de planning."
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -1797,20 +1770,6 @@ msgstr "Geplande producten"
 msgid "Manager"
 msgstr "Manager"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1827,9 +1786,10 @@ msgstr ""
 "totaal bestelde hoeveelheid zijn geproduceerd."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Werkorders"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1861,7 +1821,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1903,7 +1863,6 @@ msgstr "Tijd voor 1 cyclus (uur)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1927,7 +1886,7 @@ msgid "Compute Data"
 msgstr "Bereken gegevens"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1970,10 +1929,10 @@ msgstr "Normale materiaallijst"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr "Productietijd"
+msgstr "Extra dagen productietijd"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -2063,7 +2022,7 @@ msgstr "Startdatum"
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr "Tijd na prod."
+msgstr "Tijd na productie (uur)"
 
 #. module: mrp
 #: field:mrp.workcenter.load,time_unit:0
@@ -2218,17 +2177,7 @@ msgid "BOM Ref"
 msgstr "Referentie"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2268,7 +2217,7 @@ msgid "Bill of Materials"
 msgstr "Materiaallijst"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
@@ -3420,9 +3369,6 @@ msgstr "Producten te verbruiken"
 #~ msgid "The company name must be unique !"
 #~ msgstr "De naam van het bedrijf moet uniek zijn!"
 
-#~ msgid "Configure your work centers"
-#~ msgstr "Configureer uw werkplekken"
-
 #~ msgid "Nbr of cycles"
 #~ msgstr "Aantal cycli"
 
@@ -3586,19 +3532,6 @@ msgstr "Producten te verbruiken"
 #~ msgid "Component Product"
 #~ msgstr "Component Product"
 
-#~ msgid ""
-#~ "Work Centers allow you to create and manage manufacturing units.  They "
-#~ "consist of workers and/or machines, which are considered as units for "
-#~ "capacity and planning forecast.  Keep in mind that the working time and "
-#~ "resource leave are not taken into account in the time computation of the "
-#~ "work center."
-#~ msgstr ""
-#~ "Met werkplekken kunt u productie plaatsen maken en beheren. Ze bestaan ​​uit "
-#~ "werknemers en/of machines, die worden beschouwd als eenheden voor de "
-#~ "capaciteit en planningsprognose. Houd er rekening mee dat de werk-tijd en "
-#~ "resource afwezigheid niet worden meegenomen in de tijdberekening van de "
-#~ "werkplek."
-
 #~ msgid ""
 #~ "Bills of materials components are components and sub-products used to create "
 #~ "master bills of materials. Use this menu to search in which BoM a specific "
@@ -3669,19 +3602,35 @@ msgstr "Producten te verbruiken"
 #~ msgid "Manufacturing order '%s' is scheduled for the %s."
 #~ msgstr "Productieorder '%s' is gepland voor %s."
 
+#~ msgid "Modification name"
+#~ msgstr "Naam van wijziging"
+
+#~ msgid "Modification Date"
+#~ msgstr "Datum van wijziging"
+
+#~ msgid "Configure your work centers"
+#~ msgstr "Configureer uw productiestappen"
+
 #~ msgid ""
 #~ "Routings allow you to create and manage the manufacturing operations that "
 #~ "should be followed within your work centers in order to produce a product. "
 #~ "They are attached to bills of materials that will define the required raw "
 #~ "materials."
 #~ msgstr ""
-#~ "Productiestappen geven u de mogelijkheid om productie bewerkingen te maken "
-#~ "en te beheren, welke moeten worden opgevolgt binnen uw werkplekken om een "
-#~ "product te produceren. Ze zijn gekoppeld aan een materiaallijst, welke de "
-#~ "benodigde materialen beschrijft."
+#~ "Productie routes geven u de mogelijkheid om productie bewerkingen te maken "
+#~ "en te beheren, welke moeten worden opgevolgd binnen uw productiestappen om "
+#~ "een product te produceren. Ze zijn gekoppeld aan een materiaallijst, welke "
+#~ "de benodigde materialen beschrijft."
 
-#~ msgid "Modification name"
-#~ msgstr "Naam van wijziging"
-
-#~ msgid "Modification Date"
-#~ msgstr "Datum van wijziging"
+#~ msgid ""
+#~ "Work Centers allow you to create and manage manufacturing units.  They "
+#~ "consist of workers and/or machines, which are considered as units for "
+#~ "capacity and planning forecast.  Keep in mind that the working time and "
+#~ "resource leave are not taken into account in the time computation of the "
+#~ "work center."
+#~ msgstr ""
+#~ "Met productiestappen kunt u productie plaatsen maken en beheren. Ze bestaan "
+#~ "​​uit werknemers en/of machines, die worden beschouwd als eenheden voor de "
+#~ "capaciteit en planningsprognose. Houd er rekening mee dat de werk-tijd en "
+#~ "resource afwezigheid niet worden meegenomen in de tijdberekening van de "
+#~ "werkplek."
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index 6df52361aa5..e99d332367e 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-20 10:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 96f6631c79a..2ea8e9ebcd3 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 20:17+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 12:40+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -159,13 +159,6 @@ msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 "System utworzy automatycznie Zapytanie ofertowe do preferowanego dostawcy."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -205,13 +198,18 @@ msgstr "Jednostka miary"
 msgid "For purchased material"
 msgstr "Dla kupowanych materiałów"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr "Planowanie zamówień"
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "Pozwala szczegółowo planować operację"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "Nie można anulować zamówienia produkcji"
@@ -278,6 +276,21 @@ msgstr "Dane główne"
 msgid "Produce several products from one manufacturing order"
 msgstr "Produkuj kilka produktów z jednego zamówienia produkcji"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -444,6 +457,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Tygodniowe odchylenie wartości zapasów"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -452,7 +486,7 @@ msgid "Scheduled Date"
 msgstr "Zaplanowana data"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "Zamówienie produkcji <em>%s</em> utworzono."
@@ -463,16 +497,6 @@ msgstr "Zamówienie produkcji <em>%s</em> utworzono."
 msgid "Bill Of Material"
 msgstr "Zestawienie materiałowe"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-"Zamówienie produkcji zostało <b>potwierdzone</b> i jest <b>zaplanowane</b> "
-"dla <em>%s</em>."
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -494,12 +518,6 @@ msgstr "Odchylenia wartości zapasów"
 msgid "Bill of Materials Structure"
 msgstr "Struktura zestawień materiałowych"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "Zamówienie produkcji zostało <b>anulowane</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -635,13 +653,6 @@ msgstr ""
 "Jeśli opcja jest niezaznaczona, to marszruta będzie ukryta (i nie będziesz "
 "jej musiał usuwać)."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-"Zestawienie materiałowe zostało <b>utworzone</b> dla produktu <em>%s</em>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -662,7 +673,7 @@ msgid "Work Center Load"
 msgstr "Obłożenie centrum roboczego"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Nie zdefiniowano Zestawienia materiałowego dla tego produktu !"
@@ -734,12 +745,6 @@ msgstr "W trakcie produkcji"
 msgid "Master Bill of Materials"
 msgstr "Główne zestawienie materiałowe"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Centra robocze"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -763,30 +768,6 @@ msgstr "Drukuj"
 msgid "Type"
 msgstr "Typ"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -830,8 +811,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "Współczynnik 0.9 oznacza stratę 10% w trakcie produkcji."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -896,7 +877,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Zamówienia produkcji, które oczekują na materiały."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -907,6 +888,7 @@ msgstr "Wybrana jednostka miary ma inną kategorię niż ta w produkcie."
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Zamówienie produkcji"
@@ -972,7 +954,7 @@ msgid "BoM Type"
 msgstr "Typ Zest. Mat."
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -996,7 +978,7 @@ msgid "Companies"
 msgstr "Firmy"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1171,6 +1153,9 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Liczba operacji, które to centrum może wykonać jednocześnie. Jeśli maszyna "
+"wykonuje tę samą czynność jednocześnie na 5 komponentach, to jej wydajność "
+"na cykl wynosi 5."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1207,7 +1192,7 @@ msgstr "Koszt cykli"
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
 msgid "Cannot find bill of material for this product."
-msgstr ""
+msgstr "Nie można odnaleźć zastawienia materiałowego dla tego produktu."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -1230,6 +1215,7 @@ msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Czas w godzinach, który dane centrum potrzebuje na wykonanie operacji."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1318,7 +1304,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Niedozwolona akcja!"
@@ -1364,7 +1350,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -1406,27 +1392,6 @@ msgstr ""
 "W przypadku, gdy Metoda zaopatrzenia jest Kupno, to system tworzy zamówienie "
 "zakupu."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1496,12 +1461,6 @@ msgstr "Metoda"
 msgid "Pending"
 msgstr "Oczekiwanie"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr "Zamówienie produkcji zostało <b>rozpoczęte</b>."
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1539,12 +1498,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "Zamówienie produkcji zostało <b>zakończone</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1565,12 +1518,6 @@ msgstr "Zmień ilość produktów"
 msgid "Drives the procurement orders for raw material."
 msgstr "Sporządza zapotrzebowania na materiały do produkcji."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr "Zamówienie produkcji jest <b>gotowe do rozpoczęcia</b>."
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1587,7 +1534,7 @@ msgid "SO Number"
 msgstr "Numer ZS"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "Nie można usunąć zamówienia produkcji w stanie '%s'."
@@ -1634,6 +1581,31 @@ msgstr "Zamówienia produkcji do rozpoczęcia"
 msgid "Work Center"
 msgstr "Centrum robocze"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1771,20 +1743,6 @@ msgstr "Zaplanowane produkty"
 msgid "Manager"
 msgstr "Menedżer"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "Zamówienie produkcji zostało <b>utworzone</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1796,9 +1754,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr "Planowanie zamówień"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Centra robocze"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1830,7 +1789,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1870,7 +1829,6 @@ msgstr "Czas jednego cyklu (w godz.)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1894,7 +1852,7 @@ msgid "Compute Data"
 msgstr "Oblicz dane"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1940,7 +1898,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Czas wyprodukowania"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -2184,17 +2142,7 @@ msgid "BOM Ref"
 msgstr "Odn. Zest. Mat."
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2234,7 +2182,7 @@ msgid "Bill of Materials"
 msgstr "Zestawienia materiałowe"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr "Nie mozna odnaleźć zestawienia materiałowego dla tego produktu."
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 00986126b17..d3b05c2ed9a 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 10:20+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -157,13 +157,6 @@ msgstr ""
 "Os sistema despoleta automaticamente um pedido de cotação ao fornecedor "
 "preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -203,13 +196,18 @@ msgstr "Unidade de Medida"
 msgid "For purchased material"
 msgstr "Para materiais comprados"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -276,6 +274,21 @@ msgstr "Dados Principais"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -442,6 +455,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variação semanal do valor do stock"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -450,7 +484,7 @@ msgid "Scheduled Date"
 msgstr "Data programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -461,14 +495,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Materiais"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -490,12 +516,6 @@ msgstr "Variação do valor do stock"
 msgid "Bill of Materials Structure"
 msgstr "Estrutura da lista de materiais"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -633,12 +653,6 @@ msgstr ""
 "Se o campo ativo é definido como Falso, ele permitirá que oculte o "
 "encaminhamento sem o remover."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -659,7 +673,7 @@ msgid "Work Center Load"
 msgstr "Carga Centro de Trabalho"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Nenhum BoM definido para este artigo !"
@@ -733,12 +747,6 @@ msgstr "Em Produção"
 msgid "Master Bill of Materials"
 msgstr "Ficha técnica principal de materiais"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ordens de Trabalho"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -762,30 +770,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -830,8 +814,8 @@ msgstr ""
 "Um factor de 0,9 significa uma perda de 10% dentro do processo de produção."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -897,7 +881,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Ordens de Produção que estão à espera de matérias-primas."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -908,6 +892,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Ordem de produção"
@@ -973,7 +958,7 @@ msgid "BoM Type"
 msgstr "Tipo de BoM"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -996,7 +981,7 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1330,7 +1315,7 @@ msgstr ""
 "preenchida."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação inválida!"
@@ -1376,7 +1361,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -1418,27 +1403,6 @@ msgstr ""
 "No caso do método de fornecimento do artigo é Comprar, o sistema cria uma "
 "ordem de compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1508,12 +1472,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1551,12 +1509,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Referência do documento que gerou o pedido de ordem de produção."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1577,12 +1529,6 @@ msgstr "Mudar a quantidade de artigos"
 msgid "Drives the procurement orders for raw material."
 msgstr "Conduz a ordem de aquisição para material em bruto"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1599,7 +1545,7 @@ msgid "SO Number"
 msgstr "Número SO"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "Não se pode apagar uma ordem deprodução com o estado '%s'."
@@ -1646,6 +1592,31 @@ msgstr "Ordens para iniciar a fabricação"
 msgid "Work Center"
 msgstr "Centro de Trabalho"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1788,20 +1759,6 @@ msgstr "Artigos agendados"
 msgid "Manager"
 msgstr "Gestor"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1818,9 +1775,10 @@ msgstr ""
 "quantidades encomendadas forem produzidas."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ordens de Trabalho"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1852,7 +1810,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1894,7 +1852,6 @@ msgstr "Tempo por 1 ciclo (hora)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1918,7 +1875,7 @@ msgid "Compute Data"
 msgstr "Processar dados"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1964,7 +1921,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Tempo de fabrico da lead"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -2209,17 +2166,7 @@ msgid "BOM Ref"
 msgstr "BOM Ref"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2259,7 +2206,7 @@ msgid "Bill of Materials"
 msgstr "Contas de matérias"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 9f51b29ad51..5e519bea5cf 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-21 00:28+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 20:02+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
@@ -29,6 +29,14 @@ msgid ""
 "                    * Notes for the technician and for the final customer.\n"
 "                This installs the module mrp_repair."
 msgstr ""
+"Permite gerenciar todos os reparos dos produtos.\n"
+"                     * Adicionar / remover produtos na reparação\n"
+"                     * Impacto no estoques\n"
+"                     * Faturamento (produtos e / ou serviços)\n"
+"                     * Conceito de Garantia\n"
+"                     * Relatório de cotação de reparos\n"
+"                     * Notas para o técnico e para o cliente final.\n"
+"                 Isso instala o módulo mrp_repair."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -80,7 +88,7 @@ msgstr "Produtos Sucata"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Mrp Workcenter"
-msgstr ""
+msgstr "Mrp Centro de Trabalho"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -134,7 +142,7 @@ msgstr "Produtos Acabados"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr "Ordens de Fabricação que estao atualmente em produção."
+msgstr "Ordens de Fabricação que estão atualmente em produção."
 
 #. module: mrp
 #: help:mrp.bom,message_summary:0
@@ -161,13 +169,6 @@ msgstr ""
 "O sistema automaticamente lança uma RPC (Requisição de Cotação) para o "
 "Fornecedor preferido."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,7 +196,7 @@ msgstr ""
 #. module: mrp
 #: field:change.production.qty,product_qty:0
 msgid "Product Qty"
-msgstr "Quantidade de produtos"
+msgstr "Qtd do Produto"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -208,20 +209,25 @@ msgid "For purchased material"
 msgstr "Para Material Comprado"
 
 #. module: mrp
-#: field:mrp.config.settings,module_mrp_operations:0
-msgid "Allow detailed planning of work order"
-msgstr ""
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr "Planejamento da Ordem"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: field:mrp.config.settings,module_mrp_operations:0
+msgid "Allow detailed planning of work order"
+msgstr "Permite planejamento detalhado do centro de trabalho"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Não é possível cancelar a ordem de fabricação!"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr "Conta do ciclo"
+msgstr "Conta do Ciclo"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -258,6 +264,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um roteiro.\n"
+"              </p><p>\n"
+"              Roteiros permitem criar e gerenciar a as operações de "
+"fabricação\n"
+"              que devem ser seguidas dentro de seus centros de trabalho\n"
+"              a fim de produzir um produto. Eles estão ligados a listas de\n"
+"              materiais que irão definir as matérias-primas necessárias.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: view:mrp.production:0
@@ -278,7 +294,27 @@ msgstr "Dados Principais"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_byproduct:0
 msgid "Produce several products from one manufacturing order"
+msgstr "Produzir vários produtos a partir de uma ordem de fabricação"
+
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
 msgstr ""
+"A escolha da lista de materiais correta a se utilizar depende das "
+"propriedades especificadas no pedido de vendas e da Lista de Materiais."
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+"Ao processar um pedido de venda para este produto, a ordem de entrega\n"
+"                                 irá conter as matérias-primas, em vez de o "
+"produto acabado."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -304,7 +340,7 @@ msgstr "Conjuntos / Fantasma"
 #: view:mrp.production:0
 #: field:mrp.production,state:0
 msgid "Status"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: mrp
 #: help:mrp.bom,position:0
@@ -314,7 +350,7 @@ msgstr "Referente a uma posição em um plano externo."
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_routings
 msgid "Manage Routings"
-msgstr ""
+msgstr "Gerenciar Roteiros"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -354,6 +390,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma ordem de produção. \n"
+"              </p><p>\n"
+"               Uma ordem de produção, com base em uma lista de materiais, "
+"irá\n"
+"                 consumir matérias-primas e produzir produtos acabados.\n"
+"              </p><p>\n"
+"Ordens de produção são geralmente propostas automaticamente com base\n"
+"                 nas necessidades dos clientes ou regras automatizadas como "
+"a regra \n"
+"                 de estoque mínimo.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: sql_constraint:mrp.production:0
@@ -377,6 +426,8 @@ msgid ""
 "Fill this product to easily track your production costs in the analytic "
 "accounting."
 msgstr ""
+"Preencha este produto para controlar facilmente os custos de produção na "
+"contabilidade analítica."
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
@@ -441,12 +492,63 @@ msgid ""
 "'In Production'.\n"
 "                When the production is over, the status is set to 'Done'."
 msgstr ""
+"Quando a ordem de produção é criada a situação é definida como "
+"'Provisória'.\n"
+"                 Se o pedido for confirmado a situação é definida como "
+"'Aguardando Mercadorias'.\n"
+"                 Se as exceções existem, a situação é definida como 'Exceção "
+"na Separação'.\n"
+"                 Se o estoque estiver disponível, a situação é definida como "
+"'Pronto para Produzir'.\n"
+"                 Quando a produção é iniciada, a situação é definida como "
+"\"Em Produção\".\n"
+"                 Quando a produção é finalizada, a situação é definida como "
+"'Concluída'."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
 msgstr "Variação Semanal do Valor do Estoque"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma nova propriedade.\n"
+"              </p><p>\n"
+"                As propriedades no OpenERP são usadas ​​para selecionar a "
+"lista de materiais\n"
+"                correta para a fabricação de um produto, quando você tem "
+"diferentes\n"
+"                 maneiras de construir o mesmo produto. Você pode atribuir "
+"várias\n"
+"                 propriedades para cada lista de materiais. Quando um "
+"vendedor\n"
+"                 cria um pedido de venda, eles podem relacioná-la com várias "
+"propriedades\n"
+"                 e o OpenERP seleciona automaticamente o BOM para usar de "
+"acordo\n"
+"                 as necessidades.\n"
+"              </p>\n"
+"            "
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -455,10 +557,10 @@ msgid "Scheduled Date"
 msgstr "Data programada"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
-msgstr ""
+msgstr "Ordem de Produção <em>%s</em> criada."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -466,14 +568,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Materiais"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -495,12 +589,6 @@ msgstr "Variação do Valor do Estoque"
 msgid "Bill of Materials Structure"
 msgstr "Estrutura da Lista de Materiais"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -534,7 +622,7 @@ msgstr "Pedido de Cotação"
 #: view:mrp.product_price:0
 #: view:mrp.workcenter.load:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -554,7 +642,7 @@ msgstr "Produtos a Produzir"
 #. module: mrp
 #: view:mrp.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -575,7 +663,7 @@ msgstr "Valor do Estoque"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Produto BoM estrutura"
+msgstr "Estrututa da Lista de Materiais (BoM) do Produto"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -613,6 +701,15 @@ msgid ""
 "assembly operation.\n"
 "                This installs the module stock_no_autopicking."
 msgstr ""
+"Este módulo permite um processo de separação intermediário para fornecer "
+"matérias-primas para ordens de produção.\n"
+"                 Por exemplo, para gerenciar a produção feita por seus "
+"fornecedores (sub-contratação).\n"
+"                 Para isso, defina o produto montado, que é sub-contratado "
+"para \"Não Auto-Separação\"\n"
+"                 e coloque a localização do fornecedor no encaminhamento da "
+"operação de montagem.\n"
+"                 Isso instala o módulo stock_no_autopicking."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -638,12 +735,6 @@ msgstr ""
 "Se o campo ativo é definido como Falso, ele permitirá que você esconda o "
 "roteamento sem removê-lo."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -664,7 +755,7 @@ msgid "Work Center Load"
 msgstr "Carga do centro de trabalho"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Nenhuma LdM definida para este produto!"
@@ -722,11 +813,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar componentes em uma lista de "
+"materiais.\n"
+"              </p><p>\n"
+"                Componentes da lisa de materiais são usados por produtos\n"
+"                para criar listas de materiais mestres. Use este menu para\n"
+"                procurar em que LdM um componente específico é usado.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr "Produtos de linha BoM não devem ser os mesmo que produtos BoM"
+msgstr ""
+"Produtos de linha da Lista de Materiais LdM não devem ser os mesmo que "
+"produtos LdM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -738,12 +840,6 @@ msgstr "Em Produção"
 msgid "Master Bill of Materials"
 msgstr "Lista de Materiais Principal"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Ordens de Serviço"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -754,6 +850,12 @@ msgid ""
 "                    * Product Attributes.\n"
 "                This installs the module product_manufacturer."
 msgstr ""
+"Isso permite que você defina o seguinte para um produto:\n"
+"                     * Fabricante\n"
+"                     * Nome do Produto do Fabricante\n"
+"                     * Código do Produto do Fabricante\n"
+"                     * Atributos do produto.\n"
+"                 Isso instala o módulo product_manufacturer."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -767,30 +869,6 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -805,6 +883,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um centro de trabalho.\n"
+"              </p><p>\n"
+"                 Centros de trabalho permitem que você crie e gerencie "
+"unidades de fabricação.\n"
+"                 Eles consistem de trabalhadores e / ou máquinas, que são "
+"considerados como\n"
+"                 unidades de atribuição de tarefas, bem como previsão de "
+"capacidade e planejamento.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -822,6 +911,7 @@ msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for the "
 "inventory control"
 msgstr ""
+"Unidade de Medida (UdM) é a unidade de medida para o controle de estoque"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -835,8 +925,8 @@ msgstr ""
 "Um fator de 0.9 significa uma perda de 10% dentro do processo de produção."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
@@ -844,13 +934,13 @@ msgstr "Atenção!"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Printing date"
-msgstr "data da impressão"
+msgstr "Data de Impressão"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr "RFQ"
+msgstr "RC"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
@@ -864,11 +954,13 @@ msgid ""
 "Fill this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
+"Preencha apenas se você deseja lançamentos analíticas automáticos nas ordens "
+"de produção."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Mark as Started"
-msgstr ""
+msgstr "Marcar como Iniciado"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -902,17 +994,20 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "As ordens de produção estao esperando pelas matérias primas"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
 "product form."
 msgstr ""
+"A Unidade de Medida do Produto que você escolheu tem uma categoria diferente "
+"do que no formulário do produto."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Ordem de Produção"
@@ -929,6 +1024,9 @@ msgid ""
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Todas as quantidades de produto tem de ser maior do que 0.\n"
+"Você deve instalar o módulo mrp_byproduct se você quiser gerenciar os "
+"produtos extra em LdMs!"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -946,7 +1044,7 @@ msgstr "Pronto para Produção"
 #: field:mrp.production,message_is_follower:0
 #: field:mrp.production.workcenter.line,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -971,6 +1069,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para iniciar uma nova ordem de produção. \n"
+"              </p><p>\n"
+"                Uma ordem de produção, baseada em uma lista de materiais, "
+"irá\n"
+"                consumir matérias primas e produzir produtos acabados.\n"
+"              </p><p>\n"
+"                Ordens de Produção são geralmente propostas automaticamente "
+"\n"
+"                 baseadas em necessidades do cliente ou regras de estoque "
+"mínimo.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.bom,type:0
@@ -978,7 +1089,7 @@ msgid "BoM Type"
 msgstr "Lista de Materiais Tipo"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1001,7 +1112,7 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1044,7 +1155,7 @@ msgstr "Código"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "Nr.de Horas"
+msgstr "Nr. de Horas"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -1054,7 +1165,7 @@ msgstr "Grupo de Propriedades"
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_routings:0
 msgid "Manage routings and work orders "
-msgstr ""
+msgstr "Gerenciar roteiros e ordens de trabalho "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
@@ -1075,7 +1186,7 @@ msgstr "Inativo"
 #: view:mrp.production:0
 #: view:mrp.workcenter.load:0
 msgid "Cancel"
-msgstr "Cancela"
+msgstr "Cancelar"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -1113,7 +1224,7 @@ msgstr "Ordens de Produção"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Awaiting Raw Materials"
-msgstr ""
+msgstr "Aguardando Matérias Prima"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1123,7 +1234,7 @@ msgstr "Referência Interna"
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Quantity"
-msgstr ""
+msgstr "Quantidade de UdV do Produto"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1150,7 +1261,7 @@ msgstr "Modo"
 #: help:mrp.production,message_ids:0
 #: help:mrp.production.workcenter.line,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
@@ -1166,6 +1277,11 @@ msgid ""
 "                cases entail a small performance impact.\n"
 "                This installs the module mrp_jit."
 msgstr ""
+"Isso permite que ordens de aquisição Just In Time.\n"
+"                 Todas as ordens de compras serão processadas imediatamente, "
+"o que pode, em alguns\n"
+"                 casos implicar em um pequeno impacto no desempenho.\n"
+"                 Isso instala o módulo mrp_jit."
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1190,7 +1306,7 @@ msgstr "Ordens de Produção em Progresso"
 #. module: mrp
 #: model:ir.actions.client,name:mrp.action_client_mrp_menu
 msgid "Open MRP Menu"
-msgstr ""
+msgstr "Abrir o Menu MRP"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1217,12 +1333,12 @@ msgstr "Ciclos de Custo"
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
 msgid "Cannot find bill of material for this product."
-msgstr ""
+msgstr "Não foi possível encontrar uma lista de materiais para este produto."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Montante nos ciclos"
+msgstr "Valor nos ciclos"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
@@ -1252,7 +1368,7 @@ msgstr "Diário Analítico"
 #: code:addons/mrp/report/price.py:139
 #, python-format
 msgid "Supplier Price per Unit of Measure"
-msgstr ""
+msgstr "Preço do Fornecedor por Unidade de Medida"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1264,7 +1380,7 @@ msgstr "Por semana"
 #: field:mrp.production,message_unread:0
 #: field:mrp.production.workcenter.line,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -1289,7 +1405,7 @@ msgstr "Observações"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr "Ordens de produção que estao prontas para iniciar."
+msgstr "Ordens de produção que estão prontas para iniciar."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1310,7 +1426,7 @@ msgstr "Selecione unidade de tempo"
 #: model:ir.ui.menu,name:mrp.menu_mrp_product_form
 #: view:mrp.config.settings:0
 msgid "Products"
-msgstr ""
+msgstr "Produtos"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -1334,10 +1450,10 @@ msgstr ""
 "de produção (Centros de Trabalho) será automaticamente completada."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1378,12 +1494,14 @@ msgid ""
 "Bill of Materials allow you to define the list of required raw materials to "
 "make a finished product."
 msgstr ""
+"Lista de Materiais permite a você definir a lista de matéria prima "
+"necessária para produzir um produto acabado."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
@@ -1406,7 +1524,7 @@ msgstr "Dias de segurança para cada operação de produção."
 #: model:process.transition,name:mrp.process_transition_servicemts0
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Make to Stock"
-msgstr "Avaliar Estoque"
+msgstr "Fabricar para Estoque"
 
 #. module: mrp
 #: constraint:mrp.production:0
@@ -1422,27 +1540,6 @@ msgstr ""
 "Caso o método de fornecimento seja Comprar o sistema criará uma ordem de "
 "compra."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1451,7 +1548,7 @@ msgstr "Aquisição"
 #. module: mrp
 #: field:mrp.config.settings,module_product_manufacturer:0
 msgid "Define manufacturers on products "
-msgstr ""
+msgstr "Defina os fabricantes nos produtos "
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
@@ -1478,7 +1575,7 @@ msgstr "Procurar por Centro de Trabalho"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "Estrutura BoM"
+msgstr "Estrutura da LdM"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
@@ -1488,14 +1585,14 @@ msgstr "Data Inicial"
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
-msgstr "Conta de Hora"
+msgstr "Conta da Hora"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
 #: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida do Produto"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1512,12 +1609,6 @@ msgstr "Método"
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1533,6 +1624,11 @@ msgid ""
 "are attached to bills of materials\n"
 "                that will define the required raw materials."
 msgstr ""
+"Roteiros permitem criar e gerenciar as operações de produção que devem ser "
+"seguidas\n"
+"                 dentro de seus centros de trabalho, a fim de produzir um "
+"produto. Eles estão ligados a listas de materiais\n"
+"                 que definirá as matérias-primas necessárias."
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -1555,21 +1651,15 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Referencia do Documento que gerou essa Ordem de Produção."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr "Material 'Regra de Estoque Mínimo'"
+msgstr "'Regra de Estoque Mínimo' do Material"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Informação Extra"
+msgstr "Informações Adicionais"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
@@ -1579,18 +1669,12 @@ msgstr "Altera a Quantidade dos Produtos"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr "Dirige as ordens de compra para matéria-prima."
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
+msgstr "Controla as ordens de compra para matéria-prima."
 
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
-msgstr ""
+msgstr "UdV da Quantidade do Produto"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1603,20 +1687,20 @@ msgid "SO Number"
 msgstr "Número OS"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
-msgstr ""
+msgstr "Não é possível excluir uma ordem de produção no estado '%s'."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Done"
-msgstr "Feito"
+msgstr "Concluído"
 
 #. module: mrp
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "Quando você vender este produto, o OpenERP irá disparar"
 
 #. module: mrp
 #: field:mrp.production,origin:0
@@ -1650,6 +1734,48 @@ msgstr "Ordens de Produção para Iniciar"
 msgid "Work Center"
 msgstr "Centro de Trabalho"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um grupo de propriedades.\n"
+"              </p><p>\n"
+"Definir grupos de propriedades específicas que podem ser atribuídas a sua\n"
+"                 lista de materiais e pedidos de vendas. Propriedades "
+"permite ao OpenERP\n"
+"                 selecionar automaticamente a lista de materiais correta de "
+"acordo com\n"
+"                 as propriedades selecionadas no pedido de vendas pelo "
+"vendedor. \n"
+"             </p><p>\n"
+"Por exemplo, no grupo de propriedades \"Garantia\", você\n"
+"tem duas propriedades: garantia de 1 ano, 3 anos de garantia.\n"
+"dependendo das propriedades selecionadas no pedido de venda\n"
+"o OpenERP irá agendar uma produção usando a lista de materiais correta.\n"
+"              </p>\n"
+"            "
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1686,7 +1812,7 @@ msgstr "Imprime a Estrutura de Custo do Produto"
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr "Und de Venda"
+msgstr "UdV do Produto"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1705,7 +1831,7 @@ msgstr "Produzir"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr "Adquirir Sempre"
+msgstr "Fazer sob Demanda"
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -1713,7 +1839,7 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
-"Descrição do Centro de Trabalho. Explica aqui o que é uma ciclo de acordo "
+"Descrição do Centro de Trabalho. Explique aqui o que é uma ciclo de acordo "
 "com este Centro de Trabalho."
 
 #. module: mrp
@@ -1737,7 +1863,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr "Und de Venda"
+msgstr "UdV do Produto"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1765,7 +1891,7 @@ msgstr "Aprovar"
 #. module: mrp
 #: view:mrp.config.settings:0
 msgid "Order"
-msgstr ""
+msgstr "Ordem"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1793,20 +1919,6 @@ msgstr "Produtos Agendados"
 msgid "Manager"
 msgstr "Gerente"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1823,9 +1935,10 @@ msgstr ""
 "quando o total das quantidades encomendadas forem produzidas."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Ordens de Serviço"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1846,7 +1959,7 @@ msgstr "Cancelado"
 #. module: mrp
 #: view:mrp.production:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Atualizar)"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_operations:0
@@ -1855,16 +1968,19 @@ msgid ""
 "lines (in the \"Work Centers\" tab).\n"
 "                This installs the module mrp_operations."
 msgstr ""
+"Isso permite adicionar estado, date_start, date_stop em linhas de produção "
+"da ordem de operação (na guia \"centros de trabalho\").\n"
+"                 Isso instala módulo mrp_operations."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
 "But you can only consume up to total %s quantities."
 msgstr ""
 "Você vai consumir um total de %s quantidades de \"%s\".\n"
-"Mas voce pode consumir até %s quantidades."
+"Mas você pode consumir até %s quantidades."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1888,7 +2004,7 @@ msgstr "Empresa"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default Unit of Measure"
-msgstr ""
+msgstr "Unid. de Medida Padrão"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1898,7 +2014,6 @@ msgstr "Tempo para 1 ciclo (horas)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1914,7 +2029,7 @@ msgstr "Regra de Aquisição Automática"
 #: field:mrp.production,message_ids:0
 #: field:mrp.production.workcenter.line,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1922,12 +2037,12 @@ msgid "Compute Data"
 msgstr "Calcular Dados"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1940,12 +2055,12 @@ msgstr "Componentes"
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr "Estrutura da BoM"
+msgstr "Estrutura da LdM"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_jit:0
 msgid "Generate procurement in real time"
-msgstr ""
+msgstr "Gerar aquisição em tempo real"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
@@ -1965,13 +2080,13 @@ msgstr "LdM Normal"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr "Tempo para produção"
+msgstr "Prazo de Fabricação"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1981,7 +2096,7 @@ msgstr "Qtd Und Venda"
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Product Move"
-msgstr ""
+msgstr "Movimentação de Produto"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -2009,7 +2124,7 @@ msgstr "Eficiência de Produção"
 #: field:mrp.production,message_follower_ids:0
 #: field:mrp.production.workcenter.line,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -2043,7 +2158,7 @@ msgstr "Recriar Seleção"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr "Na Ordem"
+msgstr "No Pedido"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
@@ -2115,6 +2230,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma lista de materiais. \n"
+"              </p><p>\n"
+"                Lista de Materiais (LdM) permite a você definir uma lista de "
+"matéria prima\n"
+"                usada para produzir um produto final; através de uma ordem "
+"de produção\n"
+"                ou embalagem de produtos.\n"
+"              </p><p>\n"
+"                O OpenERP usa essas LdM para propor automaticamente ordens "
+"de produção\n"
+"                de acordo com as necessidades de aquisição.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2129,7 +2258,7 @@ msgstr "Tempo em horas para a configuração."
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_repair:0
 msgid "Manage repairs of products "
-msgstr ""
+msgstr "Gerenciar reparos de produtos "
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_byproduct:0
@@ -2139,11 +2268,15 @@ msgid ""
 "                With this module: A + B + C -> D + E.\n"
 "                This installs the module mrp_byproduct."
 msgstr ""
+"Você pode configurar-produtos na lista de materiais.\n"
+"                 Sem esse módulo: A + B + C -> D.\n"
+"                 Com este módulo: A + B + C -> D + E.\n"
+"                 Isso instala o módulo mrp_byproduct."
 
 #. module: mrp
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr "Lista de Material (BoM)"
+msgstr "Lista de Materiais (LdM)"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2161,7 +2294,7 @@ msgstr "Atribuição pelo Estoque."
 #: code:addons/mrp/report/price.py:139
 #, python-format
 msgid "Cost Price per Unit of Measure"
-msgstr ""
+msgstr "Preço de Custo por Unidade de Medida"
 
 #. module: mrp
 #: field:report.mrp.inout,date:0
@@ -2213,17 +2346,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2263,10 +2386,10 @@ msgid "Bill of Materials"
 msgstr "Lista de Materiais"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
-msgstr ""
+msgstr "Não encontramos uma lista de materiais para este produto."
 
 #. module: mrp
 #: view:product.product:0
@@ -2275,17 +2398,20 @@ msgid ""
 "                        The delivery order will be ready once the production "
 "is done."
 msgstr ""
+"utilizando a lista de materiais atribuídos a este produto.\n"
+"                         A ordem de entrega estará pronto quando a produção "
+"for concluída."
 
 #. module: mrp
 #: field:mrp.config.settings,module_stock_no_autopicking:0
 msgid "Manage manual picking to fulfill manufacturing orders "
-msgstr ""
+msgstr "Gerencia a separação manual para completar as ordens de produção "
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 #: view:mrp.workcenter:0
 msgid "General Information"
-msgstr "Informação Básica"
+msgstr "Informações Gerais"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2296,7 +2422,7 @@ msgstr "Produção"
 #: model:ir.model,name:mrp.model_stock_move_split
 #: view:mrp.production:0
 msgid "Split in Serial Numbers"
-msgstr ""
+msgstr "Dividir em Números de Série"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -2304,7 +2430,7 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
-"Produto UOS (Unidade de Venda) é a unidade de medida para o faturamento e "
+"Produto UdV (Unidade de Venda) é a unidade de medida para o faturamento e "
 "promoção do estoque."
 
 #. module: mrp
@@ -2356,7 +2482,7 @@ msgstr "Quadro de produção"
 #: code:addons/mrp/wizard/change_production_qty.py:68
 #, python-format
 msgid "Active Id not found"
-msgstr ""
+msgstr "Id Ativo não encontrado"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -2380,24 +2506,30 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"Se um sub-produto é utilizado em vários produtos, que pode ser útil para "
+"criar a sua própria LdM. Mas se você não quer ordens de produção separadas "
+"para este subproduto, selecione Definir / Fantasma como tipo LdM. Se uma LdM "
+"Fantasma é usada para um produto principal, vai ser vendido e fornecido como "
+"um conjunto de componentes, em vez de ser produzido."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_configuration
 #: view:mrp.config.settings:0
 msgid "Configure Manufacturing"
-msgstr ""
+msgstr "Configurar Produção"
 
 #. module: mrp
 #: view:product.product:0
 msgid ""
 "a manufacturing\n"
 "                        order"
-msgstr ""
+msgstr "uma ordem de produção"
 
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_properties:0
 msgid "Allow several bill of materials per products using properties"
 msgstr ""
+"Permite diversas listas de materiais por produtos usando propriedades"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
@@ -2435,7 +2567,7 @@ msgstr "Tempo em horas para a limpeza."
 #: field:mrp.production,message_summary:0
 #: field:mrp.production.workcenter.line,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
@@ -2488,7 +2620,7 @@ msgstr "Sequência"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr "Níveis do Recurso"
+msgstr "Ausências de Recurso"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
@@ -2499,7 +2631,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_config_settings
 msgid "mrp.config.settings"
-msgstr ""
+msgstr "mrp.config.settings"
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index c5ad14680a2..58f77ed831a 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-23 12:20+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -155,13 +155,6 @@ msgstr "De cumparat"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr "Sistemul lanseaza automat o CdC furnizorului preferat."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -201,13 +194,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pentru materiale achizitionate"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -274,6 +272,21 @@ msgstr "Date Principale"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -440,6 +453,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Variatia Saptamanala a Valorii Stocului"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -448,7 +482,7 @@ msgid "Scheduled Date"
 msgstr "Data programata"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -459,14 +493,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Lista de Materiale"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -488,12 +514,6 @@ msgstr "Variatia Valorii Stocului"
 msgid "Bill of Materials Structure"
 msgstr "Structura Listei de Materiale"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -630,12 +650,6 @@ msgstr ""
 "Daca campul activ este setat pe Fals, va va permite sa ascundeti fisa "
 "tehnologica fara sa o stergeti."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -656,7 +670,7 @@ msgid "Work Center Load"
 msgstr "Incarcare Centru de Lucru"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Nu este definita nicio LdM pentru acest produs !"
@@ -732,12 +746,6 @@ msgstr "In productie"
 msgid "Master Bill of Materials"
 msgstr "Lista Principala de Materiale"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Comenzi de lucru"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -761,30 +769,6 @@ msgstr "Printeaza"
 msgid "Type"
 msgstr "Tip"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -830,8 +814,8 @@ msgstr ""
 "productie."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Avertizare!"
@@ -898,7 +882,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Comenzi de Fabricatie care asteapta materia prima."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -909,6 +893,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Comanda de Productie"
@@ -974,7 +959,7 @@ msgid "BoM Type"
 msgstr "Tip LdM"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -998,7 +983,7 @@ msgid "Companies"
 msgstr "Companii"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1331,7 +1316,7 @@ msgstr ""
 "productie (Centre de Lucru) va fi pre-completata automat."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1377,7 +1362,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1419,27 +1404,6 @@ msgstr ""
 "In cazul in care metoda de aprovizionare a produsului este Cumpara, sistemul "
 "creeaza o comanda de achizitie."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1509,12 +1473,6 @@ msgstr "Metoda"
 msgid "Pending"
 msgstr "In asteptare"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1554,12 +1512,6 @@ msgstr ""
 "Referinta documentului care a generat aceasta cerere pentru comanda de "
 "productie."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1580,12 +1532,6 @@ msgstr "Schimba Cantitatea Produselor"
 msgid "Drives the procurement orders for raw material."
 msgstr "Conduce comenzile de aprovizionare pentru materia prima."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1602,7 +1548,7 @@ msgid "SO Number"
 msgstr "Numar SO"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1649,6 +1595,31 @@ msgstr "Comenzi de Productie pregatite sa inceapa"
 msgid "Work Center"
 msgstr "Centru de lucru"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1793,20 +1764,6 @@ msgstr "Produse Planificate"
 msgid "Manager"
 msgstr "Director"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1822,9 +1779,10 @@ msgstr ""
 "cand este produs totalul cantitatilor comandate."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Comenzi de lucru"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1856,7 +1814,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1898,7 +1856,6 @@ msgstr "Timp pentru 1 ciclu (ora)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1922,7 +1879,7 @@ msgid "Compute Data"
 msgstr "Calculeaza datele"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1968,7 +1925,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Timpul Total de Fabricare"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2213,17 +2170,7 @@ msgid "BOM Ref"
 msgstr "Ref LdM"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2263,7 +2210,7 @@ msgid "Bill of Materials"
 msgstr "Lista de Materiale"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 20ae7bbf267..75720b6caaf 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-09-14 07:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -153,13 +153,6 @@ msgstr "Купить"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -199,13 +192,18 @@ msgstr "Ед. изм."
 msgid "For purchased material"
 msgstr "Для приобретенного материала"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -272,6 +270,21 @@ msgstr "Основные данные"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -436,6 +449,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Недельное изменения оценки запасов"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -444,7 +478,7 @@ msgid "Scheduled Date"
 msgstr "Запланированная дата"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -455,14 +489,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Спецификация"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -484,12 +510,6 @@ msgstr "Изменение стоимости запасов"
 msgid "Bill of Materials Structure"
 msgstr "Структура спецификации"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -625,12 +645,6 @@ msgstr ""
 "Если значение активного поля — Ложь, будет возможно скрыть маршрутизацию, не "
 "удаляя её."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -651,7 +665,7 @@ msgid "Work Center Load"
 msgstr "Нагрузка Рабочего центра"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "С этим изделием не связано ни одной спецификации!"
@@ -725,12 +739,6 @@ msgstr "В производстве"
 msgid "Master Bill of Materials"
 msgstr "Основной перечень материалов"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Рабочие задания"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -754,30 +762,6 @@ msgstr "Распечатать"
 msgid "Type"
 msgstr "Тип"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -821,8 +805,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "Коэффициент 0,9 означает потерю 10% в процессе производства"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -885,7 +869,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -896,6 +880,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Заказ в производство"
@@ -961,7 +946,7 @@ msgid "BoM Type"
 msgstr "Тип спецификации"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -984,7 +969,7 @@ msgid "Companies"
 msgstr "Компании"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1304,7 +1289,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1347,7 +1332,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1389,27 +1374,6 @@ msgstr ""
 "В случае если метод поставки \"Приобрести\", система создаст заказ на "
 "поставку."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1479,12 +1443,6 @@ msgstr "Способ"
 msgid "Pending"
 msgstr "В ожидании"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1523,12 +1481,6 @@ msgid ""
 msgstr ""
 "Ссылка на документ, который сгенерировал этот производственный заказ."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1549,12 +1501,6 @@ msgstr "Изменение количества продуктов"
 msgid "Drives the procurement orders for raw material."
 msgstr "Управляет заказами на приобретение сырья."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1571,7 +1517,7 @@ msgid "SO Number"
 msgstr "Номер заказа клиента"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1618,6 +1564,31 @@ msgstr ""
 msgid "Work Center"
 msgstr "Рабочий центр"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1755,20 +1726,6 @@ msgstr "Запланированная продукция"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1780,9 +1737,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Рабочие задания"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1814,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1851,7 +1809,6 @@ msgstr "Время цикла (часов)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1875,7 +1832,7 @@ msgid "Compute Data"
 msgstr "Рассчитать данные"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1921,7 +1878,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2161,17 +2118,7 @@ msgid "BOM Ref"
 msgstr "Осн. ПМ"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2209,7 +2156,7 @@ msgid "Bill of Materials"
 msgstr "Спецификация"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index dde334d8929..4a503075195 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-27 12:28+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index e58597da3d0..e65c0681824 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 22:39+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
@@ -153,13 +153,6 @@ msgstr "Za Nabavo"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -198,13 +191,18 @@ msgstr "Enota mere"
 msgid "For purchased material"
 msgstr "Za nabavljeni material"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "Delovnega naloga ni možno preklicati!"
@@ -271,6 +269,21 @@ msgstr "Glavni vir"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -431,6 +444,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Tedensko nihanje vrednosti zalog"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -439,7 +473,7 @@ msgid "Scheduled Date"
 msgstr "Načrtovani datum"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "Delovni nalog <em>%s</em> ustvarjen."
@@ -450,15 +484,6 @@ msgstr "Delovni nalog <em>%s</em> ustvarjen."
 msgid "Bill Of Material"
 msgstr "Kosovnica"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-"Delovni nalog je bil <b> potrjen</b> in je <b> načrtovan </b>za <em>%s</em>."
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -477,12 +502,6 @@ msgstr "Nihanje vrednosti zalog"
 msgid "Bill of Materials Structure"
 msgstr "Struktura kosovnice"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "Delovni nalog je  <b>preklican</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -614,12 +633,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr "Delovni nalog je bil <b>ustvarjen</b> za <em>%s</em> izdelek."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -640,7 +653,7 @@ msgid "Work Center Load"
 msgstr "Obremenitev delovne faze"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Izdelek nima kosovnice"
@@ -710,12 +723,6 @@ msgstr "V proizvodnji"
 msgid "Master Bill of Materials"
 msgstr "Glavna sastavnica"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Delovni nalogi"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -739,30 +746,6 @@ msgstr "Natisni"
 msgid "Type"
 msgstr "Tip"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -806,8 +789,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "Faktor 0.9 pomeni izgubo 10% v proizvodnem procesu."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Opozorilo!"
@@ -870,7 +853,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Delovni nalogi , ki čakajo na material"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -881,6 +864,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Delovni nalog"
@@ -946,7 +930,7 @@ msgid "BoM Type"
 msgstr "Vrsta kosovnice"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -969,7 +953,7 @@ msgid "Companies"
 msgstr "Podjetja"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1287,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "Napačno dejanje!"
@@ -1332,7 +1316,7 @@ msgstr ""
 "izdelka."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -1372,27 +1356,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1462,12 +1425,6 @@ msgstr "Način"
 msgid "Pending"
 msgstr "Na čakanju"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1505,12 +1462,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "Delovni nalog je <b> zaključen</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1531,12 +1482,6 @@ msgstr "Spremenite količino izdelkov"
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1553,7 +1498,7 @@ msgid "SO Number"
 msgstr "Številka naročila"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "Ni mogoče brisati delovnega naloga s statusom '%s'."
@@ -1600,6 +1545,31 @@ msgstr ""
 msgid "Work Center"
 msgstr "Delovna faza"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1735,20 +1705,6 @@ msgstr ""
 msgid "Manager"
 msgstr "Vodja"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "Delovni nalog je <b>ustvarjen</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1760,9 +1716,10 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Delovni nalogi"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1794,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1831,7 +1788,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1855,7 +1811,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1901,7 +1857,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Trajanje proizvodnega cikla"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "Opozorilo"
@@ -2141,17 +2097,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Pripombe in e-pošta"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2189,7 +2135,7 @@ msgid "Bill of Materials"
 msgstr "Kosovnica"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 5abecb38f1c..94635431eae 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/sr@latin.po b/addons/mrp/i18n/sr@latin.po
index b6d0da8af73..d32bec2c0e7 100644
--- a/addons/mrp/i18n/sr@latin.po
+++ b/addons/mrp/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-10 18:38+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 326f8cf69dd..10a15ee3d52 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 11:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr "Att Köpa"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr "Måttenhet"
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -430,6 +443,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -438,7 +472,7 @@ msgid "Scheduled Date"
 msgstr "Scheduled Date"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -449,14 +483,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Materiallista"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -478,12 +504,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "Materialstruktur"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -615,12 +635,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -641,7 +655,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "No BoM defined for this product !"
@@ -711,12 +725,6 @@ msgstr "I produktion"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "Work Orders"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -740,30 +748,6 @@ msgstr "Utskrift"
 msgid "Type"
 msgstr "Typ"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -807,8 +791,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -871,7 +855,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -882,6 +866,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -947,7 +932,7 @@ msgid "BoM Type"
 msgstr "Strukturtyp"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -969,7 +954,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1287,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1333,7 +1318,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1373,27 +1358,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1463,12 +1427,6 @@ msgstr "Metod"
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1506,12 +1464,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1532,12 +1484,6 @@ msgstr "Ändra antal för produkter"
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1554,7 +1500,7 @@ msgid "SO Number"
 msgstr "SO Number"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1601,6 +1547,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1736,20 +1707,6 @@ msgstr "Scheduled Products"
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1766,9 +1723,10 @@ msgstr ""
 "totalt beställd kvantitet producerats."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Work Orders"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1800,7 +1758,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1837,7 +1795,6 @@ msgstr "Time for 1 cycle (hour)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1861,7 +1818,7 @@ msgid "Compute Data"
 msgstr "Compute Data"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1907,7 +1864,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2147,17 +2104,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2195,7 +2142,7 @@ msgid "Bill of Materials"
 msgstr "Bill of Materials"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index e9e8adaddeb..12c25c9e980 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 4c54328964b..d8966bcc9ae 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-24 22:15+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -156,13 +156,6 @@ msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 "Sistem tercih edilen tedarikçiye otomatik olarak bir Teklif İsteği yapar."
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -202,13 +195,18 @@ msgstr "Birim"
 msgid "For purchased material"
 msgstr "Satın alınan malzemeler için"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -275,6 +273,21 @@ msgstr "Ana Veri"
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -439,6 +452,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Haftalık Stok Değer Farkları"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -447,7 +481,7 @@ msgid "Scheduled Date"
 msgstr "Planlanan Tarih"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -458,14 +492,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "Ürün Ağacı"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -487,12 +513,6 @@ msgstr "Stok Değeri Çeşitliliği"
 msgid "Bill of Materials Structure"
 msgstr "Ürün Ağacı Yapısı"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -626,12 +646,6 @@ msgstr ""
 "Etkin alan Yanlış olarak ayarlanırsa, kaldırmadan rotayı gizlemenize izin "
 "verecektir."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -652,7 +666,7 @@ msgid "Work Center Load"
 msgstr "İş Merkezi Yükü"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "Bu ürün için herhangi bir Ürün Ağacı tanımlanmadı !"
@@ -726,12 +740,6 @@ msgstr "Üretimde"
 msgid "Master Bill of Materials"
 msgstr "Ana Ürün Ağacı"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "İş Emirleri"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -755,30 +763,6 @@ msgstr "Yazdır"
 msgid "Type"
 msgstr "Tür"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -823,8 +807,8 @@ msgstr ""
 "0,9 luk bir faktör üretim işleminde %10'luk bir kayıp anlamına gelir."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -890,7 +874,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "Hammadde bekleyen Üretim Emirleri"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -901,6 +885,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "Üretim Emri"
@@ -966,7 +951,7 @@ msgid "BoM Type"
 msgstr "Ürün Ağacı Tipi"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -990,7 +975,7 @@ msgid "Companies"
 msgstr "Firmalar"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1318,7 +1303,7 @@ msgstr ""
 "merkezleri) üçüncü sekmesi otomatik olarak doldurulacaktır"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1363,7 +1348,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1404,27 +1389,6 @@ msgid ""
 msgstr ""
 "Ürünün Tedarik yöntemi Satınalma ize sistem bir satınalma emri oluşturur."
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1494,12 +1458,6 @@ msgstr "Yöntem"
 msgid "Pending"
 msgstr "&Kalan Mesajları Gönder"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1537,12 +1495,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Bu üretim emri talebinde oluşturulan doküman referansı."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1563,12 +1515,6 @@ msgstr "Ürün Miktarını Değiştir"
 msgid "Drives the procurement orders for raw material."
 msgstr "Ham malzeme için satınalma emrlerini yönetir."
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1585,7 +1531,7 @@ msgid "SO Number"
 msgstr "Satış Sipariş No"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1632,6 +1578,31 @@ msgstr "Başlatılacak Üretim Emirleri"
 msgid "Work Center"
 msgstr "İş Merkezi"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1774,20 +1745,6 @@ msgstr "Planlanan Ürünler"
 msgid "Manager"
 msgstr "Yönetici"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1802,9 +1759,10 @@ msgstr ""
 "toplam ürün miktarı üretildikten sonra üretim emrini sonlandıracaktır."
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr ""
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "İş Emirleri"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1836,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1877,7 +1835,6 @@ msgstr "1 Çevrim Süresi (Saat)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1901,7 +1858,7 @@ msgid "Compute Data"
 msgstr "Veri Hesapla"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1947,7 +1904,7 @@ msgid "Manufacturing Lead Time"
 msgstr "Üretim Teslimat Süresi"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2191,17 +2148,7 @@ msgid "BOM Ref"
 msgstr "BOM Ref"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2241,7 +2188,7 @@ msgid "Bill of Materials"
 msgstr "Ürün Ağaçları"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index b88fbfda561..681ba5aec31 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 08:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "Щотижнева зміна вартості запасів"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr "У виробництві"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr "Друк"
 msgid "Type"
 msgstr "Тип"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr "Тип СВ"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr "Час на 1 цикл (годин)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr "Розрахувати дату"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr "Склад виробу"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 98ab1d0df17..70f49b7e6c3 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr ""
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index af086c74aa7..dd62cbee19e 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 14:03+0000\n"
 "Last-Translator: hifly <Unknown>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -159,13 +159,6 @@ msgstr "待采购"
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr "系统将自动向首选供应商发起询价单。"
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr "BOM的正确选择，依赖于销售订单和BOM中指定的属性"
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -203,13 +196,18 @@ msgstr "计量单位"
 msgid "For purchased material"
 msgstr "用于外购的物料"
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr "运行工作中心的详细计划"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr "不能取消生产订单！"
@@ -283,6 +281,21 @@ msgstr "主数据"
 msgid "Produce several products from one manufacturing order"
 msgstr "从一个生产订单生产几个产品"
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -457,6 +470,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr "每周库存值变动"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -465,7 +499,7 @@ msgid "Scheduled Date"
 msgstr "下单日期"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "生产订单 <em>%s</em>  创建。"
@@ -476,14 +510,6 @@ msgstr "生产订单 <em>%s</em>  创建。"
 msgid "Bill Of Material"
 msgstr "物料清单"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr "生产订单 <em>%s</em>  <b>已经确认</b> 和<b>排程</b>"
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -502,12 +528,6 @@ msgstr "库存值预测"
 msgid "Bill of Materials Structure"
 msgstr "物料清单结构"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr "生产订单  <b>已经取消</b>."
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -644,12 +664,6 @@ msgid ""
 "without removing it."
 msgstr "如果去掉这个启用的勾，工艺不需要删除就可以隐藏"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr "产品 <em>%s</em> 的 BOM 被<b>创建 </b>"
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -670,7 +684,7 @@ msgid "Work Center Load"
 msgstr "工作中心负载"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "该产品尚未定义物料清单！"
@@ -747,12 +761,6 @@ msgstr "生产中"
 msgid "Master Bill of Materials"
 msgstr "主物料表"
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr "工票"
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -782,49 +790,6 @@ msgstr "打印"
 msgid "Type"
 msgstr "类型"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -875,8 +840,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr "指标值为0.9意味着生产过程中损耗了10%"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -939,7 +904,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr "等待原材料的制造订单"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -950,6 +915,7 @@ msgstr "你选择的计量单位跟产品表单的计量单位在不同的类别
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr "生产单"
@@ -1025,7 +991,7 @@ msgid "BoM Type"
 msgstr "物料清单类型"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1047,7 +1013,7 @@ msgid "Companies"
 msgstr "公司"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1368,7 +1334,7 @@ msgid ""
 msgstr "工艺表示要用到的所有工作中心，需要多少时间或循环次数。如果这里输入了工艺，制造订单的第三个选项卡（工艺）会自动填充。"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr "非法的动作"
@@ -1411,7 +1377,7 @@ msgid ""
 msgstr "BOM 允许你定义生产成品所需原料的列表。"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -1451,36 +1417,6 @@ msgid ""
 "purchase order."
 msgstr "如果产品的供应方法是外购，系统创建采购订单。"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                点击创建一个新的属性。\n"
-"              </p><p>\n"
-"               OpenERP里的属性用于在制造同一个产品却有不同方法时，选择正确的BoM。\n"
-"                你可以为每个BoM设置多个属性。 \n"
-"                销售员创建销售订单时，可以关联多个属性，\n"
-"                这样OpenERP将根据这些属性自动匹配对应的BoM。\n"
-"              </p>\n"
-"            "
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1550,12 +1486,6 @@ msgstr "方法"
 msgid "Pending"
 msgstr "等待中"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr "生产订单 <b>在生产中</b>."
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1593,12 +1523,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "生成这张生产订单的前置单据编号"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr "生产订单已经 <b>完成</b>."
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1619,12 +1543,6 @@ msgstr "修改产成品数量"
 msgid "Drives the procurement orders for raw material."
 msgstr "生成原材料的补货单"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr "生产订单已经 <b>准备生产</b>."
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1641,7 +1559,7 @@ msgid "SO Number"
 msgstr "销售订单编号"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr "不能删除'%s'状态的生产订单。"
@@ -1688,6 +1606,31 @@ msgstr "未开始的生产订单"
 msgid "Work Center"
 msgstr "工作中心"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1823,20 +1766,6 @@ msgstr "安排的产品"
 msgid "Manager"
 msgstr "经理"
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr "当处理这个产品的销售订单时，发运单将包含原料，而不是成品。"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr "生产订单已经 <b>创建</b>."
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1850,9 +1779,10 @@ msgstr ""
 "'报工' 模式会消耗对应成品数量的原材料而且产出对应数量的产成品。"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
-msgstr "订单计划"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "工票"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1884,7 +1814,7 @@ msgid ""
 msgstr "这允许你在生产指令操作行增加状态，开始日期，结束日期 （在“工作中心”标签）"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1923,7 +1853,6 @@ msgstr "一个周期的时间(小时)"
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1947,7 +1876,7 @@ msgid "Compute Data"
 msgstr "计算数据"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1993,7 +1922,7 @@ msgid "Manufacturing Lead Time"
 msgstr "生产提前期"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr "警告"
@@ -2246,17 +2175,7 @@ msgid "BOM Ref"
 msgstr "物料表编号"
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2296,7 +2215,7 @@ msgid "Bill of Materials"
 msgstr "物料清单"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr "找不到这个产品的BOM"
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index b21bb48f529..1eae7c9e79c 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 10:26+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -152,13 +152,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -196,13 +189,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -269,6 +267,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -429,6 +442,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -437,7 +471,7 @@ msgid "Scheduled Date"
 msgstr "預定日期"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -448,14 +482,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "物料清單"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -474,12 +500,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "物料清單結構"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -611,12 +631,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -637,7 +651,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -707,12 +721,6 @@ msgstr "生產中"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -736,30 +744,6 @@ msgstr "打印"
 msgid "Type"
 msgstr "類型"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -803,8 +787,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -867,7 +851,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -878,6 +862,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -943,7 +928,7 @@ msgid "BoM Type"
 msgstr "物料清單類型"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -965,7 +950,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1283,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1326,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1366,27 +1351,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1456,12 +1420,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1499,12 +1457,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1525,12 +1477,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1547,7 +1493,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1594,6 +1540,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1729,20 +1700,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1754,8 +1711,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1788,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1825,7 +1783,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1849,7 +1806,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1895,7 +1852,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2135,17 +2092,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2183,7 +2130,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 74a7fbccf22..5603d875ca8 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-06 10:25+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\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: 2012-12-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -151,13 +151,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid ""
-"The selection of the right Bill of Material to use will depend on the  "
-"properties specified on the sale order and the Bill of Material."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -195,13 +188,18 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
 msgstr ""
@@ -268,6 +266,21 @@ msgstr ""
 msgid "Produce several products from one manufacturing order"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid ""
+"The selection of the right Bill of Material to use will depend on the "
+"properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid ""
+"When processing a sales order for this product, the delivery order\n"
+"                                will contain the raw materials, instead of "
+"the finished product."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -428,6 +441,27 @@ msgstr ""
 msgid "Weekly Stock Value Variation"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new property.\n"
+"              </p><p>\n"
+"                The Properties in OpenERP are used to select the right bill "
+"of\n"
+"                materials for manufacturing a product when you have "
+"different\n"
+"                ways of building the same product.  You can assign several\n"
+"                properties to each bill of materials.  When a salesperson\n"
+"                creates a sales order, they can relate it to several "
+"properties\n"
+"                and OpenERP will automatically select the BoM to use "
+"according\n"
+"                the needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,date_planned:0
@@ -436,7 +470,7 @@ msgid "Scheduled Date"
 msgstr "預定日期"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr ""
@@ -447,14 +481,6 @@ msgstr ""
 msgid "Bill Of Material"
 msgstr "物料清單"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid ""
-"Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for "
-"the <em>%s</em>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.routing,location_id:0
 msgid ""
@@ -473,12 +499,6 @@ msgstr ""
 msgid "Bill of Materials Structure"
 msgstr "物料清單結構"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
@@ -610,12 +630,6 @@ msgid ""
 "without removing it."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -636,7 +650,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -706,12 +720,6 @@ msgstr "生產中"
 msgid "Master Bill of Materials"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
 msgid ""
@@ -735,30 +743,6 @@ msgstr "打印"
 msgid "Type"
 msgstr "類型"
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a group of properties.\n"
-"              </p><p>\n"
-"                Define specific property groups that can be assigned to "
-"your\n"
-"                bill of materials and sales orders. Properties allows "
-"OpenERP\n"
-"                to automatically select the right bill of materials "
-"according\n"
-"                to properties selected in the sale order by salesperson.\n"
-"              </p><p>\n"
-"                For instance, in the property group \"Warranty\", you an "
-"have\n"
-"                two properties: 1 year warranty, 3 years warranty. "
-"Depending\n"
-"                on the propoerties selected in the sale order, OpenERP will\n"
-"                schedule a production using the matching bill of materials.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
 msgid ""
@@ -802,8 +786,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -866,7 +850,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
@@ -877,6 +861,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production
 #: view:mrp.config.settings:0
 #: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
 #: field:procurement.order,production_id:0
 msgid "Manufacturing Order"
 msgstr ""
@@ -942,7 +927,7 @@ msgid "BoM Type"
 msgstr "物料清單類型"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -964,7 +949,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
 #, python-format
 msgid ""
 "You must first cancel related internal picking attached to this "
@@ -1282,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1325,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1365,27 +1350,6 @@ msgid ""
 "purchase order."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new property.\n"
-"              </p><p>\n"
-"                The Properties in OpenERP are used to select the right bill "
-"of\n"
-"                materials for manufacturing a product when you have "
-"different\n"
-"                ways of building the same product.  You can assign several\n"
-"                properties to each bill of materials.  When a salesperson\n"
-"                creates a sale order, they can relate it to several "
-"properties\n"
-"                and OpenERP will automatically select the BoM to use "
-"according\n"
-"                the needs.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
@@ -1455,12 +1419,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1498,12 +1456,6 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
@@ -1524,12 +1476,6 @@ msgstr ""
 msgid "Drives the procurement orders for raw material."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
@@ -1546,7 +1492,7 @@ msgid "SO Number"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
 msgstr ""
@@ -1593,6 +1539,31 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a group of properties.\n"
+"              </p><p>\n"
+"                Define specific property groups that can be assigned to "
+"your\n"
+"                bill of materials and sales orders. Properties allows "
+"OpenERP\n"
+"                to automatically select the right bill of materials "
+"according\n"
+"                to properties selected in the sales order by salesperson.\n"
+"              </p><p>\n"
+"                For instance, in the property group \"Warranty\", you an "
+"have\n"
+"                two properties: 1 year warranty, 3 years warranty. "
+"Depending\n"
+"                on the propoerties selected in the sales order, OpenERP "
+"will\n"
+"                schedule a production using the matching bill of materials.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
@@ -1728,20 +1699,6 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom:0
-msgid ""
-"When processing a sale order for this product, the delivery order\n"
-"                                will contain the raw materials, instead of "
-"the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product.produce,mode:0
 msgid ""
@@ -1753,8 +1710,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
 msgstr ""
 
 #. module: mrp
@@ -1787,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
 #, python-format
 msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
@@ -1824,7 +1782,6 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
@@ -1848,7 +1805,7 @@ msgid "Compute Data"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #: code:addons/mrp/wizard/change_production_qty.py:83
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
@@ -1894,7 +1851,7 @@ msgid "Manufacturing Lead Time"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2134,17 +2091,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
 #, python-format
 msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
@@ -2182,7 +2129,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
 #, python-format
 msgid "Cannot find a bill of material for this product."
 msgstr ""
diff --git a/addons/mrp_byproduct/i18n/ab.po b/addons/mrp_byproduct/i18n/ab.po
index c4f3eb7c36d..6e94cb91318 100644
--- a/addons/mrp_byproduct/i18n/ab.po
+++ b/addons/mrp_byproduct/i18n/ab.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-20 09:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Abkhazian <ab@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/ar.po b/addons/mrp_byproduct/i18n/ar.po
index 6846e085acc..df0d76aa316 100644
--- a/addons/mrp_byproduct/i18n/ar.po
+++ b/addons/mrp_byproduct/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "كمية المنتج"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "ثابت"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/bg.po b/addons/mrp_byproduct/i18n/bg.po
index 818a4549e91..f98335b041b 100644
--- a/addons/mrp_byproduct/i18n/bg.po
+++ b/addons/mrp_byproduct/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 06:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "К-во продукт"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/bs.po b/addons/mrp_byproduct/i18n/bs.po
index a4961db00b1..e09bff07826 100644
--- a/addons/mrp_byproduct/i18n/bs.po
+++ b/addons/mrp_byproduct/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Proizvod Kol."
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fiksno"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/ca.po b/addons/mrp_byproduct/i18n/ca.po
index 2771d7b35a0..22c3adf359e 100644
--- a/addons/mrp_byproduct/i18n/ca.po
+++ b/addons/mrp_byproduct/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Quantitat producte"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Fixe"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/cs.po b/addons/mrp_byproduct/i18n/cs.po
index 53968f4f24b..11b2e1e37c8 100644
--- a/addons/mrp_byproduct/i18n/cs.po
+++ b/addons/mrp_byproduct/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 07:16+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Produkt Qty"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/da.po b/addons/mrp_byproduct/i18n/da.po
index dda18642f45..80f3766305a 100644
--- a/addons/mrp_byproduct/i18n/da.po
+++ b/addons/mrp_byproduct/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po
index 5f99c21cff9..032152e6518 100644
--- a/addons/mrp_byproduct/i18n/de.po
+++ b/addons/mrp_byproduct/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 18:24+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -78,7 +78,7 @@ msgid "Product Qty"
 msgstr "Anzahl"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Warnung"
@@ -99,7 +99,7 @@ msgid "Fixed"
 msgstr "Fixiert"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/es.po b/addons/mrp_byproduct/i18n/es.po
index dc9466b81bd..0a88da8e2e8 100644
--- a/addons/mrp_byproduct/i18n/es.po
+++ b/addons/mrp_byproduct/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:40+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -78,7 +78,7 @@ msgid "Product Qty"
 msgstr "Cantidad producto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Advertencia"
@@ -99,7 +99,7 @@ msgid "Fixed"
 msgstr "Fijo"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/es_AR.po b/addons/mrp_byproduct/i18n/es_AR.po
index 5e2dc333f5d..0640ae510c5 100644
--- a/addons/mrp_byproduct/i18n/es_AR.po
+++ b/addons/mrp_byproduct/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-15 20:10+0000\n"
 "Last-Translator: Diego Cohen <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Cantidad producto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/es_CR.po b/addons/mrp_byproduct/i18n/es_CR.po
index 89d31124768..d34097a7799 100644
--- a/addons/mrp_byproduct/i18n/es_CR.po
+++ b/addons/mrp_byproduct/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:45+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: mrp_byproduct
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Cantidad producto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Fijo"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/es_EC.po b/addons/mrp_byproduct/i18n/es_EC.po
index 2e7e5aeb40a..a2ead9bc858 100644
--- a/addons/mrp_byproduct/i18n/es_EC.po
+++ b/addons/mrp_byproduct/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-19 00:06+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Cantidad producto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fijo"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/et.po b/addons/mrp_byproduct/i18n/et.po
index 1b0616ff77a..656b98a98e0 100644
--- a/addons/mrp_byproduct/i18n/et.po
+++ b/addons/mrp_byproduct/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 18:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Toote kogus"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fikseeritud"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/fi.po b/addons/mrp_byproduct/i18n/fi.po
index a711b7e2835..ed9197bcc84 100644
--- a/addons/mrp_byproduct/i18n/fi.po
+++ b/addons/mrp_byproduct/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Tuotteen määrä"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Ennalta määrätty"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po
index 2a433eac9e4..5952c0e980e 100644
--- a/addons/mrp_byproduct/i18n/fr.po
+++ b/addons/mrp_byproduct/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 14:45+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Qté d'articles"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fixe"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/gl.po b/addons/mrp_byproduct/i18n/gl.po
index 9d56e32eb2c..6d60491d4d7 100644
--- a/addons/mrp_byproduct/i18n/gl.po
+++ b/addons/mrp_byproduct/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-22 18:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Cantidade produto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Fixo"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/hr.po b/addons/mrp_byproduct/i18n/hr.po
index cc28625713c..8d4bc0214a2 100644
--- a/addons/mrp_byproduct/i18n/hr.po
+++ b/addons/mrp_byproduct/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 17:04+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Količina proizvoda"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fiksno"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/hu.po b/addons/mrp_byproduct/i18n/hu.po
index 47ecb229655..abcf7b065fc 100644
--- a/addons/mrp_byproduct/i18n/hu.po
+++ b/addons/mrp_byproduct/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 12:30+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Termékmennyiség"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Állandó"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/id.po b/addons/mrp_byproduct/i18n/id.po
index e5d7228a235..7243025f87c 100644
--- a/addons/mrp_byproduct/i18n/id.po
+++ b/addons/mrp_byproduct/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 13:52+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/it.po b/addons/mrp_byproduct/i18n/it.po
index d5e0aa80d42..ca5a9128413 100644
--- a/addons/mrp_byproduct/i18n/it.po
+++ b/addons/mrp_byproduct/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 21:10+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Qtà Prodotto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Attenzione"
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fissato"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/ja.po b/addons/mrp_byproduct/i18n/ja.po
index 2914ba8f280..7796105fc79 100644
--- a/addons/mrp_byproduct/i18n/ja.po
+++ b/addons/mrp_byproduct/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 06:38+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "製品数量"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "固定"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/ko.po b/addons/mrp_byproduct/i18n/ko.po
index 9b6c9f21f0d..b0ae4e36278 100644
--- a/addons/mrp_byproduct/i18n/ko.po
+++ b/addons/mrp_byproduct/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:48+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "상품 수량"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/lt.po b/addons/mrp_byproduct/i18n/lt.po
index d9ca6086569..eea88247bbc 100644
--- a/addons/mrp_byproduct/i18n/lt.po
+++ b/addons/mrp_byproduct/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/mn.po b/addons/mrp_byproduct/i18n/mn.po
index 5479b7fbb4c..d2bb7fe1299 100644
--- a/addons/mrp_byproduct/i18n/mn.po
+++ b/addons/mrp_byproduct/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Барааны тоо"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Тогтсон"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/nb.po b/addons/mrp_byproduct/i18n/nb.po
index cd9f94a9ae4..717146bff8d 100644
--- a/addons/mrp_byproduct/i18n/nb.po
+++ b/addons/mrp_byproduct/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Produkt Ant"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Fast"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/nl.po b/addons/mrp_byproduct/i18n/nl.po
index abcc7c67d89..f1221286941 100644
--- a/addons/mrp_byproduct/i18n/nl.po
+++ b/addons/mrp_byproduct/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 18:53+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Aantal"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Opgelost"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/nl_BE.po b/addons/mrp_byproduct/i18n/nl_BE.po
index 3ea50312870..de5115ec004 100644
--- a/addons/mrp_byproduct/i18n/nl_BE.po
+++ b/addons/mrp_byproduct/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-10 08:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/oc.po b/addons/mrp_byproduct/i18n/oc.po
index 4825b09237a..7a03f7d4b5a 100644
--- a/addons/mrp_byproduct/i18n/oc.po
+++ b/addons/mrp_byproduct/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:11+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/pl.po b/addons/mrp_byproduct/i18n/pl.po
index 2cad081de9f..45fdc245b68 100644
--- a/addons/mrp_byproduct/i18n/pl.po
+++ b/addons/mrp_byproduct/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 21:08+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Ilość produktu"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Stała"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/pt.po b/addons/mrp_byproduct/i18n/pt.po
index 2ed98377c81..7748ccaf649 100644
--- a/addons/mrp_byproduct/i18n/pt.po
+++ b/addons/mrp_byproduct/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 14:59+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Quantidade do Artigo"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Corrigido"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/pt_BR.po b/addons/mrp_byproduct/i18n/pt_BR.po
index 105e31e8afa..19ac83c43ba 100644
--- a/addons/mrp_byproduct/i18n/pt_BR.po
+++ b/addons/mrp_byproduct/i18n/pt_BR.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-24 12:36+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 20:14+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -27,6 +28,14 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"Definir como a quantidade de subprodutos será definido nas ordens de "
+"produção que utilizam esta LdM. \"Fixa\" descreve uma situação em que a "
+"quantidade de subproduto criado é sempre igual à quantidade definida na LdM, "
+"independentemente de quantaos são criadas na ordem de produção. Por "
+"oposição, \"variável\" significa que a quantidade serão calculados como "
+"\"(quantidade de subproduto definido na LdM / quantidade de produto "
+"fabricado definido na quantidade LdM * Quantidade de produto fabricado na "
+"ordem de produção.) '"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_id:0
@@ -36,7 +45,7 @@ msgstr "Produto"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida do Produto"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -46,13 +55,13 @@ msgstr "Ordem de Produção"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Altera a Quantidade dos Produtos"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
 #: field:mrp.bom,sub_products:0
 msgid "Byproducts"
-msgstr ""
+msgstr "Subprodutos"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -70,10 +79,10 @@ msgid "Product Qty"
 msgstr "Qtd do Produto"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
@@ -88,17 +97,19 @@ msgstr "Variável"
 #. module: mrp_byproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
-msgstr "Fixado"
+msgstr "Fixo"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
 "product form."
 msgstr ""
+"A Unidade de Medida do Produto que você escolheu tem uma categoria diferente "
+"do que no formulário do produto."
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
 msgid "Byproduct"
-msgstr ""
+msgstr "Subproduto"
diff --git a/addons/mrp_byproduct/i18n/ro.po b/addons/mrp_byproduct/i18n/ro.po
index 098a42368f2..8314d6aa9e8 100644
--- a/addons/mrp_byproduct/i18n/ro.po
+++ b/addons/mrp_byproduct/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 16:33+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Cantitate Produs"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Fix"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/ru.po b/addons/mrp_byproduct/i18n/ru.po
index b0e6e7aa74c..f6f5235e079 100644
--- a/addons/mrp_byproduct/i18n/ru.po
+++ b/addons/mrp_byproduct/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-04-06 06:04+0000\n"
 "Last-Translator: Viktor Prokopiev <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Кол-во продукции"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Фиксированный"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/sk.po b/addons/mrp_byproduct/i18n/sk.po
index f2a4a65fbba..2fa7467805e 100644
--- a/addons/mrp_byproduct/i18n/sk.po
+++ b/addons/mrp_byproduct/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 09:01+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Množstvo produktov"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Pevný"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/sl.po b/addons/mrp_byproduct/i18n/sl.po
index 57352d5c8ca..f01580d30bb 100644
--- a/addons/mrp_byproduct/i18n/sl.po
+++ b/addons/mrp_byproduct/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-26 23:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Količina proizvodov"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Stalno"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/sq.po b/addons/mrp_byproduct/i18n/sq.po
index 0d6eeec9ab0..17ce2442792 100644
--- a/addons/mrp_byproduct/i18n/sq.po
+++ b/addons/mrp_byproduct/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Kuantiteti i produktit"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "E rregulluar"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/sr.po b/addons/mrp_byproduct/i18n/sr.po
index 95a174b60f4..32f671d8f89 100644
--- a/addons/mrp_byproduct/i18n/sr.po
+++ b/addons/mrp_byproduct/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-04 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Kol, Proizvoda"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Fiksno"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/sr@latin.po b/addons/mrp_byproduct/i18n/sr@latin.po
index c1dd441ae8b..d3cb42c1122 100644
--- a/addons/mrp_byproduct/i18n/sr@latin.po
+++ b/addons/mrp_byproduct/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 15:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr "Kol, Proizvoda"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr "Fiksno"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po
index bab3fd59164..ecad947e759 100644
--- a/addons/mrp_byproduct/i18n/sv.po
+++ b/addons/mrp_byproduct/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-23 09:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Produktkvantitet"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Rättad"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/tlh.po b/addons/mrp_byproduct/i18n/tlh.po
index 6eaf4b3dadf..4127a5388d6 100644
--- a/addons/mrp_byproduct/i18n/tlh.po
+++ b/addons/mrp_byproduct/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/tr.po b/addons/mrp_byproduct/i18n/tr.po
index fed70743d6a..69b4fb08284 100644
--- a/addons/mrp_byproduct/i18n/tr.po
+++ b/addons/mrp_byproduct/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 22:32+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr "Ürün Mik."
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr "Sabitlendi"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/uk.po b/addons/mrp_byproduct/i18n/uk.po
index d8460fc17b5..6497d1399c5 100644
--- a/addons/mrp_byproduct/i18n/uk.po
+++ b/addons/mrp_byproduct/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:38+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/vi.po b/addons/mrp_byproduct/i18n/vi.po
index 3709394f377..83dcfdae742 100644
--- a/addons/mrp_byproduct/i18n/vi.po
+++ b/addons/mrp_byproduct/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -71,7 +71,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po
index b8196cfd585..c966638fe6c 100644
--- a/addons/mrp_byproduct/i18n/zh_CN.po
+++ b/addons/mrp_byproduct/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 14:12+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -73,7 +73,7 @@ msgid "Product Qty"
 msgstr "产品数量"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr "警告"
@@ -94,7 +94,7 @@ msgid "Fixed"
 msgstr "固定的"
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_byproduct/i18n/zh_TW.po b/addons/mrp_byproduct/i18n/zh_TW.po
index 15ea59e916a..c3e574d0e0a 100644
--- a/addons/mrp_byproduct/i18n/zh_TW.po
+++ b/addons/mrp_byproduct/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-23 17:18+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -70,7 +70,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Fixed"
 msgstr ""
 
 #. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index 88545258314..6329e45812a 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "اوامر العمل"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr "قم بإلغاء العملية."
 msgid "mrp_operations.operation.code"
 msgstr "عمليات_تخطيط المورد للتصنيع"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "عملية الانتاج"
 msgid "Set to Draft"
 msgstr "حفظ كمسودة"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "تم انشاء اوامر العمل على اساس امر الانتاج."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "خطأ!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "ملغي"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "حركة مخزن"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr "عدد السطور"
 msgid "Draft"
 msgstr "مسودة"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr "كمية المنتج"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr "سبتمبر"
 msgid "December"
 msgstr "ديسمبر"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "قيد التقدم"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr "كود عملية الانتاج"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr "انهي العملية."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "المعلية لم تبدأ بعد !"
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr "المعلومات من امر الانتاج"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "آسف !"
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr "ابحث عن اوامر العمل"
 msgid "Work Center"
 msgstr "مركز العمل"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "حقيقي"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -783,12 +758,6 @@ msgstr "تمت العملية"
 msgid "#Line Orders"
 msgstr "# خط الاوامر"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -879,6 +848,9 @@ msgstr "المُدة"
 #~ msgid "Operation is Already Cancelled  !"
 #~ msgstr "تم الغاء العملية بالفعل !"
 
+#~ msgid "Real"
+#~ msgstr "حقيقي"
+
 #~ msgid "Order quantity cannot be negative or zero !"
 #~ msgstr "لا يمكن انت تكون كمية الامر سلبية او صفر !"
 
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index f1bb47e83b3..81e56353255 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-04 05:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Работни поръчки"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr "Отмяна на операцията."
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Поизводствени операции"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgstr ""
 "Работните поръчки са създадени на базата на производствената поръчка."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Грешка!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Отменен"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Движение на наличности"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "# от редове"
 msgid "Draft"
 msgstr "Чернова"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -262,7 +254,7 @@ msgid "Product Qty"
 msgstr "К-во продукт"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -348,12 +340,6 @@ msgstr "Септември"
 msgid "December"
 msgstr "Декември"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -405,14 +391,14 @@ msgid "In Progress"
 msgstr "В развитие"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -457,7 +443,7 @@ msgid "Production Operation Code"
 msgstr "Код производствена дейност"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -547,7 +533,7 @@ msgid "Finish the operation."
 msgstr "Завърши операцията."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Операцията не е започнала все още!"
@@ -558,10 +544,10 @@ msgid "Information from the production order."
 msgstr "Информация от производствената поръчка."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Съжаляваме!"
@@ -628,12 +614,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -698,11 +678,6 @@ msgstr "Търсене на работни поръчки"
 msgid "Work Center"
 msgstr "Работен център"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Реално"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -788,12 +763,6 @@ msgstr "Операцията е завършена"
 msgid "#Line Orders"
 msgstr "# Линия поръчки"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -935,6 +904,9 @@ msgstr "Продължителност"
 #~ "След като завърши последния ред от производствена поръчка, тя се извършва "
 #~ "автоматично и свързаните с нея продукти се произвеждат."
 
+#~ msgid "Real"
+#~ msgstr "Реално"
+
 #~ msgid "UOM"
 #~ msgstr "МЕ"
 
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index b5a3074eb7c..4ed63b6f19f 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 09:26+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "U Toku"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Oprostite!"
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index a322210e30d..be2fda79794 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 16:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Ordres de producció"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr "Cancel·la l'operació"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Operació de producció"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Les ordres de treball son creades en base a l'ordre de producció"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Cancel·lada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Moviment d'estoc"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "# de línies"
 msgid "Draft"
 msgstr "Esborrany"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -262,7 +254,7 @@ msgid "Product Qty"
 msgstr "Qtat producte"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -348,12 +340,6 @@ msgstr "Setembre"
 msgid "December"
 msgstr "Desembre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -405,14 +391,14 @@ msgid "In Progress"
 msgstr "En procés"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -457,7 +443,7 @@ msgid "Production Operation Code"
 msgstr "Codi operació de producció"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -547,7 +533,7 @@ msgid "Finish the operation."
 msgstr "Finalitza l'operació"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "L'operació encare no s'ha iniciat!"
@@ -558,10 +544,10 @@ msgid "Information from the production order."
 msgstr "Informació de l'ordre de fabricació"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Disculpeu!"
@@ -628,12 +614,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -698,11 +678,6 @@ msgstr "Cerca ordres de treball"
 msgid "Work Center"
 msgstr "Centre de treball"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -788,12 +763,6 @@ msgstr "Operació realitzada"
 msgid "#Line Orders"
 msgstr "Núm. línia ordres"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -1000,6 +969,9 @@ msgstr "Duració"
 #~ "que acabi l'última operació d'una ordre de producció, aquesta es realitza "
 #~ "automàticament i els productes relacionats són produïts."
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid "Production State"
 #~ msgstr "Estat producció"
 
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index bc78662146d..d4234d31f1c 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-15 02:29+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp_operations
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Pracovní příkazy"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr "Zrušit operace."
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Výrobní operace"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Pracovní příkazy jsou vytvářeny na základě výrobních příkazů."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Chyba!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Zrušeno"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Přesun zásob"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "# z řádek"
 msgid "Draft"
 msgstr "Koncept"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -262,7 +254,7 @@ msgid "Product Qty"
 msgstr "Množství výrobků"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -348,12 +340,6 @@ msgstr "Září"
 msgid "December"
 msgstr "Prosinec"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -405,14 +391,14 @@ msgid "In Progress"
 msgstr "V běhu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -457,7 +443,7 @@ msgid "Production Operation Code"
 msgstr "Kód výrobní operace"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -547,7 +533,7 @@ msgid "Finish the operation."
 msgstr "Dokončit operaci"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operace ještě nebyla zahájena !"
@@ -558,10 +544,10 @@ msgid "Information from the production order."
 msgstr "Informace z výrobního příkazu."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Promiňte!"
@@ -628,12 +614,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -698,11 +678,6 @@ msgstr "Hledat pracovní příkazy"
 msgid "Work Center"
 msgstr "Pracovní centrum"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Skutečný"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -788,12 +763,6 @@ msgstr "Operace dokončena"
 msgid "#Line Orders"
 msgstr "#Řádek objednávek"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -907,6 +876,9 @@ msgstr "Trvání"
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
 
+#~ msgid "Real"
+#~ msgstr "Skutečný"
+
 #~ msgid ")"
 #~ msgstr ")"
 
diff --git a/addons/mrp_operations/i18n/da.po b/addons/mrp_operations/i18n/da.po
index eb294018e4f..bda50038eb9 100644
--- a/addons/mrp_operations/i18n/da.po
+++ b/addons/mrp_operations/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -782,12 +757,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index d526f537ddf..7637b8613ff 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 08:59+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Arbeitsaufträge"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Vorgang ist bereits beendet"
@@ -41,14 +41,6 @@ msgstr "Abbrechen des Arbeitsauftrags"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-"Arbeitsauftrag wurde <b>storniert</b> beim Fertigungsauftrag <em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -97,14 +89,6 @@ msgstr "Arbeitsauftrag"
 msgid "Set to Draft"
 msgstr "Setze auf Entwurf"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-"Arbeitsauftrag ist zur <b>Wiedervorlage</b> geändert worden für den "
-"Fertigungauftrag <em>%s</em>."
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -153,11 +137,11 @@ msgstr ""
 "Die Arbeitsaufträge werden auf Basis des Fertigungsauftrags generiert."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -170,7 +154,7 @@ msgid "Cancelled"
 msgstr "Storniert"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Vorgang ist bereits storniert"
@@ -187,13 +171,13 @@ msgid "Stock Move"
 msgstr "Lieferung"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr "Es gibt keinen Auftrag, der storniert werden könnte."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -214,6 +198,11 @@ msgstr "# Positionen"
 msgid "Draft"
 msgstr "Entwurf"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -268,7 +257,7 @@ msgid "Product Qty"
 msgstr "Produkt Anz."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Produktionsauftrag kann nicht im Status \"%s\" beginnen!"
@@ -369,13 +358,6 @@ msgstr "September"
 msgid "December"
 msgstr "Dezember"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-"Arbeitsauftrag wurde <b>erledigt</b> für den Fertigungsauftrag <em<%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -427,7 +409,7 @@ msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -436,7 +418,7 @@ msgstr ""
 "Wiederaufnahme haben"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "Um einen Vorgang fortzusetzen muss dieser den Status Pause haben"
@@ -481,7 +463,7 @@ msgid "Production Operation Code"
 msgstr "Arbeitsauftragsnummer"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -573,7 +555,7 @@ msgid "Finish the operation."
 msgstr "Arbeitsauftrag erledigen."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Arbeitsauftrag wurde noch nicht gestartet !"
@@ -584,10 +566,10 @@ msgid "Information from the production order."
 msgstr "Information zum Fertigungsauftrag."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Entschuldigung!"
@@ -662,13 +644,6 @@ msgstr ""
 "* Durch Abbrechen des Arbeitsauftrags kann er 'Storniert' werden.\n"
 "* Wenn der Auftrag fertig gestellt wird, kann er dadurch 'Erledigt' werden."
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-"Arbeitsauftrag wurde <b>erstellt</b> für den Fertigungsauftrag <em>%s</em>."
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -747,11 +722,6 @@ msgstr "Suche Arbeitsaufträge"
 msgid "Work Center"
 msgstr "Arbeitsplatz"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Tatsächliche Fertigung"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -837,13 +807,6 @@ msgstr "Arbeitsauftrag erledigt"
 msgid "#Line Orders"
 msgstr "Auftragspositionen"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-"Arbeitsauftrag wurde <b>gestartet</b> für den Fertigungsauftrag <em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -1029,6 +992,9 @@ msgstr "Dauer"
 #~ "Starte und Beende einzelne Arbeitsaufträge und erfasse dadurch deren "
 #~ "tatsächliche Dauer zu einem Fertigungsauftrag."
 
+#~ msgid "Real"
+#~ msgstr "Tatsächliche Fertigung"
+
 #~ msgid "Production State"
 #~ msgstr "Fertigungsstatus"
 
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 253ae88ad05..97cdb350b34 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-12 15:29+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 11:15+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Órdenes de trabajo"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "¡Operación ya finalizada!"
@@ -40,15 +40,6 @@ msgstr "Cancelar la operación"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-"La orden de trabajo para la orden de fabricación <em>%s</em> ha sido "
-"<b>cancelada</b>."
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -97,13 +88,6 @@ msgstr "Operación de producción"
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-"La orden de trabajo para la orden de fabricación <em>%s</em> está pendiente."
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -151,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -168,7 +152,7 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "¡La operación ya ha sido cancelada!"
@@ -185,13 +169,13 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr "No hay operación a cancelar."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -211,6 +195,11 @@ msgstr "Nº de líneas"
 msgid "Draft"
 msgstr "Borrador"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr "Fecha real de fabricación"
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -265,7 +254,7 @@ msgid "Product Qty"
 msgstr "Ctdad producto"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "La órden de fabricación no se puede iniciar en el estado \"%s\""
@@ -362,14 +351,6 @@ msgstr "Septiembre"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-"La orden de trabajo para la orden de fabricación <em>%s</em> ha sido "
-"<b>realizada</b>."
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -421,7 +402,7 @@ msgid "In Progress"
 msgstr "En proceso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -430,7 +411,7 @@ msgstr ""
 "reanudación!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "¡Para poder reanudar la operación, debe estar en modo de pausa!"
@@ -475,7 +456,7 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -566,7 +547,7 @@ msgid "Finish the operation."
 msgstr "Terminar la operación."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "¡La operación todavía no se ha iniciado!"
@@ -577,10 +558,10 @@ msgid "Information from the production order."
 msgstr "Inforamción de la orden de fabricación"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "¡Disculpe!"
@@ -657,14 +638,6 @@ msgstr ""
 "'Cancelado'.\n"
 "* Cuando una orden se procesa completamente, su estado será 'Finalizado'."
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-"La orden de trabajo para la orden de fabricación <em>%s</em> ha sido "
-"<b>creada</b>."
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -739,11 +712,6 @@ msgstr "Buscar órdenes de trabajo"
 msgid "Work Center"
 msgstr "Centro de producción"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -829,14 +797,6 @@ msgstr "Operación realizada"
 msgid "#Line Orders"
 msgstr "Nº línea órdenes"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-"La orden de trabajo para la orden de fabricación <em>%s</em> ha sido "
-"<b>iniciada</b>."
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -1010,6 +970,9 @@ msgstr "Duración"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid "Month -1"
 #~ msgstr "Mes -1"
 
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index 4fbbfb16edc..06a2d304632 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-23 20:08+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Órdenes de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Operación de producción"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr "Borrador"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "En proceso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "¡La operación todavía no se ha iniciado!"
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "¡Disculpe!"
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "Centro de trabajo"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/es_CR.po b/addons/mrp_operations/i18n/es_CR.po
index 6dab14370ff..392299551a8 100644
--- a/addons/mrp_operations/i18n/es_CR.po
+++ b/addons/mrp_operations/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:43+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: mrp_operations
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Órdenes de trabajo"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "¡Operación ya finalizada!"
@@ -41,13 +41,6 @@ msgstr "Cancelar la operación"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Operación de producción"
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "¡La operación ya ha sido cancelada!"
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -210,6 +197,11 @@ msgstr "Nº de líneas"
 msgid "Draft"
 msgstr "Borrador"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -264,7 +256,7 @@ msgid "Product Qty"
 msgstr "Ctdad producto"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "La órden de fabricación no se puede iniciar en el estado \"%s\""
@@ -352,12 +344,6 @@ msgstr "Septiembre"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -409,7 +395,7 @@ msgid "In Progress"
 msgstr "En proceso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -418,7 +404,7 @@ msgstr ""
 "reanudación del Estado!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -464,7 +450,7 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -554,7 +540,7 @@ msgid "Finish the operation."
 msgstr "Terminar la operación."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "¡La operación todavía no se ha iniciado!"
@@ -565,10 +551,10 @@ msgid "Information from the production order."
 msgstr "Inforamción de la orden de fabricación"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "¡Disculpe!"
@@ -635,12 +621,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -705,11 +685,6 @@ msgstr "Buscar órdenes de trabajo"
 msgid "Work Center"
 msgstr "Centro de producción"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -795,12 +770,6 @@ msgstr "Operación realizada"
 msgid "#Line Orders"
 msgstr "Nº línea órdenes"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -872,6 +841,9 @@ msgstr "Duración"
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid ")"
 #~ msgstr ")"
 
diff --git a/addons/mrp_operations/i18n/es_EC.po b/addons/mrp_operations/i18n/es_EC.po
index 26294066989..1f64fdcac19 100644
--- a/addons/mrp_operations/i18n/es_EC.po
+++ b/addons/mrp_operations/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-19 00:04+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Órdenes de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr "Cancelar la operación"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Operación de producción"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Movimiento de stock"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "Nº de líneas"
 msgid "Draft"
 msgstr "Borrador"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -262,7 +254,7 @@ msgid "Product Qty"
 msgstr "Cantidad producto"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -348,12 +340,6 @@ msgstr "Septiembre"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -405,14 +391,14 @@ msgid "In Progress"
 msgstr "En proceso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -457,7 +443,7 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -547,7 +533,7 @@ msgid "Finish the operation."
 msgstr "Terminar la operación."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "¡La operación todavía no se ha iniciado!"
@@ -558,10 +544,10 @@ msgid "Information from the production order."
 msgstr "Información de la orden de fabricación"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "¡Lo siento!"
@@ -628,12 +614,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -698,11 +678,6 @@ msgstr "Buscar órdenes de trabajo"
 msgid "Work Center"
 msgstr "Centro de trabajo"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -788,12 +763,6 @@ msgstr "Operación realizada"
 msgid "#Line Orders"
 msgstr "Nº línea órdenes"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -878,6 +847,9 @@ msgstr "Duración"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid "Workcenter Production start end workflow"
 #~ msgstr "Flujo de inicio y fin producción del centro de producción"
 
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index fadfd087a3f..10df20a9875 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 10:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Töökorraldused"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Tootmise operatsioon"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Viga!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr "Mustand"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "Töös"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr "Tootmisoperatsiooni kood"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operatsiooni pole veel alustatud !"
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Vabandust!"
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "Töökeskus"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Reaalne"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -947,3 +916,6 @@ msgstr "Kestvus"
 
 #~ msgid "All Work Orders"
 #~ msgstr "Kõik töökorraldused"
+
+#~ msgid "Real"
+#~ msgstr "Reaalne"
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 9d440c5c766..232ff2ced4f 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-18 14:36+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Työtilaukset"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Operaatio on jo valmis!"
@@ -41,13 +41,6 @@ msgstr "Peruuta toiminto"
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Tuotantotoiminto"
 msgid "Set to Draft"
 msgstr "Aseta luonnokseksi"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Työtilaukset on tehty valmistustilausten perusteella."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Virhe!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Peruttu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Operaatio on jo peruutettu!"
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Varastosiirto"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -209,6 +196,11 @@ msgstr "Rivien lukumäärä"
 msgid "Draft"
 msgstr "Luonnos"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -263,7 +255,7 @@ msgid "Product Qty"
 msgstr "Tuotteen määrä"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Valmistustilausta ei voida käynnistää tilassa \"%s\"!"
@@ -351,12 +343,6 @@ msgstr "Syyskuu"
 msgid "December"
 msgstr "Joulukuu"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -408,7 +394,7 @@ msgid "In Progress"
 msgstr "Käynnissä"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -416,7 +402,7 @@ msgstr ""
 "Pysäyttääksesi operaation, sen täytyy olla käynnissä tai jatka tilassa!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "Jatkaaksei operaatiota, sen täytyy olla pysäytä tilassa!"
@@ -459,7 +445,7 @@ msgid "Production Operation Code"
 msgstr "Tuotannontoiminto koodi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -549,7 +535,7 @@ msgid "Finish the operation."
 msgstr "Toiminto on valmis."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Vaihetta ei ole vielä aloitettu!"
@@ -560,10 +546,10 @@ msgid "Information from the production order."
 msgstr "Tiedot tuotantotilaukselta"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Anteeksi!"
@@ -630,12 +616,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -700,11 +680,6 @@ msgstr "Etsi työtilaukset"
 msgid "Work Center"
 msgstr "Työkeskus"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Todellinen"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -790,12 +765,6 @@ msgstr "Vaihe on valmis"
 msgid "#Line Orders"
 msgstr "Tilausrivien määrä"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -968,6 +937,9 @@ msgstr "Kesto"
 #~ msgid "Work Center Production start end workflow"
 #~ msgstr "Työpisteen tuotannon työnvirtauksen alku ja loppu"
 
+#~ msgid "Real"
+#~ msgstr "Todellinen"
+
 #~ msgid ""
 #~ "Work Orders is the list of operations to be performed for each manufacturing "
 #~ "order. Once you start the first work order of a manufacturing order, the "
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 70ee300fb80..40098d491af 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 14:28+0000\n"
 "Last-Translator: TeMPO <openerp@tempo-consulting.fr>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Ordres de Travail"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,14 +40,6 @@ msgstr "Annuler l'opération."
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-"L'ordre de travail de l'ordre de fabrication <em>%s</em> a été <b>annulé</b>."
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,13 +88,6 @@ msgstr "Opération de production"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-"L'ordre de travail de l'ordre de fabrication <em>%s</em> est en attente."
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -150,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Les ordres de travail sont créés à partir de l'ordre de fabrication."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Erreur !"
@@ -167,7 +152,7 @@ msgid "Cancelled"
 msgstr "Annulé"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -184,13 +169,13 @@ msgid "Stock Move"
 msgstr "Mouvement de stock"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -209,6 +194,11 @@ msgstr "Nb. de lignes"
 msgid "Draft"
 msgstr "Brouillon"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -263,7 +253,7 @@ msgid "Product Qty"
 msgstr "Qté d'articles"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -349,14 +339,6 @@ msgstr "Septembre"
 msgid "December"
 msgstr "Décembre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-"L'ordre de travail est <b>terminé</b> pour l'ordre de fabrication "
-"<em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -408,14 +390,14 @@ msgid "In Progress"
 msgstr "En progress"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -460,7 +442,7 @@ msgid "Production Operation Code"
 msgstr "Code d'opération de production"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -550,7 +532,7 @@ msgid "Finish the operation."
 msgstr "Terminer l'opération."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "L'Opération n'est pas encore commencée !"
@@ -561,10 +543,10 @@ msgid "Information from the production order."
 msgstr "Information concernant l'ordre de fabrication."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Désolé !"
@@ -631,13 +613,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-"L'ordre de travail a été <b>crée</b> pour l'ordre de fabrication <em>%s</em>."
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -702,11 +677,6 @@ msgstr "Recherche dans les postes de charges"
 msgid "Work Center"
 msgstr "Poste de charge"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Réel"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -792,14 +762,6 @@ msgstr "Opération terminée"
 msgid "#Line Orders"
 msgstr "Nb. de ligne d'ordre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-"L'ordre de travail a été <b>démarré</b> pour l'ordre de fabrication "
-"<em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -921,6 +883,9 @@ msgstr "Durée"
 #~ msgid "Month -1"
 #~ msgstr "Mois -1"
 
+#~ msgid "Real"
+#~ msgstr "Réel"
+
 #~ msgid "State"
 #~ msgstr "État"
 
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index 0a54bf31cc8..6061c2c5ac7 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 07:47+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "काम के आदेश"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "ड्राफ्ट के लिए सेट करें"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "त्रुटि!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "चाल स्टॉक"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr "मसौदा"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr "उत्पाद मात्रा"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr "प्रगति में है"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "कार्य केंद्र"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "वास्तविक"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -782,12 +757,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -855,6 +824,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "संरचना देखने के लिए अमान्य XML!"
 
+#~ msgid "Real"
+#~ msgstr "वास्तविक"
+
 #~ msgid "Workcenter"
 #~ msgstr "Work center"
 
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index f68673483c9..28778bb05e3 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 20:55+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Radni nalozi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr "Cancel the operation."
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Production Operation"
 msgid "Set to Draft"
 msgstr "Postavi na nacrt"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "The work orders are created on the basis of the production order."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Otkazani"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Skladišni prijenosi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr "# linija"
 msgid "Draft"
 msgstr "Nacrt"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -261,7 +253,7 @@ msgid "Product Qty"
 msgstr "Količina"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -347,12 +339,6 @@ msgstr "Rujan"
 msgid "December"
 msgstr "Prosinac"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -404,14 +390,14 @@ msgid "In Progress"
 msgstr "In Progress"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -454,7 +440,7 @@ msgid "Production Operation Code"
 msgstr "Šifra operacije proizvodnje"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -544,7 +530,7 @@ msgid "Finish the operation."
 msgstr "Završi operacije."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -555,10 +541,10 @@ msgid "Information from the production order."
 msgstr "Information from the production order."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Oprostite!"
@@ -625,12 +611,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -695,11 +675,6 @@ msgstr "Search Work Orders"
 msgid "Work Center"
 msgstr "Radni centar"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Realan"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -785,12 +760,6 @@ msgstr "Operation done"
 msgid "#Line Orders"
 msgstr "#Line Orders"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -876,6 +845,9 @@ msgstr "Trajanje"
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
+#~ msgid "Real"
+#~ msgstr "Realan"
+
 #~ msgid ")"
 #~ msgstr ")"
 
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index 099f8bea464..8efa2f13cbd 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 11:45+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr "Művelet törlése"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Gyártási művelet"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Hiba!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Törölt"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Készletmozgás"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr "Sorok száma"
 msgid "Draft"
 msgstr "Tervezet"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr "Termékmenny."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr "Szeptember"
 msgid "December"
 msgstr "December"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "Folyamatban"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr "Művelet befejezése"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "A művelet még nem kezdődött el !"
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Valós"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr "Művelet kész"
 msgid "#Line Orders"
 msgstr "Rendelési sorok száma"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -815,6 +784,9 @@ msgstr "Év"
 msgid "Duration"
 msgstr "Időtartam"
 
+#~ msgid "Real"
+#~ msgstr "Valós"
+
 #~ msgid "UOM"
 #~ msgstr "ME"
 
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 812f115129d..3f5034d121a 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 13:52+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index 50124425c0a..d51100a6304 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 14:39+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Ordini di Lavorazione"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "L'operazione è già conclusa!"
@@ -40,15 +40,6 @@ msgstr "Annulla l'operazione"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-"L'ordine di lavorazione è stato <b>annullato</b> dall'ordine di lavorazione "
-"<em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -97,12 +88,6 @@ msgstr "Lavorazione di Produzione"
 msgid "Set to Draft"
 msgstr "Imposta come bozza"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -150,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -167,7 +152,7 @@ msgid "Cancelled"
 msgstr "Annullato"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -184,13 +169,13 @@ msgid "Stock Move"
 msgstr "Movimento di magazzino"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -209,6 +194,11 @@ msgstr "# di righe"
 msgid "Draft"
 msgstr "Bozza"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -261,7 +251,7 @@ msgid "Product Qty"
 msgstr "Q.tà Prodotto"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -347,12 +337,6 @@ msgstr "Settembre"
 msgid "December"
 msgstr "Dicembre"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -404,14 +388,14 @@ msgid "In Progress"
 msgstr "In corso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -454,7 +438,7 @@ msgid "Production Operation Code"
 msgstr "Codice Lavorazione"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -544,7 +528,7 @@ msgid "Finish the operation."
 msgstr "Finire l'operazione."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "La lavorazione non è ancora iniziata !"
@@ -555,10 +539,10 @@ msgid "Information from the production order."
 msgstr "Informazione per ordine di produzione"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Spiacente!"
@@ -625,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -695,11 +673,6 @@ msgstr "Cerca ordini di lavoro"
 msgid "Work Center"
 msgstr "Centro di Lavoro"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Reale"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -783,12 +756,6 @@ msgstr "Operazione eseguita"
 msgid "#Line Orders"
 msgstr "# Righe ordini"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -956,6 +923,9 @@ msgstr "Durata"
 #~ msgid "State"
 #~ msgstr "Stato"
 
+#~ msgid "Real"
+#~ msgstr "Reale"
+
 #~ msgid "Start Cancel Operation"
 #~ msgstr "Inizia l'Operazione di Annullamento"
 
diff --git a/addons/mrp_operations/i18n/ja.po b/addons/mrp_operations/i18n/ja.po
index 538784ba708..14f63d633f9 100644
--- a/addons/mrp_operations/i18n/ja.po
+++ b/addons/mrp_operations/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:54+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "作業オーダー"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "操作は既に終了しています。"
@@ -41,13 +41,6 @@ msgstr "操作のキャンセル"
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "製造操作"
 msgid "Set to Draft"
 msgstr "ドラフトに設定"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "作業オーダーは製造オーダーを元にして作成されます。"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "エラー"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "キャンセル済"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "操作は既にキャンセル済です。"
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "在庫移動"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "行数"
 msgid "Draft"
 msgstr "ドラフト"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr "製品数量"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "製造オーダーは %s 状態であるため開始できません。"
@@ -346,12 +338,6 @@ msgstr "9月"
 msgid "December"
 msgstr "12月"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr "進行中"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr "操作を一時停止するには、開始または再開状態でなければなりません。"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "操作を再開するには、一時停止状態でなければなりません。"
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr "製造操作コード"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr "操作の終了"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "操作はまだ開始されていません。"
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr "製造オーダーからの情報"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "残念です。"
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr "作業オーダーの検索"
 msgid "Work Center"
 msgstr "作業センタ"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "実物"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -782,12 +757,6 @@ msgstr "操作完了"
 msgid "#Line Orders"
 msgstr "オーダー行数"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -872,6 +841,9 @@ msgstr "期間"
 #~ "operation"
 #~ msgstr "操作は既に開始されました。一時停止 / 完了 / キャンセル操作ができます。"
 
+#~ msgid "Real"
+#~ msgstr "実物"
+
 #~ msgid ")"
 #~ msgstr "）"
 
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index 1f5f407a54f..a1c9a7c3e41 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 07:49+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "작업 주문"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "생산 오퍼레이션"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "에러!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr "초안"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr "진행 중"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr "생산 오퍼레이션 코드"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "오퍼레이션이 아직 시작되지 않았습니다!"
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "죄송합니다!"
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "워크센터"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -782,12 +757,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index 8a3a5da2c24..319cec5c13f 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/mn.po b/addons/mrp_operations/i18n/mn.po
index 9ea4bf63ee4..e685658d537 100644
--- a/addons/mrp_operations/i18n/mn.po
+++ b/addons/mrp_operations/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-28 16:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Ажлын Захиалгууд"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Ажиллагаа хэдийнээ дууссан байна!"
@@ -41,13 +41,6 @@ msgstr "Ажиллагааг цуцлах"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Үйлдвэрлэлийн ажиллагаа"
 msgid "Set to Draft"
 msgstr "Ноороглох"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Үйлдвэрлэлийн захиалга дээр үндэслэж ажлын захиалга үүсдэг."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Алдаа!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Ажиллагаа хэдийнээ цуцлагдсан байна!"
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr "Нөөцийн хөдөлгөөн"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -209,6 +196,11 @@ msgstr "Мөрийн тоо"
 msgid "Draft"
 msgstr "Ноорог"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -263,7 +255,7 @@ msgid "Product Qty"
 msgstr "Барааны тоо"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "\"%s\" төлөвт байгаа үйлдвэрлэх захиалгыг эхлүүлж чадахгүй!"
@@ -350,12 +342,6 @@ msgstr "9-р сар"
 msgid "December"
 msgstr "12-р сар"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -407,7 +393,7 @@ msgid "In Progress"
 msgstr "Хийгдэж буй"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -415,7 +401,7 @@ msgstr ""
 "Ажиллагааг түр зогсоохын тулд Эхлэх эсвэл Үргэлжлүүлэх төлөвт байх ёстой!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -461,7 +447,7 @@ msgid "Production Operation Code"
 msgstr "Үйлдвэрлэлийн ажиллагааны код"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -551,7 +537,7 @@ msgid "Finish the operation."
 msgstr "Ажиллагааг дуусгах."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Ажиллагаа хараахан эхлээгүй байна !"
@@ -562,10 +548,10 @@ msgid "Information from the production order."
 msgstr "Үйлдвэрлэлийн захиалгаасх мэдээлэл."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Уучлаарай!"
@@ -632,12 +618,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -702,11 +682,6 @@ msgstr "Ажлын Захиалгуудыг Хайх"
 msgid "Work Center"
 msgstr "Дамжлага"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Бодит"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -792,12 +767,6 @@ msgstr "Ажиллагаа хийгдсэн"
 msgid "#Line Orders"
 msgstr "Захиалгуудын мөр #"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -915,6 +884,9 @@ msgstr "Үргэлжлэх хугацаа"
 #~ msgid ")"
 #~ msgstr ")"
 
+#~ msgid "Real"
+#~ msgstr "Бодит"
+
 #~ msgid "Work orders made during current month"
 #~ msgstr "Энэ сард хийгдсэжн ажлын захиалгууд"
 
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index d8534f187c1..adecb9655ec 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 21:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Werkorders"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Bewerking is al gereed!"
@@ -40,13 +40,6 @@ msgstr "Verwerking annuleren"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr "Werkorder is <b>geannuleerd</b> voor productieorder <em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -71,7 +64,7 @@ msgstr "Maart"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr "Werkplekken"
+msgstr "Productiestappen"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -95,12 +88,6 @@ msgstr "Productie verwerking"
 msgid "Set to Draft"
 msgstr "Zet op concept"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr "Werkorder is <b>geparkeerd</b> voor productieorder <em>%s</em>."
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "De werkopdracht is gecreëerd op basis van de productieorder"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Bewerking is al geannuleerd!"
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Voorraadmutatie"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr "Geen operatie om te annuleren."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -209,6 +196,11 @@ msgstr "Aantal regels"
 msgid "Draft"
 msgstr "Concept"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -238,8 +230,8 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
-"Er is 1 werkopdracht per werkplek. De informatie over het aantal herhalingen "
-"of de herhaaltijd."
+"Er is 1 werkopdracht per productiestap. De informatie over het aantal "
+"herhalingen of de herhaaltijd."
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
@@ -263,7 +255,7 @@ msgid "Product Qty"
 msgstr "Producthoeveelheid"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Productieorder kan niet starten in de status \"%s\"!"
@@ -328,7 +320,8 @@ msgstr ""
 #: help:mrp.production.workcenter.line,delay:0
 msgid "The elapsed time between operation start and stop in this Work Center"
 msgstr ""
-"de verlopen tijd tussen de start en stop van de bewerking van deze werkplek"
+"De verlopen tijd tussen de start en stop van de bewerking van deze "
+"productiestap."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
@@ -350,12 +343,6 @@ msgstr "September"
 msgid "December"
 msgstr "December"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr "Werkorder is <b>uitgevoerd</b> voor productieorder <em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -407,7 +394,7 @@ msgid "In Progress"
 msgstr "In behandeling"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -416,7 +403,7 @@ msgstr ""
 "status bevinden!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -463,7 +450,7 @@ msgid "Production Operation Code"
 msgstr "Productieverwerking code"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -554,7 +541,7 @@ msgid "Finish the operation."
 msgstr "De verwerking afronden."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Bewerking is nog niet gestart!"
@@ -565,10 +552,10 @@ msgid "Information from the production order."
 msgstr "Informatie van de productieorder"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Sorry!"
@@ -635,12 +622,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr "Werkorder is <b>aangemaakt</b> voor productieorder <em>%s</em>."
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -671,7 +652,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr "Werkplek Barcode"
+msgstr "Productiestap barcode"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -703,12 +684,7 @@ msgstr "Zoek werkopdrachten"
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr "Werkplek"
-
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Werkelijk"
+msgstr "Productiestap"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
@@ -753,7 +729,7 @@ msgstr "Gereed"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr "Uren per werkplek"
+msgstr "Uren per productiestap"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -795,12 +771,6 @@ msgstr "Bewerking voltooid"
 msgid "#Line Orders"
 msgstr "Aantal orderregels"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr "Werkorder is <b>gestart</b> voor productieorder <em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -968,6 +938,9 @@ msgstr "Tijdsduur"
 #~ msgid "UOM"
 #~ msgstr "Eenheid"
 
+#~ msgid "Real"
+#~ msgstr "Werkelijk"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "U moet een productie partij toewijzen voor dit product"
 
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index fc5670d51f5..cfdff348a1b 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-14 02:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 8bcda45ea00..38b87354a75 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 21:33+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Zlecenie operacji"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Operacja jest zakończona!"
@@ -40,15 +40,6 @@ msgstr "Anuluj operację"
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-"Zlecenie operacji zostało <b>anulowane</b> dla zamówienia produkcji "
-"<em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -97,13 +88,6 @@ msgstr "Operacja produkcji"
 msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-"Zlecenie operacji <b>oczekuje</b> na zamówienie produkcji <em>%s</em>."
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -151,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Zlecenia operacji są tworzone na podstawie zamówienia produkcji"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -168,7 +152,7 @@ msgid "Cancelled"
 msgstr "Anulowano"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Operacja jest już anulowana!"
@@ -185,13 +169,13 @@ msgid "Stock Move"
 msgstr "Przesunięcie zapasu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr "Brak operacji do anulowania."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -210,6 +194,11 @@ msgstr "# pozycji"
 msgid "Draft"
 msgstr "Projekt"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -264,7 +253,7 @@ msgid "Product Qty"
 msgstr "Ilość produktu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Zamówienie produkcji nie może być rozpoczęte w stanie \"%s\"!"
@@ -360,14 +349,6 @@ msgstr "Wrzesień"
 msgid "December"
 msgstr "Grudzień"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-"Zlecenie operacji zostało <b>wykonane</b> dla zamówienia produkcji "
-"<em>%s</em>."
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -419,14 +400,14 @@ msgid "In Progress"
 msgstr "W toku"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr "Aby wstrzymać operację, to musi być ona w stanie Start lub Wznów!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "Aby wznowić operację, to musi być ona w stanie Wstrzymaj!"
@@ -471,7 +452,7 @@ msgid "Production Operation Code"
 msgstr "Kod operacji produkcyjnej"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -561,7 +542,7 @@ msgid "Finish the operation."
 msgstr "Skończ operację."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operacja nie została jeszcze uruchomiona !"
@@ -572,10 +553,10 @@ msgid "Information from the production order."
 msgstr "Infromacja z zamówienia produkcji."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Przepraszamy!"
@@ -642,14 +623,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-"Zlecenie operacji zostało <b>utworzone</b> dla zamówienia produkcji "
-"<em>%s</em>."
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -714,11 +687,6 @@ msgstr "Szukaj zleceń"
 msgid "Work Center"
 msgstr "Centrum robocze"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Rzeczywiste"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -802,12 +770,6 @@ msgstr "Operacja wykonana"
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -953,6 +915,9 @@ msgstr "Czas trwania"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
+#~ msgid "Real"
+#~ msgstr "Rzeczywiste"
+
 #~ msgid "Start working"
 #~ msgstr "Rozpocznij pracę"
 
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 4bd071075a2..339691fc99e 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-09 11:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Ordens de Trabalho"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Operação já está terminada!"
@@ -40,13 +40,6 @@ msgstr "Cancelar a operação"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Operação de Produção"
 msgid "Set to Draft"
 msgstr "Definir como rascunho"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "As ordens de trabalho são criadas com base na ordem de produção."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Erro !"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "A operação já está cancelada!"
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Movimento de Stock"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "# de Linhas"
 msgid "Draft"
 msgstr "Rascunho"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -262,7 +254,7 @@ msgid "Product Qty"
 msgstr "Quantidade do Artigo"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Ordem de produção não pode iniciar no estado \"%s\"!"
@@ -349,12 +341,6 @@ msgstr "Setembro"
 msgid "December"
 msgstr "Dezembro"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -406,14 +392,14 @@ msgid "In Progress"
 msgstr "Em Progresso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr "Para Pausar a operação, ela deve estar no iniciar ou retomar estado!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "A fim de retomar a operação, deve estar no estado Pausa!"
@@ -458,7 +444,7 @@ msgid "Production Operation Code"
 msgstr "Código de operação da produção"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -548,7 +534,7 @@ msgid "Finish the operation."
 msgstr "Terminar a operação"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "A Operação ainda não foi iniciada !"
@@ -559,10 +545,10 @@ msgid "Information from the production order."
 msgstr "informação da ordem de produção"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Desculpe!"
@@ -629,12 +615,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -699,11 +679,6 @@ msgstr "Pesquisar ordens de trabalho"
 msgid "Work Center"
 msgstr "Centro de Trabalho"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -789,12 +764,6 @@ msgstr "Operação Concluída"
 msgid "#Line Orders"
 msgstr "#Linha de Ordens"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -1089,6 +1058,9 @@ msgstr "Duração"
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Tem de associar um lote de produção a este artigo"
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid "UOM"
 #~ msgstr "UDM"
 
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index 288c79930bc..b8d0f2da07e 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/i18n/pt_BR.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-28 23:43+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 20:23+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +26,7 @@ msgid "Work Orders"
 msgstr "Ordens de Serviço"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "A Operação já está concluída!"
@@ -40,13 +41,6 @@ msgstr "Cancelar a Operação"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -61,7 +55,7 @@ msgstr "Informação da definição de roteamento."
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -95,12 +89,6 @@ msgstr "Operação de Produção"
 msgid "Set to Draft"
 msgstr "Definir como Provisório"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "As Ordens de Serviço são criadas com base na ordem de Produção."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -165,7 +153,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "A Operação já está Cancelada!"
@@ -182,13 +170,13 @@ msgid "Stock Move"
 msgstr "Mov. de Estoque"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
-msgstr ""
+msgstr "Nenhuma operação para cancelar"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,10 +196,15 @@ msgstr "# de Linhas"
 msgid "Draft"
 msgstr "Provisório"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr "Data de Produção Atual"
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
-msgstr ""
+msgstr "Centro de Trabalho de Produção"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -248,7 +241,7 @@ msgstr "Análise da ordem de Serviço"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
 msgid "Work Orders By Resource"
-msgstr ""
+msgstr "Ordem de Serviço por Recurso"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -262,7 +255,7 @@ msgid "Product Qty"
 msgstr "Qtd do Produto"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Ordem de Produção não pode iniciar com a situação \"%s\"!"
@@ -322,6 +315,20 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para iniciar uma nova ordem serviço. \n"
+"          </p><p>\n"
+"Ordens de Trabalho a lista de operações a serem realizadas para cada\n"
+"             ordem de produção. Uma vez que você começar a primeira "
+"encomenda de uma\n"
+"             ordem de produção, da ordem de fabricação é automaticamente\n"
+"             marcado como começou. Depois de terminar a última operação de "
+"uma\n"
+"             ordem de produção, o MO é concluída automaticamente e os "
+"respectivos\n"
+"             produtos são produzidos.\n"
+"          </p>\n"
+"        "
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -349,12 +356,6 @@ msgstr "Setembro"
 msgid "December"
 msgstr "Dezembro"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -390,7 +391,7 @@ msgstr "Aguardando Mercadorias"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production Status"
-msgstr ""
+msgstr "Situação da Produção"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,state:0
@@ -406,7 +407,7 @@ msgid "In Progress"
 msgstr "Em Progresso"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -415,7 +416,7 @@ msgstr ""
 "Reiniciar"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "Para Reiniciar uma operação, ela precisará estar em Pausa!"
@@ -460,12 +461,13 @@ msgid "Production Operation Code"
 msgstr "Código de Operação de Produção"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
 "operation."
 msgstr ""
+"A Operação já foi iniciada! Você pode Pausar/Finalizar/Cancelar a operação."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -550,7 +552,7 @@ msgid "Finish the operation."
 msgstr "Terminar a Operação."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "A operação ainda não foi iniciada!"
@@ -561,10 +563,10 @@ msgid "Information from the production order."
 msgstr "Informação da ordem de Produção."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Desculpe!"
@@ -630,12 +632,15 @@ msgid ""
 "* When order is completely processed that time it is set in 'Finished' "
 "status."
 msgstr ""
-
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
+"* Quando uma ordem de serviço é criado é definido como 'Provisório'.\n"
+"* Quando o usuário define ordem de serviço no início, o modo de tempo que "
+"será definido como \"Em andamento\".\n"
+"* Quando a ordem de serviço está em execução, durante esse tempo, se o "
+"usuário quer parar ou fazer alterações em ordem, então pode definir como "
+"'pendente'\n"
+"* Quando o usuário cancela a ordem de serviço será definido como "
+"'cancelado'.\n"
+"* Quando a ordem é completamente processado é definida como 'concluído'."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -663,6 +668,19 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para iniciar uma nova ordem de serviço.\n"
+"          </p><p>\n"
+"            Para fabricar ou montar produtos, e usar matérias primas e \n"
+"            produtos acabados, você também precisa lidar com operações de "
+"produção.\n"
+"            Operações de produção são chamadas de Ordens de Serviço. As "
+"diversas \n"
+"            operações terão impactos diferentes nos custos de produção e "
+"planejamento\n"
+"dependendo da carga de trabalho.\n"
+"          </p>\n"
+"        "
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
@@ -701,11 +719,6 @@ msgstr "Procurar Ordens de Serviço"
 msgid "Work Center"
 msgstr "Centro de Trabalho"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -791,12 +804,6 @@ msgstr "Operação finalizada"
 msgid "#Line Orders"
 msgstr "Linha Ordens"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -905,6 +912,9 @@ msgstr "Duração"
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Você deve atribuir um lote de produção para este produto"
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid "UOM"
 #~ msgstr "UdM"
 
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 5b2f9615f61..52c7d425bd1 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-04 20:57+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Comenzi de lucru"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Operatiunea este deja incheiata!"
@@ -40,13 +40,6 @@ msgstr "Anuleaza operatiunea."
 msgid "mrp_operations.operation.code"
 msgstr "cod.operatiune.operatiuni_mrp"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Operatiune Productie"
 msgid "Set to Draft"
 msgstr "Seteaza ca Ciorna"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "Comenzile de lucru sunt create pe baza comenzilor de productie."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Eroare!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Anulat(a)"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Operatiunea este Deja Anulata!"
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Miscare stoc"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "# de Linii"
 msgid "Draft"
 msgstr "Ciorna"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -262,7 +254,7 @@ msgid "Product Qty"
 msgstr "Cantitate produs"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Comanda de productie nu poate incepe in starea \"%s\"!"
@@ -350,12 +342,6 @@ msgstr "Septembrie"
 msgid "December"
 msgstr "Decembrie"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -407,7 +393,7 @@ msgid "In Progress"
 msgstr "In curs de desfasurare"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
@@ -415,7 +401,7 @@ msgstr ""
 "Pentru a Intrerupe operatiunea, trebuie sa fie in starea Incepe sau Reia!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "Pentru a Relua operatiunea, trebuie sa fie in starea Pauza!"
@@ -460,7 +446,7 @@ msgid "Production Operation Code"
 msgstr "Cod Operatiune de Productie"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -550,7 +536,7 @@ msgid "Finish the operation."
 msgstr "Finalizeaza Operatiunea."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operatiunea nu a inceput inca !"
@@ -561,10 +547,10 @@ msgid "Information from the production order."
 msgstr "Informatii din comanda de productie."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Ne pare rau!"
@@ -631,12 +617,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -701,11 +681,6 @@ msgstr "Cauta Comenzi de lucru"
 msgid "Work Center"
 msgstr "Centru de lucru"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Real"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -791,12 +766,6 @@ msgstr "Operatiune efectuata"
 msgid "#Line Orders"
 msgstr "# Linie Comenzi"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -884,6 +853,9 @@ msgstr "Durata"
 #~ msgid "From work order, define the cycles and hour for creating product"
 #~ msgstr "Din ordinele de lucru, definire cicluri şi ore pentru creare produse"
 
+#~ msgid "Real"
+#~ msgstr "Real"
+
 #~ msgid "This is delay between operation start and stop in this workcenter"
 #~ msgstr ""
 #~ "Aceasta este întârzierea între start şi stop în acest centru de operaţii"
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index 2eaf8e87f93..f1f618fac13 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:00+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Наряд-заказы"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr "Отменить действие."
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Управление производством"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Отменено"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Движение запасов"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr "# строк"
 msgid "Draft"
 msgstr "Черновик"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr "Кол-во продукции"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr "Сентябрь"
 msgid "December"
 msgstr "Декабрь"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "Выполняется"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr "Код производственной операции"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr "Завершить операцию."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Операция еще не началась !"
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr "Информация из производственного заказа."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Извините!"
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "Рабочий центр"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr "Операция завершена"
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index 6eb085606b6..b83bd2f291b 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 15:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Delovni nalogi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr "Osnutek"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr "V obdelavi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Dejansko"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -838,6 +807,9 @@ msgstr "Trajanje"
 #~ msgid "Operation is started"
 #~ msgstr "Operacija je zagnana"
 
+#~ msgid "Real"
+#~ msgstr "Dejansko"
+
 #~ msgid "Cancel Operation"
 #~ msgstr "Prekliči operacijo"
 
diff --git a/addons/mrp_operations/i18n/sq.po b/addons/mrp_operations/i18n/sq.po
index 84092418ad4..379b24db425 100644
--- a/addons/mrp_operations/i18n/sq.po
+++ b/addons/mrp_operations/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -782,12 +757,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
index 114c68f8c4b..7deee4ab1bb 100644
--- a/addons/mrp_operations/i18n/sr.po
+++ b/addons/mrp_operations/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-16 09:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Radni Nalozi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operacije.postupak.sifra"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Operacije Proizvoda"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr "Priprema"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr "U toku"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr "Operaciona Sifra Proizvodnje"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "Radionica"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Реални"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -784,12 +759,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -878,6 +847,9 @@ msgstr "Trajanje"
 #~ msgstr ""
 #~ "Iz Radnog Naloga, definisi cikluse i sate potrebne za zavrsetak proizvoda"
 
+#~ msgid "Real"
+#~ msgstr "Реални"
+
 #~ msgid "This is delay between operation start and stop in this workcenter"
 #~ msgstr "Ovo je razlika izmedju pocetka i kraja posla ove Radionice"
 
diff --git a/addons/mrp_operations/i18n/sr@latin.po b/addons/mrp_operations/i18n/sr@latin.po
index 1d991c89e57..46b65cdcfe8 100644
--- a/addons/mrp_operations/i18n/sr@latin.po
+++ b/addons/mrp_operations/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 15:23+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr "Radni Nalozi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr "Poništi operaciju"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operacije.postupak.sifra"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr "Operacije Proizvoda"
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr "Priprema"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr "U toku"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr "Operaciona Sifra Proizvodnje"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr "Radionica"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Реални"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -784,12 +759,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -835,6 +804,9 @@ msgstr "Trajanje"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
+#~ msgid "Real"
+#~ msgstr "Реални"
+
 #~ msgid ")"
 #~ msgstr ")"
 
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index 2d6863354d7..bbb235f4b8f 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-03 23:14+0000\n"
 "Last-Translator: Treecko <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "Arbetsordrar"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "Produktionen är redan avslutad!"
@@ -40,13 +40,6 @@ msgstr "Avbryt produktionen"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Produktionsdrift"
 msgid "Set to Draft"
 msgstr "Sätt till preliminär"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Fel!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "Avbruten"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "Produktionen är redan avbruten!"
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Lagerrörelse"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr "# Rader"
 msgid "Draft"
 msgstr "Preliminär"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr "Produktkvantitet"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr "september"
 msgid "December"
 msgstr "december"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr "Pågår"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Verksamheten är inte startad ännu !"
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Förlåt!"
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr "Sök arbetsorder"
 msgid "Work Center"
 msgstr "Arbetsstation"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Faktisk"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -784,12 +759,6 @@ msgstr "Produktionen klar"
 msgid "#Line Orders"
 msgstr "# Orderrader"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -841,6 +810,9 @@ msgstr "Varaktighet"
 #~ msgid "Workcenter Production start end workflow"
 #~ msgstr "Workcenter Production start end workflow"
 
+#~ msgid "Real"
+#~ msgstr "Faktisk"
+
 #~ msgid "State"
 #~ msgstr "Status"
 
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 4615aa0fed3..809543f650e 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index e1675db9741..569c8f28949 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "İş Emirleri"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "İşlem neredeye bitti!"
@@ -40,13 +40,6 @@ msgstr "Operasyonları iptal et."
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "Üretim Operasyonu"
 msgid "Set to Draft"
 msgstr "Taslağa  Ayarla"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "İş emirleri ürün siparişi bazında oluşturulur."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Hata!"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "İptal edildi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "İşlem Zaten İptal Edilmiş!"
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "Stok Hareketi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr "# / Satır"
 msgid "Draft"
 msgstr "Taslak"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -261,7 +253,7 @@ msgid "Product Qty"
 msgstr "Ürün Mik."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "Üretim siparişi \"%s\" durumunda başlatılamaz!"
@@ -347,12 +339,6 @@ msgstr "Eylül"
 msgid "December"
 msgstr "Aralık"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -404,14 +390,14 @@ msgid "In Progress"
 msgstr "İşlemde"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr "İşlemi duraklatmak için Başlama ya da Devam durumunda olmalı!"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "İşlemi Devam ettirmek için Duraklatma durumunda olmalı!"
@@ -456,7 +442,7 @@ msgid "Production Operation Code"
 msgstr "Üretim Operasyon Kodu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -546,7 +532,7 @@ msgid "Finish the operation."
 msgstr "Operasyonu tamamlayın."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operasyon henüz başlatılmadı!"
@@ -557,10 +543,10 @@ msgid "Information from the production order."
 msgstr "Üretim emrinden bilgiler."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "Üzgünüz!"
@@ -627,12 +613,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -697,11 +677,6 @@ msgstr "İş Emri Ara"
 msgid "Work Center"
 msgstr "İş Merkezi"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "Gerçekleşen"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -787,12 +762,6 @@ msgstr "Operasyon yapıldı"
 msgid "#Line Orders"
 msgstr "#Line Emir"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -849,6 +818,9 @@ msgstr "Süre"
 #~ msgid "Operation is done"
 #~ msgstr "Operasyon Tamamlandı"
 
+#~ msgid "Real"
+#~ msgstr "Gerçekleşen"
+
 #~ msgid "Prod.State"
 #~ msgstr "Ürün Durumu"
 
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index 3d796c47118..3ca0ec010f5 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 13:38+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index ffe5e5f1130..322aec642d6 100644
--- a/addons/mrp_operations/i18n/vi.po
+++ b/addons/mrp_operations/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 17:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -26,7 +26,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -41,13 +41,6 @@ msgstr "Hủy tác vụ"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -96,12 +89,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -149,11 +136,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "Lỗi!"
@@ -166,7 +153,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -183,13 +170,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -208,6 +195,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -260,7 +252,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -346,12 +338,6 @@ msgstr "Tháng Chín"
 msgid "December"
 msgstr "Tháng Mười hai"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -403,14 +389,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -453,7 +439,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -543,7 +529,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -554,10 +540,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -624,12 +610,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -694,11 +674,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -782,12 +757,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 5cca6faea80..9065cd25404 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-29 09:53+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 11:24+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr "工票"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr "工单已完成"
@@ -40,13 +40,6 @@ msgstr "工票作废"
 msgid "mrp_operations.operation.code"
 msgstr "mrp_operations.operation.code"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr "生产订单 <em>%s</em>的工单被 <b>取消</b>。"
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr "生产工单"
 msgid "Set to Draft"
 msgstr "设为草稿"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr "生产订单 <em>%s</em>的工单被 <b>挂起</b>。"
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr "工票基于生产订单创建"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr "已取消"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr "工单已经取消"
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr "库存调拨"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr "没有操作被取消"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr "# 明细"
 msgid "Draft"
 msgstr "草稿"
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr "实际生产日期"
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr "产品数量"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr "处于”%s“的工单不能开始。"
@@ -354,12 +346,6 @@ msgstr "9月"
 msgid "December"
 msgstr "12月"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr "生产订单 <em>%s</em>的工单被 <b>完成</b>。"
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -411,14 +397,14 @@ msgid "In Progress"
 msgstr "进行中"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr "要暂停工单，必须在开始或重启状态。"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr "要重启这个工单，必须在暂停状态。"
@@ -461,7 +447,7 @@ msgid "Production Operation Code"
 msgstr "工单编号"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -551,7 +537,7 @@ msgid "Finish the operation."
 msgstr "结束工单"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "工单还未开始"
@@ -562,10 +548,10 @@ msgid "Information from the production order."
 msgstr "源自生产单的信息"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr "抱歉!"
@@ -637,12 +623,6 @@ msgstr ""
 "* 当用户取消工单，设置为”取消状态“。\n"
 "* 从工单被完成的时候开始，设置为”完成“状态。"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr "生产订单 <em>%s</em>的工单被 <b>创建</b>。"
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -715,11 +695,6 @@ msgstr "查询工票："
 msgid "Work Center"
 msgstr "工作中心"
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr "实际"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -803,12 +778,6 @@ msgstr "工单完成"
 msgid "#Line Orders"
 msgstr "明细"
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr "生产订单 <em>%s</em>的工单已经 <b>开始</b>。"
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
@@ -971,6 +940,9 @@ msgstr "时长"
 #~ msgid ")"
 #~ msgstr ")"
 
+#~ msgid "Real"
+#~ msgstr "实际"
+
 #~ msgid "Order quantity cannot be negative or zero !"
 #~ msgstr "订单数量不能为0或者负数!"
 
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index 78ef29bcfa1..2f1807fc860 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-30 13:19+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -25,7 +25,7 @@ msgid "Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
 msgstr ""
@@ -40,13 +40,6 @@ msgstr ""
 msgid "mrp_operations.operation.code"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid ""
-"Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
@@ -95,12 +88,6 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
@@ -148,11 +135,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -165,7 +152,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Operation is Already Cancelled!"
 msgstr ""
@@ -182,13 +169,13 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
@@ -207,6 +194,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
@@ -259,7 +251,7 @@ msgid "Product Qty"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
 msgstr ""
@@ -345,12 +337,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
@@ -402,14 +388,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
 msgstr ""
@@ -452,7 +438,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
@@ -542,7 +528,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -553,10 +539,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -623,12 +609,6 @@ msgid ""
 "status."
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -693,11 +673,6 @@ msgstr ""
 msgid "Work Center"
 msgstr ""
 
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
@@ -781,12 +756,6 @@ msgstr ""
 msgid "#Line Orders"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Start Working"
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index 5bd1998d0eb..92a88cd2188 100644
--- a/addons/mrp_repair/i18n/ar.po
+++ b/addons/mrp_repair/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "إعادة إنشاء الفاتورة"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "ستقوم باختيار عنوان فاتورة للشريك في نموذج التصليح !"
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "لا يوجد منتج محدد في الرسوم !"
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "الضرائب"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "نقل"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "معلومات إضافية"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "شريك"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "لا يوجد حساب محدد للشريك \"%s\"."
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "امر التصليحات"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr "(اضف)"
 msgid "Repair Line"
 msgstr "خط التصليح"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr "نعم"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,16 +550,14 @@ msgid "Repair Fees Line"
 msgstr "خط رسوم الاصلاح"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "التسعيرة"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "اكد على التصليح"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr "انهي التصليح"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "لا يوجد حساب محدد للمنتج \"%s\"."
@@ -665,11 +639,6 @@ msgstr "رسوم"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "التسعيرة"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "اكد على التصليح"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr "الكمية الكلية"
 msgid "Remove"
 msgstr "إزالة"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr "إلغي التصليح"
 msgid "No Invoice"
 msgstr "لا يوجد فاتورة"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr "جاهز للتصليح"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "لا يوجد شريك !"
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index a9c0dca8d72..393dd77db2a 100644
--- a/addons/mrp_repair/i18n/bg.po
+++ b/addons/mrp_repair/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Създаване наново на фактура"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Данъци"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Трансфер"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Допълнителна информация"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Контрагент"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Да"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Оферта"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Отказ"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Оферта"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Искате ли да създадете фактурата/ите"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Обща сума"
 msgid "Remove"
 msgstr "Премахване"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Няма контрагент!"
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index 76c2278ad59..2075230b2ec 100644
--- a/addons/mrp_repair/i18n/bs.po
+++ b/addons/mrp_repair/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 09:20+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index 5dad07ffe2d..57d61f57cbc 100644
--- a/addons/mrp_repair/i18n/ca.po
+++ b/addons/mrp_repair/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Recrea factura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -73,7 +73,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "No s'ha definit cap producte en honoraris!"
@@ -148,9 +148,9 @@ msgid "Taxes"
 msgstr "Impostos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -215,9 +215,8 @@ msgid "Move"
 msgstr "Moviment"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -245,8 +244,8 @@ msgstr "Informació extra"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -264,7 +263,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "No s'ha definit un compte per l'empresa \"%s\"."
@@ -296,11 +295,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Comanda de reparacions"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -396,12 +390,6 @@ msgstr "(Afegeix)"
 msgid "Repair Line"
 msgstr "Línia reparació"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -440,9 +428,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -523,12 +511,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -561,12 +543,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -578,16 +554,14 @@ msgid "Repair Fees Line"
 msgstr "Línies honoraris reparació"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Pressupost"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirma reparació"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -605,8 +579,8 @@ msgid "End Repair"
 msgstr "Fi reparació"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "No s'ha definit un compte per al producte \"%s\"."
@@ -669,11 +643,6 @@ msgstr "Càrrecs"
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Pressupost"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -766,16 +735,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Desitgeu crear la/es factura/es?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirma reparació"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -808,12 +772,6 @@ msgstr "Import total"
 msgid "Remove"
 msgstr "Elimina"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -845,12 +803,6 @@ msgstr "Cancel·la reparació"
 msgid "No Invoice"
 msgstr "No facturar"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -862,7 +814,7 @@ msgid "Ready to Repair"
 msgstr "Preparat per reparació"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "No existeix empresa!"
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index a807eea8635..fc175d4b599 100644
--- a/addons/mrp_repair/i18n/cs.po
+++ b/addons/mrp_repair/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 07:21+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/da.po b/addons/mrp_repair/i18n/da.po
index a5bcd022d17..9adc5fdd55f 100644
--- a/addons/mrp_repair/i18n/da.po
+++ b/addons/mrp_repair/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,15 +550,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -665,11 +639,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index 806e9138999..6acbc2b2d85 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 09:55+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Wiedererstellung Rechnung"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -72,7 +72,7 @@ msgid "Unread Messages"
 msgstr "Ungelesene Mitteilungen"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Kein Produkt für den Reparaturaufwand definiert !"
@@ -147,9 +147,9 @@ msgid "Taxes"
 msgstr "Steuern"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr "Fehler!"
@@ -237,10 +237,9 @@ msgid "Move"
 msgstr "Lieferauftrag"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr "Reparaturauftrag für <em>%s</em> ist <b>in Reparatur</b>."
+#: report:repair.order:0
+msgid "Tax"
+msgstr "Steuer"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -269,8 +268,8 @@ msgstr "Zusatzinfo"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -288,7 +287,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Kein Finanzkonto definiert für den Partner \"%s.\""
@@ -331,11 +330,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Reparaturauftrag"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "Steuer"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -432,12 +426,6 @@ msgstr "(Ersatz)"
 msgid "Repair Line"
 msgstr "Reparaturposition"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr "Reparatur wurde <b>storniert</b>."
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -476,10 +464,10 @@ msgid "Yes"
 msgstr "Ja"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
-msgstr "Reparaturauftrag für <em>%s</em> wurde <b>erstellt</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
+msgstr "oder"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -563,12 +551,6 @@ msgstr "Garantie Ablauf"
 msgid "Pricelist of the selected partner."
 msgstr "Preisliste des ausgewählten Partners"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr "Reparaturauftrag wurde <b>beendet</b>."
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -601,12 +583,6 @@ msgstr "Die aktive ID wurde nicht gefunden"
 msgid "Is a Follower"
 msgstr "Ist ein Follower"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr "Reparaturauftrag für <em>%s</em> wurde <b>angenommen</b>."
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -618,16 +594,14 @@ msgid "Repair Fees Line"
 msgstr "Reparaturaufwendungen"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Angebot"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Rechnungsentwurf %s %s <b>wartet auf Bestätigung</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Annahme Reparatur"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -645,8 +619,8 @@ msgid "End Repair"
 msgstr "Ende Reparatur"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Kein Finanzkonto für das Produkt \"%s\" definiert!"
@@ -709,11 +683,6 @@ msgstr "Aufwendungen"
 msgid "Cancel"
 msgstr "Abgebrochen"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Angebot"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -814,16 +783,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Wollen Sie wirklich die Rechnung(en) erstellen ?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr "Reparatur wurde bereits abgerechnet."
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Annahme Reparatur"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -856,12 +820,6 @@ msgstr "Gesamt Betrag"
 msgid "Remove"
 msgstr "Ausbau"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr "Reparaturauftrag ist jetzt <b>startbereit</b>."
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -893,12 +851,6 @@ msgstr "Abbruch Reparatur"
 msgid "No Invoice"
 msgstr "Keine Rechnung"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr "oder"
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -910,7 +862,7 @@ msgid "Ready to Repair"
 msgstr "Fertig zur Reparatur"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Kein Partner"
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index 047b6cbeba2..54a5d5baa87 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 15:55+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Recrear factura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -72,7 +72,7 @@ msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "¡No se ha definido ningún producto en honorarios!"
@@ -147,9 +147,9 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -231,10 +231,9 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr "La orden de reparación para <em>%s</em> ha sido <b>iniciada</b>."
+#: report:repair.order:0
+msgid "Tax"
+msgstr "Impuesto"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -263,8 +262,8 @@ msgstr "Información adicional"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -282,7 +281,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "No se ha definido una cuenta para la empresa \"%s\"."
@@ -324,11 +323,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Órdenes de reparación"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "Impuesto"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -425,12 +419,6 @@ msgstr "(Añadir)"
 msgid "Repair Line"
 msgstr "Línea reparación"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr "La reparación ha sido <b>cancelada</b>."
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -469,10 +457,10 @@ msgid "Yes"
 msgstr "Sí"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
-msgstr "La orden de reparación para <em>%s</em> ha sido <b>creada</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
+msgstr "o"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -556,12 +544,6 @@ msgstr "Vencimiento de la garantía"
 msgid "Pricelist of the selected partner."
 msgstr "Tarifa de la empresa seleccionada"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr "La orden de reparación ha sido <b>cerrada</b>."
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -594,12 +576,6 @@ msgstr "Id. activo no encontrado"
 msgid "Is a Follower"
 msgstr "Es un seguidor"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr "La orden de reparación para <em>%s</em> ha sido <b>aceptada</b>."
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -611,16 +587,14 @@ msgid "Repair Fees Line"
 msgstr "Líneas honorarios reparación"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "La factura en borrador de %s %s <b>espera validación</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar reparación"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -638,8 +612,8 @@ msgid "End Repair"
 msgstr "Fin reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "No se ha definido una cuenta para el producto \"%s\"."
@@ -702,11 +676,6 @@ msgstr "Cargos"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -808,16 +777,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr "La orden de reparación ya ha sido facturada."
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmar reparación"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -850,12 +814,6 @@ msgstr "Importe total"
 msgid "Remove"
 msgstr "Eliminar"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr "La orden de reparación está <b>lista</b> para ser reparada."
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -887,12 +845,6 @@ msgstr "Cancelar reparación"
 msgid "No Invoice"
 msgstr "No facturar"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr "o"
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -904,7 +856,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "¡No existe empresa!"
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index a12f16f4824..e421cdb36ae 100644
--- a/addons/mrp_repair/i18n/es_AR.po
+++ b/addons/mrp_repair/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-18 03:08+0000\n"
 "Last-Translator: Carlos Sebastián Macri - Daycrom <cmacri@daycrom.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Re-generar Factura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Mover"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Información extra"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Órdenes de reparación"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr "Línea de reparación"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,16 +549,14 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Cotización"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar reparación"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr "Fin de la reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr "Cargos"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Cotización"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmar reparación"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Importe total"
 msgid "Remove"
 msgstr "Borrar"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr "Cancelar Reparación"
 msgid "No Invoice"
 msgstr "Sin factura"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Sin Partner !"
diff --git a/addons/mrp_repair/i18n/es_CR.po b/addons/mrp_repair/i18n/es_CR.po
index 761c3ed8bae..90686fd6493 100644
--- a/addons/mrp_repair/i18n/es_CR.po
+++ b/addons/mrp_repair/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:47+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: mrp_repair
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Recrear factura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -73,7 +73,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "¡No se ha definido ningún producto en honorarios!"
@@ -148,9 +148,9 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -215,9 +215,8 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -245,8 +244,8 @@ msgstr "Información adicional"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -264,7 +263,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "No se ha definido una cuenta para la empresa \"%s\"."
@@ -296,11 +295,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Órdenes de reparación"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -396,12 +390,6 @@ msgstr "(Añadir)"
 msgid "Repair Line"
 msgstr "Línea reparación"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -440,9 +428,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -523,12 +511,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -561,12 +543,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -578,16 +554,14 @@ msgid "Repair Fees Line"
 msgstr "Líneas honorarios reparación"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar reparación"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -605,8 +579,8 @@ msgid "End Repair"
 msgstr "Fin reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "No se ha definido una cuenta para el producto \"%s\"."
@@ -669,11 +643,6 @@ msgstr "Cargos"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -766,16 +735,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmar reparación"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -808,12 +772,6 @@ msgstr "Importe total"
 msgid "Remove"
 msgstr "Eliminar"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -845,12 +803,6 @@ msgstr "Cancelar reparación"
 msgid "No Invoice"
 msgstr "No facturar"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -862,7 +814,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "¡No existe empresa!"
diff --git a/addons/mrp_repair/i18n/es_EC.po b/addons/mrp_repair/i18n/es_EC.po
index 04e22dc37fa..c1f80b010d7 100644
--- a/addons/mrp_repair/i18n/es_EC.po
+++ b/addons/mrp_repair/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-19 00:05+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Recrear factura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Información adicional"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Órdenes de reparación"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr "Línea reparación"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,16 +549,14 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar reparación"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr "Fin reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr "Cargos"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmar reparación"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Importe total"
 msgid "Remove"
 msgstr "Eliminar"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr "Cancelar reparación"
 msgid "No Invoice"
 msgstr "No facturar"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index 2dcb2410e8a..6a129cf1553 100644
--- a/addons/mrp_repair/i18n/et.po
+++ b/addons/mrp_repair/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-30 12:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -44,7 +44,7 @@ msgid "Recreate Invoice"
 msgstr "Loo arve uuesti"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -82,7 +82,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -150,9 +150,9 @@ msgid "Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -217,9 +217,8 @@ msgid "Move"
 msgstr "Suuna"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -247,8 +246,8 @@ msgstr "Täiendav info"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -266,7 +265,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -298,11 +297,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Remontide korraldus"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -396,12 +390,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr "Remondi rida"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -440,9 +428,9 @@ msgid "Yes"
 msgstr "Jah"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,16 +549,14 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Hinnapakkumine"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Kinnita remont"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr "Remondi lõpp"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr "Kulud"
 msgid "Cancel"
 msgstr "Loobu"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Hinnapakkumine"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Kinnita remont"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Kogusumma"
 msgid "Remove"
 msgstr "Eemalda"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr "Loobu remondist"
 msgid "No Invoice"
 msgstr "Arve puudub"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "Valmis remondiks"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Partner puudub!"
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index 3700ad7370b..2ad82a1e373 100644
--- a/addons/mrp_repair/i18n/fi.po
+++ b/addons/mrp_repair/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Laskun uudelleenluonti"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "Sinun pitää valita kumppanin laskutusosoite korjauslomakkeella !"
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "Verot"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "Siirrä"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "Lisätiedot"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Kumppanille ei ole määritetty tiliä \"%s\"."
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Korjausten tilaus"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -394,12 +388,6 @@ msgstr "(lisää)"
 msgid "Repair Line"
 msgstr "Korjausirivi"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -438,9 +426,9 @@ msgid "Yes"
 msgstr "Kyllä"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -521,12 +509,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -559,12 +541,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -576,16 +552,14 @@ msgid "Repair Fees Line"
 msgstr "Korjauskulujen rivi"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Tarjous"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Vahvista korjaus"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -603,8 +577,8 @@ msgid "End Repair"
 msgstr "Päätä korjaus"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Tuotteelle \"%s\" ei ole määritetty tiliä"
@@ -667,11 +641,6 @@ msgstr "Veloitukset"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Tarjous"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -764,16 +733,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Oletko varma, että haluat luoda laskun?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Vahvista korjaus"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -806,12 +770,6 @@ msgstr "Yhteensä"
 msgid "Remove"
 msgstr "Poista"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -843,12 +801,6 @@ msgstr "Peruuta korjaus"
 msgid "No Invoice"
 msgstr "Ei laskua"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -860,7 +812,7 @@ msgid "Ready to Repair"
 msgstr "Valmis korjattavaksi"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Ei kumppania!"
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 6a645e941ae..be6ecde701d 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 14:41+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Recréer la Facture"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -72,7 +72,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Aucun article défini avec des frais !"
@@ -147,9 +147,9 @@ msgid "Taxes"
 msgstr "Taxes"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -214,9 +214,8 @@ msgid "Move"
 msgstr "Mouvement"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -244,8 +243,8 @@ msgstr "Informations Supplémentaires"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -263,7 +262,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Pas de compte défini pour le partenaire \"%s\"."
@@ -295,11 +294,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Commande de Réparation"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -395,12 +389,6 @@ msgstr "(Ajouter)"
 msgid "Repair Line"
 msgstr "Ligne de Réparation"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -439,9 +427,9 @@ msgid "Yes"
 msgstr "Oui"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -522,12 +510,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -560,12 +542,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -577,16 +553,14 @@ msgid "Repair Fees Line"
 msgstr "Ligne des frais de réparation"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Devis"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmer la Réparation"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -604,8 +578,8 @@ msgid "End Repair"
 msgstr "Terminer la Réparation"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Pas de compte défini pour l'article \"%s\"."
@@ -668,11 +642,6 @@ msgstr "Frais"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Devis"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -765,16 +734,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Voulez-vous réellement créer la(es) facture(s) ?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmer la Réparation"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -807,12 +771,6 @@ msgstr "Montant Total"
 msgid "Remove"
 msgstr "Enlever"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -844,12 +802,6 @@ msgstr "Annuler la Réparation"
 msgid "No Invoice"
 msgstr "Pas de Facture"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -861,7 +813,7 @@ msgid "Ready to Repair"
 msgstr "Prêt à Réparer"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Pas de partenaire !"
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 66cff25e87b..ad5feb63737 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:03+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "फिर से चालान बनाने"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "स्थानान्तर"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "अतिरिक्त जानकारी"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "साथी"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "मरम्मत के आदेश"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,15 +550,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -665,11 +639,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index a610d1dc69b..ebdc4c03752 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 17:07+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Ponovo izradi račun"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -212,10 +212,9 @@ msgid "Move"
 msgstr "Temeljnica"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr ""
+#: report:repair.order:0
+msgid "Tax"
+msgstr "Porez"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -242,8 +241,8 @@ msgstr "Dodatni podaci"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Nalozi za popravak"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "Porez"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -393,12 +387,6 @@ msgstr "(Add)"
 msgid "Repair Line"
 msgstr "Stavka popravka"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -437,10 +425,10 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
-msgstr ""
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
+msgstr "ili"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -520,12 +508,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -558,12 +540,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr "Pratitelj"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -575,16 +551,14 @@ msgid "Repair Fees Line"
 msgstr "Stavka naknade popravka"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Quotation"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Potvrdi popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -602,8 +576,8 @@ msgid "End Repair"
 msgstr "Završi popravak"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -666,11 +640,6 @@ msgstr "Fees"
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Quotation"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -763,16 +732,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Kreirati račun(e) ?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Potvrdi popravak"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -805,12 +769,6 @@ msgstr "Ukupni iznos"
 msgid "Remove"
 msgstr "Remove"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -842,12 +800,6 @@ msgstr "Otkaži popravak"
 msgid "No Invoice"
 msgstr "Nema računa"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr "ili"
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -859,7 +811,7 @@ msgid "Ready to Repair"
 msgstr "Spremno za popravak"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index c481c34688a..d23d94b11e2 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Számla újrakészítése"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Adók"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Mozgatás"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Extra információ"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Nincs számla definiálva \"%s\" partnerhez."
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr "(Hozzáadás)"
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Igen"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Árajánlat"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Nincs számla definiálva \"%s\" termékhez."
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Mégsem"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Árajánlat"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Valóban el akarja készíteni a számlá(ka)t?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Összesen"
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr "Nincs számla"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Nincs partner!"
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index 5704f3f43f7..049e59c5cb1 100644
--- a/addons/mrp_repair/i18n/id.po
+++ b/addons/mrp_repair/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-09 13:52+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index c9b51ea8779..953621d4aae 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:27+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Ricrea Fattura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Imposte"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Sposta"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Informazioni Aggiuntive"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Ordine riparazioni"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr "(Aggiungi)"
 msgid "Repair Line"
 msgstr "Linea Riparazione"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,16 +549,14 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Preventivo"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Conferma Riparazione"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr "Fine Riparazione"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr "Tasse"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Preventivo"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Vuoi veramente creare le(a) fatture(a)?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Conferma Riparazione"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Importo Totale"
 msgid "Remove"
 msgstr "Rimuovi"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr "Cancella Riparazione"
 msgid "No Invoice"
 msgstr "Fattura N°"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "Prodo da Riparare"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Nessun partner!"
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index fb7a5f858e1..08a4fc3ce53 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-12 01:54+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "請求書再作成"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "修理フォームではパートなの請求書住所を選択する必要があります。"
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "料金が定義されていない製品です。"
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "税金"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "移動"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "追加情報"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "パートナ"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "パートナ %s にアカウントが定義されていません。"
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "修理オーダー"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr "（追加）"
 msgid "Repair Line"
 msgstr "修理行"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,16 +550,14 @@ msgid "Repair Fees Line"
 msgstr "修理費行"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "見積"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "修理の確認"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr "修理終了"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "製品 %s のアカウントが定義されていません。"
@@ -665,11 +639,6 @@ msgstr "費用"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "見積"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "本当に請求書を作成しますか？"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "修理の確認"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr "合計金額"
 msgid "Remove"
 msgstr "取除く"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr "修理のキャンセル"
 msgid "No Invoice"
 msgstr "請求外"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr "修理準備完了"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "パートナがありません。"
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index 0bdce225ba1..31b6f67bab2 100644
--- a/addons/mrp_repair/i18n/ko.po
+++ b/addons/mrp_repair/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-09-08 14:15+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "인보이스 재생성"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "세금"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "이동"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "기타 정보"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "파트너"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "수리 주문"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr "수리 라인"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr "네"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,16 +550,14 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "견적"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "수리 확정"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr "수리 완료"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -665,11 +639,6 @@ msgstr "수수료"
 msgid "Cancel"
 msgstr "취소"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "견적"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "수리 확정"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr "총액"
 msgid "Remove"
 msgstr "제거"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr "수리 취소"
 msgid "No Invoice"
 msgstr "인보이스 없음"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr "수리 준비됨"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "파트너가 없음 !"
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index 59ee0f015bd..fe46fece069 100644
--- a/addons/mrp_repair/i18n/lt.po
+++ b/addons/mrp_repair/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/mn.po b/addons/mrp_repair/i18n/mn.po
index 1eb723a293a..0e7fa30bd24 100644
--- a/addons/mrp_repair/i18n/mn.po
+++ b/addons/mrp_repair/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-31 11:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Дахин нэхэмжлэл үүсгэх"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "Засварын маягтад харилцагчийн нэхэмжлэх хаягийг сонгох хэрэгтэй !"
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Ажлын хөлс дээр бараа тодорхойлогдоогүй байна!"
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "Татвар"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "Хөдөлгөөн"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "Нэмэлт мэдээлэл"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "\"%s\" харилцагчид данс тодорхойлогдоогүй байна."
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Засварын захиалга"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -394,12 +388,6 @@ msgstr "(Нэмэх)"
 msgid "Repair Line"
 msgstr "Засварын мөр"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -438,9 +426,9 @@ msgid "Yes"
 msgstr "Тийм"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -521,12 +509,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -559,12 +541,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -576,16 +552,14 @@ msgid "Repair Fees Line"
 msgstr "Засварын Ажлын Хөлсний Мөр"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Үнийн санал"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Засварыг Батлах"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -603,8 +577,8 @@ msgid "End Repair"
 msgstr "Засварыг Төгсгөх"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "\"%s\" бараанд данс тодорхойлогдоогүй байна."
@@ -667,11 +641,6 @@ msgstr "Ажлын хөлс"
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Үнийн санал"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -764,16 +733,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Засварыг Батлах"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -806,12 +770,6 @@ msgstr "Нийт дүн"
 msgid "Remove"
 msgstr "Хасах"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -843,12 +801,6 @@ msgstr "Засвар Цуцлах"
 msgid "No Invoice"
 msgstr "Нэхэмлэл үгүй"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -860,7 +812,7 @@ msgid "Ready to Repair"
 msgstr "Засахад Бэлэн"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Харилцагч алга !"
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index 268fe0cda76..6d923dc45e0 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 22:10+0000\n"
 "Last-Translator: Marcel van der Boom (HS-Development BV) <marcel@hsdev.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Maak factuur opnieuw"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Geen producten bij vergoedingen gedefineerd"
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "Belastingen"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,10 +213,9 @@ msgid "Move"
 msgstr "Verplaatsing"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr ""
+#: report:repair.order:0
+msgid "Tax"
+msgstr "Belasting"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -243,8 +242,8 @@ msgstr "Extra info"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Geen rekening voor voor partner \"%s\" gedefinieerd."
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Reparatie order"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "Belasting"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -394,12 +388,6 @@ msgstr "(Toevoegen)"
 msgid "Repair Line"
 msgstr "Reparatie regel"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -438,9 +426,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -521,12 +509,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -559,12 +541,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -576,16 +552,14 @@ msgid "Repair Fees Line"
 msgstr "Kosten reperatie regel"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Offerte"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Bevestig reparatie"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -603,8 +577,8 @@ msgid "End Repair"
 msgstr "Stop reparatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Geen rekening gedefinieerd voor product \"%s\"."
@@ -667,11 +641,6 @@ msgstr "Vergoedingen"
 msgid "Cancel"
 msgstr "Annuleer"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Offerte"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -764,16 +733,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Wilt u echt de facturen aanmaken?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Bevestig reparatie"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -806,12 +770,6 @@ msgstr "Totaalbedrag"
 msgid "Remove"
 msgstr "Verwijder"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -843,12 +801,6 @@ msgstr "Reparatie annuleren"
 msgid "No Invoice"
 msgstr "Geen factuur"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -860,7 +812,7 @@ msgid "Ready to Repair"
 msgstr "Gereed voor reparatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Geen relatie !"
@@ -997,9 +949,6 @@ msgstr "Geen relatie !"
 #~ msgid "State"
 #~ msgstr "Status"
 
-#~ msgid "invoiced"
-#~ msgstr "gefaktureerd"
-
 #, python-format
 #~ msgid "Active ID is not Found"
 #~ msgstr "Actieve ID is niet gevonden"
@@ -1073,3 +1022,6 @@ msgstr "Geen relatie !"
 #~ "Indien aangevinkt, wordt een verzamellijst gemaakt met het geselecteerde "
 #~ "product. Merk op dat u de locaties kunt selecteren in het tabblad Info als u "
 #~ "de uitgebreide weergave heeft."
+
+#~ msgid "invoiced"
+#~ msgstr "gefactureerd"
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index 4b1965bf2b8..c14c104ddc7 100644
--- a/addons/mrp_repair/i18n/nl_BE.po
+++ b/addons/mrp_repair/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-04-10 09:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index 154f1c638d7..11c437f017f 100644
--- a/addons/mrp_repair/i18n/pl.po
+++ b/addons/mrp_repair/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 12:47+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Utwórz fakturę od nowa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "Musisz wybrać adres fakturowy w formularzu zamówienia naprawy!"
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nie zdefiniowano produktu dla opłaty!"
@@ -147,9 +147,9 @@ msgid "Taxes"
 msgstr "Podatki"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -214,10 +214,9 @@ msgid "Move"
 msgstr "Przesunięcie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr "Zamówienie naprawy dla <em>%s</em> zostało <b>rozpoczęte</b>."
+#: report:repair.order:0
+msgid "Tax"
+msgstr "Podatek"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -244,8 +243,8 @@ msgstr "Dodatkowe informacje"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -263,7 +262,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Nie zdefiniowano konta dla partnera \"%s\"."
@@ -295,11 +294,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Zamówienie napraw"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "Podatek"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -395,12 +389,6 @@ msgstr "(Dodane)"
 msgid "Repair Line"
 msgstr "Pozycja naprawy"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr "Zamówienie naprawy zostało <b>anulowane</b>."
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -439,10 +427,10 @@ msgid "Yes"
 msgstr "Tak"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
-msgstr "Zamówienie naprawy od <em>%s</em> zostało <b>utworzone</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -522,12 +510,6 @@ msgstr "Koniec gwarancji"
 msgid "Pricelist of the selected partner."
 msgstr "Cennik dla partnera"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr "Zamówienie naprawy jest <b>zamknięte</b>."
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -560,12 +542,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr "Zamówienie naprawy dla <em>%s</em> zostało <b>zaakceptowane</b>."
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -577,16 +553,14 @@ msgid "Repair Fees Line"
 msgstr "Pozycja opłaty za naprawę"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Oferta"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Projekt faktury %s %s <b>czeka na zatwierdzenie</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Potwierdź naprawę"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -604,8 +578,8 @@ msgid "End Repair"
 msgstr "Koniec naprawy"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Produkt \"%s\" nie ma zdefinowanego konta."
@@ -668,11 +642,6 @@ msgstr "Opłaty"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Oferta"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -765,16 +734,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Czy chcesz utworzyć fakturę(y) ?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr "Zamówienia naprawy jest już zafakturowane."
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Potwierdź naprawę"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -807,12 +771,6 @@ msgstr "Suma kwot"
 msgid "Remove"
 msgstr "Demontaż"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr "Zamówienie naprawy jest teraz <b>gotowe</b> do wykonania."
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -844,12 +802,6 @@ msgstr "Anuluj naprawę"
 msgid "No Invoice"
 msgstr "Brak faktur"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -861,7 +813,7 @@ msgid "Ready to Repair"
 msgstr "Gotowe do naprawy"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Brak partnera !"
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index add28715f9f..e6fd7dfd171 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-09 09:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Recriar Fatura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nenhum artigo definido em taxas!"
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "Impostos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "Informação Extra"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Não tem conta definida para o parceiro \"%s\"."
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Ordens de reparação"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -394,12 +388,6 @@ msgstr "(Adicionar)"
 msgid "Repair Line"
 msgstr "Linha de Reparação"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -438,9 +426,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -521,12 +509,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -559,12 +541,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -576,16 +552,14 @@ msgid "Repair Fees Line"
 msgstr "Linha Taxas de reparação"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Cotação"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar Reparação"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -603,8 +577,8 @@ msgid "End Repair"
 msgstr "Fim da Reparação"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Não tem conta definida para o artigo \"%s\"."
@@ -667,11 +641,6 @@ msgstr "Comissões"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Cotação"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -764,16 +733,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmar Reparação"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -806,12 +770,6 @@ msgstr "Montante Total"
 msgid "Remove"
 msgstr "Remover"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -843,12 +801,6 @@ msgstr "Cancelar Reparação"
 msgid "No Invoice"
 msgstr "Sem Fatura"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -860,7 +812,7 @@ msgid "Ready to Repair"
 msgstr "Pronto para Reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Nenhum Parceiro !"
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 17bb8577e06..6fa15811de9 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
-"PO-Revision-Date: 2012-10-17 00:28+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-24 00:09+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Recriar Fatura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -54,7 +55,7 @@ msgstr "Faturar"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -69,10 +70,10 @@ msgstr "Agrupar pelo Endereço de Faturamento do Parceiro"
 #. module: mrp_repair
 #: field:mrp.repair,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nenhum produto definido no valor!"
@@ -96,7 +97,7 @@ msgstr "Pendência no Faturamento"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Número de Série"
 
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
@@ -122,7 +123,7 @@ msgstr "Endereço de Faturamento :"
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid "Choose partner for whom the order will be invoiced and delivered."
-msgstr ""
+msgstr "Escolha o parceiro para quem o pedido será faturado e entregue."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -137,7 +138,7 @@ msgstr "Observações"
 #. module: mrp_repair
 #: field:mrp.repair,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -147,12 +148,12 @@ msgid "Taxes"
 msgstr "Impostos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -163,12 +164,12 @@ msgstr "Total Líquido"
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp_repair
 #: help:mrp.repair,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -195,6 +196,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma ordem de reparos. \n"
+"              </p><p>\n"
+"                Em uma ordem de reparos, você pode detalhar os componentes "
+"que você remover,\n"
+"                adicionar, ou substituir e registrar o tempo gasto em "
+"diferentes operações.\n"
+"              </p><p>\n"
+"                A ordem de reparo usa a data da garantia no Número de Série "
+"para saber se\n"
+"                o reparo deve ser faturado ou não.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp_repair
 #: help:mrp.repair.line,state:0
@@ -214,10 +228,9 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr ""
+#: report:repair.order:0
+msgid "Tax"
+msgstr "Imposto"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -244,8 +257,8 @@ msgstr "Info. Extra"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -263,7 +276,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Sem conta definida para o Parceiro \"%s\"."
@@ -295,11 +308,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Ordens de Reparo"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "Imposto"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -395,12 +403,6 @@ msgstr "(Adicionar)"
 msgid "Repair Line"
 msgstr "Linha do Reparo"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -439,9 +441,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -522,12 +524,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -560,12 +556,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -577,16 +567,14 @@ msgid "Repair Fees Line"
 msgstr "Linhas de Valores do Conserto"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Cotação"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar Reparo"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -604,8 +592,8 @@ msgid "End Repair"
 msgstr "Finalizar Reparo"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Sem conta definida para o produtot \"%s\"."
@@ -668,11 +656,6 @@ msgstr "Impostos"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Cotação"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -765,16 +748,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Deseja Criar uma Fatura ?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirmar Reparo"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -807,12 +785,6 @@ msgstr "Valor total"
 msgid "Remove"
 msgstr "Remover"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -844,12 +816,6 @@ msgstr "Cancelar Reparo"
 msgid "No Invoice"
 msgstr "Não Faturar"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -861,7 +827,7 @@ msgid "Ready to Repair"
 msgstr "Pronto para Reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Sem parceiro !"
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index ac3d67c3f37..8194f4727c8 100644
--- a/addons/mrp_repair/i18n/ro.po
+++ b/addons/mrp_repair/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:23+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Recreeaza Factura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -72,7 +72,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Niciun produs definit in Taxe!"
@@ -147,9 +147,9 @@ msgid "Taxes"
 msgstr "Taxe"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -214,9 +214,8 @@ msgid "Move"
 msgstr "Miscare"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -244,8 +243,8 @@ msgstr "Informatii suplimentare"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -263,7 +262,7 @@ msgid "Partner"
 msgstr "Partener"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Nu este definit niciun cont pentru partenerul \"%s\"."
@@ -295,11 +294,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Comanda reparatii"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -395,12 +389,6 @@ msgstr "(Adauga)"
 msgid "Repair Line"
 msgstr "Linie reparatie"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -439,9 +427,9 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -522,12 +510,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -560,12 +542,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -577,16 +553,14 @@ msgid "Repair Fees Line"
 msgstr "Linie Taxe Reparatii"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Cotatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirma Reparatia"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -604,8 +578,8 @@ msgid "End Repair"
 msgstr "Finalizeaza Reparatia"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Niciun cont definit pentru produsul \"%s\"."
@@ -668,11 +642,6 @@ msgstr "Taxe"
 msgid "Cancel"
 msgstr "Anuleaza"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Cotatie"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -765,16 +734,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Chiar doriti să creaţi factura(ile)?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Confirma Reparatia"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -807,12 +771,6 @@ msgstr "Suma totala"
 msgid "Remove"
 msgstr "Elimina"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -844,12 +802,6 @@ msgstr "Anuleaza Reparatia"
 msgid "No Invoice"
 msgstr "Nicio Factura"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -861,7 +813,7 @@ msgid "Ready to Repair"
 msgstr "Pregatit de reparatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Niciun partener !"
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index 04cd8784880..5d78689345c 100644
--- a/addons/mrp_repair/i18n/ru.po
+++ b/addons/mrp_repair/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 09:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index 1b4eb4f5021..1fe47d93f04 100644
--- a/addons/mrp_repair/i18n/sl.po
+++ b/addons/mrp_repair/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-11-17 07:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Znova ustvari račun"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Davki"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Prenos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Dodatne informacije"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Ponudba"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Prekliči"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Ponudba"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Skupni znesek"
 msgid "Remove"
 msgstr "Odstrani"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr "Ni računa"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "Pripravljeno na popravilo"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/sq.po b/addons/mrp_repair/i18n/sq.po
index 24ff8cfe4eb..309f4ee27f1 100644
--- a/addons/mrp_repair/i18n/sq.po
+++ b/addons/mrp_repair/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,15 +550,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -665,11 +639,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
index 2e978748575..127baf9f794 100644
--- a/addons/mrp_repair/i18n/sr.po
+++ b/addons/mrp_repair/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Osvežavanje računa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "TRebas izabrati Partnerovu adresu fakture u formi za popravku!"
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nema proizvoda definisanih za Naknadne intervencije"
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "Dodatne Informacije"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "NIjedan nalog nije definisan kao partner \"%s\" ."
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Nalozi Popravke"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -394,12 +388,6 @@ msgstr "(Dodaj)"
 msgid "Repair Line"
 msgstr "Linija Popravke"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -438,9 +426,9 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -521,12 +509,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -559,12 +541,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -576,16 +552,14 @@ msgid "Repair Fees Line"
 msgstr "Linije naknadnih popravki"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Najava"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Potvrdi Popravku"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -603,8 +577,8 @@ msgid "End Repair"
 msgstr "Kraj Popravke"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Ni jedan nalog nije kreiran za proizvod \"%s\" ."
@@ -667,11 +641,6 @@ msgstr "Porezi"
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Najava"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -764,16 +733,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Zelis li da stvarno kreiras ovu fakturu(e)"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Potvrdi Popravku"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -806,12 +770,6 @@ msgstr "Ukupan iznos"
 msgid "Remove"
 msgstr "Уклони"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -843,12 +801,6 @@ msgstr "Otkazi Popravku"
 msgid "No Invoice"
 msgstr "Ne Fakturisi"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -860,7 +812,7 @@ msgid "Ready to Repair"
 msgstr "Spremno za Popravku"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Nema partnera !"
diff --git a/addons/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 9ca73c9662b..05a5ecaa794 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: MD <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr "Osvežavanje računa"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "TRebas izabrati Partnerovu adresu fakture u formi za popravku!"
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nema proizvoda definisanih za Naknadne intervencije"
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr "Dodatne Informacije"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "NIjedan nalog nije definisan kao partner \"%s\" ."
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Nalozi Popravke"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -394,12 +388,6 @@ msgstr "(Dodaj)"
 msgid "Repair Line"
 msgstr "Linija Popravke"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -438,9 +426,9 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -521,12 +509,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -559,12 +541,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -576,16 +552,14 @@ msgid "Repair Fees Line"
 msgstr "Linije naknadnih popravki"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Najava"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Potvrdi Popravku"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -603,8 +577,8 @@ msgid "End Repair"
 msgstr "Kraj Popravke"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Ni jedan nalog nije kreiran za proizvod \"%s\" ."
@@ -667,11 +641,6 @@ msgstr "Porezi"
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Najava"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -764,16 +733,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Zelis li da stvarno kreiras ovu fakturu(e)"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Potvrdi Popravku"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -806,12 +770,6 @@ msgstr "Ukupan iznos"
 msgid "Remove"
 msgstr "Уклони"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -843,12 +801,6 @@ msgstr "Otkazi Popravku"
 msgid "No Invoice"
 msgstr "Ne Fakturisi"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -860,7 +812,7 @@ msgid "Ready to Repair"
 msgstr "Spremno za Popravku"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Nema partnera !"
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 45a7d3a0ebd..3ee238d41f8 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-01 23:11+0000\n"
 "Last-Translator: Treecko <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Återskapa faktura"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Skatter"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Flytta"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Tilläggsinformation"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr "(Lägg till)"
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,16 +549,14 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Offert"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Bekräfta reparation"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr "Avsluta reparation"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr "Avgifter"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Offert"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Bekräfta reparation"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "Totalt belopp"
 msgid "Remove"
 msgstr "Ta bort"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr "Avbryt reparationen"
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "Redo att reparera"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/tlh.po b/addons/mrp_repair/i18n/tlh.po
index 22416b59a39..319185f7554 100644
--- a/addons/mrp_repair/i18n/tlh.po
+++ b/addons/mrp_repair/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 3c87c96f434..d554dfcd7cc 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "Faturayı Yeniden Oluştur"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "Onarım formundan bir Paydaş Adresi seçmelisiniz !"
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Ücretlerde tanımlanmış ürün yok!"
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "Vergiler"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr "Hareket"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr "Ek Bilgi"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "Paydaş"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "\"%s\" Paydaşı için tanımlanmış bir hesap yok."
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "Onarım Siparişi"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -393,12 +387,6 @@ msgstr "(Ekle)"
 msgid "Repair Line"
 msgstr "Onarım Kalemi"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -437,9 +425,9 @@ msgid "Yes"
 msgstr "Evet"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -520,12 +508,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -558,12 +540,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -575,16 +551,14 @@ msgid "Repair Fees Line"
 msgstr "Onarım Ücretleri Kalemi"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Teklif"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Onarımı Onayla"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -602,8 +576,8 @@ msgid "End Repair"
 msgstr "Onarım Bitir"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "\"%s\" Ürünü için tanımlı hesap yok."
@@ -666,11 +640,6 @@ msgstr "Ücretler"
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "Teklif"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -763,16 +732,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "Onarımı Onayla"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -805,12 +769,6 @@ msgstr "Toplam Tutar"
 msgid "Remove"
 msgstr "Kaldır"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -842,12 +800,6 @@ msgstr "Onarım İptal"
 msgid "No Invoice"
 msgstr "Fatura Yok"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -859,7 +811,7 @@ msgid "Ready to Repair"
 msgstr "Onarıma Hazır"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "Paydaş Yok !"
diff --git a/addons/mrp_repair/i18n/uk.po b/addons/mrp_repair/i18n/uk.po
index fc8d75e3c98..61fc49484a1 100644
--- a/addons/mrp_repair/i18n/uk.po
+++ b/addons/mrp_repair/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-02-03 10:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/vi.po b/addons/mrp_repair/i18n/vi.po
index 5f6a6969f71..90dea00167d 100644
--- a/addons/mrp_repair/i18n/vi.po
+++ b/addons/mrp_repair/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 14:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -33,7 +33,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -71,7 +71,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -146,9 +146,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -213,9 +213,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -243,8 +242,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -262,7 +261,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -294,11 +293,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -392,12 +386,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -436,9 +424,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -519,12 +507,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -557,12 +539,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -574,15 +550,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -601,8 +575,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -665,11 +639,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -762,16 +731,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -804,12 +768,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -841,12 +799,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -858,7 +810,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index a1e1761e7ca..ee939239213 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-10-25 16:34+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr "再创建发票"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "必须在维修单上输入业务伙伴的发票地址"
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "没有定义费用产品"
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr "税"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,10 +212,9 @@ msgid "Move"
 msgstr "调拨"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
-msgstr ""
+#: report:repair.order:0
+msgid "Tax"
+msgstr "税"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -242,8 +241,8 @@ msgstr "额外信息"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "业务伙伴 \"%s\" 没有指定应收账款科目"
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr "修理单"
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr "税"
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr "（增加）"
 msgid "Repair Line"
 msgstr "修理明细"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr "是"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,16 +549,14 @@ msgid "Repair Fees Line"
 msgstr "维修费行"
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "报价单"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "确认修理"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr "结束修理"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "产品 \"%s\" 没有指定科目"
@@ -664,11 +638,6 @@ msgstr "费用"
 msgid "Cancel"
 msgstr "取消"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr "报价单"
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr "你真的要生成发票吗 ？"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr "确认修理"
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr "金额合计"
 msgid "Remove"
 msgstr "删除"
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr "取消修理"
 msgid "No Invoice"
 msgstr "没发票"
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr "准备修理"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr "没有输入业务伙伴"
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index a5d9334a3bb..7e1e780415c 100644
--- a/addons/mrp_repair/i18n/zh_TW.po
+++ b/addons/mrp_repair/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2009-01-23 17:16+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -32,7 +32,7 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -70,7 +70,7 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -145,9 +145,9 @@ msgid "Taxes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -212,9 +212,8 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
@@ -242,8 +241,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
@@ -261,7 +260,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -293,11 +292,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
 #, python-format
@@ -391,12 +385,6 @@ msgstr ""
 msgid "Repair Line"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
@@ -435,9 +423,9 @@ msgid "Yes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
 msgstr ""
 
 #. module: mrp_repair
@@ -518,12 +506,6 @@ msgstr ""
 msgid "Pricelist of the selected partner."
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
@@ -556,12 +538,6 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
@@ -573,15 +549,13 @@ msgid "Repair Fees Line"
 msgstr ""
 
 #. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
 msgstr ""
 
 #. module: mrp_repair
@@ -600,8 +574,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -664,11 +638,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
@@ -761,16 +730,11 @@ msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
@@ -803,12 +767,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
@@ -840,12 +798,6 @@ msgstr ""
 msgid "No Invoice"
 msgstr ""
 
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
@@ -857,7 +809,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/multi_company/i18n/ar.po b/addons/multi_company/i18n/ar.po
index f438d1e38fb..12333404cca 100644
--- a/addons/multi_company/i18n/ar.po
+++ b/addons/multi_company/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/bg.po b/addons/multi_company/i18n/bg.po
index 1b5c3edd218..17aebc564db 100644
--- a/addons/multi_company/i18n/bg.po
+++ b/addons/multi_company/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-27 12:55+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/bs.po b/addons/multi_company/i18n/bs.po
index 15575f16488..5bccdfd44f7 100644
--- a/addons/multi_company/i18n/bs.po
+++ b/addons/multi_company/i18n/bs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/ca.po b/addons/multi_company/i18n/ca.po
index 6529b512ebf..ac4eb4f2cb5 100644
--- a/addons/multi_company/i18n/ca.po
+++ b/addons/multi_company/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/cs.po b/addons/multi_company/i18n/cs.po
index c9cff374e92..d93c2fce18d 100644
--- a/addons/multi_company/i18n/cs.po
+++ b/addons/multi_company/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/da.po b/addons/multi_company/i18n/da.po
index e64c5febf2d..d44745ea8ed 100644
--- a/addons/multi_company/i18n/da.po
+++ b/addons/multi_company/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index 6dd5e929dbe..087797f6083 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-29 10:15+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 1fd6a9932c2..a25e3a13f96 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 14:37+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/es_CR.po b/addons/multi_company/i18n/es_CR.po
index 4d63d65a98a..532c65f38bf 100644
--- a/addons/multi_company/i18n/es_CR.po
+++ b/addons/multi_company/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 00:20+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/es_EC.po b/addons/multi_company/i18n/es_EC.po
index 87d6035d512..6b78fa158e3 100644
--- a/addons/multi_company/i18n/es_EC.po
+++ b/addons/multi_company/i18n/es_EC.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-19 00:06+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 9c95df58ab6..9ddc7ed2427 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:12+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/fi.po b/addons/multi_company/i18n/fi.po
index a0d65bb557c..fdb96250598 100644
--- a/addons/multi_company/i18n/fi.po
+++ b/addons/multi_company/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:12+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index 41fdad2b057..83998dde07b 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-11 16:49+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/gl.po b/addons/multi_company/i18n/gl.po
index 8d37523d87e..42ca6a1db54 100644
--- a/addons/multi_company/i18n/gl.po
+++ b/addons/multi_company/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-11 19:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 62fe5492e75..9e806cb5ddd 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-12 12:48+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/hu.po b/addons/multi_company/i18n/hu.po
index a6be7237304..d2807411140 100644
--- a/addons/multi_company/i18n/hu.po
+++ b/addons/multi_company/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-02 12:36+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/id.po b/addons/multi_company/i18n/id.po
index d9026f74034..9f67cafa6b0 100644
--- a/addons/multi_company/i18n/id.po
+++ b/addons/multi_company/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index 971bff71ec4..1b4c5726887 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 12:11+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/ja.po b/addons/multi_company/i18n/ja.po
index 26d46b90536..3fdc50b986e 100644
--- a/addons/multi_company/i18n/ja.po
+++ b/addons/multi_company/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 06:13+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/lo.po b/addons/multi_company/i18n/lo.po
index 2afdbbe4d9b..706ed0e65ac 100644
--- a/addons/multi_company/i18n/lo.po
+++ b/addons/multi_company/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-20 18:49+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/lt.po b/addons/multi_company/i18n/lt.po
index dbc17012b49..a3adf1b6716 100644
--- a/addons/multi_company/i18n/lt.po
+++ b/addons/multi_company/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/lv.po b/addons/multi_company/i18n/lv.po
index 7cddae6b2e0..f53b03fb0ce 100644
--- a/addons/multi_company/i18n/lv.po
+++ b/addons/multi_company/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-31 09:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/mn.po b/addons/multi_company/i18n/mn.po
index f7bc3c65437..de26d16ad4e 100644
--- a/addons/multi_company/i18n/mn.po
+++ b/addons/multi_company/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 11:18+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/nb.po b/addons/multi_company/i18n/nb.po
index 2d4cf9dee64..eebadbb3518 100644
--- a/addons/multi_company/i18n/nb.po
+++ b/addons/multi_company/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-24 20:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/nl.po b/addons/multi_company/i18n/nl.po
index f6849c9d678..c415355d81d 100644
--- a/addons/multi_company/i18n/nl.po
+++ b/addons/multi_company/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-14 18:36+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
index bb1e9faa329..d516edf6bc4 100644
--- a/addons/multi_company/i18n/oc.po
+++ b/addons/multi_company/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:13+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/pl.po b/addons/multi_company/i18n/pl.po
index 237f38e1ab2..1c77a04db68 100644
--- a/addons/multi_company/i18n/pl.po
+++ b/addons/multi_company/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-28 12:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 39b02d05669..d0ebc8cdda2 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:35+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index 2b1f3f5b6c0..dc5a7c3c729 100644
--- a/addons/multi_company/i18n/pt_BR.po
+++ b/addons/multi_company/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
-"PO-Revision-Date: 2011-01-17 11:52+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:28+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -45,6 +46,18 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Prezado Senhor / Senhora,\n"
+"\n"
+"Nossos registros indicam que alguns pagamentos em sua conta estão em aberto. "
+"Por favor, veja os detalhes abaixo.\n"
+"Se o valor já tiver sido pago, por favor desconsidere este aviso. Caso "
+"contrário, regularize os pagamentos o mais breve possível.\n"
+"Se você tiver alguma dúvida sobre seus pagamentos, por favor, entre em "
+"contato conosco.\n"
+"\n"
+"Obrigado antecipadamente pela sua colaboração.\n"
+"\n"
+"Atenciosamente,"
 
 #. module: multi_company
 #: view:multi_company.default:0
diff --git a/addons/multi_company/i18n/ro.po b/addons/multi_company/i18n/ro.po
index 6d8947658e0..8b804c69d8d 100644
--- a/addons/multi_company/i18n/ro.po
+++ b/addons/multi_company/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 73b43f84c01..350dd691eb8 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-17 11:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 68c84bcf9c7..b2f5ade84b9 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-03 08:13+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/sr.po b/addons/multi_company/i18n/sr.po
index 250f694b119..e5b3064d5e9 100644
--- a/addons/multi_company/i18n/sr.po
+++ b/addons/multi_company/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-04 09:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/sr@latin.po b/addons/multi_company/i18n/sr@latin.po
index edf5926f6ca..3691a236eae 100644
--- a/addons/multi_company/i18n/sr@latin.po
+++ b/addons/multi_company/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 15:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/sv.po b/addons/multi_company/i18n/sv.po
index 2887bfd02f3..48eae30329c 100644
--- a/addons/multi_company/i18n/sv.po
+++ b/addons/multi_company/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-01 23:24+0000\n"
 "Last-Translator: Stefan Lind <Unknown>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po
index b94955d3240..f5f23f5dbb3 100644
--- a/addons/multi_company/i18n/tr.po
+++ b/addons/multi_company/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/uk.po b/addons/multi_company/i18n/uk.po
index 8af4761a7ac..19681d1967f 100644
--- a/addons/multi_company/i18n/uk.po
+++ b/addons/multi_company/i18n/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/vi.po b/addons/multi_company/i18n/vi.po
index dfc14cd7559..3d309a83bb1 100644
--- a/addons/multi_company/i18n/vi.po
+++ b/addons/multi_company/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-23 16:31+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/multi_company/i18n/zh_CN.po b/addons/multi_company/i18n/zh_CN.po
index 28e68abacf3..839b4f366c3 100644
--- a/addons/multi_company/i18n/zh_CN.po
+++ b/addons/multi_company/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
-"PO-Revision-Date: 2011-01-13 10:18+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 01:30+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -45,6 +45,14 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"亲爱的先生/女士,\n"
+"    我们的记录表明，您的到期帐款尚未支付。请看下面的明细信息。\n"
+"    如果这些金额已经支付，请忽略本次提醒。否则，请向我们说明如下金额。\n"
+"    如果有任何关于账单的疑问，请联系我们。\n"
+"\n"
+"    谢谢您的合作。\n"
+"    此致  \n"
+"           敬礼"
 
 #. module: multi_company
 #: view:multi_company.default:0
diff --git a/addons/multi_company/i18n/zh_TW.po b/addons/multi_company/i18n/zh_TW.po
index 418d9d2a3c3..dfd2b6817ed 100644
--- a/addons/multi_company/i18n/zh_TW.po
+++ b/addons/multi_company/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-26 11:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
diff --git a/addons/note/i18n/de.po b/addons/note/i18n/de.po
index f084431f562..10ffbc65ec3 100644
--- a/addons/note/i18n/de.po
+++ b/addons/note/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 08:55+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -176,10 +176,10 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und EMails"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Stufe"
 
 #. module: note
 #: field:note.tag,name:0
@@ -216,11 +216,6 @@ msgstr "Notiz Stufe"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Für die Zuordnung der Notizen"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -294,10 +289,9 @@ msgid "Owner"
 msgstr "Besitzer"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Stufe"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Für die Zuordnung der Notizen"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/es.po b/addons/note/i18n/es.po
index 0a4c5e14ea3..3235ae55736 100644
--- a/addons/note/i18n/es.po
+++ b/addons/note/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 14:45+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -170,10 +170,10 @@ msgid "Categories"
 msgstr "Categorías"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Etapa"
 
 #. module: note
 #: field:note.tag,name:0
@@ -210,11 +210,6 @@ msgstr "Fase de nota"
 msgid "Summary"
 msgstr "Resumen"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Úselo para ordenar las fases de nota"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -287,10 +282,9 @@ msgid "Owner"
 msgstr "Propietario"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Etapa"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Úselo para ordenar las fases de nota"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/fr.po b/addons/note/i18n/fr.po
index ac372423512..48c4c75b4a0 100644
--- a/addons/note/i18n/fr.po
+++ b/addons/note/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-12 09:28+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -157,10 +157,10 @@ msgid "Categories"
 msgstr "Catégories"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaires et courriels"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
 
 #. module: note
 #: field:note.tag,name:0
@@ -197,11 +197,6 @@ msgstr ""
 msgid "Summary"
 msgstr "Résumé"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr ""
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -272,9 +267,8 @@ msgid "Owner"
 msgstr "Propriétaire"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
 msgstr ""
 
 #. module: note
diff --git a/addons/note/i18n/hr.po b/addons/note/i18n/hr.po
index 01be8bbc2b4..dd5c780b6fe 100644
--- a/addons/note/i18n/hr.po
+++ b/addons/note/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 20:42+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -157,10 +157,10 @@ msgid "Categories"
 msgstr "Kategorije"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i e-pošta."
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
 
 #. module: note
 #: field:note.tag,name:0
@@ -197,11 +197,6 @@ msgstr ""
 msgid "Summary"
 msgstr "Sažetak"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr ""
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -274,9 +269,8 @@ msgid "Owner"
 msgstr "Vlasnik"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
 msgstr ""
 
 #. module: note
diff --git a/addons/note/i18n/it.po b/addons/note/i18n/it.po
index c6cb2dc42dc..330a581dda2 100644
--- a/addons/note/i18n/it.po
+++ b/addons/note/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 07:15+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -175,10 +175,10 @@ msgid "Categories"
 msgstr "Categorie"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Fase"
 
 #. module: note
 #: field:note.tag,name:0
@@ -215,11 +215,6 @@ msgstr "Fase nota"
 msgid "Summary"
 msgstr "Riepilogo"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Usato per ordinare le fasi"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -292,10 +287,9 @@ msgid "Owner"
 msgstr "Proprietario"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Fase"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Usato per ordinare le fasi"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/nl.po b/addons/note/i18n/nl.po
index 201fcba9556..6155cc229bc 100644
--- a/addons/note/i18n/nl.po
+++ b/addons/note/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-24 21:35+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -175,10 +175,10 @@ msgid "Categories"
 msgstr "Categorieën"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Fase"
 
 #. module: note
 #: field:note.tag,name:0
@@ -215,11 +215,6 @@ msgstr "Notitie fase"
 msgid "Summary"
 msgstr "Samenvatting"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Wordt gebruikt om de notitie fases te sorteren"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -293,10 +288,9 @@ msgid "Owner"
 msgstr "Eigenaar"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Fase"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Wordt gebruikt om de notitie fases te sorteren"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/pl.po b/addons/note/i18n/pl.po
index 7c16c100b76..b7d46f6c551 100644
--- a/addons/note/i18n/pl.po
+++ b/addons/note/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 20:37+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -157,10 +157,10 @@ msgid "Categories"
 msgstr "Kategorie"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Etap"
 
 #. module: note
 #: field:note.tag,name:0
@@ -197,11 +197,6 @@ msgstr "Etap notatki"
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Stosowane do porządkowania etapów notatek"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -272,10 +267,9 @@ msgid "Owner"
 msgstr "Właściciel"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Etap"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Stosowane do porządkowania etapów notatek"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/pt.po b/addons/note/i18n/pt.po
index 0e255e8c555..e3059d69f97 100644
--- a/addons/note/i18n/pt.po
+++ b/addons/note/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 15:02+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
@@ -157,10 +157,10 @@ msgid "Categories"
 msgstr "Categorias"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
 
 #. module: note
 #: field:note.tag,name:0
@@ -197,11 +197,6 @@ msgstr ""
 msgid "Summary"
 msgstr "Resumo"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr ""
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -272,9 +267,8 @@ msgid "Owner"
 msgstr "Proprietário"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
 msgstr ""
 
 #. module: note
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index c67f1f2dbd5..a18c59dc42d 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:55+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
@@ -173,10 +173,10 @@ msgid "Categories"
 msgstr "Categorias"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Estágio"
 
 #. module: note
 #: field:note.tag,name:0
@@ -213,11 +213,6 @@ msgstr "Estágio da Nota"
 msgid "Summary"
 msgstr "Resumo"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Usado para ordenar os estágios das notas"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -291,10 +286,9 @@ msgid "Owner"
 msgstr "Proprietário"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Estágio"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Usado para ordenar os estágios das notas"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/ro.po b/addons/note/i18n/ro.po
index cf3e7a81884..238f7ba2180 100644
--- a/addons/note/i18n/ro.po
+++ b/addons/note/i18n/ro.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 14:27+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
@@ -157,10 +157,10 @@ msgid "Categories"
 msgstr "Categorii"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarii si e-mailuri"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Etapa"
 
 #. module: note
 #: field:note.tag,name:0
@@ -197,11 +197,6 @@ msgstr "Nota Etapa"
 msgid "Summary"
 msgstr "Rezumat"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "Utilizată pentru a comanda etapele notei"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -274,10 +269,9 @@ msgid "Owner"
 msgstr "Deținător"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "Etapa"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Utilizată pentru a comanda etapele notei"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note/i18n/zh_CN.po b/addons/note/i18n/zh_CN.po
index d2371bb5fb4..bb71db58125 100644
--- a/addons/note/i18n/zh_CN.po
+++ b/addons/note/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-27 01:57+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -166,10 +166,10 @@ msgid "Categories"
 msgstr "类别"
 
 #. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "阶段"
 
 #. module: note
 #: field:note.tag,name:0
@@ -206,11 +206,6 @@ msgstr "便签阶段"
 msgid "Summary"
 msgstr "摘要"
 
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr "用来整理便签阶段"
-
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
@@ -281,10 +276,9 @@ msgid "Owner"
 msgstr "承办人"
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
-msgstr "阶段"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "用来整理便签阶段"
 
 #. module: note
 #: field:note.note,date_done:0
diff --git a/addons/note_pad/i18n/es.po b/addons/note_pad/i18n/es.po
index dc8af830be6..0c57f07b716 100644
--- a/addons/note_pad/i18n/es.po
+++ b/addons/note_pad/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:28+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/note_pad/i18n/hr.po b/addons/note_pad/i18n/hr.po
index 2354b2623ff..4e6f11de5d4 100644
--- a/addons/note_pad/i18n/hr.po
+++ b/addons/note_pad/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:25+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/note_pad/i18n/it.po b/addons/note_pad/i18n/it.po
index f630f646ee4..539931fce40 100644
--- a/addons/note_pad/i18n/it.po
+++ b/addons/note_pad/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 08:46+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/note_pad/i18n/nl.po b/addons/note_pad/i18n/nl.po
index e053e54f739..6b66427c4ba 100644
--- a/addons/note_pad/i18n/nl.po
+++ b/addons/note_pad/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 19:41+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/note_pad/i18n/pl.po b/addons/note_pad/i18n/pl.po
index 73688218d21..fbcb9e61f95 100644
--- a/addons/note_pad/i18n/pl.po
+++ b/addons/note_pad/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 17:56+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
diff --git a/addons/note_pad/i18n/pt.po b/addons/note_pad/i18n/pt.po
index 90416030de5..025914e18db 100644
--- a/addons/note_pad/i18n/pt.po
+++ b/addons/note_pad/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 12:46+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/note_pad/i18n/pt_BR.po b/addons/note_pad/i18n/pt_BR.po
index 30a66801956..a79f718df96 100644
--- a/addons/note_pad/i18n/pt_BR.po
+++ b/addons/note_pad/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 13:00+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/note_pad/i18n/zh_CN.po b/addons/note_pad/i18n/zh_CN.po
index d4c72370cab..2ecd5feccbf 100644
--- a/addons/note_pad/i18n/zh_CN.po
+++ b/addons/note_pad/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 16:45+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
diff --git a/addons/pad/i18n/ar.po b/addons/pad/i18n/ar.po
index ba764951268..9caed512402 100644
--- a/addons/pad/i18n/ar.po
+++ b/addons/pad/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-13 19:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "الشركات"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/bg.po b/addons/pad/i18n/bg.po
index 9e99f544033..e7c6601868b 100644
--- a/addons/pad/i18n/bg.po
+++ b/addons/pad/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-10 23:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Фирми"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/ca.po b/addons/pad/i18n/ca.po
index e96cae68849..bee7219156c 100644
--- a/addons/pad/i18n/ca.po
+++ b/addons/pad/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-13 00:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Empreses"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/cs.po b/addons/pad/i18n/cs.po
index a100ad24e6a..df41e7c227c 100644
--- a/addons/pad/i18n/cs.po
+++ b/addons/pad/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:59+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Společnosti"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/da.po b/addons/pad/i18n/da.po
index 1b85d01159f..3abcff9f2e4 100644
--- a/addons/pad/i18n/da.po
+++ b/addons/pad/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 06:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr ""
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index 051528c52d7..31843d1c9c1 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 08:57+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -26,8 +26,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -41,15 +45,9 @@ msgid "Companies"
 msgstr "Unternehmen"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
-"Sie müssen zuerst Etherpad über das Menü Konfiguration / Unternehmen / "
-"Unternehmen im Aktenreiter Konfiguration für Ihr Unternehmen einstellen."
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
index 35ab6163781..4b45f46c5ae 100644
--- a/addons/pad/i18n/es.po
+++ b/addons/pad/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-12 14:48+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 11:30+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,9 +25,15 @@ msgid "&Ntilde;"
 msgstr "&Ntilde;"
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
-msgstr "Datos comunes del PAD"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
+msgstr ""
+"Debe configurar el etherpad a través del menú Configuración > Compañías > "
+"Compañías, en la pestaña de configuración de su compañía."
 
 #. module: pad
 #: help:res.company,pad_key:0
@@ -40,15 +46,9 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
-msgstr ""
-"Debe configurar Etherpad a través del menú Configuración > Compañías > "
-"Compañías, en la pestaña configuración de su compañía."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
+msgstr "Datos comunes del PAD"
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad/i18n/es_CR.po b/addons/pad/i18n/es_CR.po
index ecf588c42d9..5f7af82cc50 100644
--- a/addons/pad/i18n/es_CR.po
+++ b/addons/pad/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:54+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: pad
@@ -26,8 +26,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -41,12 +45,8 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/fi.po b/addons/pad/i18n/fi.po
index 32db0cc6fde..f0c355361a8 100644
--- a/addons/pad/i18n/fi.po
+++ b/addons/pad/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-20 09:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Yritykset"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/fr.po b/addons/pad/i18n/fr.po
index 8b04b009ba7..3b36ee3cfea 100644
--- a/addons/pad/i18n/fr.po
+++ b/addons/pad/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 19:59+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -26,8 +26,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -41,12 +45,8 @@ msgid "Companies"
 msgstr "Sociétés"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/gl.po b/addons/pad/i18n/gl.po
index f7eff7ade21..53d16b19eaa 100644
--- a/addons/pad/i18n/gl.po
+++ b/addons/pad/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-05 01:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/hr.po b/addons/pad/i18n/hr.po
index fe8f145c13a..161bbb9e94d 100644
--- a/addons/pad/i18n/hr.po
+++ b/addons/pad/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 21:22+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,9 +25,13 @@ msgid "&Ntilde;"
 msgstr "&Ntilde;"
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
-msgstr "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
+msgstr ""
 
 #. module: pad
 #: help:res.company,pad_key:0
@@ -40,13 +44,9 @@ msgid "Companies"
 msgstr "Organizacije"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
-msgstr "Etherpad postavke upišite podatke o organizaciji(tvrtci)."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad/i18n/hu.po b/addons/pad/i18n/hu.po
index b13a5d6fba9..6b376f81087 100644
--- a/addons/pad/i18n/hu.po
+++ b/addons/pad/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-04 15:07+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -24,8 +24,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -39,12 +43,8 @@ msgid "Companies"
 msgstr "Vállalatok"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/it.po b/addons/pad/i18n/it.po
index 44df7be4974..b11a5f55579 100644
--- a/addons/pad/i18n/it.po
+++ b/addons/pad/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 08:50+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,9 +25,13 @@ msgid "&Ntilde;"
 msgstr "&Ntilde;"
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
-msgstr "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
+msgstr ""
 
 #. module: pad
 #: help:res.company,pad_key:0
@@ -40,15 +44,9 @@ msgid "Companies"
 msgstr "Aziende"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
-msgstr ""
-"E' necessario configurare l'etherpad attraverso il menù: Impostazioni > "
-"Società > Società, nella scheda configurazione della vostra società."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad/i18n/ja.po b/addons/pad/i18n/ja.po
index 4b2890bd792..80221332c85 100644
--- a/addons/pad/i18n/ja.po
+++ b/addons/pad/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-24 21:26+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "会社"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/mn.po b/addons/pad/i18n/mn.po
index 7c91cf0bf75..9f4597c7b35 100644
--- a/addons/pad/i18n/mn.po
+++ b/addons/pad/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 13:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Компаниуд"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/nb.po b/addons/pad/i18n/nb.po
index 949faf46743..92863b5b6bd 100644
--- a/addons/pad/i18n/nb.po
+++ b/addons/pad/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Firmaer"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/nl.po b/addons/pad/i18n/nl.po
index 80e68c6d516..8bf7eb64b54 100644
--- a/addons/pad/i18n/nl.po
+++ b/addons/pad/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-20 10:04+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Bedrijven"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/pl.po b/addons/pad/i18n/pl.po
index 70f9511e0f3..b7093f97bf4 100644
--- a/addons/pad/i18n/pl.po
+++ b/addons/pad/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 17:56+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Firmy"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/pt.po b/addons/pad/i18n/pt.po
index 11f067a30ef..bbb7f61cf5f 100644
--- a/addons/pad/i18n/pt.po
+++ b/addons/pad/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 15:01+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
@@ -25,9 +25,13 @@ msgid "&Ntilde;"
 msgstr "&Ntilde;"
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
-msgstr "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
+msgstr ""
 
 #. module: pad
 #: help:res.company,pad_key:0
@@ -40,13 +44,9 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
-msgstr ""
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index 65f6e824e97..b72889a2533 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 13:03+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,9 +25,13 @@ msgid "&Ntilde;"
 msgstr "Ñ"
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
-msgstr "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
+msgstr ""
 
 #. module: pad
 #: help:res.company,pad_key:0
@@ -40,15 +44,9 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
-msgstr ""
-"Você deve configurar o etherpad através do menu Configuração > Empresas > "
-"Empresas, na aba de configuração da sua empresa."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad/i18n/ro.po b/addons/pad/i18n/ro.po
index 88d2467597d..dc1b022bf5a 100644
--- a/addons/pad/i18n/ro.po
+++ b/addons/pad/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-11 14:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Companii"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/ru.po b/addons/pad/i18n/ru.po
index ba09e5e8388..c5836e9051a 100644
--- a/addons/pad/i18n/ru.po
+++ b/addons/pad/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-16 00:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Компании"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/sl.po b/addons/pad/i18n/sl.po
index 85bcdfc1541..7482658964d 100644
--- a/addons/pad/i18n/sl.po
+++ b/addons/pad/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 18:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Družbe"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/sr@latin.po b/addons/pad/i18n/sr@latin.po
index dd64e63023d..0a6f3a040b4 100644
--- a/addons/pad/i18n/sr@latin.po
+++ b/addons/pad/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 18:44+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr ""
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
index 72ab7b604f4..4df3c919568 100644
--- a/addons/pad/i18n/sv.po
+++ b/addons/pad/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-12 21:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Bolag"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/tr.po b/addons/pad/i18n/tr.po
index f45421fd96c..397a1499702 100644
--- a/addons/pad/i18n/tr.po
+++ b/addons/pad/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-10 21:03+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,8 +25,12 @@ msgid "&Ntilde;"
 msgstr ""
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
 msgstr ""
 
 #. module: pad
@@ -40,12 +44,8 @@ msgid "Companies"
 msgstr "Şirketler"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
 msgstr ""
 
 #. module: pad
diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index c15e3663269..9e3130b4c70 100644
--- a/addons/pad/i18n/zh_CN.po
+++ b/addons/pad/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-28 08:20+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-23 01:32+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
@@ -25,9 +25,13 @@ msgid "&Ntilde;"
 msgstr "&Ntilde;"
 
 #. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
-msgstr "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid ""
+"You must configure the etherpad through the menu Settings > Companies > "
+"Companies, in the configuration tab of your company."
+msgstr "必须通过菜单“设置-公司-公司”，在公司的配置标签中设置 etherpad"
 
 #. module: pad
 #: help:res.company,pad_key:0
@@ -40,13 +44,9 @@ msgid "Companies"
 msgstr "公司"
 
 #. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid ""
-"You must configure the etherpad through the menu Setting > Companies > "
-"Companies, in the configuration tab of your company."
-msgstr "你必须通过菜单 设置->公司->公司,配置 etherpad ,在你的公司的 配置标签中。"
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
diff --git a/addons/pad_project/i18n/ar.po b/addons/pad_project/i18n/ar.po
index d8037410a77..93166740596 100644
--- a/addons/pad_project/i18n/ar.po
+++ b/addons/pad_project/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 07:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/cs.po b/addons/pad_project/i18n/cs.po
index 02e84135c45..6c736310700 100644
--- a/addons/pad_project/i18n/cs.po
+++ b/addons/pad_project/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:58+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/de.po b/addons/pad_project/i18n/de.po
index 63413f29b94..6919a2c5582 100644
--- a/addons/pad_project/i18n/de.po
+++ b/addons/pad_project/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 08:02+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
diff --git a/addons/pad_project/i18n/es.po b/addons/pad_project/i18n/es.po
index fa5ed1ac64d..38b40c4d1b6 100644
--- a/addons/pad_project/i18n/es.po
+++ b/addons/pad_project/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:28+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/es_CR.po b/addons/pad_project/i18n/es_CR.po
index f51c32b3a11..2e7270cd596 100644
--- a/addons/pad_project/i18n/es_CR.po
+++ b/addons/pad_project/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:48+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/fi.po b/addons/pad_project/i18n/fi.po
index b64b8934aeb..ee6aae98e97 100644
--- a/addons/pad_project/i18n/fi.po
+++ b/addons/pad_project/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-30 10:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
index 8940d3ff505..6ce76cd37eb 100644
--- a/addons/pad_project/i18n/fr.po
+++ b/addons/pad_project/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-03 22:22+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/hr.po b/addons/pad_project/i18n/hr.po
index 0226460bbc3..7e93fac59a7 100644
--- a/addons/pad_project/i18n/hr.po
+++ b/addons/pad_project/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 21:07+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/it.po b/addons/pad_project/i18n/it.po
index 107691b2013..74a6130b3eb 100644
--- a/addons/pad_project/i18n/it.po
+++ b/addons/pad_project/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 08:47+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/ja.po b/addons/pad_project/i18n/ja.po
index a642c00f191..79ef6414334 100644
--- a/addons/pad_project/i18n/ja.po
+++ b/addons/pad_project/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-02 02:53+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/mn.po b/addons/pad_project/i18n/mn.po
index 7184521a14b..4177c986693 100644
--- a/addons/pad_project/i18n/mn.po
+++ b/addons/pad_project/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-18 01:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/nb.po b/addons/pad_project/i18n/nb.po
index aac8b17555b..92297d8626e 100644
--- a/addons/pad_project/i18n/nb.po
+++ b/addons/pad_project/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/nl.po b/addons/pad_project/i18n/nl.po
index cc65083cc81..0b5e172ecf7 100644
--- a/addons/pad_project/i18n/nl.po
+++ b/addons/pad_project/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-24 22:08+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/pl.po b/addons/pad_project/i18n/pl.po
index 0aa6aebb9d8..360d969436f 100644
--- a/addons/pad_project/i18n/pl.po
+++ b/addons/pad_project/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 17:56+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
diff --git a/addons/pad_project/i18n/pt.po b/addons/pad_project/i18n/pt.po
index ede24dc9d9b..859bdd5c6b7 100644
--- a/addons/pad_project/i18n/pt.po
+++ b/addons/pad_project/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-22 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/pt_BR.po b/addons/pad_project/i18n/pt_BR.po
index 176293a343c..1e6d41cf953 100644
--- a/addons/pad_project/i18n/pt_BR.po
+++ b/addons/pad_project/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 13:08+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/ro.po b/addons/pad_project/i18n/ro.po
index 3c02bc8186d..54fc5726ad4 100644
--- a/addons/pad_project/i18n/ro.po
+++ b/addons/pad_project/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 14:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/ru.po b/addons/pad_project/i18n/ru.po
index cfc07501c97..e67e0d2d263 100644
--- a/addons/pad_project/i18n/ru.po
+++ b/addons/pad_project/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-14 07:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/sl.po b/addons/pad_project/i18n/sl.po
index 27d0e86fbec..b27977d049b 100644
--- a/addons/pad_project/i18n/sl.po
+++ b/addons/pad_project/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-03-13 10:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
index 080bf624ff1..9cc8086996c 100644
--- a/addons/pad_project/i18n/sv.po
+++ b/addons/pad_project/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-20 15:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/tr.po b/addons/pad_project/i18n/tr.po
index 766d113ce44..fbbdd59cc30 100644
--- a/addons/pad_project/i18n/tr.po
+++ b/addons/pad_project/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-07 20:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/zh_CN.po b/addons/pad_project/i18n/zh_CN.po
index bd6c2d03e02..0446727f26a 100644
--- a/addons/pad_project/i18n/zh_CN.po
+++ b/addons/pad_project/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:49+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po
index cd2c64bd7c6..abfdc3ce54f 100644
--- a/addons/plugin/i18n/ar.po
+++ b/addons/plugin/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 07:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/cs.po b/addons/plugin/i18n/cs.po
index 3facb42ae8f..79828545d07 100644
--- a/addons/plugin/i18n/cs.po
+++ b/addons/plugin/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:59+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/de.po b/addons/plugin/i18n/de.po
index fe45311efcd..e378a4c4d64 100644
--- a/addons/plugin/i18n/de.po
+++ b/addons/plugin/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 15:37+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/es.po b/addons/plugin/i18n/es.po
index 7ef95d0b6a1..f94eb4f4f5d 100644
--- a/addons/plugin/i18n/es.po
+++ b/addons/plugin/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-08 11:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/es_CR.po b/addons/plugin/i18n/es_CR.po
index ac2ea89320a..fad73208752 100644
--- a/addons/plugin/i18n/es_CR.po
+++ b/addons/plugin/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:49+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
index 122c1f36e7f..18a4779ac39 100644
--- a/addons/plugin/i18n/fi.po
+++ b/addons/plugin/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-24 12:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index 7c3ea822c4d..0f7db46888c 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-24 17:39+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/hr.po b/addons/plugin/i18n/hr.po
index e1dc542526b..35859569c48 100644
--- a/addons/plugin/i18n/hr.po
+++ b/addons/plugin/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:44+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/it.po b/addons/plugin/i18n/it.po
index a98243df804..2146b659c2b 100644
--- a/addons/plugin/i18n/it.po
+++ b/addons/plugin/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-15 10:49+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ja.po b/addons/plugin/i18n/ja.po
index 371efaa4d10..7d4bf29fbf1 100644
--- a/addons/plugin/i18n/ja.po
+++ b/addons/plugin/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-29 04:51+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/mn.po b/addons/plugin/i18n/mn.po
index 546ba634a10..d53d987fb1a 100644
--- a/addons/plugin/i18n/mn.po
+++ b/addons/plugin/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-24 06:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/nb.po b/addons/plugin/i18n/nb.po
index 19ed0e5b327..d88622bbd65 100644
--- a/addons/plugin/i18n/nb.po
+++ b/addons/plugin/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po
index 385ef48db64..53dd6952b75 100644
--- a/addons/plugin/i18n/nl.po
+++ b/addons/plugin/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-14 13:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po
index abe0612ed92..87bd3314e3c 100644
--- a/addons/plugin/i18n/pt.po
+++ b/addons/plugin/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-22 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt_BR.po b/addons/plugin/i18n/pt_BR.po
index afbfd03ed45..fb83608c02c 100644
--- a/addons/plugin/i18n/pt_BR.po
+++ b/addons/plugin/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-16 01:34+0000\n"
 "Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ro.po b/addons/plugin/i18n/ro.po
index 355ac506cbb..b689fa930a2 100644
--- a/addons/plugin/i18n/ro.po
+++ b/addons/plugin/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 14:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ru.po b/addons/plugin/i18n/ru.po
index 067a7ac2b84..b42adf3ef31 100644
--- a/addons/plugin/i18n/ru.po
+++ b/addons/plugin/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-14 07:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index 3b0344f1b1b..cc80d4e3206 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-04 15:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/tr.po b/addons/plugin/i18n/tr.po
index 8fc45d2850e..b5fbd10adbc 100644
--- a/addons/plugin/i18n/tr.po
+++ b/addons/plugin/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-21 19:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po
index ca40482d668..1f974ec7ed8 100644
--- a/addons/plugin/i18n/zh_CN.po
+++ b/addons/plugin/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-14 09:58+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/zh_TW.po b/addons/plugin/i18n/zh_TW.po
index 241e6980bf6..3f897e34920 100644
--- a/addons/plugin/i18n/zh_TW.po
+++ b/addons/plugin/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-21 06:38+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin_outlook/i18n/ar.po b/addons/plugin_outlook/i18n/ar.po
index 6eed8e390ce..ec11179ff39 100644
--- a/addons/plugin_outlook/i18n/ar.po
+++ b/addons/plugin_outlook/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-12 05:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/bg.po b/addons/plugin_outlook/i18n/bg.po
index 72802fc313a..67f29b87425 100644
--- a/addons/plugin_outlook/i18n/bg.po
+++ b/addons/plugin_outlook/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-26 02:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/ca.po b/addons/plugin_outlook/i18n/ca.po
index 02d4ba845c8..eccf4a20d21 100644
--- a/addons/plugin_outlook/i18n/ca.po
+++ b/addons/plugin_outlook/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-13 00:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/da.po b/addons/plugin_outlook/i18n/da.po
index 1fdb6cd2108..f1d6e13b90d 100644
--- a/addons/plugin_outlook/i18n/da.po
+++ b/addons/plugin_outlook/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-27 09:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/de.po b/addons/plugin_outlook/i18n/de.po
index 8c4f0f36cf3..2a9f9001e84 100644
--- a/addons/plugin_outlook/i18n/de.po
+++ b/addons/plugin_outlook/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-19 14:35+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
diff --git a/addons/plugin_outlook/i18n/el.po b/addons/plugin_outlook/i18n/el.po
index 871cc660d63..c0b16a51f24 100644
--- a/addons/plugin_outlook/i18n/el.po
+++ b/addons/plugin_outlook/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-02-08 19:50+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/es.po b/addons/plugin_outlook/i18n/es.po
index 5850ac65e37..85e194d942c 100644
--- a/addons/plugin_outlook/i18n/es.po
+++ b/addons/plugin_outlook/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:50+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/es_CR.po b/addons/plugin_outlook/i18n/es_CR.po
index c1146e62df8..a8372c17f27 100644
--- a/addons/plugin_outlook/i18n/es_CR.po
+++ b/addons/plugin_outlook/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:55+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: plugin_outlook
diff --git a/addons/plugin_outlook/i18n/et.po b/addons/plugin_outlook/i18n/et.po
index 4c87c8a231a..77a3570e8b3 100644
--- a/addons/plugin_outlook/i18n/et.po
+++ b/addons/plugin_outlook/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-11-30 14:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/fi.po b/addons/plugin_outlook/i18n/fi.po
index b6e2391b4dd..f5c10e26de9 100644
--- a/addons/plugin_outlook/i18n/fi.po
+++ b/addons/plugin_outlook/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-06-20 09:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/fr.po b/addons/plugin_outlook/i18n/fr.po
index b90352f077c..67fda733649 100644
--- a/addons/plugin_outlook/i18n/fr.po
+++ b/addons/plugin_outlook/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 04:57+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/gl.po b/addons/plugin_outlook/i18n/gl.po
index eb9c8880afa..e9979c3b5d1 100644
--- a/addons/plugin_outlook/i18n/gl.po
+++ b/addons/plugin_outlook/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-22 11:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/hr.po b/addons/plugin_outlook/i18n/hr.po
index 5872c4294ac..920bca886e8 100644
--- a/addons/plugin_outlook/i18n/hr.po
+++ b/addons/plugin_outlook/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 20:57+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/hu.po b/addons/plugin_outlook/i18n/hu.po
index eff344a7934..8f6a78dd2f6 100644
--- a/addons/plugin_outlook/i18n/hu.po
+++ b/addons/plugin_outlook/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-24 11:35+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/id.po b/addons/plugin_outlook/i18n/id.po
index 319b72f58e3..1179dde3858 100644
--- a/addons/plugin_outlook/i18n/id.po
+++ b/addons/plugin_outlook/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-07-16 09:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/it.po b/addons/plugin_outlook/i18n/it.po
index 46edf20589c..02add7012cf 100644
--- a/addons/plugin_outlook/i18n/it.po
+++ b/addons/plugin_outlook/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-13 05:18+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/ja.po b/addons/plugin_outlook/i18n/ja.po
index 24e3f6d0df7..d0892a1b1ae 100644
--- a/addons/plugin_outlook/i18n/ja.po
+++ b/addons/plugin_outlook/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-02 03:10+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/mn.po b/addons/plugin_outlook/i18n/mn.po
index d7ddc456157..3365a21c659 100644
--- a/addons/plugin_outlook/i18n/mn.po
+++ b/addons/plugin_outlook/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-21 13:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/nb.po b/addons/plugin_outlook/i18n/nb.po
index 1a104fe53fe..7fdcb021829 100644
--- a/addons/plugin_outlook/i18n/nb.po
+++ b/addons/plugin_outlook/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/nl.po b/addons/plugin_outlook/i18n/nl.po
index 6910a0453eb..9c052db4615 100644
--- a/addons/plugin_outlook/i18n/nl.po
+++ b/addons/plugin_outlook/i18n/nl.po
@@ -7,25 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-09 17:43+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 19:17+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
 msgid "Outlook Plug-in 32bits"
-msgstr ""
+msgstr "Outlook Plug-in 32bits"
 
 #. module: plugin_outlook
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Download en installeer de plug-in"
 
 #. module: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
@@ -35,7 +35,7 @@ msgstr "outlook.installer"
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "MS .Net Framework 3.5 or above."
-msgstr ""
+msgstr "MS .Net Framework 3.5 of hoger."
 
 #. module: plugin_outlook
 #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
@@ -48,7 +48,7 @@ msgstr "Installeer de Outlook Plug-In"
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "System requirements:"
-msgstr ""
+msgstr "Systeem vereisten."
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -61,21 +61,23 @@ msgid ""
 "Click on the link above to download the installer for either 32 or 64 bits, "
 "and execute it."
 msgstr ""
+"Klik op de bovenstaande link om de installer voor 32 of 64 bits te "
+"downloaden en te tarten."
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "MS Outlook 2005 or above."
-msgstr ""
+msgstr "MS Outlook 2005 of hoger"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin64:0
 msgid "Outlook Plug-in 64bits"
-msgstr ""
+msgstr "Outlook Plug-in 64bits"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -87,6 +89,7 @@ msgstr "Installatie en configuratie stappen"
 #: help:outlook.installer,plugin64:0
 msgid "Outlook plug-in file. Save this file and install it in Outlook."
 msgstr ""
+"Outlook-plugin bestand. Sa dit bestand op en installeer het in Outlook."
 
 #~ msgid "Outlook Plug-in"
 #~ msgstr "Outlook Plug-in"
diff --git a/addons/plugin_outlook/i18n/pl.po b/addons/plugin_outlook/i18n/pl.po
index 8dc6b879fc2..ec11d979494 100644
--- a/addons/plugin_outlook/i18n/pl.po
+++ b/addons/plugin_outlook/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-12 18:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/pt.po b/addons/plugin_outlook/i18n/pt.po
index 92ac0fc57aa..44671f3760c 100644
--- a/addons/plugin_outlook/i18n/pt.po
+++ b/addons/plugin_outlook/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-20 11:44+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/pt_BR.po b/addons/plugin_outlook/i18n/pt_BR.po
index ebee15808ee..952b5312f61 100644
--- a/addons/plugin_outlook/i18n/pt_BR.po
+++ b/addons/plugin_outlook/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 12:55+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
diff --git a/addons/plugin_outlook/i18n/ro.po b/addons/plugin_outlook/i18n/ro.po
index e31e695e7ae..47cb97513e3 100644
--- a/addons/plugin_outlook/i18n/ro.po
+++ b/addons/plugin_outlook/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-11 14:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/ru.po b/addons/plugin_outlook/i18n/ru.po
index 5f6f9244da6..796ade72c4c 100644
--- a/addons/plugin_outlook/i18n/ru.po
+++ b/addons/plugin_outlook/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-03-09 16:04+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/sl.po b/addons/plugin_outlook/i18n/sl.po
index 576e2efa803..4040b2b5935 100644
--- a/addons/plugin_outlook/i18n/sl.po
+++ b/addons/plugin_outlook/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-16 18:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/sr@latin.po b/addons/plugin_outlook/i18n/sr@latin.po
index b3e5eb10dfe..b7f9cd028a5 100644
--- a/addons/plugin_outlook/i18n/sr@latin.po
+++ b/addons/plugin_outlook/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-10 18:43+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/sv.po b/addons/plugin_outlook/i18n/sv.po
index 9ab76c2eb21..7ce0509cb7e 100644
--- a/addons/plugin_outlook/i18n/sv.po
+++ b/addons/plugin_outlook/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-15 10:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/tr.po b/addons/plugin_outlook/i18n/tr.po
index 22ebb0f5081..c779e6db811 100644
--- a/addons/plugin_outlook/i18n/tr.po
+++ b/addons/plugin_outlook/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_outlook/i18n/zh_CN.po b/addons/plugin_outlook/i18n/zh_CN.po
index 49dbb66611a..5edfc897985 100644
--- a/addons/plugin_outlook/i18n/zh_CN.po
+++ b/addons/plugin_outlook/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 07:53+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
diff --git a/addons/plugin_thunderbird/i18n/ar.po b/addons/plugin_thunderbird/i18n/ar.po
index ac0cc90e27e..4132806e216 100644
--- a/addons/plugin_thunderbird/i18n/ar.po
+++ b/addons/plugin_thunderbird/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-17 03:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/bg.po b/addons/plugin_thunderbird/i18n/bg.po
index ff631aef11f..b0d78817d91 100644
--- a/addons/plugin_thunderbird/i18n/bg.po
+++ b/addons/plugin_thunderbird/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-02-16 15:05+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/ca.po b/addons/plugin_thunderbird/i18n/ca.po
index ea43eefde76..1979cbeb2bc 100644
--- a/addons/plugin_thunderbird/i18n/ca.po
+++ b/addons/plugin_thunderbird/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-26 19:12+0000\n"
 "Last-Translator: tfr (Openerp) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/cs.po b/addons/plugin_thunderbird/i18n/cs.po
index a327ec1f7af..bfd6771f449 100644
--- a/addons/plugin_thunderbird/i18n/cs.po
+++ b/addons/plugin_thunderbird/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-04-06 06:56+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/da.po b/addons/plugin_thunderbird/i18n/da.po
index 4022fb3317b..4f3aa0223cc 100644
--- a/addons/plugin_thunderbird/i18n/da.po
+++ b/addons/plugin_thunderbird/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-09 21:50+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/de.po b/addons/plugin_thunderbird/i18n/de.po
index 3c962a9b11e..6fee47304b6 100644
--- a/addons/plugin_thunderbird/i18n/de.po
+++ b/addons/plugin_thunderbird/i18n/de.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 08:04+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/en_GB.po b/addons/plugin_thunderbird/i18n/en_GB.po
index 927562b4097..1acd1c53ae2 100644
--- a/addons/plugin_thunderbird/i18n/en_GB.po
+++ b/addons/plugin_thunderbird/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-04-28 19:32+0000\n"
 "Last-Translator: Luis Miguel D.P. <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/en_US.po b/addons/plugin_thunderbird/i18n/en_US.po
index 7ab92053cde..7b9b4970844 100644
--- a/addons/plugin_thunderbird/i18n/en_US.po
+++ b/addons/plugin_thunderbird/i18n/en_US.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-01-21 08:45+0000\n"
 "Last-Translator: Marco Dieckhoff <Unknown>\n"
 "Language-Team: English (United States) <en_US@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/es.po b/addons/plugin_thunderbird/i18n/es.po
index 37454bd0435..8e42a2a55f9 100644
--- a/addons/plugin_thunderbird/i18n/es.po
+++ b/addons/plugin_thunderbird/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 15:21+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/es_CR.po b/addons/plugin_thunderbird/i18n/es_CR.po
index 72daba707bb..8db4f894b69 100644
--- a/addons/plugin_thunderbird/i18n/es_CR.po
+++ b/addons/plugin_thunderbird/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 20:56+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/et.po b/addons/plugin_thunderbird/i18n/et.po
index 850f14b6278..b11593e8c1e 100644
--- a/addons/plugin_thunderbird/i18n/et.po
+++ b/addons/plugin_thunderbird/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-05-07 16:33+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/eu.po b/addons/plugin_thunderbird/i18n/eu.po
index 2354b6ab387..7ca57fef54b 100644
--- a/addons/plugin_thunderbird/i18n/eu.po
+++ b/addons/plugin_thunderbird/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-10-08 07:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/fi.po b/addons/plugin_thunderbird/i18n/fi.po
index 71a936ee885..18c59db119b 100644
--- a/addons/plugin_thunderbird/i18n/fi.po
+++ b/addons/plugin_thunderbird/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-08-04 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index 0d195df3f2f..7e36d3e1efd 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/i18n/fr.po
@@ -7,31 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-24 17:39+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 14:39+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Redémarrer Thunderbird"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Installation de l'extension Thunderbird :"
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Télécharger et installer l'extension"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -64,7 +63,7 @@ msgstr "Nom du fichier"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Cliquez sur \"Installer maintenant\"."
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -80,7 +79,7 @@ msgstr "Module pour Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "Configurer votre serveur OpenERP"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -94,17 +93,17 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Enregistrer l'extension Thunderbird"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "Sélectionnez l'extension (le fichier nommé \"openerp_plugin.xpi\")."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -112,11 +111,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"Depuis le menu Thunderbird : Outils -> Modules complémentaires -> Icône "
+"tournevis/clé à molette -> Installer un module depuis un fichier..."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "Depuis le menu Thunderbird : OpenERP -> Configuration"
 
 #~ msgid "Description"
 #~ msgstr "Description"
diff --git a/addons/plugin_thunderbird/i18n/gl.po b/addons/plugin_thunderbird/i18n/gl.po
index 673e0297a50..153c3345420 100644
--- a/addons/plugin_thunderbird/i18n/gl.po
+++ b/addons/plugin_thunderbird/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-05-10 10:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/hr.po b/addons/plugin_thunderbird/i18n/hr.po
index 5549dd01efc..89f81a1b983 100644
--- a/addons/plugin_thunderbird/i18n/hr.po
+++ b/addons/plugin_thunderbird/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 20:59+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/hu.po b/addons/plugin_thunderbird/i18n/hu.po
index 04b53dbbef9..fe202dae70b 100644
--- a/addons/plugin_thunderbird/i18n/hu.po
+++ b/addons/plugin_thunderbird/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-26 19:12+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/is.po b/addons/plugin_thunderbird/i18n/is.po
index a6412f432fd..4ab78e1e503 100644
--- a/addons/plugin_thunderbird/i18n/is.po
+++ b/addons/plugin_thunderbird/i18n/is.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-19 10:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/it.po b/addons/plugin_thunderbird/i18n/it.po
index 5735eaf0fdc..4595bfa7529 100644
--- a/addons/plugin_thunderbird/i18n/it.po
+++ b/addons/plugin_thunderbird/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 23:19+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/ja.po b/addons/plugin_thunderbird/i18n/ja.po
index 0aa933191f1..bd95ad79001 100644
--- a/addons/plugin_thunderbird/i18n/ja.po
+++ b/addons/plugin_thunderbird/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-31 22:07+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/mn.po b/addons/plugin_thunderbird/i18n/mn.po
index 2bbb7050577..136bb543e06 100644
--- a/addons/plugin_thunderbird/i18n/mn.po
+++ b/addons/plugin_thunderbird/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-09-29 08:36+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/nb.po b/addons/plugin_thunderbird/i18n/nb.po
index b04948a42e1..d12b9d7335c 100644
--- a/addons/plugin_thunderbird/i18n/nb.po
+++ b/addons/plugin_thunderbird/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-09-10 13:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/nl.po b/addons/plugin_thunderbird/i18n/nl.po
index e3e70b60d8e..c6852517ce1 100644
--- a/addons/plugin_thunderbird/i18n/nl.po
+++ b/addons/plugin_thunderbird/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-25 21:06+0000\n"
 "Last-Translator: Mario Gielissen <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/pl.po b/addons/plugin_thunderbird/i18n/pl.po
index d95d5334757..e574793bd68 100644
--- a/addons/plugin_thunderbird/i18n/pl.po
+++ b/addons/plugin_thunderbird/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-08-22 05:50+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/pt.po b/addons/plugin_thunderbird/i18n/pt.po
index e18c688ed91..1dee04e45bf 100644
--- a/addons/plugin_thunderbird/i18n/pt.po
+++ b/addons/plugin_thunderbird/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-26 19:12+0000\n"
 "Last-Translator: tfr (Openerp) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/pt_BR.po b/addons/plugin_thunderbird/i18n/pt_BR.po
index fd748c38e8d..7b25d16c52c 100644
--- a/addons/plugin_thunderbird/i18n/pt_BR.po
+++ b/addons/plugin_thunderbird/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-20 12:59+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/ro.po b/addons/plugin_thunderbird/i18n/ro.po
index 0ff0fe7b86e..17a0c690b30 100644
--- a/addons/plugin_thunderbird/i18n/ro.po
+++ b/addons/plugin_thunderbird/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-01-09 12:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/ru.po b/addons/plugin_thunderbird/i18n/ru.po
index 44c9e4ec8aa..8a420ff1a6c 100644
--- a/addons/plugin_thunderbird/i18n/ru.po
+++ b/addons/plugin_thunderbird/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-12-26 19:12+0000\n"
 "Last-Translator: tfr (Openerp) <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/sk.po b/addons/plugin_thunderbird/i18n/sk.po
index 5e02e07c038..f1223910971 100644
--- a/addons/plugin_thunderbird/i18n/sk.po
+++ b/addons/plugin_thunderbird/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-03-05 23:50+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/sl.po b/addons/plugin_thunderbird/i18n/sl.po
index c97dff25886..0eafdc7d17c 100644
--- a/addons/plugin_thunderbird/i18n/sl.po
+++ b/addons/plugin_thunderbird/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-01-27 14:25+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/sr.po b/addons/plugin_thunderbird/i18n/sr.po
index b1fc4f3ec58..6368fb9bb3b 100644
--- a/addons/plugin_thunderbird/i18n/sr.po
+++ b/addons/plugin_thunderbird/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-07-21 07:40+0000\n"
 "Last-Translator: novta <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/sr@latin.po b/addons/plugin_thunderbird/i18n/sr@latin.po
index 5cfc4aea1f1..b0c8d0833db 100644
--- a/addons/plugin_thunderbird/i18n/sr@latin.po
+++ b/addons/plugin_thunderbird/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2010-12-23 15:05+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/sv.po b/addons/plugin_thunderbird/i18n/sv.po
index eb61b430c46..98e5318f65d 100644
--- a/addons/plugin_thunderbird/i18n/sv.po
+++ b/addons/plugin_thunderbird/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-17 08:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/tr.po b/addons/plugin_thunderbird/i18n/tr.po
index 0ad76600fbb..20c9b3a73da 100644
--- a/addons/plugin_thunderbird/i18n/tr.po
+++ b/addons/plugin_thunderbird/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-09 21:45+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index 4581f592c4d..52aa3e1043e 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 13:58+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index fa6b0cace44..464eddb608e 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "إخراج نقد"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "نسبة الخصم (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "فانتا برتقال 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "فاتورة العميل"
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr "صندوق النقد المغلق اليوم"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "لا يوجد قائمة اسعار !"
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr "لم يتم تعريف تسجيل النقدية!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr "كشف حساب بنك"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr "مرحَلة"
 msgid "Paid:"
 msgstr "مدفوع:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr "قيد يومية"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr "فاتورة المورد"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr "شكلي"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index 1898b843841..ecfa1ce276b 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 17:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Изваждане на пари"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Отстъпка (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Фактура към клиент"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Пица"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr "Плащания по потребител"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1355,7 +1360,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1621,7 +1626,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1639,7 +1644,7 @@ msgid "Number of Transaction"
 msgstr "Брой транзакции"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1810,7 +1815,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Не може да се изтрие!"
@@ -1898,7 +1903,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1974,7 +1979,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1982,7 +1987,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Няма ценова листа !"
@@ -2034,7 +2039,7 @@ msgid "No Cash Register Defined !"
 msgstr "Не е дефиниран касов апарат"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2219,7 +2224,7 @@ msgid "Bank Statement"
 msgstr "Банково извлечение"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2279,7 +2284,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2754,7 +2759,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2798,11 +2803,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3081,17 +3081,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3185,13 +3185,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3226,7 +3226,7 @@ msgid "Journal Entry"
 msgstr "Дневников запис"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3257,7 +3257,7 @@ msgid "Supplier Invoice"
 msgstr "Фактура към доставчик"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3336,7 +3336,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3377,7 +3377,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3493,7 +3493,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3537,7 +3537,7 @@ msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Моля, изберете партньор за тази продажба."
@@ -3589,7 +3589,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3948,7 +3948,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index 6b43af7a71a..66e27649cdc 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 17:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index 68fcc978721..6d8cef6e0ec 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Producte del usuari"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Pagament per usuari"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1355,7 +1360,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caixa registradora tancada avui"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1621,7 +1626,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1639,7 +1644,7 @@ msgid "Number of Transaction"
 msgstr "Número de transacció"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1810,7 +1815,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1898,7 +1903,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1973,7 +1978,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1981,7 +1986,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "No existeix tarifa!"
@@ -2033,7 +2038,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2218,7 +2223,7 @@ msgid "Bank Statement"
 msgstr "Extracte bancari"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2278,7 +2283,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2753,7 +2758,7 @@ msgid "Pos Lines"
 msgstr "Línies TPV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2797,11 +2802,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3080,17 +3080,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3184,13 +3184,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3225,7 +3225,7 @@ msgid "Journal Entry"
 msgstr "Assentament comptable"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3256,7 +3256,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveïdor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3335,7 +3335,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3376,7 +3376,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3492,7 +3492,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3536,7 +3536,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Si us plau, indiqueu una empresa per la venda."
@@ -3588,7 +3588,7 @@ msgid "Print Receipt"
 msgstr "Imprimeix rebut"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3947,7 +3947,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index c63ba39b168..c27e1fb50ae 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-11-17 07:09+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 75c3a0cfb55..057614ed8c0 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-07 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 45f0903173d..89e63ca94d2 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 23:37+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
@@ -148,7 +148,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr "Eine benutzerdefinierte EAN zuweisen"
@@ -181,7 +181,7 @@ msgid "Take Money Out"
 msgstr "Geld entnehmen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr "nicht genutzt"
@@ -204,8 +204,8 @@ msgid "Reference"
 msgstr "Referenz"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -243,7 +243,7 @@ msgid "Help needed"
 msgstr "Es wird Hilfe benötigt"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfehler!"
@@ -336,7 +336,7 @@ msgid "Disc.(%)"
 msgstr "Rabatt (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Weisen Sie ein Ertragskonto für dieses Produkt zu: \"%s\" (id:%d)."
@@ -443,7 +443,7 @@ msgid "Hardware Events"
 msgstr "Hardware Ereignis"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr "Sie müssen einen Point Of Sale für Ihre Sitzung auswählen."
@@ -459,7 +459,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -473,8 +473,8 @@ msgstr ""
 "Prüfung' nutzen, um Differenzen zu vermeiden."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr "Fehler!"
@@ -509,7 +509,7 @@ msgid "Validate & Open Session"
 msgstr "Quittiere & Öffne Kassensitzung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -656,7 +656,7 @@ msgstr ""
 "            "
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Ausgangsrechnung"
@@ -819,6 +819,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -1041,7 +1046,7 @@ msgid "User's Product"
 msgstr "Produkte des Benutzers"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1093,7 +1098,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1175,7 +1180,7 @@ msgstr "Zahlungen nach Benutzer"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1218,8 +1223,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1426,7 +1431,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Heutige Kassenabschlüsse"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr "Die ausgewählten Aufträge haben nicht die gleiche Sitzung"
@@ -1694,7 +1699,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1715,7 +1720,7 @@ msgid "Number of Transaction"
 msgstr "Transaktionsnummer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1888,7 +1893,7 @@ msgid "Difference"
 msgstr "Differenz"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Nicht löschbar!"
@@ -1983,7 +1988,7 @@ msgid "User:"
 msgstr "Benutzer:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -2060,7 +2065,7 @@ msgid "Salespeople"
 msgstr "Verkäufer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -2068,7 +2073,7 @@ msgid "You have to open at least one cashbox."
 msgstr "Sie sollten mindestens eine Kasse eröffnen."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Keine Preisliste!"
@@ -2120,7 +2125,7 @@ msgid "No Cash Register Defined !"
 msgstr "Keine Kassa definiert."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2323,7 +2328,7 @@ msgid "Bank Statement"
 msgstr "Bank Auszug"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2383,7 +2388,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2865,7 +2870,7 @@ msgid "Pos Lines"
 msgstr "Auftragspositionen POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr "Point Of Sale Umsatz"
@@ -2909,11 +2914,6 @@ msgstr "Gebucht"
 msgid "Paid:"
 msgstr "Bezahlt:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr "= Theoretischer Saldo"
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3193,17 +3193,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3300,13 +3300,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr "Handel Debitoren"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Um einen Verkauf zu löschen muss diese neu oder storniert sein."
@@ -3344,7 +3344,7 @@ msgid "Journal Entry"
 msgstr "Journalbuchung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3376,7 +3376,7 @@ msgid "Supplier Invoice"
 msgstr "Lieferantenrechnung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3457,7 +3457,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Lieferung nicht löschbar!"
@@ -3498,7 +3498,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3624,7 +3624,7 @@ msgid "Default Point of Sale"
 msgstr "Standard Point Of Sale"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr "Es existiert keine Kasse für diese PoS Session"
@@ -3668,7 +3668,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Bitte Partner für Verkauf definieren"
@@ -3720,7 +3720,7 @@ msgid "Print Receipt"
 msgstr "Drucke Quittung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr "Point Of Sale Verlust"
@@ -4095,7 +4095,7 @@ msgstr ""
 "Bedauerlicher Weise kann keine Sitzung für diesen Benutzer erstellt werden."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 6b88ae2f40e..256b86cb1de 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 15:49+0000\n"
 "Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr "Αριθμός Συναλλαγών"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Κανένας Τιμοκατάλογος !"
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr "Γραμμές POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr "Τιμολόγιο Προμηθευτή"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr "ΠΡΟ-ΦΟΡΜΑ"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Παρακαλώ καθορίστε έναν συνεργάτη για πώληση."
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 5e3379f573e..6f29e6142a7 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-19 19:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 11:40+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
@@ -142,7 +142,7 @@ msgid "Red grapefruit"
 msgstr "Pomelo rojo"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr "Asignar un EAN personalizado"
@@ -174,7 +174,7 @@ msgid "Take Money Out"
 msgstr "Sacar dinero"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr "no usado"
@@ -197,8 +197,8 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -235,7 +235,7 @@ msgid "Help needed"
 msgstr "Se necesita ayuda"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -328,7 +328,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Hardware Events"
 msgstr "Eventos de hardware"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr "Debe asignar un TPV a su sesión."
@@ -451,7 +451,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -465,8 +465,8 @@ msgstr ""
 "de caja' para evitar cualquier diferencia."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr "¡Error!"
@@ -500,7 +500,7 @@ msgid "Validate & Open Session"
 msgstr "Validar y abrir sesión"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -644,7 +644,7 @@ msgstr ""
 "            "
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Factura de cliente"
@@ -805,6 +805,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr "= Saldo teórico"
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -1025,7 +1030,7 @@ msgid "User's Product"
 msgstr "Producto del usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1077,7 +1082,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1159,7 +1164,7 @@ msgstr "Pago por usuario"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1202,8 +1207,8 @@ msgid "2L Evian"
 msgstr "Evian 2 l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1410,7 +1415,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caja registradora cerrada hoy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr "¡Los pedidos seleccionados no tienen la misma sesión!"
@@ -1678,7 +1683,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1698,7 +1703,7 @@ msgid "Number of Transaction"
 msgstr "Número de transacción"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1872,7 +1877,7 @@ msgid "Difference"
 msgstr "Diferencia"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "No se puede eliminar!"
@@ -1966,7 +1971,7 @@ msgid "User:"
 msgstr "Usuario:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -2045,7 +2050,7 @@ msgid "Salespeople"
 msgstr "Vendedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -2053,7 +2058,7 @@ msgid "You have to open at least one cashbox."
 msgstr "Tiene que abrir al menos una caja."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No existe tarifa!"
@@ -2105,7 +2110,7 @@ msgid "No Cash Register Defined !"
 msgstr "No se ha definido un registro de caja!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2302,7 +2307,7 @@ msgid "Bank Statement"
 msgstr "Extracto bancario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2362,7 +2367,7 @@ msgid "Golden Apples Perlim"
 msgstr "Manzanas Golden Perlim"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2842,7 +2847,7 @@ msgid "Pos Lines"
 msgstr "Líneas TPV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr "Ganancias del TPV"
@@ -2886,11 +2891,6 @@ msgstr "Contabilizado"
 msgid "Paid:"
 msgstr "Pagado:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr "= Saldo teórico"
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3171,17 +3171,17 @@ msgid "Boni Oranges"
 msgstr "Naranajas Boni"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3277,13 +3277,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr "Créditos por ventas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Para eliminar una venta, ésta debe ser nueva o cancelada"
@@ -3320,7 +3320,7 @@ msgid "Journal Entry"
 msgstr "Asiento contable"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr "No hay cuenta a cobrar definida para hacer el pago."
@@ -3351,7 +3351,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3432,7 +3432,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Imposible cancelar el albarán te entrada."
@@ -3473,7 +3473,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3597,7 +3597,7 @@ msgid "Default Point of Sale"
 msgstr "TPV por defecto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr "No hay caja registradora para esta sesión de TPV"
@@ -3641,7 +3641,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por favor indique una empresa para la venta."
@@ -3693,7 +3693,7 @@ msgid "Print Receipt"
 msgstr "Imprimir recibo"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr "Pérdidas del TPV"
@@ -4066,7 +4066,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr "Lo siento, no se puede crear una sesión para este usuario."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index fb5d40cfad0..aed3a7a271b 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-21 22:36+0000\n"
 "Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Desc. (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr "Número de Transacción"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sin lista de precio !"
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr "Líneas del PdV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Please provide a partner for the sale."
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/es_CR.po b/addons/point_of_sale/i18n/es_CR.po
index 8923cfa3020..76246e4e938 100644
--- a/addons/point_of_sale/i18n/es_CR.po
+++ b/addons/point_of_sale/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-17 21:48+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: point_of_sale
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr "Sacar dinero"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Naranja 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Factura de cliente"
@@ -764,6 +764,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr "Producto del usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1027,7 +1032,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1109,7 +1114,7 @@ msgstr "Pago por usuario"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1152,8 +1157,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1358,7 +1363,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caja registradora cerrada hoy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1624,7 +1629,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1642,7 +1647,7 @@ msgid "Number of Transaction"
 msgstr "Número de transacción"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1813,7 +1818,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "¡Imposible Eliminar!"
@@ -1903,7 +1908,7 @@ msgid "User:"
 msgstr "Usuario:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1980,7 +1985,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1988,7 +1993,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No existe tarifa!"
@@ -2040,7 +2045,7 @@ msgid "No Cash Register Defined !"
 msgstr "¡No definido por la caja registradora!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2225,7 +2230,7 @@ msgid "Bank Statement"
 msgstr "Extracto bancario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2285,7 +2290,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2763,7 +2768,7 @@ msgid "Pos Lines"
 msgstr "Líneas TPV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2807,11 +2812,6 @@ msgstr "Fijado"
 msgid "Paid:"
 msgstr "Pagado:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3090,17 +3090,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3194,13 +3194,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Con el fin de eliminar una venta, debe ser nuevo o cancelado."
@@ -3237,7 +3237,7 @@ msgid "Journal Entry"
 msgstr "Asiento contable"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3268,7 +3268,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3347,7 +3347,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "No se puede cancelar la recolección."
@@ -3388,7 +3388,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3504,7 +3504,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3548,7 +3548,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por favor indique una empresa para la venta."
@@ -3600,7 +3600,7 @@ msgid "Print Receipt"
 msgstr "Imprimir recibo"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3961,7 +3961,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index 98fad9c858d..04787b1f776 100644
--- a/addons/point_of_sale/i18n/es_EC.po
+++ b/addons/point_of_sale/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-10 22:34+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "User's Product"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Pagos por Usuario"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1355,7 +1360,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Today's Closed Cashbox"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1621,7 +1626,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1639,7 +1644,7 @@ msgid "Number of Transaction"
 msgstr "Número de transacción"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1810,7 +1815,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1898,7 +1903,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1973,7 +1978,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1981,7 +1986,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "No hay list de precios"
@@ -2033,7 +2038,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2218,7 +2223,7 @@ msgid "Bank Statement"
 msgstr "Extracto Bancario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2278,7 +2283,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2753,7 +2758,7 @@ msgid "Pos Lines"
 msgstr "Líneas TPV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2797,11 +2802,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3080,17 +3080,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3184,13 +3184,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3225,7 +3225,7 @@ msgid "Journal Entry"
 msgstr "Asiento de Diario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3256,7 +3256,7 @@ msgid "Supplier Invoice"
 msgstr "Supplier Invoice"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3335,7 +3335,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3376,7 +3376,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3492,7 +3492,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3536,7 +3536,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Please provide a partner for the sale."
@@ -3588,7 +3588,7 @@ msgid "Print Receipt"
 msgstr "Print Receipt"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3947,7 +3947,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index de7e80a1a36..db57f8a5dac 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-10-11 18:22+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #, python-format
 #~ msgid "Modify line failed !"
@@ -143,7 +143,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -173,7 +173,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -196,8 +196,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -234,7 +234,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -327,7 +327,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -431,7 +431,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -447,7 +447,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -457,8 +457,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -491,7 +491,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -621,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -775,6 +775,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -986,7 +991,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1036,7 +1041,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1118,7 +1123,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1161,8 +1166,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1365,7 +1370,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1631,7 +1636,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1649,7 +1654,7 @@ msgid "Number of Transaction"
 msgstr "Tehingu number"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1820,7 +1825,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1908,7 +1913,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1983,7 +1988,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1991,7 +1996,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Puudub hinnakiri !"
@@ -2043,7 +2048,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2228,7 +2233,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2288,7 +2293,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2763,7 +2768,7 @@ msgid "Pos Lines"
 msgstr "MK read"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2807,11 +2812,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3090,17 +3090,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3194,13 +3194,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3235,7 +3235,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3266,7 +3266,7 @@ msgid "Supplier Invoice"
 msgstr "Tarnija arve"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3345,7 +3345,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3386,7 +3386,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3502,7 +3502,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3546,7 +3546,7 @@ msgid "PRO-FORMA"
 msgstr "Ettemaks"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Palun lisa müügipartnerit"
@@ -3598,7 +3598,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3957,7 +3957,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index 5a1397d9f84..7a5fe9b4128 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Alennus (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr "Käyttäjän tuote"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1027,7 +1032,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1109,7 +1114,7 @@ msgstr "Käyttäjän maksu"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1152,8 +1157,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1356,7 +1361,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Päivän suljettu kassakone"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1622,7 +1627,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1640,7 +1645,7 @@ msgid "Number of Transaction"
 msgstr "Tapahtuman numero"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1811,7 +1816,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1899,7 +1904,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1974,7 +1979,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1982,7 +1987,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ei hinnastoa!"
@@ -2034,7 +2039,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2219,7 +2224,7 @@ msgid "Bank Statement"
 msgstr "Pankin tiliote"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2279,7 +2284,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2754,7 +2759,7 @@ msgid "Pos Lines"
 msgstr "Kassapääte rivit"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2798,11 +2803,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3081,17 +3081,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3185,13 +3185,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3226,7 +3226,7 @@ msgid "Journal Entry"
 msgstr "Päiväkirjavienti"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3257,7 +3257,7 @@ msgid "Supplier Invoice"
 msgstr "Toimittajan lasku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3336,7 +3336,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3377,7 +3377,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3493,7 +3493,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3537,7 +3537,7 @@ msgid "PRO-FORMA"
 msgstr "Proforma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Anna kumppani myyntiä varten."
@@ -3589,7 +3589,7 @@ msgid "Print Receipt"
 msgstr "Tulosta kuitti"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3948,7 +3948,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index 639280fbea8..6c18edeb556 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-04 10:52+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Retirer de l'argent"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr "Référence"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erreur de paramétrage !"
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Rem.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Facture clilent"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Articles utilisateur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Paiement par utilisateur"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caisse fermée d'aujourd'hui"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "Nombre de Transactions"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Suppression impossible !"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1979,7 +1984,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1987,7 +1992,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Pas de Liste de Prix !"
@@ -2039,7 +2044,7 @@ msgid "No Cash Register Defined !"
 msgstr "Pas de caisse définie"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2224,7 +2229,7 @@ msgid "Bank Statement"
 msgstr "Relevé bancaire"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2284,7 +2289,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2759,7 +2764,7 @@ msgid "Pos Lines"
 msgstr "Lignes des ventes en PdV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2803,11 +2808,6 @@ msgstr "Comptabilisé"
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3086,17 +3086,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3190,13 +3190,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3233,7 +3233,7 @@ msgid "Journal Entry"
 msgstr "Pièce comptable"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3264,7 +3264,7 @@ msgid "Supplier Invoice"
 msgstr "Facture fournisseur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3343,7 +3343,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Impossible d'annuler le bon de préparation"
@@ -3384,7 +3384,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3500,7 +3500,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3544,7 +3544,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Veuiller renseigner un client"
@@ -3596,7 +3596,7 @@ msgid "Print Receipt"
 msgstr "Imprimer le ticket"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3957,7 +3957,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index 8b6c5491e6e..59e6b6ac322 100644
--- a/addons/point_of_sale/i18n/hi.po
+++ b/addons/point_of_sale/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 17:15+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 525940f7bcb..98c7f708a68 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 07:14+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr "Greška u konfiguraciji!"
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Pop.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "User's Product"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr "Plaćanja po korisniku"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Today's Closed Cashbox"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr "broj transakcija"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr "Izvod banke"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr "Pos Lines"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr "Temeljnica"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr "Ulazni račun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr "Pro-forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr "Print Receipt"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index fe97e892954..2594a30e35c 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-08 21:19+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Eng. (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Felhasználó termékei"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr "Tranzakció száma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nincs árlista !"
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr "Bankkivonat"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr "Értékesítési pont sorok"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr "Könyvelési tétel"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr "Bejövő számla"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr "Pro forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr "Átvétel nyomtatása"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index 9aee4587551..abbd1bf2f80 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-16 23:09+0000\n"
-"Last-Translator: BlueSeptin <Unknown>\n"
+"Last-Translator: Riza Kurniawan <rizabisnis@gmail.com>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Diskon (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Produk Pengguna"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr "Pembayaran Per Pengguna"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1355,7 +1360,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Box Uang yang ditutup hari ini"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1621,7 +1626,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1639,7 +1644,7 @@ msgid "Number of Transaction"
 msgstr "Angka transaksi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1810,7 +1815,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1898,7 +1903,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1973,7 +1978,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1981,7 +1986,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Tidak ada daftar harga !"
@@ -2033,7 +2038,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2218,7 +2223,7 @@ msgid "Bank Statement"
 msgstr "Rekening Koran"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2278,7 +2283,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2753,7 +2758,7 @@ msgid "Pos Lines"
 msgstr "Baris POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2797,11 +2802,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3080,17 +3080,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3184,13 +3184,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3225,7 +3225,7 @@ msgid "Journal Entry"
 msgstr "Jurnal Masukan"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3256,7 +3256,7 @@ msgid "Supplier Invoice"
 msgstr "Faktur Pembelian"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3335,7 +3335,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3376,7 +3376,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3492,7 +3492,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3536,7 +3536,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Mohon Masukkan Pelanggan di penjualan"
@@ -3588,7 +3588,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3947,7 +3947,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index 0180afdda87..c36c87624e2 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-16 23:43+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Preleva Contanti"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr "inutilizzato"
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr "Riferimento"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr "Errore di configurazione!"
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Sconto (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Definire un conto di ricavo per questo prodotto: \"%s\" (id:%d)."
@@ -423,7 +423,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr "Dovrebbe essere assegnato un Punto Vendita alla sessione."
@@ -439,7 +439,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -449,8 +449,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr "errore!"
@@ -485,7 +485,7 @@ msgid "Validate & Open Session"
 msgstr "Valida e Apri Sessione"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -615,7 +615,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -769,6 +769,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -980,7 +985,7 @@ msgid "User's Product"
 msgstr "Prodotto dell'utente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1032,7 +1037,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1114,7 +1119,7 @@ msgstr "Pagamenti per utente"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1157,8 +1162,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1361,7 +1366,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Chiusura giornaliera registratore di cassa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1627,7 +1632,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1645,7 +1650,7 @@ msgid "Number of Transaction"
 msgstr "Numero di transazioni"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1816,7 +1821,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1904,7 +1909,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1979,7 +1984,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1987,7 +1992,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nessun Listino Prezzi !"
@@ -2039,7 +2044,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2224,7 +2229,7 @@ msgid "Bank Statement"
 msgstr "Estratto conto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2284,7 +2289,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2759,7 +2764,7 @@ msgid "Pos Lines"
 msgstr "Righe Punto Vendita"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2803,11 +2808,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3086,17 +3086,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3190,13 +3190,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3231,7 +3231,7 @@ msgid "Journal Entry"
 msgstr "Voce giornale"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3262,7 +3262,7 @@ msgid "Supplier Invoice"
 msgstr "Fattura Fornitore"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3341,7 +3341,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3382,7 +3382,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3498,7 +3498,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3542,7 +3542,7 @@ msgid "PRO-FORMA"
 msgstr "Pro-Forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Prego fornire un partner per la vendita"
@@ -3594,7 +3594,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3953,7 +3953,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index 2d6aebd3288..ebcbc0a7c36 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-11 05:37+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr "現金取出"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "割引（%）"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr "ファンタ オレンジ 330ml"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "顧客請求書"
@@ -764,6 +764,11 @@ msgstr "Dr. Oetker レストランボロネーゼ"
 msgid "Pizza"
 msgstr "ピザ"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr "ユーザ商品"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1027,7 +1032,7 @@ msgstr "コカコーラ ライト レモン 500ml"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1109,7 +1114,7 @@ msgstr "ユーザによる支払"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1152,8 +1157,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1356,7 +1361,7 @@ msgid "Today's Closed Cashbox"
 msgstr "本日の閉じられた金庫"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1622,7 +1627,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 375ml"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1640,7 +1645,7 @@ msgid "Number of Transaction"
 msgstr "取引数"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1811,7 +1816,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "削除できません。"
@@ -1899,7 +1904,7 @@ msgid "User:"
 msgstr "ユーザ："
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1974,7 +1979,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1982,7 +1987,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "価格リストがありません。"
@@ -2034,7 +2039,7 @@ msgid "No Cash Register Defined !"
 msgstr "キャッシュレジスタが定義されていません。"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2219,7 +2224,7 @@ msgid "Bank Statement"
 msgstr "銀行取引明細書"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2279,7 +2284,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2755,7 +2760,7 @@ msgid "Pos Lines"
 msgstr "POS行"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2799,11 +2804,6 @@ msgstr "記帳済"
 msgid "Paid:"
 msgstr "支払済："
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3082,17 +3082,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3186,13 +3186,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "販売を削除するために、それは新規またはキャンセルする必要があります。"
@@ -3227,7 +3227,7 @@ msgid "Journal Entry"
 msgstr "仕訳帳入力"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3258,7 +3258,7 @@ msgid "Supplier Invoice"
 msgstr "仕入先請求書"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3337,7 +3337,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "コカコーラ 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "集荷をキャンセルできません。"
@@ -3378,7 +3378,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "SPA Barisart 1.5L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3494,7 +3494,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3538,7 +3538,7 @@ msgid "PRO-FORMA"
 msgstr "プロフォーマ"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "販売のためのパートナを提供して下さい。"
@@ -3590,7 +3590,7 @@ msgid "Print Receipt"
 msgstr "レシート印刷"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3949,7 +3949,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index ffe3b0bac04..5bebf70a0c2 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 12:48+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr "거래 수"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "가격리스트가 없음!"
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr "POS 라인"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr "공급자 인보이스"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr "프로포마"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "이 판매의 파트너를 기입하십시오."
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 170738ab814..8e119ddb99e 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/lv.po b/addons/point_of_sale/i18n/lv.po
index 6a7c7189573..9deb92e7e14 100644
--- a/addons/point_of_sale/i18n/lv.po
+++ b/addons/point_of_sale/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-16 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr "Izņemt naudu"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Atl.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Klienta Rēķins"
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr "Bankas Konta Izraksts"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 9e4f24c1bb8..9248b16271b 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-11 05:36+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr "Мөнгийг гадагш авах"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Хөнг.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Захиалагчийн нэхэмжлэл"
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr "Хэрэглэгчийн Бараа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1027,7 +1032,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1109,7 +1114,7 @@ msgstr "Төлбөр хэрэглэгчээр"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1152,8 +1157,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1358,7 +1363,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Өнөөдрийн хаагдсан мөнгөний хайрцаг"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1624,7 +1629,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1642,7 +1647,7 @@ msgid "Number of Transaction"
 msgstr "Гүйлгээний тоо"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1813,7 +1818,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Устгах боломжгүй !"
@@ -1903,7 +1908,7 @@ msgid "User:"
 msgstr "Хэрэглэгч:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1978,7 +1983,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1986,7 +1991,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Үнийн жагсаалт алга!"
@@ -2038,7 +2043,7 @@ msgid "No Cash Register Defined !"
 msgstr "Кассын бүртгэл тодорхойлогдоогүй байна !"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2223,7 +2228,7 @@ msgid "Bank Statement"
 msgstr "Банкны хуулга"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2283,7 +2288,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2761,7 +2766,7 @@ msgid "Pos Lines"
 msgstr "POS мөрүүд"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2805,11 +2810,6 @@ msgstr "Илгээгдсэн"
 msgid "Paid:"
 msgstr "Төлсөн:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3088,17 +3088,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3192,13 +3192,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Захиалгыг устгахын тулд энэ нь шинэ юмуу цуцлагдсан байх ёстой."
@@ -3235,7 +3235,7 @@ msgid "Journal Entry"
 msgstr "Журналын бичилтүүд"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3266,7 +3266,7 @@ msgid "Supplier Invoice"
 msgstr "Нийлүүлэгчийн Нэхэмжлэл"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3345,7 +3345,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Бэлтгэлтийг цуцлах боломжгүй."
@@ -3386,7 +3386,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3502,7 +3502,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3546,7 +3546,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Харилцагчийг сонгоно уу."
@@ -3598,7 +3598,7 @@ msgid "Print Receipt"
 msgstr "Баримт хэвлэх"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3959,7 +3959,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/nb.po b/addons/point_of_sale/i18n/nb.po
index 5a87853c494..6d52b039d41 100644
--- a/addons/point_of_sale/i18n/nb.po
+++ b/addons/point_of_sale/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-31 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Rab.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Kundefaktura"
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr "Antall transaksjoner"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index 6ca4e9a8779..cbee82cbae2 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-12 08:29+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Geld uitnemen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Krt. (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Verkoopfactuur"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Gebruikers producten"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Betaald door gebruiker"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Vandaag gesloten kassa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "Aantal transacties"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Onmogelijk te verwijderen!"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr "Gebruiker:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1978,7 +1983,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1986,7 +1991,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Geen prijslijst!"
@@ -2038,7 +2043,7 @@ msgid "No Cash Register Defined !"
 msgstr "Geen kassa gedefinieerd"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2223,7 +2228,7 @@ msgid "Bank Statement"
 msgstr "Bankafschrift"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2283,7 +2288,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2761,7 +2766,7 @@ msgid "Pos Lines"
 msgstr "Kassa regels"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2805,11 +2810,6 @@ msgstr "Geboekt"
 msgid "Paid:"
 msgstr "Betaald:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3088,17 +3088,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3192,13 +3192,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3236,7 +3236,7 @@ msgid "Journal Entry"
 msgstr "Dagboek invoer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3267,7 +3267,7 @@ msgid "Supplier Invoice"
 msgstr "Inkoopfactuur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3346,7 +3346,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Normaal 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Niet mogelijk om het verzamelen te stoppen."
@@ -3387,7 +3387,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3503,7 +3503,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3547,7 +3547,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Kies een relatie voor deze verkoop"
@@ -3599,7 +3599,7 @@ msgid "Print Receipt"
 msgstr "Afdrukken bon"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3960,7 +3960,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 342473a8aff..ac776a17c63 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-24 15:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Geld uit kas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Korting(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Verkoopfactuur"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Product van de gebruiker"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Betaling door gebruiker"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Gesloten kasboek van vandaag"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "Aantal transacties"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Niet in staat om te verwijderen"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr "Gebruiker:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1978,7 +1983,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1986,7 +1991,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Geen prijslijst"
@@ -2038,7 +2043,7 @@ msgid "No Cash Register Defined !"
 msgstr "Geen kasboek gedefinieerd"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2223,7 +2228,7 @@ msgid "Bank Statement"
 msgstr "Rekeninguittreksel"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2283,7 +2288,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2761,7 +2766,7 @@ msgid "Pos Lines"
 msgstr "Kassaverkooplijnen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2805,11 +2810,6 @@ msgstr ""
 msgid "Paid:"
 msgstr "Betaald:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3088,17 +3088,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3192,13 +3192,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3237,7 +3237,7 @@ msgid "Journal Entry"
 msgstr "Boeking"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3268,7 +3268,7 @@ msgid "Supplier Invoice"
 msgstr "Aankoopfactuur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3347,7 +3347,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Kan de picking niet annuleren."
@@ -3388,7 +3388,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3504,7 +3504,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3548,7 +3548,7 @@ msgid "PRO-FORMA"
 msgstr "PRO FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Gelieve een relatie op te geven voor de verkoop."
@@ -3600,7 +3600,7 @@ msgid "Print Receipt"
 msgstr "Kasticket afdrukken"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3961,7 +3961,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index 9b77c9a74ca..cf9ef04a355 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 19:03+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:22+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr "Przypisz własny EAN"
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Wybierz pieniądze"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr "nie używane"
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr "Odnośnik"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr "Błąd konfiguracji!"
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Up.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Zdefiniuj konto przychodów dla tego produktu: \"%s\" (id:%d)."
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr "błąd!"
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -621,7 +621,7 @@ msgstr ""
 "            "
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Faktura dla klienta"
@@ -778,6 +778,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -989,7 +994,7 @@ msgid "User's Product"
 msgstr "Produkt użytkownika"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1041,7 +1046,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1123,7 +1128,7 @@ msgstr "Płatności wg użytkownika"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1166,8 +1171,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1372,7 +1377,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Dzisiaj zamknięte kasy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr "Wybrane zamówienia nie należą do tej samej sesji."
@@ -1638,7 +1643,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1658,7 +1663,7 @@ msgid "Number of Transaction"
 msgstr "Numer transakcji"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1829,7 +1834,7 @@ msgid "Difference"
 msgstr "Różnica"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Nie można usunąć !"
@@ -1919,7 +1924,7 @@ msgid "User:"
 msgstr "Użytkownik:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1994,7 +1999,7 @@ msgid "Salespeople"
 msgstr "Sprzedawcy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -2002,7 +2007,7 @@ msgid "You have to open at least one cashbox."
 msgstr "Musisz otworzyć co najmniej jedną kasę."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Brak cennika !"
@@ -2054,7 +2059,7 @@ msgid "No Cash Register Defined !"
 msgstr "Nie zdefiniowano żadnej kasy !"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2239,7 +2244,7 @@ msgid "Bank Statement"
 msgstr "Wyciąg bankowy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2299,7 +2304,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2776,7 +2781,7 @@ msgid "Pos Lines"
 msgstr "Pozycje sprzedaży POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2820,11 +2825,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3103,17 +3103,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3207,13 +3207,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3248,7 +3248,7 @@ msgid "Journal Entry"
 msgstr "Zapis dziennika"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3279,7 +3279,7 @@ msgid "Supplier Invoice"
 msgstr "Faktura dostawcy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3358,7 +3358,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3399,7 +3399,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3515,7 +3515,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3559,7 +3559,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Proszę wprowadzić partnera dla sprzedaży."
@@ -3611,7 +3611,7 @@ msgid "Print Receipt"
 msgstr "Drukuj paragon"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3970,7 +3970,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index 5bd2d0e4ee6..91173134b44 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Retirar dinheiro"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Laranja 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Fatura do Cliente"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolonhesa"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Artigo do Utilizador"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Limão 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Pagamentos Por Utilizador"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caixas Fechadas de Hoje"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "Número da Transação"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Não é possível excluir !"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr "Utilizador:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1978,7 +1983,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1986,7 +1991,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
@@ -2038,7 +2043,7 @@ msgid "No Cash Register Defined !"
 msgstr "Sem caixa registadora definida!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2223,7 +2228,7 @@ msgid "Bank Statement"
 msgstr "Extrato Bancário"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2283,7 +2288,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2761,7 +2766,7 @@ msgid "Pos Lines"
 msgstr "Linhas POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2805,11 +2810,6 @@ msgstr "Publicado"
 msgid "Paid:"
 msgstr "Pago:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3088,17 +3088,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3192,13 +3192,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Para apagar uma venda, ela deve ser nova ou cancelada."
@@ -3235,7 +3235,7 @@ msgid "Journal Entry"
 msgstr "Entradas no diário"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3266,7 +3266,7 @@ msgid "Supplier Invoice"
 msgstr "Fatura do Fornecedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3345,7 +3345,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Não é possível cancelar o picking."
@@ -3386,7 +3386,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3502,7 +3502,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3546,7 +3546,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por Favor forneça um parceiro para a venda"
@@ -3598,7 +3598,7 @@ msgid "Print Receipt"
 msgstr "Imprimir Recibo"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3959,7 +3959,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 17233d9aaf9..63a19c9cf80 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 00:01+0000\n"
 "Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Produto do Usuário"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr "Pagamentos por Usuário"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Fechamento de Caixa do dia"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr "Número da Transação"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr "Linhas de Vendas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr "Fatura do Fornecedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por favor informe um parceiro para a venda"
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index a10f13c75e7..4313efd2c88 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:03+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Scoateti bani"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Reducere(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta de portocale 33cl (330ml)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Factura client"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Produsul utilizatorului"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Plata dupa Utilizator"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Casa de bani inchisa de astazi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "Numarul tranzactiei"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Nu poate fi sters (stearsa) !"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr "Utilizator:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1979,7 +1984,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1987,7 +1992,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nu exista nicio lista de preturi !"
@@ -2039,7 +2044,7 @@ msgid "No Cash Register Defined !"
 msgstr "Nici o Casa de marcat definita!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2224,7 +2229,7 @@ msgid "Bank Statement"
 msgstr "Extras de cont"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2284,7 +2289,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2762,7 +2767,7 @@ msgid "Pos Lines"
 msgstr "Linii PdV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2806,11 +2811,6 @@ msgstr "Afisat"
 msgid "Paid:"
 msgstr "Platit:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3089,17 +3089,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3193,13 +3193,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Pentru a putea sterge o vanzare, trebuie sa fie noua sau anulata."
@@ -3236,7 +3236,7 @@ msgid "Journal Entry"
 msgstr "Inregistrare in jurnal"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3267,7 +3267,7 @@ msgid "Supplier Invoice"
 msgstr "Factura furnizor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3346,7 +3346,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola obisnuita 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Nu s-a putut anula ridicarea."
@@ -3387,7 +3387,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3503,7 +3503,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3547,7 +3547,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Va rugam sa furnizati un partener pentru vanzare."
@@ -3599,7 +3599,7 @@ msgid "Print Receipt"
 msgstr "Tipariti Chitanta"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3960,7 +3960,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index 968ca057cf9..55bad3cf127 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 08:45+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Скидка (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Нет прейскуранта!"
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr "Счета поставщиков"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index c37f3c9242a..8d04e2e24de 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Artikli uporabnika"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Plačilo Uporabnika"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1355,7 +1360,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Današna zaprta blagajna"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1621,7 +1626,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1639,7 +1644,7 @@ msgid "Number of Transaction"
 msgstr "Številka transakcije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1810,7 +1815,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1898,7 +1903,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1973,7 +1978,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1981,7 +1986,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ni cenika!"
@@ -2033,7 +2038,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2218,7 +2223,7 @@ msgid "Bank Statement"
 msgstr "Bančni izpisek"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2278,7 +2283,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2753,7 +2758,7 @@ msgid "Pos Lines"
 msgstr "POS postavke"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2797,11 +2802,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3080,17 +3080,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3184,13 +3184,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3225,7 +3225,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3256,7 +3256,7 @@ msgid "Supplier Invoice"
 msgstr "Račun dobavitelja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3335,7 +3335,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3376,7 +3376,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3492,7 +3492,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3536,7 +3536,7 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Prosim vnesite strankao za to prodajo."
@@ -3588,7 +3588,7 @@ msgid "Print Receipt"
 msgstr "Natisni Račun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3947,7 +3947,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index 3159c2aa9e0..1e3ef71802c 100644
--- a/addons/point_of_sale/i18n/sq.po
+++ b/addons/point_of_sale/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:21+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 3a50ddd06c1..5e3c90d8caa 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Popust(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr "Korisnicki Proizvod"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr "Placanja Korisnika"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Danasnje zatvorene Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr "Broj Transakcija"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nema Cenovnika !"
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr "Izvestaj Banke"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr "POS Linije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr "Sadrzaj dnevnika"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Molim postavi partnera za prodaju"
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr "Stampa Racuna"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po
index 5e2c754497b..258d25baa4f 100644
--- a/addons/point_of_sale/i18n/sr@latin.po
+++ b/addons/point_of_sale/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Popust(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr "Korisnicki Proizvod"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr "Placanja Korisnika"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Danasnje zatvorene Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr "Broj Transakcija"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nema Cenovnika !"
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr "Izvestaj Banke"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr "POS Linije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr "Sadrzaj dnevnika"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Molim postavi partnera za prodaju"
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr "Stampa Racuna"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 3b6e18e5017..e6759564b2c 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-08-03 22:56+0000\n"
 "Last-Translator: Stefan Lind <Unknown>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Ta ut pengar"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "Rab.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Kundfaktura"
@@ -763,6 +763,11 @@ msgstr "Dr Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Användarens Produkt"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Betalning av användare"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Dagskassa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "Antal transkationer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Kan ej tas bort!"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr "Användare"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1977,7 +1982,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1985,7 +1990,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ingen prislista !"
@@ -2037,7 +2042,7 @@ msgid "No Cash Register Defined !"
 msgstr "Ingen kassaregister Definierat!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2222,7 +2227,7 @@ msgid "Bank Statement"
 msgstr "Bankkontoutdrag"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2282,7 +2287,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2760,7 +2765,7 @@ msgid "Pos Lines"
 msgstr "Kassarader"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2804,11 +2809,6 @@ msgstr "Publicerad"
 msgid "Paid:"
 msgstr "Betald:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3087,17 +3087,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3191,13 +3191,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "För att ta bort en försäljning måste den vara ny eller annulleras."
@@ -3234,7 +3234,7 @@ msgid "Journal Entry"
 msgstr "Journalrad"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3265,7 +3265,7 @@ msgid "Supplier Invoice"
 msgstr "Leverantörsfaktura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3344,7 +3344,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Kan inte avbryta plockning."
@@ -3385,7 +3385,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3501,7 +3501,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3545,7 +3545,7 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Välj en kund för försäljningen"
@@ -3597,7 +3597,7 @@ msgid "Print Receipt"
 msgstr "Skriv ut kvitto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3958,7 +3958,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index 169d058045e..12c39f4d7a1 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index af2f3918d00..8d8a8462f62 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "Para Al"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "İnd.(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "Müşteri Faturası"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "Pizza"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "Kullanıcının Ürünleri"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "Kullanıcıya göre ödemeler"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1357,7 +1362,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Günün kapanmış Kasaları"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1623,7 +1628,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1641,7 +1646,7 @@ msgid "Number of Transaction"
 msgstr "İşlem Numarası"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1812,7 +1817,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "Silinemiyor !"
@@ -1902,7 +1907,7 @@ msgid "User:"
 msgstr "Kullanıcı:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1977,7 +1982,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1985,7 +1990,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Fiyat listesi yok!"
@@ -2037,7 +2042,7 @@ msgid "No Cash Register Defined !"
 msgstr "Hiç Nakit Kasası Tanımlanmamış!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2222,7 +2227,7 @@ msgid "Bank Statement"
 msgstr "Banka Ekstresi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2282,7 +2287,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2759,7 +2764,7 @@ msgid "Pos Lines"
 msgstr "POS Kalemleri"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2803,11 +2808,6 @@ msgstr "Gönderildi"
 msgid "Paid:"
 msgstr "Ödenen:"
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3086,17 +3086,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3190,13 +3190,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "Bir satışı silmek için satış yeni veya iptal edilmiş olmalı"
@@ -3233,7 +3233,7 @@ msgid "Journal Entry"
 msgstr "Yevmiye Defteri kalemi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3264,7 +3264,7 @@ msgid "Supplier Invoice"
 msgstr "Tedarikçi Faturası"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3343,7 +3343,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "Teslimat iptal edilemiyor."
@@ -3384,7 +3384,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3500,7 +3500,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3544,7 +3544,7 @@ msgid "PRO-FORMA"
 msgstr "PROFORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Satış için bir Cari belirtin"
@@ -3596,7 +3596,7 @@ msgid "Print Receipt"
 msgstr "Fişi Yazdır"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3957,7 +3957,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 3df648faa57..a39ef485e41 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 14:28+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index dae59ba6307..656dda6c809 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 01:04+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr "Chiết khấu (%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr "Thanh toán theo người dùng"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr "Số lượng giao dịch"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "Không có bảng giá !"
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr "Sổ phụ ngân hàng"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr "Hóa đơn Nhà cung cấp"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr "In phiếu thu"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index f4f8f4a95c8..e8935bd5e22 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr "取钱"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr "折扣(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr "客户发票"
@@ -763,6 +763,11 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 msgid "Pizza"
 msgstr "披萨"
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr "用户的产品"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1026,7 +1031,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1108,7 +1113,7 @@ msgstr "用户付款"
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1151,8 +1156,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1355,7 +1360,7 @@ msgid "Today's Closed Cashbox"
 msgstr "今日关闭的钱箱"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1621,7 +1626,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1639,7 +1644,7 @@ msgid "Number of Transaction"
 msgstr "交易数"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1810,7 +1815,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr "不能删除！"
@@ -1898,7 +1903,7 @@ msgid "User:"
 msgstr "用户:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1973,7 +1978,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1981,7 +1986,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr "没有价格表！"
@@ -2033,7 +2038,7 @@ msgid "No Cash Register Defined !"
 msgstr "没有定义收银机"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2218,7 +2223,7 @@ msgid "Bank Statement"
 msgstr "银行对账单"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2278,7 +2283,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2753,7 +2758,7 @@ msgid "Pos Lines"
 msgstr "销售单明细"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2797,11 +2802,6 @@ msgstr "已登帐"
 msgid "Paid:"
 msgstr "已付："
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3080,17 +3080,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3184,13 +3184,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "只有新的或被取消的销售流水可以删除"
@@ -3225,7 +3225,7 @@ msgid "Journal Entry"
 msgstr "日记账簿"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3256,7 +3256,7 @@ msgid "Supplier Invoice"
 msgstr "供应商发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3335,7 +3335,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "无法取消发货"
@@ -3376,7 +3376,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3492,7 +3492,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3536,7 +3536,7 @@ msgid "PRO-FORMA"
 msgstr "形式发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "请提供业务伙伴。"
@@ -3588,7 +3588,7 @@ msgid "Print Receipt"
 msgstr "打印收银条"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3947,7 +3947,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index c80a5e67680..517a45ec30c 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/i18n/zh_HK.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 16:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -132,7 +132,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -162,7 +162,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -185,8 +185,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -223,7 +223,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -436,7 +436,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -480,7 +480,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -610,7 +610,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -764,6 +764,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -975,7 +980,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1025,7 +1030,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1107,7 +1112,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1150,8 +1155,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1354,7 +1359,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1620,7 +1625,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1638,7 +1643,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1809,7 +1814,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1897,7 +1902,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1972,7 +1977,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1980,7 +1985,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2032,7 +2037,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2217,7 +2222,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2277,7 +2282,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2752,7 +2757,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2796,11 +2801,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3079,17 +3079,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3183,13 +3183,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3224,7 +3224,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3334,7 +3334,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3375,7 +3375,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3491,7 +3491,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3535,7 +3535,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3587,7 +3587,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3946,7 +3946,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index ee35ef7a456..813cca055a2 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-01-30 13:17+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:23+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -131,7 +131,7 @@ msgid "Red grapefruit"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
 #, python-format
 msgid "Assign a Custom EAN"
 msgstr ""
@@ -161,7 +161,7 @@ msgid "Take Money Out"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
 msgstr ""
@@ -184,8 +184,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -222,7 +222,7 @@ msgid "Help needed"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -315,7 +315,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Hardware Events"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Fanta Orange 33cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -445,8 +445,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
 #, python-format
 msgid "error!"
 msgstr ""
@@ -479,7 +479,7 @@ msgid "Validate & Open Session"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -609,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
 #, python-format
 msgid "Customer Invoice"
 msgstr ""
@@ -763,6 +763,11 @@ msgstr ""
 msgid "Pizza"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
 #: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -974,7 +979,7 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1024,7 +1029,7 @@ msgstr ""
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
 #: code:addons/point_of_sale/static/src/xml/pos.xml:692
 #: code:addons/point_of_sale/static/src/xml/pos.xml:747
 #, python-format
@@ -1106,7 +1111,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:209
 #: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 #: report:pos.details:0
 #: view:pos.order:0
@@ -1149,8 +1154,8 @@ msgid "2L Evian"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
@@ -1353,7 +1358,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1619,7 +1624,7 @@ msgid "Timmermans Faro 37.5cl"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
 #, python-format
 msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
@@ -1637,7 +1642,7 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1808,7 +1813,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "Unable to Delete !"
 msgstr ""
@@ -1896,7 +1901,7 @@ msgid "User:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
 #, python-format
 msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
@@ -1971,7 +1976,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1979,7 +1984,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -2031,7 +2036,7 @@ msgid "No Cash Register Defined !"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2216,7 +2221,7 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2276,7 +2281,7 @@ msgid "Golden Apples Perlim"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
@@ -2751,7 +2756,7 @@ msgid "Pos Lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2795,11 +2800,6 @@ msgstr ""
 msgid "Paid:"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
@@ -3078,17 +3078,17 @@ msgid "Boni Oranges"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: code:addons/point_of_sale/point_of_sale.py:411
-#: code:addons/point_of_sale/point_of_sale.py:421
-#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:714
-#: code:addons/point_of_sale/point_of_sale.py:758
-#: code:addons/point_of_sale/point_of_sale.py:820
-#: code:addons/point_of_sale/point_of_sale.py:900
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3182,13 +3182,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr ""
@@ -3223,7 +3223,7 @@ msgid "Journal Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3254,7 +3254,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3333,7 +3333,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr ""
@@ -3374,7 +3374,7 @@ msgid "Spa Barisart 1.5l"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3490,7 +3490,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3534,7 +3534,7 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgid "Print Receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -3945,7 +3945,7 @@ msgid "Sorry, we could not create a session for this user."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
 #: selection:pos.session,state:0
 #: selection:pos.session.opening,pos_state:0
 #, python-format
diff --git a/addons/portal/i18n/ar.po b/addons/portal/i18n/ar.po
index d5e357211f7..6067ac0aeed 100644
--- a/addons/portal/i18n/ar.po
+++ b/addons/portal/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-11-04 13:45+0000\n"
 "Last-Translator: Ahmad Khayyat <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "اختر مجموعة واحدة على الأقل للمشاركة"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "اختر مجموعة واحدة على الأقل للمشاركة"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"لا بدّ أن يكون لديك عنوان بريد إلكتروني معرّف في 'تفضيلات المستخدم' الخاصة "
+"بك حتى يمكنك إرسال بريد إلكتروني"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +181,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +202,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "حساب OpenERP الخاص بك لدى %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +258,6 @@ msgstr "المستخدمون الحاليّون"
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +280,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +301,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "لا بدّ من ذكر عنوان بريد إلكتروني"
@@ -307,13 +312,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"لا بدّ أن يكون لديك عنوان بريد إلكتروني معرّف في 'تفضيلات المستخدم' الخاصة "
-"بك حتى يمكنك إرسال بريد إلكتروني"
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -321,10 +325,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -342,6 +356,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -386,6 +407,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -454,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/bg.po b/addons/portal/i18n/bg.po
index 60f604decf9..eb1eb78d943 100644
--- a/addons/portal/i18n/bg.po
+++ b/addons/portal/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/bs.po b/addons/portal/i18n/bs.po
index a56304153e3..b1a700088fd 100644
--- a/addons/portal/i18n/bs.po
+++ b/addons/portal/i18n/bs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/ca.po b/addons/portal/i18n/ca.po
index a4d5debf7ac..14f78ccaa1b 100644
--- a/addons/portal/i18n/ca.po
+++ b/addons/portal/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Si us plau, seleccioneu almenys un grup per compartir amb"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Si us plau, seleccioneu almenys un grup per compartir amb"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Heu de tenir una adreça de correu electrònic a les preferències de l'usuari "
+"per enviar missatges."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr "Usuaris/es"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +181,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +202,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "El seu compte de OpenERP en %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +258,6 @@ msgstr "Usuaris existents"
 msgid "Wizard"
 msgstr "Assistent"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +280,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +301,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Correu electrònic requerit"
@@ -307,13 +312,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Heu de tenir una adreça de correu electrònic a les preferències de l'usuari "
-"per enviar missatges."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -321,10 +325,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -342,6 +356,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -386,6 +407,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -454,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/cs.po b/addons/portal/i18n/cs.po
index a24a1d3fb4f..15d2a4ec10e 100644
--- a/addons/portal/i18n/cs.po
+++ b/addons/portal/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: portal
@@ -40,14 +40,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Prosíme vyberte nejméně jednu skupinu, s kterou chcete sdílet"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -76,6 +75,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Prosíme vyberte nejméně jednu skupinu, s kterou chcete sdílet"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -118,9 +123,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Musíte mít emailovou adresu ve vašich uživatelských předvolbách pro zasílání "
+"emailů."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -134,11 +143,17 @@ msgid "Users"
 msgstr "Uživatelé"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -167,8 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -186,8 +203,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Váš účet OpenERP v %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -242,13 +259,6 @@ msgstr "Existující uživatelé"
 msgid "Wizard"
 msgstr "Průvodce"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -271,11 +281,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -297,7 +302,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Požadován email"
@@ -308,13 +313,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Musíte mít emailovou adresu ve vašich uživatelských předvolbách pro zasílání "
-"emailů."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -322,10 +326,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -343,6 +357,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -387,6 +408,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -455,7 +481,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/da.po b/addons/portal/i18n/da.po
index 49a4f5c69a6..6bf52f15074 100644
--- a/addons/portal/i18n/da.po
+++ b/addons/portal/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-04 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po
index 09a557a062e..d1ff7860e74 100644
--- a/addons/portal/i18n/de.po
+++ b/addons/portal/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 17:13+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -45,15 +45,14 @@ msgstr ""
 "Kontakte direkt in der Liste korrigiert werden."
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Bitte wählen Sie mindestens eine Gruppe zur Freigabe"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
-msgstr "Unternehmensneuigkeiten"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr "amount: Der zu zahlende Gesamtbetrag, als float"
 
 #. module: portal
 #: view:portal.wizard.user:0
@@ -81,6 +80,12 @@ msgstr "Einladungsnachricht"
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Bitte wählen Sie mindestens eine Gruppe zur Freigabe"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -127,9 +132,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "oder"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+"Sie müssen Ihre  E-Mail Adresse in den Benuztereinstellungen erfassen, um E-"
+"Mails senden zu können."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -143,11 +152,17 @@ msgid "Users"
 msgstr "Benutzer"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "Bezahlen Sie sicher online"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -182,9 +197,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
-msgstr "Stellenangebote"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+", es können Mako Ausdrücke verwendet werden.\n"
+"                                    Der Mako Renderkontext stellt bereit:"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -201,9 +220,9 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Ihr OpenERP Konto bei %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
-msgstr "cr: der aktuelle Datenbank Cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
@@ -261,15 +280,6 @@ msgstr "Bestehende Benutzer"
 msgid "Wizard"
 msgstr "Assistent"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-", es können Mako Ausdrücke verwendet werden.\n"
-"                                    Der Mako Renderkontext stellt bereit:"
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -294,11 +304,6 @@ msgstr ""
 "quote(): eine Methode zur Ausgabe von besonderen Strings, um sie in einer "
 "URL ausgeben zu können."
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr "amount: Der zu zahlende Gesamtbetrag, als float"
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -320,7 +325,7 @@ msgid "Outgoing Mails"
 msgstr "Postausgang"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "E-Mail ist erforderlich"
@@ -331,13 +336,12 @@ msgid "Messaging"
 msgstr "Nachrichten"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Sie müssen Ihre  E-Mail Adresse in den Benuztereinstellungen erfassen, um E-"
-"Mails senden zu können."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -345,13 +349,21 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
 msgstr ""
-"object: Das Dokument, auf dessen Basis das Zahlungsformular gerendert wird "
-"(gewöhnlicherweise eine Rechnung oder ein Verkaufsdatensatz)"
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr "cr: der aktuelle Datenbank Cursor"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
@@ -377,6 +389,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -441,6 +460,11 @@ msgstr ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "oder"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -528,7 +552,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/es.po b/addons/portal/i18n/es.po
index 897b436f781..b963271d96c 100644
--- a/addons/portal/i18n/es.po
+++ b/addons/portal/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-13 15:40+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 11:46+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -44,15 +44,14 @@ msgstr ""
 "directamente en la lista."
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Por favor seleccione al menos un grupo con quien compartir"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr "Puestos en la compañía"
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
-msgstr "Noticias de la compañía"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr "amount: el importe total a pagar, como un float"
 
 #. module: portal
 #: view:portal.wizard.user:0
@@ -80,6 +79,12 @@ msgstr "Mensaje de invitación"
 msgid "Non-Portal Groups"
 msgstr "Grupos sin acceso al portal"
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Por favor seleccione al menos un grupo con quien compartir"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -128,9 +133,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "o"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+"Debe tener una dirección email en sus preferencias de usuario para enviar "
+"emails"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -144,11 +153,17 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "Pague en línea de forma segura"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr "No se ha configurado ningún método de pago"
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -183,9 +198,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
-msgstr "Empleos de la compañía"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+", por lo que puede contener expresiones Mako.\n"
+"La evaluación del contexto de Mako provee:"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -202,9 +221,9 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Su cuenta OpenERP en %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
-msgstr "cr: el cursor actual de la base de datos"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr "Anónimo"
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
@@ -261,15 +280,6 @@ msgstr "Usuarios existentes"
 msgid "Wizard"
 msgstr "Asistente"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-", por lo que puede contener expresiones Mako.\n"
-"La evaluación del contexto de Mako provee:"
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -294,11 +304,6 @@ msgstr ""
 "quote(): un método para citar una cadena especial de caracteres  para "
 "hacerlos adecuados para la inclusión en una URL"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr "amount: el importe total a pagar, como un float"
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -320,7 +325,7 @@ msgid "Outgoing Mails"
 msgstr "Correos salientes"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Correo electrónico requerido"
@@ -331,13 +336,15 @@ msgid "Messaging"
 msgstr "Mensajería"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Debe tener una dirección email en sus preferencias de usuario para enviar "
-"emails"
+"Los usuarios anónimos tienen permisos específicos (tales como reglas de "
+"registro y menús restringidos). Normalmente no pertenecen a los grupos "
+"usuales de OpenERP."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -345,13 +352,23 @@ msgid "Online Payment Acquirer"
 msgstr "Método de pago en línea"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr "Noticias de la compañía"
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
 msgstr ""
-"object: el documento en el que el formulario de pago es reproducido "
-"(normalmente un registro de factura o de pedido de venta)"
+"Puede finalizar la configuración en <a href=\"%s\">Configuración de banco y "
+"caja</a>"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr "cr: el cursor actual de la base de datos"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
@@ -376,6 +393,15 @@ msgstr ""
 "</p>\n"
 "            "
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+"objeto: el documento en el que se muestra el formulario de pago (normalmente "
+"una registro de factura o de pedido de venta)"
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -438,6 +464,11 @@ msgstr ""
 "\n"
 "--\n"
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "o"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -527,7 +558,7 @@ msgstr ""
 "La plantilla se representará con"
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
@@ -760,4 +791,4 @@ msgstr "Administración de acceso al portal"
 #~ msgstr "Responsable"
 
 #~ msgid "Officer"
-#~ msgstr "Gestor"
+#~ msgstr "Directivo"
diff --git a/addons/portal/i18n/es_CR.po b/addons/portal/i18n/es_CR.po
index f345dbd7a5c..61571a656a9 100644
--- a/addons/portal/i18n/es_CR.po
+++ b/addons/portal/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-02-17 21:54+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: portal
@@ -40,14 +40,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Por favor seleccione al menos un grupo con quien compartir"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -76,6 +75,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Por favor seleccione al menos un grupo con quien compartir"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -118,9 +123,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Debe tener una dirección email en sus preferencias de usuario para enviar "
+"emails"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -134,11 +143,17 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -167,8 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -186,8 +203,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Su cuenta OpenERP en %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -242,13 +259,6 @@ msgstr "Usuarios existentes"
 msgid "Wizard"
 msgstr "Asistente"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -271,11 +281,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -297,7 +302,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Correo electrónico requerido"
@@ -308,13 +313,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Debe tener una dirección email en sus preferencias de usuario para enviar "
-"emails"
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -322,10 +326,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -343,6 +357,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -387,6 +408,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -455,7 +481,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/et.po b/addons/portal/i18n/et.po
index c2ad4f113fd..143e95797e2 100644
--- a/addons/portal/i18n/et.po
+++ b/addons/portal/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/fi.po b/addons/portal/i18n/fi.po
index b8cb67a31f1..22f87a69da9 100644
--- a/addons/portal/i18n/fi.po
+++ b/addons/portal/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Ole hyvä ja valitse ainakin yksi ryhmä jonka kanssa jaetaan"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Ole hyvä ja valitse ainakin yksi ryhmä jonka kanssa jaetaan"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Sinulla pitää olla sähköpostiosoite määriteltynä käyttäjäasetuksissa, jotta "
+"voit lähettää sähköpostia"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr "Käyttäjät"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +181,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +202,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "OpenERP tunnuksesi kohteessa %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +258,6 @@ msgstr "Olemassaolevat käyttäjät"
 msgid "Wizard"
 msgstr "Avustaja"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +280,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +301,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Sähköposti vaaditaan"
@@ -307,13 +312,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Sinulla pitää olla sähköpostiosoite määriteltynä käyttäjäasetuksissa, jotta "
-"voit lähettää sähköpostia"
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -321,10 +325,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -342,6 +356,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -386,6 +407,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -454,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index 252fb6924d2..491bab21435 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-06 17:21+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Veuillez sélectionner au moins un groupe avec lequel partager"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Veuillez sélectionner au moins un groupe avec lequel partager"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Vous devez avoir une adresse de courriel définie dans vos préférences "
+"utilisateur pour envoyer des courriels."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +181,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +202,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Votre compte OpenERP chez %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +258,6 @@ msgstr "Utilisateurs existants"
 msgid "Wizard"
 msgstr "Assistant"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +280,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +301,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Courriel requis"
@@ -307,13 +312,12 @@ msgid "Messaging"
 msgstr "Messagerie"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Vous devez avoir une adresse de courriel définie dans vos préférences "
-"utilisateur pour envoyer des courriels."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -321,10 +325,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -342,6 +356,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -386,6 +407,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -454,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/hr.po b/addons/portal/i18n/hr.po
index bd41c110a32..13bc691157e 100644
--- a/addons/portal/i18n/hr.po
+++ b/addons/portal/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:50+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,11 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "ili"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr "Korisnici"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr "Asistent"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Obavezan e-mail"
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "ili"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/hu.po b/addons/portal/i18n/hu.po
index 0f33fadc1aa..471c3f1c6c0 100644
--- a/addons/portal/i18n/hu.po
+++ b/addons/portal/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/id.po b/addons/portal/i18n/id.po
index eb5d722caa3..d2c28874bd4 100644
--- a/addons/portal/i18n/id.po
+++ b/addons/portal/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/it.po b/addons/portal/i18n/it.po
index 71c7e155400..61ca96e365d 100644
--- a/addons/portal/i18n/it.po
+++ b/addons/portal/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 23:39+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
@@ -39,15 +39,14 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Si prega di selezionare almeno un gruppocon cui condividere"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
-msgstr "Notizie aziendali"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
 
 #. module: portal
 #: view:portal.wizard.user:0
@@ -75,6 +74,12 @@ msgstr "Messaggio di invito"
 msgid "Non-Portal Groups"
 msgstr "Gruppi esterni al Portale"
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Si prega di selezionare almeno un gruppocon cui condividere"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "o"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+"E' necessario avere un indirizzo mail nelle Preferenze Utente per spedire "
+"email."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr "Utenti"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "Paga sicuro online"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -168,9 +183,11 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
-msgstr "Lavori Aziendali"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -187,9 +204,9 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Il tuo account OpenERP presso %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
-msgstr "cr: il cursore database corrente"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
@@ -243,13 +260,6 @@ msgstr ""
 msgid "Wizard"
 msgstr "Procedura guidata"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -272,11 +282,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -298,7 +303,7 @@ msgid "Outgoing Mails"
 msgstr "Email in uscita"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Richiesta email"
@@ -309,13 +314,12 @@ msgid "Messaging"
 msgstr "Comunicazioni"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"E' necessario avere un indirizzo mail nelle Preferenze Utente per spedire "
-"email."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -323,12 +327,22 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr "cr: il cursore database corrente"
+
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
 msgid ""
@@ -353,6 +367,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -397,6 +418,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "o"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -465,7 +491,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po
index 4d9ed0ede2f..4e1b0575ad9 100644
--- a/addons/portal/i18n/ja.po
+++ b/addons/portal/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-06-08 02:58+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "共有するためには少なくとも1グループと共有して下さい。"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "共有するためには少なくとも1グループと共有して下さい。"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,11 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr ""
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr "Eメール送信のためのユーザ設定の中にEメールアドレスを持つ必要があります。"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr "ユーザ"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "%(company)s 上のあなたのOpenERPアカウント"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr "既存ユーザ"
 msgid "Wizard"
 msgstr "ウィザード"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Eメールは必須"
@@ -307,11 +310,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
-msgstr "Eメール送信のためのユーザ設定の中にEメールアドレスを持つ必要があります。"
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/lo.po b/addons/portal/i18n/lo.po
index c7496146b6a..cf822baa2a9 100644
--- a/addons/portal/i18n/lo.po
+++ b/addons/portal/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-08-20 18:55+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "ກະລຸນາເລືອກຢ້າງນ້ອຍໝວດນຶ່ງເພື່ອແບ່ງປັນນກັບ"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "ກະລຸນາເລືອກຢ້າງນ້ອຍໝວດນຶ່ງເພື່ອແບ່ງປັນນກັບ"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/lt.po b/addons/portal/i18n/lt.po
index 20eb8a56a1f..157c2c60e72 100644
--- a/addons/portal/i18n/lt.po
+++ b/addons/portal/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/mn.po b/addons/portal/i18n/mn.po
new file mode 100644
index 00000000000..bfab7942bb6
--- /dev/null
+++ b/addons/portal/i18n/mn.po
@@ -0,0 +1,497 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 07:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Mako"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:50
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr "Дор хаяж нэг хуваалцах хэрэглэгчийг сонго"
+
+#. module: portal
+#: view:portal.wizard:0
+msgid ""
+"Select which contacts should belong to the portal in the list below.\n"
+"                        The email address of each selected contact must be "
+"valid and unique.\n"
+"                        If necessary, you can fix any contact's email "
+"address directly in the list."
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard.user:0
+msgid "Contacts"
+msgstr "Холбогчид"
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: view:res.groups:0
+msgid "Portal Groups"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,welcome_message:0
+msgid "Invitation Message"
+msgstr ""
+
+#. module: portal
+#: view:res.groups:0
+msgid "Non-Portal Groups"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_orders
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "reference: the reference number of the document to pay"
+msgstr ""
+
+#. module: portal
+#: help:portal.payment.acquirer,visible:0
+msgid ""
+"Make this payment acquirer available in portal forms (Customer invoices, "
+"etc.)"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_news
+msgid ""
+"<p>\n"
+"                    Youd don't have unread company's news.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_jobs
+#: model:ir.ui.menu,name:portal.portal_jobs
+msgid "Jobs"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:82
+#, python-format
+msgid "Pay safely online"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"kind: the kind of document on which the payment form is rendered (translated "
+"to user language, e.g. \"Invoice\")"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,portal_id:0
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:38
+#, python-format
+msgid "Users you already shared with"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_jobs
+msgid ""
+"<p>\n"
+"                    Youd don't have unread job offers.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_menu
+#: field:portal.wizard,portal_id:0
+#: field:res.groups,is_portal:0
+#: model:res.groups,name:portal.group_portal
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:34
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,in_portal:0
+msgid "In Portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_news
+#: model:ir.ui.menu,name:portal.portal_company_news
+msgid "News"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_after_sales
+msgid "After Sale Services"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal
+msgid ""
+"Portal members have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.action_acquirer_list
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirers"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_projects
+msgid "Projects"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal
+#: model:ir.ui.menu,name:portal.portal_inbox
+msgid "Inbox"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "uid: the current user id"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"quote(): a method to quote special string character to make them suitable "
+"for inclusion in a URL"
+msgstr ""
+
+#. module: portal
+#: help:res.groups,is_portal:0
+msgid "If checked, this group is usable as a portal."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,form_template:0
+msgid "Payment form template (HTML)"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:193
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_messages
+msgid "Messaging"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_anonymous
+msgid ""
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_payment_acquirer
+msgid "Online Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,welcome_message:0
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_company
+msgid "About Us"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"currency: the currency record in which the document is issued (e.g. "
+"currency.name could be EUR)"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been given access to %(portal)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"Username: %(login)s\n"
+"\n"
+"In order to complete the signin process, click on the following url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: portal
+#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
+msgid ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
+"target=\"_blank\">\n"
+"  <input type=\"hidden\" name=\"cmd\" value=\"_xclick\"/>\n"
+"  <input type=\"hidden\" name=\"business\" "
+"value=\"${object.company_id.paypal_account}\"/>\n"
+"  <input type=\"hidden\" name=\"item_name\" "
+"value=\"${object.company_id.name} ${kind.title()} ${reference}\"/>\n"
+"  <input type=\"hidden\" name=\"amount\" value=\"${amount}\"/>\n"
+"  <input type=\"hidden\" name=\"currency_code\" "
+"value=\"${currency.name}\"/>\n"
+"  <input type=\"image\" name=\"submit\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"</form>\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"If the template renders to an empty result in a certain context it will be "
+"ignored, as if it was inactive."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:39
+#, python-format
+msgid "Existing Groups (e.g Portal Groups)"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "ctx: the current context dictionary"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"This is an HTML form template to submit a payment through this acquirer.\n"
+"                                The template will be rendered with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/mail_mail.py:42
+#, python-format
+msgid ""
+"Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Form Template"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: view:portal.wizard:0
+msgid "Portal Access Management"
+msgstr ""
diff --git a/addons/portal/i18n/nl.po b/addons/portal/i18n/nl.po
index 3a2712abbdf..b0b13fea67b 100644
--- a/addons/portal/i18n/nl.po
+++ b/addons/portal/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 19:15+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,15 +39,14 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Selecteer tenminste een groep om mee te delen"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
-msgstr "Bedrijfs nieuws"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
 
 #. module: portal
 #: view:portal.wizard.user:0
@@ -75,6 +74,12 @@ msgstr "Uitnodigingsbericht invoeren"
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Selecteer tenminste een groep om mee te delen"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "of"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+"U moet een e-mail adres in uw voorkeuren hebben ingesteld om e-mails te "
+"kunnen versturen."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "Betaal veilig online"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,9 +181,11 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
-msgstr "Bedrijfs functies"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -185,8 +202,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Uw Open ERP account bij %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +258,6 @@ msgstr "Bestaande gebruikers"
 msgid "Wizard"
 msgstr "Wizard"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +280,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +301,7 @@ msgid "Outgoing Mails"
 msgstr "Uitgaande E-mails"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Email verplicht"
@@ -307,13 +312,12 @@ msgid "Messaging"
 msgstr "Berichtgeving"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"U moet een e-mail adres in uw voorkeuren hebben ingesteld om e-mails te "
-"kunnen versturen."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -321,10 +325,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -342,6 +356,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -386,6 +407,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "of"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -454,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/pl.po b/addons/portal/i18n/pl.po
index b57a1747064..5b01a901f8e 100644
--- a/addons/portal/i18n/pl.po
+++ b/addons/portal/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-17 08:59+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -44,15 +44,14 @@ msgstr ""
 "w tej liście."
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Proszę wybrać co najmniej jedną grupę do współdzielenia"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
-msgstr "Informacje firmowe"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr "kwota: kwota do zapłaty jako liczba z przecinkiem (float)"
 
 #. module: portal
 #: view:portal.wizard.user:0
@@ -80,6 +79,12 @@ msgstr "Zaproszenie"
 msgid "Non-Portal Groups"
 msgstr "Grupy pozaportalowe"
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Proszę wybrać co najmniej jedną grupę do współdzielenia"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -126,9 +131,11 @@ msgstr ""
 "            "
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "lub"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr "Musisz mieć adres email w swoich preferencjach do wysyłania maili."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -142,11 +149,17 @@ msgid "Users"
 msgstr "Użytkownicy"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "Bezpieczna płatność online"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -181,9 +194,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
-msgstr "Stanowiska w firmie"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+", więc można stosować wyrażenia Mako.\n"
+"                                Kontekst wyliczania Mako jest:"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -200,8 +217,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Twoje konto OpenERP w %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -259,15 +276,6 @@ msgstr "Istniejący użytkownicy"
 msgid "Wizard"
 msgstr "Kreator"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-", więc można stosować wyrażenia Mako.\n"
-"                                Kontekst wyliczania Mako jest:"
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -290,11 +298,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr "kwota: kwota do zapłaty jako liczba z przecinkiem (float)"
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -316,7 +319,7 @@ msgid "Outgoing Mails"
 msgstr "Wychodzace"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Wymagany email"
@@ -327,11 +330,12 @@ msgid "Messaging"
 msgstr "Wiadomości"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
-msgstr "Musisz mieć adres email w swoich preferencjach do wysyłania maili."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -339,13 +343,21 @@ msgid "Online Payment Acquirer"
 msgstr "Beneficjent płatności online"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
-"object: dokument, na podstawie którego generowany jest formularz zapłaty "
-"(zwykle faktura lub zamówienie sprzedaży)"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
@@ -371,6 +383,13 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -434,6 +453,11 @@ msgstr ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "lub"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -507,7 +531,7 @@ msgstr ""
 "                                Szablon zostanie wygenerowany z"
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/pt.po b/addons/portal/i18n/pt.po
index c850b4b4555..e4314952fba 100644
--- a/addons/portal/i18n/pt.po
+++ b/addons/portal/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Por favor, selecione pelo menos um grupo para compartilhar"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Por favor, selecione pelo menos um grupo para compartilhar"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,12 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Deve ter um endereço de e-mail nas suas preferências para enviar emails."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +141,17 @@ msgid "Users"
 msgstr "Utilizadores"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +180,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +201,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Sua conta OpenERP em %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +257,6 @@ msgstr "Utilizadores existentes"
 msgid "Wizard"
 msgstr "Assistente"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +279,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +300,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Email exigido"
@@ -307,12 +311,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Deve ter um endereço de e-mail nas suas preferências para enviar emails."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -320,10 +324,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -341,6 +355,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -385,6 +406,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -453,7 +479,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/pt_BR.po b/addons/portal/i18n/pt_BR.po
index 3e2290ba133..6af35b0ce86 100644
--- a/addons/portal/i18n/pt_BR.po
+++ b/addons/portal/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-04 21:48+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:43+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -44,15 +45,14 @@ msgstr ""
 "mail do contato diretamente na lista."
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Por favor selecione pelo menos um grupo com o qual compartilhar"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr "Trabalhos na Empresa"
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
-msgstr "Notícias da Empresa"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr "amount: o valor total a pagar, como um número flutuante"
 
 #. module: portal
 #: view:portal.wizard.user:0
@@ -80,6 +80,12 @@ msgstr "Mensagem de Convite"
 msgid "Non-Portal Groups"
 msgstr "Grupos que não são do Portal"
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Por favor selecione pelo menos um grupo com o qual compartilhar"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -128,9 +134,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "ou"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+"Você deve possuir um endereço de e-mail em suas preferências de usuário para "
+"enviar e-mails."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -144,11 +154,17 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "Pagar online com segurança"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr "Nenhuma captura de pagamentos online configurada"
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -184,9 +200,13 @@ msgstr ""
 "            "
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
-msgstr "Oportunidades de Emprego da Empresa"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+", então é possível utilizar expressões Mako.\n"
+"                                O contexto de avaliação Mako fornece:"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -203,9 +223,9 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Sua conta do OpenERP em %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
-msgstr "cr: o cursor atual do banco de dados"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr "Anônimo"
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
@@ -262,15 +282,6 @@ msgstr "Usuários Existentes"
 msgid "Wizard"
 msgstr "Assistente"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-", então é possível utilizar expressões Mako.\n"
-"                                O contexto de avaliação Mako fornece:"
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -295,11 +306,6 @@ msgstr ""
 "quote(): um método para formatar caracteres especiais e fazê-los compatíveis "
 "para inclusão em uma url"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr "amount: o valor total a pagar, como um número flutuante"
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -321,7 +327,7 @@ msgid "Outgoing Mails"
 msgstr "E-mails Enviados"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "E-mail obrigatório"
@@ -332,13 +338,15 @@ msgid "Messaging"
 msgstr "Comunicações"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Você deve possuir um endereço de e-mail em suas preferências de usuário para "
-"enviar e-mails."
+"Os usuários anônimos têm direitos de acesso específicos (como as regras de "
+"registro e menus restritos).\n"
+"                 Eles geralmente não pertencem aos grupos OpenERP habituais."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -346,13 +354,23 @@ msgid "Online Payment Acquirer"
 msgstr "Método de Pagamento Online"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr "Notícias da Empresa"
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
 msgstr ""
-"object: o documento em que o formulário de pagamento é gerado (normalmente "
-"um registro de fatura ou pedido de venda)"
+"Você pode finalizar a configuração em <a href=\"%s\">Configurações de Banco "
+"e Caixa</a>"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr "cr: o cursor atual do banco de dados"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
@@ -377,6 +395,15 @@ msgstr ""
 "                </p>\n"
 "            "
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+"objeto: o documento no qual a forma de pagamento é processada (geralmente "
+"uma fatura ou registro de pedido de vendas)"
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -440,6 +467,11 @@ msgstr ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "ou"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -529,7 +561,7 @@ msgstr ""
 "método."
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/ro.po b/addons/portal/i18n/ro.po
index 1d6850f1f87..b8f5ea6f574 100644
--- a/addons/portal/i18n/ro.po
+++ b/addons/portal/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -41,15 +41,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
-"Va rugam sa selectati cel putin un grup cu care sa partajati informatiile"
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -78,6 +76,13 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+"Va rugam sa selectati cel putin un grup cu care sa partajati informatiile"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -120,9 +125,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Trebuie sa aveti o adresa de e-mail in Preferintele Utilizatorului pentru a "
+"trimite e-mail-uri."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -136,11 +145,17 @@ msgid "Users"
 msgstr "Utilizatori"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -169,8 +184,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -188,8 +205,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "Contul d-voastra OpenERP la %(company)s"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -244,13 +261,6 @@ msgstr "Utilizatori existenti"
 msgid "Wizard"
 msgstr "Wizard"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -273,11 +283,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -299,7 +304,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "Email necesar"
@@ -310,13 +315,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"Trebuie sa aveti o adresa de e-mail in Preferintele Utilizatorului pentru a "
-"trimite e-mail-uri."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -324,10 +328,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -345,6 +359,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -389,6 +410,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -457,7 +483,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/ru.po b/addons/portal/i18n/ru.po
index c65d4cd2361..a21d07c0c42 100644
--- a/addons/portal/i18n/ru.po
+++ b/addons/portal/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/sl.po b/addons/portal/i18n/sl.po
index a85bbd3d306..02064de076f 100644
--- a/addons/portal/i18n/sl.po
+++ b/addons/portal/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/sr.po b/addons/portal/i18n/sr.po
new file mode 100644
index 00000000000..ce34b03f76f
--- /dev/null
+++ b/addons/portal/i18n/sr.po
@@ -0,0 +1,497 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 07:57+0000\n"
+"Last-Translator: Vlado Zvijer <vlado.zvijer@iinet.rs>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Mako"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:50
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid ""
+"Select which contacts should belong to the portal in the list below.\n"
+"                        The email address of each selected contact must be "
+"valid and unique.\n"
+"                        If necessary, you can fix any contact's email "
+"address directly in the list."
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard.user:0
+msgid "Contacts"
+msgstr "Контакти"
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr "Постојеће групе"
+
+#. module: portal
+#: view:res.groups:0
+msgid "Portal Groups"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,welcome_message:0
+msgid "Invitation Message"
+msgstr "Позивна порука"
+
+#. module: portal
+#: view:res.groups:0
+msgid "Non-Portal Groups"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Селектујте бар једну групу с којом желите да поделите"
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_orders
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "reference: the reference number of the document to pay"
+msgstr ""
+
+#. module: portal
+#: help:portal.payment.acquirer,visible:0
+msgid ""
+"Make this payment acquirer available in portal forms (Customer invoices, "
+"etc.)"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_news
+msgid ""
+"<p>\n"
+"                    Youd don't have unread company's news.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_jobs
+#: model:ir.ui.menu,name:portal.portal_jobs
+msgid "Jobs"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:82
+#, python-format
+msgid "Pay safely online"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"kind: the kind of document on which the payment form is rendered (translated "
+"to user language, e.g. \"Invoice\")"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,portal_id:0
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:38
+#, python-format
+msgid "Users you already shared with"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_jobs
+msgid ""
+"<p>\n"
+"                    Youd don't have unread job offers.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_menu
+#: field:portal.wizard,portal_id:0
+#: field:res.groups,is_portal:0
+#: model:res.groups,name:portal.group_portal
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:34
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,in_portal:0
+msgid "In Portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_news
+#: model:ir.ui.menu,name:portal.portal_company_news
+msgid "News"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_after_sales
+msgid "After Sale Services"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal
+msgid ""
+"Portal members have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.action_acquirer_list
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirers"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_projects
+msgid "Projects"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal
+#: model:ir.ui.menu,name:portal.portal_inbox
+msgid "Inbox"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "uid: the current user id"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"quote(): a method to quote special string character to make them suitable "
+"for inclusion in a URL"
+msgstr ""
+
+#. module: portal
+#: help:res.groups,is_portal:0
+msgid "If checked, this group is usable as a portal."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,form_template:0
+msgid "Payment form template (HTML)"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:193
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_messages
+msgid "Messaging"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_anonymous
+msgid ""
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_payment_acquirer
+msgid "Online Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,welcome_message:0
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_company
+msgid "About Us"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"currency: the currency record in which the document is issued (e.g. "
+"currency.name could be EUR)"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been given access to %(portal)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"Username: %(login)s\n"
+"\n"
+"In order to complete the signin process, click on the following url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: portal
+#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
+msgid ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
+"target=\"_blank\">\n"
+"  <input type=\"hidden\" name=\"cmd\" value=\"_xclick\"/>\n"
+"  <input type=\"hidden\" name=\"business\" "
+"value=\"${object.company_id.paypal_account}\"/>\n"
+"  <input type=\"hidden\" name=\"item_name\" "
+"value=\"${object.company_id.name} ${kind.title()} ${reference}\"/>\n"
+"  <input type=\"hidden\" name=\"amount\" value=\"${amount}\"/>\n"
+"  <input type=\"hidden\" name=\"currency_code\" "
+"value=\"${currency.name}\"/>\n"
+"  <input type=\"image\" name=\"submit\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"</form>\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"If the template renders to an empty result in a certain context it will be "
+"ignored, as if it was inactive."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:39
+#, python-format
+msgid "Existing Groups (e.g Portal Groups)"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "ctx: the current context dictionary"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"This is an HTML form template to submit a payment through this acquirer.\n"
+"                                The template will be rendered with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/mail_mail.py:42
+#, python-format
+msgid ""
+"Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Form Template"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: view:portal.wizard:0
+msgid "Portal Access Management"
+msgstr ""
diff --git a/addons/portal/i18n/sv.po b/addons/portal/i18n/sv.po
index ff897c352bd..eb9dfd42826 100644
--- a/addons/portal/i18n/sv.po
+++ b/addons/portal/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Vänligen välj minst en grupp att dela med"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Vänligen välj minst en grupp att dela med"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr "Användare"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr "Guide"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po
index f7936a9c38d..4aa30c1b4b7 100644
--- a/addons/portal/i18n/tr.po
+++ b/addons/portal/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-05-10 17:58+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "Lütfen paylaşılacak en az bir grup seçin"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "Lütfen paylaşılacak en az bir grup seçin"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
+"E-posta gönderebilmek için kullanıcı seçeneklerinde e-posta adresiniz "
+"tanımlı olmalı."
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +142,17 @@ msgid "Users"
 msgstr "Kullanıcılar"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +181,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +202,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "%(company)s şirketindeki OpenERP hesabınız"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +258,6 @@ msgstr "Varolan kullanıcılar"
 msgid "Wizard"
 msgstr "Sihirbaz"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +280,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +301,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "E-posta Gerekli"
@@ -307,13 +312,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
-"E-posta gönderebilmek için kullanıcı seçeneklerinde e-posta adresiniz "
-"tanımlı olmalı."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -321,10 +325,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -342,6 +356,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -386,6 +407,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -454,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/uk.po b/addons/portal/i18n/uk.po
index 0486ae47de8..a8a0e903297 100644
--- a/addons/portal/i18n/uk.po
+++ b/addons/portal/i18n/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index 3c1e43b0b7c..d7bac00edc1 100644
--- a/addons/portal/i18n/zh_CN.po
+++ b/addons/portal/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 11:49+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
-msgstr "请选择要分享信息的至少一个用户组"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr "邀请消息"
 msgid "Non-Portal Groups"
 msgstr "非门户组"
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "请选择要分享信息的至少一个用户组"
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,9 +122,11 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
-msgstr "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr "你的个人设置里必须要输入电子邮件地址才能发送邮件"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr "用户"
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr "安全在线支付"
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,9 +200,9 @@ msgid "Your OpenERP account at %(company)s"
 msgstr "你在 %(company)s 的OpenERP帐号"
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
-msgstr "cr: 当前数据库游标"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
@@ -241,13 +256,6 @@ msgstr "现有用户"
 msgid "Wizard"
 msgstr "向导"
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr "发出邮件"
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr "必须输入邮件地址"
@@ -307,11 +310,12 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
-msgstr "你的个人设置里必须要输入电子邮件地址才能发送邮件"
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
@@ -319,12 +323,22 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr "cr: 当前数据库游标"
+
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
 msgid ""
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr "or"
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal/i18n/zh_TW.po b/addons/portal/i18n/zh_TW.po
index 898911f9dd7..795e5a51b39 100644
--- a/addons/portal/i18n/zh_TW.po
+++ b/addons/portal/i18n/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2011-07-11 09:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -39,14 +39,13 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
 msgstr ""
 
 #. module: portal
@@ -75,6 +74,12 @@ msgstr ""
 msgid "Non-Portal Groups"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
@@ -117,8 +122,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
 msgstr ""
 
 #. module: portal
@@ -133,11 +140,17 @@ msgid "Users"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
 #, python-format
 msgid "Pay safely online"
 msgstr ""
 
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid ""
@@ -166,8 +179,10 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
 msgstr ""
 
 #. module: portal
@@ -185,8 +200,8 @@ msgid "Your OpenERP account at %(company)s"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
 msgstr ""
 
 #. module: portal
@@ -241,13 +256,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ""
-", so it may use Mako expressions.\n"
-"                                The Mako evaluation context provides:"
-msgstr ""
-
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
@@ -270,11 +278,6 @@ msgid ""
 "for inclusion in a URL"
 msgstr ""
 
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
@@ -296,7 +299,7 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -307,10 +310,11 @@ msgid "Messaging"
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
+#: model:res.groups,comment:portal.group_anonymous
 msgid ""
-"You must have an email address in your User Preferences to send emails."
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
 msgstr ""
 
 #. module: portal
@@ -319,10 +323,20 @@ msgid "Online Payment Acquirer"
 msgstr ""
 
 #. module: portal
-#: view:portal.payment.acquirer:0
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
 msgid ""
-"object: the document on which the payment form is rendered (usually an "
-"invoice or sale order record)"
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
 msgstr ""
 
 #. module: portal
@@ -340,6 +354,13 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
@@ -384,6 +405,11 @@ msgid ""
 "http://www.openerp.com\n"
 msgstr ""
 
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
 msgid ""
@@ -452,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
 #, python-format
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
diff --git a/addons/portal_claim/i18n/de.po b/addons/portal_claim/i18n/de.po
index f7a780a8d0e..e58279313e6 100644
--- a/addons/portal_claim/i18n/de.po
+++ b/addons/portal_claim/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 17:18+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/es.po b/addons/portal_claim/i18n/es.po
index 53274c4477b..f0f3946509d 100644
--- a/addons/portal_claim/i18n/es.po
+++ b/addons/portal_claim/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:25+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/fr.po b/addons/portal_claim/i18n/fr.po
index 5b9dcae54ba..4072f4b699e 100644
--- a/addons/portal_claim/i18n/fr.po
+++ b/addons/portal_claim/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/hr.po b/addons/portal_claim/i18n/hr.po
index 0d9f328149b..f8598572ecf 100644
--- a/addons/portal_claim/i18n/hr.po
+++ b/addons/portal_claim/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 20:51+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/it.po b/addons/portal_claim/i18n/it.po
index 017d7860799..70179ae3973 100644
--- a/addons/portal_claim/i18n/it.po
+++ b/addons/portal_claim/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 20:34+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/nl.po b/addons/portal_claim/i18n/nl.po
index 7b98e0858de..9a16eef200a 100644
--- a/addons/portal_claim/i18n/nl.po
+++ b/addons/portal_claim/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-30 19:42+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/pl.po b/addons/portal_claim/i18n/pl.po
index a5db30fc3b1..ea0ce7eb01e 100644
--- a/addons/portal_claim/i18n/pl.po
+++ b/addons/portal_claim/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:53+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/pt.po b/addons/portal_claim/i18n/pt.po
index 2f4a4393911..c52f7092e02 100644
--- a/addons/portal_claim/i18n/pt.po
+++ b/addons/portal_claim/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-18 15:00+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
diff --git a/addons/portal_claim/i18n/pt_BR.po b/addons/portal_claim/i18n/pt_BR.po
index 9d31bfff9cb..26cadd50ed0 100644
--- a/addons/portal_claim/i18n/pt_BR.po
+++ b/addons/portal_claim/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 22:52+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_claim/i18n/zh_CN.po b/addons/portal_claim/i18n/zh_CN.po
index d76276fad8d..aadc32686d8 100644
--- a/addons/portal_claim/i18n/zh_CN.po
+++ b/addons/portal_claim/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-27 02:00+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_claim
 #: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
diff --git a/addons/portal_crm/i18n/de.po b/addons/portal_crm/i18n/de.po
index 22fbb7e181e..9cc32006582 100644
--- a/addons/portal_crm/i18n/de.po
+++ b/addons/portal_crm/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 17:47+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -431,12 +431,6 @@ msgstr "Verkäufer"
 msgid "Days to Close"
 msgstr "Tage b. Beend."
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/es.po b/addons/portal_crm/i18n/es.po
index e484a6adfd1..9c091a05721 100644
--- a/addons/portal_crm/i18n/es.po
+++ b/addons/portal_crm/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-13 16:19+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:39+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -429,12 +429,6 @@ msgstr "Comercial"
 msgid "Days to Close"
 msgstr "Días para el cierre"
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/hr.po b/addons/portal_crm/i18n/hr.po
index 2ab2a7c5de0..f9835002a84 100644
--- a/addons/portal_crm/i18n/hr.po
+++ b/addons/portal_crm/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 06:48+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Days to Close"
 msgstr ""
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/nl.po b/addons/portal_crm/i18n/nl.po
index 7fb749547b8..720bd3c2db7 100644
--- a/addons/portal_crm/i18n/nl.po
+++ b/addons/portal_crm/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 18:30+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -430,12 +430,6 @@ msgstr "Verkoper"
 msgid "Days to Close"
 msgstr "Dagen tot sluiten"
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/pl.po b/addons/portal_crm/i18n/pl.po
index de75aeed0f8..5f091f99146 100644
--- a/addons/portal_crm/i18n/pl.po
+++ b/addons/portal_crm/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-11 11:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -426,12 +426,6 @@ msgstr "Sprzedawca"
 msgid "Days to Close"
 msgstr "Dni do zamknięcia"
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/pt.po b/addons/portal_crm/i18n/pt.po
index b2e9cca1fdb..af851c37b0f 100644
--- a/addons/portal_crm/i18n/pt.po
+++ b/addons/portal_crm/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-05 09:41+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Days to Close"
 msgstr ""
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/pt_BR.po b/addons/portal_crm/i18n/pt_BR.po
index fe132418635..fbb36048ea7 100644
--- a/addons/portal_crm/i18n/pt_BR.po
+++ b/addons/portal_crm/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-07 22:51+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -432,12 +432,6 @@ msgstr "Vendedor"
 msgid "Days to Close"
 msgstr "Dias para Fechar"
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_crm/i18n/zh_CN.po b/addons/portal_crm/i18n/zh_CN.po
index 523125827a0..a7a8ec9e3d0 100644
--- a/addons/portal_crm/i18n/zh_CN.po
+++ b/addons/portal_crm/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-29 08:12+0000\n"
 "Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -418,12 +418,6 @@ msgstr "销售员"
 msgid "Days to Close"
 msgstr ""
 
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: portal_crm
 #: field:portal_crm.crm_contact_us,company_ids:0
 msgid "Companies"
diff --git a/addons/portal_event/i18n/de.po b/addons/portal_event/i18n/de.po
index 8e9e71835f9..86f15fddbe0 100644
--- a/addons/portal_event/i18n/de.po
+++ b/addons/portal_event/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 17:52+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_event/i18n/es.po b/addons/portal_event/i18n/es.po
index 4f4520cec1e..1560ce45b54 100644
--- a/addons/portal_event/i18n/es.po
+++ b/addons/portal_event/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:51+0000\n"
 "Last-Translator: luis tobar <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_event/i18n/hr.po b/addons/portal_event/i18n/hr.po
index 89bfd991887..e4b31780780 100644
--- a/addons/portal_event/i18n/hr.po
+++ b/addons/portal_event/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 06:58+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_event/i18n/nl.po b/addons/portal_event/i18n/nl.po
index 0618f851e4d..72eb1d2c919 100644
--- a/addons/portal_event/i18n/nl.po
+++ b/addons/portal_event/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 19:17+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_event/i18n/pt.po b/addons/portal_event/i18n/pt.po
index 918a4b6de21..3c6e216c468 100644
--- a/addons/portal_event/i18n/pt.po
+++ b/addons/portal_event/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-05 09:43+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_event/i18n/pt_BR.po b/addons/portal_event/i18n/pt_BR.po
index d0f535b8bbe..e11b2d1c893 100644
--- a/addons/portal_event/i18n/pt_BR.po
+++ b/addons/portal_event/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 13:38+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_event/i18n/zh_CN.po b/addons/portal_event/i18n/zh_CN.po
index fe01f7f7e76..2cd7114cbf6 100644
--- a/addons/portal_event/i18n/zh_CN.po
+++ b/addons/portal_event/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 12:36+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_event
 #: view:event.event:0
diff --git a/addons/portal_hr_employees/i18n/de.po b/addons/portal_hr_employees/i18n/de.po
index 23180e76216..3edfe490b25 100644
--- a/addons/portal_hr_employees/i18n/de.po
+++ b/addons/portal_hr_employees/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 18:16+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +25,14 @@ msgstr ""
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "Lernen Sie das Team kennen"
+msgid "Our Team"
+msgstr ""
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr "Gruppiert nach..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "unbekannt"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr "Arbeitsstelle"
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/es.po b/addons/portal_hr_employees/i18n/es.po
index 07e56327a16..5d3eaea42b9 100644
--- a/addons/portal_hr_employees/i18n/es.po
+++ b/addons/portal_hr_employees/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-12 15:30+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 11:40+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +25,14 @@ msgstr "Monitor"
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "Conozca al equipo"
+msgid "Our Team"
+msgstr "Nuestro equipo"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "desconocido"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr "Puesto"
 msgid "Visibility"
 msgstr "Visibilidad"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr "Información pública"
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/hr.po b/addons/portal_hr_employees/i18n/hr.po
index 02385f9f001..cd25903e240 100644
--- a/addons/portal_hr_employees/i18n/hr.po
+++ b/addons/portal_hr_employees/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 07:00+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +25,14 @@ msgstr "Trener"
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "Upoznajte tim"
+msgid "Our Team"
+msgstr ""
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "nepoznato"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr "Radno mjesto"
 msgid "Visibility"
 msgstr "Vidljivost"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/nl.po b/addons/portal_hr_employees/i18n/nl.po
index cc48cf11b20..110602fe680 100644
--- a/addons/portal_hr_employees/i18n/nl.po
+++ b/addons/portal_hr_employees/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 18:38+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +25,14 @@ msgstr "Coach"
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "Maak kennis met het team"
+msgid "Our Team"
+msgstr ""
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "onbekend"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr "Functie"
 msgid "Visibility"
 msgstr "Zichtbaarheid"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/pl.po b/addons/portal_hr_employees/i18n/pl.po
index 50df2a01fdf..411cd5979bc 100644
--- a/addons/portal_hr_employees/i18n/pl.po
+++ b/addons/portal_hr_employees/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:56+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +25,14 @@ msgstr "Trener"
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "Poznaj załogę"
+msgid "Our Team"
+msgstr ""
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "nieznane"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr "Stanowisko"
 msgid "Visibility"
 msgstr "Widoczność"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/pt.po b/addons/portal_hr_employees/i18n/pt.po
index 028cae086e4..5f22b38571b 100644
--- a/addons/portal_hr_employees/i18n/pt.po
+++ b/addons/portal_hr_employees/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 17:52+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
+msgid "Our Team"
 msgstr ""
 
 #. module: portal_hr_employees
@@ -33,11 +33,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "desconhecido"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr ""
 msgid "Visibility"
 msgstr "Visibilidade"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/pt_BR.po b/addons/portal_hr_employees/i18n/pt_BR.po
index 2deb98fb7a8..f6c8cad5e0d 100644
--- a/addons/portal_hr_employees/i18n/pt_BR.po
+++ b/addons/portal_hr_employees/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-04 17:33+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-22 01:47+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +26,14 @@ msgstr "Treinador"
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "Conheça o time"
+msgid "Our Team"
+msgstr "Nossa Equipe"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr "desconhecido"
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +74,11 @@ msgstr "Trabalho"
 msgid "Visibility"
 msgstr "Visibilidade"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr "informações Públicas"
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_hr_employees/i18n/zh_CN.po b/addons/portal_hr_employees/i18n/zh_CN.po
index cf5abbcda34..2efb864fcee 100644
--- a/addons/portal_hr_employees/i18n/zh_CN.po
+++ b/addons/portal_hr_employees/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-28 14:15+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -25,19 +25,14 @@ msgstr ""
 #. module: portal_hr_employees
 #: model:ir.actions.act_window,name:portal_hr_employees.action_team
 #: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
-msgstr "团队集会"
+msgid "Our Team"
+msgstr ""
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Group By..."
 msgstr ""
 
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr ""
-
 #. module: portal_hr_employees
 #: view:hr.employee:0
 msgid "Company"
@@ -78,6 +73,11 @@ msgstr ""
 msgid "Visibility"
 msgstr "可见性"
 
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
 #. module: portal_hr_employees
 #: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
 msgid "Contact form for the portal"
diff --git a/addons/portal_project/i18n/de.po b/addons/portal_project/i18n/de.po
index d13c33ea46c..66667b013ac 100644
--- a/addons/portal_project/i18n/de.po
+++ b/addons/portal_project/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 18:18+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/es.po b/addons/portal_project/i18n/es.po
index efa00a0d1be..dcfc89d40db 100644
--- a/addons/portal_project/i18n/es.po
+++ b/addons/portal_project/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 14:24+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/fr.po b/addons/portal_project/i18n/fr.po
index 2264709dac5..a5c81a149dc 100644
--- a/addons/portal_project/i18n/fr.po
+++ b/addons/portal_project/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-12 07:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/hr.po b/addons/portal_project/i18n/hr.po
index 936be15e2e1..94055aaa2b4 100644
--- a/addons/portal_project/i18n/hr.po
+++ b/addons/portal_project/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-10 06:56+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/it.po b/addons/portal_project/i18n/it.po
index 2f834d4e25a..d6d468f04b9 100644
--- a/addons/portal_project/i18n/it.po
+++ b/addons/portal_project/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 20:35+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/nl.po b/addons/portal_project/i18n/nl.po
index d696cfa8afb..737ee513dfc 100644
--- a/addons/portal_project/i18n/nl.po
+++ b/addons/portal_project/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-09 18:36+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/pl.po b/addons/portal_project/i18n/pl.po
index f2c891f21fa..b19616a3a81 100644
--- a/addons/portal_project/i18n/pl.po
+++ b/addons/portal_project/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-16 11:54+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/pt_BR.po b/addons/portal_project/i18n/pt_BR.po
index 881f2ee267e..33516d5cd53 100644
--- a/addons/portal_project/i18n/pt_BR.po
+++ b/addons/portal_project/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-04 13:18+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/sv.po b/addons/portal_project/i18n/sv.po
index 06722e3637a..c5b7ccf7a08 100644
--- a/addons/portal_project/i18n/sv.po
+++ b/addons/portal_project/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-11-26 22:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project/i18n/zh_CN.po b/addons/portal_project/i18n/zh_CN.po
index 3c794fbfaf0..9481cfa22cf 100644
--- a/addons/portal_project/i18n/zh_CN.po
+++ b/addons/portal_project/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
 "PO-Revision-Date: 2012-12-14 13:32+0000\n"
 "Last-Translator: sum1201 <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/portal_project_issue/i18n/de.po b/addons/portal_project_issue/i18n/de.po
index 0e507b7cf7c..4607676c1c6 100644
--- a/addons/portal_project_issue/i18n/de.po
+++ b/addons/portal_project_issue/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 18:28+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_project_issue/i18n/es.po b/addons/portal_project_issue/i18n/es.po
index 316ca42f3fb..e1aec780436 100644
--- a/addons/portal_project_issue/i18n/es.po
+++ b/addons/portal_project_issue/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 14:25+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_project_issue/i18n/hr.po b/addons/portal_project_issue/i18n/hr.po
index 84f4058f28d..84af1f1a6e8 100644
--- a/addons/portal_project_issue/i18n/hr.po
+++ b/addons/portal_project_issue/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 06:54+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_project_issue/i18n/it.po b/addons/portal_project_issue/i18n/it.po
index 0d0f81eb531..45a7ba7fbee 100644
--- a/addons/portal_project_issue/i18n/it.po
+++ b/addons/portal_project_issue/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 10:48+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:49+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_project_issue/i18n/nl.po b/addons/portal_project_issue/i18n/nl.po
index 02677aa5e9e..ed1b5bf94ad 100644
--- a/addons/portal_project_issue/i18n/nl.po
+++ b/addons/portal_project_issue/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 14:03+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
diff --git a/addons/portal_project_issue/i18n/pl.po b/addons/portal_project_issue/i18n/pl.po
index 82fbeb1f581..e6a3afb6388 100644
--- a/addons/portal_project_issue/i18n/pl.po
+++ b/addons/portal_project_issue/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 11:55+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_project_issue/i18n/pt_BR.po b/addons/portal_project_issue/i18n/pt_BR.po
index 7fbaa3ff63b..5d7a7cf9185 100644
--- a/addons/portal_project_issue/i18n/pt_BR.po
+++ b/addons/portal_project_issue/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 13:24+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_project_issue/i18n/zh_CN.po b/addons/portal_project_issue/i18n/zh_CN.po
index b8abaff532a..8d9b81e2bac 100644
--- a/addons/portal_project_issue/i18n/zh_CN.po
+++ b/addons/portal_project_issue/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 14:20+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_project_issue
 #: view:project.issue:0
diff --git a/addons/portal_sale/i18n/de.po b/addons/portal_sale/i18n/de.po
index c5349312e8f..a5806a7c10c 100644
--- a/addons/portal_sale/i18n/de.po
+++ b/addons/portal_sale/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 18:36+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +28,13 @@ msgid "We haven't sent you any invoice."
 msgstr "Es liegt noch keine Rechnung für Sie vor."
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
-msgstr "Es liegt noch keine Auftragsbestätigung für Sie vor."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -62,44 +66,52 @@ msgid "Sales Orders"
 msgstr "Aufträge"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+"Mitglieder dieser Gruppe können die Online Zahlungsoptionen bei Aufträgen "
+"und Rechnungen sehen. Diese Optionen sind für Kunden gedacht, die auf Ihre "
+"Dokumente über das Portal zugreifen."
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -107,35 +119,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -145,7 +141,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -179,25 +175,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-"Mitglieder dieser Gruppe können die Online Zahlungsoptionen bei Aufträgen "
-"und Rechnungen sehen. Diese Optionen sind für Kunden gedacht, die auf Ihre "
-"Dokumente über das Portal zugreifen."
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -256,48 +240,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -305,36 +278,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -344,7 +299,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -378,13 +333,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -394,12 +354,3 @@ msgstr "Rechnung"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "Aufträge"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
diff --git a/addons/portal_sale/i18n/es.po b/addons/portal_sale/i18n/es.po
index 61411dd795b..9eef634a224 100644
--- a/addons/portal_sale/i18n/es.po
+++ b/addons/portal_sale/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-12 15:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 22:55+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +28,13 @@ msgid "We haven't sent you any invoice."
 msgstr "No se le ha enviado ninguna factura."
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
-msgstr "No se le ha enviado ningún pedido de venta."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'borrador' or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -62,44 +66,52 @@ msgid "Sales Orders"
 msgstr "Pedidos de venta"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+"Los miembros de este grupo verán las opciones de pago on-line de los pedidos "
+"de venta y las facturas de cliente. Estas opciones están previstas para "
+"clientes que acceden a sus documentos a través del portal."
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -107,35 +119,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -145,7 +141,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -179,7 +175,7 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
@@ -190,37 +186,34 @@ msgstr ""
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hola${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>Tiene una nueva factura disponible: </p>\n"
+"    <p>Hola ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Aquí está su ${object.state in ('draft', 'sent') and 'presupuesto' or "
+"'confirmación de pedido'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Nº factura: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Total de la factura: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Fecha de la factura: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Su referencia: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Factura%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Pedido%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    Puede acceder a la factura y proceder a su pago on-line vía nuestro "
-"portal del cliente:\n"
+"    Puede acceder a este documento y pagar en línea vía nuestro portal de "
+"cliente:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -228,37 +221,21 @@ msgstr ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">Ver factura</a>\n"
+"           href=\"${signup_url}\">Ver ${object.state in ('draft', 'sent') "
+"and 'presupuesto' or 'pedido'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=Pago_Factura_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>También es posible pagarlo directamente con Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
-"    <p>Si tiene cualquier pregunta, no dude en contactarnos.</p>\n"
+"    <p>Si tiene alguna pregunta, no dude en contactarnos.</p>\n"
 "    <p>Gracias por elegir ${object.company_id.name or 'us'}!</p>\n"
 "    <br/>\n"
 "    <br/>\n"
@@ -266,7 +243,7 @@ msgstr ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -300,24 +277,12 @@ msgstr ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-"Los miembros de este grupo verán las opciones de pago on-line de los pedidos "
-"de venta y las facturas de cliente. Estas opciones están previstas para "
-"clientes que acceden a sus documentos a través del portal."
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -376,48 +341,37 @@ msgid "Configure payment acquiring methods"
 msgstr "Configurar los métodos de pago"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -425,36 +379,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -464,7 +400,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -498,7 +434,7 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
@@ -509,41 +445,29 @@ msgstr ""
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Aquí está su ${object.state in ('draft', 'sent') and 'presupuesto' or "
-"'confirmación de pedido'} de ${object.company_id.name}: </p>\n"
+"    <p>Hola ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>Tiene una nueva factura disponible: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Nº de factura: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Total de la factura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha de factura: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Pedido%20${object.name}\">${object.user_id.name}</a>\n"
+"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Factura%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    Puede acceder al documento y pagarlo on-line vía nuestro portal del "
+"    Puede acceder a la misma y pagarla en línea vía nuestro portal de "
 "cliente:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
@@ -552,46 +476,28 @@ msgstr ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=Pagar_Pedido_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
-"    <p>También es posible pagarlo directamente con Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"    <p>También es posible pagarla directamente con Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
-"    <p>Si tiene alguna cuestión, no dude en contactar con nosotros.</p>\n"
-"    <p>Gracias por escoger ${object.company_id.name or 'us'}!</p>\n"
+"    <p>Si tiene alguna pregunta, no dude en contactar con nosotros.</p>\n"
+"    <p>Gracias por elegir ${object.company_id.name or 'us'}!</p>\n"
 "    <br/>\n"
 "    <br/>\n"
 "    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -625,12 +531,17 @@ msgstr ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr "No le hemos enviado ningún pedido de venta."
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -640,12 +551,3 @@ msgstr "Factura"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "Pedidos de venta"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'borrador' or ''}"
diff --git a/addons/portal_sale/i18n/fi.po b/addons/portal_sale/i18n/fi.po
index 7aff7062342..241d9393702 100644
--- a/addons/portal_sale/i18n/fi.po
+++ b/addons/portal_sale/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-26 22:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,8 +28,10 @@ msgid "We haven't sent you any invoice."
 msgstr ""
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 msgstr ""
 
 #. module: portal_sale
@@ -60,44 +62,49 @@ msgid "Sales Orders"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -105,35 +112,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -143,7 +134,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -177,22 +168,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -246,48 +228,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -295,36 +266,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -334,7 +287,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -368,13 +321,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -384,10 +342,3 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr ""
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
diff --git a/addons/portal_sale/i18n/fr.po b/addons/portal_sale/i18n/fr.po
index b76048ffe3c..4843c07f0ab 100644
--- a/addons/portal_sale/i18n/fr.po
+++ b/addons/portal_sale/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 15:36+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,8 +28,10 @@ msgid "We haven't sent you any invoice."
 msgstr ""
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 msgstr ""
 
 #. module: portal_sale
@@ -60,44 +62,49 @@ msgid "Sales Orders"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -105,35 +112,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -143,7 +134,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -177,22 +168,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -246,48 +228,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -295,36 +266,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -334,7 +287,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -368,13 +321,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -384,10 +342,3 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr ""
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
diff --git a/addons/portal_sale/i18n/hr.po b/addons/portal_sale/i18n/hr.po
index 8e9cf56c849..64f370ccfa1 100644
--- a/addons/portal_sale/i18n/hr.po
+++ b/addons/portal_sale/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 06:53+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,8 +28,10 @@ msgid "We haven't sent you any invoice."
 msgstr ""
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 msgstr ""
 
 #. module: portal_sale
@@ -60,44 +62,49 @@ msgid "Sales Orders"
 msgstr "Prodajni nalozi"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -105,35 +112,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -143,7 +134,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -177,22 +168,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -248,48 +230,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -297,36 +268,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -336,7 +289,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -370,13 +323,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -386,10 +344,3 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr ""
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
diff --git a/addons/portal_sale/i18n/nl.po b/addons/portal_sale/i18n/nl.po
index 31f2da41fb3..db340d105bf 100644
--- a/addons/portal_sale/i18n/nl.po
+++ b/addons/portal_sale/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 18:35+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +28,13 @@ msgid "We haven't sent you any invoice."
 msgstr "Wij hebben u geen factuur toegezonden."
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
-msgstr "Wij hebben u geen verkooprder toegezonden."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -60,44 +64,49 @@ msgid "Sales Orders"
 msgstr "Verkooporders"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -105,35 +114,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -143,7 +136,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -177,22 +170,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -248,48 +232,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -297,36 +270,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -336,7 +291,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -370,13 +325,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -386,12 +346,3 @@ msgstr "Factuur"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "Verkooporders"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
diff --git a/addons/portal_sale/i18n/pl.po b/addons/portal_sale/i18n/pl.po
index 79cd8bb9ea4..45413796dfd 100644
--- a/addons/portal_sale/i18n/pl.po
+++ b/addons/portal_sale/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 08:48+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +28,11 @@ msgid "We haven't sent you any invoice."
 msgstr "Nie wysłaliśmy ci żadnych faktur."
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
-msgstr "Nie wysłaliśmy ci żadnych zamówień sprzedaży."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -62,44 +64,53 @@ msgid "Sales Orders"
 msgstr "Zamówienia Sprzedaży"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+"Członkowie tych grup widzą opcje płatności\n"
+"w Zamówieniach sprzedaży i Fakturach sprzedaży. Opcje są przeznaczone dla "
+"klientów\n"
+"korzystających z dokumentów udostępnionych przez portal."
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -107,35 +118,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -145,7 +140,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -179,26 +174,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-"Członkowie tych grup widzą opcje płatności\n"
-"w Zamówieniach sprzedaży i Fakturach sprzedaży. Opcje są przeznaczone dla "
-"klientów\n"
-"korzystających z dokumentów udostępnionych przez portal."
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -254,48 +236,37 @@ msgid "Configure payment acquiring methods"
 msgstr "Konfiguruj metody przyjmowania płatności"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -303,36 +274,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -342,7 +295,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -376,13 +329,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -392,10 +350,3 @@ msgstr "Faktura"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "Zamówienia sprzedaży"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
diff --git a/addons/portal_sale/i18n/pt.po b/addons/portal_sale/i18n/pt.po
index 7af1a12920e..a83674b434f 100644
--- a/addons/portal_sale/i18n/pt.po
+++ b/addons/portal_sale/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 09:45+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +28,13 @@ msgid "We haven't sent you any invoice."
 msgstr "Não lhe enviámos qualquer fatura"
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
-msgstr "Não lhe enviámos qualquer ordem de venda"
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -62,44 +66,49 @@ msgid "Sales Orders"
 msgstr "Ordens de venda"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -107,35 +116,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -145,7 +138,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -179,22 +172,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -250,48 +234,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -299,36 +272,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -338,7 +293,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -372,13 +327,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -388,12 +348,3 @@ msgstr "Fatura"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "Ordens de venda"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
diff --git a/addons/portal_sale/i18n/pt_BR.po b/addons/portal_sale/i18n/pt_BR.po
index 51625447fc5..ac58d3121ee 100644
--- a/addons/portal_sale/i18n/pt_BR.po
+++ b/addons/portal_sale/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-06 17:05+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 01:48+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +29,13 @@ msgid "We haven't sent you any invoice."
 msgstr "Não foi enviada nenhuma fatura para você."
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
-msgstr "Não foi enviado nenhum pedido de venda para você."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -62,44 +67,53 @@ msgid "Sales Orders"
 msgstr "Pedidos de Vendas"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+"Os membros deste grupo visualizam as opções de pagamento online\n"
+"nas Faturas de Cliente e Pedidos de Venda. Estas opções são destinadas aos "
+"clientes que acessam\n"
+"os seus documentos através do portal."
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -107,35 +121,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -145,7 +143,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -179,148 +177,12 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
-"''},</p>\n"
-"\n"
-"    <p>Uma nova fatura está disponível para você: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERÊNCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Número da Fatura: <strong>${object.number}</strong><br "
-"/>\n"
-"       &nbsp;&nbsp;Total Faturado: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Data de Faturamento: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Pedido de Referência: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
-"    % if signup_url:\n"
-"    <p>\n"
-"    Você pode acessar o documento da fatura e pagar online através do nosso "
-"Portal de Atendimento:\n"
-"    </p>\n"
-"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
-"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
-"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
-"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
-"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
-"no-repeat;\"\n"
-"           href=\"${signup_url}\">Ver Fatura</a>\n"
-"    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
-"\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>Se você possui alguma dúvida ou sugestão, entre em contato "
-"conosco.</p>\n"
-"    <p>Obrigado por escolher ${object.company_id.name or 'nossa "
-"empresa'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Telefone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Site :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-"Os membros deste grupo visualizam as opções de pagamento online\n"
-"nas Faturas de Cliente e Pedidos de Venda. Estas opções são destinadas aos "
-"clientes que acessam\n"
-"os seus documentos através do portal."
 
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
@@ -380,48 +242,37 @@ msgid "Configure payment acquiring methods"
 msgstr "Configurar métodos de pagamento"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -429,36 +280,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -468,7 +301,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -502,140 +335,17 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
-"''},</p>\n"
-"    \n"
-"    <p>Esta é sua ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} de ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERÊNCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Número do Pedido: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Valor Total do Pedido: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Data do Pedido: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Referência do Pedido: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Sua referência: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
-"    % if signup_url:\n"
-"    <p>\n"
-"    Você pode acessar o documento e pagar online através do nosso Portal de "
-"Atendimento:\n"
-"    </p>\n"
-"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
-"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
-"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
-"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
-"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
-"no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
-"    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"\n"
-"    <br/>\n"
-"    <p>Se você possui alguma dúvida ou sugestão, entre em contato "
-"conosco.</p>\n"
-"    <p>Obrigado por escolher ${object.company_id.name or 'nossa "
-"empresa'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Telefone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Site :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr "Nós não te enviamos nenhuma ordem de venda."
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
@@ -646,12 +356,3 @@ msgstr "Fatura"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "Pedidos de Venda"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
diff --git a/addons/portal_sale/i18n/sv.po b/addons/portal_sale/i18n/sv.po
index 080b3b74d20..848edbcca85 100644
--- a/addons/portal_sale/i18n/sv.po
+++ b/addons/portal_sale/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-26 22:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,8 +28,10 @@ msgid "We haven't sent you any invoice."
 msgstr ""
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 msgstr ""
 
 #. module: portal_sale
@@ -60,44 +62,49 @@ msgid "Sales Orders"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -105,35 +112,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -143,7 +134,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -177,22 +168,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -246,48 +228,37 @@ msgid "Configure payment acquiring methods"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -295,36 +266,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -334,7 +287,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -368,13 +321,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -384,10 +342,3 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr ""
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
diff --git a/addons/portal_sale/i18n/zh_CN.po b/addons/portal_sale/i18n/zh_CN.po
index 2b77f62b774..9ba5c1bb991 100644
--- a/addons/portal_sale/i18n/zh_CN.po
+++ b/addons/portal_sale/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 13:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
@@ -28,9 +28,13 @@ msgid "We haven't sent you any invoice."
 msgstr ""
 
 #. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
+"or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -62,44 +66,49 @@ msgid "Sales Orders"
 msgstr ""
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>  \n"
+"    </p>\n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.portal_action_invoices'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access the invoice document and pay online via our Customer "
-"Portal:\n"
+"    You can access this document and pay online via our Customer Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -107,35 +116,19 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View Invoice</a>\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
 "    % endif\n"
-"    \n"
-"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
-"'in_refund'):\n"
-"    <% \n"
-"    comp_name = quote(object.company_id.name)\n"
-"    inv_number = quote(object.number)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    inv_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
-"\" \\\n"
-"                 "
-"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
-"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"                 "
-"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"    \n"
+"\n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -145,7 +138,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -179,22 +172,13 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid ""
-"Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers "
-"who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
 msgid ""
@@ -250,48 +234,37 @@ msgid "Configure payment acquiring methods"
 msgstr "配置支付收购办法"
 
 #. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
 "       % if object.user_id:\n"
 "       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
 "       % endif\n"
-"    </p>\n"
+"    </p>  \n"
 "\n"
-"    <%\n"
-"    action = 'portal_sale.action_quotations_portal' if object.state in "
-"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-"    object.partner_id.signup_prepare()\n"
-"    signup_url = "
-"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
-"es_id=object.id)[object.partner_id.id]\n"
-"    %>\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
 "    % if signup_url:\n"
 "    <p>\n"
-"    You can access this document and pay online via our Customer Portal:\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
 "    </p>\n"
 "        <a style=\"display:block; width: 150px; height:20px; margin-left: "
 "120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
@@ -299,36 +272,18 @@ msgid ""
 "decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
 "background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
 "no-repeat;\"\n"
-"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
-"and 'Quotation' or 'Order'}</a>\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
 "    % endif\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.residual))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    \n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
 "    % endif\n"
-"\n"
+"    \n"
 "    <br/>\n"
 "    <p>If you have any question, do not hesitate to contact us.</p>\n"
 "    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
@@ -338,7 +293,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -372,13 +327,18 @@ msgid ""
 "                Web :&nbsp;<a "
 "href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
 "            </div>\n"
-"        %endif\n"
+"        % endif\n"
 "        <p></p>\n"
 "    </div>\n"
 "</div>\n"
 "            "
 msgstr ""
 
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
 msgid "Invoice"
@@ -388,12 +348,3 @@ msgstr "发票"
 #: model:ir.actions.act_window,name:portal_sale.action_orders_portal
 msgid "Sale Orders"
 msgstr "销售订单"
-
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
-"or ''}"
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index 78c258999da..6ca5f12715a 100644
--- a/addons/process/i18n/ar.po
+++ b/addons/process/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-13 21:36+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bg.po b/addons/process/i18n/bg.po
index dd06950659d..5e8b894e551 100644
--- a/addons/process/i18n/bg.po
+++ b/addons/process/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 20:31+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bs.po b/addons/process/i18n/bs.po
index 88dfd546861..7b1df6e92ef 100644
--- a/addons/process/i18n/bs.po
+++ b/addons/process/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 06:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index 971aa42515b..18e90e38163 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-13 10:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/cs.po b/addons/process/i18n/cs.po
index aa187648ac0..d8aa5dfb45a 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-09 08:59+0000\n"
 "Last-Translator: Jan B. Krejčí <Unknown>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: process
diff --git a/addons/process/i18n/da.po b/addons/process/i18n/da.po
index 0cc747662f9..5ad248baee5 100644
--- a/addons/process/i18n/da.po
+++ b/addons/process/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index 0cf77a59389..1e53e6df0dd 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 17:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index 9cfdac3d2b6..782e3cd7998 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-09 11:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 14406422699..131d8165769 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 15:36+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:43+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index 97682116d99..2ed28896991 100644
--- a/addons/process/i18n/es_AR.po
+++ b/addons/process/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-15 20:23+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CL.po b/addons/process/i18n/es_CL.po
index 6b48db06dfc..4914a24c363 100644
--- a/addons/process/i18n/es_CL.po
+++ b/addons/process/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-14 04:37+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CR.po b/addons/process/i18n/es_CR.po
index af8eab95c78..85691ae5399 100644
--- a/addons/process/i18n/es_CR.po
+++ b/addons/process/i18n/es_CR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 00:24+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: process
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index 4f5b630bd37..9004ca1ea20 100644
--- a/addons/process/i18n/et.po
+++ b/addons/process/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fi.po b/addons/process/i18n/fi.po
index f61ab422288..3054f8f2fdc 100644
--- a/addons/process/i18n/fi.po
+++ b/addons/process/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 17:09+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index b1e0f8826fd..12c66694bd0 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 19:47+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/gl.po b/addons/process/i18n/gl.po
index eadecd8666b..96a8cb094ab 100644
--- a/addons/process/i18n/gl.po
+++ b/addons/process/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-15 06:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index 8f997e59170..b3c9c88578a 100644
--- a/addons/process/i18n/hi.po
+++ b/addons/process/i18n/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:01+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index cd4ae4a432c..cbb1a73911d 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 08:27+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: process
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index df49d3d6a8e..fd4bd6b2f18 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-04 15:08+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/id.po b/addons/process/i18n/id.po
index 82d8be451a2..083e11cf3de 100644
--- a/addons/process/i18n/id.po
+++ b/addons/process/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:53+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/it.po b/addons/process/i18n/it.po
index f8ac817eff7..4dd7d94824e 100644
--- a/addons/process/i18n/it.po
+++ b/addons/process/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 16:11+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ja.po b/addons/process/i18n/ja.po
index 94b7efeaa71..b2a3ab5a69f 100644
--- a/addons/process/i18n/ja.po
+++ b/addons/process/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-01 23:37+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index b0649d7ac62..a80eba30c8e 100644
--- a/addons/process/i18n/ko.po
+++ b/addons/process/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:34+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/lt.po b/addons/process/i18n/lt.po
index 3d5df42cad5..229f89531cd 100644
--- a/addons/process/i18n/lt.po
+++ b/addons/process/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 17:06+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/mn.po b/addons/process/i18n/mn.po
index 84316dd27bc..2d4bddce209 100644
--- a/addons/process/i18n/mn.po
+++ b/addons/process/i18n/mn.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 02:36+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index 6550c1ccf8d..412f441fce4 100644
--- a/addons/process/i18n/nl.po
+++ b/addons/process/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-24 22:07+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index d600a2ab992..bb9872558ea 100644
--- a/addons/process/i18n/nl_BE.po
+++ b/addons/process/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 10:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pl.po b/addons/process/i18n/pl.po
index e7f67bf4c1e..90f5e16deb9 100644
--- a/addons/process/i18n/pl.po
+++ b/addons/process/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 06:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index 0f0787a64af..b9d5c359d60 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 12:24+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index 83d692b6bdf..9fa5bebda4b 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-12-11 12:14+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 01:28+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -222,7 +222,7 @@ msgstr "Editar Processo"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "Nenhum"
 
 #. module: process
 #: view:process.process:0
diff --git a/addons/process/i18n/ro.po b/addons/process/i18n/ro.po
index e5d2a04ba24..8144bd678e6 100644
--- a/addons/process/i18n/ro.po
+++ b/addons/process/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-24 12:02+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index e94b143d3ee..98a022dbac4 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-06 06:17+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sk.po b/addons/process/i18n/sk.po
index 6658887f0ab..f6eefac1a71 100644
--- a/addons/process/i18n/sk.po
+++ b/addons/process/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-21 14:21+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sl.po b/addons/process/i18n/sl.po
index 2c7a0fc31a4..2bda02323e5 100644
--- a/addons/process/i18n/sl.po
+++ b/addons/process/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 08:49+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sq.po b/addons/process/i18n/sq.po
index 47f9e44620c..454a4fdf607 100644
--- a/addons/process/i18n/sq.po
+++ b/addons/process/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 03eff166516..76d7f808f15 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-04 08:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr@latin.po b/addons/process/i18n/sr@latin.po
index 93d67928b64..7ccbaf9f5b0 100644
--- a/addons/process/i18n/sr@latin.po
+++ b/addons/process/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-23 15:38+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 6e1e3037ac4..11cab8f7d8d 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:09+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tlh.po b/addons/process/i18n/tlh.po
index 6116089a859..2135bb2a851 100644
--- a/addons/process/i18n/tlh.po
+++ b/addons/process/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 11:56+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index 692056a2fd9..7397cab8e11 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index fa6ea925256..9c0672c203c 100644
--- a/addons/process/i18n/uk.po
+++ b/addons/process/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 16:49+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/vi.po b/addons/process/i18n/vi.po
index 913b99b5f07..fcdb51d38ae 100644
--- a/addons/process/i18n/vi.po
+++ b/addons/process/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-16 17:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index b102f8279d3..c0394f486b2 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 09:53+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-11-29 05:14+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 5e227798702..eb6a99b1e21 100644
--- a/addons/process/i18n/zh_TW.po
+++ b/addons/process/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 11:55+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/procurement/i18n/ar.po b/addons/procurement/i18n/ar.po
index 3543989848a..77b462c47b7 100644
--- a/addons/procurement/i18n/ar.po
+++ b/addons/procurement/i18n/ar.po
@@ -7,25 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 05:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr ""
+msgstr "جدولة"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr ""
+msgstr "طلب الخامات"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -45,12 +45,6 @@ msgstr "تجميع حسب..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr ""
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -79,15 +73,14 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr ""
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "خدمة"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "حساب كميات المواد الخام فقط"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -103,23 +96,22 @@ msgstr "شركة"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "كمية وحدة التوريد"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "السبب"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "أحسب شراء الخامات"
 
 #. module: procurement
 #: field:procurement.order,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "آخر خطأ"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -134,12 +126,7 @@ msgstr ""
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr ""
-
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "ملاحظات"
+msgstr "آخر عملية شراء خامات"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
@@ -172,6 +159,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "إستثناءات دائمة لشراء المواد الخام"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -180,7 +172,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "خصائص الجدولة"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
@@ -188,8 +180,8 @@ msgid "Stock Move"
 msgstr "حركة مخزن"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -213,7 +205,7 @@ msgstr "جاهز"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "نقطة تنظيم أتوماتيكية"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -233,11 +225,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -248,12 +235,6 @@ msgstr "مؤكد"
 msgid "Retry"
 msgstr "إعادة المحاولة"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -280,7 +261,7 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "تنفيذ اوامر شراء الخامات"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
@@ -288,10 +269,10 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
-msgstr ""
+msgstr "شراء الخام '%s' في استثناء: "
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -304,9 +285,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "جاري الانتظار"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -335,7 +316,7 @@ msgstr "المخزن"
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
-msgstr ""
+msgstr "أفضل سعر (غير مفعل!)"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:110
@@ -356,7 +337,7 @@ msgstr ""
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr ""
+msgstr "السؤال للمنتجات الجديدة"
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -375,7 +356,7 @@ msgid "Quantity"
 msgstr "كمية"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -384,7 +365,7 @@ msgstr ""
 #: field:make.procurement,uom_id:0
 #: view:procurement.order:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "وحدة القياس"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
@@ -392,12 +373,6 @@ msgstr ""
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -481,11 +456,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "خدمة"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -631,7 +601,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -647,19 +617,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -709,14 +673,8 @@ msgid "Extra Information"
 msgstr "معلومات إضافية"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -753,7 +711,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -770,12 +728,6 @@ msgstr ""
 msgid "Misc"
 msgstr "متفرقات"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -816,12 +768,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -833,9 +782,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "إحسب كل عمليات الجدولة"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -848,9 +797,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -896,6 +848,7 @@ msgstr "مؤقت"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "وصف"
 
@@ -916,11 +869,6 @@ msgstr "قيد التنفيذ"
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "جاري الانتظار"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -944,7 +892,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "إستثناءات شراء المواد الخام"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -1011,11 +959,6 @@ msgstr "عاجل جداً"
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,12 +969,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1063,11 +1000,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "ملاحظات"
+
 #~ msgid "on order"
 #~ msgstr "تحت الطلب"
 
@@ -1110,3 +1050,17 @@ msgstr ""
 
 #~ msgid "Product UoM"
 #~ msgstr "وحدة القياس للمنتج"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "لم يتم إضافة مورد لهذا المنتج"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "ام بتم إضافة عنوان المورد"
+
+#~ msgid "Minimum Stock Rules Search"
+#~ msgstr "بحث شروط المخزون"
+
+#~ msgid "Planification"
+#~ msgstr "تخطيط"
diff --git a/addons/procurement/i18n/bg.po b/addons/procurement/i18n/bg.po
index a84f7826e5c..c066e672b7c 100644
--- a/addons/procurement/i18n/bg.po
+++ b/addons/procurement/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-21 09:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -49,12 +49,6 @@ msgstr "Групиране по..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Не е зададен доставчик за този продукт !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -83,10 +77,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Не е дефиниран адрес за този доставчик"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Услуга"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -111,7 +104,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Причина"
 
@@ -140,11 +132,6 @@ msgstr "Не се използва за изчисление, само за ин
 msgid "Latest procurement"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Бележки"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -176,6 +163,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -192,8 +184,8 @@ msgid "Stock Move"
 msgstr "Движение на наличности"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -237,11 +229,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -252,12 +239,6 @@ msgstr "Потвърден"
 msgid "Retry"
 msgstr "Повторен опит"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -292,7 +273,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -308,9 +289,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Изчакване"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -379,7 +360,7 @@ msgid "Quantity"
 msgstr "Количество"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -396,12 +377,6 @@ msgstr "Мерна единица"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -485,11 +460,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr "Изчисляване на наличност"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Услуга"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -637,7 +607,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -653,19 +623,13 @@ msgid "Procure Products"
 msgstr "Снабдяване с продукти"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -715,14 +679,8 @@ msgid "Extra Information"
 msgstr "Допълнителна информация"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -759,7 +717,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Недостатъчни данни !"
@@ -776,12 +734,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Разни"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -822,12 +774,9 @@ msgid "Not urgent"
 msgstr "Не е спешно"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -839,8 +788,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -854,9 +803,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -902,6 +854,7 @@ msgstr "Временно"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Описание"
 
@@ -922,11 +875,6 @@ msgstr "В изпълнение"
 msgid "Make to Order"
 msgstr "Произведи по поръчка"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Изчакване"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1017,11 +965,6 @@ msgstr "Много спешно"
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Подробности за снабдяване"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1032,12 +975,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1069,14 +1006,25 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Не е зададен доставчик за този продукт !"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Не е дефиниран адрес за този доставчик"
+
 #~ msgid "on order"
 #~ msgstr "в поръчка"
 
+#~ msgid "Notes"
+#~ msgstr "Бележки"
+
 #~ msgid "State"
 #~ msgstr "Състояние"
 
@@ -1129,5 +1077,8 @@ msgstr ""
 #~ msgid "Product UoM"
 #~ msgstr "Мерни единици на продукт"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Подробности за снабдяване"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Трябва да зададете партида за производство на този продукт"
diff --git a/addons/procurement/i18n/ca.po b/addons/procurement/i18n/ca.po
index ff009f02e56..9673316178a 100644
--- a/addons/procurement/i18n/ca.po
+++ b/addons/procurement/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-12 22:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -50,12 +50,6 @@ msgstr ""
 "Proveïment esborrany del producte i ubicació per a aquesta regla d'estoc "
 "mínim."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "No s'ha definit un proveïdor per a aquest producte!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -84,10 +78,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "No s'ha definit adreça per al proveïdor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servei"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -112,7 +105,6 @@ msgstr "Quantitat UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motiu"
 
@@ -141,11 +133,6 @@ msgstr "No utilitzat en càlculs, només amb la finalitat d'informar."
 msgid "Latest procurement"
 msgstr "Últim proveïment"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Anotacions"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -183,6 +170,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -199,9 +191,9 @@ msgid "Stock Move"
 msgstr "Moviment d'estoc"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcula tots els planificadors"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -244,11 +236,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -259,12 +246,6 @@ msgstr "Confirmat"
 msgid "Retry"
 msgstr "Reintenta"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -301,7 +282,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regla d'inventari mínim"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Contractació '%s' està en excepció: "
@@ -317,9 +298,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -388,7 +369,7 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "No hi ha suficient estoc i no s'ha definit una regla d'estoc mínim."
@@ -405,12 +386,6 @@ msgstr "Unitat de mesura"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -496,11 +471,6 @@ msgstr "Sol·licitud de proveïment"
 msgid "Compute Stock"
 msgstr "Calcula estoc"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servei"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -648,7 +618,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Estoc insuficient"
@@ -664,19 +634,13 @@ msgid "Procure Products"
 msgstr "Proveir productes"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -726,15 +690,9 @@ msgid "Extra Information"
 msgstr "Informació extra"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nom del proveïment."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "No hi ha definit cap proveïdor per aquest producte"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -770,7 +728,7 @@ msgid "Properties composition"
 msgstr "Composició de propietats"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dades insuficients!"
@@ -787,12 +745,6 @@ msgstr "Grup de propietat"
 msgid "Misc"
 msgstr "Varis"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -833,13 +785,10 @@ msgid "Not urgent"
 msgstr "No urgent"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Excepcions proveïment"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -850,9 +799,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcula tots els planificadors"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -865,10 +814,13 @@ msgid "Procurements in Exception"
 msgstr "Proveïments en excepció"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Excepcions proveïment"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -913,6 +865,7 @@ msgstr "Temporal"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descripció"
 
@@ -933,11 +886,6 @@ msgstr "En execució"
 msgid "Make to Order"
 msgstr "Obtenir sota comanda"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "En espera"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1033,11 +981,6 @@ msgstr "Molt urgent"
 msgid "Automatic Orderpoint"
 msgstr "Regla d'estoc mínim automàtica"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalls de proveïment"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1048,12 +991,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1085,11 +1022,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Anotacions"
+
 #~ msgid "on order"
 #~ msgstr "sota comanda"
 
@@ -1178,6 +1118,9 @@ msgstr ""
 #~ msgid "from stock: products assigned."
 #~ msgstr "des d'estoc: productes assignats."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Detalls de proveïment"
+
 #, python-format
 #~ msgid ""
 #~ "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -1186,6 +1129,9 @@ msgstr ""
 #~ "Comproveu la quantitat en la(s) ordre(s) de proveïment, no hauria de ser "
 #~ "inferior a 1!"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nom del proveïment."
+
 #, python-format
 #~ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 #~ msgstr "No es pot eliminar ordre(s) de proveïment que estan en estat %s!"
@@ -1233,6 +1179,14 @@ msgstr ""
 #~ "Una vegada se soluciona l'excepció, l'estat canvia a 'Preparat'.\n"
 #~ "Està en estat 'En espera' quan està esperant a que acabi un altre proveïment."
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "No s'ha definit un proveïdor per a aquest producte!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No s'ha definit adreça per al proveïdor"
+
 #~ msgid ""
 #~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 #~ "procurement to bring the virtual stock to the Max Quantity."
@@ -1285,6 +1239,10 @@ msgstr ""
 #~ msgid "Product UOM"
 #~ msgstr "UdM del producte"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "No hi ha definit cap proveïdor per aquest producte"
+
 #, python-format
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "No hi ha cap regla de punt de reposició definida"
diff --git a/addons/procurement/i18n/cs.po b/addons/procurement/i18n/cs.po
index 3a3e7c75220..77954cd2394 100644
--- a/addons/procurement/i18n/cs.po
+++ b/addons/procurement/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-07-15 02:33+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: procurement
@@ -49,12 +49,6 @@ msgstr "Seskupit podle..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Návrh zásobování výrobu a umístění této úrovně pro doplnění"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Pro výrobek nebyl zadán dodavatel !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -83,10 +77,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Pro dodavatele nebyla zadána adresa"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Služba"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -111,7 +104,6 @@ msgstr "Množství (PJ)"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Důvod"
 
@@ -140,11 +132,6 @@ msgstr "Nepoužito ve výpočtech, pouze pro informační účely."
 msgid "Latest procurement"
 msgstr "Poslední zásobování"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Poznámky"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -176,6 +163,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -192,9 +184,9 @@ msgid "Stock Move"
 msgstr "Přesun zásob"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Spočítat všechny plánovače"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -237,11 +229,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -252,12 +239,6 @@ msgstr "Potvrzeno"
 msgid "Retry"
 msgstr "Opakovat"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -294,7 +275,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Pravidlo minimálního inventáře"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Zásobování '%s' je ve výjimce: "
@@ -310,9 +291,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Čekající"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -381,7 +362,7 @@ msgid "Quantity"
 msgstr "Množství"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nedostatek zásob a není definováno pravidlo pro úroveň doplnění."
@@ -398,12 +379,6 @@ msgstr "Jednotky měření"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -489,11 +464,6 @@ msgstr "Požadavek zásobování"
 msgid "Compute Stock"
 msgstr "Přepočítat zásoby"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Služba"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -642,7 +612,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Nedostatek zásob !"
@@ -658,19 +628,13 @@ msgid "Procure Products"
 msgstr "Pořídit výrobek"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -720,15 +684,9 @@ msgid "Extra Information"
 msgstr "Speciální informace"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Název zásobování"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Pro výrobek nebyl definován žádný dodavatel"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -764,7 +722,7 @@ msgid "Properties composition"
 msgstr "Složení parametrů"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Nedostatečná data !"
@@ -781,12 +739,6 @@ msgstr "Skupina vlastností"
 msgid "Misc"
 msgstr "Různé"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -827,13 +779,10 @@ msgid "Not urgent"
 msgstr "Není naléhavé"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Výjimky zásobování"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -844,9 +793,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Spočítat všechny plánovače"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -859,10 +808,13 @@ msgid "Procurements in Exception"
 msgstr "Zásobování ve výjimce"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Výjimky zásobování"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -907,6 +859,7 @@ msgstr "Dočasné"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Popis"
 
@@ -927,11 +880,6 @@ msgstr "Běžící"
 msgid "Make to Order"
 msgstr "Vytvořit objednávku"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Čekající"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1027,11 +975,6 @@ msgstr "Velmi naléhavé"
 msgid "Automatic Orderpoint"
 msgstr "Automatická úroveň pro doplnění"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Podrobnosti zásobování"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1042,12 +985,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1079,11 +1016,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Pro výrobek nebyl zadán dodavatel !"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Pro dodavatele nebyla zadána adresa"
+
+#~ msgid "Notes"
+#~ msgstr "Poznámky"
+
 #~ msgid "on order"
 #~ msgstr "na objednávku"
 
@@ -1156,6 +1104,9 @@ msgstr ""
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Nebylo definované pravidlo pro minimální úroveň pro doplnění."
 
+#~ msgid "Procurement name."
+#~ msgstr "Název zásobování"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
 
@@ -1178,6 +1129,10 @@ msgstr ""
 #~ msgid "The procurement quantity will by rounded up to this multiple."
 #~ msgstr "Množství zásobování bude zaokrouhleno nahoru na tento násobek."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Pro výrobek nebyl definován žádný dodavatel"
+
 #~ msgid "Current"
 #~ msgstr "Aktuální"
 
@@ -1212,3 +1167,6 @@ msgstr ""
 
 #~ msgid "Product UoM"
 #~ msgstr "MJ výrobku"
+
+#~ msgid "Procurement Details"
+#~ msgstr "Podrobnosti zásobování"
diff --git a/addons/procurement/i18n/da.po b/addons/procurement/i18n/da.po
index 48819c5193b..424799db15a 100644
--- a/addons/procurement/i18n/da.po
+++ b/addons/procurement/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-09-18 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -45,12 +45,6 @@ msgstr "Gruppér efter..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Ingen leverandør er valgt til denne vare!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -79,9 +73,8 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
 msgstr ""
 
 #. module: procurement
@@ -107,7 +100,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Årsag"
 
@@ -136,11 +128,6 @@ msgstr ""
 msgid "Latest procurement"
 msgstr "Seneste indkøb"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Noter"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -172,6 +159,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -188,8 +180,8 @@ msgid "Stock Move"
 msgstr "Lager flytning"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -233,11 +225,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -248,12 +235,6 @@ msgstr "Bekræftet"
 msgid "Retry"
 msgstr "Forsøg igen"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -288,7 +269,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -304,9 +285,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Venter"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -375,7 +356,7 @@ msgid "Quantity"
 msgstr "Mængde"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -392,12 +373,6 @@ msgstr "Måleenhed"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -481,11 +456,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr ""
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -631,7 +601,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -647,19 +617,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -709,14 +673,8 @@ msgid "Extra Information"
 msgstr ""
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -753,7 +711,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -770,12 +728,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Diverse"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -816,12 +768,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -833,8 +782,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -848,9 +797,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -896,6 +848,7 @@ msgstr "Midlertidig"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Beskrivelse:"
 
@@ -916,11 +869,6 @@ msgstr "Kører"
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Venter"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1011,11 +959,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,12 +969,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1063,11 +1000,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Noter"
+
 #~ msgid "State"
 #~ msgstr "Stat"
 
@@ -1079,3 +1019,7 @@ msgstr ""
 
 #~ msgid "from stock"
 #~ msgstr "Fra lager"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Ingen leverandør er valgt til denne vare!"
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 86aedf3ca23..bd9942c4a28 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-16 18:37+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 13:42+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +49,6 @@ msgstr "Gruppierung..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Beschaffungsentwurf für Produkt oder Lagerort der Bestellung"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Kein Lieferant für dieses Produkt definiert!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +77,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Keine Adresse bei Lieferant hinterlegt"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Dienstleistung"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +104,6 @@ msgstr "Menge (VE)"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Grund"
 
@@ -139,11 +132,6 @@ msgstr "Nicht genutzt für die Berechnung, nur zu Informationszwecken"
 msgid "Latest procurement"
 msgstr "Letzter Beschaffungsvorschlag"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Bemerkungen"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -182,6 +170,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Permanente Beschaffungs Ausnahmen"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -195,12 +188,12 @@ msgstr "Parameter Automatische Beschaffung"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
 msgid "Stock Move"
-msgstr "Lieferung"
+msgstr "Lagerbuchung"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Berechne alle Beschaffungsregeln"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -243,11 +236,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -258,12 +246,6 @@ msgstr "Bestätigt"
 msgid "Retry"
 msgstr "Wiederhole"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -300,7 +282,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Meldebestandregel"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Beschaffung '%s' ist im Ausnahmezustand "
@@ -313,12 +295,12 @@ msgstr "Priorität"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Reordering Rules Search"
-msgstr ""
+msgstr "Meldebestände Suche"
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Warteliste"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -387,7 +369,7 @@ msgid "Quantity"
 msgstr "Menge"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nicht genug Bestand und keine Meldebestandregel definiert"
@@ -404,12 +386,6 @@ msgstr "ME"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -495,11 +471,6 @@ msgstr "Bestellung (Angebotsanfrage)"
 msgid "Compute Stock"
 msgstr "Berechne Bestand"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Dienstleistung"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -602,7 +573,7 @@ msgstr "Entwurf"
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Run Schedulers"
-msgstr ""
+msgstr "Starte Beschaffung"
 
 #. module: procurement
 #: view:procurement.order.compute:0
@@ -649,7 +620,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Nicht genug Lagerbestand."
@@ -665,19 +636,13 @@ msgid "Procure Products"
 msgstr "Beschaffe Produkt"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -727,15 +692,9 @@ msgid "Extra Information"
 msgstr "Extra Informationen"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Beschaffung Bezeichnung"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Kein Standardlieferant für dieses Produkt"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -771,7 +730,7 @@ msgid "Properties composition"
 msgstr "Konfiguration Eigenschaften"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Unstimmige Daten !"
@@ -788,12 +747,6 @@ msgstr "Gruppe Eigenschaften"
 msgid "Misc"
 msgstr "Diverse"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -821,7 +774,7 @@ msgstr "Abbrechen"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr "Wiederbeschaffung Modus"
+msgstr "Modus Meldebestände"
 
 #. module: procurement
 #: field:procurement.order,origin:0
@@ -834,13 +787,10 @@ msgid "Not urgent"
 msgstr "Nicht dringend"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Fehler Beschaffung"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -851,9 +801,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Permanente Beschaffungs Ausnahmen"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Berechne alle Beschaffungsregeln"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -866,10 +816,13 @@ msgid "Procurements in Exception"
 msgstr "Aufträge in Fehlerliste"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Fehler Beschaffung"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -914,6 +867,7 @@ msgstr "Temporär"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -934,11 +888,6 @@ msgstr "In Bearbeitung"
 msgid "Make to Order"
 msgstr "Beschaffe von Auftrag"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Warteliste"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -984,7 +933,7 @@ msgstr "max"
 #: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Reordering Rules"
-msgstr ""
+msgstr "Meldebestände"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:138
@@ -1038,11 +987,6 @@ msgstr "Sehr Dringend"
 msgid "Automatic Orderpoint"
 msgstr "Autom. Bestellzeitpunkt"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Details zur Beschaffung"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1053,12 +997,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Die Beschaffung begann zu spät"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1090,7 +1028,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "PROC %d: für Aufrag - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1098,6 +1036,17 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Planung"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Kein Lieferant für dieses Produkt definiert!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Keine Adresse bei Lieferant hinterlegt"
+
+#~ msgid "Notes"
+#~ msgstr "Bemerkungen"
+
 #~ msgid ""
 #~ "When a procurement is created the state is set to 'Draft'.\n"
 #~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
@@ -1150,6 +1099,9 @@ msgstr ""
 #~ "Bitte prüfen Sie die Bestellmenge der Beschaffungsaufträge, sie sollte nicht "
 #~ "geringer als 1 sein!"
 
+#~ msgid "Procurement name."
+#~ msgstr "Beschaffung Bezeichnung"
+
 #~ msgid "Locations"
 #~ msgstr "Lagerorte"
 
@@ -1195,6 +1147,9 @@ msgstr ""
 #~ msgid "Product UoM"
 #~ msgstr "Produkt ME"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Details zur Beschaffung"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This is the module for computing Procurements.\n"
@@ -1303,6 +1258,10 @@ msgstr ""
 #~ "automatisch einen Beschaffungsvorschlag, um den fiktiven Bestand wieder bis "
 #~ "zum Auffüllbestand aufzustocken."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Kein Standardlieferant für dieses Produkt"
+
 #, python-format
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Keine Mindestbestellmengenregel definiert"
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index a66f58359db..195c1252b12 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 12:00+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -50,12 +50,6 @@ msgstr ""
 "Abastecimiento borrador del producto y ubicación para esta regla de stock "
 "mínimo."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "¡No se ha definido un proveedor para este producto!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -87,10 +81,9 @@ msgid "Manufacture"
 msgstr "Fabricar"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "No se ha definido una dirección para el proveedor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -115,7 +108,6 @@ msgstr "Cantidad UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motivo"
 
@@ -144,11 +136,6 @@ msgstr "No se utiliza en los cálculos, sólo sirve como información."
 msgid "Latest procurement"
 msgstr "Último abastecimiento"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -187,6 +174,11 @@ msgstr "Productos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Excepciones de abastecimiento permanentes"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -203,9 +195,9 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcular todos los planificadores"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr "Productos almacenables"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -263,11 +255,6 @@ msgstr ""
 "</p>\n"
 "            "
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr "Productos almacenables"
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -278,12 +265,6 @@ msgstr "Confirmada"
 msgid "Retry"
 msgstr "Reintentar"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr "Abastaceimiento <b>confirmado</b>"
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -320,7 +301,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regla de inventario mínimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Contratación '%s' está en excepción: "
@@ -336,9 +317,9 @@ msgid "Reordering Rules Search"
 msgstr "Reglas de reordenación de búsqueda"
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -407,7 +388,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "No hay suficiente stock y no existe una regla de stock mínimo."
@@ -424,12 +405,6 @@ msgstr "Unidad de medida"
 msgid "Make to Stock"
 msgstr "Obtener para stock"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr "Abastecimiento <b>cancelado</b>."
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -528,11 +503,6 @@ msgstr "Solicitud de abastecimiento"
 msgid "Compute Stock"
 msgstr "Calcular stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servicio"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -703,7 +673,7 @@ msgid "Is a Follower"
 msgstr "Es un seguidor"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Stock insuficiente."
@@ -719,7 +689,7 @@ msgid "Procure Products"
 msgstr "Abastecer productos"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
@@ -728,12 +698,6 @@ msgstr ""
 "Compruebe por favor la cantidad para la orden de abastecimiento para el "
 "producto \"%s\". ¡No debe ser 0 o menos!"
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -785,15 +749,9 @@ msgid "Extra Information"
 msgstr "Información extra"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nombre del abastecimiento."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "No hay definido ningún proveedor para este producto"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -832,7 +790,7 @@ msgid "Properties composition"
 msgstr "Propiedades composición"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "¡Datos insuficientes!"
@@ -849,12 +807,6 @@ msgstr "Grupo de propiedad"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr "Abastecimiento <b>realizado</b>."
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -895,13 +847,10 @@ msgid "Not urgent"
 msgstr "No urgente"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Excepciones abastecimiento"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr "Puntos de pedidos"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -915,9 +864,9 @@ msgstr ""
 "como cantidad máxima."
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Excepciones de abastecimiento permanentes"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -930,10 +879,13 @@ msgid "Procurements in Exception"
 msgstr "Abastecimientos en excepción"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr "Puntos de pedidos"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Excepciones abastecimiento"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -981,6 +933,7 @@ msgstr "Temporal"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -1001,11 +954,6 @@ msgstr "En ejecucion"
 msgid "Make to Order"
 msgstr "Obtener bajo pedido"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "En espera"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1101,11 +1049,6 @@ msgstr "Muy urgente"
 msgid "Automatic Orderpoint"
 msgstr "Regla de stock mínimo automática"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalles de abastecimiento"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1116,12 +1059,6 @@ msgstr "Mensajes e historial de comunicación"
 msgid "Procurement started late"
 msgstr "El abastecieminto se inició con retraso"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr "Abastecimiento <b>creado</b>."
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1153,7 +1090,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "ABAST %d: desde pedido - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr "Productos reservados del stock."
@@ -1161,6 +1098,17 @@ msgstr "Productos reservados del stock."
 #~ msgid "Planification"
 #~ msgstr "Planificación"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "¡No se ha definido un proveedor para este producto!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No se ha definido una dirección para el proveedor"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Buscar reglas de stock mínimo"
 
@@ -1254,6 +1202,9 @@ msgstr "Productos reservados del stock."
 #~ "abastecimiento puede generar tareas, órdenes de producción o pedidos de "
 #~ "compra."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Detalles de abastecimiento"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
 
@@ -1316,6 +1267,9 @@ msgstr "Productos reservados del stock."
 #~ msgid "Compute Schedulers"
 #~ msgstr "Calcular planificadores"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nombre del abastecimiento."
+
 #~ msgid ""
 #~ "Procurement Orders represent the need for a certain quantity of products, at "
 #~ "a given time, in a given location. Sales Orders are one typical source of "
@@ -1359,6 +1313,10 @@ msgstr "Productos reservados del stock."
 #~ "Está en estado 'En espera' cuando está esperando a que acabe otro "
 #~ "abastecimiento."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "No hay definido ningún proveedor para este producto"
+
 #, python-format
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "No hay ninguna regla de punto de reposición definida"
diff --git a/addons/procurement/i18n/es_CL.po b/addons/procurement/i18n/es_CL.po
index a08441d0b2d..3b4010eec8f 100644
--- a/addons/procurement/i18n/es_CL.po
+++ b/addons/procurement/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-27 19:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -50,12 +50,6 @@ msgstr ""
 "Abastecimiento borrador del producto y ubicación para esta regla de stock "
 "mínimo."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "¡No se ha definido un proveedor para este producto!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -84,10 +78,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "No se ha definido dirección para el proveedor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -112,7 +105,6 @@ msgstr "Cantidad UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motivo"
 
@@ -141,11 +133,6 @@ msgstr "No se utiliza en los cálculos, sólo sirve como información."
 msgid "Latest procurement"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -178,6 +165,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Excepciones de abastecimiento permanentes"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -194,9 +186,9 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcular todos los planificadores"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -239,11 +231,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -254,12 +241,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -294,7 +275,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -310,8 +291,8 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: procurement
@@ -381,7 +362,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Stock insuficiente y no hay reglas de stock mínimo."
@@ -398,12 +379,6 @@ msgstr "Unidad de medida"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -487,11 +462,6 @@ msgstr "Solicitud de abastecimiento"
 msgid "Compute Stock"
 msgstr "Calcular stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servicio"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -639,7 +609,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -655,19 +625,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -717,14 +681,8 @@ msgid "Extra Information"
 msgstr ""
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -761,7 +719,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -778,12 +736,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -824,12 +776,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -841,9 +790,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Excepciones de abastecimiento permanentes"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -856,9 +805,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -904,6 +856,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr ""
 
@@ -924,11 +877,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1021,11 +969,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1036,12 +979,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1073,11 +1010,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "¡No se ha definido un proveedor para este producto!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No se ha definido dirección para el proveedor"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Buscar reglas de stock mínimo"
 
diff --git a/addons/procurement/i18n/es_CR.po b/addons/procurement/i18n/es_CR.po
index 5fd8395894a..402bc9d5329 100644
--- a/addons/procurement/i18n/es_CR.po
+++ b/addons/procurement/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:11+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: procurement
@@ -51,12 +51,6 @@ msgstr ""
 "Abastecimiento borrador del producto y ubicación para esta regla de stock "
 "mínimo."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "¡No se ha definido un proveedor para este producto!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -85,10 +79,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "No se ha definido una dirección para el proveedor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -113,7 +106,6 @@ msgstr "Cantidad UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motivo"
 
@@ -142,11 +134,6 @@ msgstr "No se utiliza en los cálculos, sólo sirve como información."
 msgid "Latest procurement"
 msgstr "Último abastecimiento"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -185,6 +172,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Las excepciones permanentes Adquisiciones"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -201,9 +193,9 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcular todos los planificadores"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -246,11 +238,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -261,12 +248,6 @@ msgstr "Confirmada"
 msgid "Retry"
 msgstr "Reintentar"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -303,7 +284,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regla de inventario mínimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Contratación '%s' está en excepción: "
@@ -319,9 +300,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -390,7 +371,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -408,12 +389,6 @@ msgstr "Unidad de medida"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -499,11 +474,6 @@ msgstr "Solicitud de abastecimiento"
 msgid "Compute Stock"
 msgstr "Calcular stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servicio"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -653,7 +623,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Stock insuficiente."
@@ -669,19 +639,13 @@ msgid "Procure Products"
 msgstr "Abastecer productos"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -731,15 +695,9 @@ msgid "Extra Information"
 msgstr "Información extra"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nombre del abastecimiento."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "No hay definido ningún proveedor para este producto"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -775,7 +733,7 @@ msgid "Properties composition"
 msgstr "Propiedades composición"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "¡Datos insuficientes!"
@@ -792,12 +750,6 @@ msgstr "Grupo de propiedad"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -838,13 +790,10 @@ msgid "Not urgent"
 msgstr "No urgente"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Excepciones abastecimiento"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -855,9 +804,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Las excepciones permanentes Adquisiciones"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -870,10 +819,13 @@ msgid "Procurements in Exception"
 msgstr "Abastecimientos en excepción"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Excepciones abastecimiento"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -918,6 +870,7 @@ msgstr "Temporal"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -938,11 +891,6 @@ msgstr "En ejecucion"
 msgid "Make to Order"
 msgstr "Obtener bajo pedido"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "En espera"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1038,11 +986,6 @@ msgstr "Muy urgente"
 msgid "Automatic Orderpoint"
 msgstr "Regla de stock mínimo automática"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalles de abastecimiento"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1053,12 +996,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Contratación se inició a finales"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1090,11 +1027,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "PROC %d: en orden- %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "¡No se ha definido un proveedor para este producto!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No se ha definido una dirección para el proveedor"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "on order"
 #~ msgstr "Bajo pedido"
 
@@ -1186,6 +1134,9 @@ msgstr ""
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "No hay ninguna regla de punto de reposición definida"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nombre del abastecimiento."
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
 
@@ -1201,6 +1152,10 @@ msgstr ""
 #~ msgid "General Information"
 #~ msgstr "Información general"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "No hay definido ningún proveedor para este producto"
+
 #~ msgid "Details"
 #~ msgstr "Detalles"
 
@@ -1258,6 +1213,9 @@ msgstr ""
 #~ msgid "Product UoM"
 #~ msgstr "UdM del producto"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Detalles de abastecimiento"
+
 #~ msgid ""
 #~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 #~ "procurement to bring the virtual stock to the Max Quantity."
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index c785e2fb86f..839b03554c0 100644
--- a/addons/procurement/i18n/es_EC.po
+++ b/addons/procurement/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-11 18:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -50,12 +50,6 @@ msgstr ""
 "Abastecimiento borrador del producto y ubicación para esta regla de stock "
 "mínimo."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "¡No se ha definido un proveedor para este producto!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -84,10 +78,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "No se ha definido dirección para el proveedor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -112,7 +105,6 @@ msgstr "Cantidad UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Razón"
 
@@ -141,11 +133,6 @@ msgstr "No utilizado en cálculos, sólo con la finalidad de informar."
 msgid "Latest procurement"
 msgstr "Último abastecimiento"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -178,6 +165,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -194,9 +186,9 @@ msgid "Stock Move"
 msgstr "Movimiento de stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcular todos los planificadores"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -239,11 +231,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -254,12 +241,6 @@ msgstr "Confirmado"
 msgid "Retry"
 msgstr "Reintentar"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -296,7 +277,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regla de inventario mínimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -312,8 +293,8 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: procurement
@@ -383,7 +364,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -401,12 +382,6 @@ msgstr "Unidad de Medida"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -492,11 +467,6 @@ msgstr "Solicitud de abastecimiento"
 msgid "Compute Stock"
 msgstr "Calcular stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servicio"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -644,7 +614,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "No hay suficiente stock"
@@ -660,19 +630,13 @@ msgid "Procure Products"
 msgstr "Abastecer productos"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -722,14 +686,8 @@ msgid "Extra Information"
 msgstr "Información extra"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -766,7 +724,7 @@ msgid "Properties composition"
 msgstr "Composición de propiedades"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -783,12 +741,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -829,12 +781,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -846,9 +795,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -861,9 +810,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -909,6 +861,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr ""
 
@@ -929,11 +882,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1026,11 +974,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1041,12 +984,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1078,11 +1015,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "¡No se ha definido un proveedor para este producto!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No se ha definido dirección para el proveedor"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "on order"
 #~ msgstr "bajo pedido"
 
diff --git a/addons/procurement/i18n/et.po b/addons/procurement/i18n/et.po
index 1ccb9fab1ab..2389d433990 100644
--- a/addons/procurement/i18n/et.po
+++ b/addons/procurement/i18n/et.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 17:05+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
@@ -45,12 +45,6 @@ msgstr ""
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr ""
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -79,9 +73,8 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
 msgstr ""
 
 #. module: procurement
@@ -107,7 +100,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr ""
 
@@ -136,11 +128,6 @@ msgstr ""
 msgid "Latest procurement"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -172,6 +159,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -188,8 +180,8 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -233,11 +225,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -248,12 +235,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -288,7 +269,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -304,8 +285,8 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: procurement
@@ -375,7 +356,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -392,12 +373,6 @@ msgstr ""
 msgid "Make to Stock"
 msgstr "Loo lattu"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -481,11 +456,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr ""
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -631,7 +601,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -647,19 +617,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -709,14 +673,8 @@ msgid "Extra Information"
 msgstr ""
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -753,7 +711,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -770,12 +728,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -816,12 +768,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -833,8 +782,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -848,9 +797,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -896,6 +848,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr ""
 
@@ -916,11 +869,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1011,11 +959,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,12 +969,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1063,7 +1000,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
index 7529ba58a1c..ca7097ba615 100644
--- a/addons/procurement/i18n/fi.po
+++ b/addons/procurement/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-20 09:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Ryhmittely.."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Luonnnos hankinta tuotteelle ja tilauspisteen paikalle"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Tuotteelle ei ole määritelty toimittajaa!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Toimittajan osoitetta ei ole määritetty"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Palvelu"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Myyntiyksikkö määrä"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Syy"
 
@@ -139,11 +131,6 @@ msgstr "Ei käytetä laskutoimituksiin - vain tietoja varten."
 msgid "Latest procurement"
 msgstr "Viimeisin hankinta"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Huomautukset"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -175,6 +162,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Pysyvät hankinnan poikkeukset"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -191,9 +183,9 @@ msgid "Stock Move"
 msgstr "Varastosiirto"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Laske kaikki ajastimet"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -236,11 +228,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -251,12 +238,6 @@ msgstr "Vahvistettu"
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -291,7 +272,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Minimivarastosääntö"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Hankinta \"%s\" on poikkeustilassa: "
@@ -307,9 +288,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Odotetaan"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -378,7 +359,7 @@ msgid "Quantity"
 msgstr "Määrä"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Ei tarpeeksi varastoa eikä minimitilauspistesääntöä määriteltynä"
@@ -395,12 +376,6 @@ msgstr "Mittayksikkö"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -486,11 +461,6 @@ msgstr "Hankintapyyntö"
 msgid "Compute Stock"
 msgstr "Laske varasto"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Palvelu"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -638,7 +608,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Ei tarpeeksi varastoa."
@@ -654,19 +624,13 @@ msgid "Procure Products"
 msgstr "Hanki tuotteita"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -716,15 +680,9 @@ msgid "Extra Information"
 msgstr "Lisätiedot"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Hankinnan nimi"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Tuotteelle ei ole määritelty oletustoimittajaa"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -760,7 +718,7 @@ msgid "Properties composition"
 msgstr "Ominaisuuksien koostumus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Riittämätön data!"
@@ -777,12 +735,6 @@ msgstr "Ominaisuusryhmä"
 msgid "Misc"
 msgstr "Sekalaiset"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -823,13 +775,10 @@ msgid "Not urgent"
 msgstr "Ei kiireellinen"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Hankinnan poikkeamat"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -840,9 +789,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Pysyvät hankinnan poikkeukset"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Laske kaikki ajastimet"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -855,10 +804,13 @@ msgid "Procurements in Exception"
 msgstr "Poikkeavat hankinnat"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Hankinnan poikkeamat"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -903,6 +855,7 @@ msgstr "Väliaikainen"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -923,11 +876,6 @@ msgstr "Käynnissä olevat"
 msgid "Make to Order"
 msgstr "Valmista tilaukselle"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Odotetaan"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1021,11 +969,6 @@ msgstr "Erittäin kiireellinen"
 msgid "Automatic Orderpoint"
 msgstr "Automaattinen tilauspiste"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Hankinnan yksityiskohdat"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1036,12 +979,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Hankinta aloitettu myöhässä"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1073,11 +1010,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Tuotteelle ei ole määritelty toimittajaa!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Toimittajan osoitetta ei ole määritetty"
+
+#~ msgid "Notes"
+#~ msgstr "Huomautukset"
+
 #~ msgid "on order"
 #~ msgstr "tilauksessa"
 
@@ -1126,6 +1074,9 @@ msgstr ""
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Minimitilauspisteen sääntöä ei ole määritelty"
 
+#~ msgid "Procurement name."
+#~ msgstr "Hankinnan nimi"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Hankinnan syy"
 
@@ -1148,6 +1099,10 @@ msgstr ""
 #~ msgid "The procurement quantity will by rounded up to this multiple."
 #~ msgstr "Hankinnan määrä pyöristetään ylös tähän moninkertaan."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Tuotteelle ei ole määritelty oletustoimittajaa"
+
 #~ msgid "Current"
 #~ msgstr "Nykyinen"
 
@@ -1176,6 +1131,9 @@ msgstr ""
 #~ msgid "from stock: products assigned."
 #~ msgstr "varastosta: tuotteet määrätty."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Hankinnan yksityiskohdat"
+
 #~ msgid "Minimum Stock Rule"
 #~ msgstr "Varaston minimirajasääntö"
 
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index ea6f6f6548f..d58e5dc5b1d 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-26 13:32+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -49,12 +49,6 @@ msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 "Brouillon d'approvisionnement de l'article et localisation de son origine"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Aucun fournisseur défini pour cet article !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -83,10 +77,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Aucune adresse définie pour le fournisseur"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Service"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -111,7 +104,6 @@ msgstr "Quantité en UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motif"
 
@@ -140,11 +132,6 @@ msgstr "Non utilisé dans les calculs, pour information seulement."
 msgid "Latest procurement"
 msgstr "Dernier approvisionnement"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Remarques"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -185,6 +172,11 @@ msgstr "Articles"
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Exceptions d'approvisionnement permanentes"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -201,9 +193,9 @@ msgid "Stock Move"
 msgstr "Mouvement de stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Lancer tous les planificateurs"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -246,11 +238,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -261,12 +248,6 @@ msgstr "Confirmé"
 msgid "Retry"
 msgstr "Réessayer"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -304,7 +285,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Règle de stock minimum."
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "L'approvisionnement '%s' est en exception : "
@@ -320,9 +301,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En attente"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -391,7 +372,7 @@ msgid "Quantity"
 msgstr "Quantité"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Pas assez de stock, et aucun point de commande minimum défini."
@@ -408,12 +389,6 @@ msgstr "Unité de Mesure"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -517,11 +492,6 @@ msgstr "Demande d'approvisionnement"
 msgid "Compute Stock"
 msgstr "Calculer le stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Service"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -671,7 +641,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Pas assez de stock."
@@ -687,19 +657,13 @@ msgid "Procure Products"
 msgstr "Approvisionner les articles"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -749,15 +713,9 @@ msgid "Extra Information"
 msgstr "Informations supplémentaires"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nom de l'approvisionnement."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Pas de fournisseur par défaut défini pour cet article"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -793,7 +751,7 @@ msgid "Properties composition"
 msgstr "Combinaison de propriétés"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Données insuffisantes"
@@ -810,12 +768,6 @@ msgstr "Groupe de Propriétés"
 msgid "Misc"
 msgstr "Divers"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -856,13 +808,10 @@ msgid "Not urgent"
 msgstr "Non urgent"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Approvisionnements en exception"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -873,9 +822,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Exceptions d'approvisionnement permanentes"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Lancer tous les planificateurs"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -888,10 +837,13 @@ msgid "Procurements in Exception"
 msgstr "Approvisionnements en exception"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Approvisionnements en exception"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -936,6 +888,7 @@ msgstr "Temporaire"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Description"
 
@@ -956,11 +909,6 @@ msgstr "En cours d'exécution"
 msgid "Make to Order"
 msgstr "Production à la demande"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "En attente"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1056,11 +1004,6 @@ msgstr "Très urgent"
 msgid "Automatic Orderpoint"
 msgstr "Point de commande automatique"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Détails de l'approvisionnement"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1071,12 +1014,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "L'approvisionnement a commencé en retard"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1108,7 +1045,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "APPR %d: sur commande - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1116,6 +1053,13 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Planification"
 
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Aucune adresse définie pour le fournisseur"
+
+#~ msgid "Notes"
+#~ msgstr "Remarques"
+
 #~ msgid "State"
 #~ msgstr "État"
 
@@ -1206,6 +1150,9 @@ msgstr ""
 #~ "approvisionnement pourra générer une tâche, des ordres de fabrication ou "
 #~ "d'achat."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Détails de l'approvisionnement"
+
 #~ msgid ""
 #~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 #~ "procurement to bring the virtual stock to the Max Quantity."
@@ -1231,6 +1178,9 @@ msgstr ""
 #~ " L'état est à \"En attente\" quand l'ordre attend un autre approvisionnement "
 #~ "pour se terminer."
 
+#~ msgid "Procurement name."
+#~ msgstr "Nom de l'approvisionnement."
+
 #~ msgid ""
 #~ "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 #~ "procurement to bring the virtual stock to the Max Quantity."
@@ -1355,3 +1305,11 @@ msgstr ""
 
 #~ msgid "The company name must be unique !"
 #~ msgstr "Le nom de la société doit être unique !"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Aucun fournisseur défini pour cet article !"
+
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Pas de fournisseur par défaut défini pour cet article"
diff --git a/addons/procurement/i18n/gl.po b/addons/procurement/i18n/gl.po
index 914d5d7f1a5..7a45a846b4c 100644
--- a/addons/procurement/i18n/gl.po
+++ b/addons/procurement/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-13 10:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -49,12 +49,6 @@ msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 "Abastecemento borrador do produto e lugar para esta regra de stock mínimo."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Non se definiu un provedor para este produto!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -83,10 +77,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Non se definiu un enderezo para o provedor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servizo"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -111,7 +104,6 @@ msgstr "Cantidade UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Razón"
 
@@ -140,11 +132,6 @@ msgstr "Non se utiliza nos cálculos, só serve como información."
 msgid "Latest procurement"
 msgstr "Último abastecemento"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -183,6 +170,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -199,9 +191,9 @@ msgid "Stock Move"
 msgstr "Movemento de stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcular tódolos planificadores"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -244,11 +236,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -259,12 +246,6 @@ msgstr "Confirmado"
 msgid "Retry"
 msgstr "Tentar de novo"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -301,7 +282,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regra de inventario mínimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -317,9 +298,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En espera..."
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -388,7 +369,7 @@ msgid "Quantity"
 msgstr "Cantidade"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Non hai stock dabondo e non se definiu unha regra de stock mínimo."
@@ -405,12 +386,6 @@ msgstr "Unidade de medida"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -496,11 +471,6 @@ msgstr "Solicitude de abastecemento"
 msgid "Compute Stock"
 msgstr "Calcular stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servizo"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -650,7 +620,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Stock insuficiente"
@@ -666,19 +636,13 @@ msgid "Procure Products"
 msgstr "Abastecer produtos"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -728,15 +692,9 @@ msgid "Extra Information"
 msgstr "Información adicional"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nome do abastecemento."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Non hai ningún provedor definido por defecto para este produto"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -772,7 +730,7 @@ msgid "Properties composition"
 msgstr "Propiedades composición"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Datos insuficientes !"
@@ -789,12 +747,6 @@ msgstr "Grupo de propiedade"
 msgid "Misc"
 msgstr "Varios"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -835,13 +787,10 @@ msgid "Not urgent"
 msgstr "Non urxente"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Excepcións abastecemento"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -852,9 +801,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular tódolos planificadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -867,10 +816,13 @@ msgid "Procurements in Exception"
 msgstr "Abastecementos en excepción"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Excepcións abastecemento"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -915,6 +867,7 @@ msgstr "Temporal"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descrición"
 
@@ -935,11 +888,6 @@ msgstr "Executándose"
 msgid "Make to Order"
 msgstr "Fabricado baixo pedido"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "En espera..."
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1035,11 +983,6 @@ msgstr "Moi urxente"
 msgid "Automatic Orderpoint"
 msgstr "Regra de stock mínimo automática"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalles de abastecemento"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1050,12 +993,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1087,11 +1024,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Non se definiu un provedor para este produto!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Non se definiu un enderezo para o provedor"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "on order"
 #~ msgstr "Baixo pedido"
 
@@ -1207,6 +1155,9 @@ msgstr ""
 #~ msgid "You try to assign a lot which is not from the same product"
 #~ msgstr "Tenta asignar un lote que non pertence ó mesmo produto."
 
+#~ msgid "Procurement name."
+#~ msgstr "Nome do abastecemento."
+
 #, python-format
 #~ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 #~ msgstr ""
@@ -1228,6 +1179,10 @@ msgstr ""
 #~ msgstr ""
 #~ "A cantidade abastecida será redondeada cara arriba ata este múltiplo."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Non hai ningún provedor definido por defecto para este produto"
+
 #~ msgid "Current"
 #~ msgstr "Actual"
 
@@ -1286,5 +1241,8 @@ msgstr ""
 #~ msgid "from stock: products assigned."
 #~ msgstr "desde stock: produtos asignados"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Detalles de abastecemento"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Motivo do abastecemento"
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
index 8a359cc208f..c252f2b0698 100644
--- a/addons/procurement/i18n/hr.po
+++ b/addons/procurement/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 17:10+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -45,12 +45,6 @@ msgstr "Grupiraj po..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr ""
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -79,9 +73,8 @@ msgid "Manufacture"
 msgstr "Proizvodnja"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
 msgstr ""
 
 #. module: procurement
@@ -107,7 +100,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Razlog"
 
@@ -136,11 +128,6 @@ msgstr "Ne korisiti se u izračunu, samo za informaciju"
 msgid "Latest procurement"
 msgstr "Zadnja nabava"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Bilješke"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -172,6 +159,11 @@ msgstr "Proizvodi"
 msgid "Cancelled"
 msgstr "Otkazano"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -188,9 +180,9 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr ""
+#: view:product.product:0
+msgid "Stockable products"
+msgstr "Roba"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -233,11 +225,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr "Roba"
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -248,12 +235,6 @@ msgstr "Potvrđeno"
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -288,7 +269,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -304,9 +285,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr "Sažetak"
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -375,7 +356,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -392,12 +373,6 @@ msgstr "Jedinica mjere"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -481,11 +456,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr ""
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -631,7 +601,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -647,19 +617,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -709,15 +673,9 @@ msgid "Extra Information"
 msgstr ""
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr ""
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr "Sažetak"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -753,7 +711,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -770,12 +728,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -816,12 +768,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -833,8 +782,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -848,9 +797,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -896,6 +848,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr ""
 
@@ -916,11 +869,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1011,11 +959,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,12 +969,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1063,10 +1000,13 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Bilješke"
+
 #~ msgid "on order"
 #~ msgstr "na nalogu"
diff --git a/addons/procurement/i18n/hu.po b/addons/procurement/i18n/hu.po
index 74ce39daa33..7939157cc0e 100644
--- a/addons/procurement/i18n/hu.po
+++ b/addons/procurement/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-04 15:02+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -44,12 +44,6 @@ msgstr "Csoportosítás..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nincs szállító meghatározva ehhez a termékhez !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -78,10 +72,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Nincs cím megadva a szállítóhoz"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Szolgáltatás"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -106,7 +99,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Ok"
 
@@ -135,11 +127,6 @@ msgstr ""
 msgid "Latest procurement"
 msgstr "Legutolsó beszerzés"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Megjegyzések"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -171,6 +158,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -187,8 +179,8 @@ msgid "Stock Move"
 msgstr "Készletmozgás"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -232,11 +224,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -247,12 +234,6 @@ msgstr "Megerősített"
 msgid "Retry"
 msgstr "Újra"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -287,7 +268,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Minimum készlet szabály"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -303,9 +284,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Várakozó"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -374,7 +355,7 @@ msgid "Quantity"
 msgstr "Mennyiség"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -391,12 +372,6 @@ msgstr "Mértékegység"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -480,11 +455,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Szolgáltatás"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -630,7 +600,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -646,19 +616,13 @@ msgid "Procure Products"
 msgstr "Termékek beszerzése"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -708,14 +672,8 @@ msgid "Extra Information"
 msgstr "Extra információ"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Beszerzés megnevezése"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -752,7 +710,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Elégtelen adat !"
@@ -769,12 +727,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Vegyes"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -815,12 +767,9 @@ msgid "Not urgent"
 msgstr "Nem sürgős"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -832,8 +781,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -847,9 +796,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -895,6 +847,7 @@ msgstr "Ideiglenes"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Leírás"
 
@@ -915,11 +868,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr "Rendelésre gyártás/vásárlás"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Várakozó"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1010,11 +958,6 @@ msgstr "Nagyon sürgős"
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,12 +968,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1062,7 +999,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1070,6 +1007,17 @@ msgstr ""
 #~ msgid "Configuration"
 #~ msgstr "Beállítások"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nincs szállító meghatározva ehhez a termékhez !"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Nincs cím megadva a szállítóhoz"
+
+#~ msgid "Notes"
+#~ msgstr "Megjegyzések"
+
 #~ msgid "on order"
 #~ msgstr "rendelésre"
 
@@ -1086,6 +1034,9 @@ msgstr ""
 #~ msgid "References"
 #~ msgstr "Hivatkozások"
 
+#~ msgid "Procurement name."
+#~ msgstr "Beszerzés megnevezése"
+
 #~ msgid "Locations"
 #~ msgstr "Helyek"
 
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index 1de3bdc8a7a..75d8f9860ac 100644
--- a/addons/procurement/i18n/id.po
+++ b/addons/procurement/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-22 06:13+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Dikelompokan berdasarkan ..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Draft pengadaan produk dan lokasi orderpoint yang"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Tidak ada supplier yang ditentukan untuk produk  ini!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Tidak ada alamat yang ditetapkan  untuk  suplier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Layanan"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Kuwantitas UoS"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Alasan"
 
@@ -139,11 +131,6 @@ msgstr ""
 msgid "Latest procurement"
 msgstr "Procurement terbaru"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Catatan"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -175,6 +162,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -191,9 +183,9 @@ msgid "Stock Move"
 msgstr "Perpindahan Stok"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Hitung semua penjadwalan"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -236,11 +228,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -251,12 +238,6 @@ msgstr "Dikonfirmasi"
 msgid "Retry"
 msgstr "Ulangi"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -291,7 +272,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Aturan minimum inventory"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -307,8 +288,8 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: procurement
@@ -378,7 +359,7 @@ msgid "Quantity"
 msgstr "Kuantitas"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -396,12 +377,6 @@ msgstr "Satuan Ukuran"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -487,11 +462,6 @@ msgstr "Permintaan Procurement"
 msgid "Compute Stock"
 msgstr "Hitung Stok"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Layanan"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -640,7 +610,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -656,19 +626,13 @@ msgid "Procure Products"
 msgstr "Procure Produk"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -718,14 +682,8 @@ msgid "Extra Information"
 msgstr "Informasih tambahan"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nama Procurement"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -762,7 +720,7 @@ msgid "Properties composition"
 msgstr "Properties komposisi"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Data tidak memadai"
@@ -779,12 +737,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Lain-lain"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -825,13 +777,10 @@ msgid "Not urgent"
 msgstr "Tidak begitu penting"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Pengadaan Pengecualian"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -842,9 +791,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Hitung semua penjadwalan"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -857,10 +806,13 @@ msgid "Procurements in Exception"
 msgstr "Procurement dalam pengecualian"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Pengadaan Pengecualian"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -905,6 +857,7 @@ msgstr "Sementara"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Keterangan"
 
@@ -925,11 +878,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1022,11 +970,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1037,12 +980,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1074,11 +1011,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Tidak ada supplier yang ditentukan untuk produk  ini!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Tidak ada alamat yang ditetapkan  untuk  suplier"
+
+#~ msgid "Notes"
+#~ msgstr "Catatan"
+
 #~ msgid "on order"
 #~ msgstr "pada order"
 
@@ -1163,6 +1111,9 @@ msgstr ""
 #~ msgid "Procurement Reason"
 #~ msgstr "Alasan Procurement"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nama Procurement"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Anda harus menetapkan lot produksi untuk produk  ini"
 
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index 6013f87fbb6..a3ad3f6b012 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 23:26+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
@@ -48,12 +48,6 @@ msgstr "Raggruppa per..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nessun fornitore definito per questo prodotto !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Nessun indirizzo definito per il fornitore"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servizio"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Quantità U.V."
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Ragione"
 
@@ -139,11 +131,6 @@ msgstr "Non usato nei calcoli, a solo scopo informativo."
 msgid "Latest procurement"
 msgstr "Ultimo approvvigionamento"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Note"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -176,6 +163,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -192,9 +184,9 @@ msgid "Stock Move"
 msgstr "Movimento magazzino"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calcola tutti i pianificatori"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -237,11 +229,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -252,12 +239,6 @@ msgstr "Confermato"
 msgid "Retry"
 msgstr "Riprova"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -294,7 +275,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regola di inventario minimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -310,9 +291,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "In attesa"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -381,7 +362,7 @@ msgid "Quantity"
 msgstr "Quantità"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Giacenza insufficiente e nessuna regola di riordino definita."
@@ -398,12 +379,6 @@ msgstr "Unità di misura"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -489,11 +464,6 @@ msgstr "Richiesta approvvigionamento"
 msgid "Compute Stock"
 msgstr "Calcola giacenza"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Servizio"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -643,7 +613,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -659,19 +629,13 @@ msgid "Procure Products"
 msgstr "Ottenere prodotti"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -721,14 +685,8 @@ msgid "Extra Information"
 msgstr "Informazioni extra"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nome approvvigionamento."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -765,7 +723,7 @@ msgid "Properties composition"
 msgstr "Carattere delle proprietà"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dati insufficienti !"
@@ -782,12 +740,6 @@ msgstr "Gruppo proprietà"
 msgid "Misc"
 msgstr "Miscellanea"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -828,13 +780,10 @@ msgid "Not urgent"
 msgstr "Non urgente"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Errori approvvigionamenti"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -845,9 +794,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcola tutti i pianificatori"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -860,10 +809,13 @@ msgid "Procurements in Exception"
 msgstr "Approvvigionamenti in errore"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Errori approvvigionamenti"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -908,6 +860,7 @@ msgstr "Temporaneo"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descrizione"
 
@@ -928,11 +881,6 @@ msgstr "In esecuzione"
 msgid "Make to Order"
 msgstr "Produrre su ordine"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "In attesa"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1025,11 +973,6 @@ msgstr "Molto urgente"
 msgid "Automatic Orderpoint"
 msgstr "Riordino automatico"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Dettagli approvvigionamento"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1040,12 +983,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1077,7 +1014,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1121,6 +1058,17 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Pianificazione"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nessun fornitore definito per questo prodotto !"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Nessun indirizzo definito per il fornitore"
+
+#~ msgid "Notes"
+#~ msgstr "Note"
+
 #~ msgid ""
 #~ "When a procurement is created the state is set to 'Draft'.\n"
 #~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
@@ -1196,6 +1144,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Si sta cercando di assegnare un lotto che non viene dallo stesso prodotto"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nome approvvigionamento."
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Eì necessario assegnare un lotto di produzione per questo prodotto"
 
@@ -1237,6 +1188,9 @@ msgstr ""
 #~ msgid "from stock: products assigned."
 #~ msgstr "Da magazzino: prodotto assegnato."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Dettagli approvvigionamento"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This is the module for computing Procurements.\n"
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index 0cf6fba7696..8f636d28bf7 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 03:00+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -47,12 +47,6 @@ msgstr "グループ化…"
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "ドラフトの製品の調達とその発注点の場所"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "この製品には仕入先が定義されていません。"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -81,10 +75,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "仕入先の住所が定義されていません。"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "サービス"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -109,7 +102,6 @@ msgstr "販売単位の数量"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "理由"
 
@@ -138,11 +130,6 @@ msgstr "情報目的のみであるため、計算には使用されません。
 msgid "Latest procurement"
 msgstr "最新の調達"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "注記"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -177,6 +164,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "継続する調達の例外"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -193,9 +185,9 @@ msgid "Stock Move"
 msgstr "在庫移動"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "全スケジュールを計算"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -238,11 +230,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -253,12 +240,6 @@ msgstr "確認済"
 msgid "Retry"
 msgstr "再試行"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -295,7 +276,7 @@ msgid "Minimum Inventory Rule"
 msgstr "最小在庫ルール"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "調達 %s は例外です： "
@@ -311,9 +292,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "待機中"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -382,7 +363,7 @@ msgid "Quantity"
 msgstr "数量"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "十分な在庫がなく、かつ最小発注点ルールが定義されていません。"
@@ -399,12 +380,6 @@ msgstr "単位"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -488,11 +463,6 @@ msgstr "調達要求"
 msgid "Compute Stock"
 msgstr "在庫計算"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "サービス"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -638,7 +608,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "十分な在庫ではありません。"
@@ -654,19 +624,13 @@ msgid "Procure Products"
 msgstr "調達製品"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -716,15 +680,9 @@ msgid "Extra Information"
 msgstr "追加情報"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "調達名"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "この製品には仕入先が定義されていません。"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -760,7 +718,7 @@ msgid "Properties composition"
 msgstr "属性の構成"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "データが不足しています。"
@@ -777,12 +735,6 @@ msgstr "属性グループ"
 msgid "Misc"
 msgstr "その他"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -823,13 +775,10 @@ msgid "Not urgent"
 msgstr "緊急外"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "調達の例外"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -840,9 +789,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "継続する調達の例外"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "全スケジュールを計算"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -855,10 +804,13 @@ msgid "Procurements in Exception"
 msgstr "調達の例外"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "調達の例外"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -903,6 +855,7 @@ msgstr "一時的"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "説明"
 
@@ -923,11 +876,6 @@ msgstr "実行中"
 msgid "Make to Order"
 msgstr "オーダーの作成"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "待機中"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1019,11 +967,6 @@ msgstr "非常に緊急"
 msgid "Automatic Orderpoint"
 msgstr "自動発注点"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "調達の詳細"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1034,12 +977,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "遅れて開始された調達"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1071,11 +1008,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "調達 %d：オーダー中 - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "この製品には仕入先が定義されていません。"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "仕入先の住所が定義されていません。"
+
+#~ msgid "Notes"
+#~ msgstr "注記"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "最小在庫ルールの検索"
 
@@ -1185,6 +1133,9 @@ msgstr ""
 #~ msgid "Procurement Reason"
 #~ msgstr "調達理由"
 
+#~ msgid "Procurement name."
+#~ msgstr "調達名"
+
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "参照は会社ごとに固有でなければいけません。"
 
@@ -1200,6 +1151,10 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "詳細"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "この製品には仕入先が定義されていません。"
+
 #~ msgid "Quantity Rules"
 #~ msgstr "数量のルール"
 
@@ -1232,6 +1187,9 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "エラー：無効な商品識別番号です。"
 
+#~ msgid "Procurement Details"
+#~ msgstr "調達の詳細"
+
 #~ msgid ""
 #~ "This wizard will plan the procurement for this product. This procurement may "
 #~ "generate task, production orders or purchase orders."
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index fed505e85a2..bb6c98937a3 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-24 18:23+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -47,12 +47,6 @@ msgstr "Бүлэглэх..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Тэрхүү захиалгын цэг дээрх байрлал болон барааны ноорог татан авалт"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Энэ бараанд нийлүүлэгч тодорхойлоогүй байна !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -81,10 +75,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Нийлүүлэгчийн хаяг байхгүй"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Үйлчилгээ"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -109,7 +102,6 @@ msgstr "Хоёрдогч тоо хэмжээ"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Шалтгаан"
 
@@ -138,11 +130,6 @@ msgstr "Тооцоололд ашиглагдахгүй, зөвхөн мэдээ
 msgid "Latest procurement"
 msgstr "Сүүлийн татан авалт"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Тэмдэглэл"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -177,6 +164,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Татан авалтын хугацаагүй саатал"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -193,9 +185,9 @@ msgid "Stock Move"
 msgstr "Барааны хөдөлгөөн"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Бүх товлогчдийг тооцоолуулах"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -238,11 +230,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -253,12 +240,6 @@ msgstr "Баталсан"
 msgid "Retry"
 msgstr "Дахин оролдох"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -295,7 +276,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Зохистой нөөцийн дүрэм"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Татан авалт '%s' саатав: "
@@ -311,9 +292,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Хүлээж байна"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -382,7 +363,7 @@ msgid "Quantity"
 msgstr "Тоо хэмжээ"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Хангалттай бараа байхгүй, зохистой нөөцийн дүрэм байхгүй."
@@ -399,12 +380,6 @@ msgstr "Хэмжих нэгж"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -490,11 +465,6 @@ msgstr "Татан авах хүсэлт"
 msgid "Compute Stock"
 msgstr "Үлдэгдэл тооцоолох"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Үйлчилгээ"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -643,7 +613,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Хангалттай нөөц алга"
@@ -659,19 +629,13 @@ msgid "Procure Products"
 msgstr "Бараа татах"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -721,15 +685,9 @@ msgid "Extra Information"
 msgstr "Нэмэлт мэдээлэл"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Татан авалтын нэр."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Энэ бараанд нийлүүлэгч анхны утгаар тодорхойлогдоогүй байна"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -765,7 +723,7 @@ msgid "Properties composition"
 msgstr "Шинжүүдийн нэгтгэл"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Өгөгдөл хангалтгүй !"
@@ -782,12 +740,6 @@ msgstr "Бүрэлдэхүүний бүлэг"
 msgid "Misc"
 msgstr "Бусад"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -828,13 +780,10 @@ msgid "Not urgent"
 msgstr "Яаралтай бус"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Татан авалтын саатал"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -845,9 +794,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Татан авалтын хугацаагүй саатал"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Бүх товлогчдийг тооцоолуулах"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -860,10 +809,13 @@ msgid "Procurements in Exception"
 msgstr "Сондгойрсон Татан авалтууд"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Татан авалтын саатал"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -908,6 +860,7 @@ msgstr "Түр зуурын"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Тайлбар"
 
@@ -928,11 +881,6 @@ msgstr "Ажиллаж байна"
 msgid "Make to Order"
 msgstr "Захиалга хийх"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Хүлээж байна"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1028,11 +976,6 @@ msgstr "Маш яаралтай"
 msgid "Automatic Orderpoint"
 msgstr "Автоматаар үлдэгдэл нөхөх"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Татан авалтын дэлгэрэнгүй"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1043,12 +986,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Татан авалтын эхлэсэн огноо"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1080,11 +1017,15 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "ТАТ.А %d: захиалгад - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Нийлүүлэгчийн хаяг байхгүй"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Зохистой нөөцийн дүрэм хайх"
 
@@ -1119,9 +1060,16 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Төлөвлөлт"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Энэ бараанд нийлүүлэгч тодорхойлоогүй байна !"
+
 #~ msgid "Min Quantity"
 #~ msgstr "Доод тоо"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Татан авалтын дэлгэрэнгүй"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Татан авах шалтгаан"
 
@@ -1134,6 +1082,9 @@ msgstr ""
 #~ "    Татан авалтын тооцооллын модуль.\n"
 #~ "    "
 
+#~ msgid "Procurement name."
+#~ msgstr "Татан авалтын нэр."
+
 #, python-format
 #~ msgid ""
 #~ "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -1160,6 +1111,9 @@ msgstr ""
 #~ msgid "Product UoM"
 #~ msgstr "Барааны х.н"
 
+#~ msgid "Notes"
+#~ msgstr "Тэмдэглэл"
+
 #~ msgid ""
 #~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 #~ "procurement to bring the virtual stock to the Max Quantity."
@@ -1279,6 +1233,10 @@ msgstr ""
 #~ msgid "You can not move products from or to a location of the type view."
 #~ msgstr "Харагдац төрөлтэй байрлалаас/байрлалруу шилжүүлж болохгүй."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Энэ бараанд нийлүүлэгч анхны утгаар тодорхойлогдоогүй байна"
+
 #, python-format
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Захиалгын цэгийн хамгийн багын дүрэм тодорхойлогдоогүй байна."
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
index 7ba9c7c1651..27f875f5de5 100644
--- a/addons/procurement/i18n/nb.po
+++ b/addons/procurement/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-06 16:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -45,12 +45,6 @@ msgstr ""
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr ""
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -79,9 +73,8 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
 msgstr ""
 
 #. module: procurement
@@ -107,7 +100,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr ""
 
@@ -136,11 +128,6 @@ msgstr ""
 msgid "Latest procurement"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -172,6 +159,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -188,8 +180,8 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -233,11 +225,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -248,12 +235,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -288,7 +269,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -304,8 +285,8 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: procurement
@@ -375,7 +356,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -392,12 +373,6 @@ msgstr ""
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -481,11 +456,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr ""
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -631,7 +601,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -647,19 +617,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -709,14 +673,8 @@ msgid "Extra Information"
 msgstr ""
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -753,7 +711,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -770,12 +728,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -816,12 +768,9 @@ msgid "Not urgent"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -833,8 +782,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -848,9 +797,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -896,6 +848,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr ""
 
@@ -916,11 +869,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1011,11 +959,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,12 +969,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1063,7 +1000,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index 270eb5b44de..6b934824b77 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 16:46+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Groepeer op.."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Concept verwerving van het product en locatie van dat bestelniveau"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Geen leverancier voor dit product opgegeven!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Geen adres gedefinieerd voor de leverancier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Service"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "VE aantal"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Reden"
 
@@ -139,11 +131,6 @@ msgstr "Niet gebruikt in berekeningen, alleen ter informatie."
 msgid "Latest procurement"
 msgstr "Laatste verwervingen"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notities"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -181,6 +168,11 @@ msgstr "Producten"
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Blijvende verwervingsfouten"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -197,9 +189,9 @@ msgid "Stock Move"
 msgstr "Voorraadmutatie"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Alle planningen berekenen"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr "Voorraad producten"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -245,11 +237,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr "Voorraad producten"
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -260,12 +247,6 @@ msgstr "Bevestigd"
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr "Verwerving <b>bevestigd</b>."
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -302,7 +283,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Minimale voorraadregel"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Bij de verwerving van '%s' is een probleem ontstaan: "
@@ -318,9 +299,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Wachtend"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -389,7 +370,7 @@ msgid "Quantity"
 msgstr "Aantal"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Onvoldoende voorraad en geen minimale voorraadregel gedefinieerd."
@@ -398,7 +379,7 @@ msgstr "Onvoldoende voorraad en geen minimale voorraadregel gedefinieerd."
 #: field:make.procurement,uom_id:0
 #: view:procurement.order:0
 msgid "Unit of Measure"
-msgstr "Meeteenheid"
+msgstr "Maateenheid"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
@@ -406,12 +387,6 @@ msgstr "Meeteenheid"
 msgid "Make to Stock"
 msgstr "Maak op voorraad"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -497,11 +472,6 @@ msgstr "Verwervingsverzoek"
 msgid "Compute Stock"
 msgstr "Voorraad berekenen"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Service"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -651,7 +621,7 @@ msgid "Is a Follower"
 msgstr "Is een volger"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Onvoldoende voorraad."
@@ -667,19 +637,13 @@ msgid "Procure Products"
 msgstr "Producten verwerven"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -731,15 +695,9 @@ msgid "Extra Information"
 msgstr "Extra informatie"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Verwervingnaam."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Geen standaard leverancier gedefinieerd voor dit product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -775,7 +733,7 @@ msgid "Properties composition"
 msgstr "Samenstellingseigenschappen"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Onvoldoende gegevens !"
@@ -792,12 +750,6 @@ msgstr "Eigenschappengroep"
 msgid "Misc"
 msgstr "Overig"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr "Verwerving <b>gereed</b>."
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -838,13 +790,10 @@ msgid "Not urgent"
 msgstr "Niet urgent"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Verwervingsfouten"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr "Minimale voorraadregels"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -855,9 +804,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Blijvende verwervingsfouten"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Alle planningen berekenen"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -870,10 +819,13 @@ msgid "Procurements in Exception"
 msgstr "Verwervingen in foutsituatie"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr "Minimale voorraadregels"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Verwervingsfouten"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -918,6 +870,7 @@ msgstr "Tijdelijk"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -938,11 +891,6 @@ msgstr "In behandeling"
 msgid "Make to Order"
 msgstr "Op order maken"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Wachtend"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1038,11 +986,6 @@ msgstr "Zeer urgent"
 msgid "Automatic Orderpoint"
 msgstr "Minimale voorraadregel toepassen"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Details verwerving"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1053,12 +996,6 @@ msgstr "Berichten en communicatie historie"
 msgid "Procurement started late"
 msgstr "Verwerving is te laat gestart"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr "Verwerving <b>aangemaakt</b>."
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1090,11 +1027,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "VERW %d: van order - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Geen leverancier voor dit product opgegeven!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Geen adres gedefinieerd voor de leverancier"
+
+#~ msgid "Notes"
+#~ msgstr "Notities"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Minimum voorraad regels zoeken"
 
@@ -1137,6 +1085,9 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "Details"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Details verwerving"
+
 #~ msgid ""
 #~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 #~ "procurement to bring the virtual stock to the Max Quantity."
@@ -1191,6 +1142,9 @@ msgstr ""
 #~ msgstr ""
 #~ "U probeert een partij toe te wijzen die niet van hetzelfde product is."
 
+#~ msgid "Procurement name."
+#~ msgstr "Verwervingnaam."
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "U moet een productie partij toewijzen voor dit product"
 
@@ -1214,6 +1168,10 @@ msgstr ""
 #~ msgid "Compute Schedulers"
 #~ msgstr "Planningen berekenen"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Geen standaard leverancier gedefinieerd voor dit product"
+
 #, python-format
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Geen minimum bestelhoeveelheid gedefinieerd."
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index bbaba71893d..bb0bfd718a4 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 20:56+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Grupuj wg..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Projekt zapotrzebowania na produkt i strefa punktu zamawiania"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nie zdefiniowano dostawcy dla tego produktu!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -88,10 +82,9 @@ msgid "Manufacture"
 msgstr "Produkcja"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Nie zdefiniowano adresu dla dostawcy"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Usługa"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -116,7 +109,6 @@ msgstr "Ilość JS"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Przyczyna"
 
@@ -145,11 +137,6 @@ msgstr "Nie używane w obliczeniach, tylko do informacji"
 msgid "Latest procurement"
 msgstr "Ostatnie zapotrzebowanie"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notatki"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -187,6 +174,11 @@ msgstr "Produkty"
 msgid "Cancelled"
 msgstr "Anulowano"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Ostateczny wyjątek zapotrzebowania"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -203,9 +195,9 @@ msgid "Stock Move"
 msgstr "Przesunięcie zapasu"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Oblicz wszystkie planowania"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr "Produkty rejestrowane"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -251,11 +243,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr "Produkty rejestrowane"
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -266,12 +253,6 @@ msgstr "Potwierdzone"
 msgid "Retry"
 msgstr "Ponów"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr "Zapotrzebowanie <b>potwierdzono</b>."
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -308,7 +289,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Reguła minimalnych zapasów"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Zapotrzebowanie '%s' jest w stanie wyjątkowym: "
@@ -324,9 +305,9 @@ msgid "Reordering Rules Search"
 msgstr "Szukaj reguł zamawiania"
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr "Podsumowanie"
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Oczekiwanie"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -395,7 +376,7 @@ msgid "Quantity"
 msgstr "Ilość"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Brak zapasu i brak reguły minimalnego zapasu"
@@ -412,12 +393,6 @@ msgstr "Jednostka Miary"
 msgid "Make to Stock"
 msgstr "Na zapas"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr "Zapotrzebowanie <b>anulowano</b>."
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -505,11 +480,6 @@ msgstr "Utwórz zapotrzebowanie"
 msgid "Compute Stock"
 msgstr "Oblicz zapas"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Usługa"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -669,7 +639,7 @@ msgid "Is a Follower"
 msgstr "Jest obserwatorem"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Brak zapasu."
@@ -685,7 +655,7 @@ msgid "Procure Products"
 msgstr "Zapotrzebowanie na produkty"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
@@ -694,12 +664,6 @@ msgstr ""
 "Sprawdź ilość w zapotrzebowaniu dla produktu \"%s\" ona nie powinna być "
 "niższa od 0 !"
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -751,15 +715,9 @@ msgid "Extra Information"
 msgstr "Dodatkowe informacje"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nazwa zapotrzebowania."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Brak dostawcy dla tego produktu."
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr "Podsumowanie"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -799,7 +757,7 @@ msgid "Properties composition"
 msgstr "Kompozycja właściwości"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Zbyt mało danych !"
@@ -816,12 +774,6 @@ msgstr "Grupa właściwości"
 msgid "Misc"
 msgstr "Różne"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr "Zapotrzebowanie <b>wykonano</b>."
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -862,13 +814,10 @@ msgid "Not urgent"
 msgstr "Nie pilne"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Wyjątki zapotrzebowania"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr "Poziomy Zamawiania"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -882,9 +831,9 @@ msgstr ""
 "maksymalnej."
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Ostateczny wyjątek zapotrzebowania"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Oblicz wszystkie planowania"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -897,10 +846,13 @@ msgid "Procurements in Exception"
 msgstr "Zapotrzebowania w wyjątkach"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr "Poziomy Zamawiania"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Wyjątki zapotrzebowania"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -949,6 +901,7 @@ msgstr "Tymczasowo"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -969,11 +922,6 @@ msgstr "Uruchomiony"
 msgid "Make to Order"
 msgstr "Na zamówienie"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Oczekiwanie"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1067,11 +1015,6 @@ msgstr "Bardzo pilne"
 msgid "Automatic Orderpoint"
 msgstr "Automatyczny punkt zamawiania"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Szczegóły zapotrzebowania"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1082,12 +1025,6 @@ msgstr "Wiadomości i historia komunikacji"
 msgid "Procurement started late"
 msgstr "Zapotrzbowanie uruchomione późno"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr "Zapotrzebowanie <b>utworzono</b>."
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1119,11 +1056,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "ZAPOTRZ %d: na zamówienie - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr "Produkty zarezerwowane z zapasu."
 
+#~ msgid "Notes"
+#~ msgstr "Notatki"
+
 #~ msgid ""
 #~ "When a procurement is created the state is set to 'Draft'.\n"
 #~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
@@ -1203,6 +1143,9 @@ msgstr "Produkty zarezerwowane z zapasu."
 #~ "Kiedy zapas wirtualny spadnie poniżej wartości maksymalnej, OpenERP "
 #~ "wygeneruje zapotrzebowanie na ilość brakującą do maksymalnego zapasu."
 
+#~ msgid "Procurement name."
+#~ msgstr "Nazwa zapotrzebowania."
+
 #~ msgid "Locations"
 #~ msgstr "Strefy magazynowe"
 
@@ -1243,9 +1186,20 @@ msgstr "Produkty zarezerwowane z zapasu."
 #~ msgid "Product UoM"
 #~ msgstr "JM produktu"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Szczegóły zapotrzebowania"
+
 #~ msgid "Planification"
 #~ msgstr "Planowanie"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nie zdefiniowano dostawcy dla tego produktu!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Nie zdefiniowano adresu dla dostawcy"
+
 #~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP i planowanie logistyczne"
 
@@ -1273,3 +1227,7 @@ msgstr "Produkty zarezerwowane z zapasu."
 #~ msgstr ""
 #~ "Ten kreator zaplanuje zapotrzebowanie dla tego produktu. Zapotrzebowanie "
 #~ "może wygenerować zadanie, zamówienie produkcji lub zakupu."
+
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Brak dostawcy dla tego produktu."
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 9ddd28ed627..a8ec0f84415 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:50+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Agrupar por..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Aquisição do rascunho do artigo e localização do ponto de encomenda."
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Não há fornecedor definido para este artigo !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Não há um endereço definido para este fornecedor!"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Serviço"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Quantidade UoS"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Razão"
 
@@ -139,11 +131,6 @@ msgstr "Não utilizado em cálculos, apenas para informação."
 msgid "Latest procurement"
 msgstr "Última Aquisição"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -181,6 +168,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Exceções contratos permanentes"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -197,9 +189,9 @@ msgid "Stock Move"
 msgstr "Movimento do Stock"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Executar todos os planeadores"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -242,11 +234,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -257,12 +244,6 @@ msgstr "Confirmado"
 msgid "Retry"
 msgstr "Tentar Novamente"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -299,7 +280,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regra de inventário mínimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Aquisição '%s' está em exceção: "
@@ -315,9 +296,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Em Espera"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -386,7 +367,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Sem stock suficiente, nem regra de stock minimo definida."
@@ -403,12 +384,6 @@ msgstr "Unidade de Medida"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -494,11 +469,6 @@ msgstr "Requisição de aquisição"
 msgid "Compute Stock"
 msgstr "Calcular stock"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Serviço"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -648,7 +618,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Sem stock suficiente"
@@ -664,19 +634,13 @@ msgid "Procure Products"
 msgstr "Adquirir artigos"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -726,15 +690,9 @@ msgid "Extra Information"
 msgstr "Informação extra"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nome da aquisição"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Nenhum fornecedor padrão definido para este artigo"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -770,7 +728,7 @@ msgid "Properties composition"
 msgstr "Composição de propriedades"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dados Insuficientes!"
@@ -787,12 +745,6 @@ msgstr "Propriedade do grupo"
 msgid "Misc"
 msgstr "Diversos"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -833,13 +785,10 @@ msgid "Not urgent"
 msgstr "Não urgente"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Exceções de aquisição"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -850,9 +799,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Exceções contratos permanentes"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Executar todos os planeadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -865,10 +814,13 @@ msgid "Procurements in Exception"
 msgstr "Aquisições em exceção"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Exceções de aquisição"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -913,6 +865,7 @@ msgstr "Temporário"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -933,11 +886,6 @@ msgstr "Em Funcionamento"
 msgid "Make to Order"
 msgstr "Produzir para ordem"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Em Espera"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1033,11 +981,6 @@ msgstr "Muito urgente"
 msgid "Automatic Orderpoint"
 msgstr "Ponto de encomenda automático"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalhes de aquisição"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1048,12 +991,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Aquisição começou tarde"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1085,7 +1022,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "PROC %d: em ordem - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1093,6 +1030,10 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Planeamento"
 
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Não há um endereço definido para este fornecedor!"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
@@ -1114,6 +1055,9 @@ msgstr ""
 #~ msgid "Details"
 #~ msgstr "Detalhes"
 
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Pesquisa de regras de stock mínimo"
 
@@ -1194,6 +1138,10 @@ msgstr ""
 #~ "este campo, o OpenERP gera uma aquisição para trazer o stock virtual para a "
 #~ "quantidade máxima."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Nenhum fornecedor padrão definido para este artigo"
+
 #~ msgid ""
 #~ "This wizard allows you to run all procurement, production and/or purchase "
 #~ "orders that should be processed based on their configuration. By default, "
@@ -1245,6 +1193,10 @@ msgstr ""
 #~ "resolver-se automaticamente, mas outras requerem intervenção manual (aqueles "
 #~ "que são identificados por uma mensagem de erro específica)."
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Não há fornecedor definido para este artigo !"
+
 #~ msgid "on order"
 #~ msgstr "na ordem"
 
@@ -1320,6 +1272,9 @@ msgstr ""
 #~ msgid "Procurement Reason"
 #~ msgstr "Razões de aquisições"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nome da aquisição"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Tem de associar um lote de produção a este artigo"
 
@@ -1348,3 +1303,6 @@ msgstr ""
 #, python-format
 #~ msgid "from stock: products assigned."
 #~ msgstr "de stock: artigos atribuidos."
+
+#~ msgid "Procurement Details"
+#~ msgstr "Detalhes de aquisição"
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index c2e2db06ff8..a1721a977e9 100644
--- a/addons/procurement/i18n/pt_BR.po
+++ b/addons/procurement/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-21 00:27+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
@@ -50,12 +50,6 @@ msgstr "Agrupar Por..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Aquisição provisória do produto e local deste ponto de pedido"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nenhum fornecedor definido para este produto!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -90,10 +84,9 @@ msgid "Manufacture"
 msgstr "Fabricar"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Nenhum endereço definido para o fornecedor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Serviço"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -118,7 +111,6 @@ msgstr "Qtde na Unidade de Venda"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motivo"
 
@@ -147,11 +139,6 @@ msgstr "Não utilizado no cálculo, apenas informativo."
 msgid "Latest procurement"
 msgstr "Última aquisição"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notas"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -190,6 +177,11 @@ msgstr "Produtos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Excessões Permanentes de Aquisições"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -206,9 +198,9 @@ msgid "Stock Move"
 msgstr "Movimentação do Estoque"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Processar todos os agendamentos"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr "Produtos Estocáveis"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -266,11 +258,6 @@ msgstr ""
 "identificados por uma mensagem de erro específica).</p>\n"
 "            "
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr "Produtos Estocáveis"
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -281,12 +268,6 @@ msgstr "Confirmado"
 msgid "Retry"
 msgstr "Repetir"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr "Aquisição <b>confirmada</b>"
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -323,7 +304,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regra de Estoque Mínimo"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Aquisição '%s' possui uma excessão: "
@@ -339,9 +320,9 @@ msgid "Reordering Rules Search"
 msgstr "Pesquisar Regras reordenação"
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Aguardando"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -410,7 +391,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Estoque insuficiente e sem mínimo definido para ponto de pedido."
@@ -427,12 +408,6 @@ msgstr "Unidade de Medida - UdM"
 msgid "Make to Stock"
 msgstr "Fabricar para estoque"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr "Aquisição <b>cancelada</b>."
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -536,11 +511,6 @@ msgstr "Requisição de Aquisição"
 msgid "Compute Stock"
 msgstr "Calcular Estoque"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Serviço"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -712,7 +682,7 @@ msgid "Is a Follower"
 msgstr "É um Seguidor"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Estoque insuficiente."
@@ -728,7 +698,7 @@ msgid "Procure Products"
 msgstr "Adquirir Produtos"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
@@ -737,12 +707,6 @@ msgstr ""
 "Verifique a quantidade na ordem de aquisição para o produto\"% s\" , não "
 "deve ser 0 ou menos!"
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -794,15 +758,9 @@ msgid "Extra Information"
 msgstr "Informações Adicionais"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nome da aquisição"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Nenhum fornecedor padrão definido para este produto"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -841,7 +799,7 @@ msgid "Properties composition"
 msgstr "Propriedades da composição"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dados insuficientes!"
@@ -858,12 +816,6 @@ msgstr "Grupo de Propriedades"
 msgid "Misc"
 msgstr "Diversos"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr "Aquisição <b>concluída</b>"
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -904,13 +856,10 @@ msgid "Not urgent"
 msgstr "Não urgente"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Problemas das Aquisições"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr "Ponto de Pedido"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -924,9 +873,9 @@ msgstr ""
 "especificada como Quantidade máx."
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Excessões Permanentes de Aquisições"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Processar todos os agendamentos"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -939,10 +888,13 @@ msgid "Procurements in Exception"
 msgstr "Aquisições com Problemas"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr "Ponto de Pedido"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Problemas das Aquisições"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -991,6 +943,7 @@ msgstr "Temporário"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -1011,11 +964,6 @@ msgstr "Em execução"
 msgid "Make to Order"
 msgstr "Adquirir Sempre"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Aguardando"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1112,11 +1060,6 @@ msgstr "Muito Urgente"
 msgid "Automatic Orderpoint"
 msgstr "Ponto de Pedido Automático"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalhes da Aquisição"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1127,12 +1070,6 @@ msgstr "Histórico de mensagens e comunicação"
 msgid "Procurement started late"
 msgstr "Aquisição começou tarde"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr "Aquisição <b>criada</b>"
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1164,11 +1101,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "Aquisição %d: no pedido - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr "Produtos reservados do estoque"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nenhum fornecedor definido para este produto!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Nenhum endereço definido para o fornecedor"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "on order"
 #~ msgstr "no pedido"
 
@@ -1217,6 +1165,9 @@ msgstr "Produtos reservados do estoque"
 #~ msgid "General Information"
 #~ msgstr "Informações Gerais"
 
+#~ msgid "Procurement name."
+#~ msgstr "Nome da aquisição"
+
 #~ msgid "The procurement quantity will by rounded up to this multiple."
 #~ msgstr "A aquisição será arredondada pra cima para este multiplo."
 
@@ -1230,6 +1181,9 @@ msgstr "Produtos reservados do estoque"
 #~ msgid "from stock: products assigned."
 #~ msgstr "do estoque: produtos atribuídos."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Detalhes da Aquisição"
+
 #, python-format
 #~ msgid ""
 #~ "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -1422,6 +1376,10 @@ msgstr "Produtos reservados do estoque"
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "A referência deve ser única por empresa!"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Nenhum fornecedor padrão definido para este produto"
+
 #, python-format
 #~ msgid "Cannot delete Procurement Order(s) which are in %s state!"
 #~ msgstr ""
diff --git a/addons/procurement/i18n/ro.po b/addons/procurement/i18n/ro.po
index 7cd5ee412cf..b7a3fd80226 100644
--- a/addons/procurement/i18n/ro.po
+++ b/addons/procurement/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-17 14:37+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Grupati dupa..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Aprovizionarea ciorna a produsului si locatia punctului de comanda"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nu exista nici un furnizor definit pentru acest produs !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Nu exista nici o adresa definita pentru furnizor"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Service"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Cantitate UdV"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Motiv"
 
@@ -139,11 +131,6 @@ msgstr "A nu se utiliza in calcule, este doar ca titlu informativ."
 msgid "Latest procurement"
 msgstr "Ultima aprovizionare"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Note"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -181,6 +168,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Exceptii Permanente Aprovizionare"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -197,9 +189,9 @@ msgid "Stock Move"
 msgstr "Miscare stoc"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Calculati toate programarile"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -242,11 +234,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -257,12 +244,6 @@ msgstr "Confirmat(a)"
 msgid "Retry"
 msgstr "Incearcati din nou"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -299,7 +280,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Regula Inventarului Minim"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Aprovizionarea '%s' este in exceptie: "
@@ -315,9 +296,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "In asteptare"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -386,7 +367,7 @@ msgid "Quantity"
 msgstr "Cantitate"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -405,12 +386,6 @@ msgstr "Unitatea de masura"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -496,11 +471,6 @@ msgstr "Cerere de Aprovizionare"
 msgid "Compute Stock"
 msgstr "Calculati Stocul"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Service"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -649,7 +619,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Stoc insuficient."
@@ -665,19 +635,13 @@ msgid "Procure Products"
 msgstr "Procurare produse"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -727,15 +691,9 @@ msgid "Extra Information"
 msgstr "Informatii suplimentare"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Nume aprovizionare."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Nu exista niciun furnizor implicit definit pentru acest produs"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -771,7 +729,7 @@ msgid "Properties composition"
 msgstr "Alcatuire proprietati"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Date Insuficiente !"
@@ -788,12 +746,6 @@ msgstr "Proprietati Grup"
 msgid "Misc"
 msgstr "Diverse"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -834,13 +786,10 @@ msgid "Not urgent"
 msgstr "Nu e urgent"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Exceptii Aprovizionare"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -851,9 +800,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Exceptii Permanente Aprovizionare"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calculati toate programarile"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -866,10 +815,13 @@ msgid "Procurements in Exception"
 msgstr "Aprovizionari in Exceptie"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Exceptii Aprovizionare"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -914,6 +866,7 @@ msgstr "Temporar"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Descriere"
 
@@ -934,11 +887,6 @@ msgstr "In executie"
 msgid "Make to Order"
 msgstr "Facut la comanda"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "In asteptare"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1034,11 +982,6 @@ msgstr "Foarte Urgent"
 msgid "Automatic Orderpoint"
 msgstr "Punct de comanda Automat"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Detalii aprovizionare"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1049,12 +992,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Aprovizionarea a inceput tarziu"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1086,11 +1023,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "APROV %d: la comanda - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Note"
+
 #~ msgid "Planification"
 #~ msgstr "Planificare"
 
@@ -1143,6 +1083,9 @@ msgstr ""
 #~ "Atunci cand stocul virtual scade sub Cantitatea maximă, OpenERP generează o "
 #~ "aprovizionare pentru a aduce stocul virtual la Cantitatea maximă."
 
+#~ msgid "Procurement name."
+#~ msgstr "Nume aprovizionare."
+
 #, python-format
 #~ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 #~ msgstr ""
@@ -1165,6 +1108,17 @@ msgstr ""
 #~ msgid "from stock: products assigned."
 #~ msgstr "din stoc: produse alocate."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Detalii aprovizionare"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nu exista nici un furnizor definit pentru acest produs !"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Nu exista nici o adresa definita pentru furnizor"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Cautati Regulile Stocului Mimim"
 
@@ -1315,6 +1269,10 @@ msgstr ""
 #~ msgid "General Information"
 #~ msgstr "Informatii generale"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Nu exista niciun furnizor implicit definit pentru acest produs"
+
 #~ msgid "Quantity Rules"
 #~ msgstr "Reguli Cantitate"
 
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 74313babe08..895c5cbe878 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-24 16:47+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Группировать по ..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Черновик снабжения ТМЦ и положение точки заказа"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Не задан поставщик для ТМЦ!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Нет адреса поставщика"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Сервис"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Количество в е.п."
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Причина"
 
@@ -139,11 +131,6 @@ msgstr "Не используется в расчётах, только для 
 msgid "Latest procurement"
 msgstr "Последнее снабжение"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Примечания"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -181,6 +168,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Постоянные проблемы снабжения"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -197,9 +189,9 @@ msgid "Stock Move"
 msgstr "Движение ТМЦ"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Вычисление всех планировщиков"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -242,11 +234,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -257,12 +244,6 @@ msgstr "Подтверждено"
 msgid "Retry"
 msgstr "Повтор"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -299,7 +280,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Правило минимума ТМЦ"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Снабжение '%s' в исключительной ситуации: "
@@ -315,9 +296,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "В ожидании"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -386,7 +367,7 @@ msgid "Quantity"
 msgstr "Количество"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Не достаточен запас и нет правила минимума точки заказа."
@@ -403,12 +384,6 @@ msgstr "Единица измерения"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -494,11 +469,6 @@ msgstr "Заявка снабжения"
 msgid "Compute Stock"
 msgstr "Вычислить запасы"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Сервис"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -646,7 +616,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Не достаточный запас."
@@ -662,19 +632,13 @@ msgid "Procure Products"
 msgstr "Снабжение товарами"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -724,15 +688,9 @@ msgid "Extra Information"
 msgstr "Доп. информация"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Название снабжения."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Для ТМЦ не определен поставщик по умолчанию"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -768,7 +726,7 @@ msgid "Properties composition"
 msgstr "Составление свойств"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Недостаточно данных !"
@@ -785,12 +743,6 @@ msgstr "Группа свойств"
 msgid "Misc"
 msgstr "Прочее"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -831,13 +783,10 @@ msgid "Not urgent"
 msgstr "Не срочно"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Проблемы снабжения"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -848,9 +797,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Постоянные проблемы снабжения"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Вычисление всех планировщиков"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -863,10 +812,13 @@ msgid "Procurements in Exception"
 msgstr "Исключительные ситуации снабжения"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Проблемы снабжения"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -911,6 +863,7 @@ msgstr "Временный"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Описание"
 
@@ -931,11 +884,6 @@ msgstr "Выполняется"
 msgid "Make to Order"
 msgstr "Изготовить на заказ"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "В ожидании"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1029,11 +977,6 @@ msgstr "Очень срочно"
 msgid "Automatic Orderpoint"
 msgstr "Авто точка заказа"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Детали снабжения"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1044,12 +987,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Дата начала снабжения"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1081,11 +1018,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "СНАБ %d: по заказу - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Примечания"
+
 #~ msgid "State"
 #~ msgstr "Состояние"
 
@@ -1131,6 +1071,9 @@ msgstr ""
 #~ msgid "UOM"
 #~ msgstr "Ед. изм."
 
+#~ msgid "Procurement Details"
+#~ msgstr "Детали снабжения"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Искать правила минимальных запасов"
 
@@ -1214,6 +1157,18 @@ msgstr ""
 #~ "    Это модуль для расчета снабжения.\n"
 #~ "    "
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Для ТМЦ не определен поставщик по умолчанию"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Не задан поставщик для ТМЦ!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Нет адреса поставщика"
+
 #~ msgid "on order"
 #~ msgstr "по заказу"
 
@@ -1315,6 +1270,9 @@ msgstr ""
 #~ "меню для его принудительного запуска. Помните, что он работает в фоновом "
 #~ "режиме, вы должны подождать несколько минут до окончания обработки."
 
+#~ msgid "Procurement name."
+#~ msgstr "Название снабжения."
+
 #~ msgid "Locations"
 #~ msgstr "Места хранения"
 
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index 7b03dc6a5cd..8d57c08c5c0 100644
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-04 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Grupisano po..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nema definisanog dobavljaca za ovaj proizvod,"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Adresa za ovog dobavljaca nije definisana"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Usluga"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Kolicina JU"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Razlog"
 
@@ -139,11 +131,6 @@ msgstr "Ne koristi se pri izracunavanju, sluzi samo u informacione svrhe"
 msgid "Latest procurement"
 msgstr "Poslednja nabavka"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Napomene"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -175,6 +162,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -191,9 +183,9 @@ msgid "Stock Move"
 msgstr "Pomeri Lager"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Proracunaj sve zakazano"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -236,11 +228,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -251,12 +238,6 @@ msgstr "POtvrdjeno"
 msgid "Retry"
 msgstr "Pokusaj ponovo"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -293,7 +274,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Pravila Minimalnog Inventara"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -309,9 +290,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Na Cekanju"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -380,7 +361,7 @@ msgid "Quantity"
 msgstr "Kolicina"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nedovoljno definisana pravila za lager i minimalnu tacku narucivanja"
@@ -397,12 +378,6 @@ msgstr "Jedinica Mere"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -488,11 +463,6 @@ msgstr "Zahtev Nabavke"
 msgid "Compute Stock"
 msgstr "Izracunaj Lager"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Usluga"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -638,7 +608,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -654,19 +624,13 @@ msgid "Procure Products"
 msgstr "Nabavi Proizvode"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -716,14 +680,8 @@ msgid "Extra Information"
 msgstr "Dodatne Informacije"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Ime Nabavke"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -760,7 +718,7 @@ msgid "Properties composition"
 msgstr "Sastav Osobina"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Nedovoljno podataka !"
@@ -777,12 +735,6 @@ msgstr "Grupa Osobina"
 msgid "Misc"
 msgstr "Ostalo"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -823,13 +775,10 @@ msgid "Not urgent"
 msgstr "NIje Hitno"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Izuzeci Nabavke"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -840,9 +789,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Proracunaj sve zakazano"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -855,10 +804,13 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Izuzeci Nabavke"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -903,6 +855,7 @@ msgstr "Privremeni"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -923,11 +876,6 @@ msgstr "Radim"
 msgid "Make to Order"
 msgstr "Napravi zahtev"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Na Cekanju"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1020,11 +968,6 @@ msgstr "Vrlo Hitno"
 msgid "Automatic Orderpoint"
 msgstr "Automatska TackaNarucivanja"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "detalji Nabavke"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1035,12 +978,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1072,7 +1009,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1080,6 +1017,17 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Planiranje"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nema definisanog dobavljaca za ovaj proizvod,"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Adresa za ovog dobavljaca nije definisana"
+
+#~ msgid "Notes"
+#~ msgstr "Napomene"
+
 #~ msgid ""
 #~ "When a procurement is created the state is set to 'Draft'.\n"
 #~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
@@ -1163,6 +1111,9 @@ msgstr ""
 #~ msgid "Procurement Reason"
 #~ msgstr "Razlog Nabavke"
 
+#~ msgid "Procurement name."
+#~ msgstr "Ime Nabavke"
+
 #~ msgid "Locations"
 #~ msgstr "Lokacije"
 
@@ -1213,3 +1164,6 @@ msgstr ""
 
 #~ msgid "Product UoM"
 #~ msgstr "JM Proizvoda"
+
+#~ msgid "Procurement Details"
+#~ msgstr "detalji Nabavke"
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index a77c2ed11e7..b2344b7c009 100644
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-23 15:05+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Grupisano po..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Nema definisanog dobavljaca za ovaj proizvod,"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Adresa za ovog dobavljaca nije definisana"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Usluga"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "Kolicina JU"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Razlog"
 
@@ -139,11 +131,6 @@ msgstr "Ne koristi se pri izracunavanju, sluzi samo u informacione svrhe"
 msgid "Latest procurement"
 msgstr "Poslednja nabavka"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Napomene"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -175,6 +162,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -191,9 +183,9 @@ msgid "Stock Move"
 msgstr "Pomeri Lager"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Proracunaj sve zakazano"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -236,11 +228,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -251,12 +238,6 @@ msgstr "POtvrdjeno"
 msgid "Retry"
 msgstr "Pokusaj ponovo"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -293,7 +274,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Pravila Minimalnog Inventara"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -309,9 +290,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Na Cekanju"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -380,7 +361,7 @@ msgid "Quantity"
 msgstr "Kolicina"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nedovoljno definisana pravila za lager i minimalnu tacku narucivanja"
@@ -397,12 +378,6 @@ msgstr "Jedinica Mere"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -488,11 +463,6 @@ msgstr "Zahtev Nabavke"
 msgid "Compute Stock"
 msgstr "Izracunaj Lager"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Usluga"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -638,7 +608,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -654,19 +624,13 @@ msgid "Procure Products"
 msgstr "Nabavi Proizvode"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -716,14 +680,8 @@ msgid "Extra Information"
 msgstr "Dodatne Informacije"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Ime Nabavke"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -760,7 +718,7 @@ msgid "Properties composition"
 msgstr "Sastav Osobina"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Nedovoljno podataka !"
@@ -777,12 +735,6 @@ msgstr "Grupa Osobina"
 msgid "Misc"
 msgstr "Ostalo"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -823,13 +775,10 @@ msgid "Not urgent"
 msgstr "NIje Hitno"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Izuzeci Nabavke"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -840,9 +789,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr ""
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Proracunaj sve zakazano"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -855,10 +804,13 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Izuzeci Nabavke"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -903,6 +855,7 @@ msgstr "Privremeni"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -923,11 +876,6 @@ msgstr "Radim"
 msgid "Make to Order"
 msgstr "Napravi zahtev"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Na Cekanju"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1020,11 +968,6 @@ msgstr "Vrlo Hitno"
 msgid "Automatic Orderpoint"
 msgstr "Automatska TackaNarucivanja"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "detalji Nabavke"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1035,12 +978,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1072,7 +1009,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
@@ -1080,6 +1017,17 @@ msgstr ""
 #~ msgid "Planification"
 #~ msgstr "Planiranje"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Nema definisanog dobavljaca za ovaj proizvod,"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Adresa za ovog dobavljaca nije definisana"
+
+#~ msgid "Notes"
+#~ msgstr "Napomene"
+
 #~ msgid ""
 #~ "When a procurement is created the state is set to 'Draft'.\n"
 #~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
@@ -1160,6 +1108,9 @@ msgstr ""
 #~ "pokretanje sada. Zapamti da se proces odvija u pozadini, i da moras sacekati "
 #~ "i nekoliko minuta pre nego se zavrsi izracunavanje."
 
+#~ msgid "Procurement name."
+#~ msgstr "Ime Nabavke"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Razlog Nabavke"
 
@@ -1213,3 +1164,6 @@ msgstr ""
 
 #~ msgid "Product UoM"
 #~ msgstr "JM Proizvoda"
+
+#~ msgid "Procurement Details"
+#~ msgstr "detalji Nabavke"
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 1490a6a6d0a..8b09795aba3 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-03 22:59+0000\n"
 "Last-Translator: Stefan Lind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -49,12 +49,6 @@ msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 "Anskaffningsförslag för produkter och lagerplats med denna beställningspunkt"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Leverantör saknas för denna produkt !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -83,10 +77,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Ingen adress definierad för leverantören"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Tjänst"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -111,7 +104,6 @@ msgstr "Måttenhet Kvantitet"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Orsak"
 
@@ -140,11 +132,6 @@ msgstr "Används inte i beräkningar, endast avsedd som information."
 msgid "Latest procurement"
 msgstr "Senaste anskaffning"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Anteckningar"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -182,6 +169,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Permanenta upphandlingsfel"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -198,9 +190,9 @@ msgid "Stock Move"
 msgstr "Lagertransaktion"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Beräkna alla schemaläggare"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -243,11 +235,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -258,12 +245,6 @@ msgstr "Bekräftad"
 msgid "Retry"
 msgstr "Försök igen"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -300,7 +281,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Minsta lager regel"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Upphandling '%s' behöver åtgärdas: "
@@ -316,9 +297,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Väntar"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -387,7 +368,7 @@ msgid "Quantity"
 msgstr "Antal"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Ej tillräckligt lager och regel för minsta lager saknas."
@@ -404,12 +385,6 @@ msgstr "Måttenhet"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -495,11 +470,6 @@ msgstr "Inköpsförfrågan"
 msgid "Compute Stock"
 msgstr "Beräkna Lager"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Tjänst"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -648,7 +618,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Inte tillräckligt lager."
@@ -664,19 +634,13 @@ msgid "Procure Products"
 msgstr "Produktanskaffning"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -727,15 +691,9 @@ msgid "Extra Information"
 msgstr "Extra Information"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Upphandling namn."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Ingen standard leverantör definierad för denna produkt"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -771,7 +729,7 @@ msgid "Properties composition"
 msgstr "Egenskaper sammansättning"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Otillräckliga data!"
@@ -788,12 +746,6 @@ msgstr "Enhetsgrupp"
 msgid "Misc"
 msgstr "Övrigt"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -834,13 +786,10 @@ msgid "Not urgent"
 msgstr "Inte brådskande"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Anskaffningsundantag"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -851,9 +800,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Permanenta upphandlingsfel"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Beräkna alla schemaläggare"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -866,10 +815,13 @@ msgid "Procurements in Exception"
 msgstr "Anskaffningar i undantag"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Anskaffningsundantag"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -914,6 +866,7 @@ msgstr "Tillfällig"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -934,11 +887,6 @@ msgstr "Pågående"
 msgid "Make to Order"
 msgstr "Anskaffa på order"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Väntar"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1034,11 +982,6 @@ msgstr "Mycket brådskande"
 msgid "Automatic Orderpoint"
 msgstr "Automatisk Orderpunkt"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Upphandling Detaljer"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1049,12 +992,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Upphandling startade sent"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1086,11 +1023,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "PROC %d : på beställning -% 3.2f%-5s -% s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Anteckningar"
+
 #~ msgid "Configuration"
 #~ msgstr "Konfiguration"
 
@@ -1122,6 +1062,10 @@ msgstr ""
 #~ msgid "on order"
 #~ msgstr "beställt"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Leverantör saknas för denna produkt !"
+
 #~ msgid "Product UOM"
 #~ msgstr "Produktenhet"
 
@@ -1157,6 +1101,10 @@ msgstr ""
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Sökning på regler för minimilager"
 
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Ingen adress definierad för leverantören"
+
 #~ msgid ""
 #~ "When a procurement is created the state is set to 'Draft'.\n"
 #~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
@@ -1269,6 +1217,9 @@ msgstr ""
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Ingen regel för minsta orderpunkt har definieras."
 
+#~ msgid "Procurement name."
+#~ msgstr "Upphandling namn."
+
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "Referens måste vara unikt per företag!"
 
@@ -1281,6 +1232,10 @@ msgstr ""
 #~ msgid "General Information"
 #~ msgstr "Allmän information"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Ingen standard leverantör definierad för denna produkt"
+
 #~ msgid "Details"
 #~ msgstr "Detaljer"
 
@@ -1310,6 +1265,9 @@ msgstr ""
 #~ msgid "Compute Schedulers"
 #~ msgstr "Beräkna schemaläggare"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Upphandling Detaljer"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fel: felaktig EAN kod"
 
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 89e576bb22c..bd2cecef907 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-25 11:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -48,12 +48,6 @@ msgstr "Gruplandır..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "Sipariş noktası konumunun ve ürünün taslak tedariki"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Bu ürün için tedarikçi tanımı yok!"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -82,10 +76,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Tedarikçi için bir adres tanımlanmaış!"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Hizmet"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -110,7 +103,6 @@ msgstr "2.Br. Miktarı"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Neden"
 
@@ -139,11 +131,6 @@ msgstr "Sadece bilgi amaçlıdır, hesaplamalarda kullanılmaz."
 msgid "Latest procurement"
 msgstr "Son tedarik"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Notlar"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -181,6 +168,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Kalıcı Satınalma İstisnaları"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -197,9 +189,9 @@ msgid "Stock Move"
 msgstr "Stok Hareketi"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "Tüm Planlamacıları Hesapla"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -242,11 +234,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -257,12 +244,6 @@ msgstr "Onaylandı"
 msgid "Retry"
 msgstr "Yeniden Dene"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -297,7 +278,7 @@ msgid "Minimum Inventory Rule"
 msgstr "Minimum Envanter Kuralı"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "Tedarik '%s' de kuraldışılık var: "
@@ -313,9 +294,9 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr ""
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Beklemede"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -384,7 +365,7 @@ msgid "Quantity"
 msgstr "Miktar"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Yeterli stok yok ve minimum sipariş noktası kuralı tanımlı değil!"
@@ -401,12 +382,6 @@ msgstr "Ölçü Birimi"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -492,11 +467,6 @@ msgstr "Satınalma İsteği"
 msgid "Compute Stock"
 msgstr "Stok Hesapla"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Hizmet"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -645,7 +615,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "Yeterli stok yok."
@@ -661,19 +631,13 @@ msgid "Procure Products"
 msgstr "Ürünleri Satınal"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -723,15 +687,9 @@ msgid "Extra Information"
 msgstr "Ekstra Bilgi"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "Satınalma adı."
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "Bu ürün için varsayılan tedarikçi tanımlanmamış"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -767,7 +725,7 @@ msgid "Properties composition"
 msgstr "Bileşim Özellikleri"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Yetersiz Bilgi !"
@@ -784,12 +742,6 @@ msgstr "Özellik Grubu"
 msgid "Misc"
 msgstr "Çeşitli"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -830,13 +782,10 @@ msgid "Not urgent"
 msgstr "Acil Değil"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "Satınalma İstisnaları"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -847,9 +796,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "Kalıcı Satınalma İstisnaları"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Tüm Planlamacıları Hesapla"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -862,10 +811,13 @@ msgid "Procurements in Exception"
 msgstr "İstisnai Satınalmalar"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr ""
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "Satınalma İstisnaları"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -910,6 +862,7 @@ msgstr "Geçici"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "Açıklama"
 
@@ -930,11 +883,6 @@ msgstr "Çalışma"
 msgid "Make to Order"
 msgstr "Sipariş Ver"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "Beklemede"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1030,11 +978,6 @@ msgstr "Çok Acil"
 msgid "Automatic Orderpoint"
 msgstr "Otomatik Sipariş Noktası"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "Satınalma Detayları"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1045,12 +988,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr "Satınalma geç başladı"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1082,11 +1019,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "SATIN %d: siparişte - %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Notlar"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "Minimum Stok Kuralı Arama"
 
@@ -1148,6 +1088,9 @@ msgstr ""
 #~ msgid "Product UoM"
 #~ msgstr "Birim"
 
+#~ msgid "Procurement Details"
+#~ msgstr "Satınalma Detayları"
+
 #~ msgid "Planification"
 #~ msgstr "Planlama"
 
@@ -1197,6 +1140,9 @@ msgstr ""
 #~ "çalıştığını unutmayın, hesaplama işlemini tamamlayana kadar kadar birkaç "
 #~ "dakika beklemek zorunda kalabilirsiniz."
 
+#~ msgid "Procurement name."
+#~ msgstr "Satınalma adı."
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Bu ürün için bir üretim grubu atamanız gerekir"
 
@@ -1259,6 +1205,14 @@ msgstr ""
 #~ "bazıları manuel müdahale gerektirir (bunlar özel bir hata mesajıyla "
 #~ "belirtilir)."
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Bu ürün için tedarikçi tanımı yok!"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Tedarikçi için bir adres tanımlanmaış!"
+
 #~ msgid "on order"
 #~ msgstr "sipariş üzerine"
 
@@ -1282,6 +1236,10 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "Bu ürün için varsayılan tedarikçi tanımlanmamış"
+
 #, python-format
 #~ msgid "No minimum orderpoint rule defined."
 #~ msgstr "Enaz siparişnoktası kuralı tanımlanmamış."
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 17aade75cc5..ecaf8c50964 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-01 08:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -45,12 +45,6 @@ msgstr "Nhóm theo..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "Không có nhà cung cấp nào cho sản phẩm này !"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -79,10 +73,9 @@ msgid "Manufacture"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "Không có địa chỉ nào được gán cho nhà cung cấp"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Dịch vụ"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -107,7 +100,6 @@ msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "Lí do"
 
@@ -136,11 +128,6 @@ msgstr ""
 msgid "Latest procurement"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "Các ghi chú"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -172,6 +159,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -188,8 +180,8 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
 msgstr ""
 
 #. module: procurement
@@ -233,11 +225,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -248,12 +235,6 @@ msgstr "Đã xác nhận"
 msgid "Retry"
 msgstr "Thử lại"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -288,7 +269,7 @@ msgid "Minimum Inventory Rule"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr ""
@@ -304,8 +285,8 @@ msgid "Reordering Rules Search"
 msgstr ""
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
 msgstr ""
 
 #. module: procurement
@@ -375,7 +356,7 @@ msgid "Quantity"
 msgstr "Số lượng"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -392,12 +373,6 @@ msgstr "Đơn vị đo"
 msgid "Make to Stock"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -481,11 +456,6 @@ msgstr ""
 msgid "Compute Stock"
 msgstr ""
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "Dịch vụ"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -631,7 +601,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr ""
@@ -647,19 +617,13 @@ msgid "Procure Products"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -709,14 +673,8 @@ msgid "Extra Information"
 msgstr "Thông tin bổ sung"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: procurement
@@ -753,7 +711,7 @@ msgid "Properties composition"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dữ liệu không đầy đủ !"
@@ -770,12 +728,6 @@ msgstr ""
 msgid "Misc"
 msgstr "Các thứ khác"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -816,12 +768,9 @@ msgid "Not urgent"
 msgstr "Không gấp"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
 msgstr ""
 
 #. module: procurement
@@ -833,8 +782,8 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
 msgstr ""
 
 #. module: procurement
@@ -848,9 +797,12 @@ msgid "Procurements in Exception"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
 msgstr ""
 
 #. module: procurement
@@ -896,6 +848,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr ""
 
@@ -916,11 +869,6 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1011,11 +959,6 @@ msgstr ""
 msgid "Automatic Orderpoint"
 msgstr ""
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,12 +969,6 @@ msgstr ""
 msgid "Procurement started late"
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1063,11 +1000,14 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr ""
 
+#~ msgid "Notes"
+#~ msgstr "Các ghi chú"
+
 #~ msgid "State"
 #~ msgstr "Trạng thái"
 
@@ -1107,3 +1047,11 @@ msgstr ""
 
 #~ msgid "Details"
 #~ msgstr "Các chi tiết"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Không có nhà cung cấp nào cho sản phẩm này !"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Không có địa chỉ nào được gán cho nhà cung cấp"
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index cccedd09231..1ad394612e6 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 14:17+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -45,12 +45,6 @@ msgstr "分组..."
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr "这库位最小库存规则产品的需求单草稿"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr "尚未定义这个产品的供应商！"
-
 #. module: procurement
 #: view:product.product:0
 msgid ""
@@ -83,10 +77,9 @@ msgid "Manufacture"
 msgstr "生产"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
-msgstr "供应商地址未定义"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "服务"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -111,7 +104,6 @@ msgstr "销售单位数量"
 
 #. module: procurement
 #: view:procurement.order:0
-#: field:procurement.order,name:0
 msgid "Reason"
 msgstr "理由"
 
@@ -140,11 +132,6 @@ msgstr "没有在计算中使用，只为了提供信息。"
 msgid "Latest procurement"
 msgstr "最近需求"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr "备注"
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
 msgid ""
@@ -178,6 +165,11 @@ msgstr "产品"
 msgid "Cancelled"
 msgstr "已取消"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "永久性生产需求异常"
+
 #. module: procurement
 #: help:procurement.order,message_unread:0
 msgid "If checked new messages require your attention."
@@ -194,9 +186,9 @@ msgid "Stock Move"
 msgstr "库存调拨"
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
-msgstr "计算所有排程"
+#: view:product.product:0
+msgid "Stockable products"
+msgstr "可库存的产品"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -243,11 +235,6 @@ msgstr ""
 "来满足需要。例如：当系统不能找到一个满足需要要的方法时将产生需求意外。有些意外将被他们自行解决，但是其它的要人工干预（通过是特别的错误信息识别）。\n"
 "            "
 
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr "可库存的产品"
-
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -258,12 +245,6 @@ msgstr "已确认"
 msgid "Retry"
 msgstr "重试"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr "需求  <b>已经确认</b>."
-
 #. module: procurement
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
@@ -300,7 +281,7 @@ msgid "Minimum Inventory Rule"
 msgstr "最小库存规则"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
 #, python-format
 msgid "Procurement '%s' is in exception: "
 msgstr "需求单 '%s' 出错： "
@@ -316,9 +297,9 @@ msgid "Reordering Rules Search"
 msgstr "再订购规则搜索"
 
 #. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
-msgstr "摘要"
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "等待中"
 
 #. module: procurement
 #: field:procurement.order,message_follower_ids:0
@@ -387,7 +368,7 @@ msgid "Quantity"
 msgstr "数量"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "没有足够库存且没有定义最小订货点规则。"
@@ -404,12 +385,6 @@ msgstr "计量单位"
 msgid "Make to Stock"
 msgstr "备货型生产"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr "Procurement  <b>被取消</b>."
-
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
 msgid ""
@@ -503,11 +478,6 @@ msgstr "产品需求申请"
 msgid "Compute Stock"
 msgstr "计算库存"
 
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr "服务"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
@@ -663,7 +633,7 @@ msgid "Is a Follower"
 msgstr "是一个关注者"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
 #, python-format
 msgid "Not enough stock."
 msgstr "库存不足"
@@ -679,19 +649,13 @@ msgid "Procure Products"
 msgstr "生产产品"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
 #, python-format
 msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr "请检查需求订单中产品\"%s\" 的数量,不能小于等于0."
 
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
@@ -741,15 +705,9 @@ msgid "Extra Information"
 msgstr "额外信息"
 
 #. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr "需求单名称"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
-msgstr "产品没定义默认供应商"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr "摘要"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -787,7 +745,7 @@ msgid "Properties composition"
 msgstr "属性组成"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
 #, python-format
 msgid "Data Insufficient !"
 msgstr "数据不足!"
@@ -804,12 +762,6 @@ msgstr "属性组"
 msgid "Misc"
 msgstr "杂项"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr "需求单<b>完成</b>"
-
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
@@ -850,13 +802,10 @@ msgid "Not urgent"
 msgstr "不紧急"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
-msgstr "需求异常"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr "订购点"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -867,9 +816,9 @@ msgid ""
 msgstr "当虚拟库存变得小于最小数量，OpenERP生成一个需求单，使得预测数量达到这个字段指定的最大数量。"
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
-msgstr "永久性生产需求异常"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "计算所有排程"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -882,10 +831,13 @@ msgid "Procurements in Exception"
 msgstr "出错的需求单"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
-msgstr "订购点"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr "需求异常"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -930,6 +882,7 @@ msgstr "临时"
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
 msgid "Description"
 msgstr "描述"
 
@@ -950,11 +903,6 @@ msgstr "正在处理"
 msgid "Make to Order"
 msgstr "按订单生产"
 
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr "等待中"
-
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
@@ -1045,11 +993,6 @@ msgstr "非常紧急"
 msgid "Automatic Orderpoint"
 msgstr "自动计算订货点"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr "需求单细节"
-
 #. module: procurement
 #: help:procurement.order,message_ids:0
 msgid "Messages and communication history"
@@ -1060,12 +1003,6 @@ msgstr "消息和通信历史"
 msgid "Procurement started late"
 msgstr "没有按期开始的补货单"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr "需求单 <b>被创建</b>."
-
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
@@ -1097,11 +1034,22 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
 msgstr "补货单 %d：订单- %3.2f %-5s - %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
 #, python-format
 msgid "Products reserved from stock."
 msgstr "产品从仓库保留"
 
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "尚未定义这个产品的供应商！"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "供应商地址未定义"
+
+#~ msgid "Notes"
+#~ msgstr "备注"
+
 #~ msgid "Minimum Stock Rules Search"
 #~ msgstr "使用最少库存法则搜寻"
 
@@ -1161,6 +1109,10 @@ msgstr "产品从仓库保留"
 #~ msgid "General Information"
 #~ msgstr "一般信息"
 
+#, python-format
+#~ msgid "No default supplier defined for this product"
+#~ msgstr "产品没定义默认供应商"
+
 #~ msgid "Current"
 #~ msgstr "当前的"
 
@@ -1244,6 +1196,9 @@ msgstr "产品从仓库保留"
 #~ "procurement to bring the virtual stock to the Max Quantity."
 #~ msgstr "如果虚拟库存小于最小数量，OpenERP生成需求单以补充到最大数量。"
 
+#~ msgid "Procurement name."
+#~ msgstr "需求单名称"
+
 #, python-format
 #~ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 #~ msgstr "不能删除 %s 状态的需求单"
@@ -1271,6 +1226,9 @@ msgstr "产品从仓库保留"
 #~ "需求单体现了给定时间给定库位给定产品的需求。销售订单是需求单的一个典型来源。根据需求参数和产品设置的不同，需求引擎会试图从现有库存预留、从供应商采购或建立"
 #~ "生产订单等方式满足需求数量。如果系统无法找到可用的补货方式，会产生需求异常。有些异常会自动解决而另一些需要手动调整（有对应的错误信息可以参照）。"
 
+#~ msgid "Procurement Details"
+#~ msgstr "需求单细节"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "公司名称必须唯一！"
 
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 8ef8a604e66..ed077c183d3 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "وهذا هو الحد الأدنى لشراء كمية من المورد الرئيسي."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "يوم"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -107,8 +102,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -119,18 +114,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "دستة"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -187,7 +177,7 @@ msgid "Product Type"
 msgstr "نوع المنتج"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "المنتجات: "
@@ -275,11 +265,6 @@ msgstr ""
 msgid "Category"
 msgstr "فئة"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -504,6 +489,11 @@ msgstr "نوع القياس"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -563,12 +553,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 أو عدد من الموردين يمكن ربطهم بالمنتج. كل المعلومات تقف في شكل المنتج"
 
 #. module: product
 #: help:product.packaging,width:0
@@ -576,7 +563,7 @@ msgid "The width of the package"
 msgstr "عرض الحزمة"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -680,6 +667,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "مورِّد"
 
@@ -707,8 +695,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -782,6 +770,11 @@ msgstr "فئات فرعية"
 msgid "End Date"
 msgstr "تاريخ الإنتهاء"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -815,7 +808,6 @@ msgstr "المفتاح"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -823,8 +815,8 @@ msgstr "قائمة الأسعار"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "ساعة"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -837,9 +829,12 @@ msgid "Partner"
 msgstr "شريك"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 أو عدد من الموردين يمكن ربطهم بالمنتج. كل المعلومات تقف في شكل المنتج"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -904,11 +899,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "مجموع وزن الحزمة"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "مجهول"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1079,6 +1069,11 @@ msgstr "سعر الوحدة"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1153,6 +1148,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "يعطي ترتيب التسلسل عند عرض قائمة من فئات المنتجات"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1228,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1282,11 +1282,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "الشركاء"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1300,7 +1295,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1423,17 +1423,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "وحدة"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1543,8 +1536,8 @@ msgid "Pricelist Name"
 msgstr "اسم قائمة الأسعار"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1775,7 +1768,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1811,7 +1804,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "قسم الشريك من شكل المنتج"
@@ -1837,7 +1830,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2149,7 +2147,7 @@ msgid "Normal"
 msgstr "عادي"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2205,12 +2203,6 @@ msgstr ""
 msgid "Variable"
 msgstr "متغير"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2367,7 +2359,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2562,6 +2554,9 @@ msgstr "السعر بعد التخفيض"
 #~ msgid "Private"
 #~ msgstr "خاص"
 
+#~ msgid "Day"
+#~ msgstr "يوم"
+
 #~ msgid "UoM"
 #~ msgstr "وحدة القياس"
 
@@ -2587,6 +2582,9 @@ msgstr "السعر بعد التخفيض"
 #~ msgid "Miscellaneous"
 #~ msgstr "متفرقات"
 
+#~ msgid "Hour"
+#~ msgstr "ساعة"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "مرشحات مفصلة..."
 
@@ -2600,6 +2598,9 @@ msgstr "السعر بعد التخفيض"
 #~ msgid "Error !"
 #~ msgstr "خطأ !"
 
+#~ msgid "Partners"
+#~ msgstr "الشركاء"
+
 #~ msgid "PC"
 #~ msgstr "حاسوب"
 
@@ -3170,9 +3171,15 @@ msgstr "السعر بعد التخفيض"
 #~ msgid "Dello Computer"
 #~ msgstr "كمبيوتر ديلو"
 
+#~ msgid "unknown"
+#~ msgstr "مجهول"
+
 #~ msgid "Product Description"
 #~ msgstr "وصف المنتج"
 
+#~ msgid "Dozen"
+#~ msgstr "دستة"
+
 #~ msgid "Seq"
 #~ msgstr "مسلسل"
 
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 929a7caf05e..956f6b97f2d 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Това е минималното количество за закупуване от Основен доставчик"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Ден"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -192,7 +182,7 @@ msgid "Product Type"
 msgstr "Тип на продукта"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Продукти: "
@@ -280,11 +270,6 @@ msgstr ""
 msgid "Category"
 msgstr "Категория"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -510,6 +495,11 @@ msgstr "Вид мярка"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -569,13 +559,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 или повече доставчици могат да бъдат свързани към продукт. Всичката "
-"информация е в продуктовата форма."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -583,7 +569,7 @@ msgid "The width of the package"
 msgstr "Ширина на пратката"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -688,6 +674,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Доставчик"
 
@@ -715,8 +702,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -790,6 +777,11 @@ msgstr "Подкатегории"
 msgid "End Date"
 msgstr "Крайна дата"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -823,7 +815,6 @@ msgstr "Ключ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -831,8 +822,8 @@ msgstr "Ценова листа"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Час"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -845,9 +836,13 @@ msgid "Partner"
 msgstr "Партньор"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 или повече доставчици могат да бъдат свързани към продукт. Всичката "
+"информация е в продуктовата форма."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -912,11 +907,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Общo тегло на пратката"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1087,6 +1077,11 @@ msgstr "Единична цена"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1162,6 +1157,11 @@ msgid ""
 msgstr ""
 "Показва в последователен ред при показване на списък с продуктови категории."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1238,7 +1238,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1292,11 +1292,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Партньори"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1310,7 +1305,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1431,17 +1431,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Единица"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1551,8 +1544,8 @@ msgid "Pricelist Name"
 msgstr "Име на ценова листа"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1783,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1819,7 +1812,7 @@ msgid "Default Unit of Measure"
 msgstr "Мерни единици по подразбиране"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Секця за партньор в продуктовата форма"
@@ -1845,7 +1838,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2161,7 +2159,7 @@ msgid "Normal"
 msgstr "Нормален"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2215,12 +2213,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Променлива"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2377,7 +2369,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2533,6 +2525,9 @@ msgstr "Отстъпка от цената"
 #~ msgid "Ending date for this pricelist version to be valid."
 #~ msgstr "Крайна дата на валидност на тази версия на ценоразпис."
 
+#~ msgid "Day"
+#~ msgstr "Ден"
+
 #~ msgid "UoM"
 #~ msgstr "Мерни единици"
 
@@ -2591,6 +2586,9 @@ msgstr "Отстъпка от цената"
 #~ msgid "Miscellaneous"
 #~ msgstr "Разни"
 
+#~ msgid "Hour"
+#~ msgstr "Час"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Разширени филтри"
 
@@ -2614,6 +2612,9 @@ msgstr "Отстъпка от цената"
 #~ msgid "Error !"
 #~ msgstr "Грешка !"
 
+#~ msgid "Partners"
+#~ msgstr "Партньори"
+
 #~ msgid "PC"
 #~ msgstr "PC"
 
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 93d91f065de..82b75880c7a 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -107,8 +102,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -119,18 +114,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "Tip proizvoda"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr "Tip mjere"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,10 +556,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -578,7 +566,7 @@ msgid "The width of the package"
 msgstr "Širina paketa"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -680,6 +668,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -707,8 +696,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -782,6 +771,11 @@ msgstr "Podkategorije"
 msgid "End Date"
 msgstr "Datum završetka"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -815,7 +809,6 @@ msgstr "Ključ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -823,7 +816,7 @@ msgstr "Cjenovnik"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -837,8 +830,10 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -904,11 +899,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Ukupna težina paketa"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1079,6 +1069,11 @@ msgstr "Jedinična cijena"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1153,6 +1148,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1228,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1282,11 +1282,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1300,7 +1295,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Informacije o dobavljaču"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1419,17 +1419,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jedinica mjere"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1537,8 +1530,8 @@ msgid "Pricelist Name"
 msgstr "Naziv cjenovnika"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1770,7 +1763,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1806,7 +1799,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1832,7 +1825,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2146,7 +2144,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2198,12 +2196,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Varijabla"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2360,7 +2352,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2654,6 +2646,9 @@ msgstr "Popust"
 #~ msgid "Create new Product"
 #~ msgstr "Kreiraj novi proizvod"
 
+#~ msgid "Partners"
+#~ msgstr "Partneri"
+
 #~ msgid "Processor AMD Athlon XP 1800+"
 #~ msgstr "Procesor AMD Athlon XP 1800+"
 
@@ -2672,9 +2667,6 @@ msgstr "Popust"
 #~ msgid "HDD on demand"
 #~ msgstr "HDD na zahtjev"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Informacije o dobavljaču"
-
 #~ msgid "Miscelleanous"
 #~ msgstr "Razno"
 
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index a8117c8a75b..7f0222a8a56 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Aquesta és la quantitat mínima a comprar al proveïdor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dia"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -193,7 +183,7 @@ msgid "Product Type"
 msgstr "Tipus de producte"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productes: "
@@ -281,11 +271,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -511,6 +496,11 @@ msgstr "Tipo de medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -570,13 +560,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 o diversos proveïdor(s) poden ser relacionats amb un producte. Tota la "
-"informació es troba en el formulari del producte."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -584,7 +570,7 @@ msgid "The width of the package"
 msgstr "L'amplada del paquet"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -689,6 +675,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Proveïdor"
 
@@ -716,8 +703,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -791,6 +778,11 @@ msgstr "Categories filles"
 msgid "End Date"
 msgstr "Data final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -824,7 +816,6 @@ msgstr "Clau"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -832,8 +823,8 @@ msgstr "Tarifa"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -846,9 +837,13 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 o diversos proveïdor(s) poden ser relacionats amb un producte. Tota la "
+"informació es troba en el formulari del producte."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -913,11 +908,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total pes paquet"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1091,6 +1081,11 @@ msgstr "Preu un."
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1167,6 +1162,11 @@ msgstr ""
 "Indica l'ordre de seqüència quan es mostra una llista de categories de "
 "producte."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1243,7 +1243,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1297,11 +1297,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empreses"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1315,7 +1310,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info. proveïdor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1439,17 +1439,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unitat de venda"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1559,8 +1552,8 @@ msgid "Pricelist Name"
 msgstr "Nom tarifa"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1792,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1828,7 +1821,7 @@ msgid "Default Unit of Measure"
 msgstr "Unitat de mesura per defecte"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Secció empresa del formulario de producte"
@@ -1854,7 +1847,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2170,7 +2168,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2224,12 +2222,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2386,7 +2378,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2666,6 +2658,9 @@ msgstr "Descompte preu"
 #~ "(normalment al finalitzar l'any), Preu mitjà: El preu de cost es recalcula "
 #~ "en cada recepció de productes."
 
+#~ msgid "Partners"
+#~ msgstr "Empreses"
+
 #~ msgid "Create new Product"
 #~ msgstr "Crea nou producte"
 
@@ -2684,9 +2679,6 @@ msgstr "Descompte preu"
 #~ msgid "Factor"
 #~ msgstr "Factor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info. proveïdor"
-
 #~ msgid "UOM"
 #~ msgstr "UdM"
 
@@ -3105,6 +3097,9 @@ msgstr "Descompte preu"
 #~ "Error: La UdM per defecte i la UdM del proveïdor del producte han d'estar en "
 #~ "la mateixa categoria."
 
+#~ msgid "Day"
+#~ msgstr "Dia"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -3221,6 +3216,9 @@ msgstr "Descompte preu"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projecte disseny de cuina"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Varis"
 
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 09ef2207952..d9832217afa 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: product
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Nejmenší množství k objednání od Hlavního dodavatele"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Den"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -188,7 +178,7 @@ msgid "Product Type"
 msgstr "Typ výrobku"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Výrobky: "
@@ -276,11 +266,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorie"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -505,6 +490,11 @@ msgstr "Měrný typ"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -564,13 +554,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 nebo několik dodavatel(ů) může být navázáno na výrobek. Všechny informace "
-"zůstávají ve formuláři výrobku."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -578,7 +564,7 @@ msgid "The width of the package"
 msgstr "Šířka balíku"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -682,6 +668,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dodavatel"
 
@@ -709,8 +696,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -784,6 +771,11 @@ msgstr "Podřízené kategorie"
 msgid "End Date"
 msgstr "Koncové datum"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -817,7 +809,6 @@ msgstr "Klíč"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -825,8 +816,8 @@ msgstr "Ceník"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hodina"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -839,9 +830,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 nebo několik dodavatel(ů) může být navázáno na výrobek. Všechny informace "
+"zůstávají ve formuláři výrobku."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -906,11 +901,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Celková hmotnost balíku"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1081,6 +1071,11 @@ msgstr "Cena za kus"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1155,6 +1150,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1230,7 +1230,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1284,11 +1284,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneři"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1302,7 +1297,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1421,17 +1421,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jednotka"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1539,8 +1532,8 @@ msgid "Pricelist Name"
 msgstr "Název ceníku"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1771,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1807,7 +1800,7 @@ msgid "Default Unit of Measure"
 msgstr "Výchozí Měrná jednotka"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sekce partnera ve formuláři výrobku"
@@ -1833,7 +1826,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2149,7 +2147,7 @@ msgid "Normal"
 msgstr "Normální"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2203,12 +2201,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Proměnné"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2365,7 +2357,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2503,6 +2495,9 @@ msgstr "Sleva"
 #~ msgid "Configuration"
 #~ msgstr "Konfigurace"
 
+#~ msgid "Partners"
+#~ msgstr "Partneři"
+
 #~ msgid "In Production"
 #~ msgstr "V produkci"
 
@@ -2537,6 +2532,9 @@ msgstr "Sleva"
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Základní deska ASUStek A7V8X-X"
 
+#~ msgid "Day"
+#~ msgstr "Den"
+
 #~ msgid "UoM"
 #~ msgstr "MJ"
 
@@ -2683,6 +2681,9 @@ msgstr "Sleva"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projekt návrhu kuchyně"
 
+#~ msgid "Hour"
+#~ msgstr "Hodina"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Regál 200cm"
 
diff --git a/addons/product/i18n/da.po b/addons/product/i18n/da.po
index 9389a93c38f..eeee248100e 100644
--- a/addons/product/i18n/da.po
+++ b/addons/product/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -188,7 +178,7 @@ msgid "Product Type"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -276,11 +266,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -505,6 +490,11 @@ msgstr ""
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -564,10 +554,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -576,7 +564,7 @@ msgid "The width of the package"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -678,6 +666,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -705,8 +694,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -780,6 +769,11 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -813,7 +807,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -821,7 +814,7 @@ msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -835,8 +828,10 @@ msgid "Partner"
 msgstr ""
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -902,11 +897,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr ""
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1077,6 +1067,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1151,6 +1146,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1226,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1280,11 +1280,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr ""
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1298,7 +1293,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1417,17 +1417,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr ""
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1535,8 +1528,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1767,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1803,7 +1796,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1829,7 +1822,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2141,7 +2139,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2193,12 +2191,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2355,7 +2347,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 4a34d281cdc..9a81515889e 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-16 18:38+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 15:24+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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: 2012-12-17 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +33,6 @@ msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 "Dieses ist die minimale Menge die beim Lieferanten eingekauft werden kann."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Tag"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -115,8 +111,8 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
@@ -127,7 +123,7 @@ msgid "Small-sized image"
 msgstr "Kleines Bild"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -136,11 +132,6 @@ msgstr ""
 "Konvertierung von Produkt Mengeninheit %s zu Standard Mengeneinheit %s ist "
 "nicht möglich, das diese zu verschiedenen Kategorien gehören."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dutzend"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -201,7 +192,7 @@ msgid "Product Type"
 msgstr "Produktart"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produkte: "
@@ -303,11 +294,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorie"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Liter"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -555,6 +541,11 @@ msgstr "Mengeneinheit Typ"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -624,13 +615,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Einer oder auch mehrere Lieferantenpartner können zu einem Produkt verlinkt "
-"werden. Alle Informationen hierzu finden Sie auf dem Produkte Formular."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -638,7 +625,7 @@ msgid "The width of the package"
 msgstr "Die Breite der Verpackung"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "Zuordnungsfehler Mengeneinheit Kategorien!"
@@ -743,6 +730,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Lieferant"
 
@@ -774,9 +762,9 @@ msgid "If checked new messages require your attention."
 msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr ""
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "EAN13 Barcode"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -851,6 +839,11 @@ msgstr "Unterkategorien"
 msgid "End Date"
 msgstr "Endedatum"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -884,7 +877,6 @@ msgstr "Schlüssel"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -892,8 +884,8 @@ msgstr "Preisliste"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Stunde"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -906,9 +898,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Einer oder auch mehrere Lieferantenpartner können zu einem Produkt verlinkt "
+"werden. Alle Informationen hierzu finden Sie auf dem Produkte Formular."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -973,11 +969,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Gesamtes Verpackungsgewicht"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "Unbekannt"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1177,6 +1168,11 @@ msgstr "Preis/ME"
 msgid "Right Parent"
 msgstr "Rechter Stamm"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1251,6 +1247,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Reihenfolge bei Anzeige einer Liste für Produktkategorien"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1334,7 +1335,7 @@ msgstr ""
 "            "
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1397,11 +1398,6 @@ msgstr ""
 "In diesem Feld finden Sie das Bild für das Produkt in Form einer Datei, "
 "limitiert auf die Größe 1024x1024px"
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partner"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1417,7 +1413,12 @@ msgid "Inventory"
 msgstr "Bestand"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Lieferanteninfo"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1545,17 +1546,10 @@ msgstr "Mittelgroßes Bild"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Einheit"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "Neues Produkt wurde soeben <b>erstellt</b>"
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1678,9 +1672,9 @@ msgid "Pricelist Name"
 msgstr "Preisliste Bezeichnung"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr ""
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1849,7 +1843,7 @@ msgstr "Varianten"
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr "Produkte nach Kategorien"
+msgstr "Kategorien"
 
 #. module: product
 #: model:product.template,name:product.product_product_16_product_template
@@ -1937,7 +1931,7 @@ msgstr ""
 "anderen Einheit als die Abrechnungseinheit erfolgen soll."
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1975,7 +1969,7 @@ msgid "Default Unit of Measure"
 msgstr "Standard Mengeneinheit"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partner Sektion im Produktformular"
@@ -1999,10 +1993,15 @@ msgstr ""
 #. module: product
 #: field:product.product,message_ids:0
 msgid "Messages"
+msgstr "Nachrichten"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2099,6 +2098,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie zur Erstellung eines neuen Produkts.\n"
+"              </p><p>\n"
+"               Sie benötigen Produkte immer, wenn Sie diese im Einkauf  "
+"bestellen möchten,\n"
+"                sei es ein Lagerprodukt, eine Verbrauchsware oder eine "
+"Dienstleistung, die\n"
+"                Sie von extern zukaufen.\n"
+"              </p><p>\n"
+"                Das Produkte Formular beinhaltet ausführliche Informationen, "
+"die Sie bei der\n"
+"                Beschaffung benötigen: Preise, Lagerorte, Finanzkonten, "
+"verfügbare\n"
+"                Lieferanten etc.\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_44_product_template
@@ -2125,12 +2140,12 @@ msgstr ""
 #. module: product
 #: field:product.product,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Follower"
 
 #. module: product
 #: view:product.product:0
 msgid "Sale Conditions"
-msgstr ""
+msgstr "Verkaufskonditionen"
 
 #. module: product
 #: view:product.packaging:0
@@ -2188,6 +2203,8 @@ msgid ""
 "Specify the fixed amount to add or substract(if negative) to the amount "
 "calculated with the discount."
 msgstr ""
+"Hinterlegen Sie den festen Betrag, den Sie zum errechneten reduzierten "
+"Betrag addieren /subtrahieren (wenn negativer Wert) möchten."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -2209,6 +2226,8 @@ msgid ""
 "Consumable: Will not imply stock management for this product. \n"
 "Stockable product: Will imply stock management for this product."
 msgstr ""
+"Verbrauchsware: Es ist keine Bestandsführung erforderlich.\n"
+"Lagerprodukt: Bestandsführung ist zwingend."
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -2230,6 +2249,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie zur Erstellung eines neuen Produkts.\n"
+"              </p><p>\n"
+"                Sie müssen definieren, ob Sie das Produkt im Einkauf "
+"und/oder Verkauf\n"
+"                 benötigen, bzw. ob es sich um eine Dienstleistung, "
+"Verbrauchsware oder \n"
+"                 ein Lagerprodukt handelt.\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: view:product.product:0
@@ -2322,7 +2351,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2393,12 +2422,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabel"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2569,7 +2592,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2699,6 +2722,9 @@ msgid ""
 "128x128px image, with aspect ratio preserved, only when the image exceeds "
 "one of those sizes. Use this field in form views or some kanban views."
 msgstr ""
+"Bild des Produkts in mittlerer Größe. Es wird automatisch auf 128x128px "
+"verkleinert, ohne Änderungen des Seitenverhältnis. Verwenden Sie dieses Feld "
+"in Formular oder Kanban Ansichten."
 
 #. module: product
 #: view:product.uom:0
@@ -2805,6 +2831,9 @@ msgstr "Rabatt"
 #~ msgid "Mouse"
 #~ msgstr "Mouse"
 
+#~ msgid "Partners"
+#~ msgstr "Partner"
+
 #~ msgid "Create new Product"
 #~ msgstr "Erzeuge neues Produkt"
 
@@ -2823,9 +2852,6 @@ msgstr "Rabatt"
 #~ msgid "Factor"
 #~ msgstr "Faktor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Lieferanteninfo"
-
 #~ msgid "PCE"
 #~ msgstr "Stück"
 
@@ -3178,6 +3204,9 @@ msgstr "Rabatt"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
+#~ msgid "Day"
+#~ msgstr "Tag"
+
 #~ msgid "UoM"
 #~ msgstr "ME"
 
@@ -3259,6 +3288,9 @@ msgstr "Rabatt"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projekt Küchendesign"
 
+#~ msgid "Hour"
+#~ msgstr "Stunde"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Shelf of 200cm"
 
@@ -3826,6 +3858,12 @@ msgstr "Rabatt"
 #~ msgid "Product UoS View"
 #~ msgstr "Produkt Verkaufseinheit Ansicht"
 
+#~ msgid "Dozen"
+#~ msgstr "Dutzend"
+
+#~ msgid "unknown"
+#~ msgstr "Unbekannt"
+
 #~ msgid "Cabinet"
 #~ msgstr "Schrank"
 
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index f92bedc4bc8..1d132863249 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -34,11 +34,6 @@ msgstr ""
 "Αυτή είναι η ελάχιστη ποσότητα που επιτρέπεται να αγοραστεί από τον Κύριο "
 "Προμηθευτή."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Ημέρα"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -112,8 +107,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -124,18 +119,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -196,7 +186,7 @@ msgid "Product Type"
 msgstr "Τύπος Προϊόντος"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Προϊόντα: "
@@ -284,11 +274,6 @@ msgstr ""
 msgid "Category"
 msgstr "Κατηγορία"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -513,6 +498,11 @@ msgstr "Τύπος Μέτρησης"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -572,13 +562,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Ένας ή περισσότεροι προμηθευτές μπορούν να συνδεθούν με το προϊόν. Όλες οι "
-"πληροφορίες εμφανίζονται στην φόρμα προϊόντος."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -586,7 +572,7 @@ msgid "The width of the package"
 msgstr "Το πλάτος της συσκευασίας"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -691,6 +677,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Προμηθευτής"
 
@@ -718,8 +705,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -793,6 +780,11 @@ msgstr "Υποκατηγορίες"
 msgid "End Date"
 msgstr "Ημερομηνία Λήξης"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -826,7 +818,6 @@ msgstr "Κλειδί"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -834,8 +825,8 @@ msgstr "Τιμοκατάλογος"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Ώρα"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -848,9 +839,13 @@ msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Ένας ή περισσότεροι προμηθευτές μπορούν να συνδεθούν με το προϊόν. Όλες οι "
+"πληροφορίες εμφανίζονται στην φόρμα προϊόντος."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -915,11 +910,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Συνολικό βάρος δέματος"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1091,6 +1081,11 @@ msgstr "Τιμή Μονάδας"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1165,6 +1160,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1241,7 +1241,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1295,11 +1295,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Συνεργάτες"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1313,7 +1308,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Πληροφορίες Προμηθευτή"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1432,17 +1432,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Μονάδα"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1552,8 +1545,8 @@ msgid "Pricelist Name"
 msgstr "Ονομασία Τιμοκαταλόγου"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1787,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1823,7 +1816,7 @@ msgid "Default Unit of Measure"
 msgstr "Προεπιλεγμένη Μονάδα Μέτρησης"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Τομέας συνεργάτη στην φόρμα προϊόντος"
@@ -1849,7 +1842,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2163,7 +2161,7 @@ msgid "Normal"
 msgstr "Κανονικό"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2217,12 +2215,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Μεταβλητή"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2379,7 +2371,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2630,6 +2622,9 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Create new Product"
 #~ msgstr "Δημιουργία Νέου Προϊόντος"
 
+#~ msgid "Partners"
+#~ msgstr "Συνεργάτες"
+
 #~ msgid "Mouse"
 #~ msgstr "Ποντίκι"
 
@@ -2828,9 +2823,6 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Warranty (months)"
 #~ msgstr "Εγγύηση (μήνες)"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Πληροφορίες Προμηθευτή"
-
 #~ msgid "Price type"
 #~ msgstr "Τύποι Τιμών"
 
@@ -3087,6 +3079,9 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Supply method"
 #~ msgstr "Μέθοδος απόκτησης"
 
+#~ msgid "Day"
+#~ msgstr "Ημέρα"
+
 #~ msgid "Wood 2mm"
 #~ msgstr "Ξύλο 2χιλ"
 
@@ -3117,6 +3112,9 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Ratio & Precision"
 #~ msgstr "Αναλογία & Ακρίβεια"
 
+#~ msgid "Hour"
+#~ msgstr "Ώρα"
+
 #~ msgid "Calculate Product Price per unit base on pricelist version."
 #~ msgstr "Υπολογισμός Τιμής Προϊόντος ανά μονάδα βάση έκδοσης τιμοκαταλόγου"
 
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 2857dc1be71..2143096e1c2 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-19 18:11+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:47+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-20 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
@@ -31,11 +31,6 @@ msgstr "Precio base para el cálculo."
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Esta es la mínima cantidad a comprar al proveedor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Día"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -113,8 +108,8 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -125,7 +120,7 @@ msgid "Small-sized image"
 msgstr "Imagen pequeña"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -134,11 +129,6 @@ msgstr ""
 "¡La conversión de la UdM %s del producto a UdM por defecto %s no es posible "
 "debido a que no pertenecen a la misma categoría!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Docena"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -199,7 +189,7 @@ msgid "Product Type"
 msgstr "Tipo de producto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -302,11 +292,6 @@ msgstr "Si no está marcado, permitirá ocultar el producto sin eliminarlo."
 msgid "Category"
 msgstr "Categoría"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Litro"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -555,6 +540,11 @@ msgstr "Tipo de medida"
 msgid "Headset standard"
 msgstr "Auriculares estándar"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr "Día(s)"
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -627,13 +617,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr "PC ensamblado y personalizado (PC bajo demanda)"
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
-msgstr ""
-"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
-"información se encuentra en el formulario del producto."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr "Portátil personalizado basado en los requisitos del cliente."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -641,7 +627,7 @@ msgid "The width of the package"
 msgstr "La anchura del paquete."
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "¡Categorías de las unidades de medida no coincidentes!"
@@ -748,6 +734,7 @@ msgstr "HDD SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -778,9 +765,9 @@ msgid "If checked new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "Se puede vender"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "Código EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -855,6 +842,11 @@ msgstr "Categorías hijas"
 msgid "End Date"
 msgstr "Fecha final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr "Litro(s)"
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -888,7 +880,6 @@ msgstr "Clave"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -896,8 +887,8 @@ msgstr "Tarifa"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr "Hora(s)"
 
 #. module: product
 #: selection:product.template,state:0
@@ -910,9 +901,13 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
-msgstr "Portátil personalizado basado en los requisitos del cliente."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -980,11 +975,6 @@ msgstr "Placa base I9P57"
 msgid "Total Package Weight"
 msgstr "Total peso paquete"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "desconocido"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1181,6 +1171,11 @@ msgstr "Precio unidad"
 msgid "Right Parent"
 msgstr "Padre derecho"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr "Precio"
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1257,6 +1252,11 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de categorías de "
 "producto."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr "Docena(s)"
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1341,7 +1341,7 @@ msgstr ""
 "            "
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1403,11 +1403,6 @@ msgstr ""
 "Este campo contiene la imagen usada para el producto, limitada a 1024x1024 "
 "px."
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empresas"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1424,7 +1419,12 @@ msgid "Inventory"
 msgstr "Inventario"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info. proveedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -1550,17 +1550,10 @@ msgstr "Imagen mediana"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidad"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "El producto ha sido <b>creado</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1682,9 +1675,9 @@ msgid "Pricelist Name"
 msgstr "Nombre tarifa"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "Código EAN13"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "Se puede vender"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1933,7 +1926,7 @@ msgstr ""
 "unidad de medida por defecto."
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1970,7 +1963,7 @@ msgid "Default Unit of Measure"
 msgstr "Unidad de medida por defecto"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -1997,7 +1990,12 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr "Unidad(es)"
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -2357,7 +2355,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2425,12 +2423,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2603,7 +2595,7 @@ msgid "15” LCD Monitor"
 msgstr "Monitor LCD 15\""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2884,6 +2876,9 @@ msgstr "Descuento precio"
 #~ "(normalmente al finalizar el año), Precio medio: El precio de coste se "
 #~ "recalcula en cada recepción de productos."
 
+#~ msgid "Partners"
+#~ msgstr "Empresas"
+
 #~ msgid "Create new Product"
 #~ msgstr "Crear nuevo producto"
 
@@ -2902,9 +2897,6 @@ msgstr "Descuento precio"
 #~ msgid "Factor"
 #~ msgstr "Factor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info. proveedor"
-
 #~ msgid "UOM"
 #~ msgstr "UdM"
 
@@ -3329,6 +3321,9 @@ msgstr "Descuento precio"
 #~ msgid "Starting date for this pricelist version to be valid."
 #~ msgstr "Fecha inicial de validez para esta versión de tarifa."
 
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "Worker"
 #~ msgstr "Trabajador"
 
@@ -3375,6 +3370,9 @@ msgstr "Descuento precio"
 #~ msgid "g"
 #~ msgstr "g"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "To Sell"
 #~ msgstr "A vender"
 
@@ -3796,6 +3794,9 @@ msgstr "Descuento precio"
 #~ msgstr ""
 #~ "Calcular los precios del producto según unidades para una versión de tarifa."
 
+#~ msgid "Dozen"
+#~ msgstr "Docena"
+
 #~ msgid "Product UoS View"
 #~ msgstr "Vista UdV producto"
 
@@ -3803,6 +3804,9 @@ msgstr "Descuento precio"
 #~ msgid "Cannot change the category of existing UoM '%s'."
 #~ msgstr "No puede cambiar la categoría de la UdM existente '%s'"
 
+#~ msgid "unknown"
+#~ msgstr "desconocido"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Mesa de madera"
 
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 290446b8cb1..a37641b3ea3 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-20 19:46+0000\n"
 "Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\n"
 "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -192,7 +182,7 @@ msgid "Product Type"
 msgstr "Tipo de producto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -280,11 +270,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -509,6 +494,11 @@ msgstr "Tipo de medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -568,10 +558,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -580,7 +568,7 @@ msgid "The width of the package"
 msgstr "Ancho del paquete"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -685,6 +673,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -712,8 +701,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -787,6 +776,11 @@ msgstr "Categorías hijas"
 msgid "End Date"
 msgstr "Fecha final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -820,7 +814,6 @@ msgstr "Código"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -828,7 +821,7 @@ msgstr "Lista de precios"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -842,8 +835,10 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -909,11 +904,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total peso paquete"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1084,6 +1074,11 @@ msgstr "Precio Unitario"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1158,6 +1153,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1233,7 +1233,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1287,11 +1287,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empresas"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1305,7 +1300,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info. proveedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1424,17 +1424,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidad"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1542,8 +1535,8 @@ msgid "Pricelist Name"
 msgstr "Nombre lista de precios"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1776,7 +1769,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1812,7 +1805,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -1838,7 +1831,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2152,7 +2150,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2204,12 +2202,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2366,7 +2358,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2603,6 +2595,9 @@ msgstr "Descuento precio"
 #~ msgid "Create new Product"
 #~ msgstr "Crear nuevo producto"
 
+#~ msgid "Partners"
+#~ msgstr "Empresas"
+
 #~ msgid "Mouse"
 #~ msgstr "Ratón"
 
@@ -2835,9 +2830,6 @@ msgstr "Descuento precio"
 #~ msgid "Price type"
 #~ msgstr "Tipo de precio"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info. proveedor"
-
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "Proveedores del producto, con su nombre de producto, precio, etc."
 
diff --git a/addons/product/i18n/es_CL.po b/addons/product/i18n/es_CL.po
index 811c9800fc6..cae84d4f7d3 100644
--- a/addons/product/i18n/es_CL.po
+++ b/addons/product/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-14 04:37+0000\n"
 "Last-Translator: Carlos-smile <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Esta es la mínima cantidad a comprar al proveedor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Día"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -193,7 +183,7 @@ msgid "Product Type"
 msgstr "Tipo de producto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -281,11 +271,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -510,6 +495,11 @@ msgstr "Tipo de medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -569,13 +559,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
-"información se encuentra en el formulario del producto."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -583,7 +569,7 @@ msgid "The width of the package"
 msgstr "La anchura del paquete"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -688,6 +674,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -715,8 +702,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -790,6 +777,11 @@ msgstr "Categorías hijas"
 msgid "End Date"
 msgstr "Fecha final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -823,7 +815,6 @@ msgstr "Clave"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -831,8 +822,8 @@ msgstr "Tarifa"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -845,9 +836,13 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -912,11 +907,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total peso paquete"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1090,6 +1080,11 @@ msgstr "Precio unidad"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1166,6 +1161,11 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de categorías de "
 "producto."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1243,7 +1243,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1297,11 +1297,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empresas"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1315,7 +1310,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info. proveedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1439,17 +1439,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidad"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1559,8 +1552,8 @@ msgid "Pricelist Name"
 msgstr "Nombre tarifa"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1792,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1828,7 +1821,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -1855,7 +1848,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2172,7 +2170,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2226,12 +2224,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2388,7 +2380,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2546,6 +2538,9 @@ msgstr "Descuento precio"
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Placa madre ASUStek A7V8X-X"
 
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -2771,6 +2766,9 @@ msgstr "Descuento precio"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Proyecto diseño cocina"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Estante de 200cm"
 
@@ -2896,6 +2894,9 @@ msgstr "Descuento precio"
 #~ msgid " (copy)"
 #~ msgstr " (copia)"
 
+#~ msgid "Partners"
+#~ msgstr "Empresas"
+
 #~ msgid ""
 #~ "This is the average delay in days between the confirmation of the customer "
 #~ "order and the delivery of the finished products. It's the time you promise "
@@ -3273,9 +3274,6 @@ msgstr "Descuento precio"
 #~ msgid "Factor"
 #~ msgstr "Factor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info. proveedor"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Nombre producto proveedor"
 
diff --git a/addons/product/i18n/es_CR.po b/addons/product/i18n/es_CR.po
index 23dcbf942da..cf9ba392b76 100644
--- a/addons/product/i18n/es_CR.po
+++ b/addons/product/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:19+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: product
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Esta es la mínima cantidad a comprar al proveedor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Día"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,7 +117,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -131,11 +126,6 @@ msgstr ""
 "¡La conversión de la UdM %s del producto a UdM por defecto %s no es posible "
 "debido a que no pertenecen a la misma categoría!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Docena"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -196,7 +186,7 @@ msgid "Product Type"
 msgstr "Tipo de producto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -284,11 +274,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -513,6 +498,11 @@ msgstr "Tipo de medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -572,13 +562,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
-"información se encuentra en el formulario del producto."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -586,7 +572,7 @@ msgid "The width of the package"
 msgstr "La anchura del paquete."
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -691,6 +677,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -718,8 +705,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -793,6 +780,11 @@ msgstr "Categorías hijas"
 msgid "End Date"
 msgstr "Fecha final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -826,7 +818,6 @@ msgstr "Clave"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -834,8 +825,8 @@ msgstr "Tarifa"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -848,9 +839,13 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -915,11 +910,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total peso paquete"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "Desconocido"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1093,6 +1083,11 @@ msgstr "Precio unidad"
 msgid "Right Parent"
 msgstr "Padre derecho"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1169,6 +1164,11 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de categorías de "
 "producto."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1246,7 +1246,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1300,11 +1300,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empresas"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1318,7 +1313,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info. proveedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1442,17 +1442,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidad"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1562,8 +1555,8 @@ msgid "Pricelist Name"
 msgstr "Nombre tarifa"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1795,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1831,7 +1824,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -1858,7 +1851,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2175,7 +2173,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2231,12 +2229,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2393,7 +2385,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2551,6 +2543,9 @@ msgstr "Descuento precio"
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Placa madre ASUStek A7V8X-X"
 
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -2754,6 +2749,9 @@ msgstr "Descuento precio"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Proyecto diseño cocina"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Estante de 200cm"
 
@@ -2880,6 +2878,9 @@ msgstr "Descuento precio"
 #~ msgid " (copy)"
 #~ msgstr " (copia)"
 
+#~ msgid "Partners"
+#~ msgstr "Empresas"
+
 #~ msgid ""
 #~ "This is the average delay in days between the confirmation of the customer "
 #~ "order and the delivery of the finished products. It's the time you promise "
@@ -3225,9 +3226,6 @@ msgstr "Descuento precio"
 #~ msgid "Factor"
 #~ msgstr "Factor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info. proveedor"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Nombre producto proveedor"
 
@@ -3572,6 +3570,9 @@ msgstr "Descuento precio"
 #~ "    Imprimir etiquetas de productos con códigos de barras.\n"
 #~ "    "
 
+#~ msgid "Dozen"
+#~ msgstr "Docena"
+
 #, python-format
 #~ msgid ""
 #~ "New UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'. If "
@@ -3645,6 +3646,9 @@ msgstr "Descuento precio"
 #~ "Cree un producto para todo lo que compre o venda. Especifique un proveedor "
 #~ "si el producto puede ser comprado."
 
+#~ msgid "unknown"
+#~ msgstr "Desconocido"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Mesa de madera"
 
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index 763b253b01b..04cbd9ab5b7 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-19 00:49+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Es la minima cantidad a comprar al proveedor principal"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Día"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,7 +116,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -130,11 +125,6 @@ msgstr ""
 "¡La conversión de la UdM %s del producto a UdM por defecto %s no es posible "
 "debido a que no pertenecen a la misma categoría!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Docena"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -195,7 +185,7 @@ msgid "Product Type"
 msgstr "Tipo de producto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -283,11 +273,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -513,6 +498,11 @@ msgstr "Tipo de medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -572,13 +562,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
-"información se encuentra en el formulario del producto."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -586,7 +572,7 @@ msgid "The width of the package"
 msgstr "La anchura del paquete"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -691,6 +677,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -718,8 +705,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -793,6 +780,11 @@ msgstr "Categorías hijas"
 msgid "End Date"
 msgstr "Fecha final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -826,7 +818,6 @@ msgstr "Código"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -834,8 +825,8 @@ msgstr "Precio"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -848,9 +839,13 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -915,11 +910,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total peso paquete"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "Desconocido"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1093,6 +1083,11 @@ msgstr "Precio Unitario"
 msgid "Right Parent"
 msgstr "Padre derecho"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1169,6 +1164,11 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de categorías de "
 "producto."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1246,7 +1246,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1300,11 +1300,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empresas"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1318,7 +1313,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info. proveedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1442,17 +1442,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidad"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1562,8 +1555,8 @@ msgid "Pricelist Name"
 msgstr "Nombre tarifa"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1796,7 +1789,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1832,7 +1825,7 @@ msgid "Default Unit of Measure"
 msgstr "Unidad de medida por defecto"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -1859,7 +1852,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2176,7 +2174,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2232,12 +2230,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2394,7 +2386,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2691,6 +2683,9 @@ msgstr "Descuento precio"
 #~ "(normalmente al finalizar el año), Precio medio: El precio de coste se "
 #~ "recalcula en cada recepción de productos."
 
+#~ msgid "Partners"
+#~ msgstr "Empresas"
+
 #~ msgid "Create new Product"
 #~ msgstr "Crear nuevo producto"
 
@@ -2709,9 +2704,6 @@ msgstr "Descuento precio"
 #~ msgid "Factor"
 #~ msgstr "Factor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info. proveedor"
-
 #~ msgid "UOM"
 #~ msgstr "UOM"
 
@@ -3112,6 +3104,9 @@ msgstr "Descuento precio"
 #~ "Error: La UdM actual y la UdM del Producto del Proveedor deben estar en la "
 #~ "misma categoría"
 
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -3217,6 +3212,9 @@ msgstr "Descuento precio"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Proyecto diseño cocina"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Ratio & Precision"
 #~ msgstr "Ratio y precisión"
 
@@ -3564,6 +3562,9 @@ msgstr "Descuento precio"
 #~ msgid "Shelves"
 #~ msgstr "Contenedor"
 
+#~ msgid "Dozen"
+#~ msgstr "Docena"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Servicio en hoja de Trabajo"
 
@@ -3581,6 +3582,9 @@ msgstr "Descuento precio"
 #~ "Cree un producto para todo lo que compre o venda. Especifique un proveedor "
 #~ "si el producto puede ser comprado."
 
+#~ msgid "unknown"
+#~ msgstr "Desconocido"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Mesa de madera"
 
diff --git a/addons/product/i18n/es_PY.po b/addons/product/i18n/es_PY.po
index 768c4d2c30e..6bcfe662fdd 100644
--- a/addons/product/i18n/es_PY.po
+++ b/addons/product/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-05 00:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Esta es la mínima cantidad a comprar al proveedor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Día"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,18 +117,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -194,7 +184,7 @@ msgid "Product Type"
 msgstr "Tipo de Producto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -282,11 +272,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -511,6 +496,11 @@ msgstr "Tipo de Medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -570,13 +560,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
-"información se encuentra en el formulario del producto."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -584,7 +570,7 @@ msgid "The width of the package"
 msgstr "Ancho del paquete"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -689,6 +675,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Proveedor"
 
@@ -716,8 +703,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -791,6 +778,11 @@ msgstr "Categorías hijas"
 msgid "End Date"
 msgstr "Fecha de término"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -824,7 +816,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -832,8 +823,8 @@ msgstr "Lista de precios"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -846,9 +837,13 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -913,11 +908,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Peso total del paquete"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1091,6 +1081,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1167,6 +1162,11 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de categorías de "
 "producto."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1244,7 +1244,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1298,11 +1298,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Empresas"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1316,7 +1311,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1440,17 +1440,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidad"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1558,8 +1551,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1790,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1826,7 +1819,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1852,7 +1845,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2164,7 +2162,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2216,12 +2214,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2378,7 +2370,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2510,6 +2502,9 @@ msgstr ""
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "Sellable"
 #~ msgstr "Vendible"
 
@@ -2664,6 +2659,9 @@ msgstr ""
 #~ "Este precio se considerará como el precio para la UdM del proveedor si "
 #~ "existe o en la UdM por defecto del producto en caso contrario."
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Rules Test Match"
 #~ msgstr "Prueba de concordancia de reglas"
 
@@ -2838,6 +2836,9 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "¡ Error !"
 
+#~ msgid "Partners"
+#~ msgstr "Empresas"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " (copiar)"
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index f66d82df097..cd0ba3ed4a0 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 17:10+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #, python-format
@@ -35,11 +35,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -111,8 +106,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -123,18 +118,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -194,7 +184,7 @@ msgid "Product Type"
 msgstr "Toote tüüp"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Tooted: "
@@ -282,11 +272,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategooria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -511,6 +496,11 @@ msgstr "Mõõdu tüüp"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -570,10 +560,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -582,7 +570,7 @@ msgid "The width of the package"
 msgstr "Paki laius"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -687,6 +675,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -714,9 +703,9 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr ""
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "EAN13 triipkood"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -789,6 +778,11 @@ msgstr "Alamkategooriad"
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -822,7 +816,6 @@ msgstr "Võti"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -830,7 +823,7 @@ msgstr "Hinnakiri"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -844,8 +837,10 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -911,11 +906,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Pakendi kogukaal"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1086,6 +1076,11 @@ msgstr "Ühiku hind"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1160,6 +1155,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1235,7 +1235,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1289,11 +1289,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partnerid"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1307,7 +1302,12 @@ msgid "Inventory"
 msgstr "Laoseis"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Tarnija info"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1426,17 +1426,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Ühik"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "Toode on <b>loodud</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1544,9 +1537,9 @@ msgid "Pricelist Name"
 msgstr "Hinnakirja nimi"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "EAN13 triipkood"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr ""
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1776,7 +1769,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1812,7 +1805,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partneri sektsioon toote vormil"
@@ -1838,7 +1831,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2152,7 +2150,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2204,12 +2202,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Muutuja"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2366,7 +2358,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2731,6 +2723,9 @@ msgstr "Allahindlus"
 #~ msgid "Mouse"
 #~ msgstr "Hiir"
 
+#~ msgid "Partners"
+#~ msgstr "Partnerid"
+
 #~ msgid "Create new Product"
 #~ msgstr "Loo uus toode"
 
@@ -2749,9 +2744,6 @@ msgstr "Allahindlus"
 #~ msgid "Factor"
 #~ msgstr "Faktor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Tarnija info"
-
 #~ msgid "UOM"
 #~ msgstr "Mõõtühik"
 
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 4cc32c515b3..fce83d52d46 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -188,7 +178,7 @@ msgid "Product Type"
 msgstr "Produktu Mota"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -276,11 +266,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -505,6 +490,11 @@ msgstr "Neurketa Mota"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -564,10 +554,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -576,7 +564,7 @@ msgid "The width of the package"
 msgstr "Paketearen zabalera"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -678,6 +666,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -705,8 +694,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -780,6 +769,11 @@ msgstr ""
 msgid "End Date"
 msgstr "Amaiera Data"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -813,7 +807,6 @@ msgstr "Gakoa"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -821,7 +814,7 @@ msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -835,8 +828,10 @@ msgid "Partner"
 msgstr "Kidea"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -902,11 +897,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Paketearen Guztirako Pisua"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1077,6 +1067,11 @@ msgstr "Unitateko prezioa"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1151,6 +1146,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1226,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1280,11 +1280,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Kideak"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1298,7 +1293,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1417,17 +1417,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unitatea"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1535,8 +1528,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1767,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1803,7 +1796,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1829,7 +1822,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2141,7 +2139,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2193,12 +2191,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2355,7 +2347,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2532,6 +2524,9 @@ msgstr ""
 #~ msgid "Create new Product"
 #~ msgstr "Produktu berria sortu"
 
+#~ msgid "Partners"
+#~ msgstr "Kideak"
+
 #~ msgid "Processor AMD Athlon XP 1800+"
 #~ msgstr "AMD Athlon XP 1800+ Prozesadorea"
 
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 7376f852c5a..20a43ae304e 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Päätoimittajan minimihankintamäärä"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Päivä"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,7 +117,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -131,11 +126,6 @@ msgstr ""
 "Konversio tuotteen mittayksikösä %s oletusmittayksikköön %s ei ole "
 "mahdollista koska ne kuuluvat eri kategorioihin."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Tusina"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -195,7 +185,7 @@ msgid "Product Type"
 msgstr "Tuotteen tyyppi"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Tuotteet: "
@@ -283,11 +273,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -512,6 +497,11 @@ msgstr "Mittatyyppi"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -571,13 +561,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 tai useampia toimittajia voidaan liittää tuotteeseen. Kaikki tiedot "
-"näkyvät tuotelomakkeella."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -585,7 +571,7 @@ msgid "The width of the package"
 msgstr "Pakkauksen leveys"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -690,6 +676,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Toimittaja"
 
@@ -717,8 +704,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -792,6 +779,11 @@ msgstr "Alakategoriat"
 msgid "End Date"
 msgstr "Lopetuspäivämäärä"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -825,7 +817,6 @@ msgstr "Avain"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -833,8 +824,8 @@ msgstr "Hinnasto"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Tunti"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -847,9 +838,13 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 tai useampia toimittajia voidaan liittää tuotteeseen. Kaikki tiedot "
+"näkyvät tuotelomakkeella."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -914,11 +909,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Pakkauksen kokonaispaino"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "tuntematon"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1089,6 +1079,11 @@ msgstr "Yksikköhinta"
 msgid "Right Parent"
 msgstr "Oikea ylempi"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1163,6 +1158,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Antaa järjestyksen näytettäessä tuotekategorialistaa."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1238,7 +1238,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1292,11 +1292,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Kumppanit"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1310,7 +1305,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Toimittajan tiedot"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1434,17 +1434,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Kappale"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1554,8 +1547,8 @@ msgid "Pricelist Name"
 msgstr "Hinnaston nimi"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1786,7 +1779,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1822,7 +1815,7 @@ msgid "Default Unit of Measure"
 msgstr "Oletusmittayksikkö"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Tuotelomakkeen kumppaniosio"
@@ -1848,7 +1841,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2164,7 +2162,7 @@ msgid "Normal"
 msgstr "Normaali"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2220,12 +2218,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Vaihteleva"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2382,7 +2374,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2526,6 +2518,9 @@ msgstr "Hinnanalennus"
 #~ msgid "Prices Types"
 #~ msgstr "Hintatyypit"
 
+#~ msgid "Partners"
+#~ msgstr "Kumppanit"
+
 #~ msgid "Mouse"
 #~ msgstr "Hiiri"
 
@@ -2571,9 +2566,6 @@ msgstr "Hinnanalennus"
 #~ msgid "Warranty (months)"
 #~ msgstr "Takuu (kuukausina)"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Toimittajan tiedot"
-
 #~ msgid "Product Description"
 #~ msgstr "Tuotteen kuvaus"
 
@@ -3092,12 +3084,18 @@ msgstr "Hinnanalennus"
 #~ "Virhe: Oletusyksikön ja toimittajan tuoteyksikön tulee olla samaa "
 #~ "yksikköluokkaa."
 
+#~ msgid "Day"
+#~ msgstr "Päivä"
+
 #~ msgid "UoM"
 #~ msgstr "Mittayksikkö"
 
 #~ msgid "Reference"
 #~ msgstr "Viite"
 
+#~ msgid "Hour"
+#~ msgstr "Tunti"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Sekalaista"
 
@@ -3396,6 +3394,9 @@ msgstr "Hinnanalennus"
 #~ "Laskettu määrä on tämän arvon kertoma. Käytä 1.0 mittayksikölle jota ei voi "
 #~ "edelleen jakaa, kuten esim. kpl."
 
+#~ msgid "Dozen"
+#~ msgstr "Tusina"
+
 #~ msgid "Product UoS View"
 #~ msgstr "Tuotteen myyntierän näkymä"
 
@@ -3413,6 +3414,9 @@ msgstr "Hinnanalennus"
 #~ msgid "Service on Timesheet"
 #~ msgstr "Palvelu tuntilistalla"
 
+#~ msgid "unknown"
+#~ msgstr "tuntematon"
+
 #~ msgid "Cabinet"
 #~ msgstr "Kabinetti"
 
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 965206249d6..7c85e4b5187 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-30 13:11+0000\n"
-"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 14:45+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Second UoM"
 #~ msgstr "UdM secondaire"
@@ -56,11 +56,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Ceci est la quantité minimum à acheter au fournisseur principal"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Jour"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -120,6 +115,7 @@ msgstr "Nom de la règle"
 msgid ""
 "Base price to compute the customer price. Sometimes called the catalog price."
 msgstr ""
+"Prix de base pour calculer le prix client. Parfois appelé prix catalogue."
 
 #. module: product
 #: model:product.template,name:product.product_product_3_product_template
@@ -134,8 +130,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Avertissement !"
@@ -143,10 +139,10 @@ msgstr "Avertissement !"
 #. module: product
 #: field:product.product,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Vignette de l'image"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -155,11 +151,6 @@ msgstr ""
 "La conversion d'unité de mesure (UdM) de l'article %s dans l'UdM par défaut "
 "%s n'est pas possible car elles appartiennent à deux catégories différentes !"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Douzaine"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -220,7 +211,7 @@ msgid "Product Type"
 msgstr "Type d'article"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Articles : "
@@ -240,7 +231,7 @@ msgstr "Catégorie parent"
 #. module: product
 #: model:product.template,description:product.product_product_33_product_template
 msgid "Headset for laptop PC with USB connector."
-msgstr ""
+msgstr "Écouteurs pour PC portable avec connecteur USB"
 
 #. module: product
 #: model:product.category,name:product.product_category_all
@@ -289,6 +280,8 @@ msgid ""
 "Office Editing Software with word processing, spreadsheets, presentations, "
 "graphics, and databases..."
 msgstr ""
+"Suite bureautique avec traitement de textes, tableur, présentations, "
+"graphiques, bases de données..."
 
 #. module: product
 #: field:product.product,seller_id:0
@@ -320,11 +313,6 @@ msgstr ""
 msgid "Category"
 msgstr "Catégorie"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Litre"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -338,7 +326,7 @@ msgstr "Le nombre de colis par couche"
 #. module: product
 #: model:product.template,name:product.product_product_30_product_template
 msgid "Pen drive, SP-4"
-msgstr ""
+msgstr "Clé USB, SP-4"
 
 #. module: product
 #: field:product.packaging,qty:0
@@ -348,7 +336,7 @@ msgstr "Quantité par colis"
 #. module: product
 #: model:product.template,name:product.product_product_29_product_template
 msgid "Pen drive, SP-2"
-msgstr ""
+msgstr "Clé USB, SP-2"
 
 #. module: product
 #: view:product.product:0
@@ -401,7 +389,7 @@ msgstr "Responsable article"
 #. module: product
 #: model:product.template,name:product.product_product_7_product_template
 msgid "17” LCD Monitor"
-msgstr ""
+msgstr "Écran LCD 17\""
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
@@ -427,7 +415,7 @@ msgstr "La longueur du colis"
 #. module: product
 #: field:product.product,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Résumé"
 
 #. module: product
 #: help:product.template,weight_net:0
@@ -452,6 +440,8 @@ msgid ""
 "Specify a product if this rule only applies to one product. Keep empty "
 "otherwise."
 msgstr ""
+"Indiquez un article si cette règle ne s'applique qu'à lui. Laissez vide dans "
+"le cas contraire."
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -528,7 +518,7 @@ msgstr "Ventes & Achats"
 #. module: product
 #: model:product.template,name:product.product_product_44_product_template
 msgid "GrapWorks Software"
-msgstr ""
+msgstr "GrapWorks Software"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
@@ -548,6 +538,11 @@ msgstr "Type de mesure"
 #. module: product
 #: model:product.template,name:product.product_product_32_product_template
 msgid "Headset standard"
+msgstr "Écouteurs standards"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
 msgstr ""
 
 #. module: product
@@ -580,6 +575,8 @@ msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
 msgstr ""
+"Erreur : l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -607,6 +604,8 @@ msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
 msgstr ""
+"Vous avez indiqué un code barre EAN13 erroné. Vous pouvez utiliser le champ "
+"\"Référence interne\" à la place."
 
 #. module: product
 #: model:res.groups,name:product.group_purchase_pricelist
@@ -616,16 +615,12 @@ msgstr "Liste de prix d'achat"
 #. module: product
 #: model:product.template,name:product.product_product_5_product_template
 msgid "PC Assemble + Custom (PC on Demand)"
-msgstr ""
+msgstr "PC assemblé et personnalisé (PC à la demande)"
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
-msgstr ""
-"Un ou plusieurs fournisseurs peuvent être associés à un article. Toutes les "
-"informations figurent dans le formulaire de l'article."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr "Portable personnalisé selon les besoins du client."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -633,10 +628,10 @@ msgid "The width of the package"
 msgstr "La largeur du colis"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
-msgstr ""
+msgstr "Les catégories d'unités de mesure ne correspondent pas !"
 
 #. module: product
 #: model:product.template,name:product.product_product_36_product_template
@@ -673,7 +668,7 @@ msgstr ""
 #. module: product
 #: view:product.price_list:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -688,12 +683,12 @@ msgstr "Quantité min."
 #. module: product
 #: model:product.template,name:product.product_product_12_product_template
 msgid "Mouse, Wireless"
-msgstr ""
+msgstr "Souris, sans fil"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor Core i5 2.70 Ghz"
-msgstr ""
+msgstr "Processeur Core i5 2.70 Ghz"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -729,15 +724,16 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_18_product_template
 msgid "HDD SH-2"
-msgstr ""
+msgstr "Disque dur SH-2"
 
 #. module: product
 #: model:product.template,name:product.product_product_17_product_template
 msgid "HDD SH-1"
-msgstr ""
+msgstr "Disque dur SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Fournisseur"
 
@@ -762,12 +758,12 @@ msgstr "Type de prix"
 #. module: product
 #: help:product.product,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si coché, de nouveaux messages requièrent votre attention."
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr ""
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "Code barre EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -781,7 +777,7 @@ msgstr "Liste de prix"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Forecasted Quantity"
-msgstr ""
+msgstr "Quantité prévue"
 
 #. module: product
 #: view:product.product:0
@@ -791,7 +787,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_33_product_template
 msgid "Headset USB"
-msgstr ""
+msgstr "Écouteurs USB"
 
 #. module: product
 #: view:product.template:0
@@ -801,7 +797,7 @@ msgstr "Fournisseurs"
 #. module: product
 #: model:res.groups,name:product.group_sale_pricelist
 msgid "Sales Pricelists"
-msgstr ""
+msgstr "Listes de prix de vente"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -821,7 +817,7 @@ msgstr "Fournisseur de l'article"
 #. module: product
 #: model:product.template,name:product.product_product_28_product_template
 msgid "External Hard disk"
-msgstr ""
+msgstr "Disque dur externe"
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -829,6 +825,8 @@ msgid ""
 "Cost price of the product used for standard stock valuation in accounting "
 "and used as a base price on purchase orders."
 msgstr ""
+"Prix de revient de l'article utilisé pour la valorisation standard du stock "
+"en comptabilité, et utilisée comme prix de base dans les commandes d'achat."
 
 #. module: product
 #: field:product.category,child_id:0
@@ -840,6 +838,11 @@ msgstr "Catégories FillesCommandes de Travail"
 msgid "End Date"
 msgstr "Date de fin"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -873,7 +876,6 @@ msgstr "Code type"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -881,8 +883,8 @@ msgstr "Liste de prix"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Heure"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -895,9 +897,13 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Un ou plusieurs fournisseurs peuvent être associés à un article. Toutes les "
+"informations figurent dans le formulaire de l'article."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -912,7 +918,7 @@ msgstr ""
 #. module: product
 #: view:product.template:0
 msgid "days"
-msgstr ""
+msgstr "jours"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -931,7 +937,7 @@ msgstr "Devise"
 #. module: product
 #: model:product.template,name:product.product_product_46_product_template
 msgid "Datacard"
-msgstr ""
+msgstr "Carte mémoire"
 
 #. module: product
 #: help:product.template,uos_coeff:0
@@ -939,6 +945,8 @@ msgid ""
 "Coefficient to convert default Unit of Measure to Unit of Sale\n"
 " uos = uom * coeff"
 msgstr ""
+"Coefficient permettant de convertir l'unité de mesure en unité de vente\n"
+" UdV = UdM * coeff"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
@@ -955,18 +963,13 @@ msgstr "Approvisionnement & emplacements"
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "Motherboard I9P57"
-msgstr ""
+msgstr "Carte mère I9P57"
 
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
 msgstr "Poids total du colis"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "inconnu"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -980,7 +983,7 @@ msgstr "Type de prix d'article"
 #. module: product
 #: field:product.product,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Est abonné"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -1018,6 +1021,7 @@ msgid ""
 "Specify the minimum quantity that needs to be bought/sold for the rule to "
 "apply."
 msgstr ""
+"Indiquez la quantité minimale à acheter/vendre pour que la règle s'applique."
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1043,6 +1047,10 @@ msgid ""
 "512MB RAM\n"
 "HDD SH-1"
 msgstr ""
+"Écran LCD 17\"\n"
+"Processeur AMD 8-Core\n"
+"512MB RAM\n"
+"Disque dur SH-1"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1057,7 +1065,7 @@ msgstr "Code"
 #. module: product
 #: model:product.template,name:product.product_product_27_product_template
 msgid "Laptop Customized"
-msgstr ""
+msgstr "Portable personnalisé"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1067,7 +1075,7 @@ msgstr "Unité logistique"
 #. module: product
 #: model:product.template,name:product.product_product_35_product_template
 msgid "Blank CD"
-msgstr ""
+msgstr "CD vierge"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
@@ -1091,6 +1099,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer un nouvel article.\n"
+"              </p><p>\n"
+"                Vous devez créer un article pour tout ce que vous vendez, "
+"que ce\n"
+"                soit un produit physique, un consommable, ou un service "
+"proposé aux\n"
+"                clients.\n"
+"              </p><p>\n"
+"                Les informations du formulaire d'édition d'un article "
+"permettent de\n"
+"                simplifier le processus de vente, en indiquant le prix, des "
+"informations\n"
+"                dans les devis, les données comptables, les modes "
+"d'approvisionnement,\n"
+"                etc.\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: view:product.price_list:0
@@ -1100,7 +1126,7 @@ msgstr "Annuler"
 #. module: product
 #: model:product.template,description:product.product_product_37_product_template
 msgid "All in one hi-speed printer with fax and scanner."
-msgstr ""
+msgstr "Imprimante tout en un avec fax et scanner"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -1109,6 +1135,9 @@ msgid ""
 "Product Unit of Measure if not empty, in the default unit of measure of the "
 "product otherwise."
 msgstr ""
+"La quantité minimum à acheter chez ce fournisseur, exprimée dans l'unité de "
+"mesure fournisseur si elle est renseignée, ou dans l'unité de mesure par "
+"défaut de l'article dans le cas contraire."
 
 #. module: product
 #: view:product.product:0
@@ -1141,6 +1170,11 @@ msgstr "Prix unitaire"
 msgid "Right Parent"
 msgstr "Parent à droite"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1150,17 +1184,17 @@ msgstr "Surcharge du prix"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Référence interne"
 
 #. module: product
 #: model:product.template,name:product.product_product_8_product_template
 msgid "USB Keyboard, QWERTY"
-msgstr ""
+msgstr "Clavier USB QWERTY"
 
 #. module: product
 #: model:product.category,name:product.product_category_9
 msgid "Softwares"
-msgstr ""
+msgstr "Logiciels"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1182,12 +1216,12 @@ msgstr "Nom"
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Computers"
-msgstr ""
+msgstr "Ordinateurs"
 
 #. module: product
 #: help:product.product,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Historique des messages et communications"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
@@ -1207,7 +1241,7 @@ msgstr "km"
 #. module: product
 #: field:product.template,standard_price:0
 msgid "Cost"
-msgstr ""
+msgstr "Coût"
 
 #. module: product
 #: help:product.category,sequence:0
@@ -1215,6 +1249,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Donne l'ordre d'affichage d'une liste de catégories d'articles."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1252,13 +1291,13 @@ msgstr "Unité de vente"
 #. module: product
 #: field:product.product,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Messages non lus"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Catégories d'unités de mesure"
 
 #. module: product
 #: help:product.product,seller_id:0
@@ -1277,6 +1316,7 @@ msgstr "Services"
 #: help:product.product,ean13:0
 msgid "International Article Number used for product identification."
 msgstr ""
+"Numéro d'article international (IAN) utilisé pour identifier cet article."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1290,9 +1330,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"Voici une liste de tous les articles classés par catégorie. Vous\n"
+"pouvez cliquer sur une catégorie pour afficher les articles\n"
+"de cette catégorie, ainsi que les articles des catégories filles.\n"
+"              </p>\n"
+"            "
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1300,6 +1346,10 @@ msgid ""
 "you may deactivate this product from the 'Procurements' tab and create a new "
 "one."
 msgstr ""
+"La nouvelle unité de mesure \"%s\" doit appartenir à la même catégorie "
+"\"%s\" que l'ancienne unité de mesure \"%s\". Si vous devez changer cette "
+"unité de mesure, vous pouvez désactiver de produit dans l'onglet "
+"\"Approvisionnements\" et créer un nouveau produit."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -1337,7 +1387,7 @@ msgstr "Poids net"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr "Dimension d'une Palette"
+msgstr "Dimension d'une palette"
 
 #. module: product
 #: help:product.product,image:0
@@ -1345,11 +1395,7 @@ msgid ""
 "This field holds the image used as image for the product, limited to "
 "1024x1024px."
 msgstr ""
-
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Autres fournisseurs"
+"Ce champ contient l'image utilisée pour cet article, limitée à 1024x1024 px."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1357,27 +1403,34 @@ msgid ""
 "Specify a product category if this rule only applies to products belonging "
 "to this category or its children categories. Keep empty otherwise."
 msgstr ""
+"Indiquez une catégorie d'articles si cette règle ne s'applique qu'à cette "
+"catégorie et à ses enfants. Laissez vide dans le cas contraire."
 
 #. module: product
 #: view:product.product:0
 msgid "Inventory"
-msgstr ""
+msgstr "Inventaire"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Information fournisseur"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: product
 #: model:product.template,name:product.product_product_2_product_template
 msgid "On Site Assistance"
-msgstr ""
+msgstr "Dépannage sur site"
 
 #. module: product
 #: model:product.template,name:product.product_product_39_product_template
 msgid "Toner Cartridge"
-msgstr ""
+msgstr "Cartouche toner"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1404,7 +1457,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_43_product_template
 msgid "Zed+ Antivirus"
-msgstr ""
+msgstr "Antivirus Zed+"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -1441,7 +1494,7 @@ msgstr "Le poids brut en Kg."
 #. module: product
 #: model:product.template,name:product.product_product_37_product_template
 msgid "Printer, All-in-one"
-msgstr ""
+msgstr "Imprimante, tout en un"
 
 #. module: product
 #: view:product.template:0
@@ -1451,7 +1504,7 @@ msgstr "Approvisionnement"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Processor AMD 8-Core"
-msgstr ""
+msgstr "Processeur AMD 8-Core"
 
 #. module: product
 #: view:product.product:0
@@ -1462,7 +1515,7 @@ msgstr "Poids"
 #. module: product
 #: view:product.product:0
 msgid "Description for Quotations"
-msgstr ""
+msgstr "Description pour les devis"
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
@@ -1470,6 +1523,9 @@ msgid ""
 "This price will be considered as a price for the supplier Unit of Measure if "
 "any or the default Unit of Measure of the product otherwise"
 msgstr ""
+"Ce prix sera considéré comme le prix par unité de mesure fournisseur si "
+"celle-ci est renseignée, ou par unité de mesure par défaut de l'article dans "
+"le cas contraire."
 
 #. module: product
 #: field:product.template,uom_po_id:0
@@ -1484,21 +1540,14 @@ msgstr "Regrouper par..."
 #. module: product
 #: field:product.product,image_medium:0
 msgid "Medium-sized image"
-msgstr ""
+msgstr "Image de taille moyenne"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unité"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1507,7 +1556,7 @@ msgstr "Date de début"
 #. module: product
 #: model:product.template,name:product.product_product_38_product_template
 msgid "Ink Cartridge"
-msgstr ""
+msgstr "Cartouche jet d'encre"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1533,6 +1582,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour ajouter une version de la liste de prix.\n"
+"              </p><p>\n"
+"                Une liste de prix peut avoir plusieurs versions, chacune "
+"étant\n"
+"                valable pour une certaine durée. Il peut y avoir par exemple "
+"des\n"
+"                versions : \"Prix de base\", \"Prix 2010\", \"Prix 2011\", "
+"\"Ventes d'été\", etc.\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1546,7 +1606,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price"
-msgstr ""
+msgstr "Prix d'articles"
 
 #. module: product
 #: model:product.template,description:product.product_product_26_product_template
@@ -1556,6 +1616,10 @@ msgid ""
 "Hi-Speed 234Q Processor\n"
 "QWERTY keyboard"
 msgstr ""
+"Écran 17\"\n"
+"6GB RAM\n"
+"Processeur haute performance 234Q\n"
+"Clavier QWERTY"
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1565,12 +1629,12 @@ msgstr "Précision d'arrondi"
 #. module: product
 #: view:product.product:0
 msgid "Consumable products"
-msgstr ""
+msgstr "Article consommable"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "Motherboard A20Z7"
-msgstr ""
+msgstr "Carte mère A20Z7"
 
 #. module: product
 #: model:product.template,description:product.product_product_1_product_template
@@ -1581,12 +1645,12 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Last valid date for the version."
-msgstr ""
+msgstr "Date de fin de validité de la version."
 
 #. module: product
 #: model:product.template,name:product.product_product_19_product_template
 msgid "HDD on Demand"
-msgstr ""
+msgstr "Disque dur à la demande"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1608,9 +1672,9 @@ msgid "Pricelist Name"
 msgstr "Nom de la liste de prix"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr ""
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "En vente"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1620,7 +1684,7 @@ msgstr "Le rapport de conversion d'une unité de mesure ne peut pas être 0 !"
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Graphics Card"
-msgstr ""
+msgstr "Carte graphique"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1640,7 +1704,7 @@ msgstr "Poids d'un colis à vide"
 #. module: product
 #: model:product.template,name:product.product_product_41_product_template
 msgid "Windows Home Server 2011"
-msgstr ""
+msgstr "Windows Home Server 2011"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1651,6 +1715,7 @@ msgstr "Champ article"
 #: model:product.template,description:product.product_product_5_product_template
 msgid "Custom computer assembled on order based on customer's requirement."
 msgstr ""
+"Ordinateur personnalisé assemblé sur commande d'après les besoins client."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
@@ -1667,7 +1732,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Sales"
-msgstr ""
+msgstr "Ventes"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1683,6 +1748,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour ajouter une catégorie d'unités de mesure.\n"
+"              </p><p>\n"
+"                Les unités de mesure d'une même catégorie peuvent être\n"
+"                converties entre elles. Par exemple dans la catégorie "
+"<i>Durée</i>,\n"
+"                on trouvera les unités suivantes : heures, jours.\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
@@ -1690,6 +1764,9 @@ msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier Unit of "
 "Measure if any or in the default Unit of Measure of the product otherrwise."
 msgstr ""
+"La quantité minimum qui déclenchera cette règle, exprimée dans l'unité de "
+"mesure fournisseur si elle est renseignée ou dans l'unité de mesure par "
+"défaut de l'article dans le cas contraire."
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1711,6 +1788,7 @@ msgstr "Code de l'article chez le fournisseur"
 msgid ""
 "If unchecked, it will allow you to hide the pricelist without removing it."
 msgstr ""
+"Décocher cette case permet de masquer la liste de prix sans la supprimer."
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1737,7 +1815,7 @@ msgstr "Article"
 #. module: product
 #: view:product.product:0
 msgid "Price:"
-msgstr ""
+msgstr "Prix :"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1765,7 +1843,7 @@ msgstr "Articles par catégorie"
 #. module: product
 #: model:product.template,name:product.product_product_16_product_template
 msgid "Computer Case"
-msgstr ""
+msgstr "Boîtier d'ordinateur"
 
 #. module: product
 #: model:product.template,name:product.product_product_9_product_template
@@ -1843,7 +1921,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1879,7 +1957,7 @@ msgid "Default Unit of Measure"
 msgstr "Unité de mesure par défaut"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Section partenaire dans le formulaire article"
@@ -1905,7 +1983,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2221,7 +2304,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2278,12 +2361,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variable"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2441,7 +2518,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2664,6 +2741,9 @@ msgstr "Réduction sur le prix"
 #~ msgid "Mouse"
 #~ msgstr "Souris"
 
+#~ msgid "Partners"
+#~ msgstr "Autres fournisseurs"
+
 #~ msgid "Create new Product"
 #~ msgstr "Créer un nouveau produit"
 
@@ -2682,9 +2762,6 @@ msgstr "Réduction sur le prix"
 #~ msgid "Factor"
 #~ msgstr "Facteur"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Information fournisseur"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Nom du produit partenaire"
 
@@ -3090,6 +3167,9 @@ msgstr "Réduction sur le prix"
 #~ msgid "Procurement Method"
 #~ msgstr "Méthode d'approvisionnement"
 
+#~ msgid "Day"
+#~ msgstr "Jour"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -3123,6 +3203,9 @@ msgstr "Réduction sur le prix"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projet de conception d'une cuisine"
 
+#~ msgid "Hour"
+#~ msgstr "Heure"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Divers"
 
@@ -3605,6 +3688,9 @@ msgstr "Réduction sur le prix"
 #~ msgid "Create or Import Products"
 #~ msgstr "Créer ou importer des produits"
 
+#~ msgid "unknown"
+#~ msgstr "inconnu"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Table en bois"
 
@@ -3682,6 +3768,9 @@ msgstr "Réduction sur le prix"
 #~ "Dans les autres cas, cela comprend les marchandises de tous les emplacements "
 #~ "de stock de type \"interne\""
 
+#~ msgid "Dozen"
+#~ msgstr "Douzaine"
+
 #, python-format
 #~ msgid "Cannot change the category of existing UoM '%s'."
 #~ msgstr "Impossible de changer la catégorie existante d' UdM '%s'."
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index 6caca0cd4ca..43c57dc52e8 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-02 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -188,7 +178,7 @@ msgid "Product Type"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -276,11 +266,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -505,6 +490,11 @@ msgstr ""
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -564,10 +554,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -576,7 +564,7 @@ msgid "The width of the package"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -678,6 +666,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -705,8 +694,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -780,6 +769,11 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -813,7 +807,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -821,7 +814,7 @@ msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -835,8 +828,10 @@ msgid "Partner"
 msgstr ""
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -902,11 +897,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr ""
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1077,6 +1067,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1151,6 +1146,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1226,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1280,11 +1280,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr ""
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1298,7 +1293,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1417,17 +1417,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr ""
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1535,8 +1528,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1767,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1803,7 +1796,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1829,7 +1822,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2141,7 +2139,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2193,12 +2191,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2355,7 +2347,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 082ee8e3d3e..7590a41f438 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 19:51+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-10 04:38+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Minimalna nabavna količina kod glavnog dobavljača"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dan"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -192,7 +182,7 @@ msgid "Product Type"
 msgstr "Tip artikla"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -280,11 +270,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -509,6 +494,11 @@ msgstr "Tip mjere"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -568,13 +558,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Jedan ili više dobavljača se može povezati s artiklom. Sve informacije se "
-"nalaze na formi artikla."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -582,7 +568,7 @@ msgid "The width of the package"
 msgstr "Širina paketa"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -687,6 +673,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dobavljač"
 
@@ -714,8 +701,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -789,6 +776,11 @@ msgstr "Podkategorije"
 msgid "End Date"
 msgstr "Datum završetka"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -822,7 +814,6 @@ msgstr "Ključ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -830,8 +821,8 @@ msgstr "Cjenik"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Sat"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -844,9 +835,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Jedan ili više dobavljača se može povezati s artiklom. Sve informacije se "
+"nalaze na formi artikla."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -911,11 +906,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Ukupna težina pakiranja"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1086,6 +1076,11 @@ msgstr "Jed. cijena"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1160,6 +1155,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1235,7 +1235,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1289,11 +1289,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1307,7 +1302,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "detalji dobavljača"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1431,17 +1431,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jedinica"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1549,8 +1542,8 @@ msgid "Pricelist Name"
 msgstr "Naziv cjenika"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1781,7 +1774,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1817,7 +1810,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Podaci o partneru u formi artikla"
@@ -1843,7 +1836,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2159,7 +2157,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2213,12 +2211,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Varijabla"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2375,7 +2367,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2571,6 +2563,9 @@ msgstr "Popust"
 #~ msgid "Create new Product"
 #~ msgstr "Kreiraj novi proizvod"
 
+#~ msgid "Partners"
+#~ msgstr "Partneri"
+
 #~ msgid "Mouse"
 #~ msgstr "Miš"
 
@@ -2726,9 +2721,6 @@ msgstr "Popust"
 #~ msgid "Customer Lead Time"
 #~ msgstr "Vrijeme vođenja kupca."
 
-#~ msgid "Supplier Info"
-#~ msgstr "detalji dobavljača"
-
 #~ msgid "The mode for computing the price for this rule."
 #~ msgstr "Način izračuna cijene za ovo pravilo."
 
@@ -2991,6 +2983,9 @@ msgstr "Popust"
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
+#~ msgid "Day"
+#~ msgstr "Dan"
+
 #~ msgid "UoM"
 #~ msgstr "JM"
 
@@ -3007,6 +3002,9 @@ msgstr "Popust"
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Polica od 200cm"
 
+#~ msgid "Hour"
+#~ msgstr "Sat"
+
 #~ msgid "To Purchase"
 #~ msgstr "Za nabavu"
 
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 7c85ae405e6..f412ee6a20f 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:19+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "A főszállítótól beszerezhető minimum mennyiség."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Nap"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Tucat"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -193,7 +183,7 @@ msgid "Product Type"
 msgstr "Terméktípus"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Termékek: "
@@ -281,11 +271,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategória"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -510,6 +495,11 @@ msgstr "Mértékegység típusa"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -569,13 +559,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Egy vagy több szállító rendelhető egy termékhez. Minden információ a termék "
-"űrlapján található."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -583,7 +569,7 @@ msgid "The width of the package"
 msgstr "Csomag szélessége"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -688,6 +674,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Szállító"
 
@@ -715,8 +702,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -790,6 +777,11 @@ msgstr "Alkategóriák"
 msgid "End Date"
 msgstr "Befejezési dátum"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -823,7 +815,6 @@ msgstr "Kulcs"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -831,8 +822,8 @@ msgstr "Árlista"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Óra"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -845,9 +836,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Egy vagy több szállító rendelhető egy termékhez. Minden információ a termék "
+"űrlapján található."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -912,11 +907,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Csomagolás teljes súlya"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "Ismeretlen"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1090,6 +1080,11 @@ msgstr "Egységár"
 msgid "Right Parent"
 msgstr "Jobb oldali szülő"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1164,6 +1159,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Megadja a sorrendet, amikor a termékkategóriák listáját kiállítjuk."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1239,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1293,11 +1293,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partnerek"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1311,7 +1306,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1436,17 +1436,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Egység"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1557,8 +1550,8 @@ msgid "Pricelist Name"
 msgstr "Árlista név"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1791,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1827,7 +1820,7 @@ msgid "Default Unit of Measure"
 msgstr "Alapértelmezett mértékegység"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "A termék űrlap partneradatai."
@@ -1853,7 +1846,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2169,7 +2167,7 @@ msgid "Normal"
 msgstr "Normál"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2224,12 +2222,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Változó"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2386,7 +2378,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2542,6 +2534,9 @@ msgstr "Árengedmény"
 #~ msgid "Keyboard"
 #~ msgstr "Billentyűzet"
 
+#~ msgid "Partners"
+#~ msgstr "Partnerek"
+
 #~ msgid "Mouse"
 #~ msgstr "Egér"
 
@@ -2605,6 +2600,9 @@ msgstr "Árengedmény"
 #~ msgid "Prices Types"
 #~ msgstr "Ártípusok"
 
+#~ msgid "Day"
+#~ msgstr "Nap"
+
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Mainboard ASUStek A7V8X-X"
 
@@ -2668,6 +2666,9 @@ msgstr "Árengedmény"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Konyhadesign projekt"
 
+#~ msgid "Hour"
+#~ msgstr "Óra"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Vegyes"
 
@@ -3274,6 +3275,12 @@ msgstr "Árengedmény"
 #~ msgid "Service on Timesheet"
 #~ msgstr "Szolgáltatás munkaidő-kimutatás alapján"
 
+#~ msgid "Dozen"
+#~ msgstr "Tucat"
+
+#~ msgid "unknown"
+#~ msgstr "Ismeretlen"
+
 #~ msgid "Quantity Available"
 #~ msgstr "Rendelkezésre álló mennyiség"
 
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 6995ce11c00..6d47c7f76b7 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Ini adalah jumlah  minimal  untuk  membeli  dari Pemasok Utama."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Hari"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -193,7 +183,7 @@ msgid "Product Type"
 msgstr "Tipe Produk"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produk : "
@@ -281,11 +271,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -510,6 +495,11 @@ msgstr "Jeni Satuan"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -569,13 +559,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 atau beberapa pemasok (s) dapat dikaitkan dengan suatu produk. Semua "
-"informasi berdiri dalam bentuk produk."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -583,7 +569,7 @@ msgid "The width of the package"
 msgstr "Lebar Paket"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -688,6 +674,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Pemasok"
 
@@ -715,8 +702,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -790,6 +777,11 @@ msgstr "Kategori Turunan"
 msgid "End Date"
 msgstr "Tanggal berakhir"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -823,7 +815,6 @@ msgstr "Kunci"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -831,8 +822,8 @@ msgstr "Harga"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Jam"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -845,9 +836,13 @@ msgid "Partner"
 msgstr "Rekanan"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 atau beberapa pemasok (s) dapat dikaitkan dengan suatu produk. Semua "
+"informasi berdiri dalam bentuk produk."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -912,11 +907,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Berat total kemasan"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1090,6 +1080,11 @@ msgstr "Harga Satuan"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1165,6 +1160,11 @@ msgid ""
 msgstr ""
 "Memberikan perintah urutan ketika menampilkan daftar kategori produk."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1241,7 +1241,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1295,11 +1295,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Rekanan"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1313,7 +1308,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1437,17 +1437,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr ""
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1557,8 +1550,8 @@ msgid "Pricelist Name"
 msgstr "Nama Daftar harga"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1789,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1825,7 +1818,7 @@ msgid "Default Unit of Measure"
 msgstr "Default Unit of Measure"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partner bagian dari bentuk produk"
@@ -1851,7 +1844,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2168,7 +2166,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2222,12 +2220,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabel"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2384,7 +2376,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2756,6 +2748,9 @@ msgstr "harga discount"
 #~ msgid "Restaurant Expenses"
 #~ msgstr "Beban Restoran"
 
+#~ msgid "Day"
+#~ msgstr "Hari"
+
 #~ msgid "UoM"
 #~ msgstr "Satuan Unit"
 
@@ -2765,6 +2760,9 @@ msgstr "harga discount"
 #~ msgid "Ratio & Precision"
 #~ msgstr "Rasio & Presisi"
 
+#~ msgid "Hour"
+#~ msgstr "Jam"
+
 #~ msgid "Rules Test Match"
 #~ msgstr "Test Pencocokan Aturan"
 
@@ -2844,6 +2842,9 @@ msgstr "harga discount"
 #~ msgid "Error !"
 #~ msgstr "Ada Kesalahan !!!"
 
+#~ msgid "Partners"
+#~ msgstr "Rekanan"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " (salinan)"
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 2b02cddfbb8..f332dfc7d5a 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 20:47+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
@@ -31,11 +31,6 @@ msgstr "Prezzo base per il calcolo"
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Questa è la quantità minima da comprare dal fornitore principale"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Giorno"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -113,8 +108,8 @@ msgstr ""
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -125,7 +120,7 @@ msgid "Small-sized image"
 msgstr "Immagine (formato piccolo)"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -134,11 +129,6 @@ msgstr ""
 "Conversione da UoM Prodotto %s a UoM Default %s non possibile siccome "
 "appartengono a categorie differenti!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dozzina"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -199,7 +189,7 @@ msgid "Product Type"
 msgstr "Tipo Prodotto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Prodotti "
@@ -304,11 +294,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Litro"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -535,6 +520,11 @@ msgstr "Tipo Misura"
 msgid "Headset standard"
 msgstr "Cuffie standard"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -598,13 +588,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr "PC assemblato + custom (PC su richiesta)"
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
-msgstr ""
-"1 o più fornitori possono essere collegati al prodotto. Tutte le "
-"informazioni risiedono nel form del prodotto."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr "Portatile personalizzato sulla base delle richieste del cliente"
 
 #. module: product
 #: help:product.packaging,width:0
@@ -612,7 +598,7 @@ msgid "The width of the package"
 msgstr "La larghezza dell'imballo"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "Le categorie dell'unità di misura non corrispondono!"
@@ -719,6 +705,7 @@ msgstr "HDD SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Fornitore"
 
@@ -749,9 +736,9 @@ msgid "If checked new messages require your attention."
 msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "Vendibile"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "Barcode EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -826,6 +813,11 @@ msgstr "Categorie Collegate"
 msgid "End Date"
 msgstr "Data di fine"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -859,7 +851,6 @@ msgstr "Chiave"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -867,8 +858,8 @@ msgstr "Listino Prezzi"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Ora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -881,9 +872,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
-msgstr "Portatile personalizzato sulla base delle richieste del cliente"
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+"1 o più fornitori possono essere collegati al prodotto. Tutte le "
+"informazioni risiedono nel form del prodotto."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -951,11 +946,6 @@ msgstr "Motherboard I9P57"
 msgid "Total Package Weight"
 msgstr "Peso Totale Imballo"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "sconosciuto"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1138,6 +1128,11 @@ msgstr "Prezzo unitario"
 msgid "Right Parent"
 msgstr "Genitore destro"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1213,6 +1208,11 @@ msgid ""
 msgstr ""
 "Stabilisce la sequenza in cui visualizzare una lista di categorie prodotto."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1290,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1346,11 +1346,6 @@ msgstr ""
 "Questo campo contiene l'immagine usata per il prodotto, limitata a "
 "1024x1024px."
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partners"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1367,7 +1362,12 @@ msgid "Inventory"
 msgstr "Inventario"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Informazioni fornitore"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -1493,17 +1493,10 @@ msgstr "Immagine dimensione media"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unità"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "Il prodotto è statp <b>creato</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1633,9 +1626,9 @@ msgid "Pricelist Name"
 msgstr "Nome Listino"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "Barcode EAN13"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "Vendibile"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1877,7 +1870,7 @@ msgstr ""
 "quella di default."
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr "Impossibile cambiare la categoria dell'unità di misura: '%s'."
@@ -1913,7 +1906,7 @@ msgid "Default Unit of Measure"
 msgstr "Unità di misura di default"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sezione del partner per il form del prodotto"
@@ -1939,7 +1932,12 @@ msgid "Messages"
 msgstr "Messaggi"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -2266,7 +2264,7 @@ msgid "Normal"
 msgstr "Normale"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2322,12 +2320,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabile"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2489,7 +2481,7 @@ msgid "15” LCD Monitor"
 msgstr "Monitor 15” LCD"
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2863,6 +2855,9 @@ msgstr "Sconto Prezzo"
 #~ msgid "Mouse"
 #~ msgstr "Mouse"
 
+#~ msgid "Partners"
+#~ msgstr "Partners"
+
 #~ msgid "Create new Product"
 #~ msgstr "Creazione nuovo Prodotto"
 
@@ -2881,9 +2876,6 @@ msgstr "Sconto Prezzo"
 #~ msgid "Factor"
 #~ msgstr "Fattore"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Informazioni fornitore"
-
 #~ msgid "Miscelleanous"
 #~ msgstr "Varie"
 
@@ -3197,6 +3189,9 @@ msgstr "Sconto Prezzo"
 #~ "Errore ! Non è possibile assegnare il listino principale come 'altro "
 #~ "listino' nell'elemento di listino!"
 
+#~ msgid "Day"
+#~ msgstr "Giorno"
+
 #~ msgid "UoM"
 #~ msgstr "U.M."
 
@@ -3278,6 +3273,9 @@ msgstr "Sconto Prezzo"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Progetto cucina"
 
+#~ msgid "Hour"
+#~ msgstr "Ora"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Scaffale di 200cm"
 
@@ -3677,3 +3675,9 @@ msgstr "Sconto Prezzo"
 
 #~ msgid "Create or Import Products"
 #~ msgstr "Crea o importa prodotti"
+
+#~ msgid "Dozen"
+#~ msgstr "Dozzina"
+
+#~ msgid "unknown"
+#~ msgstr "sconosciuto"
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 25cb0678d9a..4146ce079da 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 06:44+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "これは主仕入先から仕入れる最小数量です。"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "日"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr "それらは両方が異なった分類に属しているので、製品の単位 %s からデフォルト単位 %s への変換はできません。"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "ダース"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "製品タイプ"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "製品： "
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "分類"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr "測定タイプ"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,11 +556,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
-msgstr "１つまたは複数の仕入先は製品と結びついています。全ての情報は製品フォームの中にあります。"
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr ""
 
 #. module: product
 #: help:product.packaging,width:0
@@ -578,7 +566,7 @@ msgid "The width of the package"
 msgstr "パッケージの幅"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -682,6 +670,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "仕入先"
 
@@ -709,8 +698,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -784,6 +773,11 @@ msgstr "子分類"
 msgid "End Date"
 msgstr "終了日"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -817,7 +811,6 @@ msgstr "キー"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -825,8 +818,8 @@ msgstr "価格リスト"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "時"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -839,9 +832,11 @@ msgid "Partner"
 msgstr "パートナ"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
-msgstr ""
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr "１つまたは複数の仕入先は製品と結びついています。全ての情報は製品フォームの中にあります。"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -906,11 +901,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "合計パッケージ重量"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "不明"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1081,6 +1071,11 @@ msgstr "単価"
 msgid "Right Parent"
 msgstr "右親"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1155,6 +1150,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "製品分類のリストを表示する時に並び順を与えます。"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1230,7 +1230,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1284,11 +1284,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "パートナ"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1302,7 +1297,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1421,17 +1421,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "単位"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1539,8 +1532,8 @@ msgid "Pricelist Name"
 msgstr "価格リスト名"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1771,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1807,7 +1800,7 @@ msgid "Default Unit of Measure"
 msgstr "デフォルト単位"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "製品フォームのパートナセクション"
@@ -1833,7 +1826,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2145,7 +2143,7 @@ msgid "Normal"
 msgstr "通常"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2199,12 +2197,6 @@ msgstr ""
 msgid "Variable"
 msgstr "可変"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2361,7 +2353,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2504,6 +2496,9 @@ msgstr "価格割引"
 #~ "Item!"
 #~ msgstr "エラー。価格表項目の中に他の価格表としてメインの価格表を割り当てることはできません。"
 
+#~ msgid "Day"
+#~ msgstr "日"
+
 #~ msgid "UoM"
 #~ msgstr "単位"
 
@@ -2526,6 +2521,9 @@ msgstr "価格割引"
 #~ msgid "Basic+ PC (assembly on order)"
 #~ msgstr "ベーシック＋ PC（注文生産）"
 
+#~ msgid "Dozen"
+#~ msgstr "ダース"
+
 #~ msgid "HDD on demand"
 #~ msgstr "HDDオンデマンド"
 
@@ -2765,6 +2763,9 @@ msgstr "価格割引"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "台所設計プロジェクト"
 
+#~ msgid "Hour"
+#~ msgstr "時"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "棚 200cm"
 
@@ -2776,6 +2777,9 @@ msgstr "価格割引"
 #~ msgid "IT components kits"
 #~ msgstr "ITコンポーネントキット"
 
+#~ msgid "unknown"
+#~ msgstr "不明"
+
 #~ msgid ""
 #~ "Product's cost for accounting stock valuation. It is the base price for the "
 #~ "supplier price."
@@ -2822,6 +2826,9 @@ msgstr "価格割引"
 #~ msgid "Second UoM"
 #~ msgstr "第２の単位"
 
+#~ msgid "Partners"
+#~ msgstr "パートナ"
+
 #~ msgid "If Other Pricelist"
 #~ msgstr "他の価格リストであれば"
 
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index f797d776241..602dc062dc3 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:47+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "상품 유형"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "상품 "
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "카테고리"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr "측정 유형"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,10 +556,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -578,7 +566,7 @@ msgid "The width of the package"
 msgstr "패키지 폭"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -680,6 +668,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -707,8 +696,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -782,6 +771,11 @@ msgstr ""
 msgid "End Date"
 msgstr "마감 날짜"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -815,7 +809,6 @@ msgstr "키"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -823,7 +816,7 @@ msgstr "가격리스트"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -837,8 +830,10 @@ msgid "Partner"
 msgstr "파트너"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -904,11 +899,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "총 패키지 중량"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1079,6 +1069,11 @@ msgstr "유닛 가격"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1153,6 +1148,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1228,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1282,11 +1282,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "파트너"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1300,7 +1295,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "공급자 정보"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1419,17 +1419,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "유닛"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1537,8 +1530,8 @@ msgid "Pricelist Name"
 msgstr "가격리스트 이름"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1769,7 +1762,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1805,7 +1798,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "상품 양식의 파트너 섹션"
@@ -1831,7 +1824,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2143,7 +2141,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2195,12 +2193,6 @@ msgstr ""
 msgid "Variable"
 msgstr "변수"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2357,7 +2349,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2610,6 +2602,9 @@ msgstr "가격 할인"
 #~ msgid "Create new Product"
 #~ msgstr "새 상품 만들기"
 
+#~ msgid "Partners"
+#~ msgstr "파트너"
+
 #~ msgid "Mouse"
 #~ msgstr "마우스"
 
@@ -2840,9 +2835,6 @@ msgstr "가격 할인"
 #~ msgid "Price type"
 #~ msgstr "가격 유형"
 
-#~ msgid "Supplier Info"
-#~ msgstr "공급자 정보"
-
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "공급자 이름, 상품 이름, 가격 등"
 
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index b6813e8dea4..8b3bf2004fd 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:28+0000\n"
 "Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: lt\n"
 
 #. module: product
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "Produkto tipas"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produktai: "
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr "Matavimo būdas"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,10 +556,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -578,7 +566,7 @@ msgid "The width of the package"
 msgstr "Pakuotės plotis"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -680,6 +668,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -707,8 +696,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -782,6 +771,11 @@ msgstr "Vaikinės kategorijos"
 msgid "End Date"
 msgstr "Pabaigos data"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -815,7 +809,6 @@ msgstr "Raktas"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -823,7 +816,7 @@ msgstr "Kainoraštis"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -837,8 +830,10 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -904,11 +899,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Bendras pakuotės svoris"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1079,6 +1069,11 @@ msgstr "Vieneto kaina"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1153,6 +1148,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1228,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1282,11 +1282,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneriai"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1300,7 +1295,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Tiekėjo informacija"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1419,17 +1419,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Vienetas"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1537,8 +1530,8 @@ msgid "Pricelist Name"
 msgstr "Kainoraščio pavadinimas"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1771,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1807,7 +1800,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Produkto formos partnerio sekcija"
@@ -1833,7 +1826,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2147,7 +2145,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2199,12 +2197,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Kintantis"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2361,7 +2353,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2565,6 +2557,9 @@ msgstr "Kainos nuolaida"
 #~ msgid "Create new Product"
 #~ msgstr "Sukurti naują produktą"
 
+#~ msgid "Partners"
+#~ msgstr "Partneriai"
+
 #~ msgid "Mouse"
 #~ msgstr "Pelė"
 
@@ -2680,9 +2675,6 @@ msgstr "Kainos nuolaida"
 #~ msgid "Product Description"
 #~ msgstr "Produkto aprašymas"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Tiekėjo informacija"
-
 #~ msgid "Basic+ PC (assembly on order)"
 #~ msgstr "Bazinis PK (surinkti pagal užsakymą)"
 
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 3bd3a64bd4c..26e1bc39d1a 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:34+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Minimālais iepirkuma daudzums no Pamatpiegādātāja"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Diena"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,18 +117,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "Produkta tips"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Preces: "
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr "Mērvienības Tips"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,13 +556,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Iespējams piesaistīt produktam vienu vai vairākus piegādātājus. Informācija "
-"atrodas produkta skatījuma formā."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -580,7 +566,7 @@ msgid "The width of the package"
 msgstr "Iepakojuma platums"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -684,6 +670,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Piegādātājs"
 
@@ -711,8 +698,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -786,6 +773,11 @@ msgstr "Apakškategorijas"
 msgid "End Date"
 msgstr "Beigu datums"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -819,7 +811,6 @@ msgstr "Atslēga"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -827,8 +818,8 @@ msgstr "Cenu lapa"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Stunda"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -841,9 +832,13 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Iespējams piesaistīt produktam vienu vai vairākus piegādātājus. Informācija "
+"atrodas produkta skatījuma formā."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -908,11 +903,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Kopējasi iepakojuma svars"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1085,6 +1075,11 @@ msgstr "Vienības cena"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1159,6 +1154,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Nosaka produktu kategoriju attēlošanas secību."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1234,7 +1234,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1288,11 +1288,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1306,7 +1301,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1427,17 +1427,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Vienība"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1547,8 +1540,8 @@ msgid "Pricelist Name"
 msgstr "Cenu lapas nosaukums"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1781,7 +1774,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1817,7 +1810,7 @@ msgid "Default Unit of Measure"
 msgstr "Noklusējuma mērvienība"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Produkta formas Partnera sadaļa"
@@ -1843,7 +1836,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2158,7 +2156,7 @@ msgid "Normal"
 msgstr "Normāls"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2212,12 +2210,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Mainīgais"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2374,7 +2366,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2509,6 +2501,9 @@ msgstr "Cenas atlaide"
 #~ msgid "Products Categories"
 #~ msgstr "Preču kategorijas"
 
+#~ msgid "Day"
+#~ msgstr "Diena"
+
 #~ msgid "UoM"
 #~ msgstr "Mērvienība"
 
@@ -2614,6 +2609,9 @@ msgstr "Cenas atlaide"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Kitchen Design Project"
 
+#~ msgid "Hour"
+#~ msgstr "Stunda"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Dažādi"
 
@@ -2666,6 +2664,9 @@ msgstr "Cenas atlaide"
 #~ msgid "Procurement Method"
 #~ msgstr "Sagādes metode"
 
+#~ msgid "Partners"
+#~ msgstr "Partneri"
+
 #~ msgid "Second UoM"
 #~ msgstr "Otra mērvienība"
 
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 511146eec6f..bc37b1ee2cd 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Үндсэн нийлүүлэгчээс нэг удаад нийлүүлэх доод хэмжээ"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Өдөр"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,7 +116,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -130,11 +125,6 @@ msgstr ""
 "Барааны %s хэмжих нэгжээс анхны %s хэмжих нэгж рүү хөрвүүлэх боломжгүй. Учир "
 "нь эдгээр нь өөр хэмжих нэгжийн ангилалд байна."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Олон тооны"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -193,7 +183,7 @@ msgid "Product Type"
 msgstr "Барааны төрөл"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Бараа: "
@@ -281,11 +271,6 @@ msgstr ""
 msgid "Category"
 msgstr "Ангилал"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -510,6 +495,11 @@ msgstr "Хэмжих төрөл"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -569,13 +559,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Бараанд нэг эсвэл олон нийлүүлэгч холбогдож болно. Бүх мэдээлэл барааны "
-"формд багтана."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -583,7 +569,7 @@ msgid "The width of the package"
 msgstr "Савлагааны өргөний хэмжээ"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -688,6 +674,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Нийлүүлэгч"
 
@@ -715,8 +702,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -790,6 +777,11 @@ msgstr "Дэд ангиллууд"
 msgid "End Date"
 msgstr "Дуусах өдөр"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -823,7 +815,6 @@ msgstr "Түлхүүр"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -831,8 +822,8 @@ msgstr "Үнийн хүснэгт"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Цаг"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -845,9 +836,13 @@ msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Бараанд нэг эсвэл олон нийлүүлэгч холбогдож болно. Бүх мэдээлэл барааны "
+"формд багтана."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -912,11 +907,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Савлагааны нийт жин"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "үл мэдэгдэх"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1090,6 +1080,11 @@ msgstr "Нэгж үнэ"
 msgid "Right Parent"
 msgstr "Баруун Эцэг"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1164,6 +1159,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Барааны харгалзах ангилалын хувьд эрэмбэ дарааллыг тодорхойлно."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1241,7 +1241,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1295,11 +1295,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Харилцагч"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1313,7 +1308,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Нийлүүлэгчийн мэдээлэл"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1437,17 +1437,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Тоологдох"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1557,8 +1550,8 @@ msgid "Pricelist Name"
 msgstr "Үнийн хүснэгтийн нэр"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1789,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1825,7 +1818,7 @@ msgid "Default Unit of Measure"
 msgstr "Үндсэн хэмжих нэгж"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Нийлүүлэгчийн санал болгосон үнэ"
@@ -1851,7 +1844,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2163,7 +2161,7 @@ msgid "Normal"
 msgstr "Хэвийн"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2219,12 +2217,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Хувьсах"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2381,7 +2373,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2549,6 +2541,9 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgid "Mouse"
 #~ msgstr "Хулгана"
 
+#~ msgid "Partners"
+#~ msgstr "Харилцагч"
+
 #~ msgid "Create new Product"
 #~ msgstr "Шинэ бараа үүсгэх"
 
@@ -2558,9 +2553,6 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgid "Priority"
 #~ msgstr "Урьтамж"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Нийлүүлэгчийн мэдээлэл"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Харилцагчийн барааны нэр"
 
@@ -2926,6 +2918,9 @@ msgstr "Үнийн хөнгөлөлт"
 #~ "Алдаа: Анхны хэм.нэгж болон Нийлүүлэгчийн Барааны хэм.нэгж нь ижил категорит "
 #~ "байх ёстой."
 
+#~ msgid "Day"
+#~ msgstr "Өдөр"
+
 #~ msgid "UoM"
 #~ msgstr "Хэмжих нэгж"
 
@@ -2968,6 +2963,9 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Гал Тогооны Зохиомжийн Төсөл"
 
+#~ msgid "Hour"
+#~ msgstr "Цаг"
+
 #~ msgid "Bigger than the reference UoM"
 #~ msgstr "Сурвалж хэм.нэгж-с их/том"
 
@@ -3299,6 +3297,9 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgid "Quantity Available"
 #~ msgstr "Байгаа тоо хэмжээ"
 
+#~ msgid "Dozen"
+#~ msgstr "Олон тооны"
+
 #, python-format
 #~ msgid ""
 #~ "New UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'. If "
@@ -3369,6 +3370,9 @@ msgstr "Үнийн хөнгөлөлт"
 #~ "Бусад тохиолдолд, 'дотоод' гэсэн төрлийн хадгалах байрлалууд дахь барааны "
 #~ "тоо хэмжээ байна."
 
+#~ msgid "unknown"
+#~ msgstr "үл мэдэгдэх"
+
 #~ msgid "Cabinet"
 #~ msgstr "Кабинет"
 
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 382815119b2..13bfd171f02 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:47+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Dette er minimumsantall som kjøpes fra hovedleverandør."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dag"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,7 +117,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -131,11 +126,6 @@ msgstr ""
 "Konvertering fra vareenhet %s til standard enhet %s er ikke mulig ettersom "
 "enhetene tilhører ulike kategorier!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dusin"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -195,7 +185,7 @@ msgid "Product Type"
 msgstr "Produkttype"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produkter: "
@@ -283,11 +273,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -512,6 +497,11 @@ msgstr "Måletype"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -571,13 +561,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"En eller flere leverandør(er) kan bli forbundet til et produkt. All "
-"informasjon står i produktangivelsen."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -585,7 +571,7 @@ msgid "The width of the package"
 msgstr "Forpakningsbredde"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -690,6 +676,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Leverandør"
 
@@ -717,8 +704,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -792,6 +779,11 @@ msgstr "Underordnede kategorier"
 msgid "End Date"
 msgstr "Sluttdato"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -825,7 +817,6 @@ msgstr "Nøkkel"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -833,8 +824,8 @@ msgstr "Prisliste"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Time"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -847,9 +838,13 @@ msgid "Partner"
 msgstr "Klient"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"En eller flere leverandør(er) kan bli forbundet til et produkt. All "
+"informasjon står i produktangivelsen."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -914,11 +909,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total vekt på pakke"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "ukjent"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1091,6 +1081,11 @@ msgstr "Enhetspris"
 msgid "Right Parent"
 msgstr "Høyre overordnet"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1165,6 +1160,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Gir sekvensen orden når det viser en liste over produktkategorier."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1240,7 +1240,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1294,11 +1294,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Klienter"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1312,7 +1307,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1433,17 +1433,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Enhet"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1553,8 +1546,8 @@ msgid "Pricelist Name"
 msgstr "Navn på prisliste"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1785,7 +1778,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1821,7 +1814,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partnerdelen av produktskjemaet"
@@ -1847,7 +1840,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2161,7 +2159,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2217,12 +2215,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabel"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2379,7 +2371,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2566,6 +2558,9 @@ msgstr "Prisrabatt"
 #~ msgid "Sellable"
 #~ msgstr "Salgbar"
 
+#~ msgid "Day"
+#~ msgstr "Dag"
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Advarsel !"
@@ -2655,6 +2650,9 @@ msgstr "Prisrabatt"
 #~ "Angi en produkt hvis regel kun skal anvendes for ett bestemt produkt. Angi "
 #~ "blankt for alle produkter"
 
+#~ msgid "Hour"
+#~ msgstr "Time"
+
 #~ msgid "g"
 #~ msgstr "g"
 
@@ -2683,6 +2681,9 @@ msgstr "Prisrabatt"
 #~ msgid " (copy)"
 #~ msgstr " (kopier)"
 
+#~ msgid "Partners"
+#~ msgstr "Klienter"
+
 #~ msgid "Second UoM"
 #~ msgstr "Sekundær UoM"
 
@@ -2849,6 +2850,9 @@ msgstr "Prisrabatt"
 #~ msgid "Phone Help"
 #~ msgstr "Telefonhjelp"
 
+#~ msgid "unknown"
+#~ msgstr "ukjent"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Advarsel"
@@ -2918,6 +2922,9 @@ msgstr "Prisrabatt"
 #~ "oppgave avhengig av produkttype.\r\n"
 #~ "'Kjøp' vil ved behov for anskaffelse danne bestilling."
 
+#~ msgid "Dozen"
+#~ msgstr "Dusin"
+
 #~ msgid "Ending date for this pricelist version to be valid."
 #~ msgstr "Sluttdato for gyldighet på, denne prislisteversjonen."
 
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index 049a305bb29..2573291584c 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 21:14+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "De minimale bestelhoeveelheid bij de hoofdleverancier"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dag"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -112,8 +107,8 @@ msgstr ""
 "ingevoegd."
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -124,7 +119,7 @@ msgid "Small-sized image"
 msgstr "Kleine afbeelding"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -133,11 +128,6 @@ msgstr ""
 "Conversie van product maateenheid %s naar de standaard maateenheid %s is "
 "niet mogelijk, omdat deze behoren tot een verschillende categorie!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dozijn"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -198,7 +188,7 @@ msgid "Product Type"
 msgstr "Soort product"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Producten: "
@@ -290,11 +280,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categorie"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Liter"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -520,6 +505,11 @@ msgstr "Maateenheid (ME)"
 msgid "Headset standard"
 msgstr "Headset standaard"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -583,13 +573,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Eén of meer leverancier(s) kunnen aan een product worden gekoppeld. Alle "
-"informatie is terug te vinden in het product formulier."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -597,7 +583,7 @@ msgid "The width of the package"
 msgstr "De breedte van het pakket"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "Verschillende maateenheid categorie."
@@ -702,6 +688,7 @@ msgstr "HDD SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Leverancier"
 
@@ -729,9 +716,9 @@ msgid "If checked new messages require your attention."
 msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "Verkoopbaar"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "EAN13 Barcode"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -804,6 +791,11 @@ msgstr "Subcategorieën"
 msgid "End Date"
 msgstr "Einddatum"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -837,7 +829,6 @@ msgstr "Sleutel"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -845,8 +836,8 @@ msgstr "Prijslijst"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Uur"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -859,9 +850,13 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Eén of meer leverancier(s) kunnen aan een product worden gekoppeld. Alle "
+"informatie is terug te vinden in het product formulier."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -926,11 +921,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Totaal pakketgewicht"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "onbekend"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1108,6 +1098,11 @@ msgstr "Prijs"
 msgid "Right Parent"
 msgstr "Bovenliggende"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1183,6 +1178,11 @@ msgid ""
 msgstr ""
 "Geeft de volgorde weer waarin de product categorieën worden weergegeven."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1259,7 +1259,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1313,11 +1313,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Relaties"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1331,7 +1326,12 @@ msgid "Inventory"
 msgstr "Voorraadtelling"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Leveranciersinfo"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -1455,17 +1455,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Eenheid"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "Product is <b>aangemaakt</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1579,9 +1572,9 @@ msgid "Pricelist Name"
 msgstr "Naam prijslijst"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "Verkoopbaar"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1811,7 +1804,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1847,7 +1840,7 @@ msgid "Default Unit of Measure"
 msgstr "Standaard maateenheid"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Leveranciers sectie op productformulier"
@@ -1873,7 +1866,12 @@ msgid "Messages"
 msgstr "Berichten"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -2193,7 +2191,7 @@ msgid "Normal"
 msgstr "Normaal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2249,12 +2247,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabel"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2415,7 +2407,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2554,6 +2546,9 @@ msgstr "Korting"
 #~ msgid "Keyboard"
 #~ msgstr "Toetsenbord"
 
+#~ msgid "Partners"
+#~ msgstr "Relaties"
+
 #~ msgid "Priority"
 #~ msgstr "Prioriteit"
 
@@ -2641,9 +2636,6 @@ msgstr "Korting"
 #~ msgid "Factor"
 #~ msgstr "Factor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Leveranciersinfo"
-
 #~ msgid "PCE"
 #~ msgstr "Stuks"
 
@@ -3067,6 +3059,9 @@ msgstr "Korting"
 #~ "Fout ! U kunt de hoofd prijslijst niet als andere prijslijst toekennen in "
 #~ "prijslijst item!"
 
+#~ msgid "Day"
+#~ msgstr "Dag"
+
 #~ msgid "Reference"
 #~ msgstr "Referentie"
 
@@ -3104,6 +3099,9 @@ msgstr "Korting"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Keuken ontwerp project"
 
+#~ msgid "Hour"
+#~ msgstr "Uur"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Uitgebreide filters..."
 
@@ -3130,9 +3128,6 @@ msgstr "Korting"
 #~ "Fout! De standaard meeteenheid van de leverancier en die van het product "
 #~ "moeten in dezelfde categorie vallen."
 
-#~ msgid "UoM"
-#~ msgstr "Eenh."
-
 #~ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 #~ msgstr "  bijv.: 1 * (deze eenheid) = ratio * (referentie eenheid)"
 
@@ -3363,6 +3358,9 @@ msgstr "Korting"
 #~ msgid "Assembly Section"
 #~ msgstr "Montage sectie"
 
+#~ msgid "Dozen"
+#~ msgstr "Dozijn"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Diensten op urenverantwoording"
 
@@ -3377,6 +3375,9 @@ msgstr "Korting"
 #~ "Maak een product aan voor alles wat je koopt en verkoopt. Specificeer een "
 #~ "leverancier als het product kan worden ingekocht."
 
+#~ msgid "unknown"
+#~ msgstr "onbekend"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Houten tafel"
 
@@ -3770,3 +3771,6 @@ msgstr "Korting"
 #~ "Vaste prijs: de kostprijs is vast en word periodiek herberekend (meestal aan "
 #~ "het eind van het jaar), Gemiddelde prijs: de kostprijs wordt bij elke "
 #~ "binnenkomst van producten opnieuw berekend"
+
+#~ msgid "UoM"
+#~ msgstr "Maateenheid"
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index db0fc49e0b0..c281fd2a988 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-02 10:07+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: nl\n"
 
 #. module: product
@@ -34,11 +34,6 @@ msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 "Dit is de minimumhoeveelheid die bij de hoofdleverancier moet worden gekocht."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dag"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -112,8 +107,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -124,7 +119,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -133,11 +128,6 @@ msgstr ""
 "Conversie van producteenheid %s naar standaardeenheid %s is niet mogelijk, "
 "omdat de eenheden niet tot dezelfde categorie behoren."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dozijn"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -198,7 +188,7 @@ msgid "Product Type"
 msgstr "Producttype"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Producten: "
@@ -286,11 +276,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categorie"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -515,6 +500,11 @@ msgstr "Maattype"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -574,13 +564,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Aan een product kunnen 1 of meer leveranciers worden gekoppeld. Alle "
-"informatie bevindt zich in het productformulier."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -588,7 +574,7 @@ msgid "The width of the package"
 msgstr "Breedte van verpakking"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -693,6 +679,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Leverancier"
 
@@ -720,8 +707,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -795,6 +782,11 @@ msgstr "Onderliggende categorieën"
 msgid "End Date"
 msgstr "Einddatum"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -828,7 +820,6 @@ msgstr "Sleutel"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -836,8 +827,8 @@ msgstr "Prijslijst"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Uur"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -850,9 +841,13 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Aan een product kunnen 1 of meer leveranciers worden gekoppeld. Alle "
+"informatie bevindt zich in het productformulier."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -917,11 +912,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Totaalgewicht verpakking"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "onbekend"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1095,6 +1085,11 @@ msgstr "Eenheidsprijs"
 msgid "Right Parent"
 msgstr "Rechterhoofd"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1170,6 +1165,11 @@ msgid ""
 msgstr ""
 "Toont de volgorde bij het weergeven van een lijst van productcategorieën."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1247,7 +1247,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1301,11 +1301,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Relaties"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1319,7 +1314,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1443,17 +1443,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Eenheid"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1563,8 +1556,8 @@ msgid "Pricelist Name"
 msgstr "Prijslijstnaam"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1795,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1831,7 +1824,7 @@ msgid "Default Unit of Measure"
 msgstr "Standaardmaateenheid"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Relatiesectie van het productformulier"
@@ -1857,7 +1850,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2174,7 +2172,7 @@ msgid "Normal"
 msgstr "Normaal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2230,12 +2228,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabel"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2392,7 +2384,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2578,6 +2570,9 @@ msgstr "Korting"
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Mainboard ASUStek A7V8X-X"
 
+#~ msgid "Day"
+#~ msgstr "Dag"
+
 #~ msgid "UoM"
 #~ msgstr "Eenh."
 
@@ -2601,6 +2596,9 @@ msgstr "Korting"
 #~ msgid "Keyboard"
 #~ msgstr "Toetsenbord"
 
+#~ msgid "Dozen"
+#~ msgstr "Dozijn"
+
 #~ msgid "Processor AMD Athlon XP 1800+"
 #~ msgstr "Processor AMD Athlon XP 1800+"
 
@@ -2854,6 +2852,9 @@ msgstr "Korting"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Keukenontwerp"
 
+#~ msgid "Hour"
+#~ msgstr "Uur"
+
 #, python-format
 #~ msgid "UoM categories Mismatch!"
 #~ msgstr "Verkeerde maateenheidcategorie"
@@ -2884,6 +2885,9 @@ msgstr "Korting"
 #~ "Maak en beheer maateenheden die u nodig heeft. U kunt een conversieratio "
 #~ "instellen tussen meerdere maateenheden binnen een categorie."
 
+#~ msgid "unknown"
+#~ msgstr "onbekend"
+
 #~ msgid ""
 #~ "Product's cost for accounting stock valuation. It is the base price for the "
 #~ "supplier price."
@@ -2998,6 +3002,9 @@ msgstr "Korting"
 #~ msgid " (copy)"
 #~ msgstr " (kopie)"
 
+#~ msgid "Partners"
+#~ msgstr "Relaties"
+
 #~ msgid ""
 #~ "This is the average delay in days between the confirmation of the customer "
 #~ "order and the delivery of the finished products. It's the time you promise "
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 3cd1b46649a..b7aee9d0ebd 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 19:25+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-17 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr "Cena podstawowa do obliczeń"
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "To jest minimalna ilość zakupu u głównego dostawcy."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dzień"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -113,8 +108,8 @@ msgstr ""
 "kanban."
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -125,7 +120,7 @@ msgid "Small-sized image"
 msgstr "Mały obrazek"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -134,11 +129,6 @@ msgstr ""
 "Konwersja z jednostki %s do jednostki domyślnej %s jest niemożliwa ponieważ "
 "należą one do innych kategorii!."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Tuzin"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -198,7 +188,7 @@ msgid "Product Type"
 msgstr "Typ produktu"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produkty: "
@@ -299,11 +289,6 @@ msgstr "Jeśli nie zaznaczone, to można ukryć produkt bez jego usuwania."
 msgid "Category"
 msgstr "Kategoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Litr"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -533,6 +518,11 @@ msgstr "Typ miary"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -594,13 +584,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Jeden lub kilku dostawców może być związane z produktem. Informacje o tym są "
-"w formularzu produktu."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -608,7 +594,7 @@ msgid "The width of the package"
 msgstr "Szerokość opakowania"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "Niezgodne kategorie jednostek miary !"
@@ -715,6 +701,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dostawca"
 
@@ -746,9 +733,9 @@ msgid "If checked new messages require your attention."
 msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi"
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "Do sprzedaży"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -823,6 +810,11 @@ msgstr "Kategorie podrzędne"
 msgid "End Date"
 msgstr "Data końcowa"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -856,7 +848,6 @@ msgstr "Klucz"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -864,8 +855,8 @@ msgstr "Cennik"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Godzina"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -878,9 +869,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Jeden lub kilku dostawców może być związane z produktem. Informacje o tym są "
+"w formularzu produktu."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -948,11 +943,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Suma wag opakowań"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "nieznane"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1143,6 +1133,11 @@ msgstr "Cena jednostkowa"
 msgid "Right Parent"
 msgstr "Prawa nadrzędna"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1217,6 +1212,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Określa kolejność wyświetlania listy kategorii produktów."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1299,7 +1299,7 @@ msgstr ""
 "            "
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1356,11 +1356,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partnerzy"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1376,7 +1371,12 @@ msgid "Inventory"
 msgstr "Zapasy"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info dostawcy"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -1503,17 +1503,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jednostka"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "Produkt został <b>utworzony</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1631,9 +1624,9 @@ msgid "Pricelist Name"
 msgstr "Nazwa cennika"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr ""
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "Do sprzedaży"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1882,7 +1875,7 @@ msgstr ""
 "pole puste."
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr "Nie mozna zmieniać kategorii istniejącej jednostki miary '%s'."
@@ -1918,7 +1911,7 @@ msgid "Default Unit of Measure"
 msgstr "Domyślna jednostka miary"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sekcja dostawcy w formularzu produktu"
@@ -1944,7 +1937,12 @@ msgid "Messages"
 msgstr "Wiadomości"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -2282,7 +2280,7 @@ msgid "Normal"
 msgstr "Normalny"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2338,12 +2336,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Zmienna"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2500,7 +2492,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2687,6 +2679,9 @@ msgstr "Upust cenowy"
 #~ msgid "Create new Product"
 #~ msgstr "Utwórz nowy produkt"
 
+#~ msgid "Partners"
+#~ msgstr "Partnerzy"
+
 #~ msgid "Mouse"
 #~ msgstr "Mysz"
 
@@ -2789,9 +2784,6 @@ msgstr "Upust cenowy"
 #~ msgid "Price type"
 #~ msgstr "Typ ceny"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info dostawcy"
-
 #~ msgid "Can be Purchased"
 #~ msgstr "Może być kupowane"
 
@@ -3181,6 +3173,9 @@ msgstr "Upust cenowy"
 #~ "Błąd ! Nie możesz powiązać głównego cennika jako innego cennika w elemencie "
 #~ "cennika!"
 
+#~ msgid "Day"
+#~ msgstr "Dzień"
+
 #~ msgid "UoM"
 #~ msgstr "JM"
 
@@ -3252,6 +3247,9 @@ msgstr "Upust cenowy"
 #~ "Stosuj, jeśli firma stosuje inna jednostkę do fakturowania i wyceny zapasów. "
 #~ "Pozostaw puste, aby stosować domyślną jednostkę miary."
 
+#~ msgid "Hour"
+#~ msgstr "Godzina"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Różne"
 
@@ -3547,3 +3545,9 @@ msgstr "Upust cenowy"
 
 #~ msgid "Reference"
 #~ msgstr "Kod"
+
+#~ msgid "Dozen"
+#~ msgstr "Tuzin"
+
+#~ msgid "unknown"
+#~ msgstr "nieznane"
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index a9a6df49e22..fd120a023fe 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:41+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Esta é a quantidade mínima para comprar no fornecedor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dia"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,7 +116,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -130,11 +125,6 @@ msgstr ""
 "Conversão do artigo UdM %s para o UdM padrão %s não é possível porque ambos "
 "pertencem a categorias diferentes!."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dúzia"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -194,7 +184,7 @@ msgid "Product Type"
 msgstr "Tipo de Artigo"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Artigos: "
@@ -282,11 +272,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -512,6 +497,11 @@ msgstr "Tipo de Medida"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -571,13 +561,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 ou vários fornecedor(s) podem ser ligados a um artigo. Toda a informação "
-"está na forma de artigo."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -585,7 +571,7 @@ msgid "The width of the package"
 msgstr "O volume da embalagem"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -690,6 +676,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Fornecedor"
 
@@ -717,8 +704,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -792,6 +779,11 @@ msgstr "Categorias Descendentes"
 msgid "End Date"
 msgstr "Data Final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -825,7 +817,6 @@ msgstr "Chave"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -833,8 +824,8 @@ msgstr "Lista de Preços"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -847,9 +838,13 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 ou vários fornecedor(s) podem ser ligados a um artigo. Toda a informação "
+"está na forma de artigo."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -914,11 +909,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Peso Total da Embalagem"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "Desconhecido"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1092,6 +1082,11 @@ msgstr "Preço Unitário"
 msgid "Right Parent"
 msgstr "Ascendente á Direita"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1167,6 +1162,11 @@ msgid ""
 msgstr ""
 "Dá a ordem da sequência ao exibir uma lista de categorias de artigos."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1243,7 +1243,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1297,11 +1297,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Parceiros"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1315,7 +1310,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info do Fornecedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1439,17 +1439,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidade"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1559,8 +1552,8 @@ msgid "Pricelist Name"
 msgstr "Nome da Lista de Preços"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1791,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1827,7 +1820,7 @@ msgid "Default Unit of Measure"
 msgstr "Unidade de Medida por defeito"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Secção Parceiro do formulário do artigo"
@@ -1853,7 +1846,12 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -2169,7 +2167,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2225,12 +2223,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variável"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2387,7 +2379,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2553,6 +2545,9 @@ msgstr "Desconto"
 #~ msgid "Mouse"
 #~ msgstr "Rato"
 
+#~ msgid "Partners"
+#~ msgstr "Parceiros"
+
 #~ msgid "Processor AMD Athlon XP 1800+"
 #~ msgstr "Processador AMD Athlon XP 1800+"
 
@@ -2755,9 +2750,6 @@ msgstr "Desconto"
 #~ msgid "HDD on demand"
 #~ msgstr "HDD a pedido"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info do Fornecedor"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Nome do Produto do Terceiro"
 
@@ -2982,6 +2974,9 @@ msgstr "Desconto"
 #~ "Defina uma categoria de produto se esta regra aplica-se apenas para produtos "
 #~ "de uma categoria e seus dependentes. Manter vazio para todos os produtos."
 
+#~ msgid "Day"
+#~ msgstr "Dia"
+
 #~ msgid "UoM"
 #~ msgstr "UdM"
 
@@ -3027,6 +3022,9 @@ msgstr "Desconto"
 #~ msgid "Side Panel"
 #~ msgstr "Painel Lateral"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Diversos"
 
@@ -3125,6 +3123,9 @@ msgstr "Desconto"
 #~ msgid "Shelves"
 #~ msgstr "Prateleiras"
 
+#~ msgid "Dozen"
+#~ msgstr "Dúzia"
+
 #~ msgid ""
 #~ "Quantities of products that are planned to arrive in selected locations or "
 #~ "all internal if none have been selected."
@@ -3395,6 +3396,9 @@ msgstr "Desconto"
 #~ msgid "Wood 10mm"
 #~ msgstr "madeira 10mm"
 
+#~ msgid "unknown"
+#~ msgstr "Desconhecido"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Tabela de madeira"
 
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 8b597c80738..da32a577849 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-20 23:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 01:30+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
@@ -32,11 +32,6 @@ msgstr "Preço Base para Cálculo"
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Esta é a quantidade mínima para compra do fornecedor principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dia"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -115,8 +110,8 @@ msgstr ""
 "kanban."
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -127,7 +122,7 @@ msgid "Small-sized image"
 msgstr "Imagem reduzida"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -136,11 +131,6 @@ msgstr ""
 "Conversão de uma UdM de um produto %s  para um padrão de UdM %s não é "
 "possível pois eles pertencem a categorias diferentes"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dúzia"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -201,7 +191,7 @@ msgid "Product Type"
 msgstr "Tipo de Produto"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produtos: "
@@ -305,11 +295,6 @@ msgstr "Se desmarcado, permitirá que você esconda o produto sem removê-lo."
 msgid "Category"
 msgstr "Categoria"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Litro"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -558,6 +543,11 @@ msgstr "Tipo de Medida"
 msgid "Headset standard"
 msgstr "Headset Padrão"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr "Dia(s)"
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -631,13 +621,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr "Montagem de PC  + (PC on Demand) personalizado"
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
-msgstr ""
-"Um ou vários fornecedores podem ser ligados a um produto. Todas as "
-"informações ficam na tela de produtos."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr "Laptop personalizado com base em exigência do cliente."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -645,7 +631,7 @@ msgid "The width of the package"
 msgstr "A largura da embalagem"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "Categorias de Unidades de Medida Diferentes!"
@@ -752,6 +738,7 @@ msgstr "HDD SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Fornecedor"
 
@@ -782,9 +769,9 @@ msgid "If checked new messages require your attention."
 msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "Vendável"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "Código EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -859,6 +846,11 @@ msgstr "Categorias Filha"
 msgid "End Date"
 msgstr "Data Final"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr "Litro(s)"
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -892,7 +884,6 @@ msgstr "Tecla"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -900,8 +891,8 @@ msgstr "Lista de Preços"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hora"
+msgid "Hour(s)"
+msgstr "Hora(s)"
 
 #. module: product
 #: selection:product.template,state:0
@@ -914,9 +905,13 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
-msgstr "Laptop personalizado com base em exigência do cliente."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+"Um ou vários fornecedores podem ser ligados a um produto. Todas as "
+"informações ficam na tela de produtos."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -984,11 +979,6 @@ msgstr "Placa-mãe I9P57"
 msgid "Total Package Weight"
 msgstr "Peso Bruto Total"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "desconhecido"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1188,6 +1178,11 @@ msgstr "Preço Unitário"
 msgid "Right Parent"
 msgstr "Próximo pai"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr "Preço"
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1264,6 +1259,11 @@ msgstr ""
 "Define a ordem de apresentação quando mostrar a lista de categorias de "
 "produtos."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr "Dúzia(s)"
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1347,7 +1347,7 @@ msgstr ""
 "            "
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1409,11 +1409,6 @@ msgstr ""
 "Este campo contém a imagem utilizada como imagem do produto, limitada a "
 "1024x1024px."
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Parceiros"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1429,7 +1424,12 @@ msgid "Inventory"
 msgstr "Inventário"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Informação do fornecedor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -1556,17 +1556,10 @@ msgstr "Imagem de tamanho Médio"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unidade"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "O Produto foi <b>criado</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1689,9 +1682,9 @@ msgid "Pricelist Name"
 msgstr "Nome da lista de preços"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "Código EAN13"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "Vendável"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1941,7 +1934,7 @@ msgstr ""
 "medida padrão."
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1978,7 +1971,7 @@ msgid "Default Unit of Measure"
 msgstr "Unid. de Medida Padrão"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Seção de parceiro na tela de produto."
@@ -2004,7 +1997,12 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr "Unidade(s)"
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -2368,7 +2366,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2442,12 +2440,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variável"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2621,7 +2613,7 @@ msgid "15” LCD Monitor"
 msgstr "Monitor 15” LCD"
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2867,6 +2859,9 @@ msgstr "Desconto"
 #~ msgid "Mouse"
 #~ msgstr "Mouse"
 
+#~ msgid "Partners"
+#~ msgstr "Parceiros"
+
 #~ msgid "Create new Product"
 #~ msgstr "Criar novo produto"
 
@@ -2882,9 +2877,6 @@ msgstr "Desconto"
 #~ msgid "Factor"
 #~ msgstr "Fator"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Informação do fornecedor"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Nome do produto para o parceiro"
 
@@ -3203,6 +3195,9 @@ msgstr "Desconto"
 #~ "Erro: A unidade de medida padrão e a unidade de medida do fornecedor devem "
 #~ "estar na mesma categoria."
 
+#~ msgid "Day"
+#~ msgstr "Dia"
+
 #~ msgid "Reference"
 #~ msgstr "Referência"
 
@@ -3260,6 +3255,9 @@ msgstr "Desconto"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projeto de Design de Cozinha"
 
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Diversos"
 
@@ -3645,6 +3643,9 @@ msgstr "Desconto"
 #~ msgid "Quantity Available"
 #~ msgstr "Quantidade Disponível"
 
+#~ msgid "Dozen"
+#~ msgstr "Dúzia"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Lançamentos de Horas de Serviço"
 
@@ -3907,3 +3908,6 @@ msgstr "Desconto"
 
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "Erro! Você não pode criar membros associados recursivamente."
+
+#~ msgid "unknown"
+#~ msgstr "desconhecido"
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index 474bc31c79c..c31a6817b5c 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 "Aceasta este cantitatea minima de achizitionat de la Furnizorul principal."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Zi"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,7 +117,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -131,11 +126,6 @@ msgstr ""
 "Conversia din UdM a Produsului %s in UdM Implicita %s nu este posibila "
 "pentru ca cele doua apartin unor Categorii diferite!."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Duzina"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -196,7 +186,7 @@ msgid "Product Type"
 msgstr "Tipul de produs"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produse: "
@@ -284,11 +274,6 @@ msgstr ""
 msgid "Category"
 msgstr "Categorie"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -514,6 +499,11 @@ msgstr "Tipul masurii"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -573,13 +563,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 sau mai multi furnizori pot fi asociati unui produs. Gasiti toate "
-"informatiile in formularul produsului."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -587,7 +573,7 @@ msgid "The width of the package"
 msgstr "Latimea coletului"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -692,6 +678,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Furnizor"
 
@@ -719,8 +706,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -794,6 +781,11 @@ msgstr "Categorii subordonate"
 msgid "End Date"
 msgstr "Data de sfarsit"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -827,7 +819,6 @@ msgstr "Tasta"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -835,8 +826,8 @@ msgstr "Lista de preturi"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Ora"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -849,9 +840,13 @@ msgid "Partner"
 msgstr "Partener"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 sau mai multi furnizori pot fi asociati unui produs. Gasiti toate "
+"informatiile in formularul produsului."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -916,11 +911,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Greutatea totala a coletului"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "necunoscut(a)"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1094,6 +1084,11 @@ msgstr "Pret unitar"
 msgid "Right Parent"
 msgstr "Parinte Dreapta"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1170,6 +1165,11 @@ msgstr ""
 "Prezinta ordinea secventei atunci cand afiseaza o lista cu categorii de "
 "produse."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1246,7 +1246,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1300,11 +1300,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Parteneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1318,7 +1313,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Informaţii furnizor"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1442,17 +1442,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Unitate"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1562,8 +1555,8 @@ msgid "Pricelist Name"
 msgstr "Numele Listei de preturi"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1795,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1831,7 +1824,7 @@ msgid "Default Unit of Measure"
 msgstr "Unitate de măsură implicită"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sectiunea partenerului din formularul produsului"
@@ -1859,7 +1852,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2175,7 +2173,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2231,12 +2229,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabil(a)"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2393,7 +2385,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2538,6 +2530,9 @@ msgstr "Reduceri de pret"
 #~ msgid "Default UoM"
 #~ msgstr "UM Implicită"
 
+#~ msgid "Partners"
+#~ msgstr "Parteneri"
+
 #~ msgid "Priority"
 #~ msgstr "Prioritate"
 
@@ -2584,9 +2579,6 @@ msgstr "Reduceri de pret"
 #~ msgid "HDD Seagate 7200.8 80GB"
 #~ msgstr "HDD Seagate 7200.8 80GB"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Informaţii furnizor"
-
 #~ msgid "Customer Price"
 #~ msgstr "Pret client"
 
@@ -3001,6 +2993,9 @@ msgstr "Reduceri de pret"
 #~ "Eroare ! Nu puteti atribui Lista de preturi Principala ca o Alta Lista de "
 #~ "preturi in Obiectul Listei de preturi!"
 
+#~ msgid "Day"
+#~ msgstr "Zi"
+
 #~ msgid "UoM"
 #~ msgstr "UdeM"
 
@@ -3033,6 +3028,9 @@ msgstr "Reduceri de pret"
 #~ msgid "Reference"
 #~ msgstr "Referinta"
 
+#~ msgid "Dozen"
+#~ msgstr "Duzina"
+
 #~ msgid "Keyboard"
 #~ msgstr "Tastatura"
 
@@ -3239,6 +3237,9 @@ msgstr "Reduceri de pret"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Proiect plan bucatarie"
 
+#~ msgid "Hour"
+#~ msgstr "Ora"
+
 #~ msgid ""
 #~ "Set a product if this rule only apply to one product. Keep empty for all "
 #~ "products"
@@ -3246,6 +3247,9 @@ msgstr "Reduceri de pret"
 #~ "Setati un produs daca aceasta regula se aplica doar pentrun un produs. "
 #~ "Lasati necompletat pentru toate produsele"
 
+#~ msgid "unknown"
+#~ msgstr "necunoscut(a)"
+
 #~ msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
 #~ msgstr "  ex: 1* (unitatea de referinta) = raport * (acesta unitate)"
 
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index e99fb5669fa..3f6eb99c5c7 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 11:06+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr "Базовая цена для вычислений."
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Это минимальное количество для закупки у основного поставщика."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "День"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -112,8 +107,8 @@ msgstr ""
 "html для возможности использования в канбан виде"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "Внимание!"
@@ -124,7 +119,7 @@ msgid "Small-sized image"
 msgstr "Маленькое изображение"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -133,11 +128,6 @@ msgstr ""
 "Преобразование ед.изм. товара %s в ед.изм. по умолчанию %s невозможно "
 "поскольку они принадлежат различным категориям!"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Дюжина"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -198,7 +188,7 @@ msgid "Product Type"
 msgstr "Тип продукции"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "ТМЦ: "
@@ -287,11 +277,6 @@ msgstr ""
 msgid "Category"
 msgstr "Категория"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "Литр"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -516,6 +501,11 @@ msgstr "Тип измерения"
 msgid "Headset standard"
 msgstr "Наушники стандартные"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -577,13 +567,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Один или несколько поставщиков могут быть связаны с ТМЦ. Вся информация в "
-"форме ТМЦ."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -591,7 +577,7 @@ msgid "The width of the package"
 msgstr "Ширина пакета"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "Несоответствие категорий единиц измерения!"
@@ -696,6 +682,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Поставщик"
 
@@ -723,9 +710,9 @@ msgid "If checked new messages require your attention."
 msgstr "Если установлено, новые сообщения требуют вашего внимания"
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "Продаваемое"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "Баркод EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -798,6 +785,11 @@ msgstr "Подчиненные категории"
 msgid "End Date"
 msgstr "Дата окончания"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -831,7 +823,6 @@ msgstr "Ключ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -839,8 +830,8 @@ msgstr "Прайс-лист"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Час"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -853,9 +844,13 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Один или несколько поставщиков могут быть связаны с ТМЦ. Вся информация в "
+"форме ТМЦ."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -920,11 +915,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Итоговый вес пакета"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "неизвесно"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1098,6 +1088,11 @@ msgstr "Цена за ед."
 msgid "Right Parent"
 msgstr "Правый источник"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1172,6 +1167,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Дает порядок последовательности при выводе списка категорий ТМЦ."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1247,7 +1247,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1301,11 +1301,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Партнеры"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1319,7 +1314,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Информация о поставщике"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (копия)"
@@ -1443,17 +1443,10 @@ msgstr "Среднее изображение"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Ед."
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "Товар <b>создан</b>."
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1563,9 +1556,9 @@ msgid "Pricelist Name"
 msgstr "Название прайс-листа"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "Баркод EAN13"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "Продаваемое"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1798,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr "Невозможно изменить категорию существующие единицы измерения '%s'."
@@ -1834,7 +1827,7 @@ msgid "Default Unit of Measure"
 msgstr "Единица измерения по умолчанию"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Раздел партнера в форме ввода ТМЦ"
@@ -1860,7 +1853,12 @@ msgid "Messages"
 msgstr "Сообщения"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -2176,7 +2174,7 @@ msgid "Normal"
 msgstr "Обычный"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2232,12 +2230,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Переменный"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Комментарии и эл. письма"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2394,7 +2386,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2597,6 +2589,9 @@ msgstr "Скидка с цены"
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Ошибка ! Невозможно создать рекурсивную категорию."
 
+#~ msgid "Partners"
+#~ msgstr "Партнеры"
+
 #~ msgid "In Production"
 #~ msgstr "В производстве"
 
@@ -2759,9 +2754,6 @@ msgstr "Скидка с цены"
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Число слоёв на палете или в коробке"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Информация о поставщике"
-
 #~ msgid ""
 #~ "The rule only applies if the partner buys/sells more than this quantity."
 #~ msgstr ""
@@ -2889,6 +2881,9 @@ msgstr "Скидка с цены"
 #~ "Ошибка: ед. изм. по умолчанию и ед. изм. поставщика продукции должны быть из "
 #~ "одной категории."
 
+#~ msgid "Day"
+#~ msgstr "День"
+
 #~ msgid "UoM"
 #~ msgstr "Ед. изм."
 
@@ -2929,6 +2924,9 @@ msgstr "Скидка с цены"
 #~ msgid "Side Panel"
 #~ msgstr "Боковая панель"
 
+#~ msgid "Hour"
+#~ msgstr "Час"
+
 #~ msgid "Rules Test Match"
 #~ msgstr "Проверка правил"
 
@@ -3363,6 +3361,9 @@ msgstr "Скидка с цены"
 #~ msgid "UoM categories Mismatch!"
 #~ msgstr "Несоответствие категорий единиц измерения!"
 
+#~ msgid "unknown"
+#~ msgstr "неизвесно"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Внимание"
@@ -3370,6 +3371,9 @@ msgstr "Скидка с цены"
 #~ msgid "UoM Categories"
 #~ msgstr "Категории единиц"
 
+#~ msgid "Dozen"
+#~ msgstr "Дюжина"
+
 #~ msgid "Cabinet"
 #~ msgstr "Шкаф"
 
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 676e650dde1..9fdd99d8a25 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Toto je minimálne množstvo k nákupu od hlavného dodávateľa."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Deň"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -110,8 +105,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -122,18 +117,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "Typ produktu"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produkty: "
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategória"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr "Typ merania"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,13 +556,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 alebo viacerí dodávateľa môžu byť pripojení k produktu. Všetky informácie "
-"sa nachádzajú vo formulári produktu."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -580,7 +566,7 @@ msgid "The width of the package"
 msgstr "Šírka balíka"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -684,6 +670,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dodávateľ"
 
@@ -711,8 +698,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -786,6 +773,11 @@ msgstr "Podkategórie"
 msgid "End Date"
 msgstr "Dátum ukončenia"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -819,7 +811,6 @@ msgstr "Kľúč"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -827,8 +818,8 @@ msgstr "Cenník"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Hodina"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -841,9 +832,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 alebo viacerí dodávateľa môžu byť pripojení k produktu. Všetky informácie "
+"sa nachádzajú vo formulári produktu."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -908,11 +903,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Celková hmotnosť balenia"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1086,6 +1076,11 @@ msgstr "Cena za kus"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1160,6 +1155,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1235,7 +1235,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1289,11 +1289,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1307,7 +1302,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Info o dodávateľovi"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1426,17 +1426,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jednotka"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1544,8 +1537,8 @@ msgid "Pricelist Name"
 msgstr "Názov cenníka"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1776,7 +1769,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1812,7 +1805,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1838,7 +1831,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2150,7 +2148,7 @@ msgid "Normal"
 msgstr "Normálny"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2202,12 +2200,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2364,7 +2356,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2540,6 +2532,9 @@ msgstr ""
 #~ msgid "Keyboard"
 #~ msgstr "Klávesnica"
 
+#~ msgid "Partners"
+#~ msgstr "Partneri"
+
 #~ msgid "In Production"
 #~ msgstr "Vo výrobe"
 
@@ -2558,9 +2553,6 @@ msgstr ""
 #~ msgid "Factor"
 #~ msgstr "Faktor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Info o dodávateľovi"
-
 #~ msgid "Product Process"
 #~ msgstr "Procesy produktu"
 
@@ -2661,6 +2653,9 @@ msgstr ""
 #~ msgid "Buy"
 #~ msgstr "Kúpiť"
 
+#~ msgid "Day"
+#~ msgstr "Deň"
+
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Mainboard ASUStek A7V8X-X"
 
@@ -2826,6 +2821,9 @@ msgstr ""
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projekt návrhu kuchyne"
 
+#~ msgid "Hour"
+#~ msgstr "Hodina"
+
 #~ msgid "Ratio & Precision"
 #~ msgstr "Pomer a presnosť"
 
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 4cbf10329e3..44b87f5f8ef 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:06+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 "To je minimalna količina, ki jo je možno kupiti pri Glavnem Dobavitelju"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dan"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,7 +116,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -130,11 +125,6 @@ msgstr ""
 "Pretvorba iz EM %s izdelka v privzeto  EM %s  ni mogoča, saj obe pripadata "
 "različnim kategorijam!."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Ducat"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -195,7 +185,7 @@ msgid "Product Type"
 msgstr "Vrsta izdelka"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produkti "
@@ -283,11 +273,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -512,6 +497,11 @@ msgstr "Vrsta mere"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -571,13 +561,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Eden ali več dobaviteljev lahko povežemo s proizvodom. Vse  informacije se "
-"nahajajo v formi proizvoda."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -585,7 +571,7 @@ msgid "The width of the package"
 msgstr "Širina paketa"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -690,6 +676,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dobavitelj"
 
@@ -717,8 +704,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -792,6 +779,11 @@ msgstr "Kategorije podrejenih"
 msgid "End Date"
 msgstr "Velja do"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -825,7 +817,6 @@ msgstr "Ključ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -833,8 +824,8 @@ msgstr "Cenik"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Ura"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -847,9 +838,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Eden ali več dobaviteljev lahko povežemo s proizvodom. Vse  informacije se "
+"nahajajo v formi proizvoda."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -914,11 +909,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Skupna masa paketa"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "neznano"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1089,6 +1079,11 @@ msgstr "Cena enote"
 msgid "Right Parent"
 msgstr "Desno pravilo"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1163,6 +1158,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1239,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1293,11 +1293,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partnerji"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1311,7 +1306,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1432,17 +1432,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Enota"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1551,8 +1544,8 @@ msgid "Pricelist Name"
 msgstr "Naziv cenika"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1783,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1819,7 +1812,7 @@ msgid "Default Unit of Measure"
 msgstr "Privzeta EM"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Podatki o partnerju v formi izdelka"
@@ -1845,7 +1838,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2158,7 +2156,7 @@ msgid "Normal"
 msgstr "Običajno"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2214,12 +2212,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Spremenljivo"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2376,7 +2368,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2591,6 +2583,9 @@ msgstr "Popust"
 #~ msgid "Mouse"
 #~ msgstr "Miška"
 
+#~ msgid "Partners"
+#~ msgstr "Partnerji"
+
 #~ msgid "Processor AMD Athlon XP 1800+"
 #~ msgstr "Procesor AMD Athlon XP 1800+"
 
@@ -2822,6 +2817,9 @@ msgstr "Popust"
 #~ msgid "Gross weight"
 #~ msgstr "Bruto masa"
 
+#~ msgid "Day"
+#~ msgstr "Dan"
+
 #~ msgid "Sellable"
 #~ msgstr "Možno prodati"
 
@@ -2851,6 +2849,9 @@ msgstr "Popust"
 #~ "Napaka! Glavnega Cenika ne morete dodeliti kot Drugega Cenika v postavki "
 #~ "cenika!"
 
+#~ msgid "Dozen"
+#~ msgstr "Ducat"
+
 #~ msgid "Wood 2mm"
 #~ msgstr "Les 2mm"
 
@@ -2966,6 +2967,9 @@ msgstr "Popust"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projekt dizajna kuhinje"
 
+#~ msgid "Hour"
+#~ msgstr "Ura"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Polica 200cm"
 
@@ -2996,6 +3000,9 @@ msgstr "Popust"
 #~ "Minimalna nabavna količina tega  dobavitelja izražena u EM dobavitelja ili u "
 #~ "predefinirani  EM proizvoda,če nabavna EM ni vpisana."
 
+#~ msgid "unknown"
+#~ msgstr "neznano"
+
 #~ msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
 #~ msgstr "  npr: 1 * (referenčna enota) = razmerje * (trenutna enota)"
 
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 858e468b397..78c5238a4db 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -188,7 +178,7 @@ msgid "Product Type"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -276,11 +266,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -505,6 +490,11 @@ msgstr ""
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -564,10 +554,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -576,7 +564,7 @@ msgid "The width of the package"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -678,6 +666,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -705,8 +694,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -780,6 +769,11 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -813,7 +807,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -821,7 +814,7 @@ msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -835,8 +828,10 @@ msgid "Partner"
 msgstr ""
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -902,11 +897,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr ""
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1077,6 +1067,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1151,6 +1146,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1226,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1280,11 +1280,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr ""
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1298,7 +1293,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1417,17 +1417,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr ""
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1535,8 +1528,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1767,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1803,7 +1796,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1829,7 +1822,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2141,7 +2139,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2193,12 +2191,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2355,7 +2347,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 58bb28d3f84..7a2b4f9a240 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Ovo je minimalna kolicina za nabavku od glavnog dobavljaca."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dan"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -192,7 +182,7 @@ msgid "Product Type"
 msgstr "Tip proizvoda"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -280,11 +270,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -509,6 +494,11 @@ msgstr "Tip mere"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -568,13 +558,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 ili nekoliko dobavljaca mogu biti povezani sa proizvodom. Sve se "
-"informacije nalaze u formi samog Proizvoda."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -582,7 +568,7 @@ msgid "The width of the package"
 msgstr "Širina paketa"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -687,6 +673,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dobavljac"
 
@@ -714,8 +701,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -789,6 +776,11 @@ msgstr "Pod kategorije"
 msgid "End Date"
 msgstr "Datum završetka"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -822,7 +814,6 @@ msgstr "Ključ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -830,8 +821,8 @@ msgstr "Cenovnik"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Sat"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -844,9 +835,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 ili nekoliko dobavljaca mogu biti povezani sa proizvodom. Sve se "
+"informacije nalaze u formi samog Proizvoda."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -911,11 +906,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Ukupna težina paketa"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1089,6 +1079,11 @@ msgstr "Jedinica cene"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1163,6 +1158,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Daje redosled sekvenci pri prikazu liste kategorije proizvoda."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1238,7 +1238,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1292,11 +1292,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1310,7 +1305,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Informacije dobavljača"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1431,17 +1431,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jedinica"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1551,8 +1544,8 @@ msgid "Pricelist Name"
 msgstr "Naziv cenovnika"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1784,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1820,7 +1813,7 @@ msgid "Default Unit of Measure"
 msgstr "Podrazumevana Jedinica Mere"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Deo za partnera u formi proizvoda"
@@ -1846,7 +1839,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2160,7 +2158,7 @@ msgid "Normal"
 msgstr "Normalno"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2214,12 +2212,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Promenljiva"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2376,7 +2368,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2656,6 +2648,9 @@ msgstr "Popust"
 #~ "(uglavnom na kraju godine), Prosečna cena: cena koštanja se preračunava pri "
 #~ "svakom prijemu proizvoda."
 
+#~ msgid "Partners"
+#~ msgstr "Partneri"
+
 #~ msgid "Create new Product"
 #~ msgstr "Kreiranje novog proizvoda"
 
@@ -2671,9 +2666,6 @@ msgstr "Popust"
 #~ msgid "Factor"
 #~ msgstr "Faktor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Informacije dobavljača"
-
 #~ msgid "PCE"
 #~ msgstr "PCE"
 
@@ -3054,6 +3046,9 @@ msgstr "Popust"
 #~ "Greska ! Ne mozes dodeliti Glavni Cenovnik kao DRugi Cenovnik u stavci "
 #~ "cenovnika!"
 
+#~ msgid "Day"
+#~ msgstr "Dan"
+
 #~ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 #~ msgstr "  npr: 1* (ovaj komad) = odnos * (referentni komad)"
 
@@ -3107,6 +3102,9 @@ msgstr "Popust"
 #~ msgid "Kitchen Design Project"
 #~ msgstr "Projekat Dizajna Kuhinje"
 
+#~ msgid "Hour"
+#~ msgstr "Sat"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Polica od 200mm"
 
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 66e27d9876d..456ca20f5d5 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Ovo je minimalna kolicina za nabavku od glavnog dobavljaca."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dan"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -192,7 +182,7 @@ msgid "Product Type"
 msgstr "Tip proizvoda"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -280,11 +270,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -509,6 +494,11 @@ msgstr "Tip mere"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -568,13 +558,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"1 ili nekoliko dobavljaca mogu biti povezani sa proizvodom. Sve se "
-"informacije nalaze u formi samog Proizvoda."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -582,7 +568,7 @@ msgid "The width of the package"
 msgstr "Širina paketa"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -687,6 +673,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Dobavljac"
 
@@ -714,8 +701,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -789,6 +776,11 @@ msgstr "Pod kategorije"
 msgid "End Date"
 msgstr "Datum završetka"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -822,7 +814,6 @@ msgstr "Ključ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -830,8 +821,8 @@ msgstr "Cenovnik"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Sat"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -844,9 +835,13 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"1 ili nekoliko dobavljaca mogu biti povezani sa proizvodom. Sve se "
+"informacije nalaze u formi samog Proizvoda."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -911,11 +906,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Ukupna težina paketa"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1089,6 +1079,11 @@ msgstr "Jedinica cene"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1163,6 +1158,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Daje redosled sekvenci pri prikazu liste kategorije proizvoda."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1238,7 +1238,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1292,11 +1292,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Partneri"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1310,7 +1305,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Informacije dobavljača"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1431,17 +1431,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Jedinica"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1551,8 +1544,8 @@ msgid "Pricelist Name"
 msgstr "Naziv cenovnika"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1784,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1820,7 +1813,7 @@ msgid "Default Unit of Measure"
 msgstr "Podrazumevana Jedinica Mere"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Deo za partnera u formi proizvoda"
@@ -1846,7 +1839,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2160,7 +2158,7 @@ msgid "Normal"
 msgstr "Normalno"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2214,12 +2212,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Promenljiva"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2376,7 +2368,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2537,6 +2529,9 @@ msgstr "Popust"
 #~ msgid "Mainboard ASUStek A7V8X-X"
 #~ msgstr "Matična ploča ASUStek A7V8X-X"
 
+#~ msgid "Day"
+#~ msgstr "Dan"
+
 #~ msgid "UoM"
 #~ msgstr "JM"
 
@@ -2728,6 +2723,9 @@ msgstr "Popust"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
+#~ msgid "Hour"
+#~ msgstr "Sat"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Polica od 200mm"
 
@@ -2818,6 +2816,9 @@ msgstr "Popust"
 #~ msgid " (copy)"
 #~ msgstr " (kopiraj)"
 
+#~ msgid "Partners"
+#~ msgstr "Partneri"
+
 #~ msgid ""
 #~ "This is the average delay in days between the confirmation of the customer "
 #~ "order and the delivery of the finished products. It's the time you promise "
@@ -3162,9 +3163,6 @@ msgstr "Popust"
 #~ msgid "Factor"
 #~ msgstr "Faktor"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Informacije dobavljača"
-
 #~ msgid "Default UoM"
 #~ msgstr "Podrazumevana JM"
 
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 97a6b5b74e8..912b878dd61 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Detta är minsta kvantitet att köpa från huvudleverantör."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Dag"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,7 +116,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -130,11 +125,6 @@ msgstr ""
 "Konvertering från produkt måttenheter %s till standard måttenheter %s är "
 "inte möjligt, eftersom båda tillhör annan kategori!."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Dussin"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -194,7 +184,7 @@ msgid "Product Type"
 msgstr "Produkttyp"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Produkter: "
@@ -282,11 +272,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -512,6 +497,11 @@ msgstr "Åtgärdstyp"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -571,13 +561,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"En eller flera leverantör(er) kan länkas rill en produkt. All information  "
-"finnspå produktsidan."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -585,7 +571,7 @@ msgid "The width of the package"
 msgstr "Emballagets bredd"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -690,6 +676,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Leverantör"
 
@@ -717,8 +704,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -792,6 +779,11 @@ msgstr "Underkategori"
 msgid "End Date"
 msgstr "Slutdatum"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -825,7 +817,6 @@ msgstr "Nyckel"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -833,8 +824,8 @@ msgstr "Prislista"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Timme"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -847,9 +838,13 @@ msgid "Partner"
 msgstr "Företag"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"En eller flera leverantör(er) kan länkas rill en produkt. All information  "
+"finnspå produktsidan."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -914,11 +909,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Total emballagevikt"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "okänd"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1092,6 +1082,11 @@ msgstr "Pris per enhet"
 msgid "Right Parent"
 msgstr "Högerparantes"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1166,6 +1161,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Sorterar artiklarna när de sorteras per produktkategori."
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1241,7 +1241,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1295,11 +1295,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Alternativa företag"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1313,7 +1308,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Leverantörsinfo"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1437,17 +1437,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Enhet"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1557,8 +1550,8 @@ msgid "Pricelist Name"
 msgstr "Prislistenamn"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1789,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1825,7 +1818,7 @@ msgid "Default Unit of Measure"
 msgstr "Standard enhet"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partner section of the product form"
@@ -1851,7 +1844,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2167,7 +2165,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2223,12 +2221,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Variabel"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2385,7 +2377,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2593,9 +2585,6 @@ msgstr "Prisrabatt"
 #~ msgid "Miscelleanous"
 #~ msgstr "Diverse"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Leverantörsinfo"
-
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
 #~ "base price for supplier price."
@@ -2707,6 +2696,9 @@ msgstr "Prisrabatt"
 #~ "i slutet av året), Genomsnittspris: självkostnadspris som har omräknats vid "
 #~ "varje mottagning av varor."
 
+#~ msgid "Partners"
+#~ msgstr "Alternativa företag"
+
 #~ msgid "Partner Product Name"
 #~ msgstr "Företagets artikelbenämning"
 
@@ -3083,6 +3075,9 @@ msgstr "Prisrabatt"
 #~ "Coefficient to convert UOM to UOS\n"
 #~ " uos = uom * coeff"
 
+#~ msgid "Day"
+#~ msgstr "Dag"
+
 #~ msgid "Reference"
 #~ msgstr "Referens"
 
@@ -3123,6 +3118,9 @@ msgstr "Prisrabatt"
 #~ msgid "Side Panel"
 #~ msgstr "Sidopanel"
 
+#~ msgid "Hour"
+#~ msgstr "Timme"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Allmänt"
 
@@ -3302,6 +3300,9 @@ msgstr "Prisrabatt"
 #~ "Skapa ett produktformulär för allt du köper eller säljer. Ange en leverantör "
 #~ "om produkten kan köpas."
 
+#~ msgid "Dozen"
+#~ msgstr "Dussin"
+
 #~ msgid ""
 #~ "Products can be purchased and/or sold. They can be raw materials, stockable "
 #~ "products, consumables or services. The Product form contains detailed "
@@ -3316,6 +3317,9 @@ msgstr "Prisrabatt"
 #~ msgid "Wooden Table"
 #~ msgstr "Träbord"
 
+#~ msgid "unknown"
+#~ msgstr "okänd"
+
 #~ msgid "Shelf of 200cm"
 #~ msgstr "Hylla 200m"
 
diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po
index 47bd8a7a57d..6d8943856c0 100644
--- a/addons/product/i18n/th.po
+++ b/addons/product/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-15 10:07+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "วัน"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -108,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -120,18 +115,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -188,7 +178,7 @@ msgid "Product Type"
 msgstr "ประเภทสินค้า"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "สินค้า "
@@ -276,11 +266,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -505,6 +490,11 @@ msgstr "มาตรวัด"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -564,10 +554,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -576,7 +564,7 @@ msgid "The width of the package"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -678,6 +666,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -705,8 +694,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -780,6 +769,11 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -813,7 +807,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -821,7 +814,7 @@ msgstr "รายการราคา"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -835,8 +828,10 @@ msgid "Partner"
 msgstr "พาร์ตเนอร์"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -902,11 +897,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr ""
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1077,6 +1067,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1151,6 +1146,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1226,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1280,11 +1280,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr ""
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1298,7 +1293,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1417,17 +1417,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr ""
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1535,8 +1528,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1767,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1803,7 +1796,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1829,7 +1822,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2141,7 +2139,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2193,12 +2191,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2355,7 +2347,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2484,6 +2476,9 @@ msgstr ""
 msgid "Price Discount"
 msgstr ""
 
+#~ msgid "Day"
+#~ msgstr "วัน"
+
 #~ msgid "UoM"
 #~ msgstr "หน่วยนับ"
 
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index 7cd22751976..2305f7a5b52 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -107,8 +102,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -119,18 +114,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -187,7 +177,7 @@ msgid "Product Type"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -275,11 +265,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -504,6 +489,11 @@ msgstr ""
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -563,10 +553,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -575,7 +563,7 @@ msgid "The width of the package"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -677,6 +665,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -704,8 +693,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -779,6 +768,11 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -812,7 +806,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -820,7 +813,7 @@ msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -834,8 +827,10 @@ msgid "Partner"
 msgstr ""
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -901,11 +896,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr ""
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1076,6 +1066,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1150,6 +1145,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1225,7 +1225,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1279,11 +1279,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr ""
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1297,7 +1292,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1416,17 +1416,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr ""
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1534,8 +1527,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1766,7 +1759,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1802,7 +1795,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1828,7 +1821,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2140,7 +2138,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2192,12 +2190,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2354,7 +2346,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 6750801e701..f30bf84ec7c 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:24+0000\n"
 "Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Ana tedarikçiden satınalma yapılacak en düşük miktarı belirtir."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Gün"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,7 +116,7 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
@@ -130,11 +125,6 @@ msgstr ""
 "Ürün Ölçü Birimin %s den Varsayılan Ölçü Birimi %s e dönüştürmek, eğer her "
 "ikisi de farklı kategorilere aitse, olası değildir."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "Düzine"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -194,7 +184,7 @@ msgid "Product Type"
 msgstr "Ürün Tipi"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Ürünler: "
@@ -282,11 +272,6 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -511,6 +496,11 @@ msgstr "Ölçü Tipi"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -570,13 +560,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
-"Ürün kartına bir ya da daha çok tedarikçi bağlanmış. Tüm bilgiler Ürün "
-"Kartında yer almaktadır."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -584,7 +570,7 @@ msgid "The width of the package"
 msgstr "Paket genişliği"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -689,6 +675,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Tedarikçi"
 
@@ -716,8 +703,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -791,6 +778,11 @@ msgstr "Alt Kategoriler"
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -824,7 +816,6 @@ msgstr "Anahtar"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -832,8 +823,8 @@ msgstr "Fiyat Listesi"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Saat"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -846,9 +837,13 @@ msgid "Partner"
 msgstr "Cari"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
+"Ürün kartına bir ya da daha çok tedarikçi bağlanmış. Tüm bilgiler Ürün "
+"Kartında yer almaktadır."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -913,11 +908,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Toplam Paket Ağırlığı"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "bilinmeyen"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1091,6 +1081,11 @@ msgstr "Birim Fiyat"
 msgid "Right Parent"
 msgstr "Sağ Üst Öğe"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1165,6 +1160,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "Ürün kategorilerini gösterirken sıra numarası verir"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1240,7 +1240,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1294,11 +1294,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Cari Kartlar"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1312,7 +1307,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Tedarikçi Bilgisi"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1435,17 +1435,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Adet"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1555,8 +1548,8 @@ msgid "Pricelist Name"
 msgstr "Fiyat Listesi Adı"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1787,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1823,7 +1816,7 @@ msgid "Default Unit of Measure"
 msgstr "Varsayılan Ölçü Birimi"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Ürün formunun İş ortağı bölümü"
@@ -1849,7 +1842,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2164,7 +2162,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2220,12 +2218,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Değişken"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2382,7 +2374,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2687,12 +2679,12 @@ msgstr "Fiyat İskontosu"
 #~ msgid "Customer Lead Time"
 #~ msgstr "Müşteri Tedarik Süresi"
 
+#~ msgid "Partners"
+#~ msgstr "Cari Kartlar"
+
 #~ msgid "Create new Product"
 #~ msgstr "Yeni Ürün Oluştur"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Tedarikçi Bilgisi"
-
 #~ msgid "PCE"
 #~ msgstr "AD"
 
@@ -2760,6 +2752,9 @@ msgstr "Fiyat İskontosu"
 #~ "Hata! Fiyat listesi öğesinde Ana Fiyat Listesini Diğer Fiyat Listesi olarak "
 #~ "atayamazsınız !"
 
+#~ msgid "Day"
+#~ msgstr "Gün"
+
 #~ msgid "UoM"
 #~ msgstr "Birim"
 
@@ -2845,6 +2840,9 @@ msgstr "Fiyat İskontosu"
 #~ msgid "To Purchase"
 #~ msgstr "Satınalınacak"
 
+#~ msgid "Hour"
+#~ msgstr "Saat"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Çeşitli"
 
@@ -3364,6 +3362,9 @@ msgstr "Fiyat İskontosu"
 #~ msgid "This is use as task responsible"
 #~ msgstr "Bu görev sorumlusu olarak kullanılır"
 
+#~ msgid "Dozen"
+#~ msgstr "Düzine"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Zamançizlgesi Hizmeti"
 
@@ -3381,6 +3382,9 @@ msgstr "Fiyat İskontosu"
 #~ "Satınaldığınız ya da sattığınız herşeyden bir ürün oluşturun. Satınalınır "
 #~ "bir ürünse bir tedarikçi belirleyin."
 
+#~ msgid "unknown"
+#~ msgstr "bilinmeyen"
+
 #~ msgid "Wooden Table"
 #~ msgstr "Ahşap Masa"
 
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index b4f0bb71f74..45318a19d7f 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:43+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -107,8 +102,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -119,18 +114,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -190,7 +180,7 @@ msgid "Product Type"
 msgstr "Тип продукту"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -278,11 +268,6 @@ msgstr ""
 msgid "Category"
 msgstr "Категорія"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -507,6 +492,11 @@ msgstr ""
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -566,10 +556,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -578,7 +566,7 @@ msgid "The width of the package"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -680,6 +668,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr ""
 
@@ -707,8 +696,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -782,6 +771,11 @@ msgstr ""
 msgid "End Date"
 msgstr "Кінцева дата"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -815,7 +809,6 @@ msgstr "Ключ"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -823,7 +816,7 @@ msgstr "Прейскурант"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
 msgstr ""
 
 #. module: product
@@ -837,8 +830,10 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -904,11 +899,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr ""
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1079,6 +1069,11 @@ msgstr ""
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1153,6 +1148,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1228,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1282,11 +1282,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Партнери"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1300,7 +1295,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1419,17 +1419,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Одиниця"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1537,8 +1530,8 @@ msgid "Pricelist Name"
 msgstr ""
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1769,7 +1762,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1805,7 +1798,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1831,7 +1824,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2143,7 +2141,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2195,12 +2193,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Змінний"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2357,7 +2349,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2520,6 +2512,9 @@ msgstr "Знижка"
 #~ msgid "Configuration"
 #~ msgstr "Налаштування"
 
+#~ msgid "Partners"
+#~ msgstr "Партнери"
+
 #~ msgid "In Production"
 #~ msgstr "У виробництві"
 
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 431fcdd3c0e..6b83d85522e 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -32,11 +32,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "Đây là số lượng tối thiểu để mua từ Nhà cung cấp Chính."
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "Ngày"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -109,8 +104,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -121,18 +116,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -193,7 +183,7 @@ msgid "Product Type"
 msgstr "Loại sản phẩm"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "Sản phẩm: "
@@ -281,11 +271,6 @@ msgstr ""
 msgid "Category"
 msgstr "Loại"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -510,6 +495,11 @@ msgstr "Loại đo lường"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -569,10 +559,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -581,7 +569,7 @@ msgid "The width of the package"
 msgstr "Chiều rộng của gói"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -686,6 +674,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "Nhà cung cấp"
 
@@ -713,8 +702,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -788,6 +777,11 @@ msgstr "Loại trẻ em"
 msgid "End Date"
 msgstr "Ngày kết thúc"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -821,7 +815,6 @@ msgstr "Chính"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -829,8 +822,8 @@ msgstr "Bảng giá"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "Giờ"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -843,8 +836,10 @@ msgid "Partner"
 msgstr "Đối tác"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -910,11 +905,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "Tổng khối lượng đóng gói"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1085,6 +1075,11 @@ msgstr "Giá đơn vị"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1159,6 +1154,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1234,7 +1234,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1288,11 +1288,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "Đối tác"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1306,7 +1301,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "Thông tin nhà cung cấp"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1425,17 +1425,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "Đơn vị"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1543,8 +1536,8 @@ msgid "Pricelist Name"
 msgstr "Tên bảng giá"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1776,7 +1769,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1812,7 +1805,7 @@ msgid "Default Unit of Measure"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Mục đối tác của form sản phẩm"
@@ -1838,7 +1831,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2151,7 +2149,7 @@ msgid "Normal"
 msgstr "Bình thường"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2203,12 +2201,6 @@ msgstr ""
 msgid "Variable"
 msgstr "Thay đổi"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2365,7 +2357,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2515,6 +2507,9 @@ msgstr "Chiết khấu"
 #~ msgid "Customer Lead Time"
 #~ msgstr "Thời gian giao hàng"
 
+#~ msgid "Partners"
+#~ msgstr "Đối tác"
+
 #~ msgid "Create new Product"
 #~ msgstr "Tạo sản phẩm mới"
 
@@ -2545,9 +2540,6 @@ msgstr "Chiết khấu"
 #~ msgid "Product Description"
 #~ msgstr "Mô tả sản phẩm"
 
-#~ msgid "Supplier Info"
-#~ msgstr "Thông tin nhà cung cấp"
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "Giá & Nhà cung cấp"
 
@@ -2966,6 +2958,9 @@ msgstr "Chiết khấu"
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
+#~ msgid "Day"
+#~ msgstr "Ngày"
+
 #~ msgid "UoM"
 #~ msgstr "Đơn vị đo"
 
@@ -2975,6 +2970,9 @@ msgstr "Chiết khấu"
 #~ msgid "Keyboard"
 #~ msgstr "Bàn phím"
 
+#~ msgid "Hour"
+#~ msgstr "Giờ"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Linh tinh"
 
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index fa2ed103270..1d9939087c0 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 09:28+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr "计算的基准价格"
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "供应商的最低订购量"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "日"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -107,8 +102,8 @@ msgid ""
 msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -119,18 +114,13 @@ msgid "Small-sized image"
 msgstr "小尺寸图片"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr "产品单位 %s 与默认单位 %s 无法转换，二者属于不同的类别！"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr "打"
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -189,7 +179,7 @@ msgid "Product Type"
 msgstr "产品类型"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "产品： "
@@ -282,11 +272,6 @@ msgstr "如果不选中，允许你隐藏这个产品而无需删除。"
 msgid "Category"
 msgstr "类别"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr "升"
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -525,6 +510,11 @@ msgstr "计量类型"
 msgid "Headset standard"
 msgstr "标准耳机"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -590,11 +580,9 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr "pc组装和定制（PC需求）"
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
-msgstr "1个或多个供应商能关联到一个产品,所有信息委员产品的表单内."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr "基于客户要求定制便携式计算机。"
 
 #. module: product
 #: help:product.packaging,width:0
@@ -602,7 +590,7 @@ msgid "The width of the package"
 msgstr "包装宽度"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr "计量单位类别不一致"
@@ -704,6 +692,7 @@ msgstr "硬盘 SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "供应商"
 
@@ -733,9 +722,9 @@ msgid "If checked new messages require your attention."
 msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
-msgstr "可销售"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr "EAN13 条码"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -808,6 +797,11 @@ msgstr "子类别"
 msgid "End Date"
 msgstr "结束日期"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -841,7 +835,6 @@ msgstr "关键字"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -849,8 +842,8 @@ msgstr "价格表"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "时"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -863,9 +856,11 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
-msgstr "基于客户要求定制便携式计算机。"
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr "1个或多个供应商能关联到一个产品,所有信息委员产品的表单内."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -932,11 +927,6 @@ msgstr "主板 I9P57"
 msgid "Total Package Weight"
 msgstr "包装总重量"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr "未知"
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1121,6 +1111,11 @@ msgstr "单价"
 msgid "Right Parent"
 msgstr "右父项"
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1195,6 +1190,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr "显示产品列表的顺序号"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1274,7 +1274,7 @@ msgstr ""
 "            "
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1329,11 +1329,6 @@ msgid ""
 "1024x1024px."
 msgstr "该字段保存产品的图片，限制到  1024x1024px."
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "业务伙伴列表"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1347,7 +1342,12 @@ msgid "Inventory"
 msgstr "盘点"
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr "供应商信息"
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -1466,17 +1466,10 @@ msgstr "中等尺寸图片"
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "单件"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr "产品<b>被创建 </b>"
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1596,9 +1589,9 @@ msgid "Pricelist Name"
 msgstr "价格表名称"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
-msgstr "EAN13 条码"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr "可销售"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1835,7 +1828,7 @@ msgid ""
 msgstr "如果制作发票的单位跟库存不一致，指定一个计量单位，留空使用默认单位。"
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr "不能改变已有的计量单位'%s'的类别"
@@ -1871,7 +1864,7 @@ msgid "Default Unit of Measure"
 msgstr "默认计量单位"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr "供应产品的业务伙伴"
@@ -1897,7 +1890,12 @@ msgid "Messages"
 msgstr "消息"
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr "错误!"
@@ -2234,7 +2232,7 @@ msgid "Normal"
 msgstr "常规"
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2288,12 +2286,6 @@ msgstr ""
 msgid "Variable"
 msgstr "可变的"
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2454,7 +2446,7 @@ msgid "15” LCD Monitor"
 msgstr "15” LCD 显示器"
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2669,9 +2661,6 @@ msgstr "价格折扣"
 #~ msgid "Product Description"
 #~ msgstr "产品说明"
 
-#~ msgid "Supplier Info"
-#~ msgstr "供应商信息"
-
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "警告！"
@@ -2870,6 +2859,9 @@ msgstr "价格折扣"
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "箱子数或垫板的层数"
 
+#~ msgid "Partners"
+#~ msgstr "业务伙伴列表"
+
 #~ msgid "The mode for computing the price for this rule."
 #~ msgstr "计算价格公式"
 
@@ -3135,9 +3127,15 @@ msgstr "价格折扣"
 #~ msgid "Basic+ PC (assembly on order)"
 #~ msgstr "基本配置 PC 组装订单"
 
+#~ msgid "Day"
+#~ msgstr "日"
+
 #~ msgid "UoM"
 #~ msgstr "计量单位"
 
+#~ msgid "Hour"
+#~ msgstr "时"
+
 #~ msgid "Bigger than the reference UoM"
 #~ msgstr "大于引用的计量单位"
 
@@ -3450,9 +3448,15 @@ msgstr "价格折扣"
 #~ msgid "Service on Timesheet"
 #~ msgstr "计工单服务"
 
+#~ msgid "Dozen"
+#~ msgstr "打"
+
 #~ msgid "Product UoS View"
 #~ msgstr "产品销售单位视图"
 
+#~ msgid "unknown"
+#~ msgstr "未知"
+
 #~ msgid "Assembly Service"
 #~ msgstr "组装服务"
 
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index cf661f7de78..2ed25009224 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -31,11 +31,6 @@ msgstr ""
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr "此為自主要供應商採購最少量"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr "日"
-
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
@@ -107,8 +102,8 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -119,18 +114,13 @@ msgid "Small-sized image"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
 #, python-format
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
 
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
@@ -187,7 +177,7 @@ msgid "Product Type"
 msgstr "產品類型"
 
 #. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
 #, python-format
 msgid "Products: "
 msgstr "產品： "
@@ -275,11 +265,6 @@ msgstr ""
 msgid "Category"
 msgstr "分類"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
@@ -504,6 +489,11 @@ msgstr "量度類型"
 msgid "Headset standard"
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
 #. module: product
 #: help:product.product,incoming_qty:0
 msgid ""
@@ -563,10 +553,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
 msgstr ""
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid ""
-"1 or several supplier(s) can be linked to a product. All information stands "
-"in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
 msgstr ""
 
 #. module: product
@@ -575,7 +563,7 @@ msgid "The width of the package"
 msgstr "包裝盒寬度"
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
 msgstr ""
@@ -677,6 +665,7 @@ msgstr ""
 
 #. module: product
 #: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
 msgid "Supplier"
 msgstr "供應商"
 
@@ -704,8 +693,8 @@ msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
 msgstr ""
 
 #. module: product
@@ -779,6 +768,11 @@ msgstr "下級分類"
 msgid "End Date"
 msgstr "結束日期"
 
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
@@ -812,7 +806,6 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
 #: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
@@ -820,8 +813,8 @@ msgstr "價目表"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
-msgstr "小時"
+msgid "Hour(s)"
+msgstr ""
 
 #. module: product
 #: selection:product.template,state:0
@@ -834,8 +827,10 @@ msgid "Partner"
 msgstr "伙伴"
 
 #. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
 msgstr ""
 
 #. module: product
@@ -901,11 +896,6 @@ msgstr ""
 msgid "Total Package Weight"
 msgstr "包裝盒總重"
 
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
@@ -1076,6 +1066,11 @@ msgstr "單價"
 msgid "Right Parent"
 msgstr ""
 
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
@@ -1150,6 +1145,11 @@ msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
 
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
@@ -1225,7 +1225,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
 #, python-format
 msgid ""
 "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
@@ -1279,11 +1279,6 @@ msgid ""
 "1024x1024px."
 msgstr ""
 
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr "伙伴"
-
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
@@ -1297,7 +1292,12 @@ msgid "Inventory"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1416,17 +1416,10 @@ msgstr ""
 
 #. module: product
 #: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
 msgstr "單位"
 
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1534,8 +1527,8 @@ msgid "Pricelist Name"
 msgstr "價目表名稱"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
 msgstr ""
 
 #. module: product
@@ -1766,7 +1759,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
 msgstr ""
@@ -1802,7 +1795,7 @@ msgid "Default Unit of Measure"
 msgstr "預設量度單位"
 
 #. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1828,7 +1821,12 @@ msgid "Messages"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2140,7 +2138,7 @@ msgid "Normal"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
 #, python-format
 msgid ""
 "At least one pricelist has no active version !\n"
@@ -2192,12 +2190,6 @@ msgstr ""
 msgid "Variable"
 msgstr ""
 
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
@@ -2354,7 +2346,7 @@ msgid "15” LCD Monitor"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
@@ -2492,6 +2484,9 @@ msgstr "價格折扣"
 #~ msgid "Virtual Stock"
 #~ msgstr "虛擬庫存"
 
+#~ msgid "Day"
+#~ msgstr "日"
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "警告！"
@@ -2605,6 +2600,9 @@ msgstr "價格折扣"
 #~ msgid "Side Panel"
 #~ msgstr "側板"
 
+#~ msgid "Hour"
+#~ msgstr "小時"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "雜項"
 
@@ -2651,6 +2649,9 @@ msgstr "價格折扣"
 #~ msgid "Error !"
 #~ msgstr "錯誤！"
 
+#~ msgid "Partners"
+#~ msgstr "伙伴"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " （副本）"
diff --git a/addons/product_expiry/i18n/ar.po b/addons/product_expiry/i18n/ar.po
index afd2b12fdb5..9af2e2ab9f4 100644
--- a/addons/product_expiry/i18n/ar.po
+++ b/addons/product_expiry/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 22:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/ca.po b/addons/product_expiry/i18n/ca.po
index 431cbcd1228..02bc4cf87bb 100644
--- a/addons/product_expiry/i18n/ca.po
+++ b/addons/product_expiry/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 17:58+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/da.po b/addons/product_expiry/i18n/da.po
index 74f9d04cc6a..f8df1513310 100644
--- a/addons/product_expiry/i18n/da.po
+++ b/addons/product_expiry/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index d65a28f03d1..503a46647ec 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-29 10:20+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/el.po b/addons/product_expiry/i18n/el.po
index 57371668c4d..d73cae77bb9 100644
--- a/addons/product_expiry/i18n/el.po
+++ b/addons/product_expiry/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-12 08:45+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index da6fb75648e..005d169d7a4 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:16+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/es_CR.po b/addons/product_expiry/i18n/es_CR.po
index 3d869230293..9ba5cb3fa25 100644
--- a/addons/product_expiry/i18n/es_CR.po
+++ b/addons/product_expiry/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 00:27+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/es_EC.po b/addons/product_expiry/i18n/es_EC.po
index cf124b33a33..fc49f5f24de 100644
--- a/addons/product_expiry/i18n/es_EC.po
+++ b/addons/product_expiry/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 04:43+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/et.po b/addons/product_expiry/i18n/et.po
index e8040f52c53..5aef9d45f3b 100644
--- a/addons/product_expiry/i18n/et.po
+++ b/addons/product_expiry/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-06-25 18:04+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/fi.po b/addons/product_expiry/i18n/fi.po
index 5b99ef514c1..f38c8185cdf 100644
--- a/addons/product_expiry/i18n/fi.po
+++ b/addons/product_expiry/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-27 06:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/fr.po b/addons/product_expiry/i18n/fr.po
index 070bb1d8fc8..d2ae3708a90 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-11-29 14:56+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 14:56+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/gl.po b/addons/product_expiry/i18n/gl.po
index 9ee3c739287..fc62a32f6f0 100644
--- a/addons/product_expiry/i18n/gl.po
+++ b/addons/product_expiry/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-21 17:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/hr.po b/addons/product_expiry/i18n/hr.po
index 6c765d97761..25480233e3b 100644
--- a/addons/product_expiry/i18n/hr.po
+++ b/addons/product_expiry/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 07:04+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/hu.po b/addons/product_expiry/i18n/hu.po
index 2d74ffd51ae..78616c95925 100644
--- a/addons/product_expiry/i18n/hu.po
+++ b/addons/product_expiry/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-31 17:24+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/it.po b/addons/product_expiry/i18n/it.po
index 74208408538..4ba01745193 100644
--- a/addons/product_expiry/i18n/it.po
+++ b/addons/product_expiry/i18n/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 22:50+0000\n"
 "Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/ja.po b/addons/product_expiry/i18n/ja.po
index ac9f4abf9ee..c9220c5d6f5 100644
--- a/addons/product_expiry/i18n/ja.po
+++ b/addons/product_expiry/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 17:09+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/mn.po b/addons/product_expiry/i18n/mn.po
index 811edfeb019..588cfe2191a 100644
--- a/addons/product_expiry/i18n/mn.po
+++ b/addons/product_expiry/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-24 11:28+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"Last-Translator: soyoko <Unknown>\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: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/nl.po b/addons/product_expiry/i18n/nl.po
index 947f5b4ecfa..c00e2a430d2 100644
--- a/addons/product_expiry/i18n/nl.po
+++ b/addons/product_expiry/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-26 20:18+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
index e90762760e3..145cddc9552 100644
--- a/addons/product_expiry/i18n/pl.po
+++ b/addons/product_expiry/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 12:37+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/pt.po b/addons/product_expiry/i18n/pt.po
index f6a1ccba018..dc39c8fa81c 100644
--- a/addons/product_expiry/i18n/pt.po
+++ b/addons/product_expiry/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-11 21:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/pt_BR.po b/addons/product_expiry/i18n/pt_BR.po
index 06ee19862cb..cbc79ddfbe4 100644
--- a/addons/product_expiry/i18n/pt_BR.po
+++ b/addons/product_expiry/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 23:35+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/ro.po b/addons/product_expiry/i18n/ro.po
index cf01e6269e4..684825f1b3e 100644
--- a/addons/product_expiry/i18n/ro.po
+++ b/addons/product_expiry/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 15:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/ru.po b/addons/product_expiry/i18n/ru.po
index 92a703ca241..43447ca8d7e 100644
--- a/addons/product_expiry/i18n/ru.po
+++ b/addons/product_expiry/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-24 05:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
index 16f9063cdc0..ed4e644e99e 100644
--- a/addons/product_expiry/i18n/sl.po
+++ b/addons/product_expiry/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-28 12:28+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/sr.po b/addons/product_expiry/i18n/sr.po
index e1809cc3437..01788f31c3e 100644
--- a/addons/product_expiry/i18n/sr.po
+++ b/addons/product_expiry/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-04 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/sr@latin.po b/addons/product_expiry/i18n/sr@latin.po
index b599bd02ddd..9dc9bfb88b6 100644
--- a/addons/product_expiry/i18n/sr@latin.po
+++ b/addons/product_expiry/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-23 15:19+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/sv.po b/addons/product_expiry/i18n/sv.po
index 76836d6c036..60158f39a58 100644
--- a/addons/product_expiry/i18n/sv.po
+++ b/addons/product_expiry/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-15 11:31+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index 1aa77006fde..8a40c585567 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-03 13:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/vi.po b/addons/product_expiry/i18n/vi.po
index 6b9be4e0e50..0a6103a6f39 100644
--- a/addons/product_expiry/i18n/vi.po
+++ b/addons/product_expiry/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-26 08:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_expiry/i18n/zh_CN.po b/addons/product_expiry/i18n/zh_CN.po
index 7bc77b3dada..ce402e2195a 100644
--- a/addons/product_expiry/i18n/zh_CN.po
+++ b/addons/product_expiry/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-30 02:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
diff --git a/addons/product_manufacturer/i18n/ar.po b/addons/product_manufacturer/i18n/ar.po
index 1216d9b1428..19ccc5977ef 100644
--- a/addons/product_manufacturer/i18n/ar.po
+++ b/addons/product_manufacturer/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 22:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/bg.po b/addons/product_manufacturer/i18n/bg.po
index 0360462a9cc..c4227474240 100644
--- a/addons/product_manufacturer/i18n/bg.po
+++ b/addons/product_manufacturer/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-10 23:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ca.po b/addons/product_manufacturer/i18n/ca.po
index ece474738c0..df452c86228 100644
--- a/addons/product_manufacturer/i18n/ca.po
+++ b/addons/product_manufacturer/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-12 21:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/da.po b/addons/product_manufacturer/i18n/da.po
index 8583436240c..45400e9d468 100644
--- a/addons/product_manufacturer/i18n/da.po
+++ b/addons/product_manufacturer/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index e221c0c29dc..abc90e89901 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-12 20:19+0000\n"
 "Last-Translator: Steffi Frank (Bremskerl, DE) <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/el.po b/addons/product_manufacturer/i18n/el.po
index c2b2c615c26..fd1b33f55f2 100644
--- a/addons/product_manufacturer/i18n/el.po
+++ b/addons/product_manufacturer/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-11 15:58+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index 7ead31ec5cb..94f48446a05 100644
--- a/addons/product_manufacturer/i18n/es.po
+++ b/addons/product_manufacturer/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-08 21:40+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/es_CR.po b/addons/product_manufacturer/i18n/es_CR.po
index 72f0b7a2a85..1dbbadeceb2 100644
--- a/addons/product_manufacturer/i18n/es_CR.po
+++ b/addons/product_manufacturer/i18n/es_CR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 00:27+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/es_EC.po b/addons/product_manufacturer/i18n/es_EC.po
index 4d0f3ad6252..2ff70cba3d6 100644
--- a/addons/product_manufacturer/i18n/es_EC.po
+++ b/addons/product_manufacturer/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-19 00:08+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index c989cc04026..5b328f7f877 100644
--- a/addons/product_manufacturer/i18n/et.po
+++ b/addons/product_manufacturer/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-06-25 18:10+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fi.po b/addons/product_manufacturer/i18n/fi.po
index bcb58d14eed..31ae81a7335 100644
--- a/addons/product_manufacturer/i18n/fi.po
+++ b/addons/product_manufacturer/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-20 10:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 3370425bdd0..a839e0ef187 100644
--- a/addons/product_manufacturer/i18n/fr.po
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-29 07:38+0000\n"
 "Last-Translator: Aline (OpenERP) <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/gl.po b/addons/product_manufacturer/i18n/gl.po
index 3b1a7019073..a23ff401e8d 100644
--- a/addons/product_manufacturer/i18n/gl.po
+++ b/addons/product_manufacturer/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-22 18:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/hr.po b/addons/product_manufacturer/i18n/hr.po
index 84b75a2a190..37b8f8b319d 100644
--- a/addons/product_manufacturer/i18n/hr.po
+++ b/addons/product_manufacturer/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-10 08:27+0000\n"
 "Last-Translator: Dejan Radočaj <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/hu.po b/addons/product_manufacturer/i18n/hu.po
index 0909243a74c..3c9b5f91ccb 100644
--- a/addons/product_manufacturer/i18n/hu.po
+++ b/addons/product_manufacturer/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-25 21:42+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/it.po b/addons/product_manufacturer/i18n/it.po
index 6550b216830..1bb59ac598c 100644
--- a/addons/product_manufacturer/i18n/it.po
+++ b/addons/product_manufacturer/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 22:51+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ja.po b/addons/product_manufacturer/i18n/ja.po
index 4570196d184..d9ef0c240b9 100644
--- a/addons/product_manufacturer/i18n/ja.po
+++ b/addons/product_manufacturer/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 17:13+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 45b47dcbeb8..9b5190a9bfc 100644
--- a/addons/product_manufacturer/i18n/mn.po
+++ b/addons/product_manufacturer/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-16 12:39+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/nb.po b/addons/product_manufacturer/i18n/nb.po
index eef9e7fd692..8f22b6855fe 100644
--- a/addons/product_manufacturer/i18n/nb.po
+++ b/addons/product_manufacturer/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-22 21:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/nl.po b/addons/product_manufacturer/i18n/nl.po
index 3a8d539dd48..1ff747a4913 100644
--- a/addons/product_manufacturer/i18n/nl.po
+++ b/addons/product_manufacturer/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-17 10:12+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pl.po b/addons/product_manufacturer/i18n/pl.po
index d79a44ec2fd..2f9d4965a13 100644
--- a/addons/product_manufacturer/i18n/pl.po
+++ b/addons/product_manufacturer/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-31 11:44+0000\n"
 "Last-Translator: djtms <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pt.po b/addons/product_manufacturer/i18n/pt.po
index cf335dcb3d4..e5a1db9e0b0 100644
--- a/addons/product_manufacturer/i18n/pt.po
+++ b/addons/product_manufacturer/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-03 17:58+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pt_BR.po b/addons/product_manufacturer/i18n/pt_BR.po
index 195bd8da2b6..a735cced2c7 100644
--- a/addons/product_manufacturer/i18n/pt_BR.po
+++ b/addons/product_manufacturer/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-08 18:30+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ro.po b/addons/product_manufacturer/i18n/ro.po
index ab632284107..eb432d960e5 100644
--- a/addons/product_manufacturer/i18n/ro.po
+++ b/addons/product_manufacturer/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-11 19:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
index 9a6d2e00f41..66e9d46f9d1 100644
--- a/addons/product_manufacturer/i18n/ru.po
+++ b/addons/product_manufacturer/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-09 15:59+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
index eafdd57fc06..8350f56469e 100644
--- a/addons/product_manufacturer/i18n/sl.po
+++ b/addons/product_manufacturer/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-28 12:29+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sr.po b/addons/product_manufacturer/i18n/sr.po
index 22cfa74be9b..8cf57dc1529 100644
--- a/addons/product_manufacturer/i18n/sr.po
+++ b/addons/product_manufacturer/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-14 16:37+0000\n"
 "Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sr@latin.po b/addons/product_manufacturer/i18n/sr@latin.po
index 84d00e4bc06..e4a6a362905 100644
--- a/addons/product_manufacturer/i18n/sr@latin.po
+++ b/addons/product_manufacturer/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-10 18:55+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sv.po b/addons/product_manufacturer/i18n/sv.po
index 5ad64d7c711..22ccadf6db3 100644
--- a/addons/product_manufacturer/i18n/sv.po
+++ b/addons/product_manufacturer/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-13 20:52+0000\n"
 "Last-Translator: Anders Eriksson, Mobila System <ae@mobilasystem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/tr.po b/addons/product_manufacturer/i18n/tr.po
index c698a3c37ac..92aaf36e1b8 100644
--- a/addons/product_manufacturer/i18n/tr.po
+++ b/addons/product_manufacturer/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-09 16:45+0000\n"
 "Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
index 9cc0da24770..798c0018442 100644
--- a/addons/product_manufacturer/i18n/zh_CN.po
+++ b/addons/product_manufacturer/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 16:14+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_margin/i18n/ar.po b/addons/product_margin/i18n/ar.po
index 2a405e93bbb..878a1aed797 100644
--- a/addons/product_margin/i18n/ar.po
+++ b/addons/product_margin/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "إلى"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "الى تاريخ"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "من التاريخ"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "من التاريخ"
 msgid "Draft, Open and Paid"
 msgstr "مسودة أو فتح ومدفوعة"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "هامش المنتج"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "متوسط. سعر الوحدة"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "المنتج"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "سعر الكاتلوج"
 msgid "Paid"
 msgstr "مدفوع"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "مجموع الوحدات في فواتير المورد"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "البيع المتوقع - التكلفة العادية"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# فاتورة"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "متوسط. السعر في فاتورة المورد "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,15 +173,20 @@ msgstr "حالة الفاتورة"
 msgid "Normal Cost - Total Cost"
 msgstr "السعر العادي - التكلفة الكلية"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "مجموع الهامش"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "المشتريات"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "متوسط. السعر في فاتورة المورد "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "البيع المتوقع - التكلفة العادية"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr ""
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "فتح الهوامش"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "المبيعات"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "هامش المنتج"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "المنتج"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "معلومات عامة"
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "مجموع الهامش (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "فتح الهوامش"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -280,5 +284,17 @@ msgstr "هامش المنتج"
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "المتوسط. السعر في فاتورة العميل"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "مجموع الهامش (%)"
+
+#~ msgid "# Invoiced"
+#~ msgstr "# فاتورة"
+
+#~ msgid "From Date"
+#~ msgstr "من التاريخ"
+
+#~ msgid "To Date"
+#~ msgstr "الى تاريخ"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "خطأ: رقم ترميز منتجات عالمي(EAN) غير صالح"
diff --git a/addons/product_margin/i18n/bg.po b/addons/product_margin/i18n/bg.po
index 38c7c42483d..330e93cbdb1 100644
--- a/addons/product_margin/i18n/bg.po
+++ b/addons/product_margin/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 17:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "До"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "От дата"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "До дата"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "До дата"
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Продуктови маржове"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Средна цена за единица"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Продукт"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Каталожна цена"
 msgid "Paid"
 msgstr "Платен"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Сумата на количеството по фактури на доставчици"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Фактурирани"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Критерии за анализ"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Средна цена по фактури на доставчици "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,15 +173,20 @@ msgstr "Състояние на фактура"
 msgid "Normal Cost - Total Cost"
 msgstr "Нормална цена - Крайна цена"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Краен марж"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Поръчки"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Средна цена по фактури на доставчици "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Критерии за анализ"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Продажби"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Продуктови маржове"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Продукт"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Обща информация"
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Общ марж (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -286,5 +290,17 @@ msgstr "Марж на продукт"
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "Средна цена по клиентски фактури)"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Фактурирани"
+
+#~ msgid "Total Margin (%)"
+#~ msgstr "Общ марж (%)"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Грешка: Невалиден европейски баркод"
+
+#~ msgid "From Date"
+#~ msgstr "До дата"
+
+#~ msgid "To Date"
+#~ msgstr "От дата"
diff --git a/addons/product_margin/i18n/bs.po b/addons/product_margin/i18n/bs.po
index 44baf1d503f..b1fe79451c7 100644
--- a/addons/product_margin/i18n/bs.po
+++ b/addons/product_margin/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 17:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/ca.po b/addons/product_margin/i18n/ca.po
index 623091469a8..482d2b3118b 100644
--- a/addons/product_margin/i18n/ca.po
+++ b/addons/product_margin/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-30 08:30+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Fins"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Fins data"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Des de data"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Des de data"
 msgid "Draft, Open and Paid"
 msgstr "Esborrany, obert i pagat"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marges de producte"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Preu unitat mig"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Producte"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Preu catàleg"
 msgid "Paid"
 msgstr "Pagat"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferència vendes"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma de quantitat en factures proveïdor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Venda prevista - Cost normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Núm. facturats"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criteris d'anàlisi"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Preu mig en factures de proveïdor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Estat factura"
 msgid "Normal Cost - Total Cost"
 msgstr "Cost normal - Cost total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Marge total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Diferència vendes"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Compres"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Preu mig en factures de proveïdor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venda prevista - Cost normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Marge total * 100 / Volum de negoci"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criteris d'anàlisi"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Obre marges"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Vendes"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marges de producte"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Producte"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "Informació general"
 msgid "Purchase Gap"
 msgstr "Diferència compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Total marge (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Obre marges"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -284,6 +288,12 @@ msgstr "Marge producte"
 #~ "Suma de multiplicacions del preu del catàleg de venda i quantitat de "
 #~ "factures de client"
 
+#~ msgid "To Date"
+#~ msgstr "Fins data"
+
+#~ msgid "From Date"
+#~ msgstr "Des de data"
+
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
@@ -297,6 +307,9 @@ msgstr "Marge producte"
 #~ msgstr ""
 #~ "Suma de multiplicacions del preu de cost i quantitat de factures de proveïdor"
 
+#~ msgid "# Invoiced"
+#~ msgstr "Núm. facturats"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
 
@@ -311,6 +324,9 @@ msgstr "Marge producte"
 #~ msgid "Select "
 #~ msgstr "Selecciona "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Total marge (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Veure estoc de productes"
 
diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po
index 18bb620b19b..2eea04cde95 100644
--- a/addons/product_margin/i18n/cs.po
+++ b/addons/product_margin/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-13 17:31+0000\n"
 "Last-Translator: Jan B. Krejčí <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Do"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Do data"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Od data"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Od data"
 msgid "Draft, Open and Paid"
 msgstr "Draft, Otevřený a Zaplacený"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marže produktů"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr "Prům. jedn. cena"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr "Katalogová cena"
 msgid "Paid"
 msgstr "Zaplaceno"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma množství v přijatých fakturách"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Fakturováno"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Kritérium analýzy"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prům. cena ve fakturách zásobitelů "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,15 +173,20 @@ msgstr "Stav faktury"
 msgid "Normal Cost - Total Cost"
 msgstr "Normální náklady - Celkové náklady"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Celkový rozsah"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Nákupy"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Prům. cena ve fakturách zásobitelů "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Celkový rozsah * 100 / Obrat"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Kritérium analýzy"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Prodeje"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marže produktů"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr "Nákupní rozdíl"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Celková marže (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -277,9 +281,18 @@ msgstr ""
 msgid "Product Margin"
 msgstr ""
 
+#~ msgid "From Date"
+#~ msgstr "Od data"
+
+#~ msgid "To Date"
+#~ msgstr "Do data"
+
 #~ msgid "Reporting"
 #~ msgstr "Hlášení"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Fakturováno"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalidní XML pro zobrazení architektury!"
 
@@ -301,3 +314,6 @@ msgstr ""
 #~ msgid ""
 #~ "Sum of Multification of Invoice price and quantity of Supplier Invoices "
 #~ msgstr "Suma součinu fakturované ceny a množství na přijatých fakturách "
+
+#~ msgid "Total Margin (%)"
+#~ msgstr "Celková marže (%)"
diff --git a/addons/product_margin/i18n/da.po b/addons/product_margin/i18n/da.po
index 8a1a2fc8470..e63d449cff0 100644
--- a/addons/product_margin/i18n/da.po
+++ b/addons/product_margin/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,19 +44,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -65,6 +60,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,8 +76,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -87,6 +91,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,14 +118,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -150,9 +159,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -166,15 +174,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -194,8 +207,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -209,8 +227,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -225,12 +243,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -243,16 +257,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index c8423bf7f39..2cf50fed08f 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-29 11:55+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Bis Datum"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Bis Datum"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Von Datum"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Von Datum"
 msgid "Draft, Open and Paid"
 msgstr "Entwurf, Offen und Bezahlt"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Produkte Margen"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Durch. Preis pro Einheit"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Produkt"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Katalogpreis"
 msgid "Paid"
 msgstr "Bezahlt"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Verkaufsgap"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Summe in Eingangsrechnungen"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Erwartete Einstandskosten im Verkauf"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Abgerechnet"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Analyse Kriterien"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Durch. Preis in Eingangsrechnungen "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Rechnungsstatus"
 msgid "Normal Cost - Total Cost"
 msgstr "Normalkosten - Istkosten"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Gesamtsumme Margen"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Verkaufsgap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Einkäufe"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Durch. Preis in Eingangsrechnungen "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Erwartete Einstandskosten im Verkauf"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Summe Marge *100 / Gesamtgewinn"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Analyse Kriterien"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Offene Margen"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Verkäufe"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Produkte Margen"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produkt"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "Allgemeine Information"
 msgid "Purchase Gap"
 msgstr "Einkaufslücke (Gap)"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Gesamte Marge (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Offene Margen"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -282,6 +286,12 @@ msgstr "Produkt Marge"
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 #~ msgstr "Summe Menge x Preis Ausgangsrechnungen"
 
+#~ msgid "To Date"
+#~ msgstr "Bis Datum"
+
+#~ msgid "From Date"
+#~ msgstr "Von Datum"
+
 #~ msgid "Reporting"
 #~ msgstr "Berichtswesen"
 
@@ -295,6 +305,9 @@ msgstr "Produkt Marge"
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "Summe Selbstkostenpreis x Menge Einkauf"
 
+#~ msgid "# Invoiced"
+#~ msgstr "Abgerechnet"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
@@ -314,6 +327,9 @@ msgstr "Produkt Marge"
 #~ msgid "Select "
 #~ msgstr "Auswahl "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Gesamte Marge (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Ansicht Lagerbestand Produkte"
 
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index 0c696077cb5..25fe114f31e 100644
--- a/addons/product_margin/i18n/el.po
+++ b/addons/product_margin/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-12 09:21+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -46,20 +46,15 @@ msgstr ""
 msgid "To"
 msgstr "Σε"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Σε Ημερ/νία"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Από Ημερ/νία"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -67,6 +62,15 @@ msgstr "Από Ημερ/νία"
 msgid "Draft, Open and Paid"
 msgstr "Πρόχειρα, Ανοικτά και Πληρωμένα"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Περιθώρια Προϊόντων"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -74,9 +78,9 @@ msgid "Avg. Unit Price"
 msgstr "Μέση Τιμή Τεμαχ."
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Προϊόν"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -89,6 +93,12 @@ msgstr "Τιμή Καταλόγου"
 msgid "Paid"
 msgstr "Πληρωμένα"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Κενό Πωλήσεων"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -110,15 +120,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Άθροισμα των ποσοτήτων στα Τιμολόγια Αγοράς"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Προσδοκόμενη Πώληση -  Κανονικό Κόστος"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Τιμολογημένων"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Κριτήρια Ανάλυσης"
 
 #. module: product_margin
 #: view:product.product:0
@@ -152,10 +161,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Μέση Τιμή στα Τιμολόγια Προμηθευτή "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -168,16 +176,21 @@ msgstr "Κατάσταση Τιμολογίου"
 msgid "Normal Cost - Total Cost"
 msgstr "(Κανονικό Κόστος) - (Συνολικό Κόστος)"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Σύνολο Περιθωρίων"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Κενό Πωλήσεων"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -196,9 +209,14 @@ msgid "Purchases"
 msgstr "Αγορές"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Μέση Τιμή στα Τιμολόγια Προμηθευτή "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Προσδοκόμενη Πώληση -  Κανονικό Κόστος"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -211,9 +229,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "(Σύνολο Περιθωρίων * 100) / (Κύκλος Εργασιών)"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Κριτήρια Ανάλυσης"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Ανοικτά Περιθώρια"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -227,13 +245,9 @@ msgid "Sales"
 msgstr "Πωλήσεις"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Περιθώρια Προϊόντων"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Προϊόν"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -245,16 +259,6 @@ msgstr "Γενικές Πληροφορίες"
 msgid "Purchase Gap"
 msgstr "Κενό Αγορών"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Συνολικό Περιθώριο (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Ανοικτά Περιθώρια"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -286,6 +290,12 @@ msgstr "Περιθόριο Προϊόντος"
 #~ "Άθροισμα των Γινομένων του Τιμοκαταλόγου Πωλήσεων και των ποσοτήτων στα "
 #~ "Τιμολόγια Πώλησης"
 
+#~ msgid "To Date"
+#~ msgstr "Σε Ημερ/νία"
+
+#~ msgid "From Date"
+#~ msgstr "Από Ημερ/νία"
+
 #~ msgid "Reporting"
 #~ msgstr "Αναφορές"
 
@@ -306,6 +316,9 @@ msgstr "Περιθόριο Προϊόντος"
 #~ "Άθροισμα των Γινομένων των τιμών Κόστους και των ποσοτήτων στα Τιμολόγια "
 #~ "Αγοράς"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Τιμολογημένων"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
 
@@ -324,6 +337,9 @@ msgstr "Περιθόριο Προϊόντος"
 #~ msgid "Select "
 #~ msgstr "Επιλογή "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Συνολικό Περιθώριο (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Προβολή Αποθεμάτων Προϊόντων"
 
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index d26edb45bd4..60b6ea0b0f7 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 13:09+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 13:27+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -45,20 +45,15 @@ msgstr ""
 msgid "To"
 msgstr "Hasta"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Hasta fecha"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr "Volumen de negocio - Precio estándar"
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Desde fecha"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr "Tasa de margen total (%)"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -66,6 +61,15 @@ msgstr "Desde fecha"
 msgid "Draft, Open and Paid"
 msgstr "Borrador, abierto y pagado"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Márgenes de producto"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -73,9 +77,9 @@ msgid "Avg. Unit Price"
 msgstr "Precio unidad promedio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Producto"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr "Nº facturado en venta"
 
 #. module: product_margin
 #: view:product.product:0
@@ -88,6 +92,12 @@ msgstr "Precio catálogo"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferencia ventas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -109,15 +119,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma de cantidad en facturas proveedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Venta prevista - Coste normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr "Fecha hasta del margen"
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Núm. facturados"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análisis"
 
 #. module: product_margin
 #: view:product.product:0
@@ -153,11 +162,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr "Precio medio en las facturas de cliente"
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
-"Suma de la multiplicación del PVP y la cantidad de las facturas de cliente."
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Precio promedio en facturas de proveedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -170,16 +177,22 @@ msgstr "Estado factura"
 msgid "Normal Cost - Total Cost"
 msgstr "Coste normal - Coste total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma de la multiplicación del PVP y la cantidad de las facturas de cliente."
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margen total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Diferencia ventas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr "Fecha desde del margen"
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -200,9 +213,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Precio promedio en facturas de proveedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr "Nº facturado en compra"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venta prevista - Coste normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -215,9 +233,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margen total * 100 / Volumen de negocio"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criterios de análisis"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir márgenes"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -231,13 +249,9 @@ msgid "Sales"
 msgstr "Ventas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Márgenes de producto"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Producto"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -249,16 +263,6 @@ msgstr "Información general"
 msgid "Purchase Gap"
 msgstr "Diferencia compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Total margen (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Abrir márgenes"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -293,6 +297,12 @@ msgstr "Margen producto"
 #~ "Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
 #~ "facturas de cliente"
 
+#~ msgid "To Date"
+#~ msgstr "Hasta fecha"
+
+#~ msgid "From Date"
+#~ msgstr "Desde fecha"
+
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
@@ -307,6 +317,9 @@ msgstr "Margen producto"
 #~ "Suma de multiplicaciones del precio de coste y cantidad de facturas de "
 #~ "proveedor"
 
+#~ msgid "# Invoiced"
+#~ msgstr "Núm. facturados"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
@@ -322,6 +335,9 @@ msgstr "Margen producto"
 #~ msgid "Select "
 #~ msgstr "Seleccionar "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Total margen (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Ver stock de productos"
 
diff --git a/addons/product_margin/i18n/es_AR.po b/addons/product_margin/i18n/es_AR.po
index ac91d827804..5ed7e483e0c 100644
--- a/addons/product_margin/i18n/es_AR.po
+++ b/addons/product_margin/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-23 16:05+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Para"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Hasta fecha"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Desde fecha"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Desde fecha"
 msgid "Draft, Open and Paid"
 msgstr "Borrador, abierto y pagado"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Márgenes de producto"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr "Precio unidad promedio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr "Precio catálogo"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferencia ventas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma de cantidad en facturas proveedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Núm. facturados"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análisis"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Precio promedio en facturas de proveedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Estado factura"
 msgid "Normal Cost - Total Cost"
 msgstr "Costo normal - Coste total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margen total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Diferencia ventas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Precio promedio en facturas de proveedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margen total *100/Volumen de negocio"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criterios de análisis"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir márgenes"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Ventas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Márgenes de producto"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr "Diferencia compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Total margen (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Abrir márgenes"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -280,6 +284,12 @@ msgstr ""
 #~ msgid "Margins in Product"
 #~ msgstr "Margen de Producto"
 
+#~ msgid "From Date"
+#~ msgstr "Desde fecha"
+
+#~ msgid "# Invoiced"
+#~ msgstr "Núm. facturados"
+
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr ""
 #~ "Suma de multiplicaciones del precio de coste y cantidad de facturas de "
@@ -300,6 +310,9 @@ msgstr ""
 #~ "Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
 #~ "facturas de cliente"
 
+#~ msgid "To Date"
+#~ msgstr "Hasta fecha"
+
 #~ msgid "Excepted Sale - Normal Cost"
 #~ msgstr "Venta excepcional - Costo normal"
 
@@ -318,6 +331,9 @@ msgstr ""
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Cambio de orden - Costo Total"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Total margen (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Ver stock de productos"
 
diff --git a/addons/product_margin/i18n/es_CR.po b/addons/product_margin/i18n/es_CR.po
index f82576a8131..7e9f56a4d22 100644
--- a/addons/product_margin/i18n/es_CR.po
+++ b/addons/product_margin/i18n/es_CR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 00:27+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: product_margin
@@ -45,20 +45,15 @@ msgstr ""
 msgid "To"
 msgstr "Hasta"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Hasta fecha"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Desde fecha"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -66,6 +61,15 @@ msgstr "Desde fecha"
 msgid "Draft, Open and Paid"
 msgstr "Borrador, abierto y pagado"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Márgenes de producto"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -73,9 +77,9 @@ msgid "Avg. Unit Price"
 msgstr "Precio unidad promedio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Producto"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -88,6 +92,12 @@ msgstr "Precio catálogo"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferencia ventas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -109,15 +119,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma de cantidad en facturas proveedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Venta prevista - Coste normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Núm. facturados"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análisis"
 
 #. module: product_margin
 #: view:product.product:0
@@ -151,10 +160,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Precio promedio en facturas de proveedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -167,16 +175,21 @@ msgstr "Estado factura"
 msgid "Normal Cost - Total Cost"
 msgstr "Coste normal - Coste total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margen total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Diferencia ventas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -195,9 +208,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Precio promedio en facturas de proveedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venta prevista - Coste normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -210,9 +228,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margen total * 100 / Volumen de negocio"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criterios de análisis"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir márgenes"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -226,13 +244,9 @@ msgid "Sales"
 msgstr "Ventas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Márgenes de producto"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Producto"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -244,16 +258,6 @@ msgstr "Información general"
 msgid "Purchase Gap"
 msgstr "Diferencia compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Total margen (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Abrir márgenes"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -288,11 +292,20 @@ msgstr "Margen producto"
 #~ msgid "Turnorder - Standard price"
 #~ msgstr "Volumen de negocio - Precio estándar"
 
+#~ msgid "To Date"
+#~ msgstr "Hasta fecha"
+
+#~ msgid "From Date"
+#~ msgstr "Desde fecha"
+
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr ""
 #~ "Suma de multiplicaciones del precio de coste y cantidad de facturas de "
 #~ "proveedor"
 
+#~ msgid "# Invoiced"
+#~ msgstr "Núm. facturados"
+
 #~ msgid ""
 #~ "Sum of Multification of Invoice price and quantity of Customer Invoices"
 #~ msgstr ""
@@ -311,6 +324,9 @@ msgstr "Margen producto"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN no válido"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Total margen (%)"
+
 #~ msgid "Excepted Sale - Normal Cost"
 #~ msgstr "Venta excluida - Coste normal"
 
diff --git a/addons/product_margin/i18n/es_EC.po b/addons/product_margin/i18n/es_EC.po
index 7be49e6b45d..eb943c45779 100644
--- a/addons/product_margin/i18n/es_EC.po
+++ b/addons/product_margin/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-19 00:08+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Hasta"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Hasta fecha"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Desde fecha"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Desde fecha"
 msgid "Draft, Open and Paid"
 msgstr "Borrador, abierto y pagado"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Márgenes de producto"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,8 +76,8 @@ msgid "Avg. Unit Price"
 msgstr "Precio unidad promedio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -87,6 +91,12 @@ msgstr "Precio catálogo"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferencia ventas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma de cantidad en facturas proveedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Núm. facturados"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análisis"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Precio promedio en facturas de proveedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Estado factura"
 msgid "Normal Cost - Total Cost"
 msgstr "Coste normal - Coste total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margen total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Diferencia ventas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Precio promedio en facturas de proveedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margen total * 100 / Volumen de negocio"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criterios de análisis"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir márgenes"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Ventas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Márgenes de producto"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr "Diferencia compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Total margen (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Abrir márgenes"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -284,6 +288,12 @@ msgstr ""
 #~ "Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
 #~ "facturas de cliente"
 
+#~ msgid "To Date"
+#~ msgstr "Hasta fecha"
+
+#~ msgid "From Date"
+#~ msgstr "Desde fecha"
+
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
@@ -304,6 +314,9 @@ msgstr ""
 #~ "Suma de multiplicaciones del precio de coste y cantidad de facturas de "
 #~ "proveedor"
 
+#~ msgid "# Invoiced"
+#~ msgstr "Núm. facturados"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
@@ -325,5 +338,8 @@ msgstr ""
 #~ msgid "Select "
 #~ msgstr "Seleccionar "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Total margen (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Ver stock de productos"
diff --git a/addons/product_margin/i18n/et.po b/addons/product_margin/i18n/et.po
index 7edfdec3ac3..76c073e0486 100644
--- a/addons/product_margin/i18n/et.po
+++ b/addons/product_margin/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Kuni"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Kuupäevani"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Kuupäevast"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Kuupäevast"
 msgid "Draft, Open and Paid"
 msgstr "Mustand, lahtine ja makstud"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Toote marginaalid"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr "Keskmine ühiku hind"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr "Hinnakirja hind"
 msgid "Paid"
 msgstr "Tasutud"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Müükide vahe"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Koguste summa ostuarvetes"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Arveldatud"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Analüüsi kriteeriumid"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Keskmine hind ostuarvetes "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Arve olek"
 msgid "Normal Cost - Total Cost"
 msgstr "Tavamaksumus - Üldmaksumus"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Kogu marginaal"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Müükide vahe"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Ostud"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Keskmine hind ostuarvetes "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Üldmarginaal * 100 / Käive"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Analüüsi kriteeriumid"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Ava marginaalid"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Müügid"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Toote marginaalid"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr "Ostude vahe"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Kogu marginaal (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Ava marginaalid"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -290,6 +294,12 @@ msgstr ""
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 #~ msgstr "Hinnakirja hinna ja koguse korrutise summa müügiarvetel"
 
+#~ msgid "From Date"
+#~ msgstr "Kuupäevast"
+
+#~ msgid "To Date"
+#~ msgstr "Kuupäevani"
+
 #~ msgid ""
 #~ "Sum of Multification of Invoice price and quantity of Supplier Invoices "
 #~ msgstr "Arveldatud hinna ja koguse korrutise summa ostuarvetel "
@@ -297,6 +307,9 @@ msgstr ""
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "Omahinna ja koguse korrutise summa ostuarvetel"
 
+#~ msgid "# Invoiced"
+#~ msgstr "Arveldatud"
+
 #~ msgid "Excepted Sale - Turn Over"
 #~ msgstr "Oodatav müük - Käive"
 
@@ -316,5 +329,8 @@ msgstr ""
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Käive - Üldmaksumus"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Kogu marginaal (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Vaata toodete laoseisu"
diff --git a/addons/product_margin/i18n/fi.po b/addons/product_margin/i18n/fi.po
index 38fb6b1ab1e..ff02009e089 100644
--- a/addons/product_margin/i18n/fi.po
+++ b/addons/product_margin/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Vastaanottaja"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Tähän pävään mennessä"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Alkaen"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Alkaen"
 msgid "Draft, Open and Paid"
 msgstr "Luonnos, avoin ja maksettu"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Tuotteen katteet"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Keskimääräinen yksikköhinta"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Tuote"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Luettelo hinta"
 msgid "Paid"
 msgstr "Maksettu"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Myynnin alijäämä"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Määrien summa toimittajien laskuilla"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Odotettu myynti - normaalikulut"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "laskutettu määrä"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Analyysin perusteet"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Keskihinta toimittajien laskuilla "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Laskun tila"
 msgid "Normal Cost - Total Cost"
 msgstr "Normaalikulut - kokonaiskulut"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Kokonaismarginaali"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Myynnin alijäämä"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Ostot"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Keskihinta toimittajien laskuilla "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Odotettu myynti - normaalikulut"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Kokonaismarginaali * 100 / Liikevaihto"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Analyysin perusteet"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Avaa katteet"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Myynti"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Tuotteen katteet"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Tuote"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "Yleiset tiedot"
 msgid "Purchase Gap"
 msgstr "Hankinnan erotus"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Kokonaismarginaali (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Avaa katteet"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -278,6 +282,12 @@ msgstr ""
 msgid "Product Margin"
 msgstr "Tuotteen kate"
 
+#~ msgid "From Date"
+#~ msgstr "Alkaen"
+
+#~ msgid "To Date"
+#~ msgstr "Tähän pävään mennessä"
+
 #~ msgid "Reporting"
 #~ msgstr "Raportointi"
 
@@ -290,11 +300,17 @@ msgstr "Tuotteen kate"
 #~ msgid "Select "
 #~ msgstr "Valitse "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Kokonaismarginaali (%)"
+
 #~ msgid "Excepted Sale - Turn Over"
 #~ msgstr "Odotettu myynti - Liikevaihto"
 
 #~ msgid "Margins in Product"
 #~ msgstr "Tuotteen katteet"
 
+#~ msgid "# Invoiced"
+#~ msgstr "laskutettu määrä"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Virhe: Väärä EAN-koodi"
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index 6b9dda84d0a..c94217aa350 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 17:23+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "À"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Date de Fin"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Date de Début"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Date de Début"
 msgid "Draft, Open and Paid"
 msgstr "Brouillon, Ouverte et Payée"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marges par articles"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Prix Unitaire Moyen"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Article"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Prix Catalogue"
 msgid "Paid"
 msgstr "Payée"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Écart des Ventes"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Somme de la Quantité dans les Factures Fournisseurs"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Vente attendue - Coût normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Facturés"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Critères d'Analyse"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prix Moy. dans les Factures Fournisseurs "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "État de la Facture"
 msgid "Normal Cost - Total Cost"
 msgstr "Coût Normal - Coût Total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Marge Totale"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Écart des Ventes"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Achats"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Prix Moy. dans les Factures Fournisseurs "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Vente attendue - Coût normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Marge Totale * 100 / Chiffre d'Affaires"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Critères d'Analyse"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Ouvrir les marges"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Ventes"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marges par articles"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Article"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Informations générales"
 msgid "Purchase Gap"
 msgstr "Écart des Achats"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Marge Totale (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Ouvrir les marges"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -283,6 +287,12 @@ msgstr "Marge de l'article"
 #~ "Somme de la Multiplication du prix de Catalogue de Vente et de la quantité "
 #~ "des Factures Clients"
 
+#~ msgid "To Date"
+#~ msgstr "Date de Fin"
+
+#~ msgid "From Date"
+#~ msgstr "Date de Début"
+
 #~ msgid "Reporting"
 #~ msgstr "Reporting"
 
@@ -295,6 +305,9 @@ msgstr "Marge de l'article"
 #~ msgid "Excepted Sale - Turn Over"
 #~ msgstr "Ventes Attendues - Chiffre d'Affaires"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Facturés"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
 
@@ -316,6 +329,9 @@ msgstr "Marge de l'article"
 #~ msgid "Select "
 #~ msgstr "Sélectionnez "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Marge Totale (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Voir le Stock des Produits"
 
diff --git a/addons/product_margin/i18n/gl.po b/addons/product_margin/i18n/gl.po
index 369bf30e0df..5ef00a5cdba 100644
--- a/addons/product_margin/i18n/gl.po
+++ b/addons/product_margin/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-07 08:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Ata"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Ata a data"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Desde a data"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Desde a data"
 msgid "Draft, Open and Paid"
 msgstr "Borrador, aberto e pagado"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marxes de produto"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Media prezo unidade"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Produto"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Prezo catálogo"
 msgid "Paid"
 msgstr "Pagado"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferenza vendas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma da cantidade en facturas provedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Venda prevista - Custo normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Nº facturado"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análise"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prezo medio en facturas de provedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Estado da factura"
 msgid "Normal Cost - Total Cost"
 msgstr "Custo normal - Custo total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Marxe total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Diferenza vendas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Prezo medio en facturas de provedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venda prevista - Custo normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Marxe total * 100 / Volume de negocio"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criterios de análise"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir marxes"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Vendas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marxes de produto"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produto"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "Información xeral"
 msgid "Purchase Gap"
 msgstr "Diferenza compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Total marxe (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Abrir marxes"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -284,6 +288,12 @@ msgstr "Marxe produto"
 #~ "Suma da multiplicación do prezo do catálogo de venda e cantidade das "
 #~ "facturas do cliente"
 
+#~ msgid "From Date"
+#~ msgstr "Desde a data"
+
+#~ msgid "To Date"
+#~ msgstr "Ata a data"
+
 #~ msgid "Turnorder - Standard price"
 #~ msgstr "Volume de negocio - Prezo estándar"
 
@@ -321,5 +331,11 @@ msgstr "Marxe produto"
 #~ "Suma da multiplicación do prezo da factura e da cantidade de facturas do "
 #~ "provedor "
 
+#~ msgid "# Invoiced"
+#~ msgstr "Nº facturado"
+
+#~ msgid "Total Margin (%)"
+#~ msgstr "Total marxe (%)"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN non válido"
diff --git a/addons/product_margin/i18n/gu.po b/addons/product_margin/i18n/gu.po
index 26a6f9cc911..17115615315 100644
--- a/addons/product_margin/i18n/gu.po
+++ b/addons/product_margin/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-12 15:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,19 +44,14 @@ msgstr ""
 msgid "To"
 msgstr "પ્રતિ"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -65,6 +60,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,8 +76,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -87,6 +91,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,14 +118,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -150,9 +159,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -166,15 +174,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -194,8 +207,13 @@ msgid "Purchases"
 msgstr "ખરીદીઓ"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -209,8 +227,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -225,12 +243,8 @@ msgid "Sales"
 msgstr "વેચાણ"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -243,16 +257,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/hr.po b/addons/product_margin/i18n/hr.po
index 92632810be1..cc299d05b58 100644
--- a/addons/product_margin/i18n/hr.po
+++ b/addons/product_margin/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 07:05+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Do"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Do datuma"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Od datuma"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Od datuma"
 msgid "Draft, Open and Paid"
 msgstr "Nacrt, Otvoreno i Plaćeno"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marže proizvoda"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Prosj. jedinična cijena"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Proizvod"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Kataloška cijena"
 msgid "Paid"
 msgstr "Plaćeno"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Razmak u prodaji"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma količina na dobavljačevim fakturama"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Fakturirano"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Kriterij analize"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prosj. cijena u fakturama dobavljača "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Stanje fakture"
 msgid "Normal Cost - Total Cost"
 msgstr "Normalni trošak - Totalni trošak"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Ukupna marža"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Razmak u prodaji"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Nabavke"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Prosj. cijena u fakturama dobavljača "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Ukupna marža * 100 / Zarada"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Kriterij analize"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Otvorene marže"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Prodaje"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marže proizvoda"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Opći podaci"
 msgid "Purchase Gap"
 msgstr "Razmak u kupovini"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Ukupna marža (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Otvorene marže"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -283,6 +287,12 @@ msgstr ""
 #~ "Suma umnoška kataloške cijene proizvoda i količinama proizvoda na fakturama "
 #~ "kupca"
 
+#~ msgid "To Date"
+#~ msgstr "Do datuma"
+
+#~ msgid "From Date"
+#~ msgstr "Od datuma"
+
 #~ msgid "Reporting"
 #~ msgstr "Izvještavanje"
 
@@ -299,6 +309,9 @@ msgstr ""
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "Suma umnoška cijene troška i količine na dobavljačevim fakturama"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Fakturirano"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za arhitekturu View-a!"
 
@@ -315,5 +328,8 @@ msgstr ""
 #~ msgid "Select "
 #~ msgstr "Odaberi "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Ukupna marža (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Pogledaj zalihu proizvoda"
diff --git a/addons/product_margin/i18n/hu.po b/addons/product_margin/i18n/hu.po
index 2852cab7d99..24cf424127c 100644
--- a/addons/product_margin/i18n/hu.po
+++ b/addons/product_margin/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-30 20:40+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Záró dátum"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Záró dátum"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Kezdő dátum"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Kezdő dátum"
 msgid "Draft, Open and Paid"
 msgstr "Tervezet, nyitott és rendezett"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Termékárrések"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Átlagos egységár"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Termék"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Katalógus ár"
 msgid "Paid"
 msgstr "Rendezett"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Árbevétel különbözet"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Összes mennyiség a bejövő számlákban"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Elvárt árbevétel - számított beszerzési érték"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "Számlázott mennyiség"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Átlagár a bejövő számlákban "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Számla állapota"
 msgid "Normal Cost - Total Cost"
 msgstr "Számított beszerzési érték - tényleges beszerzési érték"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Összes árrés"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Árbevétel különbözet"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Beszerzések"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Átlagár a bejövő számlákban "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Elvárt árbevétel - számított beszerzési érték"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Összes árrés * 100 / tényleges árbevétel"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Értékesítés"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Termékárrések"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Termék"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Általános információ"
 msgid "Purchase Gap"
 msgstr "Beszerzési különbözet"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Összes árrés (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -277,9 +281,21 @@ msgstr ""
 msgid "Product Margin"
 msgstr "Termékárrés"
 
+#~ msgid "From Date"
+#~ msgstr "Kezdő dátum"
+
 #~ msgid "Margins in Product"
 #~ msgstr "Termék árrései"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Összes árrés (%)"
+
+#~ msgid "To Date"
+#~ msgstr "Záró dátum"
+
+#~ msgid "# Invoiced"
+#~ msgstr "Számlázott mennyiség"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Hiba: Érvénytelen vonalkód"
 
diff --git a/addons/product_margin/i18n/id.po b/addons/product_margin/i18n/id.po
index dd459775603..9ed8da87076 100644
--- a/addons/product_margin/i18n/id.po
+++ b/addons/product_margin/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/it.po b/addons/product_margin/i18n/it.po
index af8fbaf465c..9e3c096e27f 100644
--- a/addons/product_margin/i18n/it.po
+++ b/addons/product_margin/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 06:48+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "A"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Alla data"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr "Fatturato - Prezzo standard"
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Dalla data"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Dalla data"
 msgid "Draft, Open and Paid"
 msgstr "Bozza, aperta e pagata"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Margini Prodotti"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Prezzo unitario medio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Prodotto"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Prezzo di catalogo"
 msgid "Paid"
 msgstr "Pagato"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Intervallo vendite"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Somma della quantità nelle fatture fornitori"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Vendita attesa - Costo normale"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Fatturato"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Critreri di analisi"
 
 #. module: product_margin
 #: view:product.product:0
@@ -151,12 +160,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr "Prezzo Medio nelle Fatture Clienti."
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
-"Somma del Prodotto del prezzo di Vendita da Catalogo e quantità delle "
-"Fatture Clienti"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prezzo medio nelle fatture fornitori "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -169,16 +175,23 @@ msgstr "Stato fattura"
 msgid "Normal Cost - Total Cost"
 msgstr "Costo normale - costo totale"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Somma del Prodotto del prezzo di Vendita da Catalogo e quantità delle "
+"Fatture Clienti"
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margine totale"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Intervallo vendite"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -199,9 +212,14 @@ msgid "Purchases"
 msgstr "Acquisti"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Prezzo medio nelle fatture fornitori "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Vendita attesa - Costo normale"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -214,9 +232,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margine totale * 100 / Ricambio"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Critreri di analisi"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Margini Aperti"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -230,13 +248,9 @@ msgid "Sales"
 msgstr "Vendite"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Margini Prodotti"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Prodotto"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -248,16 +262,6 @@ msgstr "Informazioni generali"
 msgid "Purchase Gap"
 msgstr "Margine di acquisto"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Margine totale (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Margini Aperti"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -283,6 +287,12 @@ msgstr "o"
 msgid "Product Margin"
 msgstr "Margine prodotto"
 
+#~ msgid "To Date"
+#~ msgstr "Alla data"
+
+#~ msgid "From Date"
+#~ msgstr "Dalla data"
+
 #~ msgid "Reporting"
 #~ msgstr "Reportistica"
 
@@ -301,9 +311,15 @@ msgstr "Margine prodotto"
 #~ msgid "Select "
 #~ msgstr "Seleziona "
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Fatturato"
+
 #~ msgid "Margins in Product"
 #~ msgstr "Margini dei prodotti"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Margine totale (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Visualizza giacenza prodotti"
 
diff --git a/addons/product_margin/i18n/ja.po b/addons/product_margin/i18n/ja.po
index 51300034190..aa123afc587 100644
--- a/addons/product_margin/i18n/ja.po
+++ b/addons/product_margin/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 17:54+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "終了"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "終了日"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "開始日"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "開始日"
 msgid "Draft, Open and Paid"
 msgstr "ドラフトと開始と支払済"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "製品利鞘"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "平均単価"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "製品"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "カタログ価格"
 msgid "Paid"
 msgstr "支払済"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "販売ギャップ"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "仕入先請求書の数量合計"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "予想販売 - 通常コスト"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "請求済数"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "分析基準"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "仕入先請求書の平均価格 "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "請求書の状態"
 msgid "Normal Cost - Total Cost"
 msgstr "通常コスト - 合計コスト"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "合計利鞘"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "販売ギャップ"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "仕入"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "仕入先請求書の平均価格 "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "予想販売 - 通常コスト"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "合計利鞘 * 100 / 売上高"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "分析基準"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "利鞘を開く"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "売上"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "製品利鞘"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "製品"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "一般情報"
 msgid "Purchase Gap"
 msgstr "仕入ギャップ"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "合計利鞘（%）"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "利鞘を開く"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -282,9 +286,18 @@ msgstr "製品利鞘"
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 #~ msgstr "顧客請求書の販売カタログ価格と数量の乗算合計"
 
+#~ msgid "From Date"
+#~ msgstr "開始日"
+
+#~ msgid "To Date"
+#~ msgstr "終了日"
+
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "仕入先請求書のコスト価格と数量の乗算合計"
 
+#~ msgid "# Invoiced"
+#~ msgstr "請求済数"
+
 #~ msgid ""
 #~ "Sum of Multification of Invoice price and quantity of Customer Invoices"
 #~ msgstr "顧客請求書の請求書価格と数量の乗算合計"
@@ -296,6 +309,9 @@ msgstr "製品利鞘"
 #~ "Sum of Multification of Invoice price and quantity of Supplier Invoices "
 #~ msgstr "仕入先請求書の請求書価格と数量の乗算合計 "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "合計利鞘（%）"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "エラー：無効な商品識別番号です。"
 
diff --git a/addons/product_margin/i18n/ko.po b/addons/product_margin/i18n/ko.po
index 55625cd9258..40aee7746de 100644
--- a/addons/product_margin/i18n/ko.po
+++ b/addons/product_margin/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 16:38+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,19 +44,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -65,6 +60,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr "초안, 오픈 그리고 결제됨"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "상품 마진"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,8 +76,8 @@ msgid "Avg. Unit Price"
 msgstr "평균 단가"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -87,6 +91,12 @@ msgstr "카타로그 가격"
 msgid "Paid"
 msgstr "결제됨"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "판매 갭"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "공급자 인보이스에서 수량 합계"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# 인보이스됨"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "분석 범주"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "공급자 인보이스의 평균 가격 "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "인보이스 상태"
 msgid "Normal Cost - Total Cost"
 msgstr "보통 원가 - 총 원가"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "총 마진"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "판매 갭"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "구매"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "공급자 인보이스의 평균 가격 "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "총 마진 * 100 / 회전율"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "분석 범주"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "오픈 마진"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "판매"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "상품 마진"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr "구매 갭"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "총 마진 (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "오픈 마진"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -288,6 +292,9 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "리포팅"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# 인보이스됨"
+
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "원가 가격과 공급자 인보이스 수량을 곱한 금액"
 
@@ -311,5 +318,8 @@ msgstr ""
 #~ msgid "Select "
 #~ msgstr "선택 "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "총 마진 (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "상품 재고 보기"
diff --git a/addons/product_margin/i18n/lt.po b/addons/product_margin/i18n/lt.po
index 76c066432fc..9391a1342ff 100644
--- a/addons/product_margin/i18n/lt.po
+++ b/addons/product_margin/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/nl.po b/addons/product_margin/i18n/nl.po
index 25cca74efcd..4277716c0a2 100644
--- a/addons/product_margin/i18n/nl.po
+++ b/addons/product_margin/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-24 22:06+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Aan"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "T/m datum"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Vanaf datum"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Vanaf datum"
 msgid "Draft, Open and Paid"
 msgstr "Concept, Open en Betaald"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Productmarges"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Gem. stuksprijs"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Verkoopprijs"
 msgid "Paid"
 msgstr "Betaald"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Verkoopkloof"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Totale hoeveelheid over leveranciersfacturen"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Verwachte verkoop - Kostpijs"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Gefactureerd"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Analysecriteria"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Gem. prijs in leveranciersfacturen "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Status factuur"
 msgid "Normal Cost - Total Cost"
 msgstr "Normale kosten- Totale kosten"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Totale Marge"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Verkoopkloof"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Inkopen"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Gem. prijs in leveranciersfacturen "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Verwachte verkoop - Kostpijs"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Totale marge * 100 / omzet"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Analysecriteria"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Open marges"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Verkopen"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Productmarges"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Product"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Algemene informatie"
 msgid "Purchase Gap"
 msgstr "Inkoopkloof"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Totale marge (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Open marges"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -277,6 +281,9 @@ msgstr "of"
 msgid "Product Margin"
 msgstr "Product marge"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Gefactureerd"
+
 #~ msgid "Margins in Product"
 #~ msgstr "Marge in producten"
 
@@ -286,6 +293,9 @@ msgstr "Product marge"
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "Gemiddelde prijs in klantfacturen"
 
+#~ msgid "From Date"
+#~ msgstr "Vanaf datum"
+
 #~ msgid "Reporting"
 #~ msgstr "Overzichten"
 
@@ -311,6 +321,9 @@ msgstr "Product marge"
 #~ msgid "Select "
 #~ msgstr "Kies "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Totale marge (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Bekijk productvoorraad"
 
@@ -331,6 +344,9 @@ msgstr "Product marge"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fout: ongeldige ean code"
 
+#~ msgid "To Date"
+#~ msgstr "T/m datum"
+
 #~ msgid ""
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 #~ msgstr "Som van product van verkoopprijs en de hoeveelheid op klantfacturen."
diff --git a/addons/product_margin/i18n/nl_BE.po b/addons/product_margin/i18n/nl_BE.po
index 9fb904634ee..45e3931225d 100644
--- a/addons/product_margin/i18n/nl_BE.po
+++ b/addons/product_margin/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-14 02:29+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/pl.po b/addons/product_margin/i18n/pl.po
index 22b3876e0fd..e9430278bb0 100644
--- a/addons/product_margin/i18n/pl.po
+++ b/addons/product_margin/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 11:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Do"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Do daty"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Od daty"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Od daty"
 msgid "Draft, Open and Paid"
 msgstr "Projekty, Otwarte i Zapłacone"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marża produktu"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr "Średnia cena jedn."
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr "Cena katalogowa"
 msgid "Paid"
 msgstr "Zapłacona"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Deficyt sprzedaży"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma ilości z faktur dostawcy"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# zafakturowanych"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Kryteria analizy"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Średnia cena z faktur dostawców "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Stan faktury"
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Suma marży"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Deficyt sprzedaży"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Zakupy"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Średnia cena z faktur dostawców "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Suma marży * 100 / Obrót"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Kryteria analizy"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Sprzedaż"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marża produktu"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr ""
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr "Deficyt zakupów"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Suma marży (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -283,6 +287,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# zafakturowanych"
+
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "Średnia cena z faktur dla klientów)"
 
@@ -292,6 +299,12 @@ msgstr ""
 #~ msgid "View Stock of Products"
 #~ msgstr "Podgląd zapasów"
 
+#~ msgid "From Date"
+#~ msgstr "Od daty"
+
+#~ msgid "To Date"
+#~ msgstr "Do daty"
+
 #~ msgid "Margins in Product"
 #~ msgstr "Marże w produkcie"
 
@@ -306,5 +319,8 @@ msgstr ""
 #~ "Sum of Multification of Invoice price and quantity of Customer Invoices"
 #~ msgstr "Suma iloczynów cen fakturowych i ilości z faktur dla klienta"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Suma marży (%)"
+
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Obrót - Suma kosztów"
diff --git a/addons/product_margin/i18n/pt.po b/addons/product_margin/i18n/pt.po
index e97ae6a3c3c..8ec256bfa77 100644
--- a/addons/product_margin/i18n/pt.po
+++ b/addons/product_margin/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:58+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Para"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Até a Data"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "A Partir da Data"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "A Partir da Data"
 msgid "Draft, Open and Paid"
 msgstr "Rascunho, Aberto e Pago"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Margens de Artigo"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Preço Unitário Médio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Artigo"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Catálogo de Preço"
 msgid "Paid"
 msgstr "Pago"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Quebra de Vendas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Soma da Quantidade de Faturas de Fornecedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Preço esperado - Custo Normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Faturado"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Análise de Critérios"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Média do Preço nas Faturas do Fornecedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Estado da Fatura"
 msgid "Normal Cost - Total Cost"
 msgstr "Custo Normal  - Custo Total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margem Total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Quebra de Vendas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Média do Preço nas Faturas do Fornecedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Preço esperado - Custo Normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margem Total * 100 / Receita"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Análise de Critérios"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir Margens"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Vendas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Margens de Artigo"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Artigo"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Informação Geral"
 msgid "Purchase Gap"
 msgstr "Diferença na Compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Margem Total (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Abrir Margens"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -280,6 +284,15 @@ msgstr "Margem artigo"
 #~ msgid "Reporting"
 #~ msgstr "Relatório"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Margem Total (%)"
+
+#~ msgid "To Date"
+#~ msgstr "Até a Data"
+
+#~ msgid "From Date"
+#~ msgstr "A Partir da Data"
+
 #~ msgid "Excepted Sale - Turn Over"
 #~ msgstr "Excepção da Venda - Entregar"
 
@@ -326,6 +339,9 @@ msgstr "Margem artigo"
 #~ "Soma da Multiplicação do Catálogo de preço de Venda e quantidade de Faturas "
 #~ "de Cliente"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Faturado"
+
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr ""
 #~ "Soma da Multiplicação do preço de Custo e quantidade de Faturas de Fornecedor"
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 51adf9a0387..c53a37887a0 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-20 23:45+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 01:38+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
@@ -46,20 +46,15 @@ msgstr ""
 msgid "To"
 msgstr "Até"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Até a Data"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr "Volume de negócios - Preço Padrão"
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Data Inicial"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr "Índice total de margem (%)"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -67,6 +62,15 @@ msgstr "Data Inicial"
 msgid "Draft, Open and Paid"
 msgstr "Provisório, Aberto e Pago"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Margens do Produto"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -74,9 +78,9 @@ msgid "Avg. Unit Price"
 msgstr "Preço Unit. Médio"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Produto"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr "#Faturado na Venda"
 
 #. module: product_margin
 #: view:product.product:0
@@ -89,6 +93,12 @@ msgstr "Preço de Catálogo"
 msgid "Paid"
 msgstr "Pago"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Vendas abertas"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -110,15 +120,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Soma da Quantidade nas Faturas de Fornecedor"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Venda Esperada - Custo Normal"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr "Margem Data para"
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Faturado"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Critérios de Análise"
 
 #. module: product_margin
 #: view:product.product:0
@@ -154,12 +163,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr "Preço Médio em faturas de clientes."
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
-"Soma de multiplicação do preço de venda de catálogo e quantidade de faturas "
-"de clientes"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Preço Médio nas Faturas de Fornecedor "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -172,16 +178,23 @@ msgstr "Situação da Fatura"
 msgid "Normal Cost - Total Cost"
 msgstr "Custo Normal - Custo Total"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Soma de multiplicação do preço de venda de catálogo e quantidade de faturas "
+"de clientes"
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Margem total"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Vendas abertas"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr "Margem Data de"
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -201,9 +214,14 @@ msgid "Purchases"
 msgstr "Compras"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Preço Médio nas Faturas de Fornecedor "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr "#Faturado na Compra"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venda Esperada - Custo Normal"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -216,9 +234,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Margem total * 100/retorno"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Critérios de Análise"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Margens Abertas"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -232,13 +250,9 @@ msgid "Sales"
 msgstr "Vendas"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Margens do Produto"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produto"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -250,16 +264,6 @@ msgstr "Informações Gerais"
 msgid "Purchase Gap"
 msgstr "Abertura de compra"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Margem Total (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Margens Abertas"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -291,6 +295,9 @@ msgstr "Margem do Produto"
 #~ "Soma da Multiplicação do preço de Catálogo de Venda e quantidade de Faturas "
 #~ "de Cliente"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Faturado"
+
 #~ msgid "Reporting"
 #~ msgstr "Relatórios"
 
@@ -315,6 +322,15 @@ msgstr "Margem do Produto"
 #~ msgstr ""
 #~ "Soma da Multiplicação do preço faturado e quantidade de faturas do cliente"
 
+#~ msgid "From Date"
+#~ msgstr "Data Inicial"
+
+#~ msgid "To Date"
+#~ msgstr "Até a Data"
+
+#~ msgid "Total Margin (%)"
+#~ msgstr "Margem Total (%)"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN inválido"
 
diff --git a/addons/product_margin/i18n/ro.po b/addons/product_margin/i18n/ro.po
index 397f753e0d0..27928798bcd 100644
--- a/addons/product_margin/i18n/ro.po
+++ b/addons/product_margin/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-29 09:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Catre"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "La zi"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Din Data"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Din Data"
 msgid "Draft, Open and Paid"
 msgstr "Ciorna, Deschis si Platit"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marje Produs"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Pretul unitar mediu"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Produs"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Pretul de catalog"
 msgid "Paid"
 msgstr "Platit(a)"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Deficit vanzari"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma Cantitatii in Facturile furnizorului"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Vanzari estimate - Costuri normale"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Facturat"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criteriile analizei"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Pretul mediu in Facturile Furnizorului "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Starea facturii"
 msgid "Normal Cost - Total Cost"
 msgstr "Costuri normale - Costuri totale"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Marja totala"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Deficit vanzari"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Achizitii"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Pretul mediu in Facturile Furnizorului "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Vanzari estimate - Costuri normale"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Marja totala * 100 / Cifra de afaceri"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Criteriile analizei"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Marje deschise"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Vanzari"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marje Produs"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produs"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Informatii generale"
 msgid "Purchase Gap"
 msgstr "Deficit achizitii"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Marja totala (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Marje deschise"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -280,6 +284,9 @@ msgstr "Marja produs"
 #~ msgid "Reporting"
 #~ msgstr "Raportare"
 
+#~ msgid "From Date"
+#~ msgstr "Din Data"
+
 #~ msgid "Margins in Product"
 #~ msgstr "Marje produs"
 
@@ -300,12 +307,18 @@ msgstr "Marja produs"
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "Pretul mediu in Facturile Clientului"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Facturat"
+
 #~ msgid ""
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 #~ msgstr ""
 #~ "Suma Inmultirii pretului din Catalogul de Vanzare si cantitatea de Facturi "
 #~ "ale Clientului"
 
+#~ msgid "To Date"
+#~ msgstr "La zi"
+
 #~ msgid "Turnorder - Standard price"
 #~ msgstr "Comanda - Pretul standard"
 
@@ -323,5 +336,8 @@ msgstr "Marja produs"
 #~ msgstr ""
 #~ "Suma Inmultirii Pretului de pe factura si cantitatea Facturilor Clientului"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Marja totala (%)"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Eroare: Cod ean invalid"
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index f87cde02226..0848f531511 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 11:11+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "До"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "По дату"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "С даты"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "С даты"
 msgid "Draft, Open and Paid"
 msgstr "Черновик, Открыто и Оплачено"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Маржа продукции"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Средняя цена единицы"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Продукция"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Цена по каталогу"
 msgid "Paid"
 msgstr "Оплачено"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Отставание продаж"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Сумма количеств в счетах поставщика"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Ожидаемые продажи — Нормальная цена"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# выставленных счетов"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Критерии анализа"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Средняя цена в счетах поставщика "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Состояние счёта"
 msgid "Normal Cost - Total Cost"
 msgstr "Нормальная цена — Общая цена"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Общая маржа"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Отставание продаж"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Закупки"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Средняя цена в счетах поставщика "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Ожидаемые продажи — Нормальная цена"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Общая маржа * 100 / Оборот"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Критерии анализа"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Открытая маржа"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Продажи"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Маржа продукции"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Продукция"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Общая информация"
 msgid "Purchase Gap"
 msgstr "Отставание закупок"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Общая маржа (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Открытая маржа"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -288,9 +292,18 @@ msgstr "Маржа продукции"
 #~ msgstr ""
 #~ "Сумма произведения цены из каталога продаж и количества счетов заказчика"
 
+#~ msgid "From Date"
+#~ msgstr "С даты"
+
+#~ msgid "To Date"
+#~ msgstr "По дату"
+
 #~ msgid "Margins in Product"
 #~ msgstr "Наценки в ТМЦ"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# выставленных счетов"
+
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "Сред. цена в счетах заказчику)"
 
@@ -307,5 +320,8 @@ msgstr "Маржа продукции"
 #~ "содержит достаточное количество параметров, помогающих получить нужные "
 #~ "данные.\n"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Общая маржа (%)"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Ошибка: Неверный штрих-код"
diff --git a/addons/product_margin/i18n/sl.po b/addons/product_margin/i18n/sl.po
index eb6a3bef579..62a221a64ea 100644
--- a/addons/product_margin/i18n/sl.po
+++ b/addons/product_margin/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Za"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Do datuma"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Od datuma"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Od datuma"
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr "Kataloška cena"
 msgid "Paid"
 msgstr "Plačano"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr "Nabave"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr "Prodaja"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -282,3 +286,9 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid "From Date"
+#~ msgstr "Od datuma"
+
+#~ msgid "To Date"
+#~ msgstr "Do datuma"
diff --git a/addons/product_margin/i18n/sq.po b/addons/product_margin/i18n/sq.po
index efa5d7163f3..ecd74dc578f 100644
--- a/addons/product_margin/i18n/sq.po
+++ b/addons/product_margin/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,19 +44,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -65,6 +60,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,8 +76,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -87,6 +91,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,14 +118,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -150,9 +159,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -166,15 +174,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -194,8 +207,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -209,8 +227,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -225,12 +243,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -243,16 +257,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/sr.po b/addons/product_margin/i18n/sr.po
index 28132f953e9..61c7215213a 100644
--- a/addons/product_margin/i18n/sr.po
+++ b/addons/product_margin/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-04 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Do"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Do datuma"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Od datuma"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Od datuma"
 msgid "Draft, Open and Paid"
 msgstr "Pripremljeno, Otvoreno i Plaćeno"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marže proizvoda"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Srednja jedinična cijena"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Proizvod"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Kataloška cena"
 msgid "Paid"
 msgstr "Plaćeno"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Razmak u prodaji"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma količina na dobavljačevim fakturama"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Ocekivana Prodaja - Normalni Troskovi"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Fakturisano"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Kriterijum Analize"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Srednja cena u fakturama dobavljača "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Stanje fakture"
 msgid "Normal Cost - Total Cost"
 msgstr "Normalni trošak - Ukupni trošak"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Ukupna marža"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Razmak u prodaji"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Nabavke"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Srednja cena u fakturama dobavljača "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Ocekivana Prodaja - Normalni Troskovi"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Ukupna marža * 100 / Zarada"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Kriterijum Analize"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Otvorene marže"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Prodaje"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marže proizvoda"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "Generalne Informacije"
 msgid "Purchase Gap"
 msgstr "Razmak u kupovini"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Ukupna marža (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Otvorene marže"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -287,9 +291,18 @@ msgstr "Marza Proizvoda"
 #~ msgid "Margins in Product"
 #~ msgstr "Marže proizvoda"
 
+#~ msgid "From Date"
+#~ msgstr "Od datuma"
+
+#~ msgid "To Date"
+#~ msgstr "Do datuma"
+
 #~ msgid "Reporting"
 #~ msgstr "Izveštavanje"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Fakturisano"
+
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "Suma mnozenja nabavne cene i količine na dobavljačevim fakturama"
 
@@ -319,6 +332,9 @@ msgstr "Marza Proizvoda"
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Zarada-Ukupni trošak"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Ukupna marža (%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Pogledaj zalihu proizvoda"
 
diff --git a/addons/product_margin/i18n/sr@latin.po b/addons/product_margin/i18n/sr@latin.po
index 8564d81e6dc..ffa46c56b57 100644
--- a/addons/product_margin/i18n/sr@latin.po
+++ b/addons/product_margin/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-23 15:24+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,20 +44,15 @@ msgstr ""
 msgid "To"
 msgstr "Do"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Do datuma"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Od datuma"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -65,6 +60,15 @@ msgstr "Od datuma"
 msgid "Draft, Open and Paid"
 msgstr "Pripremljeno, Otvoreno i Plaćeno"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marže proizvoda"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,9 +76,9 @@ msgid "Avg. Unit Price"
 msgstr "Srednja jedinična cijena"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Proizvod"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -87,6 +91,12 @@ msgstr "Kataloška cena"
 msgid "Paid"
 msgstr "Plaćeno"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Razmak u prodaji"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,15 +118,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Suma količina na dobavljačevim fakturama"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Ocekivana Prodaja - Normalni Troskovi"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Fakturisano"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Kriterijum Analize"
 
 #. module: product_margin
 #: view:product.product:0
@@ -150,10 +159,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Srednja cena u fakturama dobavljača "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -166,16 +174,21 @@ msgstr "Stanje fakture"
 msgid "Normal Cost - Total Cost"
 msgstr "Normalni trošak - Ukupni trošak"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Ukupna marža"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Razmak u prodaji"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -194,9 +207,14 @@ msgid "Purchases"
 msgstr "Nabavke"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Srednja cena u fakturama dobavljača "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Ocekivana Prodaja - Normalni Troskovi"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -209,9 +227,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Ukupna marža * 100 / Zarada"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Kriterijum Analize"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Otvorene marže"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -225,13 +243,9 @@ msgid "Sales"
 msgstr "Prodaje"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Marže proizvoda"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -243,16 +257,6 @@ msgstr "Generalne Informacije"
 msgid "Purchase Gap"
 msgstr "Razmak u kupovini"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Ukupna marža (%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Otvorene marže"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -278,9 +282,15 @@ msgstr ""
 msgid "Product Margin"
 msgstr "Marza Proizvoda"
 
+#~ msgid "To Date"
+#~ msgstr "Do datuma"
+
 #~ msgid "Turnorder - Standard price"
 #~ msgstr "ObrtniZahtev -Standardna cena"
 
+#~ msgid "From Date"
+#~ msgstr "Od datuma"
+
 #~ msgid ""
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 #~ msgstr ""
@@ -293,6 +303,9 @@ msgstr "Marza Proizvoda"
 #~ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 #~ msgstr "Suma mnozenja nabavne cene i količine na dobavljačevim fakturama"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Fakturisano"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
@@ -307,6 +320,9 @@ msgstr "Marza Proizvoda"
 #~ "Sum of Multification of Invoice price and quantity of Supplier Invoices "
 #~ msgstr "Suma mnozenja fakturne cijene i količine na dobavljačevim fakturama "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Ukupna marža (%)"
+
 #~ msgid "Reporting"
 #~ msgstr "Izveštavanje"
 
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 7a5deebc9a7..2e4c3fd9a53 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:17+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Till"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Till datum"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Från datum"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Från datum"
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Produkt"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr "Betalad"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr ""
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produkt"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -279,3 +283,9 @@ msgstr ""
 
 #~ msgid "Margins in Product"
 #~ msgstr "Margins in Product"
+
+#~ msgid "From Date"
+#~ msgstr "Från datum"
+
+#~ msgid "To Date"
+#~ msgstr "Till datum"
diff --git a/addons/product_margin/i18n/tlh.po b/addons/product_margin/i18n/tlh.po
index 17fc7bfc01c..a4d1c80d08a 100644
--- a/addons/product_margin/i18n/tlh.po
+++ b/addons/product_margin/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index d456c7b33a9..11addb8b77f 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr ""
 msgid "To"
 msgstr "Bitiş"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "Bitiş Tarihi"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "Baş. Tarihi"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "Baş. Tarihi"
 msgid "Draft, Open and Paid"
 msgstr "Taslak, Açık ve Ödenmiş"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Ürün Marjları"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "Ort. Birim Fiyat"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "Ürün"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "Katalog fiyatı"
 msgid "Paid"
 msgstr "Ödendi"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Satış Farkı"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "Tedarikçi faturalarıdaki miktarların toplamı"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "Beklenen Satış - Normal Maliyet"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Faturalanmış"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Analiz kriteri"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Tedarikçi Faturası Ort. Fiyatı "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "Fatura Durumu"
 msgid "Normal Cost - Total Cost"
 msgstr "Normal Maliyet - Toplam Maliyet"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "Toplam Kâr"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "Satış Farkı"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "Alışlar"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "Tedarikçi Faturası Ort. Fiyatı "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Beklenen Satış - Normal Maliyet"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "Toplam margin * 100 / Ciro"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "Analiz kriteri"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Marj Aç"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "Satışlar"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "Ürün Marjları"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Ürün"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "Genel Bilgiler"
 msgid "Purchase Gap"
 msgstr "Alış Farkı"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "Toplam Kâr %"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "Marj Aç"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -280,9 +284,18 @@ msgstr "Ürün kar marjı"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
+#~ msgid "To Date"
+#~ msgstr "Bitiş Tarihi"
+
+#~ msgid "From Date"
+#~ msgstr "Baş. Tarihi"
+
 #~ msgid "Reporting"
 #~ msgstr "Raporlama"
 
+#~ msgid "# Invoiced"
+#~ msgstr "# Faturalanmış"
+
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Dönen Sipariş - Toplam Maliyeti"
 
@@ -292,6 +305,9 @@ msgstr "Ürün kar marjı"
 #~ msgid "Select "
 #~ msgstr "Seç "
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "Toplam Kâr %"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "Ürün Stoğunu Göster"
 
diff --git a/addons/product_margin/i18n/uk.po b/addons/product_margin/i18n/uk.po
index abf1758ffeb..a952ba0fa89 100644
--- a/addons/product_margin/i18n/uk.po
+++ b/addons/product_margin/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:43+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr "Закупівлі"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr "Продажі"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/vi.po b/addons/product_margin/i18n/vi.po
index 15faef2ed41..110be679e8c 100644
--- a/addons/product_margin/i18n/vi.po
+++ b/addons/product_margin/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -44,19 +44,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -65,6 +60,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -72,8 +76,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -87,6 +91,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -108,14 +118,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -150,9 +159,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -166,15 +174,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -194,8 +207,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -209,8 +227,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -225,12 +243,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -243,16 +257,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index 420c7a9dd9b..6ad8e689c9c 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 11:58+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,20 +43,15 @@ msgstr "供应商发票的开票价格和数量相乘的合计 "
 msgid "To"
 msgstr "到"
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr "日期到"
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr "营业额-标准价格"
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
-msgstr "日期从"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -64,6 +59,15 @@ msgstr "日期从"
 msgid "Draft, Open and Paid"
 msgstr "草稿、待处理和支付"
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "产品利润"
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,9 +75,9 @@ msgid "Avg. Unit Price"
 msgstr "平均单价"
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
-msgstr "产品"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
 
 #. module: product_margin
 #: view:product.product:0
@@ -86,6 +90,12 @@ msgstr "(产品列表价格)标价"
 msgid "Paid"
 msgstr "支付"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "销售差额"
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,15 +117,14 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr "供应商发票数量合计"
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
-msgstr "预计销售 - 标准成本"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
-msgstr "已开票数量"
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "分析准则"
 
 #. module: product_margin
 #: view:product.product:0
@@ -149,10 +158,9 @@ msgid "Avg. Price in Customer Invoices."
 msgstr "客户发票中的平均价格"
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr "客户发票的销售分类价格和数量相乘的汇总"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "供应商发票平均单价 "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -165,16 +173,21 @@ msgstr "发票状态"
 msgid "Normal Cost - Total Cost"
 msgstr "正常成本 - 总成本"
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr "客户发票的销售分类价格和数量相乘的汇总"
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr "总利润"
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
-msgstr "销售差额"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr ""
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -193,9 +206,14 @@ msgid "Purchases"
 msgstr "采购"
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
-msgstr "供应商发票平均单价 "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "预计销售 - 标准成本"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -208,9 +226,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr "总利润 / 营业额 * 100"
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
-msgstr "分析准则"
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "待处理利润"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -224,13 +242,9 @@ msgid "Sales"
 msgstr "销售"
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
-msgstr "产品利润"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "产品"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -242,16 +256,6 @@ msgstr "一般信息"
 msgid "Purchase Gap"
 msgstr "采购差额"
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr "总利润率(%)"
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr "待处理利润"
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
@@ -280,6 +284,12 @@ msgstr "产品利润"
 #~ msgid "Select "
 #~ msgstr "选择 "
 
+#~ msgid "To Date"
+#~ msgstr "日期到"
+
+#~ msgid "From Date"
+#~ msgstr "日期从"
+
 #~ msgid "Reporting"
 #~ msgstr "内部报表"
 
@@ -292,6 +302,9 @@ msgstr "产品利润"
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "总成本"
 
+#~ msgid "Total Margin (%)"
+#~ msgstr "总利润率(%)"
+
 #~ msgid "View Stock of Products"
 #~ msgstr "查看库存产品"
 
@@ -302,6 +315,9 @@ msgstr "产品利润"
 #~ msgid "Avg. Price in Customer Invoices)"
 #~ msgstr "客户发票的平均单价"
 
+#~ msgid "# Invoiced"
+#~ msgstr "已开票数量"
+
 #~ msgid "Excepted Sale - Turn Over"
 #~ msgstr "预计销售 - 营业额"
 
diff --git a/addons/product_margin/i18n/zh_TW.po b/addons/product_margin/i18n/zh_TW.po
index a65b0b392ed..74e7b7232a1 100644
--- a/addons/product_margin/i18n/zh_TW.po
+++ b/addons/product_margin/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-23 17:17+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -43,19 +43,14 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
 msgstr ""
 
 #. module: product_margin
@@ -64,6 +59,15 @@ msgstr ""
 msgid "Draft, Open and Paid"
 msgstr ""
 
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -71,8 +75,8 @@ msgid "Avg. Unit Price"
 msgstr ""
 
 #. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
 msgstr ""
 
 #. module: product_margin
@@ -86,6 +90,12 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
@@ -107,14 +117,13 @@ msgid "Sum of Quantity in Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -149,9 +158,8 @@ msgid "Avg. Price in Customer Invoices."
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
@@ -165,15 +173,20 @@ msgstr ""
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
 msgstr ""
 
 #. module: product_margin
@@ -193,8 +206,13 @@ msgid "Purchases"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -208,8 +226,8 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
@@ -224,12 +242,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: product_margin
@@ -242,16 +256,6 @@ msgstr ""
 msgid "Purchase Gap"
 msgstr ""
 
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
 #. module: product_margin
 #: view:product.margin:0
 msgid "Cancel"
diff --git a/addons/product_visible_discount/i18n/ar.po b/addons/product_visible_discount/i18n/ar.po
index 480ce8bdbe3..be4ac020020 100644
--- a/addons/product_visible_discount/i18n/ar.po
+++ b/addons/product_visible_discount/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 22:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/bg.po b/addons/product_visible_discount/i18n/bg.po
index 999b775f1c5..d3e3fabf651 100644
--- a/addons/product_visible_discount/i18n/bg.po
+++ b/addons/product_visible_discount/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-27 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/ca.po b/addons/product_visible_discount/i18n/ca.po
index 72b32942ee2..7fbf4ad7731 100644
--- a/addons/product_visible_discount/i18n/ca.po
+++ b/addons/product_visible_discount/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-06-21 15:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/da.po b/addons/product_visible_discount/i18n/da.po
index 231b7bf1c7f..e76b0172a86 100644
--- a/addons/product_visible_discount/i18n/da.po
+++ b/addons/product_visible_discount/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-08 11:47+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index c5a78fc70a3..f497fc3b899 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-08 11:39+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/el.po b/addons/product_visible_discount/i18n/el.po
index aad24ce895a..a7d4d22bce4 100644
--- a/addons/product_visible_discount/i18n/el.po
+++ b/addons/product_visible_discount/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-12 09:32+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index ea1c5f7c84c..8281546b58d 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-01 07:19+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/es_CR.po b/addons/product_visible_discount/i18n/es_CR.po
index d07785f7447..80bead5653a 100644
--- a/addons/product_visible_discount/i18n/es_CR.po
+++ b/addons/product_visible_discount/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:22+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/es_EC.po b/addons/product_visible_discount/i18n/es_EC.po
index 826dc36830d..ca53ed68e4c 100644
--- a/addons/product_visible_discount/i18n/es_EC.po
+++ b/addons/product_visible_discount/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-19 00:08+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/et.po b/addons/product_visible_discount/i18n/et.po
index 9646bc564eb..69d922a75aa 100644
--- a/addons/product_visible_discount/i18n/et.po
+++ b/addons/product_visible_discount/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-08 08:45+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/fi.po b/addons/product_visible_discount/i18n/fi.po
index 7e288af12f3..029a88dcf15 100644
--- a/addons/product_visible_discount/i18n/fi.po
+++ b/addons/product_visible_discount/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 10:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/fr.po b/addons/product_visible_discount/i18n/fr.po
index 6f4ddf726d1..a14a77c798c 100644
--- a/addons/product_visible_discount/i18n/fr.po
+++ b/addons/product_visible_discount/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 11:41+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/gl.po b/addons/product_visible_discount/i18n/gl.po
index 4b523148cd8..d97682dde5a 100644
--- a/addons/product_visible_discount/i18n/gl.po
+++ b/addons/product_visible_discount/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-11 19:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/hr.po b/addons/product_visible_discount/i18n/hr.po
index c2e04bbf678..0017abcc75a 100644
--- a/addons/product_visible_discount/i18n/hr.po
+++ b/addons/product_visible_discount/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 21:01+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/hu.po b/addons/product_visible_discount/i18n/hu.po
index 21d0300d8d1..a2f46b2e67f 100644
--- a/addons/product_visible_discount/i18n/hu.po
+++ b/addons/product_visible_discount/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-31 18:05+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/it.po b/addons/product_visible_discount/i18n/it.po
index 653dcb7dbfa..bae3b281a4b 100644
--- a/addons/product_visible_discount/i18n/it.po
+++ b/addons/product_visible_discount/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 20:40+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/ja.po b/addons/product_visible_discount/i18n/ja.po
index 67e49d7fdde..08f01a60cbd 100644
--- a/addons/product_visible_discount/i18n/ja.po
+++ b/addons/product_visible_discount/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 17:59+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/lt.po b/addons/product_visible_discount/i18n/lt.po
index ad250c9b726..d00bd8262f4 100644
--- a/addons/product_visible_discount/i18n/lt.po
+++ b/addons/product_visible_discount/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-15 13:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/mn.po b/addons/product_visible_discount/i18n/mn.po
index b539896e32e..80999ece8f1 100644
--- a/addons/product_visible_discount/i18n/mn.po
+++ b/addons/product_visible_discount/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-12 06:37+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/nl.po b/addons/product_visible_discount/i18n/nl.po
index 730ae0e1eb4..3ea3fc31bd7 100644
--- a/addons/product_visible_discount/i18n/nl.po
+++ b/addons/product_visible_discount/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-08 10:26+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/pl.po b/addons/product_visible_discount/i18n/pl.po
index cc06a47b176..e67284beaa9 100644
--- a/addons/product_visible_discount/i18n/pl.po
+++ b/addons/product_visible_discount/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 12:05+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/pt.po b/addons/product_visible_discount/i18n/pt.po
index 499e18fc52d..47b6540b61b 100644
--- a/addons/product_visible_discount/i18n/pt.po
+++ b/addons/product_visible_discount/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-27 04:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/pt_BR.po b/addons/product_visible_discount/i18n/pt_BR.po
index 63fd1c16b83..6b7180315d0 100644
--- a/addons/product_visible_discount/i18n/pt_BR.po
+++ b/addons/product_visible_discount/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-28 19:35+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/ro.po b/addons/product_visible_discount/i18n/ro.po
index 1e178e7d364..d8455d3b64a 100644
--- a/addons/product_visible_discount/i18n/ro.po
+++ b/addons/product_visible_discount/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-11 19:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/ru.po b/addons/product_visible_discount/i18n/ru.po
index 9dd54535ad9..75b3de9faf8 100644
--- a/addons/product_visible_discount/i18n/ru.po
+++ b/addons/product_visible_discount/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-25 06:47+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
index 0091859432f..24254dc556d 100644
--- a/addons/product_visible_discount/i18n/sl.po
+++ b/addons/product_visible_discount/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-02 12:04+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
index 651cfaaee63..a5be16e1c78 100644
--- a/addons/product_visible_discount/i18n/sr.po
+++ b/addons/product_visible_discount/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-04 09:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/sr@latin.po b/addons/product_visible_discount/i18n/sr@latin.po
index 5b9f99b547a..e29680d0b37 100644
--- a/addons/product_visible_discount/i18n/sr@latin.po
+++ b/addons/product_visible_discount/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-31 20:04+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/sv.po b/addons/product_visible_discount/i18n/sv.po
index 722270cefb2..c26f9cc8520 100644
--- a/addons/product_visible_discount/i18n/sv.po
+++ b/addons/product_visible_discount/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-26 22:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/tr.po b/addons/product_visible_discount/i18n/tr.po
index 9ea563d6bd2..ec287e75b83 100644
--- a/addons/product_visible_discount/i18n/tr.po
+++ b/addons/product_visible_discount/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 23:23+0000\n"
 "Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/vi.po b/addons/product_visible_discount/i18n/vi.po
index b2a866fc8ea..419d2235c8d 100644
--- a/addons/product_visible_discount/i18n/vi.po
+++ b/addons/product_visible_discount/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-01 17:21+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/product_visible_discount/i18n/zh_CN.po b/addons/product_visible_discount/i18n/zh_CN.po
index f507e641220..5126f85a591 100644
--- a/addons/product_visible_discount/i18n/zh_CN.po
+++ b/addons/product_visible_discount/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-14 10:27+0000\n"
 "Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:149
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 646d6958918..f20dd523932 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "ابدء المهمة"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -224,9 +224,10 @@ msgid "Assigned To"
 msgstr "عُينت لـ"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "شديد الأهمية"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -264,9 +265,14 @@ msgid "Project Task Delegate"
 msgstr "تأخير مهمة المشروع"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -312,12 +318,6 @@ msgstr ""
 msgid "August"
 msgstr "أغسطس"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -389,7 +389,7 @@ msgid "Assigned to"
 msgstr "مكلف إلى"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -425,12 +425,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr "إعادة تقييم المهمة"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -441,6 +435,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -456,6 +456,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -607,12 +612,6 @@ msgstr "ملخص المهمة"
 msgid "Not a Template Task"
 msgstr "ليست قالب المهمة"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -672,6 +671,14 @@ msgstr "مهام جديدة"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "تاريخ الإنتهاء"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -862,6 +869,11 @@ msgstr ""
 msgid "Companies"
 msgstr "الشركات"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -891,12 +903,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -918,17 +924,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -954,9 +949,11 @@ msgstr ""
 "مجموع الساعات المقضية لكل المهم المتعلقة بهذا المشروع ومشاريعها الفرعية."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "التّطوير"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -964,27 +961,21 @@ msgid "Users"
 msgstr "المستخدمون"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "مدير"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "مشاريع مشتركة بين الجميع"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1034,18 +1025,6 @@ msgstr "التحقق من صلاحية الحالة"
 msgid "Work summary"
 msgstr "ملخص العمل"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1098,11 +1077,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "المهام الاساسية"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1151,7 +1125,7 @@ msgid "Done by"
 msgstr "تم بواسطة"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1185,11 +1159,6 @@ msgstr "# من المهام"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1230,13 +1199,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "حسابها كالتالي: الوقت المستغرق + الوقت المتبقي"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1274,6 +1248,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "شديد الأهمية"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1335,8 +1314,6 @@ msgid "Low"
 msgstr "منخفض"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgstr ""
 "في حالة المسودة."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1448,7 +1425,7 @@ msgid "Done"
 msgstr "تم"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1475,6 +1452,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "الساعات المتبقية"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1496,17 +1478,6 @@ msgstr "ابحث عن المشروع"
 msgid "Delegated Task"
 msgstr "المهمة المؤجلة"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "مدير"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1519,12 +1490,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "تاريخ الإنتهاء"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "التّطوير"
 
 #. module: project
 #: help:project.task,active:0
@@ -1567,7 +1535,7 @@ msgid "Overpassed Tasks"
 msgstr "المهام الزائدة"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1596,6 +1564,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "فوض المهمة الخاصة بك الى مستخدم اخر"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1623,7 +1596,7 @@ msgid "CHECK: "
 msgstr "تحقق: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "يجب تعيين أعضاء في المشروع '%s' !"
@@ -1751,6 +1724,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1764,8 +1742,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1846,7 +1822,7 @@ msgid "Starting Date"
 msgstr "تاريخ البدء"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1879,12 +1855,6 @@ msgstr "تحليل المهام"
 msgid "Project Tasks"
 msgstr "مهام المشروع"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1903,12 +1873,6 @@ msgstr "مهام"
 msgid "December"
 msgstr "ديسمبر"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1951,12 +1915,6 @@ msgstr "مسودة"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2004,14 +1962,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2022,11 +1972,6 @@ msgstr "المهام والتدفق التراكمي"
 msgid "January"
 msgstr "يناير"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2038,11 +1983,17 @@ msgid "Reevaluation Task"
 msgstr "إعادة تقييم المهمة"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "رجاء قم بحذف رابط المشروع مع هذا الحساب أولاً"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2061,6 +2012,11 @@ msgstr "المشاريع التي أنا مديرها"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2100,6 +2056,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2749,6 +2710,9 @@ msgstr "مراحل المهام"
 #~ msgid "Month-2"
 #~ msgstr "الشهر-2"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "مشاريع مشتركة بين الجميع"
+
 #~ msgid ""
 #~ "The stages can be common to all project or specific to one project. Each "
 #~ "task will follow the different stages in order to be closed."
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 9b161596153..3c37a31d9ed 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 09:16+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Начало на задача"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr "Състояние"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr "Присвоено на"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr "Обобщение на задачата"
 msgid "Not a Template Task"
 msgstr "Не е шаблон на задача"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr "Направено от"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr "Нисък"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr "Готово"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Оставащи часове"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr "Търси проект"
 msgid "Delegated Task"
 msgstr "Делегирана задача"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr "Проверка: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Задачи на проекта"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr "Задачи"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr "Чернова"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr "Преоценка на задача"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index c0ac952353b..0488789aa33 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 09:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1085,11 +1064,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1138,7 +1112,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1172,11 +1146,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1217,13 +1186,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1261,6 +1235,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1320,8 +1299,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1408,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1455,6 +1432,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1476,17 +1458,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1499,11 +1470,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1544,7 +1512,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1571,6 +1539,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1598,7 +1571,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1726,6 +1699,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1739,8 +1717,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1820,7 +1796,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1853,12 +1829,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1877,12 +1847,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1925,12 +1889,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1978,14 +1936,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1996,11 +1946,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2012,11 +1957,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2035,6 +1986,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2072,6 +2028,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 81125926f5f..056d2024887 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:51+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Inicia tasca"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -226,8 +226,9 @@ msgid "Assigned To"
 msgstr "Assignat a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -266,9 +267,14 @@ msgid "Project Task Delegate"
 msgstr "Delega tasca de projecte"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -315,12 +321,6 @@ msgstr "Estat"
 msgid "August"
 msgstr "Agost"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -395,7 +395,7 @@ msgid "Assigned to"
 msgstr "Assignat a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -431,12 +431,6 @@ msgstr "Temps treballat"
 msgid "Re-evaluate Task"
 msgstr "Re-avalua tasca"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -447,6 +441,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -462,6 +462,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -614,12 +619,6 @@ msgstr "Resum de la tasca"
 msgid "Not a Template Task"
 msgstr "No és una plantilla de tasca"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -679,6 +678,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Data de finalització"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -869,6 +876,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Companyies"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -898,12 +910,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -926,17 +932,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -963,9 +958,11 @@ msgstr ""
 "projecte i els seus projectes fills."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desenvolupament"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -973,27 +970,21 @@ msgid "Users"
 msgstr "Usuaris"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Director"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1043,18 +1034,6 @@ msgstr "Estat de validació"
 msgid "Work summary"
 msgstr "Resum del treball"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1109,11 +1088,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Tasques pare"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1162,7 +1136,7 @@ msgid "Done by"
 msgstr "Realitzat per"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1196,11 +1170,6 @@ msgstr "Nº de tasques"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1241,13 +1210,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculat com: Temps dedicat + Temps restant."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1285,6 +1259,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1344,8 +1323,6 @@ msgid "Low"
 msgstr "Baixa"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1439,7 +1416,7 @@ msgstr ""
 "projecte quan la tasca està en estat esborrany."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1459,7 +1436,7 @@ msgid "Done"
 msgstr "Realitzat"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1486,6 +1463,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Hores restants"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1508,17 +1490,6 @@ msgstr "Cerca projecte"
 msgid "Delegated Task"
 msgstr "Tasca delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Director"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1531,12 +1502,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Data de finalització"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desenvolupament"
 
 #. module: project
 #: help:project.task,active:0
@@ -1579,7 +1547,7 @@ msgid "Overpassed Tasks"
 msgstr "Tasques sobrepassades"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1606,6 +1574,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegueu la vostra tasca a un altre usuari"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1633,7 +1606,7 @@ msgid "CHECK: "
 msgstr "COMPROVA: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1761,6 +1734,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1774,8 +1752,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1857,7 +1833,7 @@ msgid "Starting Date"
 msgstr "Data d'inici"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1890,12 +1866,6 @@ msgstr "Anàlisi de tasques"
 msgid "Project Tasks"
 msgstr "Tasques de projecte"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1914,12 +1884,6 @@ msgstr "Tasques"
 msgid "December"
 msgstr "Desembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1962,12 +1926,6 @@ msgstr "Esborrany"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2015,14 +1973,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2033,11 +1983,6 @@ msgstr ""
 msgid "January"
 msgstr "Gener"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2049,11 +1994,17 @@ msgid "Reevaluation Task"
 msgstr "Re-avaluació de la tasca"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2072,6 +2023,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2109,6 +2065,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 5344d315593..1d920d5eb4e 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:56+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Začít úkol"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr "Přiřazeno k"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr "Delegace úlohy projektu"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -311,12 +317,6 @@ msgstr ""
 msgid "August"
 msgstr "Srpen"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -388,7 +388,7 @@ msgid "Assigned to"
 msgstr "Přiřadit k"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -424,12 +424,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr "Znovu vyhodnotit úkol"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -440,6 +434,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -455,6 +455,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -606,12 +611,6 @@ msgstr "Souhrn úlohy"
 msgid "Not a Template Task"
 msgstr "Není šablonová úloha"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -671,6 +670,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Datum ukončení"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -861,6 +868,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Společnosti"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -890,12 +902,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -914,17 +920,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Zrušit"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -951,9 +946,11 @@ msgstr ""
 "podřízeným projektům."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Ve vývoji"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -961,27 +958,21 @@ msgid "Users"
 msgstr "Uživatelé"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Správce"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1031,18 +1022,6 @@ msgstr "Stav ověření"
 msgid "Work summary"
 msgstr "Souhrn práce"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1095,11 +1074,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Nadřazené úkoly"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1148,7 +1122,7 @@ msgid "Done by"
 msgstr "Udělal"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1182,11 +1156,6 @@ msgstr "# úkolů"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1227,13 +1196,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "spočítáno jako: Čas strávený + Čas zbývající."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1271,6 +1245,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1330,8 +1309,6 @@ msgid "Low"
 msgstr "Nízký"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1424,7 +1401,7 @@ msgstr ""
 "je úkol ve stavu návrhu."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1444,7 +1421,7 @@ msgid "Done"
 msgstr "Dokončeno"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1471,6 +1448,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Zbývající hodiny"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1492,17 +1474,6 @@ msgstr "Hledat projekt"
 msgid "Delegated Task"
 msgstr "Delegované úkoly"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Správce"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1515,12 +1486,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Datum ukončení"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Ve vývoji"
 
 #. module: project
 #: help:project.task,active:0
@@ -1563,7 +1531,7 @@ msgid "Overpassed Tasks"
 msgstr "Překročené úlohy"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1590,6 +1558,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegovat váš úkol na jiného uživatele"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1617,7 +1590,7 @@ msgid "CHECK: "
 msgstr "KONTROLA: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1745,6 +1718,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1758,8 +1736,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1841,7 +1817,7 @@ msgid "Starting Date"
 msgstr "Počáteční datum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1874,12 +1850,6 @@ msgstr "Analýza úkolů"
 msgid "Project Tasks"
 msgstr "Projektové úkoly"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1898,12 +1868,6 @@ msgstr "Úkoly"
 msgid "December"
 msgstr "Prosinec"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1946,12 +1910,6 @@ msgstr "Koncept"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1999,14 +1957,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2017,11 +1967,6 @@ msgstr ""
 msgid "January"
 msgstr "Leden"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2033,11 +1978,17 @@ msgid "Reevaluation Task"
 msgstr "Znovu vyhodnocení úkolu"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2056,6 +2007,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2093,6 +2049,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 017960e0498..a5ca792a68c 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 06:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,8 +937,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 4bdfc13cd27..b036fe0cb86 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-21 00:06+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 14:43+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
@@ -85,7 +85,7 @@ msgid "Start Task"
 msgstr "Starte Aufgabe"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Warnung!"
@@ -137,8 +137,8 @@ msgstr ""
 "html Format, um Sie später in einer Kanban Ansicht einfügen zu können."
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -229,9 +229,10 @@ msgid "Assigned To"
 msgstr "Zugewiesen an"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Sehr wichtig"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -269,10 +270,15 @@ msgid "Project Task Delegate"
 msgstr "Delegation Projektaufgabe"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "Projekt wurde <b>erzeugt</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr ""
 
 #. module: project
 #: view:project.config.settings:0
@@ -318,12 +324,6 @@ msgstr "Status"
 msgid "August"
 msgstr "August"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "Die Aufgabe wurde <b>weiteregleitet</b> an <em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -400,7 +400,7 @@ msgid "Assigned to"
 msgstr "Zuweisung an"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Der beuaftragte Benutzer muss definiert werden."
@@ -436,12 +436,6 @@ msgstr "Arbeitszeit"
 msgid "Re-evaluate Task"
 msgstr "Neuberechnung verbleibender Stunden"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stufe wurde geändert auf <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -452,6 +446,12 @@ msgstr "Bestätigte Plan Zeit"
 msgid "Use integrated collaborative note pads on task"
 msgstr "Integrierte Zusammenarbeit für Aufgaben"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -460,13 +460,18 @@ msgstr "Erfasse Deine Arbeitsstunden"
 #. module: project
 #: field:project.project,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: project
 #: view:project.task:0
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -620,13 +625,6 @@ msgstr "Aufgabe"
 msgid "Not a Template Task"
 msgstr "Keine Aufgabenvorlage"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-"Folge diesem Projekt, um alle relevanten Aufgaben und Probleme zu verfolgen."
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -701,6 +699,14 @@ msgstr "Neue Aufgaben"
 msgid "Invoice working time on issues"
 msgstr "Abrechnen der Arbeitszeit zu Vorfällen"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Ende Datum"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -896,6 +902,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Unternehmen"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -928,12 +939,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "Projekt wurde <b>abgebrochen</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -955,21 +960,10 @@ msgstr ""
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "Projekt wurde <b>abgeschlossen</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Weitere Info"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -992,9 +986,11 @@ msgstr ""
 "Teilprojekte."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Softwareentwicklung"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -1002,31 +998,25 @@ msgid "Users"
 msgstr "Benutzer"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Stufe wurde geändert"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Wichtig"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Allen Projekten gemeinsam"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Bezeichnung"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1053,7 +1043,7 @@ msgstr "Gemeinsam"
 #: help:project.project,message_ids:0
 #: help:project.task,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Nachrichten und Kommunikations-Historie"
 
 #. module: project
 #: view:project.project:0
@@ -1061,6 +1051,8 @@ msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
 msgstr ""
+"Zur Abrechnung oder neuen Erstellung eines Vertrags, wechseln Sie zum "
+"verknüpften Vertrag."
 
 #. module: project
 #: field:project.task.delegate,state:0
@@ -1072,18 +1064,6 @@ msgstr "Validierung Status"
 msgid "Work summary"
 msgstr "Arbeitszeiten Auswertung"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "Projekt ist jetzt <b>im Wiedervorlage Zustand</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1128,7 +1108,7 @@ msgstr "Delegierte Aufgaben"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ungelesene Nachrichten"
 
 #. module: project
 #: view:project.task:0
@@ -1136,11 +1116,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Hauptaufgabe"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1175,7 +1150,7 @@ msgstr "Zeige nur Aufgaben mit Frist"
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Bedienung"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1189,10 +1164,10 @@ msgid "Done by"
 msgstr "Erledigt durch"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Diese Aktion ist fehlerhaft!"
 
 #. module: project
 #: help:project.task.type,state:0
@@ -1201,6 +1176,10 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"Der Status des Belegs ändert sich automatisch, je nachdem welche "
+"Bearbeitungsstufe ausgewählt wurde. Wenn z.B. ein Vorgang bereits 'Beendet' "
+"wurde, z.B. bei Erreichen einer bestimmten Stufe, wird er automatisch im "
+"System beendet."
 
 #. module: project
 #: view:project.task:0
@@ -1210,7 +1189,7 @@ msgstr "Extra Information"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Bearbeiten ..."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1221,12 +1200,7 @@ msgstr "# Aufgaben"
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
+msgstr "Anzahl Anhänge"
 
 #. module: project
 #: field:project.task,priority:0
@@ -1271,13 +1245,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Berechnet als: Zeitaufwand + Verbleibende Zeit"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1308,13 +1287,18 @@ msgstr "Verzögerung in Stunden"
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr "Definieren Sie die Mengeneinheit für Projekte und Aufgaben."
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Sehr wichtig"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1362,7 +1346,7 @@ msgstr "Beschreibung der Prüfung für die delegierte Aufgabe"
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "Arbeitseinheit"
 
 #. module: project
 #: view:project.project:0
@@ -1376,11 +1360,9 @@ msgid "Low"
 msgstr "Ausreichend"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Beendet"
 
 #. module: project
 #: view:project.project:0
@@ -1399,7 +1381,7 @@ msgstr "Im Wartezustand"
 #. module: project
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Stichwörter"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1420,7 +1402,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,group_manage_delegation_task:0
 msgid "Allows you to delegate tasks to other users."
-msgstr ""
+msgstr "Ermöglicht eine Aufgabendelegation"
 
 #. module: project
 #: field:project.project,active:0
@@ -1449,7 +1431,7 @@ msgstr ""
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Hilfe & Support"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1471,7 +1453,7 @@ msgstr ""
 "Projektmanager im Stadium des Entwurfs."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1491,7 +1473,7 @@ msgid "Done"
 msgstr "Erledigt"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1520,6 +1502,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Verbleibende Stunden"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1541,17 +1528,6 @@ msgstr "Suche Projekt"
 msgid "Delegated Task"
 msgstr "Delegierte Aufgaben"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1564,12 +1540,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Ende Datum"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Softwareentwicklung"
 
 #. module: project
 #: help:project.task,active:0
@@ -1613,7 +1586,7 @@ msgid "Overpassed Tasks"
 msgstr "Aufgaben mit Verzug"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1642,6 +1615,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegiere Aufgaben an anderen Benutzer"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1671,7 +1649,7 @@ msgid "CHECK: "
 msgstr "PRÜFE: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Sie müssen dem Projekt '%s' Mitarbeiter zuordnen"
@@ -1809,6 +1787,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1822,8 +1805,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1905,7 +1886,7 @@ msgid "Starting Date"
 msgstr "Start Datum:"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1938,12 +1919,6 @@ msgstr "Statistik Aufgaben"
 msgid "Project Tasks"
 msgstr "Projekt Aufgaben"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1962,12 +1937,6 @@ msgstr "Aufgaben"
 msgid "December"
 msgstr "Dezember"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -2019,12 +1988,6 @@ msgstr "Entwurf"
 msgid "Kanban State"
 msgstr "Kanban Status"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2074,14 +2037,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr "Projekt konfigurieren"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2092,11 +2047,6 @@ msgstr "Kumulierter Aufgabenfortschritt"
 msgid "January"
 msgstr "Januar"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "Projekt: Markieren als ungelesen"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2108,13 +2058,19 @@ msgid "Reevaluation Task"
 msgstr "Neubewertung der verbleibenden Zeit"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 "Löschen Sie bitte vorher das Projekt, das mit dieser Kostenstelle verlinkt "
 "ist"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2133,6 +2089,11 @@ msgstr "Projekte, die ich verantworte"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2174,6 +2135,11 @@ msgstr ""
 "Eine Anwendung für das Projektmanagement von Langzeit - Projekten , zur "
 "Planung und Reservierung  der benötigten Ressourcen."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3139,6 +3105,9 @@ msgstr "Aufgaben Stufen"
 #~ msgid "Delegations History"
 #~ msgstr "Delegationsverlauf"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Allen Projekten gemeinsam"
+
 #~ msgid "Deployment"
 #~ msgstr "Einsatz"
 
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index adb63c0d006..ca4fb0925b9 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-08 19:49+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -85,7 +85,7 @@ msgid "Start Task"
 msgstr "Εκκίνηση Εργασίας"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -135,8 +135,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -224,8 +224,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -264,9 +265,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -311,12 +317,6 @@ msgstr "Κατάσταση"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -388,7 +388,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -424,12 +424,6 @@ msgstr "Χρόνος Εργασίας"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -440,6 +434,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -455,6 +455,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -607,12 +612,6 @@ msgstr "Σύνοψη Εργασίας"
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -672,6 +671,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -862,6 +869,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -891,12 +903,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -918,17 +924,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -953,8 +948,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -963,27 +960,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1033,18 +1024,6 @@ msgstr "Στάδιο Επικύρωσης"
 msgid "Work summary"
 msgstr "Περίληψη εργασίας"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1099,11 +1078,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1152,7 +1126,7 @@ msgid "Done by"
 msgstr "Ολοκληρώθηκε από"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1186,11 +1160,6 @@ msgstr "#  εργασιών"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1231,13 +1200,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Υπολογισμένο ως εξής: Χρόνος που Αναλώθηκε + Υπολοιπο Χρόνου"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1275,6 +1249,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1334,8 +1313,6 @@ msgid "Low"
 msgstr "Χαμηλή"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1424,7 +1401,7 @@ msgstr ""
 "Διαχειριστή Έργου όταν η Εργασία είναι ακόμα πρόχειρη."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1444,7 +1421,7 @@ msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1471,6 +1448,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Ώρες που Απομένουν"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1492,17 +1474,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr "Ανατεθειμένη Εργασία"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1515,11 +1486,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1560,7 +1528,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1587,6 +1555,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Ανάθεση εργασίας στον άλλο χρήστη"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1615,7 +1588,7 @@ msgid "CHECK: "
 msgstr "ΕΛΕΓΧΟΣ: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1743,6 +1716,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1756,8 +1734,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1837,7 +1813,7 @@ msgid "Starting Date"
 msgstr "Ημερ/νία Εκκίνησης"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1870,12 +1846,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Εργασίες"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1894,12 +1864,6 @@ msgstr "Εργασίες"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1942,12 +1906,6 @@ msgstr "Πρόχειρα"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1995,14 +1953,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2013,11 +1963,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2029,11 +1974,17 @@ msgid "Reevaluation Task"
 msgstr "Επαναξιολόγηση εργασίας"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2052,6 +2003,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2089,6 +2045,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 1f8835a4552..3d44e48e955 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 15:16+0000\n"
-"Last-Translator: Guillermo Bisheimer <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 22:58+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -55,7 +55,7 @@ msgstr "Tareas del proyecto"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Nombre etapa"
+msgstr "Nombre de la etapa"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -84,7 +84,7 @@ msgid "Start Task"
 msgstr "Iniciar tarea"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "¡ Advertencia !"
@@ -136,8 +136,8 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -229,9 +229,10 @@ msgid "Assigned To"
 msgstr "Asignado a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Muy importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr "Tarea realizada"
 
 #. module: project
 #: view:project.project:0
@@ -269,10 +270,15 @@ msgid "Project Task Delegate"
 msgstr "Delegar tarea de proyecto"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "El proyecto ha sido <b>creado</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr "Tarea iniciada"
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Muy importante"
 
 #. module: project
 #: view:project.config.settings:0
@@ -318,12 +324,6 @@ msgstr "Estado"
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "La tarea ha sido <b>delegada</b> a <em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -399,7 +399,7 @@ msgid "Assigned to"
 msgstr "Asignado a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Debería especificarse un usuario delegado"
@@ -435,12 +435,6 @@ msgstr "Tiempo trabajado"
 msgid "Re-evaluate Task"
 msgstr "Re-evaluar tarea"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa cambiada a  <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -451,6 +445,12 @@ msgstr "Validar planificación de tiempo"
 msgid "Use integrated collaborative note pads on task"
 msgstr "Usar el pad integrado de notas colaborativas para las tareas"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr "Tarea bloqueada"
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -466,6 +466,11 @@ msgstr "Alias"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr "Tarea bloqueada"
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -618,14 +623,6 @@ msgstr "Resumen tarea"
 msgid "Not a Template Task"
 msgstr "No es una plantilla de tarea"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-"Siga este proyecto para seguir automáticamente todas las tareas e "
-"incidencias relacionadas con el mismo."
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -697,6 +694,14 @@ msgstr "Nuevas tareas"
 msgid "Invoice working time on issues"
 msgstr "Facturar tiempo de trabajo en las incidencias"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Fecha final"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -891,6 +896,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Compañías"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr "Replegado por defecto"
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -928,12 +938,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "El proyecto ha sido <b>cancelado</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -956,17 +960,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "El proyecto ha sido <b>cerrado</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "Tareas: Marcos como leídas"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -993,9 +986,13 @@ msgstr ""
 "proyecto y sus proyectos hijos."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desarrollo"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
+"Seguir este proyecto para rastrear automáticamente los eventos asociados a "
+"las tareas y a las incidencias del mismo."
 
 #. module: project
 #: view:project.task:0
@@ -1003,27 +1000,21 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "Etapa cambiada"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr "Ocultar en las vistas si vacío"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Responsable"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Común a todos los proyectos"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1043,7 +1034,7 @@ msgstr "Re-evaluar tarea"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr "Etapa tarea"
+msgstr "Etapa de la tarea"
 
 #. module: project
 #: view:project.task.type:0
@@ -1075,18 +1066,6 @@ msgstr "Estado de validación"
 msgid "Work summary"
 msgstr "Resumen del trabajo"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "El proyecto está ahora <b>pendiente</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "El proyecto ha sido <b>abierto</b>."
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1142,11 +1121,6 @@ msgstr "Mensajes sin leer"
 msgid "Parent Tasks"
 msgstr "Tareas padre"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "Proyecto: Marcar como leídos"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1195,7 +1169,7 @@ msgid "Done by"
 msgstr "Realizado por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "¡Acción no válida!"
@@ -1233,11 +1207,6 @@ msgstr "Nº de tareas"
 msgid "Number of documents attached"
 msgstr "Número de documentos adjuntos"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr "Tareas: Marcar como no leídas"
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1289,13 +1258,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr "Etapa de tarea cambiada"
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1334,6 +1308,11 @@ msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 "Esto establecerá la unidad de medida usada en los proyectos y las tareas."
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Muy importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1395,8 +1374,6 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Cerrado/a"
@@ -1490,7 +1467,7 @@ msgstr ""
 "responsable del proyecto cuando la tarea está en estado borrador."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Adjuntos"
@@ -1510,7 +1487,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1540,6 +1517,11 @@ msgstr "Privacidad / Visibilidad"
 msgid "Remaining Hours"
 msgstr "Horas restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr "Etapa cambiada"
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1562,17 +1544,6 @@ msgstr "Buscar proyecto"
 msgid "Delegated Task"
 msgstr "Tarea delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Muy importante"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1585,12 +1556,9 @@ msgid "project.config.settings"
 msgstr "Parámetros de configuración de proyectos"
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Fecha final"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desarrollo"
 
 #. module: project
 #: help:project.task,active:0
@@ -1636,7 +1604,7 @@ msgid "Overpassed Tasks"
 msgstr "Tareas sobrepasadas"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1665,6 +1633,11 @@ msgstr "Total"
 msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr "Tarea iniciada"
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1694,7 +1667,7 @@ msgid "CHECK: "
 msgstr "Validar "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "¡Debe asignar miembros al proyecto '%s'!"
@@ -1835,6 +1808,11 @@ msgstr "Estado relacionado"
 msgid "Documents"
 msgstr "Documentos"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr "Tarea creada"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1848,8 +1826,6 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1931,7 +1907,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1964,12 +1940,6 @@ msgstr "Análisis tareas"
 msgid "Project Tasks"
 msgstr "Tareas de proyecto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "La tarea ha sido <b>creada</b>."
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1988,12 +1958,6 @@ msgstr "Tareas"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Cancelado"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -2042,12 +2006,6 @@ msgstr "Borrador"
 msgid "Kanban State"
 msgstr "Estado Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "La tarea se ha establecido como <b>borrador</b>."
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2097,14 +2055,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr "Configurar proyecto"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2115,11 +2065,6 @@ msgstr "Flujo acumulado de tareas"
 msgid "January"
 msgstr "Enero"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "Proyecto: Marcar como no leído"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2131,11 +2076,17 @@ msgid "Reevaluation Task"
 msgstr "Tarea re-evaluación"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Por favor, elimine primero el proyecto relacionado con esta cuenta."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr "Tarea creada"
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2154,6 +2105,11 @@ msgstr "Proyectos en los cuales soy responsable"
 msgid "Ready for next stage"
 msgstr "Lista para la siguiente etapa"
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr "Predeterminado para nuevos proyectos"
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2196,6 +2152,11 @@ msgstr ""
 "programar y asignar recursos.\n"
 "Esto instalará el módulo 'project_long_term'."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr "Tarea cerrada"
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3168,6 +3129,9 @@ msgstr "Etapas de tareas"
 #~ msgid "Please specify the Customer or email address of Customer."
 #~ msgstr "Por favor indique el cliente o email del cliente"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Común a todos los proyectos"
+
 #~ msgid "Deployment"
 #~ msgstr "Despliegue"
 
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index a06eaf3a626..000736d3667 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-23 17:51+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Tarea inicial"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr "Estado"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -385,7 +385,7 @@ msgid "Assigned to"
 msgstr "Asignado a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -421,12 +421,6 @@ msgstr "Horario de trabajo"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -437,6 +431,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -452,6 +452,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -604,12 +609,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -669,6 +668,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -859,6 +866,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -888,12 +900,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -916,17 +922,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -951,8 +946,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -961,27 +958,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1031,18 +1022,6 @@ msgstr "Estado de validación"
 msgid "Work summary"
 msgstr "Resumen de trabajo"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1095,11 +1074,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1148,7 +1122,7 @@ msgid "Done by"
 msgstr "Realizado por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1182,11 +1156,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1227,13 +1196,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1271,6 +1245,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1330,8 +1309,6 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1421,7 +1398,7 @@ msgstr ""
 "responsable del proyecto cuando la tarea está en estado borrador."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1441,7 +1418,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1468,6 +1445,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Horas restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1489,17 +1471,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr "Tarea delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1512,11 +1483,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1557,7 +1525,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1584,6 +1552,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1611,7 +1584,7 @@ msgid "CHECK: "
 msgstr "Validar "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1739,6 +1712,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1752,8 +1730,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1833,7 +1809,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1866,12 +1842,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Tareas de proyecto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1890,12 +1860,6 @@ msgstr "Tareas"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1938,12 +1902,6 @@ msgstr "Borrador"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1991,14 +1949,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2009,11 +1959,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2025,11 +1970,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2048,6 +1999,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2085,6 +2041,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/es_CR.po b/addons/project/i18n/es_CR.po
index f4cbbe25714..0e6ab6776a5 100644
--- a/addons/project/i18n/es_CR.po
+++ b/addons/project/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-17 22:33+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: project
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Iniciar tarea"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "¡ Advertencia !"
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -226,9 +226,10 @@ msgid "Assigned To"
 msgstr "Asignado a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Muy importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -266,9 +267,14 @@ msgid "Project Task Delegate"
 msgstr "Delegar tarea de proyecto"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -315,12 +321,6 @@ msgstr "Estado"
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -395,7 +395,7 @@ msgid "Assigned to"
 msgstr "Asignado a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Delegated User should be specified"
@@ -431,12 +431,6 @@ msgstr "Tiempo trabajado"
 msgid "Re-evaluate Task"
 msgstr "Re-evaluar tarea"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -447,6 +441,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -462,6 +462,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -614,12 +619,6 @@ msgstr "Resumen tarea"
 msgid "Not a Template Task"
 msgstr "No es una plantilla de tarea"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -679,6 +678,14 @@ msgstr "Nuevas tareas"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Fecha final"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -869,6 +876,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Compañías"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -898,12 +910,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -926,17 +932,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -963,9 +958,11 @@ msgstr ""
 "proyecto y sus proyectos hijos."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desarrollo"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -973,27 +970,21 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Responsable"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Común a todos los proyectos"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1043,18 +1034,6 @@ msgstr "Estado de validación"
 msgid "Work summary"
 msgstr "Resumen del trabajo"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1110,11 +1089,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Tareas padre"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1163,7 +1137,7 @@ msgid "Done by"
 msgstr "Realizado por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1197,11 +1171,6 @@ msgstr "Nº de tareas"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1242,13 +1211,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1286,6 +1260,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Muy importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1347,8 +1326,6 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1442,7 +1419,7 @@ msgstr ""
 "responsable del proyecto cuando la tarea está en estado borrador."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1462,7 +1439,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1489,6 +1466,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Horas restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1511,17 +1493,6 @@ msgstr "Buscar proyecto"
 msgid "Delegated Task"
 msgstr "Tarea delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1534,12 +1505,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Fecha final"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desarrollo"
 
 #. module: project
 #: help:project.task,active:0
@@ -1582,7 +1550,7 @@ msgid "Overpassed Tasks"
 msgstr "Tareas sobrepasadas"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1611,6 +1579,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1638,7 +1611,7 @@ msgid "CHECK: "
 msgstr "Validar "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "¡Debe asignar miembros al proyecto '%s'!"
@@ -1766,6 +1739,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1779,8 +1757,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1862,7 +1838,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1895,12 +1871,6 @@ msgstr "Análisis tareas"
 msgid "Project Tasks"
 msgstr "Tareas de proyecto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1919,12 +1889,6 @@ msgstr "Tareas"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1967,12 +1931,6 @@ msgstr "Borrador"
 msgid "Kanban State"
 msgstr "Estado Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2020,14 +1978,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2038,11 +1988,6 @@ msgstr "Tareas de flujo es acumulativo"
 msgid "January"
 msgstr "Enero"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2054,11 +1999,17 @@ msgid "Reevaluation Task"
 msgstr "Tarea re-evaluación"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Por favor, elimine primero el proyecto relacionado con esta cuenta."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2077,6 +2028,11 @@ msgstr "Proyectos en los cuales soy responsable"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2116,6 +2072,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3113,6 +3074,9 @@ msgstr "Etapas de tareas"
 #~ msgid "Please specify the Customer or email address of Customer."
 #~ msgstr "Por favor indique el cliente o email del cliente"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Común a todos los proyectos"
+
 #~ msgid "Deployment"
 #~ msgstr "Despliegue"
 
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index 3e6d2eef90b..0dc0a01017e 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-08 18:07+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Iniciar tarea"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "¡ Advertencia !"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -225,9 +225,10 @@ msgid "Assigned To"
 msgstr "Asignado a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Muy importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -265,9 +266,14 @@ msgid "Project Task Delegate"
 msgstr "Delegación de Tarea"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -314,12 +320,6 @@ msgstr "Estado"
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -394,7 +394,7 @@ msgid "Assigned to"
 msgstr "Asignado a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Debe especificar un usuario delegado"
@@ -430,12 +430,6 @@ msgstr "Tiempo trabajado"
 msgid "Re-evaluate Task"
 msgstr "Reevaluar Tarea"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -446,6 +440,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -461,6 +461,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -613,12 +618,6 @@ msgstr "Resumen de Tarea"
 msgid "Not a Template Task"
 msgstr "No es plantilla"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -678,6 +677,14 @@ msgstr "Nuevas tareas"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Fecha Final"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -868,6 +875,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Compañias"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -897,12 +909,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -925,17 +931,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -962,9 +957,11 @@ msgstr ""
 "sus hijos."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desarrollo"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -972,27 +969,21 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Administrador"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Común a todos los proyectos"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1042,18 +1033,6 @@ msgstr "Estado de validación"
 msgid "Work summary"
 msgstr "Resumen del trabajo"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1107,11 +1086,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Tareas padre"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1160,7 +1134,7 @@ msgid "Done by"
 msgstr "Realizado por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1194,11 +1168,6 @@ msgstr "# de tareas"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1239,13 +1208,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1283,6 +1257,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Muy importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1344,8 +1323,6 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1439,7 +1416,7 @@ msgstr ""
 "responsable del proyecto cuando la tarea está en estado borrador."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1459,7 +1436,7 @@ msgid "Done"
 msgstr "Realizado"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1486,6 +1463,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Horas restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1508,17 +1490,6 @@ msgstr "Buscar Proyecto"
 msgid "Delegated Task"
 msgstr "Tarea delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Administrador"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1531,12 +1502,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Fecha Final"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desarrollo"
 
 #. module: project
 #: help:project.task,active:0
@@ -1579,7 +1547,7 @@ msgid "Overpassed Tasks"
 msgstr "Tareas sobrepasadas"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1608,6 +1576,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1635,7 +1608,7 @@ msgid "CHECK: "
 msgstr "COMPROBAR: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "¡Usted debe asignar miembros al proyecto '%s'!"
@@ -1763,6 +1736,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1776,8 +1754,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1859,7 +1835,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1892,12 +1868,6 @@ msgstr "Analisis de Tareas"
 msgid "Project Tasks"
 msgstr "Tareas de proyecto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1916,12 +1886,6 @@ msgstr "Tareas"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1964,12 +1928,6 @@ msgstr "Borrador"
 msgid "Kanban State"
 msgstr "Estado Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2017,14 +1975,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2035,11 +1985,6 @@ msgstr "Tareas del flujo acumulado"
 msgid "January"
 msgstr "Enero"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2051,11 +1996,17 @@ msgid "Reevaluation Task"
 msgstr "Reevaluación de Tareas"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Por favor, elimine primero el proyecto relacionado con esta cuenta."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2074,6 +2025,11 @@ msgstr "Proyectos en los cuales soy responsable"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2113,6 +2069,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3099,6 +3060,9 @@ msgstr "Etapas de Tareas"
 #~ msgid "Create your Firsts Projects"
 #~ msgstr "Cree sus primeros proyectos"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Común a todos los proyectos"
+
 #~ msgid "Deployment"
 #~ msgstr "Despliegue"
 
diff --git a/addons/project/i18n/es_MX.po b/addons/project/i18n/es_MX.po
index f82480f015f..adfac0be4b8 100644
--- a/addons/project/i18n/es_MX.po
+++ b/addons/project/i18n/es_MX.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 17:33+0000\n"
 "Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
@@ -85,7 +85,7 @@ msgid "Start Task"
 msgstr "Iniciar tarea"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "¡Advertencia!"
@@ -137,8 +137,8 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -230,9 +230,10 @@ msgid "Assigned To"
 msgstr "Asignado a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Muy importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -270,10 +271,15 @@ msgid "Project Task Delegate"
 msgstr "Delegar tarea de proyecto"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "El proyecto ha sido <b>creado</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Muy importante"
 
 #. module: project
 #: view:project.config.settings:0
@@ -319,12 +325,6 @@ msgstr "Status"
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "La tarea ha sido <b>delegada</b> a <em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -400,7 +400,7 @@ msgid "Assigned to"
 msgstr "Asignado a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Debería especificarse un usuario delegado"
@@ -436,12 +436,6 @@ msgstr "Horario trabajo"
 msgid "Re-evaluate Task"
 msgstr "Re-evaluar tarea"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa cambiada a  <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -452,6 +446,12 @@ msgstr "Validar planificación de tiempo"
 msgid "Use integrated collaborative note pads on task"
 msgstr "Usar el pad integrado de notas colaborativas para las tareas"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -467,6 +467,11 @@ msgstr "Alias"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -619,14 +624,6 @@ msgstr "Descripción de la tarea"
 msgid "Not a Template Task"
 msgstr "No es una plantilla de tarea"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-"Siga este proyecto para seguir automáticamente todas las tareas e "
-"incidencias relacionadas con el mismo."
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -698,6 +695,14 @@ msgstr "Nuevas tareas"
 msgid "Invoice working time on issues"
 msgstr "Facturar tiempo de trabajo en las incidencias"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Fecha Final"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -892,6 +897,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Compañías"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -929,12 +939,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "El proyecto ha sido <b>cancelado</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -957,17 +961,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "El proyecto ha sido <b>cerrado</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "Tareas: Marcadas como leídas"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -994,9 +987,11 @@ msgstr ""
 "proyecto y sus proyectos hijos."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desarrollo"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -1004,27 +999,21 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "Etapa cambiada"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr "Ocultar en las vistas si está vacío"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Responsable"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Común a todos los proyectos"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1076,18 +1065,6 @@ msgstr "Estado de validación"
 msgid "Work summary"
 msgstr "Resumen del trabajo"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "El proyecto está ahora <b>pendiente</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "El proyecto ha sido <b>abierto</b>."
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1143,11 +1120,6 @@ msgstr "Mensajes no leídos"
 msgid "Parent Tasks"
 msgstr "Tareas padre"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "Proyecto: Marcar como leídos"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1196,7 +1168,7 @@ msgid "Done by"
 msgstr "Realizado por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "¡Acción inválida!"
@@ -1234,11 +1206,6 @@ msgstr "Nº de tareas"
 msgid "Number of documents attached"
 msgstr "Número de documentos adjuntos"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr "Tareas: Marcar como no leídas"
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1290,13 +1257,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1335,6 +1307,11 @@ msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 "Esto establecerá la unidad de medida usada en los proyectos y las tareas."
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Muy importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1396,8 +1373,6 @@ msgid "Low"
 msgstr "Baja"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Cerrado/a"
@@ -1491,7 +1466,7 @@ msgstr ""
 "responsable del proyecto cuando la tarea está en estado borrador."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Adjuntos"
@@ -1511,7 +1486,7 @@ msgid "Done"
 msgstr "Hecho"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1541,6 +1516,11 @@ msgstr "Privacidad / Visibilidad"
 msgid "Remaining Hours"
 msgstr "Horas restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1563,17 +1543,6 @@ msgstr "Buscar proyecto"
 msgid "Delegated Task"
 msgstr "Tarea delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Muy importante"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1586,12 +1555,9 @@ msgid "project.config.settings"
 msgstr "Parámetros de configuración de proyectos"
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Fecha Final"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desarrollo"
 
 #. module: project
 #: help:project.task,active:0
@@ -1637,7 +1603,7 @@ msgid "Overpassed Tasks"
 msgstr "Tareas sobrepasadas"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1666,6 +1632,11 @@ msgstr "Total"
 msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1695,7 +1666,7 @@ msgid "CHECK: "
 msgstr "Validar "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "¡Debe asignar miembros al proyecto '%s'!"
@@ -1836,6 +1807,11 @@ msgstr "Estado relacionado"
 msgid "Documents"
 msgstr "Documentos"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1849,8 +1825,6 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1932,7 +1906,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1965,12 +1939,6 @@ msgstr "Análisis tareas"
 msgid "Project Tasks"
 msgstr "Tareas del proyecto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "La tarea ha sido <b>creada</b>."
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1989,12 +1957,6 @@ msgstr "Tareas"
 msgid "December"
 msgstr "Diciembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Cancelado"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -2043,12 +2005,6 @@ msgstr "Borrador"
 msgid "Kanban State"
 msgstr "Estado Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "La tarea se ha establecido como <b>borrador</b>."
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2098,14 +2054,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr "Configurar proyecto"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos electrónicos"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2116,11 +2064,6 @@ msgstr "Flujo acumulado de tareas"
 msgid "January"
 msgstr "Enero"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "Proyecto: Marcar como no leído"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2132,11 +2075,17 @@ msgid "Reevaluation Task"
 msgstr "Tarea re-evaluación"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Por favor, elimine primero el proyecto relacionado con esta cuenta."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2155,6 +2104,11 @@ msgstr "Proyectos en los cuales soy responsable"
 msgid "Ready for next stage"
 msgstr "Lista para la siguiente etapa"
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2197,6 +2151,11 @@ msgstr ""
 "programar y asignar recursos.\n"
 "Esto instalará el módulo 'project_long_term'."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2274,3 +2233,6 @@ msgstr "Año"
 #: view:project.task.type:0
 msgid "Tasks Stages"
 msgstr "Etapas de tareas"
+
+#~ msgid "Common to All Projects"
+#~ msgstr "Común a todos los proyectos"
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index bf1509c629d..5472bd1061e 100644
--- a/addons/project/i18n/es_PY.po
+++ b/addons/project/i18n/es_PY.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-11 16:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,8 +937,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index e33d6a1285d..bdcd74bfd2f 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-30 15:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Alusta ülesannet"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr "Olek"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -385,7 +385,7 @@ msgid "Assigned to"
 msgstr "Kellele määratud"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -421,12 +421,6 @@ msgstr "Tööaeg"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -437,6 +431,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -452,6 +452,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -604,12 +609,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -669,6 +668,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -859,6 +866,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -888,12 +900,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -915,17 +921,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Loobu"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -950,8 +945,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -960,27 +957,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1030,18 +1021,6 @@ msgstr "Kinnitamise olek"
 msgid "Work summary"
 msgstr "Töö kokkuvõte"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1094,11 +1073,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1147,7 +1121,7 @@ msgid "Done by"
 msgstr "Tegija"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1181,11 +1155,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1226,13 +1195,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Arvutuskäik: kulutatud aeg + järelejäänud aeg"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1270,6 +1244,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1329,8 +1308,6 @@ msgid "Low"
 msgstr "Madal"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1419,7 +1396,7 @@ msgstr ""
 "poolt, kui ülesanne on mustandi olekus."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1439,7 +1416,7 @@ msgid "Done"
 msgstr "Valmis"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1466,6 +1443,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Järelejäänud tunnid"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1487,17 +1469,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr "Valitatud ülesanne"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1510,11 +1481,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1555,7 +1523,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1582,6 +1550,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Volita oma ülesanne teisele kasutajale."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1609,7 +1582,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1737,6 +1710,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1750,8 +1728,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1831,7 +1807,7 @@ msgid "Starting Date"
 msgstr "Alguskuupäev"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1864,12 +1840,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Projekti ülesanded"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1888,12 +1858,6 @@ msgstr "Ülesanded"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1936,12 +1900,6 @@ msgstr "Mustand"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1989,14 +1947,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2007,11 +1957,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2023,11 +1968,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2046,6 +1997,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2083,6 +2039,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 845499089eb..420fa1d3409 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-10-09 16:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Ataza Hasi"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -601,12 +606,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -666,6 +665,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -856,6 +863,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -885,12 +897,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -909,17 +915,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -944,8 +939,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -954,27 +951,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1024,18 +1015,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1088,11 +1067,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1141,7 +1115,7 @@ msgid "Done by"
 msgstr "Nork egina:"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1175,11 +1149,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1220,13 +1189,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1264,6 +1238,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1323,8 +1302,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1411,7 +1388,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1431,7 +1408,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1458,6 +1435,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1479,17 +1461,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1502,11 +1473,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1547,7 +1515,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1574,6 +1542,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1601,7 +1574,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1729,6 +1702,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1742,8 +1720,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1823,7 +1799,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1856,12 +1832,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Proiektuko Atazak"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1880,12 +1850,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1928,12 +1892,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1981,14 +1939,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1999,11 +1949,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2015,11 +1960,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2038,6 +1989,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2075,6 +2031,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index a3dd2195786..8728b384eca 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Aloita tehtävä"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Varoitus !"
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,9 +222,10 @@ msgid "Assigned To"
 msgstr "Määritelty käyttäjälle"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Erittäin tärkeä"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr "Projektitehtävän suorittaja (delegaatti)"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -311,12 +317,6 @@ msgstr "Tila"
 msgid "August"
 msgstr "Elokuu"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -387,7 +387,7 @@ msgid "Assigned to"
 msgstr "Annettu tehtäväksi"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Delegoitu käyttäjä tulisi olla määriteltynä"
@@ -423,12 +423,6 @@ msgstr "Työaika"
 msgid "Re-evaluate Task"
 msgstr "Uudelleenarvioi tehtävä"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -439,6 +433,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -454,6 +454,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -606,12 +611,6 @@ msgstr "Tehtävän yhteenveto"
 msgid "Not a Template Task"
 msgstr "Ei malli tehtävä"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -671,6 +670,14 @@ msgstr "Uudet tehtävät"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Loppupvm"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -861,6 +868,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Yritykset"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -890,12 +902,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -914,17 +920,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -951,9 +946,11 @@ msgstr ""
 "kokonaistuntimäärä."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Kehitys"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -961,27 +958,21 @@ msgid "Users"
 msgstr "Käyttäjät"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Päällikkö"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Tarkeä"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Yhteinen kaikille projekteille"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1031,18 +1022,6 @@ msgstr "Tarkistuksen tila"
 msgid "Work summary"
 msgstr "Työn yhteenveto"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1095,11 +1074,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Ylätason tehtävät"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1148,7 +1122,7 @@ msgid "Done by"
 msgstr "Tehnyt"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1182,11 +1156,6 @@ msgstr "tehtävien määrä"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1227,13 +1196,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Laskettu: käytetty aika + jäljelläoleva aika"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopio)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1271,6 +1245,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Erittäin tärkeä"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1332,8 +1311,6 @@ msgid "Low"
 msgstr "Matala"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1426,7 +1403,7 @@ msgstr ""
 "projektipäällikkö kun tehtävä on luonnostilassa."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1446,7 +1423,7 @@ msgid "Done"
 msgstr "Valmis"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1473,6 +1450,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Jäljellä olevat tunnit"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1495,17 +1477,6 @@ msgstr "Hae projektia"
 msgid "Delegated Task"
 msgstr "Delegoidut tehtävät"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Päällikkö"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1518,12 +1489,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Loppupvm"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Kehitys"
 
 #. module: project
 #: help:project.task,active:0
@@ -1563,7 +1531,7 @@ msgid "Overpassed Tasks"
 msgstr "Ohitetut tehtävät"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1592,6 +1560,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegoi tehtäväsi toiselle käyttäjälle"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1619,7 +1592,7 @@ msgid "CHECK: "
 msgstr "TARKISTA: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Sinun pitää määritellä projektin jäsenet '%s' !"
@@ -1747,6 +1720,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1760,8 +1738,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1843,7 +1819,7 @@ msgid "Starting Date"
 msgstr "Aloituspäivämäärä"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1876,12 +1852,6 @@ msgstr "Tehtäväanalyysi"
 msgid "Project Tasks"
 msgstr "Projekti tehtävät"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1900,12 +1870,6 @@ msgstr "Tehtävät"
 msgid "December"
 msgstr "Joulukuu"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1949,12 +1913,6 @@ msgstr "Luonnos"
 msgid "Kanban State"
 msgstr "Kanban tila"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2002,14 +1960,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2020,11 +1970,6 @@ msgstr "Tehtävien kumulatiivinen virtaus"
 msgid "January"
 msgstr "Tammikuu"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2036,11 +1981,17 @@ msgid "Reevaluation Task"
 msgstr "Uudelleenarviointi tehtävä"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Ole hyvä ja poista tähän tunnukseen linkitetty projekti ensin."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2059,6 +2010,11 @@ msgstr "Projektit joissa olen päällikkönä"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2096,6 +2052,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2813,6 +2774,9 @@ msgstr "Tehtävien vaiheet"
 #~ msgid "Validate planned time and open task"
 #~ msgstr "Tarkista suunniteltu aika ja avaa tehtävä"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Yhteinen kaikille projekteille"
+
 #~ msgid "Deployment"
 #~ msgstr "Käyttöönotto"
 
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index c22ab93c7ec..f6e14b59dbc 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:57+0000\n"
 "Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Démarrer la tâche"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -226,9 +226,10 @@ msgid "Assigned To"
 msgstr "Assigné à"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Très important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -266,9 +267,14 @@ msgid "Project Task Delegate"
 msgstr "Déléguer une tâche"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -315,12 +321,6 @@ msgstr "État"
 msgid "August"
 msgstr "Août"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -395,7 +395,7 @@ msgid "Assigned to"
 msgstr "Assigné à"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "L'utilisateur à qui la tâche est déléguée doit être spécifié"
@@ -431,12 +431,6 @@ msgstr "Temps de Travail"
 msgid "Re-evaluate Task"
 msgstr "Réévaluer la tâche"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -447,6 +441,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -462,6 +462,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -615,12 +620,6 @@ msgstr "Résumé de la tâche"
 msgid "Not a Template Task"
 msgstr "Pas une tâche modèle"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -680,6 +679,14 @@ msgstr "Nouvelles tâches"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Date de fin"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -870,6 +877,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Sociétés"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -899,12 +911,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -927,17 +933,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -964,9 +959,11 @@ msgstr ""
 "sous-projets"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Développement"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -974,27 +971,21 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Responsable"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Important"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Commun à tous les projets"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1044,18 +1035,6 @@ msgstr "État de la validation"
 msgid "Work summary"
 msgstr "Résumé des tâches"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1110,11 +1089,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Tâche parente"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1163,7 +1137,7 @@ msgid "Done by"
 msgstr "Assigné à"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1197,11 +1171,6 @@ msgstr "Nb de tâches"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1242,13 +1211,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculé comme : Temps passé + Temps restant."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1286,6 +1260,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Très important"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1347,8 +1326,6 @@ msgid "Low"
 msgstr "Basse"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1443,7 +1420,7 @@ msgstr ""
 "du projet quand la tâche est à l'état brouillon"
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1463,7 +1440,7 @@ msgid "Done"
 msgstr "Terminé"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1490,6 +1467,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Heures restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1513,17 +1495,6 @@ msgstr "Chercher un projet"
 msgid "Delegated Task"
 msgstr "Tache délégué"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1536,12 +1507,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Date de fin"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Développement"
 
 #. module: project
 #: help:project.task,active:0
@@ -1584,7 +1552,7 @@ msgid "Overpassed Tasks"
 msgstr "Tâches en dépassement"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1613,6 +1581,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Délégué votre tâche à un autre utilisateur"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1640,7 +1613,7 @@ msgid "CHECK: "
 msgstr "VALIDATION: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Vous devez assigner des membres au projet '%s' !"
@@ -1768,6 +1741,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1781,8 +1759,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1864,7 +1840,7 @@ msgid "Starting Date"
 msgstr "Démarrage du projet"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1897,12 +1873,6 @@ msgstr "Analyse des tâches"
 msgid "Project Tasks"
 msgstr "Tâche projet"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1921,12 +1891,6 @@ msgstr "Tâches"
 msgid "December"
 msgstr "Décembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1970,12 +1934,6 @@ msgstr "Brouillon"
 msgid "Kanban State"
 msgstr "État kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2023,14 +1981,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2041,11 +1991,6 @@ msgstr "Flux cumulé des tâches"
 msgid "January"
 msgstr "Janvier"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2057,11 +2002,17 @@ msgid "Reevaluation Task"
 msgstr "Réévaluation de la tâche"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Supprimer d'abord le projet lié avec ce compte analytique."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2080,6 +2031,11 @@ msgstr "Projets dans lesquels je suis membre"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2119,6 +2075,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3060,6 +3021,9 @@ msgstr "Étapes des tâches"
 #~ msgid "Contact Address"
 #~ msgstr "Adresse du contact"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Commun à tous les projets"
+
 #~ msgid "Deployment"
 #~ msgstr "Déploiement"
 
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index 469d3868e1d..831e5ed82cf 100644
--- a/addons/project/i18n/gl.po
+++ b/addons/project/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-07 10:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,8 +937,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/gu.po b/addons/project/i18n/gu.po
index 71fa01bc458..b7ed126ce25 100644
--- a/addons/project/i18n/gu.po
+++ b/addons/project/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-16 16:34+0000\n"
 "Last-Translator: Serpent Consulting Services <Unknown>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,8 +937,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr "કાર્ય ની પુનઃચકાસણી"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 54077e7866a..860072955a7 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-06 12:24+0000\n"
 "Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: project
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Započni Zadatak"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -223,8 +223,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -263,9 +264,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -310,12 +316,6 @@ msgstr "Status"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -386,7 +386,7 @@ msgid "Assigned to"
 msgstr "Dodijeljeno"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -422,12 +422,6 @@ msgstr "Radno Vrijeme"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -438,6 +432,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -453,6 +453,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -604,12 +609,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -669,6 +668,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -859,6 +866,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -888,12 +900,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -915,17 +921,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -950,8 +945,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -960,27 +957,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1030,18 +1021,6 @@ msgstr "Stanje Vrednovanja"
 msgid "Work summary"
 msgstr "Sižetak rada"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1094,11 +1073,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1147,7 +1121,7 @@ msgid "Done by"
 msgstr "izvršio"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1181,11 +1155,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1226,13 +1195,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Računa se kao: Utrošeno vrijeme + Preostalo vrijeme"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1270,6 +1244,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1329,8 +1308,6 @@ msgid "Low"
 msgstr "Nisko"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1419,7 +1396,7 @@ msgstr ""
 "Projekta kada je zadatak u stanju Nacrta."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1439,7 +1416,7 @@ msgid "Done"
 msgstr "Učinjeno"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1466,6 +1443,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Preostali Sati"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1487,17 +1469,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr "Delegirani Zadaci"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1510,11 +1481,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1555,7 +1523,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1582,6 +1550,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegirajte zadatak drugom korisniku."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1609,7 +1582,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1737,6 +1710,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1750,8 +1728,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1831,7 +1807,7 @@ msgid "Starting Date"
 msgstr "Početni Datum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1864,12 +1840,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Zadaci Projekta"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1888,12 +1858,6 @@ msgstr "Zadaci"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1936,12 +1900,6 @@ msgstr "Nacrt"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1989,14 +1947,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2007,11 +1957,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2023,11 +1968,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2046,6 +1997,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2083,6 +2039,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index e6ca741ff15..2162e1fbe74 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:55+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Feladat kezdete"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -227,9 +227,10 @@ msgid "Assigned To"
 msgstr "Hozzárendelve"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Nagyon fontos"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -267,9 +268,14 @@ msgid "Project Task Delegate"
 msgstr "Projektfeladat átruházása"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -314,12 +320,6 @@ msgstr ""
 msgid "August"
 msgstr "Augusztus"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -393,7 +393,7 @@ msgid "Assigned to"
 msgstr "Hozzárendelve"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -429,12 +429,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr "Feladat újraértékelése"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -445,6 +439,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -460,6 +460,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -611,12 +616,6 @@ msgstr "Feladatösszegzés"
 msgid "Not a Template Task"
 msgstr "Nem sablonfeladat"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -676,6 +675,14 @@ msgstr "Új Feladatok"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Befejezési dátum"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -866,6 +873,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Vállalatok"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -895,12 +907,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -922,17 +928,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Mégsem"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -959,9 +954,11 @@ msgstr ""
 "fordított összes idő órában."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Fejlesztés"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -969,27 +966,21 @@ msgid "Users"
 msgstr "Felhasználók"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Menedzser"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Fontos"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1039,18 +1030,6 @@ msgstr "Jóváhagyás állapota"
 msgid "Work summary"
 msgstr "Munka összegzése"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1105,11 +1084,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Forrás feladatok"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1158,7 +1132,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1192,11 +1166,6 @@ msgstr "Feladatok száma"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1237,13 +1206,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Kiszámítható: eltöltött idő + hátralévő idő"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1281,6 +1255,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Nagyon fontos"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1340,8 +1319,6 @@ msgid "Low"
 msgstr "Alacsony"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1434,7 +1411,7 @@ msgstr ""
 "feladat tervezeti állapotban van."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1454,7 +1431,7 @@ msgid "Done"
 msgstr "Kész"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1481,6 +1458,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Hátralévő idő"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1502,17 +1484,6 @@ msgstr "Projekt keresése"
 msgid "Delegated Task"
 msgstr "Átruházott feladat"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Menedzser"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1525,12 +1496,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Befejezési dátum"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Fejlesztés"
 
 #. module: project
 #: help:project.task,active:0
@@ -1574,7 +1542,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1601,6 +1569,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Ön átruházza a feladatát más felhasználóra."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1629,7 +1602,7 @@ msgid "CHECK: "
 msgstr "ELLENŐRIZNI: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1757,6 +1730,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1770,8 +1748,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1853,7 +1829,7 @@ msgid "Starting Date"
 msgstr "Kezdési dátum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1886,12 +1862,6 @@ msgstr "Feladatok elemézése"
 msgid "Project Tasks"
 msgstr "Projektfeladatok"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1910,12 +1880,6 @@ msgstr "Feladatok"
 msgid "December"
 msgstr "December"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1960,12 +1924,6 @@ msgstr "Tervezet"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2013,14 +1971,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2031,11 +1981,6 @@ msgstr ""
 msgid "January"
 msgstr "Január"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2047,11 +1992,17 @@ msgid "Reevaluation Task"
 msgstr "Feladat újraértékelése"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2070,6 +2021,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2107,6 +2063,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index ded32b2ff72..368f9622799 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 09:17+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1085,11 +1064,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1138,7 +1112,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1172,11 +1146,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1217,13 +1186,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1261,6 +1235,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1320,8 +1299,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1408,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1455,6 +1432,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1476,17 +1458,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1499,11 +1470,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1544,7 +1512,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1571,6 +1539,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1598,7 +1571,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1726,6 +1699,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1739,8 +1717,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1820,7 +1796,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1853,12 +1829,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1877,12 +1847,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1925,12 +1889,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1978,14 +1936,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1996,11 +1946,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2012,11 +1957,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2035,6 +1986,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2072,6 +2028,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 2b7ed6e09cb..855011ccf10 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 22:53+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
@@ -84,7 +84,7 @@ msgid "Start Task"
 msgstr "Inizia Attività"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione !"
@@ -136,8 +136,8 @@ msgstr ""
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -229,9 +229,10 @@ msgid "Assigned To"
 msgstr "Assegnato a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Molto importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -269,10 +270,15 @@ msgid "Project Task Delegate"
 msgstr "Delega attività progetto"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "Il progetto è stato <b>creato</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Molto Importante"
 
 #. module: project
 #: view:project.config.settings:0
@@ -318,12 +324,6 @@ msgstr "Stato"
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "L'attività è stata <b>delegata</b> a <em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -400,7 +400,7 @@ msgid "Assigned to"
 msgstr "Assegnato a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "L'utente delegato dovrebbe essere specificato"
@@ -436,12 +436,6 @@ msgstr "Orario di Lavoro"
 msgid "Re-evaluate Task"
 msgstr "Rivaluta l'attività"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Stato cambiato a <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -452,6 +446,12 @@ msgstr "Valida pianificazione"
 msgid "Use integrated collaborative note pads on task"
 msgstr "Usa appunti (pads) collaborativi sulle attività"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -467,6 +467,11 @@ msgstr "Alias"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -619,14 +624,6 @@ msgstr "Descrizione attività"
 msgid "Not a Template Task"
 msgstr "Non un'attività di template"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-"Segui questo progetto per poter seguire automaticamente attività e "
-"problematiche correlate."
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -703,6 +700,14 @@ msgstr "Nuova Attività"
 msgid "Invoice working time on issues"
 msgstr "Fatturazione del tempo di lavoro sulle problematiche"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Data fine"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -897,6 +902,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Aziende"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -934,12 +944,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "Il progetto è stato <b>annullato</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -961,17 +965,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "Il progetto è stato <b>chiuso</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "Attività: Segna come letto"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -998,9 +991,11 @@ msgstr ""
 "suoi progetti figli"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Sviluppo"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -1008,27 +1003,21 @@ msgid "Users"
 msgstr "Utenti"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "Fase Cambiata"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr "Nascondi nella vista se vuoto"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Uguale per tutti i Progetti"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1080,18 +1069,6 @@ msgstr "Stato Convalida"
 msgid "Work summary"
 msgstr "Cronologia Lavoro"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "Il Progetto adesso è <b>sospeso</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "Il progetto è stato <b>aperto</b>."
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1145,11 +1122,6 @@ msgstr "Messaggi non letti"
 msgid "Parent Tasks"
 msgstr "Attività genitore"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "Progetto: Segna come letto"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1198,7 +1170,7 @@ msgid "Done by"
 msgstr "Completato da"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "Azione non valida!"
@@ -1235,11 +1207,6 @@ msgstr "# di attività"
 msgid "Number of documents attached"
 msgstr "Numero di documenti allegati"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr "Attività: Segna come letto"
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1295,13 +1262,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calcolaro come: Tempo impiegato + Tempo rimanente."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1339,6 +1311,11 @@ msgstr "Team"
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr "Imposta l'unità di misura usata nei progetti e nelle attività."
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Molto importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1400,8 +1377,6 @@ msgid "Low"
 msgstr "Basso"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Chiuso"
@@ -1495,7 +1470,7 @@ msgstr ""
 "manager quando l'attività è in stato bozza."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Allegati"
@@ -1515,7 +1490,7 @@ msgid "Done"
 msgstr "Completato"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1545,6 +1520,11 @@ msgstr "Privacy / Visibilità"
 msgid "Remaining Hours"
 msgstr "Ore Rimanenti"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1568,17 +1548,6 @@ msgstr "Cerca progetto"
 msgid "Delegated Task"
 msgstr "Attività Delegata"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Molto Importante"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1591,12 +1560,9 @@ msgid "project.config.settings"
 msgstr "project.config.settings"
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Data fine"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Sviluppo"
 
 #. module: project
 #: help:project.task,active:0
@@ -1642,7 +1608,7 @@ msgid "Overpassed Tasks"
 msgstr "Attività superate"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1671,6 +1637,11 @@ msgstr "Totale"
 msgid "Delegate your task to the other user"
 msgstr "Delega la tua attività ad un altro utente"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1700,7 +1671,7 @@ msgid "CHECK: "
 msgstr "CONTROLLA: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "E' necessario assegnare i membri del progetto '%s' !"
@@ -1843,6 +1814,11 @@ msgstr "Stati Correlati"
 msgid "Documents"
 msgstr "Documenti"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1856,8 +1832,6 @@ msgid "Followers"
 msgstr "Followers"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1939,7 +1913,7 @@ msgid "Starting Date"
 msgstr "Data di inizio"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1972,12 +1946,6 @@ msgstr "Analisi attività"
 msgid "Project Tasks"
 msgstr "Attività del Progetto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "L'attività è stata <b>creata</b>."
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1996,12 +1964,6 @@ msgstr "Attività"
 msgid "December"
 msgstr "Dicembre"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Annullato"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -2051,12 +2013,6 @@ msgstr "Bozza"
 msgid "Kanban State"
 msgstr "Stato Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "L'attività è stata impostata a <b>bozza</b>."
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2106,14 +2062,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr "Configura Progetto"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2124,11 +2072,6 @@ msgstr "Flusso Cumulativo delle Attività"
 msgid "January"
 msgstr "Gennaio"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "Progetto: Segna come letto"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2140,11 +2083,17 @@ msgid "Reevaluation Task"
 msgstr "Attività di rivalutazione"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Si prega di eliminare prima il progetto legato a questo conto."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2163,6 +2112,11 @@ msgstr "Progetti nei quali sono un manager"
 msgid "Ready for next stage"
 msgstr "Pronto per la prossima fase"
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2205,6 +2159,11 @@ msgstr ""
 "pianificazione e dell'allocazione risorse.\n"
 "Installa il modulo project_long_term."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3116,5 +3075,8 @@ msgstr "Stadi attività"
 #~ "Abilita il tracciamento dei progetti a lungo termine, inclusi progetti a "
 #~ "multi-fase e gestione allocazione risorse."
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Uguale per tutti i Progetti"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "Il nome azienda deve essere univoco!"
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index e4f89cb36f2..459e95f2539 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-10 00:39+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "タスク開始"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "警告"
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -224,9 +224,10 @@ msgid "Assigned To"
 msgstr "割当先"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "非常に重要"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -264,9 +265,14 @@ msgid "Project Task Delegate"
 msgstr "プロジェクトタスクの委任"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -311,12 +317,6 @@ msgstr ""
 msgid "August"
 msgstr "8月"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -386,7 +386,7 @@ msgid "Assigned to"
 msgstr "割当先"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "委任したユーザを指定する必要があります。"
@@ -422,12 +422,6 @@ msgstr "作業時間"
 msgid "Re-evaluate Task"
 msgstr "再評価タスク"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -438,6 +432,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -453,6 +453,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -603,12 +608,6 @@ msgstr "タスク概要"
 msgid "Not a Template Task"
 msgstr "非テンプレートタスク"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -668,6 +667,14 @@ msgstr "新規タスク"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "終了日"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -858,6 +865,11 @@ msgstr ""
 msgid "Companies"
 msgstr "会社"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -887,12 +899,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -913,17 +919,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -948,9 +943,11 @@ msgid ""
 msgstr "このプロジェクトと子のプロジェクトに関連する全タスクの消費時間数の合計です。"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "開発"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -958,27 +955,21 @@ msgid "Users"
 msgstr "ユーザ"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "マネジャ"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "重要"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "全製品共通"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1028,18 +1019,6 @@ msgstr "検証状態"
 msgid "Work summary"
 msgstr "作業の概要"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1092,11 +1071,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "親タスク"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1145,7 +1119,7 @@ msgid "Done by"
 msgstr "実施者"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1179,11 +1153,6 @@ msgstr "タスク数"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1224,13 +1193,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "計算式：消費時間 + 残り時間"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s（コピー）"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1268,6 +1242,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "非常に重要"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1327,8 +1306,6 @@ msgid "Low"
 msgstr "低い"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1415,7 +1392,7 @@ msgid ""
 msgstr "タスクを行う予想時間。タスクがドラフト状態の時に通常はプロジェクトマネジャによりセットされます。"
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1435,7 +1412,7 @@ msgid "Done"
 msgstr "完了"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1462,6 +1439,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "残り時間数"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1483,17 +1465,6 @@ msgstr "プロジェクトの検索"
 msgid "Delegated Task"
 msgstr "委任されたタスク"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "マネジャ"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1506,12 +1477,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "終了日"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "開発"
 
 #. module: project
 #: help:project.task,active:0
@@ -1553,7 +1521,7 @@ msgid "Overpassed Tasks"
 msgstr "期限超過タスク"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1582,6 +1550,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "他のユーザへタスクを委任"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1609,7 +1582,7 @@ msgid "CHECK: "
 msgstr "確認： "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "プロジェクト %s にメンバーを割り当てる必要があります。"
@@ -1737,6 +1710,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1750,8 +1728,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1831,7 +1807,7 @@ msgid "Starting Date"
 msgstr "開始日"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1864,12 +1840,6 @@ msgstr "タスク分析"
 msgid "Project Tasks"
 msgstr "プロジェクトのタスク"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1888,12 +1858,6 @@ msgstr "タスク"
 msgid "December"
 msgstr "12月"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1936,12 +1900,6 @@ msgstr "ドラフト"
 msgid "Kanban State"
 msgstr "かんばん状態"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1989,14 +1947,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2007,11 +1957,6 @@ msgstr "タスクの累積フロー"
 msgid "January"
 msgstr "1月"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2023,11 +1968,17 @@ msgid "Reevaluation Task"
 msgstr "再評価タスク"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "最初にこのアカウントにリンクしているプロジェクトを削除して下さい。"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2046,6 +1997,11 @@ msgstr "私がマネジャであるプロジェクト"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2084,6 +2040,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2449,6 +2410,9 @@ msgstr "タスク工程"
 #~ msgid "My Delegated Tasks"
 #~ msgstr "私の委任タスク"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "全製品共通"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "会社名は固有でなければいけません。"
 
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index ccaead26753..56c5ab55680 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 09:18+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "과제 시작"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr "상태"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -385,7 +385,7 @@ msgid "Assigned to"
 msgstr "할당 대상"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -421,12 +421,6 @@ msgstr "작업 시간"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -437,6 +431,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -452,6 +452,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -602,12 +607,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -667,6 +666,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -857,6 +864,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -886,12 +898,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -912,17 +918,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "취소"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -947,8 +942,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -957,27 +954,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1027,18 +1018,6 @@ msgstr "검증 상태"
 msgid "Work summary"
 msgstr "작업 개요"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1091,11 +1070,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1144,7 +1118,7 @@ msgid "Done by"
 msgstr "수행자"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1178,11 +1152,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1223,13 +1192,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "계산: 소요 시간 + 남은 시간"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1267,6 +1241,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1326,8 +1305,6 @@ msgid "Low"
 msgstr "낮음"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1414,7 +1391,7 @@ msgid ""
 msgstr "과제를 수행하는데 필요한 추정 시간이며, 주로, 해당 과제가 초안 상태일 때 프로젝트 매니저에 의해 설정됩니다."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1434,7 +1411,7 @@ msgid "Done"
 msgstr "완료"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1461,6 +1438,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "남은 시간"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1482,17 +1464,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr "위임된 과제"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1505,11 +1476,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1550,7 +1518,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1577,6 +1545,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "다른 사용자에게 귀하의 과제를 위임"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1604,7 +1577,7 @@ msgid "CHECK: "
 msgstr "체크: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1732,6 +1705,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1745,8 +1723,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1826,7 +1802,7 @@ msgid "Starting Date"
 msgstr "시작 날짜"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1859,12 +1835,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "프로젝트 과제"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1883,12 +1853,6 @@ msgstr "과제들"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1931,12 +1895,6 @@ msgstr "초안"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1984,14 +1942,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2002,11 +1952,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2018,11 +1963,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2041,6 +1992,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2078,6 +2034,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 7b64a8a4511..641a7e5fb90 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Pradėti užduotį"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr "Priskirtas"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr "Projekto užduoties delegavimas"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr "Būsena"
 msgid "August"
 msgstr "Rugpjūtis"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -388,7 +388,7 @@ msgid "Assigned to"
 msgstr "Priskirtas"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -424,12 +424,6 @@ msgstr "Darbo valandos"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -440,6 +434,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -455,6 +455,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -606,12 +611,6 @@ msgstr "Užduoties konspektas"
 msgid "Not a Template Task"
 msgstr "Ne šabloninė užduotis"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -671,6 +670,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Pabaigos data"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -861,6 +868,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Įmonės"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -890,12 +902,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -917,17 +923,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -952,9 +947,11 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Kūrimas"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -962,27 +959,21 @@ msgid "Users"
 msgstr "Vartotojai"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Vadovas"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1032,18 +1023,6 @@ msgstr "Patvirtinimo būsena"
 msgid "Work summary"
 msgstr "Darbo santrauka"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1096,11 +1075,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Pirminės užduotys"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1149,7 +1123,7 @@ msgid "Done by"
 msgstr "Atliktas"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1183,11 +1157,6 @@ msgstr "# užduočių"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1228,13 +1197,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Skaičiuojama taip : Praleistas + Likęs laikas."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1272,6 +1246,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1331,8 +1310,6 @@ msgid "Low"
 msgstr "Žemas"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1421,7 +1398,7 @@ msgstr ""
 "kai užduotis yra projekto būsenoje)."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1441,7 +1418,7 @@ msgid "Done"
 msgstr "Atlikta"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1468,6 +1445,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Likusios valandos"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1489,17 +1471,6 @@ msgstr "Ieškoti projekto"
 msgid "Delegated Task"
 msgstr "Deleguoti užduotį"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Vadovas"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1512,12 +1483,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Pabaigos data"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Kūrimas"
 
 #. module: project
 #: help:project.task,active:0
@@ -1557,7 +1525,7 @@ msgid "Overpassed Tasks"
 msgstr "Uždelstos užduotys"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1584,6 +1552,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Deleguoti savo užduotį kitam naudotojui"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1611,7 +1584,7 @@ msgid "CHECK: "
 msgstr "Patikrinti: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1739,6 +1712,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1752,8 +1730,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1835,7 +1811,7 @@ msgid "Starting Date"
 msgstr "Pradžios data"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1868,12 +1844,6 @@ msgstr "Užduočių analizė"
 msgid "Project Tasks"
 msgstr "Projekto užduotys"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1892,12 +1862,6 @@ msgstr "Užduotys"
 msgid "December"
 msgstr "Gruodis"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1940,12 +1904,6 @@ msgstr "Juodraštis"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1993,14 +1951,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2011,11 +1961,6 @@ msgstr ""
 msgid "January"
 msgstr "Sausis"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2027,11 +1972,17 @@ msgid "Reevaluation Task"
 msgstr "Pakartotinė užduotis"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2050,6 +2001,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2087,6 +2043,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index f3987c1881f..f79db7c9fd5 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Sākt Uzdevumu"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -225,8 +225,9 @@ msgid "Assigned To"
 msgstr "Piesaistīts"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -265,9 +266,14 @@ msgid "Project Task Delegate"
 msgstr "Projekta uzdevumu deliģēšana"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -312,12 +318,6 @@ msgstr "Statuss"
 msgid "August"
 msgstr "Augusts"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -391,7 +391,7 @@ msgid "Assigned to"
 msgstr "Piešķirts"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -427,12 +427,6 @@ msgstr "Darba Laiks"
 msgid "Re-evaluate Task"
 msgstr "Pārvērtēt uzdevumu"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -443,6 +437,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -458,6 +458,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -610,12 +615,6 @@ msgstr "Uzdevuma kopsavilkums"
 msgid "Not a Template Task"
 msgstr "Nav sagataves uzdevums"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -675,6 +674,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Beigu Datums"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -865,6 +872,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Uzņēmumi"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -894,12 +906,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -921,17 +927,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Atcelt"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -958,9 +953,11 @@ msgstr ""
 "apakšprojektiem."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Attīstība"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -968,27 +965,21 @@ msgid "Users"
 msgstr "Lietotāji"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Vadītājs"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1038,18 +1029,6 @@ msgstr "Apstiprinājuma Statuss"
 msgid "Work summary"
 msgstr "Paveiktais darbs"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1102,11 +1081,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Virsuzdevumi"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1155,7 +1129,7 @@ msgid "Done by"
 msgstr "Veica"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1189,11 +1163,6 @@ msgstr "Uzd. skaits"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1234,13 +1203,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Aprēķināts kā: Pavadītais laiks + Atlikušais laiks"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1278,6 +1252,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1337,8 +1316,6 @@ msgid "Low"
 msgstr "Zems"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1431,7 +1408,7 @@ msgstr ""
 "kamēr uzdevums vēl ir melnrakstā."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1451,7 +1428,7 @@ msgid "Done"
 msgstr "Pabeigts"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1478,6 +1455,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Atlikušās Stundas"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1499,17 +1481,6 @@ msgstr "Meklēt projektu"
 msgid "Delegated Task"
 msgstr "Deleģētais Darba Uzdevums"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Vadītājs"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1522,12 +1493,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Beigu Datums"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Attīstība"
 
 #. module: project
 #: help:project.task,active:0
@@ -1570,7 +1538,7 @@ msgid "Overpassed Tasks"
 msgstr "Nokavētie uzdevumi"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1597,6 +1565,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Piešķirt uzdevumu citam lietotājam"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1624,7 +1597,7 @@ msgid "CHECK: "
 msgstr "PĀRBAUDĪT: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1752,6 +1725,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1765,8 +1743,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1848,7 +1824,7 @@ msgid "Starting Date"
 msgstr "Sākuma Datums"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1881,12 +1857,6 @@ msgstr "Uzdevumu analīze"
 msgid "Project Tasks"
 msgstr "Projekta uzdevumi"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1905,12 +1875,6 @@ msgstr "Uzdevumi"
 msgid "December"
 msgstr "Decembris"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1953,12 +1917,6 @@ msgstr "Melnraksts"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2006,14 +1964,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2024,11 +1974,6 @@ msgstr ""
 msgid "January"
 msgstr "Janvāris"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2040,11 +1985,17 @@ msgid "Reevaluation Task"
 msgstr "Pārvērtēšanas uzdevums"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2063,6 +2014,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2100,6 +2056,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 0112ae616a0..17178e8f787 100644
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-25 19:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Даалгаврыг эхлэх"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Сануулга !"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -224,9 +224,10 @@ msgid "Assigned To"
 msgstr "Оноогдсон"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Маш чухал"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -264,9 +265,14 @@ msgid "Project Task Delegate"
 msgstr "Төслийн даалгавар ацаглах"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -312,12 +318,6 @@ msgstr "Төлөв"
 msgid "August"
 msgstr "8 сар"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -392,7 +392,7 @@ msgid "Assigned to"
 msgstr "Хариуцагч"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Ацагласан хэрэглэгч заагдсан байх хэрэгтэй"
@@ -428,12 +428,6 @@ msgstr "Ажлын цаг"
 msgid "Re-evaluate Task"
 msgstr "Даалгаврыг дахин үнэлүүлэх"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -444,6 +438,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -459,6 +459,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -611,12 +616,6 @@ msgstr "Даалгаврын товч утга"
 msgid "Not a Template Task"
 msgstr "Даалгаврын Үлгэр Биш"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -676,6 +675,14 @@ msgstr "Шинэ даалгавар"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -866,6 +873,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Компаниуд"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -895,12 +907,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -922,17 +928,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -959,9 +954,11 @@ msgstr ""
 "нийлбэр."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Хөгжүүлэлт"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -969,27 +966,21 @@ msgid "Users"
 msgstr "Хэрэглэгч"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Менежер"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Чухал"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Бүх төсөлд ерөнхий"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1039,18 +1030,6 @@ msgstr "Батлагдсан төлөв"
 msgid "Work summary"
 msgstr "Ажлын тойм"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1103,11 +1082,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Эцэг даалгавар"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1156,7 +1130,7 @@ msgid "Done by"
 msgstr "Гүйцэтгэсэн"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1190,11 +1164,6 @@ msgstr "# даалгаврын"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1235,13 +1204,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Бодолт: Зарцуулсан цаг + Үлдсэн цаг."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (хуулбар)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1279,6 +1253,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Маш чухал"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1340,8 +1319,6 @@ msgid "Low"
 msgstr "Бага"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1434,7 +1411,7 @@ msgstr ""
 "төлөвтэй байхад нь төслийн менежер тогтоож өгдөг."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1454,7 +1431,7 @@ msgid "Done"
 msgstr "Дууссан"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1481,6 +1458,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Үлдсэн цаг"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1503,17 +1485,6 @@ msgstr "Хайх"
 msgid "Delegated Task"
 msgstr "Ацагласан даалгавар"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Менежер"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1526,12 +1497,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Дуусах огноо"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Хөгжүүлэлт"
 
 #. module: project
 #: help:project.task,active:0
@@ -1575,7 +1543,7 @@ msgid "Overpassed Tasks"
 msgstr "Алгассан даалгаврууд"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1602,6 +1570,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Өөр хэрэглэгчид өөрийн даалгаврыг ацаглах"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1629,7 +1602,7 @@ msgid "CHECK: "
 msgstr "ШАЛГАХ: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Энэхүү '%s' төсөлд гишүүд оноох ёстой !"
@@ -1757,6 +1730,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1770,8 +1748,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1853,7 +1829,7 @@ msgid "Starting Date"
 msgstr "Эхлэл Огноо"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1886,12 +1862,6 @@ msgstr "Даалгавар шинжилгээ"
 msgid "Project Tasks"
 msgstr "Төслийн даалгаврууд"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1910,12 +1880,6 @@ msgstr "Даалгаврууд"
 msgid "December"
 msgstr "12 сар"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1958,12 +1922,6 @@ msgstr "Ноорог"
 msgid "Kanban State"
 msgstr "Канбан Төлөв"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2011,14 +1969,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2029,11 +1979,6 @@ msgstr "Даалгавруудын Хуримтлагдсан Урсгал"
 msgid "January"
 msgstr "1 сар"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2045,11 +1990,17 @@ msgid "Reevaluation Task"
 msgstr "Даалгаврыг дахин үнэлэх"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Энэ данстай холбогдсон төслийг эхлээд устгана уу."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2068,6 +2019,11 @@ msgstr "Би менежер нь байгаа төслүүд"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2107,6 +2063,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2842,6 +2803,9 @@ msgstr "Даалгаврын үе"
 #~ msgid "Create your Firsts Projects"
 #~ msgstr "Өөрийн анхны төслүүдээ үүсгэ"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Бүх төсөлд ерөнхий"
+
 #~ msgid "Month-2"
 #~ msgstr "Сар-2"
 
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index 9426318798f..6fc4d7e6bd5 100644
--- a/addons/project/i18n/nb.po
+++ b/addons/project/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-06 16:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Start oppgave"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,9 +222,10 @@ msgid "Assigned To"
 msgstr "Tildelt til"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Veldig viktig"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -311,12 +317,6 @@ msgstr "Status"
 msgid "August"
 msgstr "August"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -386,7 +386,7 @@ msgid "Assigned to"
 msgstr "Tildelt til"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -422,12 +422,6 @@ msgstr "Arbeidstid"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -438,6 +432,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -453,6 +453,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -604,12 +609,6 @@ msgstr "Oppgavesammendrag"
 msgid "Not a Template Task"
 msgstr "Ikke en oppgavemal"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -669,6 +668,14 @@ msgstr "Ny oppgave"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Sluttdato"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -859,6 +866,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Firmaer"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -888,12 +900,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -915,17 +921,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -952,8 +947,10 @@ msgstr ""
 "underprosjekter."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -962,27 +959,21 @@ msgid "Users"
 msgstr "Brukere"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Prosjektleder"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Viktig"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1032,18 +1023,6 @@ msgstr ""
 msgid "Work summary"
 msgstr "Oppsummering av arbeid"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1096,11 +1075,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Overordnede oppgaver"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1149,7 +1123,7 @@ msgid "Done by"
 msgstr "Utført av"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1183,11 +1157,6 @@ msgstr "Antall oppgaver"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1228,13 +1197,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Beregnet som: Tid brukt + gjenstående tid."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopi)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1272,6 +1246,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Veldig viktig"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1331,8 +1310,6 @@ msgid "Low"
 msgstr "Lav"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1423,7 +1400,7 @@ msgstr ""
 "oppgaven fortsatt har status utkast."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1443,7 +1420,7 @@ msgid "Done"
 msgstr "Fullført"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1470,6 +1447,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Gjenstående timer"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1491,17 +1473,6 @@ msgstr "Søk i prosjekt"
 msgid "Delegated Task"
 msgstr "Delegerte oppgaver"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Prosjektleder"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1514,12 +1485,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Sluttdato"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr ""
 
 #. module: project
 #: help:project.task,active:0
@@ -1559,7 +1527,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1586,6 +1554,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Deleger dine oppgaver til andre brukere"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1613,7 +1586,7 @@ msgid "CHECK: "
 msgstr "SJEKK: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Du må tilordne deltakere til prosjekt '%s'!"
@@ -1741,6 +1714,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1754,8 +1732,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1837,7 +1813,7 @@ msgid "Starting Date"
 msgstr "Startdato"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1870,12 +1846,6 @@ msgstr "Oppgaveanalyse"
 msgid "Project Tasks"
 msgstr "Prosjektoppgaver"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1894,12 +1864,6 @@ msgstr "Oppgaver"
 msgid "December"
 msgstr "Desember"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1942,12 +1906,6 @@ msgstr "Utkast"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1995,14 +1953,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2013,11 +1963,6 @@ msgstr ""
 msgid "January"
 msgstr "Januar"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2029,11 +1974,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2052,6 +2003,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2089,6 +2045,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 4b2d46ccae2..11225aca776 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 18:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Start taak"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing !"
@@ -135,8 +135,8 @@ msgstr ""
 "ingevoegd."
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -228,9 +228,10 @@ msgid "Assigned To"
 msgstr "Toegewezen aan"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Heel belangrijk"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -268,11 +269,16 @@ msgid "Project Task Delegate"
 msgstr "Project taak delegeren"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
 msgstr ""
 
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Erg belangrijk"
+
 #. module: project
 #: view:project.config.settings:0
 msgid "Support"
@@ -317,12 +323,6 @@ msgstr "Status"
 msgid "August"
 msgstr "Augustus"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -399,7 +399,7 @@ msgid "Assigned to"
 msgstr "Toegewezen aan"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "De gedelegeerde gebruiker moet worden gespecificeerd"
@@ -435,12 +435,6 @@ msgstr "Werktijd"
 msgid "Re-evaluate Task"
 msgstr "Taak her-evalueren"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Fase veranderd in <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -451,6 +445,12 @@ msgstr "Bevestig de geplande tijd"
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -466,6 +466,11 @@ msgstr "Alias"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -618,12 +623,6 @@ msgstr "Taaksamenvatting"
 msgid "Not a Template Task"
 msgstr "Geen sjabloon taak"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -683,6 +682,14 @@ msgstr "Nieuwe taak"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Einddatum"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -877,6 +884,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Bedrijven"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -906,12 +918,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "Project is <b>geannuleerd</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -934,17 +940,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "Project is  <b>afgesloten</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "Taak: Markeer rood"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -971,9 +966,11 @@ msgstr ""
 "onderliggende projecten."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Ontwikkeling"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -981,27 +978,21 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "Fase veranderd"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Belangrijk"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Normaal voor alle projecten"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1051,18 +1042,6 @@ msgstr "Bevestigingsstatus"
 msgid "Work summary"
 msgstr "Samenvatting werk"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "Project is nu  <b>in afwachting</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "Project is <b>geopend</b>."
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1115,11 +1094,6 @@ msgstr "Ongelezen berichten"
 msgid "Parent Tasks"
 msgstr "Bovenliggende taken"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "Project: Markeer gelezen"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1168,7 +1142,7 @@ msgid "Done by"
 msgstr "Gedaan door"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie!"
@@ -1202,11 +1176,6 @@ msgstr "# taken"
 msgid "Number of documents attached"
 msgstr "Aantal gekoppelde documenten"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1247,13 +1216,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Berekend als: Gebruikte uren + resterende uren."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1291,6 +1265,11 @@ msgstr "Team"
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Heel belangrijk"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1352,8 +1331,6 @@ msgid "Low"
 msgstr "Laag"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Gesloten"
@@ -1446,7 +1423,7 @@ msgstr ""
 "projectleider tijdens conceptfase."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Bijlagen"
@@ -1466,7 +1443,7 @@ msgid "Done"
 msgstr "Voltooid"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1493,6 +1470,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Resterende uren"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1514,17 +1496,6 @@ msgstr "Project zoeken"
 msgid "Delegated Task"
 msgstr "Gedelegeerde taak"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Erg belangrijk"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1537,12 +1508,9 @@ msgid "project.config.settings"
 msgstr "project.config.settings"
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Einddatum"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Ontwikkeling"
 
 #. module: project
 #: help:project.task,active:0
@@ -1585,7 +1553,7 @@ msgid "Overpassed Tasks"
 msgstr "Overschreden taken"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1614,6 +1582,11 @@ msgstr "Totaal"
 msgid "Delegate your task to the other user"
 msgstr "Delegeer deze taak aan een andere gebruiker"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1643,7 +1616,7 @@ msgid "CHECK: "
 msgstr "CONTROLEER: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "U dient gebruikers aan het project '%s' toe te wijzen!"
@@ -1771,6 +1744,11 @@ msgstr "Gerelateerde status"
 msgid "Documents"
 msgstr "Documenten"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1784,8 +1762,6 @@ msgid "Followers"
 msgstr "Volgers"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1867,7 +1843,7 @@ msgid "Starting Date"
 msgstr "Begindatum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1900,12 +1876,6 @@ msgstr "Taken analyse"
 msgid "Project Tasks"
 msgstr "Projecttaken"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "Task is <b>aangemaakt</b>."
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1924,12 +1894,6 @@ msgstr "Taken"
 msgid "December"
 msgstr "December"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Geannuleerd"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1972,12 +1936,6 @@ msgstr "Concept"
 msgid "Kanban State"
 msgstr "Kanban Status"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2025,14 +1983,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2043,11 +1993,6 @@ msgstr "Taken cumulatieve flow"
 msgid "January"
 msgstr "Januari"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "Project: Markeer ongelezen"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2059,11 +2004,17 @@ msgid "Reevaluation Task"
 msgstr "Taak herevalueren"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Verwijder eerst het project dat aan deze kostenplaats is gekoppeld"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2082,6 +2033,11 @@ msgstr "projecten waarvan ik manager ben"
 msgid "Ready for next stage"
 msgstr "Gereed voor ogende fase"
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2121,6 +2077,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3028,6 +2989,9 @@ msgstr "Taken fases"
 #~ msgid "Please specify the Customer or email address of Customer."
 #~ msgstr "Definieer de klant of het e-mail adres van de klant."
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Normaal voor alle projecten"
+
 #~ msgid "Month-2"
 #~ msgstr "Maand-2"
 
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index a861b13ade7..1e436e4e13b 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-20 09:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Taak starten"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -227,8 +227,9 @@ msgid "Assigned To"
 msgstr "Toegewezen aan"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -267,9 +268,14 @@ msgid "Project Task Delegate"
 msgstr "Projecttaak delegeren"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -316,12 +322,6 @@ msgstr ""
 msgid "August"
 msgstr "Augustus"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -394,7 +394,7 @@ msgid "Assigned to"
 msgstr "Toegewezen aan"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -430,12 +430,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr "Taak opnieuw inschatten"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -446,6 +440,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -461,6 +461,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -613,12 +618,6 @@ msgstr "Taaksamenvatting"
 msgid "Not a Template Task"
 msgstr "Dit is geen modeltaak"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -678,6 +677,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Einddatum"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -868,6 +875,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Bedrijven"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -897,12 +909,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -924,17 +930,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -959,9 +954,11 @@ msgid ""
 msgstr "Som bestede uren van alle taken in dit project en in subprojecten."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Ontwikkeling"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -969,27 +966,21 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1039,18 +1030,6 @@ msgstr "Valideringsstatus"
 msgid "Work summary"
 msgstr "Werkomschrijving"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1103,11 +1082,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Hoofdtaken"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1156,7 +1130,7 @@ msgid "Done by"
 msgstr "Uitgevoerd door"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1190,11 +1164,6 @@ msgstr "# taken"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1235,13 +1204,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Berekend als: Bestede tijd + resterende tijd"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1279,6 +1253,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1338,8 +1317,6 @@ msgid "Low"
 msgstr "Laag"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1430,7 +1407,7 @@ msgstr ""
 "voorlopige taak ingesteld door de projectmanager."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1450,7 +1427,7 @@ msgid "Done"
 msgstr "Gereed"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1477,6 +1454,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Resterende uren"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1499,17 +1481,6 @@ msgstr "Zoeken in projecten"
 msgid "Delegated Task"
 msgstr "Gedelegeerde taak"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1522,12 +1493,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Einddatum"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Ontwikkeling"
 
 #. module: project
 #: help:project.task,active:0
@@ -1570,7 +1538,7 @@ msgid "Overpassed Tasks"
 msgstr "Taken over tijd"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1597,6 +1565,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegeer uw taak aan een andere gebruiker"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1624,7 +1597,7 @@ msgid "CHECK: "
 msgstr "CONTROLE: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1752,6 +1725,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1765,8 +1743,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1846,7 +1822,7 @@ msgid "Starting Date"
 msgstr "Begindatum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1879,12 +1855,6 @@ msgstr "Taakanalyse"
 msgid "Project Tasks"
 msgstr "Projecttaken"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1903,12 +1873,6 @@ msgstr "Taken"
 msgid "December"
 msgstr "December"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1953,12 +1917,6 @@ msgstr "Voorlopig"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2006,14 +1964,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2024,11 +1974,6 @@ msgstr ""
 msgid "January"
 msgstr "Januari"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2040,11 +1985,17 @@ msgid "Reevaluation Task"
 msgstr "Taak opnieuw inschatten"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2063,6 +2014,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2100,6 +2056,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index 095e9456ef4..1361568346e 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 15:32+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-16 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -84,7 +84,7 @@ msgid "Start Task"
 msgstr "Rozpocznij zadanie"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
@@ -134,8 +134,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -226,9 +226,10 @@ msgid "Assigned To"
 msgstr "Przypisany do"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Bardzo ważne"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -266,10 +267,15 @@ msgid "Project Task Delegate"
 msgstr "Przydzielanie zadania"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "Projekt został <b>utworzony</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Bardzo ważne"
 
 #. module: project
 #: view:project.config.settings:0
@@ -315,12 +321,6 @@ msgstr "Stan"
 msgid "August"
 msgstr "Sierpień"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "Zadanie zostało <b>przydzielone</b> <em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -394,7 +394,7 @@ msgid "Assigned to"
 msgstr "Przypisano do"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Oddelegowani pracownicy powinni być wyspecyfikowani"
@@ -430,12 +430,6 @@ msgstr "Czas pracy"
 msgid "Re-evaluate Task"
 msgstr "Przeszacuj zadanie"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etap zmieniony na <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -446,6 +440,12 @@ msgstr "Zatwierdź planowany czas"
 msgid "Use integrated collaborative note pads on task"
 msgstr "Stosuj w zadaniu współdzielony notatnik"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -461,6 +461,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -613,13 +618,6 @@ msgstr "Podsumowanie zadania"
 msgid "Not a Template Task"
 msgstr "Nie szablon zadania"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-"Działaj w tym projekcie, aby automatycznie działać w zadaniach i problemach."
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -692,6 +690,14 @@ msgstr "Nowe zadania"
 msgid "Invoice working time on issues"
 msgstr "Fakturuj czas problemów"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Data ukończenia"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -887,6 +893,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Firmy"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -922,12 +933,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "Projekt został <b>anulowany</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -949,17 +954,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "Projekt został <b>zamknięty</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "Zadanie: Oznacz jako przeczytane"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -986,9 +980,11 @@ msgstr ""
 "podrzędnych."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Rozwój"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -996,27 +992,21 @@ msgid "Users"
 msgstr "Użytkownicy"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "Zmieniono etap"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr "Ukryj w widokach, jeśli puste"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Menedżer"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Ważne"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Wspólne dla wszystkich projektów"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1068,18 +1058,6 @@ msgstr "Stan zatwierdzenia"
 msgid "Work summary"
 msgstr "Podsumowanie pracy"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "Projekt obecnie jest w stanie <b>oczekiwania</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "Projekt został <b>otwarty</b>."
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1132,11 +1110,6 @@ msgstr "Nieprzeczytane wiadomości"
 msgid "Parent Tasks"
 msgstr "Zadania nadrzędne"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "Projekt: Oznacz jako przeczytane"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1185,7 +1158,7 @@ msgid "Done by"
 msgstr "Wykonane przez"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "Niedozwolona akcja!"
@@ -1222,11 +1195,6 @@ msgstr "# zadań"
 msgid "Number of documents attached"
 msgstr "Liczba załączonych dokumentów"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr "Zadanie: Oznacz jako nieprzeczytane"
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1279,13 +1247,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1323,6 +1296,11 @@ msgstr "Zespół"
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr "Tu ustawisz jednostkę miary stosowaną w projekcie lub zadaniach."
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Bardzo ważne"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1384,8 +1362,6 @@ msgid "Low"
 msgstr "Niski"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Zamknięte"
@@ -1479,7 +1455,7 @@ msgstr ""
 "kiedy zadanie jest w stanie projektu."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Załączniki"
@@ -1499,7 +1475,7 @@ msgid "Done"
 msgstr "Wykonano"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1528,6 +1504,11 @@ msgstr "Prywatność / Widoczność"
 msgid "Remaining Hours"
 msgstr "Pozostałe godziny"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1549,17 +1530,6 @@ msgstr "Szukaj projektu"
 msgid "Delegated Task"
 msgstr "Przydzielone zadanie"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Menedżer"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Bardzo ważne"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1572,12 +1542,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Data ukończenia"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Rozwój"
 
 #. module: project
 #: help:project.task,active:0
@@ -1620,7 +1587,7 @@ msgid "Overpassed Tasks"
 msgstr "Zadania przeterminowane"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1649,6 +1616,11 @@ msgstr "Suma"
 msgid "Delegate your task to the other user"
 msgstr "Przydziel swoje zadania innemu użytkownikowi"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1678,7 +1650,7 @@ msgid "CHECK: "
 msgstr "SPRAWDŹ: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Musisz przypisac uczestników do projektu '%s' !"
@@ -1816,6 +1788,11 @@ msgstr "Stan powiązany"
 msgid "Documents"
 msgstr "Dokumenty"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1829,8 +1806,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1911,7 +1886,7 @@ msgid "Starting Date"
 msgstr "Data rozpoczęcia"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1944,12 +1919,6 @@ msgstr "Analiza zadań"
 msgid "Project Tasks"
 msgstr "Zadania projektu"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "Zadanie zostało <b>utworzone</b>."
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1968,12 +1937,6 @@ msgstr "Zadania"
 msgid "December"
 msgstr "Grudzień"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Anulowano"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -2017,12 +1980,6 @@ msgstr "Projekt"
 msgid "Kanban State"
 msgstr "Stan Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "Zadanie zostało ustawione na <b>projekt</b>."
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2072,14 +2029,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2090,11 +2039,6 @@ msgstr "Kumulacyjny przepływ zadań"
 msgid "January"
 msgstr "Styczeń"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2106,11 +2050,17 @@ msgid "Reevaluation Task"
 msgstr "Przeliczenie zadania"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Usuń najpierw projekt związany z tym kontem."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2129,6 +2079,11 @@ msgstr "Projekty, których jestem menedżerem"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2168,6 +2123,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3139,5 +3099,8 @@ msgstr "Etapy zadań"
 #~ msgid "Delegations History"
 #~ msgstr "Historia przydziałów"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Wspólne dla wszystkich projektów"
+
 #~ msgid "Month-2"
 #~ msgstr "Miesiąc-2"
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 89522a99315..0cf3d95ce77 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-26 10:00+0000\n"
 "Last-Translator: Daniel Reis (SECURITAS SA) <Unknown>\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: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Iniciar Tarefa"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -225,9 +225,10 @@ msgid "Assigned To"
 msgstr "Atribuído a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Muito importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -265,10 +266,15 @@ msgid "Project Task Delegate"
 msgstr "Delegar tarefa do projeto"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "Projeto foi <b>criado</b>"
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Muito importante"
 
 #. module: project
 #: view:project.config.settings:0
@@ -314,12 +320,6 @@ msgstr "Estado"
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "Tarefa foi <b>delegada</b> a <em>%s</em>"
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -392,7 +392,7 @@ msgid "Assigned to"
 msgstr "Atribuído a"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Utilizador delegado deve ser especificado"
@@ -428,12 +428,6 @@ msgstr "Tempo de Trabalho"
 msgid "Re-evaluate Task"
 msgstr "Reavaliar a tarefa"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa alterada para <b>%s</b>"
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -444,6 +438,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -459,6 +459,11 @@ msgstr "Alias"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -611,12 +616,6 @@ msgstr "Resumo da Tarefa"
 msgid "Not a Template Task"
 msgstr "Não é uma tarefa do template"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -676,6 +675,14 @@ msgstr "Nova tarefa"
 msgid "Invoice working time on issues"
 msgstr "Faturar trabalho em incidentes"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Data Final"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -866,6 +873,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -895,12 +907,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "Projeto foi <b>cancelado</b>"
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -922,17 +928,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "Projeto foi <b>fechado</b>"
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -959,9 +954,11 @@ msgstr ""
 "projetos."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desenvolvimento"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -969,27 +966,21 @@ msgid "Users"
 msgstr "Utilizadores"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Gestor"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Comum a todos os projetos"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1039,18 +1030,6 @@ msgstr "Estado de Validação"
 msgid "Work summary"
 msgstr "Resumo do trabalho"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "Projeto foi <b>aberto</b>"
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1103,11 +1082,6 @@ msgstr "Mensagens por ler"
 msgid "Parent Tasks"
 msgstr "Tarefas ascendentes"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1156,7 +1130,7 @@ msgid "Done by"
 msgstr "Concluído por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação inválida!"
@@ -1190,11 +1164,6 @@ msgstr "# de tarefas"
 msgid "Number of documents attached"
 msgstr "N.º de documentos anexos"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1235,13 +1204,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Processado como: Tempo Gasto + Tempo Restante."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1279,6 +1253,11 @@ msgstr "Equipa"
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Muito importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1340,8 +1319,6 @@ msgid "Low"
 msgstr "Baixo"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Fechado"
@@ -1434,7 +1411,7 @@ msgstr ""
 "do projeto quando a tarefa está no estado rascunho."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Anexos"
@@ -1454,7 +1431,7 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1481,6 +1458,11 @@ msgstr "Privacidade / visibilidade"
 msgid "Remaining Hours"
 msgstr "Horas Restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1502,17 +1484,6 @@ msgstr "Pesquisar projeto"
 msgid "Delegated Task"
 msgstr "Tarefa Delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Gestor"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Muito importante"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1525,12 +1496,9 @@ msgid "project.config.settings"
 msgstr "project.config.settings"
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Data Final"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desenvolvimento"
 
 #. module: project
 #: help:project.task,active:0
@@ -1573,7 +1541,7 @@ msgid "Overpassed Tasks"
 msgstr "Tarefas superada"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1602,6 +1570,11 @@ msgstr "Total"
 msgid "Delegate your task to the other user"
 msgstr "Delegue a sua tarefa ao outro utilizador"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1630,7 +1603,7 @@ msgid "CHECK: "
 msgstr "VERIFICAR: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Deve atribuir os membros em projeto '%s'!"
@@ -1758,6 +1731,11 @@ msgstr ""
 msgid "Documents"
 msgstr "Documentos"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1771,8 +1749,6 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1854,7 +1830,7 @@ msgid "Starting Date"
 msgstr "Data Inicial"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1887,12 +1863,6 @@ msgstr "Análise de tarefas"
 msgid "Project Tasks"
 msgstr "Tarefas do Projeto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "Tarefa foi <b>criada</b>"
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1911,12 +1881,6 @@ msgstr "Tarefas"
 msgid "December"
 msgstr "Dezembro"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Cancelado"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1959,12 +1923,6 @@ msgstr "Rascunho"
 msgid "Kanban State"
 msgstr "Estado Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "Tarefa passou para  <b>rascunho</b>"
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2012,14 +1970,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr "Configurar projeto"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2030,11 +1980,6 @@ msgstr "Flow das tarefas acumulado"
 msgid "January"
 msgstr "Janeiro"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2046,11 +1991,17 @@ msgid "Reevaluation Task"
 msgstr "Tarefa reavaliação"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Por favor, excluir o projeto ligado a esta conta primeiro."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2069,6 +2020,11 @@ msgstr "Projetos em que eu sou gestor"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2108,6 +2064,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2948,6 +2909,9 @@ msgstr "Estágios da tarefa"
 #~ msgid "The company name must be unique !"
 #~ msgstr "O nome da empresa deve ser único!"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Comum a todos os projetos"
+
 #~ msgid "Month-1"
 #~ msgstr "Mês-1"
 
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 7a01ea56051..3be4938e168 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 18:51+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 13:28+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -29,7 +30,7 @@ msgid ""
 "be able to manage tasks or track issues"
 msgstr ""
 "Se marcado, este contrato estará disponível no menu do projeto e você poderá "
-"gerenciar tarefas e monitorar problemas"
+"gerenciar tarefas e monitorar questões"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -46,7 +47,7 @@ msgstr "Tarefas por responsáveis"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr "Pai"
+msgstr "Superior"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -85,7 +86,7 @@ msgid "Start Task"
 msgstr "Iniciar Tarefa"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -94,7 +95,7 @@ msgstr "Aviso!"
 #: help:project.project,message_unread:0
 #: help:project.task,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "Se marcado novas mensagens requerem sua atenção"
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -138,8 +139,8 @@ msgstr ""
 "kanban."
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
@@ -231,9 +232,10 @@ msgid "Assigned To"
 msgstr "Atribuído a"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Muito importante"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr "Tarefa Concluída"
 
 #. module: project
 #: view:project.project:0
@@ -262,7 +264,7 @@ msgstr "Contrato/Analítico"
 #. module: project
 #: view:project.config.settings:0
 msgid "Project Management"
-msgstr "Gerenciamento de Projetos"
+msgstr "Gestão de Projetos"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -271,10 +273,15 @@ msgid "Project Task Delegate"
 msgstr "Atribuíção de Tarefas de Projeto"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "O projeto foi <b>criado</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr "Tarefa Iniciada"
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "Muito Importante"
 
 #. module: project
 #: view:project.config.settings:0
@@ -313,19 +320,13 @@ msgstr "Gerente do Projeto"
 #: field:project.task.history.cumulative,state:0
 #: field:report.project.task.user,state:0
 msgid "Status"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "A tarefa foi <b>delegada</b> para <em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +382,7 @@ msgstr ""
 #: view:project.task:0
 #: view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr "Tarefas em Progresso"
+msgstr "Tarefas em Andamento"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -402,7 +403,7 @@ msgid "Assigned to"
 msgstr "Atribuída para"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "É necessário especificar o usuário delegado"
@@ -421,7 +422,7 @@ msgstr "Gerente do(s) Projeto(s)"
 #: selection:project.task.type,state:0
 #: selection:report.project.task.user,state:0
 msgid "In Progress"
-msgstr "Em Progresso"
+msgstr "Em Andamento"
 
 #. module: project
 #: view:project.task:0
@@ -431,19 +432,13 @@ msgstr "Reativar"
 #. module: project
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr "Tempo de trabalho"
+msgstr "Tempo de Trabalho"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
 msgstr "Reavaliar Tarefa"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Estágio alterado para <b>%s</b>."
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -452,7 +447,13 @@ msgstr "Validar tempo planejado"
 #. module: project
 #: field:project.config.settings,module_pad:0
 msgid "Use integrated collaborative note pads on task"
-msgstr "Utilizar as notas colaborativas pads nas tarefas"
+msgstr "Usar o Bloco de Notas colaborativo nas tarefas"
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr "Tarefa Bloqueada"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -469,6 +470,11 @@ msgstr "Apelido"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr "Tarefa bloqueada"
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -525,8 +531,8 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
-"O tempo restante total, pode re-ser estimado periodicamente pelo cessionário "
-"da tarefa."
+"Tempo total restante, pode ser re-estimado periodicamente pelo executor da "
+"tarefa"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -565,7 +571,7 @@ msgstr "Dias para Abrir"
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr "Muito Urgente"
+msgstr "Urgentíssimo"
 
 #. module: project
 #: help:project.task.delegate,project_id:0
@@ -621,14 +627,6 @@ msgstr "Sumário da Tarefa"
 msgid "Not a Template Task"
 msgstr "Não é uma Tarefa Modelo"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-"Siga este projeto para segir automaticamente todas as tarefas e incidentes "
-"relacionados."
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -697,13 +695,21 @@ msgstr "Pronto"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr "Nova Tarefa"
+msgstr "Novas Tarefas"
 
 #. module: project
 #: field:project.config.settings,module_project_issue_sheet:0
 msgid "Invoice working time on issues"
 msgstr "Faturar horas trabalhadas em incidentes"
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Data Final"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -712,7 +718,7 @@ msgstr "Especificação"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "Do estado Rascunho, mudará para o estado Aberto."
+msgstr "Do estado Provisório, mudará para o estado Aberto."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -728,7 +734,7 @@ msgstr "Descrição de Nova Tarefa"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -749,7 +755,7 @@ msgstr "Tempo total"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr "Data da criação"
+msgstr "Data de Criação"
 
 #. module: project
 #: view:project.project:0
@@ -767,7 +773,7 @@ msgstr "Estágio"
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "Tarefa Rascunho Aberta"
+msgstr "Tarefa Provisória Aberta"
 
 #. module: project
 #: field:project.project,alias_model:0
@@ -888,8 +894,8 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
-"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
-"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"A situação é definida como 'Provisória' quando o caso é criado. Se o caso "
+"está em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
 "situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
 "situação é definida como 'Pendente'."
 
@@ -898,6 +904,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Empresas"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr "Dobrado por Padrão"
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -934,12 +945,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "O projeto foi <b>cancelado</b>."
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -947,9 +952,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
-"Associe este projeto a uma conta analítica se precisar gerencia financeira "
-"nos projetos com análise de orçamentos, planejamento, custo e retorno, "
-"planilha de tempo em projetos, etc."
+"Associe este projeto a uma conta analítica se precisar gestão financeira nos "
+"projetos com análise de orçamentos, planejamento, custo e retorno, planilha "
+"de tempo em projetos, etc."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -961,17 +966,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "O projeto foi <b>fechado</b>."
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "Tarefa: Marcar lida"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -998,9 +992,13 @@ msgstr ""
 "projetos filho."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Desenvolvimento"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
+"Siga este projeto para acompanhar automaticamente os eventos associados as "
+"tarefas e questões deste projeto."
 
 #. module: project
 #: view:project.task:0
@@ -1008,27 +1006,21 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "Estágio Alterado"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr "Esconder se visão estiver vazia"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Gerente"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Importante"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Comum para Todos os Projetos"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1078,26 +1070,14 @@ msgstr "Estado de validação"
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr "Sumário do trabalho"
-
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "O projeto está agora <b>pendente</b>."
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "O projeto foi <b>aberto</b>."
+msgstr "Resumo do trabalho"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: project
 #: view:project.project:0
@@ -1144,11 +1124,6 @@ msgstr "Mensagens Não Lidas"
 msgid "Parent Tasks"
 msgstr "Tarefas Pai"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "Projeto: Marcar como Lido"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1162,7 +1137,7 @@ msgstr "Estágios comuns para todos os projetos"
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "Tarefa em Rascunho"
+msgstr "Tarefas Provisórias"
 
 #. module: project
 #: field:project.task,notes:0
@@ -1197,7 +1172,7 @@ msgid "Done by"
 msgstr "Concluído por"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação Inválida!"
@@ -1235,11 +1210,6 @@ msgstr "# de tarefas"
 msgid "Number of documents attached"
 msgstr "Número de documentos anexados"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr "Tarefa: Marcar não lida"
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1279,10 +1249,10 @@ msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
 "                Clique para adicionar um estágio às tarefas.\n"
 "              </p><p>\n"
-"                Define os passos que serão utilizados no projeto da criação\n"
-"                da tarefa, até o fechamento da mesma ou do incidente.\n"
-"                Estes estágios serão usados para monitorar o progresso em\n"
-"                resolver uma tarefa ou um incidente.\n"
+"                Define os passos que serão utilizados no projeto na criação\n"
+"                da tarefa, até o fechamento da mesma ou da questão.\n"
+"                Estes estágios serão usados para monitorar o progresso na\n"
+"                resolução de uma tarefa ou questão.\n"
 "              </p>\n"
 "            "
 
@@ -1292,13 +1262,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tempo Gasto + Tempo Restante"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr "Estágio da Tarefa Alterado"
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1336,6 +1311,11 @@ msgstr "Equipe"
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr "Define a unidade de medida utilizada em projetos e tarefas."
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Muito importante"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1345,7 +1325,7 @@ msgstr "Mês"
 #. module: project
 #: model:project.task.type,name:project.project_tt_design
 msgid "Design"
-msgstr "Desenho"
+msgstr "Design"
 
 #. module: project
 #: view:project.task:0
@@ -1397,8 +1377,6 @@ msgid "Low"
 msgstr "Baixo"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "Fechado"
@@ -1434,7 +1412,7 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
-"Novo status da sua tarefa. Pendente irá reabrir automaticamente quando a "
+"Nova situação da sua tarefa. Pendente irá reabrir automaticamente quando a "
 "tarefa atribuída for concluída"
 
 #. module: project
@@ -1487,11 +1465,11 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
-"Tempo estimado para efetuar a tarefa, usualmente ajustado pelo Gerente do "
-"Projeto quando a tarefa está no estado de Rascunho."
+"Tempo estimado para efetuar a tarefa, geralmente ajustado pelo Gerente do "
+"Projeto quando a tarefa está no estado Provisório."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "Anexos"
@@ -1511,7 +1489,7 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1541,10 +1519,15 @@ msgstr "Privacidade / Visibilidade"
 msgid "Remaining Hours"
 msgstr "Horas Restantes"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr "Estágio alterado"
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro ! A data final deve ser maior do que a data inicial"
+msgstr "Erro! A data final deve ser maior do que a data inicial"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1562,17 +1545,6 @@ msgstr "Pesquisar Projeto"
 msgid "Delegated Task"
 msgstr "Tarefa delegada"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Gerente"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "Muito Importante"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1585,12 +1557,9 @@ msgid "project.config.settings"
 msgstr "project.config.settings"
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Data Final"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desenvolvimento"
 
 #. module: project
 #: help:project.task,active:0
@@ -1638,7 +1607,7 @@ msgid "Overpassed Tasks"
 msgstr "Tarefas Atrasadas"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1667,6 +1636,11 @@ msgstr "Total"
 msgid "Delegate your task to the other user"
 msgstr "Delegar sua tarefa para outro usuário"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr "Tarefa Iniciada"
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1697,7 +1671,7 @@ msgid "CHECK: "
 msgstr "VERIFIQUE: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Você precisa associar membros no projeto '%s' !"
@@ -1760,7 +1734,7 @@ msgstr "Estágios da Tarefa"
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr "Defina as exigências e ajuste horas de planejamento."
+msgstr "Defina as exigências e defina as horas de planejadas."
 
 #. module: project
 #: field:project.project,message_ids:0
@@ -1841,6 +1815,11 @@ msgstr "Situação Relacionada"
 msgid "Documents"
 msgstr "Documentos"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr "Tarefa criada"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1854,8 +1833,6 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1911,7 +1888,7 @@ msgstr ""
 #. module: project
 #: view:res.partner:0
 msgid "For changing to done state"
-msgstr "Para mudar o estado para feito"
+msgstr "Para mudar o estado para Concluído"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1937,7 +1914,7 @@ msgid "Starting Date"
 msgstr "Data de Início"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1970,12 +1947,6 @@ msgstr "Análise de Tarefas"
 msgid "Project Tasks"
 msgstr "Tarefas do Projeto"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "A tarefa foi <b>criada</b>."
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1994,12 +1965,6 @@ msgstr "Tarefas"
 msgid "December"
 msgstr "Dezembro"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "Cancelada"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -2022,7 +1987,7 @@ msgstr ""
 "um pedido de venda.\n"
 "                Mais precisamente, tarefas são criadas para linhas de "
 "obtenção com o produto do tipo 'Serviço',\n"
-"                método de obtenção 'Fazer pedido' e método de fornecimento "
+"                método de aquisição 'No pedido' e método de fornecimento "
 "'Fabricação'.\n"
 "                O módulo project_mrp será instalado."
 
@@ -2040,7 +2005,7 @@ msgstr "Experimento"
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: selection:report.project.task.user,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: project
 #: field:project.task,kanban_state:0
@@ -2049,16 +2014,10 @@ msgstr "Rascunho"
 msgid "Kanban State"
 msgstr "Situação Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "A tarefa foi definida como <b>rascunho</b>."
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
-msgstr "Registrar planinha de tempo por tarefa"
+msgstr "Registrar planilha de tempo por tarefa"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -2104,14 +2063,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr "Configurar Projeto"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2122,11 +2073,6 @@ msgstr "Fluxo de Tarefas Acumuladas"
 msgid "January"
 msgstr "Janeiro"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "Projeto: Marcar como não lido"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2138,10 +2084,16 @@ msgid "Reevaluation Task"
 msgstr "Tarefa de Reavaliação"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr "Por favor apague o projeto ligado a esta conta primeiro."
+msgstr "Por favor exclua o projeto associado a esta conta primeiro."
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr "Tarefa Criada"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2161,6 +2113,11 @@ msgstr "Projetos nos quais eu sou gerente"
 msgid "Ready for next stage"
 msgstr "Pronto para o próximo estágio"
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr "Padrão para Novos Projetos"
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2203,6 +2160,11 @@ msgstr ""
 "planejamento, agendamento e alocação de recursos.\n"
 "                O módulo project_long_term será instalado."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr "Tarefa fechada"
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -3119,6 +3081,9 @@ msgstr "Estágio de Tarefas"
 #~ msgid "Contact Address"
 #~ msgstr "Endereço do contato"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Comum para Todos os Projetos"
+
 #~ msgid "Deployment"
 #~ msgstr "Implantação"
 
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index dd76acb0b60..e38a20c346e 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-04-26 18:27+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Incepeti Sarcina"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Avertizare !"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -226,9 +226,10 @@ msgid "Assigned To"
 msgstr "Atribuit lui"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Foarte important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -266,9 +267,14 @@ msgid "Project Task Delegate"
 msgstr "Delegat Sarcina Proiect"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -315,12 +321,6 @@ msgstr ""
 msgid "August"
 msgstr "August"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -396,7 +396,7 @@ msgid "Assigned to"
 msgstr "Atribuit lui"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Ar trebui specificat Utilizatorul Delegat"
@@ -432,12 +432,6 @@ msgstr "Program de lucru"
 msgid "Re-evaluate Task"
 msgstr "Re-evaluati Sarcina"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -448,6 +442,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -463,6 +463,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -615,12 +620,6 @@ msgstr "Rezumat sarcina"
 msgid "Not a Template Task"
 msgstr "Nu este o sarcina sablon"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -680,6 +679,14 @@ msgstr "Sarcini noi"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Data de sfarsit"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -870,6 +877,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Companii"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -899,12 +911,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -927,17 +933,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Anulati"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -964,9 +959,11 @@ msgstr ""
 "proiect si proiectelor lui subordonate."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Dezvoltare"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -974,27 +971,21 @@ msgid "Users"
 msgstr "Utilizatori"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Important"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Comun(a) tuturor Proiectelor"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1044,18 +1035,6 @@ msgstr "Starea Validarii"
 msgid "Work summary"
 msgstr "Rezumat munca"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1110,11 +1089,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Sarcini principale"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1163,7 +1137,7 @@ msgid "Done by"
 msgstr "Efectuat de catre"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1197,11 +1171,6 @@ msgstr "# de sarcini"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1242,13 +1211,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculat în felul următor: Timp petrecut + Timp rămas"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1286,6 +1260,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Foarte important"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1347,8 +1326,6 @@ msgid "Low"
 msgstr "Scazut(a)"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1441,7 +1418,7 @@ msgstr ""
 "managerul de proiect atunci cand sarcina se afla in starea de ciorna."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1461,7 +1438,7 @@ msgid "Done"
 msgstr "Efectuat"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1488,6 +1465,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Ore ramase"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1511,17 +1493,6 @@ msgstr "Cautati Proiectul"
 msgid "Delegated Task"
 msgstr "Sarcina delegata"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1534,12 +1505,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Data de sfarsit"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Dezvoltare"
 
 #. module: project
 #: help:project.task,active:0
@@ -1583,7 +1551,7 @@ msgid "Overpassed Tasks"
 msgstr "Sarcini omise"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1612,6 +1580,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegati-va sarcina altor utilizatori"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1639,7 +1612,7 @@ msgid "CHECK: "
 msgstr "VERIFICATI: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Trebuie sa alocati membri proiectului '%s' !"
@@ -1767,6 +1740,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1780,8 +1758,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1863,7 +1839,7 @@ msgid "Starting Date"
 msgstr "Data de inceput"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1896,12 +1872,6 @@ msgstr "Analiza Sarcinilor"
 msgid "Project Tasks"
 msgstr "Sarcini Proiect"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1920,12 +1890,6 @@ msgstr "Sarcini"
 msgid "December"
 msgstr "Decembrie"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1970,12 +1934,6 @@ msgstr "Ciorna"
 msgid "Kanban State"
 msgstr "Starea Kanban"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2023,14 +1981,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2041,11 +1991,6 @@ msgstr "Fluxul cumulativ al sarcinilor"
 msgid "January"
 msgstr "Ianuarie"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2057,11 +2002,17 @@ msgid "Reevaluation Task"
 msgstr "Activitatea de reevaluare"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Va rugam mai intai sa stergeti proiectul asociat acestui cont."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2080,6 +2031,11 @@ msgstr "Proiecte la care sunt manager"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2119,6 +2075,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2773,6 +2734,9 @@ msgstr "Etapele Sarcinilor"
 #~ msgid "Task By Days"
 #~ msgstr "Sarcina dupa Zile"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Comun(a) tuturor Proiectelor"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "Numele companiei trebuie sa fie unic !"
 
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index d68aea73130..1ff5eb08b95 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-09-14 06:31+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Запуск задания"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Внимание!"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -225,9 +225,10 @@ msgid "Assigned To"
 msgstr "Назначено"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Очень важно"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -265,9 +266,14 @@ msgid "Project Task Delegate"
 msgstr "Назначить задание"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -314,12 +320,6 @@ msgstr "Статус"
 msgid "August"
 msgstr "Август"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -392,7 +392,7 @@ msgid "Assigned to"
 msgstr "Исполнитель"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Делегированный Пользователь должен быть определен"
@@ -428,12 +428,6 @@ msgstr "Рабочее время"
 msgid "Re-evaluate Task"
 msgstr "Пересмотреть задачу"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -444,6 +438,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -459,6 +459,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -611,12 +616,6 @@ msgstr "Описание задания"
 msgid "Not a Template Task"
 msgstr "Не шаблон задания"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -676,6 +675,14 @@ msgstr "Новые Задачи"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Дата окончания"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -867,6 +874,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Организации"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -896,12 +908,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -924,17 +930,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Отменить"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -961,9 +956,11 @@ msgstr ""
 "подпроектами."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Разработка"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -971,27 +968,21 @@ msgid "Users"
 msgstr "Исполнитель"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Руководитель"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Важное"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Общее для всех проектов"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1041,18 +1032,6 @@ msgstr "Состояние проверки"
 msgid "Work summary"
 msgstr "Обзор работы"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1106,11 +1085,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Родительские задания"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1159,7 +1133,7 @@ msgid "Done by"
 msgstr "Выполнил(а)"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1193,11 +1167,6 @@ msgstr "№ задачи"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1238,13 +1207,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Вычисляется по формуле: Затраченное время + Оставшееся время."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (копия)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1282,6 +1256,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Очень важно"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1343,8 +1322,6 @@ msgid "Low"
 msgstr "Низкий"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1438,7 +1415,7 @@ msgstr ""
 "\"Черновик\"."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1458,7 +1435,7 @@ msgid "Done"
 msgstr "Выполнено"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1485,6 +1462,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Оставшееся время"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1507,17 +1489,6 @@ msgstr "Поиск Проекта"
 msgid "Delegated Task"
 msgstr "Порученное задание"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Руководитель"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1530,12 +1501,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Дата окончания"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Разработка"
 
 #. module: project
 #: help:project.task,active:0
@@ -1578,7 +1546,7 @@ msgid "Overpassed Tasks"
 msgstr "Просроченные задания"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1607,6 +1575,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Поручить ваше задание другому пользователю"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1634,7 +1607,7 @@ msgid "CHECK: "
 msgstr "ПРОВЕРКА: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Вы должны назначить участников проекту '%s' !"
@@ -1762,6 +1735,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1775,8 +1753,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1858,7 +1834,7 @@ msgid "Starting Date"
 msgstr "Дата начала"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1891,12 +1867,6 @@ msgstr "Анализ задач"
 msgid "Project Tasks"
 msgstr "Задания проекта"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1915,12 +1885,6 @@ msgstr "Задания"
 msgid "December"
 msgstr "Декабрь"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1965,12 +1929,6 @@ msgstr "Черновик"
 msgid "Kanban State"
 msgstr "Канбан статус"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2018,14 +1976,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2036,11 +1986,6 @@ msgstr "Совокупный поток"
 msgid "January"
 msgstr "Январь"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2052,11 +1997,17 @@ msgid "Reevaluation Task"
 msgstr "Переоценка задачи"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Пожалуйста, сначала удалите проект, ссылающийся на этот счет."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2075,6 +2026,11 @@ msgstr "Проекты, в которых я менеджер"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2115,6 +2071,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2869,6 +2830,9 @@ msgstr "Шаги задания"
 #~ msgid "My Task's Deadlines"
 #~ msgstr "Сроки моих заданий"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Общее для всех проектов"
+
 #~ msgid "Deployment"
 #~ msgstr "Развертывание"
 
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index e40fdf52098..cadb163be68 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 16:34+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr "Začiatok úlohy"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,8 +937,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr "Hotové podľa"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Úlohy projektu"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index 2c89ccf3f5c..5b633c99d0b 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 09:21+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr "Stanje"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr "Dodeljeno"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr "Delovni čas"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Prekliči"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1085,11 +1064,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1138,7 +1112,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1172,11 +1146,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1217,13 +1186,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1261,6 +1235,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1320,8 +1299,6 @@ msgid "Low"
 msgstr "Nizko"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1408,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgid "Done"
 msgstr "Zaključeno"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1455,6 +1432,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Preostale ure"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1476,17 +1458,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1499,11 +1470,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1544,7 +1512,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1571,6 +1539,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1598,7 +1571,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1726,6 +1699,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1739,8 +1717,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1820,7 +1796,7 @@ msgid "Starting Date"
 msgstr "Začetni datum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1853,12 +1829,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Naloge projekta"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1877,12 +1847,6 @@ msgstr "Opravila"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1925,12 +1889,6 @@ msgstr "Osnutek"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1978,14 +1936,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1996,11 +1946,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2012,11 +1957,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2035,6 +1986,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2072,6 +2028,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 2fc43204525..393cfaffe4a 100644
--- a/addons/project/i18n/sq.po
+++ b/addons/project/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 15:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:11+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,8 +937,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,11 +1471,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 024a01e63fc..c3d5ce2d79b 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-23 09:31+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Starta aktivitet"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "Varning !"
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -225,9 +225,10 @@ msgid "Assigned To"
 msgstr "Tilldelad"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "Mycket viktigt"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -265,9 +266,14 @@ msgid "Project Task Delegate"
 msgstr "Projektaktivitetsdelegering"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -314,12 +320,6 @@ msgstr "Status"
 msgid "August"
 msgstr "augusti"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -393,7 +393,7 @@ msgid "Assigned to"
 msgstr "Tilldelad till"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "Användaren som ärendet delegeras till måste anges"
@@ -429,12 +429,6 @@ msgstr "Arbetstid"
 msgid "Re-evaluate Task"
 msgstr "Ovärdera aktivitet"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -445,6 +439,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -460,6 +460,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -612,12 +617,6 @@ msgstr "Aktivitetssammanfattning"
 msgid "Not a Template Task"
 msgstr "Inte en aktivitetsmall"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -677,6 +676,14 @@ msgstr "Ny aktivitet"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Slutdatum"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -867,6 +874,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Bolag"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -896,12 +908,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -923,17 +929,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -960,9 +955,11 @@ msgstr ""
 "projekt och underliggande."
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Utveckling"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -970,27 +967,21 @@ msgid "Users"
 msgstr "Användare"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr ""
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "Chef"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "Viktigt"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "Gemensamt med alla projekt"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1040,18 +1031,6 @@ msgstr "Granskningsstatus"
 msgid "Work summary"
 msgstr "Sammanställning av arbete"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1104,11 +1083,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr "Överliggande aktiviteter"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1157,7 +1131,7 @@ msgid "Done by"
 msgstr "Utfört av"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1191,11 +1165,6 @@ msgstr "# aktiviteter"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1236,13 +1205,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Beräknas som: Nedlagd tid + Återstående tid."
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1280,6 +1254,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "Mycket viktigt"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1341,8 +1320,6 @@ msgid "Low"
 msgstr "Låg"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1435,7 +1412,7 @@ msgstr ""
 "projektledaren när aktiviteten har status preliminär."
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1455,7 +1432,7 @@ msgid "Done"
 msgstr "Klar"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1482,6 +1459,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Återstående timmar"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1503,17 +1485,6 @@ msgstr "Sök projekt"
 msgid "Delegated Task"
 msgstr "Delegerade aktiviteter"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "Chef"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1526,12 +1497,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Slutdatum"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Utveckling"
 
 #. module: project
 #: help:project.task,active:0
@@ -1574,7 +1542,7 @@ msgid "Overpassed Tasks"
 msgstr "Övertrasserade aktiviteter"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1603,6 +1571,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Delegera din aktivitet till den andra användaren"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1630,7 +1603,7 @@ msgid "CHECK: "
 msgstr "CHECK: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "Du måste tilldela medarbetare till projektet '%s'!"
@@ -1758,6 +1731,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1771,8 +1749,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1854,7 +1830,7 @@ msgid "Starting Date"
 msgstr "Startdatum"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1887,12 +1863,6 @@ msgstr "Aktivietetsanalys"
 msgid "Project Tasks"
 msgstr "Projektaktiviteter"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1911,12 +1881,6 @@ msgstr "Aktiviteter"
 msgid "December"
 msgstr "december"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1960,12 +1924,6 @@ msgstr "Preliminär"
 msgid "Kanban State"
 msgstr "Kanbanstatus"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -2013,14 +1971,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2031,11 +1981,6 @@ msgstr "Aktiviteters kummulativa flöde"
 msgid "January"
 msgstr "januari"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2047,11 +1992,17 @@ msgid "Reevaluation Task"
 msgstr "Omvärdering av aktiviteten"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "Vänligen radera projektet som är länkat till detta konto först."
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2070,6 +2021,11 @@ msgstr "Projekt där jag är ansvarig"
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2109,6 +2065,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2561,6 +2522,9 @@ msgstr "Aktivitetsetapper"
 #~ msgid "The chosen company is not in the allowed companies for this user"
 #~ msgstr "Detta bolag är inte tillåtet för den här användaren"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "Gemensamt med alla projekt"
+
 #~ msgid "Project vs remaining hours"
 #~ msgstr "Planerad tid jämfört med återstående"
 
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 73fe9523311..4322c21e7b5 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1085,11 +1064,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1138,7 +1112,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1172,11 +1146,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1217,13 +1186,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1261,6 +1235,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1320,8 +1299,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1408,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1455,6 +1432,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1476,17 +1458,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1499,11 +1470,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1544,7 +1512,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1571,6 +1539,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1598,7 +1571,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1726,6 +1699,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1739,8 +1717,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1820,7 +1796,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1853,12 +1829,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1877,12 +1847,6 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1925,12 +1889,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1978,14 +1936,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1996,11 +1946,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2012,11 +1957,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2035,6 +1986,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2072,6 +2028,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 1eaf41b601f..4d43889d952 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "Görevi Başlat"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr "Durum"
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr "Atanan"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr "Çalışılan Süresi"
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -600,12 +605,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -665,6 +664,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -855,6 +862,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -884,12 +896,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -908,17 +914,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "İptal"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -943,8 +938,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -953,27 +950,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1023,18 +1014,6 @@ msgstr "Onay Durumu"
 msgid "Work summary"
 msgstr "İş Özeti"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1087,11 +1066,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1140,7 +1114,7 @@ msgid "Done by"
 msgstr "Tamamlayan Kişi"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1174,11 +1148,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1219,13 +1188,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1263,6 +1237,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1322,8 +1301,6 @@ msgid "Low"
 msgstr "Düşük"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1410,7 +1387,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1430,7 +1407,7 @@ msgid "Done"
 msgstr "Tamamlandı"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1457,6 +1434,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Kalan Saatler"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1478,17 +1460,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr "Aktarılmış Görevler"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1501,11 +1472,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1546,7 +1514,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1573,6 +1541,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr "Görevinizi başka bir kullanıcıya aktarın."
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1600,7 +1573,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1728,6 +1701,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1741,8 +1719,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1822,7 +1798,7 @@ msgid "Starting Date"
 msgstr "Başlangıç Tarihi"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1855,12 +1831,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Proje Görevleri"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1879,12 +1849,6 @@ msgstr "Görevler"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1927,12 +1891,6 @@ msgstr "Taslak"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1980,14 +1938,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1998,11 +1948,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2014,11 +1959,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2037,6 +1988,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2074,6 +2030,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 31a93df98ce..9cbc378d6d9 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-03 09:22+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr "Призначено"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr "Опис роботи"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1085,11 +1064,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1138,7 +1112,7 @@ msgid "Done by"
 msgstr "Виконав"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1172,11 +1146,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1217,13 +1186,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1261,6 +1235,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1320,8 +1299,6 @@ msgid "Low"
 msgstr "Низький"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1408,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgid "Done"
 msgstr "Завершений"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1455,6 +1432,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1476,17 +1458,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1499,11 +1470,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1544,7 +1512,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1571,6 +1539,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1598,7 +1571,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1726,6 +1699,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1739,8 +1717,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1820,7 +1796,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1853,12 +1829,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1877,12 +1847,6 @@ msgstr "Завдання"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1925,12 +1889,6 @@ msgstr "Чорновик"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1978,14 +1936,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1996,11 +1946,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2012,11 +1957,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2035,6 +1986,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2072,6 +2028,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index 5b99bc885ae..5b427a3e00b 100644
--- a/addons/project/i18n/vi.po
+++ b/addons/project/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-21 02:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -83,7 +83,7 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -133,8 +133,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -222,8 +222,9 @@ msgid "Assigned To"
 msgstr "Phân công cho"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -262,9 +263,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -309,12 +315,6 @@ msgstr ""
 msgid "August"
 msgstr "Tháng Tám"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -382,7 +382,7 @@ msgid "Assigned to"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -418,12 +418,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -434,6 +428,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -449,6 +449,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -599,12 +604,6 @@ msgstr ""
 msgid "Not a Template Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -664,6 +663,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "Ngày kết thúc"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -854,6 +861,11 @@ msgstr ""
 msgid "Companies"
 msgstr "Các công ty"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -883,12 +895,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -907,17 +913,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Hủy"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -942,9 +937,11 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "Phát triển"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -952,27 +949,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1022,18 +1013,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1086,11 +1065,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1139,7 +1113,7 @@ msgid "Done by"
 msgstr "Hoàn thành bởi"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1173,11 +1147,6 @@ msgstr ""
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1218,13 +1187,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1262,6 +1236,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1321,8 +1300,6 @@ msgid "Low"
 msgstr "Thấp"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1409,7 +1386,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1429,7 +1406,7 @@ msgid "Done"
 msgstr "Hoàn tất"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1456,6 +1433,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Số giờ còn lại"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1477,17 +1459,6 @@ msgstr "Tìm kiếm Dự án"
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1500,12 +1471,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "Ngày kết thúc"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Phát triển"
 
 #. module: project
 #: help:project.task,active:0
@@ -1545,7 +1513,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1572,6 +1540,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1599,7 +1572,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1727,6 +1700,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1740,8 +1718,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1821,7 +1797,7 @@ msgid "Starting Date"
 msgstr "Ngày bắt đầu"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1854,12 +1830,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr "Các nhiệm vụ của dự án"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1878,12 +1848,6 @@ msgstr "Các nhiệm vụ"
 msgid "December"
 msgstr "Tháng Mười hai"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1926,12 +1890,6 @@ msgstr ""
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1979,14 +1937,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1997,11 +1947,6 @@ msgstr ""
 msgid "January"
 msgstr "Tháng Một"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2013,11 +1958,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2036,6 +1987,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2073,6 +2029,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index ca32a7738ba..f25f25b71a0 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-14 14:12+0000\n"
 "Last-Translator: sum1201 <Unknown>\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: 2012-12-15 05:04+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "开始任务"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -132,8 +132,8 @@ msgid ""
 msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr "警告!"
@@ -221,9 +221,10 @@ msgid "Assigned To"
 msgstr "分配给"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
-msgstr "非常重要"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
 
 #. module: project
 #: view:project.project:0
@@ -261,10 +262,15 @@ msgid "Project Task Delegate"
 msgstr "任务分派"
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
-msgstr "项目已<B>创建</ B>。"
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr "非常重要"
 
 #. module: project
 #: view:project.config.settings:0
@@ -308,12 +314,6 @@ msgstr "状态"
 msgid "August"
 msgstr "八月"
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr "任务已经被<b>委派</b>给<em>%s</em>."
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -383,7 +383,7 @@ msgid "Assigned to"
 msgstr "指派到"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "应该制定委派用户"
@@ -419,12 +419,6 @@ msgstr "工作时间"
 msgid "Re-evaluate Task"
 msgstr "任务重估"
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "阶段已改为<b>%s</b>"
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -435,6 +429,12 @@ msgstr "验证计划的时间"
 msgid "Use integrated collaborative note pads on task"
 msgstr "使用集成的协作记事簿任务"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -450,6 +450,11 @@ msgstr "别名"
 msgid "oe_kanban_text_red"
 msgstr "oe_kanban_text_red"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -600,12 +605,6 @@ msgstr "任务摘要"
 msgid "Not a Template Task"
 msgstr "非模版任务"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr "按照这个项目的自动跟踪所有相关的任务和问题。"
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -665,6 +664,14 @@ msgstr "新任务"
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "结束日期"
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -856,6 +863,11 @@ msgstr ""
 msgid "Companies"
 msgstr "公司"
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -892,12 +904,6 @@ msgstr ""
 msgid "10"
 msgstr "10"
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr "项目已<B>取消</ B>。"
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -916,17 +922,6 @@ msgstr "如果你需要项目的财务管理链接到这项目的辅助核算项
 msgid "Cancel"
 msgstr "取消"
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr "项目已<B>关闭</ B>。"
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr "任务：标记为已读"
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -951,9 +946,11 @@ msgid ""
 msgstr "本项目和相关项目的任务实际花费的小时数合计"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
-msgstr "开发"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -961,27 +958,21 @@ msgid "Users"
 msgstr "用户"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr "阶段变更"
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
-msgstr "如果为空,隐藏视图"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "经理"
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr "重要"
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr "对所有项目通用"
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1031,18 +1022,6 @@ msgstr "确认状态"
 msgid "Work summary"
 msgstr "工作摘要"
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr "项目现在<b>待定</ B>。"
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr "项目已<B>打开</ B>。"
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1095,11 +1074,6 @@ msgstr "未读消息"
 msgid "Parent Tasks"
 msgstr "上级任务"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr "项目：标记为已读"
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1148,7 +1122,7 @@ msgid "Done by"
 msgstr "完成者"
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr "无效的动作！"
@@ -1182,11 +1156,6 @@ msgstr "任务编号"
 msgid "Number of documents attached"
 msgstr "附件数量"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr "任务：标记为未读"
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1227,13 +1196,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "计算:花费的时间 + 剩余的时间"
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1271,6 +1245,11 @@ msgstr "团队"
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr "这将设置用于项目和任务的度量单位。"
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "非常重要"
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1330,8 +1309,6 @@ msgid "Low"
 msgstr "低"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr "已关闭"
@@ -1418,7 +1395,7 @@ msgid ""
 msgstr "做任务的估计时间.通常由项目经理在任务草稿阶段设定"
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr "附件"
@@ -1438,7 +1415,7 @@ msgid "Done"
 msgstr "完成"
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1465,6 +1442,11 @@ msgstr "隐私/能见度"
 msgid "Remaining Hours"
 msgstr "剩余的小时数"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1486,17 +1468,6 @@ msgstr "项目列表"
 msgid "Delegated Task"
 msgstr "委派任务"
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr "经理"
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr "非常重要"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1509,12 +1480,9 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
-msgstr "结束日期"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "开发"
 
 #. module: project
 #: help:project.task,active:0
@@ -1554,7 +1522,7 @@ msgid "Overpassed Tasks"
 msgstr "拖期任务"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1583,6 +1551,11 @@ msgstr "合计"
 msgid "Delegate your task to the other user"
 msgstr "委派你的任务给其它用户"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1610,7 +1583,7 @@ msgid "CHECK: "
 msgstr "CHECK: "
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "您必须为项目“%s”指定成员！"
@@ -1738,6 +1711,11 @@ msgstr "相关状态"
 msgid "Documents"
 msgstr "文档"
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1751,8 +1729,6 @@ msgid "Followers"
 msgstr "关注者"
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1832,7 +1808,7 @@ msgid "Starting Date"
 msgstr "开始日期"
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1865,12 +1841,6 @@ msgstr "任务分析"
 msgid "Project Tasks"
 msgstr "项目任务列表"
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr "任务已经<B>创建</ B>。"
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1889,12 +1859,6 @@ msgstr "任务"
 msgid "December"
 msgstr "十二月"
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr "取消"
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1937,12 +1901,6 @@ msgstr "草稿"
 msgid "Kanban State"
 msgstr "看板状态"
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr "任务已被设置为的<b>草稿</ B>。"
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1990,14 +1948,6 @@ msgstr "该类型的文件创建电子邮件时，收到该项目的电子邮件
 msgid "Configure Project"
 msgstr "配置项目"
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -2008,11 +1958,6 @@ msgstr "任务的渐进过程"
 msgid "January"
 msgstr "一月"
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr "项目：标记为未读"
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2024,11 +1969,17 @@ msgid "Reevaluation Task"
 msgstr "任务重估"
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "请删除与此科目关联的项目"
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2047,6 +1998,11 @@ msgstr "我是项目经理的项目"
 msgid "Ready for next stage"
 msgstr "准备好下一个阶段"
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2084,6 +2040,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
@@ -2989,6 +2950,9 @@ msgstr "任务阶段"
 #~ msgid "Review Task Stages"
 #~ msgstr "查看任务阶段"
 
+#~ msgid "Common to All Projects"
+#~ msgstr "对所有项目通用"
+
 #~ msgid ""
 #~ "The stages can be common to all project or specific to one project. Each "
 #~ "task will follow the different stages in order to be closed."
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index 693d8779b69..5814d389a9e 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-27 10:35+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "開始任務"
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -132,8 +132,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -221,8 +221,9 @@ msgid "Assigned To"
 msgstr "已分配給"
 
 #. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
 msgstr ""
 
 #. module: project
@@ -261,9 +262,14 @@ msgid "Project Task Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
 msgstr ""
 
 #. module: project
@@ -308,12 +314,6 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
@@ -381,7 +381,7 @@ msgid "Assigned to"
 msgstr "已分配給"
 
 #. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
 msgstr ""
@@ -417,12 +417,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
@@ -433,6 +427,12 @@ msgstr ""
 msgid "Use integrated collaborative note pads on task"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
@@ -448,6 +448,11 @@ msgstr ""
 msgid "oe_kanban_text_red"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
@@ -598,12 +603,6 @@ msgstr "任務摘要"
 msgid "Not a Template Task"
 msgstr "並非範本任務"
 
-#. module: project
-#: view:project.project:0
-msgid ""
-"Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
@@ -663,6 +662,14 @@ msgstr ""
 msgid "Invoice working time on issues"
 msgstr ""
 
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
@@ -853,6 +860,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0
@@ -882,12 +894,6 @@ msgstr ""
 msgid "10"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
 #. module: project
 #: help:project.project,analytic_account_id:0
 msgid ""
@@ -906,17 +912,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-msgstr ""
-
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Task: Mark read"
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
@@ -941,8 +936,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
 msgstr ""
 
 #. module: project
@@ -951,27 +948,21 @@ msgid "Users"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
 msgstr ""
 
 #. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
 msgstr ""
 
 #. module: project
-#: view:project.task:0
 #: selection:project.task,priority:0
 msgid "Important"
 msgstr ""
 
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
@@ -1021,18 +1012,6 @@ msgstr ""
 msgid "Work summary"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
@@ -1085,11 +1064,6 @@ msgstr ""
 msgid "Parent Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-msgid "Project: Mark read"
-msgstr ""
-
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
@@ -1138,7 +1112,7 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1172,11 +1146,6 @@ msgstr "任務數"
 msgid "Number of documents attached"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-msgid "Task: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
@@ -1217,13 +1186,18 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
@@ -1261,6 +1235,11 @@ msgstr ""
 msgid "This will set the unit of measure used in projects and tasks."
 msgstr ""
 
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
@@ -1320,8 +1299,6 @@ msgid "Low"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
 msgstr ""
@@ -1408,7 +1385,7 @@ msgid ""
 msgstr "完成任務估計時間，通常由專案經理(PM)於草案階段設定。"
 
 #. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
 msgstr ""
@@ -1428,7 +1405,7 @@ msgid "Done"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
 #, python-format
 msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
@@ -1455,6 +1432,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
@@ -1476,17 +1458,6 @@ msgstr ""
 msgid "Delegated Task"
 msgstr ""
 
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
@@ -1499,11 +1470,8 @@ msgid "project.config.settings"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
 msgstr ""
 
 #. module: project
@@ -1544,7 +1512,7 @@ msgid "Overpassed Tasks"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1571,6 +1539,11 @@ msgstr ""
 msgid "Delegate your task to the other user"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -1598,7 +1571,7 @@ msgid "CHECK: "
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr ""
@@ -1726,6 +1699,11 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -1739,8 +1717,6 @@ msgid "Followers"
 msgstr ""
 
 #. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
 #: selection:project.project,state:0
 #: view:project.task:0
 #: selection:project.task,state:0
@@ -1820,7 +1796,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1853,12 +1829,6 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
 #. module: project
 #: field:account.analytic.account,use_tasks:0
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1877,12 +1847,6 @@ msgstr "任务"
 msgid "December"
 msgstr ""
 
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
@@ -1925,12 +1889,6 @@ msgstr "草案"
 msgid "Kanban State"
 msgstr ""
 
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
@@ -1978,14 +1936,6 @@ msgstr ""
 msgid "Configure Project"
 msgstr ""
 
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
@@ -1996,11 +1946,6 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Project: Mark unread"
-msgstr ""
-
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
@@ -2012,11 +1957,17 @@ msgid "Reevaluation Task"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
@@ -2035,6 +1986,11 @@ msgstr ""
 msgid "Ready for next stage"
 msgstr ""
 
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
 #. module: project
 #: view:project.task:0
 #: field:project.task,description:0
@@ -2072,6 +2028,11 @@ msgid ""
 "                This installs the module project_long_term."
 msgstr ""
 
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
diff --git a/addons/project_gtd/i18n/ar.po b/addons/project_gtd/i18n/ar.po
index bc870e46f78..5215c6a06f2 100644
--- a/addons/project_gtd/i18n/ar.po
+++ b/addons/project_gtd/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index 149d5a6f5ff..c7744b22fd4 100644
--- a/addons/project_gtd/i18n/bg.po
+++ b/addons/project_gtd/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 18:41+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index 158a9f47489..8359c49509b 100644
--- a/addons/project_gtd/i18n/bs.po
+++ b/addons/project_gtd/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 15:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index 48923365ffd..1c32926b4b0 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 15:34+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index dd61a72029e..140fa6c666b 100644
--- a/addons/project_gtd/i18n/cs.po
+++ b/addons/project_gtd/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/da.po b/addons/project_gtd/i18n/da.po
index 19053bfa939..d4542da21b7 100644
--- a/addons/project_gtd/i18n/da.po
+++ b/addons/project_gtd/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index a9443a8b153..398ee1d5725 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:44+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index 975a72c6dab..77bcc8b9fa5 100644
--- a/addons/project_gtd/i18n/el.po
+++ b/addons/project_gtd/i18n/el.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-08 19:49+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index d056ab37b50..f031c0965f3 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:10+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index 7195596d016..ab2f58319cb 100644
--- a/addons/project_gtd/i18n/es_AR.po
+++ b/addons/project_gtd/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-23 18:33+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es_CR.po b/addons/project_gtd/i18n/es_CR.po
index 1f43affd657..58d51ad3a94 100644
--- a/addons/project_gtd/i18n/es_CR.po
+++ b/addons/project_gtd/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:54+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_EC.po b/addons/project_gtd/i18n/es_EC.po
index 96d48bfdf3c..c2ca620d660 100644
--- a/addons/project_gtd/i18n/es_EC.po
+++ b/addons/project_gtd/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-19 00:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index 3fab4f4e596..4317c6d23e8 100644
--- a/addons/project_gtd/i18n/et.po
+++ b/addons/project_gtd/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index b777f56a7f3..33523c86df5 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 15:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 501fd983c0b..ea0f1d61d12 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 22:01+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/gl.po b/addons/project_gtd/i18n/gl.po
index 17597346893..346fb33ef29 100644
--- a/addons/project_gtd/i18n/gl.po
+++ b/addons/project_gtd/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-12 15:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index 03f52334291..8ae22e10d54 100644
--- a/addons/project_gtd/i18n/hr.po
+++ b/addons/project_gtd/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 21:16+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index 43437b5d395..caf562ec72d 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-25 10:59+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index a13929be560..60b908ea1f9 100644
--- a/addons/project_gtd/i18n/id.po
+++ b/addons/project_gtd/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:54+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index 371fbbbb233..72470c4039d 100644
--- a/addons/project_gtd/i18n/it.po
+++ b/addons/project_gtd/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 06:41+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ja.po b/addons/project_gtd/i18n/ja.po
index 917a150f244..9dd526b1004 100644
--- a/addons/project_gtd/i18n/ja.po
+++ b/addons/project_gtd/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-10 02:57+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index 7b723dd2e68..b0cc8cffafe 100644
--- a/addons/project_gtd/i18n/ko.po
+++ b/addons/project_gtd/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 15:15+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index 47545c83553..208009ba60d 100644
--- a/addons/project_gtd/i18n/lt.po
+++ b/addons/project_gtd/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/lv.po b/addons/project_gtd/i18n/lv.po
index c0e5928a4b7..f66a4b8eef5 100644
--- a/addons/project_gtd/i18n/lv.po
+++ b/addons/project_gtd/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-02 08:16+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/mn.po b/addons/project_gtd/i18n/mn.po
index 396687deb6d..3818ef84307 100644
--- a/addons/project_gtd/i18n/mn.po
+++ b/addons/project_gtd/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-24 12:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index ab126ea0cc2..e8f033eade8 100644
--- a/addons/project_gtd/i18n/nl.po
+++ b/addons/project_gtd/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-18 14:55+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index 2def82aa2c0..b61681aa8c8 100644
--- a/addons/project_gtd/i18n/nl_BE.po
+++ b/addons/project_gtd/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 68f69b92c28..7ef2a7dfe72 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-14 08:32+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index fef57b56910..237319d44e4 100644
--- a/addons/project_gtd/i18n/pt.po
+++ b/addons/project_gtd/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:39+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index fff929d7eec..96b62deafa7 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-06 17:34+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 13:27+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-07 04:35+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "In Progress"
-msgstr "Em Progresso"
+msgstr "Em Andamento"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -126,7 +127,7 @@ msgstr "Local aonde o usuário deve executar a tarefa"
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
 #: view:project.timebox.empty:0
 msgid "Empty Timebox"
-msgstr "Período vazio"
+msgstr "Timebox Vazia"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -156,7 +157,7 @@ msgstr "Tarefa"
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "Add to Timebox"
-msgstr "Adicionar ao período"
+msgstr "Adicionar ao Timebox"
 
 #. module: project_gtd
 #: field:project.timebox.empty,name:0
@@ -183,7 +184,7 @@ msgstr "Mostrar Contexto"
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
 #: view:project.timebox.fill.plan:0
 msgid "Plannify Timebox"
-msgstr "Período planejado"
+msgstr "Planejar Timebox"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -201,7 +202,7 @@ msgstr "Erro!"
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr "Período de tempo"
+msgstr "Timeboxes"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -235,7 +236,7 @@ msgstr "Escritório"
 #: field:project.gtd.context,sequence:0
 #: field:project.gtd.timebox,sequence:0
 msgid "Sequence"
-msgstr "Sequencia"
+msgstr "Seqüência"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -245,7 +246,7 @@ msgstr "Mostrar o campo de contexto"
 #. module: project_gtd
 #: help:project.gtd.context,sequence:0
 msgid "Gives the sequence order when displaying a list of contexts."
-msgstr "Fornece a sequencia de ordem quando exibe uma lista de contextos."
+msgstr "Fornece a ordem da sequência ao exibir uma lista de contextos."
 
 #. module: project_gtd
 #: view:project.task:0
@@ -255,7 +256,7 @@ msgstr "Mostrar Prazos Finais"
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr "Definição do período"
+msgstr "Definição do Timebox"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -265,7 +266,7 @@ msgstr "Caixa de Entrada"
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
 msgid "Get from Timebox"
-msgstr "Pegando do período"
+msgstr "Obter do Timebox"
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 6c90f4f6db1..4942f6023c3 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index 04ca2a96458..05034123f8d 100644
--- a/addons/project_gtd/i18n/ru.po
+++ b/addons/project_gtd/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index 61f75a7f40e..4e5a849015b 100644
--- a/addons/project_gtd/i18n/sl.po
+++ b/addons/project_gtd/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 09:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sq.po b/addons/project_gtd/i18n/sq.po
index 9677dc04ae8..a375bc0964c 100644
--- a/addons/project_gtd/i18n/sq.po
+++ b/addons/project_gtd/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index dece049341b..286372500b2 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:11+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index df5c38b32b6..27a603990f9 100644
--- a/addons/project_gtd/i18n/tlh.po
+++ b/addons/project_gtd/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 0333fee06d8..d5bff6a18a6 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index 20c681ff8fa..b21703bee0d 100644
--- a/addons/project_gtd/i18n/uk.po
+++ b/addons/project_gtd/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 18:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/vi.po b/addons/project_gtd/i18n/vi.po
index bd6c014fd04..7b2a13e164c 100644
--- a/addons/project_gtd/i18n/vi.po
+++ b/addons/project_gtd/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-19 20:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index 4ec38ce6092..f34e35f3ff0 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-29 14:03+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index e41a3eca013..a797b82fe45 100644
--- a/addons/project_gtd/i18n/zh_TW.po
+++ b/addons/project_gtd/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:25+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:46+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_issue/i18n/ar.po b/addons/project_issue/i18n/ar.po
index f768b7be092..14eda204a25 100644
--- a/addons/project_issue/i18n/ar.po
+++ b/addons/project_issue/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-12 21:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "تجميع حسب..."
 msgid "Working Hours to Open the Issue"
 msgstr "ساعات العمل لفتح الحالة"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "شركة"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "مراقبو رسائل البريد الالكتروني"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "الأيام للفتح"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr "مهمة"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr "بحث تعقب الحالة"
 msgid "Color Index"
 msgstr "الألوان"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "حسابها كالتالي: الوقت المستغرق / الوقت الإجمالي."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -267,12 +278,12 @@ msgid "Statistics"
 msgstr "إحصائيات"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "الصيانة"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -328,7 +339,7 @@ msgid "Lowest"
 msgstr "أدنى"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -399,7 +410,7 @@ msgid "Issues Analysis"
 msgstr "تحليل الحالات"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -417,19 +428,13 @@ msgstr "حالات المشروع الخاص بي"
 msgid "Contact"
 msgstr "جهة الاتصال"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "مهام"
@@ -440,9 +445,9 @@ msgid "# of Issues"
 msgstr "# للحالة"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "سبتمبر"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -494,17 +499,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "الإجراء التالي"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "شركة"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "فئة"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -532,6 +531,11 @@ msgstr ""
 "والصادرة لهذا التسجيل قبل ان يرسل. افصل بين عناوين البريد الالكتروني "
 "المتعددة بفاصلة"
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "الصيانة"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -579,6 +583,7 @@ msgid "August"
 msgstr "أغسطس"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -641,17 +646,11 @@ msgid "November"
 msgstr "نوفمبر"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -705,14 +704,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "سبتمبر"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -746,6 +745,7 @@ msgid "Issues"
 msgstr "الإصدارات"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "قيد التقدم"
@@ -768,9 +768,14 @@ msgid "Creation Month"
 msgstr "إنشاء شهر"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "حسابها كالتالي: الوقت المستغرق / الوقت الإجمالي."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -793,12 +798,6 @@ msgstr "شهر"
 msgid "Issue"
 msgstr "حالة"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -829,17 +828,41 @@ msgstr "مايو"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "عدد الرسائل"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "فبراير"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -897,6 +920,11 @@ msgstr ""
 msgid "References"
 msgstr "مراجع"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -907,6 +935,11 @@ msgstr "ساعات العمل لغلق الحالة"
 msgid "ID"
 msgstr "معرّف"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -922,6 +955,11 @@ msgstr "عدد الايام لغلق مسألة المشروع"
 msgid "Avg. Working Hours to Close"
 msgstr "متوسط ساعات العمل للغلق"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -949,6 +987,12 @@ msgstr "سنة"
 msgid "Duration"
 msgstr "المُدة"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Add Internal Note"
 #~ msgstr "أضف ملاحظة داخلية"
 
@@ -990,6 +1034,9 @@ msgstr "المُدة"
 #~ msgid "History Information"
 #~ msgstr "معلومات المحفوظات"
 
+#~ msgid "Category"
+#~ msgstr "فئة"
+
 #~ msgid "Escalate"
 #~ msgstr "تصعيد"
 
diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index 0ce4a1bbdae..76c5a2fcb15 100644
--- a/addons/project_issue/i18n/ca.po
+++ b/addons/project_issue/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-08-17 19:57+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Agrupar per..."
 msgid "Working Hours to Open the Issue"
 msgstr "Hores de treball per obrir la incidència"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Companyia"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Observadors d'Emails (CC)"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dies per obrir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr ""
 msgid "Task"
 msgstr "Tasca"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Cerca en el gestor d'incidències"
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculat com: Temps dedicat / Temps total."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -271,12 +282,12 @@ msgid "Statistics"
 msgstr "Estadístiques"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Manteniment"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -332,7 +343,7 @@ msgid "Lowest"
 msgstr "Mínima"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -403,7 +414,7 @@ msgid "Issues Analysis"
 msgstr "Anàlisi d'incidències"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -421,19 +432,13 @@ msgstr "Les meves incidències de projecte"
 msgid "Contact"
 msgstr "Contacta"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tasques"
@@ -444,9 +449,9 @@ msgid "# of Issues"
 msgstr "Nº de incidències"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Setembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -498,17 +503,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Acció següent"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Companyia"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categoria"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -536,6 +535,11 @@ msgstr ""
 "entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
 "diferents adreces de correu amb una coma."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Manteniment"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -583,6 +587,7 @@ msgid "August"
 msgstr "Agost"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -645,17 +650,11 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -709,14 +708,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Setembre"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -750,6 +749,7 @@ msgid "Issues"
 msgstr "Incidencias"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -772,9 +772,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculat com: Temps dedicat / Temps total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -797,12 +802,6 @@ msgstr "Mes"
 msgid "Issue"
 msgstr "Incidència"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -833,17 +832,41 @@ msgstr "Maig"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Nº d'emails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Febrer"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -901,6 +924,11 @@ msgstr ""
 msgid "References"
 msgstr "Referències"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -911,6 +939,11 @@ msgstr "Hores de treball per tancar la incidència"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -926,6 +959,11 @@ msgstr "Número de dies per tancar la incidència de projecte"
 msgid "Avg. Working Hours to Close"
 msgstr "Hores de treball mitjà per tancar"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -953,6 +991,12 @@ msgstr "Any"
 msgid "Duration"
 msgstr "Duració"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "Error! La data d'inici del projecte ha de ser anterior a la data final del "
@@ -1048,6 +1092,9 @@ msgstr "Duració"
 #~ msgid "Escalate"
 #~ msgstr "Escalat"
 
+#~ msgid "Category"
+#~ msgstr "Categoria"
+
 #~ msgid ""
 #~ "\n"
 #~ "        This module provide Issues/Bugs Management in Project\n"
diff --git a/addons/project_issue/i18n/da.po b/addons/project_issue/i18n/da.po
index 94d75a45a0a..7cc8fb47fb0 100644
--- a/addons/project_issue/i18n/da.po
+++ b/addons/project_issue/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-27 06:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr ""
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,14 +77,10 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: project_issue
@@ -87,6 +88,16 @@ msgstr ""
 msgid "Watchers Emails"
 msgstr ""
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -262,12 +273,12 @@ msgid "Statistics"
 msgstr ""
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -323,7 +334,7 @@ msgid "Lowest"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +405,7 @@ msgid "Issues Analysis"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -412,19 +423,13 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr ""
@@ -435,8 +440,8 @@ msgid "# of Issues"
 msgstr ""
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
+#: selection:project.issue.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: project_issue
@@ -489,16 +494,10 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
 msgstr ""
 
 #. module: project_issue
@@ -524,6 +523,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -571,6 +575,7 @@ msgid "August"
 msgstr ""
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -633,17 +638,11 @@ msgid "November"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -697,13 +696,13 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
+#: view:project.issue:0
+msgid "Current Features"
 msgstr ""
 
 #. module: project_issue
@@ -738,6 +737,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -760,9 +760,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -785,12 +790,6 @@ msgstr ""
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -821,17 +820,41 @@ msgstr ""
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -887,6 +910,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -897,6 +925,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -912,6 +945,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -938,3 +976,9 @@ msgstr ""
 #: field:project.issue,duration:0
 msgid "Duration"
 msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index d554dd8f1f1..edc947d4c00 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-16 18:54+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 15:42+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
 msgid "Deadly bug"
-msgstr ""
+msgstr "Bedrohlicher Fehler"
 
 #. module: project_issue
 #: help:project.config.settings,fetchmail_issue:0
@@ -44,7 +45,12 @@ msgstr "Gruppierung..."
 #. module: project_issue
 #: field:project.issue,working_hours_open:0
 msgid "Working Hours to Open the Issue"
-msgstr "Arbeitszeit für Eröffnung"
+msgstr "Dauer b. Eröffn. d. Falls"
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -70,33 +76,41 @@ msgstr "Fortschritt (%)"
 #: view:project.issue:0
 #: field:project.issue,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ungelesene Nachrichten"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Unternehmen"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "E-Mails des Beobachters"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
 
 #. module: project_issue
 #: help:account.analytic.account,use_issues:0
 msgid "Check this field if this project manages issues"
 msgstr ""
+"Aktivieren Sie diese Option, wenn in Ihren Projekten Vorfälle verwaltet "
+"werden sollen."
 
 #. module: project_issue
 #: field:project.issue,day_open:0
@@ -104,7 +118,7 @@ msgid "Days to Open"
 msgstr "Tage bis Eröffnung"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -148,6 +162,11 @@ msgstr "Tage seit Erzeugung"
 msgid "Task"
 msgstr "Aufgabe"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -207,11 +226,6 @@ msgstr "Fall Suche"
 msgid "Color Index"
 msgstr "Farb Index"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berechnet als:  Gearbeitete Zeit / Gesamtzeit"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -273,12 +287,12 @@ msgid "Statistics"
 msgstr "Statistik"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Wartung"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -334,7 +348,7 @@ msgid "Lowest"
 msgstr "Niedrig"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -405,7 +419,7 @@ msgid "Issues Analysis"
 msgstr "Statistik Fälle"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -423,19 +437,13 @@ msgstr "Meine Projektfälle"
 msgid "Contact"
 msgstr "Kontakt"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -446,9 +454,9 @@ msgid "# of Issues"
 msgstr "# Fälle"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "September"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -500,17 +508,11 @@ msgstr "Offene Merkmale"
 msgid "Next Action"
 msgstr "Nächste Aktion"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategorie"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -520,7 +522,7 @@ msgstr "Benutzer E-Mail"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Number of Project Issues"
-msgstr "# Anz. Probl."
+msgstr "Anzahl Projektfälle"
 
 #. module: project_issue
 #: help:project.issue,channel_id:0
@@ -538,6 +540,11 @@ msgstr ""
 "ausgehenden Mails hinzugefügt. Trennen Sie mehrere E-Mail Adressen mit "
 "Kommas."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Wartung"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -585,6 +592,7 @@ msgid "August"
 msgstr "August"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -647,17 +655,11 @@ msgid "November"
 msgstr "November"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -710,16 +712,16 @@ msgstr "Zugewiesen an"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "aktuelle Merkmale"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "September"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -752,6 +754,7 @@ msgid "Issues"
 msgstr "Fälle"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "In Bearbeitung"
@@ -774,9 +777,14 @@ msgid "Creation Month"
 msgstr "Monat Erstellung"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Berechnet als:  Gearbeitete Zeit / Gesamtzeit"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -799,12 +807,6 @@ msgstr "Monat"
 msgid "Issue"
 msgstr "Problem"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -835,17 +837,41 @@ msgstr "Mai"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "E-Mails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Februar"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -903,6 +929,11 @@ msgstr ""
 msgid "References"
 msgstr "Referenzen"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -913,6 +944,11 @@ msgstr "Arbeitszeit f. Beendigung"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -928,6 +964,11 @@ msgstr "Anzahl Tage für Beendigung"
 msgid "Avg. Working Hours to Close"
 msgstr "Durch. Zeit b. Beendigung"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -955,6 +996,12 @@ msgstr "Jahr"
 msgid "Duration"
 msgstr "Dauer"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Close Working hours"
 #~ msgstr "Arbeitszeit für Beendigung"
 
@@ -1023,6 +1070,9 @@ msgstr "Dauer"
 #~ "Projektbezug\n"
 #~ "    "
 
+#~ msgid "Category"
+#~ msgstr "Kategorie"
+
 #~ msgid "Global CC"
 #~ msgstr "Allg. EMail (CC)"
 
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 3457beaee30..28abec7011a 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-13 15:06+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 23:04+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -47,6 +47,11 @@ msgstr "Agrupar por..."
 msgid "Working Hours to Open the Issue"
 msgstr "Horas de trabajo para abrir la incidencia"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr "Incidencia iniciada"
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -74,21 +79,33 @@ msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr "<b>escalado</b>."
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr "Incidencia: Marcar como no leída"
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Email de los observadores"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+"Un estado de kanban de las incidencias indica situaciones especiales que las "
+"afectan:\n"
+"* 'Normal' es la situación por defecto.\n"
+"* 'Bloqueada' indica que algo impide el progreso de la incidencia.\n"
+"* 'Lista para la siguiente etapa' indica que la incidencia está lista para "
+"ser llevada a la siguiente etapa."
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -105,7 +122,7 @@ msgid "Days to Open"
 msgstr "Días para abrir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -148,6 +165,11 @@ msgstr "Días desde la fecha de creación"
 msgid "Task"
 msgstr "Tarea"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr "Estapa de incidencia cambiada"
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -216,11 +238,6 @@ msgstr "Buscar en el gestor de incidencias"
 msgid "Color Index"
 msgstr "Índice de colores"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tiempo dedicado / Tiempo total."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -284,12 +301,12 @@ msgid "Statistics"
 msgstr "Estadísticas"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Mantenimiento"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr "Estado de kanban"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr "Incidencia de proyecto <b>convertida</b> a tarea."
@@ -345,7 +362,7 @@ msgid "Lowest"
 msgstr "La más baja"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -416,7 +433,7 @@ msgid "Issues Analysis"
 msgstr "Análisis de incidencias"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr "Sin asunto"
@@ -434,19 +451,13 @@ msgstr "Mis incidencias de proyecto"
 msgid "Contact"
 msgstr "Contacto"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr "Incidencia de proyecto <b>creada</b>."
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr "Eliminar"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tareas"
@@ -457,9 +468,9 @@ msgid "# of Issues"
 msgstr "Nº de incidencias"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr "Incidencia: Marcar como leída"
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septiembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -511,17 +522,11 @@ msgstr "Características abiertas"
 msgid "Next Action"
 msgstr "Próxima acción"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categoría"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr "Bloqueada"
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -549,6 +554,11 @@ msgstr ""
 "correos entrantes y salientes de este registro antes de ser enviados. Separe "
 "las diferentes direcciones de correo con una coma."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -596,6 +606,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -662,17 +673,11 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -725,16 +730,16 @@ msgstr "Asignada a"
 msgid "Configure"
 msgstr "Configurar"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr "Incidencia cerrada"
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Características actuales"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -767,6 +772,7 @@ msgid "Issues"
 msgstr "Incidencias"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "En proceso"
@@ -789,10 +795,15 @@ msgid "Creation Month"
 msgstr "Mes de creación"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
-msgstr "<b>escalado</b> a <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
+msgstr "Lista para la siguiente etapa"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -814,12 +825,6 @@ msgstr "Mes"
 msgid "Issue"
 msgstr "Incidencia"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Etapa cambiada a  <b>%s</b>."
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -850,17 +855,41 @@ msgstr "Mayo"
 msgid "project.config.settings"
 msgstr "Parámetros de configuración de proyectos"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr "Incidencia cerrada"
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Nº de emails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr "Incidencia creada"
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr "Incidencia bloqueada"
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Febrero"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr "Etapa cambiada"
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -925,6 +954,11 @@ msgstr "⇒ Escalar"
 msgid "References"
 msgstr "Referencias"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr "Incidencia creada"
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -935,6 +969,11 @@ msgstr "Horas de trabajo para cerrar la incidencia"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr "Incidencia bloqueada"
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -950,6 +989,11 @@ msgstr "Número de días para cerrar la incidencia de proyecto"
 msgid "Avg. Working Hours to Close"
 msgstr "Horas de trabajo prom. para cerrar"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr "Etapa cambiada"
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -977,6 +1021,12 @@ msgstr "Año"
 msgid "Duration"
 msgstr "Duración"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr "Incidencia iniciada"
+
 #~ msgid "Today"
 #~ msgstr "Hoy"
 
@@ -1044,6 +1094,9 @@ msgstr "Duración"
 #~ msgid "My Board"
 #~ msgstr "Mi tablero"
 
+#~ msgid "Category"
+#~ msgstr "Categoría"
+
 #~ msgid "Escalate"
 #~ msgstr "Escalar"
 
diff --git a/addons/project_issue/i18n/es_CR.po b/addons/project_issue/i18n/es_CR.po
index fbe6ef5629d..664471c0ba5 100644
--- a/addons/project_issue/i18n/es_CR.po
+++ b/addons/project_issue/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-17 22:50+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: project_issue
@@ -46,6 +46,11 @@ msgstr "Agrupar por..."
 msgid "Working Hours to Open the Issue"
 msgstr "Horas de trabajo para abrir la incidencia"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -73,21 +78,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Email de los observadores"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -104,7 +115,7 @@ msgid "Days to Open"
 msgstr "Días para abrir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -147,6 +158,11 @@ msgstr "Días desde la fecha de creación"
 msgid "Task"
 msgstr "Tarea"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -206,11 +222,6 @@ msgstr "Buscar en el gestor de incidencias"
 msgid "Color Index"
 msgstr "Índice de colores"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tiempo dedicado / Tiempo total."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -272,12 +283,12 @@ msgid "Statistics"
 msgstr "Estadísticas"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Mantenimiento"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -333,7 +344,7 @@ msgid "Lowest"
 msgstr "La más baja"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -404,7 +415,7 @@ msgid "Issues Analysis"
 msgstr "Análisis de incidencias"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -422,19 +433,13 @@ msgstr "Mis incidencias de proyecto"
 msgid "Contact"
 msgstr "Contacto"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tareas"
@@ -445,9 +450,9 @@ msgid "# of Issues"
 msgstr "Nº de incidencias"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septiembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -499,17 +504,11 @@ msgstr "Características abiertas"
 msgid "Next Action"
 msgstr "Próxima acción"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categoría"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -537,6 +536,11 @@ msgstr ""
 "correos entrantes y salientes de este registro antes de ser enviados. Separe "
 "las diferentes direcciones de correo con una coma."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -584,6 +588,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -646,17 +651,11 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -709,16 +708,16 @@ msgstr "Asignada a"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Características actuales"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -751,6 +750,7 @@ msgid "Issues"
 msgstr "Incidencias"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "En progreso"
@@ -773,9 +773,14 @@ msgid "Creation Month"
 msgstr "Mes de creación"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -798,12 +803,6 @@ msgstr "Mes"
 msgid "Issue"
 msgstr "Incidencia"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -834,17 +833,41 @@ msgstr "Mayo"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Nº de emails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Febrero"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -902,6 +925,11 @@ msgstr ""
 msgid "References"
 msgstr "Referencias"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -912,6 +940,11 @@ msgstr "Horas de trabajo para cerrar la incidencia"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -927,6 +960,11 @@ msgstr "Número de días para cerrar la incidencia de proyecto"
 msgid "Avg. Working Hours to Close"
 msgstr "Horas de trabajo prom. para cerrar"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -954,6 +992,12 @@ msgstr "Año"
 msgid "Duration"
 msgstr "Duración"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
@@ -1025,6 +1069,9 @@ msgstr "Duración"
 #~ msgid "Previous"
 #~ msgstr "Anterior"
 
+#~ msgid "Category"
+#~ msgstr "Categoría"
+
 #~ msgid "Reply"
 #~ msgstr "Responder"
 
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index 87d04f6df0b..58d136c67a4 100644
--- a/addons/project_issue/i18n/fi.po
+++ b/addons/project_issue/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-19 08:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Ryhmittely.."
 msgid "Working Hours to Open the Issue"
 msgstr "Työtunnit tapauksen avaamiseen"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Yritys"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Seuraajien Sähköpostit"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Päiviä avaamiseen"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "Päiviä luontipäivästä"
 msgid "Task"
 msgstr "Tehtävä"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Tapausseurannan haku"
 msgid "Color Index"
 msgstr "Väri-indeksi"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Laskettu: käytetty aika / kokonaisaika"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -266,12 +277,12 @@ msgid "Statistics"
 msgstr "Tilastot"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Ylläpito"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -327,7 +338,7 @@ msgid "Lowest"
 msgstr "Alin"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -398,7 +409,7 @@ msgid "Issues Analysis"
 msgstr "Tapausten analyysit"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -416,19 +427,13 @@ msgstr "Omat projektitapahtumat"
 msgid "Contact"
 msgstr "Yhteyshenkilö"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -439,9 +444,9 @@ msgid "# of Issues"
 msgstr "Tapausten lukumäärä"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Syyskuu"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -493,17 +498,11 @@ msgstr "Avaa päätehtävät"
 msgid "Next Action"
 msgstr "Seuraava Toimenpide"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Yritys"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategoria"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -531,6 +530,11 @@ msgstr ""
 "tietueeseen liittyvien sähköpostien osalta. Erota useammat osoitteet "
 "pilkulla."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Ylläpito"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -578,6 +582,7 @@ msgid "August"
 msgstr "Elokuu"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -640,17 +645,11 @@ msgid "November"
 msgstr "Marraskuu"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -703,16 +702,16 @@ msgstr "Annettu tehtäväksi"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Nykyiset päätapahtumat"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Syyskuu"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -745,6 +744,7 @@ msgid "Issues"
 msgstr "Tapaukset"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "Käynnissä"
@@ -767,9 +767,14 @@ msgid "Creation Month"
 msgstr "Luontikuukausi"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Laskettu: käytetty aika / kokonaisaika"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -792,12 +797,6 @@ msgstr "Kuukausi"
 msgid "Issue"
 msgstr "Tapaus"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -828,17 +827,41 @@ msgstr "Toukokuu"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Sähköpostien määrä"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Helmikuu"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -896,6 +919,11 @@ msgstr ""
 msgid "References"
 msgstr "Viitteet"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -906,6 +934,11 @@ msgstr "Työtunnit tapauksen sulkemiseen"
 msgid "ID"
 msgstr "Tunniste (ID)"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -921,6 +954,11 @@ msgstr "Päivien määrä projektitapahtuman sulkemiseen"
 msgid "Avg. Working Hours to Close"
 msgstr "Keskimääräiset työtunnit sulkemiseen"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -948,6 +986,12 @@ msgstr "Vuosi"
 msgid "Duration"
 msgstr "Kesto"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
 
@@ -1037,6 +1081,9 @@ msgstr "Kesto"
 #~ msgid "This is the current user to whom the related task have been assigned"
 #~ msgstr "Tämä on nykyinen käyttäjä jolle liittyvä tehtävä on määritelty"
 
+#~ msgid "Category"
+#~ msgstr "Kategoria"
+
 #~ msgid "Escalate"
 #~ msgstr "Eskaloi"
 
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 74234ff9478..068289bc4ca 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-18 16:44+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -44,6 +44,11 @@ msgstr "Regrouper par..."
 msgid "Working Hours to Open the Issue"
 msgstr "Heures de travail pour ouvrir l'incident"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -71,21 +76,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Société"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Courriels des CC"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -102,7 +113,7 @@ msgid "Days to Open"
 msgstr "Jours pour ouvrir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -147,6 +158,11 @@ msgstr "Jours depuis la création"
 msgid "Task"
 msgstr "Tâche"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -206,11 +222,6 @@ msgstr "Recherche d'incident"
 msgid "Color Index"
 msgstr "Couleur"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculer comme: Temps passé / Temps total"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -271,12 +282,12 @@ msgid "Statistics"
 msgstr "Statistiques"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -332,7 +343,7 @@ msgid "Lowest"
 msgstr "La plus basse"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -403,7 +414,7 @@ msgid "Issues Analysis"
 msgstr "Analyse des incidents"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -421,19 +432,13 @@ msgstr "Mes incidents"
 msgid "Contact"
 msgstr "Contact"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tâches"
@@ -444,9 +449,9 @@ msgid "# of Issues"
 msgstr "Nb. d'incidents"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -498,17 +503,11 @@ msgstr "Caractéristiques ouvertes"
 msgid "Next Action"
 msgstr "Action suivante"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Société"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Catégorie"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -536,6 +535,11 @@ msgstr ""
 "tous les courriels entrants et sortants de cet enregistrement. Séparez les "
 "adresses multiples avec une virgule."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Maintenance"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -583,6 +587,7 @@ msgid "August"
 msgstr "Août"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -645,17 +650,11 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -708,16 +707,16 @@ msgstr "Assigné à"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Caractéristiques courantes"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Septembre"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -750,6 +749,7 @@ msgid "Issues"
 msgstr "Incidents"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "En cours"
@@ -772,9 +772,14 @@ msgid "Creation Month"
 msgstr "Mois de création"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculer comme: Temps passé / Temps total"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -797,12 +802,6 @@ msgstr "Mois"
 msgid "Issue"
 msgstr "Incident"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -833,17 +832,41 @@ msgstr "Mai"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Nb. de courriels"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Février"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -901,6 +924,11 @@ msgstr ""
 msgid "References"
 msgstr "Références"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -911,6 +939,11 @@ msgstr "heures de travail pour clôturer l'incident"
 msgid "ID"
 msgstr "Id."
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -926,6 +959,11 @@ msgstr "Nombre de jours pour terminer l'incident"
 msgid "Avg. Working Hours to Close"
 msgstr "Heures moyennes de travail pour fermer"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -953,6 +991,12 @@ msgstr "Année"
 msgid "Duration"
 msgstr "Durée"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Add Internal Note"
 #~ msgstr "Ajouter une note interne"
 
@@ -1026,6 +1070,9 @@ msgstr "Durée"
 #~ msgid "My Board"
 #~ msgstr "Mon tableau de bord"
 
+#~ msgid "Category"
+#~ msgstr "Catégorie"
+
 #~ msgid "This is the current user to whom the related task have been assigned"
 #~ msgstr "C'est l'utilisateur à qui la tâche a été assignée."
 
diff --git a/addons/project_issue/i18n/hr.po b/addons/project_issue/i18n/hr.po
index b7d0cfc7aad..6da109f7c2f 100644
--- a/addons/project_issue/i18n/hr.po
+++ b/addons/project_issue/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-19 17:35+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Grupiraj po..."
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Organizacija"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Emailovi promatrača"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dana za otvaranje"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr "Zadatak"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -262,12 +273,12 @@ msgid "Statistics"
 msgstr ""
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -323,7 +334,7 @@ msgid "Lowest"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +405,7 @@ msgid "Issues Analysis"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -412,19 +423,13 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr ""
@@ -435,8 +440,8 @@ msgid "# of Issues"
 msgstr ""
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
+#: selection:project.issue.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: project_issue
@@ -489,16 +494,10 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Organizacija"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
 msgstr ""
 
 #. module: project_issue
@@ -524,6 +523,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -571,6 +575,7 @@ msgid "August"
 msgstr ""
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -633,17 +638,11 @@ msgid "November"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -697,13 +696,13 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
+#: view:project.issue:0
+msgid "Current Features"
 msgstr ""
 
 #. module: project_issue
@@ -738,6 +737,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -760,9 +760,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -785,12 +790,6 @@ msgstr ""
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -821,17 +820,41 @@ msgstr ""
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -887,6 +910,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -897,6 +925,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -912,6 +945,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -939,5 +977,11 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Date Closed"
 #~ msgstr "Datum zatvaranja"
diff --git a/addons/project_issue/i18n/hu.po b/addons/project_issue/i18n/hu.po
index 5d9c8d12139..92b197b73f2 100644
--- a/addons/project_issue/i18n/hu.po
+++ b/addons/project_issue/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-07 12:14+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -44,6 +44,11 @@ msgstr "Csoportosítás..."
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -71,21 +76,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Vállalat"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr ""
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -102,7 +113,7 @@ msgid "Days to Open"
 msgstr "Megnyitásig hátralévő napok"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -143,6 +154,11 @@ msgstr ""
 msgid "Task"
 msgstr "Feladat"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -202,11 +218,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Kiszámítható: Eltöltött idő / Teljes idő"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -261,12 +272,12 @@ msgid "Statistics"
 msgstr "Statisztika"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -322,7 +333,7 @@ msgid "Lowest"
 msgstr "Legalacsonyabb"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -393,7 +404,7 @@ msgid "Issues Analysis"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -411,19 +422,13 @@ msgstr ""
 msgid "Contact"
 msgstr "Kapcsolat"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Feladatok"
@@ -434,9 +439,9 @@ msgid "# of Issues"
 msgstr ""
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Szeptember"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -488,17 +493,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Következő művelet"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Vállalat"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategória"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -523,6 +522,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -570,6 +574,7 @@ msgid "August"
 msgstr "Augusztus"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -632,17 +637,11 @@ msgid "November"
 msgstr "November"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -696,14 +695,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Szeptember"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -737,6 +736,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -759,9 +759,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Kiszámítható: Eltöltött idő / Teljes idő"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -784,12 +789,6 @@ msgstr "Hónap"
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -820,17 +819,41 @@ msgstr "Május"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "E-mailek száma"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Február"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -886,6 +909,11 @@ msgstr ""
 msgid "References"
 msgstr "Hivatkozások"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -896,6 +924,11 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -911,6 +944,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -938,6 +976,12 @@ msgstr "Év"
 msgid "Duration"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "Hiba! A projekt kezdő dátumának előbbinek kell lennie, mint a projekt "
@@ -984,6 +1028,9 @@ msgstr ""
 #~ msgid "History Information"
 #~ msgstr "Előzmény"
 
+#~ msgid "Category"
+#~ msgstr "Kategória"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Kiterjesztett szűrők…"
 
diff --git a/addons/project_issue/i18n/it.po b/addons/project_issue/i18n/it.po
index 429722c972a..aef3081b87c 100644
--- a/addons/project_issue/i18n/it.po
+++ b/addons/project_issue/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-15 19:00+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Raggruppa per..."
 msgid "Working Hours to Open the Issue"
 msgstr "Ore lavorative per aprire il problema"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Azienda"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Email osservatori"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Giorni per l'apertura"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -145,6 +156,11 @@ msgstr ""
 msgid "Task"
 msgstr "Attività"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -204,11 +220,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calcolato come: Tempo impiegato / Tempo totale."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -263,12 +274,12 @@ msgid "Statistics"
 msgstr "Statistiche"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Manutenzione"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -324,7 +335,7 @@ msgid "Lowest"
 msgstr "Minore"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -395,7 +406,7 @@ msgid "Issues Analysis"
 msgstr "Analisi problematiche"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -413,19 +424,13 @@ msgstr "Le mie problematiche di progetto"
 msgid "Contact"
 msgstr "Contatto"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Attività"
@@ -436,9 +441,9 @@ msgid "# of Issues"
 msgstr "# di problematiche"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Settembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -490,17 +495,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Prossima azione"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Azienda"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categoria"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -528,6 +527,11 @@ msgstr ""
 "entrate e uscita, prima di essere spedite. E' necessario separare gli "
 "indirizzi con una virgola"
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Manutenzione"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -575,6 +579,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -637,17 +642,11 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -701,14 +700,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Settembre"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -742,6 +741,7 @@ msgid "Issues"
 msgstr "Problematiche"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "In corso"
@@ -764,9 +764,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calcolato come: Tempo impiegato / Tempo totale."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -789,12 +794,6 @@ msgstr "Mese"
 msgid "Issue"
 msgstr "Problematica"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -825,17 +824,41 @@ msgstr "Maggio"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# Email"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Febbraio"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -893,6 +916,11 @@ msgstr ""
 msgid "References"
 msgstr "Riferimenti"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -903,6 +931,11 @@ msgstr "Ore lavorative per chiudere la problematica"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -918,6 +951,11 @@ msgstr "Numero di giorni per chiudere la problematica di progetto"
 msgid "Avg. Working Hours to Close"
 msgstr "Ore lavorative per chiusura medie"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -945,6 +983,12 @@ msgstr "Anno"
 msgid "Duration"
 msgstr "Durata"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "Errore! La data inizio del progetto deve essere antecedente alla data fine."
@@ -990,6 +1034,9 @@ msgstr "Durata"
 #~ msgid "My Board"
 #~ msgstr "La Mia Board"
 
+#~ msgid "Category"
+#~ msgstr "Categoria"
+
 #~ msgid "Global CC"
 #~ msgstr "CC globale"
 
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index 6063e6ed30b..c774a2f98fb 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-09 05:11+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "グループ化…"
 msgid "Working Hours to Open the Issue"
 msgstr "問題を開くための作業時間数"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "会社"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "傍観者のEメール"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "開始日"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "作成日からの日数"
 msgid "Task"
 msgstr "タスク"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "問題トラッカーの検索"
 msgid "Color Index"
 msgstr "カラーインデックス"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "計算式：消費時間 / 合計時間"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -266,12 +277,12 @@ msgid "Statistics"
 msgstr "統計"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "メンテナンス"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -327,7 +338,7 @@ msgid "Lowest"
 msgstr "最低"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -398,7 +409,7 @@ msgid "Issues Analysis"
 msgstr "問題分析"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -416,19 +427,13 @@ msgstr "私のプロジェクトの問題"
 msgid "Contact"
 msgstr "連絡先"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "タスク"
@@ -439,9 +444,9 @@ msgid "# of Issues"
 msgstr "問題の数"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "9月"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -493,17 +498,11 @@ msgstr "機能を開く"
 msgid "Next Action"
 msgstr "次のアクション"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "会社"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "分類"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -528,6 +527,11 @@ msgid ""
 "addresses with a comma"
 msgstr "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間をコンマで区切って下さい。"
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "メンテナンス"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -575,6 +579,7 @@ msgid "August"
 msgstr "8月"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -637,17 +642,11 @@ msgid "November"
 msgstr "11月"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -700,16 +699,16 @@ msgstr "割当先"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "現在の機能"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "9月"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -742,6 +741,7 @@ msgid "Issues"
 msgstr "問題"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "進行中"
@@ -764,9 +764,14 @@ msgid "Creation Month"
 msgstr "作成月"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "計算式：消費時間 / 合計時間"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -789,12 +794,6 @@ msgstr "月"
 msgid "Issue"
 msgstr "問題"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -825,17 +824,41 @@ msgstr "5月"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Eメールの数"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "2月"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -891,6 +914,11 @@ msgstr ""
 msgid "References"
 msgstr "参照"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -901,6 +929,11 @@ msgstr "問題を閉じるための作業時間数"
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -916,6 +949,11 @@ msgstr "プロジェクトの問題を閉じるための日数"
 msgid "Avg. Working Hours to Close"
 msgstr "閉じるための平均作業時間数"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -943,6 +981,12 @@ msgstr "年"
 msgid "Duration"
 msgstr "期間"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "警告"
@@ -1019,6 +1063,9 @@ msgstr "期間"
 #~ msgid "Escalate"
 #~ msgstr "拡大"
 
+#~ msgid "Category"
+#~ msgstr "分類"
+
 #~ msgid "Reset to New"
 #~ msgstr "新規に再設定"
 
diff --git a/addons/project_issue/i18n/lt.po b/addons/project_issue/i18n/lt.po
index cd5a23e6a6d..3fad64bb5a7 100644
--- a/addons/project_issue/i18n/lt.po
+++ b/addons/project_issue/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-11 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr ""
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,14 +77,10 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: project_issue
@@ -87,6 +88,16 @@ msgstr ""
 msgid "Watchers Emails"
 msgstr ""
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -262,12 +273,12 @@ msgid "Statistics"
 msgstr ""
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -323,7 +334,7 @@ msgid "Lowest"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +405,7 @@ msgid "Issues Analysis"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -412,19 +423,13 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr ""
@@ -435,8 +440,8 @@ msgid "# of Issues"
 msgstr ""
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
+#: selection:project.issue.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: project_issue
@@ -489,16 +494,10 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
 msgstr ""
 
 #. module: project_issue
@@ -524,6 +523,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -571,6 +575,7 @@ msgid "August"
 msgstr ""
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -633,17 +638,11 @@ msgid "November"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -697,13 +696,13 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
+#: view:project.issue:0
+msgid "Current Features"
 msgstr ""
 
 #. module: project_issue
@@ -738,6 +737,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -760,9 +760,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -785,12 +790,6 @@ msgstr ""
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -821,17 +820,41 @@ msgstr ""
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -887,6 +910,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -897,6 +925,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -912,6 +945,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -938,3 +976,9 @@ msgstr ""
 #: field:project.issue,duration:0
 msgid "Duration"
 msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 26224479d9d..e4a1c33c1e4 100644
--- a/addons/project_issue/i18n/lv.po
+++ b/addons/project_issue/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-31 10:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Grupēt pēc..."
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Sekotāju e-pasti"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dienas līdz Atvēršanai"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr "Uzdevums"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr "Incidentu reģistra meklēšana"
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Aprēķināts kā: Patērētais Laiks / Kopējo Laiku."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -262,12 +273,12 @@ msgid "Statistics"
 msgstr "Statistika"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Uzturēšana"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -323,7 +334,7 @@ msgid "Lowest"
 msgstr "Zemākā"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +405,7 @@ msgid "Issues Analysis"
 msgstr "Incidentu analīze"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -412,19 +423,13 @@ msgstr "Mani projektu incidenti"
 msgid "Contact"
 msgstr "Kontakts"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Uzdevumi"
@@ -435,9 +440,9 @@ msgid "# of Issues"
 msgstr "Incidentu skaits"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septembris"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -489,17 +494,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Nākamā darbība"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Uzņēmums"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategorija"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -524,6 +523,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Uzturēšana"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -571,6 +575,7 @@ msgid "August"
 msgstr "Augusts"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -633,17 +638,11 @@ msgid "November"
 msgstr "Novembris"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -697,14 +696,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Septembris"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -738,6 +737,7 @@ msgid "Issues"
 msgstr "Incidenti"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -760,9 +760,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Aprēķināts kā: Patērētais Laiks / Kopējo Laiku."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -785,12 +790,6 @@ msgstr "Mēnesis"
 msgid "Issue"
 msgstr "Incidents"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -821,17 +820,41 @@ msgstr "Maijs"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "E-pastu skaits"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Februāris"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -887,6 +910,11 @@ msgstr ""
 msgid "References"
 msgstr "Atsauces"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -897,6 +925,11 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -912,6 +945,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -939,6 +977,12 @@ msgstr "Gads"
 msgid "Duration"
 msgstr "Ilgums"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
 
@@ -1010,6 +1054,9 @@ msgstr "Ilgums"
 #~ msgid "History Information"
 #~ msgstr "Vēstures informācija"
 
+#~ msgid "Category"
+#~ msgstr "Kategorija"
+
 #~ msgid "Escalate"
 #~ msgstr "Eskalēt"
 
diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
index f46173e753b..c00ebe424d2 100644
--- a/addons/project_issue/i18n/mn.po
+++ b/addons/project_issue/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-24 12:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Бүлэглэх..."
 msgid "Working Hours to Open the Issue"
 msgstr "Асуудлыг Нээх Ажлын Цаг"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Компани"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Ажиглагчийн и-мэйл"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Нээх хүртэлх өдөр"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "Үүсгэснээс хойшх хоног"
 msgid "Task"
 msgstr "Даалгавар"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Асуудал Хөтлөгчийн Хайлт"
 msgid "Color Index"
 msgstr "Өнгөний Индекс"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Бодолт: Зарцуулсан хугацаа / Нийт хугацаа."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -270,12 +281,12 @@ msgid "Statistics"
 msgstr "Статистик"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Маллагаа"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -331,7 +342,7 @@ msgid "Lowest"
 msgstr "Хамгийн Бага"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -402,7 +413,7 @@ msgid "Issues Analysis"
 msgstr "Асуудлын Шинжилгээ"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -420,19 +431,13 @@ msgstr "Миний төслийн асуудлууд"
 msgid "Contact"
 msgstr "Холбогч"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Даалгаврууд"
@@ -443,9 +448,9 @@ msgid "# of Issues"
 msgstr "Асуудлын #"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "9-р сар"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -497,17 +502,11 @@ msgstr "Нээлттэй онцлог"
 msgid "Next Action"
 msgstr "Дараагийн үйлдэл"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Компани"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Ангилал"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -534,6 +533,11 @@ msgstr ""
 "Энэ бичлэгт харгалзах орох, гарах бүх э-мэйлийг илгээхийн өмнө СС талбарт "
 "эдгээр э-мэйл хаягуудыг нэмж өгнө. Э-мэйл хаягуудыг таслалаар тусгаарлана."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Маллагаа"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -581,6 +585,7 @@ msgid "August"
 msgstr "8-р сар"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -643,17 +648,11 @@ msgid "November"
 msgstr "11-р сар"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -706,16 +705,16 @@ msgstr "Хариуцагч"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Идэвхтэй Онцлог"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "9-р сар"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -748,6 +747,7 @@ msgid "Issues"
 msgstr "Асуудал"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "Боловсруулж байна"
@@ -770,9 +770,14 @@ msgid "Creation Month"
 msgstr "Үүсгэсэн сар"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Бодолт: Зарцуулсан хугацаа / Нийт хугацаа."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -795,12 +800,6 @@ msgstr "Сар"
 msgid "Issue"
 msgstr "Асуудал"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -831,17 +830,41 @@ msgstr "5-р сар"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Имэйл #"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "2-р сар"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -899,6 +922,11 @@ msgstr ""
 msgid "References"
 msgstr "Сурвалж"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -909,6 +937,11 @@ msgstr "Асуудлыг хаах хүртэлх ажлын цаг"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -924,6 +957,11 @@ msgstr "Төслийн даалгаврыг хаах хүртэл өдрийн 
 msgid "Avg. Working Hours to Close"
 msgstr "Хаах хүртэлх дундаж ажлын цаг"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -951,6 +989,12 @@ msgstr "Он"
 msgid "Duration"
 msgstr "Үргэлжлэх хугацаа"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Анхаар !"
@@ -1032,6 +1076,9 @@ msgstr "Үргэлжлэх хугацаа"
 #~ msgid "Partner"
 #~ msgstr "Харилцагч"
 
+#~ msgid "Category"
+#~ msgstr "Ангилал"
+
 #~ msgid "Previous"
 #~ msgstr "Өмнөх"
 
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
index d67e6f71e91..75956b38466 100644
--- a/addons/project_issue/i18n/nb.po
+++ b/addons/project_issue/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-09 11:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Grupper etter..."
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Firma"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr ""
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr "Oppgave"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -262,12 +273,12 @@ msgid "Statistics"
 msgstr "Statistikk"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Velikehold"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -323,7 +334,7 @@ msgid "Lowest"
 msgstr "Laveste"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +405,7 @@ msgid "Issues Analysis"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -412,19 +423,13 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontakt"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Oppgaver"
@@ -435,9 +440,9 @@ msgid "# of Issues"
 msgstr ""
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "September"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -489,17 +494,11 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Firma"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategori"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -524,6 +523,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Velikehold"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -571,6 +575,7 @@ msgid "August"
 msgstr "August"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -633,17 +638,11 @@ msgid "November"
 msgstr "November"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -697,14 +696,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "September"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -738,6 +737,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -760,9 +760,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -785,12 +790,6 @@ msgstr "Måned"
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -821,17 +820,41 @@ msgstr "Mai"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -887,6 +910,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -897,6 +925,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -912,6 +945,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -939,6 +977,12 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Add Internal Note"
 #~ msgstr "Legg til internt notat"
 
@@ -977,6 +1021,9 @@ msgstr ""
 #~ msgid "Communication & History"
 #~ msgstr "Kommunikasjon & Historikk"
 
+#~ msgid "Category"
+#~ msgstr "Kategori"
+
 #~ msgid "Escalate"
 #~ msgstr "Eskaler"
 
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index 28e740e5adb..67cad45d29f 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 18:59+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Groepeer op.."
 msgid "Working Hours to Open the Issue"
 msgstr "Werkuren voor openen issue"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr "Ongelezen berichten"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr "<b>geëscaleerd</b>."
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr "Issue: Markeer ongelezen"
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Emails toeschouwers"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dagen tot openen"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "Dagen sinds aanmaakdatum"
 msgid "Task"
 msgstr "Taak"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Issue tracker zoeken"
 msgid "Color Index"
 msgstr "Kleur index"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berekend als: Gebruikte tijd / totale tijd"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -273,12 +284,12 @@ msgid "Statistics"
 msgstr "Statistieken"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Onderhoud"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr "Project issue <b>geconverteerd</b> naar taak."
@@ -334,7 +345,7 @@ msgid "Lowest"
 msgstr "Laagste"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -405,7 +416,7 @@ msgid "Issues Analysis"
 msgstr "Issues analyse"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
@@ -423,19 +434,13 @@ msgstr "Mijn project issues"
 msgid "Contact"
 msgstr "Contactpersoon"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr "Project issue <b>aangemaakt</b>."
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr "Verwijder"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Taken"
@@ -446,9 +451,9 @@ msgid "# of Issues"
 msgstr "# Issues"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr "Issue: Markeer gelezen"
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "September"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -500,17 +505,11 @@ msgstr "Open features"
 msgid "Next Action"
 msgstr "Volgende actie"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categorie"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -538,6 +537,11 @@ msgstr ""
 "uitgaande emails voor dit record voorafgaand aan versturen. Scheidt "
 "verschillende email adressen met een komma."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Onderhoud"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -585,6 +589,7 @@ msgid "August"
 msgstr "Augustus"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -651,17 +656,11 @@ msgid "November"
 msgstr "November"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -714,16 +713,16 @@ msgstr "Toegekend aan"
 msgid "Configure"
 msgstr "Instellen"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Huidige features"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "September"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -756,6 +755,7 @@ msgid "Issues"
 msgstr "Issues"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "In behandeling"
@@ -778,10 +778,15 @@ msgid "Creation Month"
 msgstr "Aanmaak maand"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
-msgstr "<b>geëscaleerd</b> naar <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Berekend als: Gebruikte tijd / totale tijd"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -803,12 +808,6 @@ msgstr "Maand"
 msgid "Issue"
 msgstr "Issue"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Fase veranderd in <b>%s</b>."
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -839,17 +838,41 @@ msgstr "Mei"
 msgid "project.config.settings"
 msgstr "project.config.settings"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# Emails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Februari"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -907,6 +930,11 @@ msgstr "⇒ Escaleren"
 msgid "References"
 msgstr "Referenties"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -917,6 +945,11 @@ msgstr "Gewerkte uren tot sluiten issue"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -932,6 +965,11 @@ msgstr "Aantal dagen tot sluiten issue"
 msgid "Avg. Working Hours to Close"
 msgstr "Gem. gewerkte uren tot sluiten"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -959,6 +997,12 @@ msgstr "Jaar"
 msgid "Duration"
 msgstr "Tijdsduur"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Mobile"
 #~ msgstr "Mobiel"
 
@@ -1032,6 +1076,9 @@ msgstr "Tijdsduur"
 #~ msgid "This is the current user to whom the related task have been assigned"
 #~ msgstr "Dit is de huidige gebruiker waaraan de verbonden taak is toegewezen"
 
+#~ msgid "Category"
+#~ msgstr "Categorie"
+
 #~ msgid "Global CC"
 #~ msgstr "Globale CC"
 
diff --git a/addons/project_issue/i18n/nl_BE.po b/addons/project_issue/i18n/nl_BE.po
index 2e2079e4bc2..32a17a45a22 100644
--- a/addons/project_issue/i18n/nl_BE.po
+++ b/addons/project_issue/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-03-01 12:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Groeperen op..."
 msgid "Working Hours to Open the Issue"
 msgstr "Werkuren nodig om probleem te openen"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "E-mails van de abonnees"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dagen tot openen"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr ""
 msgid "Task"
 msgstr "Taak"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Zoeken in probleemoplosser"
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berekend als: Bestede tijd / totale tijd"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -271,12 +282,12 @@ msgid "Statistics"
 msgstr "Statistieken"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Onderhoud"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -332,7 +343,7 @@ msgid "Lowest"
 msgstr "Laagste"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -403,7 +414,7 @@ msgid "Issues Analysis"
 msgstr "Probleemanalyse"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -421,19 +432,13 @@ msgstr "Mijn projectproblemen"
 msgid "Contact"
 msgstr "Contactpersoon"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Taken"
@@ -444,9 +449,9 @@ msgid "# of Issues"
 msgstr "# problemen"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "September"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -498,17 +503,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Volgende actie"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categorie"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -536,6 +535,11 @@ msgstr ""
 "uitgaande mails voor dit record. Verschillende adressen kunnen worden "
 "gescheiden door een komma."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Onderhoud"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -583,6 +587,7 @@ msgid "August"
 msgstr "Augustus"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -645,17 +650,11 @@ msgid "November"
 msgstr "November"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -709,14 +708,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "September"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -750,6 +749,7 @@ msgid "Issues"
 msgstr "Problemen"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -772,9 +772,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Berekend als: Bestede tijd / totale tijd"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -797,12 +802,6 @@ msgstr "Maand"
 msgid "Issue"
 msgstr "Probleem"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -833,17 +832,41 @@ msgstr "Mei"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# e-mails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Februari"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -901,6 +924,11 @@ msgstr ""
 msgid "References"
 msgstr "Referenties"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -911,6 +939,11 @@ msgstr "Werkuren nodig om probleem te sluiten"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -926,6 +959,11 @@ msgstr "Aantal dagen tot afsluiten van probleem"
 msgid "Avg. Working Hours to Close"
 msgstr "Gem. te sluiten werkuren"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -953,6 +991,12 @@ msgstr "Jaar"
 msgid "Duration"
 msgstr "Duur"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "De begindatum van het project moet voor de einddatum liggen."
 
@@ -1067,6 +1111,9 @@ msgstr "Duur"
 #~ "        Met deze module volgt u problemen/fouten op voor projecten\n"
 #~ "    "
 
+#~ msgid "Category"
+#~ msgstr "Categorie"
+
 #~ msgid "Current Issues"
 #~ msgstr "Huidige problemen"
 
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index a2d26973d80..7338be60c20 100644
--- a/addons/project_issue/i18n/pl.po
+++ b/addons/project_issue/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 09:07+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Grupuj wg..."
 msgid "Working Hours to Open the Issue"
 msgstr "Godziny robocze do otwarcia problemu"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Firma"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Adresy obserwatorów"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dni do otwarcia"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr ""
 msgid "Task"
 msgstr "Zadanie"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Przeszukaj śledzenia problemów"
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Obliczone jako: Czas przepracowany / Czas całkowity"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -266,12 +277,12 @@ msgid "Statistics"
 msgstr "Statystyki"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -327,7 +338,7 @@ msgid "Lowest"
 msgstr "Najniższy"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -398,7 +409,7 @@ msgid "Issues Analysis"
 msgstr "Analiza problemu"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -416,19 +427,13 @@ msgstr "Moje problemy"
 msgid "Contact"
 msgstr "Kontakt"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Zadania"
@@ -439,9 +444,9 @@ msgid "# of Issues"
 msgstr "# problemów"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Wrzesień"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -493,17 +498,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Następna akcja"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Firma"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategoria"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -530,6 +529,11 @@ msgstr ""
 "Te adresy zostaną dodane do pola DW przy wysyłaniu i otrzymywaniu wiadomości "
 "dla tego rekordu. Przy wielu adresach oddzielaj je przecinkami."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -577,6 +581,7 @@ msgid "August"
 msgstr "Sierpień"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -639,17 +644,11 @@ msgid "November"
 msgstr "Listopad"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -703,14 +702,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Wrzesień"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -744,6 +743,7 @@ msgid "Issues"
 msgstr "Problemy"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -766,9 +766,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Obliczone jako: Czas przepracowany / Czas całkowity"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -791,12 +796,6 @@ msgstr "Miesiąc"
 msgid "Issue"
 msgstr "Problem"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -827,17 +826,41 @@ msgstr "Maj"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# wiadomości"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Luty"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -895,6 +918,11 @@ msgstr ""
 msgid "References"
 msgstr "Odnośniki"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -905,6 +933,11 @@ msgstr "Godziny robocze do zamknięcia prablemu"
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -920,6 +953,11 @@ msgstr "Liczba dni do zamknięcia problemu w projekcie"
 msgid "Avg. Working Hours to Close"
 msgstr "Średni czas w godzinach do zamknięcia"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -947,6 +985,12 @@ msgstr "Rok"
 msgid "Duration"
 msgstr "Czas trwania"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Date Closed"
 #~ msgstr "Data zamknięcia"
 
@@ -1004,6 +1048,9 @@ msgstr "Czas trwania"
 #~ msgid "This is the current user to whom the related task have been assigned"
 #~ msgstr "To jest bieżący użytkownik, do którego zadanie zostało przypisane."
 
+#~ msgid "Category"
+#~ msgstr "Kategoria"
+
 #~ msgid ""
 #~ "\n"
 #~ "        This module provide Issues/Bugs Management in Project\n"
diff --git a/addons/project_issue/i18n/pt.po b/addons/project_issue/i18n/pt.po
index 5e937f6527d..fc1a13d170e 100644
--- a/addons/project_issue/i18n/pt.po
+++ b/addons/project_issue/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 17:58+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Agrupar por..."
 msgid "Working Hours to Open the Issue"
 msgstr "Horas de trabalho para abrir o Issue"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Empresa"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Watchers Emails"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dias para abrir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "Dias desde a data de criação"
 msgid "Task"
 msgstr "Tarefa"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Issue Tracker Search"
 msgid "Color Index"
 msgstr "Índice de Cor"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tempo Passado/Tempo Total."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -270,12 +281,12 @@ msgid "Statistics"
 msgstr "Estatísticas"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Manutenção"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -331,7 +342,7 @@ msgid "Lowest"
 msgstr "Menor"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -402,7 +413,7 @@ msgid "Issues Analysis"
 msgstr "Issues Analíses"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -420,19 +431,13 @@ msgstr "Minhas Questões do projeto"
 msgid "Contact"
 msgstr "Contato"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tarefas"
@@ -443,9 +448,9 @@ msgid "# of Issues"
 msgstr "# de incidentes"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Setembro"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -497,17 +502,11 @@ msgstr "Características abertas"
 msgid "Next Action"
 msgstr "Próxima Ação"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categori­a"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -535,6 +534,11 @@ msgstr ""
 "entrada e saída para este registo antes de ser enviado. Separe vários "
 "endereços de email com uma vírgula"
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Manutenção"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -582,6 +586,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -644,17 +649,11 @@ msgid "November"
 msgstr "Novembro"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -707,16 +706,16 @@ msgstr "Atribuído a"
 msgid "Configure"
 msgstr "Configurar"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Características atuais"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Setembro"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -749,6 +748,7 @@ msgid "Issues"
 msgstr "Incidentes"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "Em Progresso"
@@ -771,9 +771,14 @@ msgid "Creation Month"
 msgstr "Mês de Criação"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tempo Passado/Tempo Total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -796,12 +801,6 @@ msgstr "Mês"
 msgid "Issue"
 msgstr "Incidente"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -832,17 +831,41 @@ msgstr "Maio"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# Emails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Fevereiro"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -900,6 +923,11 @@ msgstr ""
 msgid "References"
 msgstr "Referências"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -910,6 +938,11 @@ msgstr "Horas de Trabalho até Fechar Incidente"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -925,6 +958,11 @@ msgstr "Número de Dias para Fechar o Incidente do Projeto"
 msgid "Avg. Working Hours to Close"
 msgstr "Avg. Horas de trabalho até fechar"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -952,6 +990,12 @@ msgstr "Ano"
 msgid "Duration"
 msgstr "Duração"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Erro ! A data de início do projeto deve ser anterior à do seu fim"
 
@@ -967,6 +1011,9 @@ msgstr "Duração"
 #~ msgid "Phone"
 #~ msgstr "Telefone"
 
+#~ msgid "Category"
+#~ msgstr "Categori­a"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index 3bafb098d83..a167d40d25a 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 19:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 13:43+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -47,6 +47,11 @@ msgstr "Agrupar Por..."
 msgid "Working Hours to Open the Issue"
 msgstr "Horas Trabalhadas para Abrir o Incidente"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr "Incidente iniciado"
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -65,7 +70,7 @@ msgstr "Março"
 #. module: project_issue
 #: field:project.issue,progress:0
 msgid "Progress (%)"
-msgstr "Progresso"
+msgstr "Progresso (%)"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -74,21 +79,31 @@ msgid "Unread Messages"
 msgstr "Mensagens Não Lidas"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr "<b>escalado</b>."
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr "Incidente: Marcar como não lido"
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Empresa"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Emails dos Observadores"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+"Um painel kanban de incidentes indica situações especiais que a afetam:\n"
+"  * Normal é a situação de padrão\n"
+"  * Bloqueado indica que algo está impedindo o progresso deste incidente\n"
+"  * Pronto indica que o incidente está pronto para ir para a próxima fase"
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -105,7 +120,7 @@ msgid "Days to Open"
 msgstr "Dias para Abrir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -148,6 +163,11 @@ msgstr "Dias desde a data da criação"
 msgid "Task"
 msgstr "Tarefa"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr "Estágio do Incidente Alterado"
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -217,11 +237,6 @@ msgstr "Pesquisar no Rastreador de Incidentes"
 msgid "Color Index"
 msgstr "Índice de Cores"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tempo Gasto / Tempo Total."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -286,12 +301,12 @@ msgid "Statistics"
 msgstr "Estatísticas"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Manutenção"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr "Situação Kanban"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr "Incidente de projeto <b>convertido</b> para tarefa."
@@ -347,7 +362,7 @@ msgid "Lowest"
 msgstr "Mais Baixa"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -362,7 +377,7 @@ msgstr "Incidentes não atribuídos"
 #: view:project.issue.report:0
 #: field:project.issue.report,creation_date:0
 msgid "Creation Date"
-msgstr "Dt. Criação"
+msgstr "Data de Criação"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_version_action
@@ -383,7 +398,7 @@ msgstr "project.issue.version"
 #. module: project_issue
 #: field:project.config.settings,fetchmail_issue:0
 msgid "Create issues from an incoming email account "
-msgstr "Criar incidentes a partir de uma conta de recebimento de e-mails "
+msgstr "Criar incidentes a partir do recebimento de e-mails "
 
 #. module: project_issue
 #: view:project.issue:0
@@ -408,7 +423,7 @@ msgstr "Categorias"
 #: view:project.issue.report:0
 #: field:project.issue.report,stage_id:0
 msgid "Stage"
-msgstr "Fase"
+msgstr "Estágio"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_report
@@ -418,7 +433,7 @@ msgid "Issues Analysis"
 msgstr "Análise de Incidentes"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr "Sem Assunto"
@@ -436,19 +451,13 @@ msgstr "Meus Incidentes do Projeto"
 msgid "Contact"
 msgstr "Contato"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr "Incidente de Projeto <b>criado</b>"
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr "Excluir"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Tarefas"
@@ -459,9 +468,9 @@ msgid "# of Issues"
 msgstr "Nº de Incidentes"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr "Incidente: Marcar como lido"
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Setembro"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -513,17 +522,11 @@ msgstr "Recursos Abertos"
 msgid "Next Action"
 msgstr "Próxima Ação"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categoria"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr "Bloqueado"
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -551,6 +554,11 @@ msgstr ""
 "e saídas de emails para este registro antes de ser enviado. Separe múltiplos "
 "endereços de email com vírgula."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Manutenção"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -585,7 +593,7 @@ msgstr "Pendente"
 #: field:project.issue,state:0
 #: field:project.issue.report,state:0
 msgid "Status"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -598,6 +606,7 @@ msgid "August"
 msgstr "Agosto"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -647,8 +656,8 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
-"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
-"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"A situação é definida como 'Provisória' quando o caso é criado. Se o caso "
+"está em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
 "situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
 "situação é definida como 'Pendente'."
 
@@ -664,17 +673,11 @@ msgid "November"
 msgstr "Novembro"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e e-mails"
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -727,16 +730,16 @@ msgstr "Atribuído a"
 msgid "Configure"
 msgstr "Configurar"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr "Incidente fechado"
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Recursos Atuais"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Setembro"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -769,6 +772,7 @@ msgid "Issues"
 msgstr "Incidentes"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "Em Progresso"
@@ -791,10 +795,15 @@ msgid "Creation Month"
 msgstr "Mês de criação"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
-msgstr "<b>escalado</b> para <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tempo Gasto / Tempo Total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
+msgstr "Pronto para o próximo estágio"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -816,12 +825,6 @@ msgstr "Mês"
 msgid "Issue"
 msgstr "Incidente"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "Estágio alterado para <b>%s</b>."
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -852,17 +855,41 @@ msgstr "Maio"
 msgid "project.config.settings"
 msgstr "project.config.settings"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr "Incidente Fechado"
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "Nº de Emails"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr "Incidente Criado"
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr "Incidente Bloqueado"
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Fevereiro"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr "Estágio alterado"
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -927,6 +954,11 @@ msgstr "⇒ Escalar"
 msgid "References"
 msgstr "Referências"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr "Incidente criado"
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -937,6 +969,11 @@ msgstr "Horas de Trabalho para Concluir o Incidente"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr "Incidente bloqueado"
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -952,6 +989,11 @@ msgstr "Número de dias para fechar o incidente do projeto."
 msgid "Avg. Working Hours to Close"
 msgstr "Média de Horas Trabalhadas para Fechar"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr "Estágio Alterado"
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -979,6 +1021,12 @@ msgstr "Ano"
 msgid "Duration"
 msgstr "Duração"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr "Incidente Iniciado"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Erro! A data inicial do projeto precisar ser menor que a data final."
 
@@ -1036,6 +1084,9 @@ msgstr "Duração"
 #~ msgid "Escalate"
 #~ msgstr "Escalar"
 
+#~ msgid "Category"
+#~ msgstr "Categoria"
+
 #~ msgid "Current Issues"
 #~ msgstr "Problemas Atuais"
 
diff --git a/addons/project_issue/i18n/ro.po b/addons/project_issue/i18n/ro.po
index 5a11da7e617..761801d13cf 100644
--- a/addons/project_issue/i18n/ro.po
+++ b/addons/project_issue/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-13 21:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Grupati dupa..."
 msgid "Working Hours to Open the Issue"
 msgstr "Program de lucru pentru a deschide problema"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Companie"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Email-uri supraveghetori"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Zile pana la deschidere"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "Zile de la data crearii"
 msgid "Task"
 msgstr "Sarcina"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Cautati Programul care tine evidenta problemelor"
 msgid "Color Index"
 msgstr "Index Culori"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculat in felul urmator: Timpul petrecut / Timpul total."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -271,12 +282,12 @@ msgid "Statistics"
 msgstr "Statistica"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Mentenanta"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -332,7 +343,7 @@ msgid "Lowest"
 msgstr "Cel mai scazut (cea mai scazuta)"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -403,7 +414,7 @@ msgid "Issues Analysis"
 msgstr "Analiza Probleme"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -421,19 +432,13 @@ msgstr "Problemele Proiectului meu"
 msgid "Contact"
 msgstr "Contact"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Sarcini"
@@ -444,9 +449,9 @@ msgid "# of Issues"
 msgstr "# de probleme"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septembrie"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -498,17 +503,11 @@ msgstr "Caracteristici Open"
 msgid "Next Action"
 msgstr "Urmatoarea actiune"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Companie"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Categorie"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -536,6 +535,11 @@ msgstr ""
 "primite si trimise pentru aceasta inregistrare inainte de a fi trimise. "
 "Despartiti adresele de mail multiple cu o virgula"
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Mentenanta"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -583,6 +587,7 @@ msgid "August"
 msgstr "August"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -645,17 +650,11 @@ msgid "November"
 msgstr "Noiembrie"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -708,16 +707,16 @@ msgstr "Atribuit lui"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Caracteristici curente"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Septembrie"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -750,6 +749,7 @@ msgid "Issues"
 msgstr "Probleme"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "In curs de desfasurare"
@@ -772,9 +772,14 @@ msgid "Creation Month"
 msgstr "Luna crearii"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculat in felul urmator: Timpul petrecut / Timpul total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -797,12 +802,6 @@ msgstr "Luna"
 msgid "Issue"
 msgstr "Problema"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -833,17 +832,41 @@ msgstr "Mai"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# Email-uri"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "Februarie"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -901,6 +924,11 @@ msgstr ""
 msgid "References"
 msgstr "Referinte"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -911,6 +939,11 @@ msgstr "Orele de lucru pentru inchiderea problemei"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -926,6 +959,11 @@ msgstr "Numarul de Zile pana la inchiderea problemei proiectului"
 msgid "Avg. Working Hours to Close"
 msgstr "Media orelor de lucru pana la inchidere"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -953,6 +991,12 @@ msgstr "An"
 msgid "Duration"
 msgstr "Durata"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Close Working hours"
 #~ msgstr "Terminare Program de lucru"
 
@@ -1010,6 +1054,9 @@ msgstr "Durata"
 #~ msgstr ""
 #~ "Acesta este utilizatorul curent căruia i-a fost atribuită sarcina curentă"
 
+#~ msgid "Category"
+#~ msgstr "Categorie"
+
 #~ msgid ""
 #~ "\n"
 #~ "        This module provide Issues/Bugs Management in Project\n"
diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po
index 5a3d70e3775..f08f136cc45 100644
--- a/addons/project_issue/i18n/ru.po
+++ b/addons/project_issue/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 22:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Группировать по ..."
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Организация"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Адреса наблюдателей"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Дней до открытия"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr ""
 msgid "Task"
 msgstr "Задача"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Поиск по проблемам"
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -264,12 +275,12 @@ msgid "Statistics"
 msgstr "Статистика"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Обслуживание"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -325,7 +336,7 @@ msgid "Lowest"
 msgstr "Низший"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -396,7 +407,7 @@ msgid "Issues Analysis"
 msgstr "Анализ проблемы"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -414,19 +425,13 @@ msgstr "Мои инциденты"
 msgid "Contact"
 msgstr "Контакт"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Задачи"
@@ -437,9 +442,9 @@ msgid "# of Issues"
 msgstr "Кол-во инцидентов"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Сентябрь"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -491,17 +496,11 @@ msgstr ""
 msgid "Next Action"
 msgstr "Следующее действие"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Организация"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Категория"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -529,6 +528,11 @@ msgstr ""
 "исходящих сообщений для этой записи перед отправкой. Разделяйте адреса "
 "запятыми."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Обслуживание"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -576,6 +580,7 @@ msgid "August"
 msgstr "Август"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -638,17 +643,11 @@ msgid "November"
 msgstr "Ноябрь"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -702,14 +701,14 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "Сентябрь"
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -743,6 +742,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -765,9 +765,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -790,12 +795,6 @@ msgstr "Месяц"
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -826,17 +825,41 @@ msgstr ""
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -892,6 +915,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -902,6 +930,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -917,6 +950,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -944,6 +982,12 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "Ошибка! Дата начала проекта должна быть раньше даты окончания проекта."
@@ -1022,6 +1066,9 @@ msgstr ""
 #~ msgid "History Information"
 #~ msgstr "История"
 
+#~ msgid "Category"
+#~ msgstr "Категория"
+
 #~ msgid "Escalate"
 #~ msgstr "Эскалировать"
 
diff --git a/addons/project_issue/i18n/sv.po b/addons/project_issue/i18n/sv.po
index 9e64f3d6c99..be7adca86f0 100644
--- a/addons/project_issue/i18n/sv.po
+++ b/addons/project_issue/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-30 19:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Gruppera efter..."
 msgid "Working Hours to Open the Issue"
 msgstr "Arbetstid för att öppna ärendet"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Bolag"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "Övervakarens e-post"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "Dagar för att öppna"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "Dagar sedan registrering"
 msgid "Task"
 msgstr "Ärende"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "Ärendesökning"
 msgid "Color Index"
 msgstr "Färgindex"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Beräknas som: nedlagd tid / total tid."
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -270,12 +281,12 @@ msgid "Statistics"
 msgstr "Statistik"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Underhåll"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -331,7 +342,7 @@ msgid "Lowest"
 msgstr "Lägsta"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -402,7 +413,7 @@ msgid "Issues Analysis"
 msgstr "Ärendeanalys"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -420,19 +431,13 @@ msgstr "Mina projektärenden"
 msgid "Contact"
 msgstr "Kontakt"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -443,9 +448,9 @@ msgid "# of Issues"
 msgstr "# ärenden"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "september"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -497,17 +502,11 @@ msgstr "Nya egenskaper"
 msgid "Next Action"
 msgstr "Nästa åtgärd"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "Bolag"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "Kategori"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -535,6 +534,11 @@ msgstr ""
 "meddelanden för denna post innan de skickas. Separera flera adresser med "
 "komma."
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Underhåll"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -582,6 +586,7 @@ msgid "August"
 msgstr "augusti"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -644,17 +649,11 @@ msgid "November"
 msgstr "november"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -707,16 +706,16 @@ msgstr "Tilldelad"
 msgid "Configure"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "Aktuella egenskaper"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "september"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -749,6 +748,7 @@ msgid "Issues"
 msgstr "Ärenden"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "Pågår"
@@ -771,9 +771,14 @@ msgid "Creation Month"
 msgstr "Registeringsmånad"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Beräknas som: nedlagd tid / total tid."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -796,12 +801,6 @@ msgstr "Månad"
 msgid "Issue"
 msgstr "Ärende"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -832,17 +831,41 @@ msgstr "maj"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "# e-postmeddelanden"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "februari"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -900,6 +923,11 @@ msgstr ""
 msgid "References"
 msgstr "Referenser"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -910,6 +938,11 @@ msgstr "Nedlagd arbetstid för att avsluta ärendet"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -925,6 +958,11 @@ msgstr "Antal dagar för att stänga ärendet"
 msgid "Avg. Working Hours to Close"
 msgstr "Arbetstid för att stänga i snitt"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -952,6 +990,12 @@ msgstr "År"
 msgid "Duration"
 msgstr "Varaktighet"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Previous Month"
 #~ msgstr "Föregående månad"
 
@@ -1023,6 +1067,9 @@ msgstr "Varaktighet"
 #~ msgid "Reset to New"
 #~ msgstr "Återställ till ny"
 
+#~ msgid "Category"
+#~ msgstr "Kategori"
+
 #~ msgid "Contact Information"
 #~ msgstr "Kontaktinformation"
 
diff --git a/addons/project_issue/i18n/tr.po b/addons/project_issue/i18n/tr.po
index 84f892aa1b1..7dfca4829a7 100644
--- a/addons/project_issue/i18n/tr.po
+++ b/addons/project_issue/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-25 17:30+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "Grupla..."
 msgid "Working Hours to Open the Issue"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,14 +77,10 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: project_issue
@@ -87,6 +88,16 @@ msgstr ""
 msgid "Watchers Emails"
 msgstr ""
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -144,6 +155,11 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -203,11 +219,6 @@ msgstr ""
 msgid "Color Index"
 msgstr ""
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -262,12 +273,12 @@ msgid "Statistics"
 msgstr ""
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -323,7 +334,7 @@ msgid "Lowest"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -394,7 +405,7 @@ msgid "Issues Analysis"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -412,19 +423,13 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr ""
@@ -435,8 +440,8 @@ msgid "# of Issues"
 msgstr ""
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
+#: selection:project.issue.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: project_issue
@@ -489,16 +494,10 @@ msgstr ""
 msgid "Next Action"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
 msgstr ""
 
 #. module: project_issue
@@ -524,6 +523,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -571,6 +575,7 @@ msgid "August"
 msgstr ""
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -633,17 +638,11 @@ msgid "November"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -697,13 +696,13 @@ msgid "Configure"
 msgstr ""
 
 #. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
 msgstr ""
 
 #. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
+#: view:project.issue:0
+msgid "Current Features"
 msgstr ""
 
 #. module: project_issue
@@ -738,6 +737,7 @@ msgid "Issues"
 msgstr ""
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr ""
@@ -760,9 +760,14 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -785,12 +790,6 @@ msgstr ""
 msgid "Issue"
 msgstr ""
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -821,17 +820,41 @@ msgstr ""
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -887,6 +910,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -897,6 +925,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -912,6 +945,11 @@ msgstr ""
 msgid "Avg. Working Hours to Close"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -939,6 +977,12 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Uyarı !"
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
index 58b0e793c93..8dccd5f86aa 100644
--- a/addons/project_issue/i18n/zh_CN.po
+++ b/addons/project_issue/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-30 08:57+0000\n"
 "Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,6 +45,11 @@ msgstr "分组..."
 msgid "Working Hours to Open the Issue"
 msgstr "据开始处理小时数"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
@@ -72,21 +77,27 @@ msgid "Unread Messages"
 msgstr "未读消息"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
-msgstr ""
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "公司"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
 msgstr "关注者的电子邮件"
 
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
@@ -103,7 +114,7 @@ msgid "Days to Open"
 msgstr "距开始日期"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid ""
 "You cannot escalate this issue.\n"
@@ -146,6 +157,11 @@ msgstr "从创建以来的天数"
 msgid "Task"
 msgstr "任务"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
@@ -205,11 +221,6 @@ msgstr "问题跟踪搜索"
 msgid "Color Index"
 msgstr "颜色索引"
 
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "计算方式：花费时间 / 总时间"
-
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
@@ -264,12 +275,12 @@ msgid "Statistics"
 msgstr "统计信息"
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "维护"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Project issue <b>converted</b> to task."
 msgstr ""
@@ -325,7 +336,7 @@ msgid "Lowest"
 msgstr "最低"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -396,7 +407,7 @@ msgid "Issues Analysis"
 msgstr "问题分析"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
 #, python-format
 msgid "No Subject"
 msgstr ""
@@ -414,19 +425,13 @@ msgstr "我的项目问题"
 msgid "Contact"
 msgstr "联系方式"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
 #, python-format
 msgid "Tasks"
 msgstr "任务"
@@ -437,9 +442,9 @@ msgid "# of Issues"
 msgstr "问题编号"
 
 #. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
-msgstr ""
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "九月"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -491,17 +496,11 @@ msgstr "其他功能"
 msgid "Next Action"
 msgstr "下一动作"
 
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr "公司"
-
 #. module: project_issue
 #: view:project.issue:0
-msgid "Category"
-msgstr "类别"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,user_email:0
@@ -526,6 +525,11 @@ msgid ""
 "addresses with a comma"
 msgstr "这些邮箱地址将添加到所有接收的发送邮件的抄送字段，用逗号分隔多个邮件地址。"
 
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "维护"
+
 #. module: project_issue
 #: selection:project.issue.report,state:0
 msgid "Draft"
@@ -573,6 +577,7 @@ msgid "August"
 msgstr "八月"
 
 #. module: project_issue
+#: selection:project.issue,kanban_state:0
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
@@ -635,17 +640,11 @@ msgid "November"
 msgstr "十一月"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
 #, python-format
 msgid "Warning!"
 msgstr "警告!"
 
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
@@ -698,16 +697,16 @@ msgstr "指派到"
 msgid "Configure"
 msgstr "设置"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
 msgstr "当前功能"
 
-#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
-msgstr "九月"
-
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
@@ -740,6 +739,7 @@ msgid "Issues"
 msgstr "问题"
 
 #. module: project_issue
+#: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "In Progress"
 msgstr "进行中"
@@ -762,9 +762,14 @@ msgid "Creation Month"
 msgstr "创建月份"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "计算方式：花费时间 / 总时间"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
 msgstr ""
 
 #. module: project_issue
@@ -787,12 +792,6 @@ msgstr "月份"
 msgid "Issue"
 msgstr "问题"
 
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr "阶段已改为<b>%s</b>"
-
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
@@ -823,17 +822,41 @@ msgstr "五月"
 msgid "project.config.settings"
 msgstr ""
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
 msgstr "电子邮件"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
 msgstr "二月"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
@@ -889,6 +912,11 @@ msgstr ""
 msgid "References"
 msgstr "参考资料"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
@@ -899,6 +927,11 @@ msgstr "剩余工时"
 msgid "ID"
 msgstr "ID"
 
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
@@ -914,6 +947,11 @@ msgstr "剩余天数"
 msgid "Avg. Working Hours to Close"
 msgstr "平均剩余工时"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -941,6 +979,12 @@ msgstr "年"
 msgid "Duration"
 msgstr "时长"
 
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "错误！项目的开始日期必须小于项目的结束日期"
 
@@ -1015,6 +1059,9 @@ msgstr "时长"
 #~ "here the different versions of your products on which you can work on issues."
 #~ msgstr "可以用缺陷跟踪来管理软件开发中的Bug或售后的产品缺陷等。这里输入您管理缺陷的产品的不同版本。"
 
+#~ msgid "Category"
+#~ msgstr "类别"
+
 #~ msgid "Escalate"
 #~ msgstr "提升"
 
diff --git a/addons/project_issue_sheet/i18n/ar.po b/addons/project_issue_sheet/i18n/ar.po
index fb5bd7b9352..d48257bd1b0 100644
--- a/addons/project_issue_sheet/i18n/ar.po
+++ b/addons/project_issue_sheet/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 21:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/ca.po b/addons/project_issue_sheet/i18n/ca.po
index 619ea517356..ac47366c88e 100644
--- a/addons/project_issue_sheet/i18n/ca.po
+++ b/addons/project_issue_sheet/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-06 22:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/da.po b/addons/project_issue_sheet/i18n/da.po
index 1bb1987ffa7..0005a40e364 100644
--- a/addons/project_issue_sheet/i18n/da.po
+++ b/addons/project_issue_sheet/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/de.po b/addons/project_issue_sheet/i18n/de.po
index b9b08855f99..76e87dd9e61 100644
--- a/addons/project_issue_sheet/i18n/de.po
+++ b/addons/project_issue_sheet/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 19:16+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index 89dd0f2b0f1..2c9df14a49f 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:09+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/es_CR.po b/addons/project_issue_sheet/i18n/es_CR.po
index 96dda355ddd..bdc2721c249 100644
--- a/addons/project_issue_sheet/i18n/es_CR.po
+++ b/addons/project_issue_sheet/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:44+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/fi.po b/addons/project_issue_sheet/i18n/fi.po
index b4314cd0530..caa13baa958 100644
--- a/addons/project_issue_sheet/i18n/fi.po
+++ b/addons/project_issue_sheet/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index 28acd57f495..087ba4709a0 100644
--- a/addons/project_issue_sheet/i18n/fr.po
+++ b/addons/project_issue_sheet/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 18:53+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/gl.po b/addons/project_issue_sheet/i18n/gl.po
index 3bb80a820f7..ff9c65e2e6d 100644
--- a/addons/project_issue_sheet/i18n/gl.po
+++ b/addons/project_issue_sheet/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-21 17:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/hr.po b/addons/project_issue_sheet/i18n/hr.po
index 77ddec6a106..4e1be7d6929 100644
--- a/addons/project_issue_sheet/i18n/hr.po
+++ b/addons/project_issue_sheet/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-12 09:54+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/hu.po b/addons/project_issue_sheet/i18n/hu.po
index fbb1fc32bbb..afe28824f74 100644
--- a/addons/project_issue_sheet/i18n/hu.po
+++ b/addons/project_issue_sheet/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-07 12:16+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/it.po b/addons/project_issue_sheet/i18n/it.po
index 6e90014e982..98a14b4e1da 100644
--- a/addons/project_issue_sheet/i18n/it.po
+++ b/addons/project_issue_sheet/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 14:57+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/ja.po b/addons/project_issue_sheet/i18n/ja.po
index 1051ba5eddb..55f5435fe1f 100644
--- a/addons/project_issue_sheet/i18n/ja.po
+++ b/addons/project_issue_sheet/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-09 20:56+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/lv.po b/addons/project_issue_sheet/i18n/lv.po
index 17a82d2974e..7386a1c73a0 100644
--- a/addons/project_issue_sheet/i18n/lv.po
+++ b/addons/project_issue_sheet/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-31 10:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/mn.po b/addons/project_issue_sheet/i18n/mn.po
index e7e47b6d737..21e1ed98897 100644
--- a/addons/project_issue_sheet/i18n/mn.po
+++ b/addons/project_issue_sheet/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-03 09:15+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/nl.po b/addons/project_issue_sheet/i18n/nl.po
index 4e3ebc3316b..1d02cf207da 100644
--- a/addons/project_issue_sheet/i18n/nl.po
+++ b/addons/project_issue_sheet/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 14:53+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index b2b85f20016..1bc9f19a68e 100644
--- a/addons/project_issue_sheet/i18n/pl.po
+++ b/addons/project_issue_sheet/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-08 07:31+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/pt.po b/addons/project_issue_sheet/i18n/pt.po
index 9edf5112fa3..70f43f6e0e1 100644
--- a/addons/project_issue_sheet/i18n/pt.po
+++ b/addons/project_issue_sheet/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-09 09:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index 6e3418f9dc8..53f9cda75fd 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_sheet/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-06 17:36+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 13:44+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
@@ -31,12 +32,12 @@ msgstr "Linha Analítica"
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_project_issue
 msgid "Project Issue"
-msgstr "Questões do Projeto"
+msgstr "Incidente do Projeto"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linha da Planilhao de Horas"
+msgstr "Linha da Planilha de Horas"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
@@ -48,7 +49,7 @@ msgstr "on_change_project(project_id)"
 #: field:project.issue,analytic_account_id:0
 #, python-format
 msgid "Analytic Account"
-msgstr "Conta analítica"
+msgstr "Conta Analítica"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
@@ -69,7 +70,7 @@ msgstr "Planilhas de Horas"
 #. module: project_issue_sheet
 #: field:hr.analytic.timesheet,issue_id:0
 msgid "Issue"
-msgstr "Problema"
+msgstr "Incidente"
 
 #~ msgid "Add the Timesheet support for Issue Management in Project Management"
 #~ msgstr ""
diff --git a/addons/project_issue_sheet/i18n/ro.po b/addons/project_issue_sheet/i18n/ro.po
index babf933d905..7e4e1545895 100644
--- a/addons/project_issue_sheet/i18n/ro.po
+++ b/addons/project_issue_sheet/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-13 11:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/ru.po b/addons/project_issue_sheet/i18n/ru.po
index 9cc05786907..f84bc969f2b 100644
--- a/addons/project_issue_sheet/i18n/ru.po
+++ b/addons/project_issue_sheet/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-10 17:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po
index 4cc456588ff..3b1ef3e74fe 100644
--- a/addons/project_issue_sheet/i18n/sv.po
+++ b/addons/project_issue_sheet/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-04 10:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/tr.po b/addons/project_issue_sheet/i18n/tr.po
index 9b7ea68404d..f2d56ef234c 100644
--- a/addons/project_issue_sheet/i18n/tr.po
+++ b/addons/project_issue_sheet/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 17:31+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_issue_sheet/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
index 80188f5950b..00ead465d36 100644
--- a/addons/project_issue_sheet/i18n/zh_CN.po
+++ b/addons/project_issue_sheet/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 13:52+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index 9414ccbd1ac..34fd3e8e393 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 21:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "قيد التقدم"
 msgid "Phases"
 msgstr "المراحل"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr "مراحل قيد التنفيذ"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "يرجى تحديد مشروع لجدولته."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr "مسلسل"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "تاريخ البدء"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,10 +246,9 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "يوم"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "تاريخ البدء"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -501,12 +497,14 @@ msgid "Name"
 msgstr "الاسم"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "التخطيط للمستخدمين"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
+
+#, python-format
+#~ msgid "Day"
+#~ msgstr "يوم"
 
 #~ msgid "Schedule"
 #~ msgstr "مجدول"
@@ -667,3 +665,6 @@ msgstr "التخطيط للمستخدمين"
 
 #~ msgid "Resource Detail"
 #~ msgstr "تفاصيل المصدر"
+
+#~ msgid "Planning of Users"
+#~ msgstr "التخطيط للمستخدمين"
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index e4df060f72f..07ec3b34149 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "En procés"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr "Seqüència"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Data d'inici"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,10 +246,9 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dia"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -504,11 +500,9 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
 
 #~ msgid "Error! project start-date must be lower then project end-date."
@@ -525,6 +519,10 @@ msgstr ""
 #~ msgid "Long Term Project Management"
 #~ msgstr "Gestió de projectes a llarg plaç"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dia"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index 52d522ed1b6..4bb0c4a2045 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr ""
 msgid "Phases"
 msgstr ""
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr ""
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr ""
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,9 +246,8 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
 msgstr ""
 
 #. module: project_long_term
@@ -501,9 +497,7 @@ msgid "Name"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index b91bb5d871f..9cab2e4718d 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 08:02+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
@@ -34,6 +34,14 @@ msgstr "In Bearbeitung"
 msgid "Phases"
 msgstr "Phasen"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -143,7 +151,7 @@ msgid "In Progress Phases"
 msgstr "Fortschritts Phasen"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
@@ -154,12 +162,6 @@ msgstr "%s (Kopie)"
 msgid "Please specify a project to schedule."
 msgstr "Bitte wählen Si eine Projekt für die  Planung"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "oder"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -201,11 +203,6 @@ msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 "Aktivieren Sie dieses Feld, um die Phasen basierte Planung zu verwenden"
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Start Datum"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -259,10 +256,9 @@ msgid "Pending Phases"
 msgstr "unerledigte Phasen"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Tag"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Start Datum"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -521,12 +517,10 @@ msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planung der Benutzer"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "oder"
 
 #~ msgid "Compute Scheduling of Phases"
 #~ msgstr "Berechne Projektphasen"
@@ -543,6 +537,10 @@ msgstr "Planung der Benutzer"
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Tag"
+
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "ME (Mengeneinheit) entspr. Einheit für die Dauer"
 
@@ -695,6 +693,9 @@ msgstr "Planung der Benutzer"
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planung der Benutzer"
+
 #~ msgid ""
 #~ "The ressources on the project can be computed automatically by the scheduler"
 #~ msgstr ""
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index ad6aa3651d2..1651c1d2de1 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 15:35+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:49+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "En proceso"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr "Planificación del equipo"
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Fases en proceso"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -155,12 +163,6 @@ msgstr "%s (copia)"
 msgid "Please specify a project to schedule."
 msgstr "Por favor indique el proyecto a planificar."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "o"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -201,11 +203,6 @@ msgstr "Secuencia"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr "Marque esta casilla si planea usar planificación por fases"
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -258,10 +255,9 @@ msgid "Pending Phases"
 msgstr "Etapas pendientes"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Día"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -520,12 +516,10 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planificación de usuarios"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "o"
 
 #~ msgid "Schedule"
 #~ msgstr "Programa"
@@ -550,6 +544,10 @@ msgstr "Planificación de usuarios"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
@@ -695,6 +693,9 @@ msgstr "Planificación de usuarios"
 #~ msgstr ""
 #~ "¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planificación de usuarios"
+
 #~ msgid ""
 #~ "The ressources on the project can be computed automatically by the scheduler"
 #~ msgstr ""
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index 757ee4591d3..f3978ed6dc4 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:43+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: project_long_term
@@ -36,6 +36,14 @@ msgstr "En proceso"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -145,7 +153,7 @@ msgid "In Progress Phases"
 msgstr "Fases en progreso"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -156,12 +164,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Por favor, especifique un proyecto para programar."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -200,11 +202,6 @@ msgstr "Secuencia"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -253,10 +250,9 @@ msgid "Pending Phases"
 msgstr "Fases pendientes"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Día"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -515,12 +511,10 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planificación de los Usuarios"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
@@ -539,6 +533,10 @@ msgstr "Planificación de los Usuarios"
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
 
@@ -690,6 +688,9 @@ msgstr "Planificación de los Usuarios"
 #~ msgid "project.schedule.tasks"
 #~ msgstr "proyecto.planificar.tareas"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planificación de los Usuarios"
+
 #~ msgid ""
 #~ "The ressources on the project can be computed automatically by the scheduler"
 #~ msgstr ""
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
index 934d7119b54..145def5ae97 100644
--- a/addons/project_long_term/i18n/es_EC.po
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-24 16:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "En progreso"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Fases en progreso"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -155,12 +163,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Por favor, especifique un proyecto para planificar."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -199,11 +201,6 @@ msgstr "Secuencia"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -252,10 +249,9 @@ msgid "Pending Phases"
 msgstr "Fases pendientes"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Día"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -514,12 +510,10 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planificación de Usuarios"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Schedule"
 #~ msgstr "Planificar"
@@ -538,9 +532,16 @@ msgstr "Planificación de Usuarios"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Día"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "¡Error! No puede asignar un escalado al mismo proyecto!"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planificación de Usuarios"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " (copiar)"
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 3ddb253852d..665ecca055f 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:39+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "Käynnissä"
 msgid "Phases"
 msgstr "Vaiheet"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr "Meneillään olevat vaiheet"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Ole hyvä ja määrittele ajoitettava projekti."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr "Sekvenssi"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Aloituspäivämäärä"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,10 +246,9 @@ msgid "Pending Phases"
 msgstr "Odottavat vaiheet"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Päivä"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Aloituspäivämäärä"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -503,12 +499,10 @@ msgid "Name"
 msgstr "Nimi"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Käyttäjien suunnittelu"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
@@ -540,6 +534,10 @@ msgstr "Käyttäjien suunnittelu"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "Mittayksikkö (UoM) on keston mittayksikkö"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Päivä"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " (kopio)"
@@ -632,6 +630,9 @@ msgstr "Käyttäjien suunnittelu"
 #~ msgid "Compute All Projects"
 #~ msgstr "Laske kaikki projektit"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Käyttäjien suunnittelu"
+
 #~ msgid ""
 #~ "The ressources on the project can be computed automatically by the scheduler"
 #~ msgstr "Projektin resurssit voidaan laskea automaattisesti ajastimen avulla."
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 479eac05cc6..5d5988cc3a9 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:52+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -34,6 +34,14 @@ msgstr "En cours"
 msgid "Phases"
 msgstr "Phases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -143,7 +151,7 @@ msgid "In Progress Phases"
 msgstr "Phases en cours"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -154,12 +162,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Préciser un projet à plannifier"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -198,11 +200,6 @@ msgstr "Séquence"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Date de début"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -251,10 +248,9 @@ msgid "Pending Phases"
 msgstr "Phases en attentes"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Jour"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Date de début"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -516,12 +512,10 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planning des utilisateurs"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Schedule"
 #~ msgstr "Planifier"
@@ -535,6 +529,10 @@ msgstr "Planning des utilisateurs"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UdM (unité de mesure) est l'unité de mesure de la durée"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Jour"
+
 #~ msgid "Resource Allocations"
 #~ msgstr "Allocations des ressources"
 
@@ -695,6 +693,9 @@ msgstr "Planning des utilisateurs"
 #~ "Erreur ! La date de fin de la tâche doit être postérieure à la date de "
 #~ "démarrage"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planning des utilisateurs"
+
 #~ msgid ""
 #~ "The ressources on the project can be computed automatically by the scheduler"
 #~ msgstr ""
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index d301cb80f46..ee3ffaba32c 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "U tijeku"
 msgid "Phases"
 msgstr "Faze"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr "Sekvenca"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Početni datum"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,10 +246,9 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dan"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Početni datum"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -502,11 +498,9 @@ msgid "Name"
 msgstr "Naziv"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
 
 #~ msgid "Displaying settings"
@@ -534,6 +528,10 @@ msgstr ""
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dan"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
 
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 7af622a1dcb..e25d811f1cc 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:31+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -34,6 +34,14 @@ msgstr "Folyamatban"
 msgid "Phases"
 msgstr "Fázisok"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -140,7 +148,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -151,12 +159,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -195,11 +197,6 @@ msgstr "Sorszám"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Kezdési dátum"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -248,10 +245,9 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Nap"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Kezdési dátum"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -504,11 +500,9 @@ msgid "Name"
 msgstr "Név"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
 
 #~ msgid "Error! project start-date must be lower then project end-date."
@@ -522,6 +516,10 @@ msgstr ""
 #~ msgid "Long Term Project Management"
 #~ msgstr "Hosszútávú projektmenedzsment"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Nap"
+
 #~ msgid "Planning"
 #~ msgstr "Tervezés"
 
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 4df0a792155..21a1715b365 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 22:27+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
@@ -35,6 +35,14 @@ msgstr "In corso"
 msgid "Phases"
 msgstr "Fasi"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Fasi di avanzamento"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -155,12 +163,6 @@ msgstr "%s (copia)"
 msgid "Please specify a project to schedule."
 msgstr "Si prega di specificare un progetto da pianificare."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "o"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -203,11 +205,6 @@ msgstr ""
 "Selezionare questo campo se si prevede di usare una pianificare basata sulle "
 "fasi"
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Data di inizio"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -261,10 +258,9 @@ msgid "Pending Phases"
 msgstr "Fasi in Sospeso"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Giorno"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Data di inizio"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -523,12 +519,10 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Pianificazione degli Utenti"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "o"
 
 #~ msgid "Displaying settings"
 #~ msgstr "Visualizza impostazioni"
@@ -549,6 +543,10 @@ msgstr "Pianificazione degli Utenti"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "U.M. (unità di misura) è l'unità per la misurazione della durata"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Giorno"
+
 #~ msgid "Resource Allocations"
 #~ msgstr "Allocazione risorse"
 
@@ -695,3 +693,6 @@ msgstr "Pianificazione degli Utenti"
 #~ " Se è necessaria una revisione, la fase è nello stato 'In sospeso.           "
 #~ "                       \n"
 #~ " Se la fase è conclusa, lo stato è 'Completato'."
+
+#~ msgid "Planning of Users"
+#~ msgstr "Pianificazione degli Utenti"
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index a0a26207f99..ec4d5a69c5c 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-10 03:12+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "進行中"
 msgid "Phases"
 msgstr "フェーズ"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -143,7 +151,7 @@ msgid "In Progress Phases"
 msgstr "進行中のフェーズ"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -154,12 +162,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "スケジュールするプロジェクトを指定して下さい。"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -198,11 +200,6 @@ msgstr "順序"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "開始日"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -251,10 +248,9 @@ msgid "Pending Phases"
 msgstr "保留中フェーズ"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "日"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "開始日"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -505,12 +501,10 @@ msgid "Name"
 msgstr "名前"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "ユーザの計画"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Schedule"
 #~ msgstr "スケジュール"
@@ -524,9 +518,16 @@ msgstr "ユーザの計画"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UoMは期間のための単位です。"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "日"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
 
+#~ msgid "Planning of Users"
+#~ msgstr "ユーザの計画"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " （コピー）"
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 60d0fe03772..1321e58c100 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-31 10:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "Progresā"
 msgid "Phases"
 msgstr "Fāzes"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr "Secība"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Sākuma Datums"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,10 +246,9 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Diena"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Sākuma Datums"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -501,11 +497,9 @@ msgid "Name"
 msgstr "Nosaukums"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
 
 #~ msgid "Schedule"
@@ -532,6 +526,10 @@ msgstr ""
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "Mērv. (mērvienība) ir ilguma mērvienība"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Diena"
+
 #~ msgid "Resource Allocations"
 #~ msgstr "Resursu iedalīšanas"
 
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index f83c3539ec3..8783eb0e393 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-24 13:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "Хийгдэж байна"
 msgid "Phases"
 msgstr "Шатууд"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Боловсруулагдаж байгаа Шатууд"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -155,12 +163,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Төслийн товийг зааж өгнө үү."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -199,11 +201,6 @@ msgstr "Дараалал"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Эхлэх огноо"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -252,10 +249,9 @@ msgid "Pending Phases"
 msgstr "Хүлээгдэж байгаа шатууд"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Өдөр"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Эхлэх огноо"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -513,12 +509,10 @@ msgid "Name"
 msgstr "Нэр"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Хэрэглэгчдийг Төлөвлөх"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
@@ -532,9 +526,16 @@ msgstr "Хэрэглэгчдийг Төлөвлөх"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "Х.Н (Хэмжих Нэгж) гэдэг нь үргэлжлэх хугацааг хэмжих нэгж юм."
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Өдөр"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
+#~ msgid "Planning of Users"
+#~ msgstr "Хэрэглэгчдийг Төлөвлөх"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " (хувилах)"
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 72bebf93825..99eaebc1638 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 18:54+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "In behandeling"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Fases in bewerking"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -155,12 +163,6 @@ msgstr "%s (kopie)"
 msgid "Please specify a project to schedule."
 msgstr "Specificeer een project om in te plannen"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "of"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -199,11 +201,6 @@ msgstr "Volgnummer"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Startdatum"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -252,10 +249,9 @@ msgid "Pending Phases"
 msgstr "Fases in afwachting"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dag"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Startdatum"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -514,12 +510,10 @@ msgid "Name"
 msgstr "Naam"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planning voor gebruikers"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "of"
 
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Fout! Project startdatum moet liggen voor project einddatum."
@@ -536,8 +530,9 @@ msgstr "Planning voor gebruikers"
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Fout! U kunt geen recursieve taken aanmaken."
 
-#~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-#~ msgstr "ME (Meeteenheid) is de eenheid voor de doorlooptijd"
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dag"
 
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Fout! U kunt geen escalatie toewijzen aan hetzelfde project!"
@@ -666,6 +661,9 @@ msgstr "Planning voor gebruikers"
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planning voor gebruikers"
+
 #~ msgid "Schedule"
 #~ msgstr "Planning berekenen"
 
@@ -690,3 +688,6 @@ msgstr "Planning voor gebruikers"
 #~ " Als opnieuw bekeken moet worden, wordt de fase status 'In afwachting'.      "
 #~ "                            \n"
 #~ " Als de fase voorbij is, wordt de status op 'Voltooid' gezet."
+
+#~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+#~ msgstr "Maateenheid is de eenheid voor de doorlooptijd"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index 8d89b24da5a..d1b536c1e35 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 12:54+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "W toku"
 msgid "Phases"
 msgstr "Fazy"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr "fazy w toku"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
@@ -152,12 +160,6 @@ msgstr "%s (kopia)"
 msgid "Please specify a project to schedule."
 msgstr "Podaj projekt do zaplanowania"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "lub"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr "Numeracja"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr "Zaznacz to pole, jeśli chcesz stosować planowanie z fazami."
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Data początkowa"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -254,10 +251,9 @@ msgid "Pending Phases"
 msgstr "Fazy oczekujące"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dzień"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Data początkowa"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -511,16 +507,18 @@ msgid "Name"
 msgstr "Nazwa"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planowanie użytkowników"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "lub"
 
 #~ msgid "Schedule"
 #~ msgstr "Harmonogram"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dzień"
+
 #~ msgid "Planning"
 #~ msgstr "Planowanie"
 
@@ -627,3 +625,6 @@ msgstr "Planowanie użytkowników"
 
 #~ msgid "Compute All Projects"
 #~ msgstr "Oblicz wszystkie projekty"
+
+#~ msgid "Planning of Users"
+#~ msgstr "Planowanie użytkowników"
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 3b94ca29571..62064ddadc1 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 12:48+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "Em Progresso"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Fases em progresso"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -155,12 +163,6 @@ msgstr "%s (cópia)"
 msgid "Please specify a project to schedule."
 msgstr "Por favor, especifique um projeto para agendar."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "ou"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -199,11 +201,6 @@ msgstr "Sequência"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Data de Início"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -252,10 +249,9 @@ msgid "Pending Phases"
 msgstr "Fases pendentes"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dia"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Data de Início"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -511,12 +507,14 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planeamento de utilizadores"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "ou"
+
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dia"
 
 #~ msgid "Planning"
 #~ msgstr "Planeamento"
@@ -570,6 +568,9 @@ msgstr "Planeamento de utilizadores"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UdM (unidade de medida) é a unidade de medida de Duração"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planeamento de utilizadores"
+
 #~ msgid "_Cancel"
 #~ msgstr "_Cancelar"
 
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 5ded78aa156..0b59c239659 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-10-17 00:36+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 14:28+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +36,14 @@ msgstr "Em Andamento"
 msgid "Phases"
 msgstr "Fases"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr "Planejamento de Equipe"
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -83,12 +92,12 @@ msgstr "Planejar Fases"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Ação"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -109,7 +118,7 @@ msgstr "Provisório"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr "C_alcular"
+msgstr "(o) Calcular"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -120,7 +129,7 @@ msgstr "Novo"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "Duração da Unidade de Medida"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -144,10 +153,10 @@ msgid "In Progress Phases"
 msgstr "Fases em Progresso"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
@@ -155,12 +164,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Por favor especifique um projeto para agendar"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -181,28 +184,25 @@ msgstr "Data Inicial Mínima"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Unidade de Medida (UdM) é a unidade de medida para Duração"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
 msgstr ""
+"Os recursos sobre o projeto podem ser calculados automaticamente pelo "
+"agendador."
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr "Sequência"
+msgstr "Seqüência"
 
 #. module: project_long_term
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Data Inicial"
+msgstr "Marque esta caixa se você deseja usar o agendamento baseado em fases"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -213,6 +213,10 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"Quando a fase é criada a situação é 'Provisória'.\n"
+"Quando a fase é iniciada, o situação muda para 'Em andamento'.\n"
+"Se for necessário uma revisão na fase a situação fica como 'Pendente'.\n"
+"Quando a fase termina, a situação fica como 'Concluído'."
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -252,10 +256,9 @@ msgid "Pending Phases"
 msgstr "Fases Pendentes"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dia"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Data Inicial"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -319,7 +322,7 @@ msgstr "Detalhes das Tarefas"
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "Fases Abertas"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -416,7 +419,7 @@ msgstr "Dá a ordem da seqüência ao exibir uma lista de fases."
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Tarefas"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
@@ -461,7 +464,7 @@ msgstr "Mês"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
@@ -513,12 +516,10 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planejamento de Usuários"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "ou"
 
 #~ msgid "Schedule"
 #~ msgstr "Agendar"
@@ -538,6 +539,10 @@ msgstr "Planejamento de Usuários"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "UdM (Unidade de Medida) é a unidade de medida para Duração"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dia"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Erro! Você não pode atribuir escalas para o mesmo projeto!"
 
@@ -641,6 +646,9 @@ msgstr "Planejamento de Usuários"
 #~ msgid "Displaying settings"
 #~ msgstr "Mostrando configurações"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planejamento de Usuários"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index 045e3e190f1..2467d747a74 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:31+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "In curs de desfasurare"
 msgid "Phases"
 msgstr "Etape"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "Etape in desfasurare"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -155,12 +163,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Va rugam sa specificati un proiect de programat."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -199,11 +201,6 @@ msgstr "Secventa"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Data de inceput"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -252,10 +249,9 @@ msgid "Pending Phases"
 msgstr "Etape in asteptare"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Zi"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Data de inceput"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -515,12 +511,10 @@ msgid "Name"
 msgstr "Nume"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Planificarea Utilizatorilor"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Resources Allocation"
 #~ msgstr "Alocare resurse"
@@ -534,6 +528,10 @@ msgstr "Planificarea Utilizatorilor"
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Eroare ! Nu puteti crea sarcini recursive."
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Zi"
+
 #~ msgid "Resource Allocations"
 #~ msgstr "Alocare Resurse"
 
@@ -669,6 +667,9 @@ msgstr "Planificarea Utilizatorilor"
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Eroare! Nu puteti atribui o avansare aceluiasi proiect!"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Planificarea Utilizatorilor"
+
 #~ msgid "_Cancel"
 #~ msgstr "_Anulati"
 
diff --git a/addons/project_long_term/i18n/ru.po b/addons/project_long_term/i18n/ru.po
index 5df46595efb..9b5e0faa0f5 100644
--- a/addons/project_long_term/i18n/ru.po
+++ b/addons/project_long_term/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 07:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr ""
 msgid "Phases"
 msgstr ""
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr ""
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr ""
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,9 +246,8 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
 msgstr ""
 
 #. module: project_long_term
@@ -501,9 +497,7 @@ msgid "Name"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index 1a0b03ef107..ebafe2e2da1 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-20 14:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "Pågående"
 msgid "Phases"
 msgstr "Faser"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -144,7 +152,7 @@ msgid "In Progress Phases"
 msgstr "I aktiva faser"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -155,12 +163,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr "Vänlgen ange ett projekt att schemalägga."
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -199,11 +201,6 @@ msgstr "Sekvens"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "Startdatum"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -252,10 +249,9 @@ msgid "Pending Phases"
 msgstr "Vilande faser"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "Dag"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Startdatum"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -513,12 +509,10 @@ msgid "Name"
 msgstr "Namn"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "Personalplanering"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr ""
 
 #~ msgid "Schedule"
 #~ msgstr "Schemalägg"
@@ -532,9 +526,16 @@ msgstr "Personalplanering"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "Enhet (mätenhet) är enheter för att beskriva varaktigheten"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "Dag"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Fel! Du kan inte eskalera till samma projekt"
 
+#~ msgid "Planning of Users"
+#~ msgstr "Personalplanering"
+
 #, python-format
 #~ msgid " (copy)"
 #~ msgstr " (kopia)"
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 1daab6b175c..8c48e1849f1 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 17:32+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr ""
 msgid "Phases"
 msgstr ""
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -141,7 +149,7 @@ msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -152,12 +160,6 @@ msgstr ""
 msgid "Please specify a project to schedule."
 msgstr ""
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -196,11 +198,6 @@ msgstr ""
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr ""
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -249,9 +246,8 @@ msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
 msgstr ""
 
 #. module: project_long_term
@@ -501,11 +497,9 @@ msgid "Name"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
 msgstr ""
 
 #~ msgid "Schedule"
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index fb5a60cd0e5..b5056ea3531 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:57+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -35,6 +35,14 @@ msgstr "进行中"
 msgid "Phases"
 msgstr "阶段"
 
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Team Planning"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
@@ -143,7 +151,7 @@ msgid "In Progress Phases"
 msgstr "进行中的阶段"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -154,12 +162,6 @@ msgstr "%s (副本)"
 msgid "Please specify a project to schedule."
 msgstr "请输入要排程的项目"
 
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr "or"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.user.allocation:0
@@ -198,11 +200,6 @@ msgstr "序号"
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr "如果你计划使用分阶段调度，选中这个字段。"
 
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr "开始日期"
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid ""
@@ -255,10 +252,9 @@ msgid "Pending Phases"
 msgstr "暂停的阶段"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
-msgstr "天"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "开始日期"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -509,12 +505,10 @@ msgid "Name"
 msgstr "名称"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
-msgstr "规划用户"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
+msgstr "or"
 
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "错误！项目的开始日期必须小于项目的结束日期"
@@ -537,6 +531,10 @@ msgstr "规划用户"
 #~ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 #~ msgstr "某个周期的计量单位"
 
+#, python-format
+#~ msgid "Day"
+#~ msgstr "天"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "不能升级到相同的项目"
 
@@ -673,6 +671,9 @@ msgstr "规划用户"
 #~ msgid "Compute All Projects"
 #~ msgstr "计算所有项目"
 
+#~ msgid "Planning of Users"
+#~ msgstr "规划用户"
+
 #~ msgid ""
 #~ "The ressources on the project can be computed automatically by the scheduler"
 #~ msgstr "调度器会自动计算项目的资源"
diff --git a/addons/project_mrp/i18n/ar.po b/addons/project_mrp/i18n/ar.po
index c0e0c6d9f61..59ee5c7cd46 100644
--- a/addons/project_mrp/i18n/ar.po
+++ b/addons/project_mrp/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "علامة المنتج هي خدمة, وهي تنشأ المهمة."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "تم انشاء المهمة لتؤدي الخدمة."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "سطر أمر الشراء"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "المنتج"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "اطلب مهمة"
 msgid "Procurement Task"
 msgstr "مهمة المشتريات"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "مهمة المشتريات"
 msgid "Task"
 msgstr "مهمة"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "مشروع"
 msgid "Procurement"
 msgstr "المشتريات"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "سطر أمر الشراء"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr "اذا كانت طريقة الشراء لعمل امر واسلوب العرض هو للانتاج"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "مهمة امر البيع"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -137,11 +142,6 @@ msgstr "أمر المبيعات"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "في حالة قيامك ببيع الخدمات على حسب ترتيب البيع"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -159,6 +159,12 @@ msgstr ""
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "خطأ ! لا يمكنك انشاء مهام رجعية."
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "في حالة قيامك ببيع الخدمات على حسب ترتيب البيع"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "مهمة امر البيع"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module creates a link between procurement orders\n"
@@ -203,5 +209,11 @@ msgstr ""
 #~ "إنشاؤه تلقائيا عن طريق أوامر بيع.\n"
 #~ "\n"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "سطر أمر الشراء"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "مرجع الأمر يجب أن يكون فريداً لكل شركة علي حدا!"
+
+#~ msgid "Sale order line"
+#~ msgstr "سطر أمر الشراء"
diff --git a/addons/project_mrp/i18n/bg.po b/addons/project_mrp/i18n/bg.po
index 7645109ec55..3e80c3aa7c4 100644
--- a/addons/project_mrp/i18n/bg.po
+++ b/addons/project_mrp/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Продукт"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr "Задача към Снабдяване"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Задача към Снабдяване"
 msgid "Task"
 msgstr "Задача"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Проект"
 msgid "Procurement"
 msgstr "Снабдаване"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/bs.po b/addons/project_mrp/i18n/bs.po
index c4453f8819d..79569bdfcaa 100644
--- a/addons/project_mrp/i18n/bs.po
+++ b/addons/project_mrp/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/ca.po b/addons/project_mrp/i18n/ca.po
index 593f727ef0d..90c8d39fc70 100644
--- a/addons/project_mrp/i18n/ca.po
+++ b/addons/project_mrp/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 09:31+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Tipus de producte és servei, després es crea la tasca."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Es crea una tasca per proveir el servei."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Producte"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Tasca ordre"
 msgid "Procurement Task"
 msgstr "Tasca proveïment"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Tasca proveïment"
 msgid "Task"
 msgstr "Tasca"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Projecte"
 msgid "Procurement"
 msgstr "Proveïment"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "Si mètode proveïment és obtenir sota comanda i mètode subministro és produir"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tasca comanda de venda"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "En cas que veneu serveis sobre comanda de venda"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -157,6 +157,12 @@ msgstr ""
 #~ msgid "Procure Task"
 #~ msgstr "Tasca proveïment"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Tasca comanda de venda"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "En cas que veneu serveis sobre comanda de venda"
+
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Gestió de projectes - Integració amb MRP i vendes"
 
diff --git a/addons/project_mrp/i18n/cs.po b/addons/project_mrp/i18n/cs.po
index 464f439296e..d29850973db 100644
--- a/addons/project_mrp/i18n/cs.po
+++ b/addons/project_mrp/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-06 04:53+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project_mrp
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Pokud typ výrobku je služby, tak je vytvořen úkol."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Úkol je vytvořen k poskytování služby."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Řádek prodejní objednávky"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Výrobek"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Příkaz úkolu"
 msgid "Procurement Task"
 msgstr "Úloha zásobování"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Úloha zásobování"
 msgid "Task"
 msgstr "Úkol"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Projekt"
 msgid "Procurement"
 msgstr "Zásobování"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Řádek prodejní objednávky"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "Pokud je metoda zásobování Udělat na příkaz a metoda dodání je výroba"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Úkol prodejního příkazu"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr "Prodejní objednávka"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "V případě, kdy prodáváte služby pomocí prodejního příkazu"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -158,6 +158,9 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Chyba: Neplatný kód ean"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Úkol prodejního příkazu"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module creates a link between procurement orders\n"
@@ -203,6 +206,15 @@ msgstr ""
 #~ "automatically created via sale orders.\n"
 #~ "\n"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "V případě, kdy prodáváte služby pomocí prodejního příkazu"
+
+#~ msgid "Sale order line"
+#~ msgstr "Řádek prodejní objednávky"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Řádek prodejní objednávky"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Chyba ! Datum ukončení úkolu musí být větší než počáteční datum"
 
diff --git a/addons/project_mrp/i18n/da.po b/addons/project_mrp/i18n/da.po
index 1e4b13a60f6..a3f344d50e0 100644
--- a/addons/project_mrp/i18n/da.po
+++ b/addons/project_mrp/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,24 +28,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -63,6 +68,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,8 +124,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -138,11 +143,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index 2084fe15cb4..c9cfab246fc 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:32+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
@@ -29,26 +29,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Für die Produktart Dienstleistungen, wird eine Aufgabe generiert."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "Aufgabe angelegt"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Eine Aufgabe wurde erzeugt um die Dienstleistung zu erbringen."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Verkaufsauftragsposition"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produkt"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -66,6 +71,11 @@ msgstr "Bestelle Aufgabe"
 msgid "Procurement Task"
 msgstr "Aufgabe von Beschaffungsauftrag"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -74,6 +84,16 @@ msgstr "Aufgabe von Beschaffungsauftrag"
 msgid "Task"
 msgstr "Aufgabe"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -90,31 +110,13 @@ msgstr "Projekt"
 msgid "Procurement"
 msgstr "Beschaffung"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Verkaufsauftragsposition"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr "Ungültig"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-"wird angelegt um Ihre Aufgaben zu verfolgen. Diese Aufgabe wird beim Projekt "
-"aufscheinen, \n"
-"das zu dem Kontrakt des Verkaufsauftrages gehört."
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr "Aufgabe angelegt"
@@ -127,9 +129,9 @@ msgstr ""
 "Beschaffungsmethode  \"Fertigung\" ist"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Verkaufsauftrag Aufgabe"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -146,13 +148,6 @@ msgstr "Verkaufsauftrag"
 msgid "Order Line"
 msgstr "Auftragsposition"
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-"Für den Fall, dass Sie Dienstleistungen auf Basis von Verkaufsaufträgen "
-"verkaufen"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -169,6 +164,9 @@ msgstr "eine Aufgabe"
 #~ msgid "Procure Task"
 #~ msgstr "Beschaffung Aufgabe"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Verkaufsauftrag Aufgabe"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
@@ -227,8 +225,19 @@ msgstr "eine Aufgabe"
 #~ "auch eine Abrechnung der geleisteten Arbeiten an den Kunden erfolgt.\n"
 #~ "\n"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr ""
+#~ "Für den Fall, dass Sie Dienstleistungen auf Basis von Verkaufsaufträgen "
+#~ "verkaufen"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
 
+#~ msgid "Sale order line"
+#~ msgstr "Verkaufsauftragsposition"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Verkaufsauftragsposition"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
diff --git a/addons/project_mrp/i18n/el.po b/addons/project_mrp/i18n/el.po
index e579e97dd6b..a8a11f45b5a 100644
--- a/addons/project_mrp/i18n/el.po
+++ b/addons/project_mrp/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-06-15 07:21+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -30,24 +30,29 @@ msgid "Product type is service, then its creates the task."
 msgstr "Product type is service, then its creates the task."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Μια εργασία δημιουργείται για την παροχή της υπηρεσίας."
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -65,6 +70,11 @@ msgstr "Εργασία Παραγγελίας"
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -73,6 +83,16 @@ msgstr ""
 msgid "Task"
 msgstr "Εργασία"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -89,28 +109,13 @@ msgstr ""
 msgid "Procurement"
 msgstr "Τροφοδοσία"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -121,9 +126,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Εργασία Παραγγελίας Πώλησης"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -140,11 +145,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Σε περίπτωση που προσφέρετε υπηρεσίες με την παραγγελία πώλησης."
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -158,3 +158,9 @@ msgstr ""
 
 #~ msgid "Procure Task"
 #~ msgstr "Εργασία Τροφοδοσίας"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Εργασία Παραγγελίας Πώλησης"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Σε περίπτωση που προσφέρετε υπηρεσίες με την παραγγελία πώλησης."
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index eab164c3ad8..2bab272eed9 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-17 11:44+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 18:22+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Tipo de producto es servicio, luego se crea la tarea."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "Tarea creada"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr "En caso de que vendas servicios en el pedido de venta"
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Se crea una tarea para proveer el servicio."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Línea de pedido de venta"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Producto"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr "Tareas del pedido de venta"
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Tarea orden"
 msgid "Procurement Task"
 msgstr "Tarea abastecimiento"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr "Línea del pedido de venta"
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,18 @@ msgstr "Tarea abastecimiento"
 msgid "Task"
 msgstr "Tarea"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+"será creado para seguir la tarea a realizar. Esta tarea aparecerá en el "
+"proyecto relacionado con el contrato del pedido de venta."
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,30 +108,13 @@ msgstr "Proyecto"
 msgid "Procurement"
 msgstr "Abastecimiento"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Línea de pedido de venta"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr "Falso"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-"será creado para seguir la tarea a realizar. Esta tarea aparecerá en el "
-"proyecto relacionado con el contrato del pedido de venta."
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr "Tarea creada."
@@ -122,9 +127,9 @@ msgstr ""
 "Producir"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tarea pedido de venta"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línea del pedido de venta"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -141,11 +146,6 @@ msgstr "Pedidos de Venta"
 msgid "Order Line"
 msgstr "Línea del pedido"
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "En caso que venda servicios sobre pedido de venta"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -159,6 +159,12 @@ msgstr "una tarea"
 #~ msgid "Procure Task"
 #~ msgstr "Tarea abastecimiento"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Tarea pedido de venta"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "En caso que venda servicios sobre pedido de venta"
+
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Gestión de proyectos - Integración con MRP y ventas"
 
@@ -220,5 +226,11 @@ msgstr "una tarea"
 #~ msgstr ""
 #~ "¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea de pedido de venta"
+
+#~ msgid "Sale order line"
+#~ msgstr "Línea de pedido de venta"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "¡La referencia del pedido debe ser única por compañía!"
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/project_mrp/i18n/es_AR.po
index 11803f64bfb..460fcd61f47 100644
--- a/addons/project_mrp/i18n/es_AR.po
+++ b/addons/project_mrp/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-23 18:36+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr "Si el tipo de producto es servicio, luego se crea la tarea."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Se crea una tarea para proveer el servicio."
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr "Tarea orden"
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr "Tarea"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr "Abastecimiento"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tarea de pedido de venta"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "En caso que venda servicios sobre pedido de venta"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -157,3 +157,9 @@ msgstr ""
 
 #~ msgid "Procure Task"
 #~ msgstr "Tarea abastecimiento"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "En caso que venda servicios sobre pedido de venta"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Tarea de pedido de venta"
diff --git a/addons/project_mrp/i18n/es_CR.po b/addons/project_mrp/i18n/es_CR.po
index cb04df5379f..544a197a6c5 100644
--- a/addons/project_mrp/i18n/es_CR.po
+++ b/addons/project_mrp/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 22:34+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: project_mrp
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Tipo de producto es servicio, luego se crea la tarea."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Se crea una tarea para proveer el servicio."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Línea de pedido de venta"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Producto"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Tarea orden"
 msgid "Procurement Task"
 msgstr "Tarea abastecimiento"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Tarea abastecimiento"
 msgid "Task"
 msgstr "Tarea"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Proyecto"
 msgid "Procurement"
 msgstr "Abastecimiento"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Línea de pedido de venta"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -121,9 +126,9 @@ msgstr ""
 "Producir"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tarea pedido de venta"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -140,11 +145,6 @@ msgstr "Pedido de Venta"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "En caso que venda servicios sobre pedido de venta"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -154,12 +154,18 @@ msgstr ""
 #~ msgstr ""
 #~ "¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Tarea pedido de venta"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN no válido"
 
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "¡Error! No puede crear tareas recursivas."
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "En caso que venda servicios sobre pedido de venta"
+
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "si método de abastecimiento es Fabricar bajo pedido y método de suministro "
@@ -219,5 +225,11 @@ msgstr ""
 #~ "automáticamente a través de pedidos de venta.\n"
 #~ "\n"
 
+#~ msgid "Sale order line"
+#~ msgstr "Línea de pedido de venta"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea de pedido de venta"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "¡La referencia de la compra debe ser única por compañía!"
diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/project_mrp/i18n/es_EC.po
index acfea8fe16d..10e541cc6d3 100644
--- a/addons/project_mrp/i18n/es_EC.po
+++ b/addons/project_mrp/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-19 00:12+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr "Tipo de producto es servicio, luego se crea la tarea."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Se crea una tarea para proveer el servicio."
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr "Tarea orden"
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr "Tarea"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr "Abastecimiento"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tarea pedido de venta"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "En caso que venda servicios sobre pedido de venta"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -157,3 +157,9 @@ msgstr ""
 
 #~ msgid "Procure Task"
 #~ msgstr "Tarea abastecimiento"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Tarea pedido de venta"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "En caso que venda servicios sobre pedido de venta"
diff --git a/addons/project_mrp/i18n/et.po b/addons/project_mrp/i18n/et.po
index 65b61b660cb..f1d5a74929a 100644
--- a/addons/project_mrp/i18n/et.po
+++ b/addons/project_mrp/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr "Toote tüüp on teenus, siis see loob ülesande."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Ülesanne on loodud, et pakkuda teenust."
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr "Ülesanne"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr "Hankimine"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Juhul kui sa müüd teenuseid müügikorraldusel"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -152,3 +152,6 @@ msgstr ""
 
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr "Kui tootmise meetod on 'Loo korraldusse' ja tarne meetod on 'Tooda'"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Juhul kui sa müüd teenuseid müügikorraldusel"
diff --git a/addons/project_mrp/i18n/fi.po b/addons/project_mrp/i18n/fi.po
index 9d47aff0fdc..494fa53cf31 100644
--- a/addons/project_mrp/i18n/fi.po
+++ b/addons/project_mrp/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-22 09:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Tuotteen tyyppi on palvelu, luodaan tehtävä."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Tehtävä on luotu tuottamaan palvelu"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Myyntitilausrivi"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Tuote"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Tilaustehtävä"
 msgid "Procurement Task"
 msgstr "Hankintatehtävä"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Hankintatehtävä"
 msgid "Task"
 msgstr "Tehtävä"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Projekti"
 msgid "Procurement"
 msgstr "Hankinta"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Myyntitilausrivi"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,9 +124,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr "Jos hankintametodi on tee tilaukseen ja toimitusmetodi on tuota"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Myyntitilaustehtävä"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,11 +143,6 @@ msgstr "Myyntitilaus"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "tapauksessa jossa myyt palveluja myyntitilauksella"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -158,8 +158,20 @@ msgstr ""
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Hankinnan ja projektinhallinnan integraatio"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Myyntitilaustehtävä"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "tapauksessa jossa myyt palveluja myyntitilauksella"
+
+#~ msgid "Sale order line"
+#~ msgstr "Myyntitilausrivi"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Myyntitilausrivi"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Tilausviitteen tulee olla uniikki yrityskohtaisesti!"
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index 573ca9f2643..fd657425585 100644
--- a/addons/project_mrp/i18n/fr.po
+++ b/addons/project_mrp/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 15:22+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Si le type d'article est\"service\", alors cela crée une tâche."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Une tâche est créée pour fournir le service."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Ligne de commande client"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Article"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Tâche commandée"
 msgid "Procurement Task"
 msgstr "Tâche d'approvisionnement"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Tâche d'approvisionnement"
 msgid "Task"
 msgstr "Tâche"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Projet"
 msgid "Procurement"
 msgstr "Approvisionnement"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Ligne de commande client"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "méthode de fourniture est \"Produire\""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tâche sur les commandes de ventes"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr "Commande client"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Dans ce cas vous vendez le service sur les commandes de ventes"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -160,6 +160,12 @@ msgstr ""
 #~ msgid "Procure Task"
 #~ msgstr "Tâche obtenu"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Tâche sur les commandes de ventes"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Dans ce cas vous vendez le service sur les commandes de ventes"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
 
@@ -218,8 +224,14 @@ msgstr ""
 #~ "tâches créées automatiquement via les bons de commande.\n"
 #~ "\n"
 
+#~ msgid "Sale order line"
+#~ msgstr "Ligne de commande client"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erreur : code EAN incorrect"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Ligne de commande client"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "La référence de commande doit être unique par société !"
diff --git a/addons/project_mrp/i18n/gl.po b/addons/project_mrp/i18n/gl.po
index e1f7bcd6b56..cae151c18ea 100644
--- a/addons/project_mrp/i18n/gl.po
+++ b/addons/project_mrp/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-10 15:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "\"Tipo de produto\" é servizo, a continuación créase a tarefa."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Créase unha tarefa para prover o servizo."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produto"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Tarefa orde"
 msgid "Procurement Task"
 msgstr "Tarefa abastecemento"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Tarefa abastecemento"
 msgid "Task"
 msgstr "Tarefa"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Proxecto"
 msgid "Procurement"
 msgstr "Adquisición"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -121,9 +126,9 @@ msgstr ""
 "Producir"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tarefa pedido de venda"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -140,11 +145,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "En caso que venda servizos sobre pedido de venda"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -161,6 +161,9 @@ msgstr ""
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Integración de abastecementos e xestión de proxectos"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Tarefa pedido de venda"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Erro! Non pode crear tarefas recorrentes."
 
@@ -200,3 +203,6 @@ msgstr ""
 #~ "para poder facturar servizos baseados en tarefas creadasautomaticamente a "
 #~ "través de pedidos de venda.\n"
 #~ "\n"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "En caso que venda servizos sobre pedido de venda"
diff --git a/addons/project_mrp/i18n/gu.po b/addons/project_mrp/i18n/gu.po
index 5be204f5658..db7d2ef4760 100644
--- a/addons/project_mrp/i18n/gu.po
+++ b/addons/project_mrp/i18n/gu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-12 15:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,24 +28,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -63,6 +68,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr ""
 msgid "Task"
 msgstr "કાર્ય"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,8 +124,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -138,11 +143,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index 1a761574286..2b43f376b0d 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-12 00:12+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: project_mrp
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Ako je tip proizvoda 'usluga' tada kreira zadatak"
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Stvara se zadatak kako bi se pružila usluga"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Proizvod"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Zadatak naloga"
 msgid "Procurement Task"
 msgstr "Procurement Task"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Procurement Task"
 msgid "Task"
 msgstr "Task"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Projekt"
 msgid "Procurement"
 msgstr "Procurement"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,9 +124,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr "If procurement method is Make to order and supply method is produce"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Zadatak prodajnog naloga"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,11 +143,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "U slučaju kada prodajete usluge na prodajnim nalozima"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -167,3 +167,9 @@ msgstr ""
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: Neispravan barkod!"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Zadatak prodajnog naloga"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "U slučaju kada prodajete usluge na prodajnim nalozima"
diff --git a/addons/project_mrp/i18n/hu.po b/addons/project_mrp/i18n/hu.po
index bf96f1eb59d..0c000d7d3ef 100644
--- a/addons/project_mrp/i18n/hu.po
+++ b/addons/project_mrp/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-07 16:26+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "A termék típusa szolgáltatás, ez létrehozza a feladatot."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "A szolgáltatáshoz szükséges  feladat létrehozása."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Termék"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Rendelési feladat"
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr "Feladat"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Projekt"
 msgid "Procurement"
 msgstr "Beszerzés"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Vevői megrendelési feladat"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Abban az esetben, ha vevői megrendelésre értékesít szolgáltatásokat."
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -152,3 +152,9 @@ msgstr ""
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Hiba: Érvénytelen vonalkód"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Abban az esetben, ha vevői megrendelésre értékesít szolgáltatásokat."
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Vevői megrendelési feladat"
diff --git a/addons/project_mrp/i18n/id.po b/addons/project_mrp/i18n/id.po
index 40f673c3f45..ac60f0c45f9 100644
--- a/addons/project_mrp/i18n/id.po
+++ b/addons/project_mrp/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:54+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index 1979a97129c..8af0f4b27b7 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 22:36+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Il prodotto è di tipo servizio, quindi crea l'attività."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "Attività creata"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Un'attività viene creata per fornire il servizio."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Riga Ordine di vendita"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Prodotto"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Attività ordine"
 msgid "Procurement Task"
 msgstr "Attività approvvigionamento"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Attività approvvigionamento"
 msgid "Task"
 msgstr "Attività"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,33 +106,13 @@ msgstr "Progetto"
 msgid "Procurement"
 msgstr "Approvvigionamento"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Riga ordine di vendita"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr "Falso"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-"sarà \n"
-"                        creato per seguire il compito da svolgere. Questa "
-"attività apparirà\n"
-"                        nel progetto relativo al contratto dell'ordine di "
-"vendita."
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr "Attività creata."
@@ -125,9 +125,9 @@ msgstr ""
 "rifornimento è 'produrre'"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Attività ordine di vendita"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -144,16 +144,14 @@ msgstr "Ordini di vendita"
 msgid "Order Line"
 msgstr "Riga Ordine"
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Nel caso si vendano servizi tramite ordine di vendita"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
 msgstr "un'attività"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Nel caso si vendano servizi tramite ordine di vendita"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Errore ! Non è possibile creare attività ricorsive."
 
@@ -163,6 +161,9 @@ msgstr "un'attività"
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Integrazione tra gestione progetti e approvvigionamenti"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Attività ordine di vendita"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module creates a link between procurement orders\n"
@@ -212,3 +213,9 @@ msgstr "un'attività"
 
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Il riferimento dell'ordine deve essere unico per ogni azienda!"
+
+#~ msgid "Sale order line"
+#~ msgstr "Riga ordine di vendita"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Riga Ordine di vendita"
diff --git a/addons/project_mrp/i18n/ja.po b/addons/project_mrp/i18n/ja.po
index e887a38d022..066e47c1a54 100644
--- a/addons/project_mrp/i18n/ja.po
+++ b/addons/project_mrp/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-10 03:33+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "製品タイプがサービスの時はタスクを生成します。"
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "タスクはサービスを提供するために作成されます。"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "受注オーダー行"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "製品"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "オーダータスク"
 msgid "Procurement Task"
 msgstr "調達タスク"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "調達タスク"
 msgid "Task"
 msgstr "タスク"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "プロジェクト"
 msgid "Procurement"
 msgstr "調達"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "受注オーダー行"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,9 +124,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr "調達方法がオーダーを作成、かつ供給方法が製造の場合、"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "受注オーダータスク"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,11 +143,6 @@ msgstr "受注オーダー"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "そのケースでは受注オーダーでサービスを売ります。"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -151,6 +151,12 @@ msgstr ""
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "受注オーダータスク"
+
+#~ msgid "Sale order line"
+#~ msgstr "受注オーダー行"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
@@ -159,3 +165,9 @@ msgstr ""
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "エラー：無効な商品識別番号です。"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "そのケースでは受注オーダーでサービスを売ります。"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "受注オーダー行"
diff --git a/addons/project_mrp/i18n/ko.po b/addons/project_mrp/i18n/ko.po
index 1e538bec996..32fd72a633f 100644
--- a/addons/project_mrp/i18n/ko.po
+++ b/addons/project_mrp/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 12:53+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,24 +28,29 @@ msgid "Product type is service, then its creates the task."
 msgstr "상품 타입이 '서비스'이면, 과제를 생성합니다."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "서비스를 제공하기 위한 과제가 생성되었습니다."
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -63,6 +68,11 @@ msgstr "주문 과제"
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr ""
 msgid "Task"
 msgstr "과제"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr ""
 msgid "Procurement"
 msgstr "조달"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,9 +124,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "판매 주문 과제"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,11 +143,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "판매 주문에 따라 서비스를 판매하는 경우"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -156,3 +156,9 @@ msgstr ""
 
 #~ msgid "Procure Task"
 #~ msgstr "조달 과제"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "판매 주문에 따라 서비스를 판매하는 경우"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "판매 주문 과제"
diff --git a/addons/project_mrp/i18n/lt.po b/addons/project_mrp/i18n/lt.po
index c4453f8819d..79569bdfcaa 100644
--- a/addons/project_mrp/i18n/lt.po
+++ b/addons/project_mrp/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/lv.po b/addons/project_mrp/i18n/lv.po
index 642a7c19e3c..cf8a69c58b7 100644
--- a/addons/project_mrp/i18n/lv.po
+++ b/addons/project_mrp/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-02 09:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Produkta tips ir pakalpojums, tad tas veido uzdevumu."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Ir izveidots uzdevums, lai nodrošinātu pakalpojumu."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produkts"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Pasūtījuma uzdevums"
 msgid "Procurement Task"
 msgstr "Sagādes uzdevums"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Sagādes uzdevums"
 msgid "Task"
 msgstr "Uzdevums"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Projekts"
 msgid "Procurement"
 msgstr "Sagāde"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "Ja sagādes metode ir veidot uz pasūtījuma un piegādes metode ir ražot"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Klienta pasūtījuma uzdevums"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Gadījumā, ja tiek pārdoti pakalpojumi uz klientu pasūtījumu"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -155,5 +155,11 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Kļūda: nederīgs EAN kods"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Gadījumā, ja tiek pārdoti pakalpojumi uz klientu pasūtījumu"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Klienta pasūtījuma uzdevums"
+
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Sagādes un projektu vadības integrācija"
diff --git a/addons/project_mrp/i18n/mn.po b/addons/project_mrp/i18n/mn.po
index f41295ec083..f730476853e 100644
--- a/addons/project_mrp/i18n/mn.po
+++ b/addons/project_mrp/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-24 14:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Барааны төрөл нь үйлчилгээ бол энэ нь даалгавар үүсгэдэг."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Үйлчилгээ үзүүлэх даалгавар"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Борлуулалтын захиалгын мөр"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Бараа"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Даалгавар Захиалах"
 msgid "Procurement Task"
 msgstr "Татан авах даалгавар"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Татан авах даалгавар"
 msgid "Task"
 msgstr "Даалгавар"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Төсөл"
 msgid "Procurement"
 msgstr "Татан авалт"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Борлуулалтын захиалгын мөр"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "Хэрэв татан авах арга нь захиалахад хийх бөгөөд нийлүүлэх арга нь үйлдвэрлэх"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Борлуулалтын Захиалгын Даалгавар"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,16 +144,14 @@ msgstr "Борлуулалтын захиалга"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Борлуулалтын захиалгад үйлчилгээ борлуулалх тохиолдолд"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
 msgstr ""
 
+#~ msgid "Sale order line"
+#~ msgstr "Борлуулалтын захиалгын мөр"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Захиалгын код компанийн хэмжээнд үл давхцах байх ёстой!"
 
@@ -159,5 +162,14 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Алдаа: EAN код буруу"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Борлуулалтын Захиалгын Даалгавар"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Борлуулалтын захиалгын мөр"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Борлуулалтын захиалгад үйлчилгээ борлуулалх тохиолдолд"
diff --git a/addons/project_mrp/i18n/nb.po b/addons/project_mrp/i18n/nb.po
index cc24171f2d6..16529ad1e39 100644
--- a/addons/project_mrp/i18n/nb.po
+++ b/addons/project_mrp/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-08-12 17:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,26 +28,31 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produkt"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -63,6 +68,11 @@ msgstr "Ordre oppgave"
 msgid "Procurement Task"
 msgstr "Innkjøps oppgave"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr "Innkjøps oppgave"
 msgid "Task"
 msgstr "Oppgave"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr "Prosjekt"
 msgid "Procurement"
 msgstr "Innkjøp"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Salgs ordre linje"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,9 +124,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Salgs ordre oppgave"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,18 +143,19 @@ msgstr "Salgsordre"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
 msgstr ""
 
+#~ msgid "Sale order line"
+#~ msgstr "Salgs ordre linje"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Ordrereferanse må være unik pr. firma!"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Salgs ordre oppgave"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Feil: Ugyldig ean kode"
diff --git a/addons/project_mrp/i18n/nl.po b/addons/project_mrp/i18n/nl.po
index 7b50a167c96..57939874752 100644
--- a/addons/project_mrp/i18n/nl.po
+++ b/addons/project_mrp/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 14:52+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Productsoort is dienst, dan maakt het de taak aan."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Er is een taak aangemaakt voor het leveren van de dienst"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Verkooporderregel"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Product"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Taak volgorde"
 msgid "Procurement Task"
 msgstr "Verwervingstaak"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Verwervingstaak"
 msgid "Task"
 msgstr "Taak"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Project"
 msgid "Procurement"
 msgstr "Verwerving"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Verkooporderregel"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,9 +124,9 @@ msgstr ""
 "Als verwervingsmethode is 'make to order' en aanvulmethode is produceren"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Verkooporder taak"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,11 +143,6 @@ msgstr "Verkooporder"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Wanneer u dienten levert op verkooporders"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -158,6 +158,12 @@ msgstr ""
 #~ msgid "Procure Task"
 #~ msgstr "Besteltaak"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Verkooporder taak"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Wanneer u dienten levert op verkooporders"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Fout! U kunt geen recursieve taken aanmaken."
 
@@ -216,5 +222,11 @@ msgstr ""
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
 
+#~ msgid "Sale order line"
+#~ msgstr "Verkooporderregel"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Verkooporderregel"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Orderreferentie moet uniek zijn per bedrijf!"
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/project_mrp/i18n/nl_BE.po
index 6d96ddc8d89..4c8dd3e0b83 100644
--- a/addons/project_mrp/i18n/nl_BE.po
+++ b/addons/project_mrp/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 12:23+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 68ac95a1b8f..2df87e12dbe 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 12:39+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-17 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Typ produktu jest 'usługa', czyli tworzone jest zadanie."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "Utworzone zadanie"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Utworzono zadanie dla wykonywanej usługi"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Pozycja zamówienia sprzedaży"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produkt"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Zamów zadanie"
 msgid "Procurement Task"
 msgstr "Zapotrzebowanie na zadanie"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Zapotrzebowanie na zadanie"
 msgid "Task"
 msgstr "Zadanie"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Projekt"
 msgid "Procurement"
 msgstr "Zapotrzebowanie"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Pozycja zamówienia sprzedaży"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr "Fałsz"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr "Zadanie utworzono"
@@ -120,9 +125,9 @@ msgstr ""
 "Produkcja."
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Zadanie do zamówienia sprzedaży"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr "Zamówienie sprzedaży"
 msgid "Order Line"
 msgstr "Pozycja zamówienia"
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "W przypadku sprzedaży usług na zamówienie sprzedaży"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -152,6 +152,9 @@ msgstr "zadanie"
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Zarządzanie projektami - Integracja ze sprzedażą i MRP"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "W przypadku sprzedaży usług na zamówienie sprzedaży"
+
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
@@ -159,3 +162,12 @@ msgstr "zadanie"
 
 #~ msgid "Procure Task"
 #~ msgstr "Utwórz zadanie"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Zadanie do zamówienia sprzedaży"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Pozycja zamówienia sprzedaży"
+
+#~ msgid "Sale order line"
+#~ msgstr "Pozycja zamówienia sprzedaży"
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index dcc0e3e7c07..7ef5bacc104 100644
--- a/addons/project_mrp/i18n/pt.po
+++ b/addons/project_mrp/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:46+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "O Tipo de artigo é um serviço, então ele cria a tarefa."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "Tarefa criada"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Uma tarefa é criada para prover um serviço."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Linha de Ordem de Venda"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Artigo"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Ordem de Tarefa"
 msgid "Procurement Task"
 msgstr "Tarefa de Aquisições"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Tarefa de Aquisições"
 msgid "Task"
 msgstr "Tarefa"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Projeto"
 msgid "Procurement"
 msgstr "Aquisição"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Linha da ordem de venda"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr "Falso"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr "Tarefa criada"
@@ -120,9 +125,9 @@ msgstr ""
 "produzir"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Ordem de Tarefa de Venda"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr "Ordem de Vendas"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Em caso de vendar serviços em ordem de venda"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -159,6 +159,15 @@ msgstr ""
 #~ msgid "Procure Task"
 #~ msgstr "Tarefa Aquisição"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Ordem de Tarefa de Venda"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Em caso de vendar serviços em ordem de venda"
+
+#~ msgid "Sale order line"
+#~ msgstr "Linha da ordem de venda"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Erro ! Não se pode criar tarefas recursivas"
 
@@ -168,5 +177,8 @@ msgstr ""
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Ordem de referência deve ser única por empresa!"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Linha de Ordem de Venda"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/project_mrp/i18n/pt_BR.po
index 3d88499714d..18c9d10af8e 100644
--- a/addons/project_mrp/i18n/pt_BR.po
+++ b/addons/project_mrp/i18n/pt_BR.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-25 01:22+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 14:33+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -25,33 +26,38 @@ msgstr "Para cada produto, no tipo serviço e na ordem"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr "Tipo de produto é serviço, então isto cria a tarefa."
+msgstr "O tipo de produto é serviço, então isto cria uma tarefa."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
-msgstr ""
+msgstr "Tarefa criada"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr "Caso você venda serviços no pedido de venda"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr "Uma tarefa é criada para prover o serviço."
-
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Linha do Pedido de Venda"
+msgstr "Uma tarefa é criada para fornecer o serviço."
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produto"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr "Tarefa no Pedido de Venda"
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr "Se o tipo de produto é 'serviço' então isto cria a tarefa"
+msgstr "Se o tipo de produto é 'serviço' então isto cria uma tarefa"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
@@ -61,7 +67,12 @@ msgstr "Ordem de Tarefa"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr "Taréfa de Aquisição"
+msgstr "Aquisição da Tarefa"
+
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr "Linha do pedido de vendas"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -73,8 +84,23 @@ msgstr "Tarefa"
 
 #. module: project_mrp
 #: view:product.product:0
-msgid "When you sell this service to a customer,"
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
 msgstr ""
+"será\n"
+"                         criado para acompanhar o trabalho a ser feito. Esta "
+"tarefa será exibida\n"
+"                         no projeto relacionado com o contrato do pedido de "
+"vendas."
+
+#. module: project_mrp
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Quando você vender este serviço a um cliente,"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -87,31 +113,16 @@ msgstr "Projeto"
 msgid "Procurement"
 msgstr "Aquisição"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Linha do pedido de venda"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
-msgstr ""
+msgstr "Tarefa criada."
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
@@ -121,9 +132,9 @@ msgstr ""
 "produzir"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Tarefa de Pedido de Venda"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Linha do Pedido de Vendas"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -138,17 +149,12 @@ msgstr "Pedido de Venda"
 #. module: project_mrp
 #: view:project.task:0
 msgid "Order Line"
-msgstr ""
-
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "No caso de venda de serviços no Pedido de Venda"
+msgstr "Linha do Pedido"
 
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
-msgstr ""
+msgstr "uma tarefa"
 
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Erro! Você não pode criar tarefas recursivas."
@@ -159,6 +165,12 @@ msgstr ""
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Integração de Aquisição e Gerenciamento de Projeto"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "No caso de venda de serviços no Pedido de Venda"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Tarefa de Pedido de Venda"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module creates a link between procurement orders\n"
@@ -203,6 +215,12 @@ msgstr ""
 #~ "criadas automaticamente através dos Pedidos de Venda.\n"
 #~ "\n"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Linha do Pedido de Venda"
+
+#~ msgid "Sale order line"
+#~ msgstr "Linha do pedido de venda"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
diff --git a/addons/project_mrp/i18n/ro.po b/addons/project_mrp/i18n/ro.po
index 4a337f19b34..7342b066294 100644
--- a/addons/project_mrp/i18n/ro.po
+++ b/addons/project_mrp/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Tipul de produs este serviciu, apoi este creata sarcina."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "O sarcina este creata pentru a furniza serviciul."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Linia Comenzii de Vanzare"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produs"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Comanda sarcina"
 msgid "Procurement Task"
 msgstr "Activitatea de Aprovizionare"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Activitatea de Aprovizionare"
 msgid "Task"
 msgstr "Sarcina"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Proiect"
 msgid "Procurement"
 msgstr "Aprovizionare"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Linie comanda de vanzare"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "aprovizionare este productie"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Sarcina Comenzii de Vanzare"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr "Comanda de vanzare"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "In cazul in care vindeti servicii la comanda de vanzare"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -155,6 +155,9 @@ msgstr ""
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "integrarea Managementului Aprovizionării si al Proiectului"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "In cazul in care vindeti servicii la comanda de vanzare"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Eroare ! Nu puteti crea sarcini recursive."
 
@@ -210,5 +213,14 @@ msgstr ""
 #~ "Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
 #~ "inceput"
 
+#~ msgid "Sale order line"
+#~ msgstr "Linie comanda de vanzare"
+
+#~ msgid "Sale Order Task"
+#~ msgstr "Sarcina Comenzii de Vanzare"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Linia Comenzii de Vanzare"
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index 1f4910f9260..e87bb8a523c 100644
--- a/addons/project_mrp/i18n/ru.po
+++ b/addons/project_mrp/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 09:49+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "Задача создана"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Позиция заказа продажи"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Товар"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr "Задание"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -154,5 +154,8 @@ msgstr ""
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Ошибка! Вы не можете создавать рекурсивные задачи."
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Позиция заказа продажи"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
diff --git a/addons/project_mrp/i18n/sl.po b/addons/project_mrp/i18n/sl.po
index 8c70039b170..110975f243b 100644
--- a/addons/project_mrp/i18n/sl.po
+++ b/addons/project_mrp/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 09:35+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr "Naloga - naročilo"
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr "Opravilo"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr "Nabava"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Naloga - prodajni naročilo"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -137,15 +142,16 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "V primeru, da storitve prodajate preko prodajnega naročila"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
 msgstr ""
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Naloga - prodajni naročilo"
+
 #~ msgid "Procure Task"
 #~ msgstr "Naloga - nabavi"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "V primeru, da storitve prodajate preko prodajnega naročila"
diff --git a/addons/project_mrp/i18n/sq.po b/addons/project_mrp/i18n/sq.po
index 61f428a29a1..23cf4356869 100644
--- a/addons/project_mrp/i18n/sq.po
+++ b/addons/project_mrp/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,24 +28,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -63,6 +68,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,8 +124,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -138,11 +143,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/sv.po b/addons/project_mrp/i18n/sv.po
index dc944da1c54..bdb27569c05 100644
--- a/addons/project_mrp/i18n/sv.po
+++ b/addons/project_mrp/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:08+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Product type is service, then its creates the task."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "A task is created to provide the service."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Orderrad"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Produkt"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Order Task"
 msgid "Procurement Task"
 msgstr "Anskaffningsaktivitet"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Anskaffningsaktivitet"
 msgid "Task"
 msgstr "Task"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Projekt"
 msgid "Procurement"
 msgstr "Procurement"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Orderrad"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -120,9 +125,9 @@ msgstr ""
 "framställa"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -139,11 +144,6 @@ msgstr "Kundorder"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "In case you sell services on sale order"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -158,9 +158,18 @@ msgstr ""
 #~ msgid "Procure Task"
 #~ msgstr "Procure Task"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Sale Order Task"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "In case you sell services on sale order"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
 
+#~ msgid "Sale order line"
+#~ msgstr "Orderrad"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter."
 
@@ -169,3 +178,6 @@ msgstr ""
 
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Orderreferensen måste vara unik per bolag!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Orderrad"
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/project_mrp/i18n/tlh.po
index da8abc34ae0..c7904710901 100644
--- a/addons/project_mrp/i18n/tlh.po
+++ b/addons/project_mrp/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index f4b1d2a417d..246f136e346 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-09 07:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "Ürün türü hizmettir, sonra görev oluşturur."
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "Hizmetin sağlanması için bir görev oluşturuldu."
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Satış Sipariş Satırı"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "Ürün"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "Sipariş Görevi"
 msgid "Procurement Task"
 msgstr "Satınalma Görevi"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "Satınalma Görevi"
 msgid "Task"
 msgstr "Görev"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr "Proje"
 msgid "Procurement"
 msgstr "Satınalma"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "Satış Siparişi Satırı"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr "Eğer satınalma yöntemi sipariş etmek ve tedarik yöntemi üretmekse"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "Satış Sipariş Görevi"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -137,11 +142,6 @@ msgstr "Satış Siparişi"
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "Satış siparişi üzerine hizmet satılması durumunda"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
@@ -150,14 +150,26 @@ msgstr ""
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Proje Yönetimi - MRP ve Satış Entegrasyonu"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "Satış Sipariş Görevi"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Hata: Geçersiz barkod"
 
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Hata! görev bitiş tarihi başlangıç tarihinden sonra olmalı"
 
+#~ msgid "Sale order line"
+#~ msgstr "Satış Siparişi Satırı"
+
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Hata ! Yinelenen görevler oluşturamazsınız."
 
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Sipariş Kaynağı Her Şirket İçin Eşsiz Olmalı!"
+
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "Satış siparişi üzerine hizmet satılması durumunda"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Satış Sipariş Satırı"
diff --git a/addons/project_mrp/i18n/uk.po b/addons/project_mrp/i18n/uk.po
index 8a1cdc77bda..a32a083c2c3 100644
--- a/addons/project_mrp/i18n/uk.po
+++ b/addons/project_mrp/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/vi.po b/addons/project_mrp/i18n/vi.po
index 56d3ea19873..8960d816dec 100644
--- a/addons/project_mrp/i18n/vi.po
+++ b/addons/project_mrp/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -28,24 +28,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -63,6 +68,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -71,6 +81,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -87,28 +107,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -119,8 +124,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -138,11 +143,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 22ced7ff88b..dd4dd331be6 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:50+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,26 +27,31 @@ msgid "Product type is service, then its creates the task."
 msgstr "产品类型是服务创建这任务"
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr "任务已创建"
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr "创建一提供服务的任务"
 
-#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "销售订单明细"
-
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
 msgstr "产品"
 
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
@@ -62,6 +67,11 @@ msgstr "订单任务"
 msgid "Procurement Task"
 msgstr "需求任务"
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr "需求任务"
 msgid "Task"
 msgstr "任务"
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,31 +106,13 @@ msgstr "项目"
 msgid "Procurement"
 msgstr "需求"
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr "销售订单明细"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr "False"
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-"将被创建为\n"
-"                   以跟进要做的作业。此任务将显示\n"
-"                   在项目中销售订单有关的合同。"
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr "任务已创建"
@@ -121,9 +123,9 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr "如果补货方式为按订单而且供应方式为自制"
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
-msgstr "销售订单任务"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -140,16 +142,14 @@ msgstr "销售订单"
 msgid "Order Line"
 msgstr "订单明细"
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr "在销售订单这事务是销售服务"
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
 msgstr "一个任务"
 
+#~ msgid "Sale Order Task"
+#~ msgstr "销售订单任务"
+
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr "如果采购方式是按单和供应方式是生产"
 
@@ -159,6 +159,9 @@ msgstr "一个任务"
 #~ msgid "Procure Task"
 #~ msgstr "获得任务"
 
+#~ msgid "In case you sell services on sale order"
+#~ msgstr "在销售订单这事务是销售服务"
+
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "错误！任务结束日期必须大于任务开始日期"
 
@@ -209,5 +212,11 @@ msgstr "一个任务"
 #~ "这个模块适用于针对任务开发票的公司按订单创建任务。\n"
 #~ "\n"
 
+#~ msgid "Sale order line"
+#~ msgstr "销售订单明细"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "销售订单明细"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "采购订单号必须在一个公司范围内唯一"
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/project_mrp/i18n/zh_TW.po
index 716b34fdc60..8dee4ed08d3 100644
--- a/addons/project_mrp/i18n/zh_TW.po
+++ b/addons/project_mrp/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:15+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -27,24 +27,29 @@ msgid "Product type is service, then its creates the task."
 msgstr ""
 
 #. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
 #, python-format
 msgid "Task created"
 msgstr ""
 
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
+msgstr ""
+
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
 msgstr ""
 
 #. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_product_product
-msgid "Product"
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
 msgstr ""
 
 #. module: project_mrp
@@ -62,6 +67,11 @@ msgstr ""
 msgid "Procurement Task"
 msgstr ""
 
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -70,6 +80,16 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#. module: project_mrp
+#: view:product.product:0
+msgid ""
+"will be \n"
+"                        created to follow up the job to do. This task will "
+"appear\n"
+"                        in the project related to the contract of the sales "
+"order."
+msgstr ""
+
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
@@ -86,28 +106,13 @@ msgstr ""
 msgid "Procurement"
 msgstr ""
 
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
 msgstr ""
 
 #. module: project_mrp
-#: view:product.product:0
-msgid ""
-"will be \n"
-"                        created to follow up the job to do. This task will "
-"appear\n"
-"                        in the project related to the contract of the sale "
-"order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
 #, python-format
 msgid "Task created."
 msgstr ""
@@ -118,8 +123,8 @@ msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: project_mrp
@@ -137,11 +142,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
diff --git a/addons/project_timesheet/i18n/ar.po b/addons/project_timesheet/i18n/ar.po
index d6b01f83f77..30d6bae23cb 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "تجميع حسب..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "انشء فاتورة من خطوط امر البيع"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr "مجموعة بتاريخ من تاريخ"
 msgid "Task"
 msgstr "مهمة"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "عمل مهام الفاتورة"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "ضيط سيء !"
 msgid "Invoicing"
 msgstr "الفواتير"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "العمل على المهمة"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -462,6 +462,9 @@ msgstr "املئ سجل الدوام"
 #~ msgid "Cannot delete Partner which is Assigned to project  !"
 #~ msgstr "لا يمكن حذف الشريك المُعين للمشروع !"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "عمل مهام الفاتورة"
+
 #~ msgid "Project Timesheet"
 #~ msgstr "سجل الدوام للمشروع"
 
@@ -495,6 +498,9 @@ msgstr "املئ سجل الدوام"
 #~ "تبين لك تلك القوائم كل عمل مهمة يمكن عمل الفاتورة لها للعميل. اختار الخطوط "
 #~ "بالترتيب لانتاج الفواتير تلقائيًا."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "انشء فاتورة من خطوط امر البيع"
+
 #~ msgid ""
 #~ "\n"
 #~ "        This module lets you transfer the entries under tasks defined for "
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index dc237d89ede..9a31f3e32ea 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index 5b766de7730..0b3a0d9aad8 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:22+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Loša Konfiguracija !"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index f4fe8ef3646..ab504a06354 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 13:49+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Agrupa per..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Activa factures des de línies de comandes de venda"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr "Tasca"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Factura treball de les tasques"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Configuració errònia!"
 msgid "Invoicing"
 msgstr "Facturació"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Treballa en tasca"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -456,6 +456,9 @@ msgstr "Emplena fulla de serveis"
 #~ msgid "Invoiceable"
 #~ msgstr "Facturable"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Factura treball de les tasques"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Acció no vàlida!"
@@ -478,6 +481,9 @@ msgstr "Emplena fulla de serveis"
 #~ msgid "Invoice Task Work"
 #~ msgstr "Factura treball de la tascta"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Activa factures des de línies de comandes de venda"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Error! No podeu crear membres associats recursivament."
 
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index 0cfabc9135d..1df2868423d 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 14:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Špatná konfigurace !"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/da.po b/addons/project_timesheet/i18n/da.po
index 135eb3c13ec..4d8444c2d48 100644
--- a/addons/project_timesheet/i18n/da.po
+++ b/addons/project_timesheet/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index f4ca0cd56a7..a28e5870c7d 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:27+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Löse Rechnungen durch Verkaufsauftragspositionen aus"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -197,12 +192,6 @@ msgstr "Gruppiere je Monat"
 msgid "Task"
 msgstr "Aufgabe"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Abrechnen Arbeitszeit"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -345,6 +334,11 @@ msgstr "Falsche Konfiguration !"
 msgid "Invoicing"
 msgstr "Fakturierung"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -372,6 +366,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Aufgaben in Bearbeitung"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -440,6 +440,9 @@ msgstr "Zeiterfassung vervollständigen"
 #~ msgid "Project Timesheet"
 #~ msgstr "Projekt Zeiterfassung"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Abrechnen Arbeitszeit"
+
 #~ msgid "Invoicing Data"
 #~ msgstr "Abrechnungsdaten"
 
@@ -567,6 +570,9 @@ msgstr "Zeiterfassung vervollständigen"
 #~ "Arbeitszeit\" \n"
 #~ "auf dem Reiter \"Fakturierung\" im Projektformular zu definieren."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Löse Rechnungen durch Verkaufsauftragspositionen aus"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Ungültige Aktion!"
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index 101a3e4840e..c186ff63499 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-06-15 07:22+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -185,12 +180,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -326,6 +315,11 @@ msgstr "Λάθος ρυθμίσεις!"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -348,6 +342,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index a73ee2c5fde..1162f938173 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 19:06+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:48+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Disparar facturas desde líneas de pedidos de venta"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -199,12 +194,6 @@ msgstr "Agrupar por mes"
 msgid "Task"
 msgstr "Tarea"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Facturar trabajo de las tareas"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -347,6 +336,11 @@ msgstr "¡ Configuración errónea !"
 msgid "Invoicing"
 msgstr "Facturación"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr "Lanzar facturas desde las líneas de pedido de venta"
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -374,6 +368,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Trabajar en tarea"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr "Facturar tareas"
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -472,6 +472,9 @@ msgstr "Rellenar hoja de servicios"
 #~ msgstr ""
 #~ "No se ha definido un empleado para el usuario \"%s\". Debe crear uno."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Disparar facturas desde líneas de pedidos de venta"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
@@ -508,6 +511,9 @@ msgstr "Rellenar hoja de servicios"
 #~ msgid "Invoiceable"
 #~ msgstr "Facturable"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Facturar trabajo de las tareas"
+
 #~ msgid "Bill Tasks Works"
 #~ msgstr "Facturar los trabajos de las tareas"
 
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index 9fa3c456cea..c9abe4e9118 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-22 20:01+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "¡Configuración errónea!"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/es_CR.po b/addons/project_timesheet/i18n/es_CR.po
index cfa083e0357..4e97a49b5fd 100644
--- a/addons/project_timesheet/i18n/es_CR.po
+++ b/addons/project_timesheet/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 23:00+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: project_timesheet
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Disparar facturas desde líneas de pedidos de venta"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr "Agrupado por mes de fecha"
 msgid "Task"
 msgstr "Tarea"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Facturar trabajo de las tareas"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "¡ Configuración errónea !"
 msgid "Invoicing"
 msgstr "Facturación"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Trabajar en tarea"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -421,6 +421,9 @@ msgstr "Rellenar hoja de servicios"
 #~ msgstr ""
 #~ "¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Disparar facturas desde líneas de pedidos de venta"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
@@ -433,6 +436,9 @@ msgstr "Rellenar hoja de servicios"
 #~ msgid "Invalid action !"
 #~ msgstr "¡Acción no válida!"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Facturar trabajo de las tareas"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index 79dc70f0ab1..eb8d0650164 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 5f6d4a3bb65..633a9eea407 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-18 14:08+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Ryhmittele"
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Liipaise laskutus myyntitilausriveistä"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr "Ryhmittele kuukauden mukaan"
 msgid "Task"
 msgstr "Tehtävä"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Laskuta tehtävän työt"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Virheellinen konfiguraatio !"
 msgid "Invoicing"
 msgstr "Laskutus"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Tehtävälle tehty työ"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -441,6 +441,9 @@ msgstr "Täytä tuntilista"
 #~ msgid "Working Hours"
 #~ msgstr "Työtunnit"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Laskuta tehtävän työt"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Virheellinen toiminto!"
@@ -466,6 +469,9 @@ msgstr "Täytä tuntilista"
 #~ msgid "My Timesheet"
 #~ msgstr "Oma tuntilista"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Liipaise laskutus myyntitilausriveistä"
+
 #~ msgid " Month-1 "
 #~ msgstr " Kuukausi-1 "
 
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 1951f7ea4fa..c523bdf4943 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 19:27+0000\n"
 "Last-Translator: swinter <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Regrouper par..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Déclencher des factures depuis des lignes de commandes de ventes"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr "Regrouper par mois"
 msgid "Task"
 msgstr "Tâche"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Facturer le travail des tâches"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Mauvaise configuration !"
 msgid "Invoicing"
 msgstr "Facturation"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Travaille sur la tâche"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -430,6 +430,9 @@ msgstr "Remplir la feuille de temps"
 #~ msgid "Invoice Task Work"
 #~ msgstr "Facturer le travail de la tâche"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Facturer le travail des tâches"
+
 #, python-format
 #~ msgid ""
 #~ "No journal defined on the related employee.\n"
@@ -438,6 +441,9 @@ msgstr "Remplir la feuille de temps"
 #~ "Pas de journal défini sur l'employé concerné.\n"
 #~ "Remplissez l'onglet de la feuille de temps du formulaire de l'employé"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Déclencher des factures depuis des lignes de commandes de ventes"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr ""
 #~ "Erreur! La date de début du projet doit être antérieure à la date de fin du "
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index 84f0bf3420c..abcd091b040 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: project-timesheet-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-08-17 08:29+0000\n"
 "Last-Translator: Frco. Javier Rial <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -184,12 +179,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -325,6 +314,11 @@ msgstr "¡Configuración errada!"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -347,6 +341,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index aac31b22934..9fae139d3e6 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-12 11:28+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Automatsko kreiranje računa iz stavki prodajnog naloga"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr "Task"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Fakturiraj radove"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr "Fakturiranje"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Work on task"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -410,12 +410,18 @@ msgstr "Popuni ev. rada"
 #~ msgid "Error ! Task end-date must be greater then task start-date"
 #~ msgstr "Pogreška! Datum završetka zadatka mora biti veći od datuma početka."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Automatsko kreiranje računa iz stavki prodajnog naloga"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Error! project start-date must be lower then project end-date."
 
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Greška! Rekurzivni zadaci."
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Fakturiraj radove"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Pogreška! Ne možete dodijeliti eskalacije na isti projekt!"
 
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index dd1ad79cc4e..12eb98e3afd 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-08 09:31+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Csoportosítás..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Vevői megrendelés sorokból számlák készítése"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr "Feladat"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Feladatmunka számlázása"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Rossz konfiguráció !"
 msgid "Invoicing"
 msgstr "Számlázás"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Feladaton lévő munka"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -454,6 +454,9 @@ msgstr "Munkaidő-kimutatás kitöltése"
 #~ msgstr ""
 #~ "\"%s\" felhasználóra nem állítottak be alkalmazottat. Kérem, hozza létre."
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Feladatmunka számlázása"
+
 #~ msgid "Invoiceable"
 #~ msgstr "Számlázható"
 
@@ -501,6 +504,9 @@ msgstr "Munkaidő-kimutatás kitöltése"
 #~ "\n"
 #~ "    "
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Vevői megrendelés sorokból számlák készítése"
+
 #, python-format
 #~ msgid ""
 #~ "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index 850fd39c86c..746d7ce2af4 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:54+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Konfigurasi Buruk!"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index 171e86fcec4..9469520e608 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 22:48+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Attiva la fatturazione dalle linee dell'ordine di vendita"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -190,12 +185,6 @@ msgstr "Raggruppa per mese"
 msgid "Task"
 msgstr "Attività"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Fattura Ore sulle Attività"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -332,6 +321,11 @@ msgstr "Configurazione errata!"
 msgid "Invoicing"
 msgstr "Fatturazione"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -354,6 +348,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Lavoro sull'attivià"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -486,3 +486,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Questa lista mostra ogni lavoro sull'attività che si può fatturare al "
 #~ "cliente. Seleziona le linee per generare le fatture automaticamente."
+
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Attiva la fatturazione dalle linee dell'ordine di vendita"
+
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Fattura Ore sulle Attività"
diff --git a/addons/project_timesheet/i18n/ja.po b/addons/project_timesheet/i18n/ja.po
index 64c4a8819ab..1865fd1ae02 100644
--- a/addons/project_timesheet/i18n/ja.po
+++ b/addons/project_timesheet/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-12 02:02+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "グループ化…"
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "受注オーダーが起因となる請求書"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr "日付の月でグループ化"
 msgid "Task"
 msgstr "タスク"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "請求タスク作業"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "設定が正しくありません。"
 msgid "Invoicing"
 msgstr "請求"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "タスクの作業"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -446,6 +446,9 @@ msgstr "タイムシートを埋める"
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "請求タスク作業"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
 
@@ -458,6 +461,9 @@ msgstr "タイムシートを埋める"
 #~ msgid "Task Hours in current year"
 #~ msgstr "今年のタスク時間"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "受注オーダーが起因となる請求書"
+
 #~ msgid "Invoicing Data"
 #~ msgstr "請求書データ"
 
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index a441cea7f15..2aeebe68101 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 15:12+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "잘못된 구성 !"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 3ac66cb264a..e443da85799 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 15:25+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index 65de8988d76..24c9270cb3b 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-01 13:07+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Grupēt pēc..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Iniciē rēķinus no klientu pasūtījumu rindām"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr "Uzdevums"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Izrakstīt rēķinu par uzdevumu darbu"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Nepareiza konfigurācija!"
 msgid "Invoicing"
 msgstr "Rēķinu izrakstīšana"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Darbs pie uzdevuma"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -443,12 +443,18 @@ msgstr "Aizpildiet darba uzsk. tabeli"
 #~ msgid "No employee defined for user \"%s\". You must create one."
 #~ msgstr "Lietotājam '%s' nav definēts darbinieks, kas obligāti jāizveido."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Iniciē rēķinus no klientu pasūtījumu rindām"
+
 #~ msgid " Year "
 #~ msgstr " Gads "
 
 #~ msgid "Invoiceable"
 #~ msgstr "Izrakstāmi rēķini"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Izrakstīt rēķinu par uzdevumu darbu"
+
 #~ msgid "Bill Tasks Works"
 #~ msgstr "Izrakstīt rēķinus par uzdevumu darbu"
 
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index 422cc454e75..3891be615a9 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-11 03:11+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Борлуулалтын захиалгын мөрөөс нэхэмжлэх үүсгэх"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr "Огнооны сараар бүлэглэх"
 msgid "Task"
 msgstr "Даалгавар"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Буруу Тохиргоо !"
 msgid "Invoicing"
 msgstr "Нэхэмжлэл"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Даалгавар дахь ажил"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -442,6 +442,9 @@ msgstr "Цагийн хуудсыг бөглөх"
 #~ "Энд захиалагчийн төсөлтэй холбогдсон гэрээнүүдийг харах болно. Энэ нь "
 #~ "нэхэмжлэх явцыг зөвх хянахад туслана."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Борлуулалтын захиалгын мөрөөс нэхэмжлэх үүсгэх"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Алдаатай үйлдэл !"
@@ -452,6 +455,9 @@ msgstr "Цагийн хуудсыг бөглөх"
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index a92afdb819d..93c95ffc386 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-13 07:57+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Trigger facturatie van verkooporder regels"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr "Groepeer op maand of datum"
 msgid "Task"
 msgstr "Taak"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Te factureren werkzaamheden"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Fout in configuratie !"
 msgid "Invoicing"
 msgstr "Facturatie"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Werken aan taak"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -486,6 +486,9 @@ msgstr "Urenstaat invullen"
 #~ msgid "My Timesheet"
 #~ msgstr "Mijn urenstaat"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Trigger facturatie van verkooporder regels"
+
 #~ msgid " Month "
 #~ msgstr " Maand "
 
@@ -564,5 +567,8 @@ msgstr "Urenstaat invullen"
 #~ msgstr ""
 #~ "Geen werknemer gedefinieerd voor gebruiker \"%s\". U moet er een maken."
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Te factureren werkzaamheden"
+
 #~ msgid "Bill Tasks Works"
 #~ msgstr "Te factureren werkzaamheden"
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index 2ca4f0c06d7..334e4a0faf8 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-14 02:28+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index edd8bc66a86..28cd69d6aea 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 12:58+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Twórz faktury z pozycji zamówienia sprzedaży"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -196,12 +191,6 @@ msgstr "Grupuj według miesiąca"
 msgid "Task"
 msgstr "Zadanie"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Fakturuj przebieg zadania"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -344,6 +333,11 @@ msgstr "Błędna konfiguracja !"
 msgid "Invoicing"
 msgstr "Fakturowanie"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -370,6 +364,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Przebieg zadania"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -446,12 +446,18 @@ msgstr "Wypełnij kartę czasu pracy"
 #~ "Nie zdefiniowano dziennika dla pracownika.\n"
 #~ "Wprowadź w formularzu pracownika w zakładce karta pracy."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Twórz faktury z pozycji zamówienia sprzedaży"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Błąd ! data początkowa projektu musi być mniejsza od daty końcowej."
 
 #~ msgid " Year "
 #~ msgstr " Rok "
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Fakturuj przebieg zadania"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Błąd! Nie możesz wiązać przedziału do tego samego projektu!"
 
diff --git a/addons/project_timesheet/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index d3015b2a567..eb202565d9c 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-04 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Acionar faturas a partir de linhas de ordem de venda"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr "Grupo por mês da data"
 msgid "Task"
 msgstr "Tarefa"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Fatura da tarefa de trabalho"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Má Configuração!"
 msgid "Invoicing"
 msgstr "Faturação"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Trabalhar em tarefas"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -538,10 +538,16 @@ msgstr "Preencha a folha de horas"
 #~ "Não pode excluir um sócio que é atribuído ao projeto, sugerimos que "
 #~ "desmarque a caixa ativa!"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Acionar faturas a partir de linhas de ordem de venda"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Ação Inválida!"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Fatura da tarefa de trabalho"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Erro! Não pode atribuir uma escaltion ao mesmo projeto!"
 
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 2e15734e772..8341e837203 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-06 17:53+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 16:04+0000\n"
+"Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\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: 2012-12-07 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Disparar faturas a partir dos itens da ordem de venda"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -115,7 +110,7 @@ msgstr "Conta Analítica/Projeto"
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr "Conta Analítica/Projeto"
+msgstr "Conta analítica/projeto"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
@@ -130,9 +125,9 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
-"Por favor defina produto e propriedades da conta de produto no colaborador "
+"Por favor defina produto e propriedades da conta de produto no funcionário "
 "relacionado.\n"
-"Preencha na aba de Configurações de RH do formulário do colaborador."
+"Preencha na aba de Configurações de RH do formulário do funcionário."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -166,8 +161,8 @@ msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
-"Por favor informe o diário no colaborador relacionado\n"
-"Preencha na aba de apontamento de horas no formulário do colaborador."
+"Por favor informe o diário no funcionário relacionado\n"
+"Preencha na aba de apontamento de horas no formulário do funcionário."
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -199,12 +194,6 @@ msgstr "Agrupar por mês da data"
 msgid "Task"
 msgstr "Tarefa"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Fatura de Tarefas em andamento"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -225,7 +214,7 @@ msgstr "Julho"
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr "Complete sua Planilha de Tempo"
+msgstr "Complete sua Planilha de Horas"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
@@ -315,7 +304,7 @@ msgstr "Codifique quanto tempo você gastou em sua tarefa"
 #: code:addons/project_timesheet/project_timesheet.py:85
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
-msgstr "Defina um colaborador para o usuário \"%s\". Você deve criá-lo."
+msgstr "Crie um funcionário para o usuário \"%s\"."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -347,6 +336,11 @@ msgstr "Mal configurado !"
 msgid "Invoicing"
 msgstr "Faturamento"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr "Disparar faturas das linhas de pedido de vendas"
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -355,6 +349,9 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Por favor, defina o produto e a conta da categoria de produto no funcionário "
+"relacionado.\n"
+"Preencha a aba da planilha de de horás no formulário do funcionário."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:60
@@ -371,6 +368,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Trabalho na Tarefa"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr "Faturar Tarefas"
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -391,7 +394,7 @@ msgstr "Dezembro"
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr "Depois da tarefa concluída, Criar sua nota fiscal"
+msgstr "Depois da tarefa concluída, Criar as faturas"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:266
@@ -451,6 +454,9 @@ msgstr "Preencher Planilha de Horas"
 #~ msgstr ""
 #~ "Nenhum funcionário definido para o usuário \"%s\". Você precisa criar um."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Disparar faturas a partir dos itens da ordem de venda"
+
 #~ msgid "Invoiceable"
 #~ msgstr "Faturável"
 
@@ -460,6 +466,9 @@ msgstr "Preencher Planilha de Horas"
 #~ msgid "Invoice Task Work"
 #~ msgstr "Fatura de Tarefas em andamento"
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Fatura de Tarefas em andamento"
+
 #, python-format
 #~ msgid ""
 #~ "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index 0a1a7f4fe13..326fea5baab 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Grupeaza dupa..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Declanseaza facturi din liniile comenzii de vanzare"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr "Grupeaza dupa luna"
 msgid "Task"
 msgstr "Sarcina"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Factureaza Sarcina de lucru"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Configurare gresita !"
 msgid "Invoicing"
 msgstr "Facturare"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Lucrul la sarcina"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -511,6 +511,9 @@ msgstr "Completeaza Fisa de pontaj"
 #~ "Aici veti gasi contractele referitoare la proiectele clientilor d-voastra "
 #~ "pentru a tine evidenta progresului facturarii."
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Declanseaza facturi din liniile comenzii de vanzare"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Actiune nevalida !"
@@ -526,6 +529,9 @@ msgstr "Completeaza Fisa de pontaj"
 #~ "Eroare! data de inceput a proiectului trebuie să fie mai mica decat data de "
 #~ "sfarsit a proiectului."
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Factureaza Sarcina de lucru"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "Eroare! Nu puteti atribui o avansare aceluiasi proiect!"
 
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index f18b4940486..09b9fd7454e 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:41+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Неправильная настройка!"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index ea9bcef5fcc..17fda5d926c 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 15:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Nepravilna konfiguracija!"
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/sq.po b/addons/project_timesheet/i18n/sq.po
index 0cc97505e5a..59aa74c30d3 100644
--- a/addons/project_timesheet/i18n/sq.po
+++ b/addons/project_timesheet/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index 46f1bbb99c4..a3a0de69801 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:14+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Gruppera på..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "Utlös faktura från försäljningsorderrader"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr "Gruppera månadsvis"
 msgid "Task"
 msgstr "Aktivitet"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "Fakturera aktivitetsarbete"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr "Felaktig konfiguration !"
 msgid "Invoicing"
 msgstr "Fakturering"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr "Arbete på aktiviteten"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -424,6 +424,9 @@ msgstr "Fyll i tidrapport"
 #~ msgid "Task Hours in current month"
 #~ msgstr "Aktivitetstimmar i aktuell månad"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Utlös faktura från försäljningsorderrader"
+
 #~ msgid "Error! project start-date must be lower then project end-date."
 #~ msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
 
@@ -437,6 +440,9 @@ msgstr "Fyll i tidrapport"
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter."
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "Fakturera aktivitetsarbete"
+
 #~ msgid "Customer"
 #~ msgstr "Kund"
 
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index 89157e10ab6..6088c6d8c2a 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 6d7368191f6..250d261afc9 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 19:58+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 4e3f963f255..d6f3cffd282 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/vi.po b/addons/project_timesheet/i18n/vi.po
index 3cc3ac27bfe..929c57ed703 100644
--- a/addons/project_timesheet/i18n/vi.po
+++ b/addons/project_timesheet/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-19 22:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Nhóm theo..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -183,12 +178,6 @@ msgstr ""
 msgid "Task"
 msgstr "Nhiệm vụ"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -324,6 +313,11 @@ msgstr "Cấu hình không hợp lệ !"
 msgid "Invoicing"
 msgstr "Hóa đơn"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -346,6 +340,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index d45d843921c..fe89f5bec58 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 07:56+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr "你不能选择关闭或者取消状态的辅助核算项"
 msgid "Group By..."
 msgstr "分组..."
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr "按销售订单明细开发票"
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -190,12 +185,6 @@ msgstr "按月分组"
 msgid "Task"
 msgstr "任务"
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr "根据任务进展开发票"
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -336,6 +325,11 @@ msgstr "配置错误"
 msgid "Invoicing"
 msgstr "开发票"
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -360,6 +354,12 @@ msgstr "<p>根据合同的条款，项目的计工单可开票给 %s </p>"
 msgid "Work on task"
 msgstr "任务进展"
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
@@ -441,6 +441,9 @@ msgstr "输入计工单"
 #~ msgid " Year "
 #~ msgstr " 年 "
 
+#~ msgid "Invoice Tasks Work"
+#~ msgstr "根据任务进展开发票"
+
 #~ msgid "Error! You cannot assign escalation to the same project!"
 #~ msgstr "不能升级到相同的项目"
 
@@ -511,6 +514,9 @@ msgstr "输入计工单"
 #~ "the lines in order to generate the invoices automatically."
 #~ msgstr "这里列出了所有可以向客户开发票的工作进展。选择对应行生成发票"
 
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "按销售订单明细开发票"
+
 #~ msgid " Month "
 #~ msgstr " 月份 "
 
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index 8748a32bc8f..d75fe891d5a 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:16+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
@@ -182,12 +177,6 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
@@ -323,6 +312,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
 #, python-format
@@ -345,6 +339,12 @@ msgstr ""
 msgid "Work on task"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index db6adc807b6..1a0bffb7efb 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-08 16:00+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "تضع قائمة الاسعار العملة المستخدمه لامر البيع هذا. وهي تحسب سعر المورد "
 "للمنتجات المختارة/الكميات."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "يجب عليك أولا إلغاء جميع حفلات الاستقبال المتعلقة بهذا أمر الشراء."
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr "الشراء-السعر المثالي"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "تحقق من صلاحيته بواسطة"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "متوسط السعر"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -232,7 +218,7 @@ msgid ""
 msgstr "تم حسابها كأدنى حد للتاريخ المجدول لكل منتجات خطوط امر الشراء."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -257,29 +243,12 @@ msgstr "${object.company_id.name} أمر (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "كمية مادون الضرائب الكلية"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "فئة"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -348,14 +317,16 @@ msgid "October"
 msgstr "أكتوبر"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -383,12 +354,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "كمية"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -446,12 +411,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -472,6 +431,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "تاريخ مجدول"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -504,6 +468,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -526,6 +503,11 @@ msgstr ""
 "تُنشأ الفاتورة تلقائيًا اذا كان التحكم في الفاتورة لامر الشراء ‘مطلوبة‘. "
 "يمكن للفاتورة ايضًا ان تُجمع من المحاسب (التحكم في الفاتورة=يدوي)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -545,6 +527,11 @@ msgstr ""
 "سيقبل المشتري (الحصة المطلوبة) قبل ان تُرسل إلى المورد. وتصبح (الحصة "
 "المطلوبة) امر شراء مؤكد."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -570,7 +557,7 @@ msgid "Supplier"
 msgstr "مورِّد"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -594,7 +581,6 @@ msgstr "المجموع الفرعي"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "تاريخ التلقي"
 
@@ -635,6 +621,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -642,7 +635,7 @@ msgid "# of Lines"
 msgstr "عدد السطور"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -663,8 +656,8 @@ msgid "It indicates that a picking has been done"
 msgstr "توضح انه قد تم عمل الاختيار"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -728,6 +721,15 @@ msgstr "قائمة الأسعار"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -759,6 +761,11 @@ msgstr "مسودة للفاتورة"
 msgid "The tax amount"
 msgstr "كمية الضرائب"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -791,7 +798,7 @@ msgid "Stock Moves"
 msgstr "حركات الأسهم"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -811,11 +818,6 @@ msgstr "وهي توضح انه قد تم دفع الفاتورة"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -909,12 +911,6 @@ msgstr "الكمية"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -949,14 +945,89 @@ msgid "Date Approved"
 msgstr "تاريخ الموافقة"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -998,16 +1069,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1020,13 +1086,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1038,19 +1109,13 @@ msgstr "وحدة القياس"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "لوحة قيادة الشراء"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1089,15 +1154,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "حدد امر بيع مفتوحة"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "حفظ كمسودة"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1128,7 +1200,7 @@ msgid "Stock Move"
 msgstr "حركة مخزن"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1230,7 +1302,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "يقوم خط امر الشراء بعمل الفاتورة"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1331,7 +1403,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1342,9 +1414,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "الفواتير اليدوية"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1498,8 +1570,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1611,8 +1683,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1684,11 +1757,11 @@ msgid "Purchase Order"
 msgstr "أمر الشراء"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1709,15 +1782,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"تجمع القائمة المختاره الفاتورة. بالاعتماد على تحكم فاتورة امر البيع, تعتمد "
-"الفاتورة على التسليم او الكمية المأمور بها."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1731,9 +1795,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1821,7 +1884,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "يقوم بالبيع لهذا المنتج المود المختار فقط بواسطة %s"
@@ -1866,6 +1929,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "المنتجات الصادرة للفاتورة"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "تحقق من صلاحيته بواسطة"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1956,9 +2025,9 @@ msgid "November"
 msgstr "نوفمبر"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "الفواتير اليدوية"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1980,13 +2049,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2007,89 +2069,6 @@ msgstr "طلب التسعير"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2100,6 +2079,12 @@ msgstr "الأوامر الكلية للمستخدم عن كل شهر"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2107,15 +2092,7 @@ msgid "Warehouse"
 msgstr "المخزن"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2195,8 +2172,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2205,6 +2182,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "اصدارات قائمة الاسعار"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2372,6 +2354,9 @@ msgstr "الطلبيّات"
 #~ "النتجات, الخ. لكل امر شراء, يمكنك متابعة البضاعة المستلمة, والتحكم في فواتير "
 #~ "المورد."
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "حدد امر بيع مفتوحة"
+
 #, python-format
 #~ msgid "No Pricelist !"
 #~ msgstr "لا يوجد قائمة اسعار !"
@@ -2399,6 +2384,13 @@ msgstr "الطلبيّات"
 #~ msgid "Approve Purchase"
 #~ msgstr "اقبل الشراء"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "تجمع القائمة المختاره الفاتورة. بالاعتماد على تحكم فاتورة امر البيع, تعتمد "
+#~ "الفاتورة على التسليم او الكمية المأمور بها."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "كمية الشراء تخطت الحد المسموح"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index bb7c13b1de4..10770f4890b 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "Ценовата листа определя валутата, използвана за тази поръчка. Също така "
 "изчислява доставната цена за избраните продукти / количества."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Проверрено от"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Средна цена"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -232,7 +218,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -257,29 +243,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Общо без данък"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Категория"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -345,14 +314,16 @@ msgid "October"
 msgstr "Октомври"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -380,12 +351,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Количество"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -443,12 +408,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -469,6 +428,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Планирана дата"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -501,6 +465,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -521,6 +498,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -540,6 +522,11 @@ msgstr ""
 "Купувачът трябва да одобри RFQ преди да бъдат изпратени на доставчика. В RFQ "
 "става потвърена Поръчка."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -565,7 +552,7 @@ msgid "Supplier"
 msgstr "Доставчик"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -589,7 +576,6 @@ msgstr "Междинна сума"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Получена"
 
@@ -630,6 +616,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -637,7 +630,7 @@ msgid "# of Lines"
 msgstr "# от редове"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -658,8 +651,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -721,6 +714,15 @@ msgstr "Ценова листа"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -752,6 +754,11 @@ msgstr "Чернова фактура"
 msgid "The tax amount"
 msgstr "Стойност на данъка"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -784,7 +791,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -804,11 +811,6 @@ msgstr "Индикация за платена фактура"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -902,12 +904,6 @@ msgstr "К-во"
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -942,14 +938,89 @@ msgid "Date Approved"
 msgstr "Одобрен на дата"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -989,16 +1060,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1011,13 +1077,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1029,19 +1100,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1080,8 +1145,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1089,6 +1154,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Пращане в проект"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1119,7 +1191,7 @@ msgid "Stock Move"
 msgstr "Движение в склад"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1218,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1308,7 +1380,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1319,7 +1391,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1330,9 +1402,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ръчно издадени фактури"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1486,8 +1558,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1599,8 +1671,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1673,11 +1746,11 @@ msgid "Purchase Order"
 msgstr "Поръчка за покупка"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1698,13 +1771,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1718,9 +1784,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1804,7 +1869,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1849,6 +1914,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Проверрено от"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1939,9 +2010,9 @@ msgid "November"
 msgstr "Ноември"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ръчно издадени фактури"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1963,13 +2034,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1990,89 +2054,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2083,6 +2064,12 @@ msgstr "Общо поръчки по клиент за месец"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2090,15 +2077,7 @@ msgid "Warehouse"
 msgstr "Склад"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2171,8 +2150,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2181,6 +2160,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Версии на ценова листа"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 418f915a6bf..59f6fe18ec8 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "Cjenovnik postavlja valutu koja se koristi u nabavnom nalogu. Također, isti "
 "izračunava nabavnu cijenu za odabrane proizvode i količinu."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -234,7 +220,7 @@ msgstr ""
 "svim nabavnim nalozima."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -259,29 +245,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -347,14 +316,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -382,12 +353,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Količina"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -445,12 +410,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -471,6 +430,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -503,6 +467,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -523,6 +500,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -540,6 +522,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -565,7 +552,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -589,7 +576,6 @@ msgstr "Sub-ukupno"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Primljeno"
 
@@ -630,6 +616,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -637,7 +630,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -658,8 +651,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -721,6 +714,15 @@ msgstr "Cijenovnik"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -752,6 +754,11 @@ msgstr "Draft račun"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -784,7 +791,7 @@ msgid "Stock Moves"
 msgstr "Kretanje zaliha"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -804,11 +811,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -902,12 +904,6 @@ msgstr "Količina"
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -942,14 +938,89 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -989,16 +1060,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1011,13 +1077,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1029,19 +1100,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1080,8 +1145,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1089,6 +1154,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "podesi kao draft"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1119,7 +1191,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1218,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1308,7 +1380,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1319,7 +1391,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1330,8 +1402,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1486,8 +1558,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1599,8 +1671,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1673,11 +1746,11 @@ msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1698,13 +1771,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1718,9 +1784,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1804,7 +1869,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1849,6 +1914,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1939,8 +2010,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1963,13 +2034,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1990,89 +2054,6 @@ msgstr "Zahtjev za ponudu N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2083,6 +2064,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2090,15 +2077,7 @@ msgid "Warehouse"
 msgstr "Skladište"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2171,8 +2150,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2181,6 +2160,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index d771625cf1b..56dcca01d3d 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "La tarifa fixa la moneda usada per aquesta comanda de compra. També calcula "
 "el preu del proveïdor pels productes/quantitats seleccionats."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr "Preu compra-estàndard"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validat per"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Preu mitjà"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -234,7 +220,7 @@ msgstr ""
 "les línies de la comanda de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -259,29 +245,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Total import base"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -350,14 +319,16 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -385,12 +356,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Quantitat"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -448,12 +413,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -474,6 +433,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Data planificada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -506,6 +470,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -529,6 +506,11 @@ msgstr ""
 "de compra és 'Des de comanda'. La factura també pot ser generada manualment "
 "pel comptable (control facturació = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "proveïdor. La sol·licitud de pressupost es convertirà en una comanda de "
 "compra confirmada."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Proveïdor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Rebuda"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "# de línies"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarà ha estat realitzat."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -732,6 +725,15 @@ msgstr "Tarifa"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -763,6 +765,11 @@ msgstr "Factura esborrany"
 msgid "The tax amount"
 msgstr "Import dels impostos."
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
 msgstr "Moviments d'estoc"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -815,11 +822,6 @@ msgstr "Indica que una factura s'ha pagat."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -913,12 +915,6 @@ msgstr "Qtat"
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
 msgstr "Data aprovació"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Unitats de mesura"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Taulell de compres"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccioneu una comanda de venda oberta"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Canvia a esborrany"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Moviment d'estoc"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Línia comanda de compra realitza factura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Factures manuals"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
 msgstr "Comanda de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1716,15 +1789,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarà genera una factura. Segons el control de facturació en la comanda "
-"de venda, la factura es basa en les quantitats enviades o demandades."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1738,9 +1802,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1831,7 +1894,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveïdor seleccionat només ven aquest producte per %s"
@@ -1876,6 +1939,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Productes sortints a facturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validat per"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1966,9 +2035,9 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Factures manuals"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1990,13 +2059,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2017,89 +2079,6 @@ msgstr "Petició de pressupost Nº"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2110,6 +2089,12 @@ msgstr "Total comandes per usuari mensual"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2117,15 +2102,7 @@ msgid "Warehouse"
 msgstr "Magatzem"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2187,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2220,6 +2197,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versions de llista de preus"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2648,6 +2630,16 @@ msgstr "Comandes"
 #~ msgid "Current purchases"
 #~ msgstr "Compres actuals"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccioneu una comanda de venda oberta"
+
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarà genera una factura. Segons el control de facturació en la comanda "
+#~ "de venda, la factura es basa en les quantitats enviades o demandades."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Import de la compra per sobre del límit"
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 0a7dd310fb2..00e4aac2a12 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 12:54+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: purchase
@@ -60,11 +60,6 @@ msgstr ""
 "Ceník nastavuje měnu použitou pro nákupní objednáku. Také spočítá ceny "
 "dodavatele pro vybrané výrobky/množství."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr "Standardní ceny nákupů"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Zkontrolováno"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Průměrná cena"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "prodejní objednávky."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Celková částka bez daně"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategorie"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -348,14 +317,16 @@ msgid "October"
 msgstr "Říjen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -383,12 +354,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Množství"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -446,12 +411,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -472,6 +431,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Plánovaný datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -504,6 +468,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -527,6 +504,11 @@ msgstr ""
 "'Objednáno'. Faktura může být generována také ručně účetním (Řízení "
 "fakturace = Ruční)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -546,6 +528,11 @@ msgstr ""
 "Kupec musí schválit RFQ před tím, než bude zaslat dodavateli. RFQ se stance "
 "potvrzenou nákupní objednávkou."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -571,7 +558,7 @@ msgid "Supplier"
 msgstr "Dodavatel"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -595,7 +582,6 @@ msgstr "Mezivýsledek"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Obdrženo"
 
@@ -636,6 +622,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -643,7 +636,7 @@ msgid "# of Lines"
 msgstr "# z řádek"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -664,8 +657,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indikuje, že navádění bylo dokončeno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -729,6 +722,15 @@ msgstr "Ceník"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -760,6 +762,11 @@ msgstr "Návrh faktury"
 msgid "The tax amount"
 msgstr "Částka daně"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -792,7 +799,7 @@ msgid "Stock Moves"
 msgstr "Skladové pohyby"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -812,11 +819,6 @@ msgstr "Indikuje, že faktura již byla zaplacena."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -910,12 +912,6 @@ msgstr "Množ."
 msgid "Cancel"
 msgstr "Zrušit"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -950,14 +946,89 @@ msgid "Date Approved"
 msgstr "Datum schválení"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -999,16 +1070,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1021,13 +1087,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1039,19 +1110,13 @@ msgstr "Měrné jednotky"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Nástěnka nákupu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1090,15 +1155,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "VYberte otevřenou prodejní objednávku"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Nastavit na koncept"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1129,7 +1201,7 @@ msgid "Stock Move"
 msgstr "Přesun zásob"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1228,7 +1300,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1318,7 +1390,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Řádek nákupní objednávky vytváří fakturu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1329,7 +1401,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1340,9 +1412,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ruční faktury"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1496,8 +1568,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1609,8 +1681,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1682,11 +1755,11 @@ msgid "Purchase Order"
 msgstr "Nákupní příkaz"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1707,13 +1780,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1727,9 +1793,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1816,7 +1881,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -1861,6 +1926,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Odchozí výrobky k fakturaci"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Zkontrolováno"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1951,9 +2022,9 @@ msgid "November"
 msgstr "Listopad"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ruční faktury"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1975,13 +2046,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2002,89 +2066,6 @@ msgstr "Požadavek na ocenění N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2095,6 +2076,12 @@ msgstr "Celkem objednávek podle uživatele podle měsíce"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2102,15 +2089,7 @@ msgid "Warehouse"
 msgstr "Sklad"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2183,8 +2162,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2193,6 +2172,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Verze ceníku"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2269,6 +2253,9 @@ msgstr "Objednávky"
 #~ msgid "No Pricelist !"
 #~ msgstr "Žádný ceník !"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "VYberte otevřenou prodejní objednávku"
+
 #~ msgid "Current purchases"
 #~ msgstr "Aktuální nákupy"
 
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index 75c16de1fa0..31b5c1249bb 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-08 22:35+0000\n"
 "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -344,14 +313,16 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -379,12 +350,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Antal"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -442,12 +407,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -468,6 +427,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -500,6 +464,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,6 +497,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -537,6 +519,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -562,7 +549,7 @@ msgid "Supplier"
 msgstr "Leverandør"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -586,7 +573,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Modtaget"
 
@@ -627,6 +613,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -634,7 +627,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -718,6 +711,15 @@ msgstr "Prislist"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -749,6 +751,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
 msgstr "Lagerflytning"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -801,11 +808,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -899,12 +901,6 @@ msgstr "Antal"
 msgid "Cancel"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -939,14 +935,89 @@ msgid "Date Approved"
 msgstr "Godkendelsesdato"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -986,16 +1057,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1008,13 +1074,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1026,19 +1097,13 @@ msgstr "Måleenheder"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Indkøb oversigt"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1086,6 +1151,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
 msgstr "Lager flytning"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
 msgstr "Indkøbsordre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1844,6 +1909,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1934,8 +2005,8 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1985,89 +2049,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2078,6 +2059,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2085,15 +2072,7 @@ msgid "Warehouse"
 msgstr "Lagersted"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2176,6 +2155,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 6a3359707e7..9e6638e27fe 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-18 06:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 13:33+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -67,11 +67,6 @@ msgstr ""
 "wird auf dieser Basis der Einkaufspreis für die zu bestellenden Produkte "
 "unter Berücksichtigung der Bestellmenge errechnet."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Einkauf: Markiere als gelesen"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -116,16 +111,13 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Warnung !"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "Sie müssen vorab alle Warenineingänge dieses Auftrags stornieren."
@@ -142,10 +134,10 @@ msgid "Purchase-Standard Price"
 msgstr "Diff. zu Standardpreis"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Geprüft durch"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -177,12 +169,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Durchschnittspreis"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Rechnung ist <b>bezahlt</b>"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -257,7 +243,7 @@ msgstr ""
 "Anlieferung."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr "Um eine Bestellung zu löschen, muss sie zunächst storniert werden."
@@ -282,29 +268,12 @@ msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Nettobetrag"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Einheiten Kategorien"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategorie"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Angebot "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "Angebot <em>%s</em> <b>wurde umgewandelt </b> in Bestellung %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -391,15 +360,17 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Bestellung für <em>%s</em> <b>wurde abgebrochen</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Wenn Sie diese Dienstleistung verkaufen,"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -426,12 +397,6 @@ msgstr "Möchten Sie die Eingangsrechnungen erstellen?"
 msgid "Quantity"
 msgstr "Menge"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Lieferung <em>%s</em> <b>wurde eingeplant</b> für %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -505,12 +470,6 @@ msgstr ""
 "keinen gesonderten Eintrag vor, damit die Anlieferung direkt an Ihr "
 "Unternehmen erfolgt."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Entwurf der Rechnung vom  %s %s <b>erwartet Validierung</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -539,6 +498,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Geplantes Datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -571,6 +535,19 @@ msgstr "kann eingekauft werden"
 msgid "Incoming  Products"
 msgstr "von Lieferscheinen"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -595,6 +572,11 @@ msgstr ""
 "Rechnung kann alternativ auch per Hand erstellt werden (Rechnungserstellung "
 "= Manuelle Rechnung)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -614,6 +596,11 @@ msgstr ""
 "Der Einkäufer muss die Angebotsanfrage vor Versendung an den Lieferanten "
 "zunächst bestätigen. Erst hierdurch ensteht auch eine Bestellung."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -639,7 +626,7 @@ msgid "Supplier"
 msgstr "Lieferant"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -664,7 +651,6 @@ msgstr "Zwischensumme"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Empfangen"
 
@@ -717,6 +703,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Rechnungen und Lieferscheine"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -724,7 +717,7 @@ msgid "# of Lines"
 msgstr "Anzahl Positionen"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -746,8 +739,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "Es ist nicht möglich diese Bestellung abzubrechen."
@@ -814,6 +807,15 @@ msgstr "Preisliste"
 msgid "Draft PO"
 msgstr "Entwurf Bestellung"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Warnung !"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -845,6 +847,11 @@ msgstr "Rechnungsentwurf"
 msgid "The tax amount"
 msgstr "Der Steuerbetrag"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -877,7 +884,7 @@ msgid "Stock Moves"
 msgstr "Lagerbuchungen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Entwurf für Bestellung wurde erstellt"
@@ -897,11 +904,6 @@ msgstr "Zeigt an, ob eine Rechnung bereits bezahlt wurde"
 msgid "Terms and Conditions"
 msgstr "Bedingungen und Konditionen"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "unbekannt"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -995,12 +997,6 @@ msgstr "Anzahl"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -1034,17 +1030,92 @@ msgstr "Preis/ME"
 msgid "Date Approved"
 msgstr "Datum Genehmigung"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Angebotsanfrage <b>wurde erstellt</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "eine Bestellung im Entwurf"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1090,17 +1161,12 @@ msgid "Outgoing Mails"
 msgstr "Postausgang"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 "Sie können keine Bestellung ohne erfasste Bestellpositionen bestätigen."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Einkauf: Markiere als gelesen"
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1113,7 +1179,7 @@ msgid "Destination Warehouse"
 msgstr "Ziellager"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -1122,6 +1188,11 @@ msgstr ""
 "Die ausgewählte Einheit, befindet sich leider nicht in der selben Kategorie "
 "wie die Produkt Einheit."
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1133,19 +1204,13 @@ msgstr "Mengeneinheiten"
 msgid "Manage pricelist per supplier"
 msgstr "Verwalte einzelne Preislisten für Lieferanten"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Bestellung ist im Status <b>Entwurf</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Anzeigetafel Einkauf"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1185,15 +1250,22 @@ msgid "Unread Messages"
 msgstr "Ungelesene Mitteilungen"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Wähle offenen Verkauf"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Einheiten Kategorien"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Setze auf Entwurf"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1221,10 +1293,10 @@ msgstr "Produkte"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr "Lieferung"
+msgstr "Lagerbuchung"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ungültige Aktion!"
@@ -1332,7 +1404,7 @@ msgstr ""
 "                         Bestellung"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Bitte erstellen Sie Abrechnung."
@@ -1436,7 +1508,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Rechnungserstellung von Bestellpositionen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1447,7 +1519,7 @@ msgid "Send by EMail"
 msgstr "Per E-Mail senden"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1460,9 +1532,9 @@ msgid "Purchase Order "
 msgstr "Bestellung "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Erzeuge Rechnungen"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "Anschaffungspreis aus Durchschnittspreisen errechnen lassen"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1631,8 +1703,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "Durchschnittspreise berechnen für Standard Preis"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1756,9 +1828,10 @@ msgid "Open Purchase Menu"
 msgstr "Öffnen Einkauf Menü"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "E-Mail Assistent"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1807,7 +1880,7 @@ msgstr "von vorab Rechnungsentwürfen"
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr "Statistik Zugangslieferungen"
+msgstr "Statistik Wareneingang"
 
 #. module: purchase
 #: field:purchase.order,message_ids:0
@@ -1830,11 +1903,11 @@ msgid "Purchase Order"
 msgstr "Bestellung"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Fehler!"
@@ -1863,16 +1936,6 @@ msgstr ""
 "Rechnungserfassung oder bei der Wareneingangserfassung wechselt der Status "
 "auf 'Fehler' (Sonderfall / Exception)."
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Ein Lieferauftrag erzeugt eine Rechnung. Abhängig von der Einstellung zum "
-"Zeitpunkt der Erstellung der Ausgangsrechnung, basiert die Rechnung auf "
-"entweder gelieferten oder bestellten Mengen."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1886,10 +1949,9 @@ msgid "# of Purchase Order"
 msgstr "Anzahl Bestellungen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Lieferung <b> erhalten</b>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-Mail Assistent"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1984,7 +2046,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -2034,6 +2096,12 @@ msgstr "Referenz Mengeneinheit"
 msgid "Outgoing products to invoice"
 msgstr "Rechnungserstellung für Auslieferungen"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Geprüft durch"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -2124,9 +2192,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "Anschaffungspreis aus Durchschnittspreisen errechnen lassen"
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Erzeuge Rechnungen"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2154,15 +2222,6 @@ msgstr ""
 "von Lieferscheinen: Es lassen sich Rechnungen erstellen. wenn Sie den "
 "Lieferschein bestätigt haben."
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Referenz zu Beleg, der die Angebotsanfrage ausgelöst hat, i.d.R. ist dies "
-"ein Verkauf oder eine Bedarfsberechnung."
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2183,168 +2242,6 @@ msgstr "Angebotsanfrage Nr."
 msgid "Invoicing Settings"
 msgstr "Einstellungen zur Rechnungserstellung"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hallo${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>hier finden Sie  den Beleg${object.state in ('draft', 'sent') and "
-"'request for quotation' or 'purchase order confirmation'} von "
-"${object.company_id.name}: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENZEN</strong><br />\n"
-"       &nbsp;&nbsp;Bestellnummer: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Bestellbetrag: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Bestelldatum: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Unsere Referenz: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Ihre Referenz: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Ihr Ansprechpartner: <a "
-"href=\"mailto:${object.validator.email or "
-"''}?Betreff=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>Bei Fragen, zögern Sie bitte nicht, uns zu kontaktieren!</p>\n"
-"    <p>Vielen Dank!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Telefon:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Homepage :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2355,6 +2252,12 @@ msgstr "Bestellungen nach Benutzer pro Monat"
 msgid "Based on incoming shipments"
 msgstr "von Lieferscheinen"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2362,18 +2265,7 @@ msgid "Warehouse"
 msgstr "Lager"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Referenz des Angebots durch Ihren Lieferanten. Hauptsächlich wird diese "
-"Referenz benötigt, damit dann eine Zuordnung zum Eingangslieferschein "
-"möglich ist, oder später bei der Bezahlung verwendet werden kann."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2459,9 +2351,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Wenn Sie diese Dienstleistung verkaufen,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Zusammenfassung"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2469,6 +2361,11 @@ msgstr "Wenn Sie diese Dienstleistung verkaufen,"
 msgid "Pricelist Versions"
 msgstr "Preislisten Versionen"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2856,6 +2753,14 @@ msgstr "Bestellungen"
 #~ "Bitte nehmen Sie diese Eintragung vor, bevor Sie die Produkte für die "
 #~ "Auftragspositionen wählen."
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Ein Lieferauftrag erzeugt eine Rechnung. Abhängig von der Einstellung zum "
+#~ "Zeitpunkt der Erstellung der Ausgangsrechnung, basiert die Rechnung auf "
+#~ "entweder gelieferten oder bestellten Mengen."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Beschaffungswert übersteigt Limit"
@@ -3517,3 +3422,6 @@ msgstr "Bestellungen"
 
 #~ msgid "Pre-Generate Draft Invoices based on Purchase Orders"
 #~ msgstr "Erzeuge vorab Rechnungsentwürfe aufgrund der Einkaufsaufträge"
+
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Wähle offenen Verkauf"
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 3d80a149762..a3bd1344baf 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -63,11 +63,6 @@ msgstr ""
 "αγορών. Υπολογίζει επίσης την τιμή του προμηθευτή για τα επιλέγμένα "
 "προϊόντα/ποσότητες."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -109,16 +104,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -135,10 +127,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Επικυρωμένο Από"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -160,12 +152,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -238,7 +224,7 @@ msgstr ""
 "γραμμές παραγγελίας."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -263,29 +249,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -351,14 +320,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -386,12 +357,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Ποσότητα"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -449,12 +414,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -475,6 +434,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -507,6 +471,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -527,6 +504,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -544,6 +526,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -569,7 +556,7 @@ msgid "Supplier"
 msgstr "Προμηθευτής"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -593,7 +580,6 @@ msgstr "Σύνολο"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Παραλήφθηκε"
 
@@ -634,6 +620,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -641,7 +634,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -662,8 +655,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -725,6 +718,15 @@ msgstr "Τιμοκατάλογος"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -756,6 +758,11 @@ msgstr "Πρόχειρο Τιμολόγιο"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -788,7 +795,7 @@ msgid "Stock Moves"
 msgstr "Κινήσεις Αποθέματος"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -808,11 +815,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -906,12 +908,6 @@ msgstr "Ποσ."
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -946,14 +942,89 @@ msgid "Date Approved"
 msgstr "Ημερ/νία Έγκρισης"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -993,16 +1064,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1015,13 +1081,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1033,19 +1104,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1084,8 +1149,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1093,6 +1158,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Ορισμός σε Πρόχειρη"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1123,7 +1195,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1222,7 +1294,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1312,7 +1384,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1323,7 +1395,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1334,8 +1406,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1490,8 +1562,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1603,8 +1675,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1677,11 +1750,11 @@ msgid "Purchase Order"
 msgstr "Παραγγελία Αγοράς"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1702,13 +1775,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1722,9 +1788,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1808,7 +1873,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1853,6 +1918,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Επικυρωμένο Από"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1943,8 +2014,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1967,13 +2038,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1994,89 +2058,6 @@ msgstr "Αίτηση Προσφοράς Νο:"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2087,6 +2068,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2094,15 +2081,7 @@ msgid "Warehouse"
 msgstr "Αποθήκη"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2175,8 +2154,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2185,6 +2164,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 977841deaf8..82173e89394 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:31+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "You must first cancel all receptions related to this purchase order."
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Average Price"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "products."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Total Untaxed amount"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Category"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -351,14 +320,16 @@ msgid "October"
 msgstr "October"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -386,12 +357,6 @@ msgstr "Do you want to generate the supplier invoices?"
 msgid "Quantity"
 msgstr "Quantity"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -449,12 +414,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -475,6 +434,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -507,6 +471,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -530,6 +507,11 @@ msgstr ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Supplier"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Received"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "# of Lines"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "It indicates that a picking has been done"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -732,6 +725,15 @@ msgstr "Pricelist"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -763,6 +765,11 @@ msgstr "Draft Invoice"
 msgid "The tax amount"
 msgstr "The tax amount"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -815,11 +822,6 @@ msgstr "It indicates that an invoice has been paid"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -913,12 +915,6 @@ msgstr "Qty"
 msgid "Cancel"
 msgstr "Cancel"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1000,16 +1071,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1022,13 +1088,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1040,19 +1111,13 @@ msgstr "Units of Measure"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1091,15 +1156,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Set to Draft"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1130,7 +1202,7 @@ msgid "Stock Move"
 msgstr "Stock Move"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1232,7 +1304,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1322,7 +1394,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Purchase Order Line Make Invoice"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1333,7 +1405,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1344,9 +1416,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1500,8 +1572,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1613,8 +1685,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1687,11 +1760,11 @@ msgid "Purchase Order"
 msgstr "Purchase Order"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1712,15 +1785,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1734,9 +1798,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1826,7 +1889,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "The selected supplier only sells this product by %s"
@@ -1871,6 +1934,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Outgoing products to invoice"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validated By"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1961,9 +2030,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manual Invoices"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1985,13 +2054,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2012,89 +2074,6 @@ msgstr "Request for Quotation N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2105,6 +2084,12 @@ msgstr "Total Orders by User per month"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2112,15 +2097,7 @@ msgid "Warehouse"
 msgstr "Warehouse"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2193,8 +2170,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2203,6 +2180,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2326,6 +2308,13 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "Origin"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+
 #~ msgid "Convert to Purchase Order"
 #~ msgstr "Convert to Purchase Order"
 
@@ -2573,6 +2562,9 @@ msgstr ""
 #~ msgid "Current purchases"
 #~ msgstr "Current purchases"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Select an Open Sale Order"
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Purchase amount over the limit"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index eb860f07acb..1b45ca9f48f 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-18 17:43+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 23:11+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -64,11 +64,6 @@ msgstr ""
 "La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
 "el precio del proveedor para los productos/cantidades seleccionados."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Compras: Marcar como leídos"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -112,16 +107,13 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
+msgid "Configuration Error!"
+msgstr "¡Error de configuración!"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -140,10 +132,10 @@ msgid "Purchase-Standard Price"
 msgstr "Precio compra-estándar"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -172,12 +164,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Precio medio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factura <b>pagada</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -252,7 +238,7 @@ msgstr ""
 "las líneas del pedido de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr "Para borrar un pedido de compra, debe cancelarlo primero."
@@ -277,30 +263,12 @@ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Total importe base"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Categorías de las unidades de medida"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Presupuesto "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Presupuesto para <em>%s</em> <b>convertido</b> a pedido de compra de %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -381,15 +349,19 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "El pedido de compra para <em>%s</em> ha sido <b>cancelado</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
+"¡El producto \"%s\" ha sido definido con su compañía como distribuidor, lo "
+"que debe ser un error de configuración!"
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Cuando vende este servicio al cliente,"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -416,12 +388,6 @@ msgstr "¿Quiere generar las facturas de proveedor?"
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Envío <em>%s</em> <b>programado</b> para %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -490,13 +456,6 @@ msgstr ""
 "cliente. En caso contrario, déjelo en blanco para enviar a su propia "
 "compañía."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-"La factura en borrador de %s %s esta <b>esperando para validación</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -524,6 +483,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Fecha planificada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -556,6 +520,23 @@ msgstr "Puede ser comprado"
 msgid "Incoming  Products"
 msgstr "Productos a recibir"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Solicitud de presupuesto "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+"Referencia del pedido de venta o presupuesto enviado a su proveedor. Se usa "
+"principalmente para casar documentos cuando recibe los productos, ya que "
+"esta referencia se suele escribir en la orden de entrega enviada por su "
+"proveedor."
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -579,6 +560,11 @@ msgstr ""
 "de compra es 'Desde pedido'. La factura también puede ser generada "
 "manualmente por el contable (control facturación = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr "SdP aprobada"
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -599,6 +585,11 @@ msgstr ""
 "proveedor. La solicitud de presupuesto se convertirá en un pedido de compra "
 "confirmado."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr "SdP confirmada"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -624,7 +615,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "Defina la cuenta de gastos para esta compañía: \"%s\" (id:%d)."
@@ -648,7 +639,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recibido"
 
@@ -698,6 +688,16 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Facturas y recepciones"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"Un albarán genera una factura. Dependiendo del control de facturación del "
+"pedido de venta, la factura está basada en la cantidad entregada o en la del "
+"pedido."
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -705,7 +705,7 @@ msgid "# of Lines"
 msgstr "Nº de líneas"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "Defina la cuenta de gastos para este producto:\"%s\" (id:%d)."
@@ -726,8 +726,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarán ha sido realizado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "No se ha podido cancelar este pedido de compra."
@@ -793,6 +793,15 @@ msgstr "Tarifa"
 msgid "Draft PO"
 msgstr "OC en borrador"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -824,6 +833,11 @@ msgstr "Factura borrador"
 msgid "The tax amount"
 msgstr "El importe de los impuestos."
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr "Proporción recibida"
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -856,7 +870,7 @@ msgid "Stock Moves"
 msgstr "Movimientos de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Pedido de compra en borrador creado"
@@ -876,11 +890,6 @@ msgstr "Indica que una factura ha sido pagada."
 msgid "Terms and Conditions"
 msgstr "Términos y condiciones"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "desconocido"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -974,12 +983,6 @@ msgstr "Ctdad"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -1013,17 +1016,168 @@ msgstr "Precio unidad"
 msgid "Date Approved"
 msgstr "Fecha aprobación"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Solicitud de presupuesto <b>creada</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "un pedido de compra en borrador"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hola ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Aquí tiene ${object.state in ('draft', 'sent') 'una solicitud de "
+"presupuesto' or 'la confirmación del pedido de compra'} de "
+"${object.company_id.name}: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Su referencia: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.validator.email or "
+"''}?subject=Pedido%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>Si tiene alguna pregunta, no dude en contactarnos.</p>\n"
+"    <p>¡Gracias!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Teléfono:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1067,16 +1221,11 @@ msgid "Outgoing Mails"
 msgstr "Correos salientes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr "No puede confirmar un pedido de compra que no tiene líneas."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Compras: Marcar como no leído"
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1089,7 +1238,7 @@ msgid "Destination Warehouse"
 msgstr "Almacén destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -1098,6 +1247,11 @@ msgstr ""
 "La unidad de medida seleccionada no pertenece a la misma categoría que la "
 "unidad de medida del producto."
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr "Seleccione un pedido de venta abierto"
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1109,19 +1263,13 @@ msgstr "Unidades de medida"
 msgid "Manage pricelist per supplier"
 msgstr "Gestionar tarifas por proveedor"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "El pedido de compra se ha establecido como <b>borrador</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Tablero de compras"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1161,15 +1309,24 @@ msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Categorías de las unidades de medida"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+"Referencia del documento que generó esta solicitud de pedido de compra; un "
+"pedido de venta o una petición interna de abastecimiento."
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1200,7 +1357,7 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "¡Acción no válida!"
@@ -1306,7 +1463,7 @@ msgid ""
 msgstr "un pedido de compra en borrador"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Por favor, cree facturas."
@@ -1404,7 +1561,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Línea pedido de compra realiza factura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PC: %s"
@@ -1415,7 +1572,7 @@ msgid "Send by EMail"
 msgstr "Enviar por correo electrónico"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "Defina el diario de compras para esta compañía: \"%s\" (id: %d)."
@@ -1426,9 +1583,10 @@ msgid "Purchase Order "
 msgstr "Pedido de compra "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+"Permite calcular el precio de coste del producto basado en el coste medio."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1595,8 +1753,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "Calcular precio de coste del producto basado en el coste medio"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1720,9 +1878,10 @@ msgid "Open Purchase Menu"
 msgstr "Abrir menú 'Compras'"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Asistente de redacción de correo electrónico."
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido una dirección para el proveedor"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1794,11 +1953,11 @@ msgid "Purchase Order"
 msgstr "Pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -1826,15 +1985,6 @@ msgstr ""
 "de cancelación ocurre en la factura o en la recepción de los bienes, el "
 "estado se convierte a en excepción."
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarán genera una factura. Según el control de facturación en el pedido "
-"de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1848,10 +1998,9 @@ msgid "# of Purchase Order"
 msgstr "Nº de pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Envío <b>recibido</b>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Asistente de redacción de correo electrónico."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1946,7 +2095,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "PdO_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1994,6 +2143,12 @@ msgstr "Unidad de medida de referencia"
 msgid "Outgoing products to invoice"
 msgstr "Productos salientes a facturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -2084,10 +2239,9 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
-"Permite calcular el precio de coste del producto basado en el coste medio."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2116,15 +2270,6 @@ msgstr ""
 "Basada en envíos entrantes: deja crear una factura cuando las recepciones "
 "son validadas."
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Referencia del documento que genera esta petición de pedido de compra: un "
-"pedido de venta o una petición interna de abastecimiento."
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2145,167 +2290,6 @@ msgstr "Solicitud de presupuesto Nº"
 msgid "Invoicing Settings"
 msgstr "Configuración de facturación"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Aquí le enviamos ${object.state in ('draft', 'sent') and 'una "
-"solicitud de presupuesto' or 'una confirmación de pedido de compra'} de "
-"${object.company_id.name}: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Su referencia: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Pedido%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>Si tiene alguna duda, no dude en contactarnos.</p>\n"
-"    <p>¡Gracias!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Teléfono:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2316,6 +2300,12 @@ msgstr "Total pedidos por usuario mensual"
 msgid "Based on incoming shipments"
 msgstr "Basado en envíos entrantes"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr "No hay definido ningún proveedor por defecto para este producto"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2323,19 +2313,7 @@ msgid "Warehouse"
 msgstr "Almacén"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Referencia del pedido de venta o presupuesto enviado por el proveedor. Se "
-"usa principalmente para casar documentos cuando recibe los productos, ya que "
-"esta referencia se escribe habitualmente en la orden de entrega enviada por "
-"el proveedor."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2422,9 +2400,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Cuando vende este servicio al cliente,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2432,6 +2410,11 @@ msgstr "Cuando vende este servicio al cliente,"
 msgid "Pricelist Versions"
 msgstr "Versiones de tarifa"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2847,6 +2830,9 @@ msgstr "Pedidos"
 #~ msgstr ""
 #~ "No puede confirmar un pedido de compra sin líneas de pedido de compra"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccionar un pedido de compra abierto"
+
 #~ msgid "Do you want to generate the supplier invoices ?"
 #~ msgstr "¿Desea generar las facturas de proveedor?"
 
@@ -2874,6 +2860,13 @@ msgstr "Pedidos"
 #~ msgid "Current purchases"
 #~ msgstr "Compras actuales"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarán genera una factura. Según el control de facturación en el pedido "
+#~ "de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Importe de compra por encima del límite"
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 84ee2f81707..8641294e97a 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-23 15:07+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "También calcula el precio del proveedor para los productos/cantidades "
 "seleccionados."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "las líneas de la orden de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -348,14 +317,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -383,12 +354,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -446,12 +411,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -472,6 +431,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -504,6 +468,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -524,6 +501,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -541,6 +523,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -566,7 +553,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -590,7 +577,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recibido"
 
@@ -631,6 +617,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -638,7 +631,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -722,6 +715,15 @@ msgstr "Lista de Precios"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -753,6 +755,11 @@ msgstr "Factura borrador"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -785,7 +792,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -805,11 +812,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -903,12 +905,6 @@ msgstr "Ctdad"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -943,14 +939,89 @@ msgid "Date Approved"
 msgstr "Fecha de aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -990,16 +1061,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1012,13 +1078,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1030,19 +1101,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1081,8 +1146,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1090,6 +1155,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Establecer como borrador"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1120,7 +1192,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1219,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1309,7 +1381,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1331,8 +1403,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1487,8 +1559,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1600,8 +1672,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1674,11 +1747,11 @@ msgid "Purchase Order"
 msgstr "Orden de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1699,13 +1772,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1719,9 +1785,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1805,7 +1870,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1850,6 +1915,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1940,8 +2011,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1964,13 +2035,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1991,89 +2055,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2084,6 +2065,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2091,15 +2078,7 @@ msgid "Warehouse"
 msgstr "Almacén"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2172,8 +2151,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2182,6 +2161,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index 5d94e4f5a4d..9b673a62b1a 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-14 04:45+0000\n"
 "Last-Translator: Carlos-smile <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
 "el precio del proveedor para los productos/cantidades seleccionados."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr "Precio compra-estándar"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Precio medio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -234,7 +220,7 @@ msgstr ""
 "las líneas del pedido de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -259,29 +245,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Total importe base"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -350,14 +319,16 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -385,12 +356,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -448,12 +413,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -474,6 +433,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Fecha planificada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -506,6 +470,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -529,6 +506,11 @@ msgstr ""
 "de compra es 'Desde pedido'. La factura también puede ser generada "
 "manualmente por el contable (control facturación = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "proveedor. La solicitud de presupuesto se convertirá en un pedido de compra "
 "confirmado."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recibido"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "Nº de líneas"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarán ha sido realizado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -732,6 +725,15 @@ msgstr "Tarifa"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -763,6 +765,11 @@ msgstr "Factura borrador"
 msgid "The tax amount"
 msgstr "El importe de los impuestos."
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
 msgstr "Movimientos de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -815,11 +822,6 @@ msgstr "Indica que una factura ha sido pagada."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -913,12 +915,6 @@ msgstr "Ctdad"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
 msgstr "Fecha aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Unidades de medida"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Tablero de compras"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Línea pedido de compra realiza factura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
 msgstr "Pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1715,16 +1788,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un ingreso de productos genera una factura. Según el control de facturación "
-"en el pedido de venta, la factura se basa en las cantidades enviadas u "
-"ordenadas."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1738,9 +1801,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1831,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1876,6 +1938,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Productos salientes a facturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1966,9 +2034,9 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1990,13 +2058,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2017,89 +2078,6 @@ msgstr "Petición de presupuesto Nº"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2110,6 +2088,12 @@ msgstr "Total pedidos por usuario mensual"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2117,15 +2101,7 @@ msgid "Warehouse"
 msgstr "Almacén"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2186,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2220,6 +2196,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versiones de tarifa"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2298,6 +2279,9 @@ msgstr "Pedidos"
 #~ msgid "No Pricelist !"
 #~ msgstr "¡No tarifa!"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccionar un pedido de compra abierto"
+
 #~ msgid "Current purchases"
 #~ msgstr "Compras actuales"
 
@@ -2959,6 +2943,14 @@ msgstr "Pedidos"
 #~ msgid "Based on Purchase Order Lines"
 #~ msgstr "Basadas en líneas de la orden de compra"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un ingreso de productos genera una factura. Según el control de facturación "
+#~ "en el pedido de venta, la factura se basa en las cantidades enviadas u "
+#~ "ordenadas."
+
 #~ msgid ""
 #~ "You can create a request for quotation when you want to buy products to a "
 #~ "supplier but the purchase is not confirmed yet. Use also this menu to review "
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index 1d97070870b..e13f1aaf631 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-18 21:55+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: purchase
@@ -60,11 +60,6 @@ msgstr ""
 "La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
 "el precio del proveedor para los productos/cantidades seleccionados."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
 msgstr "Precio compra-estándar"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Precio medio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -237,7 +223,7 @@ msgstr ""
 "las líneas del pedido de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -262,29 +248,12 @@ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Total importe base"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -353,14 +322,16 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -388,12 +359,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -451,12 +416,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -477,6 +436,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Fecha planificada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -509,6 +473,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -532,6 +509,11 @@ msgstr ""
 "de compra es 'Desde pedido'. La factura también puede ser generada "
 "manualmente por el contable (control facturación = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -552,6 +534,11 @@ msgstr ""
 "proveedor. La solicitud de presupuesto se convertirá en un pedido de compra "
 "confirmado."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -577,7 +564,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -601,7 +588,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recibido"
 
@@ -642,6 +628,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -649,7 +642,7 @@ msgid "# of Lines"
 msgstr "Nº de líneas"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -670,8 +663,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarán ha sido realizado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -735,6 +728,15 @@ msgstr "Tarifa"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -766,6 +768,11 @@ msgstr "Factura borrador"
 msgid "The tax amount"
 msgstr "El importe de los impuestos."
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -798,7 +805,7 @@ msgid "Stock Moves"
 msgstr "Movimientos de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -818,11 +825,6 @@ msgstr "Indica que una factura ha sido pagada."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -916,12 +918,6 @@ msgstr "Ctdad"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -956,14 +952,89 @@ msgid "Date Approved"
 msgstr "Fecha aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1006,16 +1077,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1028,13 +1094,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1046,19 +1117,13 @@ msgstr "Unidades de medida"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Tablero de compras"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1097,15 +1162,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1136,7 +1208,7 @@ msgid "Stock Move"
 msgstr "Moviemiento de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1238,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1328,7 +1400,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Línea pedido de compra realiza factura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1339,7 +1411,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1350,9 +1422,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1506,8 +1578,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1619,8 +1691,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1693,11 +1766,11 @@ msgid "Purchase Order"
 msgstr "Pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1718,15 +1791,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarán genera una factura. Según el control de facturación en el pedido "
-"de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1740,9 +1804,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1833,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1878,6 +1941,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Productos salientes a facturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1968,9 +2037,9 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1992,13 +2061,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2019,89 +2081,6 @@ msgstr "Petición de presupuesto Nº"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2112,6 +2091,12 @@ msgstr "Total pedidos por usuario mensual"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2119,15 +2104,7 @@ msgid "Warehouse"
 msgstr "Almacén"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2214,8 +2191,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2224,6 +2201,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versiones de tarifa"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2323,6 +2305,13 @@ msgstr "Pedidos"
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarán genera una factura. Según el control de facturación en el pedido "
+#~ "de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
 #~ msgid "Convert to Purchase Order"
 #~ msgstr "Convertir a pedido de compra"
 
@@ -2537,6 +2526,9 @@ msgstr "Pedidos"
 #~ msgid "Purchase Management"
 #~ msgstr "Compras"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccionar un pedido de compra abierto"
+
 #~ msgid ""
 #~ "unique number of the purchase order,computed automatically when the purchase "
 #~ "order is created"
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 8fc581321f6..9e3fb9b8df9 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-09 21:06+0000\n"
 "Last-Translator: mariofabian <mcdc1983@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
 "el precio del proveedor para los productos/cantidades seleccionados."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
 msgstr "Precio compra-estándar"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Precio promedio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -237,7 +223,7 @@ msgstr ""
 "las líneas del pedido de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -262,29 +248,12 @@ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Total importe base"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -353,14 +322,16 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -388,12 +359,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -451,12 +416,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -477,6 +436,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Fecha programada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -509,6 +473,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -532,6 +509,11 @@ msgstr ""
 "de compra es 'Desde pedido'. La factura también puede ser generada "
 "manualmente por el contable (control facturación = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -552,6 +534,11 @@ msgstr ""
 "proveedor. La solicitud de presupuesto se convertirá en un pedido de compra "
 "confirmado."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -577,7 +564,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -601,7 +588,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recibido"
 
@@ -642,6 +628,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -649,7 +642,7 @@ msgid "# of Lines"
 msgstr "Nº de líneas"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -670,8 +663,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarán ha sido realizado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -735,6 +728,15 @@ msgstr "Lista de precios"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -766,6 +768,11 @@ msgstr "Factura borrador"
 msgid "The tax amount"
 msgstr "El importe impuestos"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -798,7 +805,7 @@ msgid "Stock Moves"
 msgstr "Movimientos de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -818,11 +825,6 @@ msgstr "Indica que una factura ha sido pagada."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -916,12 +918,6 @@ msgstr "Ctdad"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -956,14 +952,89 @@ msgid "Date Approved"
 msgstr "Fecha aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1006,16 +1077,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1028,13 +1094,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1046,19 +1117,13 @@ msgstr "Unidades de medida"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Tablero de compras"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1097,15 +1162,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccione una orden de venta abierta"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1136,7 +1208,7 @@ msgid "Stock Move"
 msgstr "Movimiento de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1238,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1328,7 +1400,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Línea de pedido de compra realizar factura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1339,7 +1411,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1350,9 +1422,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1506,8 +1578,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1619,8 +1691,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1693,11 +1766,11 @@ msgid "Purchase Order"
 msgstr "Orden de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1718,15 +1791,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Un albarán genera una factura. Según el control de facturación en el pedido "
-"de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1740,9 +1804,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1833,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -1878,6 +1941,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Productos salientes a facturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1968,9 +2037,9 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1992,13 +2061,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2019,89 +2081,6 @@ msgstr "Petición de presupuesto Nº"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2112,6 +2091,12 @@ msgstr "Total pedidos por usuario mensual"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2119,15 +2104,7 @@ msgid "Warehouse"
 msgstr "Almacén"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2214,8 +2191,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2224,6 +2201,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versiones de lista de precios"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2569,6 +2551,9 @@ msgstr "Pedidos"
 #~ msgid "Current purchases"
 #~ msgstr "Compras actuales"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Seleccione una orden de venta abierta"
+
 #, python-format
 #~ msgid "Purchase order '%s' is confirmed."
 #~ msgstr "Pedido de compra '%s' está confirmado."
@@ -2619,6 +2604,13 @@ msgstr "Pedidos"
 #~ msgid "Origin"
 #~ msgstr "Orígen"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Un albarán genera una factura. Según el control de facturación en el pedido "
+#~ "de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
 #~ msgid "Convert to Purchase Order"
 #~ msgstr "Convertir a orden de compra"
 
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index fc0617b74e1..e5a946f3b7c 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 19:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 20:41+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -37,7 +37,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr "Arveldamishaldus"
+msgstr "Arveldus"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -129,11 +129,6 @@ msgstr ""
 "Hinnakiri määrab selle ostukorralduse jaoks kasutatava valuuta. Samuti "
 "arvutab see tarnija hinna valitud toodetele/kogustele."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -155,7 +150,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr "Sissetulevad Tooted"
+msgstr "Sisenevad tooted"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -175,16 +170,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -201,10 +193,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Valideerija:"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -226,12 +218,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -297,7 +283,7 @@ msgstr ""
 "planeeritud kuupäev."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -322,29 +308,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Pakkumine "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -410,14 +379,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -445,12 +416,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Kogus"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -466,7 +431,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 #: view:purchase.order:0
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Sisenevad saadetised"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
@@ -499,7 +464,7 @@ msgstr "Nõutud aeg"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "Ostukorralduse read"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -508,12 +473,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -534,6 +493,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Planeeritud kuupäev"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -543,7 +507,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "Hinnapäringud"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -554,11 +518,24 @@ msgstr ""
 #: view:product.product:0
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "On ostetav"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 msgid "Incoming  Products"
+msgstr "Sisenevad tooted"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Hinnapäring "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
 msgstr ""
 
 #. module: purchase
@@ -581,15 +558,20 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Kinnita"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Maksuvaba summa"
+msgstr "Maksuta summa"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -598,6 +580,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -623,7 +610,7 @@ msgid "Supplier"
 msgstr "Tarnija"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -647,7 +634,6 @@ msgstr "Vahesumma"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Vastu võetud"
 
@@ -688,6 +674,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -695,7 +688,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -703,7 +696,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(uuenda)"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -716,8 +709,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -777,6 +770,15 @@ msgstr "Hinnakiri"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Draft PO"
+msgstr "Ostukorralduse mustand"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: purchase
@@ -810,6 +812,11 @@ msgstr "Arve mustand"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -823,13 +830,13 @@ msgstr ""
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr "Hinnapäring"
+msgstr "Hinnapäring:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 msgid "On Incoming Shipments"
-msgstr ""
+msgstr "Sisenevatel saadetistel"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -842,7 +849,7 @@ msgid "Stock Moves"
 msgstr "Lao liikumised"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -860,12 +867,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,notes:0
 msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
+msgstr "Tingimused"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -931,7 +933,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_purchase_config
 #: view:res.partner:0
 msgid "Purchases"
-msgstr ""
+msgstr "Ostud"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -960,12 +962,6 @@ msgstr "Kogus"
 msgid "Cancel"
 msgstr "Tühista"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -1000,14 +996,89 @@ msgid "Date Approved"
 msgstr "Heaks kiitmise kuupäev"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1047,16 +1118,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1069,13 +1135,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1087,19 +1158,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1138,8 +1203,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1147,6 +1212,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Määra mustandiks"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1169,7 +1241,7 @@ msgstr "Maksud"
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 msgid "Products"
-msgstr ""
+msgstr "Tooted"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -1177,7 +1249,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1197,7 +1269,7 @@ msgstr ""
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "Hinnapäringud."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1251,7 +1323,7 @@ msgstr ""
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Väljuvad tooted"
 
 #. module: purchase
 #: view:product.product:0
@@ -1270,7 +1342,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1294,12 +1366,12 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Invoice"
-msgstr ""
+msgstr "Loo arve"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Products"
-msgstr ""
+msgstr "Võta vastu"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1352,7 +1424,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Loo arved"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
@@ -1360,7 +1432,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1371,7 +1443,7 @@ msgid "Send by EMail"
 msgstr "Saada e-kirjaga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1379,11 +1451,11 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Order "
-msgstr ""
+msgstr "Ostukorraldus "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1406,7 +1478,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "On Purchase Order Lines"
-msgstr ""
+msgstr "Ostukorralduse ridadel"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1518,7 +1590,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Ostmine"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0
@@ -1538,13 +1610,13 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Ostuarved"
 
 #. module: purchase
 #: field:purchase.order,product_id:0
@@ -1569,7 +1641,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Tooted kategooria järgi"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1587,7 +1659,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr ""
+msgstr "Arve loodud"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1612,7 +1684,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Ostukorralduse ridade põhjal"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1646,8 +1718,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1691,7 +1764,7 @@ msgstr "Vaikimisi ostuhinnakirja versioon"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Loodud mustandarve põhjal"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1705,11 +1778,11 @@ msgid "Messages"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1730,13 +1803,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1750,9 +1816,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1786,12 +1851,12 @@ msgstr "Kinnita"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "Vastuvõtmiste põhjal"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Tarnija viide"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -1836,7 +1901,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1881,6 +1946,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Valideerija:"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1896,7 +1967,7 @@ msgstr ""
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Arved"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1921,7 +1992,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Incoming Shipments & Invoices"
-msgstr ""
+msgstr "Sisenevad saadetised ja arved"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1971,8 +2042,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1990,13 +2061,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2010,96 +2074,13 @@ msgstr "Korralduse olek"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Hinnapäring nr."
 
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2108,6 +2089,12 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on incoming shipments"
+msgstr "Sisenevate saadetiste põhjal"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
 msgstr ""
 
 #. module: purchase
@@ -2117,15 +2104,7 @@ msgid "Warehouse"
 msgstr "Ladu"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2153,7 +2132,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_invoice_pending
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "On Draft Invoices"
-msgstr ""
+msgstr "Mustandarvetel"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
@@ -2193,8 +2172,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2203,6 +2182,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Maksetingimus"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2217,7 +2201,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on purchase order lines"
-msgstr ""
+msgstr "Ostukorralduse ridade põhjal"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index b321325b628..937c4febaa5 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 12:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "Hinnasto määrää käytettävän valuutan tilaukselle. Se laskee myös toimittajan "
 "hinnan kyseiselle tuotteille/määrille."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
 msgstr "Oston standardihinta"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Hyväksyjä"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Keskimääräinen hinta"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -237,7 +223,7 @@ msgstr ""
 "tuotteille."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -262,29 +248,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Veroton Summa"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Luokka"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -353,14 +322,16 @@ msgid "October"
 msgstr "Lokakuu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -388,12 +359,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Määrä"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -451,12 +416,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -477,6 +436,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Suunniteltu päivämäärä"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -509,6 +473,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -532,6 +509,11 @@ msgstr ""
 "'tilattaessa'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta "
 "(laskujen kontrolli = manuaalinen)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -551,6 +533,11 @@ msgstr ""
 "Ostajan on hyväksyttävä tarjouspyyntö ennen toimittajalle lähettämistä. "
 "Tarjouspyynnöstä tulee hyväksytty ostotilaus."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -576,7 +563,7 @@ msgid "Supplier"
 msgstr "Toimittaja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -600,7 +587,6 @@ msgstr "Välisumma"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Vastaanotettu"
 
@@ -641,6 +627,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -648,7 +641,7 @@ msgid "# of Lines"
 msgstr "Rivien lukumäärä"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -669,8 +662,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Merkitsee että keräilylista on tehty"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -734,6 +727,15 @@ msgstr "Hinnasto"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -765,6 +767,11 @@ msgstr "Luonnoslasku"
 msgid "The tax amount"
 msgstr "Veron määrä"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -797,7 +804,7 @@ msgid "Stock Moves"
 msgstr "Varastosiirrot"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -817,11 +824,6 @@ msgstr "Merkitsee että lasku on maksettu"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -915,12 +917,6 @@ msgstr "Määrä"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -955,14 +951,89 @@ msgid "Date Approved"
 msgstr "Hyväksymispäivämäärä"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1004,16 +1075,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,13 +1092,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1044,19 +1115,13 @@ msgstr "Mittayksiköt"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Hankintojen Työtila"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1095,15 +1160,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Valitse Avoin Myyntitilaus"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Aseta luonnokseksi"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1134,7 +1206,7 @@ msgid "Stock Move"
 msgstr "Varastosiirto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1236,7 +1308,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Ostotilausrivi luo laskun"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Käsin Laskutus"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
 msgstr "Ostotilaus"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1715,15 +1788,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Keräilylista luo laskun. Riippuen myyntitilauksen kontrolleista, lasku "
-"perustuu joko toimitettuun tai tilattuun määrään"
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1828,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
@@ -1873,6 +1936,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Laskutettavat lähtevät tuotteet"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Hyväksyjä"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1963,9 +2032,9 @@ msgid "November"
 msgstr "Marraskuu"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Käsin Laskutus"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1987,13 +2056,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2014,89 +2076,6 @@ msgstr "Tarjouspyynnön numero"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2107,6 +2086,12 @@ msgstr "Tilaukset käyttäjittäin ja kuukausittain yhteensä"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2114,15 +2099,7 @@ msgid "Warehouse"
 msgstr "Varasto"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2196,8 +2173,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2206,6 +2183,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Hinnaston versiot"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2596,6 +2578,9 @@ msgstr "Tilaukset"
 #~ msgid "Partial Picking"
 #~ msgstr "Osittainen keräily"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Valitse Avoin Myyntitilaus"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Määrityksen Eteneminen"
 
@@ -2717,6 +2702,13 @@ msgstr "Tilaukset"
 #~ msgid "Current purchases"
 #~ msgstr "Nykyiset hankinnat"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Keräilylista luo laskun. Riippuen myyntitilauksen kontrolleista, lasku "
+#~ "perustuu joko toimitettuun tai tilattuun määrään"
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Ostomäärä ylittää rajan"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 01b99e9decf..652cf4345a4 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 16:28+0000\n"
 "Last-Translator: LudoRA <Unknown>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
@@ -67,11 +67,6 @@ msgstr ""
 "calcule également le prix fournisseur pour les quantités et/ou articles "
 "sélectionnés."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
 msgstr "Prix standard d'achat"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validée par"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Prix moyen"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -238,7 +224,7 @@ msgstr ""
 "de la commande d'achat."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -263,29 +249,12 @@ msgstr "${object.company_id.name} Commande (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Montant total hors taxe"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Catégorie"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -355,14 +324,16 @@ msgid "October"
 msgstr "Octobre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -390,12 +361,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Quantité"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -453,12 +418,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -479,6 +438,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Date prévue"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -511,6 +475,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -534,6 +511,11 @@ msgstr ""
 "bon de commande est 'à la commande'. La facture peut aussi être générée "
 "manuellement par le comptable (contrôle facture = \"Manuel\")"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -554,6 +536,11 @@ msgstr ""
 "l'envoyer au fournisseur : la demande de prix devient alors un bon de "
 "commande confirmé."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -579,7 +566,7 @@ msgid "Supplier"
 msgstr "Fournisseur"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -603,7 +590,6 @@ msgstr "Sous-total"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Reçu"
 
@@ -644,6 +630,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -651,7 +644,7 @@ msgid "# of Lines"
 msgstr "# de lignes"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -672,8 +665,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indique qu'une réception de marchandise a été effectuée."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -738,6 +731,15 @@ msgstr "Liste de prix"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -769,6 +771,11 @@ msgstr "Facture brouillon"
 msgid "The tax amount"
 msgstr "Le montant des taxes"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -801,7 +808,7 @@ msgid "Stock Moves"
 msgstr "Mouvements de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -821,11 +828,6 @@ msgstr "Ceci indique qu'une facture a été payée"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -921,12 +923,6 @@ msgstr "Qté"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -961,14 +957,89 @@ msgid "Date Approved"
 msgstr "Date approbation"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1011,16 +1082,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1033,13 +1099,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1051,19 +1122,13 @@ msgstr "Unités de mesure"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Tableau de bord des achats"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1102,15 +1167,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Sélectionnez un bon de commande ouvert"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Mettre en brouillon"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1141,7 +1213,7 @@ msgid "Stock Move"
 msgstr "Mouvement de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1243,7 +1315,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1333,7 +1405,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Créer la facture des lignes de commande d'achat"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1344,7 +1416,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1355,9 +1427,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Factures manuelles"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1511,8 +1583,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1624,8 +1696,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1698,11 +1771,11 @@ msgid "Purchase Order"
 msgstr "Bon de commande"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1723,16 +1796,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Une expédition génère une facture. En fonction du contrôle de facturation du "
-"bon de commande, la facture est basée sur les quantités livrées ou "
-"commandées."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1746,9 +1809,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1839,7 +1901,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Le fournisseur sélectionné peut seulement vendre cet article par %s"
@@ -1884,6 +1946,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Expéditions à facturer"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validée par"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1974,9 +2042,9 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Factures manuelles"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1998,13 +2066,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2025,89 +2086,6 @@ msgstr "Demande de prix N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2118,6 +2096,12 @@ msgstr "Total des commandes par utilisateur par mois"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2125,15 +2109,7 @@ msgid "Warehouse"
 msgstr "Entrepôt"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2220,8 +2196,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2230,6 +2206,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versions de la liste de prix"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2711,6 +2692,17 @@ msgstr "Commandes"
 #~ msgid "Dest. Address Contact Name"
 #~ msgstr "Adresse de destination du contact"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Une expédition génère une facture. En fonction du contrôle de facturation du "
+#~ "bon de commande, la facture est basée sur les quantités livrées ou "
+#~ "commandées."
+
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Sélectionnez un bon de commande ouvert"
+
 #~ msgid "Approve Purchase"
 #~ msgstr "Approuver l'achat"
 
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index 279c2e26061..446f0ae376d 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-02 16:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -344,14 +313,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -379,12 +350,6 @@ msgstr ""
 msgid "Quantity"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -442,12 +407,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -468,6 +427,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -500,6 +464,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,6 +497,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -537,6 +519,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -562,7 +549,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -586,7 +573,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr ""
 
@@ -627,6 +613,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -634,7 +627,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -718,6 +711,15 @@ msgstr ""
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -749,6 +751,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -801,11 +808,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -899,12 +901,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -939,14 +935,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -986,16 +1057,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1008,13 +1074,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1026,19 +1097,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1086,6 +1151,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1844,6 +1909,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1934,8 +2005,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1985,89 +2049,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2078,6 +2059,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2085,15 +2072,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2176,6 +2155,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 800a84b4fa9..dcdb84c0359 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-19 20:45+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -59,11 +59,6 @@ msgstr ""
 "Cjenik određuje valutu za ovu narudžbu. Ujedno računa i cijenu dobavljača za "
 "odabrane proizvode/količine."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -107,16 +102,13 @@ msgstr ""
 "da bi mogao biti ubačen u kanban pogled."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Upozorenje!"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "Postoje neotkazane primke vezane na ovaj nalog."
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
 msgstr "Uobičajena nabavna cijena"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od strane"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Prosječna cijena"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Račun  <b>plaćeno</b>,"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -237,7 +223,7 @@ msgstr ""
 "products."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -262,29 +248,12 @@ msgstr "${object.company_id.name} Narudžba (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Uk. osnovica"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "kategorije JM"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Grupa"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Ponuda "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -352,15 +321,17 @@ msgid "October"
 msgstr "Listopad"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Sažetak"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -387,12 +358,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Količina"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -450,12 +415,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -476,6 +435,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Planirani datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -508,6 +472,19 @@ msgstr "Vidljiv u nabavi"
 msgid "Incoming  Products"
 msgstr "Roba u dolasku"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -531,6 +508,11 @@ msgstr ""
 "se automatski generirati. Račun može izraditi i knjigovođa upisom računa i "
 "stavki kada je 'Fakturiranje' postavljeno na 'Ručno'."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -550,6 +532,11 @@ msgstr ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -575,7 +562,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -599,7 +586,6 @@ msgstr "Podzbroj"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Received"
 
@@ -640,6 +626,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Računi i primke"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -647,7 +640,7 @@ msgid "# of Lines"
 msgstr "# linija"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Označava da je izvršen prijem proizvoda"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -733,6 +726,15 @@ msgstr "Pricelist"
 msgid "Draft PO"
 msgstr "Nacrt"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -764,6 +766,11 @@ msgstr "Nacrt računa"
 msgid "The tax amount"
 msgstr "Iznos poreza"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
 msgstr "Skladišni prijenosi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Nacrt naloga za nabavu kreiran"
@@ -816,11 +823,6 @@ msgstr "Označava da je račun plaćen"
 msgid "Terms and Conditions"
 msgstr "Uvjeti o korištenju"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "nepoznato"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -914,12 +916,6 @@ msgstr "Kol."
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i emailovi."
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -954,14 +950,89 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr "Odlazni mailovi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr "Ciljno skladište"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Jedinice mjere"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Upravljačka ploča nabave"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Odaberite otvoreni prodajni nalog"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "kategorije JM"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Postavi na nacrt"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Skladišni prijenosi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Kreiraj račun iz stavki naloga za nabavu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "NN: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
 msgstr "Nalog za nabavu "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ručni računi"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
 msgstr "Nalog za nabavu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -1715,15 +1788,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
-"račun se kreira na temelju primljenih ili naručenih količina."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1828,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1873,6 +1936,12 @@ msgstr "Referentna JM"
 msgid "Outgoing products to invoice"
 msgstr "Nefakturirani izlaz"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od strane"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1963,9 +2032,9 @@ msgid "November"
 msgstr "Studeni"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ručni računi"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1987,13 +2056,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2014,89 +2076,6 @@ msgstr "Zahtjev za ponudom br."
 msgid "Invoicing Settings"
 msgstr "Postave fakturiranja"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2107,6 +2086,12 @@ msgstr "Ukupno naloga po korisniku i mjesecu"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2114,15 +2099,7 @@ msgid "Warehouse"
 msgstr "Skladište"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2205,9 +2182,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr ""
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Sažetak"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2215,6 +2192,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Verzije cjenika"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2322,6 +2304,13 @@ msgstr "Orders"
 #~ msgid "Negotiation by Supplier"
 #~ msgstr "Negotiation by Supplier"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
+#~ "račun se kreira na temelju primljenih ili naručenih količina."
+
 #~ msgid "Convert to Purchase Order"
 #~ msgstr "U nalog za nabavu"
 
@@ -2502,6 +2491,9 @@ msgstr "Orders"
 #~ msgid "Purchase Management"
 #~ msgstr "Upravljanje nabavom"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Odaberite otvoreni prodajni nalog"
+
 #~ msgid ""
 #~ "unique number of the purchase order,computed automatically when the purchase "
 #~ "order is created"
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index acb2c7854e7..d5bb15ee489 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "pénznemét, továbbá kiszámítja a kiválasztott termékek/mennyiségek szállítói "
 "árát."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr "Beszerzés-Standard ár"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Jóváhagyó"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Átlagár"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "dátuma."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Teljes nettó összeg"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategória"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -351,14 +320,16 @@ msgid "October"
 msgstr "Október"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -387,12 +358,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -450,12 +415,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -476,6 +435,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Tervezett dátum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -508,6 +472,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -531,6 +508,11 @@ msgstr ""
 "számlaellenőrzése: \"Rendelés alatt\". A könyvelő manuálisan is elkészítheti "
 "a számlát (számlaellenőrzés = manuális)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -550,6 +532,11 @@ msgstr ""
 "A vásárlónak jóvá kell hagynia az ajánlatkérést, mielőtt az elküldésre kerül "
 "a beszállítónak. Az ajánlatkérésből jóváhagyott szállítói megrendelés lesz."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -575,7 +562,7 @@ msgid "Supplier"
 msgstr "Szállító"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -599,7 +586,6 @@ msgstr "Részösszeg"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Érkeztetett"
 
@@ -640,6 +626,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -647,7 +640,7 @@ msgid "# of Lines"
 msgstr "Sorok száma"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Jelzi, hogy a kiszedést végrehajtották."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -734,6 +727,15 @@ msgstr "Árlista"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -765,6 +767,11 @@ msgstr "Számlatervezet"
 msgid "The tax amount"
 msgstr "Az adó összege"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -797,7 +804,7 @@ msgid "Stock Moves"
 msgstr "Készletmozgások"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -817,11 +824,6 @@ msgstr "Jelzi, hogy a számlát kifizették."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -916,12 +918,6 @@ msgstr "Mennyiség"
 msgid "Cancel"
 msgstr "Mégsem"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -956,14 +952,89 @@ msgid "Date Approved"
 msgstr "Dátum jóváhagyása"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1006,16 +1077,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1028,13 +1094,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1046,19 +1117,13 @@ msgstr "Mértékegységek"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Beszerzési vezérlőpult"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1097,15 +1162,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Nyitott vevői megrendelés kiválasztása"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Beállítás tervezetnek"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1136,7 +1208,7 @@ msgid "Stock Move"
 msgstr "Készletmozgás"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1238,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1328,7 +1400,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Szállítói megrendelési sorokból számla készítése"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1339,7 +1411,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1350,9 +1422,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Kézi számlák"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1506,8 +1578,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1619,8 +1691,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1693,11 +1766,11 @@ msgid "Purchase Order"
 msgstr "Szállítói megrendelés"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1718,16 +1791,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"A kiszedési lista létrehoz egy számlát. Az értékesítési megbízás "
-"számlaellenőrzésétől függően a számla a kiszállított vagy a megrendelt "
-"mennyiségen alapul."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1741,9 +1804,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1834,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "A kiválasztott beszállító feltétele a termék eladására: %s"
@@ -1879,6 +1941,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Számlázandó kimenő termékek"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Jóváhagyó"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1969,9 +2037,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Kézi számlák"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1993,13 +2061,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2020,89 +2081,6 @@ msgstr "Ajánlatkérés száma"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2113,6 +2091,12 @@ msgstr "Felhasználónkénti összes megrendelés havonta"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2120,15 +2104,7 @@ msgid "Warehouse"
 msgstr "Raktár"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2212,8 +2188,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2222,6 +2198,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Árlista változatok"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2563,6 +2544,9 @@ msgstr "Megrendelések"
 #~ msgid "Do you want to generate the supplier invoices ?"
 #~ msgstr "El akarja készíteni a bejövő számlákat?"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Nyitott vevői megrendelés kiválasztása"
+
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
 
@@ -2689,6 +2673,14 @@ msgstr "Megrendelések"
 #~ msgid "Configure Your Purchases Management Application"
 #~ msgstr "Állítsa be beszerzésmenedzsment alkalmazását"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "A kiszedési lista létrehoz egy számlát. Az értékesítési megbízás "
+#~ "számlaellenőrzésétől függően a számla a kiszállított vagy a megrendelt "
+#~ "mennyiségen alapul."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "A határértéket meghaladó beszerzési összeg"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index c5137969528..6b347a11485 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -57,11 +57,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -103,16 +98,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -129,10 +121,10 @@ msgid "Purchase-Standard Price"
 msgstr "Standar Harga Pembelian"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Divalidasi oleh .."
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -154,12 +146,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Harga Rata-rata"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -230,7 +216,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -255,29 +241,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Jumlah total tidak kena pajak"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -346,14 +315,16 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -381,12 +352,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Kuantitas"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -444,12 +409,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -470,6 +429,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -502,6 +466,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -522,6 +499,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -541,6 +523,11 @@ msgstr ""
 "Pembeli telah menyetujui RFQ sebelum dikirim ke pemasok.  RFQ menjadi order "
 "pembelian yang telah dikonfirmasi."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -566,7 +553,7 @@ msgid "Supplier"
 msgstr "Pemasok"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -590,7 +577,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Diterima"
 
@@ -631,6 +617,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -638,7 +631,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Hal ini menunjukkan bahwa  pengambilan  telah  dilakukan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -725,6 +718,15 @@ msgstr "Harga"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -756,6 +758,11 @@ msgstr "Konsep Faktur"
 msgid "The tax amount"
 msgstr "Jumlah Pajak"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -788,7 +795,7 @@ msgid "Stock Moves"
 msgstr "Perpindahan Stok"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -808,11 +815,6 @@ msgstr "Ini adalah indikator bahwa faktur telah dibayarkan"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -906,12 +908,6 @@ msgstr "Qty"
 msgid "Cancel"
 msgstr "Batal"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -946,14 +942,89 @@ msgid "Date Approved"
 msgstr "Tanggal Disetujui"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -996,16 +1067,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1018,13 +1084,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1036,19 +1107,13 @@ msgstr "Satuan Unit"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1087,15 +1152,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Pilih Order Penjualan"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Atur ke draft"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1126,7 +1198,7 @@ msgid "Stock Move"
 msgstr "Perpindahan Stok"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1228,7 +1300,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1318,7 +1390,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1329,7 +1401,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1340,9 +1412,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Faktur secara manual"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1496,8 +1568,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1609,8 +1681,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1683,11 +1756,11 @@ msgid "Purchase Order"
 msgstr "Order Pembelian"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1708,16 +1781,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Daftar Pengambilan untuk membuat  faktur. Tergantung pada kontrol Faktur "
-"dari order penjualan, faktur berdasarkan  pengiriman  atau jumlah yang "
-"diminta."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1731,9 +1794,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1822,7 +1884,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1867,6 +1929,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Divalidasi oleh .."
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1957,9 +2025,9 @@ msgid "November"
 msgstr "Nopember"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faktur secara manual"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1981,13 +2049,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2008,89 +2069,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2101,6 +2079,12 @@ msgstr "Jumlah Pesanan oleh Pengguna per bulan"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2108,15 +2092,7 @@ msgid "Warehouse"
 msgstr "Gudang"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2189,8 +2165,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2199,6 +2175,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versi Daftar Harga"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2290,6 +2271,9 @@ msgstr ""
 #~ msgid "No Pricelist !"
 #~ msgstr "Tidak ada daftar harga !"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Pilih Order Penjualan"
+
 #~ msgid ""
 #~ "Put an address if you want to deliver directly from the supplier to the "
 #~ "customer.In this case, it will remove the warehouse link and set the "
@@ -2315,6 +2299,14 @@ msgstr ""
 #~ msgid "Approve Purchase"
 #~ msgstr "Pembelian disetujui"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Daftar Pengambilan untuk membuat  faktur. Tergantung pada kontrol Faktur "
+#~ "dari order penjualan, faktur berdasarkan  pengiriman  atau jumlah yang "
+#~ "diminta."
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist or a supplier in the purchase form !\n"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 8ee00511eb2..f055e995920 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 22:37+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -64,11 +64,6 @@ msgstr ""
 "Il listino, oltre a definire la valuta utilizzata per questo ordine, calcola "
 "il prezzo del fornitore per i prodotti e le quantità selezionate"
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Acquisti: Segna come letto"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -112,16 +107,13 @@ msgstr ""
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Attenzione!"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -140,10 +132,10 @@ msgid "Purchase-Standard Price"
 msgstr "Prezzo standard di acquisto"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Convalidato da"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -176,12 +168,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Prezzo medio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fattura <b>pagata</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -256,7 +242,7 @@ msgstr ""
 "ordine d'acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -282,30 +268,12 @@ msgstr "${object.company_id.name} Ordine (Rif ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Totale imponibile"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Categorie Unità di Misura"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Preventivo "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Preventivo per <em>%s</em> <b>convertito</b> in Ordine di Acquisto per %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -390,15 +358,17 @@ msgid "October"
 msgstr "Ottobre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Ordine di Acquisto per <em>%s</em> <b>annullato</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Riepilogo"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Quando si vende questo servizio ad un cliente,"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -426,12 +396,6 @@ msgstr "Vuoi generare la fattura fornitore?"
 msgid "Quantity"
 msgstr "Quantità"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Spedizione <em>%s</em> <b>pianificata</b> per %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -503,12 +467,6 @@ msgstr ""
 "cliente. Altrimenti, lasciare vuote per consegnare direttamente alla propria "
 "azienda."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Fattura bozza per %s %s is <b>in attesa di validazione</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -540,6 +498,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Data preventivata"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -572,6 +535,19 @@ msgstr "Può essere acquistato"
 msgid "Incoming  Products"
 msgstr "Prodotti in arrivo"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -595,6 +571,11 @@ msgstr ""
 "vendita è 'On order'. La fattura può essere anche generata manualmente dal "
 "responsabile della contabilità (controllo fattura = Manuale)"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -614,6 +595,11 @@ msgstr ""
 "Il compratore deve approvare il preventivo prima che questo venga inviato al "
 "fornitore. Il preventivo diverrà quindi un ordine di acquisto"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -639,7 +625,7 @@ msgid "Supplier"
 msgstr "Fornitore"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "Definire un conto spese per questa azienda: \"%s\" (id:%d)."
@@ -663,7 +649,6 @@ msgstr "Subtotale"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Ricevuto"
 
@@ -717,6 +702,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Fatture e Arrivi"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -724,7 +716,7 @@ msgid "# of Lines"
 msgstr "Numero di linee"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "Definire un conto spese per questo prodotto: \"%s\" (id:%d)."
@@ -745,8 +737,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica che è stato eseguito un movimento merci"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "Impossibile annullare questo ordine di acquisto."
@@ -813,6 +805,15 @@ msgstr "Listino Prezzi"
 msgid "Draft PO"
 msgstr "PO Bozza"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Attenzione!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -844,6 +845,11 @@ msgstr "Bozza Fattura"
 msgid "The tax amount"
 msgstr "Totale imposte"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -876,7 +882,7 @@ msgid "Stock Moves"
 msgstr "Movimenti di magazzino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Ordine di acquisto bozza creato"
@@ -896,11 +902,6 @@ msgstr "Indica che una fattura è stata pagata"
 msgid "Terms and Conditions"
 msgstr "Termini e Condizioni"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "sconosciuto"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -995,12 +996,6 @@ msgstr "Qta'"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -1034,17 +1029,92 @@ msgstr "Prezzo unitario"
 msgid "Date Approved"
 msgstr "Data Approvazione"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Richiesta di preventivo <b>creata</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "un ordine di acquisto bozza"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1088,16 +1158,11 @@ msgid "Outgoing Mails"
 msgstr "Email in uscita"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr "Non è possibile confermare un ordine di acquisto senza righe."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Acquisti: Segna come letto"
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1110,7 +1175,7 @@ msgid "Destination Warehouse"
 msgstr "Magazzino di destinazione"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -1119,6 +1184,11 @@ msgstr ""
 "L'unità di misura selezionata non appartiene alla stessa categoria di quella "
 "del prodotto."
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1130,19 +1200,13 @@ msgstr "Unità di Misura"
 msgid "Manage pricelist per supplier"
 msgstr "Gestisce i listini prezzi per fornitore"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "L'ordine di acquisto è stato impostato a <b>bozza</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Dashboard acquisti"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1182,15 +1246,22 @@ msgid "Unread Messages"
 msgstr "Messaggi non letti"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selezionare un ordine di vendita aperto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Categorie Unità di Misura"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Imposta come Bozza"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1221,7 +1292,7 @@ msgid "Stock Move"
 msgstr "Movimento di magazzino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "Azione non valida!"
@@ -1327,7 +1398,7 @@ msgid ""
 msgstr "un ordine di acquisto bozza"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Si prega di creare le fatture."
@@ -1434,7 +1505,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Genera fattura da linea ordine di acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1445,7 +1516,7 @@ msgid "Send by EMail"
 msgstr "Invia tramite email"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "Definire il sezionale acquisti per l'azienda: \"%s\" (id:%d)."
@@ -1456,9 +1527,11 @@ msgid "Purchase Order "
 msgstr "Ordine d'acquisto "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Fatture manuali"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+"Consente di calcolare il prezzo di costo del prodotto basandosi sul costo "
+"medio."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1628,8 +1701,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "Calcola il prezzo di costo del prodotto basandosi sul costo medio"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1752,9 +1825,10 @@ msgid "Open Purchase Menu"
 msgstr "Apre Menù Acquisti"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Wizard composizione email"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1826,11 +1900,11 @@ msgid "Purchase Order"
 msgstr "Ordine Acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -1857,16 +1931,6 @@ msgstr ""
 "viene pagato e ricevuto, lo stato passa a 'Completato'. Se la fattura o la "
 "ricezione merci relative vengono annullate, lo stato diventa eccezione."
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Una lista di prelievo genera una fattura. La fattura sarà riferita alle "
-"quantità spedite o a quelle ordinate, in funzione del controllo dell'ordine "
-"di vendita della fattura stessa ."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1880,10 +1944,9 @@ msgid "# of Purchase Order"
 msgstr "# dell'ordine di acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Spedizione <b>ricevuta</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Wizard composizione email"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1977,7 +2040,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Il fornitore selezionato vende questo prodotto solo da %s"
@@ -2025,6 +2088,12 @@ msgstr "Unità di Misura di Riferimento"
 msgid "Outgoing products to invoice"
 msgstr "Prodotti in uscita da fatturare"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Convalidato da"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -2115,11 +2184,9 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
-"Consente di calcolare il prezzo di costo del prodotto basandosi sul costo "
-"medio."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Fatture manuali"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2147,15 +2214,6 @@ msgstr ""
 "Basato sulle spedizioni in entrata: consente di creare una fattura quando le "
 "ricezioni vengono validate."
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Riferimento del documento che ha generato questo ordine di acquisto; un "
-"ordine di vendita o una richiesta di approvvigionamento interna."
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2176,167 +2234,6 @@ msgstr "Richiesta di Quotazione N°"
 msgid "Invoicing Settings"
 msgstr "Impostazioni Fatturazione"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Salve ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Ecco la vostra ${object.state in ('draft', 'sent') and 'richiesta di "
-"preventivo' or \"conferma d'ordine di acquisto\"} da "
-"${object.company_id.name}: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Numero ordine: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Totale ordine: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Data ordine: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Riferimento ordine: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Vostro rif.: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>Per qualsiasi informazione non esitate a contattarci.</p>\n"
-"    <p>Grazie!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2347,6 +2244,12 @@ msgstr "Ordini totali per utente per mese"
 msgid "Based on incoming shipments"
 msgstr "Basato sulle spedizioni in entrata"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2354,18 +2257,7 @@ msgid "Warehouse"
 msgstr "Magazzino"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Riferimento dell'ordine di vendita o preventivo inviato dal fornitore. E' "
-"principalmente usato per collegare i prodotti ricevuti siccome solitamente "
-"viene scritto sul DDT."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2452,9 +2344,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Quando si vende questo servizio ad un cliente,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Riepilogo"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2462,6 +2354,11 @@ msgstr "Quando si vende questo servizio ad un cliente,"
 msgid "Pricelist Versions"
 msgstr "Versione listino prezzi"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2791,6 +2688,9 @@ msgstr "Ordini"
 #~ msgid "Do you want to generate the supplier invoices ?"
 #~ msgstr "Si desidera generare le fatture di acquisto?"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selezionare un ordine di vendita aperto"
+
 #~ msgid "Current purchases"
 #~ msgstr "Acquisti correnti"
 
@@ -2825,6 +2725,14 @@ msgstr "Ordini"
 #~ msgid "Configuration Progress"
 #~ msgstr "Avanzamento configurazione"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Una lista di prelievo genera una fattura. La fattura sarà riferita alle "
+#~ "quantità spedite o a quelle ordinate, in funzione del controllo dell'ordine "
+#~ "di vendita della fattura stessa ."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Costo d' acquisto sopra il limite consentito"
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index 1b61ec78e82..08e4d12838d 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-21 23:39+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "最初に、この発注オーダーに関連する全ての受領をキャンセルすべきです。"
@@ -130,10 +122,10 @@ msgid "Purchase-Standard Price"
 msgstr "発注標準価格"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "検証者"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "平均価格"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr "これは、全発注オーダー行の製品のもっとも小さい予定日として計算されます。"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "税抜合計"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "分類"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -345,14 +314,16 @@ msgid "October"
 msgstr "10月"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -380,12 +351,6 @@ msgstr "仕入先請求書を作成しますか？"
 msgid "Quantity"
 msgstr "数量"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -443,12 +408,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -469,6 +428,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "予定日"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -501,6 +465,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -522,6 +499,11 @@ msgid ""
 msgstr ""
 "発注オーダーの請求書制御がオーダー時である場合は、請求書は自動的に作成されます。請求書は会計士により、手動で生成することもできます（請求書制御を手動）。"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -539,6 +521,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr "買い手は仕入先に送られる前に見積依頼（RFQ）を承認しなければなりません。見積依頼（RFQ）は確認された発注オーダーになります。"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -564,7 +551,7 @@ msgid "Supplier"
 msgstr "仕入先"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -588,7 +575,6 @@ msgstr "小計"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "受信済"
 
@@ -629,6 +615,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -636,7 +629,7 @@ msgid "# of Lines"
 msgstr "行数"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -657,8 +650,8 @@ msgid "It indicates that a picking has been done"
 msgstr "それは集荷は行われたことを示しています。"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -720,6 +713,15 @@ msgstr "価格リスト"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -751,6 +753,11 @@ msgstr "ドラフト請求書"
 msgid "The tax amount"
 msgstr "税金額"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -783,7 +790,7 @@ msgid "Stock Moves"
 msgstr "在庫移動"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -803,11 +810,6 @@ msgstr "これは請求書は既に支払われたことを意味しています
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -901,12 +903,6 @@ msgstr "数量"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -941,14 +937,89 @@ msgid "Date Approved"
 msgstr "承認日"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -988,16 +1059,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1010,13 +1076,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1028,19 +1099,13 @@ msgstr "単位"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "発注ダッシュボード"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1079,15 +1144,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "開いている受注オーダーの選択"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "ドラフトに設定"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1118,7 +1190,7 @@ msgid "Stock Move"
 msgstr "在庫移動"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1218,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1308,7 +1380,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "発注オーダー行は請求書を作成します。"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "発注オーダー：%s"
@@ -1319,7 +1391,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1330,9 +1402,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "手動作成請求書"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1486,8 +1558,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1599,8 +1671,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1671,11 +1744,11 @@ msgid "Purchase Order"
 msgstr "発注オーダー"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1696,13 +1769,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1716,9 +1782,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1803,7 +1868,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "選択仕入先は%s によりこの製品のみを売ります。"
@@ -1848,6 +1913,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "請求するための出庫製品"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "検証者"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1938,9 +2009,9 @@ msgid "November"
 msgstr "11月"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "手動作成請求書"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1962,13 +2033,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1989,89 +2053,6 @@ msgstr "見積依頼番号"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2082,6 +2063,12 @@ msgstr "ユーザの月別合計オーダー"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2089,15 +2076,7 @@ msgid "Warehouse"
 msgstr "倉庫"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2180,8 +2159,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2190,6 +2169,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "価格リストバージョン"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2347,6 +2331,11 @@ msgstr "オーダー"
 #~ msgid "Set the Default Invoicing Control Method"
 #~ msgstr "デフォルト請求書制御方法をセット"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
+
 #~ msgid "Default Invoicing Control Method"
 #~ msgstr "デフォルト請求書制御方法"
 
@@ -2722,6 +2711,9 @@ msgstr "オーダー"
 #~ msgid "Order in current year"
 #~ msgstr "今年のオーダー"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "開いている受注オーダーの選択"
+
 #~ msgid ""
 #~ "unique number of the purchase order,computed automatically when the purchase "
 #~ "order is created"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 56dc478101f..b0506fd5eb3 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:31+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr "가격리스트는 이 구매 주문에 이용되는 통화를 설정하며, 선택된 상품/수량에 대해 공급자 가격을 계산합니다."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -130,10 +122,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "검증한 이"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr "이것은 모든 구매 주문 라인 상품의 최소 스케줄 날짜로 계산됩니다."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -344,14 +313,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -379,12 +350,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "수량"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -442,12 +407,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -468,6 +427,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -500,6 +464,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,6 +497,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -537,6 +519,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -562,7 +549,7 @@ msgid "Supplier"
 msgstr "공급자"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -586,7 +573,6 @@ msgstr "소계"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "수령함"
 
@@ -627,6 +613,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -634,7 +627,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -718,6 +711,15 @@ msgstr "가격리스트"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -749,6 +751,11 @@ msgstr "초안 인보이스"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -801,11 +808,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -899,12 +901,6 @@ msgstr "수량"
 msgid "Cancel"
 msgstr "취소"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -939,14 +935,89 @@ msgid "Date Approved"
 msgstr "승인된 날짜"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -986,16 +1057,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1008,13 +1074,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1026,19 +1097,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1086,6 +1151,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "초안으로 설정"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
 msgstr "구매 주문"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1844,6 +1909,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "검증한 이"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1934,8 +2005,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1985,89 +2049,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2078,6 +2059,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2085,15 +2072,7 @@ msgid "Warehouse"
 msgstr "창고"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2176,6 +2155,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index c38cb805acf..b5214864b74 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -57,11 +57,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -103,16 +98,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -129,10 +121,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Patvirtintas"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -154,12 +146,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -230,7 +216,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -255,29 +241,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -343,14 +312,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -378,12 +349,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Kiekis"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -441,12 +406,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -467,6 +426,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -499,6 +463,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -519,6 +496,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -536,6 +518,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -561,7 +548,7 @@ msgid "Supplier"
 msgstr "Tiekėjas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -585,7 +572,6 @@ msgstr "Tarpinė suma"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Gauta"
 
@@ -626,6 +612,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -633,7 +626,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -717,6 +710,15 @@ msgstr "Kainoraštis"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -748,6 +750,11 @@ msgstr "Sąskaitos faktūros juodraštis"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -780,7 +787,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -800,11 +807,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -898,12 +900,6 @@ msgstr "Kiekis"
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -938,14 +934,89 @@ msgid "Date Approved"
 msgstr "Patvirtinimo data"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -985,16 +1056,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1007,13 +1073,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1025,19 +1096,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1085,6 +1150,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Nustatyti kaip juodraštį"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1669,11 +1742,11 @@ msgid "Purchase Order"
 msgstr "Pirkimo užsakymas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1714,9 +1780,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1800,7 +1865,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1845,6 +1910,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Patvirtintas"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1935,8 +2006,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1986,89 +2050,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2079,6 +2060,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2086,15 +2073,7 @@ msgid "Warehouse"
 msgstr "Sandėlis"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2167,8 +2146,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2177,6 +2156,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index 8b781b6b96d..4a5e4d9f651 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-16 16:24+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "Cenrādis norāda iepirkuma valūtu. Tas arī aprēķina izvēlēto "
 "produktu/daudzumu un piegādes cenu."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr "Iepirkuma Standarta Cena"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Apstiprināja"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Vidējā Cena"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -233,7 +219,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -258,29 +244,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Summa bez Nodokļiem kopā"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -346,14 +315,16 @@ msgid "October"
 msgstr "Oktobris"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -382,12 +353,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Skaits"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -445,12 +410,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -471,6 +430,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Ieplānotais Datums"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -503,6 +467,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -523,6 +500,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -542,6 +524,11 @@ msgstr ""
 "Pirms tāme tiek aizsūtīta piegādātājam, pircējam tā ir jāapstiprina. Pēc tam "
 "tāme kļūst par apstiprinātu Iepirkumu."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -567,7 +554,7 @@ msgid "Supplier"
 msgstr "Piegādātājs"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -591,7 +578,6 @@ msgstr "Apakšsumma kopā"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Saņemts"
 
@@ -632,6 +618,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -639,7 +632,7 @@ msgid "# of Lines"
 msgstr "Rindu skaits"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -660,8 +653,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Parāda, ka komplektācija ir pabeigta"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -723,6 +716,15 @@ msgstr "Cenrādis"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -754,6 +756,11 @@ msgstr "Neapstiprināts Rēķins"
 msgid "The tax amount"
 msgstr "Nodokļa Summa"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -786,7 +793,7 @@ msgid "Stock Moves"
 msgstr "Preču kustība Noliktavā"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -806,11 +813,6 @@ msgstr "Norāda, ka rēķins ir apmaksāts"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -904,12 +906,6 @@ msgstr "Sk."
 msgid "Cancel"
 msgstr "Atcelt"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -944,14 +940,89 @@ msgid "Date Approved"
 msgstr "Datums, kurā apstiprināts"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -991,16 +1062,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1013,13 +1079,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1031,19 +1102,13 @@ msgstr "Mērvienības"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Iepirkumu Rīku Panelis"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1082,15 +1147,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Izvēlēties Aktīvu Pasūtījumu"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Atzīmēt kā Melnrakstu"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1121,7 +1193,7 @@ msgid "Stock Move"
 msgstr "Noliktavas Grāmatojums"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1220,7 +1292,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1310,7 +1382,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1321,7 +1393,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1332,9 +1404,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuālie Rēķini"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1488,8 +1560,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1601,8 +1673,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1673,11 +1746,11 @@ msgid "Purchase Order"
 msgstr "Iepirkums"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1698,13 +1771,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1718,9 +1784,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1804,7 +1869,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Izvēlētais piegādātājs produktu pārdod tikai pēc %s"
@@ -1849,6 +1914,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Izejošie produkti, par kuriem piestādīt rēķinu"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Apstiprināja"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1939,9 +2010,9 @@ msgid "November"
 msgstr "Novembris"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuālie Rēķini"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1963,13 +2034,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1990,89 +2054,6 @@ msgstr "Tame Nr."
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2083,6 +2064,12 @@ msgstr "Pasūtījumi kopā pēc lietotāja pa mēnešiem"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2090,15 +2077,7 @@ msgid "Warehouse"
 msgstr "Noliktava"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2171,8 +2150,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2181,6 +2160,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Cenrāža Versijas"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2345,6 +2329,9 @@ msgstr "Pasūtījumi"
 #~ msgid "No Pricelist !"
 #~ msgstr "Nav Cenrāža!"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Izvēlēties Aktīvu Pasūtījumu"
+
 #~ msgid "Reference UoM"
 #~ msgstr "Atsauces Mērv."
 
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 208edcbf7cf..3b8e9718e9f 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-20 04:05+0000\n"
 "Last-Translator: Khulan Altangerel <khulancomp@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "Үнийн жагсаалт нь энэ захиалгад зориулж валютыг тохируулна. Мөн өгөгдсөн "
 "бараа/тоо ширхэг дээр үндэслэн нийлүүлэгчийн үнийг тооцоолно."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
 msgstr "Худалдан авалтын стандарт үнэ"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Баталсан"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Дундаж үнэ"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "Захиалгын мөрүүдээс хамгийн ойрын огноог сонгож энэ огноог тооцоолно."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr "${object.company_id.name} Захиалга (Код ${object.name or 'б/
 msgid "Total Untaxed amount"
 msgstr "Нийт татваргүй хэмжээ"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Ангилал"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -351,14 +320,16 @@ msgid "October"
 msgstr "10 сар"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -386,12 +357,6 @@ msgstr "Та нийлүүлэгчийн нэхэмжлэл үүсгэхийг х
 msgid "Quantity"
 msgstr "Тоо ширхэг"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -449,12 +414,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -475,6 +434,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Төлөвлөгдсөн огноо"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -507,6 +471,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -530,6 +507,11 @@ msgstr ""
 "автоматаар үүснэ. Мөн нягтлан нэхэмжлэлийг гараараа үүсгэх боломжтой. "
 "(Нэхэмжлэл хяналт = Гараар)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "Худалдан авагч үнийн саналын хүсэлтийг нийлүүлэгчрүү илгээхээс өмнө батлах "
 "ёстой. Үнийн саналын хүсэлт нь Худалдан Авах Захиалга болж хувирна."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Нийлүүлэгч"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Дэд дүн"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Ирсэн"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "# Мөрийн"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Энэ нь барааг бүрэн хүлээж авсан эсэхийг илэрхийлнэ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -732,6 +725,15 @@ msgstr "Үнийн хүснэгт"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -763,6 +765,11 @@ msgstr "Ноорог нэхэмжлэл"
 msgid "The tax amount"
 msgstr "Татварын хэмжээ"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
 msgstr "Барааны хөдөлгөөн"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -815,11 +822,6 @@ msgstr "Энэ нь нэхэмжлэл бүрэн төлөгдсөн эсэхи
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -913,12 +915,6 @@ msgstr "Тоо"
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
 msgstr "Зөвшөөрсөн огноо"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Хэмжих нэгж"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Худалдан авалт"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Нээлттэй борлуулалтын захиалга сонгох"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Ноороглох"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Агуулахын хөдөлгөөн"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Худалдан авалтын захиалгын  мөрний нэхэмжлэл бэлдэх"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "ХАЗ: %s"
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Нэхэмжлэх заавар"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
 msgstr "Худалдан авах захиалга"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1716,16 +1789,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Бэлтгэх жагсаалт нь нэхэмжлэлийг үүсгэдэг. Борлуулалтын захиалгын "
-"нэхэмжлэлийг хянах аргаас шалтгаалан хүргэлтээс болон захиалсан тоо "
-"хэмжээнээс нэхэмжлэл үүсдэг."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1739,9 +1802,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1831,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Сонгосон нийлүүлэгч нь энэ барааг зөвхөн %s-р борлуулдаг."
@@ -1876,6 +1938,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Гарч байгаа нэхэмжлэх бараанууд"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Баталсан"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1966,9 +2034,9 @@ msgid "November"
 msgstr "11 сар"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Нэхэмжлэх заавар"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1990,13 +2058,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2017,89 +2078,6 @@ msgstr "Үнийн санал N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2110,6 +2088,12 @@ msgstr "Нийт захиалга (сар бүр хэрэглэгчээр)"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2117,15 +2101,7 @@ msgid "Warehouse"
 msgstr "Агуулах"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2186,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2220,6 +2196,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Үнийн хувилбар"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2520,6 +2501,9 @@ msgstr "Захиалга"
 #~ msgid "No Pricelist !"
 #~ msgstr "Үнийн хүснэгтгүй !"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Нээлттэй борлуулалтын захиалга сонгох"
+
 #~ msgid "Current purchases"
 #~ msgstr "Өнөөгийн худалдан авалт"
 
@@ -2759,6 +2743,14 @@ msgstr "Захиалга"
 #~ msgid "To Invoice"
 #~ msgstr "Нэхэмжлэх"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Бэлтгэх жагсаалт нь нэхэмжлэлийг үүсгэдэг. Борлуулалтын захиалгын "
+#~ "нэхэмжлэлийг хянах аргаас шалтгаалан хүргэлтээс болон захиалсан тоо "
+#~ "хэмжээнээс нэхэмжлэл үүсдэг."
+
 #~ msgid ""
 #~ "You can create a request for quotation when you want to buy products to a "
 #~ "supplier but the purchase is not confirmed yet. Use also this menu to review "
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 5616b025609..83425bf0fae 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-04-01 12:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "Prislisten angir valuta benyttet for denne innkjøpsordren. Den beregner også "
 "leverandørpris for valgte produkter og mengder."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "Du må først kansellere alle mottak knyttet til denne innkjøpsordren"
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr "Innkjøp-standard pris"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Bekreftet av"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Gjennomsnittspris"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "produkter."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -261,29 +247,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Totalt ikke avg.ber. beløp"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -352,14 +321,16 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -387,12 +358,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Antall"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -450,12 +415,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -476,6 +435,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Planlagt dato"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -508,6 +472,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -531,6 +508,11 @@ msgstr ""
 "«på bestilling». Fakturaen kan også genereres manuelt av revisor (Faktura "
 "kontroll = Manuell)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -550,6 +532,11 @@ msgstr ""
 "Kjøper må godkjenne forespørselen før den sendes leverandør. Forespørselen "
 "blir en bekreftet innkjøpsordre."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -575,7 +562,7 @@ msgid "Supplier"
 msgstr "Leverandør"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -599,7 +586,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Mottatt"
 
@@ -640,6 +626,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -647,7 +640,7 @@ msgid "# of Lines"
 msgstr "# linjer"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
 msgstr "det indikerer at en plukking har blitt utført"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -733,6 +726,15 @@ msgstr "Prisliste"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -764,6 +766,11 @@ msgstr "Fakturautkast"
 msgid "The tax amount"
 msgstr "Avgiftsbeløp"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
 msgstr "Lagerbevegelser"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -816,11 +823,6 @@ msgstr "Det indikerer at en faktura har blitt betalt"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -914,12 +916,6 @@ msgstr "Antall"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -954,14 +950,89 @@ msgid "Date Approved"
 msgstr "Godkjent dato"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Måleenheter"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Innkjøpskonsoll"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Velg en åpen salgsordre"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Sett som utkast"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Lagerbevegelser"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Innkjøpsordrelinjer danner faktura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuelle fakturaer"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
 msgstr "Innkjøpsordre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1715,15 +1788,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"En plukkliste danner faktura. Fakturaen baseres enten på levert eller "
-"bestilt antall avhengig av parameter for faktureringsregel på ordren."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1828,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Den valgte leverandøren selger dette produktet bare som %s"
@@ -1873,6 +1936,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Utgående produkter til fakturering"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Bekreftet av"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1963,9 +2032,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuelle fakturaer"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1987,13 +2056,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2014,89 +2076,6 @@ msgstr "Tilbudsforespørsels nr."
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2107,6 +2086,12 @@ msgstr "Totalt antall ordre pr bruker pr månded"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2114,15 +2099,7 @@ msgid "Warehouse"
 msgstr "Lager"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2207,8 +2184,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2217,6 +2194,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Prisliste versjoner"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2267,6 +2249,9 @@ msgstr "Ordre"
 #~ msgid "No Pricelist !"
 #~ msgstr "Ingen prisliste!"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Velg en åpen salgsordre"
+
 #~ msgid "Partial Picking"
 #~ msgstr "Delvis plukking"
 
@@ -2689,6 +2674,13 @@ msgstr "Ordre"
 #~ msgid "Incoming Shipments already processed"
 #~ msgstr "Innkommende leveranse er allerede behandlet"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "En plukkliste danner faktura. Fakturaen baseres enten på levert eller "
+#~ "bestilt antall avhengig av parameter for faktureringsregel på ordren."
+
 #, python-format
 #~ msgid "You must first cancel all invoices related to this purchase order."
 #~ msgstr "Du må først annullere alle fakturaer tilhørende innkjøpsordren."
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 98c2cb15999..44186f01101 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 19:11+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "De prijslijst zet de valuta voor deze inkooporder. Het berekend ook de "
 "inkoopprijs voor de geselecteerd producten."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Purchase: Markeer als gelezen"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -108,16 +103,13 @@ msgstr ""
 "ingevoegd."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -136,10 +128,10 @@ msgid "Purchase-Standard Price"
 msgstr "Inkoop-kostprijs"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Goedgekeurd door"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -161,12 +153,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Gemiddelde prijs"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factuur <b>betaald</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -238,7 +224,7 @@ msgstr ""
 "Dit is een berekende minimale geplande datum van alle inkooporderregels."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -263,29 +249,12 @@ msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Totaalbedrag excl. belastingen"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Maateenheid categorieën"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categorie"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Offerte "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -354,15 +323,17 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Inkooporder voorr <em>%s</em> <b>geannuleerd</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -389,12 +360,6 @@ msgstr "Wilt u de leveranciersfacturen genereren?"
 msgid "Quantity"
 msgstr "Aantal"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Inkomende levering <em>%s</em> <b>geplant</b> for %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -452,12 +417,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -478,6 +437,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Geplande datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -510,6 +474,19 @@ msgstr "Inkoop product"
 msgid "Incoming  Products"
 msgstr "Inkomende producten"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,7 +497,7 @@ msgstr "of"
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr "Voorbereidingstijd inkoop"
+msgstr "Extra dagen levertijd inkoop"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -533,6 +510,11 @@ msgstr ""
 "inkooporder 'Van order' is. De factuur kan ook handmatig worden gegenereerd "
 "door de boekhouder (Factuurinstelling = Handmatig)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -553,6 +535,11 @@ msgstr ""
 "leveranciers wordt gestuurd. De offerteaanvraag wordt een bevestigde "
 "inkooporder."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -578,7 +565,7 @@ msgid "Supplier"
 msgstr "Leverancier"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -602,7 +589,6 @@ msgstr "Subtotaal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Ontvangen"
 
@@ -643,6 +629,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Facturen en ontvangsten"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -650,7 +643,7 @@ msgid "# of Lines"
 msgstr "# Regels"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -671,8 +664,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Het geeft aan dat het order verzamelen is uitgevoerd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -736,6 +729,15 @@ msgstr "Prijslijst"
 msgid "Draft PO"
 msgstr "Concept inkoopporder"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -767,6 +769,11 @@ msgstr "Concept factuur"
 msgid "The tax amount"
 msgstr "Het BTW bedrag"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -799,7 +806,7 @@ msgid "Stock Moves"
 msgstr "Goederenstromen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Concept inkoopporderBeheer aangemaakt."
@@ -819,11 +826,6 @@ msgstr "Dit geeft aan dat de factuur is betaald."
 msgid "Terms and Conditions"
 msgstr "Voorwaarden"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "onbekend"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -917,12 +919,6 @@ msgstr "Hvhd"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -956,17 +952,92 @@ msgstr "Prijs"
 msgid "Date Approved"
 msgstr "Datum goedgekeurd"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr ""
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "een concept inkooporder"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1007,16 +1078,11 @@ msgid "Outgoing Mails"
 msgstr "Uitgaande E-mails"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Inkoop: Markeer als ongelezen"
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1029,13 +1095,18 @@ msgid "Destination Warehouse"
 msgstr "Bestemmings magazijn"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1047,19 +1118,13 @@ msgstr "Maateenheden"
 msgid "Manage pricelist per supplier"
 msgstr "Beheer prijslijsten per leverancier"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Inkoop dashboard"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1098,15 +1163,22 @@ msgid "Unread Messages"
 msgstr "Ongelezen berichten"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecteer een openstaande verkooporder"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Maateenheid categorieën"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Naar Concept"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1137,7 +1209,7 @@ msgid "Stock Move"
 msgstr "Voorraadmutatie"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie!"
@@ -1239,7 +1311,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Maak à.u.b. Facturen."
@@ -1329,7 +1401,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Inkooporderregel factuur maken"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "IO: %s"
@@ -1340,7 +1412,7 @@ msgid "Send by EMail"
 msgstr "Stuur per -mail"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1351,9 +1423,9 @@ msgid "Purchase Order "
 msgstr "InkoopporderBeheer "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Handmatige facturen"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1507,8 +1579,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1620,9 +1692,10 @@ msgid "Open Purchase Menu"
 msgstr "Inkoop menu openen"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "E-mail samenstellen wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1694,11 +1767,11 @@ msgid "Purchase Order"
 msgstr "Inkooporder"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -1719,16 +1792,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Een pakbon genereert een factuur. Afhankelijk van de facturatieinstelling "
-"van de verkooporder, is de factuur gebaseerd op geleverde of bestelde "
-"aantallen."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1742,10 +1805,9 @@ msgid "# of Purchase Order"
 msgstr "# inkoopporderBeheer"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Inkomende levering <b>ontvangen</>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-mail samenstellen wizard"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1834,7 +1896,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "Offerte_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s"
@@ -1879,6 +1941,12 @@ msgstr "Maateenheid referentie"
 msgid "Outgoing products to invoice"
 msgstr "Te factureren uitgaande producten"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Goedgekeurd door"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1969,9 +2037,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Handmatige facturen"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1993,13 +2061,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2020,89 +2081,6 @@ msgstr "Verzoek om offerte nr."
 msgid "Invoicing Settings"
 msgstr "Facturering instellingen"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2113,6 +2091,12 @@ msgstr "Totaal oprders op gebruiker per maand"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2120,15 +2104,7 @@ msgid "Warehouse"
 msgstr "Magazijn"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,13 +2186,13 @@ msgstr ""
 " \n"
 " Regels worden alleen samengevoegd als: \n"
 " * Orderregels exact hetzelfde zijn behalve het product aantal en "
-"meeteenheid \n"
+"maateenheid \n"
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr ""
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2224,6 +2200,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versies prijslijsten"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2411,9 +2392,6 @@ msgstr "Orders"
 #~ msgid "Confirm Purchase Order"
 #~ msgstr "Bevestig Inkooporder"
 
-#~ msgid "Purchase Management"
-#~ msgstr "Inkoopbeheer"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Partner Ref."
 
@@ -2574,6 +2552,9 @@ msgstr "Orders"
 #~ msgid "Current purchases"
 #~ msgstr "Actuele inkopen"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecteer een openstaande verkooporder"
+
 #~ msgid "Reference UoM"
 #~ msgstr "Referentie eenheid"
 
@@ -2584,6 +2565,14 @@ msgstr "Orders"
 #~ msgid "Partial Picking"
 #~ msgstr "Deels gepikt"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Een pakbon genereert een factuur. Afhankelijk van de facturatieinstelling "
+#~ "van de verkooporder, is de factuur gebaseerd op geleverde of bestelde "
+#~ "aantallen."
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -3240,3 +3229,6 @@ msgstr "Orders"
 
 #~ msgid "Product UOM"
 #~ msgstr "Product maateenheid"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Inkoop"
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 26ee17f71a2..56ea970f882 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-01 11:28+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "De prijslijst bepaalt de munt voor de aankooporder. Ook de aankoopprijs voor "
 "de gekozen producten / hoeveelheden wordt hiermee berekend."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "U moet eerst alle ontvangsten voor deze aankooporder annuleren."
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr "Standaardaankooppprijs"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Goedgekeurd door"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Gemiddelde prijs"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -234,7 +220,7 @@ msgstr ""
 "aankooporderlijnen."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -259,29 +245,12 @@ msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
 msgid "Total Untaxed amount"
 msgstr "Totaalbedrag excl. btw"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categorie"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -350,14 +319,16 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -386,12 +357,6 @@ msgstr "Wilt u de aankoopfacturen maken?"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -449,12 +414,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -475,6 +434,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Geplande datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -507,6 +471,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -530,6 +507,11 @@ msgstr ""
 "aankooporder op 'Van order' staat. De factuur kan ook manueel door de "
 "boekhouder worden ingegeven (factuurcontrole = manueel)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "De aankoper moet de bestelaanvraag goedkeuren voordat ze naar de leverancier "
 "wordt gestuurd. De bestelaanvraag wordt dan een aankooporder."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Leverancier"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotaal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Ontvangen"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "# lijnen"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Geeft aan dat de ontvangst is gebeurd."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -732,6 +725,15 @@ msgstr "Prijslijst"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -763,6 +765,11 @@ msgstr "Conceptfactuur"
 msgid "The tax amount"
 msgstr "Btw-bedrag"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
 msgstr "Voorraadbewegingen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -815,11 +822,6 @@ msgstr "Geeft aan dat de factuur is betaald."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -913,12 +915,6 @@ msgstr "Hvh"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
 msgstr "Datum goedk."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Meeteenheden"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Aankoopdashboard"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Kies een openstaande order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Terugzetten naar concept"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Voorraadbeweging"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Factuur maken van aankooporderlijnen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "AO: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuele facturen"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1689,11 +1762,11 @@ msgid "Purchase Order"
 msgstr "Aankooporder"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1714,16 +1787,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Van een ontvangst kan een factuur worden gemaakt. In functie van de keuze in "
-"de order, wordt de factuur gemaakt volgens geleverde of bestelde "
-"hoeveelheden."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1737,9 +1800,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1829,7 +1891,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "De gekozen leverancier verkoopt dit product enkel per %s"
@@ -1874,6 +1936,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Te factureren uitgaande producten"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Goedgekeurd door"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1964,9 +2032,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuele facturen"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1988,13 +2056,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2015,89 +2076,6 @@ msgstr "Bestelaanvraagnummer"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2108,6 +2086,12 @@ msgstr "Totaal aantal orders per gebruiker per maand"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2115,15 +2099,7 @@ msgid "Warehouse"
 msgstr "Magazijn"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2208,8 +2184,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2218,6 +2194,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Prijslijstversies"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2319,6 +2300,9 @@ msgstr "Bestellingen"
 #~ msgid "No Pricelist !"
 #~ msgstr "Geen prijslijst"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Kies een openstaande order"
+
 #~ msgid "Current purchases"
 #~ msgstr "Huidige aankopen"
 
@@ -2360,6 +2344,14 @@ msgstr "Bestellingen"
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuratievoortgang"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Van een ontvangst kan een factuur worden gemaakt. In functie van de keuze in "
+#~ "de order, wordt de factuur gemaakt volgens geleverde of bestelde "
+#~ "hoeveelheden."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Aankoopbedrag is groter dan de limiet."
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 5dd8484adf6..eb51d4e1fa2 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 20:16+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 15:50+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -64,11 +64,6 @@ msgstr ""
 "Cennik ustala walutę stosowaną do tego zamówienia zakupu. Cena dla dostawcy "
 "jest obliczana z tego cennika."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Zakupy: Oznacz jako przeczytane"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -113,16 +108,13 @@ msgstr ""
 "kanban."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Ostrzeżenie !"
+msgid "Configuration Error!"
+msgstr "Błąd konfiguracji!"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "Musisz najpierw anulować wszystkie przyjęcia dla tego zamówienia."
@@ -139,10 +131,10 @@ msgid "Purchase-Standard Price"
 msgstr "Zakup - cena standardowa"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Zatwierdzone przez"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Nie zdefiniowano dostawcy dla tego produktu!"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -173,12 +165,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Cena przeciętna"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Faktura <b>zapłacona</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -251,7 +237,7 @@ msgstr ""
 "zakupu."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr "Aby usunąć zamówienia zakupu, to musisz je najpierw anulować."
@@ -276,30 +262,12 @@ msgstr "${object.company_id.name} Zamówienie (Odn ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Suma kwot netto"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Kategorie jednostek miary"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategoria"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Oferta "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Oferta <em>%s</em> <b>skonwertowana</b> do zamówienia zakupu od %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -379,15 +347,17 @@ msgid "October"
 msgstr "Październik"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Zamówienie zakupu od <em>%s</em> <b>anulowano</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Podsumowanie"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Kiedy sprzedaż usługę klientowi"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -414,12 +384,6 @@ msgstr "Chcesz wygenerować fakturę od dostawcy?"
 msgid "Quantity"
 msgstr "Ilość"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Przesyłkę <em>%s</em> <b>zaplanowano</b>  %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -489,12 +453,6 @@ msgstr ""
 "Wprowadź adres, jeśli chcesz dostawy prosto do twojego klienta. Pozostaw "
 "puste, jeśli dostawa ma być do twojej firmy."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Projekt faktury %s %s <b>oczekuje na zatwierdzenie</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -525,6 +483,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Zaplanowana data"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr "Waluta"
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -557,6 +520,22 @@ msgstr "Może być kupowane"
 msgid "Incoming  Products"
 msgstr "Produkty przychodzące"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Zapytanie ofertowe "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+"Odnośnik zamówienia sprzedaży lub oferty twojego dostawcy. Stosowane głównie "
+"do kojarzenia z nimi przyjęć, bo w dokumentach wysyłki dostawcy ten numer "
+"powinien być podany."
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -580,6 +559,11 @@ msgstr ""
 "jest ustawione 'Z zamówienia'. Faktura może być również wystawiona ręcznie "
 "kiedy fakturowanie jest ustawione na 'Ręczne'."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr "Zapytanie ofertowe aprobowane."
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -599,6 +583,11 @@ msgstr ""
 "Pracownik zakupów musi aprobować zapytanie ofertowe przed wysłaniem do "
 "dostawcy. Zapytanie ofertowe stanie się potwierdzonym zamówieniem zakupu."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr "Zapytanie ofertowe potwierdzone"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -624,7 +613,7 @@ msgid "Supplier"
 msgstr "Dostawca"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "Definiuj konto wydatków dla firmy: \"%s\" (id:%d)."
@@ -648,7 +637,6 @@ msgstr "Suma częściowa"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Przyjęto"
 
@@ -699,6 +687,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "faktury i rachunki"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -706,7 +701,7 @@ msgid "# of Lines"
 msgstr "# pozycji"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "Definiuj konto wydatków dla tego produktu: \"%s\" (id:%d)."
@@ -727,8 +722,8 @@ msgid "It indicates that a picking has been done"
 msgstr "To oznacza, że pobranie zostało wykonane"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "Nie mozna anulować tego zamówienia zakupu."
@@ -794,6 +789,15 @@ msgstr "Cennik"
 msgid "Draft PO"
 msgstr "Projekt zamówienia"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Ostrzeżenie !"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -825,6 +829,11 @@ msgstr "Projekt faktury"
 msgid "The tax amount"
 msgstr "Kwota podatku"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr "Współczynnik pobranych"
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -857,7 +866,7 @@ msgid "Stock Moves"
 msgstr "Przesunięcia zapasów"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Projekt zamówienia zakupu utworzono"
@@ -877,11 +886,6 @@ msgstr "To oznacza, że faktura została zapłacona"
 msgid "Terms and Conditions"
 msgstr "Warunki i postanowienia"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "nieznane"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -937,7 +941,7 @@ msgstr "Stosuj wiele kont analitycznych na zamówieniu"
 #. module: purchase
 #: view:product.product:0
 msgid "will be created in order to subcontract the job"
-msgstr ""
+msgstr "będzie utworzone jako podwykonanie zadania"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -975,12 +979,6 @@ msgstr "Il."
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -1014,17 +1012,92 @@ msgstr "Cena jednostkowa"
 msgid "Date Approved"
 msgstr "Data aprobowania"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "zapytanie ofertowe <b>utworzone</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "prjekt zamówienia zakupu"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1069,16 +1142,11 @@ msgid "Outgoing Mails"
 msgstr "Wychodzace"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr "Nie można potwierdzać zamówienia zakupu bez pozycji."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Zakupy:: Oznacz jako nieprzeczytane"
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1091,7 +1159,7 @@ msgid "Destination Warehouse"
 msgstr "Docelowy magazyn"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -1100,6 +1168,11 @@ msgstr ""
 "Wybrana jednostka nie należy do tej samej kategorii co jednostka dla "
 "produktu."
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr "Wybierz otwarte zamówienia sprzedaży"
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1111,19 +1184,13 @@ msgstr "Jedn. miary"
 msgid "Manage pricelist per supplier"
 msgstr "Zarządzaj cennikami dostawców"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Zamowienie zakupu zostało ustawione na <b>projekt</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Konsola zakupów"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr "Najpierw anuluj wszystkie pobrania do tego zamówienia zakkupu."
@@ -1162,15 +1229,22 @@ msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Wybierz otwarte zamówienie sprzedaży"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Kategorie jednostek miary"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1201,7 +1275,7 @@ msgid "Stock Move"
 msgstr "Przesunięcie zapasu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "Niedozwolona akcja!"
@@ -1305,7 +1379,7 @@ msgstr ""
 "                        zamówienia zakupu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Utwórz faktury"
@@ -1403,7 +1477,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Pozycja zamówienia zakupu tworzy fakturę"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "ZZ: %s"
@@ -1414,7 +1488,7 @@ msgid "Send by EMail"
 msgstr "Wyślij mailem"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "Zdefiniuj dziennik zakupów dla tej firmy: \"%s\" (id:%d)."
@@ -1425,9 +1499,9 @@ msgid "Purchase Order "
 msgstr "Zamówienie zakupu "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ręczne faktury"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "Pozwala obliczyć cenę produktu opartą o koszt przeciętny."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1592,8 +1666,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "Wyliczaj ceną kosztową na podstawie ceny przeciętnej"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1715,9 +1789,10 @@ msgid "Open Purchase Menu"
 msgstr "Otwórz menu Zakupów"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Kreator email"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Nie zdefiniowano adresu dla dostawcy"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1788,11 +1863,11 @@ msgid "Purchase Order"
 msgstr "Zamówienie zakupu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -1813,16 +1888,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Pobranie tworzy fakturę. Zależnie od ustawień fakturowania zamówień "
-"sprzedaży, faktura jest tworzona na podstawie ilości wysłanych lub "
-"zamówionych."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1836,10 +1901,9 @@ msgid "# of Purchase Order"
 msgstr "# Zamówień zakupu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Przyjęcie <b>przyjęte</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Kreator email"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1926,7 +1990,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s"
@@ -1971,6 +2035,12 @@ msgstr "Referencyjna jednostka miary"
 msgid "Outgoing products to invoice"
 msgstr "Wydawane produkty do zafakturowania"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Zatwierdzone przez"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -2061,9 +2131,9 @@ msgid "November"
 msgstr "Listopad"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "Pozwala obliczyć cenę produktu opartą o koszt przeciętny."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ręczne faktury"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2089,15 +2159,6 @@ msgstr ""
 "Na podstawie faktury: Tworzy projekt faktury do późniejszego zatwierdzenia.\n"
 "Na podstawie przyjęć: Pozwala fakturować przy zatwierdzaniu przyjęcia."
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Odnośnik do dokumentu, który spowodował wygenerowanie tego zamówienia "
-"zakupu, To może być zamówienie sprzedaży  lub Zapotrzebowanie."
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2118,89 +2179,6 @@ msgstr "Zapytanie ofertowe nr"
 msgid "Invoicing Settings"
 msgstr "Ustawienia fakturowania"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2211,6 +2189,12 @@ msgstr "Suma zamówień na użytkownika na miesiąc"
 msgid "Based on incoming shipments"
 msgstr "Na podstawie przyjęć"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr "Brak dostawcy dla tego produktu."
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2218,18 +2202,7 @@ msgid "Warehouse"
 msgstr "Magazyn"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Odnośnik zamówienia sprzedaży lub oferty przysłanej ci przez dostawcę. To "
-"jest stosowane do skojarzenia z dokumentem wydania wystawionym przez "
-"dostawcę."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2314,9 +2287,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Kiedy sprzedaż usługę klientowi"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Podsumowanie"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2324,6 +2297,11 @@ msgstr "Kiedy sprzedaż usługę klientowi"
 msgid "Pricelist Versions"
 msgstr "Wersje cennika"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Warunki płatności"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2744,6 +2722,9 @@ msgstr "Zamówienia"
 #~ msgid "You can not confirm purchase order without Purchase Order Lines."
 #~ msgstr "Nie możesz potwierdzić zamówienia zakupu bez pozycji."
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Wybierz otwarte zamówienie sprzedaży"
+
 #~ msgid "Do you want to generate the supplier invoices ?"
 #~ msgstr "Chcesz generować fakturę od dostawcy ?"
 
@@ -2773,6 +2754,14 @@ msgstr "Zamówienia"
 #~ msgid "Dest. Address Contact Name"
 #~ msgstr "Nazwa kontaktu"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Pobranie tworzy fakturę. Zależnie od ustawień fakturowania zamówień "
+#~ "sprzedaży, faktura jest tworzona na podstawie ilości wysłanych lub "
+#~ "zamówionych."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Wartość zakupu powyżej limitu"
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 709b0de7264..11571098727 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:34+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "A lista de preços determina a moeda usada para esta ordem de compra. Também "
 "processa o preço do fornecedor para os artigos e quantidades selecionados."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -133,10 +125,10 @@ msgid "Purchase-Standard Price"
 msgstr "Preço padrão de compra"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado Por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -158,12 +150,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Preço médio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -236,7 +222,7 @@ msgstr ""
 "de ordens de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -261,29 +247,12 @@ msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Total sem impostos"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categori­a"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -352,14 +321,16 @@ msgid "October"
 msgstr "Outubro"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -387,12 +358,6 @@ msgstr "Pretende gerar as facturas do fornecedor?"
 msgid "Quantity"
 msgstr "Quantidade"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -450,12 +415,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -476,6 +435,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Data programada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -508,6 +472,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -531,6 +508,11 @@ msgstr ""
 "é 'Em ordem \". A fatura também pode ser gerada manualmente pelo contador "
 "(controlo Manual = Fatura)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -550,6 +532,11 @@ msgstr ""
 "O comprador tem que aprovar o RFQ antes de ser enviado ao fornecedor. O RFQ "
 "torna-se uma ordem de compra confirmada."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -575,7 +562,7 @@ msgid "Supplier"
 msgstr "Fornecedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -599,7 +586,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recebido"
 
@@ -640,6 +626,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -647,7 +640,7 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -668,8 +661,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que a recepção foi concluída"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -733,6 +726,15 @@ msgstr "Lista de preços"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -764,6 +766,11 @@ msgstr "Fatura Rascunho"
 msgid "The tax amount"
 msgstr "O montante de impostos"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
 msgstr "Movimentos de stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -816,11 +823,6 @@ msgstr "Indica que a fatura foi paga."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -914,12 +916,6 @@ msgstr "Qtd"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -954,14 +950,89 @@ msgid "Date Approved"
 msgstr "Data de Aprovação"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1004,16 +1075,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,13 +1092,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1044,19 +1115,13 @@ msgstr "Unidades de Medida"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Painel de controlo da compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1095,15 +1160,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecione uma Ordem de Venda em Aberto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Definir como Rascunho"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1134,7 +1206,7 @@ msgid "Stock Move"
 msgstr "Movimento do Stock"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1236,7 +1308,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Linha Ordem de Compra Faça Fatura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Faturação Manual"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
 msgstr "Ordem de Compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1716,15 +1789,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Uma recepção, gera uma fatura. Conforme o controlo de faturação da ordem de "
-"venda, a fatura é baseada nas quantidades entregues ou nas encomendadas."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1738,9 +1802,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1830,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "O fornecedor selecionado só vende este artigo %s"
@@ -1875,6 +1938,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Artigos em expedição, por faturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado Por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1965,9 +2034,9 @@ msgid "November"
 msgstr "Novembro"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faturação Manual"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1989,13 +2058,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2016,89 +2078,6 @@ msgstr "Pedido de cotação Nº"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2109,6 +2088,12 @@ msgstr "Total de ordens por utilizador e por mês"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2116,15 +2101,7 @@ msgid "Warehouse"
 msgstr "Armazém"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2210,8 +2187,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2220,6 +2197,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versões da Lista de Preços"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2967,6 +2949,13 @@ msgstr "Ordens"
 #~ msgid "To Approve"
 #~ msgstr "Para aprovar"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Uma recepção, gera uma fatura. Conforme o controlo de faturação da ordem de "
+#~ "venda, a fatura é baseada nas quantidades entregues ou nas encomendadas."
+
 #~ msgid "TVA :"
 #~ msgstr "TVA :"
 
@@ -3220,6 +3209,9 @@ msgstr "Ordens"
 #~ msgid "Order in current year"
 #~ msgstr "Ordem do ano atual"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecione uma Ordem de Venda em Aberto"
+
 #~ msgid "Is a Back Order"
 #~ msgstr "é uma Back-Order"
 
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 6d3c74cec0f..e2e6611de67 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 12:36+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 18:01+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -66,11 +66,6 @@ msgstr ""
 "Lista de Preços define a moeda usada para este pedido de compra. Ela também "
 "calcula o preço do fornecedor para os produtos/quantidades selecionadas."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Compras: Marcar como lido"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -115,16 +110,13 @@ msgstr ""
 "kanban."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+msgid "Configuration Error!"
+msgstr "Erro de Configuração!"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -143,10 +135,10 @@ msgid "Purchase-Standard Price"
 msgstr "Preço Padrão de Compra"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado Por"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Nenhum fornecedor definido para este produto!"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -175,12 +167,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Preço Médio"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fatura <b>paga</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -255,7 +241,7 @@ msgstr ""
 "linhas do Pedido de compra '."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -281,30 +267,12 @@ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Valor Sem Imposto"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Categorias de Unidade de Medida"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Cotação "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-"Cotação para <em>%s</em> <b>convertida</b> em uma Ordem de Compra de %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -388,15 +356,19 @@ msgid "October"
 msgstr "Outubro"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Ordem de Compra para <em>%s</em><b>cancelada</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
+"O produto \"%s\" foi definido em sua empresa como um revendedor o que parece "
+"ser um erro de configuração!"
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Quando você vender este serviço a um cliente,"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -424,12 +396,6 @@ msgstr "Você quer gerar a fatura do fornecedor?"
 msgid "Quantity"
 msgstr "Quantidade"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Entrega <em>%s</em><b>agendada</b> para %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -499,12 +465,6 @@ msgstr ""
 "Coloque um endereço, se você quer entregar diretamente do fornecedor ao "
 "cliente. Caso contrário, mantenha vazio para entregar a sua própria empresa."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Fatura provisória de %s %s está <b>aguardando validação</b>"
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -533,6 +493,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Data Programada"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr "Moeda"
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -565,6 +530,23 @@ msgstr "Pode ser Comprado"
 msgid "Incoming  Products"
 msgstr "Recebimentos de Produtos"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr "Solicitar Cotação "
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+"Referência do pedido de venda ou cotação enviada pelo seu fornecedor. É "
+"usado principalmente para fazer a correspondência quando você recebe os "
+"produtos já que essa referência é geralmente escrita na nota de entrega "
+"enviada pelo seu fornecedor."
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -588,6 +570,11 @@ msgstr ""
 "compra for 'No Pedido'. A fatura também pode ser gerada manualmente pelo "
 "contador (Controle Fatura = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr "RFQ Aprovada"
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -607,6 +594,11 @@ msgstr ""
 "A comprador tem para aprovar o RC antes de ser enviada ao fornecedor. A RC "
 "se torna um Pedido de compra confirmado."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr "RFQ Confirmada"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -632,7 +624,7 @@ msgid "Supplier"
 msgstr "Fornecedor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "Defina a conta de despesas para esta empresa: \"%s\" (id:%d)."
@@ -656,7 +648,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Recebido"
 
@@ -708,6 +699,16 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Faturas e Recebimentos"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"Uma lista de separação gera uma fatura. Dependendo do controle de "
+"faturamento no pedido de venda, a fatura é gerada com base em entregas ou em "
+"quantidades encomendadas."
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -715,7 +716,7 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "Defina a conta de despesas para este produto: \"%s\" (id:%d)."
@@ -736,8 +737,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Isso indica que a Separação foi Feita"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "Não foi possível cancelar esta ordem de compra."
@@ -804,6 +805,15 @@ msgstr "Lista de Preços"
 msgid "Draft PO"
 msgstr "OC Provisória"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -835,6 +845,11 @@ msgstr "Fatura Provisória"
 msgid "The tax amount"
 msgstr "O valor do Imposto"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr "Proporção Recebida"
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -867,7 +882,7 @@ msgid "Stock Moves"
 msgstr "Movimentação de Estoque"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Ordem de Compra provisória gerada"
@@ -887,11 +902,6 @@ msgstr "Isso indica que a Fatura foi Paga"
 msgid "Terms and Conditions"
 msgstr "Termos e Condições"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "desconhecido"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -985,12 +995,6 @@ msgstr "Qtd"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -1024,17 +1028,169 @@ msgstr "Preço Unitário"
 msgid "Date Approved"
 msgstr "Data da Aprovação"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Requisição de cotação <b>criado</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "uma ordem de compra provisória"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Olá ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Aqui está o ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIA</strong><br />\n"
+"       &nbsp;&nbsp;Número do pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total do pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data do pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referência do pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Sua referência: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.validator.email or "
+"''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>Se você tiver alguma dúvida, não deixe de entrar em contato "
+"conosco.</p>\n"
+"    <p>Obrigado!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Fone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1079,17 +1235,12 @@ msgid "Outgoing Mails"
 msgstr "E-mails Enviados"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 "Você não pode confirmar uma ordem de compra sem nenhuma linha de compra"
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr "Compra: Marcar não lido"
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1102,7 +1253,7 @@ msgid "Destination Warehouse"
 msgstr "Armazém de Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -1111,6 +1262,11 @@ msgstr ""
 "A Unidade de Medida selecionada não pertence a mesma categoria da Unidade de "
 "Medida do produto"
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr "Escolha um Pedido de Vendas Aberto"
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1122,19 +1278,13 @@ msgstr "Unidades de Medida"
 msgid "Manage pricelist per supplier"
 msgstr "Gerenciar lista de preços por fornecedor"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "A Ordem de Compra foi definida como <b>provisória</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Painel de Compras"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1174,15 +1324,24 @@ msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecione um Pedido de Venda Aberto"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Categorias de Unidade de Medida"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Definir como Provisório"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+"Referência do documento que gerou essa solicitação de pedido de compra; um "
+"pedido de venda ou uma solicitação de aquisição interna."
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1213,7 +1372,7 @@ msgid "Stock Move"
 msgstr "Mov. de Estoque"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ação Inválida!"
@@ -1320,7 +1479,7 @@ msgstr ""
 "provisória"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Por favor gere as faturas."
@@ -1419,7 +1578,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Faturar Linha Pedido de Compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1430,7 +1589,7 @@ msgid "Send by EMail"
 msgstr "Enviar por Email"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "Defina o diário de compras para esta empresa \"%s\" (id:%d)."
@@ -1441,9 +1600,11 @@ msgid "Purchase Order "
 msgstr "Ordem de Compra "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Faturamento Manual"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+"Permite a você calcular o preço de custo de um produto baseado no custo "
+"médio."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1610,8 +1771,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "Cálculo do custo do produto baseado no custo médio"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1735,9 +1896,10 @@ msgid "Open Purchase Menu"
 msgstr "Abrir Menu de Compras"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Assistente de composição de Email"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Nenhum endereço definido para o fornecedor"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1809,11 +1971,11 @@ msgid "Purchase Order"
 msgstr "Ordem de Compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -1841,16 +2003,6 @@ msgstr ""
 "Se um cancelamento ocorre na fatura ou na recepção de mercadorias, a "
 "situação torna-se exceção."
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"A lista de separação gera uma fatura. Dependendo do controle de faturamento "
-"do pedido de venda, a factura é baseado nas quantidades entregues ou "
-"encomendadas."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1864,10 +2016,9 @@ msgid "# of Purchase Order"
 msgstr "# de Ordem de Compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Recebimento <b>confirmado</b>"
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Assistente de composição de Email"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1963,7 +2114,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "O fornecedor selecionado somente vende este produto por %s"
@@ -2011,6 +2162,12 @@ msgstr "Unidade de Medida referencial"
 msgid "Outgoing products to invoice"
 msgstr "Saida Produtos a Faturar"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado Por"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -2101,11 +2258,9 @@ msgid "November"
 msgstr "Novembro"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
-"Permite a você calcular o preço de custo de um produto baseado no custo "
-"médio."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faturamento Manual"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2133,15 +2288,6 @@ msgstr ""
 "Baseada em recebimentos: permitem que você crie uma fatura quando os "
 "recebimentos são validados."
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Referência do documento que gerou esse pedido pedido de compra, uma ordem de "
-"venda ou uma solicitação de aquisição interna."
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2162,168 +2308,6 @@ msgstr "Solicitação para Cotação N°"
 msgid "Invoicing Settings"
 msgstr "Configurações de Faturamento"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
-"''},</p>\n"
-"    \n"
-"    <p>Aqui está um ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCIA</strong><br />\n"
-"       &nbsp;&nbsp;Número da Ordem: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Total da Ordem: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Data da Ordem: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Referencia da Ordem: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Sua Referencia: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.validator.email or "
-"''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>Se você tiver alguma dúvida não deixe de entrar em contato "
-"conosco.</p>\n"
-"    <p>Obrigado!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2334,6 +2318,12 @@ msgstr "Total de Pedidos por Usuário por Mês"
 msgid "Based on incoming shipments"
 msgstr "Baseado em recebimentos"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr "Nenhum fornecedor padrão definido para este produto"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2341,19 +2331,7 @@ msgid "Warehouse"
 msgstr "Armazém"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-"Referência da ordem de venda ou cotação enviada pelo seu fornecedor. É usado "
-"principalmente para fazer a correspondência no recebimento dos produtos essa "
-"referência é geralmente escrito na ordem de entrega enviada pelo seu "
-"fornecedor."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2439,9 +2417,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Quando você vender este serviço a um cliente,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2449,6 +2427,11 @@ msgstr "Quando você vender este serviço a um cliente,"
 msgid "Pricelist Versions"
 msgstr "Versões da lista"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr "Condições de Pagamento"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -3085,6 +3068,9 @@ msgstr "Pedidos"
 #~ "não foram faturadas. Quando puder lançar a fatura, você pode gerar uma "
 #~ "fatura provisória com base nos itens deste menu."
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecione um Pedido de Venda Aberto"
+
 #~ msgid ""
 #~ "Put an address if you want to deliver directly from the supplier to the "
 #~ "customer.In this case, it will remove the warehouse link and set the "
@@ -3094,6 +3080,14 @@ msgstr "Pedidos"
 #~ "cliente. Neste caso, ele irá remover o link do armazém e definir o local do "
 #~ "cliente"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "A lista de separação gera uma fatura. Dependendo do controle de faturamento "
+#~ "do pedido de venda, a factura é baseado nas quantidades entregues ou "
+#~ "encomendadas."
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progresso da Configuração"
 
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 849a7b7c3f5..28750210ba6 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-29 16:12+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "achizitie. Calculeaza, de asemenea, pretul de furnizor pentru "
 "produsele/cantitatile selectate."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -134,10 +126,10 @@ msgid "Purchase-Standard Price"
 msgstr "Pretul Standard de achizitie"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validat de catre"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -159,12 +151,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Pret mediu"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -237,7 +223,7 @@ msgstr ""
 "comenzilor de achizitie a produselor."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -262,29 +248,12 @@ msgstr "${object.company_id.name} Comanda (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Total suma neimpozitata"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Categorie"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -354,14 +323,16 @@ msgid "October"
 msgstr "Octombrie"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -389,12 +360,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Cantitate"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -452,12 +417,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -478,6 +437,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Data programata"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -510,6 +474,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -533,6 +510,11 @@ msgstr ""
 "este ”La comanda”. Factura poate fi de asemenea generata manual de catre "
 "contabil (Controlul facturii = Manual)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -552,6 +534,11 @@ msgstr ""
 "Cumparatorul trebuie sa aprobe CdO (cererea de oferta) inainte de a o "
 "trimite furnizorului. CdO devine o Comanda de aprovizionare confirmata."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -577,7 +564,7 @@ msgid "Supplier"
 msgstr "Furnizor"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -601,7 +588,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Primit"
 
@@ -642,6 +628,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -649,7 +642,7 @@ msgid "# of Lines"
 msgstr "# de Linii"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -670,8 +663,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica faptul ca a fost efectuata o ridicare"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -736,6 +729,15 @@ msgstr "Lista de preturi"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -767,6 +769,11 @@ msgstr "Factura ciorna"
 msgid "The tax amount"
 msgstr "Valoare taxe"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -799,7 +806,7 @@ msgid "Stock Moves"
 msgstr "Miscari stoc"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -819,11 +826,6 @@ msgstr "Indiaă faptul ca o factura a fost platita"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -919,12 +921,6 @@ msgstr "Cantitate"
 msgid "Cancel"
 msgstr "Anuleaza"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -959,14 +955,89 @@ msgid "Date Approved"
 msgstr "Data aprobata"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1009,16 +1080,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1031,13 +1097,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1049,19 +1120,13 @@ msgstr "Unitati de Masura"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Panou de bord Achizitii"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1100,15 +1165,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Selecteaza o Comanda de vanzari Deschisa"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Seteaza ca ciorna"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1139,7 +1211,7 @@ msgid "Stock Move"
 msgstr "Miscare stoc"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1241,7 +1313,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1331,7 +1403,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Linie comanda de achizitii Faceti factura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1342,7 +1414,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1353,9 +1425,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturi manuale"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1509,8 +1581,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1622,8 +1694,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1696,11 +1769,11 @@ msgid "Purchase Order"
 msgstr "Comanda de aprovizionare"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1721,16 +1794,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"O lista de ridicare genereaza o factura. In functie de controlul facturii "
-"din comanda de vanzare, factura este bazata pe cantitatile livrate sau "
-"comandate."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1744,9 +1807,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1837,7 +1899,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Furnizorul selectat vinde acest produs doar după %s"
@@ -1882,6 +1944,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Facturare produse iesite"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validat de catre"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1972,9 +2040,9 @@ msgid "November"
 msgstr "Noiembrie"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturi manuale"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1996,13 +2064,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2023,89 +2084,6 @@ msgstr "Nr Cererii de cotatie"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2116,6 +2094,12 @@ msgstr "Total Comenzi după Utilizator pe luna"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2123,15 +2107,7 @@ msgid "Warehouse"
 msgstr "Depozit"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2218,8 +2194,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2228,6 +2204,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Versiuni ale Listei de preturi"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2617,6 +2598,14 @@ msgstr "Comenzi"
 #~ msgid "Approve Purchase"
 #~ msgstr "Aproba achizitia"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "O lista de ridicare genereaza o factura. In functie de controlul facturii "
+#~ "din comanda de vanzare, factura este bazata pe cantitatile livrate sau "
+#~ "comandate."
+
 #~ msgid "Convert to Purchase Order"
 #~ msgstr "Schimba in Comanda de Achizitionare"
 
@@ -2941,6 +2930,9 @@ msgstr "Comenzi"
 #~ msgid "Order in current year"
 #~ msgstr "Comanda din anul curent"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Selecteaza o Comanda de vanzari Deschisa"
+
 #~ msgid "Purchase Management"
 #~ msgstr "Managementul achizitiilor"
 
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index e361dd3085f..fe14b630ab3 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 13:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "Валюта, используемая в заказе закупки, определяется прайс-листом. Так же "
 "рассчитывается цена поставщика для выбранной продукции / количества."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -107,16 +102,13 @@ msgstr ""
 "html для возможности использования в канбан виде"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Внимание!"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -135,10 +127,10 @@ msgid "Purchase-Standard Price"
 msgstr "Стандартная цена закупки"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Утверждено"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -160,12 +152,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Средняя цена"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Счет <b>оплачен</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -238,7 +224,7 @@ msgstr ""
 "Вычислено, как ближайшая запланированная дата из всех позиций заказа закупки"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr "Для того, чтобы удалить заказ, сначала вы должны отменить его."
@@ -263,29 +249,12 @@ msgstr "${object.company_id.name} Заказ (Ссылка ${object.name or 'n/a
 msgid "Total Untaxed amount"
 msgstr "Итого без налога"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Категории единиц измерения"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Категория"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Предложение "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "Предложение <em>%s</em> <b>преобразовано</b> в заказ закупки %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -354,15 +323,17 @@ msgid "October"
 msgstr "Октябрь"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Заказ закупки для <em>%s</em> <b>отменен</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Итого"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "Когда вы продаете эту услугу заказчику,"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -389,12 +360,6 @@ msgstr "Вы хотите создавать счета от поставщик
 msgid "Quantity"
 msgstr "Количество"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Отгрузка <em>%s</em> <b>запланирована</b> на %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -454,12 +419,6 @@ msgstr ""
 "Поместите адрес, если Вы хотите прямую доставку от поставщика к заказчику. "
 "Иначе, оставьте пустым для доставки в вашу компанию."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Черновик счета %s %s <b>ожидает утверждения</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -480,6 +439,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Запланированная дата"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -512,6 +476,19 @@ msgstr "Можно закупать"
 msgid "Incoming  Products"
 msgstr "Входящие товары"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -535,6 +512,11 @@ msgstr ""
 "заказу'. Возможно создание счета вручную бухгалтером (контроль счетов = "
 "'Вручную')."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -554,6 +536,11 @@ msgstr ""
 "Покупатель должен утвердить запрос до его передачи поставщику. Запрос "
 "становится подтвержденным заказом закупки."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -579,7 +566,7 @@ msgid "Supplier"
 msgstr "Поставщик"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "Определить счет расходов для этой компании: \"%s\" (id:%d)."
@@ -603,7 +590,6 @@ msgstr "Подитог"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Получено"
 
@@ -644,6 +630,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Счета и поступления"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -651,7 +644,7 @@ msgid "# of Lines"
 msgstr "Кол-во позиций"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "Определить счет расходов для этого товара: \"%s\" (id:%d)."
@@ -672,8 +665,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Показывает, что комплектование выполнено."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "Не удалось отменить это заказ."
@@ -739,6 +732,15 @@ msgstr "Прайс-лист"
 msgid "Draft PO"
 msgstr "Черновик ЗЗ"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Внимание!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -770,6 +772,11 @@ msgstr "Черновик счета"
 msgid "The tax amount"
 msgstr "Сумма налогов"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -802,7 +809,7 @@ msgid "Stock Moves"
 msgstr "Движение ТМЦ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Черновик заказа закупки создан"
@@ -822,11 +829,6 @@ msgstr "Показывает, что счет был оплачен"
 msgid "Terms and Conditions"
 msgstr "Условия"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "неизвестный"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -920,12 +922,6 @@ msgstr "Кол-во"
 msgid "Cancel"
 msgstr "Отмена"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Комментарии и эл. письма"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -959,17 +955,92 @@ msgstr "Цена за ед."
 msgid "Date Approved"
 msgstr "Дата утверждения"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Запрос цен <b>создан</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "черновик заказа закупки"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1010,16 +1081,11 @@ msgid "Outgoing Mails"
 msgstr "Исходящие письма"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr "Вы не можете подтвердить заказ закупки без позиций заказа."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1032,7 +1098,7 @@ msgid "Destination Warehouse"
 msgstr "Склад назначения"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
@@ -1041,6 +1107,11 @@ msgstr ""
 "Выбранные единицы измерения не принадлежат к той же категории, что и единицы "
 "измерения товара."
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1052,19 +1123,13 @@ msgstr "Единицы измерения"
 msgid "Manage pricelist per supplier"
 msgstr "Управление прайс-листом по поставщику"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Заказ закупки установлен в <b>черновик</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Панель закупок"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr "Сначала отмените все приходы, связанные с этим заказом закупки."
@@ -1103,15 +1168,22 @@ msgid "Unread Messages"
 msgstr "Непрочитанные сообщения"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Выберите открытый заказ продажи"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Категории единиц измерения"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Установить в 'Черновик'"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1142,7 +1214,7 @@ msgid "Stock Move"
 msgstr "Перемещение ТМЦ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "Неверное действие!"
@@ -1246,7 +1318,7 @@ msgstr ""
 "                        заказа закупки"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "Пожалуйста, создайте счета"
@@ -1336,7 +1408,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Позиция заказа закупки - Создать счет"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "ЗЗ: %s"
@@ -1347,7 +1419,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "Определить журнал покупок для этой компании: \"%s\" (id:%d)."
@@ -1358,9 +1430,9 @@ msgid "Purchase Order "
 msgstr "Заказ закупки "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Счета вручную"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "Позволяет рассчитать себестоимость на основе средней стоимости."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1515,8 +1587,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "Вычислить себестоимость на основе средней стоимости"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1628,8 +1700,9 @@ msgid "Open Purchase Menu"
 msgstr "Открыть меню закупок"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1702,11 +1775,11 @@ msgid "Purchase Order"
 msgstr "Заказ закупки"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -1727,16 +1800,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Комплектовочный лист создает счет. В зависимости от метода выставления счета "
-"при заказе продаж, счет основывается на отгруженном или на заказанном "
-"количестве."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1750,10 +1813,9 @@ msgid "# of Purchase Order"
 msgstr "№ заказа закупки"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "Партия <b>получена</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1842,7 +1904,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Выбранный поставщик продает ТМЦ только по %s"
@@ -1887,6 +1949,12 @@ msgstr "Базовая единица измерения"
 msgid "Outgoing products to invoice"
 msgstr "Исходящие ТМЦ в счет"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Утверждено"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1977,9 +2045,9 @@ msgid "November"
 msgstr "Ноябрь"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "Позволяет рассчитать себестоимость на основе средней стоимости."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Счета вручную"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2001,15 +2069,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-"Ссылка на документ, который генерирует этот заказ закупки; заказ продажи или "
-"внутренний запрос снабжения."
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2030,89 +2089,6 @@ msgstr "Запрос цен №"
 msgid "Invoicing Settings"
 msgstr "Настройка счетов"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2123,6 +2099,12 @@ msgstr "Всего заказов пользователя за месяц"
 msgid "Based on incoming shipments"
 msgstr "На основании поступающих грузов"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2130,15 +2112,7 @@ msgid "Warehouse"
 msgstr "Склад"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2223,9 +2197,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "Когда вы продаете эту услугу заказчику,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Итого"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2233,6 +2207,11 @@ msgstr "Когда вы продаете эту услугу заказчику,
 msgid "Pricelist Versions"
 msgstr "Версии прайс-листов"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2831,6 +2810,14 @@ msgstr "Заказы"
 #~ msgid "To Approve"
 #~ msgstr "На утверждение"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Комплектовочный лист создает счет. В зависимости от метода выставления счета "
+#~ "при заказе продаж, счет основывается на отгруженном или на заказанном "
+#~ "количестве."
+
 #~ msgid "Convert to Purchase Order"
 #~ msgstr "Преобразовать в заказ закупки"
 
@@ -3172,6 +3159,9 @@ msgstr "Заказы"
 #~ msgid "res_config_contents"
 #~ msgstr "res_config_contents"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Выберите открытый заказ продажи"
+
 #~ msgid ""
 #~ "unique number of the purchase order,computed automatically when the purchase "
 #~ "order is created"
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index cfe7d868390..94e304028ab 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-21 09:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -130,10 +122,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Overená"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -344,14 +313,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -379,12 +350,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Množstvo"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -442,12 +407,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -468,6 +427,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -500,6 +464,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,6 +497,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -537,6 +519,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -562,7 +549,7 @@ msgid "Supplier"
 msgstr "Dodávateľ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -586,7 +573,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr ""
 
@@ -627,6 +613,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -634,7 +627,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -718,6 +711,15 @@ msgstr ""
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -749,6 +751,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -801,11 +808,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -899,12 +901,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -939,14 +935,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -986,16 +1057,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1008,13 +1074,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1026,19 +1097,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1086,6 +1151,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Nastaviť ako návr"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Vybraný dodávateľ predáva produkt %s"
@@ -1844,6 +1909,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Overená"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1934,8 +2005,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1985,89 +2049,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2078,6 +2059,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2085,15 +2072,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2176,6 +2155,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index e5470f3f92a..19a4fa5c1bb 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 10:21+0000\n"
 "Last-Translator: Vida Potočnik <vida.potocnik@mentis.si>\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: 2012-12-21 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
@@ -59,11 +59,6 @@ msgstr ""
 "Ta cenik nastavi valuto, ki se uporablja za ta nabavni nalog. Izračuna tudi "
 "dobaviteljevo ceno za izbrane proizvode/količine."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr "Nabava: Označi  kot prebrano"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "Opozorilo!"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "Najprej morate preklicati vse prevzeme, vezane na ta nabavni nalog."
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr "Standardna cena nabave"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potrdil"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -156,12 +148,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Povprečna cena"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Račun <b>plačan>/b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -233,7 +219,7 @@ msgstr ""
 "To se izračuna kot minimalni pričakovani datum vseh naročil artiklov."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr "Če želite izbrisati nabavni nalog, ga morate najprej preklicati."
@@ -258,29 +244,12 @@ msgstr "${object.company_id.name} Naročilo (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Skupaj brez davka"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "Skupine enot mere"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategorija"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "Ponudba "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "Ponudba za <em>%s</em> <b>spremenjena</b> v nabavni nalog %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -346,15 +315,17 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Nabavni nalog za <em>%s</em> <b>preklican</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "Povzetek"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -381,12 +352,6 @@ msgstr "Želite ustvariti prejete račune?"
 msgid "Quantity"
 msgstr "Količina"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Pošiljka <em>%s</em> <b>načrtovana</b> za %s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -446,12 +411,6 @@ msgstr ""
 "Če želite, da dobavitelj dobavi blago neposredno kupcu, vnesite njegov "
 "naslov, drugače pustite prazno."
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "Osnutek računa %s %s čaka na potrditev</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -472,6 +431,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Predvideni datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -504,6 +468,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr "Naročeni produkti"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -524,6 +501,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -541,6 +523,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -566,7 +553,7 @@ msgid "Supplier"
 msgstr "Dobavitelj"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "Določite konto odhodkov za to podjetje: \"%s\" (id:%d)."
@@ -590,7 +577,6 @@ msgstr "Delni seštevek"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Prejeto"
 
@@ -631,6 +617,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "Računi in Prevzemi"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -638,7 +631,7 @@ msgid "# of Lines"
 msgstr "# št. vrstic"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "Določite konto odhodkov za ta izdelek: \"%s\" (id:%d)."
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Pokaže da je bilo izbiranje končano"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "Tega nabavnega naloga ni mogoče preklicati."
@@ -726,6 +719,15 @@ msgstr "Cenik"
 msgid "Draft PO"
 msgstr "Osnutek nabavnega naloga"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "Opozorilo!"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -757,6 +759,11 @@ msgstr "Pripravljen račun"
 msgid "The tax amount"
 msgstr "Znesek davka"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -789,7 +796,7 @@ msgid "Stock Moves"
 msgstr "Premiki zaloge"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "Osnutek nabavnega naloga je kreiran"
@@ -809,11 +816,6 @@ msgstr "To pomeni, da je bila faktura plačana"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "neznano"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -907,12 +909,6 @@ msgstr "Kol."
 msgid "Cancel"
 msgstr "Prekliči"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Pripombe in e-pošta"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -946,17 +942,92 @@ msgstr "Cena enote"
 msgid "Date Approved"
 msgstr "Odobreno dne"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "Zahteva za ponudbo <b>kreirana</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "osnutek nabavnega naloga"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -996,16 +1067,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr "Ne morete potrditi nabavnega naloga brez postavk."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1018,13 +1084,18 @@ msgid "Destination Warehouse"
 msgstr "Ciljno skladišče"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr "Izbrana enota mere ne pripada isti skupini kot enota mere produkta."
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1036,19 +1107,13 @@ msgstr "Merske enote"
 msgid "Manage pricelist per supplier"
 msgstr "Upravljanje cenikov po dobavitelju"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "Nabavni nalog je bil spremenjen v <b>osnutek</b>."
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Nadzorna plošča za nakup"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr "Najprej prekličite vse prevzeme, vezane na ta nabavni nalog."
@@ -1087,15 +1152,22 @@ msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Izberi odprt prodajni nalog"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "Skupine enot mere"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Preklopi v pripravo"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1126,7 +1198,7 @@ msgid "Stock Move"
 msgstr "Prenos zaloge"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1230,7 +1302,7 @@ msgstr ""
 "                        nabavnega naloga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Naročilo naj naredi račun"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "Nabavni nalog: %s"
@@ -1331,7 +1403,7 @@ msgid "Send by EMail"
 msgstr "Pošlji po e-pošti"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "Določite dnevnik nabave za to podjetje: \"%s\" (id:%d)."
@@ -1342,9 +1414,9 @@ msgid "Purchase Order "
 msgstr "Nabavni nalog "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Ročna faktura"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1498,8 +1570,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1611,9 +1683,10 @@ msgid "Open Purchase Menu"
 msgstr "Odpri meni nabave"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Čarovnik za sestavljanje e-pošte"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1685,11 +1758,11 @@ msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "Napaka!"
@@ -1710,13 +1783,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1730,10 +1796,9 @@ msgid "# of Purchase Order"
 msgstr "# od nabavnega naloga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr ""
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Čarovnik za sestavljanje e-pošte"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1819,7 +1884,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "Zahtevo za ponudbo_${(object.name or '').zamenja('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Izbrani dobavitelj prodaja le ta artikel z %s"
@@ -1864,6 +1929,12 @@ msgstr "Referenčna enota mere"
 msgid "Outgoing products to invoice"
 msgstr "Odhodni artikli na računu"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potrdil"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1954,9 +2025,9 @@ msgid "November"
 msgstr "November"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Ročna faktura"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1978,13 +2049,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2005,89 +2069,6 @@ msgstr "Zahteva za ponudbo št.:"
 msgid "Invoicing Settings"
 msgstr "Nastavitve fakturiranja"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2098,6 +2079,12 @@ msgstr "Skupna naročila za uporabnika na mesec"
 msgid "Based on incoming shipments"
 msgstr "Na osnovi prihajajočih pošiljk"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2105,15 +2092,7 @@ msgid "Warehouse"
 msgstr "Skladišče"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2196,9 +2175,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr ""
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "Povzetek"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2206,6 +2185,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Različice cenikov"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2525,6 +2509,9 @@ msgstr "Naročila"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Sklic naročila mora biti enoličen!"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Izberi odprt prodajni nalog"
+
 #~ msgid "Supplier Invoices to Receive"
 #~ msgstr "Faktura dobavitelja za prejemanje"
 
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index 98cde501dab..8ceff859e02 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-10 10:20+0000\n"
 "Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:18+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -344,14 +313,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -379,12 +350,6 @@ msgstr ""
 msgid "Quantity"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -442,12 +407,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -468,6 +427,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -500,6 +464,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,6 +497,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -537,6 +519,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -562,7 +549,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -586,7 +573,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr ""
 
@@ -627,6 +613,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -634,7 +627,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -718,6 +711,15 @@ msgstr ""
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -749,6 +751,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -801,11 +808,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -899,12 +901,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -939,14 +935,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -986,16 +1057,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1008,13 +1074,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1026,19 +1097,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1086,6 +1151,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1844,6 +1909,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1934,8 +2005,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1985,89 +2049,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2078,6 +2059,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2085,15 +2072,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2176,6 +2155,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index 77629ad5285..18ba4056a0b 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "Cenovnik postavlja valutu koja se koristi u nabavnom nalogu. Takođe, isti "
 "izračunava nabavnu cenu za odabrane proizvode i količinu."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "svim nabavnim nalozima."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -348,14 +317,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -383,12 +354,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Količina"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -446,12 +411,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -472,6 +431,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -504,6 +468,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -524,6 +501,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -541,6 +523,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -566,7 +553,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -590,7 +577,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Primljeno"
 
@@ -631,6 +617,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -638,7 +631,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -722,6 +715,15 @@ msgstr "Cenovnik"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -753,6 +755,11 @@ msgstr "Račun u 'Pripremi'"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -785,7 +792,7 @@ msgid "Stock Moves"
 msgstr "Kretanje zaliha"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -805,11 +812,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -903,12 +905,6 @@ msgstr "Količina"
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -943,14 +939,89 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -990,16 +1061,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1012,13 +1078,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1030,19 +1101,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1081,8 +1146,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1090,6 +1155,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Postavi u 'Pripremu'"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1120,7 +1192,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1219,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1309,7 +1381,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1331,8 +1403,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1487,8 +1559,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1600,8 +1672,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1674,11 +1747,11 @@ msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1699,13 +1772,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1719,9 +1785,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1805,7 +1870,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1850,6 +1915,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1940,8 +2011,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1964,13 +2035,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1991,89 +2055,6 @@ msgstr "Zahtjev za ponudu N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2084,6 +2065,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2091,15 +2078,7 @@ msgid "Warehouse"
 msgstr "Skladište"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2172,8 +2151,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2182,6 +2161,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 7307cf94b96..1c78b9a63a0 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "Cenovnik postavlja valutu koja se koristi u nabavnom nalogu. Takođe, isti "
 "izračunava nabavnu cenu za odabrane proizvode i količinu."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Potvrđeno od"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "svim nabavnim nalozima."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -348,14 +317,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -383,12 +354,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Količina"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -446,12 +411,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -472,6 +431,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -504,6 +468,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -524,6 +501,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -541,6 +523,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -566,7 +553,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -590,7 +577,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Primljeno"
 
@@ -631,6 +617,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -638,7 +631,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -722,6 +715,15 @@ msgstr "Cenovnik"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -753,6 +755,11 @@ msgstr "Račun u 'Pripremi'"
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -785,7 +792,7 @@ msgid "Stock Moves"
 msgstr "Kretanje zaliha"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -805,11 +812,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -903,12 +905,6 @@ msgstr "Količina"
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -943,14 +939,89 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -990,16 +1061,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1012,13 +1078,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1030,19 +1101,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1081,8 +1146,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1090,6 +1155,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Postavi u 'Pripremu'"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1120,7 +1192,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1219,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1309,7 +1381,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1320,7 +1392,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1331,8 +1403,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1487,8 +1559,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1600,8 +1672,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1674,11 +1747,11 @@ msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1699,13 +1772,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1719,9 +1785,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1805,7 +1870,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1850,6 +1915,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Potvrđeno od"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1940,8 +2011,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1964,13 +2035,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1991,89 +2055,6 @@ msgstr "Zahtjev za ponudu N°"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2084,6 +2065,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2091,15 +2078,7 @@ msgid "Warehouse"
 msgstr "Skladište"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2172,8 +2151,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2182,6 +2161,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index fca89be609c..6decb677513 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-26 07:07+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:19+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgstr ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr "Standardpris Inköp"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Snittpris"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "products."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Totalt ex moms"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -351,14 +320,16 @@ msgid "October"
 msgstr "oktober"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -386,16 +357,10 @@ msgstr ""
 msgid "Quantity"
 msgstr "Kvantitet"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Fiscal Position"
+msgstr "Momshantering"
 
 #. module: purchase
 #: field:purchase.config.settings,default_invoice_method:0
@@ -449,12 +414,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -475,6 +434,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Planerat datum"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -507,6 +471,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -530,6 +507,11 @@ msgstr ""
 "order\". Fakturan kan också genereras manuellt av den som bokför (Faktura "
 "kontroll = Manuell)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "Köparen måste godkänna offertförfrågan innan den skickas till leverantören. "
 "Inköpsförfrågan blir då en bekräftad Inköpsorder."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Leverantör"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Subtotal"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Mottagen"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "# Rader"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Anger att plockningen är klar."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -676,7 +669,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 msgid "Invoice Control"
-msgstr "Invoice Control"
+msgstr "Fakturakontroll"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -732,6 +725,15 @@ msgstr "Prislista"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -763,6 +765,11 @@ msgstr "Preliminär faktura"
 msgid "The tax amount"
 msgstr "Moms"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -795,7 +802,7 @@ msgid "Stock Moves"
 msgstr "Stock Moves"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -815,11 +822,6 @@ msgstr "Anger att en faktura är betald."
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -913,12 +915,6 @@ msgstr "Qty"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -953,14 +949,89 @@ msgid "Date Approved"
 msgstr "Datum godkänd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1003,16 +1074,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1025,13 +1091,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1043,19 +1114,13 @@ msgstr "Enhet"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Inköpsinfopanel"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1094,15 +1159,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Välj en öppen säljorder"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Set to Draft"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1133,7 +1205,7 @@ msgid "Stock Move"
 msgstr "Lagertransaktion"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1235,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1325,7 +1397,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Inköpsorderrader Tillverka Faktura"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "IO: %s"
@@ -1336,7 +1408,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1347,9 +1419,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuella fakturor"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1503,8 +1575,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1557,7 +1629,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr "Invoicing Control"
+msgstr "Fakturagenerering"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1582,7 +1654,7 @@ msgstr "Chef"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr "Baserat på inköpsorderrader"
+msgstr "Generera faktura mot inköpsorderrader"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1616,8 +1688,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1661,7 +1734,7 @@ msgstr "Standardinköpsprislisteversion"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr "Baserad på genererad preleminär faktura"
+msgstr "Generera fakturautkast direkt"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1690,11 +1763,11 @@ msgid "Purchase Order"
 msgstr "Inköpsorder"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1715,15 +1788,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
-"försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1737,9 +1801,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1773,7 +1836,7 @@ msgstr "Bekräfta"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on receptions"
-msgstr "Baserad på mottagning"
+msgstr "Generera fakturautkast vid mottagning"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
@@ -1829,7 +1892,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Den valda leverantören säljer endast denna produkt med %s"
@@ -1874,6 +1937,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Utlevererade produkter att fakturera"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validated By"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1964,9 +2033,9 @@ msgid "November"
 msgstr "november"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuella fakturor"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1988,13 +2057,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2015,89 +2077,6 @@ msgstr "Offertförfrågan nr. :"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2108,6 +2087,12 @@ msgstr "Totalt order per användare per månad"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2115,15 +2100,7 @@ msgid "Warehouse"
 msgstr "Lagerhus"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2169,7 +2146,7 @@ msgstr "Your Order Reference"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr "Purchase Order Confirmation N°"
+msgstr "InköpsOrderBekräftelse Nr"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -2208,8 +2185,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2218,6 +2195,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Prislisteversioner"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2284,9 +2266,6 @@ msgstr "Ordrar"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
-#~ msgid "Delivery"
-#~ msgstr "Delivery"
-
 #, python-format
 #~ msgid "No Pricelist !"
 #~ msgstr "No Pricelist !"
@@ -2607,6 +2586,9 @@ msgstr "Ordrar"
 #~ msgid "Current purchases"
 #~ msgstr "Nuvarande inköp"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Välj en öppen säljorder"
+
 #, python-format
 #~ msgid "You can not confirm purchase order without Purchase Order Lines."
 #~ msgstr "Du kan inte bekräfta beställningen utan inköpsorder"
@@ -2648,9 +2630,6 @@ msgstr "Ordrar"
 #~ msgid "purchase.config.wizard"
 #~ msgstr "purchase.config.wizard"
 
-#~ msgid "Based on Receptions"
-#~ msgstr "Baserad på mottagning"
-
 #~ msgid "To Approve"
 #~ msgstr "Att godkänna"
 
@@ -2801,6 +2780,13 @@ msgstr "Ordrar"
 #~ msgid "In order to delete a purchase order, it must be cancelled first!"
 #~ msgstr "För att ta bort en Inköpsorder, måste den avbrytas först!"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
+#~ "försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
+
 #~ msgid "Dest. Address Contact Name"
 #~ msgstr "Dest. Adress Kontakt Namn"
 
@@ -2842,9 +2828,6 @@ msgstr "Ordrar"
 #~ msgid "Unable to cancel this purchase order!"
 #~ msgstr "Kan inte avbryta inköpsorder!"
 
-#~ msgid "Based on Purchase Order Lines"
-#~ msgstr "Baserat på inköpsorderrader"
-
 #, python-format
 #~ msgid "Selected UOM does not belong to the same category as the product UOM"
 #~ msgstr "Vald enhet tillhör inte samma kategori som produktens enhet"
@@ -2852,19 +2835,6 @@ msgstr "Ordrar"
 #~ msgid "Purchase orders which are not approved yet."
 #~ msgstr "Inköpsordrar som inte är godkända ännu."
 
-#~ msgid ""
-#~ "Based on Purchase Order lines: place individual lines in 'Invoice Control > "
-#~ "Based on P.O. lines' from where you can selectively create an invoice.\n"
-#~ "Based on generated invoice: create a draft invoice you can validate later.\n"
-#~ "Based on receptions: let you create an invoice when receptions are validated."
-#~ msgstr ""
-#~ "Baserat på rader i inköpsorder: placera enskilda rader i 'FakturaKontroll > "
-#~ "Baserat på inköpsorderrader' från där du kan välja att skapa en faktura.\n"
-#~ "Baserat på genererad faktura: skapar ett fakturautkast som du kan godkänna "
-#~ "senare.\n"
-#~ "Baserat på mottagningar: låter dig skapa en faktura när mottagningen "
-#~ "godkänts."
-
 #~ msgid "Set the Default Invoicing Control Method"
 #~ msgstr "Sätt Standardmetod för FaktureringsKontroll"
 
@@ -3067,3 +3037,26 @@ msgstr "Ordrar"
 
 #~ msgid "Cancel Purchase Order"
 #~ msgstr "Avbryt Inköpsorder"
+
+#~ msgid ""
+#~ "Based on Purchase Order lines: place individual lines in 'Invoice Control > "
+#~ "Based on P.O. lines' from where you can selectively create an invoice.\n"
+#~ "Based on generated invoice: create a draft invoice you can validate later.\n"
+#~ "Based on receptions: let you create an invoice when receptions are validated."
+#~ msgstr ""
+#~ "Generera faktura mot inköpsorderrader: Placerar enskilda  inköpsorderrader i "
+#~ "'Faktura Kontroll > Baserat på inköpsorderrader' där du sedan kan välja att "
+#~ "skapa en eller flera  fakturautkast.\n"
+#~ "Generera fakturautkast direkt: Skapar ett fakturautkast när du godkänner "
+#~ "inköpsordern.\n"
+#~ "Generera fakturautkast vid mottagning: Låter dig skapa en faktura när "
+#~ "mottagningen godkänts."
+
+#~ msgid "Based on Purchase Order Lines"
+#~ msgstr "Generera faktura mot inköpsorderrader"
+
+#~ msgid "Based on Receptions"
+#~ msgstr "Generera fakturautkast vid mottagning"
+
+#~ msgid "Delivery"
+#~ msgstr "Leverans"
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index 497edff5d48..91fc7d74d29 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-19 11:33+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "รายการราคาจะเลือกสกุลเงินให้กับใบสั่งซื้อนี้ "
 "และจะคำนวณหาราคาซื้อของคู่ค้าปัจจุบันให้ตรงกับสินค้าและจำนวนที่เลือกไว้"
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "ตรวจสอบโดย"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "ราคาเฉลี่ย"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -233,7 +219,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -258,29 +244,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "รวมจำนวนเงิน(ไม่รวมภาษี)"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "หมวดหมู่"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -346,14 +315,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -381,12 +352,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "จำนวน"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -444,12 +409,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -470,6 +429,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -502,6 +466,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -522,6 +499,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -541,6 +523,11 @@ msgstr ""
 "ผู้ซื้อต้องอนุมัติใบแจ้งขอใบเสนอราคาก่อนที่จะส่งให้ผู้จัดจำหน่าย "
 "จากนั้นใบแจ้งขอใบเสนอราคาจึงจะเปลี่ยนเป็นใบสั่งซื้อสถานะยืนยัน"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -566,7 +553,7 @@ msgid "Supplier"
 msgstr "ผู้จัดจำหน่าย"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -590,7 +577,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "สินค้าที่ได้รับ"
 
@@ -631,6 +617,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -638,7 +631,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -659,8 +652,8 @@ msgid "It indicates that a picking has been done"
 msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -724,6 +717,15 @@ msgstr "รายการราคา"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -755,6 +757,11 @@ msgstr "ใบแจ้งหนี้ฉบับร่าง"
 msgid "The tax amount"
 msgstr "จำนวนภาษี"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -787,7 +794,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -807,11 +814,6 @@ msgstr "ช่องนี้บ่งบอกถึงใบแจ้งหน
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -905,12 +907,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -945,14 +941,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -992,16 +1063,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1014,13 +1080,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1032,19 +1103,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1083,15 +1148,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "เลือกใบสั่งขายสถานะเปิด"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "กำหนดให้เป็นแบบร่าง"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1122,7 +1194,7 @@ msgid "Stock Move"
 msgstr "รายการเคลื่อนไหวสินค้า"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1221,7 +1293,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1311,7 +1383,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1322,7 +1394,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1333,8 +1405,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1489,8 +1561,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1602,8 +1674,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1676,11 +1749,11 @@ msgid "Purchase Order"
 msgstr "ใบสั่งซื้อ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1701,16 +1774,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ "
-"ขึ้นอยู่กับการตั้งค่าในใบสั่งขายว่าเลือกให้สร้างใบแจ้งหนี้ จากการจัดส่ง "
-"หรือเลือกจากจำนวนสินค้าที่สั่ง"
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1724,9 +1787,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1813,7 +1875,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1858,6 +1920,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "ตรวจสอบโดย"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1948,8 +2016,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1972,13 +2040,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1999,89 +2060,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2092,6 +2070,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2099,15 +2083,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2180,8 +2156,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2190,6 +2166,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2345,6 +2326,9 @@ msgstr ""
 #~ msgid "No Pricelist !"
 #~ msgstr "ไม่มีรายการาคา!"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "เลือกใบสั่งขายสถานะเปิด"
+
 #, python-format
 #~ msgid "Purchase order '%s' is confirmed."
 #~ msgstr "ใบสั่งซื้อ '%s' นี้ถูกยืนยันแล้ว"
@@ -2380,6 +2364,14 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "ความก้าวหน้าการตั้งค่า"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ "
+#~ "ขึ้นอยู่กับการตั้งค่าในใบสั่งขายว่าเลือกให้สร้างใบแจ้งหนี้ จากการจัดส่ง "
+#~ "หรือเลือกจากจำนวนสินค้าที่สั่ง"
+
 #~ msgid "Configure Your Purchases Management Application"
 #~ msgstr "ตั้งค่าแอพพลิเคชั่นการจัดการซื้อ"
 
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 724e7628feb..029aa6f19a5 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -57,11 +57,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -103,16 +98,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -129,9 +121,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -154,12 +146,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -230,7 +216,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -255,29 +241,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -343,14 +312,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -378,12 +349,6 @@ msgstr ""
 msgid "Quantity"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -441,12 +406,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -467,6 +426,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -499,6 +463,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -519,6 +496,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -536,6 +518,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -561,7 +548,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -585,7 +572,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr ""
 
@@ -626,6 +612,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -633,7 +626,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -717,6 +710,15 @@ msgstr ""
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -748,6 +750,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -780,7 +787,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -800,11 +807,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -898,12 +900,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -938,14 +934,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -985,16 +1056,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1007,13 +1073,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1025,19 +1096,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1085,6 +1150,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1667,11 +1740,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1692,13 +1765,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1712,9 +1778,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1798,7 +1863,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1843,6 +1908,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1933,8 +2004,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1957,13 +2028,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1984,89 +2048,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2077,6 +2058,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2084,15 +2071,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2165,8 +2144,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2175,6 +2154,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index b60ee4665f2..850d73ee499 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-01-24 23:32+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -60,11 +60,6 @@ msgstr ""
 "belirler. Ayrıca, seçilen ürünler/miktarlar için tedarikçi fiyatını da "
 "hesaplar."
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -106,16 +101,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "Önce bu satınalma emriyle ilişkili bütün alımları iptal etmelisiniz."
@@ -132,10 +124,10 @@ msgid "Purchase-Standard Price"
 msgstr "Satınalma-Standart Fiyat"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Onaylayan"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -157,12 +149,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Ortalama Fiyat"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -235,7 +221,7 @@ msgstr ""
 "olarak hesaplar."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -260,29 +246,12 @@ msgstr "${object.company_id.name} Satınalma (Ref ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "Vergilendirilmemiş toplam tutar"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -351,14 +320,16 @@ msgid "October"
 msgstr "Ekim"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -386,12 +357,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Miktar"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -449,12 +414,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -475,6 +434,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "Zamanlanan Tarih"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -507,6 +471,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -530,6 +507,11 @@ msgstr ""
 "oluşturulur. Fatura hesap uzmanı tarafından manuel olarak da oluşturulabilir "
 "(Fatura kontrolü = Manuel)."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -549,6 +531,11 @@ msgstr ""
 "Alıcı, tedarikçiye gönderilmeden önce RFQ'yu onaylamalıdır. RFQ onaylanmış "
 "bir Satınalma Siparişi haline gelir."
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -574,7 +561,7 @@ msgid "Supplier"
 msgstr "Tedarikçi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -598,7 +585,6 @@ msgstr "Alt Toplam"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Alınan"
 
@@ -639,6 +625,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -646,7 +639,7 @@ msgid "# of Lines"
 msgstr "Satır sayısı"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -667,8 +660,8 @@ msgid "It indicates that a picking has been done"
 msgstr "Bir alım gerçekleştirildiğini gösterir"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -733,6 +726,15 @@ msgstr "Fiyat Listesi"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -764,6 +766,11 @@ msgstr "Taslak Fatura"
 msgid "The tax amount"
 msgstr "Vergi miktarı"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -796,7 +803,7 @@ msgid "Stock Moves"
 msgstr "Stok Hareketi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -816,11 +823,6 @@ msgstr "Bir faturanın ödendiğini gösterir"
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -915,12 +917,6 @@ msgstr "Mik."
 msgid "Cancel"
 msgstr "İptal"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -955,14 +951,89 @@ msgid "Date Approved"
 msgstr "Onaylanmış Tarih"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -1004,16 +1075,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1026,13 +1092,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1044,19 +1115,13 @@ msgstr "Ölçü Birimleri"
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "Satınalma Paneli"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1095,15 +1160,22 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Bir Açık Satış Siparişi Seçin"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "Taslak olarak Ayarla"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1134,7 +1206,7 @@ msgid "Stock Move"
 msgstr "Stok Hareketi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1236,7 +1308,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1326,7 +1398,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "Satınalma Siparişi Öğesi Faturalandırma"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "SA: %s"
@@ -1337,7 +1409,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1348,9 +1420,9 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Manuel Faturalar"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1504,8 +1576,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1617,8 +1689,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1691,11 +1764,11 @@ msgid "Purchase Order"
 msgstr "Satınalma Siparişi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1716,15 +1789,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-"Alım listesi bir fatura oluşturur. Satış siparişi faturalama kontrolüne "
-"bağlı olarak, fatura teslimata ya da sipariş edilen miktarlara bağlıdır."
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1738,9 +1802,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1830,7 +1893,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Seçilen tedarikçi bu ürünün sadece %s'ini satar"
@@ -1875,6 +1938,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr "Faturalandırılacak giden ürünler"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Onaylayan"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1965,9 +2034,9 @@ msgid "November"
 msgstr "Kasım"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Manuel Faturalar"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1989,13 +2058,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2016,89 +2078,6 @@ msgstr "Teklif İsteği No"
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2109,6 +2088,12 @@ msgstr "Aylık Toplam Kullanıcı Siparişi"
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2116,15 +2101,7 @@ msgid "Warehouse"
 msgstr "Depo"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2211,8 +2188,8 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2221,6 +2198,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr "Fiyat Listesi Sürümleri"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2440,6 +2422,9 @@ msgstr "Siparişler"
 #~ msgid "No Pricelist !"
 #~ msgstr "Fiyat listesi yok!"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "Bir Açık Satış Siparişi Seçin"
+
 #~ msgid "Current purchases"
 #~ msgstr "Mevcut satınalmalar"
 
@@ -2476,6 +2461,13 @@ msgstr "Siparişler"
 #~ msgid "Configuration Progress"
 #~ msgstr "Yapılandırma İlerleyişi"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr ""
+#~ "Alım listesi bir fatura oluşturur. Satış siparişi faturalama kontrolüne "
+#~ "bağlı olarak, fatura teslimata ya da sipariş edilen miktarlara bağlıdır."
+
 #, python-format
 #~ msgid "Purchase amount over the limit"
 #~ msgstr "Satınalma miktarı limitin üzerinde"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 65e3eda3ecb..085010f9167 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:15+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -57,11 +57,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -103,16 +98,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -129,9 +121,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -154,12 +146,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -230,7 +216,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -255,29 +241,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -343,14 +312,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -378,12 +349,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Кількість"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -441,12 +406,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -467,6 +426,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -499,6 +463,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -519,6 +496,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -536,6 +518,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -561,7 +548,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -585,7 +572,6 @@ msgstr "Попередня сума"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Отримано"
 
@@ -626,6 +612,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -633,7 +626,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -717,6 +710,15 @@ msgstr "Прейскурант"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -748,6 +750,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -780,7 +787,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -800,11 +807,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -898,12 +900,6 @@ msgstr "К-сть"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -938,14 +934,89 @@ msgid "Date Approved"
 msgstr "Затверджена дата"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -985,16 +1056,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1007,13 +1073,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1025,19 +1096,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1085,6 +1150,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1669,11 +1742,11 @@ msgid "Purchase Order"
 msgstr "Заявка на придбання"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1694,13 +1767,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1714,9 +1780,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1800,7 +1865,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1845,6 +1910,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1935,8 +2006,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1959,13 +2030,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1986,89 +2050,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2079,6 +2060,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2086,15 +2073,7 @@ msgid "Warehouse"
 msgstr "Склад"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2167,8 +2146,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2177,6 +2156,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index e0eb246f425..2011ec360fb 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-07-31 06:20+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -58,11 +58,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -104,16 +99,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -130,9 +122,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -155,12 +147,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "Giá trung bình"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -231,7 +217,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -256,29 +242,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Tổng số tiền không thuế"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "Loại"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -344,14 +313,16 @@ msgid "October"
 msgstr "Tháng Mười"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -379,12 +350,6 @@ msgstr ""
 msgid "Quantity"
 msgstr "Số lượng"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -442,12 +407,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -468,6 +427,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -500,6 +464,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -520,6 +497,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -537,6 +519,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -562,7 +549,7 @@ msgid "Supplier"
 msgstr "Nhà cung cấp"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -586,7 +573,6 @@ msgstr "Tổng phụ"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "Đã nhận"
 
@@ -627,6 +613,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -634,7 +627,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -655,8 +648,8 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -718,6 +711,15 @@ msgstr "Bảng giá"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -749,6 +751,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -781,7 +788,7 @@ msgid "Stock Moves"
 msgstr "Dịch chuyển hàng tồn kho"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -801,11 +808,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -899,12 +901,6 @@ msgstr "Số lượng"
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -939,14 +935,89 @@ msgid "Date Approved"
 msgstr "Ngày được chấp thuận"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -986,16 +1057,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1008,13 +1074,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1026,19 +1097,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1077,8 +1142,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1086,6 +1151,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1116,7 +1188,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1215,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1305,7 +1377,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1316,7 +1388,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1327,8 +1399,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1483,8 +1555,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1596,8 +1668,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1668,11 +1741,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1693,13 +1766,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1713,9 +1779,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1799,7 +1864,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1844,6 +1909,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1934,8 +2005,8 @@ msgid "November"
 msgstr "Tháng Mười một"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1958,13 +2029,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1985,89 +2049,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2078,6 +2059,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2085,15 +2072,7 @@ msgid "Warehouse"
 msgstr "Kho hàng"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2166,8 +2145,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2176,6 +2155,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index f3e350c96ab..5b4c6380a9b 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 11:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -59,11 +59,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。"
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -105,16 +100,13 @@ msgid ""
 msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
-msgstr "警告！"
+msgid "Configuration Error!"
+msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr "你必须首先这个采购订单相关的所有收货单。"
@@ -131,10 +123,10 @@ msgid "Purchase-Standard Price"
 msgstr "采购 - 标准单价"
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "审核人"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -161,12 +153,6 @@ msgstr ""
 msgid "Average Price"
 msgstr "均价"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "发票 <b>已经支付</b>."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -237,7 +223,7 @@ msgid ""
 msgstr "计算所有采购订单明细产品的最小计划日期"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr "要删除采购订单，你必须先取消它"
@@ -262,29 +248,12 @@ msgstr "${object.company_id.name} 订单 (编号 ${object.name or 'n/a' })"
 msgid "Total Untaxed amount"
 msgstr "总未完税金额"
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr "计量单位类别"
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr "分类"
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr "报价单 "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr "报价单 <em>%s</em> <b>被转换为</b> 采购订单 %s %s."
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -359,15 +328,17 @@ msgid "October"
 msgstr "10月"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr "采购订单r <em>%s</em> <b>被取消</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
-msgstr "摘要"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr "当你卖 服务给客户时"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -394,12 +365,6 @@ msgstr "你是否要生成供应商发票？"
 msgid "Quantity"
 msgstr "数量"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr "发运 <em>%s</em> <b>已排程</b> 为%s."
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -464,12 +429,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr "如果你要直接从供应商发货给给客户，输入一个地址。否则，发给你自己公司的时候，留空。"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr "发票草稿  %s %s is <b>等待核准</b>."
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -492,6 +451,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr "计划日期"
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -524,6 +488,19 @@ msgstr "可被采购"
 msgid "Incoming  Products"
 msgstr "入库产品"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -544,6 +521,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr "如果采购订单的发票控制是“来自订单”发票是自动生成。发票也可以由会计人员手动产生(发票控制 = 手动)"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -561,6 +543,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr "询价单(RFQ) 必须先得到采购经理审批后才能发给供应商。 询价单能确认为采购订单。"
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -586,7 +573,7 @@ msgid "Supplier"
 msgstr "供应商"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr "定义这个公司的费用科目: \"%s\" (id:%d)."
@@ -610,7 +597,6 @@ msgstr "小计"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "已接收"
 
@@ -659,6 +645,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr "发票和入库单"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -666,7 +659,7 @@ msgid "# of Lines"
 msgstr "# 明细"
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr "为产品: \"%s\" (id:%d) 定义费用科目。"
@@ -687,8 +680,8 @@ msgid "It indicates that a picking has been done"
 msgstr "这表示装箱单已完成"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr "不能取消这个采购订单"
@@ -750,6 +743,15 @@ msgstr "价格表"
 msgid "Draft PO"
 msgstr "采购订单草稿"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -781,6 +783,11 @@ msgstr "发票草稿"
 msgid "The tax amount"
 msgstr "税金"
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -813,7 +820,7 @@ msgid "Stock Moves"
 msgstr "库存调拨"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr "采购单草稿被创建"
@@ -833,11 +840,6 @@ msgstr "这表明发票已支付"
 msgid "Terms and Conditions"
 msgstr "条款和条件"
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr "未知"
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -931,12 +933,6 @@ msgstr "数量"
 msgid "Cancel"
 msgstr "取消"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -970,17 +966,92 @@ msgstr "单价"
 msgid "Date Approved"
 msgstr "审批日期"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
-msgstr "询价单<b>被创建</b>."
-
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
 msgstr "一个采购订单草稿"
 
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
@@ -1018,16 +1089,11 @@ msgid "Outgoing Mails"
 msgstr "发出邮件"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr "你不能确认没有任何明细的采购订单"
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1040,13 +1106,18 @@ msgid "Destination Warehouse"
 msgstr "目标仓库"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr "选择的计量单位不属于产品的计量单位相同的分类。"
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1058,19 +1129,13 @@ msgstr "计量单位"
 msgid "Manage pricelist per supplier"
 msgstr "管理每个供应商的价格表"
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr "采购订单被设置为“草稿”"
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr "采购控制台"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr "首先取消这个采购订单相关的入库单"
@@ -1109,15 +1174,22 @@ msgid "Unread Messages"
 msgstr "未读信息"
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "选择待处理的销售订单"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr "计量单位类别"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
 msgstr "设为草稿"
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1148,7 +1220,7 @@ msgid "Stock Move"
 msgstr "库存调拨"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr "非法的动作"
@@ -1247,7 +1319,7 @@ msgid ""
 msgstr "一个草稿"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr "请创建发票"
@@ -1344,7 +1416,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr "采购订单明细生成发票"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr "PO: %s"
@@ -1355,7 +1427,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr "为公司 \"%s\" (id:%d)  定义采购账簿。"
@@ -1366,9 +1438,9 @@ msgid "Purchase Order "
 msgstr "采购订单 "
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "手工发票"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr "允许你基于平均成本计算产品成本"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
@@ -1531,8 +1603,8 @@ msgid "Compute product cost price based on average cost"
 msgstr "基于平均成本计算产品成本"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1650,8 +1722,9 @@ msgid "Open Purchase Menu"
 msgstr "打开采购菜单"
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1722,11 +1795,11 @@ msgid "Purchase Order"
 msgstr "采购订单"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr "错误!"
@@ -1753,13 +1826,6 @@ msgstr ""
 "当采购订单被支付和收货以后，状态变成“完成”。\r\n"
 "如果在开票或者收货过程中出现了 “取消”操作，状态变成了“异常”。"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "装箱单生成发票，依据销售订单控制生成的发票，发票是基于已收货或已经下单的数量。"
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1773,10 +1839,9 @@ msgid "# of Purchase Order"
 msgstr "采购订单号"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
-msgstr "装运货物 <b>已经收到</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1861,7 +1926,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "选择的供应商只销售这产品  %s"
@@ -1908,6 +1973,12 @@ msgstr "参考计量单位"
 msgid "Outgoing products to invoice"
 msgstr "出仓产品要开发票"
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "审核人"
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1998,9 +2069,9 @@ msgid "November"
 msgstr "11月"
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
-msgstr "允许你基于平均成本计算产品成本"
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "手工发票"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2025,13 +2096,6 @@ msgstr ""
 "基于订单: 生成一个发票草稿供你以后确认。\n"
 "基于收货: 收货后根据收货手动开票"
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr "生成这张采购订单需求、销售订单或内部请购的单据参考号。"
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -2052,89 +2116,6 @@ msgstr "询价单号"
 msgid "Invoicing Settings"
 msgstr "开票设置"
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2145,6 +2126,12 @@ msgstr "按用户每月的订单总金额"
 msgid "Based on incoming shipments"
 msgstr "基于收货量"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2152,15 +2139,7 @@ msgid "Warehouse"
 msgstr "仓库"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr "销售单或者供应商发送的报价单的参考编号。主要 用于根据这个参考号(通常写在供应商送来的发运单上面) 查找对应的产品。"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2242,9 +2221,9 @@ msgstr ""
 " "
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
-msgstr "当你卖 服务给客户时"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr "摘要"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2252,6 +2231,11 @@ msgstr "当你卖 服务给客户时"
 msgid "Pricelist Versions"
 msgstr "价格表版本"
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
@@ -2814,6 +2798,9 @@ msgstr "订单"
 #~ "and control the supplier invoices."
 #~ msgstr "使用这菜单按单号，供应商，产品等搜索您的采购订单，您可以跟踪接收的产品和控制供应商的发票。"
 
+#~ msgid "Select an Open Sale Order"
+#~ msgstr "选择待处理的销售订单"
+
 #~ msgid ""
 #~ "Put an address if you want to deliver directly from the supplier to the "
 #~ "customer.In this case, it will remove the warehouse link and set the "
@@ -2916,6 +2903,11 @@ msgstr "订单"
 #~ "“已完成”状态当采购订单完成自动设置\n"
 #~ "“已取消”状态当用户取消采购订单时自动设置"
 
+#~ msgid ""
+#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
+#~ "sale order, the invoice is based on delivered or on ordered quantities."
+#~ msgstr "装箱单生成发票，依据销售订单控制生成的发票，发票是基于已收货或已经下单的数量。"
+
 #~ msgid "Delivery & Invoicing"
 #~ msgstr "收货与开票"
 
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 056264acaf0..a5c8eb73055 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-01-30 13:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -57,11 +57,6 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
@@ -103,16 +98,13 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
@@ -129,9 +121,9 @@ msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
 msgstr ""
 
 #. module: purchase
@@ -154,12 +146,6 @@ msgstr ""
 msgid "Average Price"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
@@ -230,7 +216,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
 msgstr ""
@@ -255,29 +241,12 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
 msgstr ""
 
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid ""
-"Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid ""
@@ -343,14 +312,16 @@ msgid "October"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
 #, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
 msgstr ""
 
 #. module: purchase
@@ -378,12 +349,6 @@ msgstr ""
 msgid "Quantity"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -441,12 +406,6 @@ msgid ""
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
 msgid ""
@@ -467,6 +426,11 @@ msgstr ""
 msgid "Scheduled Date"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
@@ -499,6 +463,19 @@ msgstr ""
 msgid "Incoming  Products"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
@@ -519,6 +496,11 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
@@ -536,6 +518,11 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
@@ -561,7 +548,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -585,7 +572,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
 msgid "Received"
 msgstr "已发运"
 
@@ -626,6 +612,13 @@ msgstr ""
 msgid "Invoices and Receptions"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
@@ -633,7 +626,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
 msgstr ""
@@ -654,8 +647,8 @@ msgid "It indicates that a picking has been done"
 msgstr "代表已完成提貨"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
 #, python-format
 msgid "Unable to cancel this purchase order."
 msgstr ""
@@ -717,6 +710,15 @@ msgstr "價目表"
 msgid "Draft PO"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -748,6 +750,11 @@ msgstr ""
 msgid "The tax amount"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
@@ -780,7 +787,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
 #, python-format
 msgid "Draft Purchase Order created"
 msgstr ""
@@ -800,11 +807,6 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -898,12 +900,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
@@ -938,14 +934,89 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello$ ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: purchase
@@ -985,16 +1056,11 @@ msgid "Outgoing Mails"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Purchase: Mark unread"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
@@ -1007,13 +1073,18 @@ msgid "Destination Warehouse"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
 #, python-format
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -1025,19 +1096,13 @@ msgstr ""
 msgid "Manage pricelist per supplier"
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 msgid "Purchase Dashboard"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
 msgstr ""
@@ -1076,8 +1141,8 @@ msgid "Unread Messages"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
 msgstr ""
 
 #. module: purchase
@@ -1085,6 +1150,13 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Notes"
@@ -1115,7 +1187,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -1214,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
 #, python-format
 msgid "Please create Invoices."
 msgstr ""
@@ -1304,7 +1376,7 @@ msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "PO: %s"
 msgstr ""
@@ -1315,7 +1387,7 @@ msgid "Send by EMail"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -1326,8 +1398,8 @@ msgid "Purchase Order "
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
 msgstr ""
 
 #. module: purchase
@@ -1482,8 +1554,8 @@ msgid "Compute product cost price based on average cost"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
 #: view:res.partner:0
 #, python-format
@@ -1595,8 +1667,9 @@ msgid "Open Purchase Menu"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
 msgstr ""
 
 #. module: purchase
@@ -1667,11 +1740,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:310
-#: code:addons/purchase/purchase.py:437
-#: code:addons/purchase/purchase.py:497
-#: code:addons/purchase/purchase.py:508
-#: code:addons/purchase/wizard/purchase_line_invoice.py:109
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1692,13 +1765,6 @@ msgid ""
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid ""
-"A Pick list generates an invoice. Depending on the Invoicing control of the "
-"sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
@@ -1712,9 +1778,8 @@ msgid "# of Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: purchase
@@ -1798,7 +1863,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -1843,6 +1908,12 @@ msgstr ""
 msgid "Outgoing products to invoice"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -1933,8 +2004,8 @@ msgid "November"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1957,13 +2028,6 @@ msgid ""
 "validated."
 msgstr ""
 
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid ""
-"Reference of the document that generated this purchase order request; a sale "
-"order or an internal procurement request."
-msgstr ""
-
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
@@ -1984,89 +2048,6 @@ msgstr ""
 msgid "Invoicing Settings"
 msgstr ""
 
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.partner_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-"       % endif\n"
-"       % if object.validator:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
-"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
@@ -2077,6 +2058,12 @@ msgstr ""
 msgid "Based on incoming shipments"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
@@ -2084,15 +2071,7 @@ msgid "Warehouse"
 msgstr "倉庫"
 
 #. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid ""
-"Reference of the sale order or quotation sent by your supplier. It's mainly "
-"used to do the matching when you receive the products as this reference is "
-"usually written on the delivery order sent by your supplier."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
@@ -2165,8 +2144,8 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: purchase
@@ -2175,6 +2154,11 @@ msgstr ""
 msgid "Pricelist Versions"
 msgstr ""
 
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase_analytic_plans/i18n/ar.po b/addons/purchase_analytic_plans/i18n/ar.po
index b4ce2d24d33..f2063be1bbb 100644
--- a/addons/purchase_analytic_plans/i18n/ar.po
+++ b/addons/purchase_analytic_plans/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/bg.po b/addons/purchase_analytic_plans/i18n/bg.po
index 153160cf30b..d3065e2779c 100644
--- a/addons/purchase_analytic_plans/i18n/bg.po
+++ b/addons/purchase_analytic_plans/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 05:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index 440476ea66c..43d53ac34e2 100644
--- a/addons/purchase_analytic_plans/i18n/bs.po
+++ b/addons/purchase_analytic_plans/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-02-10 12:28+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ca.po b/addons/purchase_analytic_plans/i18n/ca.po
index a0f7e558df4..feaf82c3adf 100644
--- a/addons/purchase_analytic_plans/i18n/ca.po
+++ b/addons/purchase_analytic_plans/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 09:46+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index d127016c344..4e32a059a3a 100644
--- a/addons/purchase_analytic_plans/i18n/cs.po
+++ b/addons/purchase_analytic_plans/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-06 04:51+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/da.po b/addons/purchase_analytic_plans/i18n/da.po
index 1057a8d3373..b23c59578a4 100644
--- a/addons/purchase_analytic_plans/i18n/da.po
+++ b/addons/purchase_analytic_plans/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-08 11:49+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index 5e7fa77fb90..768ea6caa30 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_analytic_plans/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-13 18:33+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/el.po b/addons/purchase_analytic_plans/i18n/el.po
index ef55276a645..0b9b2118cac 100644
--- a/addons/purchase_analytic_plans/i18n/el.po
+++ b/addons/purchase_analytic_plans/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-06-15 07:22+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index 22409b95c2c..21849150f8b 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 12:42+0000\n"
 "Last-Translator: Carlos Ch. <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/es_AR.po b/addons/purchase_analytic_plans/i18n/es_AR.po
index 67f01041a16..9baf497fd60 100644
--- a/addons/purchase_analytic_plans/i18n/es_AR.po
+++ b/addons/purchase_analytic_plans/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-14 14:15+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/es_CR.po b/addons/purchase_analytic_plans/i18n/es_CR.po
index 9cf41aa331e..2cd67baa2a8 100644
--- a/addons/purchase_analytic_plans/i18n/es_CR.po
+++ b/addons/purchase_analytic_plans/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 21:57+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/et.po b/addons/purchase_analytic_plans/i18n/et.po
index 99053bcaeef..191a3b9f4f8 100644
--- a/addons/purchase_analytic_plans/i18n/et.po
+++ b/addons/purchase_analytic_plans/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/fi.po b/addons/purchase_analytic_plans/i18n/fi.po
index fbaffef010b..78d33b5b258 100644
--- a/addons/purchase_analytic_plans/i18n/fi.po
+++ b/addons/purchase_analytic_plans/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 05:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 0abd5ef3113..e076a3320f1 100644
--- a/addons/purchase_analytic_plans/i18n/fr.po
+++ b/addons/purchase_analytic_plans/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 01:54+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/gl.po b/addons/purchase_analytic_plans/i18n/gl.po
index 283d695822a..4903856d3c8 100644
--- a/addons/purchase_analytic_plans/i18n/gl.po
+++ b/addons/purchase_analytic_plans/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: purchase-analytic-plans-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-08-17 08:30+0000\n"
 "Last-Translator: Frco. Javier Rial <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index 506f5f7badf..e4046174eee 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-12 08:01+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/hu.po b/addons/purchase_analytic_plans/i18n/hu.po
index 49295a5acfc..5cb72e4a463 100644
--- a/addons/purchase_analytic_plans/i18n/hu.po
+++ b/addons/purchase_analytic_plans/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-01 18:03+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/id.po b/addons/purchase_analytic_plans/i18n/id.po
index fe93e265565..b2ea5f772c9 100644
--- a/addons/purchase_analytic_plans/i18n/id.po
+++ b/addons/purchase_analytic_plans/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:55+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index 5b0b5946c3a..f3dd5a8f2d2 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_analytic_plans/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 14:28+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ja.po b/addons/purchase_analytic_plans/i18n/ja.po
index 5a1b73db8ff..06d9e281f70 100644
--- a/addons/purchase_analytic_plans/i18n/ja.po
+++ b/addons/purchase_analytic_plans/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-29 05:06+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ko.po b/addons/purchase_analytic_plans/i18n/ko.po
index 45ef6cde2aa..8c014fc1252 100644
--- a/addons/purchase_analytic_plans/i18n/ko.po
+++ b/addons/purchase_analytic_plans/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:38+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/lt.po b/addons/purchase_analytic_plans/i18n/lt.po
index 01284bbfdad..44932ae5727 100644
--- a/addons/purchase_analytic_plans/i18n/lt.po
+++ b/addons/purchase_analytic_plans/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/mn.po b/addons/purchase_analytic_plans/i18n/mn.po
index b278c8095c1..9eb7d2b818f 100644
--- a/addons/purchase_analytic_plans/i18n/mn.po
+++ b/addons/purchase_analytic_plans/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-11 04:59+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/nl.po b/addons/purchase_analytic_plans/i18n/nl.po
index 4866b67a9c9..be7be488559 100644
--- a/addons/purchase_analytic_plans/i18n/nl.po
+++ b/addons/purchase_analytic_plans/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-28 13:55+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/nl_BE.po b/addons/purchase_analytic_plans/i18n/nl_BE.po
index 6ddc5d59a5f..33bb15fbf4e 100644
--- a/addons/purchase_analytic_plans/i18n/nl_BE.po
+++ b/addons/purchase_analytic_plans/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-20 10:04+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pl.po b/addons/purchase_analytic_plans/i18n/pl.po
index 34416c033b2..95b5ef03ccf 100644
--- a/addons/purchase_analytic_plans/i18n/pl.po
+++ b/addons/purchase_analytic_plans/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 10:20+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt.po b/addons/purchase_analytic_plans/i18n/pt.po
index 6da9c6f7ac5..12977a449f9 100644
--- a/addons/purchase_analytic_plans/i18n/pt.po
+++ b/addons/purchase_analytic_plans/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-27 06:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index 0487e44228c..e30b1453044 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_analytic_plans/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-28 20:58+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ro.po b/addons/purchase_analytic_plans/i18n/ro.po
index 21fd6a8de3b..ccae109421f 100644
--- a/addons/purchase_analytic_plans/i18n/ro.po
+++ b/addons/purchase_analytic_plans/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-06 07:12+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index 202f59bf749..6c0844e2e75 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_analytic_plans/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-29 07:54+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sl.po b/addons/purchase_analytic_plans/i18n/sl.po
index 5d71487d9fe..746fd9696e8 100644
--- a/addons/purchase_analytic_plans/i18n/sl.po
+++ b/addons/purchase_analytic_plans/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-26 09:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sq.po b/addons/purchase_analytic_plans/i18n/sq.po
index b38421cc00a..5f4df2002b2 100644
--- a/addons/purchase_analytic_plans/i18n/sq.po
+++ b/addons/purchase_analytic_plans/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sr.po b/addons/purchase_analytic_plans/i18n/sr.po
index 19e1e9ac39e..f09ca2d63b1 100644
--- a/addons/purchase_analytic_plans/i18n/sr.po
+++ b/addons/purchase_analytic_plans/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-04 08:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sr@latin.po b/addons/purchase_analytic_plans/i18n/sr@latin.po
index ab4006fb995..ffab85191b9 100644
--- a/addons/purchase_analytic_plans/i18n/sr@latin.po
+++ b/addons/purchase_analytic_plans/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-13 15:29+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sv.po b/addons/purchase_analytic_plans/i18n/sv.po
index 0a48d76e548..f79b1a1aa5c 100644
--- a/addons/purchase_analytic_plans/i18n/sv.po
+++ b/addons/purchase_analytic_plans/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:07+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/tlh.po b/addons/purchase_analytic_plans/i18n/tlh.po
index 11c02666044..97b018082fc 100644
--- a/addons/purchase_analytic_plans/i18n/tlh.po
+++ b/addons/purchase_analytic_plans/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index 6f8754c9ab7..432ea731723 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/uk.po b/addons/purchase_analytic_plans/i18n/uk.po
index b97a17f8eaf..fc9a840a28b 100644
--- a/addons/purchase_analytic_plans/i18n/uk.po
+++ b/addons/purchase_analytic_plans/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 05:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ur.po b/addons/purchase_analytic_plans/i18n/ur.po
index 3c26ad8db43..edd7532fbec 100644
--- a/addons/purchase_analytic_plans/i18n/ur.po
+++ b/addons/purchase_analytic_plans/i18n/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 16:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/vi.po b/addons/purchase_analytic_plans/i18n/vi.po
index 1e1c4bd3ca0..086a4f042a6 100644
--- a/addons/purchase_analytic_plans/i18n/vi.po
+++ b/addons/purchase_analytic_plans/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 15:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 713cd229028..102ba04c2bf 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:35+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/zh_TW.po b/addons/purchase_analytic_plans/i18n/zh_TW.po
index c5216f9136d..f7f62a86a03 100644
--- a/addons/purchase_analytic_plans/i18n/zh_TW.po
+++ b/addons/purchase_analytic_plans/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:19+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_double_validation/i18n/ar.po b/addons/purchase_double_validation/i18n/ar.po
index b4e55f8ecc8..89edce1a7d7 100644
--- a/addons/purchase_double_validation/i18n/ar.po
+++ b/addons/purchase_double_validation/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 18:49+0000\n"
 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/bg.po b/addons/purchase_double_validation/i18n/bg.po
index 888e4845a70..bb12f556b39 100644
--- a/addons/purchase_double_validation/i18n/bg.po
+++ b/addons/purchase_double_validation/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-27 17:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/ca.po b/addons/purchase_double_validation/i18n/ca.po
index 26541e977dd..f210ce0448e 100644
--- a/addons/purchase_double_validation/i18n/ca.po
+++ b/addons/purchase_double_validation/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-15 15:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/da.po b/addons/purchase_double_validation/i18n/da.po
index 6021b0d9490..f4d5a8d8b28 100644
--- a/addons/purchase_double_validation/i18n/da.po
+++ b/addons/purchase_double_validation/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/de.po b/addons/purchase_double_validation/i18n/de.po
index 470546565c0..660acf55aa6 100644
--- a/addons/purchase_double_validation/i18n/de.po
+++ b/addons/purchase_double_validation/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 19:15+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/es.po b/addons/purchase_double_validation/i18n/es.po
index 0a61fe8f3a3..cd5e5e42fba 100644
--- a/addons/purchase_double_validation/i18n/es.po
+++ b/addons/purchase_double_validation/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:05+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/es_CR.po b/addons/purchase_double_validation/i18n/es_CR.po
index 3b5585b2712..ea03384418d 100644
--- a/addons/purchase_double_validation/i18n/es_CR.po
+++ b/addons/purchase_double_validation/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 21:58+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: purchase_double_validation
diff --git a/addons/purchase_double_validation/i18n/es_EC.po b/addons/purchase_double_validation/i18n/es_EC.po
index 52100ef985f..38e8e67ae14 100644
--- a/addons/purchase_double_validation/i18n/es_EC.po
+++ b/addons/purchase_double_validation/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-17 04:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/fi.po b/addons/purchase_double_validation/i18n/fi.po
index 1e5fa5f79f8..2649ee4386c 100644
--- a/addons/purchase_double_validation/i18n/fi.po
+++ b/addons/purchase_double_validation/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-28 09:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/fr.po b/addons/purchase_double_validation/i18n/fr.po
index 2ce706b8514..26972719d0c 100644
--- a/addons/purchase_double_validation/i18n/fr.po
+++ b/addons/purchase_double_validation/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-15 15:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/gl.po b/addons/purchase_double_validation/i18n/gl.po
index fcd84cc2c1e..cfc39ade1ab 100644
--- a/addons/purchase_double_validation/i18n/gl.po
+++ b/addons/purchase_double_validation/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-10 15:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
index a6cf61bb869..f75fa5d7e7a 100644
--- a/addons/purchase_double_validation/i18n/hr.po
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 06:50+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/hu.po b/addons/purchase_double_validation/i18n/hu.po
index a6e4735489a..b26fb2efb75 100644
--- a/addons/purchase_double_validation/i18n/hu.po
+++ b/addons/purchase_double_validation/i18n/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-15 15:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/it.po b/addons/purchase_double_validation/i18n/it.po
index 6619c5c873f..6ac0a7e29d1 100644
--- a/addons/purchase_double_validation/i18n/it.po
+++ b/addons/purchase_double_validation/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 20:49+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/ja.po b/addons/purchase_double_validation/i18n/ja.po
index 866178e7786..a2d6837016d 100644
--- a/addons/purchase_double_validation/i18n/ja.po
+++ b/addons/purchase_double_validation/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 21:47+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/nl.po b/addons/purchase_double_validation/i18n/nl.po
index a662fb669ba..baa53336229 100644
--- a/addons/purchase_double_validation/i18n/nl.po
+++ b/addons/purchase_double_validation/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 21:17+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/pl.po b/addons/purchase_double_validation/i18n/pl.po
index df746d6e647..607b64bb50f 100644
--- a/addons/purchase_double_validation/i18n/pl.po
+++ b/addons/purchase_double_validation/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 10:28+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/pt.po b/addons/purchase_double_validation/i18n/pt.po
index 2fe44af393a..f8418a33bb9 100644
--- a/addons/purchase_double_validation/i18n/pt.po
+++ b/addons/purchase_double_validation/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:45+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index 6813e104814..06abc4d2a30 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 12:38+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
diff --git a/addons/purchase_double_validation/i18n/ro.po b/addons/purchase_double_validation/i18n/ro.po
index 7ac95a068e5..bc28aeab5e2 100644
--- a/addons/purchase_double_validation/i18n/ro.po
+++ b/addons/purchase_double_validation/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-11 19:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/ru.po b/addons/purchase_double_validation/i18n/ru.po
index e5a91f0e029..1d29b776719 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 12:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/sv.po b/addons/purchase_double_validation/i18n/sv.po
index 7f0935f6be6..8c77d424408 100644
--- a/addons/purchase_double_validation/i18n/sv.po
+++ b/addons/purchase_double_validation/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 21:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/tr.po b/addons/purchase_double_validation/i18n/tr.po
index bbd53c397f5..e182d041353 100644
--- a/addons/purchase_double_validation/i18n/tr.po
+++ b/addons/purchase_double_validation/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 00:14+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po
index 81ebadcc9f8..066e43ce3b7 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:37+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
diff --git a/addons/purchase_requisition/i18n/ar.po b/addons/purchase_requisition/i18n/ar.po
index a576c2ab7c0..dfb9952e51c 100644
--- a/addons/purchase_requisition/i18n/ar.po
+++ b/addons/purchase_requisition/i18n/ar.po
@@ -7,115 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 17:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "تجميع حسب..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "مورِّد"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "تفاصيل المنتج"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"طلب الشراء (حصري): على تأكيد امر الشراء, وهي تلغي امر اشلراء المتبقي.\n"
-"طلب الشراء (متعدد): وهي تسمح باوامر الشراء المتعددة. على تأكيد امر الشراء "
-"فهي لا تلغي الاوامر المتبقية"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "شركة"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "كمية"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "أمر الشراء"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "خطأ!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "المنتجات"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "ملغي"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "تفاصيل التسعيرة"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "نوع الطلب"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "مرجع"
+msgid "Request a Quotation"
+msgstr "طلب تسعيرة"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -123,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "العديد من طلبات الشراء"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "إعادة التعيين لمسودة"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -152,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "مسؤول"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "تجميع حسب..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -163,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "المخزن"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "مورِّد"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -173,6 +100,16 @@ msgstr "المخزن"
 msgid "New"
 msgstr "جديد"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "تفاصيل المنتج"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "الكمية"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -192,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr "طلب شراء"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "خط طلب المبيعات"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "المنتج"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "التسعيرات"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "وصف"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "شركة"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "انشأ تسعيره"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -209,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "مقبولة من المورد"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "مرجع الأمر"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "تاريخ الأمر"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "المشتريات"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "الطلب"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "شريك طلب الشراء"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "اوامر الشراء"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "طلب الشراء (خصوصي)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "أكد امر الشراء"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "تاريخ البدء"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "إعادة التعيين لمسودة"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -301,15 +206,65 @@ msgstr ""
 msgid "User"
 msgstr "مستخدم"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "مرجع الأمر"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "كمية"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "طلبات الشراء"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "تفاصيل التسعيرة"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "تاريخ الإنتهاء"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "مرجع الطلب"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "منتجات للشراء"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -323,16 +278,56 @@ msgstr "ابحث عن طلب شراء"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "تاريخ الأمر"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"طلب الشراء (حصري): على تأكيد امر الشراء, وهي تلغي امر اشلراء المتبقي.\n"
+"طلب الشراء (متعدد): وهي تسمح باوامر الشراء المتعددة. على تأكيد امر الشراء "
+"فهي لا تلغي الاوامر المتبقية"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "إلغي امر الشراء"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "أمر الشراء"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "خطأ!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "نوع الطلب"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -340,40 +335,124 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "التسعيرات"
+msgid "Products"
+msgstr "المنتجات"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "طلب تسعيرة"
+msgid "Order Date"
+msgstr "تاريخ الأمر"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "ملغي"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "شريك طلب الشراء"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "لطلبات الشراء"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "اوامر الشراء"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "طلب الموعد النهائي"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "مرجع"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "المشتريات"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "المخزن"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "اخر طلب"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "الكمية"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "المدير"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "طلب الشراء (خصوصي)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "وحدة القياس للمنتج"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "أكد امر الشراء"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "انشأ تسعيره"
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "تاريخ الطلب"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "تاريخ البدء"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -381,10 +460,9 @@ msgid "Unassigned"
 msgstr "غير مخصص"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "إلغاء"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "الطلب"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -398,120 +476,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "اوامر الشراء"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "مسؤول"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "خط طلب المبيعات"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "المنتج"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "وصف"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "طلبات الشراء"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "تاريخ الإنتهاء"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "منتجات للشراء"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "تاريخ الأمر"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "مرجع الطلب"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "وحدة القياس للمنتج"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "تاريخ الطلب"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "لطلبات الشراء"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "طلب الموعد النهائي"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "المدير"
-
 #~ msgid "In Progress"
 #~ msgstr "قيد التقدم"
 
diff --git a/addons/purchase_requisition/i18n/bg.po b/addons/purchase_requisition/i18n/bg.po
index 23ae023ed54..1fbe3111c34 100644
--- a/addons/purchase_requisition/i18n/bg.po
+++ b/addons/purchase_requisition/i18n/bg.po
@@ -7,127 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-27 17:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Групиране по..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Доставчик"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Детайли за продукт"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
+msgid "Request a Quotation"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Фирма"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Нареждане за покупка"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Грешка!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Продукти"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Отказан"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Подробности за запитване"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Отпратка"
-
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
 msgid "Multiple Requisitions"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Пращане в проект"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -149,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Отговорник"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Групиране по..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -160,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Доставчик"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -170,6 +100,16 @@ msgstr "Склад"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Детайли за продукт"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "К-во"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -189,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Продукт"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Оферти"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -206,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr ""
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Отпратка към поръчка"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Дата на поръчка"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Снабдаване"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Начална дата"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Пращане в проект"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -298,15 +206,65 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Отпратка към поръчка"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Подробности за запитване"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Крайна дата"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -320,14 +278,51 @@ msgstr ""
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Дата на поръчка"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Откажи поръчка"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Нареждане за покупка"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Грешка!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
 msgstr ""
 
 #. module: purchase_requisition
@@ -337,51 +332,134 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Оферти"
+msgid "Products"
+msgstr "Продукти"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
+msgid "Order Date"
+msgstr "Дата на поръчка"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Отказан"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Отпратка"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Снабдаване"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr ""
 
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
-msgid "Qty"
-msgstr "К-во"
+msgid "Product UoM"
+msgstr "Мерни единици на продукт"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
+#: code:addons/purchase_requisition/purchase_requisition.py:134
 #, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+msgid "Warning!"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
 msgstr ""
 
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr "Отказ"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Начална дата"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned"
 msgstr "Незаето"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Отказ"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr ""
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -395,120 +473,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Поръчки за покупки"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Отговорник"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Продукт"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Крайна дата"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Дата на поръчка"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Мерни единици на продукт"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #~ msgid "In Progress"
 #~ msgstr "В развитие"
 
diff --git a/addons/purchase_requisition/i18n/ca.po b/addons/purchase_requisition/i18n/ca.po
index 37d20ac306a..9f6c2b7b9e8 100644
--- a/addons/purchase_requisition/i18n/ca.po
+++ b/addons/purchase_requisition/i18n/ca.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-17 21:52+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Agrupa per..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Proveïdor"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detall del producte"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Sol·licitud de compra (exclusiva): En la confirmació d'una comanda de "
-"compra, cancel·la les restants comandes de compra.\n"
-"Sol·licitud de compra (múltiple): Permet tenir diverses comandes de compra. "
-"En la confirmació d'una comanda de compra no cancel·la la resta de comandes."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Companyia"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Ja heu demanat un% s de compra d'aquest empresa, heu de cancel·lar l'ordre "
-"de compra per crear una nova cotització."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Quantitat"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Comanda de compra"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Error!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Productes"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Cancel·lat"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detall del pressupost"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipus de sol·licitud"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referència"
+msgid "Request a Quotation"
+msgstr "Sol·licita un pressupost"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Sol·licituds múltiples"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Inicialitza a esborrany"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -155,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupa per..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -166,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magatzem"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Proveïdor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -176,6 +100,16 @@ msgstr "Magatzem"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detall del producte"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Quant."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -195,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr "Sol·licitud de compra"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Línia sol·licitud de compra"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Producte"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Pressuposts"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crea pressupost"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -212,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Aprovat pel proveïdor"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referència de la comanda"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Data comanda"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Proveïment"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Requisició"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Proveïdor de sol·licitud de compra"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Comanda de compra"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Sol·licitud de compra (exclusiva)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirma comanda de compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Data d'inici"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Inicialitza a esborrany"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -304,15 +206,67 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referència de la comanda"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Sol·licituds de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detall del pressupost"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Ja heu demanat un% s de compra d'aquest empresa, heu de cancel·lar l'ordre "
+"de compra per crear una nova cotització."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data de finalització"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referència de sol·licitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Productes a comprar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -326,16 +280,57 @@ msgstr "Cerca sol·licitud de compra"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data comanda"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Sol·licitud de compra (exclusiva): En la confirmació d'una comanda de "
+"compra, cancel·la les restants comandes de compra.\n"
+"Sol·licitud de compra (múltiple): Permet tenir diverses comandes de compra. "
+"En la confirmació d'una comanda de compra no cancel·la la resta de comandes."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Cancel·la comanda de compra"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Comanda de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipus de sol·licitud"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -343,40 +338,124 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Pressuposts"
+msgid "Products"
+msgstr "Productes"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Sol·licita un pressupost"
+msgid "Order Date"
+msgstr "Data comanda"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancel·lat"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Proveïdor de sol·licitud de compra"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Compra per a sol·licituds"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Comanda de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Data límit de sol·licitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referència"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Proveïment"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magatzem"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Última sol·licitud"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Quant."
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
 msgstr ""
 
 #. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Sol·licitud de compra (exclusiva)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "UdM de producte"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirma comanda de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Crea pressupost"
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data de sol·licitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data d'inici"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -384,10 +463,9 @@ msgid "Unassigned"
 msgstr "Sense assignar"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Cancel·la"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Requisició"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -401,120 +479,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Comandes de compra"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Línia sol·licitud de compra"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Producte"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descripció"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Sol·licituds de compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Data de finalització"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Productes a comprar"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Data comanda"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Referència de sol·licitud"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UdM de producte"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Data de sol·licitud"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Compra per a sol·licituds"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Data límit de sol·licitud"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #, python-format
 #~ msgid "No Product in Tender"
 #~ msgstr "No hi ha producte en la licitació"
diff --git a/addons/purchase_requisition/i18n/da.po b/addons/purchase_requisition/i18n/da.po
index 8e2a328e16e..d505b7155e5 100644
--- a/addons/purchase_requisition/i18n/da.po
+++ b/addons/purchase_requisition/i18n/da.po
@@ -7,111 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr ""
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
+msgid "Request a Quotation"
 msgstr ""
 
 #. module: purchase_requisition
@@ -120,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -149,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -160,8 +84,14 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
 msgstr ""
 
 #. module: purchase_requisition
@@ -170,6 +100,16 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr ""
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -189,93 +129,24 @@ msgid "Purchase Requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
 msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
+msgid "Purchase Orders with requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
+msgid "Quotations"
 msgstr ""
 
 #. module: purchase_requisition
@@ -284,8 +155,45 @@ msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
 msgstr ""
 
 #. module: purchase_requisition
@@ -298,146 +206,19 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr ""
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Search Purchase Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "No Product in Tender."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "New Purchase Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:procurement.order,requisition_id:0
-msgid "Latest Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:product.product,purchase_requisition:0
-msgid ""
-"Check this box to generates purchase requisition instead of generating "
-"requests for quotation from procurement."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
 msgstr ""
 
 #. module: purchase_requisition
@@ -451,32 +232,214 @@ msgstr ""
 msgid "Purchase Requisitions"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr ""
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
 msgstr ""
 
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "No Product in Tender."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product UoM"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr ""
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
@@ -484,27 +447,28 @@ msgid "Requisition Date"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
+#: view:purchase.requisition:0
+msgid "Start Date"
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
+#: view:purchase.requisition:0
+msgid "Unassigned"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
+#: view:purchase.order:0
+msgid "Requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box to generates purchase requisition instead of generating "
+"requests for quotation from procurement."
 msgstr ""
 
 #. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
 msgstr ""
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index 0aefac06386..f5d7f159890 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -7,120 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 19:19+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Lieferant"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Produkte Details"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Bestellmeldung (Exklusiv): Bei Bestätigung einer Bestellung, werden "
-"automatisch verbleibende Angebote gelöscht.\n"
-"Bestellmeldung (Multiple): Ermöglicht mehrere Bestellungen für einen "
-"gemeldeten Bedarf. Bei Bestätigung einer Bestellung verbleiben die "
-"bestehenden Angebote im System"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Ungelesene Mitteilungen"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Benachrichtigung erfordert handeln"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"SIe haben bereits eine %s Bestellung für diesen Partner erstellt, diese "
-"sollte zuerst gelöscht werden, bevor eine neue Angebotsanfrage vorgenommen "
-"werden kann."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Menge"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Mitteilungen"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Bestellung"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produkte"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Angebotsanfrage Details"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Bestellmeldung Typ"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referenz"
+msgid "Request a Quotation"
+msgstr "Anfrage eines Angebots"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -128,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "Multiple Bestellmeldung"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Zurücksetzen auf Entwurf"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "Warnung!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "Produkt Einheit"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -171,10 +65,32 @@ msgstr ""
 "        "
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Referenzbeleg"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Verantwortlich"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "An Lieferanten senden"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Gruppierung..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "Bestellung erledigt"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -182,9 +98,15 @@ msgid "Followers"
 msgstr "Followers"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Bestellmeldung in Verhandlung"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Lieferant"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -192,6 +114,16 @@ msgstr "Lager"
 msgid "New"
 msgstr "Neu"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Produkte Details"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Anzahl"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -211,97 +143,25 @@ msgid "Purchase Requisition"
 msgstr "Bestellmeldung"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "An Lieferanten senden"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Hier finden Sie die Nachrichtenübersicht (Anzahl Nachrichten etc., ...) im "
-"html Format, um über dieses Format dann später in einer Kanban Ansicht "
-"weiterzuarbeiten."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Auftrag vom Lieferanten bestätigt"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "An Lieferanten senden"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referenz Bestellung"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Bestelldatum"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Beschaffung"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Bestellmeldung Positionen"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Bestellmeldung"
+msgid "Purchase Orders with requisition"
+msgstr "Einkauf durch Bestellmeldung"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr "Bestellmeldung wurde <b>erstellt</b"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Bestellmeldung Lieferant"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Bestellungen"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Bestellmeldung (Exklusiv)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Bestätige Bestellung"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Start Datum"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "oder"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "Produkt Einheit"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Status"
+msgid "Quotations"
+msgstr "Angebote"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -309,9 +169,46 @@ msgid "Terms and Conditions"
 msgstr "Bedingungen und Konditionen"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Einkauf durch Bestellmeldung"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Ungelesene Mitteilungen"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Erfasse Angebot"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Nachrichten und Kommunikations-Historie"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Auftrag vom Lieferanten bestätigt"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "oder"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Zurücksetzen auf Entwurf"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -323,16 +220,69 @@ msgstr "Aktuelle Bestellmeldungen"
 msgid "User"
 msgstr "Benutzer"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referenz Bestellung"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Ist bereits Follower"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "nicht zugeteilte Bestellmeldungen"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Bestellmeldungen"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Angebotsanfrage Details"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"SIe haben bereits eine %s Bestellung für diesen Partner erstellt, diese "
+"sollte zuerst gelöscht werden, bevor eine neue Angebotsanfrage vorgenommen "
+"werden kann."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Ende Datum"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Bestellmeldung Referenz"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Zu bestellende Produkte"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "An Lieferanten senden"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -345,15 +295,57 @@ msgstr "Suche Bestellmeldung"
 msgid "No Product in Tender."
 msgstr "Kein Produkt in Angebotsanfrage"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Bestellung Datum"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Mitteilungen"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Bestellmeldung (Exklusiv): Bei Bestätigung einer Bestellung, werden "
+"automatisch verbleibende Angebote gelöscht.\n"
+"Bestellmeldung (Multiple): Ermöglicht mehrere Bestellungen für einen "
+"gemeldeten Bedarf. Bei Bestätigung einer Bestellung verbleiben die "
+"bestehenden Angebote im System"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Storniere Bestellung"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Bestellung"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Referenzbeleg"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Fehler!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Bestellmeldung Typ"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -362,40 +354,127 @@ msgstr "Neue Bestellmeldung"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Angebote"
+msgid "Products"
+msgstr "Produkte"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Anfrage eines Angebots"
+msgid "Order Date"
+msgstr "Bestelldatum"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr "Bestellmeldung wurde <b>abgebrochen</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Bestellmeldung Lieferant"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Benachrichtigung erfordert handeln"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Bedarfsmeldung für Beschaffung"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Bestellungen"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Bestellmeldung Fristablauf"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referenz"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Beschaffung"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Referenzbeleg"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Letzte Bestellmeldung"
 
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Einkaufsmanager"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Bestellmeldung (Exklusiv)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Hier finden Sie die Nachrichtenübersicht (Anzahl Nachrichten etc., ...) im "
+"html Format, um über dieses Format dann später in einer Kanban Ansicht "
+"weiterzuarbeiten."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Anzahl"
+msgid "Product UoM"
+msgstr "Produkt Einheit"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
+#: code:addons/purchase_requisition/purchase_requisition.py:134
 #, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr "Entwurf Bestellmeldung wurde <b>an Lieferanten</b> gesendet."
+msgid "Warning!"
+msgstr "Warnung!"
 
 #. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Bestätige Bestellung"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Erfasse Angebot"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Datum Bestellmeldung"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Start Datum"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -403,10 +482,9 @@ msgid "Unassigned"
 msgstr "Nicht zugewiesen"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Abbrechen"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Bestellmeldung"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -422,120 +500,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Bestellungen"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Referenzbeleg"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Verantwortlich"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "Bestellung erledigt"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Bestellmeldung in Verhandlung"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Bestellmeldung Positionen"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr "Bestellmeldung wurde erstellt im Status <b>Entwurf</b>."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "nicht zugeteilte Bestellmeldungen"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Bestellmeldungen"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Ende Datum"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Zu bestellende Produkte"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Bestellung Datum"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Bestellmeldung Referenz"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Produkt Einheit"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Datum Bestellmeldung"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Nachrichten und Kommunikations-Historie"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Bedarfsmeldung für Beschaffung"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Bestellmeldung Fristablauf"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr "Bestellmeldung wurde <b>erledigt</b>."
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Einkaufsmanager"
-
 #~ msgid "In Progress"
 #~ msgstr "In Bearbeitung"
 
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index 05d66d539c8..013c827939c 100644
--- a/addons/purchase_requisition/i18n/es.po
+++ b/addons/purchase_requisition/i18n/es.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 18:41+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detalle del producto"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Solicitud de compra (exclusiva): En la confirmación de un pedido de compra, "
-"cancela los restantes pedidos de compra.\n"
-"Solicitud de compra (múltiple): Permite tener varios pedidos de compra. En "
-"la confirmación de un pedido de compra no cancela el resto de pedidos."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensajes sin leer"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Tiene ya un pedido de compra %s para esta empresa. Debe cancelar este pedido "
-"de compra para crear un nuevo presupuesto."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Pedido de compra"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Productos"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detalle del presupuesto"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipo de solicitud"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referencia"
+msgid "Request a Quotation"
+msgstr "Solicitar un presupuesto"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "Solicitudes múltiples"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "Unidad de medida del producto"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -165,10 +61,32 @@ msgstr ""
 "        "
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Origen"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "Enviar a los proveedores"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "Compra realizada"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -176,9 +94,15 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Solicitud de compra en negociación"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Proveedor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -186,6 +110,16 @@ msgstr "Almacén"
 msgid "New"
 msgstr "Nuevo"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalle del producto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Ctd."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -205,96 +139,25 @@ msgid "Purchase Requisition"
 msgstr "Solicitud de compra"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "Enviar a los proveedores"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
-"directamente en formato HTML para poder ser insertado en las vistas kanban."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Aprobado por proveedor"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "Enviar a los proveedores"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referencia pedido"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Abastecimiento"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Línea solicitud de compra"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Solicitud"
+msgid "Purchase Orders with requisition"
+msgstr "Pedidos de compra con solicitud"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr "La solicitud de compra ha sido <b>creada</b>."
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Proveedor de solicitud de compra"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Pedidos de compra"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Solicitud de compra (exclusiva)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmar pedido de compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "o"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "Unidad de medida del producto"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Estado"
+msgid "Quotations"
+msgstr "Presupuestos"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -302,9 +165,46 @@ msgid "Terms and Conditions"
 msgstr "Términos y condiciones"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Pedidos de compra con solicitud"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crear presupuesto"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Mensajes e historial de comunicación"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Aprobado por proveedor"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "o"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -316,16 +216,68 @@ msgstr "Solicitudes de compra actuales"
 msgid "User"
 msgstr "Usuario"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referencia pedido"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Es un seguidor"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Solicitudes sin asignar"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Solicitudes de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalle del presupuesto"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Tiene ya un pedido de compra %s para esta empresa. Debe cancelar este pedido "
+"de compra para crear un nuevo presupuesto."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referencia de solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Productos a comprar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "Enviar a los proveedores"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -338,15 +290,56 @@ msgstr "Buscar solicitud de compra"
 msgid "No Product in Tender."
 msgstr "Ningún artículo en la licitación."
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Fecha pedido"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Solicitud de compra (exclusiva): En la confirmación de un pedido de compra, "
+"cancela los restantes pedidos de compra.\n"
+"Solicitud de compra (múltiple): Permite tener varios pedidos de compra. En "
+"la confirmación de un pedido de compra no cancela el resto de pedidos."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Cancelar pedido de compra"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo de solicitud"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -355,40 +348,126 @@ msgstr "Nueva solicitud de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Presupuestos"
+msgid "Products"
+msgstr "Productos"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Solicitar un presupuesto"
+msgid "Order Date"
+msgstr "Fecha pedido"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr "La solicitud de compra ha sido <b>cancelada</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Proveedor de solicitud de compra"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Compra para solicitudes"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Fecha límite de solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Origen"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Última solicitud"
 
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Solicitud de compra (exclusiva)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
+"directamente en formato HTML para poder ser insertado en las vistas kanban."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Ctd."
+msgid "Product UoM"
+msgstr "UdM de producto"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
+#: code:addons/purchase_requisition/purchase_requisition.py:134
 #, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr "La solicitud borrador ha sido <b>enviada a los proveedores</b>."
+msgid "Warning!"
+msgstr "¡Advertencia!"
 
 #. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar pedido de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Crear presupuesto"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Fecha de solicitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Fecha inicio"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -396,10 +475,9 @@ msgid "Unassigned"
 msgstr "No asignado"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Solicitud"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -415,120 +493,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Pedidos de compra"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "Compra realizada"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Solicitud de compra en negociación"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Línea solicitud de compra"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr "La solicitud de compra se ha establecido como <b>borrador</b>."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Solicitudes sin asignar"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Solicitudes de compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Productos a comprar"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Fecha pedido"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Referencia de solicitud"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UdM de producto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Fecha de solicitud"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Mensajes e historial de comunicación"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Compra para solicitudes"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Fecha límite de solicitud"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr "La solicitud de compra ha sido <b>realizada</b>."
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Responsable"
-
 #~ msgid "In Progress"
 #~ msgstr "En proceso"
 
diff --git a/addons/purchase_requisition/i18n/es_CR.po b/addons/purchase_requisition/i18n/es_CR.po
index ab7b74d3919..c451ac2511a 100644
--- a/addons/purchase_requisition/i18n/es_CR.po
+++ b/addons/purchase_requisition/i18n/es_CR.po
@@ -7,119 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:03+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detalle del producto"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Solicitud de compra (exclusiva): En la confirmación de un pedido de compra, "
-"cancela los restantes pedidos de compra.\n"
-"Solicitud de compra (múltiple): Permite tener varios pedidos de compra. En "
-"la confirmación de un pedido de compra no cancela el resto de pedidos."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Usted tiene ya una orden de compra de% s para esta pareja, que debe cancelar "
-"esta orden de compra para crear una nueva cotización."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Pedido de compra"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Productos"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detalle del presupuesto"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipo de solicitud"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referencia"
+msgid "Request a Quotation"
+msgstr "Solicitar un presupuesto"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -127,14 +29,8 @@ msgid "Multiple Requisitions"
 msgstr "Solicitudes múltiples"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -156,9 +52,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -167,9 +85,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Solicitud de compra en la negociación"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Proveedor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -177,6 +101,16 @@ msgstr "Almacén"
 msgid "New"
 msgstr "Nuevo"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalle del producto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Ctd."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -195,17 +129,57 @@ msgstr "Tipo"
 msgid "Purchase Requisition"
 msgstr "Solicitud de compra"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Línea solicitud de compra"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "Ordenes de compra con la solicitud"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crear presupuesto"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -213,87 +187,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Aprobado por proveedor"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referencia pedido"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Solicitud"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Proveedor de solicitud de compra"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Pedidos de compra"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Solicitud de compra (exclusiva)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmar pedido de compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Ordenes de compra con la solicitud"
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -305,15 +207,67 @@ msgstr "Solicitud de compra actual"
 msgid "User"
 msgstr "Usuario"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referencia pedido"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Requisición sin asignar"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Solicitudes de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalle del presupuesto"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Usted tiene ya una orden de compra de% s para esta pareja, que debe cancelar "
+"esta orden de compra para crear una nueva cotización."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referencia de solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Productos a comprar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -327,16 +281,57 @@ msgstr "Buscar solicitud de compra"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Fecha pedido"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Solicitud de compra (exclusiva): En la confirmación de un pedido de compra, "
+"cancela los restantes pedidos de compra.\n"
+"Solicitud de compra (múltiple): Permite tener varios pedidos de compra. En "
+"la confirmación de un pedido de compra no cancela el resto de pedidos."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Cancelar pedido de compra"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo de solicitud"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -344,40 +339,124 @@ msgstr "Nueva solicitud de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Presupuestos"
+msgid "Products"
+msgstr "Productos"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Solicitar un presupuesto"
+msgid "Order Date"
+msgstr "Fecha pedido"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Proveedor de solicitud de compra"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Compra para solicitudes"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Fecha límite de solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Última solicitud"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Ctd."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Director"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Solicitud de compra (exclusiva)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "UdM de producto"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar pedido de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Crear presupuesto"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Fecha de solicitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Fecha inicio"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -385,10 +464,9 @@ msgid "Unassigned"
 msgstr "No asignado"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Solicitud"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -402,120 +480,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Pedidos de compra"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Solicitud de compra en la negociación"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Línea solicitud de compra"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Requisición sin asignar"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Solicitudes de compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Productos a comprar"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Fecha pedido"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Referencia de solicitud"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UdM de producto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Fecha de solicitud"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Compra para solicitudes"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Fecha límite de solicitud"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Director"
-
 #~ msgid "In Progress"
 #~ msgstr "En proceso"
 
diff --git a/addons/purchase_requisition/i18n/fi.po b/addons/purchase_requisition/i18n/fi.po
index 67bbe06e114..4c1b756a463 100644
--- a/addons/purchase_requisition/i18n/fi.po
+++ b/addons/purchase_requisition/i18n/fi.po
@@ -7,112 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-20 09:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Toimittaja"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Tuotteen yksityiskohdat"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Yritys"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Määrä"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Ostotilaus"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Virhe!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Tuotteet"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Peruttu"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Tarjouspyynnön yksityiskohdat"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Pyynnön tyyppi"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Viite"
+msgid "Request a Quotation"
+msgstr "Pyydä tarjousta"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -120,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Useita pyyntöjä"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Palauta luonnokseksi"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -149,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Vastuuhenkilö"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -160,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Varasto"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Ostotilauspyyntö neuvottelussa"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Toimittaja"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -170,6 +100,16 @@ msgstr "Varasto"
 msgid "New"
 msgstr "Uusi"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Tuotteen yksityiskohdat"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Määrä"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -188,17 +128,57 @@ msgstr "Tyyppi"
 msgid "Purchase Requisition"
 msgstr "Ostotilauspyyntö"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Ostotilauspyynnön rivi"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "Ostotilaukset joilla pyyntöjä"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "Tarjoukset"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Luo tarjous"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -206,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Toimittajan vahvistama"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Tilauksen viite"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Tilauksen päivämäärä"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Hankinta"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Pyyntö"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Ostotilauspyynnön kumppani"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Ostotilaukset"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Ostotilauspyyntö (poissulkeva)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Vahvista ostotilaus"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Alkupäivä"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Ostotilaukset joilla pyyntöjä"
+msgid "Reset to Draft"
+msgstr "Palauta luonnokseksi"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -298,15 +206,65 @@ msgstr "Nykyinen ostotilauspyyntö"
 msgid "User"
 msgstr "Käyttäjä"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Tilauksen viite"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Kohdistamaton pyyntö"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Hankintapyynnöt"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Tarjouspyynnön yksityiskohdat"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Loppupvm"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Pyynnön viite"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Ostettavat tuotteet"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -320,16 +278,53 @@ msgstr "Hae ostotilausehdotusta"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Tilauspäivämäärä"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Peru ostotilaus"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ostotilaus"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Virhe!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Pyynnön tyyppi"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -337,40 +332,124 @@ msgstr "Uusi ostotilauspyyntö"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Tarjoukset"
+msgid "Products"
+msgstr "Tuotteet"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Pyydä tarjousta"
+msgid "Order Date"
+msgstr "Tilauksen päivämäärä"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Ostotilauspyynnön kumppani"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Osta pyynnöille"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Ostotilaukset"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Pyynnön takaraja (päivä)"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Viite"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Hankinta"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Viimeisin pyyntö"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Määrä"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Päällikkö"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Ostotilauspyyntö (poissulkeva)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "Tuotteen mittayksikkö"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Vahvista ostotilaus"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Luo tarjous"
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Pyynnön päivä"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Alkupäivä"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -378,10 +457,9 @@ msgid "Unassigned"
 msgstr "Liittämätön"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Peruuta"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Pyyntö"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -395,120 +473,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Ostotilaukset"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Vastuuhenkilö"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Ostotilauspyyntö neuvottelussa"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Ostotilauspyynnön rivi"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Tuote"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Kuvaus"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Kohdistamaton pyyntö"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Hankintapyynnöt"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Loppupvm"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Ostettavat tuotteet"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Tilauspäivämäärä"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Pyynnön viite"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Tuotteen mittayksikkö"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Pyynnön päivä"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Osta pyynnöille"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Pyynnön takaraja (päivä)"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Päällikkö"
-
 #~ msgid "In Progress"
 #~ msgstr "Käynnissä"
 
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index 4207fd1edf3..2bdc87843d5 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.po
@@ -7,119 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-16 15:15+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Regrouper par..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Fournisseur"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Détail du produit"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Appel d'offres (exclusif) : au moment de la confirmation d'un bon de "
-"commande, les autres seront annulés.\n"
-"Appel d'offres  (multiple) : cela permet d'avoir plusieurs bons de "
-"commandes. Au moment de la confirmation d'un bon, les autres ne seront pas "
-"annulés."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Société"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Il existe déjà une commande %s pour ce partenaire, vous devez annuler cette "
-"commande avant de faire un nouveau devis."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Quantité"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Bon de commande"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Erreur!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produits"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Annulé"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Détail du devis"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Type d'appel d'offres"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Référence"
+msgid "Request a Quotation"
+msgstr "Demander un prix"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -127,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Appel d'offres (multiple)"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Revenir à l'état \"Brouillon\""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -156,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Regrouper par..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -167,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Entrepôt"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Fournisseur"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -177,6 +100,16 @@ msgstr "Entrepôt"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Détail du produit"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Qté"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -196,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr "Appel d'offres"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Ligne de l'appel d'offre"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Devis"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Céer un devis"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -213,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Approuvée par le fournisseur"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Référence de la commande"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Date de commande"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Approvisionnement"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Appel d'offres"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Partenaires associés à l'appel d'offres"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Bons de commande"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Appel d'offres (exclusif)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmer le bon de commande"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Date de début"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Revenir à l'état \"Brouillon\""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -305,15 +206,67 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Référence de la commande"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantité"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Appels d'offres"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Détail du devis"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Il existe déjà une commande %s pour ce partenaire, vous devez annuler cette "
+"commande avant de faire un nouveau devis."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Date de fin"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Référence de l'appel d'offres"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produits à acheter"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -327,16 +280,58 @@ msgstr "Chercher un appel d'offres"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Date de commande"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Appel d'offres (exclusif) : au moment de la confirmation d'un bon de "
+"commande, les autres seront annulés.\n"
+"Appel d'offres  (multiple) : cela permet d'avoir plusieurs bons de "
+"commandes. Au moment de la confirmation d'un bon, les autres ne seront pas "
+"annulés."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Annuler le bon de commande"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Erreur!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Type d'appel d'offres"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -344,40 +339,124 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Devis"
+msgid "Products"
+msgstr "Produits"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Demander un prix"
+msgid "Order Date"
+msgstr "Date de commande"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Annulé"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partenaires associés à l'appel d'offres"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Appels d'offre"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Bons de commande"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Date d'échéance de l'appel d'offres"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Référence"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Approvisionnement"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Entrepôt"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Dernièr appel d'offres"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Qté"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
 msgstr ""
 
 #. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Appel d'offres (exclusif)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "UdM du produit"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmer le bon de commande"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Céer un devis"
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Date de demande"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Date de début"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -385,10 +464,9 @@ msgid "Unassigned"
 msgstr "Non assigné"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Annuler"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Appel d'offres"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -402,120 +480,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Bon de commande"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Ligne de l'appel d'offre"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produit"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Description"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Appels d'offres"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Date de fin"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Produits à acheter"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Date de commande"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Référence de l'appel d'offres"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UdM du produit"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Date de demande"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Appels d'offre"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Date d'échéance de l'appel d'offres"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #~ msgid "State"
 #~ msgstr "État"
 
diff --git a/addons/purchase_requisition/i18n/hr.po b/addons/purchase_requisition/i18n/hr.po
index f4a779412ab..38f4f024079 100644
--- a/addons/purchase_requisition/i18n/hr.po
+++ b/addons/purchase_requisition/i18n/hr.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-30 20:17+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Grupiraj po..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Dobavljač"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detalji artikla"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Zahtjev u nabavi (ekskluzivni):  Prilikom potvrde nabavnog naloga , "
-"poništava preostale nabavne naloge.\n"
-"Zahtjevi u nabavi(Višestruki):  Omogućuje više nabavnih naloga. Prilikom "
-"potvrde nabavnog naloga ne poništava preostale naloge."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Organizacija"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Već imate jedan %s nabavni nalog za tog partnera. Morate poništiti ovaj "
-"nabavni nalog kako bi kreirali novi upit."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Nalog za nabavu"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Greška!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Artikli"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detalji upita"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Vrsta zahtjeva"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Vezna oznaka"
+msgid "Request a Quotation"
+msgstr "Upit"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Višestruki zahtjevi"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Vrati u nacrt"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -155,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -166,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Zahtjevnice u pregovorima"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Dobavljač"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -176,6 +100,16 @@ msgstr "Skladište"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalji artikla"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Kol."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -194,17 +128,57 @@ msgstr "Vrsta"
 msgid "Purchase Requisition"
 msgstr "Zahtjev za nabavom"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Stavka zahtjeva za nabavom"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "Nalozi sa zahjtjevnicama"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Artikl"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "Upiti"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Kreiraj upit"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -212,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Odobrio dobavljač"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Oznaka narudžbe"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Datum naloga"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Nabava"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Zahtjevnica"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Partner za zahtjev u nabavi"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Nalozi u nabavi"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Zahtjev u nabavi (ekskluzivan)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Potvrdi nabavni nalog"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Početni datum"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Nalozi sa zahjtjevnicama"
+msgid "Reset to Draft"
+msgstr "Vrati u nacrt"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -304,15 +206,67 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Oznaka narudžbe"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Zahtjevi u nabavi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalji upita"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Već imate jedan %s nabavni nalog za tog partnera. Morate poništiti ovaj "
+"nabavni nalog kako bi kreirali novi upit."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Završni datum"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Oznaka zahtjeva"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Artikli za nabavu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -326,16 +280,57 @@ msgstr "Pretraži zahtjeve u nabavi"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Zahtjev u nabavi (ekskluzivni):  Prilikom potvrde nabavnog naloga , "
+"poništava preostale nabavne naloge.\n"
+"Zahtjevi u nabavi(Višestruki):  Omogućuje više nabavnih naloga. Prilikom "
+"potvrde nabavnog naloga ne poništava preostale naloge."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Poništi nabavni nalog"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Nalog za nabavu"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Vrsta zahtjeva"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -343,40 +338,124 @@ msgstr "Novi zahtjev za nabavom"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Upiti"
+msgid "Products"
+msgstr "Artikli"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Upit"
+msgid "Order Date"
+msgstr "Datum naloga"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner za zahtjev u nabavi"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Nabava za zahtjeve"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Nalozi u nabavi"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Konačan rok zahtjeva"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Vezna oznaka"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Zadnji zahtjev"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Kol."
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
 msgstr ""
 
 #. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Zahtjev u nabavi (ekskluzivan)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "JM proizvoda"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Potvrdi nabavni nalog"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Kreiraj upit"
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Datum zahtjeva"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Početni datum"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -384,10 +463,9 @@ msgid "Unassigned"
 msgstr "Nedodjeljen"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Odustani"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Zahtjevnica"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -401,120 +479,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Nalozi u nabavi"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Odgovoran"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Zahtjevnice u pregovorima"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Stavka zahtjeva za nabavom"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Artikl"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Zahtjevi u nabavi"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Završni datum"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Artikli za nabavu"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Datum narudžbe"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Oznaka zahtjeva"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "JM proizvoda"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Datum zahtjeva"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Nabava za zahtjeve"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Konačan rok zahtjeva"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #~ msgid "In Progress"
 #~ msgstr "U tijeku"
 
diff --git a/addons/purchase_requisition/i18n/hu.po b/addons/purchase_requisition/i18n/hu.po
index 40c1533d6e1..544fc8dbcda 100644
--- a/addons/purchase_requisition/i18n/hu.po
+++ b/addons/purchase_requisition/i18n/hu.po
@@ -6,117 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-31 20:01+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Szállító"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Termék részletei"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Exkluzív igénylés:  Egy szállítói megrendelés megerősítésekor megszakítja a "
-"többi szállítói megrendelést.\n"
-"Többszörös igénylés:  Lehetővé teszi több szállítói megrendelés "
-"létrehozását. Egy szállítói megrendelés megerősítésekor nem szakítja meg a "
-"többi megrendelést."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Vállalat"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Mennyiség"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Szállítói megrendelés"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Hiba!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Termékek"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Megszakítva"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Árajánlat részletei"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Igénylés típusa"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Hivatkozás"
+msgid "Request a Quotation"
+msgstr "Árajánlat kérése"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -124,14 +27,8 @@ msgid "Multiple Requisitions"
 msgstr "Többszörös igénylés"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Visszaállítás tervezet állapotba"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -153,9 +50,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Felelős"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Csoportosítás..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -164,9 +83,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Raktár"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Szállító"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -174,6 +99,16 @@ msgstr "Raktár"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Termék részletei"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Mennyiség"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -193,16 +128,56 @@ msgid "Purchase Requisition"
 msgstr "Beszerzési igénylés"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Beszerzési igénylési sor"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Termék"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Árajánlatok"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Leírás"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Vállalat"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Árajánlat létrehozása"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -210,87 +185,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Szállító által jóváhagyva"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Megrendelés hivatkozása"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Megrendelés dátuma"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Beszerzés"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Igénylés"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Beszerzési igénylési partner"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Szállítói megrendelések"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Exkluzív Igénylés"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Szállítói megrendelés megerősítése"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Kezdési dátum"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Visszaállítás tervezet állapotba"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -302,15 +205,65 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Megrendelés hivatkozása"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Mennyiség"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Beszerzési igénylések"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Árajánlat részletei"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Befejezési dátum"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Igénylés hivatkozása"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Beszerzésre váró termékek"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -324,16 +277,58 @@ msgstr "Beszerzési Igénylés keresése"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Megrendelés dátuma"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Exkluzív igénylés:  Egy szállítói megrendelés megerősítésekor megszakítja a "
+"többi szállítói megrendelést.\n"
+"Többszörös igénylés:  Lehetővé teszi több szállítói megrendelés "
+"létrehozását. Egy szállítói megrendelés megerősítésekor nem szakítja meg a "
+"többi megrendelést."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Szállítói megrendelés megszakítása"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Szállítói megrendelés"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Hiba!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Igénylés típusa"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -341,40 +336,124 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Árajánlatok"
+msgid "Products"
+msgstr "Termékek"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Árajánlat kérése"
+msgid "Order Date"
+msgstr "Megrendelés dátuma"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Megszakítva"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Beszerzési igénylési partner"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Beszerzés az igénylésekre"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Szállítói megrendelések"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Igénylési határidő"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Hivatkozás"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Beszerzés"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Raktár"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Legújabb igénylés"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Mennyiség"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
 msgstr ""
 
 #. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Exkluzív Igénylés"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "Termék ME"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Szállítói megrendelés megerősítése"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Árajánlat létrehozása"
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Igénylés dátuma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Kezdési dátum"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -382,10 +461,9 @@ msgid "Unassigned"
 msgstr "Nem hozzárendelt"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Mégsem"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Igénylés"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -399,120 +477,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Szállítói megrendelések"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Felelős"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Beszerzési igénylési sor"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Termék"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Leírás"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Beszerzési igénylések"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Befejezési dátum"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Beszerzésre váró termékek"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Megrendelés dátuma"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Igénylés hivatkozása"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Termék ME"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Igénylés dátuma"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Beszerzés az igénylésekre"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Igénylési határidő"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #~ msgid "State"
 #~ msgstr "Állapot"
 
diff --git a/addons/purchase_requisition/i18n/id.po b/addons/purchase_requisition/i18n/id.po
index 54008fb7b7d..8c316429c3a 100644
--- a/addons/purchase_requisition/i18n/id.po
+++ b/addons/purchase_requisition/i18n/id.po
@@ -7,117 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-23 05:56+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Dikelompokan berdasarkan ..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Pemasok"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detail Produk"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
+msgid "Request a Quotation"
 msgstr ""
-"Permintaan Pembelian (eksklusif): Pada konfirmasi order pembelian, itu "
-"membatalkan pesanan pembelian yang tersisa.\n"
-"Permintaan Pembelian (Multiple): Hal ini memungkinkan untuk memiliki "
-"beberapa orders.On konfirmasi pembelian dari suatu pesanan pembelian itu "
-"tidak membatalkan perintah yang tersisa"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Perusahaan"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Kuantitas"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Order Pembelian"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Ada Kesalahan !"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produk"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Dibatalkan"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Jenis permintaan"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referensi"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -125,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Kembalikan ke Konsep"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -154,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Yang Bertanggung Jawab"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Dikelompokan berdasarkan ..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -165,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Gudang"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Pemasok"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -175,6 +100,16 @@ msgstr "Gudang"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detail Produk"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Qty"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -194,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr "Permintaan Pembelian"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produk"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Penawaran"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Keterangan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Buat Penawaran"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -211,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Distujui oleh Pemasok"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referensi Order"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Tanggal Order"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Pengadaan"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Daftar Permintaan"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Order Pembelian"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Permintaan Pembelian (eksklusif)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Konfirmasi order pembelian"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Tanggal Mulai"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Kembalikan ke Konsep"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -303,15 +206,65 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referensi Order"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Kuantitas"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Pembelian Rekuisisi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Tanggal berakhir"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referensi Permintaan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produk untuk pembelian"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -325,16 +278,58 @@ msgstr ""
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Tanggal pemesanan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Permintaan Pembelian (eksklusif): Pada konfirmasi order pembelian, itu "
+"membatalkan pesanan pembelian yang tersisa.\n"
+"Permintaan Pembelian (Multiple): Hal ini memungkinkan untuk memiliki "
+"beberapa orders.On konfirmasi pembelian dari suatu pesanan pembelian itu "
+"tidak membatalkan perintah yang tersisa"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Order Pembelian di batalkan"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Order Pembelian"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Ada Kesalahan !"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Jenis permintaan"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -342,40 +337,124 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Penawaran"
+msgid "Products"
+msgstr "Produk"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
+msgid "Order Date"
+msgstr "Tanggal Order"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Dibatalkan"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Pembelian untuk Rekuisisi"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Order Pembelian"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Batas waktu permintaan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referensi"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Pengadaan"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Gudang"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Qty"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
 msgstr ""
 
 #. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Permintaan Pembelian (eksklusif)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "Produk UoM"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Konfirmasi order pembelian"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Buat Penawaran"
+msgid "Cancel"
+msgstr "Batal"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Tanggal permintaan"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Tanggal Mulai"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -383,10 +462,9 @@ msgid "Unassigned"
 msgstr "Tak ditugaskan"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Batal"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Daftar Permintaan"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -400,120 +478,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Order Pembelian"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Yang Bertanggung Jawab"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produk"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Keterangan"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Pembelian Rekuisisi"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Tanggal berakhir"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Produk untuk pembelian"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Tanggal pemesanan"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Referensi Permintaan"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Produk UoM"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Tanggal permintaan"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Pembelian untuk Rekuisisi"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Batas waktu permintaan"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #~ msgid "In Progress"
 #~ msgstr "Dalam Proses"
 
diff --git a/addons/purchase_requisition/i18n/it.po b/addons/purchase_requisition/i18n/it.po
index dd3571b9238..9a384611269 100644
--- a/addons/purchase_requisition/i18n/it.po
+++ b/addons/purchase_requisition/i18n/it.po
@@ -7,117 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 09:27+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Fornitore"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Dettaglio prodotto"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Richiesta d'acquisto(esclusiva): durante la conferma dell'ordine di acquisto "
-"cancella il rimanente ordine di acquisto.\n"
-"Richiesta d'acquisto(multipla): permette di avere diversi ordini di "
-"acquisto. Durante la conferma di un ordine di acquisto non cancella gli "
-"ordini rimanenti"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Azienda"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Quantità"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Ordine di Acquisto"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Errore!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Prodotti"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Annullato"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Dettaglio preventivo"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipo richiesta"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Riferimento"
+msgid "Request a Quotation"
+msgstr "Richiedi preventivo"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -125,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Più richieste"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Reimposta come bozza"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -154,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsabile"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -165,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazzino"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Fornitore"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -175,6 +100,16 @@ msgstr "Magazzino"
 msgid "New"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Dettaglio prodotto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Q.tà"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -194,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr "Richiesta d'acquisto"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Linea di richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Quotazioni"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descrizioni"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crea preventivo"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -211,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Approvato dal fornitore"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Riferimento ordine"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Data ordine"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Approvvigionamento"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Richiesta"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Partner richiesta ordine"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Ordini di acquisto"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Richiesta d'acquisto (esclusiva)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Conferma ordine di acquisto"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Data inizio"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Reimposta come bozza"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -303,15 +206,65 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Riferimento ordine"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Richieste di acquisto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Dettaglio preventivo"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data fine"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Riferimento richiesta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Prodotti da acquistare"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -325,16 +278,58 @@ msgstr "Cerca richieste d'acquisto"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data ordine"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Richiesta d'acquisto(esclusiva): durante la conferma dell'ordine di acquisto "
+"cancella il rimanente ordine di acquisto.\n"
+"Richiesta d'acquisto(multipla): permette di avere diversi ordini di "
+"acquisto. Durante la conferma di un ordine di acquisto non cancella gli "
+"ordini rimanenti"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Annulla Ordine d'Acquisto"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ordine di Acquisto"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Errore!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo richiesta"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -342,40 +337,124 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Quotazioni"
+msgid "Products"
+msgstr "Prodotti"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Richiedi preventivo"
+msgid "Order Date"
+msgstr "Data ordine"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Annullato"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner richiesta ordine"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Acquisto per richieste"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Ordini di acquisto"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Termine richiesta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Riferimento"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Approvvigionamento"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Ultima richiesta"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Q.tà"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
 msgstr ""
 
 #. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Richiesta d'acquisto (esclusiva)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "UoM prodotto"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Conferma ordine di acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Crea preventivo"
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data richiesta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data inizio"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -383,10 +462,9 @@ msgid "Unassigned"
 msgstr "Non assegnato"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Annulla"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Richiesta"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -400,120 +478,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Ordini di acquisto"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsabile"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Linea di richiesta d'acquisto"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descrizioni"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Richieste di acquisto"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Data fine"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Prodotti da acquistare"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Data ordine"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Riferimento richiesta"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UoM prodotto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Data richiesta"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Acquisto per richieste"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Termine richiesta"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr ""
-
 #~ msgid "In Progress"
 #~ msgstr "In progresso"
 
diff --git a/addons/purchase_requisition/i18n/ja.po b/addons/purchase_requisition/i18n/ja.po
index eecc9eaa0cf..8a5de1c0627 100644
--- a/addons/purchase_requisition/i18n/ja.po
+++ b/addons/purchase_requisition/i18n/ja.po
@@ -7,114 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 21:11+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "グループ化…"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "仕入先"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "製品詳細"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"発注要求書（排他）：発注オーダーの確認により、残りの発注オーダーをキャンセルします。\n"
-"発注要求書（複数）：複数の発注オーダーを持つことができます。発注オーダーの確認をしても、残りのオーダーはキャンセルされません。"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "会社"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr "このパートナに既に %s の発注オーダーを持っています、新しい見積を作成するためにはこの発注オーダーをキャンセルする必要があります。"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "数量"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "発注オーダー"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "エラー"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "製品"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "キャンセル済"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "見積詳細"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "要求書タイプ"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "参照"
+msgid "Request a Quotation"
+msgstr "見積要求"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -122,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "複数の要求書"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "ドラフトに再設定"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -151,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -162,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "倉庫"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "交渉での発注要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "仕入先"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -172,6 +100,16 @@ msgstr "倉庫"
 msgid "New"
 msgstr "新規"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "製品詳細"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "数量"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -190,17 +128,57 @@ msgstr "タイプ"
 msgid "Purchase Requisition"
 msgstr "発注要求書"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "発注要求書行"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "製品"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "見積"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "見積の作成"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -208,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "仕入先による承認"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "オーダー参照"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "オーダー日"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "調達"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "要求書"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "発注要求書パートナ"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "発注オーダー"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "発注要求書（排他）"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "発注オーダーの確認"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "開始日"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "発注オーダー"
+msgid "Reset to Draft"
+msgstr "ドラフトに再設定"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -300,15 +206,65 @@ msgstr "現在の発注要求書"
 msgid "User"
 msgstr "ユーザ"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "オーダー参照"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "未割当の要求書"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "発注要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "見積詳細"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr "このパートナに既に %s の発注オーダーを持っています、新しい見積を作成するためにはこの発注オーダーをキャンセルする必要があります。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "要求書の参照"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "発注する製品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -322,16 +278,55 @@ msgstr "発注要求書の検索"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"発注要求書（排他）：発注オーダーの確認により、残りの発注オーダーをキャンセルします。\n"
+"発注要求書（複数）：複数の発注オーダーを持つことができます。発注オーダーの確認をしても、残りのオーダーはキャンセルされません。"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "発注オーダーのキャンセル"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "要求書タイプ"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -339,40 +334,124 @@ msgstr "新規発注要求書"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "見積"
+msgid "Products"
+msgstr "製品"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "見積要求"
+msgid "Order Date"
+msgstr "オーダー日"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "発注要求書パートナ"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "要求書のための発注"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "要求書の締切"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "調達"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "最終要求書"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "数量"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "マネジャ"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "発注要求書（排他）"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "製品単位"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "発注オーダーの確認"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "見積の作成"
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "要求日"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "開始日"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -380,10 +459,9 @@ msgid "Unassigned"
 msgstr "未割当"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "キャンセル"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "要求書"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -397,120 +475,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "発注オーダー"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "担当"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "交渉での発注要求書"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "発注要求書行"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "製品"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "説明"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "未割当の要求書"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "発注要求書"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "終了日"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "発注する製品"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "オーダー日"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "要求書の参照"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "製品単位"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "要求日"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "要求書のための発注"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "要求書の締切"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "マネジャ"
-
 #~ msgid "In Progress"
 #~ msgstr "進行中"
 
diff --git a/addons/purchase_requisition/i18n/nb.po b/addons/purchase_requisition/i18n/nb.po
index 46d420fefec..8be1be61b87 100644
--- a/addons/purchase_requisition/i18n/nb.po
+++ b/addons/purchase_requisition/i18n/nb.po
@@ -7,112 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-23 10:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Grupper etter..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Leverandør"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "produktdetaljer"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Kvantum"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Innkjøpsordre"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Feil!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produkter"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Kansellert"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Tilbudsdetaljer"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Rekvisisjonstype"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referanse"
+msgid "Request a Quotation"
+msgstr "Be om tilbud"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -120,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Sett tilbake til utkast"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -149,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Ansvarlig"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -160,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Innkjøpsrekvisisjon i forhandling"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Leverandør"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -170,6 +100,16 @@ msgstr "Lager"
 msgid "New"
 msgstr "Ny"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "produktdetaljer"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Ant"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -188,17 +128,57 @@ msgstr "Type"
 msgid "Purchase Requisition"
 msgstr "Innkjøpsrekvisisjon"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Innkjøpsrekvisisjonslinje"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "Innkjøpsordre med rekvisisjon"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "Tilbud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Lag tilbud"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -206,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Godkjent av leverandør"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Ordrereferanse"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Ordredato"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Innkjøp"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Rekvisisjon"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Innkjøpsrekvisisjons partner"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Innkjøpsordre"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Innkjøpsrekvisisjon (eksklusiv)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Bekreft innkjøpsordre"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Startdato"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Innkjøpsordre med rekvisisjon"
+msgid "Reset to Draft"
+msgstr "Sett tilbake til utkast"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -298,15 +206,65 @@ msgstr "Gjeldende innkjøpsrekvisisjon"
 msgid "User"
 msgstr "Bruker"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Ordrereferanse"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Kvantum"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Innkjøpsrekvisisjoner"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Tilbudsdetaljer"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Rekvisisjonsreferanse"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -320,16 +278,53 @@ msgstr "Søk innkjøpsrekvisisjon"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Ordredato"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Annuller innkjøpsordre"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Innkjøpsordre"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Rekvisisjonstype"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -337,40 +332,124 @@ msgstr "Ny innkjøpsrekvisisjon"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Tilbud"
+msgid "Products"
+msgstr "Produkter"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Be om tilbud"
+msgid "Order Date"
+msgstr "Ordredato"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Kansellert"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Innkjøpsrekvisisjons partner"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Innkjøpsordre"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Innkjøp"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Siste rekvisisjon"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Ant"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Innkjøpsrekvisisjon (eksklusiv)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "Produkt måleenhet"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Bekreft innkjøpsordre"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Lag tilbud"
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Rekvisisjonsdato"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Startdato"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -378,10 +457,9 @@ msgid "Unassigned"
 msgstr "Ikke tildelt"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Kanseller"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Rekvisisjon"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -395,120 +473,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Innkjøpsordre"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Ansvarlig"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Innkjøpsrekvisisjon i forhandling"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Innkjøpsrekvisisjonslinje"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Beskrivelse"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Innkjøpsrekvisisjoner"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Sluttdato"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Ordredato"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Rekvisisjonsreferanse"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Produkt måleenhet"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Rekvisisjonsdato"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Manager"
-
 #~ msgid "In Progress"
 #~ msgstr "I arbeid"
 
diff --git a/addons/purchase_requisition/i18n/nl.po b/addons/purchase_requisition/i18n/nl.po
index 446179b1d79..b3241404dfb 100644
--- a/addons/purchase_requisition/i18n/nl.po
+++ b/addons/purchase_requisition/i18n/nl.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-30 19:58+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Leverancier"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Product detail"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Inkoopaanvraag (exclusief): Bij de bevestiging van de inkooporder worden de "
-"resterende aanvragen geannuleerd.\n"
-"Inkoopaanvraag (meer): Er kunnen meer inkooporders zijn. Bij bevestiging van "
-"de inkooporder worden de resterende aanvragen niet geannuleerd."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Ongelezen berichten"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Er is al een een %s inkooporder voor deze relatie. De inkooporder moet eerst "
-"geannuleerd worden voordat een nieuwe offerte kan worden gemaakt."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Aantal"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Inkooporder"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Fout!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Producten"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Offerte detail"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Soort aanvraag"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referentie"
+msgid "Request a Quotation"
+msgstr "Vraag een offerte aan"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "Meer aanvragen"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Terugzetten naar Concept"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "Maateenheid product"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -155,10 +51,32 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Bron"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Verantwoordelijke"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "Stuur naar leveranciers"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr ""
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -166,9 +84,15 @@ msgid "Followers"
 msgstr "Volgers"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Inkoopaanvraag in onderhandeling"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Leverancier"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -176,6 +100,16 @@ msgstr "Magazijn"
 msgid "New"
 msgstr "Nieuw"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Product detail"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Hvhd"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -195,97 +129,25 @@ msgid "Purchase Requisition"
 msgstr "Inkoopaanvraag"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "Stuur naar leveranciers"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
-"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
-"ingevoegd."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Goedgekeurd door leverancier"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "Stuur naar leveranciers"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Order referentie"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Verwerving"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Inkoopaanvraag regel"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Aanvraag"
+msgid "Purchase Orders with requisition"
+msgstr "Inkooporders met aanvraag"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Inkoopaanvraag relatie"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Inkooporders"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Inkoopaanvraag (exclusief)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Product"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Inkooporder bevestigen"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Startdatum"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "of"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "Maateenheid product"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Status"
+msgid "Quotations"
+msgstr "Offertes"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -293,9 +155,46 @@ msgid "Terms and Conditions"
 msgstr "Voorwaarden"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Inkooporders met aanvraag"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Offerte maken"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatie historie"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Goedgekeurd door leverancier"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "of"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Terugzetten naar Concept"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -307,147 +206,20 @@ msgstr "Huidige inkoopaanvraag"
 msgid "User"
 msgstr "Gebruiker"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Order referentie"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Is een volger"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Search Purchase Requisition"
-msgstr "Inkoopaanvragen zoeken"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "No Product in Tender."
-msgstr "Geen product in aanvraag"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Cancel Purchase Order"
-msgstr "Verwijder Inkooporder"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "New Purchase Requisition"
-msgstr "Nieuwe inkoopaanvraag"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Offertes"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Vraag een offerte aan"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:procurement.order,requisition_id:0
-msgid "Latest Requisition"
-msgstr "Laatste inkoop"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Hvhd"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Offerte maken"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned"
-msgstr "Niet toegewezen"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: purchase_requisition
-#: help:product.product,purchase_requisition:0
-msgid ""
-"Check this box to generates purchase requisition instead of generating "
-"requests for quotation from procurement."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "Inkooporders"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Bron document"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Verantwoordelijke"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Inkoopaanvraag in onderhandeling"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Inkoopaanvraag regel"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Product"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Aantal"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -460,32 +232,223 @@ msgstr "Niet toegewezen aanvragen"
 msgid "Purchase Requisitions"
 msgstr "Inkoopaanvragen"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Offerte detail"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Er is al een een %s inkooporder voor deze relatie. De inkooporder moet eerst "
+"geannuleerd worden voordat een nieuwe offerte kan worden gemaakt."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
 msgstr "Einddatum"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "In te kopen producten"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Besteldatum"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
 msgstr "Aanvraag referentie"
 
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "In te kopen producten"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "Stuur naar leveranciers"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Inkoopaanvragen zoeken"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "No Product in Tender."
+msgstr "Geen product in aanvraag"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Besteldatum"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Inkoopaanvraag (exclusief): Bij de bevestiging van de inkooporder worden de "
+"resterende aanvragen geannuleerd.\n"
+"Inkoopaanvraag (meer): Er kunnen meer inkooporders zijn. Bij bevestiging van "
+"de inkooporder worden de resterende aanvragen niet geannuleerd."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Verwijder Inkooporder"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Inkooporder"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Bron document"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Soort aanvraag"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr "Nieuwe inkoopaanvraag"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Producten"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Orderdatum"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Inkoopaanvraag relatie"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Inkoopaanvragen"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Inkooporders"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Aanvraag einddatum"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referentie"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Verwerving"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Bron"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Laatste inkoop"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Manager"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Inkoopaanvraag (exclusief)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product UoM"
 msgstr "Product maateenheid"
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Inkooporder bevestigen"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr "Annuleren"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
@@ -493,30 +456,31 @@ msgid "Requisition Date"
 msgstr "Aanvraagdatum"
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Berichten en communicatie historie"
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Startdatum"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Inkoopaanvragen"
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Niet toegewezen"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Aanvraag einddatum"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Aanvraag"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box to generates purchase requisition instead of generating "
+"requests for quotation from procurement."
 msgstr ""
 
 #. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Manager"
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Inkooporders"
 
 #, python-format
 #~ msgid "No Product in Tender"
diff --git a/addons/purchase_requisition/i18n/pl.po b/addons/purchase_requisition/i18n/pl.po
index f685d57502c..61c654502ee 100644
--- a/addons/purchase_requisition/i18n/pl.po
+++ b/addons/purchase_requisition/i18n/pl.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 13:12+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Grupuj wg"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Dostawca"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Szczegóły produktu"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Zlecenie zakupu (wyłączne):  Po potwierdzeniu zamówienia zakupu pozostałe "
-"zamówienia ze zlecenia są anulowane.\n"
-"Zlecenie zakupu (wielokrotne):  Pozwala grupować zamówienia zakupu. Po "
-"potwierdzeniu jednego z nich pozostałe pozostają aktywne."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Nieprzeczytane wiadomości"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi."
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Masz już jedno %s zamówienie zakupu dla tego partnera. Musisz najpierw "
-"anulować to zamówienie zakupu, aby utworzyć ofertę."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Ilość"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Wiadomości"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Zamówienie Zakupu"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Błąd!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produkty"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Szczegóły oferty"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Typ zlecenia"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Odnośnik"
+msgid "Request a Quotation"
+msgstr "Zapytanie ofertowe"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "Wielokrotne zlecenia"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Przywróć do projektu"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "Ostrzeżenie !"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "Jednostka miary produktu"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -155,10 +51,32 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Źródło"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Odpowiedzialny"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Stan"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "Wyślij do dostawców"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Grupuj wg"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "Zakup wykonano"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -166,9 +84,15 @@ msgid "Followers"
 msgstr "Wypowiadający się"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazyn"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Zlecenie w negocjacjach"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Dostawca"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -176,6 +100,16 @@ msgstr "Magazyn"
 msgid "New"
 msgstr "Nowe"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Szczegóły produktu"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Il."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -195,97 +129,25 @@ msgid "Purchase Requisition"
 msgstr "Zlecenie zakupu"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "Wyślij do dostawców"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Zawiera podsumowanie wypowiedzi (liczbę wiadomości, ...). To podsumowanie "
-"jest bezpośrednio w formacie html, aby można je było stosować w widokach "
-"kanban."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Zaaprobowane przez dostawcę"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "Wyślij do dostawców"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Odnośnik zamówienia"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Data zamówienia"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Zapotrzebowanie"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Pozycja zlecenia zakupu"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Zlecenie"
+msgid "Purchase Orders with requisition"
+msgstr "Zamówienia zakupu ze zleceniem"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr "Zlecenie zakupu zostało <b>utworzone</b>."
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Partner zlecenia akupu"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Zamówienia zakupu"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Zlecenie zakupu (wyłączne)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Potwierdź zamówienie zakupu"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Data Początkowa"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "lub"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "Jednostka miary produktu"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Stan"
+msgid "Quotations"
+msgstr "Oferty"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -293,9 +155,46 @@ msgid "Terms and Conditions"
 msgstr "Warunki i postanowienia"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Zamówienia zakupu ze zleceniem"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Nieprzeczytane wiadomości"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Utwórz ofertę"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Wiadomości i historia komunikacji"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Zaaprobowane przez dostawcę"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "lub"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Przywróć do projektu"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -307,16 +206,68 @@ msgstr "Bieżące Zlecenie zakupu"
 msgid "User"
 msgstr "Użytkownik"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Odnośnik zamówienia"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Jest wypowiadającym się"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Nieprzypisane zlecenia"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Zlecenia zakupu"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Szczegóły oferty"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Masz już jedno %s zamówienie zakupu dla tego partnera. Musisz najpierw "
+"anulować to zamówienie zakupu, aby utworzyć ofertę."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data końcowa"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Odnośnik zlecenia"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produkty do zakupienia"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "Wyślij do dostawców"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -329,15 +280,56 @@ msgstr "Szukaj zlecenia zakupu"
 msgid "No Product in Tender."
 msgstr "Brak produktu"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data zamówienia"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Zlecenie zakupu (wyłączne):  Po potwierdzeniu zamówienia zakupu pozostałe "
+"zamówienia ze zlecenia są anulowane.\n"
+"Zlecenie zakupu (wielokrotne):  Pozwala grupować zamówienia zakupu. Po "
+"potwierdzeniu jednego z nich pozostałe pozostają aktywne."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Anuluj zamówienie zakupu"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Podsumowanie"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Zamówienie Zakupu"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Dokument źródłowy"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Błąd!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Typ zlecenia"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -346,40 +338,127 @@ msgstr "Nowe zlecenie zakupu"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Oferty"
+msgid "Products"
+msgstr "Produkty"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Zapytanie ofertowe"
+msgid "Order Date"
+msgstr "Data zamówienia"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr "Zlecenie zakupu zostało <b>anulowane</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner zlecenia akupu"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Zamówienia dla zleceń"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Zamówienia zakupu"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Termin zlecenia"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Podsumowanie"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Odnośnik"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Zapotrzebowanie"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Źródło"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazyn"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Ostatnie zlecenie"
 
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Menedżer"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Zlecenie zakupu (wyłączne)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Zawiera podsumowanie wypowiedzi (liczbę wiadomości, ...). To podsumowanie "
+"jest bezpośrednio w formacie html, aby można je było stosować w widokach "
+"kanban."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Il."
+msgid "Product UoM"
+msgstr "JM produktu"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
+#: code:addons/purchase_requisition/purchase_requisition.py:134
 #, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr "Projekt Zlecenia zakupu został <b>wysłany do dostawców</b>."
+msgid "Warning!"
+msgstr "Ostrzeżenie !"
 
 #. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Potwierdź zamówienie zakupu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Utwórz ofertę"
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data zlecenia"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data Początkowa"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -387,10 +466,9 @@ msgid "Unassigned"
 msgstr "Nieprzypisane"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Anuluj"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Zlecenie"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -406,120 +484,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Zamówienia Zakupu"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Dokument źródłowy"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Odpowiedzialny"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "Zakup wykonano"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Zlecenie w negocjacjach"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Pozycja zlecenia zakupu"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr "Zlecenie zakupu zostało ustawione na <b>projekt</b>."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Nieprzypisane zlecenia"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Zlecenia zakupu"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Data końcowa"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Produkty do zakupienia"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Data zamówienia"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Odnośnik zlecenia"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "JM produktu"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Data zlecenia"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Wiadomości i historia komunikacji"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Zamówienia dla zleceń"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Termin zlecenia"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr "Zlecenie zakupu zostało <b>wykonane</b>."
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Menedżer"
-
 #~ msgid "In Progress"
 #~ msgstr "W toku"
 
diff --git a/addons/purchase_requisition/i18n/pt.po b/addons/purchase_requisition/i18n/pt.po
index d2d33c7afc8..b6e94ebfad2 100644
--- a/addons/purchase_requisition/i18n/pt.po
+++ b/addons/purchase_requisition/i18n/pt.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 12:09+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Fornecedor"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detalhe do artigo"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Requisição de compra (exclusivo):  Na confirmação de uma ordem de compra, "
-"ele cancela a ordem de compra restante.\n"
-"Requisição de compra (Múltipla):  Permite ter várias ordens de compra. Após "
-"a confirmação de uma ordem de compra não pode cancelar as ordens restantes"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensagens por ler"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Já tem uma ordem %s de compra para este parceiro, deve cancelar esta ordem "
-"de compra para criar uma nova cotação."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Quantidade"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Ordem de compra"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Artigos"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detalhes da Cotação"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipo de requisição"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referência"
+msgid "Request a Quotation"
+msgstr "Solicitar uma cotação"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "Múltiplas Requisições"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Voltar a rascunho"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr ""
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -155,10 +51,32 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Origem"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsável"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "Enviar aos fornecedores"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "Compra realizada"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -166,9 +84,15 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Armazém"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Requisição de compra em negociação"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Fornecedor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -176,6 +100,16 @@ msgstr "Armazém"
 msgid "New"
 msgstr "Novo"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalhe do artigo"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Qtd"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -195,94 +129,25 @@ msgid "Purchase Requisition"
 msgstr "Requisição de compra"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "Enviar aos fornecedores"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Aprovado pelo fornecedor"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "Enviar aos fornecedores"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Ordem de Referência"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Ordem da Data"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Aquisição"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Linha de Requisição da compra"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Requisição"
+msgid "Purchase Orders with requisition"
+msgstr "Ordens de compra com requisição"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Parceiro da requisição de compra"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Ordens de compra"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Requisição de compra (exclusivo)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Artigo"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmar Ordem de Compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Data Inicial"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "ou"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Estado"
+msgid "Quotations"
+msgstr "Cotações"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -290,9 +155,46 @@ msgid "Terms and Conditions"
 msgstr "Termos e condições"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Ordens de compra com requisição"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens por ler"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Criar Cotação"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Aprovado pelo fornecedor"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "ou"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Voltar a rascunho"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -304,147 +206,20 @@ msgstr "Requisição de compra atual"
 msgid "User"
 msgstr "Utilizador"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Ordem de Referência"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "É um seguidor"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Search Purchase Requisition"
-msgstr "Pesquisa da requisição da compra"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "No Product in Tender."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Cancel Purchase Order"
-msgstr "Cancelar ordem de compra"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "New Purchase Requisition"
-msgstr "Requisição de nova compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Cotações"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Solicitar uma cotação"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:procurement.order,requisition_id:0
-msgid "Latest Requisition"
-msgstr "Ultima requisição"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Qtd"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Criar Cotação"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned"
-msgstr "Não atribuído"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: purchase_requisition
-#: help:product.product,purchase_requisition:0
-msgid ""
-"Check this box to generates purchase requisition instead of generating "
-"requests for quotation from procurement."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "Ordens de Compra"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Documento de origem"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "Compra realizada"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Requisição de compra em negociação"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Linha de Requisição da compra"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Artigo"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantidade"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -457,32 +232,220 @@ msgstr "Requisição não atribuída"
 msgid "Purchase Requisitions"
 msgstr "Requisições de Compra"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalhes da Cotação"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Já tem uma ordem %s de compra para este parceiro, deve cancelar esta ordem "
+"de compra para criar uma nova cotação."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
 msgstr "Data Final"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Artigos a Comprar"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Data Ordenada"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
 msgstr "Referência da Requisição"
 
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Artigos a Comprar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "Enviar aos fornecedores"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Pesquisa da requisição da compra"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "No Product in Tender."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data Ordenada"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Requisição de compra (exclusivo):  Na confirmação de uma ordem de compra, "
+"ele cancela a ordem de compra restante.\n"
+"Requisição de compra (Múltipla):  Permite ter várias ordens de compra. Após "
+"a confirmação de uma ordem de compra não pode cancelar as ordens restantes"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar ordem de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ordem de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Documento de origem"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo de requisição"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr "Requisição de nova compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Artigos"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Ordem da Data"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Parceiro da requisição de compra"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Requisições para compra"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Ordens de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Prazo de requisição"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Origem"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Ultima requisição"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Gestor"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Requisição de compra (exclusivo)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product UoM"
 msgstr "UdM do Artigo"
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar Ordem de Compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
@@ -490,30 +453,31 @@ msgid "Requisition Date"
 msgstr "Data da requisição"
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Histórico de mensagens e comunicação"
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data Inicial"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Requisições para compra"
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Não atribuído"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Prazo de requisição"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Requisição"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box to generates purchase requisition instead of generating "
+"requests for quotation from procurement."
 msgstr ""
 
 #. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Gestor"
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Ordens de Compra"
 
 #~ msgid "State"
 #~ msgstr "Estado"
diff --git a/addons/purchase_requisition/i18n/pt_BR.po b/addons/purchase_requisition/i18n/pt_BR.po
index 763d73026cf..e7a291acf20 100644
--- a/addons/purchase_requisition/i18n/pt_BR.po
+++ b/addons/purchase_requisition/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 12:50+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,111 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Fornecedor"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detalhes do Produto"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Requisição de Compra (exclusiva): Na confirmação do Pedido de Compra, serão "
-"cancelados os pedidos remanescentes.\n"
-"Requisição de Compra (múltipla): Permite ter múltiplos Pedidos de Compra. Na "
-"confirmação do Pedido de Compra, os pedidos remanscentes não serão cancelados"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensagens não lidas"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Se marcado novas mensagens solicitarão sua atenção."
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Você já tem um %s pedido de compra para este parceiro, você precisa cancelar "
-"este pedido para criar uma nova cotação."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Quantidade"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Ordem de Compra"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produtos"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detalhes da Cotação"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipo de Requisição"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referência"
+msgid "Request a Quotation"
+msgstr "Solicitar Cotação"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -127,15 +29,9 @@ msgid "Multiple Requisitions"
 msgstr "Múltiplas Requisições"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Voltar para Provisório"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "Unidade de Medida do Produto"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -169,10 +65,32 @@ msgstr ""
 "        "
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Origem"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsável"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Situação"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "Enviar aos Fornecedores"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "Compra Concluída"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -180,9 +98,15 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Armazém"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Solicitação de Compra em negociação"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Fornecedor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -190,6 +114,16 @@ msgstr "Armazém"
 msgid "New"
 msgstr "Novo"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalhes do Produto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Qtde"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -209,97 +143,25 @@ msgid "Purchase Requisition"
 msgstr "Requisição de Compras"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "Enviada aos Fornecedores"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
-"gerado diretamente em formato HTML para que possa ser inserido nas visões "
-"kanban."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Aprovado pelo Fornecedor"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "Enviar aos Fornecedores"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referência do Pedido"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Data do Pedido"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Aquisição"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Linha de Requisição de Compra"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Requisição"
+msgid "Purchase Orders with requisition"
+msgstr "Pedidos de Compra com solicitações"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr "Requisição de Compra foi <b>criada</b>."
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Parceiros da Requisição de Compra"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Pedidos de compra"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Requisição de Compra (exclusiva)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produto"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmar Ordem de Compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Data de Início"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "ou"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "Unidade de Medida do Produto"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Situação"
+msgid "Quotations"
+msgstr "Cotações"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -307,9 +169,46 @@ msgid "Terms and Conditions"
 msgstr "Termos e Condições"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Pedidos de Compra com solicitações"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens não lidas"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Criar Cotação"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Aprovado pelo Fornecedor"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "ou"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Voltar para Provisório"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -321,16 +220,68 @@ msgstr "Solicitações de Compra Atuais"
 msgid "User"
 msgstr "Usuário"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referência do Pedido"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "É um Seguidor"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Solicitação não atribuída"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Requisição de Compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalhes da Cotação"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Você já tem um %s pedido de compra para este parceiro, você precisa cancelar "
+"este pedido para criar uma nova cotação."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data Final"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referência para Requisição"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produtos para Compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "Enviada aos Fornecedores"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -343,15 +294,56 @@ msgstr "Procurar Requisição de Compra"
 msgid "No Product in Tender."
 msgstr "Nenhum Produto em Licitação"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data do Pedido"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Requisição de Compra (exclusiva): Na confirmação do Pedido de Compra, serão "
+"cancelados os pedidos remanescentes.\n"
+"Requisição de Compra (múltipla): Permite ter múltiplos Pedidos de Compra. Na "
+"confirmação do Pedido de Compra, os pedidos remanscentes não serão cancelados"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Cancelar Ordem de Compra"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ordem de Compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Documento de Origem"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo de Requisição"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -360,40 +352,127 @@ msgstr "Nova Solicitação de Compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Cotações"
+msgid "Products"
+msgstr "Produtos"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Solicitar Cotação"
+msgid "Order Date"
+msgstr "Data do Pedido"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr "Requisição de compra foi <b>cancelada</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Parceiros da Requisição de Compra"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Compras por Requisições"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Limite para Requisição"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Origem"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Armazém"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Última Requisição"
 
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Requisição de Compra (exclusiva)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Qtde"
+msgid "Product UoM"
+msgstr "UdM do Produto"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
+#: code:addons/purchase_requisition/purchase_requisition.py:134
 #, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr "Requisição provisória foi <b>enviada aos fornecedores</b>."
+msgid "Warning!"
+msgstr "Aviso!"
 
 #. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar Ordem de Compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Criar Cotação"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data da Requisição"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data de Início"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -401,10 +480,9 @@ msgid "Unassigned"
 msgstr "Não atribuído"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Requisição"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -420,120 +498,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Pedidos de Compra"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Documento de Origem"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "Compra Concluída"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Solicitação de Compra em negociação"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Linha de Requisição de Compra"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr "Requisição de Compra foi definida como <b>provisória</b>."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Solicitação não atribuída"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Requisição de Compra"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Data Final"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Produtos para Compra"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Data do Pedido"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Referência para Requisição"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UdM do Produto"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Data da Requisição"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Histórico de mensagens e comunicação"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Compras por Requisições"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Limite para Requisição"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr "Requisição de compra está <b>concluida</b>."
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Gerente"
-
 #, python-format
 #~ msgid "No Product in Tender"
 #~ msgstr "Nenhum Produto na Proposta"
diff --git a/addons/purchase_requisition/i18n/ro.po b/addons/purchase_requisition/i18n/ro.po
index 72c96d70cc8..29be9044224 100644
--- a/addons/purchase_requisition/i18n/ro.po
+++ b/addons/purchase_requisition/i18n/ro.po
@@ -7,119 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-18 18:25+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Grupeaza dupa..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Furnizor"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Detaliu Produs"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Cererea de achizitie (exclusiv): La confirmarea unei comenzi de achizitie, "
-"anuleaza comanda de achizitie ramasa.\n"
-"Cererea de achizitie (multipla): Permite detinerea mai multor comenzi de "
-"achizitie. La confirmarea unei comenzi de achizitie nu anuleaza comenzile "
-"ramase"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Companie"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Aveti deja o comanda de achizitie %s pentru acest partener, trebuie sa "
-"anulati aceasta comanda de achizitie pentru a crea o cotatie noua."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Cantitate"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Comanda de achizitie"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Eroare!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produse"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Anulat(a)"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Detalii cotatie (oferta)"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Tipul cererii"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referinta"
+msgid "Request a Quotation"
+msgstr "Cere o cotatie (oferta)"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -127,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Cereri Multiple"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Resetare ca Ciorna"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -156,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsabil"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Grupeaza dupa..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -167,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depozit"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Cerere Achizitie in negociere"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Furnizor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -177,6 +100,16 @@ msgstr "Depozit"
 msgid "New"
 msgstr "Nou(a)"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detaliu Produs"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Cantitate"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -195,17 +128,57 @@ msgstr "Tip"
 msgid "Purchase Requisition"
 msgstr "Cererea pentru achizitie"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Linie cerere de achizitie"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "Comenzi de achizitie la cerere"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produs"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "Cotatii (oferte)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descriere"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Companie"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Creeaza cotatia"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -213,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Aprobat de catre furnizor"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Referinta comanda"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Data comenzii"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Aprovizionare"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Cerere"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Partener Cerere de achizitie"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Comenzi de achizitie"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Cerere de achizitie (exclusiv)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Confirma comanda de achizitie"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Data de inceput"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Comenzi de achizitie la cerere"
+msgid "Reset to Draft"
+msgstr "Resetare ca Ciorna"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -305,15 +206,67 @@ msgstr "Cerere curenta de achizitie"
 msgid "User"
 msgstr "Utilizator"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referinta comanda"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Cantitate"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Cerere neatribuita"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Solicitare de achizitie"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalii cotatie (oferta)"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Aveti deja o comanda de achizitie %s pentru acest partener, trebuie sa "
+"anulati aceasta comanda de achizitie pentru a crea o cotatie noua."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data de sfarsit"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referinta solicitare"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produse de cumparat"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -327,16 +280,58 @@ msgstr "Cauta solicitarea de achizitie"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data comenzii"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Cererea de achizitie (exclusiv): La confirmarea unei comenzi de achizitie, "
+"anuleaza comanda de achizitie ramasa.\n"
+"Cererea de achizitie (multipla): Permite detinerea mai multor comenzi de "
+"achizitie. La confirmarea unei comenzi de achizitie nu anuleaza comenzile "
+"ramase"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Anuleaza comanda de achizitie"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Comanda de achizitie"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Eroare!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipul cererii"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -344,40 +339,124 @@ msgstr "Cerere noua de achizitie"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Cotatii (oferte)"
+msgid "Products"
+msgstr "Produse"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Cere o cotatie (oferta)"
+msgid "Order Date"
+msgstr "Data comenzii"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Anulat(a)"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partener Cerere de achizitie"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Cereri pentru achizitii"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Comenzi de achizitie"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Scadenta solicitare"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referinta"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Aprovizionare"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depozit"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Ultima cerere"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Cantitate"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Manager"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Cerere de achizitie (exclusiv)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "UdeM (Unitate de masura) produs"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirma comanda de achizitie"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Creeaza cotatia"
+msgid "Cancel"
+msgstr "Anuleaza"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data cererii"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data de inceput"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -385,10 +464,9 @@ msgid "Unassigned"
 msgstr "Neatribuit"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Anuleaza"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Cerere"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -402,120 +480,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Comenzi de achizitie"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsabil"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Cerere Achizitie in negociere"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Linie cerere de achizitie"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produs"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Descriere"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Cerere neatribuita"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Solicitare de achizitie"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Data de sfarsit"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Produse de cumparat"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Data comenzii"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "Referinta solicitare"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "UdeM (Unitate de masura) produs"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "Data cererii"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Cereri pentru achizitii"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Scadenta solicitare"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Manager"
-
 #~ msgid "State"
 #~ msgstr "Stare"
 
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 4fd7d167344..277fea102e2 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 13:43+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Группировать по ..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Поставщик"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "ТМЦ подробно"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Запрос на закупку (исключительный): при подтверждении заказа закупки, "
-"дополнительные заказы отменяются.\n"
-"Запрос на закупку (несколько): позволяет иметь несколько заказов закупки. "
-"При подтверждении заказа закупки, дополнительные заказы не отменяются."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "Непрочитанные сообщения"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Компания"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Если установлено, новые сообщения требуют вашего внимания"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"У вас уже есть один %s заказ закупки для этого партнёра, вы должны отменить "
-"этот заказ закупки для создания нового запроса цен."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "Сообщения"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Заказ закупки"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Ошибка !"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "ТМЦ"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Отменено"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Подробности предложения цен"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "Тип запроса"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Ссылка"
+msgid "Request a Quotation"
+msgstr "Запрос цен"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "Несколько запросов"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Установить в \"Черновик\""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "Внимание!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "Ед. изм. продукции"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -165,10 +61,32 @@ msgstr ""
 "        "
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "Источник"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Ответственный"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "Послать поставщикам"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Группировать по ..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "Закупка сделана"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -176,9 +94,15 @@ msgid "Followers"
 msgstr "Подписчики"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Запрос закупки в переговорах"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Поставщик"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -186,6 +110,16 @@ msgstr "Склад"
 msgid "New"
 msgstr "Создать"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "ТМЦ подробно"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Кол-во"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -205,96 +139,25 @@ msgid "Purchase Requisition"
 msgstr "Запрос на закупку"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "Отправлено поставщикам"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
-"html для возможности использования в канбан виде"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "Утверждено поставщиком"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "Послать поставщикам"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Ссылка на заказ"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Дата заказа"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Снабжение"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Позиция запроса на закупку"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "Запрос"
+msgid "Purchase Orders with requisition"
+msgstr "Заказы закупки с запросом"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr "Запрос на закупку был <b>создан</b>."
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Партнер запроса на закупку"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Заказы закупки"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Запрос на закупку (исключительный)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "ТМЦ"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Подтвердить заказ закупки"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Дата начала"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "или"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "Ед. изм. продукции"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "Статус"
+msgid "Quotations"
+msgstr "Предложения"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -302,9 +165,46 @@ msgid "Terms and Conditions"
 msgstr "Условия"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "Заказы закупки с запросом"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "Непрочитанные сообщения"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Создать предложение цен"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "Сообщения и история общения"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Утверждено поставщиком"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "или"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Установить в \"Черновик\""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -316,148 +216,20 @@ msgstr "Текущий запрос закупки"
 msgid "User"
 msgstr "Пользователь"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Ссылка на заказ"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Подписан"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Комментарии и эл. письма"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Search Purchase Requisition"
-msgstr "Искать запрос на закупку"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "No Product in Tender."
-msgstr "Нет товаров в тендере."
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Cancel Purchase Order"
-msgstr "Отменить заказ на закупку"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "Итого"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "New Purchase Requisition"
-msgstr "Новый запрос на закупку"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Предложения"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Запрос цен"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr "Запрос на закупку был <b>отменен</b>."
-
-#. module: purchase_requisition
-#: field:procurement.order,requisition_id:0
-msgid "Latest Requisition"
-msgstr "Последний запрос"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Кол-во"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr "Черновик запроса был <b>отправлен поставщику</b>."
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Создать предложение цен"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned"
-msgstr "Не назначенный"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: purchase_requisition
-#: help:product.product,purchase_requisition:0
-msgid ""
-"Check this box to generates purchase requisition instead of generating "
-"requests for quotation from procurement."
-msgstr ""
-"Отметьте для создания запроса на закупку вместо запроса цен при снабжении."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "Заказы закупки"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "Документ-источник"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Ответственный"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "Закупка сделана"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Запрос закупки в переговорах"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Позиция запроса на закупку"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "ТМЦ"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr "Запрос на закупку был установлен в <b>черновик</b>."
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Количество"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -470,32 +242,222 @@ msgstr "Нераспределенный запрос"
 msgid "Purchase Requisitions"
 msgstr "Запросы на закупку"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Подробности предложения цен"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"У вас уже есть один %s заказ закупки для этого партнёра, вы должны отменить "
+"этот заказ закупки для создания нового запроса цен."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
 msgstr "Дата окончания"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "ТМЦ для закупки"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Дата заказа"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
 msgstr "Ссылка на запрос"
 
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "ТМЦ для закупки"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "Отправлено поставщикам"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Искать запрос на закупку"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "No Product in Tender."
+msgstr "Нет товаров в тендере."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Дата заказа"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Запрос на закупку (исключительный): при подтверждении заказа закупки, "
+"дополнительные заказы отменяются.\n"
+"Запрос на закупку (несколько): позволяет иметь несколько заказов закупки. "
+"При подтверждении заказа закупки, дополнительные заказы не отменяются."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Отменить заказ на закупку"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Заказ закупки"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "Документ-источник"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Ошибка !"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Тип запроса"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr "Новый запрос на закупку"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "ТМЦ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Дата заказа"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Партнер запроса на закупку"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Если установлено, новые сообщения требуют вашего внимания"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Закупка по запросам"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Заказы закупки"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Срок запроса"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "Итого"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Ссылка"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Снабжение"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "Источник"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Последний запрос"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Менеджер"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Запрос на закупку (исключительный)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product UoM"
 msgstr "Ед. изм. ТМЦ"
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr "Внимание!"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Подтвердить заказ закупки"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr "Отмена"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
@@ -503,30 +465,32 @@ msgid "Requisition Date"
 msgstr "Дата запроса"
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "Сообщения и история общения"
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Дата начала"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "Закупка по запросам"
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Не назначенный"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "Срок запроса"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Запрос"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr "Запрос на закупку был <b>сделан</b>."
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box to generates purchase requisition instead of generating "
+"requests for quotation from procurement."
+msgstr ""
+"Отметьте для создания запроса на закупку вместо запроса цен при снабжении."
 
 #. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Менеджер"
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Заказы закупки"
 
 #~ msgid "State"
 #~ msgstr "Состояние"
diff --git a/addons/purchase_requisition/i18n/sv.po b/addons/purchase_requisition/i18n/sv.po
index 501ae148826..1b5108f25fe 100644
--- a/addons/purchase_requisition/i18n/sv.po
+++ b/addons/purchase_requisition/i18n/sv.po
@@ -7,127 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-08 21:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Gruppera på..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Leverantör"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
+msgid "Request a Quotation"
 msgstr ""
 
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Bolag"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Antal"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Inköpsorder"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Fel!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Produkter"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Avbruten"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Hänvisning"
-
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
 msgid "Multiple Requisitions"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Återställ till preliminär"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -149,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Ansvarig"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -160,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Leverantör"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -170,6 +100,16 @@ msgstr "Lager"
 msgid "New"
 msgstr "Ny"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Antal"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -189,16 +129,56 @@ msgid "Purchase Requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Offerter"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Skapa offert"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -206,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr ""
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Orderreferens"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Anskaffning"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Rekvisition"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Inköpsordrar"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr ""
+msgid "Reset to Draft"
+msgstr "Återställ till preliminär"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -298,15 +206,65 @@ msgstr ""
 msgid "User"
 msgstr "Användare"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Orderreferens"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Inköpsrekvisition"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Slutdatum"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produkter att köpa in"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -320,14 +278,51 @@ msgstr ""
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Orderdatum"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Inköpsorder"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
 msgstr ""
 
 #. module: purchase_requisition
@@ -337,44 +332,106 @@ msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Offerter"
+msgid "Products"
+msgstr "Produkter"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
+msgid "Order Date"
+msgstr "Orderdatum"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Avbruten"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Inköpsordrar"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Hänvisning"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Anskaffning"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Antal"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Chef"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Skapa offert"
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "Produktenhet"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Unassigned"
+msgid "Confirm Purchase Order"
 msgstr ""
 
 #. module: purchase_requisition
@@ -383,6 +440,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Rekvisition"
+
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
 msgid ""
@@ -395,120 +473,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Ansvarig"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Beskrivning"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Inköpsrekvisition"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Slutdatum"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Produkter att köpa in"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Orderdatum"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Produktenhet"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Chef"
-
 #~ msgid "In Progress"
 #~ msgstr "Pågående"
 
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 2be730fb4e7..5a9f97a5647 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -7,118 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 18:58+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "Gruplandır..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "Tedarikçi"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "Ürün Ayrıntısı"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"Satınalma İsteği (özel): Bir satınalma siparişinin onaylanmasıyla kalan "
-"siparişleri iptal eder.\n"
-"Satınalma İsteği (çoklu): Çoklu satınalma siparişlerine izin verir. Bir "
-"satınalma siparişinin onaylanmasıyla kalan siparişleri iptal etmez."
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr ""
-"Bu paydaş için zaten bir %s siparişiniz var, yeni bir teklif oluşturmak için "
-"bu siparişi iptal edin."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "Miktar"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "Satınalma Siparişi"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "Hata!"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "Ürünler"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "Vazgeçildi"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "Teklif Ayrıntısı"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "İstek Türü"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "Referans"
+msgid "Request a Quotation"
+msgstr "Bir Teklif İste"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -126,14 +28,8 @@ msgid "Multiple Requisitions"
 msgstr "Çoklu İstekler"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "Taslağa Geri Dönüştür"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: purchase_requisition
@@ -155,9 +51,31 @@ msgid ""
 msgstr ""
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Sorumlu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Gruplandır..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
 msgstr ""
 
 #. module: purchase_requisition
@@ -166,9 +84,15 @@ msgid "Followers"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depo"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "Satınalma İsteği görüşülüyor"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "Tedarikçi"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -176,6 +100,16 @@ msgstr "Depo"
 msgid "New"
 msgstr "Yeni"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Ürün Ayrıntısı"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Mik"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -194,17 +128,57 @@ msgstr "Tür"
 msgid "Purchase Requisition"
 msgstr "Satınalma İsteği"
 
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Satınalma İsteği Öğesi"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "İstekli Satınalma Siparişleri"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Ürün"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+msgid "Quotations"
+msgstr "Teklifler"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
 msgstr ""
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Açıklama"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Teklif Oluştur"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: purchase_requisition
@@ -212,87 +186,15 @@ msgstr ""
 msgid "Approved by Supplier"
 msgstr "Tedarikçi tarafından onaylandı"
 
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "Sipariş Referansı"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "Sipariş Tarihi"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Tedarik"
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "İstek"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "Satınalma İsteği Paydaşı"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Satınalma siparişleri"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "Alış İsteği (özel)"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "Satınalma Siparişi Onayla"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "Başlama Tarihi"
-
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
 msgstr ""
 
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Terms and Conditions"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "İstekli Satınalma Siparişleri"
+msgid "Reset to Draft"
+msgstr "Taslağa Geri Dönüştür"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -304,15 +206,67 @@ msgstr "Geçerli Satınalma İsteği"
 msgid "User"
 msgstr "Kullanıcı"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Sipariş Referansı"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Miktar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "Atanmamış İstek"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Satınalma İstekleri"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Teklif Ayrıntısı"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Bu paydaş için zaten bir %s siparişiniz var, yeni bir teklif oluşturmak için "
+"bu siparişi iptal edin."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Bitiş Tarihi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "İstek Referansı"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Satınalınacak Ürünler"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
 msgstr ""
 
 #. module: purchase_requisition
@@ -326,16 +280,57 @@ msgstr "Satınalma İsteği Ara"
 msgid "No Product in Tender."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Sipariş Tarihi"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Satınalma İsteği (özel): Bir satınalma siparişinin onaylanmasıyla kalan "
+"siparişleri iptal eder.\n"
+"Satınalma İsteği (çoklu): Çoklu satınalma siparişlerine izin verir. Bir "
+"satınalma siparişinin onaylanmasıyla kalan siparişleri iptal etmez."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
 msgstr "Alış Siparişini İptal Et"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Satınalma Siparişi"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "Hata!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "İstek Türü"
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
@@ -343,40 +338,124 @@ msgstr "Yeni Satınalma İsteği"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "Teklifler"
+msgid "Products"
+msgstr "Ürünler"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "Bir Teklif İste"
+msgid "Order Date"
+msgstr "Sipariş Tarihi"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Vazgeçildi"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Satınalma İsteği Paydaşı"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "İstekler için Satınalma"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Satınalma siparişleri"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "İstek Bitiş Tarihi"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referans"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Tedarik"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
 msgstr "Enson İstek"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
-msgstr "Mik"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "Yönetici"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Alış İsteği (özel)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr "Ürün Ölçü Birimi"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Satınalma Siparişi Onayla"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
 #: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Teklif Oluştur"
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "İstek Tarihi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Başlama Tarihi"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -384,10 +463,9 @@ msgid "Unassigned"
 msgstr "Atanmamış"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "Vazgeç"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "İstek"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -401,120 +479,6 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Satınalma Siparişleri"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Sorumlu"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "Satınalma İsteği görüşülüyor"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "Satınalma İsteği Öğesi"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "Ürün"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Açıklama"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned  Requisition"
-msgstr "Atanmamış İstek"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
-msgstr "Satınalma İstekleri"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
-msgstr "Bitiş Tarihi"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "Satınalınacak Ürünler"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "Sipariş Tarihi"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
-msgstr "İstek Referansı"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
-msgstr "Ürün Ölçü Birimi"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,date_start:0
-msgid "Requisition Date"
-msgstr "İstek Tarihi"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
-msgstr "İstekler için Satınalma"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "İstek Bitiş Tarihi"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "Yönetici"
-
 #~ msgid "In Progress"
 #~ msgstr "Sürüyor"
 
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index 02f92a1a8fd..566bab74d3b 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/i18n/zh_CN.po
@@ -7,114 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 08:28+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Group By..."
-msgstr "分组..."
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr "供应商"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr "产品详情"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid ""
-"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
-"it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple):  It allows to have multiple purchase "
-"orders.On confirmation of a purchase order it does not cancel the remaining "
-"orders"
-msgstr ""
-"采购申请(排它的)：确认采购订单，它会取消剩下的采购订单。\n"
-"采购申请(复合的)：它允许有多个采购订单，确认采购订单它不会取消剩下的采购订单。"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr "未读信息"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
-msgstr "公司"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息，勾选此项"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid ""
-"You have already one %s purchase order for this partner, you must cancel "
-"this purchase order to create a new quotation."
-msgstr "你对这个供应商已经有个一个 %s 采购单 ,  你必须取消采购订单再创建新的请购单."
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
-msgstr "数量"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
-msgstr "消息"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: view:purchase.requisition:0
-msgid "Purchase Order"
-msgstr "采购订单"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
-msgstr "错误！"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Products"
-msgstr "产品"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr "已取消"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
-msgstr "询价详情"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
-msgstr "请购类型"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reference"
-msgstr "单号"
+msgid "Request a Quotation"
+msgstr "请求询价"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -122,15 +28,9 @@ msgid "Multiple Requisitions"
 msgstr "多个申请"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr "重置为草稿"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr "警告！"
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr "产品计量单位"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -160,10 +60,32 @@ msgstr ""
 "        "
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
 #: view:purchase.requisition:0
-msgid "Source"
-msgstr "来源"
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr "状态"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr "发给供应商"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr "采购完成"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
@@ -171,9 +93,15 @@ msgid "Followers"
 msgstr "关注者"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
-msgstr "仓库"
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "谈判中的采购申请"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr "供应商"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -181,6 +109,16 @@ msgstr "仓库"
 msgid "New"
 msgstr "新建"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "产品详情"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "数量"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
@@ -200,94 +138,25 @@ msgid "Purchase Requisition"
 msgstr "采购申请"
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
-msgstr "发给供应商"
-
-#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Approved by Supplier"
-msgstr "供应商已核审批"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Send to Suppliers"
-msgstr "发给供应商"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Order Reference"
-msgstr "单号"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
-msgstr "订单日期"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "需求单"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "采购申请明细"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
-msgid "Requisition"
-msgstr "采购申请"
+msgid "Purchase Orders with requisition"
+msgstr "具有请购的采购单"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
-msgstr "请购单 <b>被创建</b>."
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr "采购申请业务伙伴"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "采购订单"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
-msgstr "采购申请(排它的)"
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "产品"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
-msgstr "确认采购订单"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
-msgstr "开始日期"
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
-msgstr "or"
-
-#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
-msgstr "产品计量单位"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
-msgstr "状态"
+msgid "Quotations"
+msgstr "询价单"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -295,9 +164,46 @@ msgid "Terms and Conditions"
 msgstr "条款和条件"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
-msgstr "具有请购的采购单"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "描述"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr "未读信息"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "创建询价单"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr "消息和通信历史"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "供应商已核审批"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr "or"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -309,148 +215,21 @@ msgstr "当前的采购请求"
 msgid "User"
 msgstr "用户"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "单号"
+
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
 msgstr "是一个关注者"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Search Purchase Requisition"
-msgstr "搜索采购申请"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "No Product in Tender."
-msgstr "没有产品在投标"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Cancel Purchase Order"
-msgstr "取消采购订单"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
-msgstr "摘要"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "New Purchase Requisition"
-msgstr "新的采购申请"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
-msgstr "询价单"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Request a Quotation"
-msgstr "请求询价"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr "请购单被<b>取消</b>."
-
-#. module: purchase_requisition
-#: field:procurement.order,requisition_id:0
-msgid "Latest Requisition"
-msgstr "最近的请购"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
 msgstr "数量"
 
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr "请购单草稿被 <b>发给供应商</b>."
-
-#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "创建询价单"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned"
-msgstr "未分配"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: purchase_requisition
-#: help:product.product,purchase_requisition:0
-msgid ""
-"Check this box to generates purchase requisition instead of generating "
-"requests for quotation from procurement."
-msgstr "选中此项，产生请购单，而不是生成采购询价单"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "采购订单"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
-msgstr "源单据"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "负责人"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
-msgstr "采购完成"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
-msgstr "谈判中的采购申请"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
-msgstr "采购申请明细"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
-msgstr "产品"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "描述"
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr "请购单被设为 <b>草稿</b>."
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned  Requisition"
@@ -462,32 +241,216 @@ msgstr "未指派的请购单"
 msgid "Purchase Requisitions"
 msgstr "采购申请"
 
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "询价详情"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr "你对这个供应商已经有个一个 %s 采购单 ,  你必须取消采购订单再创建新的请购单."
+
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
 msgstr "结束日期"
 
-#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
-msgstr "采购的产品"
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Date Ordered"
-msgstr "下单日期"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
 msgstr "采购申请"
 
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "采购的产品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr "发给供应商"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "搜索采购申请"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "No Product in Tender."
+msgstr "没有产品在投标"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "下单日期"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"采购申请(排它的)：确认采购订单，它会取消剩下的采购订单。\n"
+"采购申请(复合的)：它允许有多个采购订单，确认采购订单它不会取消剩下的采购订单。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "取消采购订单"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "采购订单"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr "源单据"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr "错误！"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "请购类型"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr "新的采购申请"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "产品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "订单日期"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "采购申请业务伙伴"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "如果要求你关注新消息，勾选此项"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "采购申请"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "采购订单"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "请购截止日期"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "单号"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "需求单"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr "来源"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "最近的请购"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "主管"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "采购申请(排它的)"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product UoM"
 msgstr "产品计量单位"
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "确认采购订单"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr "取消"
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
@@ -495,30 +458,31 @@ msgid "Requisition Date"
 msgstr "请购日期"
 
 #. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
-msgstr "消息和通信历史"
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "开始日期"
 
 #. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "未分配"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
 msgstr "采购申请"
 
 #. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
-msgstr "请购截止日期"
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box to generates purchase requisition instead of generating "
+"requests for quotation from procurement."
+msgstr "选中此项，产生请购单，而不是生成采购询价单"
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
-msgstr "请购单已经 <b>完成</b>."
-
-#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
-msgstr "主管"
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "采购订单"
 
 #~ msgid "Confirm"
 #~ msgstr "确认"
diff --git a/addons/report_intrastat/i18n/ar.po b/addons/report_intrastat/i18n/ar.po
index f3be9a795ec..b8ec6bc5c03 100644
--- a/addons/report_intrastat/i18n/ar.po
+++ b/addons/report_intrastat/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/bg.po b/addons/report_intrastat/i18n/bg.po
index ae6c1fb7ff2..6fc57226507 100644
--- a/addons/report_intrastat/i18n/bg.po
+++ b/addons/report_intrastat/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 06:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/bs.po b/addons/report_intrastat/i18n/bs.po
index 3b31f7121a4..92c02a5e492 100644
--- a/addons/report_intrastat/i18n/bs.po
+++ b/addons/report_intrastat/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 06:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ca.po b/addons/report_intrastat/i18n/ca.po
index 1380945a7cf..42bfb6d0de5 100644
--- a/addons/report_intrastat/i18n/ca.po
+++ b/addons/report_intrastat/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 14:42+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/cs.po b/addons/report_intrastat/i18n/cs.po
index d99da861029..17d8ccf2cb3 100644
--- a/addons/report_intrastat/i18n/cs.po
+++ b/addons/report_intrastat/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/da.po b/addons/report_intrastat/i18n/da.po
index d87bbb4c953..fcd715fe8a2 100644
--- a/addons/report_intrastat/i18n/da.po
+++ b/addons/report_intrastat/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index 4347d0663aa..471515e627e 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-31 10:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 80318db0df6..a0b2fad15dc 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-28 08:50+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_AR.po b/addons/report_intrastat/i18n/es_AR.po
index b9f908962aa..3b565e14306 100644
--- a/addons/report_intrastat/i18n/es_AR.po
+++ b/addons/report_intrastat/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-23 13:21+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_CR.po b/addons/report_intrastat/i18n/es_CR.po
index 0e7c24dea1d..5e89d28a236 100644
--- a/addons/report_intrastat/i18n/es_CR.po
+++ b/addons/report_intrastat/i18n/es_CR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 00:32+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/et.po b/addons/report_intrastat/i18n/et.po
index 4209d7ecb70..b2495955631 100644
--- a/addons/report_intrastat/i18n/et.po
+++ b/addons/report_intrastat/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 13:36+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/fi.po b/addons/report_intrastat/i18n/fi.po
index e83d924db42..437ada96ba1 100644
--- a/addons/report_intrastat/i18n/fi.po
+++ b/addons/report_intrastat/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 16:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/fr.po b/addons/report_intrastat/i18n/fr.po
index f3e1eaf83e1..678368d9717 100644
--- a/addons/report_intrastat/i18n/fr.po
+++ b/addons/report_intrastat/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 15:42+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 1dd90f85d4a..61cb26637e6 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 09:02+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/hu.po b/addons/report_intrastat/i18n/hu.po
index 5aedb30577f..b5eb1d8b462 100644
--- a/addons/report_intrastat/i18n/hu.po
+++ b/addons/report_intrastat/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-28 14:01+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/id.po b/addons/report_intrastat/i18n/id.po
index a8d2df8a82a..0b0024e1126 100644
--- a/addons/report_intrastat/i18n/id.po
+++ b/addons/report_intrastat/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 06a383fa086..a9ff8b9259b 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-12 15:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ja.po b/addons/report_intrastat/i18n/ja.po
index 4d69285a628..be82cd5724b 100644
--- a/addons/report_intrastat/i18n/ja.po
+++ b/addons/report_intrastat/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-15 23:02+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ko.po b/addons/report_intrastat/i18n/ko.po
index a6bf17b5803..8245dcd3c33 100644
--- a/addons/report_intrastat/i18n/ko.po
+++ b/addons/report_intrastat/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:06+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/lt.po b/addons/report_intrastat/i18n/lt.po
index f02f914f659..044a4cefe6b 100644
--- a/addons/report_intrastat/i18n/lt.po
+++ b/addons/report_intrastat/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/nl.po b/addons/report_intrastat/i18n/nl.po
index 290fbc3589c..73910d08cbd 100644
--- a/addons/report_intrastat/i18n/nl.po
+++ b/addons/report_intrastat/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-30 19:55+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -339,12 +339,6 @@ msgstr "Intrastat-code"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fout: de standaard meeteenheid en de inkoop-meeteenheid moeten in de zelfde "
-#~ "categorie liggen."
-
 #~ msgid "The code of the country must be unique !"
 #~ msgstr "De landcode moet uniek zijn !"
 
@@ -367,3 +361,9 @@ msgstr "Intrastat-code"
 #~ "    Een module die intrastat overzichten toevoegt.\n"
 #~ "    Deze module geeft de details van de goederen die zijn verhandeld tussen "
 #~ "landen binnen de Europese Unie "
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Fout: de standaard maateenheid en de inkoopeenheid moet in de zelfde "
+#~ "categorie liggen."
diff --git a/addons/report_intrastat/i18n/nl_BE.po b/addons/report_intrastat/i18n/nl_BE.po
index 3c4260fc3ab..dab6ab9a997 100644
--- a/addons/report_intrastat/i18n/nl_BE.po
+++ b/addons/report_intrastat/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 12:18+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pl.po b/addons/report_intrastat/i18n/pl.po
index 808e8628cec..0966b63081a 100644
--- a/addons/report_intrastat/i18n/pl.po
+++ b/addons/report_intrastat/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-03-29 19:03+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pt.po b/addons/report_intrastat/i18n/pt.po
index f50c7029344..cc26da7128f 100644
--- a/addons/report_intrastat/i18n/pt.po
+++ b/addons/report_intrastat/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-15 13:07+0000\n"
 "Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 47457f0f784..3945d8a41cd 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-25 01:02+0000\n"
 "Last-Translator: Emerson <Unknown>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ro.po b/addons/report_intrastat/i18n/ro.po
index 836da500235..6a3fcdb898e 100644
--- a/addons/report_intrastat/i18n/ro.po
+++ b/addons/report_intrastat/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po
index 7b59df0046d..d53118c47e6 100644
--- a/addons/report_intrastat/i18n/ru.po
+++ b/addons/report_intrastat/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-01 12:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sl.po b/addons/report_intrastat/i18n/sl.po
index cf2e05949d0..b90243218cc 100644
--- a/addons/report_intrastat/i18n/sl.po
+++ b/addons/report_intrastat/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sq.po b/addons/report_intrastat/i18n/sq.po
index 34c20aa6255..8920d676df0 100644
--- a/addons/report_intrastat/i18n/sq.po
+++ b/addons/report_intrastat/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index dc2b45d11db..801ba20c276 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-16 15:22+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/tlh.po b/addons/report_intrastat/i18n/tlh.po
index 3bfbeb22820..b10dcf6bf38 100644
--- a/addons/report_intrastat/i18n/tlh.po
+++ b/addons/report_intrastat/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index ed2217dd537..8b9ae45459d 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 17:35+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/uk.po b/addons/report_intrastat/i18n/uk.po
index e506b2b0daf..537dbd4f62b 100644
--- a/addons/report_intrastat/i18n/uk.po
+++ b/addons/report_intrastat/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 14:51+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/vi.po b/addons/report_intrastat/i18n/vi.po
index f4b656407a3..7599c4f30e0 100644
--- a/addons/report_intrastat/i18n/vi.po
+++ b/addons/report_intrastat/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-20 00:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index 769333d2aea..9cd7bd9d6ea 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 13:39+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_TW.po b/addons/report_intrastat/i18n/zh_TW.po
index e09d92016b8..9a8dc303d45 100644
--- a/addons/report_intrastat/i18n/zh_TW.po
+++ b/addons/report_intrastat/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:19+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_webkit/i18n/ar.po b/addons/report_webkit/i18n/ar.po
index 82e294e7617..0d7b4442db0 100644
--- a/addons/report_webkit/i18n/ar.po
+++ b/addons/report_webkit/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 05:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr ""
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "شركة"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr ""
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr ""
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -329,7 +319,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -375,7 +365,7 @@ msgid "Right Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -386,11 +376,8 @@ msgid "Orientation"
 msgstr "تنسيق"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
 msgstr ""
 
 #. module: report_webkit
@@ -430,7 +417,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -498,7 +485,7 @@ msgid "Left Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "خطأ!"
@@ -519,7 +506,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/bg.po b/addons/report_webkit/i18n/bg.po
index df511221173..7bd4a34493e 100644
--- a/addons/report_webkit/i18n/bg.po
+++ b/addons/report_webkit/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-27 18:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Фирма"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -329,7 +319,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -375,7 +365,7 @@ msgid "Right Margin (mm)"
 msgstr "Дясна граница (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -386,12 +376,9 @@ msgid "Orientation"
 msgstr "Ориентация"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -430,7 +417,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -498,7 +485,7 @@ msgid "Left Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -519,7 +506,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/ca.po b/addons/report_webkit/i18n/ca.po
index 724c400fa27..beb332cbf82 100644
--- a/addons/report_webkit/i18n/ca.po
+++ b/addons/report_webkit/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-17 20:54+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Plantilla WebKit (utilitzada si el fitxer de l'informe no existeix)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloide 29 279,4 x 431,8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Ruta executable WebKit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Llibre 28 431,8 x 279,4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "No hi ha capçalera definida per a aquest informe de Webkit !"
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Companyia"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8,26 x 11,69 pulgades"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -335,7 +325,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -381,7 +371,7 @@ msgid "Right Margin (mm)"
 msgstr "Marge dret (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -392,12 +382,9 @@ msgid "Orientation"
 msgstr "Orientació"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -436,7 +423,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -504,7 +491,7 @@ msgid "Left Margin (mm)"
 msgstr "Marge esquerra (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -525,7 +512,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.accions.informe.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -542,6 +529,9 @@ msgstr ""
 #~ msgid "WebKit Header"
 #~ msgstr "Capçalera WebKit"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Ruta executable WebKit"
+
 #~ msgid "Header IMG"
 #~ msgstr "Imatge capçalera"
 
diff --git a/addons/report_webkit/i18n/da.po b/addons/report_webkit/i18n/da.po
index 583bc38c73a..2cd7e8ea28d 100644
--- a/addons/report_webkit/i18n/da.po
+++ b/addons/report_webkit/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr ""
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr ""
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr ""
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -329,7 +319,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -375,7 +365,7 @@ msgid "Right Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -386,11 +376,8 @@ msgid "Orientation"
 msgstr ""
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
 msgstr ""
 
 #. module: report_webkit
@@ -430,7 +417,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -498,7 +485,7 @@ msgid "Left Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -519,7 +506,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index d50e5e1d2d7..8c1422f5c10 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:28+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
@@ -28,18 +28,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Webkit Programmpfad."
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Kopf für diese Webkit Bericht fehlt"
@@ -73,7 +68,7 @@ msgid "Company"
 msgstr "Unternehmen"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -121,12 +116,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr "WebKit Fehler"
@@ -137,11 +127,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr "WebKit Anzeige!"
@@ -344,7 +334,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr "Der Befehl 'wkhtmltopdf' scheiterte mit dem Code = %s. Meldung: %s"
@@ -390,7 +380,7 @@ msgid "Right Margin (mm)"
 msgstr "Rechter Rand (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr "Webkit Report Vorlage nicht gefunden!"
@@ -401,15 +391,9 @@ msgid "Orientation"
 msgstr "Ausrichtung"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Der vollständige Pfad zur auszuführenden wkhtmltopdf Datei. Version 0.9.9 "
-"ist notwendig. \r\n"
-"Installieren Sie eine statische Version, wenn Kopf oder Fusszeilen fehlen."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -448,7 +432,7 @@ msgid "Webkit Logos"
 msgstr "Webkit Logos"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr "Es gibt keine Diagnose Meldung."
@@ -516,7 +500,7 @@ msgid "Left Margin (mm)"
 msgstr "Linker Rand (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -537,7 +521,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr "Die folgende Diagnose Meldung wurde erzeugt.\n"
@@ -553,6 +537,9 @@ msgstr "HTML Kopf"
 #~ msgid "Header IMG"
 #~ msgstr "Kopftext Bild"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Webkit Programmpfad."
+
 #, python-format
 #~ msgid "path to Wkhtmltopdf is not absolute"
 #~ msgstr "Pfad zu wkhtmltopdf ist nicht absolut"
@@ -719,3 +706,12 @@ msgstr "HTML Kopf"
 
 #~ msgid "The company name must be unique !"
 #~ msgstr "Der Unternehmensname muss eindeutig sein!"
+
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Der vollständige Pfad zur auszuführenden wkhtmltopdf Datei. Version 0.9.9 "
+#~ "ist notwendig. \r\n"
+#~ "Installieren Sie eine statische Version, wenn Kopf oder Fusszeilen fehlen."
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index bb9cabc8967..85745d002a8 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 23:01+0000\n"
 "Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Plantilla WebKit (utilizada si el archivo del informe no existe)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloide 29 279,4 x 431,8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Ruta ejecutable WebKit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Libro 28 431,8 x 279,4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "¡ Ninguna cabecera definida para este informe de Webkit !"
@@ -72,7 +67,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr "Por favor, ponga una cabecera en ajustes de la compañia."
@@ -119,12 +114,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8,26 x 11,69 pulgadas"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr "Error Webkit"
@@ -135,11 +125,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr "Motor de renderizado Webit!"
@@ -343,7 +333,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -391,7 +381,7 @@ msgid "Right Margin (mm)"
 msgstr "Margen derecho (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr "¡La plantilla del informe webkit no ha sido encontrada!"
@@ -402,15 +392,9 @@ msgid "Orientation"
 msgstr "Orientación"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Ruta completa al archivo ejecutable wkhtmltopdf. Se requiere la versión "
-"0.9.9. Instale una versión estática de la librería si experimenta pérdidas "
-"del encabezado o pie de página en Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -449,7 +433,7 @@ msgid "Webkit Logos"
 msgstr "Logos de Webkit"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr "No se ha obtenido ningún mensaje de diagnóstico"
@@ -517,7 +501,7 @@ msgid "Left Margin (mm)"
 msgstr "Margen izquierdo (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -538,7 +522,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.acciones.informe.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr "Se ha obtenido el siguiente mensaje de diagnóstico:\n"
@@ -551,6 +535,9 @@ msgstr "Cabecera HTML"
 #~ msgid "WebKit Header"
 #~ msgstr "Cabecera WebKit"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Ruta ejecutable WebKit"
+
 #~ msgid "Header IMG"
 #~ msgstr "Imagen cabecera"
 
@@ -720,5 +707,14 @@ msgstr "Cabecera HTML"
 #~ msgid "Footer"
 #~ msgstr "Pie de página"
 
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Ruta completa al archivo ejecutable wkhtmltopdf. Se requiere la versión "
+#~ "0.9.9. Instale una versión estática de la librería si experimenta pérdidas "
+#~ "del encabezado o pie de página en Linux."
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "¡El nombre de la compañía debe ser único!"
diff --git a/addons/report_webkit/i18n/es_CR.po b/addons/report_webkit/i18n/es_CR.po
index 76283685afb..3e33b878e5f 100644
--- a/addons/report_webkit/i18n/es_CR.po
+++ b/addons/report_webkit/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:08+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: report_webkit
@@ -28,18 +28,13 @@ msgstr "Plantilla WebKit (utilizada si el archivo del informe no existe)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloide 29 279,4 x 431,8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Ruta ejecutable WebKit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Libro 28 431,8 x 279,4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "¡ Ninguna cabecera definida para este informe de Webkit !"
@@ -73,7 +68,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -120,12 +115,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8,26 x 11,69 pulgadas"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -136,11 +126,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -339,7 +329,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -385,7 +375,7 @@ msgid "Right Margin (mm)"
 msgstr "Margen derecho (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -396,15 +386,9 @@ msgid "Orientation"
 msgstr "Orientación"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Ruta de acceso completa al archivo ejecutable wkhtmltopdf. Versión 0.9.9 se "
-"requiere. Instalar una versión estática de la biblioteca si experimenta "
-"falta de cabecera / pie de página en Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -443,7 +427,7 @@ msgid "Webkit Logos"
 msgstr "Logos Webkit"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -511,7 +495,7 @@ msgid "Left Margin (mm)"
 msgstr "Margen izquierdo (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -532,7 +516,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.acciones.informe.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -542,6 +526,9 @@ msgstr ""
 msgid "HTML Header"
 msgstr ""
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Ruta ejecutable WebKit"
+
 #, python-format
 #~ msgid "path to Wkhtmltopdf is not absolute"
 #~ msgstr "La ruta a Wkhtmltopdf no es absoluta"
@@ -714,5 +701,14 @@ msgstr ""
 #~ msgid "Footer"
 #~ msgstr "Pie de página"
 
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Ruta de acceso completa al archivo ejecutable wkhtmltopdf. Versión 0.9.9 se "
+#~ "requiere. Instalar una versión estática de la biblioteca si experimenta "
+#~ "falta de cabecera / pie de página en Linux."
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "¡El nombre de la compañía debe ser único!"
diff --git a/addons/report_webkit/i18n/fi.po b/addons/report_webkit/i18n/fi.po
index 0199327b558..0c51b72e51d 100644
--- a/addons/report_webkit/i18n/fi.po
+++ b/addons/report_webkit/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-07-21 08:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Webkit-mallipohja (käytetään jos raporttitiedostoa ei löydy)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279,4 x 431,8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Webkitin ohjelmatiedoston polku"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger 28 431,8 x 279,4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Tälle Webkit raportille ei ole määritelty yläotsikkoa"
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Yritys"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8,26 x 11,69 tuumaa"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -331,7 +321,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -377,7 +367,7 @@ msgid "Right Margin (mm)"
 msgstr "Oikean reunan marginaali (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -388,12 +378,9 @@ msgid "Orientation"
 msgstr "Suunta"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -432,7 +419,7 @@ msgid "Webkit Logos"
 msgstr "Webkit logot"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -500,7 +487,7 @@ msgid "Left Margin (mm)"
 msgstr "Vasemman reunan marginaali (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Virhe!"
@@ -521,7 +508,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -567,6 +554,9 @@ msgstr ""
 #~ msgid "Header IMG"
 #~ msgstr "Yläotsikon kuva"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Webkitin ohjelmatiedoston polku"
+
 #~ msgid "Company and Page Setup"
 #~ msgstr "Yrityksen ja sivun asetukset"
 
diff --git a/addons/report_webkit/i18n/fr.po b/addons/report_webkit/i18n/fr.po
index f378ff4646c..d5bfa7e321d 100644
--- a/addons/report_webkit/i18n/fr.po
+++ b/addons/report_webkit/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 22:56+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Modèle WebKit (utilisé si le rapport n'est pas trouvé)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Format tabloïd 29 279,4 x 431,8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Chemin de l'exécutable Webkit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Format livre 28 431,8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Pas d'en-tête définie pour ce rapport Webkit !"
@@ -72,7 +67,7 @@ msgid "Company"
 msgstr "Société"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -119,12 +114,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 pouces"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -135,11 +125,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -336,7 +326,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -382,7 +372,7 @@ msgid "Right Margin (mm)"
 msgstr "Marge de droite (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -393,15 +383,9 @@ msgid "Orientation"
 msgstr "Orientation"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Chemin complet vers le fichier exécutable wkhtmltopdf. La version 0.9.9 est "
-"requise. Installez une version statique de la bibliothèque d'en-tête / pied "
-"de page sur Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -440,7 +424,7 @@ msgid "Webkit Logos"
 msgstr "Logos pour Webkit"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -508,7 +492,7 @@ msgid "Left Margin (mm)"
 msgstr "Marge de gauche (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Erreur !"
@@ -529,7 +513,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -549,6 +533,9 @@ msgstr ""
 #~ msgid "path to Wkhtmltopdf is not absolute"
 #~ msgstr "Le chemin vers Wkhtmltopdf n'est pas absolu"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Chemin de l'exécutable Webkit"
+
 #, python-format
 #~ msgid "Webkit raise an error"
 #~ msgstr "Webkit a retourné une erreur"
@@ -709,3 +696,12 @@ msgstr ""
 
 #~ msgid "Company and Page Setup"
 #~ msgstr "Configuration de la société et de la mise en page"
+
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Chemin complet vers le fichier exécutable wkhtmltopdf. La version 0.9.9 est "
+#~ "requise. Installez une version statique de la bibliothèque d'en-tête / pied "
+#~ "de page sur Linux."
diff --git a/addons/report_webkit/i18n/hr.po b/addons/report_webkit/i18n/hr.po
index 23d37334cc6..e77bd29c83e 100644
--- a/addons/report_webkit/i18n/hr.po
+++ b/addons/report_webkit/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-11 21:52+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Predložak Webkita (koristi se ako datoteka izvještaja nije nađena)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr ""
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Webkit izvršna putanja"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Organizacija"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -334,7 +324,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -380,7 +370,7 @@ msgid "Right Margin (mm)"
 msgstr "Desna margina (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -391,12 +381,9 @@ msgid "Orientation"
 msgstr "Orijentacija"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -435,7 +422,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -503,7 +490,7 @@ msgid "Left Margin (mm)"
 msgstr "Lijeva margina (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -524,7 +511,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -541,6 +528,9 @@ msgstr ""
 #~ msgid "WebKit Header"
 #~ msgstr "Zaglavlje Webkita"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Webkit izvršna putanja"
+
 #, python-format
 #~ msgid "Webkit raise an error"
 #~ msgstr "Webkit je uzrokovao grešku"
diff --git a/addons/report_webkit/i18n/hu.po b/addons/report_webkit/i18n/hu.po
index 85f0a893a13..b0f647f2216 100644
--- a/addons/report_webkit/i18n/hu.po
+++ b/addons/report_webkit/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-26 10:12+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -26,18 +26,13 @@ msgstr "WebKit sablon (használja ezt, ha jelentésfájl nem található)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -68,7 +63,7 @@ msgid "Company"
 msgstr "Vállalat"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -115,12 +110,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inch"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -131,11 +121,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -328,7 +318,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -374,7 +364,7 @@ msgid "Right Margin (mm)"
 msgstr "Jobb margó (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -385,12 +375,9 @@ msgid "Orientation"
 msgstr "Tájolás"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -429,7 +416,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -497,7 +484,7 @@ msgid "Left Margin (mm)"
 msgstr "Bal margó (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -518,7 +505,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/it.po b/addons/report_webkit/i18n/it.po
index 982d07391d9..44b9792d70d 100644
--- a/addons/report_webkit/i18n/it.po
+++ b/addons/report_webkit/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 23:01+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Template webkit (usato se il file del report non è trovato)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Percorso eseguibile webkit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger 28 431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Nessuna intestazione definita per questo report Webkit!"
@@ -72,7 +67,7 @@ msgid "Company"
 msgstr "Azienda"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr "Si prega di impostare l'intestazione nelle configurazioni aziendali."
@@ -119,12 +114,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr "Errore Webkit"
@@ -135,11 +125,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr "Renderizzazione Webkit!"
@@ -342,7 +332,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr "Comando 'wkhtmltopdf' fallito con codice errore = %s. Messaggio %s"
@@ -388,7 +378,7 @@ msgid "Right Margin (mm)"
 msgstr "Margine destro (mm.)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr "Modello di report Webkit non trovato!"
@@ -399,15 +389,9 @@ msgid "Orientation"
 msgstr "Orientamento"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Percorso completo al file eseguibile wkhtmltopdf. È richiesta la versione "
-"0.9.9. Installare una versione statica della libreria nel caso si "
-"riscontrino intestazioni/piè di pagina mancanti su Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -446,7 +430,7 @@ msgid "Webkit Logos"
 msgstr "Loghi Webkit"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr "Nessun messaggio di diagnosi è stato fornito"
@@ -514,7 +498,7 @@ msgid "Left Margin (mm)"
 msgstr "Margine sinistro (mm.)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -535,7 +519,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr "Il seguente messaggio di diagnosi è stato fornito:\n"
@@ -592,6 +576,9 @@ msgstr "Intestazione HTML"
 #~ msgid "Please set a header in company settings"
 #~ msgstr "Prego impostare una intestazione nei settaggi dell'azienda"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Percorso eseguibile webkit"
+
 #, python-format
 #~ msgid "Webkit render"
 #~ msgstr "Render webkit"
@@ -605,3 +592,12 @@ msgstr "Intestazione HTML"
 #, python-format
 #~ msgid "Webkit Report template not found !"
 #~ msgstr "Template report webkit non trovato!"
+
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Percorso completo al file eseguibile wkhtmltopdf. È richiesta la versione "
+#~ "0.9.9. Installare una versione statica della libreria nel caso si "
+#~ "riscontrino intestazioni/piè di pagina mancanti su Linux."
diff --git a/addons/report_webkit/i18n/ja.po b/addons/report_webkit/i18n/ja.po
index 25417260c90..11bf18003e0 100644
--- a/addons/report_webkit/i18n/ja.po
+++ b/addons/report_webkit/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 00:51+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "WebKitテンプレート（レポートファイルが見つからない
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "タブロイド 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "WebKit実行可能ファイルのパス"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "レジャー 28 431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "WebKit"
@@ -70,7 +65,7 @@ msgid "Company"
 msgstr "会社"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -117,12 +112,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8.26 x 11.69 インチ"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr ""
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -133,11 +123,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -330,7 +320,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -376,7 +366,7 @@ msgid "Right Margin (mm)"
 msgstr "右余白（mm）"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -387,14 +377,9 @@ msgid "Orientation"
 msgstr "向き"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
 msgstr ""
-"wkhtmltopdf 実行可能ファイルへのフルパス。バージョン 0.9.9 が必須です。Linuxでヘッダー / "
-"フッターの欠落を経験するなら、ライブラリは静的なバージョンをインストールします。"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -433,7 +418,7 @@ msgid "Webkit Logos"
 msgstr "WebKitロゴ"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -501,7 +486,7 @@ msgid "Left Margin (mm)"
 msgstr "左余白（mm）"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "エラー"
@@ -522,7 +507,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -540,6 +525,9 @@ msgstr ""
 #~ msgid "path to Wkhtmltopdf is not absolute"
 #~ msgstr "Wkhtmltopdfへのパスが絶対パスではありません。"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "WebKit実行可能ファイルのパス"
+
 #, python-format
 #~ msgid "Webkit raise an error"
 #~ msgstr "WebKitはエラーを起こしました。"
@@ -602,5 +590,13 @@ msgstr ""
 #~ msgid "CSS Style"
 #~ msgstr "CSSスタイル"
 
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "wkhtmltopdf 実行可能ファイルへのフルパス。バージョン 0.9.9 が必須です。Linuxでヘッダー / "
+#~ "フッターの欠落を経験するなら、ライブラリは静的なバージョンをインストールします。"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "会社名は固有でなければいけません。"
diff --git a/addons/report_webkit/i18n/nl.po b/addons/report_webkit/i18n/nl.po
index 36690ce0ddb..d282b654168 100644
--- a/addons/report_webkit/i18n/nl.po
+++ b/addons/report_webkit/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-13 15:35+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -28,18 +28,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Webkit uitvoering pad"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Geen koptekst gedefinieerd voor dit Webkit rapport!"
@@ -72,7 +67,7 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -119,12 +114,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -135,11 +125,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -336,7 +326,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -382,7 +372,7 @@ msgid "Right Margin (mm)"
 msgstr "Rechtermarge (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -393,15 +383,9 @@ msgid "Orientation"
 msgstr "Afdrukstand"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Volledig pad naar het wkhtmltopdf executable bestand. Versie 0.9.9 is "
-"vereist. Installeer een statische versie van de bibliotheek indien er "
-"ontbrekende kopteksten/voetteksten zijn onder Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -440,7 +424,7 @@ msgid "Webkit Logos"
 msgstr "Webkit Logos"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -508,7 +492,7 @@ msgid "Left Margin (mm)"
 msgstr "Linkermarge (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -529,7 +513,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -543,6 +527,9 @@ msgstr ""
 #~ msgid "path to Wkhtmltopdf is not absolute"
 #~ msgstr "pad naar Wkhtmltopdf is niet absoluut"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Webkit uitvoering pad"
+
 #~ msgid "Header IMG"
 #~ msgstr "Kop afbeelding"
 
@@ -715,6 +702,15 @@ msgstr ""
 #~ msgid "The company name must be unique !"
 #~ msgstr "De naam van het bedrijf moet uniek zijn!"
 
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Volledig pad naar het wkhtmltopdf executable bestand. Versie 0.9.9 is "
+#~ "vereist. Installeer een statische versie van de bibliotheek indien er "
+#~ "ontbrekende kopteksten/voetteksten zijn onder Linux."
+
 #, python-format
 #~ msgid "Webkit Report template not found !"
 #~ msgstr "WebKit rapportsjabloon niet gevonden !"
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
index 0b51d897fed..867085ee751 100644
--- a/addons/report_webkit/i18n/pl.po
+++ b/addons/report_webkit/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-28 09:14+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Szablon Webkit (stosowany nie znaleziono pliku raportu)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr ""
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Ścieżka plików wykonywalnych Webkit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr ""
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr ""
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -334,7 +324,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -380,7 +370,7 @@ msgid "Right Margin (mm)"
 msgstr "Prawy margines (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -391,11 +381,8 @@ msgid "Orientation"
 msgstr "Orientacja"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
 msgstr ""
 
 #. module: report_webkit
@@ -435,7 +422,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -503,7 +490,7 @@ msgid "Left Margin (mm)"
 msgstr "Lewy margines (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -524,7 +511,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -537,6 +524,9 @@ msgstr ""
 #~ msgid "WebKit Header"
 #~ msgstr "Nagłówek Webkit"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Ścieżka plików wykonywalnych Webkit"
+
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
 
diff --git a/addons/report_webkit/i18n/pt.po b/addons/report_webkit/i18n/pt.po
index 6bc54b16645..634cbda0675 100644
--- a/addons/report_webkit/i18n/pt.po
+++ b/addons/report_webkit/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-12 09:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloide 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8.26 x 11.69 polegadas"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -329,7 +319,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -375,7 +365,7 @@ msgid "Right Margin (mm)"
 msgstr "Margem direita (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -386,12 +376,9 @@ msgid "Orientation"
 msgstr "Orientação da página"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -430,7 +417,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -498,7 +485,7 @@ msgid "Left Margin (mm)"
 msgstr "Margem esquerda (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Erro !"
@@ -519,7 +506,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/pt_BR.po b/addons/report_webkit/i18n/pt_BR.po
index 81eabb89d02..e432d054ece 100644
--- a/addons/report_webkit/i18n/pt_BR.po
+++ b/addons/report_webkit/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-04 00:40+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr ""
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 polegadas"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -330,7 +320,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -376,7 +366,7 @@ msgid "Right Margin (mm)"
 msgstr "Margem Direita (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -387,12 +377,9 @@ msgid "Orientation"
 msgstr "Orientação"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -431,7 +418,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -499,7 +486,7 @@ msgid "Left Margin (mm)"
 msgstr "Margem Esquerda (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -520,7 +507,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/ro.po b/addons/report_webkit/i18n/ro.po
index 353ce6d300c..a0a1d783f26 100644
--- a/addons/report_webkit/i18n/ro.po
+++ b/addons/report_webkit/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-12 20:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Sablon Webkit (folosit daca nu gasiti Fisierul Raport)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Traseu executabil Webkit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Registru 28 431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Nu exista nici un antet definit pentru acest raport Webkit!"
@@ -72,7 +67,7 @@ msgid "Company"
 msgstr "Companie"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -119,12 +114,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 mm, 8.26 x 11.69 inci"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -135,11 +125,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -338,7 +328,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -384,7 +374,7 @@ msgid "Right Margin (mm)"
 msgstr "Marginea din dreapta (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -395,15 +385,9 @@ msgid "Orientation"
 msgstr "Orientare"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Traseu complet catre fisierul executabil wkhtmltopdf. Este necesara "
-"versiunea 0.9.9. Instalati o versiune statica din biblioteca daca aveti "
-"probleme cu lipsa antetului/subsolului paginii on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -442,7 +426,7 @@ msgid "Webkit Logos"
 msgstr "Logo-uri Webkit"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -510,7 +494,7 @@ msgid "Left Margin (mm)"
 msgstr "Marginea din stanga (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Eroare!"
@@ -531,7 +515,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml (ir.actiuni.raport.xml)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -544,6 +528,9 @@ msgstr ""
 #~ msgid "WebKit Header"
 #~ msgstr "Antet WebKit"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Traseu executabil Webkit"
+
 #~ msgid "Header IMG"
 #~ msgstr "Antet IMG"
 
@@ -711,6 +698,15 @@ msgstr ""
 #~ msgid "Header"
 #~ msgstr "Antet"
 
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Traseu complet catre fisierul executabil wkhtmltopdf. Este necesara "
+#~ "versiunea 0.9.9. Instalati o versiune statica din biblioteca daca aveti "
+#~ "probleme cu lipsa antetului/subsolului paginii on Linux."
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "Numele companiei trebuie să fie unic !"
 
diff --git a/addons/report_webkit/i18n/ru.po b/addons/report_webkit/i18n/ru.po
index ec2e1956c7a..68807df1ab0 100644
--- a/addons/report_webkit/i18n/ru.po
+++ b/addons/report_webkit/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 07:19+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Шаблон Webkit (используется если файл отчё
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 мм"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Путь к исполняемому файлу Webkit"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 мм"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "Неопределен заголовок для этого отчёта Webkit!"
@@ -72,7 +67,7 @@ msgid "Company"
 msgstr "Компания"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -119,12 +114,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 мм, 8.26 x 11.69 дюймов"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 мм"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -135,11 +125,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 мм"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -336,7 +326,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 мм"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -382,7 +372,7 @@ msgid "Right Margin (mm)"
 msgstr "Правое поле (мм)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -393,15 +383,9 @@ msgid "Orientation"
 msgstr "Ориентация"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
-"Полный путь к исполняемому файлу wkhtmltopdf. Требуется версия 0.9.9. "
-"Установите статическую версию библиотеки, если вы обнаружили пропуск "
-"верхнего/нижнего колонтитула на Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 мм"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -440,7 +424,7 @@ msgid "Webkit Logos"
 msgstr "Логотипы Webkit"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -508,7 +492,7 @@ msgid "Left Margin (mm)"
 msgstr "Левое поле (мм)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -529,7 +513,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
@@ -543,6 +527,9 @@ msgstr ""
 #~ msgid "path to Wkhtmltopdf is not absolute"
 #~ msgstr "путь к Wkhtmltopdf не абсолютный"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Путь к исполняемому файлу Webkit"
+
 #, python-format
 #~ msgid "Webkit raise an error"
 #~ msgstr "Webkit вызвал ошибку"
@@ -606,6 +593,15 @@ msgstr ""
 #~ msgid "CSS Style"
 #~ msgstr "CSS стиль"
 
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr ""
+#~ "Полный путь к исполняемому файлу wkhtmltopdf. Требуется версия 0.9.9. "
+#~ "Установите статическую версию библиотеки, если вы обнаружили пропуск "
+#~ "верхнего/нижнего колонтитула на Linux."
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "Название компании должно быть уникальным!"
 
diff --git a/addons/report_webkit/i18n/sv.po b/addons/report_webkit/i18n/sv.po
index 53bcd1c6ccd..e7e545658db 100644
--- a/addons/report_webkit/i18n/sv.po
+++ b/addons/report_webkit/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-27 10:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Webkitmall (används då rapportfil saknas)"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 mm"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Bolag"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6  20  125 x 176 mm"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2  17  500 x 707 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -329,7 +319,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8  22  62 x 88 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -375,7 +365,7 @@ msgid "Right Margin (mm)"
 msgstr "Högermarginal (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -386,12 +376,9 @@ msgid "Orientation"
 msgstr "Orientering"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr ""
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -430,7 +417,7 @@ msgid "Webkit Logos"
 msgstr "Webkit-loggor"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -498,7 +485,7 @@ msgid "Left Margin (mm)"
 msgstr "Vänstermarginal (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "Fel!"
@@ -519,7 +506,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/tr.po b/addons/report_webkit/i18n/tr.po
index ccf22ffa2f8..bc7eb06a25c 100644
--- a/addons/report_webkit/i18n/tr.po
+++ b/addons/report_webkit/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 17:36+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr ""
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr ""
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "Şirket"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr ""
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr ""
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr ""
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr ""
@@ -329,7 +319,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr ""
@@ -375,7 +365,7 @@ msgid "Right Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr ""
@@ -386,11 +376,8 @@ msgid "Orientation"
 msgstr ""
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
 msgstr ""
 
 #. module: report_webkit
@@ -430,7 +417,7 @@ msgid "Webkit Logos"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr ""
@@ -498,7 +485,7 @@ msgid "Left Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -519,7 +506,7 @@ msgid "ir.actions.report.xml"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr ""
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index 0cf5489cf55..00d9277e4a7 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 15:45+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -27,18 +27,13 @@ msgstr "Webkit的模板（用于没有找到报表文件）"
 msgid "Tabloid 29 279.4 x 431.8 mm"
 msgstr "Tabloid 29 279.4 x 431.8 毫米"
 
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr "Webkit的可执行路径"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger 28431.8 x 279.4 毫米"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr "这个Webkit报表没定义页头"
@@ -69,7 +64,7 @@ msgid "Company"
 msgstr "公司"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
 msgstr "请在公司设置里设定页眉"
@@ -116,12 +111,7 @@ msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
 msgstr "A4 0 210 x 297 毫米, 8.26 x 11.69 英寸"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6  20  125 x 176 mm"
-msgstr "B6 20 125 x 176 毫米"
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
 msgstr "Webkit 错误"
@@ -132,11 +122,11 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 毫米"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
 msgstr "Webkit 渲染！"
@@ -333,7 +323,7 @@ msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 毫米"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
 msgstr "命令'wkhtmltopdf'失败，错误代码=%s，  消息: %s"
@@ -379,7 +369,7 @@ msgid "Right Margin (mm)"
 msgstr "右边距（毫米）"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Webkit report template not found!"
 msgstr "Webkit 报表模版没找到！"
@@ -390,12 +380,9 @@ msgid "Orientation"
 msgstr "定位"
 
 #. module: report_webkit
-#: help:res.company,lib_path:0
-msgid ""
-"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
-"Install a static version of the library if you experience missing "
-"header/footers on Linux."
-msgstr "wkhtmltopdf 执行文件的全路径，要求版本 0.9.9  。如果你在Linux遇到找不到页眉/页脚，安装一个静态库版本，"
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 毫米"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -434,7 +421,7 @@ msgid "Webkit Logos"
 msgstr "Webkit 标志"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
 #, python-format
 msgid "No diagnosis message was provided"
 msgstr "没有诊断信息提供"
@@ -502,7 +489,7 @@ msgid "Left Margin (mm)"
 msgstr "左边距（毫米）"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -523,7 +510,7 @@ msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
 #, python-format
 msgid "The following diagnosis message was provided:\n"
 msgstr "下面的诊断信息被提供\n"
@@ -533,6 +520,9 @@ msgstr "下面的诊断信息被提供\n"
 msgid "HTML Header"
 msgstr "HTML 页眉"
 
+#~ msgid "Webkit Executable Path"
+#~ msgstr "Webkit的可执行路径"
+
 #, python-format
 #~ msgid "Webkit raise an error"
 #~ msgstr "Webkit的出现错误"
@@ -689,3 +679,9 @@ msgstr "HTML 页眉"
 
 #~ msgid "The company name must be unique !"
 #~ msgstr "公司名必须唯一！"
+
+#~ msgid ""
+#~ "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+#~ "Install a static version of the library if you experience missing "
+#~ "header/footers on Linux."
+#~ msgstr "wkhtmltopdf 执行文件的全路径，要求版本 0.9.9  。如果你在Linux遇到找不到页眉/页脚，安装一个静态库版本，"
diff --git a/addons/resource/i18n/ar.po b/addons/resource/i18n/ar.po
index f286e2bd155..e4fe993444a 100644
--- a/addons/resource/i18n/ar.po
+++ b/addons/resource/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr "الموارد"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "خطأ في الإعدادات!"
diff --git a/addons/resource/i18n/bg.po b/addons/resource/i18n/bg.po
index ed63e163e7e..3eb1ff4c727 100644
--- a/addons/resource/i18n/bg.po
+++ b/addons/resource/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr "Ресурси"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,7 +327,7 @@ msgid "(vacation)"
 msgstr "(ваканция)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/ca.po b/addons/resource/i18n/ca.po
index 1004ea08ef8..8de8c136386 100644
--- a/addons/resource/i18n/ca.po
+++ b/addons/resource/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -335,7 +335,7 @@ msgid "(vacation)"
 msgstr "(vacances)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/cs.po b/addons/resource/i18n/cs.po
index 645a113093c..8541accaa51 100644
--- a/addons/resource/i18n/cs.po
+++ b/addons/resource/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:19+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: resource
@@ -91,14 +91,14 @@ msgid "Resources"
 msgstr "Zdroje"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 "Ujistěte se, že pracovní doba byla nastavena se správnými dny v týdnu!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -337,7 +337,7 @@ msgid "(vacation)"
 msgstr "(dovolená)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Chyba nastavení!"
diff --git a/addons/resource/i18n/da.po b/addons/resource/i18n/da.po
index 89d8fcbf494..68aaac82c9b 100644
--- a/addons/resource/i18n/da.po
+++ b/addons/resource/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 7201e547a7d..cea45c2231d 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 19:00+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -91,14 +91,14 @@ msgid "Resources"
 msgstr "Ressourcen"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 "Überprüfen Sie, dass die Arbeitszeit zu den richtigen Wochentagen passt!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
@@ -342,7 +342,7 @@ msgid "(vacation)"
 msgstr "(Ferien)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfehler !"
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 307eb791da5..720c2168c71 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:04+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 "la semana adecuados!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -342,7 +342,7 @@ msgid "(vacation)"
 msgstr "(ausencia)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
diff --git a/addons/resource/i18n/es_CR.po b/addons/resource/i18n/es_CR.po
index b0093b1d3c7..060d3dbe9bf 100644
--- a/addons/resource/i18n/es_CR.po
+++ b/addons/resource/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:10+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: resource
@@ -91,7 +91,7 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -99,7 +99,7 @@ msgstr ""
 "semana de verdad!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "(vacation)"
 msgstr "(ausencia)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
diff --git a/addons/resource/i18n/es_EC.po b/addons/resource/i18n/es_EC.po
index cccb7719fe4..f6b5d8a3752 100644
--- a/addons/resource/i18n/es_EC.po
+++ b/addons/resource/i18n/es_EC.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-16 03:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -334,7 +334,7 @@ msgid "(vacation)"
 msgstr "(ausencia)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/et.po b/addons/resource/i18n/et.po
index 402e9dca271..06ee5b2fb3d 100644
--- a/addons/resource/i18n/et.po
+++ b/addons/resource/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:22+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr "Ressursid"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/fi.po b/addons/resource/i18n/fi.po
index 8eda1503537..806a190a89d 100644
--- a/addons/resource/i18n/fi.po
+++ b/addons/resource/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Resurssit"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr "Varmista että työaika on määritelty oikeille työpäiville!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -334,7 +334,7 @@ msgid "(vacation)"
 msgstr "(loma)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfiguraatio virhe!"
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index a10fc0a0e56..cfa3aa54c0e 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 10:59+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgid "Resources"
 msgstr "Ressources"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 "la semaine !"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -336,7 +336,7 @@ msgid "(vacation)"
 msgstr "(vacances)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erreur de paramétrage !"
diff --git a/addons/resource/i18n/gl.po b/addons/resource/i18n/gl.po
index 25a52713ec4..70b28ea1aea 100644
--- a/addons/resource/i18n/gl.po
+++ b/addons/resource/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "(vacation)"
 msgstr "(vacación)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index 5a984800b9a..b5e526ce187 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:53+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Resursi"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -332,7 +332,7 @@ msgid "(vacation)"
 msgstr "(odmor)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/hu.po b/addons/resource/i18n/hu.po
index 7520654c62e..faa2a172c8d 100644
--- a/addons/resource/i18n/hu.po
+++ b/addons/resource/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:13+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Erőforrások"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -337,7 +337,7 @@ msgid "(vacation)"
 msgstr "(szabadság)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/it.po b/addons/resource/i18n/it.po
index 9db5a976374..0f9b9792a51 100644
--- a/addons/resource/i18n/it.po
+++ b/addons/resource/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 23:16+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgid "Resources"
 msgstr "Risorse"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 "giorni della settimana!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -343,7 +343,7 @@ msgid "(vacation)"
 msgstr "(assenza)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Errore di configurazione!"
diff --git a/addons/resource/i18n/ja.po b/addons/resource/i18n/ja.po
index 6abe30774d4..28de0a2d5f7 100644
--- a/addons/resource/i18n/ja.po
+++ b/addons/resource/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 02:00+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr "リソース"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr "作業時間に適切な曜日が設定されていることを確認して下さい。"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -326,7 +326,7 @@ msgid "(vacation)"
 msgstr "（休暇）"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "設定エラー"
diff --git a/addons/resource/i18n/lt.po b/addons/resource/i18n/lt.po
index 42c212bfbf8..c290289eb9d 100644
--- a/addons/resource/i18n/lt.po
+++ b/addons/resource/i18n/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:44+0000\n"
 "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Resursai"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,7 +327,7 @@ msgid "(vacation)"
 msgstr "(atostogos)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/mn.po b/addons/resource/i18n/mn.po
index 7e9fb92ee26..e1379a989e8 100644
--- a/addons/resource/i18n/mn.po
+++ b/addons/resource/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:01+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,14 +90,14 @@ msgid "Resources"
 msgstr "Нөөцүүд"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 "Ажлын цаг нь зөв гарагуудаар тохируулагдсан эсэхийг нягтлаж шалгаарай!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -335,7 +335,7 @@ msgid "(vacation)"
 msgstr "(эзгүй)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Тохиргооны алдаа!"
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index fe0bd9ba792..651142c2a79 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 14:01+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
@@ -90,14 +90,14 @@ msgid "Resources"
 msgstr "Resources"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 "Zorg ervoor dat de werktijd met de juiste werkdagen is geconfigureerd."
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -340,7 +340,7 @@ msgid "(vacation)"
 msgstr "(vakantie)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuratiefout!"
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
index 4870851d212..b4a8a442615 100644
--- a/addons/resource/i18n/pl.po
+++ b/addons/resource/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Zasoby"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,7 +327,7 @@ msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
index 5d848adb022..8e7aaec54b5 100644
--- a/addons/resource/i18n/pt.po
+++ b/addons/resource/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 12:58+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 "apropriados!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -337,7 +337,7 @@ msgid "(vacation)"
 msgstr "(vacation)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
diff --git a/addons/resource/i18n/pt_BR.po b/addons/resource/i18n/pt_BR.po
index b540578144c..14cb13b99f0 100644
--- a/addons/resource/i18n/pt_BR.po
+++ b/addons/resource/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 23:51+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
@@ -91,7 +91,7 @@ msgid "Resources"
 msgstr "Recursos"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -99,7 +99,7 @@ msgstr ""
 "semana apropriados!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -342,7 +342,7 @@ msgid "(vacation)"
 msgstr "(férias)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
diff --git a/addons/resource/i18n/ro.po b/addons/resource/i18n/ro.po
index 805c8cdd2bb..a41d7ba5de7 100644
--- a/addons/resource/i18n/ro.po
+++ b/addons/resource/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgid "Resources"
 msgstr "Resurse"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 "corespunzatoare din saptamana!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "(vacation)"
 msgstr "(concediu)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Eroare de configurare!"
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index c9a163bf26a..fc660c4a8ba 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-23 18:55+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Ресурсы"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -327,7 +327,7 @@ msgid "(vacation)"
 msgstr "(отпуск)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Ошибка конфигурации!"
diff --git a/addons/resource/i18n/sl.po b/addons/resource/i18n/sl.po
index 4e2889e7f0c..1cb0de63f32 100644
--- a/addons/resource/i18n/sl.po
+++ b/addons/resource/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-21 14:09+0000\n"
 "Last-Translator: Matjaz Kalic <matjaz@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfiguracijska napaka"
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index c9da9458c68..cba10b7b63e 100644
--- a/addons/resource/i18n/sv.po
+++ b/addons/resource/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,13 +90,13 @@ msgid "Resources"
 msgstr "Resurser"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr "Se till att arbetstid har konfigurerats med riktiga veckodagar!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -334,7 +334,7 @@ msgid "(vacation)"
 msgstr "(semester)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfel!"
diff --git a/addons/resource/i18n/tr.po b/addons/resource/i18n/tr.po
index 62580696a43..adf57fe679b 100644
--- a/addons/resource/i18n/tr.po
+++ b/addons/resource/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 17:38+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,14 +90,14 @@ msgid "Resources"
 msgstr "Kaynaklar"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 "Çalışma süresinin haftanın doğru günleriyle yapılandırıldığından emin olun!"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -331,7 +331,7 @@ msgid "(vacation)"
 msgstr "(tatil)"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "Yapılandırma Hatası!"
diff --git a/addons/resource/i18n/vi.po b/addons/resource/i18n/vi.po
index 84ee25a3538..30ced3f2ed6 100644
--- a/addons/resource/i18n/vi.po
+++ b/addons/resource/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:42+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr "Tài nguyên"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index 4b826ef6f0d..7644da61c83 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:33+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -88,13 +88,13 @@ msgid "Resources"
 msgstr "资源"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr "请确保已经配置好适当的工作日的工作时间！"
 
 #. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -327,7 +327,7 @@ msgid "(vacation)"
 msgstr "（假期）"
 
 #. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index 956593a6619..a0623fc30e0 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -6,48 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "تأكيد التسعيرة"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "لوحة المبيعات"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "تاريخ التأكيد"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "تجميع حسب ..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "حصة الشريك"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "قائمة الأسعار لأمر البيع الحالي"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "طريقة الشراء"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "تاريخ تأكيد أمر المبيعات"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "مارس/آذار"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "الشركة"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "تاريخ الفاتورة"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "السطور المستلمة غير المفوترة"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "خلل في الفاتورة"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "تحليل الحساب"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "المجموع"
 
 #. module: sale
 #: view:sale.report:0
@@ -60,6 +206,26 @@ msgstr "اليوم"
 msgid "Cancel Order"
 msgstr "إلغاء الطلب"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "الوزن"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "تحت الطلب"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "المبلغ دون ضرائب"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "المجموع الصافي"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "ملغي"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "خلل شحن"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "الكمية (وحدة البيع)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "المتجر"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "المبيعات ذات الخلل"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "عنوان الفاتورة"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "تاريخ إنشاء أمر المبيعات"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "إنشاء الفواتير"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "تأكيد التاريخ"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "تحليل الحساب"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "عدد السطور"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr "# للكمية"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "الفاكس:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "شريك"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "أمر المبيعات"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "سطر أمر المبيعات"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "مبلغ الدفع المقدم"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,480 +519,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "أجل السداد الافتراضي"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "دورة الشهر"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "الكميات المشحونة"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "السنة"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "نسبة الخصم (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "السعر الإجمالي"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "اختر لتجميع الفواتير حسب العميل"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "الكميات المطلوبة"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "مرجع الأمر"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "معلومات أخرى"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "تُنشأ المبيعات الفاتورة"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "الخصم (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "العروض الخاصة بي"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "اسم المتجر"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "المبيعات ذات الخلل"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "أغسطس/آب"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "يونيو/حزيران"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "إحصائيات أوامر البيع"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "الحساب التحليلي المتعلق بأمر بيع"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "أكتوبر/تشرين الأول"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "التسعيرات"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "الكمية"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "سبتمبر/أيلول"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "الوضع المالي"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "قيد التقدم"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"مندوب المبيعات يؤكد التسعيرة. يحوّل حالة أمر المبيعات إلى 'قيد التفيذ' أو "
-"'قيد التنفيذ يدوياً'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "هاتف:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "عنوان الفاتورة لأمر البيع الحالي"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "مفوتر"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "تاريخ التأكيد"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "حصة الشريك"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "مارس/آذار"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "المبلغ الإجمالي"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "المجموع"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "عنوان الفاتورة:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "عنوان الفاتورة"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "التسعيرة / الأمر"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "سطر أمر المبيعات"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -623,8 +600,30 @@ msgid "Order Lines"
 msgstr "سطور الأوامر"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "نسبة الخصم (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "سطور الفواتير"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "السعر الإجمالي"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -636,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "اختر لتجميع الفواتير حسب العميل"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "أصدر الفواتير"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "ساعة"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "تاريخ الإنشاء"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "في انتظار الفوترة"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "عنوان الفاتورة لأمر البيع الحالي"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "الكميات المطلوبة"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "السطور المستلمة غير المفوترة"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "الكمية"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "المجموع"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "مبيعاتي"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "قائمة الأسعار"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "مرجع الأمر"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "الوضع المالي"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "يوليو/تموز"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -684,29 +751,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "ساعة"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -714,23 +811,37 @@ msgid "Order Date"
 msgstr "تاريخ الأمر"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "تمّ الشحن"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "مدفوع"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "شريك"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -738,37 +849,95 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "تاريخ التسعيرة"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "تجميع الفواتير"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "المبلغ المفوتر مقدماً"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "تُنشأ المبيعات الفاتورة"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "الخصم (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
+"لا يمكن إنشاء فاتورة لسطر أمر المبيعات هذا لأحد السببين التاليين:\n"
+"1. سطر أمر المبيعات في حالة \"مسودة\" أو \"إلغاء\"!\n"
+"2. سطر أمر المبيعات مفوتر!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "العروض الخاصة بي"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "الفواتير"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "ديسمبر/كانون الأول"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "تمّ الشحن"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "الشهر"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "غير مفوتر"
 
 #. module: sale
 #: view:sale.report:0
@@ -777,7 +946,7 @@ msgid "Category of Product"
 msgstr "فئة المنتج"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -788,10 +957,18 @@ msgid "Recreate Invoice"
 msgstr "إعادة إنشاء الفاتورة"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "اسم المتجر"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -799,36 +976,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "الضرائب:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "مفوتر"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "فاتورة الدفع المقدم"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "قيد التقدم"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "لا يوجد عملاء"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "إنشاء الفواتير"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "مؤكد"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "ينشأ خط طلب البيع الفاتورة"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "مسودّة"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "قوالب البريد الإلكتروني"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "بإنتظار الجدول"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "أوامر المبيعات"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "مبلغ الضرائب"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "أغسطس/آب"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "يحدد كلاً من التحصيل والفواتير"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "في انتظار التنفيذ"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "يونيو/حزيران"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "أمر"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "تحليل المبيعات"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "إحصائيات أوامر البيع"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "التاريخ"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "نوفمبر/تشرين الثاني"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "التسعيرة"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "منتج الدفع المقدم"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "استثناء"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "أكتوبر/تشرين الأول"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"ينشأ البائع الفاتورة يدويا، إذا كان النظام لسياسة شحن المبيعات هي \"دليل "
+"والشحن في التقدم\". يتم إنشاء الفاتورة تلقائيا إذا كانت سياسة النقل البحري "
+"هو \"الدفع قبل التسليم\"."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "متجر المبيعات"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -837,6 +1241,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "يناير/كانون الثاني"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "أمر المبيعات قيد التنفيذ"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -847,11 +1275,94 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "الحساب التحليلي المتعلق بأمر بيع"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"مندوب المبيعات يؤكد التسعيرة. يحوّل حالة أمر المبيعات إلى 'قيد التفيذ' أو "
+"'قيد التنفيذ يدوياً'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "مرجع المستند الذي أصدر طلب أمر المبيعات هذا"
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "تأخير في الالتزام"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "التسعيرات"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "تجاهل الخلل"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -872,11 +1383,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "مرجعك"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "ترتيب التواريخ"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "قائمة الأسعار"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "فواتير العميل"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "فوترة أمر المبيعات المؤكّد"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "المبيعات"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "الكمية"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "من المخزون"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "تاريخ التسعيرة"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "المجموع"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "تمّ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "عنوان الفاتورة:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "الفاتورة"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -892,19 +1497,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "إلغاء"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "ابحث السطور غير المفوترة"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "عنوان الشحن"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "فاتورة الدفع المقدم للمبيعات"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -915,360 +1602,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "إنشاء فاتورة"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "المبلغ دون ضرائب"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "يشير إلى أنه تمّ تسديد الفاتورة."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "السعر"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "تحت الطلب"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "عنوان الشحن"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "مسودّة: حالة من حالات أمر المبيعات"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "المجموع مع الضرائب"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "تأكيد التسعيرة"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "تجميع حسب ..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "بإنتظار الجدول"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "طريقة الشراء"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "سعر الوحدة"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "الضرائب"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "تاريخ إنشاء أمر المبيعات"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "إنشاء الفواتير"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "الفاكس:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "مبلغ الدفع المقدم"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "الكميات المشحونة"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "أصدر الفواتير"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "في انتظار الفوترة"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "يوليو/تموز"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "خلل شحن"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "تجميع الفواتير"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "الشهر"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "بحاجة إلى مراجعة المحاسِب"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "إنشاء الفواتير"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "ينشأ خط طلب البيع الفاتورة"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "التسعيرات السابقة"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "مدفوع"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "تحليل المبيعات"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "التسعيرة"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"ينشأ البائع الفاتورة يدويا، إذا كان النظام لسياسة شحن المبيعات هي \"دليل "
-"والشحن في التقدم\". يتم إنشاء الفاتورة تلقائيا إذا كانت سياسة النقل البحري "
-"هو \"الدفع قبل التسليم\"."
+msgid "Other Information"
+msgstr "معلومات أخرى"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1291,27 +1663,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1326,7 +1681,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1367,92 +1722,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "فواتير العميل"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "المبيعات"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "سعر الوحدة"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "تمّ"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "الفاتورة"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "مستند المصدر"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "في انتظار التنفيذ"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "المبلغ دون ضرائب"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "فاتورة الدفع المقدم للمبيعات"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1462,10 +1731,38 @@ msgid "Product"
 msgstr "المنتج"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "المبلغ الإجمالي"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "مايو/أيار"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "السعر"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1478,386 +1775,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "دورة الشهر"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "فاتورة لـ"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"سيقوم النظام تلقائيابتحليل اسعارك واوامر المبيعات. يتحقق التحليل من عوائد "
+"المبيعات الخاصة بك ويصنفها بمعايير المجموعة المختلفة (ندوب مبيعات، شريك، "
+"والمنتج، الخ.) استخدم هذا التقرير للقيام بتحليل المبيعات التي ليس لديها "
+"فواتير بعد.إذا كنت ترغب في تحليل دوران الخاص بك، يجب عليك استخدام تقرير "
+"تحليل الفاتورة في تطبيق المحاسبة."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "التسعيرة / الأمر"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "تاريخ الأمر"
+msgid "Tel. :"
+msgstr "هاتف:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "وحدة البيع للمنتج"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "قيد التنفيذ يدوياً"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "أمر"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "من أمر مبيعات"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "تجاهل الخلل"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"اعتمادا على مراقبة الفواتير من امر المبيعات، يمكن أن تستند على تسليم "
-"الفاتورة أو على الكميات المطلوبة. وبالتالي، يمكن أن تنشأ امر المبيعات فاتورة "
-"أو أمر تسليم حالما يتم تأكيده من قبل البائع."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "مرجع العميل"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "المجموع"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "لوحة المبيعات"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "تاريخ تأكيد أمر المبيعات"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "الشركة"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "تاريخ الفاتورة"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "المبلغ المفوتر مقدماً"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "خلل في الفاتورة"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "لا يوجد عملاء"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "المجموع الصافي"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "ملغي"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "ابحث السطور غير المفوترة"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "المتجر"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "تأكيد التاريخ"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "أمر المبيعات"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "الكمية (وحدة البيع)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "مؤكد"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "تأكيد"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "سطور الفواتير"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "عدد السطور"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "سطور أوامر المبيعات"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1867,245 +1812,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"لا يمكن إنشاء فاتورة لسطر أمر المبيعات هذا لأحد السببين التاليين:\n"
-"1. سطر أمر المبيعات في حالة \"مسودة\" أو \"إلغاء\"!\n"
-"2. سطر أمر المبيعات مفوتر!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "الوزن"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "بحاجة إلى مراجعة المحاسِب"
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "الفواتير"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "ديسمبر/كانون الأول"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "غير مفوتر"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "يحدد كلاً من التحصيل والفواتير"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "المبلغ دون ضرائب"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "فاتورة الدفع المقدم"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "مسودّة"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "مبلغ الضرائب"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "قوالب البريد الإلكتروني"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "أوامر المبيعات"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "متجر المبيعات"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "نوفمبر/تشرين الثاني"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "منتج الدفع المقدم"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "يناير/كانون الثاني"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "أمر المبيعات قيد التنفيذ"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "مرجع المستند الذي أصدر طلب أمر المبيعات هذا"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "تأخير في الالتزام"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "ترتيب التواريخ"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "فوترة أمر المبيعات المؤكّد"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "من المخزون"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "يشير إلى أنه تمّ تسديد الفاتورة."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "الوصف"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "مايو/أيار"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2128,11 +1874,131 @@ msgstr "الدفع المقدم"
 msgid "February"
 msgstr "فبراير/شباط"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "فاتورة لـ"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "سبتمبر/أيلول"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "تاريخ الأمر"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "وحدة البيع للمنتج"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "مسودّة: حالة من حالات أمر المبيعات"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "مستند المصدر"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "أبريل/نيسان"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "قيد التنفيذ يدوياً"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "التسعيرات السابقة"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "ابحث في أمر المبيعات"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "الوصف"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2143,19 +2009,46 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "ابحث في أمر المبيعات"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "من أمر مبيعات"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"اعتمادا على مراقبة الفواتير من امر المبيعات، يمكن أن تستند على تسليم "
+"الفاتورة أو على الكميات المطلوبة. وبالتالي، يمكن أن تنشأ امر المبيعات فاتورة "
+"أو أمر تسليم حالما يتم تأكيده من قبل البائع."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2165,44 +2058,92 @@ msgid "Payment Term"
 msgstr "أجل السداد"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"سيقوم النظام تلقائيابتحليل اسعارك واوامر المبيعات. يتحقق التحليل من عوائد "
-"المبيعات الخاصة بك ويصنفها بمعايير المجموعة المختلفة (ندوب مبيعات، شريك، "
-"والمنتج، الخ.) استخدم هذا التقرير للقيام بتحليل المبيعات التي ليس لديها "
-"فواتير بعد.إذا كنت ترغب في تحليل دوران الخاص بك، يجب عليك استخدام تقرير "
-"تحليل الفاتورة في تطبيق المحاسبة."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "سطور أوامر المبيعات"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "قائمة الأسعار لأمر البيع الحالي"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "اقتباس بالعدد"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "مرجع العميل"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "تمّ الالتقاط"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "السنة"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "المجموع مع الضرائب"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Recreate Procurement"
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 4ad8293a851..ffaeb302b5f 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -6,48 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:21+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Потвърждаване на оферта"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Дата на потвърждаване"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Групирай по"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Партньор в разпределние"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Ценова листа за настоящото нарежданае за продажба"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Начин на снабдяване"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Дата на фактура"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Редове с нефактурирани и доставени"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Грешка в фактура"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналитична сметка"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Междинна сума"
 
 #. module: sale
 #: view:sale.report:0
@@ -60,6 +206,26 @@ msgstr "Ден"
 msgid "Cancel Order"
 msgstr "Отказ на поръчка"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Тегло"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "в поръчка"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Данъци"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Необложена сума"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Общо нето :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Отказан"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Грешка при доставка"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Кол-во (бр. за продажба)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Продажби с грешки"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Адрес за фактура"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Дата на създаваене на поръчка за продажба"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Създаване на фактури"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# от редове"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr "# от кол."
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Факс:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Нареждане за продажба"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ред от нареждане за продажба"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,480 +519,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Условия за плащане по подрабиране"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Потвърждение"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Доставени количества"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Година"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Отстъпка (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Крайна цена"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Слежете отметка за да групирате фактурите за едни и същи клиенти"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Поръчани количества"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Отпратка към поръчка"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Друга информация"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Отстъпка (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Мои оферти"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Име на магазин"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Продажби с грешки"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Състояние"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Юни"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Статистика на нареждани за продажби"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Аналитичната сметкта свързана с нареждания за продажби"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Октомври"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Оферти"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "ДДС"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Септември"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Финансова позиция"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Изпълнява се"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Търговецът потвърждава офертата. Състоянието на нареждането за продажба "
-"става \"В развитие\" или \"Ръчно\"."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Тел. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Адрес за фактурата за настоящото нареждане за продажба."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Фактуриран"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Дата на потвърждаване"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Партньор в разпределние"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Март"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Общата сума"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Междинна сума"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Адрес за фактура:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Адрес за фактура"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Оферта / Поръчка"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Ред от нареждане за продажба"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -623,8 +600,30 @@ msgid "Order Lines"
 msgstr "Редове от поръчка"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Отстъпка (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Редове на фактура"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Крайна цена"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -636,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Слежете отметка за да групирате фактурите за едни и същи клиенти"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Направи фактури"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Дата на създаване"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Редове с нефактурирани и доставени"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Адрес за фактурата за настоящото нареждане за продажба."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Поръчани количества"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Количество"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Общо :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Мои продажби"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Ценова листа"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Отпратка към поръчка"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Финансова позиция"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Юли"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -684,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Състояние"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -714,23 +811,37 @@ msgid "Order Date"
 msgstr "Дата на поръчка"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Изпратена"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Платен"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Контрагент"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -738,38 +849,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Дата на оферта"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Групиране на фактури"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Отстъпка (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мои оферти"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Фактури"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Декември"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Изпратена"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Нефактуриран/и"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -777,7 +943,7 @@ msgid "Category of Product"
 msgstr "Категория на продукта"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -788,10 +954,18 @@ msgid "Recreate Invoice"
 msgstr "Създаване наново на фактура"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Име на магазин"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -799,36 +973,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Данъци :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Фактуриран"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Фактура за предплащане"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Изпълнява се"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Не е определен клиент!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Създаване на фактури"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Потвърден"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Проект"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Очакване на планиране"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Поръчки за продажби"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Трябва да се направи"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Юни"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ред"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Анализ на продажби"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Статистика на нареждани за продажби"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Ноември"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Оферта"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Предварителен продукт"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Грешка"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Октомври"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Търговецът създава фактура ръчно ако if the sales order shipping policy is "
+"'Shipping and Manual in Progress'. The invoice is created automatically if "
+"the shipping policy is 'Payment before Delivery'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -837,6 +1238,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Януари"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Активни поръчки за продажба"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -847,11 +1272,94 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Аналитичната сметкта свързана с нареждания за продажби"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Търговецът потвърждава офертата. Състоянието на нареждането за продажба "
+"става \"В развитие\" или \"Ръчно\"."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Оферти"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Игнорирай грешка"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -872,11 +1380,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Ваш референтен номер"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "По дата"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Ценова листа"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "ДДС"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Потвърдени нареждания за продажби за фактуриране."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Продажби"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "К-во"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "от склад"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Дата на оферта"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Общо"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Готов"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Адрес за фактура:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Фактура"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -892,19 +1494,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Отказ"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Търси нефактурирани редове"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Адрес за доставка :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -915,360 +1599,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Създаване на фактура"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Сумата без данък."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Показва, че фактурата е платена"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Цена"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "в поръчка"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Адрес за доставка :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Поръчка за продажба в проект"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Потвърждаване на оферта"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Групирай по"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Очакване на планиране"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Начин на снабдяване"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Единична цена"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Поръчка за продажба"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Данъци"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Дата на създаваене на поръчка за продажба"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Създаване на фактури"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Факс:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Доставени количества"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Направи фактури"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Юли"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Грешка при доставка"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Групиране на фактури"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Месец"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Създаване на фактури"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Платен"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Анализ на продажби"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Оферта"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Търговецът създава фактура ръчно ако if the sales order shipping policy is "
-"'Shipping and Manual in Progress'. The invoice is created automatically if "
-"the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
+msgstr "Друга информация"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1291,27 +1660,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1326,7 +1678,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1367,92 +1719,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Продажби"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Единична цена"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Готов"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Фактура"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Изходен документ"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Трябва да се направи"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Сумата без данък."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1462,10 +1728,38 @@ msgid "Product"
 msgstr "Продукт"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Общата сума"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Май"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Цена"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1478,383 +1772,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Фактура за"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Оферта / Поръчка"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Дата на поръчка"
+msgid "Tel. :"
+msgstr "Тел. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Прод. единици на продукт"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ръчно в развитие"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ред"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "От поръчка за продажба"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Игнорирай грешка"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Общо"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Фирма"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Дата на фактура"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Грешка в фактура"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Не е определен клиент!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Общо нето :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Отказан"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Търси нефактурирани редове"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Нареждане за продажба"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Кол-во (бр. за продажба)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Потвърден"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Потвърждение"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Редове на фактура"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# от редове"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Редове от поръчка за продажба"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Искате ли да създадете фактурата/ите"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1864,242 +1804,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Тегло"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Фактури"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Декември"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Нефактуриран/и"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Необложена сума"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Фактура за предплащане"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Проект"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Поръчки за продажби"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Ноември"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Предварителен продукт"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Януари"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Активни поръчки за продажба"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "По дата"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Потвърдени нареждания за продажби за фактуриране."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "от склад"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Показва, че фактурата е платена"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Май"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Искате ли да създадете фактурата/ите"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2122,11 +1866,131 @@ msgstr "Напред"
 msgid "February"
 msgstr "Февруари"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Фактура за"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Септември"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Дата на поръчка"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Прод. единици на продукт"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Поръчка за продажба в проект"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Изходен документ"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Април"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ръчно в развитие"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Търсене на нареждания за продажби"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Описание"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2137,20 +2001,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Търсене на нареждания за продажби"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Последователност"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "От поръчка за продажба"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2159,39 +2047,92 @@ msgid "Payment Term"
 msgstr "Условие за плащане"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Редове от поръчка за продажба"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Ценова листа за настоящото нарежданае за продажба"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Оферта №"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Натоварен"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Година"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Notes"
@@ -2374,6 +2315,9 @@ msgstr ""
 #~ msgid "invalid mode for test_state"
 #~ msgstr "невалиден режим за test_state"
 
+#~ msgid "Sale Order"
+#~ msgstr "Поръчка за продажба"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Прокет на фактура за клиент чакащ одобрение от счетоводител."
 
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index a2c0fcf4cc6..69ce6f310f4 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -6,49 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-15 20:56+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdi Ponudu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Stavke koje su isporučene a nisu fakturisane."
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakture izuzeci"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitičko konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sub-ukupno"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -60,6 +206,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr "Otkaži naruđbu"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "u nalogu"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovan iznos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Neto ukupno:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Izuzeci otpreme"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (JM)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Iznimka u prodaji"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa fakture (kupca)"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitičko konto"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,15 +519,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Standardni uslovi plaćanja"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Isporučena količina"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -147,461 +574,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Naručena količina"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referenca naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moje Ponude"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Naziv prodajnog mjesta"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Iznimka u prodaji"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturisano"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sub-ukupno"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa fakture (kupca):"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa fakture (kupca)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponuda / Nalog"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -621,8 +600,30 @@ msgid "Order Lines"
 msgstr "Stavke naloga"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavka Fakture"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -634,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Stavke koje su isporučene a nisu fakturisane."
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Naručena količina"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Ukupno :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cjenovnik"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referenca naloga"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -682,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -712,22 +811,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -736,36 +849,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupiraj Fakture"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje Ponude"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakture"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -775,7 +943,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -786,10 +954,18 @@ msgid "Recreate Invoice"
 msgstr "Ponovno kreiranje Fakturu"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naziv prodajnog mjesta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -797,14 +973,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Porezi"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturisano"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Predračun"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Kreiraj Fakturu"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodajni nalozi"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -812,21 +1145,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Proizvod"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Izuzetak"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -835,6 +1235,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Prodajni nalog u obradi"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -845,11 +1269,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -868,11 +1373,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Tvoja Referenca"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cjenovnik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Slijed"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Količina"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "sa zaliha"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Urađeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa fakture (kupca):"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -888,19 +1487,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Otkaži"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -911,345 +1592,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Kreriaj Fakturu"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Cijena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "u nalogu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdi Ponudu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Prodajni nalog"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Isporučena količina"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzeci otpreme"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupiraj Fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Kreiraj Fakturu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1257,11 +1628,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1284,27 +1653,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1319,7 +1671,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1360,92 +1712,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinična cijena"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Urađeno"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1455,10 +1721,38 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cijena"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1471,382 +1765,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura na"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponuda / Nalog"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datum naruđbe"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Proizvod JM"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Nalog"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakture izuzeci"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Neto ukupno:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavnica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (JM)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavka Fakture"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke Prodajnog naloga"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1857,240 +1797,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakture"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovan iznos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Predračun"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Draft"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodajni nalozi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Proizvod"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Prodajni nalog u obradi"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "sa zaliha"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2115,11 +1859,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura na"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datum naruđbe"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Proizvod JM"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2130,20 +1994,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Slijed"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2152,18 +2040,32 @@ msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Stavke Prodajnog naloga"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2171,20 +2073,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "Ponuda N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Izuzeto"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Stock Moves"
@@ -2217,6 +2158,9 @@ msgstr ""
 #~ msgid "Sale Order Line"
 #~ msgstr "Stavka prodajnog naloga"
 
+#~ msgid "Sale Order"
+#~ msgstr "Prodajni nalog"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index a6eb6aa95a1..6f3a7ed2b10 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,41 +14,187 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirma pressupost"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data de confirmació"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Agrupa per..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicació empresa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa per la comanda de venda actual."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Mètode proveïment"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data en la qual es confirma la comanda de venda."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Març"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Línies no facturades i lliuraments"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepció de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Dia"
 msgid "Cancel Order"
 msgstr "Cancel·la comanda"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Pes"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "sota comanda"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imposable"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total net :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancel·lada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepció d'enviament"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantitat (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tenda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Vendes en excepció"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adreça de factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data en la qual es crea la comanda de venda."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crea factures"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data de confirmació"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Compte analític"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de línies"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "Nº de qtat"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Comanda de venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línia comanda de venda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Import avançat"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,481 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Termini pagament per defecte"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Quantitats enviades"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Any"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preu total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Marqueu aquesta opció per agrupar les factures dels mateixos clients."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantitats demanades"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referència comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Altra informació"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vendes. Realitza factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descompte (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Els meus pressuposts"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nom tenda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Vendes en excepció"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estat"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agost"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juny"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadístiques comandes de venda"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "El compte analític relacionat amb una comanda de venda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Pressuposts"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Quantitat"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posició fiscal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En procés"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el pressupost. L'estat de la comanda de venda es "
-"converteix 'En procés' o 'Procés manual'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adreça de facturació per a la comanda de venda actual."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturat"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data de confirmació"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicació empresa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Març"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "L'import total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adreça de factura :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adreça de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Pressupost / Comanda"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Línia comanda de venda"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -625,8 +601,30 @@ msgid "Order Lines"
 msgstr "Línies de la comanda"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Línies de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preu total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -638,38 +636,107 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Marqueu aquesta opció per agrupar les factures dels mateixos clients."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realitza factures"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Data creació"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Per facturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adreça de facturació per a la comanda de venda actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantitats demanades"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Línies no facturades i lliuraments"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantitat"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Les meves vendes"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referència comanda"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posició fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juliol"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -686,28 +753,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estat"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -716,23 +813,37 @@ msgid "Order Date"
 msgstr "Data comanda"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Enviat"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagat"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -740,37 +851,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data pressupost"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupa les factures"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "L'import a facturar per endavant."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vendes. Realitza factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descompte (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
+"No podeu crear la factura a partir d'aquesta línia de comanda de venda per "
+"les següents raons:\n"
+"1. L'estat d'aquesta línia de la comanda de venda està en estat "
+"\"esborrany\" o \"cancel·lada\".\n"
+"2. La línia de la comanda de venda està facturada."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Els meus pressuposts"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Factures"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Desembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviat"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
 
 #. module: sale
 #: view:sale.report:0
@@ -779,7 +950,7 @@ msgid "Category of Product"
 msgstr "Categoria de producte"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -790,10 +961,18 @@ msgid "Recreate Invoice"
 msgstr "Recrea factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nom tenda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -801,36 +980,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impostos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturat"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avança factura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En procés"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "No s'ha definit un client!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crea factures"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venda Línia_comanda Realitzar_factura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Esborrany"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperant data planificada"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Comandes de venda"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "L'import dels impostos."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agost"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera proveïment i facturació"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Per fer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juny"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Comanda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Anàlisi de vendes"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadístiques comandes de venda"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtres extensos..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Pressupost"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producte avançat"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepció"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualment si la política de facturació de la "
+"comanda de venda és \"Enviament i Factura manual\". La factura es crea de "
+"forma automàtica si la política de facturació és 'Pagament abans de "
+"l'enviament'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tenda vendes"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -839,6 +1246,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Gener"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Comanda de venda en procés"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -849,11 +1280,96 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "El compte analític relacionat amb una comanda de venda."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el pressupost. L'estat de la comanda de venda es "
+"converteix 'En procés' o 'Procés manual'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referència del document que ha generat aquesta sol·licitud de comanda de "
+"venda."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retard realització"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Pressuposts"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora excepció"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -875,11 +1391,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "La vostra referència"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Data de comanda"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Comanda de venda confirmada a facturar"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendes"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Qtat"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "des d'estoc"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data pressupost"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realitzada"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adreça de factura :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -895,19 +1505,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancel·la"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Cerca línies no facturades"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adreça d'enviament :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Vendes. Bestreta pagament factura"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -918,361 +1610,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Crea factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "L'import sense impostos."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha estat pagada."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Preu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "sota comanda"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adreça d'enviament :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estat esborrany de la comanda de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impostos inclosos"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirma pressupost"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupa per..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperant data planificada"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Mètode proveïment"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preu un."
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Comanda de venda"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data en la qual es crea la comanda de venda."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crea factures"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Import avançat"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantitats enviades"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Realitza factures"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Per facturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juliol"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepció d'enviament"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupa les factures"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Per ser revisat pel comptable."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crea factures"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Venda Línia_comanda Realitzar_factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Pressupostos antics"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagat"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Anàlisi de vendes"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Pressupost"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El comercial crea una factura manualment si la política de facturació de la "
-"comanda de venda és \"Enviament i Factura manual\". La factura es crea de "
-"forma automàtica si la política de facturació és 'Pagament abans de "
-"l'enviament'."
+msgid "Other Information"
+msgstr "Altra informació"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1295,27 +1671,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1330,7 +1689,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1371,92 +1730,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Vendes"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preu un."
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realitzada"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Document d'origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Per fer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "L'import sense impostos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Vendes. Bestreta pagament factura"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1466,10 +1739,38 @@ msgid "Product"
 msgstr "Producte"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "L'import total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maig"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Preu"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1482,387 +1783,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Aquest informe realitza una anàlisi dels vostres pressupostos i comandes de "
+"venda. L'anàlisi verifica els ingressos de les vostres vendes i les ordena "
+"per diferents grups de criteris (comercial, empresa, producte, etc.). "
+"Utilitzeu aquest informe per realitzar un anàlisi sobre les vostres vendes "
+"encara no facturades. Si voleu analitzar els vostres ingressos, hauríeu "
+"d'utilitzar l'informe d'anàlisi de factures en l'aplicació de Comptabilitat."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar les"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Pressupost / Comanda"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data ordenada"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producte"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en procés"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Des d'una comanda de venda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignora excepció"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En funció del control de facturació de les comandes de venda, la factura pot "
-"estar basada en les quantitats enviades o venudes. Per tant, una comanda de "
-"venda pot generar una factura o un albarà tan aviat com sigui confirmada pel "
-"comercial."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referència del client"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data en la qual es confirma la comanda de venda."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Companyia"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "L'import a facturar per endavant."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepció de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "No s'ha definit un client!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total net :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancel·lada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Cerca línies no facturades"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tenda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data de confirmació"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Comanda de venda"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantitat (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirma"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Línies de factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de línies"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Línies de la comanda de venda"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Voleu crear la(es) factura(es)?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1872,249 +1821,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No podeu crear la factura a partir d'aquesta línia de comanda de venda per "
-"les següents raons:\n"
-"1. L'estat d'aquesta línia de la comanda de venda està en estat "
-"\"esborrany\" o \"cancel·lada\".\n"
-"2. La línia de la comanda de venda està facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Pes"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Per ser revisat pel comptable."
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Factures"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Desembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera proveïment i facturació"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imposable"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avança factura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "L'import dels impostos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Comandes de venda"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tenda vendes"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Producte avançat"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Gener"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Comanda de venda en procés"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referència del document que ha generat aquesta sol·licitud de comanda de "
-"venda."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retard realització"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Data de comanda"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Comanda de venda confirmada a facturar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "des d'estoc"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que una factura ha estat pagada."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripció"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maig"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Voleu crear la(es) factura(es)?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2137,11 +1883,131 @@ msgstr "Bestreta"
 msgid "February"
 msgstr "Febrer"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar les"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data ordenada"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producte"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estat esborrany de la comanda de venda"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Document d'origen"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en procés"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Pressupostos antics"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Cerca comanda de venda"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripció"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2152,20 +2018,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Cerca comanda de venda"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Seqüència"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Des d'una comanda de venda"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En funció del control de facturació de les comandes de venda, la factura pot "
+"estar basada en les quantitats enviades o venudes. Per tant, una comanda de "
+"venda pot generar una factura o un albarà tan aviat com sigui confirmada pel "
+"comercial."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2174,45 +2068,92 @@ msgid "Payment Term"
 msgstr "Termini de pagament"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Aquest informe realitza una anàlisi dels vostres pressupostos i comandes de "
-"venda. L'anàlisi verifica els ingressos de les vostres vendes i les ordena "
-"per diferents grups de criteris (comercial, empresa, producte, etc.). "
-"Utilitzeu aquest informe per realitzar un anàlisi sobre les vostres vendes "
-"encara no facturades. Si voleu analitzar els vostres ingressos, hauríeu "
-"d'utilitzar l'informe d'anàlisi de factures en l'aplicació de Comptabilitat."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Línies de la comanda de venda"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa per la comanda de venda actual."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Pressupost Nº"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referència del client"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Any"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impostos inclosos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Invoice Based on Deliveries"
@@ -2509,6 +2450,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Un proveïment per cada producte."
 
+#~ msgid "Sale Order"
+#~ msgstr "Comanda de venda"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifes de venda"
 
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 9932d5630ec..c7191d47426 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -6,49 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:18+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdit ocenění"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum potvrzení"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Seskupit podle..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Podílový partner"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Ceník pro aktuální prodejní objednávku."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda zásobování"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum, pro které prodejní objednávka potvrzena."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Březen"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Společnost"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum faktury"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nefakturované a doručené řádky"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Vyjímka faktury"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Mezisoučet"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Den"
 msgid "Cancel Order"
 msgstr "Zrušit objednávku"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Váha"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na objednávku"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Daně"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Nezdaněná částka"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Čistého celkem:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Výjimka přepravy"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Množství (PJ)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Obchod"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Prodeje ve výjimce"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturační adresa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum, kdy je vytvořena prodejní objednávka."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Vytvořit faktury"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrzení"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytický účet"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# z řádek"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "# z množ."
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodejní objednávka"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Řádek prodejní objednávky"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Částka dopředu"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,480 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Výchozí datum splatnosti"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Přepravované množství"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Rok"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Slev.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Celková cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Zaškrtněte políčko pro seskupení faktůr pro stejného zákazníka"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Objednané množství"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Odkaz objednávky"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Jiné informace"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Sleva (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Jméno obchodu"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Prodeje ve výjimce"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Srpen"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Červen"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistiky prodejních objednávek"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analytický účet vztažený k prodejní objednávce."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Říjen"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Cenové nabídky"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Množství"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Září"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Finanční pozice"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "V běhu"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Obchodník potvrdí ocenění. Stav prodejního příkazu přejde na 'V běhu' nebo "
-"'Ručně v běhu'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturační adresa pro aktuální prodejní objednávku."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturováno"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum potvrzení"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Podílový partner"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Březen"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Celkové množství"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Mezisoučet"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturační adresa :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturační adresa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ocenění / Objednávka"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Řádek prodejní objednávky"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -624,8 +601,30 @@ msgid "Order Lines"
 msgstr "Řádky objednávky"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Slev.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Řádky faktury"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -637,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Zaškrtněte políčko pro seskupení faktůr pro stejného zákazníka"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Vytvoření faktůr"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Datum vytvoření"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "K fakturaci"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturační adresa pro aktuální prodejní objednávku."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Objednané množství"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nefakturované a doručené řádky"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Množství"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Celkem :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Moje prodeje"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Ceník"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Odkaz objednávky"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Finanční pozice"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Červenec"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -685,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -715,23 +812,37 @@ msgid "Order Date"
 msgstr "Datum objednávky"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Odesláno"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Placeno"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -739,38 +850,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum ocenění"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Seskupit faktury"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Částka, která je fakturována dopředu."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Sleva (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktury"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Prosinec"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Odesláno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Měsíc"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturované"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -778,7 +944,7 @@ msgid "Category of Product"
 msgstr "Kategorie výrobku"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -789,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Znovu vytvořit fakturu"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Jméno obchodu"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -800,36 +974,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Daně :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturováno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktura dopředu"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "V běhu"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Neurčen zákazník !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Vytvořit faktury"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrzeno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Koncept"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Čekací rozvrh"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodejní objednávky"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Částka daně"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Srpen"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Řídí zásobování a fakturace"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "K provedení"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Červen"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Objednávka"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analýza prodeje"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiky prodejních objednávek"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Listopad"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Rozšířené filtry..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cenová nabídka"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Vyjímka"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Říjen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Obchodník vytváří fakturu ručně, pokud je přepravní politika prodejní "
+"objednávky 'P5eprava a Ručně v běhu'. Faktura je vytvořena automaticky, "
+"pokud přepravní politika je 'Zaplacení před doručením'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodejní obchod"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -838,6 +1239,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Leden"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Prodejní objednávky v běhu"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -848,11 +1273,95 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analytický účet vztažený k prodejní objednávce."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Obchodník potvrdí ocenění. Stav prodejního příkazu přejde na 'V běhu' nebo "
+"'Ručně v běhu'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Odkaz na dokument, který generoval tento požadavek na prodejní objednávku."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Zpoždění závazku"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cenové nabídky"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoravat výjimku"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -874,11 +1383,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Váš odkaz"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Datum objednávky"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Ceník"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Potvrzení prodejní objednávky k fakturaci."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodej"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Množ."
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "ze skladu"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum ocenění"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Celkem"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Dokončeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturační adresa :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -894,19 +1497,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Zrušit"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Hledat nefakturované řádky"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dodací adresa :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Prodejní platba faktury dopředu"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -917,360 +1602,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Vytvořit fakturu"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Množství bez daně."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indikuje, že faktura již byla zaplacena."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na objednávku"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dodací adresa :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Návrh prodejní objednávky"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Celkem zahrnutá daň"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdit ocenění"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Seskupit podle..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Čekací rozvrh"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda zásobování"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena za kus"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Daně"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum, kdy je vytvořena prodejní objednávka."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Vytvořit faktury"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Částka dopředu"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Přepravované množství"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Vytvoření faktůr"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "K fakturaci"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Červenec"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Výjimka přepravy"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Seskupit faktury"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Měsíc"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "K překontrolování účetním."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Vytvořit faktury"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Staré ocenění"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Placeno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analýza prodeje"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cenová nabídka"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Obchodník vytváří fakturu ručně, pokud je přepravní politika prodejní "
-"objednávky 'P5eprava a Ručně v běhu'. Faktura je vytvořena automaticky, "
-"pokud přepravní politika je 'Zaplacení před doručením'."
+msgid "Other Information"
+msgstr "Jiné informace"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1293,27 +1663,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1328,7 +1681,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1369,92 +1722,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Prodej"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena za kus"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Dokončeno"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Zdrojový dokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "K provedení"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Množství bez daně."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Prodejní platba faktury dopředu"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1464,10 +1731,38 @@ msgid "Product"
 msgstr "Výrobek"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Celkové množství"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Květen"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1480,383 +1775,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura pro"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ocenění / Objednávka"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "DAtum objednání"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UoS výrobku"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ruční v běhu"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Objednávka"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Z prodejní objednávky"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignoravat výjimku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Odkaz zákazníka"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Celkem"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum, pro které prodejní objednávka potvrzena."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Společnost"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum faktury"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Částka, která je fakturována dopředu."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Vyjímka faktury"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Neurčen zákazník !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Čistého celkem:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Zrušeno"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Hledat nefakturované řádky"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Obchod"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrzení"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Prodejní objednávka"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Množství (PJ)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrzeno"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdit"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Řádky faktury"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# z řádek"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Řádky prodejní objednávky"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Opravdu chcete vytvořit fakturu(y) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1866,243 +1807,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "K překontrolování účetním."
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Váha"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faktury"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Prosinec"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturované"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Řídí zásobování a fakturace"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Nezdaněná částka"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktura dopředu"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Koncept"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Částka daně"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodejní objednávky"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodejní obchod"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Listopad"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Leden"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Prodejní objednávky v běhu"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Odkaz na dokument, který generoval tento požadavek na prodejní objednávku."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Zpoždění závazku"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Datum objednávky"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Potvrzení prodejní objednávky k fakturaci."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "ze skladu"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indikuje, že faktura již byla zaplacena."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Popis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Květen"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Opravdu chcete vytvořit fakturu(y) ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2125,11 +1869,131 @@ msgstr "Dopředu"
 msgid "February"
 msgstr "Únor"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura pro"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Září"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "DAtum objednání"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UoS výrobku"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Návrh prodejní objednávky"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Zdrojový dokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Duben"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ruční v běhu"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Staré ocenění"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Hledat prodejní objednávky"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Popis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2140,19 +2004,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Hledat prodejní objednávky"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Z prodejní objednávky"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2162,39 +2050,92 @@ msgid "Payment Term"
 msgstr "Platební období"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Řádky prodejní objednávky"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Ceník pro aktuální prodejní objednávku."
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Množství N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Odkaz zákazníka"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Naskladněno"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Rok"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Celkem zahrnutá daň"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Do you really want to create the invoices ?"
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 72f55c50e0e..d2d13a80777 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -7,49 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-08 17:59+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Faktura dato"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -61,6 +207,26 @@ msgstr "Dag"
 msgid "Cancel Order"
 msgstr "Annuller ordre"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Faktura adresse"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,11 +421,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Kontakt"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Standard betalingsbetinelser"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rabat (%)."
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Total pris"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Afkryds for at gruppere fakturaer pr. kunde."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Ordret antal"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Ordre referense"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Anden information"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabat (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Butiksnavn"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Salgsordre statistik"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Tilbud"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Antal"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faktureret"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marts"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Faktura adresse:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Faktura adresse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "Ordre linier"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rabat (%)."
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total pris"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Afkryds for at gruppere fakturaer pr. kunde."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Oprettelses dato"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Ordret antal"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Antal"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prisliste"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ordre referense"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Ordredato"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Afsendt"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betalt"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Kontakt"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabat (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Afsendt"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Butiksnavn"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kunde mangler!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Salgsordrer"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Salgsordre statistik"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tilbud"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Salg"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Antal"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Udført!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Faktura adresse:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,357 +1593,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Pris"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Enhedspris"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Måned"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betalt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Anden information"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Salg"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Enhedspris"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Udført!"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,10 +1722,38 @@ msgid "Product"
 msgstr "Vare"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pris"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
+msgid "Tel. :"
+msgstr "Tel:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Virksomhed"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Faktura dato"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kunde mangler!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto total:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Salgsordrer"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,19 +1995,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2153,18 +2041,32 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2172,20 +2074,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "År"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "VAT"
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 3fc9ee7b460..7d78e8fc9ae 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -7,51 +7,205 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-21 02:05+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 14:23+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Kostenstelle für den Verkauf"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-"Auftragspositionen, die bestätigt, erledigt oder Sonderfälle sind und noch "
-"nicht abgerechnet sind."
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Bestätige Angebot"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Pinnwand Verkauf"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "Es wurde kein Ertragskonto als allgemeiner Standard festgelegt."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Auftragszeilen für Rechnung"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bestätigung am"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "VE"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Verkäufer"
+msgid "Group By..."
+msgstr "Gruppierung..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Preisliste für diesen Verkaufsauftrag."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Vertriebspartner"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Abrechnung Auftrag"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Produkteigenschaften"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Durch diese Anwendung können Sie die Konditionen Ihrer Projekt Verträge "
+"definieren: Abrechnung\n"
+"                (Festpreis, von Stundenzettel, Ausgaben Verrechnung), Preise "
+"(650 € / Tag) oder die Laufzeit \n"
+"                (z.B. 1 Jahr Support Vertrag). Sie können den Projekt "
+"Vertrag Fortschritt verfolgen und automatisch\n"
+"                Abrechnungen erstellen. Es wird das Modul "
+"account_analytic_analysis installiert."
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Maßeinheit"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Dispositionsmethode"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum der Auftragsbestätigung"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Verwenden Sie mehrere Kostenstellen für den Verkauf"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "März"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+"Stornieren Sie zuerst alle Rechnungen, die mit diesem Auftrag verknüpft sind."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Angebotsnummer"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Ungelesene Nachrichten"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Rechnungsdatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Abzurechnende Auslieferungen"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Abrechnungsfehler"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Angebot "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Angebotsentwurf"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Lieferadresse"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Kostenstelle"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+"Stapelverarbeitung von Rechnungen auf Basis von Lieferauftragsjournalen"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Zwischensumme"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,10 +215,29 @@ msgstr "Tag"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Auftrag stornieren"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Lager Eigenschaften"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "Die"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Mengeneinheit "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -77,21 +250,188 @@ msgstr "Fehlerhafte Daten"
 msgid "The value of Advance Amount must be positive."
 msgstr "Der Wert einer Anzahlung muss positiv sein"
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Beschaffe von Auftrag"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Nachrichten"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Auftragsstatus"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Umsatzsteuer"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Nettobetrag"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Fehler!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettobetrag:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Beschaffe an Lager: Bei Bedarf wird das Produkt entweder direkt vom Lager "
+"entnommen oder es wird abgewartet bis wieder Bestand auf Lager ist.\n"
+"Beschaffe von Auftrag: Bei Bedarf wird das Produkt entweder eingekauft oder "
+"produziert."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Die Funktion eines Mitarbeiters  kann als Standard bei Projekt Verträgen "
+"übernommen werden.\n"
+"                  Dieses ist sinnvoll, wenn Benutzer Vertragsarbeiten über "
+"Stundenzettel eingeben. Diese Werte können dann einfach übernommen werden.\n"
+"                   Es gibt dennoch natürlich die Möglichkeit die Werte zu "
+"überschreiben. Durch Aktivierung installieren Sie hier die Anwendung "
+"analytic_user_function."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Auftragspositionen meiner Verkaufsaufträge"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Angebot gesendet"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-Mail Assistent"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Versand Fehlerliste"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Menge (Verkaufseinheit)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Vertriebsshop"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "fehlerhafte Sonderfälle"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Rechnungsadresse"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum der Auftragserstellung"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Ungültig"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Erzeuge Rechnungen"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Steuer"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ungültige Aktion!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -111,12 +451,15 @@ msgstr ""
 "Ausführung zum Bestelldatum wartet."
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Geplante Lieferung am"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Kostenstelle"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Positionen"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -128,6 +471,11 @@ msgstr ""
 "html Format, um über dieses Format dann später in einer Kanban Ansicht "
 "weiterzuarbeiten."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr "Anzeige der Nummernfolge bei mehrereren  Zeilenordner."
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -135,9 +483,67 @@ msgid "# of Qty"
 msgstr "Menge"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Ermöglicht die Gewährung eines Rabatts für eine Auftragsposition"
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(aktualisieren)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Vertragseigenschaften"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Verkaufsauftrag"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Auftragsposition"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Anzahlung"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -150,16 +556,54 @@ msgstr ""
 "z.B. 10% für Wiederverkäufer, Nachlass um 5 EUR aufgrund einer "
 "Verkaufsaktion für das Produkt, etc."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Ein Mitarbeiter hatte mehrere Rollen  in veschiedenen Verträgen"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Standard Zahlungsbedingung"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Rechnung ist  <b>bezahlt</b>"
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Monatlicher Umsatz"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Ausgelieferte Menge"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Jahr"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -167,9 +611,30 @@ msgid "Allow using different units of measures"
 msgstr "Erlaubt die Verwendung verschiedener Mengeneinheiten"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Prozentsatz"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Nicht bestätigte Verkaufsaufträge"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Drucken"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Bestellnummer"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Auftragszeilen"
 
 #. module: sale
 #: report:sale.order:0
@@ -177,17 +642,41 @@ msgid "Disc.(%)"
 msgstr "Rabatt (%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Weisen Sie ein Ertragskonto für dieses Produkt zu: \"%s\" (id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Rechnungszeilen"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Gesamtumsatz"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Bei Aktivierung können Sie Aufträge und Lieferungen (Lieferaufträge) "
+"zwischen verschiedenen \n"
+"Journalen differenzieren und dann im Stapel ausführen. Sie installieren "
+"hierdurch das Modul\n"
+"sale_journal."
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
@@ -196,9 +685,21 @@ msgstr ""
 "sollen"
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Meine Verkaufsaufträge"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Rechnungen erstellen"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Stunde"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# des Auftrags"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -216,11 +717,59 @@ msgstr ""
 "                Durch diese Auswahl installieren Sie das Modul "
 "account_analytic_analysis."
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Datum Auftragserstellung"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Abzurechnen"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Bestellmenge"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Jahr des Verkaufsauftrages"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Summe:"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Meine Verkäufe"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -228,33 +777,125 @@ msgid "Order Reference"
 msgstr "Auftragsreferenz"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Andere Informationen"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Steuerzuordnung"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+"* Die \"Entwurf\"-Status wird zugewiesen, wenn der zugehörige Auftrag im "
+"Entwurf-Status ist.\n"
+"* Die \"Bestätigt\"-Status wird zugewiesen, wenn der korrespondierende "
+"Auftrag bestätigt wurde.\n"
+"* Der \"Sonderfall\" Status wird zugewiesen, wenn korrespondierende Belege "
+"des Auftrags abgebrochen wurden.\n"
+"* Der \"Erledigt\" Status wird zugewiesen, wenn die Auftragspositionen "
+"versendet wurden.\n"
+"* Der \"Abgebrochen\"-Status wird zugewiesen, wenn ein Benutzer den "
+"korrespondierenden Auftrag abbricht."
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Standardeinstellungen"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Warnung!"
+msgid "Configuration Error!"
+msgstr "Konfigurationsfehler!"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Kostenstellen für den Verkauf"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Nachdem Sie 'Auftragszeilen zur Verrechnung anzeigen' angeklickt haben, "
+"wählen Sie die zu verrechnenden Zeilen aus und erzeugen Sie die Rechnung "
+"durch Auswahl des Eintrages im Menu 'Mehr'."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "E-mail senden"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Preisliste(%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "Bei Auslieferung"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Rechnungsstellungsprozess"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Auftragsdatum"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Auftrag erledigt"
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+"Bitte wählen Sie ein Verkaufsjournal für das Unternehmen \"%s\" (id:%d) aus."
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Angebote und Verkäufe"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Bezahlt"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
@@ -263,13 +904,38 @@ msgstr ""
 "Ermöglicht die Auswahl und Verwaltung verschiedener Mengeneinheiten für "
 "Produkte."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Basis Mengeneinheit"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Erzeuge und zeige Rechnung an"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppiere Rechnungen"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Der Vorauszahlungsbetrag"
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Verkauf erstellt Rechnung"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Preisliste Warnung!"
@@ -279,6 +945,20 @@ msgstr "Preisliste Warnung!"
 msgid "Discount (%)"
 msgstr "Rabatt (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Die Ausgangsrechnung kann für den Verkaufsauftrag aus folgendem Grund "
+"aktuell nicht erstellt werden:\n"
+"1. Der Status ist entweder \"In Entwurf\" oder \"Abgebrochen\"\n"
+"2. Der Verkaufsauftrag wurde bereits abgerechnet"
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -288,7 +968,60 @@ msgstr "Rechnung erstellen und anzeigen"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 msgid "My Quotations"
-msgstr "Meine Angebote"
+msgstr "Eigene Angebote"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Alle Rechnungen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Dezember"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Vertragsverwaltung"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Ausgeliefert"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nicht abgerechnet"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Produktkategorie"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Der Auftrag kann nicht abgebrochen werden!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Wiederherstellung Rechnung"
 
 #. module: sale
 #: field:sale.config.settings,module_warning:0
@@ -301,6 +1034,593 @@ msgstr ""
 msgid "Shop Name"
 msgstr "Bezeichnung Shop"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Steuern:"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Abgerechnet"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Anzahlungsrechnung"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Öffne Menü Verkauf"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In Arbeit"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kein Kunde definiert !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Erzeuge Rechnungen"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bestätigt"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Anzahlung von  %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Verkaufsauftragszeile Erzeuge Rechnung"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "E-Mail Vorlagen"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Ein Partner, dem dieses bestimmte Produkt zugeordnet wurde."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Vertrag / Projekt"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Warteliste"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Geschäftsbedingungen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkaufsaufträge"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Steuerbetrag"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Auf Anforderung"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Steuert Beschaffung und Rechnungsstellung"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Auftrag"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Statistik Verkaufsaufträge"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Ist ein Follower"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistik Verkaufsauftrag"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Verkäufer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Erweiterter Filter..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Angebot"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Produkt für Anzahlung"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Fehlerliste"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Der Verkäufer erstellt die Rechnung per Hand, wenn die Abrechnungsbedingung  "
+"\" Lieferung & Manuelle Rechnung\" lautet. Die Rechnung wird automatisch "
+"erstellt, wenn die Regel \"Zahlung vor Lieferung\" ist."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkaufsshop"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Ermöglicht die Erstellung von Aufträgen unter Verwendung verschiedener "
+"Lieferbedingungen und angebundener Lagerwirtschaft."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Wählen Sie ein Dienstleistungsprodukt namens \"Anzahlung\".\n"
+"                  Möglicherweise müssen Sie dieses Produkt vorab definieren, "
+"um es als Standard Vorauswahl zu hinterlegen."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Auftrag in Bearbeitung"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+"Durch Aktivierung können Sie automatische Mitteilungen für Produkte "
+"hinterlegen und diese automatisch ausführen, wenn ein Benutzer dieses "
+"Produkt in eine Angebotsposition übernimmt. Zum Beispiel Mitteilungen bei "
+"Produkten: Dieses Produkt wird demnächst nicht mehr verfügbar sein, bitte "
+"nicht mehr als 5 St. verkaufen.\n"
+"                    Mitteilung bei Lieferant: Nicht vergessen, "
+"Expresslieferung bei Bestellung anzugeben."
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Die Projekt Kostenstelle für diesen Auftrag"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Rechnung anzeigen"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Was möchten Sie abrechnen ?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Benutzen Sie Preislisten, um den Preis auf Kundenbasis anzupassen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Der Verkäufer bestätigt den Verkaufsauftrag. Der Status des "
+"Verkaufsauftrages wechselt auf 'In Bearbeitung' oder auf 'In Bearbeitung und "
+"abzurechnen'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Sie müssen eine Preisliste oder einen Kunden im Verkaufsformular auswählen, "
+"bevor Sie ein Produkt auswählen."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Referenz zu Beleg, der den Verkaufsauftrag ausgelöst hat"
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Keine gültige Preisliste gefunden"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Anzahlung von %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Tage bis Auftrag"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Angebote"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+"Sie können durch Aktivierung das Modul sale_analytic_plans installieren."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoriere den Ausnahmefehler"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Lieferadresse für den aktuellen Auftrag."
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Gewinnspanne in Aufträgen anzeigen"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Diese Liste beinhaltet alle Rechnungen für diesen Auftrag. Der gleiche "
+"Auftrag könnte mehrere Rechnungen verursacht haben, z.B. bei bereits "
+"erfolgter Abrechnung einzelner Positionen."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Ihre Referenz"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Zeige abzurechnende Positionen"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Auftragsdatum"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Preisliste"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "USt.:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Kundenrechnungen"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Bestätigte Verkaufsaufträge zur Abrechnung"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Verkaufsaufträge"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Wenn Sie die Preisliste diese Auftrags ändern (und ggf die Währung) werden "
+"sich die Preise der Zeilen nicht automatisch ändern!"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Anz."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Beschaffung an Lager"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Angebot"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Bruttobetrag"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Erledigt"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Rechnungsanschrift:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Meine Verkaufsauftragspositionen"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Followers"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Keine Preisliste! "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Suche nicht abgerechnete Auftragspositionen"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -328,219 +1648,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Angebot "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Anzahlung von  %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "fehlerhafte Sonderfälle"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Ein Partner, dem dieses bestimmte Produkt zugeordnet wurde."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie hier, um ein Angebot zu erzeugen, das in einen "
-"Auftrag\n"
-"                umgewandelt werden kann.\n"
-"              </p><p>\n"
-"                OpenERP unterstützt Sie effizient Ihren vollständigen "
-"Verkaufsprozess\n"
-"                abzuwickeln: Angebot, Auftrag, Lieferung, Rechnungsstellung "
-"und Bezahlung.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistik Verkaufsauftrag"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Die Projekt Kostenstelle für diesen Auftrag"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Rechnung anzeigen"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Anzahlung von %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Angebote"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Menge"
+msgid "Shipping address :"
+msgstr "Lieferanschrift:"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Lieferadresse für den aktuellen Auftrag."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "USt.:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Steuerzuordnung"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In Arbeit"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Rechnungsentwurf %s %s <b>wartet auf Bestätigung</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Der Verkäufer bestätigt den Verkaufsauftrag. Der Status des "
-"Verkaufsauftrages wechselt auf 'In Bearbeitung' oder auf 'In Bearbeitung und "
-"abzurechnen'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"Sie können keine Auftragszeile stornieren, wenn sie bereits abgerechnet "
-"wurde."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Vor Lieferung"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"Es gibt noch keine Steuer Zuordnung oder Erlöskonto, das als Standard "
-"Einstellung bei den Produkt Kategorien hinterlegt wurde."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Adressen in Aufträgen"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Vertrag / Projekt"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Abrechnung von Auftragszeilen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Bestellmonat"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -550,460 +1663,24 @@ msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "oder"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Abgerechnet"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Kostenstelle für den Verkauf"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bestätigung am"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Vertriebspartner"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "Abrechnung Auftrag"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "März"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Verkauf: Als gelesen markieren"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Gesamtsumme."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
+msgid "Invoice Sales Order"
 msgstr ""
-"Stapelverarbeitung von Rechnungen auf Basis von Lieferauftragsjournalen"
 
 #. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Zwischensumme"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Rabatt auf Auftragszeilen erlauben"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Rechnungsanschrift:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Mengeneinheit "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "Die"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Rechnungsadresse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Auftragspositionen meiner Verkaufsaufträge"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Angebot / Bestellung"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
-"Alle Auftragszeilen werden in Rechnung gestellt. Sie können auch einen "
-"Prozentsatz\n"
-"                definieren, der auf die Summe angewendet wird oder einen "
-"Festpreis (für Abschlagszahlungen) direkt aus dem Auftrag."
 
 #. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(aktualisieren)"
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Vertragsmanagement benutzen"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Auftragsposition"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Ein Mitarbeiter hatte mehrere Rollen  in veschiedenen Verträgen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Drucken"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Bestellnummer"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Auftragszeilen"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Verwenden Sie mehrere Kostenstellen für den Verkauf"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-"Bei Aktivierung können Sie Aufträge und Lieferungen (Lieferaufträge) "
-"zwischen verschiedenen \n"
-"Journalen differenzieren und dann im Stapel ausführen. Sie installieren "
-"hierdurch das Modul\n"
-"sale_journal."
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Datum Auftragserstellung"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Auftrag für <em>%s</em> wurde auf <b>Erledigt</b> gesetzt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Abzurechnende Auslieferungen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Summe:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Meine Verkäufe"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Preisliste"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-"* Die \"Entwurf\"-Status wird zugewiesen, wenn der zugehörige Auftrag im "
-"Entwurf-Status ist.\n"
-"* Die \"Bestätigt\"-Status wird zugewiesen, wenn der korrespondierende "
-"Auftrag bestätigt wurde.\n"
-"* Der \"Sonderfall\" Status wird zugewiesen, wenn korrespondierende Belege "
-"des Auftrags abgebrochen wurden.\n"
-"* Der \"Erledigt\" Status wird zugewiesen, wenn die Auftragspositionen "
-"versendet wurden.\n"
-"* Der \"Abgebrochen\"-Status wird zugewiesen, wenn ein Benutzer den "
-"korrespondierenden Auftrag abbricht."
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr "Es wurde kein Ertragskonto als allgemeiner Standard festgelegt."
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Konfigurationsfehler!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "E-mail senden"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Stunde"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Auftragsdatum"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Ausgeliefert"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-"Erlaubt dem Verkäufer Rechnung auf Basis von Auftragspositionen zu erstellen."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Erzeuge und zeige Rechnung an"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie zur Definition eines neuen Verkauf Shops.\n"
-"              </p><p>\n"
-"                Jedes Angebot oder Auftrag muss einem Shop zugewiesen "
-"werden. Der Shop bestimmt das\n"
-"                 Zentrallager aus dem die Produkte für jeden einzelnen "
-"Auftrag ausgeliefert werden.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Angebot"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Sie können einen Verkaufsauftrag ohne Zeilen nicht bestätigen"
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Sie müssen eine Preisliste oder einen Kunden im Verkaufsformular auswählen, "
-"bevor Sie ein Produkt auswählen."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Produktkategorie"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Der Auftrag kann nicht abgebrochen werden!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Wiederherstellung Rechnung"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"Um einen bestätigten Auftrag zu löschen, muss er vorher storniert werden!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Steuern:"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "Auf Anforderung"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "Unbekannt"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Ist ein Follower"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Erweiterter Filter..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Fehlerliste"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-"Wählen Sie ein Dienstleistungsprodukt namens \"Anzahlung\".\n"
-"                  Möglicherweise müssen Sie dieses Produkt vorab definieren, "
-"um es als Standard Vorauswahl zu hinterlegen."
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-"Durch Aktivierung können Sie automatische Mitteilungen für Produkte "
-"hinterlegen und diese automatisch ausführen, wenn ein Benutzer dieses "
-"Produkt in eine Angebotsposition übernimmt. Zum Beispiel Mitteilungen bei "
-"Produkten: Dieses Produkt wird demnächst nicht mehr verfügbar sein, bitte "
-"nicht mehr als 5 St. verkaufen.\n"
-"                    Mitteilung bei Lieferant: Nicht vergessen, "
-"Expresslieferung bei Bestellung anzugeben."
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Keine gültige Preisliste gefunden"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Gewinnspanne in Aufträgen anzeigen"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Diese Liste beinhaltet alle Rechnungen für diesen Auftrag. Der gleiche "
-"Auftrag könnte mehrere Rechnungen verursacht haben, z.B. bei bereits "
-"erfolgter Abrechnung einzelner Positionen."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Ihre Referenz"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Anz."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Meine Verkaufsauftragspositionen"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -1013,390 +1690,60 @@ msgstr ""
 "zutrifft.\n"
 "Sie müssen entweder das Produkt, die Anzahl oder die Preisliste ändern."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Anzahlungsrechnung"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Erzeuge Rechnung"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Nettobetrag"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Auftrag Referenz"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"Ermöglicht die Erstellung von Aufträgen unter Verwendung verschiedener "
-"Lieferbedingungen und angebundener Lagerwirtschaft."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Hier wird angezeigt, ob eine Rechnung bezahlt wurde."
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Verkaufspreis"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Angebotsnummer"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Beschaffe von Auftrag"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Lieferanschrift:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Ermöglicht die Zuordnung einer Kostenstelle zu einem Auftrag."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Entwurf Zustand des Verkaufsauftrags"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Angebot für <em>%s</em> <b>erzeugt</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Nachrichten und Kommunikations-Historie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Neue Kopie des Angebots"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Kann eine Auftragszeile im Status '%s' nicht löschen."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Eigentschaften von Zeilen"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Bevor Sie ein Produkt auswählen,\n"
-" wählen Sie einen Kunden im Verkaufsformular aus."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Bruttobetrag"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Bestelldatum des Verkaufsauftrages"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Bestätige Angebot"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Auftragszeilen für Rechnung"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Produkteigenschaften"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Warteliste"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Maßeinheit"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Dispositionsmethode"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preis/ME"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Rechnung auf Basis eines vollständigen Auftrags"
+msgid "Percentage"
+msgstr "Prozentsatz"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Ungelesene Nachrichten"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Angebotsentwurf"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Verkaufsauftrag"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Umsatzsteuer"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Fakturierbare Verkaufsaufträge"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-"Die Funktion eines Mitarbeiters  kann als Standard bei Projekt Verträgen "
-"übernommen werden.\n"
-"                  Dieses ist sinnvoll, wenn Benutzer Vertragsarbeiten über "
-"Stundenzettel eingeben. Diese Werte können dann einfach übernommen werden.\n"
-"                   Es gibt dennoch natürlich die Möglichkeit die Werte zu "
-"überschreiben. Durch Aktivierung installieren Sie hier die Anwendung "
-"analytic_user_function."
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum der Auftragserstellung"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Erzeuge Rechnungen"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Ungültige Aktion!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Anzahlung"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Ausgelieferte Menge"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Wenn Sie die Preisliste diese Auftrags ändern (und ggf die Währung) werden "
-"sich die Preise der Zeilen nicht automatisch ändern!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Rechnungen erstellen"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# des Auftrags"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Abzurechnen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Jahr des Verkaufsauftrages"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Nachdem Sie 'Auftragszeilen zur Verrechnung anzeigen' angeklickt haben, "
-"wählen Sie die zu verrechnenden Zeilen aus und erzeugen Sie die Rechnung "
-"durch Auswahl des Eintrages im Menu 'Mehr'."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-"Gibt an das mindestens eine Rechnung für diesen Auftrag erzeugt wurde."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Versand Fehlerliste"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppiere Rechnungen"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-"Das Angebot für <em>%s</em> <b>wurde umgewandelt</b> in Auftrag %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Auftrag abrechnen"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Vertragsverwaltung"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Monat"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Vom Rechnungswesen zu überprüfen"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Erzeuge Rechnungen"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Verkaufsauftragszeile Erzeuge Rechnung"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vorherige Angebote"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Bezahlt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Statistik Verkaufsaufträge"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Angebot"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Der Verkäufer erstellt die Rechnung per Hand, wenn die Abrechnungsbedingung  "
-"\" Lieferung & Manuelle Rechnung\" lautet. Die Rechnung wird automatisch "
-"erstellt, wenn die Regel \"Zahlung vor Lieferung\" ist."
+msgid "Other Information"
+msgstr "Andere Informationen"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1419,27 +1766,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1454,7 +1784,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1494,201 +1824,6 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hallo${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>wir senden Ihnen auf diesem Weg ein(en)${object.state in ('draft', "
-"'sent') and 'quotation' or 'order confirmation'} "
-"von${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>BEZUG</strong><br />\n"
-"       &nbsp;&nbsp;Angebots-/Auftragsnummer: "
-"<strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Betrag: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Datum: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Bezug: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Ihre Referenz: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Ihr Ansprechpartner: <a "
-"href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>Sie können gerne Online mit Paypal bezahlen:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"\n"
-"    <br/>\n"
-"    <p>Zögern Sie bitte nicht, uns bei Fragen Ihrerseits zu "
-"kontaktieren.</p>\n"
-"    <p> ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Homepage :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Benutzen Sie Preislisten, um den Preis auf Kundenbasis anzupassen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bestätigte Auftragspositionen, noch nicht geliefert"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-"Der Auftrag erzeugt automatisch einen Rechnungsvorschlag (Entwurf). Sie "
-"haben die Wahl, ob Sie auf Basis Ihres Angebots abgerechnen wollen "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Kundenrechnungen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Verkaufsaufträge"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"Durch Aktivierung können Sie Ihre Margen in Angeboten / Aufträgen anzeigen.\n"
-"                  Hierdurch haben Sie die Möglichkeit Ihre Handelsspanne als "
-"Differenz zwischen Verkauf Preis und Standard Preis zu berechnen.\n"
-"\n"
-"                   Sie installieren hierdurch das Modul sale_margin."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preis/ME"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Belegreferenz"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Nettobetrag"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Anzahlungsrechnung"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1699,9 +1834,39 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Erzeugt Rechnungen auf Basis von Auftragszeilen"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Gesamtsumme."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Auftrag bestätigen"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Es wurde kein Ertragskonto für dieses Produkt ausgewählt: \"%s\" (Kürzel: "
+"%d)."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Verkaufspreis"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1720,434 +1885,35 @@ msgstr ""
 "muss vor Auslieferung bezahlt werden."
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Monatlicher Umsatz"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Diese Auswertung analysiert Ihre Angebote und Verkaufsaufträge. Hierbei "
+"werden Ihre Verkaufsumsätze  ausgewertet und nach verschiedenen Kriterien "
+"gruppiert (Verkäufer, Partner, Produkt, etc). Benutzen Sie diese Auswertung "
+"außerdem, um noch nicht in Rechnung gestellte Verkaufsaufträge zu "
+"analysieren. Wenn Sie Ihren Umsatz analysieren möchten, nutzen Sie bitte die "
+"Statistik für die Umsatzerlöse in der Finanzbuchhaltung."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Abrechnungsumfang"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Festpreis (Anzahlung)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Angebot / Bestellung"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Auftragsdatum"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkt - Verkaufseinheit"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuell in Bearbeitung"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Verkauf: Als ungelesen markieren"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Auftrag"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Auftrag bestätigen"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Durch einen Verkaufsauftrag"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignoriere den Ausnahmefehler"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Abhängig vom Abrechnungsumfang eines Verkaufsauftrags, kann die Rechnung auf "
-"Basis der beauftragten Mengen oder der ausgelieferten Mengen erfolgen. "
-"Hierdurch kann die Rechnungserstellung schon bei der Auftragserteilung so "
-"gesteuert werden, dass eine frühestmögliche Abrechnung durch den Vertriebler "
-"optional vorgesehen werden kann."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Einige Auftragspositionen"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Rabatt auf Auftragspositionen"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenz des Kunden"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Bruttobetrag"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Treffen Sie eine Auswahl für die Abrechnung des Auftrags.  Diese Auswahl\n"
-"                        erstellt einen Rechnungsentwurf, der vor endgültiger "
-"Validierung / Buchung noch\n"
-"                        modifiziert werden kann."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Pinnwand Verkauf"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Benutzen Sie vollständige Abrechnung des Auftrags für eine Schlussrechnung.\n"
-"                         Wählen Sie Prozentualer Anteil, für prozentuale "
-"Teilabrechnung des Gesamtauftrags.\n"
-"                         Wählen Sie Festpreis für die Anzahlung eines "
-"Festbetrags im voraus.\n"
-"                         Wählen Sie Einige Auftragspositionen für eine "
-"selektive Abrechnung einzelner Positionen."
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"Durch diese Anwendung können Sie die Konditionen Ihrer Projekt Verträge "
-"definieren: Abrechnung\n"
-"                (Festpreis, von Stundenzettel, Ausgaben Verrechnung), Preise "
-"(650 € / Tag) oder die Laufzeit \n"
-"                (z.B. 1 Jahr Support Vertrag). Sie können den Projekt "
-"Vertrag Fortschritt verfolgen und automatisch\n"
-"                Abrechnungen erstellen. Es wird das Modul "
-"account_analytic_analysis installiert."
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum der Auftragsbestätigung"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-"Stornieren Sie zuerst alle Rechnungen, die mit diesem Auftrag verknüpft sind."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Rechnungsdatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Der Vorauszahlungsbetrag"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Abrechnungsfehler"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kein Kunde definiert !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Lieferadresse"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Abrechnung"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Lager Eigenschaften"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Nettobetrag:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Beschaffe an Lager: Bei Bedarf wird das Produkt entweder direkt vom Lager "
-"entnommen oder es wird abgewartet bis wieder Bestand auf Lager ist.\n"
-"Beschaffe von Auftrag: Bei Bedarf wird das Produkt entweder eingekauft oder "
-"produziert."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Suche nicht abgerechnete Auftragspositionen"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Angebot gesendet"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "E-Mail Assistent"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Vertriebsshop"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Geplante Lieferung am"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-"Bitte wählen Sie ein Verkaufsjournal für das Unternehmen \"%s\" (id:%d) aus."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Vertragseigenschaften"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Verkaufsauftrag"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Menge (Verkaufseinheit)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Unerledigte Auftragspositionen"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bestätigt"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Geschäftsbedingungen"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bestätigen"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Followers"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Rechnungszeilen"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Positionen"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Verkaufsauftragpositionen"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Standardeinstellungen"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Kostenstellen für den Verkauf"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Preisliste(%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie zur Erstellung eines Angebots oder Auftrags für "
-"diesen Kunden.\n"
-"              </p><p>\n"
-"                OpenERP hilft bei der vollständigen Abwicklung des "
-"Auftragszyklus:\n"
-"                Angebot, Auftrag, Auslieferung, Abrechnung und "
-"Zahlungsabwicklung.\n"
-"              </p><p>\n"
-"                Optimieren Sie auch die Kommunikation in Ihrem soziales "
-"Business-Netzwerk. \n"
-"                Sie können direkt zu allen Geschäftsvorgängen wie Rechnungen "
-"oder \n"
-"                Veranstaltungen Kurzmitteilungen versenden oder ad-hoc "
-"Kommentare \n"
-"                versenden und empfangen. Verfolgen Sie mit höchstmöglicher "
-"Effizienz \n"
-"                den Arbeitsfortschritt. Wichtige Infos können nicht mehr im "
-"EMail Postfach\n"
-"                untergehen.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "Bei Auslieferung"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Basis Mengeneinheit"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Wollen Sie wirklich diese Rechnung erstellen?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -2157,270 +1923,47 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
-"Klicken Sie einfach zur Erstellung eines neuen Auftrags.\n"
-"              </p><p>\n"
-"                OpenERP  wird Ihnen dabei helfen, Ihren Vertriebsprozess "
-"effizient abzubilden,\n"
-"                vom Angebot zum Auftrag, über den Lieferauftrag, die "
-"tatsächliche Ablieferung \n"
-"                beim Kuden, die Abrechnung und die Verfolgung des "
-"Zahlungseingangs.\n"
-"              </p><p>\n"
-"                Das soziale Netzwerk übernimmt dabei die Funktion des  "
-"Sozialnetwerks ,\n"
-"                die Diskussionen helfen dabei, Diskussionen zur jeder Sale "
-"Order  und ermöglicht\n"
-"                Ihren Kunden die Rückverfolgbarkeit eines Auftrags. \n"
-"              </p>\n"
-"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
-"Die Ausgangsrechnung kann für den Verkaufsauftrag aus folgendem Grund "
-"aktuell nicht erstellt werden:\n"
-"1. Der Status ist entweder \"In Entwurf\" oder \"Abgebrochen\"\n"
-"2. Der Verkaufsauftrag wurde bereits abgerechnet"
+"Es gibt noch keine Steuer Zuordnung oder Erlöskonto, das als Standard "
+"Einstellung bei den Produkt Kategorien hinterlegt wurde."
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Erledigte Verkaufsauftragspositionen"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Vom Rechnungswesen zu überprüfen"
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Gewicht"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Eigentschaften von Zeilen"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Alle Rechnungen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Dezember"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"Es wurde kein Ertragskonto für dieses Produkt ausgewählt: \"%s\" (Kürzel: "
-"%d)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nicht abgerechnet"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Steuert Beschaffung und Rechnungsstellung"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Nettobetrag"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Anzahlungsrechnung"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Öffne Menü Verkauf"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Erzeuge Lieferscheine automatisch aus Aufträgen"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Steuerbetrag"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Auftrag "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Verkaufsauftragspositionen zu fakturieren"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "E-Mail Vorlagen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Verkaufsaufträge"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Verkaufsshop"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Produkt für Anzahlung"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr "Anzeige der Nummernfolge bei mehrereren  Zeilenordner."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Auftrag in Bearbeitung"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Auftrag für <em>%s</em> wurde <b>abgebrochen</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Referenz zu Beleg, der den Verkaufsauftrag ausgelöst hat"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Tage bis Auftrag"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Auftragsstatus"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Zeige abzurechnende Positionen"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Auftragsdatum"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Bestätigte Verkaufsaufträge zur Abrechnung"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Nicht bestätigte Verkaufsaufträge"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Beschaffung an Lager"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Keine Preisliste! "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Aufträge"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Vertragsmanagement benutzen"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Hier wird angezeigt, ob eine Rechnung bezahlt wurde."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mai"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Wollen Sie wirklich diese Rechnung erstellen?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Abzurechnende Aufträge"
 
 #. module: sale
 #: view:sale.order:0
@@ -2444,11 +1987,131 @@ msgstr "Vorschuss"
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Abrechnungsumfang"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Festpreis (Anzahlung)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Auftragsdatum"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Vor Lieferung"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkt - Verkaufseinheit"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Entwurf Zustand des Verkaufsauftrags"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Belegreferenz"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuell in Bearbeitung"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Warnung!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vorherige Angebote"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Nachrichten und Kommunikations-Historie"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Suche Verkaufsaufträge"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Beschreibung"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2463,20 +2126,49 @@ msgstr ""
 "                        mit Ihren Kunden sind."
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestellmonat"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Durch einen Verkaufsauftrag"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Suche Verkaufsaufträge"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Was möchten Sie abrechnen ?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Abhängig vom Abrechnungsumfang eines Verkaufsauftrags, kann die Rechnung auf "
+"Basis der beauftragten Mengen oder der ausgelieferten Mengen erfolgen. "
+"Hierdurch kann die Rechnungserstellung schon bei der Auftragserteilung so "
+"gesteuert werden, dass eine frühestmögliche Abrechnung durch den Vertriebler "
+"optional vorgesehen werden kann."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sequenz"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "VE"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Einige Auftragspositionen"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Kann eine Auftragszeile im Status '%s' nicht löschen."
 
 #. module: sale
 #: report:sale.order:0
@@ -2485,26 +2177,33 @@ msgid "Payment Term"
 msgstr "Zahlungsbedingung"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr ""
-"Sie können durch Aktivierung das Modul sale_analytic_plans installieren."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Fakturierbare Verkaufsaufträge"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Diese Auswertung analysiert Ihre Angebote und Verkaufsaufträge. Hierbei "
-"werden Ihre Verkaufsumsätze  ausgewertet und nach verschiedenen Kriterien "
-"gruppiert (Verkäufer, Partner, Produkt, etc). Benutzen Sie diese Auswertung "
-"außerdem, um noch nicht in Rechnung gestellte Verkaufsaufträge zu "
-"analysieren. Wenn Sie Ihren Umsatz analysieren möchten, nutzen Sie bitte die "
-"Statistik für die Umsatzerlöse in der Finanzbuchhaltung."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "oder"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkaufsauftragpositionen"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Preisliste für diesen Verkaufsauftrag."
 
 #. module: sale
 #: report:sale.order:0
@@ -2512,21 +2211,70 @@ msgid "Quotation N°"
 msgstr "Angebot Nr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Rabatt auf Auftragspositionen"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenz des Kunden"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Ausgeliefert"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Jahr"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Durch Aktivierung können Sie Ihre Margen in Angeboten / Aufträgen anzeigen.\n"
+"                  Hierdurch haben Sie die Möglichkeit Ihre Handelsspanne als "
+"Differenz zwischen Verkauf Preis und Standard Preis zu berechnen.\n"
+"\n"
+"                   Sie installieren hierdurch das Modul sale_margin."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Bevor Sie ein Produkt auswählen,\n"
+" wählen Sie einen Kunden im Verkaufsformular aus."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Bruttobetrag"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Neue Kopie des Angebots"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Treffen Sie eine Auswahl für die Abrechnung des Auftrags.  Diese Auswahl\n"
+"                        erstellt einen Rechnungsentwurf, der vor endgültiger "
+"Validierung / Buchung noch\n"
+"                        modifiziert werden kann."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Bestelldatum des Verkaufsauftrages"
 
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Verwaltet den Liefer- und Fakturierungs- Fortschritt"
@@ -2776,6 +2524,9 @@ msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
 #~ msgid "One procurement for each product."
 #~ msgstr "Ein Beschaffungsvorgang je Produkt"
 
+#~ msgid "Sale Order"
+#~ msgstr "Verkaufsauftrag"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Preisliste Verkauf"
 
@@ -3768,6 +3519,9 @@ msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
 #~ msgid "Based on Delivery Orders"
 #~ msgstr "Basierend auf Lieferaufträgen"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Meine Verkaufsaufträge"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "Der Name der Firma darf nur einmal vorkommen!"
 
@@ -3802,6 +3556,10 @@ msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
 #~ msgid "Options"
 #~ msgstr "Optionen"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Sie können einen Verkaufsauftrag ohne Zeilen nicht bestätigen"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is in state '%s'!"
 #~ msgstr "Kann Varkaufsauftragspositionen im Status %s nicht löschen."
@@ -3837,6 +3595,9 @@ msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Bestätigte Auftragspositionen, noch nicht geliefert"
+
 #~ msgid ""
 #~ "This tool will help you to install the right module and configure the system "
 #~ "according to the method you use to invoice your customers."
@@ -3847,6 +3608,15 @@ msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
 #~ msgid "Setup your Invoicing Method"
 #~ msgstr "Bestimmen Sie Ihre Fakturierungsmethode"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Erledigte Verkaufsauftragspositionen"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Verkaufsauftragspositionen zu fakturieren"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Unerledigte Auftragspositionen"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Vorwiegende Methode basiert auf"
 
@@ -4173,3 +3943,10 @@ msgstr "Möchten Sie die Auswahl der Auftragspositionen auch abrechnen ?"
 #~ "festlegen ob auf Basis bestellter oder gelieferter Ware fakturiert werden "
 #~ "soll. Wenn das Produkt ein Service ist, dann bedeuten gelieferte Mengen die "
 #~ "Zeiteinheiten,  die für die zugehörigen Aufgaben verbraucht wurden."
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Auftragspositionen, die bestätigt, erledigt oder Sonderfälle sind und noch "
+#~ "nicht abgerechnet sind."
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 8ac449fc043..f755eaaf06e 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Επιβεβαίωση Πώλησης"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Ημερομηνία Επιβεβαίωσης"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Ομαδοποίηση Κατά..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Συνεργάτης Παροχής"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Μέθοδος Προμήθειας"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Ημερομηνία στην οποία η παραγγελία πώλησης επιβεβαιώνεται."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Μάρτιος"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Εταιρία"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Ημερομηνία Τιμολογίου"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Μή τιμολογημένα και Απεσταλμένες Γραμμές"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Εξαίρεση Τιμολογίου"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Αναλυτικός Λογαριασμός"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Υποσύνολο"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Ημέρα"
 msgid "Cancel Order"
 msgstr "Ακύρωση Εντολής"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Βάρος"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Σε εντολή"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Φόροι"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Αφορολόγητο Ποσό"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Καθαρό Σύνολο:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Ακυρώθηκε"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Εξαίρεση Παράδοσης"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Ποσότητα (ΜοΠ)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Κατάστημα"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Πωλήσεις σε Εξαίρεση"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Διεύθυνση Τιμολογίου"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Δημιουργία τιμολογίων"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Ημερομηνία Επιβεβαίωσης"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Αναλυτικός Λογαριασμός"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Γραμμών"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "# από Ποσ."
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Παραγγελία Πώλησης"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Γραμμή Παραγγελίας Πώλησης"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Προκαθορισμένος Όρος Πληρωμής"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Παραδοθέντα Τεμάχια"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Έτος"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Εκπτ.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Συνολική Τιμή"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Τσέκαρε αυτό το κουτί για να ομαδοποιήσεις τα τιμολόγια ανά πελάτη"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Παραγγελθέντα Τεμάχια"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Παραπομπή Εντολής"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Άλλες Πληροφορίες"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Πωλήσεις Δημιουργία Τιμολογίου"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Έκπτωση (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Οι Προσφορές Μου"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Όνομα καταστήματος"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Πωλήσεις σε Εξαίρεση"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Κατάσταση"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Αύγουστος"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Ιούνιος"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Ο αναλυτικός λογαριασμός που σχετίζεται με την παραγγελία πώλησης"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Οκτώβριος"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Προσφορές"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Ποσότητα"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Σεπτέμβριος"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Λογιστική Θέση"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Σε Εξέλιξη"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Τηλ:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Διέυθυνση Τιμολόγησης για την τρέχουσα παραγγελία πώλησης."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Τιμολογημένα"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Ημερομηνία Επιβεβαίωσης"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Συνεργάτης Παροχής"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Μάρτιος"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Το συνολικό ποσό."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Υποσύνολο"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Διεύθυνση τιμολογίου:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Διεύθυνση Τιμολογίου"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Προσφορά / Εντολή"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Γραμμή Παραγγελίας Πώλησης"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "Γραμμές Εντολής"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Εκπτ.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Γραμμές Τιμολογίου"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Συνολική Τιμή"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Τσέκαρε αυτό το κουτί για να ομαδοποιήσεις τα τιμολόγια ανά πελάτη"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Μή τιμολογημένα και Απεσταλμένες Γραμμές"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Διέυθυνση Τιμολόγησης για την τρέχουσα παραγγελία πώλησης."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Παραγγελθέντα Τεμάχια"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Ποσότητα"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Σύνολο:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Οι πωλήσεις μου"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Τιμοκατάλογος"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Παραπομπή Εντολής"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Λογιστική Θέση"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Ιούλιος"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Κατάσταση"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Ημερομηνία Παραγγελίας"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Απεσταλμένο"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Πληρωμένα"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Συνεργάτης"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,38 +850,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Ημερομηνία Προσφοράς"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Ομαδοποίηση τιμολογίων"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Πωλήσεις Δημιουργία Τιμολογίου"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Έκπτωση (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Οι Προσφορές Μου"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Τιμολόγια"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Δεκέμβριος"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Απεσταλμένο"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Μήνας"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Ατιμολόγητα"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr "Κατηγορία Προϊόντος"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Επαναδημιουργία Τιμολογίου"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Όνομα καταστήματος"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,36 +974,260 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Φόροι:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Τιμολογημένα"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Advance Invoice"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Σε Εξέλιξη"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Δεν έχει Οριστεί Πελάτης!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Δημιουργία τιμολογίων"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Επιβεβαιωμένο"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Πρόχειρο"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Χρονοδιάγραμμα Αναμονής"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Εντολές Πώλησης"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Αύγουστος"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Εκκρεμότητες"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Ιούνιος"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Εντολή"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Ανάλυση Πωλήσεων"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Νοέμβριος"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Εκτεταμένα Φίλτρα..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Προσφορά"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Advance Product"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Εξαίρεση"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Οκτώβριος"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Κατάστημα Πώλησης"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Ιανουάριος"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Εντολές Πώλησης σε Εξέλιξη"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Ο αναλυτικός λογαριασμός που σχετίζεται με την παραγγελία πώλησης"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Προσφορές"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Ο αριθμός πρωτοκόλλου σας"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Ημερομηνία Παραγγελίας"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Τιμοκατάλογος"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Επιβεβαιωμένη παραγγελία πώλησης για τιμολόγηση."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Αλληλουχία"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Πωλήσεις"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ποσότητα"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Απο στόκ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Ημερομηνία Προσφοράς"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Σύνολο"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Εκπληρωμένο"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Διεύθυνση τιμολογίου:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Τιμολόγιο"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Άκυρο"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Αναζήτηση Ατιμολόγητων γραμμών"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Διεύθυνση παράδοσης:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,357 +1593,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Δημιουργία Τιμολογίου"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Τιμή"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Σε εντολή"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Διεύθυνση παράδοσης:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Πρόχειρη κατάσταση των παραγγελιών πώλησης"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Συνολικός Φόρος που εμπεριέχεται"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Επιβεβαίωση Πώλησης"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Ομαδοποίηση Κατά..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Χρονοδιάγραμμα Αναμονής"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Μέθοδος Προμήθειας"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Τιμή Μονάδας"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Εντολή Πώλησης"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Φόροι"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Δημιουργία τιμολογίων"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Παραδοθέντα Τεμάχια"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Ιούλιος"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Εξαίρεση Παράδοσης"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Ομαδοποίηση τιμολογίων"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Μήνας"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Δημιουργία τιμολογίων"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Πληρωμένα"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Ανάλυση Πωλήσεων"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Προσφορά"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Άλλες Πληροφορίες"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Πωλήσεις"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Τιμή Μονάδας"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Εκπληρωμένο"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Τιμολόγιο"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Εκκρεμότητες"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,10 +1722,38 @@ msgid "Product"
 msgstr "Προϊόν"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Το συνολικό ποσό."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Μάιος"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Τιμή"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1472,383 +1766,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Τιμολόγηση σε"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Προσφορά / Εντολή"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Ημερομηνία Εντολής"
+msgid "Tel. :"
+msgstr "Τηλ:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "ΜοΠ Προϊόντος"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Χειροκίνητη σε εξέλιξη"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Εντολή"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Από παραγγελία πώλησης"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Πρωτόκολλο πελάτη"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Σύνολο"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Ημερομηνία στην οποία η παραγγελία πώλησης επιβεβαιώνεται."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Εταιρία"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Ημερομηνία Τιμολογίου"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Εξαίρεση Τιμολογίου"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Δεν έχει Οριστεί Πελάτης!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Καθαρό Σύνολο:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Ακυρώθηκε"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Αναζήτηση Ατιμολόγητων γραμμών"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Κατάστημα"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Ημερομηνία Επιβεβαίωσης"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Παραγγελία Πώλησης"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Ποσότητα (ΜοΠ)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Επιβεβαιωμένο"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Γραμμές Τιμολογίου"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Γραμμών"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Γραμμές Εντολών Πώλησης"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Είστε σιγουροι ότι θέλετε να δημιουργήσετε τιμολόγιο(α);"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1858,242 +1798,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Βάρος"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Τιμολόγια"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Δεκέμβριος"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Ατιμολόγητα"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Αφορολόγητο Ποσό"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Advance Invoice"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Πρόχειρο"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Εντολές Πώλησης"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Κατάστημα Πώλησης"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Νοέμβριος"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Advance Product"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Ιανουάριος"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Εντολές Πώλησης σε Εξέλιξη"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Ημερομηνία Παραγγελίας"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Επιβεβαιωμένη παραγγελία πώλησης για τιμολόγηση."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Απο στόκ"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Περιγραφή"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Μάιος"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Είστε σιγουροι ότι θέλετε να δημιουργήσετε τιμολόγιο(α);"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr "Φεβρουάριος"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Τιμολόγηση σε"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Σεπτέμβριος"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Ημερομηνία Εντολής"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "ΜοΠ Προϊόντος"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Πρόχειρη κατάσταση των παραγγελιών πώλησης"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Απρίλιος"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Χειροκίνητη σε εξέλιξη"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Αναζήτηση  Παραγγελίες Πωλήσεων"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Περιγραφή"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,20 +1995,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Αναζήτηση  Παραγγελίες Πωλήσεων"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Αλληλουχία"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Από παραγγελία πώλησης"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2153,39 +2041,92 @@ msgid "Payment Term"
 msgstr "Όροι Πληρωμής"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Γραμμές Εντολών Πώλησης"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Αρ. Προσφοράς"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Πρωτόκολλο πελάτη"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Picked"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Έτος"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Συνολικός Φόρος που εμπεριέχεται"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Steps To Deliver a Sale Order"
@@ -2477,6 +2418,9 @@ msgstr ""
 #~ msgid "Sale Procurement"
 #~ msgstr "Προμήθεια Πώλησης"
 
+#~ msgid "Sale Order"
+#~ msgstr "Εντολή Πώλησης"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 6e0122a670a..94ed20eb04c 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -6,50 +6,202 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 18:24+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-19 05:16+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "Parámetros de configuración contable"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Contabilidad analítica para las ventas"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-"Las lineas del pedido de venta que están confirmadas, realizadas o con el "
-"estado de excepción aún no han sido facturadas"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "No hay cuenta de ingresos definida como propiedad global."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Pedidos de venta a facturar"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Comercial"
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Orden de facturación"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Características de los productos"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Permite definir las condiciones del contrato de cliente: método de "
+"facturación (precio fijo, con parte de horas, factura avanzada), el precio "
+"exacto (650 €/día de un desarrollador), la duración (contrato de soporte de "
+"un año). Podrá seguir el progreso del contrato y facturar automáticamente.\n"
+"Esto instalará el módulo 'account_analytic_analysis'."
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'borrador' or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Usar múltiples cuentas analíticas en las ventas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "Primero cancele todas las facturas relativas a este pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Número de presupuesto"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Presupuesto "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Presupuesto borrador"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Dirección de entrega"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+"Permitir facturación en lote de órdenes de entrega a través de los diarios"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +211,29 @@ msgstr "Día"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Características del almacén"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "La unidad de tiempo de trabajo por defecto para los servicios es"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unidad de medida "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +246,186 @@ msgstr "Datos incorrectos"
 msgid "The value of Advance Amount must be positive."
 msgstr "El valor del importe avanzado debe ser positivo."
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Bajo pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Desde stock: Cuando se necesite, el producto se cogerá del stock o se "
+"esperará a su reposición.\n"
+"Bajo pedido: Cuando se necesite, el producto se compra o se fabrica."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Permite definir cuál es la función por defecto de un usuario específico en "
+"una cuenta dad.\n"
+"Se usa en su mayoría cuando un usuario introduce su parte de horas, para que "
+"los campos sean rellenados automáticamente. Pero la posibilidad de cambiar "
+"estos valores está aún disponible.\n"
+"Esto instala el módulo 'analytic_user_function'."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Líneas de pedidos de ventas relacionadas con un pedido de venta mío"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Presupuesto enviado"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Asistente de redacción de correo electrónico."
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Falso"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Impuesto"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "¡Acción no válida!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -109,12 +445,15 @@ msgstr ""
 "pedido establecida."
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -125,6 +464,13 @@ msgstr ""
 "Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"pedidos de venta."
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -132,9 +478,67 @@ msgid "# of Qty"
 msgstr "Nº de ctdad"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Permite aplicar un descuento por línea de pedido de venta."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(actualizar)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Características del contrato"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -146,16 +550,54 @@ msgstr ""
 "clientes.\n"
 "Ejemplo: 10% para minoristas, promoción de 5 EUR en este producto, etc."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Un empleado puede tener diferentes roles por contrato"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Plazo de pago por defecto"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Preparar facturas basadas en los partes de horas"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factura <b>pagada</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -163,9 +605,30 @@ msgid "Allow using different units of measures"
 msgstr "Permite usar diferentes unidades de medida"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Porcentaje"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
 
 #. module: sale
 #: report:sale.order:0
@@ -173,27 +636,61 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 "Defina por favor la cuenta de ingresos para este producto:\"%s\"(id: %id)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Precio total"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Permite categorizar las ventas y entregas (albaranes) entre los diferentes "
+"diarios, y realizar tareas en lote en los mismos.\n"
+"Esto instala el módulo 'sale_journal'."
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mis pedidos de venta"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "Nº de pedido de venta"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -210,514 +707,74 @@ msgstr ""
 "usuario y por mes.\n"
 "Esto instala el módulo 'account_analytica_analysis'."
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Cantidades pedidas"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Año ordenado de los pedidos de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
 msgid "Order Reference"
 msgstr "Referencia del pedido"
 
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Proceso de facturación"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "Orden de venta completa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Presupuestos y pedidos"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-"Le permite seleccionar y configurar diferentes unidades de medida para los "
-"productos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "¡Advertencia de la lista de precios!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr "Crear y ver factura"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr "Permitir configurar alertas por cliente o productos"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p>\n"
-"Ésta es una lista de cada línea de pedido de venta a ser facturada. Puede "
-"facturar pedidos de venta parcialmente, por líneas de pedido de venta. No "
-"necesita esta lista si factura desde las órdenes de entrega o si factura las "
-"ventas totalmente.\n"
-"</p>\n"
-"            "
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Presupuesto "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Avance de %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Empresa para la que el producto en particular necesita ser asignado."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear un presupuesto que puede ser convertido en un pedido de "
-"venta.\n"
-"</p><p>\n"
-"OpenERP le permitirá manejar eficientemente el flujo completo de ventas: "
-"presupuesto, pedido de venta, envío, facturación y pago.\n"
-"</p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Ver factura"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Avance de %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Dirección de envío para el pedido de ventas actual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "La factura en borrador de %s %s <b>espera validación</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"No puede cancelar una línea de pedido de venta que ya ha sido facturada."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "Parámetros de configuración de las ventas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Antes del envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"No hay posición fiscal definida o categoría de cuenta de ingresos definida "
-"para las propiedades por defecto de las categorías de producto."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Direcciones en los pedidos de venta"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Contrato / Analítica"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Habilitar facturar líneas de pedido de venta"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Pedidos de venta ordenados por meses"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"No puede agrupar ventas con diferentes monedas para el mismo cliente."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "o"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Contabilidad analítica para las ventas"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "Orden de facturación"
-
 #. module: sale
 #: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Ventas: Marcar como leídos"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-"Permitir facturación en lote de órdenes de entrega a través de los diarios"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-"Permite establecer un descuento en las líneas de los pedidos de venta"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Unidad de medida "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "La unidad de tiempo de trabajo por defecto para los servicios es"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Líneas de pedidos de ventas relacionadas con un pedido de venta mío"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-"Todos estos elementos en estas líneas de pedido serán facturados. También "
-"puede facturar un porcentaje del pedido de venta o un precio fijo (para "
-"avances) directamente desde el formulario del pedido de venta si lo prefiere."
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(actualizar)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Un empleado puede tener diferentes roles por contrato"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Imprimir"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pedido Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Usar múltiples cuentas analíticas en las ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-"Permite categorizar las ventas y entregas (albaranes) entre los diferentes "
-"diarios, y realizar tareas en lote en los mismos.\n"
-"Esto instala el módulo 'sale_journal'."
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Pedido de venta para <em>%s</em> <b>realizado</b>."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mis ventas"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
+msgid "July"
+msgstr "Julio"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -744,29 +801,61 @@ msgstr ""
 "venta asociado."
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr "No hay cuenta de ingresos definida como propiedad global."
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Opciones por defecto"
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Contabilidad analítica para ventas"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Después de hacer clic en 'Mostrar líneas a facturar', seleccione las líneas "
+"a facturar y cree la factura desde el menú desplegable 'Más'."
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr "Enviar por correo electrónico"
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Hora"
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "Sobre la orden de entrega"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Proceso de facturación"
 
 #. module: sale
 #: view:sale.order:0
@@ -774,25 +863,40 @@ msgid "Order Date"
 msgstr "Fecha pedido"
 
 #. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Enviado"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Orden de venta completa"
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
-"Permitir a su comercial realizar facturas para las líneas de pedido venta "
-"usando el menú 'Líneas a facturar'."
+"Defina por favor un diario de ventas para esta compañía: \"%s\" (id: %d)."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+"Le permite seleccionar y configurar diferentes unidades de medida para los "
+"productos."
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Reference Unit of Measure"
+msgstr "Unidad de medida de referencia"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -800,47 +904,97 @@ msgid "Create and View Invoice"
 msgstr "Crear y ver factura"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para definir una nueva tienda.\n"
-"</p><p>\n"
-"Cada presupuesto o pedido de venta debe estar enlazado con una tienda. La "
-"tienda define el almacén desde el que el producto serás entregado para cada "
-"venta en particular.\n"
-"</p>\n"
-"            "
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "No puede confirmar un pedido de venta sin lineas."
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia de la lista de precios!"
 
 #. module: sale
-#: code:addons/sale/sale.py:1124
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
-"pedido."
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr "Crear y ver factura"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Gestión de contratos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
 
 #. module: sale
 #: view:sale.report:0
@@ -849,7 +1003,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "¡No se puede cancelar este pedido de venta!"
@@ -860,48 +1014,285 @@ msgid "Recreate Invoice"
 msgstr "Volver a Crear factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr "Permitir configurar alertas por cliente o productos"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
-"¡Para eliminar un pedido de venta confirmado, debe cancelarlo primero!"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "Impuestos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Abrir menú de ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Avance de %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Plantillas email"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Empresa para la que el producto en particular necesita ser asignado."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Contrato / Analítica"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Términos y condiciones"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr "Bajo demanda"
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "desconocido"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Es un seguidor"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Fecha"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Comercial"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Permite realizar un presupuesto o un pedido de venta usando diferentes "
+"políticas de pedido y gestionar el stock relacionado.\n"
+"Esto instala el módulo 'sale_stock'."
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -914,6 +1305,30 @@ msgstr ""
 "Tal vez tenga que crearlo y establecerlo como valor por defecto en este "
 "campo."
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -929,11 +1344,97 @@ msgstr ""
 "Cliente: No olvidar preguntar por envío urgente."
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Ver factura"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "¿Qué quiere facturar?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Usar tarifas para adaptar los precios a cada cliente"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
+"pedido."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "¡No se ha encontrado una linea de tarifa valida!"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Avance de %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "Permite instalar el módulo 'sale_analytic_plans'."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Dirección de envío para el pedido de ventas actual."
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -956,11 +1457,106 @@ msgid "Your Reference"
 msgstr "Su referencia"
 
 #. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Mostrar líneas a facturar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Si cambia la tarifa de este pedido (y eventualmente la moneda), los precios "
+"existentes en las lineas del pedido no se actualizarán."
+
+#. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctdad"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -968,22 +1564,106 @@ msgstr "Mis lineas de pedidos de venta"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
+#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "¡No hay tarifa! "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "Parámetros de configuración contable"
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "¡La referencia del pedido debe ser única por compañía!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"Ésta es una lista de cada línea de pedido de venta a ser facturada. Puede "
+"facturar pedidos de venta parcialmente, por líneas de pedido de venta. No "
+"necesita esta lista si factura desde las órdenes de entrega o si factura las "
+"ventas totalmente.\n"
+"</p>\n"
+"            "
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No puede agrupar ventas con diferentes monedas para el mismo cliente."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Usar gestión de contratos"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -993,391 +1673,60 @@ msgstr ""
 "cantidad.\n"
 "Tiene que cambiar o bien el producto, la cantidad, o la tarifa."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Crear factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Referencia de pedido"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"Permite realizar un presupuesto o un pedido de venta usando diferentes "
-"políticas de pedido y gestionar el stock relacionado.\n"
-"Esto instala el módulo 'sale_stock'."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Presupuesto' or 'Pedido'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Número de presupuesto"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Bajo pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Permite especificar una cuenta analítica en los pedidos de venta."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Presupuesto para <em>%s</em> <b>crado</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Mensajes e historial de comunicación"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nueva copia de presupuesto"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-"No se puede eliminar una línea de pedido de venta que está en estado '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Propiedades en las líneas"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Antes de escoger un producto, seleccione un cliente en el formulario de "
-"ventas."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Fecha ordenada de los pedidos de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Pedidos de venta a facturar"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Características de los productos"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Unidad de medida"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Facturar el pedido de venta completo"
+msgid "Percentage"
+msgstr "Porcentaje"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensajes sin leer"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Presupuesto borrador"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedidos preparados para ser facturados"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-"Permite definir cuál es la función por defecto de un usuario específico en "
-"una cuenta dad.\n"
-"Se usa en su mayoría cuando un usuario introduce su parte de horas, para que "
-"los campos sean rellenados automáticamente. Pero la posibilidad de cambiar "
-"estos valores está aún disponible.\n"
-"Esto instala el módulo 'analytic_user_function'."
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en la que se crea el pedido de venta."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "¡Acción no válida!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Si cambia la tarifa de este pedido (y eventualmente la moneda), los precios "
-"existentes en las lineas del pedido no se actualizarán."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "Nº de pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Año ordenado de los pedidos de venta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Después de hacer clic en 'Mostrar líneas a facturar', seleccione las líneas "
-"a facturar y cree la factura desde el menú desplegable 'Más'."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Indica que el pedido de venta tiene al menos una factura."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-"Presupuesto para <em>%s</em> <b>convertido</b> a pedido de venta de %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Facturar pedido de venta"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Gestión de contratos"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Venta Línea_pedido Realizar_factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El comercial crea una factura manualmente si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
+msgid "Other Information"
+msgstr "Otra información"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1400,27 +1749,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1435,7 +1767,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1475,197 +1807,6 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Aquí tiene su ${object.state in ('draft', 'sent') and 'presupuesto' "
-"or 'confirmación de pedido'} de ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Número de pedido: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Su referencia: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Pedido%20${object.name}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>También es posible pagar directamente con Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"\n"
-"    <br/>\n"
-"    <p>Si tiene alguna pregunta, no dude en contactar con nosotros.</p>\n"
-"    <p>Gracias por elegir a ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Teléfono:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Usar tarifas para adaptar los precios a cada cliente"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Líneas de pedido de venta confirmadas, pero no entregadas aún"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-"El pedido de venta creará automáticamente una propuesta de factura (factura "
-"borrador). Tiene que escoger si quiere su factura basada en lo pedido o en "
-"lo enviado. "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"Añade el campo 'Margen' en los pedidos de venta, que informa de la "
-"rentabilidad calculando la diferencia entre el precio unitario y el precio "
-"de coste.\n"
-"Esto instala el módulo 'sale_margin'."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1676,9 +1817,40 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Generar facturas basadas en las líneas del pedido de venta"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Confirmar venta"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"No hay cuenta de ingresos definida para este producto: \"%s\" (id: %d)."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Presupuesto' or 'Pedido'} (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1698,414 +1870,35 @@ msgstr ""
 "debe ser pagada antes de que los productos puedan ser entregados."
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Precio fijo (depósito)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Ventas: Marcar como no leídos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Confirmar venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o un albarán tan pronto como sea "
-"confirmado por el comercial."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Algunas líneas de pedido"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "Grupo de dirección de entrega de venta"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Descuentos en líneas"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Seleccione cómo quiere facturar este pedido. Esto creará una factura "
-"borrador que puede ser modificada antes de la validación."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Use 'Todo' para crear la factura final.\n"
-"Use 'Porcentaje' para facturar un porcentaje del importe total.\n"
-"Use 'Precio fijo' para facturar una cantidad específica como avance.\n"
-"Use 'Algunas líneas de pedido' para facturar una selección de las líneas de "
-"pedido de venta."
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"Permite definir las condiciones del contrato de cliente: método de "
-"facturación (precio fijo, con parte de horas, factura avanzada), el precio "
-"exacto (650 €/día de un desarrollador), la duración (contrato de soporte de "
-"un año). Podrá seguir el progreso del contrato y facturar automáticamente.\n"
-"Esto instalará el módulo 'account_analytic_analysis'."
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'borrador' or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "Primero cancele todas las facturas relativas a este pedido de venta."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Dirección de entrega"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Venta a facturar"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Características del almacén"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Desde stock: Cuando se necesite, el producto se cogerá del stock o se "
-"esperará a su reposición.\n"
-"Bajo pedido: Cuando se necesite, el producto se compra o se fabrica."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Presupuesto enviado"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Asistente de redacción de correo electrónico."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-"Defina por favor un diario de ventas para esta compañía: \"%s\" (id: %d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Características del contrato"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Pedidos de venta que están en estado 'Realizado'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Términos y condiciones"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Seguidores"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Opciones por defecto"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Contabilidad analítica para ventas"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Tarifa EDI (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear un presupuesto o un pedido de venta para este cliente.\n"
-"</p><p>\n"
-"OpenERP le ayudará a gestionar de manera eficiente el flujo completo de "
-"ventas: presupuesto, pedido de venta, entrega, factura y pago.\n"
-"</p><p>\n"
-"Las características sociales le permite organizar discusiones en cada pedido "
-"de venta, y permite a los clientes seguir la evolución del pedido de venta.\n"
-"</p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "Sobre la orden de entrega"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Unidad de medida de referencia"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -2115,269 +1908,47 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear un presupuesto, el primer paso de una nueva venta.\n"
-"</p><p>\n"
-"OpenERP le ayuda a gestionar eficientemente el flujo completo de ventas: "
-"desde el presupuesto al pedido de venta, la entrega, la facturación y su "
-"pago.\n"
-"</p><p>\n"
-"Las características sociales le permiten organizar discusiones en cada "
-"pedido de venta, y permiten que sus clientes puedan seguir la evolución del "
-"pedido de venta.\n"
-"</p>\n"
-"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "Grupo de dirección de entrega de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
+"No hay posición fiscal definida o categoría de cuenta de ingresos definida "
+"para las propiedades por defecto de las categorías de producto."
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Lineas del pedido de venta realizadas"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Propiedades en las líneas"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"No hay cuenta de ingresos definida para este producto: \"%s\" (id: %d)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Abrir menú de ventas"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Lanzar órdenes de entrega automáticamente desde los pedidos de venta"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "El importe de los impuestos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Pedido de venta "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Lineas del pedido de venta para ser facturadas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Plantillas email"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tienda ventas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos electrónicos"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Producto avanzado"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de líneas de "
-"pedidos de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Pedidos de ventas en proceso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Preparar facturas basadas en los partes de horas"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Pedido de venta para <em>%s</em> <b>cancelado</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retraso realización"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Mostrar líneas a facturar"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Pedido de venta confirmado a factura."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de venta sin confirmar"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "¡No hay tarifa! "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Pedidos de venta"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Usar gestión de contratos"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que una factura ha sido pagada."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "¿Desea crear la(s) factura(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Venta a facturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -2401,11 +1972,131 @@ msgstr "Anticipo"
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Precio fijo (depósito)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "Parámetros de configuración de las ventas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Antes del envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Mensajes e historial de comunicación"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2418,20 +2109,49 @@ msgstr ""
 "parte del mismo contrato con su cliente."
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Pedidos de venta ordenados por meses"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "¿Qué quiere facturar?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Algunas líneas de pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+"No se puede eliminar una línea de pedido de venta que está en estado '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2440,25 +2160,33 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr "Permite instalar el módulo 'sale_analytic_plans'."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
-"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
-"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
-"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
-"desea analizar sus ingresos, debería utilizar el informe de análisis de "
-"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "o"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
 
 #. module: sale
 #: report:sale.order:0
@@ -2466,21 +2194,67 @@ msgid "Quotation N°"
 msgstr "Presupuesto Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Descuentos en líneas"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Añade el campo 'Margen' en los pedidos de venta, que informa de la "
+"rentabilidad calculando la diferencia entre el precio unitario y el precio "
+"de coste.\n"
+"Esto instala el módulo 'sale_margin'."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Antes de escoger un producto, seleccione un cliente en el formulario de "
+"ventas."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nueva copia de presupuesto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Seleccione cómo quiere facturar este pedido. Esto creará una factura "
+"borrador que puede ser modificada antes de la validación."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Fecha ordenada de los pedidos de venta"
 
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
@@ -2774,6 +2548,9 @@ msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifas de venta"
 
@@ -3781,9 +3558,19 @@ msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Unidad de tiempo de trabajo principal"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mis pedidos de venta"
+
 #~ msgid "Based on Timesheet"
 #~ msgstr "Basado en hoja de servicios"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Las lineas del pedido de venta que están confirmadas, realizadas o con el "
+#~ "estado de excepción aún no han sido facturadas"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "¡El nombre de la compañía debe ser único!"
 
@@ -3810,6 +3597,10 @@ msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 #~ msgid "Based on Sales Orders"
 #~ msgstr "Basado en pedidos de venta"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "No puede confirmar un pedido de venta sin lineas."
+
 #~ msgid "Line Sequence"
 #~ msgstr "Secuencia de linea"
 
@@ -3841,6 +3632,9 @@ msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Pedidos de venta que están en estado 'Realizado'"
+
 #~ msgid "Contract/Analytic Account"
 #~ msgstr "Contrato / Cuenta analítica"
 
@@ -3856,6 +3650,12 @@ msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 #~ msgid "Print Order"
 #~ msgstr "Imprimir pedido"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Lineas del pedido de venta realizadas"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Lineas del pedido de venta para ser facturadas"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Pedidos de venta creados en el año actual"
 
@@ -3962,6 +3762,9 @@ msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 #~ "pedido de venta se confirme para crear una tarea, un pedido de compra o una "
 #~ "orden de fabricación enlazada a esta línea de pedido de venta."
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Líneas de pedido de venta confirmadas, pero no entregadas aún"
+
 #~ msgid ""
 #~ "\n"
 #~ "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 4f84f06b414..9c492e3bb98 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -6,50 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-10 03:06+0000\n"
 "Last-Translator: Guillermo Bisheimer <Unknown>\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: 2012-12-11 04:48+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Cuenta analítica para las ventas"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar cotización"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
-"Lineas de orden de venta que están confirmadas, realizadas o con el estado "
-"de excepción y que aún no han sido facturadas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Lineas de pedido a facturar"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha de confirmación"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Vendedor"
+msgid "Group By..."
+msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para la orden de venta actual."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partner de Distribución"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Facturar orden"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Presupuesto "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +203,29 @@ msgstr "Día"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar orden"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "La unidad por defecto de tiempo de trabajo para servicios es"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unidad de medida "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +238,177 @@ msgstr "Datos incorrectos"
 msgid "The value of Advance Amount must be positive."
 msgstr "El valor del monto de adelanto debe ser positivo"
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "a pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Importe sin impuestos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Si está marcado, nuevos mensajes requieren su atención."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de Envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Sucursal"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Domicilio de Facturación"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Falso"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Impuesto"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +421,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -118,6 +440,11 @@ msgstr ""
 "Guarda el resumen del Chatter (número de mensajes, ...). Este resumen está "
 "en formato HTML para ser insertado directamente en las vistas kanban."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -125,9 +452,67 @@ msgid "# of Qty"
 msgstr "# de cantidad"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Permite aplicar un descuento a las líneas de una orden de venta."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -139,16 +524,54 @@ msgstr ""
 "cliente.\n"
 "Por ejemplo: 10% para revendedores, promoción de 5 EUR en este producto, etc."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Término de pago predeterminado"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factura <b>pagada</b>"
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -156,479 +579,13 @@ msgid "Allow using different units of measures"
 msgstr "Permitir el uso de diferentes unidades de medida"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Porcentaje"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-"Por favor devina la cuenta de ingresos para este producto: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mis pedidos de venta"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades ordenadas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia de la orden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Proceso de facturación"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "Orden de venta lista"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Presupuestos y ventas"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-"Permite seleccionar y mantener diferentes unidades de medida para los "
-"productos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "¡Advertencia de la lista de precios!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr "Crear y visualizar factura"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis cotizaciones"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr "Permitir configurar alertas por cliente o productos"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre de sucursal"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Quotation "
-msgstr "Presupuesto "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Adelanto del %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Un partner al cual debe asignarse el producto."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Hacer click para crear un presupuesto que pueda ser "
-"convertido en una orden de venta.\n"
-"              </p><p>\n"
-"                OpenERP le ayudará a manejar eficientemente el flujo de "
-"venta completo:\n"
-"                presupuesto, orden de venta, despacho, facturación y pago.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas de pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con una orden de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Ver factura"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Avance del %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Dirección de envío para la orden de venta actual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setiembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Borrador de factura %s %s <b>esperando validación</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El vendedor confirma el presupuesto. El estado de la orden de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"No se puede cancelar una linea de una orden de venta que ya fue facturada."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para la orden de venta activa."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Antes del envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"No hay una posición fiscal o cuenta de ingresos definida para las "
-"propiedades por defecto de las categorías de producto."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Direcciones en órdenes de venta"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Habilitar facturación de líneas de ordenes de venta"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Pedidos de venta ordenados por meses"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"No puede agrupar ventas con diferentes monedas para el mismo cliente."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "o"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturada"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Cuenta analítica para las ventas"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha de confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Partner de Distribución"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "Facturar orden"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Venta: Marcar como leído"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Permite aplicar un descuento a las lineas de una orden de venta"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Domicilio de facturación :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Unidad de medida "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "La unidad por defecto de tiempo de trabajo para servicios es"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Domicilio de Facturación"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotización / Orden"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -642,13 +599,37 @@ msgid "Order N°"
 msgstr "Orden Nº"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Líneas de la orden"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+"Por favor devina la cuenta de ingresos para este producto: \"%s\" (id:%d)."
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de Facturación"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -660,38 +641,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para la orden de venta activa."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Precios"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia de la orden"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -708,52 +757,98 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Proceso de facturación"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Orden de venta lista"
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y ventas"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagada"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Permite seleccionar y mantener diferentes unidades de medida para los "
+"productos."
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -762,36 +857,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia de la lista de precios!"
 
 #. module: sale
-#: code:addons/sale/sale.py:1124
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr "Crear y visualizar factura"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis cotizaciones"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -801,7 +951,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -812,10 +962,18 @@ msgid "Recreate Invoice"
 msgstr "Re-generar Factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr "Permitir configurar alertas por cliente o productos"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre de sucursal"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -823,14 +981,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impuestos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturada"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear Facturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Adelanto del %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Un partner al cual debe asignarse el producto."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando programación"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Órdenes de venta"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -838,21 +1153,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas de pedidos de venta"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Vendedor"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotización"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Anticipo de producto"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -861,6 +1243,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Órdenes de venta en proceso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -871,11 +1277,94 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con una orden de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Ver factura"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El vendedor confirma el presupuesto. El estado de la orden de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Avance del %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Dirección de envío para la orden de venta actual."
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -895,11 +1384,104 @@ msgid "Your Reference"
 msgstr "Su referencia"
 
 #. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Precios"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctd"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Domicilio de facturación :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -907,391 +1489,159 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
+#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
-#, python-format
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"Cannot find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "a pedido"
-
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
 msgstr "Domicilio de envío :"
 
 #. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No puede agrupar ventas con diferentes monedas para el mismo cliente."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
 msgstr ""
 
 #. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
 #: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar cotización"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Lineas de pedido a facturar"
-
-#. module: sale
-#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
+msgid "Create Invoice"
+msgstr "Crear factura"
 
 #. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
 msgstr ""
 
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando programación"
-
 #. module: sale
 #: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Orden de Venta"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unitario"
 
 #. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Porcentaje"
 
 #. module: sale
 #: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de Envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear Facturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagada"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotización"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Otra información"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1314,27 +1664,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1349,7 +1682,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1390,87 +1723,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizada"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1480,10 +1732,38 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1496,381 +1776,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturado en"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotización / Orden"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha ordenada"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Sucursal"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de Facturación"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas en orden de venta"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1881,247 +1808,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+"No hay una posición fiscal o cuenta de ingresos definida para las "
+"propiedades por defecto de las categorías de producto."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Importe sin impuestos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Órdenes de venta"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Anticipo de producto"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Órdenes de venta en proceso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2146,11 +1872,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturado en"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha ordenada"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Antes del envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2161,20 +2007,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Pedidos de venta ordenados por meses"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2183,40 +2053,92 @@ msgid "Payment Term"
 msgstr "Término de pago"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "o"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas en orden de venta"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para la orden de venta actual."
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cotización Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Entregada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Delivery Order"
@@ -2588,6 +2510,9 @@ msgstr ""
 #~ msgid "Procurement Corrected"
 #~ msgstr "Abastecimiento corregido"
 
+#~ msgid "Sale Order"
+#~ msgstr "Orden de Venta"
+
 #~ msgid "Properties"
 #~ msgstr "Propiedades"
 
@@ -2813,3 +2738,13 @@ msgstr ""
 
 #~ msgid "Invoice Based on Deliveries"
 #~ msgstr "Facturar desde órdenes de entrega"
+
+#~ msgid "My Sale Orders"
+#~ msgstr "Mis pedidos de venta"
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Lineas de orden de venta que están confirmadas, realizadas o con el estado "
+#~ "de excepción y que aún no han sido facturadas"
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index 1828482ba24..82fbc1e3f44 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -6,48 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-21 07:26+0000\n"
 "Last-Translator: felipemolinam <Unknown>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para Orden de Venta actual"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -60,6 +206,26 @@ msgstr "Día"
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en que se crea el pedido de venta."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr "Nº de ctdad"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,481 +519,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Plazo de pago por defecto"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades ordenadas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia de pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Presupuestos y pedidos"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Realizar facturas de Venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El vendedor confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
 
 #. module: sale
 #: view:sale.order:0
@@ -623,8 +600,30 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -636,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mis ventas"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia de pedido"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -684,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -714,23 +811,37 @@ msgid "Order Date"
 msgstr "Fecha pedido"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -738,39 +849,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Realizar facturas de Venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
-"pedido."
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
 
 #. module: sale
 #: view:sale.report:0
@@ -779,7 +948,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -790,10 +959,18 @@ msgid "Recreate Invoice"
 msgstr "Volver a Crear factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -801,36 +978,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impuestos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Fecha"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tiendas de venta"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -839,6 +1243,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -849,11 +1277,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El vendedor confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
+"pedido."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -875,11 +1389,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Su referencia"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctdad"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -895,19 +1503,101 @@ msgstr "Mis lineas de pedidos de venta"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -918,360 +1608,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Crear factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Fecha de pedido de la orden de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedidos preparados para ser facturados"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en que se crea el pedido de venta."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Venta Línea_pedido Realizar_factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El vendedor crea una factura manualmente si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
+msgid "Other Information"
+msgstr "Otra información"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1294,27 +1669,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1329,7 +1687,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1370,92 +1728,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1465,10 +1737,38 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1481,386 +1781,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y los ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha Pedido"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde Orden de Venta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o una guía de despacho tan pronto "
-"como sea confirmado por el vendedor."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1871,246 +1819,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "El importe de los impuestos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tiendas de venta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Producto avanzado"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Pedidos de ventas en proceso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retraso realización"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Pedido de venta confirmado a factura."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de venta sin confirmar"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que una factura ha sido pagada."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2135,11 +1881,131 @@ msgstr "Anticipo"
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha Pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2150,20 +2016,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde Orden de Venta"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o una guía de despacho tan pronto "
+"como sea confirmado por el vendedor."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2172,47 +2066,94 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
-"análisis verifica los ingresos de sus ventas y los ordena por diferentes "
-"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
-"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
-"desea analizar sus ingresos, debería utilizar el informe de análisis de "
-"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para Orden de Venta actual"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Presupuesto Nº"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Fecha de pedido de la orden de venta"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
 
@@ -3034,6 +2975,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifas de venta"
 
diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po
index 0fd0fd753db..1a5137746fe 100644
--- a/addons/sale/i18n/es_CR.po
+++ b/addons/sale/i18n/es_CR.po
@@ -6,51 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-21 05:48+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Líneas de venta que se han confirmado, hecho o en el estado de excepción y "
-"aún no han sido facturados"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -63,6 +207,26 @@ msgstr "Día"
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +239,178 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Líneas de pedido de ventas relacionados con una orden de venta de la mina"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -101,12 +422,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -115,6 +440,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -122,8 +452,66 @@ msgid "# of Qty"
 msgstr "Nº de ctdad"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -133,484 +521,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Plazo de pago por defecto"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mis ordenes de venta"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades pedidas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Cotizaciones y Ventas"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "¡Advertencia Lista de precios!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Meses Ordenados por orden de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"No se puede tener las ventas del grupo de monedas diferentes para la misma "
-"pareja."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-"Líneas de pedido de ventas relacionados con una orden de venta de la mina"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Ordenes de venta que aún no han sido confirmados"
 
 #. module: sale
 #: view:sale.order:0
@@ -629,8 +602,30 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -642,38 +637,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Año Ordenado de la orden de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mis ventas"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -690,29 +753,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Hora"
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -720,23 +813,37 @@ msgid "Order Date"
 msgstr "Fecha pedido"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotizaciones y Ventas"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -744,40 +851,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "No se puede confirmar una orden de venta que no tiene ninguna línea."
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia Lista de precios!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"¡Tienes que seleccionar una lista de precios o de un cliente en forma de "
-"ventas!\n"
-"Por favor, establece uno antes de elegir un producto."
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
 
 #. module: sale
 #: view:sale.report:0
@@ -786,7 +950,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -797,10 +961,18 @@ msgid "Recreate Invoice"
 msgstr "Volver a Crear factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -808,36 +980,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impuestos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Plantillas de correo electrónico"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Fecha"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -846,6 +1245,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -856,11 +1279,98 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Tienes que seleccionar una lista de precios o de un cliente en forma de "
+"ventas!\n"
+"Por favor, establece uno antes de elegir un producto."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "¡No válida línea de la lista de precios encontrado! :"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -882,11 +1392,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Su referencia"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Si cambia la lista de precios de esta orden (y eventualmente la moneda), los "
+"precios de líneas de pedido existentes no será actualizado."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctdad"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -902,19 +1508,103 @@ msgstr "Mis líneas de pedido de ventas"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "¡No Lista de precios! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "¡La referencia de la compra debe ser única por compañía!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No se puede tener las ventas del grupo de monedas diferentes para la misma "
+"pareja."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -925,362 +1615,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Crear factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Ordenes de referencia"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Ordenado de la fecha de la orden de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Órdenes de venta listos para ser facturado"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en la que se crea el pedido de venta."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Si cambia la lista de precios de esta orden (y eventualmente la moneda), los "
-"precios de líneas de pedido existentes no será actualizado."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Año Ordenado de la orden de venta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Venta Línea_pedido Realizar_factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El comercial crea una factura manualmente si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
+msgid "Other Information"
+msgstr "Otra información"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1303,27 +1676,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1338,7 +1694,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1379,92 +1735,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Confirmadas las líneas de pedido de venta, aún no entregado"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1474,10 +1744,38 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1490,386 +1788,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o un albarán tan pronto como sea "
-"confirmado por el comercial."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Líneas de venta por que están en 'hacer' estado"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Tarifa EDI (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1880,246 +1826,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Las líneas de venta por hacer"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "El importe de los impuestos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Líneas de venta pedido listo para ser facturado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Plantillas de correo electrónico"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tienda ventas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Producto avanzado"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Pedidos de ventas en proceso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retraso realización"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Pedido de venta confirmado a factura."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Ordenes de venta que aún no han sido confirmados"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "¡No Lista de precios! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que una factura ha sido pagada."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2144,11 +1888,131 @@ msgstr "Anticipo"
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2159,20 +2023,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Meses Ordenados por orden de venta"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2181,47 +2073,94 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Órdenes de venta listos para ser facturado"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
-"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
-"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
-"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
-"desea analizar sus ingresos, debería utilizar el informe de análisis de "
-"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Presupuesto Nº"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Ordenado de la fecha de la orden de venta"
+
 #~ msgid "Sales by Salesman in last 90 days"
 #~ msgstr "Ventas por comercial últimos 90 días"
 
@@ -2999,6 +2938,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifas de venta"
 
@@ -3510,9 +3452,19 @@ msgstr ""
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Trabajo principal de la unidad de tiempo"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mis ordenes de venta"
+
 #~ msgid "Based on Timesheet"
 #~ msgstr "Basado en parte de horas"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Líneas de venta que se han confirmado, hecho o en el estado de excepción y "
+#~ "aún no han sido facturados"
+
 #~ msgid "Invoice based on deliveries"
 #~ msgstr "Facturar desde albaranes"
 
@@ -3591,6 +3543,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Opciones"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "No se puede confirmar una orden de venta que no tiene ninguna línea."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is in state '%s'!"
 #~ msgstr ""
@@ -3800,6 +3756,9 @@ msgstr ""
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Confirmadas las líneas de pedido de venta, aún no entregado"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -3828,6 +3787,12 @@ msgstr ""
 #~ msgid "Print Order"
 #~ msgstr "Imprimir pedido"
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Líneas de venta pedido listo para ser facturado"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Líneas de venta por que están en 'hacer' estado"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Método principal basado en"
 
@@ -3846,6 +3811,9 @@ msgstr ""
 #~ "cantidad.\n"
 #~ "Debe cambiar el producto, la cantidad o la tarifa."
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Las líneas de venta por hacer"
+
 #, python-format
 #~ msgid "Not enough stock ! : "
 #~ msgstr "¡No es suficiente stock! : "
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 169fe09cb75..41b09ac306c 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.po
@@ -6,49 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-21 04:49+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar petición"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha de confirmación"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Agroupar por ..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método de abastecimiento"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha de facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -60,6 +206,26 @@ msgstr "Día"
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha de confirmación"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr "# of Qty"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Advance Amount"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,478 +519,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Plazo de pago por defecto"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio Total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Seleccione para agrupar las facturas del mismo cliente"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades ordenadas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Información adicional"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadística de las ordenes de pedido"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Peticiones"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha de confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección factura:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Petición / Pedido"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -621,8 +600,30 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -634,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Seleccione para agrupar las facturas del mismo cliente"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Fecha de creación"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mis Pedidos"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -682,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -712,23 +811,37 @@ msgid "Order Date"
 msgstr "Fecha de orden"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Enviada"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -736,38 +849,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha de petición"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupo de facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El moto a ser facturado por adelantado."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -775,7 +943,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -786,10 +954,18 @@ msgid "Recreate Invoice"
 msgstr "Volver a Crear factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -797,36 +973,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impuestos:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Facturar por adelantado"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡Cliente no definido!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Crear factura de la línea de pedido"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Medios de abastecimiento y facturación"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadística de las ordenes de pedido"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Peticiones"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente, si la política de envío de las "
+"ordenes de pedido is 'Envío manual en proceso'. La factura es creada "
+"automáticamente si la política de envío es 'Pago antes de entrega'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -835,6 +1238,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -845,11 +1272,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso de entrega"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Peticiones"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -868,11 +1376,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Su referencia"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctdad"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha de petición"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección factura:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -888,19 +1490,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -911,360 +1595,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Crear factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total de impuestos incluidos"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar petición"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agroupar por ..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método de abastecimiento"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio por unidad"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Advance Amount"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "A facturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupo de facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser reviado por el cliente."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Crear factura de la línea de pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Peticiones anteriores"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Peticiones"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El vendedor crea una factura manualmente, si la política de envío de las "
-"ordenes de pedido is 'Envío manual en proceso'. La factura es creada "
-"automáticamente si la política de envío es 'Pago antes de entrega'."
+msgid "Other Information"
+msgstr "Información adicional"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1287,27 +1656,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1322,7 +1674,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1363,92 +1715,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio por unidad"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Por hacer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1458,10 +1724,38 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1474,382 +1768,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Petición / Pedido"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia del cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañia"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha de facturación"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El moto a ser facturado por adelantado."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡Cliente no definido!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha de confirmación"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas de pedido"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1860,240 +1800,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser reviado por el cliente."
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Medios de abastecimiento y facturación"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Facturar por adelantado"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Producto avanzado"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Pedidos de ventas en proceso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retraso de entrega"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Fecha de pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2118,11 +1862,131 @@ msgstr ""
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Peticiones anteriores"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedidos de ventas"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2133,20 +1997,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedidos de ventas"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2155,18 +2043,32 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas de pedido"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2174,20 +2076,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "Petición N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia del cliente"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total de impuestos incluidos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Partial Delivery"
@@ -2596,6 +2537,9 @@ msgstr ""
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Tarifas de compra"
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
 #~ msgid "Name"
 #~ msgstr "Nombre"
 
diff --git a/addons/sale/i18n/es_MX.po b/addons/sale/i18n/es_MX.po
index ba3fc593337..27bde5eeb4c 100644
--- a/addons/sale/i18n/es_MX.po
+++ b/addons/sale/i18n/es_MX.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-26 08:55+0000\n"
 "Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
 "<anegrinm@gmail.com>\n"
@@ -15,43 +15,187 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar Cotización"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Las lineas del pedido de venta que están confirmadas, realizadas o con el "
-"estado de excepción aún no han sido facturadas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Líneas de pedido a facturar"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Vendedor"
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Empresa Asociada"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Orden de Facturación"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Detalles de Producto"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Número de Cotización"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Cotización "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Dirección de entrega"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sub-Total"
 
 #. module: sale
 #: view:sale.report:0
@@ -64,6 +208,26 @@ msgstr "Día"
 msgid "Cancel Order"
 msgstr "Cancelar el pedido"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Detalles de almacén"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unidad de Medida "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -76,21 +240,177 @@ msgstr "Datos incorrectos"
 msgid "The value of Advance Amount must be positive."
 msgstr "El  importe tiene que ser valor positivo"
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Informes"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado/a"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Líneas de pedidos de ventas relacionadas con un pedido de venta mío"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Cotizaciones enviadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Asistente de creación de correo-e"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de facturación"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear Facturas"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Impuesto"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "¡Acción inválida!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +422,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -116,6 +440,12 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de ventas."
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -123,8 +453,66 @@ msgid "# of Qty"
 msgstr "Cantidad"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedidos de Venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -134,16 +522,54 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Un empleado puede tener diferentes roles por contrato"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Plazo de pago por defecto"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factura pagada"
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -151,466 +577,14 @@ msgid "Allow using different units of measures"
 msgstr "Permite el uso de diferentes unidades de medida"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Porcentaje"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-"Por favor define una cuenta de ingreso para este producto: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio Total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mis pedidos de venta"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidad solicitada"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra Información"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Proceso de Facturación"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "Pedidos de Venta confirmados"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Presupuestos y pedidos"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "¡Advertencia de la lista de precios!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Quotation "
-msgstr "Cotización "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Avance de %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Ver factura"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Avance de  %s %s"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Cotizaciones"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Dirección de entrega para este pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Borrador de factura %s %s <b>en espera de aprobación</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El vendedor confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr "No puedes cancelar un pedido que ha sido facturado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Antes de la entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Direcciones en Pedidos de Venta"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Contrato"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Habilitar Facturación de líneas de pedido de venta"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Periodo (mes) del pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"No puede agrupar ventas con diferentes monedas para el mismo cliente."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "ó"
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Empresa Asociada"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "Orden de Facturación"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sub-Total"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Unidad de Medida "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de facturación"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Líneas de pedidos de ventas relacionadas con un pedido de venta mío"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotización / Pedido"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Un empleado puede tener diferentes roles por contrato"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
 
 #. module: sale
 #: view:sale.order:0
@@ -629,8 +603,31 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+"Por favor define una cuenta de ingreso para este producto: \"%s\" (id:%d)."
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -642,38 +639,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "Número de pedido de venta"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Fecha de Creación"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidad solicitada"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Año ordenado de los pedidos de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mis ventas"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -690,29 +755,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr "Enviar por correo-e"
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Hora"
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "En proceso de entrega"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Proceso de Facturación"
 
 #. module: sale
 #: view:sale.order:0
@@ -720,23 +815,37 @@ msgid "Order Date"
 msgstr "Fecha de pedido"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Enviado"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Pedidos de Venta confirmados"
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Reference Unit of Measure"
+msgstr "Referencia de unidad de medida"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -744,38 +853,97 @@ msgid "Create and View Invoice"
 msgstr "Crear y mostrar factura"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "No puede confirmar un pedido de venta sin líneas."
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia de la lista de precios!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Tiene que seleccionar una tarifa o un cliente en el formulario del pedido."
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Gestión de contratos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
 
 #. module: sale
 #: view:sale.report:0
@@ -784,7 +952,7 @@ msgid "Category of Product"
 msgstr "Categoría de producto"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "¡No se pudo cancelar este pedido de vetas!"
@@ -795,10 +963,18 @@ msgid "Recreate Invoice"
 msgstr "Volver a crear factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -806,36 +982,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impuestos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Anticipo de factura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Avance de %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Plantillas de correo electrónico"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Contrato"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Términos y condiciones"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr "Bajo demanda"
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "desconocido"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedidos"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Es un Seguidor"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Fecha"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Vendedor"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotización"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente, si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tiendas de venta"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -844,6 +1247,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -854,11 +1281,96 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Ver factura"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El vendedor confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una tarifa o un cliente en el formulario del pedido."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "¡No se ha encontrado una linea de tarifa válida!"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Avance de  %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotizaciones"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Dirección de entrega para este pedido"
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -880,11 +1392,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Su referencia"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedidos de venta confirmados para factura."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Si cambia la tarifa de este pedido (y eventualmente la moneda), los precios "
+"existentes en las líneas del pedido no se actualizarán."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Cantidad"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Completado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -900,19 +1508,102 @@ msgstr "Mis líneas de pedidos de venta"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "¡No hay tarifa! "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "¡La referencia del pedido debe ser única por compañía!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No puede agrupar ventas con diferentes monedas para el mismo cliente."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -923,362 +1614,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Crear factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Importe antes de impuestos"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Referencia de pedido"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Número de Cotización"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total (impuestos incluidos)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Fecha ordenada de los pedidos de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar Cotización"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Líneas de pedido a facturar"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Detalles de Producto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Unidad de medida"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unitario"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr ""
+msgid "Percentage"
+msgstr "Porcentaje"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensajes sin leer"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedidos preparados para ser facturados"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en la que se crea el pedido de venta."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear Facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "¡Acción inválida!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Si cambia la tarifa de este pedido (y eventualmente la moneda), los precios "
-"existentes en las líneas del pedido no se actualizarán."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "Número de pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "A facturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Año ordenado de los pedidos de venta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Gestión de contratos"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contador"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotizaciones anteriores"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotización"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El vendedor crea una factura manualmente, si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
+msgid "Other Information"
+msgstr "Otra Información"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1301,27 +1675,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1336,7 +1693,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1377,92 +1734,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Líneas de pedido de venta confirmadas, pero no entregadas aún"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Completado"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Importe antes de impuestos"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1472,9 +1743,37 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Generar factura basado en pedidos de venta"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Confirmar venta"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1488,387 +1787,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Este informe realiza un análisis de sus cotizaciones y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
+"grupos de criterios (vendedor, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotización / Pedido"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
+msgid "Tel. :"
+msgstr "Tel :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedidos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Confirmar venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o salida de almacén tan pronto "
-"como sea confirmado por el vendedor."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Algunas líneas de pedido"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Descuentos en líneas de pedido"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia del cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Dirección de entrega"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Pedido a facturar"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Detalles de almacén"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Informes"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado/a"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Cotizaciones enviadas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Asistente de creación de correo-e"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Pedidos de Venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Pedidos de venta que están en estado 'Realizado'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Términos y condiciones"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Seguidores"
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Tarifa EDI (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "En proceso de entrega"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Referencia de unidad de medida"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1878,248 +1825,45 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Lineas del pedido de venta realizadas"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contador"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Anticipo de factura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "El importe de los impuestos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Pedido de venta "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Líneas del pedido de venta para ser facturadas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Plantillas de correo electrónico"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tiendas de venta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos-e"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de líneas de ventas."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Pedidos de ventas en proceso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retraso realización"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Pedidos de venta confirmados para factura."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de venta sin confirmar"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "¡No hay tarifa! "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Pedidos de venta"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que una factura ha sido pagada."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "¿Desea crear la(s) factura(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Pedido a facturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -2143,11 +1887,131 @@ msgstr "Anticipo"
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Antes de la entrega"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotizaciones anteriores"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2158,20 +2022,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Periodo (mes) del pedido de venta"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o salida de almacén tan pronto "
+"como sea confirmado por el vendedor."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Algunas líneas de pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2180,46 +2072,122 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"Este informe realiza un análisis de sus cotizaciones y pedidos de venta. El "
-"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
-"grupos de criterios (vendedor, empresa, producto, etc.). Utilice este "
-"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
-"desea analizar sus ingresos, debería utilizar el informe de análisis de "
-"facturas en la aplicación de Contabilidad."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "ó"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cotización Nº"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Descuentos en líneas de pedido"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia del cliente"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total (impuestos incluidos)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Fecha ordenada de los pedidos de venta"
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Las lineas del pedido de venta que están confirmadas, realizadas o con el "
+#~ "estado de excepción aún no han sido facturadas"
+
+#~ msgid "My Sale Orders"
+#~ msgstr "Mis pedidos de venta"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN no válido"
+
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "No puede confirmar un pedido de venta sin líneas."
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Líneas de pedido de venta confirmadas, pero no entregadas aún"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Pedidos de venta que están en estado 'Realizado'"
+
+#~ msgid "Sale order lines done"
+#~ msgstr "Lineas del pedido de venta realizadas"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Líneas del pedido de venta para ser facturadas"
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index fc9093eca9d..53884ae4a93 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -6,38 +6,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 19:43+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Korralduse read"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Korraldus"
-
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
 msgstr "Maksustamata summa"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Korralduse read"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Müügitellimused"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Korraldus"
+
 #~ msgid "Sales orders"
 #~ msgstr "Müügitellimused"
 
@@ -74,38 +75,184 @@ msgstr "Müügitellimused"
 #~ msgstr "Ostu hinnakirjad"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Kinnita pakkumine"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Pakkumise number"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Arveldamata ja kohaletoimetatud read"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Arve erand"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Pakkumine "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Pakkumise mustand"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Vahesumma"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -114,10 +261,29 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Tühista korraldus"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Kaal"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -130,21 +296,172 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "korraldusel"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Maksud"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netosumma:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Pakkumine saadetud"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Kohaletoimetamise erand"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kogus (TÜ)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Pood"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Müügid erandis"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Arve aadress"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -157,12 +474,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Ridade arv"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -171,6 +491,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -178,8 +503,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -189,15 +572,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Vaikimisi maksetähtaeg"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Kinnita"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Saadetud kogused"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -206,461 +627,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Allah. (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Hind kokku"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Tellitud kogused"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Korralduse viide"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Muu info"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Pakkumised ja müük"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Allahindlus (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Minu pakkumised"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Poe nimi"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Pakkumine "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Müügid erandis"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Staatus"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Pakkumised"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Kogus"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "KM:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Finantspositsioon"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Töös"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Arveldatud"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Vahesumma"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Arve aadress :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Arve aadress"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Pakkumine / Korraldus"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -674,8 +647,30 @@ msgid "Order N°"
 msgstr "Korraldus Nr."
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Allah. (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Arve read"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Hind kokku"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -687,38 +682,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Arveldamata ja kohaletoimetatud read"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Tellitud kogused"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Kogus"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Kokku :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Hinnakiri"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Korralduse viide"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Finantspositsioon"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -735,28 +798,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Staatus"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -765,23 +858,37 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Pakkumised ja müük"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Tasutud"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -789,36 +896,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Pakkumise kuupäev"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupeeri arved"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1124
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Allahindlus (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minu pakkumised"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Arved"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -828,7 +990,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -839,10 +1001,18 @@ msgid "Recreate Invoice"
 msgstr "Loo arve uuesti"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Poe nimi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -850,14 +1020,159 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Maksud :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Arveldatud"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Ettemaksuarve"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Töös"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Klienti pole määratud!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Loo arved"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Kinnitatud"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Mustand"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Ootegraafik"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -865,21 +1180,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Pakkumine"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Ettemaksu toode"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Erand"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -888,6 +1270,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Edenemisel müügikorraldused"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -898,11 +1304,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Pakkumised"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -922,11 +1409,104 @@ msgid "Your Reference"
 msgstr "Teie viide"
 
 #. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Hinnakiri"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "KM:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Järjekord"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Müügid"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Kogus"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "laost"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Pakkumise kuupäev"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Kokku"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Arve aadress :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Arve"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -934,391 +1514,158 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
+#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Tühista"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
-#, python-format
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"Cannot find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Loo arve"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Korralduse viide"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Hind"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Pakkumise number"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "korraldusel"
-
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
 msgstr "Tarneaadress :"
 
 #. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Uus koopia pakkumisest"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Kinnita pakkumine"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
 #: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
+msgid "Create Invoice"
+msgstr "Loo arve"
 
 #. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
 msgstr ""
 
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Ootegraafik"
-
 #. module: sale
 #: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
+msgid "Order reference"
+msgstr "Korralduse viide"
 
 #. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Pakkumise mustand"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Müügikorraldus"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Maksud"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks :"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Ühiku hind"
 
 #. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Saadetud kogused"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Kohaletoimetamise erand"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupeeri arved"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Kuu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Loo arved"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vanad pakkumised"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Tasutud"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Pakkumine"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Muu info"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1341,27 +1688,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1376,7 +1706,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1417,87 +1747,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Müügid"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Ühiku hind"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Arve"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1507,10 +1756,38 @@ msgid "Product"
 msgstr "Toode"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Hind"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1523,376 +1800,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Arve alus"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Pakkumine / Korraldus"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Tellimise kuupäev"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Toote TÜ"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Edenemisel käsitsi"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Kliendi viide"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Kokku"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Ettevõte"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Arve erand"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Klienti pole määratud!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netosumma:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Pakkumine saadetud"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Pood"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kogus (TÜ)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Kinnitatud"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Kinnita"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Arve read"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Ridade arv"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Müügikorralduste read"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1903,235 +1832,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Kaal"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Arved"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Ettemaksuarve"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Mustand"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Ettemaksu toode"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Edenemisel müügikorraldused"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "laost"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Kirjeldus"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2156,11 +1894,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Arve alus"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Tellimise kuupäev"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Toote TÜ"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Edenemisel käsitsi"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vanad pakkumised"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Kirjeldus"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2171,20 +2029,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Järjekord"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2193,18 +2075,32 @@ msgid "Payment Term"
 msgstr "Maksetingimus"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Müügikorralduste read"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2213,20 +2109,58 @@ msgid "Quotation N°"
 msgstr "Pakkumine Nr"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Kliendi viide"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Nopitud"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Uus koopia pakkumisest"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Sales Configuration"
@@ -2668,6 +2602,9 @@ msgstr ""
 #~ msgid "Sales order lines"
 #~ msgstr "Müügikorralduste read"
 
+#~ msgid "Sale Order"
+#~ msgstr "Müügikorraldus"
+
 #~ msgid "Order State"
 #~ msgstr "Korralduse olek"
 
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 543039e1922..3fa797aa08d 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -7,50 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Vahvista tarjous"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Myynnin työpöytä"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Myyntitilausrivit joita ei ole vahvistettu, tehty tai poikkeustilassa ja "
-"joita ei ole vielä laskutettu"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Vahvistuspvm"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Jakelukumppani"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tilauksessa käytettävä hinnasto."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Hankintatapa"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Päivä jolloin myyntitilaus on vahvistettu"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maaliskuu"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Laskun päivämäärä"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Laskuttamattomat ja toimitetut rivit"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Poikkeus laskutuksessa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Välisumma"
 
 #. module: sale
 #: view:sale.report:0
@@ -63,6 +207,26 @@ msgstr "Päivä"
 msgid "Cancel Order"
 msgstr "Peruuta tilaus"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Paino"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "tilauksesta"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Verot"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Veroton määrä"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Yhteensä veroton"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Omiin myyntitilauksiin liittyvät myyntitilausrivit"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Poikkeus toimituksessa"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Määrä (myyntiyksikkö)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Myymälä"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Myydyt joissa poikkeus toimituksessa"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Laskutusosoite"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Päivä jolloin myyntitilaus on luotu"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Luo laskuja"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -101,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Vahvistus Päivämäärä"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Rivien lukumäärä"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -115,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -122,8 +451,66 @@ msgid "# of Qty"
 msgstr "Määrä"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faksi:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilauksen Rivi"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Etukäteismäärä"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -133,481 +520,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Oletusmaksuehto"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Kuukausittainen liikevaihto"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Toimitetut määrät"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Vuosi"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Alennus (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Hinta yhteensä"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Ruksi laatikko ryhmitelläksesi samalle asiakkaalle menevät laskut."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Omat myyntitilaukset"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Tilatut määrät"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Tilauksen viite"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Lisätiedot"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Tarjoukset ja myynnit"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Myynti luo lasku"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Hinnaston varoitus"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Alennus (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Omat tarjoukset"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Myymälän nimi"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Myydyt joissa poikkeus toimituksessa"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Tila"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Elokuu"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Kesäkuu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Myyntitilausten Tilastot"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Myyntitilaukseen liitetty analyyttinen tili."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Lokakuu"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Tarjoukset"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Määrä"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "ALV:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Syyskuu"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Taloudellinen tilanne"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Käynnissä"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Myyntimies vahvistaa tarjouksen. Myyntitilauksen tila muuttuu 'käynnissä' "
-"tai 'manuaalinen käynnissä'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Puh.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Laskutusosoite nykyiselle myyntitilaukselle"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Myyntitilauksen tilauskuukausi"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "Et voi ryhmitellä saman kumppanin myyntejä joilla on eri valuuttoja."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Laskutettu"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Vahvistuspvm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Jakelukumppani"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maaliskuu"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Kokonaismäärä"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Välisumma"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Laskutusosoite:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Laskutusosoite"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Omiin myyntitilauksiin liittyvät myyntitilausrivit"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Tarjous / Tilaus"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Myyntitilauksen Rivi"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Myyntitilaus jota ei ole vielä vahvistettu"
 
 #. module: sale
 #: view:sale.order:0
@@ -626,8 +601,30 @@ msgid "Order Lines"
 msgstr "Tilausrivit"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Alennus (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Laskurivit"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Hinta yhteensä"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -639,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Ruksi laatikko ryhmitelläksesi samalle asiakkaalle menevät laskut."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Luo Laskuja"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Tunti"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Luontipäivämäärä"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Laskutettavaa"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Laskutusosoite nykyiselle myyntitilaukselle"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Tilatut määrät"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Tilausvuosi myyntitilauksella"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Laskuttamattomat ja toimitetut rivit"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Määrä"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Yhteensä:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Omat Myynnit"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Hinnasto"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Tilauksen viite"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Taloudellinen tilanne"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Heinäkuu"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -687,29 +752,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Tunti"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI hinnasto (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -717,23 +812,37 @@ msgid "Order Date"
 msgstr "Tilauksen päivämäärä"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Toimitettu"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Tarjoukset ja myynnit"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Maksettu"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Kumppani"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -741,39 +850,95 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tarjouksen Päiväys"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Yhdistä laskut"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Ennakkoon laskutettava määrä."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Myynti luo lasku"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Et voi vahvistaa myyntitilausta, jolla ei ole rivejä."
+msgid "Pricelist Warning!"
+msgstr "Hinnaston varoitus"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Alennus (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Sinun pitää valita hinnasto tai asiakas myyntilomakkeella!\n"
-"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
+"Laskua ei voi luoda tälle myyntitilausriville seuraavista syistä:\n"
+"1. Myyntitilausrivin tila on joko luonnos tai peruttu!\n"
+"2. Myyntitilausrivi on laskutettu!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Omat tarjoukset"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Laskut"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Joulukuu"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Toimitettu"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Kuukausi"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Laskuttamaton"
 
 #. module: sale
 #: view:sale.report:0
@@ -782,7 +947,7 @@ msgid "Category of Product"
 msgstr "Tuotteen Luokka"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -793,10 +958,18 @@ msgid "Recreate Invoice"
 msgstr "Laskun uudelleenluonti"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Myymälän nimi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -804,36 +977,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Verot:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Laskutettu"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Ennakkolasku"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Käynnissä"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Asiakasta ei ole määritetty!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Luo laskut"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Myyntiilausrivi tee lasku"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Sähköpostin mallipohjat"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Odottaa aikataulua"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Myyntitilaukset"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Veron määrä"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Elokuu"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Ohjaa hankintaa ja laskutusta"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Tehtävää"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Kesäkuu"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Tilaa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Myyntianalyysi"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Myyntitilausten Tilastot"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Päivämäärä"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Marraskuu"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Tarjous"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Ennakkotuote"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Poikkeus"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Lokakuu"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Myyjä luo laskun käsin, jos myyntitilauksen lähetyssäännöt ovat 'toimitus ja "
+"manuaalinen käynnissä'. Lasku luodaan automaattisesti jos lähetyssääntö on "
+"'maksu ennen toimitusta'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Myymälä"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -842,6 +1242,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Tammikuu"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Myyntitilaukset käsittelyssä"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -852,11 +1276,96 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Myyntitilaukseen liitetty analyyttinen tili."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Myyntimies vahvistaa tarjouksen. Myyntitilauksen tila muuttuu 'käynnissä' "
+"tai 'manuaalinen käynnissä'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Sinun pitää valita hinnasto tai asiakas myyntilomakkeella!\n"
+"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Ei löytynyt voimassaolevaa hinnaston riviä! :"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Sitoutumisen viive"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tarjoukset"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ohita poikkeus"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -877,11 +1386,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Viitteenne"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Tilauksen Päiväys"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Hinnasto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "ALV:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Asiakkaan laskut"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Laskutettavat vahvistetut myyntitilaukset."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sarja"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Myynti"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Määrä"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "varastosta"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tarjouksen Päiväys"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Yhteensä"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Laskutusosoite:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Lasku"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -897,19 +1500,101 @@ msgstr "Omat myyntitilausrivit"
 msgid "Cancel"
 msgstr "Peruuta"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Ei hinnastoa ! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Etsi Laskuttamattomia Rivejä"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Tilausviitteen tulee olla uniikki yrityskohtaisesti!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Toimitusosoite:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "Et voi ryhmitellä saman kumppanin myyntejä joilla on eri valuuttoja."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Myynnin ennakkomaksulasku"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -920,360 +1605,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Luo lasku"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Määrä ilman veroa."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Tilausviite"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Merkitsee että lasku on maksettu"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Hinta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "tilauksesta"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Toimitusosoite:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Myyntitilauksen luonnostila"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Verollinen Summa"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Myyntitilauksen tilauspäivä"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Vahvista tarjous"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Odottaa aikataulua"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Hankintatapa"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Yksikköhinta"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Myyntitilaus"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Verot"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Myyntitilaus on valmis laskutettavaksi"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Päivä jolloin myyntitilaus on luotu"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Luo laskuja"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faksi:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Etukäteismäärä"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Toimitetut määrät"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Luo Laskuja"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Laskutettavaa"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Tilausvuosi myyntitilauksella"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Heinäkuu"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Poikkeus toimituksessa"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Yhdistä laskut"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Kuukausi"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Kirjanpitäjän tarkistettavaksi"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Luo laskut"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Myyntiilausrivi tee lasku"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vanhat Tarjoukset"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Maksettu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Myyntianalyysi"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Tarjous"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Myyjä luo laskun käsin, jos myyntitilauksen lähetyssäännöt ovat 'toimitus ja "
-"manuaalinen käynnissä'. Lasku luodaan automaattisesti jos lähetyssääntö on "
-"'maksu ennen toimitusta'."
+msgid "Other Information"
+msgstr "Lisätiedot"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1296,27 +1666,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1331,7 +1684,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1372,92 +1725,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Vahvistetut myyntitilausrivit, ei vielä toimitettu"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Asiakkaan laskut"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Myynti"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Yksikköhinta"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Lasku"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Lähdedokumentti"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Tehtävää"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Määrä ilman veroa."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Myynnin ennakkomaksulasku"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1467,10 +1734,38 @@ msgid "Product"
 msgstr "Tuote"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Kokonaismäärä"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Toukokuu"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Hinta"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1483,383 +1778,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Kuukausittainen liikevaihto"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Laskutetaan kun"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Tarjous / Tilaus"
+
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Tilauspäivämäärä"
+msgid "Tel. :"
+msgstr "Puh.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Tuotteen myyntiyksikkö"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuaalisessa käsittelyssä"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Tilaa"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Myyntitilauksesta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ohita poikkeus"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Asiakkaan Viite"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Yhteensä"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Myynnin työpöytä"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Päivä jolloin myyntitilaus on vahvistettu"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Yritys"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Laskun päivämäärä"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Ennakkoon laskutettava määrä."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Poikkeus laskutuksessa"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Asiakasta ei ole määritetty!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Yhteensä veroton"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Peruutettu"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Etsi Laskuttamattomia Rivejä"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Myymälä"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Vahvistus Päivämäärä"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Myyntitilaus"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Määrä (myyntiyksikkö)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Myyntitilausrivit jotka ovat 'valmis' tilassa"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Vahvistettu"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Vahvista"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Laskurivit"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Rivien lukumäärä"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Myyntitilauksen rivit"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI hinnasto (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Oletko varma, että haluat muodostaa laskun?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1869,245 +1810,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Laskua ei voi luoda tälle myyntitilausriville seuraavista syistä:\n"
-"1. Myyntitilausrivin tila on joko luonnos tai peruttu!\n"
-"2. Myyntitilausrivi on laskutettu!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Myyntitilausrivit valmiit"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Paino"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Laskut"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Joulukuu"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Laskuttamaton"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Kirjanpitäjän tarkistettavaksi"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Ohjaa hankintaa ja laskutusta"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Veroton määrä"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Ennakkolasku"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Veron määrä"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Myyntitilausrivit valmiina laskutettaviksi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Sähköpostin mallipohjat"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Myyntitilaukset"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Myymälä"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Marraskuu"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Ennakkotuote"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Tammikuu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Myyntitilaukset käsittelyssä"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Sitoutumisen viive"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Tilauksen Päiväys"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Laskutettavat vahvistetut myyntitilaukset."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Myyntitilaus jota ei ole vielä vahvistettu"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "varastosta"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Ei hinnastoa ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Merkitsee että lasku on maksettu"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Kuvaus"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Toukokuu"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Oletko varma, että haluat muodostaa laskun?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2130,11 +1872,131 @@ msgstr "Ennakko"
 msgid "February"
 msgstr "Helmikuu"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Laskutetaan kun"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Syyskuu"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Tilauspäivämäärä"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Tuotteen myyntiyksikkö"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Myyntitilauksen luonnostila"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Lähdedokumentti"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Huhtikuu"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuaalisessa käsittelyssä"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vanhat Tarjoukset"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Hae myyntitilausta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Kuvaus"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2145,20 +2007,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Hae myyntitilausta"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Myyntitilauksen tilauskuukausi"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Myyntitilauksesta"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sarja"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2167,41 +2053,94 @@ msgid "Payment Term"
 msgstr "Maksuehto"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Myyntitilaus on valmis laskutettavaksi"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Myyntitilauksen rivit"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tilauksessa käytettävä hinnasto."
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Tarjous no."
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Asiakkaan Viite"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Kerätty"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Vuosi"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Verollinen Summa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Myyntitilauksen tilauspäivä"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Vaiheet myyntitilauksen toimittamiseksi"
 
@@ -2482,6 +2421,9 @@ msgstr ""
 #~ "Lasku luodaan myyntitilauksen vahvistamisen jälkeen kun painetaan \"Luo "
 #~ "lasku\". Tämä toiminto siirtää myyntitilauksen laskutukseen."
 
+#~ msgid "Sale Order"
+#~ msgstr "Myyntitilaus"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Luonnos asiakkaan laskusta tilinpitäjän tarkastettavaksi."
 
@@ -3309,9 +3251,19 @@ msgstr ""
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Työn pääaikayksikkö"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Omat myyntitilaukset"
+
 #~ msgid "Based on Timesheet"
 #~ msgstr "Tuntilistan mukaan"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Myyntitilausrivit joita ei ole vahvistettu, tehty tai poikkeustilassa ja "
+#~ "joita ei ole vielä laskutettu"
+
 #~ msgid "Invoice based on deliveries"
 #~ msgstr "Toimituksiin perustuva lasku"
 
@@ -3366,6 +3318,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Valinnat"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Et voi vahvistaa myyntitilausta, jolla ei ole rivejä."
+
 #~ msgid "Deliver all products at once"
 #~ msgstr "Toimita kaikki tuotteet kerralla"
 
@@ -3385,6 +3341,9 @@ msgstr ""
 #~ msgid "Sales order created in current month"
 #~ msgstr "Myyntitilaukset jotka luotu kuluvan kuukauden aikana"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Vahvistetut myyntitilausrivit, ei vielä toimitettu"
+
 #~ msgid "Setup your Invoicing Method"
 #~ msgstr "Aseta laskutustapa"
 
@@ -3401,12 +3360,21 @@ msgstr ""
 #~ msgid "Print Order"
 #~ msgstr "Tulostusjärjestys"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Myyntitilausrivit jotka ovat 'valmis' tilassa"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Päämetodi perustuu"
 
 #~ msgid "Contract/Analytic Account"
 #~ msgstr "Sopimus/Analyyttinen tili"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Myyntitilausrivit valmiit"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Myyntitilausrivit valmiina laskutettaviksi"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Myyntitilaukset luotu kuluvana vuonna"
 
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 8edd31a49fe..07cd0582ff8 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-26 12:14+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #, python-format
 #~ msgid ""
@@ -53,39 +53,183 @@ msgstr ""
 #~ "Erreur: l'UP par défaut et l'UP d'achat doivent être dans la même catégorie."
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmer le devis"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tableaux de bord des ventes"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Lignes de bon de commande qui sont en état confirmé, terminé ou en exception "
-"et qui n'ont pas encore été facturé."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Date de confirmation"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Regrouper par..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partenaire alloti"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "liste de prix du bon de commandes actuel"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Méthode d'approvisionnement"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Date à laquelle le bon de commande est confirmé."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Date de facturation"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Lignes livrées et non-facturées"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Incident de facturation"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sous-total"
 
 #. module: sale
 #: view:sale.report:0
@@ -98,6 +242,26 @@ msgstr "Jour"
 msgid "Cancel Order"
 msgstr "Annuler la commande"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Poids brut"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -110,21 +274,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Sur commande"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Taxes"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Montant hors-taxe"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Net :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Annuler"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Lignes de commande liées à une de mes commandes"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Incident d'expédition"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantité (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Magasin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Commandes avec incidents"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresse de facturation"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Date à laquelle le bon de commande a été créé."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Créer les factures"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -136,12 +456,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Date de confirmation"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Compte analytique"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Nb. de lignes"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -150,6 +474,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -157,8 +486,66 @@ msgid "# of Qty"
 msgstr "Nb. de qté."
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Commande de ventes"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ligne de commandes de vente"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Montant anticipé"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -170,483 +557,68 @@ msgstr ""
 "Permet de gérer différents prix selon des règles par catégories de clients.\n"
 "Exemple : 10% pour les revendeurs, promotion de 5€ sur cet article, etc."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Condition de règlement par défaut"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Chiffre d'affaires mensuel"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Quantités livrées"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Année"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rem.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-"Veuillez définir un compte de revenu pour cet article : \"%s\" (id. : %d)"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Prix total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Cochez cette case pour grouper les factures d'un même client"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mes bons de commande"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantités commandées"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Référence commande"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Autre information"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Devis et ventes"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vente : Facturer"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Avertissement sur liste de prix!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Remise (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mes devis"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nom du Magasin"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Commandes avec incidents"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "État"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Août"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juin"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistiques sur les commandes de ventes"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Le compte analytique lié au bon de commandes"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octobre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Devis"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Quantité"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Régime fiscal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En cours"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Le vendeur confirme le devis. L'état du bon de commande devient \"En cours\" "
-"ou \"Manuel, en cours\""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tél. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adresse de facturation pour le bon de commandes actuel"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mois de commande du bon de commande"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Vous ne pouvez pas regrouper les bons de commande ayant des devises "
-"différentes pour un même partenaire."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturé"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Date de confirmation"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Partenaire alloti"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mars"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Montant total"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sous-total"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresse de facturation :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresse de facturation"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Lignes de commande liées à une de mes commandes"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Devis / Commande"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Ligne de commandes de vente"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -666,8 +638,31 @@ msgid "Order Lines"
 msgstr "Lignes de la commande"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rem.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+"Veuillez définir un compte de revenu pour cet article : \"%s\" (id. : %d)"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Lignes de facture"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prix total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -679,38 +674,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Cochez cette case pour grouper les factures d'un même client"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Générer les factures"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Heure"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Date de création"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "À facturer"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adresse de facturation pour le bon de commandes actuel"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantités commandées"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Année de commande du bon de commande"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Lignes livrées et non-facturées"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantité"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mes ventes"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Liste de prix"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Référence commande"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Régime fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juillet"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -727,29 +790,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "État"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Heure"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -757,23 +850,37 @@ msgid "Order Date"
 msgstr "Date de commande"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Expédié"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Devis et ventes"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Payé"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partenaire"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -781,40 +888,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Date du devis"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grouper les factures"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Le montant à facturer par anticipation"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vente : Facturer"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Vous ne pouvez pas confirmer un bon de commande sans ligne"
+msgid "Pricelist Warning!"
+msgstr "Avertissement sur liste de prix!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Remise (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Vous devez sélectionner une liste de prix ou un client dans le formulaire de "
-"vente !\n"
-"Sélectionnez-en un avant de choisir un article."
+"Une facture ne peut pas être créée depuis une ligne de vente à cause d'une "
+"des raisons suivantes :\n"
+"1. L'état de cette ligne de vente est soit \"Brouillon\", soit \"Annulée\" "
+"!\n"
+"2. La ligne de vente est déjà facturée !"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mes devis"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Factures"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Décembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Expédié"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Non-facturée"
 
 #. module: sale
 #: view:sale.report:0
@@ -823,7 +987,7 @@ msgid "Category of Product"
 msgstr "Catégorie d'article"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -834,10 +998,18 @@ msgid "Recreate Invoice"
 msgstr "Recréer la Facture"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nom du Magasin"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -845,36 +1017,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Taxes :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturé"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Facture Anticipée"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En cours"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Aucun Client défini !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Créer les factures"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmée"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Lignes de vente : Facturer"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Modèles de courriels"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Attente de planification"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Bons de commande"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Total des taxes."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Août"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pilote l'approvisionnement et la facturation"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "À faire"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juin"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Commande"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analyse des ventes"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiques sur les commandes de ventes"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Date"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembre"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Devis"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Article d'avance"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Incident"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octobre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Le vendeur crée une facture manuellement, si la politique d'expédition de la "
+"commande de ventes est 'Expédition et manuelle en cours'. La facture est "
+"crée automatiquement si la politique d'expédition est 'Paiement avant la "
+"livraison'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Magasin"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -883,6 +1283,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Janvier"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Bons de commande en cours"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -893,11 +1317,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Le compte analytique lié au bon de commandes"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Le vendeur confirme le devis. L'état du bon de commande devient \"En cours\" "
+"ou \"Manuel, en cours\""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Vous devez sélectionner une liste de prix ou un client dans le formulaire de "
+"vente !\n"
+"Sélectionnez-en un avant de choisir un article."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Référence du document qui a généré cette demande de commande."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Pas de ligne de liste de prix correcte trouvée ! :"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Période d'engagement"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Devis"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ne pas traiter l'incident"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -919,11 +1429,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Votre Référence"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Date de commande"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Liste de prix"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Factures clients"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Bons de commande confirmé à facturer."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventes"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Qté"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Depuis le stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Date du devis"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Terminée"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresse de facturation :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Facture"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -939,19 +1543,103 @@ msgstr "Mes lignes de bons de commande"
 msgid "Cancel"
 msgstr "Annuler"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Pas de liste de prix ! "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Recherche des lignes non-facturées"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "La référence de commande doit être unique par société!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresse de livraison :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Vous ne pouvez pas regrouper les bons de commande ayant des devises "
+"différentes pour un même partenaire."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Facture de paiement d'avance"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -962,361 +1650,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Créer facture"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Le total hors-taxe"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Référence commande"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Cela indique que la facture a été payée."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Prix"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Sur commande"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresse de livraison :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "État \"Brouillon\" de la commande de vente"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total taxes incluses"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Date de commande du bon de commande"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmer le devis"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Regrouper par..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Attente de planification"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Méthode d'approvisionnement"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prix unitaire"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Commande client"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Taxes"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Bons de commande prêts à facturer"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Date à laquelle le bon de commande a été créé."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Créer les factures"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Montant anticipé"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantités livrées"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Générer les factures"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "À facturer"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Année de commande du bon de commande"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juillet"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Incident d'expédition"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grouper les factures"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mois"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "À vérifier par le comptable."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Créer les factures"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Lignes de vente : Facturer"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Anciens devis"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Payé"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analyse des ventes"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Devis"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Le vendeur crée une facture manuellement, si la politique d'expédition de la "
-"commande de ventes est 'Expédition et manuelle en cours'. La facture est "
-"crée automatiquement si la politique d'expédition est 'Paiement avant la "
-"livraison'."
+msgid "Other Information"
+msgstr "Autre information"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1339,27 +1711,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1374,7 +1729,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1415,92 +1770,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Lignes de commande confirmées, pas encore livrées"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Factures clients"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventes"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prix unitaire"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Terminée"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Facture"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Document d'origine"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "À faire"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Le total hors-taxe"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Facture de paiement d'avance"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1510,10 +1779,38 @@ msgid "Product"
 msgstr "Article"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Montant total"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Prix"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1526,387 +1823,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Chiffre d'affaires mensuel"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facture sur"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Ce rapport analyse vos devis et commandes clients. Il vérifie les revenus "
+"liés aux ventes et les classifie selon différents critères (vendeur, "
+"partenaire, article, etc.). Vous pouvez utiliser ce rapport pour analyser "
+"vos ventes non encore facturées. Si vous souhaitez analyser votre chiffre "
+"d'affaires, vous devriez utiliser le rapport \"Analyse des factures "
+"clients\" dans l'application comptabilité."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Devis / Commande"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Date de commande"
+msgid "Tel. :"
+msgstr "Tél. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV de l'article"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuelle en cours"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Commande"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "À partir d'un bon de commandes"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ne pas traiter l'incident"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Dépendant du contrôle de la facturation des bons de commande, la facture "
-"peut être basée sur les quantités livrées ou les quantités commandées. Par "
-"conséquent, un bon de commande peut générer une facture ou un bon de "
-"livraison dès qu'il a été confirmé par le commercial."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Référence client"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Tableaux de bord des ventes"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Date à laquelle le bon de commande est confirmé."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Société"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Date de facturation"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Le montant à facturer par anticipation"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Incident de facturation"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Aucun Client défini !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Net :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Annuler"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Recherche des lignes non-facturées"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Magasin"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Date de confirmation"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Commande de ventes"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantité (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Lignes de commande en état \"terminé\""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmée"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmer"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Lignes de facture"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Nb. de lignes"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Lignes de ventes"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Voulez-vous réellement créer la(les) facture(s) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1916,247 +1861,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Une facture ne peut pas être créée depuis une ligne de vente à cause d'une "
-"des raisons suivantes :\n"
-"1. L'état de cette ligne de vente est soit \"Brouillon\", soit \"Annulée\" "
-"!\n"
-"2. La ligne de vente est déjà facturée !"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Lignes de commande terminées"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Poids brut"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Factures"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Décembre"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Non-facturée"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "À vérifier par le comptable."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pilote l'approvisionnement et la facturation"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Montant hors-taxe"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Facture Anticipée"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Total des taxes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Lignes de commande prêtes à facturer"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Modèles de courriels"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Bons de commande"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Magasin"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Article d'avance"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Janvier"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Bons de commande en cours"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Référence du document qui a généré cette demande de commande."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Période d'engagement"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Date de commande"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Bons de commande confirmé à facturer."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Depuis le stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Pas de liste de prix ! "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Cela indique que la facture a été payée."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Description"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mai"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Voulez-vous réellement créer la(les) facture(s) ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2179,11 +1923,131 @@ msgstr "Avancé"
 msgid "February"
 msgstr "Février"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facture sur"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Date de commande"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV de l'article"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "État \"Brouillon\" de la commande de vente"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Document d'origine"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Avril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuelle en cours"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Anciens devis"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Recherche de commandes de ventes"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Description"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2194,20 +2058,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Recherche de commandes de ventes"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mois de commande du bon de commande"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "À partir d'un bon de commandes"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Dépendant du contrôle de la facturation des bons de commande, la facture "
+"peut être basée sur les quantités livrées ou les quantités commandées. Par "
+"conséquent, un bon de commande peut générer une facture ou un bon de "
+"livraison dès qu'il a été confirmé par le commercial."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2216,47 +2108,94 @@ msgid "Payment Term"
 msgstr "Condition de règlement"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Bons de commande prêts à facturer"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Ce rapport analyse vos devis et commandes clients. Il vérifie les revenus "
-"liés aux ventes et les classifie selon différents critères (vendeur, "
-"partenaire, article, etc.). Vous pouvez utiliser ce rapport pour analyser "
-"vos ventes non encore facturées. Si vous souhaitez analyser votre chiffre "
-"d'affaires, vous devriez utiliser le rapport \"Analyse des factures "
-"clients\" dans l'application comptabilité."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Lignes de ventes"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "liste de prix du bon de commandes actuel"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Devis N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Référence client"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Réceptionné"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Année"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total taxes incluses"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Date de commande du bon de commande"
+
 #~ msgid "Stock Moves"
 #~ msgstr "Mouvements de stock"
 
@@ -2539,6 +2478,9 @@ msgstr ""
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Créer une facture anticipée"
 
+#~ msgid "Sale Order"
+#~ msgstr "Commande client"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Liste de prix de ventes"
 
@@ -3468,12 +3410,22 @@ msgstr ""
 #~ "Donne la marge de rentabilité en calculant la différence entre le prix "
 #~ "unitaire et le prix de revient."
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Lignes de bon de commande qui sont en état confirmé, terminé ou en exception "
+#~ "et qui n'ont pas encore été facturé."
+
 #~ msgid "Print Quotation"
 #~ msgstr "Imprimer devis"
 
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Unité de temps de travail principale"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mes bons de commande"
+
 #, python-format
 #~ msgid ""
 #~ "In order to delete a confirmed sale order, you must cancel it before ! To "
@@ -3669,6 +3621,10 @@ msgstr ""
 #~ "Vous ne pouvez pas annuler une ligne d'un bon de commande qui a déjà été "
 #~ "facturée !"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Vous ne pouvez pas confirmer un bon de commande sans ligne"
+
 #~ msgid "Deliver each product when available"
 #~ msgstr "Livrer chaque produit dès qu'il est disponible"
 
@@ -3688,6 +3644,9 @@ msgstr ""
 #~ msgid "Qty(UoS)"
 #~ msgstr "Qté. (UdV)"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Lignes de commande confirmées, pas encore livrées"
+
 #~ msgid "Qty(UoM)"
 #~ msgstr "Qté. (UdM)"
 
@@ -3721,6 +3680,15 @@ msgstr ""
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Commande (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Lignes de commande terminées"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Lignes de commande prêtes à facturer"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Lignes de commande en état \"terminé\""
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Bons de commande créés cette année"
 
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index ea5a76ce841..b9b1a6baf97 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/i18n/gl.po
@@ -7,47 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-04-19 14:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
 msgstr ""
 
 #. module: sale
@@ -61,6 +207,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,11 +421,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,15 +520,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -148,461 +575,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades Pedidas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,20 +636,74 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
 msgstr ""
 
 #. module: sale
@@ -656,16 +711,30 @@ msgstr ""
 msgid "Total :"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,22 +812,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,345 +1593,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1258,11 +1629,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,8 +1722,36 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
 msgstr ""
 
 #. module: sale
@@ -1472,386 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data Pedido"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función do control de facturación dos pedidos de venda, a factura pode "
-"estar baseada nas cantidades enviadas ou vendidas. Polo tanto, un pedido de "
-"venda pode xerar unha factura ou un albará tan pronto como sea confirmada "
-"polo comercial."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1862,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2120,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data Pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2135,19 +1995,47 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función do control de facturación dos pedidos de venda, a factura pode "
+"estar baseada nas cantidades enviadas ou vendidas. Polo tanto, un pedido de "
+"venda pode xerar unha factura ou un albará tan pronto como sea confirmada "
+"polo comercial."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2157,18 +2045,32 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2176,20 +2078,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 5a1375cb0be..b273ec1beeb 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -6,51 +6,204 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 00:48+0000\n"
 "Last-Translator: Lovro Lazarin <lovro.lazarin@slobodni-programi.hr>\n"
 "Language-Team: Vinteh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Analitičko računovodstvo za prodaju"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdite ponudu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Upravljačka ploča prodaje"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Stavke prodajnog naloga koje su potvrđene, zaključene ili u stanju "
-"\"Iznimke\" i nisu još fakturirane"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Narudžbene stavke u fakturu"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum potvrde"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "JM"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Prodavač"
+msgid "Group By..."
+msgstr "Grupiraj po..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cjenik za trenutni prodajni nalog"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodjeljeni partner"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Značajke proizvoda"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Omogućuje vam da definirate uvijete ugovora kupaca: metoda \n"
+"            fakturiranja (fiksna cijena, prema kontrolnoj kartici, napredno "
+"fakturiranje), točno određivanje cijena\n"
+"            (650€/danu programera), trajanje (jednogodišnji ugovor).\n"
+"            Biti ćete u mogućnosti pratiti napredak ugovora i fakturiranja "
+"automatski.\n"
+"            Instalira modul account_analytic_analysis."
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Jedinica mjere"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda nabave"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum potvrde prodajnog naloga"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Koristi višestruke analitičke račune za prodaju"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "Prvo otkažite sve račune povezane sa ovim prodajnoim nalogom."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Broj ponude"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Nepročitane poruke"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Tvrtka"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum fakture"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nefakturirane i dostavljene stavke"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Iznimka fakture"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Ponuda "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Nacrt ponude"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Adresa dostave"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Konto analitike"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Podzbroj"
 
 #. module: sale
 #: view:sale.report:0
@@ -60,10 +213,29 @@ msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Otkaži narudžbu"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Značajke skladišta"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "Zadana jedninica radnog vremena za službe je"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Mjerna jedinica "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -76,21 +248,188 @@ msgstr "Netočni podaci"
 msgid "The value of Advance Amount must be positive."
 msgstr "Iznos avansa mora biti pozitivna."
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Po narudžbi"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Status naloga"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Iznos bez poreza"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto zbroj:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Sa zaliha: kada je potrebno, proizvod je uzet sa zaliha ili čekamo "
+"nadopunjavanje.\n"
+"Prema narudžbi: kada je potrebno, proizvod je kupljen ili proizveden."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Omogućuje vam da definirate zadanu funkciju za određenog korisnika na datom "
+"računu.\n"
+"                Ovo se uglavnom koristi kada korisnik šifrira svoju "
+"kontrolnu karticu. Vrijednosti su  dohvaćene i polja su automatski "
+"popunjena.\n"
+"                Ali mogućnost da promijenite te vrijednosti i dalje "
+"postoji.\n"
+"                Ovo instalira modul analytic_user_function."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Stavke prodajnog naloga vezane za moj prodajni nalog"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Ponuda poslana"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Čarobnjak za sastavljanje e-pošte"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Ako je odabrano, nove poruke zahtijevaju Vašu pažnju."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Izuzetak kod otpreme"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (JP)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavaonica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Prodaje u iznimci"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa fakture"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum kreiranja prodajnog naloga"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Netočno"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Napravi fakture"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Porez"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Nevažeća akcija"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -110,12 +449,15 @@ msgstr ""
 "planera da krene na datum narudžbe."
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrde"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Konto analitike"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# linija"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -126,6 +468,11 @@ msgstr ""
 "Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
 "da bi mogao biti ubačen u kanban pogled."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr "Daje poredak kada prikazuje listu prodajnih naloga."
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -133,10 +480,67 @@ msgid "# of Qty"
 msgstr "# kol"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(ažuriraj)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Značajke ugovora"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Iznos predujma"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
-"Omogućuje vam da primijenite određena sniženja po stavkama prodajnog naloga."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -148,16 +552,54 @@ msgstr ""
 "kategorijama kupaca.\n"
 "Npr: 10% za maloprodajne trgovce, promocija od 5€ na proizvod, itd."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Jedan zaposlenik može imati različite uloge po ugovoru"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Standardan uvjet plaćanja"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Pripremi fakture na temelju kontrolnih kartica"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Faktura  <b>plaćeno</b>,"
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Mjesečni obrtaj"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Otpremljene količine"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Godina"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -165,9 +607,30 @@ msgid "Allow using different units of measures"
 msgstr "Dopusti korištenje različitih mjernih jedinica"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Postotak"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Prodajni nalog koji nije potvrđen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Ispis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Narudžba broj"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Stavke narudžbe"
 
 #. module: sale
 #: report:sale.order:0
@@ -175,26 +638,57 @@ msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Molimo definirajte račun dohotka za ovaj proizvod \"%s\" (id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavke fakture"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Ukupni iznos"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Označite kućicu za grupiranje faktura istih kupaca"
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Moji prodajni nalozi"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Napravi fakture"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Sat"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# prodajnih naloga"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -213,11 +707,59 @@ msgstr ""
 "                                                                             "
 "  Ovo instalira modul account_analytic_analysis."
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za fakturirati"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adresa fakture za trenutni prodajni nalog."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Naručene količine"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Godina prodajnog naloga"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moje prodaje"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -225,33 +767,123 @@ msgid "Order Reference"
 msgstr "Referenca narudžbe"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Ostali podaci"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Srpanj"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+"* Status 'Nacrt' je postavljen kada je vezani prodajni nalog u stanju "
+"nacrta.                     \n"
+"* Status 'Potvrđeno' je postavljen kada je vezani prodajni nalog potvrđen.   "
+"                  \n"
+"* Status 'Iznimka' je postavljen kada je vezani prodajni nalog postavljen "
+"kao iznimka.                     \n"
+"* Status 'Zaključeno' je postavljen kada je stavka prodjanog naloga "
+"odabrana.                     \n"
+"* Status 'Otkazano' je postavljen kada korisnik otkaže vezani prodajni nalog."
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Zadane opcije"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Upozorenje!"
+msgid "Configuration Error!"
+msgstr "Greška u konfiguraciji!"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Analitički računi prodaje"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Nakon odabira \"Prikaži stavke za fakturiranje\", odaberite stavke za "
+"fakturiranje i kreirajte račun iz \"više\" padajućeg izbornika."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Pošalji e-poštom"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Cjenik (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "Na otpremnici"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Proces fakturiranja"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Datum narudžbe"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Prodajni nalog gotov"
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+"Molimo definirajte prodajni dnevnik za ovu organizaciju: \"%s\" (id:%d)."
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Ponude i prodaje"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeno"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
@@ -259,13 +891,38 @@ msgid ""
 msgstr ""
 "Omogućuje vam da odaberete i zadržite različite mjerne jedinice za proizvode."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Referentna JM"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Kreiraj i prikaži fakturu"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupiraj fakture"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Iznos za fakturiranje unaprijed."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Faktura obavljene prodaje"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Upozorenje cjenovnika!"
@@ -275,6 +932,20 @@ msgstr "Upozorenje cjenovnika!"
 msgid "Discount (%)"
 msgstr "Popust (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Faktura se ne može kreirati za ovu stavku prodajnog naloga zbog jednog od "
+"sljedećih razloga:\n"
+"1. Stanje ove stavke prodajnog naloga je \"Nacrt\" ili \"Otkazano\"!\n"
+"2. Stavka prodajnog naloga je već fakturirana!"
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -286,6 +957,59 @@ msgstr "Kreiraj i pogledaj fakturu"
 msgid "My Quotations"
 msgstr "Moje Ponude"
 
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakture"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Prosinac"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Upravljanje ugovorima"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Otpremljeno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturirano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategorija proizvoda"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Ne možete otkazati ovaj prodajni nalog!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Ponovno izradi fakturu"
+
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
@@ -296,6 +1020,586 @@ msgstr "Dopusti kreiranje alarma prema kupcima ili proizvodima"
 msgid "Shop Name"
 msgstr "Naziv prodavaonice"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Porezi :"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturirano"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktura predujma"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Otvori izbornik Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nije definiran kupac !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Napravi fakture"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Avans od %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Sale OrderLine Make_invoice"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Email predlošci"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Partner kojemu određeni proizvod treba biti dodijeljen"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Ugovor / Analitički"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Uvijeti o korištenju"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodajni nalozi"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Iznos poreza."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Na zahtijev"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Kolovoz"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Izvršava nabavu i fakturiranje"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Za napraviti"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Lipanj"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Narudžba"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza prodaje"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Pratitelj"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika prodajnih naloga"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Prodavač"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Studeni"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Prošireni filteri..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Proizvod predujma"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Iznimka"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Listopad"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Ako je pravilo otpremanja prodajnog naloga 'Otpremanje i ručni postupak u "
+"tijeku', prodavač kreira fakturu ručno. Faktura se kreira automatski ako je "
+"postavljeno pravilo otpremanja 'Plaćanje prije dostave'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodavaonica"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Omogućuje vam da kreirate ponudu, prodajni nalog koristeći različita pravila "
+"narudžbe i upravljate vezanim zalihama.\n"
+"                    Ovo instalira modul sale_stock."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Odaberite proizvod od vrste servisa koji se zove 'Napredni proizvod'.\n"
+"                Možda ćete ga morati kreirati i postaviti kao zadanu "
+"vrijednost na ovom polju."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Siječanj"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Prodajni nalozi u tijeku"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+"Dopusti konfiguraciju notifikacija na proizvodima i iniciraj ih kada "
+"korisnik želi prodati određeni proizvod ili određenom kupcu.\n"
+"Nrp: Proizvod: ovaj proizvod je zastario, ne kupujte više od 5.\n"
+"                Dobavljač: ne zaboravi tražiti žurnu dostavu."
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analitički konto povezan sa prodajnim nalogom."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Pogledaj fakturu"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Što želite fakturirati?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Koristite cjenik za prilagodbu cijena po kupcima"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Prodavač potvrđuje ponudu. Stanje prodajnog naloga postaje 'U tijeku' ili "
+"'Ručni postupak u tijeku'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr "Odaberite cjenik ili kupca prije odabira proizvoda!"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Referenca na dokument koji je generirao ovaj prodajni nalog."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nije pronađena odgovarajuća stavka cjenika"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Avans od %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Odgoda obveze"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Ponude"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "Ovo omogućuje instlaciju modula sale_analytic_plans."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Zanemari iznimku"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Adresa dostave za trenutni prodajni nalog."
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Prikazuj marže na prodajnim nalozima"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Ovo je lista faktura koje su generirane za prodajni nalog. Isti prodajni "
+"nalog može biti fakturiran više puta (npr. prema stavkama)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Vaša referenca"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Prikaži stavke prema fakturiranju"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Datum narudžbe"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cjenik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "OIB:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Izlazni računi"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Prodajni nalog potvrđen i pretvoren u fakturu."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Redoslijed"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Ukoliko se promijeni cjenik za postojeću narudžbu (eventualno i valuta), "
+"cijene postojećih stavaka narudžbe neće biti osvježene."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Iz zalihe"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum ponude"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Završeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa fakture :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Moje stavke prodajnog naloga"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Pratitelji"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Nema cjenika! "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pretraži nefakturirane stavke"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Poveznica narudžbe mora biti jedinstvena za Organizaciju!"
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -321,217 +1625,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Ponuda "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Avans od %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodaje u iznimci"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Partner kojemu određeni proizvod treba biti dodijeljen"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Kolovoz"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                                                                           "
-"Kliknite da bi kreirali ponudu koja može biti pretvorena u prodajni\n"
-"                                                                           "
-"nalog.\n"
-"                                                                 </p><p>\n"
-"                                                                           "
-"OpenERP wam pomaže da efikasno upravljate kompletnim prodajnim tokom:\n"
-"                                                                           "
-"ponuda, prodajni nalog, otprema, fakturiranje i plaćanje.\n"
-"                                                                  </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Lipanj"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistika prodajnih naloga"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analitički konto povezan sa prodajnim nalogom."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Listopad"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Sažetak"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Pogledaj fakturu"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Avans od %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Ponude"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
+msgid "Shipping address :"
+msgstr "Adresa otpreme"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Adresa dostave za trenutni prodajni nalog."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "OIB:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Rujan"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U tijeku"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Nacrt fakture od %s %s <b>čekanje na validaciju</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Prodavač potvrđuje ponudu. Stanje prodajnog naloga postaje 'U tijeku' ili "
-"'Ručni postupak u tijeku'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr "Ne možete otkazati stavku prodajnog naloga koja je već fakturirana."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adresa fakture za trenutni prodajni nalog."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Prije otpreme"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"Nije definirana fiskalna pozicija ili prihodovni konto kategorije za zadane "
-"karakteristike proizvodnih kategorija."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Adresa u prodajnom nalogu"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Ugovor / Analitički"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Omogući fakturiranje stavki prodajnih naloga"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mjesec prodajnog naloga"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -541,449 +1640,24 @@ msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "ili"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturirano"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Analitičko računovodstvo za prodaju"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum potvrde"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodjeljeni partner"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
+msgid "Invoice Sales Order"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Ožujak"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Prodaja: označi crveno"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Ukupan iznos."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Podzbroj"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Dopusti postavljanje popusta na stavke prodajnog naloga"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa fakture :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Mjerna jedinica "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "Zadana jedninica radnog vremena za službe je"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa fakture"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Stavke prodajnog naloga vezane za moj prodajni nalog"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponuda / Narudžba"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-"Svi predmeti u ovim stavkama će biti fakturirani. Možete također fakturirati "
-"postotak prodajnog naloga \n"
-"                                                                             "
-"                  ili fiksnu cijenu (za avans) direktno iz prodajnog naloga."
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(ažuriraj)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Stavka prodajnog naloga"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Jedan zaposlenik može imati različite uloge po ugovoru"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Ispis"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Narudžba broj"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Stavke narudžbe"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Koristi višestruke analitičke račune za prodaju"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Koristi upravljanje ugovorima"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Prodajni nalog za <em>%s</em> set to <b>Done</b>"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nefakturirane i dostavljene stavke"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Ukupno :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moje prodaje"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cjenik"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-"* Status 'Nacrt' je postavljen kada je vezani prodajni nalog u stanju "
-"nacrta.                     \n"
-"* Status 'Potvrđeno' je postavljen kada je vezani prodajni nalog potvrđen.   "
-"                  \n"
-"* Status 'Iznimka' je postavljen kada je vezani prodajni nalog postavljen "
-"kao iznimka.                     \n"
-"* Status 'Zaključeno' je postavljen kada je stavka prodjanog naloga "
-"odabrana.                     \n"
-"* Status 'Otkazano' je postavljen kada korisnik otkaže vezani prodajni nalog."
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Greška u konfiguraciji!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "Pošalji e-poštom"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Sat"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Datum narudžbe"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Otpremljeno"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-"Da bi dopustili prodavaču da kreira fakture za stavke prodajnih naloga "
-"koristeći meni 'Stavke u fakture'."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Kreiraj i prikaži fakturu"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknite da bi definirali novu prodavaonicu.\n"
-"              </p><p>\n"
-"                Svaka ponuda ili prodajni nalog mora biti vezan za "
-"prodavaonicu. Prodavaonica\n"
-"                također definira skladište iz kojega će proizvodi biti "
-"optremljeni\n"
-"                za svaku pojedinu prodaju.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum ponude"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr "Odaberite cjenik ili kupca prije odabira proizvoda!"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategorija proizvoda"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Ne možete otkazati ovaj prodajni nalog!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Ponovno izradi fakturu"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"Kako bi obrisali potvrđeni prodajni nalog, morate ga prethodno otkazati!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Porezi :"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "Na zahtijev"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "nepoznato"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Pratitelj"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Prošireni filteri..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Iznimka"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-"Odaberite proizvod od vrste servisa koji se zove 'Napredni proizvod'.\n"
-"                Možda ćete ga morati kreirati i postaviti kao zadanu "
-"vrijednost na ovom polju."
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-"Dopusti konfiguraciju notifikacija na proizvodima i iniciraj ih kada "
-"korisnik želi prodati određeni proizvod ili određenom kupcu.\n"
-"Nrp: Proizvod: ovaj proizvod je zastario, ne kupujte više od 5.\n"
-"                Dobavljač: ne zaboravi tražiti žurnu dostavu."
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nije pronađena odgovarajuća stavka cjenika"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Prikazuj marže na prodajnim nalozima"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Ovo je lista faktura koje su generirane za prodajni nalog. Isti prodajni "
-"nalog može biti fakturiran više puta (npr. prema stavkama)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Vaša referenca"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kol."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Moje stavke prodajnog naloga"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Otkaži"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Poveznica narudžbe mora biti jedinstvena za Organizaciju!"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -992,391 +1666,60 @@ msgstr ""
 "Ne mogu naći stavku u cjenovniku koja odgovara ovom proizvodu i količini.\n"
 "Morate promijeniti ili proizvod, količinu ili cjenovnik."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Faktura za predujam"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Kreiraj fakturu"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Iznos bez poreza."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Poveznica narudžbe"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"Omogućuje vam da kreirate ponudu, prodajni nalog koristeći različita pravila "
-"narudžbe i upravljate vezanim zalihama.\n"
-"                    Ovo instalira modul sale_stock."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Pokazatelj da je faktura plaćena."
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cijena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Broj ponude"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Po narudžbi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa otpreme"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Dopušta Vam da odaberete analitički račun na prodajnom nalogu."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Prodajni nalog u stanju nacrta"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Ponuda za <em>%s</em> <b>created</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Poruke i povijest komuniciranja"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nova kopija ponude"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Ne možete obrisati prodajni nalog koji je u stanju '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Krakteristike na stavkama"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Prije odabira proizvoda, \n"
-" odaberite kupca u prodajnom formularu."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Ukupan uračunati porez"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Datum prodajnog naloga"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdite ponudu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Narudžbene stavke u fakturu"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupiraj po..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Značajke proizvoda"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Jedinica mjere"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda nabave"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Fakturiraj kompletni prodajni nalog"
+msgid "Percentage"
+msgstr "Postotak"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Nepročitane poruke"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Nacrt ponude"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Prodajna narudžba"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Prodajni nalog spreman za fakturiranje"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-"Omogućuje vam da definirate zadanu funkciju za određenog korisnika na datom "
-"računu.\n"
-"                Ovo se uglavnom koristi kada korisnik šifrira svoju "
-"kontrolnu karticu. Vrijednosti su  dohvaćene i polja su automatski "
-"popunjena.\n"
-"                Ali mogućnost da promijenite te vrijednosti i dalje "
-"postoji.\n"
-"                Ovo instalira modul analytic_user_function."
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum kreiranja prodajnog naloga"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Napravi fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Nevažeća akcija"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Iznos predujma"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Otpremljene količine"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Ukoliko se promijeni cjenik za postojeću narudžbu (eventualno i valuta), "
-"cijene postojećih stavaka narudžbe neće biti osvježene."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Napravi fakture"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# prodajnih naloga"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za fakturirati"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Godina prodajnog naloga"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Srpanj"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Nakon odabira \"Prikaži stavke za fakturiranje\", odaberite stavke za "
-"fakturiranje i kreirajte račun iz \"više\" padajućeg izbornika."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Ukazuje da prodajni nalog ima barem jedan račun."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzetak kod otpreme"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupiraj fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr "Ponuda za <em>%s</em> <b>pretvorena</b> prodajni nalog od %s %s"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Fakturiraj prodajni nalog"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Upravljanje ugovorima"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mjesec"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Potreban pregled od strane računovođe."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Napravi fakture"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Sale OrderLine Make_invoice"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stare ponude"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza prodaje"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Ako je pravilo otpremanja prodajnog naloga 'Otpremanje i ručni postupak u "
-"tijeku', prodavač kreira fakturu ručno. Faktura se kreira automatski ako je "
-"postavljeno pravilo otpremanja 'Plaćanje prije dostave'."
+msgid "Other Information"
+msgstr "Ostali podaci"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1399,27 +1742,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1434,7 +1760,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1474,196 +1800,6 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Pozdrav${object.partner_id.name and ' ' or "
-"''}${object.partner_id.name or ''},</p>\n"
-"    \n"
-"    <p>Ovdje je Vaš ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCE</strong><br />\n"
-"       &nbsp;&nbsp;Broj narudžbe: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Ukupno naručeno: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Datum narudžbe: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Reference narudžbe: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Vaša referenca: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Vaš kontakt: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = ponuda(object.company_id.name)\n"
-"    order_name = ponuda(object.name)\n"
-"    paypal_account =ponuda(object.company_id.paypal_account)\n"
-"    order_amount = ponuda(str(object.amount_total))\n"
-"    cur_name = ponuda(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>Moguće je i direktno platiti preko Paypal-a:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"\n"
-"    <br/>\n"
-"    <p>Ako imate pitanja slobodno nas kontaktirajte.</p>\n"
-"    <p>Hvala vam što ste izabrali ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Telefon:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Koristite cjenik za prilagodbu cijena po kupcima"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Potvrđene, ali neisporučene stavke prodajnog naloga"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-"Prodajni nalog će automatski kreirati prijedlog fakture (nacrt fakture). "
-"Morate odabrati da li želite fakturu na temelju narudžbe. "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Izlazni računi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"Ovo dodaje 'Maržu' na prodajni nalog.\n"
-"                Ovo prikazuje isplativost kalkulirajući razliku između "
-"jednične cijene i cijene koštanja.\n"
-"                Ovo instalira modul sale_margin."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinična cijena"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Završeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Izvorni dokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Za napraviti"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Iznos bez poreza."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Faktura za predujam"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1674,9 +1810,39 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Generiraj račune bazirane na stavkama prodajnog naloga"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Ukupan iznos."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Potvrdi prodaju"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Svibanj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cijena"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1696,424 +1862,35 @@ msgstr ""
 "plaćen prije otpreme proizvoda."
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Mjesečni obrtaj"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Ovaj izvještaj radi analizu vaših ponuda i prodajnih naloga. Analiza "
+"provjerava dohotke od prodaje i sortira ih prema različitim kriterijima "
+"grupiranja (prodavač, partner, proizvod, itd.) Koristite ovaj izvještaj za "
+"izvođenje analize na prodajama koje još nisu fakturirane. Ako želite "
+"analizirati prihod, trebali bi koristiti Izvještaj analize faktura u "
+"računovodstvenoj aplikaciji."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura za"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Fiksna cijena (depozit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponuda / Narudžba"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datum narudžbe"
+msgid "Tel. :"
+msgstr "Tel:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Proizvod - jedinica prodaje"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ručni postupak u tijeku"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Prodaja: označi nepročitano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Narudžba"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Potvrdi prodaju"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Prema prodajnom nalogu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Zanemari iznimku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"U ovisnosti o kontroli fakturiranja, faktura može biti temeljena na "
-"dostavljenim ili na naručenim količinama. Tako, prodajni nalog može "
-"generirati fakturu ili otpremnicu onog trenutka kada je prodavač potvrdi."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Neke stavke narudžbe"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Popust na stavkama"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenca kupca"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Odaberite kako želite fakturirati ovu narudžbu. Ovo\n"
-"                        će kreirati nacrt fakture koji može biti "
-"modificiran.\n"
-"                        prije validacije."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Upravljačka ploča prodaje"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Koristite Sve da bi kreirali završnu fakturu.\n"
-"                Koristite postotak da bi faturirali postotni dio od totalne "
-"količine.\n"
-"                Koristite fiksne cijene kako bi fakturirali specifičnu "
-"količinu unaprijed.\n"
-"                Koristite neke stavke narudžbe da bi fakturirali odabrane "
-"stavke prodajnog naloga."
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"Omogućuje vam da definirate uvijete ugovora kupaca: metoda \n"
-"            fakturiranja (fiksna cijena, prema kontrolnoj kartici, napredno "
-"fakturiranje), točno određivanje cijena\n"
-"            (650€/danu programera), trajanje (jednogodišnji ugovor).\n"
-"            Biti ćete u mogućnosti pratiti napredak ugovora i fakturiranja "
-"automatski.\n"
-"            Instalira modul account_analytic_analysis."
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum potvrde prodajnog naloga"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "Prvo otkažite sve račune povezane sa ovim prodajnoim nalogom."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Tvrtka"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum fakture"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Iznos za fakturiranje unaprijed."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Iznimka fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nije definiran kupac !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Adresa dostave"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Prodaja u fakturu"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Značajke skladišta"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Poruke"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Greška!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto zbroj:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Sa zaliha: kada je potrebno, proizvod je uzet sa zaliha ili čekamo "
-"nadopunjavanje.\n"
-"Prema narudžbi: kada je potrebno, proizvod je kupljen ili proizveden."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pretraži nefakturirane stavke"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Ponuda poslana"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Čarobnjak za sastavljanje e-pošte"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavaonica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrde"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-"Molimo definirajte prodajni dnevnik za ovu organizaciju: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Značajke ugovora"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Prodajni nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (JP)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Stavke prodajnog naloga koje su u stanju \"zaključeno\""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Uvijeti o korištenju"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Pratitelji"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavke fakture"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# linija"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke prodajnog naloga"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Zadane opcije"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Analitički računi prodaje"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Cjenik (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknite da bi kreirali ponudu ili prodajni nalog za ovoga "
-"kupca.\n"
-"              </p><p>\n"
-"                OpenERP će vam pomoći da efikasno upravljate kompletnim "
-"prodajnim tokom:\n"
-"                ponudom, prodjanim nalogom, otpremom, fakturiranje i\n"
-"                plaćanje.\n"
-"              </p><p>\n"
-"                Društvene mogućnosti pomažu vam da organizirate rasprave na "
-"svakom prodajnom nalogu\n"
-"                , i omogućuje vašem kupcu da prati proces\n"
-"                prodjanog naloga.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "Na otpremnici"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Referentna JM"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Želite li zaista kreirati fakturu(e)?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -2123,267 +1900,47 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klliknite da bi kreirali ponudu, prvi korak kod nove "
-"prodaje.\n"
-"              </p><p>\n"
-"                OpenERP će vam pomoći da upravljate kompletnim prodajnm "
-"tokom:\n"
-"                od ponude do prodajnog naloga, \n"
-"                otpreme, fakturiranje i preuzimanje plaćanja.\n"
-"              </p><p>\n"
-"                Društvene mogućnosti pomaže vam da organizirate rasprave na "
-"za svaki prodajni nalog,\n"
-"                i omućuje Vašem kupcu da prati razvoj\n"
-"                prodajnog naloga\n"
-"              </p>\n"
-"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
-"Faktura se ne može kreirati za ovu stavku prodajnog naloga zbog jednog od "
-"sljedećih razloga:\n"
-"1. Stanje ove stavke prodajnog naloga je \"Nacrt\" ili \"Otkazano\"!\n"
-"2. Stavka prodajnog naloga je već fakturirana!"
+"Nije definirana fiskalna pozicija ili prihodovni konto kategorije za zadane "
+"karakteristike proizvodnih kategorija."
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Zaključene stavke prodajnog naloga"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Potreban pregled od strane računovođe."
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Krakteristike na stavkama"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakture"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Prosinac"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturirano"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Izvršava nabavu i fakturiranje"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Iznos bez poreza"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktura predujma"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Otvori izbornik Prodaja"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Inicijaliziraj otpremnice automatski iz prodajnih naloga"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Iznos poreza."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Prodajni nalog "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Stavke prodajnog naloga spremne za fakturiranje"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Email predlošci"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodajni nalozi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodavaonica"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Studeni"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentari i e-pošta."
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Proizvod predujma"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr "Daje poredak kada prikazuje listu prodajnih naloga."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Siječanj"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Prodajni nalozi u tijeku"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Pripremi fakture na temelju kontrolnih kartica"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Prodajni nalog za <em>%s</em> <b>cancelled</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Referenca na dokument koji je generirao ovaj prodajni nalog."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Odgoda obveze"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Status naloga"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Prikaži stavke prema fakturiranju"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Datum narudžbe"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Prodajni nalog potvrđen i pretvoren u fakturu."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Prodajni nalog koji nije potvrđen"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Iz zalihe"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Nema cjenika! "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Prodajni nalozi"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Koristi upravljanje ugovorima"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Pokazatelj da je faktura plaćena."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Svibanj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Želite li zaista kreirati fakturu(e)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Prodaja u fakturu"
 
 #. module: sale
 #: view:sale.order:0
@@ -2407,11 +1964,131 @@ msgstr "Akontacija"
 msgid "February"
 msgstr "Veljača"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura za"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Fiksna cijena (depozit)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Rujan"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Prije otpreme"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Proizvod - jedinica prodaje"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Prodajni nalog u stanju nacrta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Izvorni dokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Travanj"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ručni postupak u tijeku"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stare ponude"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Sažetak"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Poruke i povijest komuniciranja"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Pretraži prodajne naloge"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2425,20 +2102,47 @@ msgstr ""
 "                        Vašim kupcem."
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mjesec prodajnog naloga"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Prema prodajnom nalogu"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pretraži prodajne naloge"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Što želite fakturirati?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"U ovisnosti o kontroli fakturiranja, faktura može biti temeljena na "
+"dostavljenim ili na naručenim količinama. Tako, prodajni nalog može "
+"generirati fakturu ili otpremnicu onog trenutka kada je prodavač potvrdi."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Redoslijed"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "JM"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Neke stavke narudžbe"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Ne možete obrisati prodajni nalog koji je u stanju '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2447,25 +2151,33 @@ msgid "Payment Term"
 msgstr "Uvjet plaćanja"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr "Ovo omogućuje instlaciju modula sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Prodajni nalog spreman za fakturiranje"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Ovaj izvještaj radi analizu vaših ponuda i prodajnih naloga. Analiza "
-"provjerava dohotke od prodaje i sortira ih prema različitim kriterijima "
-"grupiranja (prodavač, partner, proizvod, itd.) Koristite ovaj izvještaj za "
-"izvođenje analize na prodajama koje još nisu fakturirane. Ako želite "
-"analizirati prihod, trebali bi koristiti Izvještaj analize faktura u "
-"računovodstvenoj aplikaciji."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "ili"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Stavke prodajnog naloga"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cjenik za trenutni prodajni nalog"
 
 #. module: sale
 #: report:sale.order:0
@@ -2473,21 +2185,69 @@ msgid "Quotation N°"
 msgstr "Ponuda broj"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Popust na stavkama"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenca kupca"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Odabran"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Godina"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Ovo dodaje 'Maržu' na prodajni nalog.\n"
+"                Ovo prikazuje isplativost kalkulirajući razliku između "
+"jednične cijene i cijene koštanja.\n"
+"                Ovo instalira modul sale_margin."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "Da li želite fakturirati odabrane stavke prodajnog naloga?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Prije odabira proizvoda, \n"
+" odaberite kupca u prodajnom formularu."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Ukupan uračunati porez"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nova kopija ponude"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Odaberite kako želite fakturirati ovu narudžbu. Ovo\n"
+"                        će kreirati nacrt fakture koji može biti "
+"modificiran.\n"
+"                        prije validacije."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Datum prodajnog naloga"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Djelomična isporuka"
@@ -2847,6 +2607,9 @@ msgstr "Da li želite fakturirati odabrane stavke prodajnog naloga?"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Kupovni cjenici"
 
+#~ msgid "Sale Order"
+#~ msgstr "Prodajna narudžba"
+
 #~ msgid "Name"
 #~ msgstr "Ime"
 
@@ -3639,6 +3402,16 @@ msgstr "Da li želite fakturirati odabrane stavke prodajnog naloga?"
 #~ msgid "Sales Order Requisition"
 #~ msgstr "Zahtjev za prodajnim nalogom"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Moji prodajni nalozi"
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Stavke prodajnog naloga koje su potvrđene, zaključene ili u stanju "
+#~ "\"Iznimke\" i nisu još fakturirane"
+
 #~ msgid "Invoice based on deliveries"
 #~ msgstr "Faktura temeljena na isporukama"
 
@@ -3680,6 +3453,10 @@ msgstr "Da li želite fakturirati odabrane stavke prodajnog naloga?"
 #~ msgid "Options"
 #~ msgstr "Postavke"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
+
 #~ msgid "Deliver all products at once"
 #~ msgstr "Isporuči sve proizvode odjednom"
 
@@ -3701,6 +3478,15 @@ msgstr "Da li želite fakturirati odabrane stavke prodajnog naloga?"
 #~ msgid "Reference UoM"
 #~ msgstr "Referentna JM"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Zaključene stavke prodajnog naloga"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Stavke prodajnog naloga spremne za fakturiranje"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Stavke prodajnog naloga koje su u stanju \"zaključeno\""
+
 #, python-format
 #~ msgid ""
 #~ "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -3714,3 +3500,6 @@ msgstr "Da li želite fakturirati odabrane stavke prodajnog naloga?"
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: Neispravan barkod!"
+
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Potvrđene, ali neisporučene stavke prodajnog naloga"
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 0334d84660c..cd1a6d8abbb 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -6,48 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-19 17:22+0000\n"
 "Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Árajánlat megerősítése"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr "EE"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Megerősítés dátuma"
 
 #. module: sale
-#: report:sale.order:0
 #: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Csoportosítás..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Elosztási partner"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "A jelenlegi értékesítési megbízás árlistája."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Beszerzési módszer"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Az értékesítési megbízás megerősítésének dátuma."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Március"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Olvasatlan üzenetek"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Vállalat"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Számla kelte"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Ki nem számlázott, de kiszállított tételek"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Számlázási hiba"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitikus számla"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Részösszeg"
 
 #. module: sale
 #: view:sale.report:0
@@ -60,6 +206,26 @@ msgstr "Nap"
 msgid "Cancel Order"
 msgstr "Rendelés visszavonása"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Súly"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Megendelésre"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Üzenetek"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Adók"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Nettó érték"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettó ár:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Visszavonva"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Szállítási hiba"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Mennyiség (EE)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Üzlet"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Hiba az értékesítés során"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Számlázási cím"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Az értékesítési megbízás létrehozásának dátuma."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Számlák létrehozása"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Megerősítés dátuma"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitikus számla"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Sorok száma"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr "# mennyiség"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Értékesítési megbízás"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Értékesítési megbízási sor"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Előleg"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,483 +519,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Alapértelmezett fizetési feltétel"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Megerősítés"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Kiszállított mennyiség"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Év"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Áreng. (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Teljes ár"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Jelölje be a négyzetet az ugyanazon vevőhöz tartozó számlák "
-"csoportosításához."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Rendelt mennyiségek"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Rendeléshivatkozás"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Egyéb információ"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Számla generálása értékesítésből"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Árengedmény (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Árajánlataim"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Üzlet neve"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Hiba az értékesítés során"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Állapot"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusztus"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Június"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Értékesítési megbízási statisztikák"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Az értékesítési megbízáshoz kapcsolódó analitikus számla."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Október"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Árajánlatok"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Mennyiség"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "ÁFA:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Szeptember"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "ÁFA pozíció"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Folyamatban"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Az értékesítő megerősíti az árajánlatot, az értékesítési megbízás állapota a "
-"következőkre változik: \"Folyamatban\" vagy \"Manuális vezérléssel "
-"folyamatban\""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Az aktuális értékesítési megbízás számlázási címe."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Számlázott"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Megerősítés dátuma"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Elosztási partner"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Március"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "A végösszeg."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Részösszeg"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Számlázási cím:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Számlázási cím"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Árajánlat / Megrendelés"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Értékesítési megbízási sor"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -626,8 +600,30 @@ msgid "Order Lines"
 msgstr "Megrendelési tételek"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Áreng. (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Számlasorok"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Teljes ár"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -639,38 +635,108 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Jelölje be a négyzetet az ugyanazon vevőhöz tartozó számlák "
+"csoportosításához."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Számlák készítése"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Számlázandó"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Az aktuális értékesítési megbízás számlázási címe."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Rendelt mennyiségek"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Ki nem számlázott, de kiszállított tételek"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Mennyiség"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Bruttó ár:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Értékesítéseim"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Árlista"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rendeléshivatkozás"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "ÁFA pozíció"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Július"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -687,28 +753,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Állapot"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -717,23 +813,37 @@ msgid "Order Date"
 msgstr "Megrendelés dátuma"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Kiszállított"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Fizetve"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -741,37 +851,96 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Árajánlat dátuma"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Számlák csoportosítása"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Az előlegszámla összege."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Számla generálása értékesítésből"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Árengedmény (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
+"Nem készíthet számlát ehhez az értékesítési megbízási sorhoz, az alábbi okok "
+"egyikének következtében:\n"
+"1. Az értékesítési megbízás sorának állapota: \"Tervezet\" vagy \"Mégsem\".\n"
+"2.  Az értékesítési megbízás sor már kiszámlázásra került."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Árajánlataim"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Számlák"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Kiszállított"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Hónap"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nem számlázott"
 
 #. module: sale
 #: view:sale.report:0
@@ -780,7 +949,7 @@ msgid "Category of Product"
 msgstr "Termékkaterógia"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -791,10 +960,18 @@ msgid "Recreate Invoice"
 msgstr "Számla újrakészítése"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Üzlet neve"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -802,36 +979,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Adók:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Számlázott"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Előlegszámla"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Folyamatban"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nincs vevő megadva!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Számlák létrehozása"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Megerősítve"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Számla létrehozása az értékesítési megbízási sorból"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Tervezet"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Ütemezésre vár"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Értékesítési megbízások"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Az adó összege"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusztus"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Irányítja a beszerzést és a számlázást"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Teendő"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Június"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Megrendelés"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Értékesítési elemzés"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr "követő"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Értékesítési megbízási statisztikák"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Árajánlat"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Előlegtermék"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Hiba"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Október"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Az értékesítő manuálisan létrehoz egy számlát, hogy ha az értékesítési "
+"megbízás szállítási szabálya: \"Szállítás és manuális vezérléssel "
+"folyamatban\". A számla automatikusan létrejön , ha a szállítási szabály: "
+"\"Fizetés kiszállítás előtt\"."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Értékesítési bolt"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -840,6 +1245,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Január"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Értékesítési megbízás folyamatban"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -850,11 +1279,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Az értékesítési megbízáshoz kapcsolódó analitikus számla."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Az értékesítő megerősíti az árajánlatot, az értékesítési megbízás állapota a "
+"következőkre változik: \"Folyamatban\" vagy \"Manuális vezérléssel "
+"folyamatban\""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"A dokumentum hivatkozása, amely létrehozta ezt az értékesítési megbízási "
+"igényt."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Árajánlati kötöttség ideje"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Árajánlatok"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Hiba figyelmen kívül hagyása"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -876,11 +1391,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Az Ön hivatkozása"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Megrendelési dátum"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Árlista"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "ÁFA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "megerősített értékesítési megbízás, amely számlázható."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Értékesítés"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Menny."
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "készletből"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Árajánlat dátuma"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Összesen"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Kész"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Számlázási cím:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Számla"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -896,19 +1505,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Mégsem"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Követők"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Számlázatlan sorok keresése"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Szállítási cím:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Értékesítési Fizetési számla"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -919,361 +1610,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Számla készítése"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Összeg adó nélkül."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Azt jelzi, hogy a számla ki van fizetve."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Ár"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Megendelésre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Szállítási cím:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Az értékesítési megbízás tervezet állapota"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Üzenetek és kommunikáció történet"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Végösszeg adókkal együtt"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Árajánlat megerősítése"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Ütemezésre vár"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Beszerzési módszer"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Egységár"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Olvasatlan üzenetek"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Rendelés"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Adók"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Az értékesítési megbízás létrehozásának dátuma."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Számlák létrehozása"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Előleg"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Kiszállított mennyiség"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Számlák készítése"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Számlázandó"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Július"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Szállítási hiba"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Számlák csoportosítása"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Hónap"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Ellenőrizendő a könyvelő által."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Számlák létrehozása"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Számla létrehozása az értékesítési megbízási sorból"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Régi árajánlatok"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Fizetve"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Értékesítési elemzés"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Árajánlat"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Az értékesítő manuálisan létrehoz egy számlát, hogy ha az értékesítési "
-"megbízás szállítási szabálya: \"Szállítás és manuális vezérléssel "
-"folyamatban\". A számla automatikusan létrejön , ha a szállítási szabály: "
-"\"Fizetés kiszállítás előtt\"."
+msgid "Other Information"
+msgstr "Egyéb információ"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1296,27 +1671,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1331,7 +1689,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1372,92 +1730,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Értékesítés"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Egységár"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Kész"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Számla"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Forrás dokumentum"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Teendő"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Összeg adó nélkül."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Értékesítési Fizetési számla"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1467,10 +1739,38 @@ msgid "Product"
 msgstr "Termék"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "A végösszeg."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Május"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Ár"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1483,387 +1783,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Ez a jelentés elemzést készít az árajánlatairól és az értékesítési "
+"megbízásairól. Az elemzés kimutatja az értékesítési bevételeit, és "
+"szétosztja különböző kritériumok alapján (értékesítő, partner, termék stb.). "
+"Használja ezt a jelentést, ha elemzést szeretne készíteni a még ki nem "
+"számlázott értékesítéseiről. Ha a forgalmát szeretné elemezni, akkor "
+"használja a számla elemző jelentést a könyvelési modulban."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Számlázás alapja"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Árajánlat / Megrendelés"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Rendelés dátuma"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Termék eladási egysége"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuális vezérléssel folyamatban"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Megrendelés"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Értékesítési megbízásból"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Hiba figyelmen kívül hagyása"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Az értékesítési megbízás számlázási beállításaitól függően a számla "
-"alapulhat a kiszállítási vagy a megrendelési mennyiségen. A rendszer az "
-"értékesítési megbízásból létrehozhat egy számlát vagy egy kiszállítási "
-"megbízást, amint az értékesítő megerősíti azt."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Vevői hivatkozás"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Összesen"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Az értékesítési megbízás megerősítésének dátuma."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Vállalat"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Számla kelte"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Az előlegszámla összege."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Számlázási hiba"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nincs vevő megadva!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Üzenetek"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Nettó ár:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Visszavonva"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Számlázatlan sorok keresése"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Üzlet"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Megerősítés dátuma"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Értékesítési megbízás"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Mennyiség (EE)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Megerősítve"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Megerősítés"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Követők"
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Számlasorok"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Sorok száma"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Értékesítési megbízási tételek"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Biztosan létre akarja hozni a számlá(ka)t?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1873,248 +1821,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Nem készíthet számlát ehhez az értékesítési megbízási sorhoz, az alábbi okok "
-"egyikének következtében:\n"
-"1. Az értékesítési megbízás sorának állapota: \"Tervezet\" vagy \"Mégsem\".\n"
-"2.  Az értékesítési megbízás sor már kiszámlázásra került."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Súly"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Ellenőrizendő a könyvelő által."
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Számlák"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nem számlázott"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Irányítja a beszerzést és a számlázást"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Nettó érték"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Előlegszámla"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Tervezet"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Az adó összege"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Értékesítési megbízások"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Értékesítési bolt"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Előlegtermék"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Január"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Értékesítési megbízás folyamatban"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"A dokumentum hivatkozása, amely létrehozta ezt az értékesítési megbízási "
-"igényt."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Árajánlati kötöttség ideje"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Megrendelési dátum"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "megerősített értékesítési megbízás, amely számlázható."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "készletből"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Azt jelzi, hogy a számla ki van fizetve."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Leírás"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Május"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Biztosan létre akarja hozni a számlá(ka)t?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2137,11 +1883,131 @@ msgstr "Előleg"
 msgid "February"
 msgstr "Február"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Számlázás alapja"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Szeptember"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Rendelés dátuma"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Termék eladási egysége"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Az értékesítési megbízás tervezet állapota"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Forrás dokumentum"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Április"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuális vezérléssel folyamatban"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Régi árajánlatok"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Üzenetek és kommunikáció történet"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Értékesítési megbízás keresése"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Leírás"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2152,20 +2018,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Értékesítési megbízás keresése"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sorszám"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Értékesítési megbízásból"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Az értékesítési megbízás számlázási beállításaitól függően a számla "
+"alapulhat a kiszállítási vagy a megrendelési mennyiségen. A rendszer az "
+"értékesítési megbízásból létrehozhat egy számlát vagy egy kiszállítási "
+"megbízást, amint az értékesítő megerősíti azt."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "EE"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2174,45 +2068,92 @@ msgid "Payment Term"
 msgstr "Fizetési feltétel"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Ez a jelentés elemzést készít az árajánlatairól és az értékesítési "
-"megbízásairól. Az elemzés kimutatja az értékesítési bevételeit, és "
-"szétosztja különböző kritériumok alapján (értékesítő, partner, termék stb.). "
-"Használja ezt a jelentést, ha elemzést szeretne készíteni a még ki nem "
-"számlázott értékesítéseiről. Ha a forgalmát szeretné elemezni, akkor "
-"használja a számla elemző jelentést a könyvelési modulban."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Értékesítési megbízási tételek"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "A jelenlegi értékesítési megbízás árlistája."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Árajánlat száma"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Vevői hivatkozás"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Kiszedve"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Év"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Végösszeg adókkal együtt"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Reference"
@@ -2490,6 +2431,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Egy beszerzés minden termékhez."
 
+#~ msgid "Sale Order"
+#~ msgstr "Rendelés"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Akciós árlista"
 
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 7d8d4e5bbda..0a59459312c 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:27+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Konfirmasi Penawaran"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Tanggal Konfirmasi"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Dikelompokan berdasarkan ..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Peruntukan rekanan"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Daftar  harga sales order untuk saat ini"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metode Pengadaan"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Tanggal dimana order penjualan di konfirmasi"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maret"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Tanggal Invoice"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Baris Order belum terfakturkan dan belum terkirim"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Faktur pengecualian"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Akun Analisis"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sub Total"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Hari"
 msgid "Cancel Order"
 msgstr "Batalkan order"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Berat"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Dalam pemesanan"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Pajak"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Jumlah sebelum kena pajak"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total bersih"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Dibatalkan"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Pengecualian dalam pengiriman"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kwantitas (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Toko"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Sales dalam Pengecualian"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Alamat Faktur"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Tanggal pesanan penjualan dibuat"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Buat Faktur"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Tanggal konfirmasi"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Akun Analisis"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "batas akhir daftar"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "# of Qty"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Rekanan"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Sales order"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Daftar order penjualan"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Kenaikan jumlah"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,480 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Default Term Pembayaran"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Konfirmasi"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Kwantitas Terkirim"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Tahun"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Potongan (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Total Harga"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "centang kotak untuk kelompok invoice untuk pelanggan yang sama"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Order Kuantitas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referensi Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Informasi lainnya"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Sales membuat invoice"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Potongan (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nama toko"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Sales dalam Pengecualian"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agustus"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistik order penjualan"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Akun  analitik yang terkait  dengan  order penjualan"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Penawaran"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Kuantitas"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posisi Fiskal"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Dalam Proses"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Salesman ini mengkonfirmasikan penawaran.status  penjualan menjadi 'Dalam "
-"proses \"atau\" Proses manual'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "telepon"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Faktur alamat untuk order penjualan saat ini."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Terinvoice"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Tanggal Konfirmasi"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Peruntukan rekanan"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maret"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Jumlah total"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sub Total"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Alamat faktur"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Alamat Faktur"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "penawaran/permintaan"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Daftar order penjualan"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -624,8 +601,30 @@ msgid "Order Lines"
 msgstr "Baris Order"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Potongan (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Detail Invoice"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total Harga"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -637,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "centang kotak untuk kelompok invoice untuk pelanggan yang sama"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Buat Faktur"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Tanggal Pembuatan"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Pada Faktur"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Faktur alamat untuk order penjualan saat ini."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Order Kuantitas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Baris Order belum terfakturkan dan belum terkirim"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Kuantitas"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Sales Saya"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Harga"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referensi Order"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posisi Fiskal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -685,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -715,23 +812,37 @@ msgid "Order Date"
 msgstr "Tanggal Order"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Dikirimkan"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Dibayarkan"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Rekanan"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -739,37 +850,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tanggal Penawaran"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Mengelompokan Faktur"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Jumlah harga yang di fakturkan"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Sales membuat invoice"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Potongan (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
+"Faktur tidak dapat dibuat untuk Sales Order Line karena salah satu alasan "
+"berikut:\n"
+"1.The keadaan baris ini pesanan penjualan adalah baik \"draft\" atau "
+"\"cancel\"!\n"
+"2.Aktifitas Line Order Penjualan Faktur!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Invoices"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Dikirimkan"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Bulan"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Belum Difakturkan"
 
 #. module: sale
 #: view:sale.report:0
@@ -778,7 +949,7 @@ msgid "Category of Product"
 msgstr "Produk Kategori"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -789,10 +960,18 @@ msgid "Recreate Invoice"
 msgstr "Buat faktur ulang"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nama toko"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -800,36 +979,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Pajak"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Terinvoice"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktur"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Dalam Proses"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nama konsumen tidak ditemukan"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Buat Faktur"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Dikonfirmasi"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Penjualan Orderline Buat_invoice"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Rancangan"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Jadwal Tunggu"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Order Penjualan"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "jumlah pajak"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agustus"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "mendrive pengadaan dan faktur"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Yang harus dilakukan .."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pesanan"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analisa Penjualan"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistik order penjualan"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filter Tambahan"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Quotation"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Produk advance"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Pengecualian"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Salesman akan membuat faktur secara manual, jika kebijakan pengiriman "
+"pesanan penjualan  adalah  'Pengiriman dan Manual dalam Penyelesaian'. "
+"Faktur dibuat 'Pembayaran sebelum Pengiriman' secara otomatis  jika "
+"kebijakan pelayaran."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Toko Penjualan"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -838,6 +1245,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Order Penjualan dalam Penyelesaian"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -848,11 +1279,95 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Akun  analitik yang terkait  dengan  order penjualan"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Salesman ini mengkonfirmasikan penawaran.status  penjualan menjadi 'Dalam "
+"proses \"atau\" Proses manual'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referensi dokumen yang dihasilkan dari permintaan  pesanan  penjualan."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Kesepakatan yang ditunda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Penawaran"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Abaikan pengecualian"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -873,11 +1388,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Referensi Anda"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Tanggal Pemesanan"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Harga"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Sales order untuk invoice dikonfirmasi."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Sales"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Qty"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "dari stok"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tanggal Penawaran"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Selesai"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Alamat faktur"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Invoice"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -893,19 +1502,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Batal"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pencarian daftar yang tidak terfakturkan"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Alamat pengiriman :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Pembayaran faktur penjualan"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -916,361 +1607,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Buat Faktur"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Jumlah tanpa pajak"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Ini mengindikasikan bahwa faktur telah di bayar"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Harga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Dalam pemesanan"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Alamat pengiriman :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "draft order penjualan"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Jumlah total termasuk pajak"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Konfirmasi Penawaran"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Dikelompokan berdasarkan ..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Jadwal Tunggu"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metode Pengadaan"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Harga Satuan"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Pajak"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Tanggal pesanan penjualan dibuat"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Kenaikan jumlah"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Kwantitas Terkirim"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Pada Faktur"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Pengecualian dalam pengiriman"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Mengelompokan Faktur"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Bulan"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Untuk di review oleh akuntan"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Penjualan Orderline Buat_invoice"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Quotations Lama"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Dibayarkan"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analisa Penjualan"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Quotation"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Salesman akan membuat faktur secara manual, jika kebijakan pengiriman "
-"pesanan penjualan  adalah  'Pengiriman dan Manual dalam Penyelesaian'. "
-"Faktur dibuat 'Pembayaran sebelum Pengiriman' secara otomatis  jika "
-"kebijakan pelayaran."
+msgid "Other Information"
+msgstr "Informasi lainnya"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1293,27 +1668,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1328,7 +1686,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1369,92 +1727,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Sales"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Harga Satuan"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Selesai"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Invoice"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Sumber berkas"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Yang harus dilakukan .."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Jumlah tanpa pajak"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Pembayaran faktur penjualan"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1464,10 +1736,38 @@ msgid "Product"
 msgstr "Produk"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Jumlah total"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Harga"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1480,387 +1780,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Laporan ini melakukan analisis pada penawaran Anda dan pesanan penjualan. "
+"Analisis pendapatan penjualan Anda  memeriksa  dan menyortir itu dengan "
+"kriteria kelompok yang berbeda  (salesman, mitra, produk, dll) Gunakan "
+"laporan ini untuk melakukan analisis penjualan tidak memiliki  tagihan  "
+"belum. Jika Anda ingin menganalisis  omset  Anda, Anda harus menggunakan  "
+"laporan  Analisis  Faktur  dalam  aplikasi  Akuntansi"
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktur pada .."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "penawaran/permintaan"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Tanggal pemesanan"
+msgid "Tel. :"
+msgstr "telepon"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produk UoS"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Proses Manual sedang berlangsung"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pesanan"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Dari Sales Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Abaikan pengecualian"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Tergantung pada kontrol Faktur dari pesanan penjualan, faktur dapat "
-"didasarkan pada jumlah yang disampaikan  atau memerintahkan. Dengan "
-"demikian, perintah penjualan dapat menghasilkan  faktur  atau delivery order "
-" secepat  itu dikonfirmasi  oleh penjual"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referensi Klien"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Tanggal dimana order penjualan di konfirmasi"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Perusahaan"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Tanggal Invoice"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Jumlah harga yang di fakturkan"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Faktur pengecualian"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nama konsumen tidak ditemukan"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total bersih"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Dibatalkan"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pencarian daftar yang tidak terfakturkan"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Toko"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Tanggal konfirmasi"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Sales order"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kwantitas (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Dikonfirmasi"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Konfirmasi"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Detail Invoice"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "batas akhir daftar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Baris Order Penjualan"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Apakah anda benar-benar ingin membuat faktur ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1870,248 +1818,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Faktur tidak dapat dibuat untuk Sales Order Line karena salah satu alasan "
-"berikut:\n"
-"1.The keadaan baris ini pesanan penjualan adalah baik \"draft\" atau "
-"\"cancel\"!\n"
-"2.Aktifitas Line Order Penjualan Faktur!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Berat"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Untuk di review oleh akuntan"
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Invoices"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Desember"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Belum Difakturkan"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "mendrive pengadaan dan faktur"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Jumlah sebelum kena pajak"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktur"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Rancangan"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "jumlah pajak"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Order Penjualan"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Toko Penjualan"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Produk advance"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Order Penjualan dalam Penyelesaian"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referensi dokumen yang dihasilkan dari permintaan  pesanan  penjualan."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Kesepakatan yang ditunda"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Tanggal Pemesanan"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Sales order untuk invoice dikonfirmasi."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "dari stok"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Ini mengindikasikan bahwa faktur telah di bayar"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Gambaran"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mei"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Apakah anda benar-benar ingin membuat faktur ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2134,11 +1880,131 @@ msgstr "Advance"
 msgid "February"
 msgstr "Februari"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktur pada .."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Tanggal pemesanan"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produk UoS"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "draft order penjualan"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Sumber berkas"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Proses Manual sedang berlangsung"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Quotations Lama"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Pencarian Order Penjualan"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Gambaran"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2149,19 +2015,47 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pencarian Order Penjualan"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Dari Sales Order"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Tergantung pada kontrol Faktur dari pesanan penjualan, faktur dapat "
+"didasarkan pada jumlah yang disampaikan  atau memerintahkan. Dengan "
+"demikian, perintah penjualan dapat menghasilkan  faktur  atau delivery order "
+" secepat  itu dikonfirmasi  oleh penjual"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2171,45 +2065,92 @@ msgid "Payment Term"
 msgstr "Termin Pembayaran"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Laporan ini melakukan analisis pada penawaran Anda dan pesanan penjualan. "
-"Analisis pendapatan penjualan Anda  memeriksa  dan menyortir itu dengan "
-"kriteria kelompok yang berbeda  (salesman, mitra, produk, dll) Gunakan "
-"laporan ini untuk melakukan analisis penjualan tidak memiliki  tagihan  "
-"belum. Jika Anda ingin menganalisis  omset  Anda, Anda harus menggunakan  "
-"laporan  Analisis  Faktur  dalam  aplikasi  Akuntansi"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Baris Order Penjualan"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Daftar  harga sales order untuk saat ini"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Quotation N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referensi Klien"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Sudah Diambil"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Tahun"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Jumlah total termasuk pajak"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Recreate Procurement"
diff --git a/addons/sale/i18n/is.po b/addons/sale/i18n/is.po
index ca635552cff..8985391b6e9 100644
--- a/addons/sale/i18n/is.po
+++ b/addons/sale/i18n/is.po
@@ -7,47 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-29 17:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
 msgstr ""
 
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Dags Staðfestingar"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Dags. hvenær sölu pöntun er staðfest."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Dags. Reiknings"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
 msgstr ""
 
 #. module: sale
@@ -61,6 +207,26 @@ msgstr "Dagur"
 msgid "Cancel Order"
 msgstr "Afpanta sölupöntun"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Dags. hvenær sölu pöntun er gerð."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,11 +421,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Dags. Staðfest"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Viðskipta aðili"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,15 +520,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Sjálfgefnir greiðslu skilmálar"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -148,461 +575,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Afsl.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Samtals Verð"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Hakið í boxið til að taka saman reikninga fyrir hvern viðskiptavin"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mínar sölupantanir"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Pantað Magn"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Tilvísun í Pöntun"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Aðrar upplýsingar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Tilboð og Sölur"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Sölur gera reikninga"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Viðvörun út frá verðlista!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Afsláttur (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mín Tilboð"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nafn Verslunar"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Magn"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Dags Staðfestingar"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Afsl.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Samtals Verð"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,37 +636,105 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Hakið í boxið til að taka saman reikninga fyrir hvern viðskiptavin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Búið til þann"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Pantað Magn"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Magn"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Tilvísun í Pöntun"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Dags. Pöntunar"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Tilboð og Sölur"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Viðskipta aðili"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Dags Tilboðs"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Sölur gera reikninga"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Viðvörun út frá verðlista!"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Afsláttur (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mín Tilboð"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nafn Verslunar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Enginn viðskiptavinur skilgreindur !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Dags."
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Reikningar Viðskiptavinar"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Dags Tilboðs"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,357 +1593,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Pöntunar dags. sölupöntunar"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Dags. hvenær sölu pöntun er gerð."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Aðrar upplýsingar"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Reikningar Viðskiptavinar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,8 +1722,36 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
 msgstr ""
 
 #. module: sale
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Dags Pantað"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Frá sölu pöntun"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Tilvísun viðskiptavinar"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Dags. hvenær sölu pöntun er staðfest."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Dags. Reiknings"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Enginn viðskiptavinur skilgreindur !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Dags. Staðfest"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Dags Pantað"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,19 +1995,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Frá sölu pöntun"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2153,18 +2041,32 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2172,22 +2074,61 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Tilvísun viðskiptavinar"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Pöntunar dags. sölupöntunar"
+
 #~ msgid "Sales by Salesman in last 90 days"
 #~ msgstr "Sala eftir sölumanni síðustu 90 daga"
 
@@ -2274,6 +2215,9 @@ msgstr ""
 #~ msgid "Inventory Moves"
 #~ msgstr "Lager færslur"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mínar sölupantanir"
+
 #~ msgid "Dates"
 #~ msgstr "Dagsetningar"
 
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 5366b4b30c3..ce10f973ff2 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -6,566 +6,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-16 20:47+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-17 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
-
-#. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-"Ordini di Vendita in stato confermato, completo o eccezione o che non sono "
-"stati fatturati"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
-#: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
-#: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Commerciale"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Listino prezzi per l'ordine di vendita corrente."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,day:0
-msgid "Day"
-msgstr "Giorno"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Annulla Ordine"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
-#, python-format
-msgid "Incorrect Data"
-msgstr "Dati Errati"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
-#, python-format
-msgid "The value of Advance Amount must be positive."
-msgstr "Il valore di Totale Acconto deve essere positivo."
-
-#. module: sale
-#: help:sale.order,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
-
-#. module: sale
-#: view:res.partner:0
-msgid "False"
-msgstr "Falso"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr "Imposta"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the status of the quotation or sales order.              \n"
-"The exception status is automatically set when a cancel operation occurs     "
-"          in the invoice validation (Invoice Exception) or in the picking "
-"list process (Shipping Exception).\n"
-"The 'Waiting Schedule' status is set when the invoice is confirmed           "
-"    but waiting for the scheduler to run on the order date."
-msgstr ""
-"Fornisce lo stato del preventivo o ordine di vendita.\n"
-"Lo stato di eccezione viene impostato automaticamente quando si annulla "
-"un'operazione durante la validazione della fattura (Eccezione Fattura) o "
-"durante il prelievo da magazzino (Eccezione Consegna).\n"
-"Lo stato 'Attesa Pianificazione' viene impostato quando la fattura è "
-"confermata ma in attesa che lo scheduler venga avviato."
-
-#. module: sale
-#: field:sale.order,project_id:0
-#: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: sale
-#: help:sale.order,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr ""
-"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
-"direttamente in html così da poter essere inserito nelle viste kanban."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Q.tà"
-
-#. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Consente di applicare alcuni sconti per riga ordine di vendita."
-
-#. module: sale
-#: help:sale.config.settings,group_sale_pricelist:0
-msgid ""
-"Allows to manage different prices based on rules per category of customers.\n"
-"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
-msgstr ""
-"Consente di gestione differenti prezzi basati su regole per categorie di "
-"clienti.\n"
-"Esempio: 10% per rivenditori, promozione di 5 EUR su questo prodotto, etc."
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Scadenza Pagamento Predefinita"
-
-#. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fattura <b>pagata</b>."
-
-#. module: sale
-#: field:sale.config.settings,group_uom:0
-msgid "Allow using different units of measures"
-msgstr "Consente di usare differenti unità di misura"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Percentuale"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Sconto (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr "Definire un conto di ricavo per questo prodotto: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Prezzo Totale"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Spuntare il box per raggruppare le fatture riferite agli stessi clienti"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "I Miei Ordini di Vendita"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis.\n"
-"\n"
-"Per modificare la vista del conto analitico al fine di mostrare dati "
-"rilevanti ai project manager delle aziende di servizi.\n"
-"                E' possibile inoltre mostrare il sommario del conto "
-"analitico lato utente così come quello mensile.\n"
-"                Installa il modulo account_analytic_analysis."
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantità Ordinate"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Rif. Ordine"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Altre informazioni"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "Attenzione!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Processo di Fatturazione"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "Ordine di Vendita completato"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Preventivi e Vendite"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-"Consente di selezionare e mantenere differenti unità di misura per i "
-"prodotti."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Crea fattura di vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Avviso Listino!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Sconto (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr "Crea e Visualizza Fattura"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "I Miei Preventivi"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr "Consente di configurare avvisi per cliente o per prodotto"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nome Negozio"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p>\n"
-"                Ecco una lista di ogni riga ordine di vendita da fatturare. "
-"Puoi\n"
-"                fatturare ordini di vendita parzialmente. Non si ha bisogno\n"
-"                di questa lista se si fattura partendo dalle consegne o se "
-"si\n"
-"                fattura completamente gli ordini di vendita.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Preventivo "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Anticipo su %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vendite in Eccezione"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-"Un partner al quale questo particolare prodotto deve essere assegnato."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Stato"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliccare per creare un preventivo che verrà convertito in un "
-"ordine\n"
-"                di vendita.\n"
-"              </p><p>\n"
-"                OpenERP ti aiuterà a gestire efficientemente un flusso di "
-"vendita completo:\n"
-"                preventivo, ordine di vendita, consegna, fatturazione e "
-"pagamento.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Giugno"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistiche ordini di vendita"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Il conto analitico legato all'ordine di vendita."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Ottobre"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Riepilogo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Visualizza Fattura"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Anticipo su %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Preventivi"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Quantità"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Indirizzo di spedizione per questo ordine di vendita"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Settembre"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posizione Fiscale"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In corso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Fattura bozza per %s %s <b>in attesa di validazione</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Il venditore conferma il preventivo. Lo stato dell'ordine di vendita diventa "
-"quindi 'In corso' o 'In corso manualmente'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"Non è possibile annullare una riga di ordine di vendita se è già stata "
-"fatturata."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Indirizzo di fatturazione per questo ordine di vendita."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Prima della Consegna"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"Non sono presenti una Posizione Fiscale o un conto di ricavo definiti per la "
-"categoria prodotto."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Indirizzi negli Ordini di Vendita"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Contratto / Conto Analitico"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Abilita la fatturazione da righe d'ordine di vendita"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mese dell'ordine di vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Impossibile raggruppare vendite con diversa valuta per lo stesso partner."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "o"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fatturato"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
 msgstr "Contabilità Analitica su Vendite"
 
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Conferma Offerta"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Dashboard Vendite"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+"Non esiste nessun conto di ricavo configurato come proprietà globale."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Righe d'ordine da fatturare"
+
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
 msgstr "Data di conferma"
 
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
@@ -576,1273 +66,11 @@ msgstr "Ripartizione Partner"
 msgid "Invoice Order"
 msgstr "Ordine di Fatturazione"
 
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Vendite: Segna come letto"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Il prezzo totale"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-"Consente la fatturazione raggruppata degli ordini di consegna tramite "
-"sezionali."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotale"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Consente di applicare uno sconto sulle righe dell'ordine di vendita"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Indirizzo di Fatturazione"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Unità di Misura "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "L'unità di lavorazione di default per i servizi è"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Indirizzo Fatturazione"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Righe d'ordine di vendita legate ai miei Ordini di Vendita"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Preventivo / Ordine"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-"Tutti gli elementi in questa riga d'ordine verranno fatturati. E' anche "
-"possibile fatturare una percentuale dell'ordine di vendita\n"
-"                    o un prezzo fisso (per anticipi) direttamente dal form "
-"dell'ordine di vendita se si preferisce."
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(aggiorna)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linea d'ordine di vendita"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Un dipendente può avere differenti ruoli per contratto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Stampa"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordine N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Righe Ordine"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Consente conti analitici multipli sulle vendite"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-"Consente di categorizzare le vendite e le consegne (picking lists) tra "
-"differenti sezionali,\n"
-"                e di fare operazioni raggruppate sui giornali.\n"
-"                Installa il modulo sale_journal."
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data creazione"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
-"L'Ordine di Vendita per <em>%s</em> è stato impostato a <b>Completato</b>"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Righe Consegnate e Non Fatturate"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Totale :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Le mie vendite"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Listino Prezzi"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-"* Lo stato 'Bozza' viene impostato quando l'ordine di vendita relativo sono "
-"nello stato bozza.             \n"
-"* Lo stato 'Confermato' viene impostato quando l'ordine di vendita relativo "
-"è confermato.\n"
-"* Lo stato 'Eccezione' viene impostato quando l'ordine di vendita relativo è "
-"in eccezione.              \n"
-"* Lo stato 'Completato' viene impostato quando l'ordine di vendita relativo "
-"è stato prelevato.\n"
-"* Lo stato 'Annullato' è impostato quando un utente annulla l'ordine di "
-"vendita relativo."
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr ""
-"Non esiste nessun conto di ricavo configurato come proprietà globale."
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Errore di configurazione!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "Invia tramite Email"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Ora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data dell'ordine"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Spedite"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-"Consente ai commerciali di creare fatture dalle righe degli ordini di "
-"vendita usanto il menù \"Righe da Fatturare\"."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Crea e mostra fattura"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliccare per definire un nuovo punto vendita.\n"
-"              </p><p>\n"
-"                Ogni preventivo o ordine di vendita deve essere legato ad un "
-"punto vendita. Il\n"
-"                punto vendita definisce inoltre il magazzino dal quale i "
-"prodotto verranno\n"
-"                spediti per ogni specifica vendita.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data preventivo"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Impossibile confermare un ordine di vendita senza righe."
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"E' necessario selezionare un listino o un cliente nel form dell'ordine!\n"
-"Si prega di selezionarne uno prima di scegliere un prodotto."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria prodotto"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Impossibile annullare l'ordine di vendita!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Ricrea Fattura"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"Per eliminare un ordine di vendita confermato è necessario prima annullarlo!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Imposte :"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "Su Richiesta"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "sconosciuto"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "E' un Follower"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtri estesi..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Eccezione"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-"Selezionare un prodotto di tipo servizio chiamato 'Anticipo'.\n"
-"                Potrebbe essere necessario creare tale prodotto e impostarlo "
-"come valore prefefinito per questo campo."
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-"Consente di configurare avvisi sui prodotti e lanciarli quando un utente "
-"vuole vendere un determinato prodotto ad un determinato cliente.\n"
-"Esempio: Prodotto: questo prodotto è deprecato, non acquistarne più di 5 "
-"unità.\n"
-"                Fornitore: non dimenticare di chiedere l'invio tramite "
-"corriere."
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nessun listino valido trovato!:"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Visualizza margini sugli ordini di vendita"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Lista delle fatture generate per questo ordine di vendita. Lo stesso ordine "
-"di vendita infatti può essere scisso in diverse fatture (ad esempio per "
-"linea d'ordine)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Riferimento"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qta'"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Le mie righe degli ordini di vendita"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Il Riferimento Ordine deve essere unico per azienda!"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
-#, python-format
-msgid ""
-"Cannot find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Impossibile trovare un listino che corrisponda a questo prodotto e a questa "
-"quantità.\n"
-"E' necessario cambiare il prodotto, la quantità o il listino."
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crea fattura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Riferimento ordine"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"Consente di creare Preventivi e Ordini di Vendita usando differenti "
-"politiche e gestirne le relative giacenze.\n"
-"                    Installa il modulo sale_stock."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Preventivo' or 'Ordine'} (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Prezzo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Numero Preventivo"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "su Ordine"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Indirizzo Spedizione:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Consente di specificare un conto analitico sugli ordini di vendita."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Stato bozza dell'ordine di vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Preventivo per <em>%s</em> <b>creato</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Storico messaggi e comunicazioni"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nuova Copia del Preventivo"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Impossibile eliminare un ordine di vendita in stato '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Proprietà sulle righe"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Prima di selezionare un prodotto,\n"
-" selezionare un cliente nel form dell'ordine."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totale (tasse incluse)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data dell'ordine di vendita"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Conferma Offerta"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Righe d'ordine da fatturare"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
 msgstr "Caratteristiche prodotto"
 
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "In attesa di pianificazione"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Unità di misura"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metodo di approvvigionamento"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Fattura l'intero ordine di vendita"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Messaggi non letti"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Bozza Preventivo"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Ordine di Vendita"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Imposte"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Ordini di vendita pronti per la fatturazione"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-"Consente di defainire quale sia la funzione predefinita di uno specifico "
-"utente su un determinato conto.\n"
-"                E' maggiormente utilizzato quando un utente compila il "
-"proprio timesheet. I valori vengono estratti ed i campi auto-completati.\n"
-"                Ma la possibilità di modificare questi valori rimane "
-"presente.\n"
-"                Installa il modulo analytic_user_function."
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data nella quale l'ordine di vendita è creato"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crea fatture"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Azione non valida!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importo di anticipo"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantità Spedite"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Se il listino di questo ordine viene modificato (ed eventualmente anche la "
-"valuta), i prezzi delle righe d'ordine esistenti non verranno aggiornate."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Genera fatture"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# dell'Ordine di Vendita"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Da fatturare"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Anno dell'ordine di vendita"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Luglio"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Dopo aver premuto su 'Mostra le righe da fatturare', selezionare le righe da "
-"fatturare e creare la fattura dal menù 'Altro'."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Indica che l'ordine di vendita è legato ad almeno una fattura."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Eccezione Spedizione"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Raggruppa Fatture"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-"Preventivo per <em>%s</em> <b>convertito</b> Ordine di Vendita del %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Fattura Ordine di Vendita"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Gestione Contratti"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mese"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Richiede una revisione del responsabile della contabilità."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crea fatture"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Genera fattura - linea ordine di vendita"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vecchi preventivi"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagato"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analisi delle vendite"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Preventivo"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Se il metodo di spedizione dell'ordine di vendita è 'Shipping and Manual in "
-"Progress' il venditore crea una fattura manualmente. La fattura viene invece "
-"creata automaticamente quando il metodo di spedizione è 'Pagamento prima "
-"della consegna'."
-
-#. module: sale
-#: model:email.template,body_html:sale.email_template_edi_sale
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
-"'order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"\n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
-"\n"
-"    <p>Salve ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
-"    \n"
-"    <p>Ecco il vostro ${object.state in ('draft', 'sent') and 'preventivo' "
-"or 'ordine di vendita'} da parte di ${object.company_id.name}: </p>\n"
-"\n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>RIFERIMENTI</strong><br />\n"
-"       &nbsp;&nbsp;Numero ordine: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Totale ordine: <strong>${object.amount_total} "
-"${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Data ordine: ${object.date_order}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Riferimento ordine: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       &nbsp;&nbsp;Vostro Rif.: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Vostro contatto: <a href=\"mailto:${object.user_id.email "
-"or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>\n"
-"\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
-"    <br/>\n"
-"    <p>E' anche possibile pagare direttamente con PayPal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"\n"
-"    <br/>\n"
-"    <p>Per ulteriori informazioni non esitate a contattarci.</p>\n"
-"    <p>Grazie per aver scelto ${object.company_id.name or 'i nostri "
-"servizi'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Usa i listini per gestire i prezzi ai clienti"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Righe d'ordine di vendita confermate, non ancora evase"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr "L'ordine di vendita creerà automaticamente una fattura bozza. "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Fatture Clienti"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Vendite"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"Aggiunge il 'Margine' all'ordine di vendita.\n"
-"                Mostra il guadagno calcolando la differenza tra il prezzo "
-"unitario e il prezzo di costo.\n"
-"                Installa il modulo sale_margin."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prezzo unitario"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fattura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento sorgente"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Da fare"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Totale senza la tassazione"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Anticipo su fattura di vendita"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.order.line,product_id:0
-#: view:sale.report:0
-#: field:sale.report,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
-#. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Genera fatture basate sulle righe degli ordini di vendita"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"On demand: A draft invoice can be created from the sales order when needed. "
-"\n"
-"On delivery order: A draft invoice can be created from the delivery order "
-"when the products have been delivered. \n"
-"Before delivery: A draft invoice is created from the sales order and must be "
-"paid before the products can be delivered."
-msgstr ""
-"Su richiesta. Una fattura bozza può essere creata dall'ordine di vendita "
-"quando necessario.\n"
-"Su consegne: Una fattura bozza può essere creata dall'ordine di consegna "
-"quando i prodotti vengono spediti.\n"
-"Prima della consegna: Una fattura bozza viene creata dall'ordine di vendita "
-"e deve essere pagata prima che i prodotti vengano spediti."
-
-#. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Fatturato Mensile"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fattura su"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Prezzo Fisso (cauzione)"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data ordine"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Unità di Vendita Prodotto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuale in Progresso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Vendite: Segna come letto"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ordine"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Conferma Ordine"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Da un ordine di vendita"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignora eccezione"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"La fattura sarà riferita alla quantità consegnata o alla quantità ordinata "
-"in funzione del controllo dell'ordine di vendita della fattura stessa. "
-"Quindi un ordine di vendita può generare una fattura o un ordine di consegna "
-"non appena confermato da un venditore."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Alcune righe d'ordine"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Sconti sulle righe"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Riferimento cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Totale"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Dashboard Vendite"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Usare Tutto per creare la fattura finale.\n"
-"                Usare Percentuale per fatturare solo una percentuale "
-"dell'importo totale.\n"
-"                Usare Prezzo Fisso per fatturare un determinato anticipo.\n"
-"                Usare Alcune Righe Ordine per fatturare una selezione delle "
-"righe dell'ordine di vendita."
-
 #. module: sale
 #: help:sale.config.settings,module_account_analytic_analysis:0
 msgid ""
@@ -1873,17 +101,49 @@ msgstr ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unità di misura"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metodo di approvvigionamento"
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr "Data nella quale l'ordine di vendita viene confermato."
 
 #. module: sale
-#: code:addons/sale/sale.py:556
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Consente conti analitici multipli sulle vendite"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
 msgstr "Cancellare prima tutte le fatture legate a questo ordine di vendita."
 
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Numero Preventivo"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Messaggi non letti"
+
 #. module: sale
 #: field:sale.order,company_id:0
 #: field:sale.order.line,company_id:0
@@ -1899,9 +159,14 @@ msgid "Invoice Date"
 msgstr "Data fattura"
 
 #. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Il totale da fatturare in anticipo."
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Righe Consegnate e Non Fatturate"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1910,10 +175,14 @@ msgid "Invoice Exception"
 msgstr "Eccezione Fattura"
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nessun cliente definito!"
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Preventivo "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Bozza Preventivo"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -1921,31 +190,114 @@ msgid "Delivery Address"
 msgstr "Indirizzo di Consegna"
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Ordini da Fatturare"
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+"Consente la fatturazione raggruppata degli ordini di consegna tramite "
+"sezionali."
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotale"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Giorno"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Annulla Ordine"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Warehouse Features"
 msgstr "Caratteristiche Magazzino"
 
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "L'unità di lavorazione di default per i servizi è"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unità di Misura "
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
+#, python-format
+msgid "Incorrect Data"
+msgstr "Dati Errati"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr "Il valore di Totale Acconto deve essere positivo."
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "su Ordine"
+
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
 msgstr "Messaggi"
 
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Stato Ordine"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Imposte"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Totale Imponibile"
+
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
 msgstr "Progetto"
 
 #. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -1966,6 +318,25 @@ msgstr ""
 "magazzino e si attende l'approvvigionamento.\n"
 "Da ordine: Quando richiesto, il prodotto è acquistato o prodotto."
 
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Consente di defainire quale sia la funzione predefinita di uno specifico "
+"utente su un determinato conto.\n"
+"                E' maggiormente utilizzato quando un utente compila il "
+"proprio timesheet. I valori vengono estratti ed i campi auto-completati.\n"
+"                Ma la possibilità di modificare questi valori rimane "
+"presente.\n"
+"                Installa il modulo analytic_user_function."
+
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.order.line,state:0
@@ -1975,8 +346,8 @@ msgstr "Annullato"
 
 #. module: sale
 #: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Cerca linee non ancora fatturate"
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Righe d'ordine di vendita legate ai miei Ordini di Vendita"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1989,39 +360,15 @@ msgid "Email composition wizard"
 msgstr "Wizard composizione email"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Negozio"
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
 
 #. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data conferma"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr "Definire il sezionale vendite per questa azienda: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Caratteristiche Contratto"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Ordine di vendita"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Eccezione Spedizione"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -2029,35 +376,83 @@ msgid "Quantity (UoS)"
 msgstr "Quantità (Unità di Vendita)"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Righe Ordine di Vendita in stato 'completato'"
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Negozio"
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confermato"
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Vendite in Eccezione"
 
 #. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Termini e Condizioni"
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Indirizzo Fatturazione"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Conferma"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data nella quale l'ordine di vendita è creato"
 
 #. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Followers"
+#: view:res.partner:0
+msgid "False"
+msgstr "Falso"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Righe Fattura"
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crea fatture"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "Imposta"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Azione non valida!"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the status of the quotation or sales order.              \n"
+"The exception status is automatically set when a cancel operation occurs     "
+"          in the invoice validation (Invoice Exception) or in the picking "
+"list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed           "
+"    but waiting for the scheduler to run on the order date."
+msgstr ""
+"Fornisce lo stato del preventivo o ordine di vendita.\n"
+"Lo stato di eccezione viene impostato automaticamente quando si annulla "
+"un'operazione durante la validazione della fattura (Eccezione Fattura) o "
+"durante il prelievo da magazzino (Eccezione Consegna).\n"
+"Lo stato 'Attesa Pianificazione' viene impostato quando la fattura è "
+"confermata ma in attesa che lo scheduler venga avviato."
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data conferma"
 
 #. module: sale
 #: view:sale.report:0
@@ -2065,114 +460,493 @@ msgstr "Righe Fattura"
 msgid "# of Lines"
 msgstr "Numero Righe"
 
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
+"direttamente in html così da poter essere inserito nelle viste kanban."
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+"Attribuisce l'ordine di sequenza durante la visualizzazione delle righe "
+"degli ordini di vendita."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Q.tà"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(aggiorna)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Caratteristiche Contratto"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Ordine di vendita"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linea d'ordine di vendita"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importo di anticipo"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+msgstr ""
+"Consente di gestione differenti prezzi basati su regole per categorie di "
+"clienti.\n"
+"Esempio: 10% per rivenditori, promozione di 5 EUR su questo prodotto, etc."
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Un dipendente può avere differenti ruoli per contratto"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Scadenza Pagamento Predefinita"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Conferma"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Prepara fatture basate sui timesheets."
+
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Fatturato Mensile"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Quantità Spedite"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Anno"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr "Consente di usare differenti unità di misura"
+
+#. module: sale
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Ordini di Vendita non ancora confermati"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Stampa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordine N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Righe Ordine"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Sconto (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr "Definire un conto di ricavo per questo prodotto: \"%s\" (id:%d)."
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Righe Fattura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prezzo Totale"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Consente di categorizzare le vendite e le consegne (picking lists) tra "
+"differenti sezionali,\n"
+"                e di fare operazioni raggruppate sui giornali.\n"
+"                Installa il modulo sale_journal."
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Spuntare il box per raggruppare le fatture riferite agli stessi clienti"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Genera fatture"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Ora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# dell'Ordine di Vendita"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis.\n"
+"\n"
+"Per modificare la vista del conto analitico al fine di mostrare dati "
+"rilevanti ai project manager delle aziende di servizi.\n"
+"                E' possibile inoltre mostrare il sommario del conto "
+"analitico lato utente così come quello mensile.\n"
+"                Installa il modulo account_analytic_analysis."
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data creazione"
+
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Righe Ordine di Vendita"
+msgid "To Invoice"
+msgstr "Da fatturare"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Indirizzo di fatturazione per questo ordine di vendita."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantità Ordinate"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Anno dell'ordine di vendita"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totale :"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Le mie vendite"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rif. Ordine"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posizione Fiscale"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Luglio"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+"* Lo stato 'Bozza' viene impostato quando l'ordine di vendita relativo sono "
+"nello stato bozza.             \n"
+"* Lo stato 'Confermato' viene impostato quando l'ordine di vendita relativo "
+"è confermato.\n"
+"* Lo stato 'Eccezione' viene impostato quando l'ordine di vendita relativo è "
+"in eccezione.              \n"
+"* Lo stato 'Completato' viene impostato quando l'ordine di vendita relativo "
+"è stato prelevato.\n"
+"* Lo stato 'Annullato' è impostato quando un utente annulla l'ordine di "
+"vendita relativo."
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Default Options"
 msgstr "Opzioni Predefinite"
 
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
+msgstr "Errore di configurazione!"
+
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
 msgstr "Contabilità analitiche su vendite"
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:139
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stato"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Dopo aver premuto su 'Mostra le righe da fatturare', selezionare le righe da "
+"fatturare e creare la fattura dal menù 'Altro'."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Invia tramite Email"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr "Listino EDI (%s)"
 
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Cliccare per creare un preventivo o un ordine di vendita per "
-"questo cliente.\n"
-"              </p><p>\n"
-"                OpenERP aiuterà a gestire efficientemente il flusso di "
-"vendita completo:\n"
-"                preventivo, ordine di vendita, consegne fatturazione e "
-"pagamenti.\n"
-"              </p><p>\n"
-"                Le funzionalità social aiuteranno ad organizzare discussioni "
-"su ogni ordine\n"
-"                di vendita, e consentiranno al cliente di tenere traccia "
-"dell'evoluzione\n"
-"                dell'ordine di vendita.\n"
-"              </p>\n"
-"            "
-
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
 msgstr "Su Ordine di Consegna"
 
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Processo di Fatturazione"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data dell'ordine"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Ordine di Vendita completato"
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr "Definire il sezionale vendite per questa azienda: \"%s\" (id:%d)."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Preventivi e Vendite"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagato"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+"Consente di selezionare e mantenere differenti unità di misura per i "
+"prodotti."
+
 #. module: sale
 #: view:sale.report:0
 msgid "Reference Unit of Measure"
 msgstr "Unità di Misura di Riferimento"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_quotations
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation, the first step of a new sale.\n"
-"              </p><p>\n"
-"                OpenERP will help you handle efficiently the complete sale "
-"flow:\n"
-"                from the quotation to the sale order, the\n"
-"                delivery, the invoicing and the payment collection.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customers to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation, the first step of a new sale.\n"
-"                Cliccare per creare un preventivo, il primo passo di una "
-"nuova vendita.\n"
-"              </p><p>\n"
-"                OpenERP aiuterà a gestire efficientemente il flusso di "
-"vendita completo:\n"
-"                preventivo, ordine di vendita, consegne fatturazione e "
-"pagamenti.\n"
-"              </p><p>\n"
-"                Le funzionalità social aiuteranno ad organizzare discussioni "
-"su ogni ordine\n"
-"                di vendita, e consentiranno al cliente di tenere traccia "
-"dell'evoluzione\n"
-"                dell'ordine di vendita.\n"
-"              </p>\n"
-"            "
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Crea e mostra fattura"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Raggruppa Fatture"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Il totale da fatturare in anticipo."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Crea fattura di vendita"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Avviso Listino!"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Sconto (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -2186,18 +960,17 @@ msgstr ""
 "2. La linea dell'ordine di vendita è stata fatturata!"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Righe ordine di vendita completate"
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr "Crea e Visualizza Fattura"
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "I Miei Preventivi"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Fatture"
@@ -2208,11 +981,25 @@ msgid "December"
 msgstr "Dicembre"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Gestione Contratti"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Spedite"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
 msgstr ""
-"Non c'è un conto di ricavo definito per questo prodotto: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2220,53 +1007,114 @@ msgid "Uninvoiced"
 msgstr "Non fatturata"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Regola approvigionamenti e fatturazione"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria prodotto"
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Totale Imponibile"
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Impossibile annullare l'ordine di vendita!"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
 #: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Ricrea Fattura"
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr "Consente di configurare avvisi per cliente o per prodotto"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nome Negozio"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Imposte :"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fatturato"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
 #, python-format
 msgid "Advance Invoice"
 msgstr "Fattura di acconto"
 
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
 msgstr "Apri Menu Vendite"
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Bozza"
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In corso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nessun cliente definito!"
 
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Crea ordini di consegna automaticamente dagli ordini di vendita"
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Totale tassa"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crea fatture"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Ordine di Vendita "
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confermato"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Righe ordine di vendita pronte per la fatturazione"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Anticipo su %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Genera fattura - linea ordine di vendita"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Bozza"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
@@ -2274,12 +1122,172 @@ msgid "Email Templates"
 msgstr "Modelli Email"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+"Un partner al quale questo particolare prodotto deve essere assegnato."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Contratto / Conto Analitico"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "In attesa di pianificazione"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Termini e Condizioni"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Ordini di Vendita"
 
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Totale tassa"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Su Richiesta"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Regola approvigionamenti e fatturazione"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Da fare"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Giugno"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ordine"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analisi delle vendite"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "E' un Follower"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiche ordini di vendita"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Commerciale"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembre"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtri estesi..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Preventivo"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Acconto prodotto"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Eccezione"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Ottobre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Se il metodo di spedizione dell'ordine di vendita è 'Shipping and Manual in "
+"Progress' il venditore crea una fattura manualmente. La fattura viene invece "
+"creata automaticamente quando il metodo di spedizione è 'Pagamento prima "
+"della consegna'."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
@@ -2287,27 +1295,26 @@ msgid "Sales Shop"
 msgstr "Negozio"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembre"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commenti ed Email"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Acconto prodotto"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
-"Attribuisce l'ordine di sequenza durante la visualizzazione delle righe "
-"degli ordini di vendita."
+"Consente di creare Preventivi e Ordini di Vendita usando differenti "
+"politiche e gestirne le relative giacenze.\n"
+"                    Installa il modulo sale_stock."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Selezionare un prodotto di tipo servizio chiamato 'Anticipo'.\n"
+"                Potrebbe essere necessario creare tale prodotto e impostarlo "
+"come valore prefefinito per questo campo."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2315,26 +1322,101 @@ msgid "January"
 msgstr "Gennaio"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
 msgid "Sales Order in Progress"
 msgstr "Ordini di Vendita in esecuzione"
 
 #. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Prepara fatture basate sui timesheets."
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:655
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+"Consente di configurare avvisi sui prodotti e lanciarli quando un utente "
+"vuole vendere un determinato prodotto ad un determinato cliente.\n"
+"Esempio: Prodotto: questo prodotto è deprecato, non acquistarne più di 5 "
+"unità.\n"
+"                Fornitore: non dimenticare di chiedere l'invio tramite "
+"corriere."
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Il conto analitico legato all'ordine di vendita."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Visualizza Fattura"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Cosa si vuole fatturare?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Usa i listini per gestire i prezzi ai clienti"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Il venditore conferma il preventivo. Lo stato dell'ordine di vendita diventa "
+"quindi 'In corso' o 'In corso manualmente'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
 #, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Ordine di Vendita per <em>%s</em> <b>annullato</b>."
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"E' necessario selezionare un listino o un cliente nel form dell'ordine!\n"
+"Si prega di selezionarne uno prima di scegliere un prodotto."
 
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Riferimento del documento che ha creato questa richiesta d'ordine"
 
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nessun listino valido trovato!:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Anticipo su %s %s"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,delay:0
@@ -2342,9 +1424,48 @@ msgid "Commitment Delay"
 msgstr "Ritardo"
 
 #. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Stato Ordine"
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Preventivi"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "Consente di installare sale_analytic_plans."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora eccezione"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Indirizzo di spedizione per questo ordine di vendita"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Visualizza margini sugli ordini di vendita"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Lista delle fatture generate per questo ordine di vendita. Lo stesso ordine "
+"di vendita infatti può essere scisso in diverse fatture (ad esempio per "
+"linea d'ordine)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Riferimento"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -2356,15 +1477,58 @@ msgstr "Mostra Righe da Fatturare"
 msgid "Date Order"
 msgstr "Data ordine"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Listino Prezzi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Fatture Clienti"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Ordine di vendita confermato da fatturare."
 
 #. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Ordini di Vendita non ancora confermati"
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendite"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Se il listino di questo ordine viene modificato (ed eventualmente anche la "
+"valuta), i prezzi delle righe d'ordine esistenti non verranno aggiornate."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qta'"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -2372,22 +1536,181 @@ msgid "from stock"
 msgstr "da Stock"
 
 #. module: sale
-#: code:addons/sale/sale.py:968
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data preventivo"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totale"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Completato"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Indirizzo di Fatturazione"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Fattura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Le mie righe degli ordini di vendita"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Followers"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Nessun Listino!: "
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Ordini di Vendita"
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Cerca linee non ancora fatturate"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Il Riferimento Ordine deve essere unico per azienda!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"                Ecco una lista di ogni riga ordine di vendita da fatturare. "
+"Puoi\n"
+"                fatturare ordini di vendita parzialmente. Non si ha bisogno\n"
+"                di questa lista se si fattura partendo dalle consegne o se "
+"si\n"
+"                fattura completamente gli ordini di vendita.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Indirizzo Spedizione:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Impossibile raggruppare vendite con diversa valuta per lo stesso partner."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
 msgid "Use contracts management"
 msgstr "Usa gestione contratti"
 
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+"Impossibile trovare un listino che corrisponda a questo prodotto e a questa "
+"quantità.\n"
+"E' necessario cambiare il prodotto, la quantità o il listino."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Anticipo su fattura di vendita"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crea fattura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Totale senza la tassazione"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Riferimento ordine"
+
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
@@ -2395,20 +1718,251 @@ msgstr "Indica che una fattura è stata pagata."
 
 #. module: sale
 #: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descrizione"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prezzo unitario"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Percentuale"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Altre informazioni"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Il prezzo totale"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Conferma Ordine"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Non c'è un conto di ricavo definito per questo prodotto: \"%s\" (id:%d)."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maggio"
 
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Preventivo' or 'Ordine'} (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Prezzo"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
+msgstr ""
+"Su richiesta. Una fattura bozza può essere creata dall'ordine di vendita "
+"quando necessario.\n"
+"Su consegne: Una fattura bozza può essere creata dall'ordine di consegna "
+"quando i prodotti vengono spediti.\n"
+"Prima della consegna: Una fattura bozza viene creata dall'ordine di vendita "
+"e deve essere pagata prima che i prodotti vengano spediti."
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Questo report permette le analisi sui propri preventivi e ordini di vendita. "
+"Le analisi verificano le entrate e le ordinano in funzione di differenti "
+"criteri (venditore, partner, prodotto, etc.). Utilizzare questo report per "
+"eseguire le analisi sulle vendite non ancora fatturate. Se si desidera "
+"analizzare il proprio fatturato, è necessario utilizzare l'analisi sulle "
+"fatture nell'applicazione di contabilità."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Preventivo / Ordine"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
 #. module: sale
 #: view:sale.make.invoice:0
 msgid "Do you really want to create the invoice(s)?"
 msgstr "Si desidera veramente creare la(le) fattura(e)?"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_quotations
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sales order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+"Non sono presenti una Posizione Fiscale o un conto di ricavo definiti per la "
+"categoria prodotto."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Richiede una revisione del responsabile della contabilità."
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Proprietà sulle righe"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Ordini da Fatturare"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2431,11 +1985,131 @@ msgstr "Avanzamento"
 msgid "February"
 msgstr "Febbraio"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fattura su"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Prezzo Fisso (cauzione)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Settembre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data ordine"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Prima della Consegna"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Unità di Vendita Prodotto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Stato bozza dell'ordine di vendita"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento sorgente"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Aprile"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuale in Progresso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Attenzione!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vecchi preventivi"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Riepilogo"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Storico messaggi e comunicazioni"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Cerca ordine di vendita"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descrizione"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2448,20 +2122,48 @@ msgstr ""
 "parte integrante dello stesso contratto con il cliente."
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mese dell'ordine di vendita"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Da un ordine di vendita"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Cerca ordine di vendita"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Cosa si vuole fatturare?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"La fattura sarà riferita alla quantità consegnata o alla quantità ordinata "
+"in funzione del controllo dell'ordine di vendita della fattura stessa. "
+"Quindi un ordine di vendita può generare una fattura o un ordine di consegna "
+"non appena confermato da un venditore."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Alcune righe d'ordine"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Impossibile eliminare un ordine di vendita in stato '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2470,25 +2172,33 @@ msgid "Payment Term"
 msgstr "Termine di pagamento"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr "Consente di installare sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Ordini di vendita pronti per la fatturazione"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Questo report permette le analisi sui propri preventivi e ordini di vendita. "
-"Le analisi verificano le entrate e le ordinano in funzione di differenti "
-"criteri (venditore, partner, prodotto, etc.). Utilizzare questo report per "
-"eseguire le analisi sulle vendite non ancora fatturate. Se si desidera "
-"analizzare il proprio fatturato, è necessario utilizzare l'analisi sulle "
-"fatture nell'applicazione di contabilità."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "o"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Righe Ordine di Vendita"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Listino prezzi per l'ordine di vendita corrente."
 
 #. module: sale
 #: report:sale.order:0
@@ -2496,21 +2206,68 @@ msgid "Quotation N°"
 msgstr "Preventivo N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Sconti sulle righe"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Riferimento cliente"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Prelevato"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Anno"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Aggiunge il 'Margine' all'ordine di vendita.\n"
+"                Mostra il guadagno calcolando la differenza tra il prezzo "
+"unitario e il prezzo di costo.\n"
+"                Installa il modulo sale_margin."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "Si vuole fatturare le righe ordine selezionate?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Prima di selezionare un prodotto,\n"
+" selezionare un cliente nel form dell'ordine."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totale (tasse incluse)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nuova Copia del Preventivo"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data dell'ordine di vendita"
 
 #~ msgid ""
 #~ "This Configuration step use to set default picking policy when make sale "
@@ -2798,6 +2555,9 @@ msgstr "Si vuole fatturare le righe ordine selezionate?"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un approvvigionamento per ciascun prodotto."
 
+#~ msgid "Sale Order"
+#~ msgstr "Ordine di Vendita"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Listino prezzo vendita"
 
@@ -3736,3 +3496,29 @@ msgstr "Si vuole fatturare le righe ordine selezionate?"
 
 #~ msgid "Deliver all products at once"
 #~ msgstr "Invia tutti i prodotti con una sola spedizione"
+
+#~ msgid "My Sale Orders"
+#~ msgstr "I Miei Ordini di Vendita"
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Ordini di Vendita in stato confermato, completo o eccezione o che non sono "
+#~ "stati fatturati"
+
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Impossibile confermare un ordine di vendita senza righe."
+
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Righe d'ordine di vendita confermate, non ancora evase"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Righe Ordine di Vendita in stato 'completato'"
+
+#~ msgid "Sale order lines done"
+#~ msgstr "Righe ordine di vendita completate"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Righe ordine di vendita pronte per la fatturazione"
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 978b0ef7cff..c38c0a5901e 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-19 22:22+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr "受注オーダー行は確認済、完了、または例外状態であり、まだ請求されていません。"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "見積の確認"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "受注ダッシュボード"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "確認日"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "販売単位"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "割当パートナ"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "現在の受注オーダーのための価格リスト"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "調達方法"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "受注オーダー確認日"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未請求かつ配達済行"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "請求書の例外"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小計"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "日"
 msgid "Cancel Order"
 msgstr "オーダーのキャンセル"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "オーダー中"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "非課税金額"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "合計："
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "私の受注オーダーと関係する受注オーダー行"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "出荷例外"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "販売単位の数量"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "店"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "例外の受注"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "請求書住所"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "受注オーダーの作成日"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "確認日"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "分析アカウント"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "行数"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "数量の数"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "前払金額"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,479 +520,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "デフォルト支払条件"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "月次売上高"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "出荷数量"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "年"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "割引（%）"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "合計価格"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "同じ顧客のために請求書をグループ化するにはこのボックスをチェックします。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "私の受注オーダー"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "注文数量"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "オーダー参照"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "その他情報"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "見積と受注"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "受注による請求書作成"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "価格リストの警告。"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "割引（%）"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "私の見積"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "店名"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "例外の受注"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "6月"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "受注オーダーの統計値"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "受注オーダーに関連した分析アカウント"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "10月"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "見積"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "数量"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "9月"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "会計ポジション"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "進行中"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr "販売員は見積を確認します。受注オーダーの状態は進行中または手動進行中になります。"
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "TEL："
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "現在の受注オーダーのための請求書住所"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "受注オーダーのオーダー月"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "同じパートナに対する異なった通貨を持つ受注はグループ化できません。"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "請求済"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "確認日"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "割当パートナ"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "3月"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "合計金額"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "小計"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "請求書住所："
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "請求書住所"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "私の受注オーダーと関係する受注オーダー行"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "見積 / オーダー"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "受注オーダー行"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "未確認状態の受注オーダー"
 
 #. module: sale
 #: view:sale.order:0
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "オーダー行"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "請求書行"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "同じ顧客のために請求書をグループ化するにはこのボックスをチェックします。"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "請求書作成"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "時"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "作成日"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "請求対象"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "現在の受注オーダーのための請求書住所"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "注文数量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "受注オーダーのオーダー年"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "未請求かつ配達済行"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "数量"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "合計："
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "私の受注"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "価格リスト"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "オーダー参照"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "会計ポジション"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7月"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,29 +752,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "時"
+msgid "EDI Pricelist (%s)"
+msgstr "EDIの価格リスト（%s）"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "オーダー日"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "出荷済"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "見積と受注"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "支払済"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "パートナ"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,39 +850,95 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "見積日"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "請求書のグループ化"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "事前に請求される金額"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "受注による請求書作成"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "行が無い受注オーダーの確認はできません。"
+msgid "Pricelist Warning!"
+msgstr "価格リストの警告。"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"受注フォームで価格リストまたは顧客を選択する必要があります。\n"
-"製品を選択する前にどちらかをセットして下さい。"
+"請求書は次の何れかの理由により、この受注オーダー行のために作成されません。\n"
+"1. この受注オーダー行の状態はドラフトまたはキャンセルの何れかである。\n"
+"2. 受注オーダー行は請求されている。"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "私の見積"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "請求書"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "出荷済"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "未請求"
 
 #. module: sale
 #: view:sale.report:0
@@ -778,7 +947,7 @@ msgid "Category of Product"
 msgstr "製品分類"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -789,10 +958,18 @@ msgid "Recreate Invoice"
 msgstr "請求書再作成"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "店名"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -800,36 +977,261 @@ msgstr ""
 msgid "Taxes :"
 msgstr "税金："
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "請求済"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "前払請求書"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "顧客が定義されていません。"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "請求書作成"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "確認済"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "受注オーダー行の請求書を作成"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Eメールテンプレート"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "スケジュール待ち"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "受注オーダー"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "税金金額"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "調達と請求を実施"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "ToDo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "オーダー"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "受注分析"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "受注オーダーの統計値"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "日付"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "11月"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "見積"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "前払製品"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "例外"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"受注オーダーの出荷方針が出荷は手動進行中の場合、販売員は請求書を手動で作成します。出荷方針が配達前に支払の場合、請求書は自動的に作成されます。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "販売店"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -838,6 +1240,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "進行中の受注オーダー"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -848,11 +1274,94 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "受注オーダーに関連した分析アカウント"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr "販売員は見積を確認します。受注オーダーの状態は進行中または手動進行中になります。"
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"受注フォームで価格リストまたは顧客を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "この受注オーダー要求を生成したドキュメントへの参照"
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "適切な価格リスト行が見つかりません："
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "委任の遅延"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "見積"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "例外を無視"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -871,11 +1380,105 @@ msgstr "これは、この受注オーダーのために生成された請求書
 msgid "Your Reference"
 msgstr "あなたの参照"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "日付順"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "価格リスト"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "顧客請求書"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "請求する確認済受注オーダー"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "受注"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr "このオーダーの価格リストを変更した場合（通貨であっても）、既存オーダー行の価格は更新されません。"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "数量"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "在庫から"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "見積日"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "合計"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "請求書住所："
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "請求書"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -891,19 +1494,101 @@ msgstr "私の受注オーダー行"
 msgid "Cancel"
 msgstr "キャンセル"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "価格リストがありません： "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "未請求行の検索"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "送付先住所："
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "同じパートナに対する異なった通貨を持つ受注はグループ化できません。"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "受注前払請求書"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -914,358 +1599,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "請求書作成"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "税抜金額"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "オーダー参照"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "請求書は支払済であることを示しています。"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "価格"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "オーダー中"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "送付先住所："
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "受注オーダーのドラフト状態"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "税込合計"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "受注オーダーのオーダー日"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "見積の確認"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "グループ化…"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "スケジュール待ち"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "調達方法"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "単価"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "税金"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "請求準備のできた受注オーダー"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "受注オーダーの作成日"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "請求書を作成"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "FAX："
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "前払金額"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "出荷数量"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr "このオーダーの価格リストを変更した場合（通貨であっても）、既存オーダー行の価格は更新されません。"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "請求書作成"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "請求対象"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "受注オーダーのオーダー年"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "7月"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "出荷例外"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "請求書のグループ化"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "月"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "会計士によってレビューされます。"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "請求書作成"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "受注オーダー行の請求書を作成"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "古い見積"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "支払済"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "受注分析"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "見積"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"受注オーダーの出荷方針が出荷は手動進行中の場合、販売員は請求書を手動で作成します。出荷方針が配達前に支払の場合、請求書は自動的に作成されます。"
+msgid "Other Information"
+msgstr "その他情報"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1288,27 +1660,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1323,7 +1678,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1364,92 +1719,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "未配達の確認済受注オーダー行"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "顧客請求書"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "受注"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "単価"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "完了"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "請求書"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "元となるドキュメント"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "ToDo"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "税抜金額"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "受注前払請求書"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1459,10 +1728,38 @@ msgid "Product"
 msgstr "製品"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "合計金額"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "価格"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1475,385 +1772,32 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "月次売上高"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "請求対象"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"このレポートは見積と受注オーダー上の分析を実行します。分析は受注高をチェックし別のグループ基準（販売員、パートナ、製品など）により並べ替えます。まだ請求さ"
+"れていない受注の分析を実行するためにこのレポートを使います。総売上高を分析したい場合は、会計アプリケーションの中の請求書分析レポートを使用する必要がありま"
+"す。"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "見積 / オーダー"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "オーダー日"
+msgid "Tel. :"
+msgstr "TEL："
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "製品販売単位"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "手動進行中"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "オーダー"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "受注オーダーから"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "例外を無視"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"受注オーダーの請求制御によって、請求書は配達、または受注数量基準とすることが可能です。したがって、受注オーダーは販売員によりそれが確認されるとすぐに、請求"
-"書、または配達オーダーを生成します。"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "顧客参照"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "合計"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "受注ダッシュボード"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "受注オーダー確認日"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "会社"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "請求日"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "事前に請求される金額"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "請求書の例外"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "顧客が定義されていません。"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "合計："
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "キャンセル済"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "未請求行の検索"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "店"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "確認日"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "受注オーダー"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "販売単位の数量"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "完了状態の受注オーダー行"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "確認済"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "確認"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "請求書行"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "行数"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "受注オーダー行"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDIの価格リスト（%s）"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "本当に請求書を作成しますか？"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1863,245 +1807,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"請求書は次の何れかの理由により、この受注オーダー行のために作成されません。\n"
-"1. この受注オーダー行の状態はドラフトまたはキャンセルの何れかである。\n"
-"2. 受注オーダー行は請求されている。"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "受注オーダー行の完了"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "重量"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "請求書"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "12月"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "未請求"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "会計士によってレビューされます。"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "調達と請求を実施"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "非課税金額"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "前払請求書"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "ドラフト"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "税金金額"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "請求準備ができた受注オーダー行"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Eメールテンプレート"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "受注オーダー"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "販売店"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "11月"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "前払製品"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "1月"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "進行中の受注オーダー"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "この受注オーダー要求を生成したドキュメントへの参照"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "委任の遅延"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "日付順"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "請求する確認済受注オーダー"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "未確認状態の受注オーダー"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "在庫から"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "価格リストがありません： "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "請求書は支払済であることを示しています。"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "説明"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "5月"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "本当に請求書を作成しますか？"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2124,11 +1869,131 @@ msgstr "前払"
 msgid "February"
 msgstr "2月"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "請求対象"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "製品販売単位"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "受注オーダーのドラフト状態"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "元となるドキュメント"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "4月"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "手動進行中"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "古い見積"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "受注オーダーの検索"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "説明"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2139,19 +2004,45 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "受注オーダーの検索"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "受注オーダーのオーダー月"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "受注オーダーから"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"受注オーダーの請求制御によって、請求書は配達、または受注数量基準とすることが可能です。したがって、受注オーダーは販売員によりそれが確認されるとすぐに、請求"
+"書、または配達オーダーを生成します。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "販売単位"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2161,50 +2052,105 @@ msgid "Payment Term"
 msgstr "支払条件"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "請求準備のできた受注オーダー"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"このレポートは見積と受注オーダー上の分析を実行します。分析は受注高をチェックし別のグループ基準（販売員、パートナ、製品など）により並べ替えます。まだ請求さ"
-"れていない受注の分析を実行するためにこのレポートを使います。総売上高を分析したい場合は、会計アプリケーションの中の請求書分析レポートを使用する必要がありま"
-"す。"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "受注オーダー行"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "現在の受注オーダーのための価格リスト"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "見積番号"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "顧客参照"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "集荷"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "年"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "税込合計"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "受注オーダーのオーダー日"
+
 #~ msgid "Sales by Salesman in last 90 days"
 #~ msgstr "過去90日間の販売員による販売"
 
 #~ msgid "Based on Timesheet"
 #~ msgstr "勤務表を基本"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr "受注オーダー行は確認済、完了、または例外状態であり、まだ請求されていません。"
+
 #~ msgid ""
 #~ "If you don't have enough stock available to deliver all at once, do you "
 #~ "accept partial shipments or not?"
@@ -2294,6 +2240,9 @@ msgstr ""
 #~ msgid "Inventory Moves"
 #~ msgstr "在庫移動"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "私の受注オーダー"
+
 #~ msgid "Sales by Salesman"
 #~ msgstr "販売員による受注"
 
@@ -2449,6 +2398,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "オプション"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "行が無い受注オーダーの確認はできません。"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2802,6 +2755,9 @@ msgstr ""
 #~ "according to the method you use to invoice your customers."
 #~ msgstr "このツールは、顧客に請求するために使用する方法にしたがって、正しいモジュールのインストールとシステムを設定するのに役立ちます。"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "未配達の確認済受注オーダー行"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2909,6 +2865,9 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "警告"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "完了状態の受注オーダー行"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "基本とする主な方法"
 
@@ -2924,6 +2883,9 @@ msgstr ""
 #~ msgid "Print Order"
 #~ msgstr "印刷順序"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "受注オーダー行の完了"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "今年作成された受注オーダー"
 
@@ -2972,6 +2934,9 @@ msgstr ""
 #~ msgid "Packings"
 #~ msgstr "梱包"
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "請求準備ができた受注オーダー行"
+
 #~ msgid ""
 #~ "One Procurement order for each sales order line and for each of the "
 #~ "components."
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 8e780ff392f..e28c1891ba5 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -7,49 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-15 21:56+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "견적 확정"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Allotment 파트너"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "인보이스되지 않고 배송된 라인들"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "인보이스 예외"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "분석 계정"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "소계"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -61,6 +207,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr "주문 취소"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "중량"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "주문 상"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "세금"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "과세되지 않은 금액"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "순 합계:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "선적 예외"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "샵"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "예외적 판매"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "인보이스 주소"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "분석 계정"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "팩스:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,15 +520,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "디폴트 결제 조건"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "확정"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "선적 수량"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -148,461 +575,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Disc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "주문된 수량"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "주문 참조"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "할인 (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "내 견적"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "예외적 판매"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "상태"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "수량"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "회계 포지션"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "전화:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "인보이스됨"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Allotment 파트너"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "소계"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "인보이스 주소:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "인보이스 주소"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "견적 / 주문"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "주문 라인"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Disc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "인보이스 라인"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "인보이스되지 않고 배송된 라인들"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "주문된 수량"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "수량"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "합계:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "가격리스트"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "주문 참조"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "회계 포지션"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "상태"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,22 +812,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "지불됨"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "인보이스 그룹화"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "할인 (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "내 견적"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "인보이스"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "인보이스 다시 생성"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr "세금:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "인보이스됨"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Advance Invoice"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "인보이스 생성"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "확정됨"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "초안"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "대기 스케줄"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "판매 주문"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "주문"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "견적"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Advance Product"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "예외"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "진행 중인 판매 주문"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "귀하의 참조"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "가격리스트"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "시퀀스"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "판매"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "수량"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "스톡으로부터"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "합계"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "완료"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "인보이스 주소:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "인보이스"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "취소"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "선적 주소:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,345 +1593,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "인보이스 생성"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "가격"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "주문 상"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "선적 주소:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "견적 확정"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "대기 스케줄"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "유닛 가격"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "판매 주문"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "세금"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "팩스:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "선적 수량"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "선적 예외"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "인보이스 그룹화"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "인보이스 생성"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "지불됨"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "견적"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1258,11 +1629,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "판매"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "유닛 가격"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "완료"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "인보이스"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,10 +1722,38 @@ msgid "Product"
 msgstr "상품"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "가격"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "인보이스 날짜"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "견적 / 주문"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "주문 날짜"
+msgid "Tel. :"
+msgstr "전화:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "주문"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "합계"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "인보이스 예외"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "순 합계:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "샵"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "확정됨"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "확정"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "인보이스 라인"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "판매 주문 라인"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "중량"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "인보이스"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "과세되지 않은 금액"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Advance Invoice"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "초안"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "판매 주문"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Advance Product"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "진행 중인 판매 주문"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "스톡으로부터"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "설명"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "인보이스 날짜"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "주문 날짜"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "설명"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,20 +1995,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "시퀀스"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2153,18 +2041,32 @@ msgid "Payment Term"
 msgstr "결제 조건"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "판매 주문 라인"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2172,20 +2074,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "견적 N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "인수됨"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Steps To Deliver a Sale Order"
@@ -2458,6 +2399,9 @@ msgstr ""
 #~ msgid "Sale Procurement"
 #~ msgstr "판매 조달"
 
+#~ msgid "Sale Order"
+#~ msgstr "판매 주문"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
diff --git a/addons/sale/i18n/lo.po b/addons/sale/i18n/lo.po
index 2cbd950a84e..6d1d1e9dc42 100644
--- a/addons/sale/i18n/lo.po
+++ b/addons/sale/i18n/lo.po
@@ -7,47 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 19:00+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
 msgstr ""
 
 #. module: sale
@@ -61,6 +207,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr "ສລົບລ້າງສັ່ງຊື້"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "ອາກອນ"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,11 +421,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,15 +520,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -148,461 +575,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "ຈຳນວນ"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,37 +636,105 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "ຈຳນວນ"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,22 +812,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,345 +1593,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1258,11 +1629,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,8 +1722,36 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
 msgstr ""
 
 #. module: sale
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,19 +1995,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2153,18 +2041,32 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2172,20 +2074,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Shipping address for current sales order."
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 309427dd638..6ed4a08d1f0 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -6,51 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-22 17:52+0000\n"
 "Last-Translator: ignas <ignassladkevicius@yahoo.com>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Patvirtinti pasiūlymą"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
-"Pardavimo sutartys, kurios yra patvirtintos, baigtos arba kitoje "
-"(išskirtinėje) būsenoje ir kurioms dar nebuvo išrašyta sąskaita"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Patvirtinimo data"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Grupuoti pagal..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Važtaraščio eil. adresas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Neužpajamuotos ir pristatymo eilutės"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Sąskaitos faktūros klaida"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitinė sąskaita"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Tarpinė suma"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -62,6 +206,26 @@ msgstr "Diena"
 msgid "Cancel Order"
 msgstr "Atšaukti užsakymą"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Svoris"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -74,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Užsakant"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Mokesčiai"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma be mokesčių"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Neto iš viso:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Atšauktas"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Pristatymo klaida"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kiekis (Mat. vnt.)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Parduotuvė"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Pardavimų išimtys"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Sąskaitos adresas"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -100,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitinė sąskaita"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -114,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -121,8 +450,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faksas :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -132,15 +519,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Numatytasis mokėjimo terminas"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Patvirtinti"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Mėnesinė apyvarta"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Pristatyti kiekiai"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -149,462 +574,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Nuol. (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Bendra kaina"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Pažymėkite žymės langelį, kad sugrupuoti tų pačių klientų sąskaitas faktūras"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Užsakyti kiekiai"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Užsakymo nuoroda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Kita informacija"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Pasiūlymai ir pardavimai"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Kainoraščio Įspėjimas!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Nuolaida (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mano pasiūlymai"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Parduotuvės pavadinimas"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Pardavimų išimtys"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Būsena"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Rugpjūtis"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Birželis"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Pardavimų užsakymų statistika"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Pasiūlymai"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Kiekis"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "PVM :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalinė pozicija"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Vykdomas"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Išrašyta sąskaita faktūra"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Patvirtinimo data"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Važtaraščio eil. adresas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Bendra suma."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Tarpinė suma"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Sąskaitos adresas :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Sąskaitos adresas"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Pasiūlymas / Užsakymas"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -624,8 +600,30 @@ msgid "Order Lines"
 msgstr "Užsakymo eilutės"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Nuol. (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Sąskaitos eilutės"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Bendra kaina"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -637,38 +635,107 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Pažymėkite žymės langelį, kad sugrupuoti tų pačių klientų sąskaitas faktūras"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Neužpajamuotos ir pristatymo eilutės"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Užsakyti kiekiai"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Kiekis"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Iš viso :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mano pardavimai"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Kainoraštis"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Užsakymo nuoroda"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalinė pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -685,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Būsena"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -715,23 +812,37 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Pasiūlymai ir pardavimai"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Apmokėta"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partneris"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -739,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupuoti sąskaitas faktūras"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgid "Pricelist Warning!"
+msgstr "Kainoraščio Įspėjimas!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Nuolaida (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mano pasiūlymai"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Sąskaitos faktūros"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -778,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -789,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Iš naujo sukurti sąskaitą faktūrą"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Parduotuvės pavadinimas"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -800,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Mokesčiai:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Išrašyta sąskaita faktūra"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanso sąskaita faktūra"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Vykdomas"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nenurodytas klientas!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Sukurti sąskaitas faktūras"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Patvirtinta"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Juodraštis"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Laukiantis"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pardavimų užsakymai"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Mokesčiai"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Rugpjūtis"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Birželis"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Užsakymas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -815,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Pardavimų užsakymų statistika"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Pasiūlymas"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Avansinės prekės"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Išimtis"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -838,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Vykdomi pardavimų užsakymai"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -848,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Pasiūlymai"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -871,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Nuoroda"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Kainoraštis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "PVM :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Seka"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Pardavimai"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Kiekis"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Iš sandėlio"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Iš viso"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Atlikta"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Sąskaitos adresas :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Sąskaita faktūra"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -891,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Atšaukti"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Pristatymo adresas :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -914,357 +1593,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Sukurti sąskaitą faktūrą"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Kaina"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Užsakant"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Pristatymo adresas :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Patvirtinti pasiūlymą"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupuoti pagal..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Laukiantis"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Vieneto kaina"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pardavimo užsakymas"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Mokesčiai"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faksas :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Pristatyti kiekiai"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Pristatymo klaida"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupuoti sąskaitas faktūras"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Sukurti sąskaitas faktūras"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Seni pasiūlymai"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Apmokėta"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Pasiūlymas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Kita informacija"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1287,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1322,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1363,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Pardavimai"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Vieneto kaina"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Atlikta"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Sąskaita faktūra"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1458,10 +1722,38 @@ msgid "Product"
 msgstr "Produktas"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Bendra suma."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Kaina"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1474,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Mėnesinė apyvarta"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Užpajamuojama"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Pasiūlymas / Užsakymas"
+
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Užsakymo data"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produktas"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Vykdomas"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Užsakymas"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Iš paravimo užsakymo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Iš viso"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Sąskaitos faktūros klaida"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nenurodytas klientas!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Neto iš viso:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Atšauktas"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Parduotuvė"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kiekis (Mat. vnt.)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Patvirtinta"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Patvirtinti"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Sąskaitos eilutės"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Pardavimų užsakymų eilutės"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1860,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Svoris"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Sąskaitos faktūros"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Suma be mokesčių"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanso sąskaita faktūra"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Juodraštis"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Mokesčiai"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pardavimų užsakymai"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Avansinės prekės"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Vykdomi pardavimų užsakymai"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Iš sandėlio"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Aprašymas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2118,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Užpajamuojama"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Užsakymo data"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produktas"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Vykdomas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Seni pasiūlymai"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Aprašymas"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2133,20 +1995,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Iš paravimo užsakymo"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Seka"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2155,18 +2041,32 @@ msgid "Payment Term"
 msgstr "Mokėjimo terminas"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Pardavimų užsakymų eilutės"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2174,20 +2074,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "Pasiūlymo Nr."
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Pristatyta"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Configuration"
@@ -2577,6 +2516,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Vienas užsakymas kiekvienam produktui."
 
+#~ msgid "Sale Order"
+#~ msgstr "Pardavimo užsakymas"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Pardavimų kainoraščiai"
 
@@ -2776,6 +2718,13 @@ msgstr ""
 #~ msgid "Based on Timesheet"
 #~ msgstr "Pagal darbo laiko apskaitos žiniaraštį"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Pardavimo sutartys, kurios yra patvirtintos, baigtos arba kitoje "
+#~ "(išskirtinėje) būsenoje ir kurioms dar nebuvo išrašyta sąskaita"
+
 #~ msgid "Shipping address for current sales order."
 #~ msgstr "Pristatymo adresas einamiesiems pardavimams."
 
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index 81950fed29b..4de385eef5a 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-16 12:35+0000\n"
 "Last-Translator: Normunds (Alistek) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Apstiprināt Pasūtījumu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Apstiprināšanas Datums"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Grupēt Pēc..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Daļas Partneris"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cenrādis Pasūtījumam"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Sagādes Veids"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datums, kurā pasūtījums tika apstiprināts."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Rēķina Datums"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Rēķina kļūda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Apakšsumma kopā"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Diena"
 msgid "Cancel Order"
 msgstr "Atcelt Pasūtījumu"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Svars"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "pie pasūtījuma"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Nodokļi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Summa bez nodokļiem"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Neto Summa:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Atcelts"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Piegādes kļūda"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Daudzums (Pārdošanas mērvienība)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Veikals"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Veiktas Izmaiņas"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Rēķina Adrese"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datums, kurā izveidots pasūtījums."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Veidot Rēķinus"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Apstiprināšanas Datums"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analītiskais Konts"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Rindu skaits"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "Daudz."
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fakss:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pasūtījums"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pasūtījuma Rinda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Priekšapmaksas Summa"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Apmaksas termiņš pēc noklusējuma"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Apstiprināt"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Piegādātais Daudzums"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Gads"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Atlaide %"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Cena Kopā"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Atzīmēt lauku, lai grupētu rēķinus pa klientiem"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Pasūtītais Daudzums"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Atsauce uz Pasūtījumu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Cita Informācija"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Izrakstīt Rēķinu"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Atlaide %"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Tirdzniecības Punkta Nosaukums"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Veiktas Izmaiņas"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Statuss"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusts"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Jūnijs"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Pasūtījumu Statistika"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Ar pasūtījumu saistītais analītiskais konts."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktobris"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Tāmējumi"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Skaits"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "PVN:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembris"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Nodokļu Profils"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Apstrādē"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Pasūtījuma rēķina adrese"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Rēķins piestādīts"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Apstiprināšanas Datums"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Daļas Partneris"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marts"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Summa"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Apakšsumma kopā"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Rēķina adrese:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Rēķina Adrese"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cenas piedāvājums / Pasūtījums"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Pasūtījuma Rinda"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "Pasūtījuma sastāvdaļas"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Atlaide %"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Rēķina pozīcijas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Cena Kopā"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Atzīmēt lauku, lai grupētu rēķinus pa klientiem"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Veidot Rēķinus"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Izveides Datums"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Piestādīt Rēķinu"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Pasūtījuma rēķina adrese"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Pasūtītais Daudzums"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Skaits"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Kopā:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mana Pārdošana"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenrādis"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Atsauce uz Pasūtījumu"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Nodokļu Profils"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Jūlijs"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Statuss"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Pasūtījuma datums"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Piegādāts"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Samaksāts"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partneris"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,38 +850,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tāmējuma Datums"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupēt rēķinus"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Priekšapmaksas rēķina summa."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Izrakstīt Rēķinu"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Atlaide %"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Rēķini"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembris"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Piegādāts"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mēnesis"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nav piestādīts rēķins"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr "Produkta Kategorija"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Veidot Rēķinu"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Tirdzniecības Punkta Nosaukums"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,36 +974,260 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Nodokļi:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Rēķins piestādīts"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Priekšapmaksas Rēķins"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Apstrādē"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Klients nav Definēts!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Izveidot Rēķinus"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Apstiprināts"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Melnraksts"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Tirdzniecības Pasūtījumi"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Nodokļa summa."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusts"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Nodrošina iepirkumu un rēķinu piestādīšanas procesu"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Veicamais"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Jūnijs"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pasūtījums"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Pārdošanu Analīze"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Pasūtījumu Statistika"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembris"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Paplašinātie filtri..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Tāme"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Priekšapmaksas Prece"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Kļūda"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktobris"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tirdzniecības Kanāls"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Janvāris"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Tirdzniecības pasūtījuma progress"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Ar pasūtījumu saistītais analītiskais konts."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tāmējumi"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorēt Brīdinājumu"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Jūsu Atsauce"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenrādis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "PVN:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Apstiprinātie pasūtījumi rēķina piestādīšanai."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Tirdzniecība"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Sk."
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "no noliktavā esošajām precēm"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tāmējuma Datums"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Kopā"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Rēķina adrese:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Rēķins"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Atcelt"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Meklēt Rindas, par kurām nav piestādīti Rēķini"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Piegādes adrese:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Priekšapmaksas Rēķins"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,357 +1593,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Izveidot Rēķinu"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Summa bez nodokļiem."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Norāda, ka rēķins ir apmaksāts."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "pie pasūtījuma"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Piegādes adrese:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Pasūtījuma melnraksta statuss"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Iekļauto Nodokļu Summa"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Apstiprināt Pasūtījumu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupēt Pēc..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Sagādes Veids"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Vienības cena"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Tirdzniecības Pasūtījums"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Nodokļi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datums, kurā izveidots pasūtījums."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Veidot Rēķinus"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fakss:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Priekšapmaksas Summa"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Piegādātais Daudzums"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Veidot Rēķinus"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Piestādīt Rēķinu"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Jūlijs"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Piegādes kļūda"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupēt rēķinus"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mēnesis"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Pārbaudīt Grāmatvedim."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Izveidot Rēķinus"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vecie Tāmējumi"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Samaksāts"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Pārdošanu Analīze"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Tāme"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Cita Informācija"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Tirdzniecība"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Vienības cena"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Pabeigts"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Rēķins"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Pamatojuma Dokuments"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Veicamais"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Summa bez nodokļiem."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Priekšapmaksas Rēķins"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,10 +1722,38 @@ msgid "Product"
 msgstr "Produkts"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Summa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maijs"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Rēķins pēc"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cenas piedāvājums / Pasūtījums"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datums, kad tika pasūtīts"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkta pārdošanas mērvienība"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuāls Progresā"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pasūtījums"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "No pasūtījuma"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorēt Brīdinājumu"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Klienta Kods"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Kopā"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datums, kurā pasūtījums tika apstiprināts."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Uzņēmums"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Rēķina Datums"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Priekšapmaksas rēķina summa."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Rēķina kļūda"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Klients nav Definēts!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Neto Summa:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Atcelts"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Meklēt Rindas, par kurām nav piestādīti Rēķini"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Veikals"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Apstiprināšanas Datums"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Pasūtījums"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Daudzums (Pārdošanas mērvienība)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Apstiprināts"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Apstiprināt"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Rēķina pozīcijas"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Rindu skaits"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Tirdzniecības Pasūtījuma pozīcijas"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Pārbaudīt Grāmatvedim."
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Svars"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Rēķini"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembris"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nav piestādīts rēķins"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Nodrošina iepirkumu un rēķinu piestādīšanas procesu"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Summa bez nodokļiem"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Priekšapmaksas Rēķins"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Melnraksts"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Nodokļa summa."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Tirdzniecības Pasūtījumi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tirdzniecības Kanāls"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembris"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Priekšapmaksas Prece"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Janvāris"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Tirdzniecības pasūtījuma progress"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Apstiprinātie pasūtījumi rēķina piestādīšanai."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "no noliktavā esošajām precēm"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Norāda, ka rēķins ir apmaksāts."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Apraksts"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maijs"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr "Priekšapmaksa"
 msgid "February"
 msgstr "Februāris"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Rēķins pēc"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembris"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datums, kad tika pasūtīts"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkta pārdošanas mērvienība"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Pasūtījuma melnraksta statuss"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Pamatojuma Dokuments"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Aprīlis"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuāls Progresā"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vecie Tāmējumi"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Meklēt Pasūtījumu"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Apraksts"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,20 +1995,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Meklēt Pasūtījumu"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secība"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "No pasūtījuma"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2153,39 +2041,92 @@ msgid "Payment Term"
 msgstr "Apmaksas Noteikumi"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Tirdzniecības Pasūtījuma pozīcijas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cenrādis Pasūtījumam"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cenas piedāvājuma Nr."
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Klienta Kods"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Pieņemts piegādei"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Gads"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Iekļauto Nodokļu Summa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Recreate Procurement"
@@ -2382,6 +2323,9 @@ msgstr ""
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Izveidot Priekšapmaksas Rēķinu"
 
+#~ msgid "Sale Order"
+#~ msgstr "Tirdzniecības Pasūtījums"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tirdzniecības Cenuzīmes"
 
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index d9dfeccab0c..7124e5ef035 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -7,50 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-31 11:44+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Үнийн саналыг батлах"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Борлуулалт хянах самбар"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Борлуулалтын захиалгын мөрүүд нь батлагдсан, дууссан төлөвтэй эсвэл "
-"ялгагдсан төлөвтэй бөгөөд хараахан нэхэмжлэгдээгүй байна."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Баталгаажсан огноо"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Б.Н"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Хоёрдогч хүргэх хаяг"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Идэвхтэй борлуулалтын захиалгын Үнийн Жагсаалт."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Нөхөн дүүргэх хэлбэр"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Борлуулалтын захиалга батлагдсан огноо"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Нэхэмжлэх огноо"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Нэхэмжлээгүй бөгөөд хүргэгдсэн захиалгууд"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Нэхэмжлэлийн сондгойрол"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналитик данс"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Дэд дүн"
 
 #. module: sale
 #: view:sale.report:0
@@ -63,6 +207,26 @@ msgstr "Өдөр"
 msgid "Cancel Order"
 msgstr "Захиалга цуцлах"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Жин"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +239,178 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Захиалга"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Татвар"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Татваргүй дүн"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Цэвэр дүн :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Цуцалсан"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Миний борлуулалтын захиалгад холбогдсон борлуулалтын захиалгын мөрүүд"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Хүргэлтийн саатал"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Хоёрдогч тоо хэмжээ"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Дэлгүүр"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Саатаж буй захиалга"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Нэхэмжлэх хаяг"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Борлуулалтын захиалга үүсгэгдсэн огноо."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Нэхэмжлэл үүсгэх"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -101,12 +422,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Батлах огноо"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналитик данс"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Мөрийн тоо"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -115,6 +440,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -122,8 +452,66 @@ msgid "# of Qty"
 msgstr "Нийт тоо хэмжээ"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Факс:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Урьдчилгаа дүн"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -133,482 +521,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Үндсэн төлбөрийн нөхцөл"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Батлах"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Сарын эргэц"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Тээвэрлэсэн тоо"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Жил"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Хөнг.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Нийт Үнэ"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Ижил захиалагчийн захиалгыг бүлэглэж нэхэмжлэх бол сонго"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Миний борлуулалтын захиалга"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Захиалсан тоо хэмжээ"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Захиалгын дугаар"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Бусад мэдээлэл"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Үнийн санал болон Борлуулалт"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Борлуулалтаас Нэхэмжлэх"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Үнийн жагсаалтын Сануулга!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Хөнгөлөлт (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Миний үнийн саналууд"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Дэлгүүрийн нэр"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Саатаж буй захиалга"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Байдал"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Наймдугаар сар"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Зургадугаар сар"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Борлуулалтын захиалгын шинжилгээ"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Борлуулалтын захиалгатай холбогдсон шинжилгээний данс."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "10 сар"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Үнийн санал"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Тоо ширхэг"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "НӨАТ :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "9 сар"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Санхүүгийн орлуулалт"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Хийгдэж байна"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Борлуулалтын ажилтан үнийн саналыг батлана. Борлуулалтын захиалгын төлөв нь "
-"'Хийгдэж байна' эсвэл 'Гараар хийгдэж байна' төлөвтэй болдог."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Утас:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Идэвхтэй борлуулалтын захиалгын нэхэмжлэх хаяг."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Борлуулалтын захиалгын захиалагдсан сар"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "Ижил харилцагчийн бүлэг борлуулалт ялгаатай валюттай байж болохгүй."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Нэхэмжилсэн"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Баталгаажсан огноо"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Хоёрдогч хүргэх хаяг"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "3 сар"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Бүх дүн."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Дэд дүн"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Нэхэмжлэх хаяг :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Нэхэмжлэх хаяг"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-"Миний борлуулалтын захиалгад холбогдсон борлуулалтын захиалгын мөрүүд"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Үнийн санал / Захиалга"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Борлуулалтын Захиалгын Мөр"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Хараахан батлагдаагүй Борлуулалтын Захиалга"
 
 #. module: sale
 #: view:sale.order:0
@@ -627,8 +602,30 @@ msgid "Order Lines"
 msgstr "Захиалгын мөрүүд"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Хөнг.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Нэхэмжлэлийн мөрүүд"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Нийт Үнэ"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -640,38 +637,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Ижил захиалагчийн захиалгыг бүлэглэж нэхэмжлэх бол сонго"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Цаг"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Үүсгэсэн огноо"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Нэхэмжлэх"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Идэвхтэй борлуулалтын захиалгын нэхэмжлэх хаяг."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Захиалсан тоо хэмжээ"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Борлуулалтын захиалгын захиалсан он"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Нэхэмжлээгүй бөгөөд хүргэгдсэн захиалгууд"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Тоо ширхэг"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Нийт :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Миний борлуулалт"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Үнийн хүснэгт"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Захиалгын дугаар"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Санхүүгийн орлуулалт"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7 сар"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -688,29 +753,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Байдал"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Цаг"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Үнийн жагсаалт (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -718,23 +813,37 @@ msgid "Order Date"
 msgstr "Огноо"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Хүргэгдсэн"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Үнийн санал болон Борлуулалт"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Төлсөн"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Харилцагч"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -742,39 +851,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Үнэ зохиох өдөр"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Нэхэмжлэлийг бүлэглэх"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Урьдчилгаа нэхэмжлэх дүн."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Борлуулалтаас Нэхэмжлэх"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Мөр байхгүй борлуулалтын захиалгыг батлах боломжгүй."
+msgid "Pricelist Warning!"
+msgstr "Үнийн жагсаалтын Сануулга!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Хөнгөлөлт (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Борлуулалтын формд үнийн жагсаалт эсвэл захиалагчийг сонгох ёстой ! \n"
-"Бараа сонгохын өмнө аль нэгийг нь сонго."
+"Дараах шалтгаануудаас энэ Борлуулалтын Захиалгын Мөр дээр нэхэмжлэл "
+"үүсэхгүй:\n"
+"1. Энэ борлуулалтын захиалгын мөр нь \"ноорог\" эсвэл \"цуцлагдсан\" "
+"төлөлтэй байна!\n"
+"2. Борлуулалтын Захиалгын Мөр нэхэмжлэгдсэн!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Миний үнийн саналууд"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Нэхэмжлэлүүд"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "12 сар"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Хүргэгдсэн"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Нэхэмжлээгүй"
 
 #. module: sale
 #: view:sale.report:0
@@ -783,7 +950,7 @@ msgid "Category of Product"
 msgstr "Барааны ангилал"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -794,10 +961,18 @@ msgid "Recreate Invoice"
 msgstr "Дахин нэхэмжлэл үүсгэх"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Дэлгүүрийн нэр"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -805,36 +980,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Татвар :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Нэхэмжилсэн"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Урьдчилгаа нэхэмжлэл"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Хийгдэж байна"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Захиалагч тодорхойлогдоогүй байна !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Батлагдсан"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүсгэх"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Имэйл Үлгэрүүд"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Хуваарь хүлээж байна"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Татварын дүн."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Наймдугаар сар"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Нөхөн дүүргэлт хийх болон нэхэмжлэх"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Бэлтгэх"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Зургадугаар сар"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Захиалга"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Борлуулалтын шинжилгээ"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Борлуулалтын захиалгын шинжилгээ"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Огноо"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Арван нэгдүгээр сар"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Өргөтгөсөн хайлт..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Үнийн санал"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Урьдчилгаа"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Алдаа"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Хэрэв захиалга гүйцэтгэх арга нь 'Хүргэлтийн дараа нэхэмжлэлийг гараар "
+"үүсгэх' бол борлуулалтын ажилтан нэхэмжлэлийг гараар үүсгэнэ. Хэрэв захиалга "
+"гүйцэтгэх арга нь 'Хүргэлтийн өмнө төлбөр хийх' бол нэхэмжлэл нь автоматаар "
+"үүснэ."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Борлуулалтын Дэлгүүр"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -843,6 +1246,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "1 сар"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Хийгдэж байгаа захиалга"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -853,11 +1280,96 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Борлуулалтын захиалгатай холбогдсон шинжилгээний данс."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Борлуулалтын ажилтан үнийн саналыг батлана. Борлуулалтын захиалгын төлөв нь "
+"'Хийгдэж байна' эсвэл 'Гараар хийгдэж байна' төлөвтэй болдог."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Борлуулалтын формд үнийн жагсаалт эсвэл захиалагчийг сонгох ёстой ! \n"
+"Бараа сонгохын өмнө аль нэгийг нь сонго."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Энэ борлуулалтын захиалгыг үүсгэсэн сурвалж баримт."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Тохирох үнийн жагсаалт олдсонгүй !"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Баталгаажсан дундаж хугацаа"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Үнийн санал"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Онцгой тохиолдлыг үл хэрэгс"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -879,11 +1391,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Таны дугаар"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Захиалгын огноо"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Үнийн хүснэгт"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "НӨАТ :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Захиалагчийн нэхэмжлэл"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Нэхэмжлэх батлагдсан борлуулалтын захиалгууд."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Борлуулалт"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Энэ захиалгын үнийн жагсаалт (валют) -ыг өөрчилбөл одоо байгаа захиалгын "
+"мөрүүд шинэчлэгдэхгүй."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Тоо хэмжээ"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Агуулахаас"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Үнэ зохиох өдөр"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Нийт"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Дууссан"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Нэхэмжлэх хаяг :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Нэхэмжлэл"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -899,19 +1507,101 @@ msgstr "Миний Борлуулалтын Захиалгын Мөрүүд"
 msgid "Cancel"
 msgstr "Цуцлах"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Үнийн жагсаалт алга ! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Нэхэмжлээгүй захиалга хайх"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Хүргэх хаяг :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "Ижил харилцагчийн бүлэг борлуулалт ялгаатай валюттай байж болохгүй."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Борлуулалтын Урьдчилгаа Төлбөрийн Нэхэмжлэл"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -922,363 +1612,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Нэхэмжлэл үүсгэх"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Татваргүй дүн."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Захиалгын код"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Энэ нь нэхэмжлэл төлөгдсөн болохыг илэрхийлнэ."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Үнэ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Захиалга"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Хүргэх хаяг :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Борлуулалтын захиалгын Ноорог төлөв"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Татвартай нийлбэр"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Борлуулалтын захиалгын захиалсан огноо"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Үнийн саналыг батлах"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Бүлэглэх..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Хуваарь хүлээж байна"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Нөхөн дүүргэх хэлбэр"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Нэгж үнэ"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Борлуулах захиалга"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Татвар"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Нэхэмжлэхэд бэлэн Борлуулалтын Захиалга"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Борлуулалтын захиалга үүсгэгдсэн огноо."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Факс:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Урьдчилгаа дүн"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Тээвэрлэсэн тоо"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Энэ захиалгын үнийн жагсаалт (валют) -ыг өөрчилбөл одоо байгаа захиалгын "
-"мөрүүд шинэчлэгдэхгүй."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Нэхэмжлэх"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Борлуулалтын захиалгын захиалсан он"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "7 сар"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Хүргэлтийн саатал"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Нэхэмжлэлийг бүлэглэх"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Сар"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Нягтлан бодогчоор хянагдана."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүсгэх"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Хуучин үнийн санал"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Төлсөн"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Борлуулалтын шинжилгээ"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Үнийн санал"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Хэрэв захиалга гүйцэтгэх арга нь 'Хүргэлтийн дараа нэхэмжлэлийг гараар "
-"үүсгэх' бол борлуулалтын ажилтан нэхэмжлэлийг гараар үүсгэнэ. Хэрэв захиалга "
-"гүйцэтгэх арга нь 'Хүргэлтийн өмнө төлбөр хийх' бол нэхэмжлэл нь автоматаар "
-"үүснэ."
+msgid "Other Information"
+msgstr "Бусад мэдээлэл"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1301,27 +1673,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1336,7 +1691,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1377,92 +1732,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Батлагдсан боловч хараахан хүргэгдээгүй борлуулалтын мөр"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Захиалагчийн нэхэмжлэл"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Борлуулалт"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Нэгж үнэ"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Дууссан"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Нэхэмжлэл"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Эх баримт"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Бэлтгэх"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Татваргүй дүн."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Борлуулалтын Урьдчилгаа Төлбөрийн Нэхэмжлэл"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1472,10 +1741,38 @@ msgid "Product"
 msgstr "Бараа"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Бүх дүн."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "5 сар"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Үнэ"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1488,386 +1785,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Сарын эргэц"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Нэхэмжлэл нь"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Энэ тайлан нь таны үнийн санал болон борлуулалтын захиалгад шинжилгээ хийнэ. "
+"Шинжилгээ нь таны борлуулалтын орлогыг бусад хүчин зүйлсээр (борлуулагч, "
+"харилцагч, бараа гэх мэт) эрэмбэлж харуулна. Уг тайлангийн тусламжтайгаар "
+"хараахан нэхэмжлээгүй байгаа захиалгуудад гүйцэтгэлийн дүгнэлт хийх "
+"боломжтой. Хэрэв эргэцийн шинжилгээ хийхийг хүсвэл Санхүүгийн хэсгийн "
+"нэхэмжлэл шинжилгээ тайланг ашиглаарай."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Үнийн санал / Захиалга"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Захиалсан огноо"
+msgid "Tel. :"
+msgstr "Утас:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Хоёрдогч хэмжих нэгж"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Захиалгыг бэлтгэж байна"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Захиалга"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Борлуулалтын захиалгаас"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Онцгой тохиолдлыг үл хэрэгс"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Нэхэмжлэлийн хяналтаас шалтгаалан нэхэмжлэл нь хүргэгдсэн эсвэл захиалсан "
-"тоо ширхэг дээр үндэслэж болно. Тиймээс борлуулалтын ажилтан батлангуут "
-"хүргэх баримт эсвэл нэхэмжлэл үүсгэгдэнэ."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Захиалагчийн дугаар"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Нийт"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Борлуулалт хянах самбар"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Борлуулалтын захиалга батлагдсан огноо"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Компани"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Нэхэмжлэх огноо"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Урьдчилгаа нэхэмжлэх дүн."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн сондгойрол"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Захиалагч тодорхойлогдоогүй байна !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Цэвэр дүн :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Цуцалсан"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Нэхэмжлээгүй захиалга хайх"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Дэлгүүр"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Батлах огноо"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Борлуулалтын захиалга"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Хоёрдогч тоо хэмжээ"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "'Дууссан' төлөвтэй Борлуулалтын Захиалгын Мөрүүд"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Батлагдсан"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Батлах"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Нэхэмжлэлийн мөрүүд"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Мөрийн тоо"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Захиалгын мөрүүд"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Үнийн жагсаалт (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1877,247 +1823,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Дараах шалтгаануудаас энэ Борлуулалтын Захиалгын Мөр дээр нэхэмжлэл "
-"үүсэхгүй:\n"
-"1. Энэ борлуулалтын захиалгын мөр нь \"ноорог\" эсвэл \"цуцлагдсан\" "
-"төлөлтэй байна!\n"
-"2. Борлуулалтын Захиалгын Мөр нэхэмжлэгдсэн!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Борлуулалтын Захиалгын Мөрүүд Хийгдсэн."
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Жин"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Нэхэмжлэлүүд"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "12 сар"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Нэхэмжлээгүй"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Нягтлан бодогчоор хянагдана."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Нөхөн дүүргэлт хийх болон нэхэмжлэх"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Татваргүй дүн"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Урьдчилгаа нэхэмжлэл"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Ноорог"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Татварын дүн."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Борлуулалтын Захиалгын Мөрүүд нэхэмжлэхэд бэлэн"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Имэйл Үлгэрүүд"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Борлуулалтын захиалга"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Борлуулалтын Дэлгүүр"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Арван нэгдүгээр сар"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Урьдчилгаа"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "1 сар"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Хийгдэж байгаа захиалга"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Энэ борлуулалтын захиалгыг үүсгэсэн сурвалж баримт."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Баталгаажсан дундаж хугацаа"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Захиалгын огноо"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Нэхэмжлэх батлагдсан борлуулалтын захиалгууд."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Хараахан батлагдаагүй Борлуулалтын Захиалга"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Агуулахаас"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Үнийн жагсаалт алга ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Энэ нь нэхэмжлэл төлөгдсөн болохыг илэрхийлнэ."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Тайлбар"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "5 сар"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2140,11 +1885,131 @@ msgstr "Урьдчилгаа"
 msgid "February"
 msgstr "2 сар"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Нэхэмжлэл нь"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9 сар"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Захиалсан огноо"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Хоёрдогч хэмжих нэгж"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Борлуулалтын захиалгын Ноорог төлөв"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Эх баримт"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "4 сар"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Захиалгыг бэлтгэж байна"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Хуучин үнийн санал"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Борлуулалтын захиалга хайх"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Тайлбар"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2155,20 +2020,47 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Борлуулалтын захиалга хайх"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Борлуулалтын захиалгын захиалагдсан сар"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Борлуулалтын захиалгаас"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Дараалал"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Нэхэмжлэлийн хяналтаас шалтгаалан нэхэмжлэл нь хүргэгдсэн эсвэл захиалсан "
+"тоо ширхэг дээр үндэслэж болно. Тиймээс борлуулалтын ажилтан батлангуут "
+"хүргэх баримт эсвэл нэхэмжлэл үүсгэгдэнэ."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Б.Н"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2177,47 +2069,94 @@ msgid "Payment Term"
 msgstr "Төлбөрийн нөхцөл"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Нэхэмжлэхэд бэлэн Борлуулалтын Захиалга"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Энэ тайлан нь таны үнийн санал болон борлуулалтын захиалгад шинжилгээ хийнэ. "
-"Шинжилгээ нь таны борлуулалтын орлогыг бусад хүчин зүйлсээр (борлуулагч, "
-"харилцагч, бараа гэх мэт) эрэмбэлж харуулна. Уг тайлангийн тусламжтайгаар "
-"хараахан нэхэмжлээгүй байгаа захиалгуудад гүйцэтгэлийн дүгнэлт хийх "
-"боломжтой. Хэрэв эргэцийн шинжилгээ хийхийг хүсвэл Санхүүгийн хэсгийн "
-"нэхэмжлэл шинжилгээ тайланг ашиглаарай."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Захиалгын мөрүүд"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Идэвхтэй борлуулалтын захиалгын Үнийн Жагсаалт."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Үнийн санал №"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Захиалагчийн дугаар"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Хүргэгдсэн"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Жил"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Татвартай нийлбэр"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Борлуулалтын захиалгын захиалсан огноо"
+
 #~ msgid "Notes"
 #~ msgstr "Тэмдэглэл"
 
@@ -2248,6 +2187,9 @@ msgstr ""
 #~ msgid "History"
 #~ msgstr "Түүх"
 
+#~ msgid "Sale Order"
+#~ msgstr "Борлуулах захиалга"
+
 #~ msgid "Name"
 #~ msgstr "Нэр"
 
@@ -2918,6 +2860,13 @@ msgstr ""
 #~ msgid "Print Quotation"
 #~ msgstr "Үнийн санлалыг хэвлэх"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Борлуулалтын захиалгын мөрүүд нь батлагдсан, дууссан төлөвтэй эсвэл "
+#~ "ялгагдсан төлөвтэй бөгөөд хараахан нэхэмжлэгдээгүй байна."
+
 #~ msgid "Sales by Salesman in last 90 days"
 #~ msgstr "Сүүлийн 90 хоногийн Борлуулалт Борлуулалтын Ажилтнаар"
 
@@ -2973,6 +2922,9 @@ msgstr ""
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Үндсэн ажлын цагийн нэгж"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Миний борлуулалтын захиалга"
+
 #~ msgid "Based on Delivery Orders"
 #~ msgstr "Хүргэлтийн Баримт дээр Суурилсан"
 
@@ -3088,6 +3040,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Сонголт"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Мөр байхгүй борлуулалтын захиалгыг батлах боломжгүй."
+
 #~ msgid "Invoice on order after delivery"
 #~ msgstr "Хүргэлтийн нэхэмжлэх"
 
@@ -3313,6 +3269,9 @@ msgstr ""
 #~ msgid "Could not cancel sales order !"
 #~ msgstr "Борлуулалтын захиалгыг цуцлаж чадсангүй !"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Батлагдсан боловч хараахан хүргэгдээгүй борлуулалтын мөр"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -3415,6 +3374,12 @@ msgstr ""
 #~ "болохыг илэрхийлнэ. Тэнд борлуулалтын захиалгын бэлтгэх 1 жагсаалт байх "
 #~ "бөгөөд хэсгүүдийн байгаа эсэхтэй холбогддог."
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Борлуулалтын Захиалгын Мөрүүд Хийгдсэн."
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "'Дууссан' төлөвтэй Борлуулалтын Захиалгын Мөрүүд"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Үндсэн Методийн Суурьлах нь"
 
@@ -3469,6 +3434,9 @@ msgstr ""
 #~ "төлөгдмөгц үүснэ. Энэ нь худалдан авалт болон үйлдвэрлэлийг борлуулалтын "
 #~ "захиалгын тохиргооны параметрээс шалтаалуулан эхлүүлнэ. "
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Борлуулалтын Захиалгын Мөрүүд нэхэмжлэхэд бэлэн"
+
 #~ msgid "Sales order created in last month"
 #~ msgstr "Өнгөрсөн сард үүсгэгдсэн борлуулалтын захиалга"
 
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index 03d02f05fd8..05410f2228a 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/i18n/nb.po
@@ -7,50 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Bekreft tilbudet"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Salgskonsoll"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Salgsordrelinjer som er bekreftet, levert eller med avvik og enda ikke er "
-"fakturert"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bekreftet dato"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Salgsenhet"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Delpartner"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prisliste for aktuell salgsordre."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Innkjøpsmetode"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Dato hvor salgsordre er bekreftet."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fakturadato"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Ufakturerte og leverte linjer"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakturaavvik"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -63,6 +207,26 @@ msgstr "Dag"
 msgid "Cancel Order"
 msgstr "Kanseller ordre"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Vekt"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "i ordre"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Avgifter"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Ikke avgiftsberegnet beløp"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Kansellert"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Salgsordrelinjer knyttet til en av mine salgsordre"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Forsendelsesavvik"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kvantum (salgsenhet)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Salgsordre med avvik"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturaadresse"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Dato for når salgsordre blir opprettet"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Lag faktura"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -101,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Dato bekreftet"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytisk konto"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -115,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -122,8 +451,66 @@ msgid "# of Qty"
 msgstr "Mengde"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Forskuddsbeløp"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -133,482 +520,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Default betalingsbetingelse"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Bekreft"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Månedlig omsetning"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Levert kvantum"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rabatt(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totalpris"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marker for å gruppere fakturaer for samme kunde"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mine salgsordre"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Bestilt kvantum"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Ordrereferanse"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Annen informasjon"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Tilbud og salg"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Salg oppretter faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Prisliste-advarsel!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabatt (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mine tilbud"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Butikknavn"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Salgsordre med avvik"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Salgsordrestatistikk"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analytiske konto relatert til en salgsordre."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Tilbud"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Antall"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "MVA:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Skattemessig posisjon"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "I arbeid"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Selgeren bekrefter tilbudet. Status for salgsordren blir 'I arbeid' eller 'I "
-"manuelt arbeid'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturaadresse for gjeldende salgsordre."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Ordremåned for salgsordren"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Du kan ikke gruppere salg som har forskjellig valuta for samme partner."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturert"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bekreftet dato"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Delpartner"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mars"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Totalbeløp."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturaadresse:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturaadresse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Salgsordrelinjer knyttet til en av mine salgsordre"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Tilbud / ordre"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Salgsordrelinje"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Salgsordre som ennå ikke er bekreftet"
 
 #. module: sale
 #: view:sale.order:0
@@ -627,8 +601,30 @@ msgid "Order Lines"
 msgstr "Ordrelinjer"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rabatt(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Fakturalinjer"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -640,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marker for å gruppere fakturaer for samme kunde"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Lag fakturaer"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Time"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Opprettet dato"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Å fakturere"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturaadresse for gjeldende salgsordre."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Bestilt kvantum"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Ordreår for salgsordren"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Ufakturerte og leverte linjer"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Antall"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mine salg"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prisliste"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ordrereferanse"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Skattemessig posisjon"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -688,29 +752,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Time"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI prisliste (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -718,23 +812,37 @@ msgid "Order Date"
 msgstr "Ordredato"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Sendt"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Tilbud og salg"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betalt"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -742,39 +850,94 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tilbudsdato"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppering av fakturaer"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Beløp som skal forhåndsfaktureres."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Salg oppretter faktura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Du kan ikke bekrefte en salgsordre uten linjer."
+msgid "Pricelist Warning!"
+msgstr "Prisliste-advarsel!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Du må velge en prisliste eller en kunde i salgsbildet!\n"
-"Vennligst gjør dette før du velger produkt."
+"Faktura for denne salgsordrelinjen kan ikke dannes da ordrelinjen enten "
+"allerede er fakturert eller har status \"Utkast\" eller \"Kansellert\"."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mine tilbud"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakturaer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Sendt"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Ikke fakturert"
 
 #. module: sale
 #: view:sale.report:0
@@ -783,7 +946,7 @@ msgid "Category of Product"
 msgstr "Produktkategori"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -794,10 +957,18 @@ msgid "Recreate Invoice"
 msgstr "Gjenskap faktura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Butikknavn"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -805,36 +976,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Avgifter:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturert"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Forskuddsfaktura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "I arbeid"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Ingen kunde definert!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Lag faktura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Sale OrderLine Make_invoice"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Utkast"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "E-post maler"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Avventer planlegging"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Salgsordre"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "MVA beløp."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Styrer anskaffelse og fakturering"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Gjøremål"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ordre"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Salgsanalyse"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Salgsordrestatistikk"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Dato"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Utvidede filter..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Tilbud"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Forhåndsfakturert produkt"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Avvik"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Selger oppretter faktura manuelt dersom faktureringsregel er 'Manuell "
+"utlevering og fakturering'. Faktura dannes automatisk dersom "
+"faktureringsregel er 'Forskuddsbetaling'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Butikk"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -843,6 +1241,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Salgsordre i arbeid"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -853,11 +1275,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analytiske konto relatert til en salgsordre."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Selgeren bekrefter tilbudet. Status for salgsordren blir 'I arbeid' eller 'I "
+"manuelt arbeid'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Du må velge en prisliste eller en kunde i salgsbildet!\n"
+"Vennligst gjør dette før du velger produkt."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referanse til dokumentet som genererte denne salgsordreforespørselen."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Inegn gyldig prisliste funnet!:"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Bekreftelsesforsinkelse"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tilbud"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorer avvik"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -878,11 +1386,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Deres referanse"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Ordredato"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "MVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Kundefaktura"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Bekrefte salgsordre som skal faktureres"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Salg"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Hvis du endrer prisliste for denne ordren (og evt. valutaen) vil prisene på "
+"eksisterende ordrelinjer ikke bli oppdatert."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Mengde"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "fra lager"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tilbudsdato"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Fullført"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturaadresse:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -898,19 +1502,102 @@ msgstr "Mine salgsordrelinjer"
 msgid "Cancel"
 msgstr "Kanseller"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Ingen prisliste!: "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Søk ikkefakturerte linjer"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Ordrereferanse må være unik pr. firma!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Leveringsadresse:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Du kan ikke gruppere salg som har forskjellig valuta for samme partner."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Forskuddsfaktura"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -921,362 +1608,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Lag faktura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Beløp uten avgift"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Ordrereferanse"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "dette indikerer at en faktura har blitt betalt."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Pris"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "i ordre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Leveringsadresse:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Utkast status  for salgordre"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totalt inkl. avg."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Ordredato for salgsordren"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Bekreft tilbudet"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupper etter..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Avventer planlegging"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Innkjøpsmetode"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Enhetspris"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Salgsordre"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Avgifter"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Salgsordre klare til fakturering"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Dato for når salgsordre blir opprettet"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Lag faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Forskuddsbeløp"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Levert kvantum"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Hvis du endrer prisliste for denne ordren (og evt. valutaen) vil prisene på "
-"eksisterende ordrelinjer ikke bli oppdatert."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Lag fakturaer"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Å fakturere"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Ordreår for salgsordren"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Forsendelsesavvik"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppering av fakturaer"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Måned"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "For gjennomgang av regnskap."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Lag faktura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Sale OrderLine Make_invoice"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Gamle tilbud"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betalt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Salgsanalyse"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Tilbud"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Selger oppretter faktura manuelt dersom faktureringsregel er 'Manuell "
-"utlevering og fakturering'. Faktura dannes automatisk dersom "
-"faktureringsregel er 'Forskuddsbetaling'."
+msgid "Other Information"
+msgstr "Annen informasjon"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1299,27 +1669,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1334,7 +1687,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1375,92 +1728,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bekreftede salgsordrelinjer, ennå ikke levert"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Kundefaktura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Salg"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Enhetspris"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Fullført"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Kildedokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Gjøremål"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Beløp uten avgift"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Forskuddsfaktura"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1470,10 +1737,38 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Totalbeløp."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pris"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1486,386 +1781,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Månedlig omsetning"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura på"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Denne rapporten analyserer dine sitater og salgsordrer. Analysen sjekker "
+"salgsinntekter og sorterer de ved annen gruppe kriterier (selger, partner, "
+"produkt, etc.) Bruk denne rapporten til å utføre analyser på salg du ikke "
+"har fakturert enda. Hvis du ønsker å analysere din omsetning, bør du bruke "
+"fakturaen analyserapporten i Regnskap søknaden."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Tilbud / ordre"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Ordredato"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkt salgsenhet"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuell i arbeid"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ordre"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Fra en salgsordre"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorer avvik"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Avhengig av faktureringsregelen på salgsordren kan faktura baseres på "
-"bestilt eller levert mengde. Slik kan en salgsordre danne faktura eller "
-"plikkordre når den bekreftes av selger."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Kundereferanse"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Salgskonsoll"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Dato hvor salgsordre er bekreftet."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fakturadato"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Beløp som skal forhåndsfaktureres."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakturaavvik"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Ingen kunde definert!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto total:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Kansellert"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Søk ikkefakturerte linjer"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Butikk"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Dato bekreftet"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Salgsordre"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kvantum (salgsenhet)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Salgsordrelinjer som er i utført status"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bekreftet"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bekreft"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Fakturalinjer"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# linjer"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Salgsordrelinjer"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI prisliste (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Vil du virkerlig opprette faktura(ene) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1875,245 +1818,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Faktura for denne salgsordrelinjen kan ikke dannes da ordrelinjen enten "
-"allerede er fakturert eller har status \"Utkast\" eller \"Kansellert\"."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Salgsordrelinjer ferdig"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Vekt"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakturaer"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Desember"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Ikke fakturert"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "For gjennomgang av regnskap."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Styrer anskaffelse og fakturering"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Ikke avgiftsberegnet beløp"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Forskuddsfaktura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Utkast"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "MVA beløp."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Salgsordrelinjer klare for fakturering"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "E-post maler"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Salgsordre"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Butikk"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Forhåndsfakturert produkt"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Salgsordre i arbeid"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referanse til dokumentet som genererte denne salgsordreforespørselen."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Bekreftelsesforsinkelse"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Ordredato"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Bekrefte salgsordre som skal faktureres"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Salgsordre som ennå ikke er bekreftet"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "fra lager"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Ingen prisliste!: "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "dette indikerer at en faktura har blitt betalt."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Beskrivelse"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mai"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Vil du virkerlig opprette faktura(ene) ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2136,11 +1880,131 @@ msgstr "Forskudd"
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura på"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Ordredato"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkt salgsenhet"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Utkast status  for salgordre"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Kildedokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuell i arbeid"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Gamle tilbud"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Søk salgsordre"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Beskrivelse"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2151,19 +2015,46 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Søk salgsordre"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Ordremåned for salgsordren"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Fra en salgsordre"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Avhengig av faktureringsregelen på salgsordren kan faktura baseres på "
+"bestilt eller levert mengde. Slik kan en salgsordre danne faktura eller "
+"plikkordre når den bekreftes av selger."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Salgsenhet"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2173,46 +2064,94 @@ msgid "Payment Term"
 msgstr "Betalingsbetingelse"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Salgsordre klare til fakturering"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Denne rapporten analyserer dine sitater og salgsordrer. Analysen sjekker "
-"salgsinntekter og sorterer de ved annen gruppe kriterier (selger, partner, "
-"produkt, etc.) Bruk denne rapporten til å utføre analyser på salg du ikke "
-"har fakturert enda. Hvis du ønsker å analysere din omsetning, bør du bruke "
-"fakturaen analyserapporten i Regnskap søknaden."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Salgsordrelinjer"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prisliste for aktuell salgsordre."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Tilbudsnr."
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Kundereferanse"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Plukket"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "År"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totalt inkl. avg."
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Ordredato for salgsordren"
+
 #~ msgid "Sales by Salesman in last 90 days"
 #~ msgstr "Salg pr. selger de siste 90 dager"
 
@@ -2771,6 +2710,9 @@ msgstr ""
 #~ msgid "Our Salesman"
 #~ msgstr "Vår salgsperson"
 
+#~ msgid "Sale Order"
+#~ msgstr "Salgsordre"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Salgsprisliste"
 
@@ -2840,6 +2782,9 @@ msgstr ""
 #~ msgid "Print Quotation"
 #~ msgstr "Skriv ut tilbud"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mine salgsordre"
+
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced!"
 #~ msgstr "Du kan ikke kansellere en salgsordrelinje som allerede er fakturert!"
@@ -2985,6 +2930,10 @@ msgstr ""
 #~ msgid "Line Sequence"
 #~ msgstr "Linjesekvens"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Du kan ikke bekrefte en salgsordre uten linjer."
+
 #~ msgid "Invoice on order after delivery"
 #~ msgstr "Fakturer ordre etter levering"
 
@@ -3018,6 +2967,9 @@ msgstr ""
 #~ msgid "Picking Information ! : "
 #~ msgstr "Plukking informasjon "
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Bekreftede salgsordrelinjer, ennå ikke levert"
+
 #~ msgid ""
 #~ "You can generate invoices based on sales orders or based on shippings."
 #~ msgstr "Du kan lage fakturaer basert enten på salgsordre eller leveranser."
@@ -3042,6 +2994,9 @@ msgstr ""
 #~ msgid "res_config_contents"
 #~ msgstr "res_config_contents"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Salgsordrelinjer som er i utført status"
+
 #~ msgid "Contract/Analytic Account"
 #~ msgstr "Kontrakt/analytisk konto"
 
@@ -3064,6 +3019,9 @@ msgstr ""
 #~ msgid "The sales order '%s' has been cancelled."
 #~ msgstr "Salgsordren '%s' har blitt kansellert."
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Salgsordrelinjer klare for fakturering"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Du må velge en produksjonslot/batch for dette produktet"
 
@@ -3180,6 +3138,13 @@ msgstr ""
 #~ msgid "The sales order '%s' has been set in draft state."
 #~ msgstr "Status for salgsordre '%s' er satt til 'Utkast'."
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Salgsordrelinjer som er bekreftet, levert eller med avvik og enda ikke er "
+#~ "fakturert"
+
 #~ msgid "Reference UoM"
 #~ msgstr "Referanseenhet"
 
@@ -3219,6 +3184,9 @@ msgstr ""
 #~ msgid "Recreate Packing"
 #~ msgstr "Gjenskap pakking"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Salgsordrelinjer ferdig"
+
 #, python-format
 #~ msgid "Not enough stock ! : "
 #~ msgstr "Ikke nok lager!: "
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 34b19da00e7..f2fbc897d76 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -6,50 +6,197 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 14:54+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Kostenplaatsen voor verkoop"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Bevestig offerte"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Verkoop dashboard"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Verkooporderregels welke bevestigd, gereed of in fout en welke nog niet zijn "
-"gefactureerd."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Orderregels te factureren"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum bevestigd"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Verkoper"
+msgid "Group By..."
+msgstr "Groepeer op..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prijslijst voor actuele verkooporder"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Toewijzing relatie"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Factureer order"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Product mogelijkheden"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Maateenheid"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Verwervingswijze"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum waarop de verkooporder is bevestigd."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Gebruik meerdere kostenplaatsen bij verkoop"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+"Annuleer eerst alle facturen welke aan deze verkooporder zijn gekoppeld."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Offerte nummer"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nog te factureren en geleverde regels"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fouten in facturatie"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Offerte "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Concept offerte"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Afleveradres"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Kostenplaatsen"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotaal"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +206,29 @@ msgstr "Dag"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Annuleer order"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Magazijn mogelijkheden"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "De standaard werktijd maateenheid voor diensten is"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Maateenheid "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +241,177 @@ msgstr "Foutieve gegevens"
 msgid "The value of Advance Amount must be positive."
 msgstr "De waarde van de vooruitbetaling moet positief zijn"
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Maak op bestelling"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Order status"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Belastingen"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Netto bedrag"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Project"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto totaal :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Verkooporderregels gerelateerd aan een verkooporder van mijzelf"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Offerte verstuurd"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-mail samenstellen wizard"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Fouten in verzendingen"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Aantal (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Verkooppunten"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Verkooporders met uitgestelde levering"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Factuuradres"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum waarop de verkooporder is gemaakt."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Onwaar"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Maak facturen"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Belasting"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ongeldige actie!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +424,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum bevestigd"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Kostenplaatsen"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Regels"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -119,6 +444,11 @@ msgstr ""
 "samenvatting is direct in html formaat om zo in de kanban weergave te worden "
 "ingevoegd."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -126,10 +456,67 @@ msgid "# of Qty"
 msgstr "# Aantal"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(update)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Contract mogelijkheden"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Verkooporderregel"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Bedrag vooruitbetaling"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
-"Geeft u de mogelijkheid om een korting in te geven per verkooporderregel."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -138,16 +525,54 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Std. betalingstermijn"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Voorbereiden van facturen op urenstaten"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Factuur <b>betaald</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Maandelijkse omzet"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Verzonden hoeveelheden"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Jaar"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -155,478 +580,14 @@ msgid "Allow using different units of measures"
 msgstr "Afwijkende maateenheid toestaan"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Percentage"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Krt. (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totaalprijs"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Zet aan om de facturen voor dezelfde klanten te groeperen."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mijn verkooporders"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Bestelde hoeveelheden"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Order referentie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Overige informatie"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Factureer proces"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "Verkooporder gereed"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Offertes en verkooporders"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Verkoopfactuur maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Prijslijst waarschuwing"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Korting (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr "Maak en bekijk factuur"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mijn offerte-aanvragen"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Naam verkooppunt"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Quotation "
-msgstr "Offerte "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Vooruitbetaling van %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Verkooporders met uitgestelde levering"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augustus"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik om een offerte te maken welke kan worden omgezet in "
-"een\n"
-"                verkooporder.\n"
-"              </p><p>\n"
-"                OpenERP helpt u met het efficiënt beheersen van uw "
-"verkoopproces:\n"
-"                Offerte, Verkooporder, Levering, Facturering en betaling\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Verkooporder statistieken"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "De kostenplaatsrekening verbonden met een verkooporder."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Bekijk factuur"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Voorschot van %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Offertes"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Aantal"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Afleveradres voor de huidige verkooporder"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "BTW :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiscale positie"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In behandeling"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Concept factuur van %s %s <b>wacht op validatie</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
-"behandeling'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"Het is niet mogelijk een verkooporderregel te annuleren welke al is "
-"gefactureerd."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Factuuradres van actuele verkooporder."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Voor levering"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Adressen in verkooporders"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Contract / Kostenplaats"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Activeren van facturering van verkooporderregels"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Bestelde maand van de verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Het is niet mogelijk om verkopen met verschillende valuta van dezelfde "
-"relatie samen te voegen."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "of"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Gefactureerd"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Kostenplaatsen voor verkoop"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum bevestigd"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Toewijzing relatie"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "Factureer order"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maart"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Verkoop: Markeer als gelezen"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Het totaalbedrag."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotaal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Korting op verkoopovereenkomst toestaan"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Factuuradres:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Maateenheid "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "De standaard werktijd maateenheid voor diensten is"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Factuuradres"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Verkooporderregels gerelateerd aan een verkooporder van mijzelf"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Offerte / Order"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(update)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Verkooporderregel"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Verkooporders welke nog niet zijn bevestigd"
 
 #. module: sale
 #: view:sale.order:0
@@ -639,14 +600,37 @@ msgid "Order N°"
 msgstr "Order nr."
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Orderregels"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Gebruik meerdere kostenplaatsen bij verkoop"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Krt. (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Factuurregels"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totaalprijs"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -657,38 +641,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Zet aan om de facturen voor dezelfde klanten te groeperen."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Maak facturen"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Uur"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# verkooporders"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Datum gemaakt"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Verkooporder voor <em>%s</em> is <b>gereed</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Te factureren"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nog te factureren en geleverde regels"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Factuuradres van actuele verkooporder."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Bestelde hoeveelheden"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Besteld jaar van de verkooporders"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Aantal"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Totaal :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Mijn verkopen"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prijslijst"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Order referentie"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiscale positie"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -705,29 +757,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr ""
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Standaard opties"
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuratiefout!"
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Verkoop kostenplaatsen"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr "Verzenden via e-mail"
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Uur"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Prijslijst (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "Bij uitgaande levering"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Factureer proces"
 
 #. module: sale
 #: view:sale.order:0
@@ -735,23 +817,37 @@ msgid "Order Date"
 msgstr "Orderdatum"
 
 #. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Verzonden"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Verkooporder gereed"
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Offertes en verkooporders"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betaald"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Relatie"
+msgid "Reference Unit of Measure"
+msgstr "Maateenheid referentie"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -759,39 +855,96 @@ msgid "Create and View Invoice"
 msgstr "Maak en bekijk factuur"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Offertedatum"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Groepeer de facturen"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Het bedrag dat vooruit gefactureerd wordt."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Verkoopfactuur maken"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Het is niet mogelijk een verkooporder zonder regels te bevestigen"
+msgid "Pricelist Warning!"
+msgstr "Prijslijst waarschuwing"
 
 #. module: sale
-#: code:addons/sale/sale.py:1124
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Korting (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"U dient een prijslijst of een klant in het verkoopscherm te selecteren!\n"
-"Stel een prijslijst in voor het kiezen van een product."
+"Factuur kan niet worden gemaakt voor deze verkooporderregel vanwege een van "
+"de volgende redenen:\n"
+"1. De status van deze verkooporder is of \"offerte\" of \"geannuleerd\"!\n"
+"2. De verkooporderregel is al gefactureerd!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr "Maak en bekijk factuur"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mijn offerte-aanvragen"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Contractenbeheer"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Verzonden"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niet-gefactureerd"
 
 #. module: sale
 #: view:sale.report:0
@@ -800,7 +953,7 @@ msgid "Category of Product"
 msgstr "Productcategorie"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "Het is niet mogelijk deze verkooporder te annuleren!"
@@ -811,10 +964,18 @@ msgid "Recreate Invoice"
 msgstr "Maak factuur opnieuw"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naam verkooppunt"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -822,36 +983,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Belastingen :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Vooruitbetalen"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Open verkoop menu"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In behandeling"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Geen klant opgegeven!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Maak facturen"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Vooruitbetaling van %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Verkooporderregel factuur maken"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Offerte"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Email-sjablonen"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Contract / Kostenplaats"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Volgende planning"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Voorwaarden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkooporders"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Bet BTW bedrag."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr "Op verzoek"
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "onbekend"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Stuurt verwerving en facturatie aan"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Te doen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr "Is een volger"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Verkooporder statistieken"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Datum"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Verkoper"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offerte"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Product voor vooruitbetaling"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Fout"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"De verkoper maakt een factuur handmatig, als verkooporder leveringsmethode "
+"op 'Levering en handmatige voortgang'. De factuur wordt automatisch gemaakt "
+"als de leveringsmethode 'Vooruitbetaling' is."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkoopfiliaal"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -860,6 +1248,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Lopende verkooporders"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -870,11 +1282,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "De kostenplaatsrekening verbonden met een verkooporder."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Bekijk factuur"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Wat wilt u factureren?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
+"behandeling'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"U dient een prijslijst of een klant in het verkoopscherm te selecteren!\n"
+"Stel een prijslijst in voor het kiezen van een product."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referentie van het document dat deze verkooporder aanvraag genereerde."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Geen geldige prijslijst gevonden!:"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Voorschot van %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Toezegging vertraging"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Offertes"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Fouten negeren"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Afleveradres voor de huidige verkooporder"
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -897,269 +1395,55 @@ msgid "Your Reference"
 msgstr "Uw referentie"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Hvhd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mijn verkooporderregels"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annuleer"
+msgid "Show Lines to Invoice"
+msgstr "Geef Te factureren regels weer"
 
 #. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Orderreferentie moet uniek zijn per bedrijf!"
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Orderdatum"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
-#, python-format
-msgid ""
-"Cannot find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Maak factuur"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Order referentie"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Bedrag"
+msgid "TVA :"
+msgstr "BTW :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Offerte nummer"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Maak op bestelling"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Afleveradres :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-"Geeft u de mogelijkheid om een kostenplaats te definieren per verkooporder"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Offerte status van een verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
+#: code:addons/sale/sale.py:441
 #, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Offerte voor <em>%s</em> <b>aangemaakt</b>."
+msgid "Customer Invoices"
+msgstr "Klantfacturen"
 
 #. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Berichten en communicatie historie"
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Bevestigde verkooporder naar factuur."
 
 #. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Volgorde"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nieuwe kopie van offerte"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-"Het is niet mogelijk een verkooporderregel te verwijderen, welke zich in de "
-"'%s' status bevind."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Eigenschappen op regels"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totaal incl. BTW"
-
-#. module: sale
 #: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Besteldatum van de verkooporders"
+msgid "Sales"
+msgstr "Verkopen"
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Bevestig offerte"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Orderregels te factureren"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Product mogelijkheden"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Volgende planning"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Maateenheid"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Verwervingswijze"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Factureer de gehele verkooporder"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Ongelezen berichten"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Concept offerte"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Verkooporder"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Belastingen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Verkooporders, gereed om te worden gefactureerd"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum waarop de verkooporder is gemaakt."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Maak facturen"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Ongeldige actie!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Bedrag vooruitbetaling"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Verzonden hoeveelheden"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
+#: code:addons/sale/sale.py:301
 #, python-format
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
@@ -1169,139 +1453,209 @@ msgstr ""
 "de prijzen van bestaande orderregels niet worden bijgewerkt."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Hvhd"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Uit Voorraad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Offertedatum"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totaal"
+
+#. module: sale
 #: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Maak facturen"
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Gereed"
 
 #. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# verkooporders"
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Factuuradres:"
 
 #. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mijn verkooporderregels"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Te factureren"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Besteld jaar van de verkooporders"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Geeft aan dat de verkooporder op zijn minst één factuur heeft."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Fouten in verzendingen"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Groepeer de facturen"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Factureer verkooporder"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Contractenbeheer"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Maand"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Te controleren door de boekhouder."
-
-#. module: sale
-#: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Maak facturen"
+msgid "Cancel"
+msgstr "Annuleer"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Verkooporderregel factuur maken"
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Oude offertes"
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Geen prijslijst! "
 
 #. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betaald"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Verkoopanalyse"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Offerte"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+#: view:sale.order:0
+msgid "Sales Order "
 msgstr ""
-"De verkoper maakt een factuur handmatig, als verkooporder leveringsmethode "
-"op 'Levering en handmatige voortgang'. De factuur wordt automatisch gemaakt "
-"als de leveringsmethode 'Vooruitbetaling' is."
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Niet-gefactureerde regels zoeken"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferentie moet uniek zijn per bedrijf!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Afleveradres :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Het is niet mogelijk om verkopen met verschillende valuta van dezelfde "
+"relatie samen te voegen."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Gebruik contractmanagement"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Verkoop vooruitbetaling factuur"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Maak factuur"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Het bedrag zonder BTW."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Order referentie"
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Het geeft aan dat een factuur is betaald."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prijs"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Percentage"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Overige informatie"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1324,27 +1678,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1359,7 +1696,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1400,87 +1737,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bevestigde verkooporderregels, nog niet geleverd"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Klantfacturen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Verkopen"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prijs"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Gereed"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Bron document"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Te doen"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Het bedrag zonder BTW."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Verkoop vooruitbetaling factuur"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1490,9 +1746,37 @@ msgid "Product"
 msgstr "Product"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Genereer facturen op basis van de verkooporder regels."
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Het totaalbedrag."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Bevestig verkoop"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Bedrag"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1506,404 +1790,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Maandelijkse omzet"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Dit overzicht voert een analyse uit op uw offertes en verkooporders. "
+"Analyseer uw inkomsten en sorteer het op verschillende gropeer criteria "
+"(verkoper, relatie, product, etc.) Gebruik dit overzicht op nog niet "
+"gefactureerde verkopen. Als u uw omzet wilt analyseren, moet u de factuur "
+"analyse gebruiken in de financiële applicatie."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Factureer op"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Vaste prijs"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Offerte / Order"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Besteldatum"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Artikel UoS"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Handmatig in behandeling"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Verkoop: Markeer ongelezen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Bevestig verkoop"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Van een verkooporder"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Fouten negeren"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Afhankelijk van de factuurinstelling van de verkooporder kan de factuur "
-"gebaseerd zijn op bestelde of geleverde hoeveelheden. Dus, een verkooporder "
-"kan een factuur of uitgaande levering genereren zodra deze bevestigd is door "
-"de verkoper."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Somige orderregels"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Korting op regels"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referentie klant"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Totaal"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Verkoop dashboard"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum waarop de verkooporder is bevestigd."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-"Annuleer eerst alle facturen welke aan deze verkooporder zijn gekoppeld."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Factuurdatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Het bedrag dat vooruit gefactureerd wordt."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fouten in facturatie"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Geen klant opgegeven!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Afleveradres"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Verkopen om te factureren"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Magazijn mogelijkheden"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Project"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Fout!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto totaal :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Niet-gefactureerde regels zoeken"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Offerte verstuurd"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "E-mail samenstellen wizard"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Verkooppunten"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum bevestigd"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Contract mogelijkheden"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Verkooporder"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Aantal (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Verkooporderregels welke zich in de 'gereed' status bevinden."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bevestigd"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Voorwaarden"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bevestig"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Volgers"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Factuurregels"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Regels"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Verkooporderregels"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Standaard opties"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Verkoop kostenplaatsen"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Prijslijst (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik hier om een ​​offerte of verkooporder voor deze klant "
-"te maken.\n"
-"              </p><p>\n"
-"                OpenERP helpt u de volledige verkoopstroom efficiënt af te "
-"handelen:\n"
-"                offerte, verkoop, bestelling, levering, facturatie en "
-"betaling.\n"
-"              </p><p>\n"
-"                De sociale functie helpt bij het organiseren discussies over "
-"iedere verkooporder, \n"
-"                en geeft uw klant de mogelijkheid om het verloop verkoop "
-"order te volgen. \n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "Bij uitgaande levering"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Maateenheid referentie"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Wilt u echt de facturen aanmaken?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1913,253 +1827,45 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Factuur kan niet worden gemaakt voor deze verkooporderregel vanwege een van "
-"de volgende redenen:\n"
-"1. De status van deze verkooporder is of \"offerte\" of \"geannuleerd\"!\n"
-"2. De verkooporderregel is al gefactureerd!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Verkooporderregels gereed"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Gewicht"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Niet-gefactureerd"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Te controleren door de boekhouder."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Stuurt verwerving en facturatie aan"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Eigenschappen op regels"
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Netto bedrag"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Vooruitbetalen"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Open verkoop menu"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Offerte"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Bet BTW bedrag."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Verkooporder "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Verkooporderregels gereed om te worden gefactureerd"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Email-sjablonen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Verkooporders"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Verkoopfiliaal"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Product voor vooruitbetaling"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Lopende verkooporders"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Voorbereiden van facturen op urenstaten"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Verkooporder voor <em>%s</em> <b>geannuleerd</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referentie van het document dat deze verkooporder aanvraag genereerde."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Toezegging vertraging"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Order status"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Geef Te factureren regels weer"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Orderdatum"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Bevestigde verkooporder naar factuur."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Verkooporders welke nog niet zijn bevestigd"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Uit Voorraad"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Geen prijslijst! "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Verkooporders"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Gebruik contractmanagement"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Het geeft aan dat een factuur is betaald."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mei"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Wilt u echt de facturen aanmaken?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Verkopen om te factureren"
 
 #. module: sale
 #: view:sale.order:0
@@ -2183,11 +1889,131 @@ msgstr "Vooruitbetaling"
 msgid "February"
 msgstr "Februari"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Factureer op"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Vaste prijs"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Besteldatum"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Voor levering"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Artikel UoS"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Offerte status van een verkooporder"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Bron document"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Handmatig in behandeling"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Oude offertes"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatie historie"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Verkooporder zoeken"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Omschrijving"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2198,20 +2024,50 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestelde maand van de verkooporder"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Van een verkooporder"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Verkooporder zoeken"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Wat wilt u factureren?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Afhankelijk van de factuurinstelling van de verkooporder kan de factuur "
+"gebaseerd zijn op bestelde of geleverde hoeveelheden. Dus, een verkooporder "
+"kan een factuur of uitgaande levering genereren zodra deze bevestigd is door "
+"de verkoper."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Volgorde"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Somige orderregels"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+"Het is niet mogelijk een verkooporderregel te verwijderen, welke zich in de "
+"'%s' status bevind."
 
 #. module: sale
 #: report:sale.order:0
@@ -2220,24 +2076,33 @@ msgid "Payment Term"
 msgstr "Betalingsconditie"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Verkooporders, gereed om te worden gefactureerd"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"Dit overzicht voert een analyse uit op uw offertes en verkooporders. "
-"Analyseer uw inkomsten en sorteer het op verschillende gropeer criteria "
-"(verkoper, relatie, product, etc.) Gebruik dit overzicht op nog niet "
-"gefactureerde verkopen. Als u uw omzet wilt analyseren, moet u de factuur "
-"analyse gebruiken in de financiële applicatie."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "of"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkooporderregels"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prijslijst voor actuele verkooporder"
 
 #. module: sale
 #: report:sale.order:0
@@ -2245,22 +2110,60 @@ msgid "Quotation N°"
 msgstr "Offerte nr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Korting op regels"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referentie klant"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Verzameld"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Jaar"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totaal incl. BTW"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nieuwe kopie van offerte"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Besteldatum van de verkooporders"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Deellevering"
 
@@ -2541,6 +2444,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Een aanschaffing voor elk product"
 
+#~ msgid "Sale Order"
+#~ msgstr "Verkooporder"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Verkoopprijslijsten"
 
@@ -3334,6 +3240,9 @@ msgstr ""
 #~ msgid "Based on Timesheet"
 #~ msgstr "Gebaseerd op urenstaat"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mijn verkooporders"
+
 #~ msgid "The company name must be unique !"
 #~ msgstr "De naam van het bedrijf moet uniek zijn!"
 
@@ -3362,6 +3271,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Opties"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Het is niet mogelijk een verkooporder zonder regels te bevestigen"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is in state '%s'!"
 #~ msgstr ""
@@ -3383,6 +3296,12 @@ msgstr ""
 #~ msgid "Invoice Policy"
 #~ msgstr "Factureerbeleid"
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Verkooporderregels gereed om te worden gefactureerd"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Verkooporderregels welke zich in de 'gereed' status bevinden."
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Verkooporder aangemaakt in huidige jaar"
 
@@ -3395,9 +3314,15 @@ msgstr ""
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Bevestigde verkooporderregels, nog niet geleverd"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Hoofd methode gebaseerd op"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Verkooporderregels gereed"
+
 #, python-format
 #~ msgid "Not enough stock ! : "
 #~ msgstr "Niet genoeg voorraad! "
@@ -3608,6 +3533,13 @@ msgstr ""
 #~ msgid "Setup your Invoicing Method"
 #~ msgstr "Stel uw factureerbeleid in"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Verkooporderregels welke bevestigd, gereed of in fout en welke nog niet zijn "
+#~ "gefactureerd."
+
 #~ msgid "Print Order"
 #~ msgstr "Order afdrukken"
 
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index 7ea8a01f895..fcfd3db1395 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -7,51 +7,204 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-01 17:10+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: nl\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Verkopen analytisch boeken"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-"Verkooporderlijnen in status bevestigd, gereed of uitzondering en die nog "
-"niet zijn gefactureerd"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Offerte bevestigen"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Verkoopdashboard"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "Er is geen opbrengstenrekening ingesteld als een globaal kenmerk."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Te factureren lijnen"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bevestigingsdatum"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "VK-eenh."
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Verkoper"
+msgid "Group By..."
+msgstr "Groeperen op..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prijslijst voor deze verkooporder."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Relatie rechtstr. levering"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Order factureren"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Productopties"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Hiermee kunt u de contractvoorwaarden van een klant instellen: "
+"factuurmethode\n"
+"            (vaste prijs, volgesn uurrooster, voorschotfactuur), de juiste "
+"prijs\n"
+"            (650€/dag voor een ontwikkelaar), de duur (supportcontract van "
+"een jaar).\n"
+"            U kunt de vooruitgang van het contract opvolgen en automatisch "
+"factureren.\n"
+"            Hiermee wordt de module account_analytic_analysis geïnstalleerd."
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Meeteenheid"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Verwervingswijze"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum waarop verkooporder is bevestigd."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "U moet eerst alle facturen voor deze verkooporder annuleren."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Niet-gefactureerde en geleverde lijnen"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Factuuruitzondering"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Offerte "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Voorlopige offerte"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytische rekening"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr "Facturatie in batch toelaten voor leveringsorders volgens journalen"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotaal"
 
 #. module: sale
 #: view:sale.report:0
@@ -64,6 +217,26 @@ msgstr "Dag"
 msgid "Cancel Order"
 msgstr "Annuleer order"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Magazijnopties"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "De standaardwerkeenheid voor diensten is"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Meeteenheid "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -76,22 +249,184 @@ msgstr "Ongeldige gegevens"
 msgid "The value of Advance Amount must be positive."
 msgstr "De waarde van het voorschotbedrag moet positief zijn."
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Op bestelling"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Btw"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Bedrag excl. btw"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Project"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Fout"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettototaal:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Hiermee stelt u in wat de standaardfunctie van een gebruiker is voor een "
+"bepaalde rekening.\n"
+"                Doorgaans wordt dit toegepast bij het invoeren van "
+"uurroosters. De waarden worden automatisch in de juiste velden gezet.\n"
+"                Natuurlijk kunnen deze waarden nog worden aangepast.\n"
+"                Hiermee wordt de module analytic_user_function geïnstalleerd."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Verkooporderlijnen gekoppeld aan een van mijn verkooporders"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Verstuurde offerte"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 "Als dit is ingeschakeld, zijn er nieuwe berichten die uw aandacht vragen."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Verzenduitzondering"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Hoeveelheid (verk.eenh.)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Verkooppunt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Verkooporders in uitzonderingsstatus"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Factuuradres"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum waarop verkooporder is gemaakt."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Onwaar"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Facturen maken"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Btw"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ongeldige actie"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -103,12 +438,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Bevestigingsdatum"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytische rekening"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# lijnen"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -119,6 +458,12 @@ msgstr ""
 "Bevat de Chatsamenvatting (aantal berichten, ...). Deze samenvatting is in "
 "html-formaat, zodat ze in de kanbanweergave kan worden gebruikt."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+"Toont de volgorde bij het weergeven van een lijst van verkooporderlijnen."
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -126,9 +471,67 @@ msgid "# of Qty"
 msgstr "Hvh"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Hiermee kunt u een korting per verkooporderlijn toepassen"
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(bijwerken)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Verkooporderlijn"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Voorschotbedrag"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -137,26 +540,85 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Een werknemer kan verschillende rollen per contract hebben."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Std. betalingstermijn"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Facturen voorbereiden op basis van uurroosters"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
 
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Maandelijkse omzet"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Verzonden hoeveelheden"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Jaar"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr "Verschillende meeteenheden toelaten"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Percentage"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Onbevestigde verkooporders"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Afdrukken"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordernr."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Orderlijnen"
 
 #. module: sale
 #: report:sale.order:0
@@ -164,28 +626,63 @@ msgid "Disc.(%)"
 msgstr "Korting(%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 "Gelieve een opbrengstenrekening in te stellen voor dit product: \"%s\" "
 "(id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Factuurlijnen"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Totale prijs"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Hiermee kunt u verkopen en leveringen (ontvangsten) in verschillende "
+"journalen plaatsen,\n"
+"                en batchbewerkingen uitvoeren per journaal.\n"
+"                Hiermee wordt de module sale_journal geïnstalleerd."
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Schakel het vakje in om facturen per klant te groeperen."
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mijn verkooporders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Uur"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# verkooporders"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -203,11 +700,59 @@ msgstr ""
 "                Hiermee wordt de module account_analytic_analysis "
 "geïnstalleerd."
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Creatiedatum"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Te factureren"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Factuuradres voor de huidige verkooporder."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Bestelde hoeveelheden"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Besteljaar van de verkooporder"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totaal:"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mijn verkopen"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -215,33 +760,113 @@ msgid "Order Reference"
 msgstr "Orderreferentie"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Overige informatie"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiscale positie"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Standaardopties"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Waarschuwing"
+msgid "Configuration Error!"
+msgstr "Configuratiefout"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Verkopen analytisch boeken"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Klik op 'Te factureren lijnen weergeven' en selecteer vervolgens de lijnen "
+"die u wilt factureren. Maak de factuur via het menu 'Extra'."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI-prijslijst (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Facturatiewijze"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Besteldatum"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Verkooporder afgewerkt."
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr "Stel een verkoopdagboek in voor dit bedrijf: \"%s\" (id:%d)."
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Offertes en verkopen"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betaald"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
@@ -249,13 +874,38 @@ msgid ""
 msgstr ""
 "Hiermee kunt u verschillende meeteenheden kiezen en instellen voor producten."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Referentiemeeteenheid"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Factuur maken en bekijken"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Facturen groeperen"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Het bedrag dat vooruit wordt gefactureerd."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Verkoopfactuur maken"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Prijslijstwaarschuwing"
@@ -265,6 +915,20 @@ msgstr "Prijslijstwaarschuwing"
 msgid "Discount (%)"
 msgstr "Korting (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Factuur kan niet worden gemaakt voor deze verkooporderregel omdat:\\n\n"
+"1. de status van deze verkooporder \\\"concept\\\" is of \\\"geannuleerd\\"
+"\"\\n\n"
+"2. de verkooporderlijn al is gefactureerd."
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -276,6 +940,59 @@ msgstr ""
 msgid "My Quotations"
 msgstr "Mijn offertes"
 
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Contractbeheer"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Verzonden"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niet gefactureerd"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Productcategorie"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Kan verkooporder niet annuleren"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Factuur opnieuw maken"
+
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
@@ -286,6 +1003,586 @@ msgstr "Waarschuwingen instellen per klant of product"
 msgid "Shop Name"
 msgstr "Naam verkooppunt"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Btw:"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Voorschotfactuur"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Het verkoopmenu openen"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In behandeling"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Geen klant gedefinieerd"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Voorschot van %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Factuur maken van verkooporderlijnen"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "E-mailsjablonen"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Wacht op planner"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Verkoopvoorwaarden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkooporders"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Btw-bedrag"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Op verzoek"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Stuurt de verwervingen en facturatie"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Nog te doen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is een volger"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Verkooporderstatistieken"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Verkoper"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Uitgebreide filters..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offerte"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Voorschotproduct"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Uitzondering"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"De verkoper maakt zelf een factuur als verkooporder leveringsmethode "
+"'Levering en handmatige factuur' is. De factuur wordt automatisch gemaakt "
+"als de leveringsmethode 'Vooruitbetaling' is."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkooppunt"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Hiermee maakt u een offerte, een verkooporder met verschillende bestelwijzen "
+"en voorraadopvolging.\n"
+"                    Hiermee wordt de module sale_stock geïnstalleerd."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Selecteer een product van het type Dienst dat 'Voorschotproduct' heet.\n"
+"\t\t\t  U moet dit product wellicht eerst maken en instellen als "
+"standaardwaarde voor dit veld."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Lopende verkooporders"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "De analytische rekening van een verkooporder."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Wat wilt u factureren?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Gebruik prijslijsten als u specifieke prijzen per klant wilt"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
+"behandeling' of 'Handmatig'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"U moet een prijslijst of een klant kiezen in het verkoopformulier.\n"
+"Gelieve dit te doen voordat u een product kiest."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referentie van het document op basis waarvan deze verkooporder is gemaakt."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Geen geldige prijslijstlijn gevonden"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Voorschot van %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Vertraging"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Offertes"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "Hiermee wordt de module sale_analytic_plans geïnstalleerd."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Uitzondering negeren"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Marges in verkooporder weergeven"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Dit is de lijst van facturen die zijn gegenereerd voor deze verkooporder. "
+"Dezelfde verkooporder kan in meerdere keren zijn gefactureerd (bijvoorbeeld "
+"per lijn)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Uw referentie"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Te factureren lijnen weergeven"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Besteldatum"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Btw:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Verkoopfacturen"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Te factureren verkooporders"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Volgorde"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Verkoop"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Als u de prijslijst van dit order (en eventueel de munt) wijzigt, worden de "
+"prijzen van de bestaande orderlijnen niet bijgewerkt."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Hvh"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "uit voorraad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Offertedatum"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totaal"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Gereed"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Factuuradres:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mijn verkooporderlijnen"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Geen prijslijst "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Niet-gefactureerde lijnen zoeken"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "De referentie moet uniek zijn."
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -311,214 +1608,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Offerte "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Voorschot van %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Verkooporders in uitzonderingsstatus"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augustus"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik om een offerte te maken die kan worden omgezet in een "
-"verkooporder.\n"
-"              </p><p>\n"
-"                Met OpenERP handelt u de volledige verkoopflow efficiënt "
-"af:\n"
-"                offerte, order, levering, facturatie en betaling.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Verkooporderstatistieken"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "De analytische rekening van een verkooporder."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Voorschot van %s %s"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Offertes"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Hoeveelheid"
+msgid "Shipping address :"
+msgstr "Verzendadres:"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "Btw:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiscale positie"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In behandeling"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Voorlopige factuur van %s %s <b>wacht op goedkeuring</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
-"behandeling' of 'Handmatig'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Factuuradres voor de huidige verkooporder."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"Er is geen fiscale positie ingesteld of er is geen opbrengstenrekening "
-"ingesteld voor de productcategorie."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Adressen in verkooporders"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Factuur volgens verkooporderlijnen instellen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Bestelmaand van verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -527,436 +1622,24 @@ msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
+msgid "Invoice Sales Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Gefactureerd"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Verkopen analytisch boeken"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bevestigingsdatum"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Relatie rechtstr. levering"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "Order factureren"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maart"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Het totale bedrag"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr "Facturatie in batch toelaten voor leveringsorders volgens journalen"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotaal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Mogelijkheid bieden om korting op verkooporderlijn in te stellen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Factuuradres:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Meeteenheid "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "De standaardwerkeenheid voor diensten is"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Factuuradres"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Verkooporderlijnen gekoppeld aan een van mijn verkooporders"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Offerte / Order"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(bijwerken)"
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Gebruik contractbeheer"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Verkooporderlijn"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Een werknemer kan verschillende rollen per contract hebben."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Afdrukken"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordernr."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Orderlijnen"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-"Hiermee kunt u verkopen en leveringen (ontvangsten) in verschillende "
-"journalen plaatsen,\n"
-"                en batchbewerkingen uitvoeren per journaal.\n"
-"                Hiermee wordt de module sale_journal geïnstalleerd."
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Creatiedatum"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Niet-gefactureerde en geleverde lijnen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Totaal:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mijn verkopen"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prijslijst"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr "Er is geen opbrengstenrekening ingesteld als een globaal kenmerk."
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Configuratiefout"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Uur"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Besteldatum"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Verzonden"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_partner
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Factuur maken en bekijken"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik als u een nieuw verkooppunt wilt instellen.\n"
-"              </p><p>\n"
-"                Elke offerte of verkooporder moet aan een verkooppunt worden "
-"gekoppeld. Het\n"
-"                verkooppunt bepaalt ook het magazijn van waaruit de "
-"producten worden geleverd.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Offertedatum"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Een verkooporder zonder orderlijnen kan niet worden bevestigd."
-
-#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"U moet een prijslijst of een klant kiezen in het verkoopformulier.\n"
-"Gelieve dit te doen voordat u een product kiest."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Productcategorie"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Kan verkooporder niet annuleren"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Factuur opnieuw maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"U kunt een bevestigde verkooporder pas verwijderen als u deze eerst "
-"annuleert."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Btw:"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "Op verzoek"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Is een volger"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Uitgebreide filters..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Uitzondering"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-"Selecteer een product van het type Dienst dat 'Voorschotproduct' heet.\n"
-"\t\t\t  U moet dit product wellicht eerst maken en instellen als "
-"standaardwaarde voor dit veld."
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Geen geldige prijslijstlijn gevonden"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Marges in verkooporder weergeven"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Dit is de lijst van facturen die zijn gegenereerd voor deze verkooporder. "
-"Dezelfde verkooporder kan in meerdere keren zijn gefactureerd (bijvoorbeeld "
-"per lijn)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Uw referentie"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Hvh"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mijn verkooporderlijnen"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "De referentie moet uniek zijn."
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -965,6 +1648,11 @@ msgstr ""
 "Geen prijslijstlijn gevonden voor dit product en deze hoeveelheid.\n"
 "U moet het product, de hoeveelheid of de prijslijst veranderen."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Voorschotfactuur"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -975,376 +1663,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Factuur maken"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Bedrag zonder btw"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Orderreferentie"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"Hiermee maakt u een offerte, een verkooporder met verschillende bestelwijzen "
-"en voorraadopvolging.\n"
-"                    Hiermee wordt de module sale_stock geïnstalleerd."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Geeft aan dat de factuur is betaald."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Prijs"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Op bestelling"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Verzendadres:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-"Hiermee kunt u een analytische rekening meegeven op een verkooporder."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Conceptstatus van verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Offerte voor <em>%s</em> <b>is gemaakt</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Berichten en communicatiehistoriek"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Eigenschappen per lijn"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Kies eerst een klant in het verkoopformulier,\n"
-" en dan pas een product."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totaal incl. btw"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Besteldatum van verkooporder"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Offerte bevestigen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Te factureren lijnen"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Groeperen op..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Productopties"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Wacht op planner"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Meeteenheid"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Verwervingswijze"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Factureer de volledige verkooporder"
+msgid "Percentage"
+msgstr "Percentage"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Ongelezen berichten"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Voorlopige offerte"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Verkooporder"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Btw"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Te factureren verkooporders"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-"Hiermee stelt u in wat de standaardfunctie van een gebruiker is voor een "
-"bepaalde rekening.\n"
-"                Doorgaans wordt dit toegepast bij het invoeren van "
-"uurroosters. De waarden worden automatisch in de juiste velden gezet.\n"
-"                Natuurlijk kunnen deze waarden nog worden aangepast.\n"
-"                Hiermee wordt de module analytic_user_function geïnstalleerd."
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum waarop verkooporder is gemaakt."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Facturen maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Ongeldige actie"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Voorschotbedrag"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Verzonden hoeveelheden"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Als u de prijslijst van dit order (en eventueel de munt) wijzigt, worden de "
-"prijzen van de bestaande orderlijnen niet bijgewerkt."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Facturen maken"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# verkooporders"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Te factureren"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Besteljaar van de verkooporder"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Klik op 'Te factureren lijnen weergeven' en selecteer vervolgens de lijnen "
-"die u wilt factureren. Maak de factuur via het menu 'Extra'."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Geeft aan dat er voor de verkooporder tenminste een factuur bestaat."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Verzenduitzondering"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Facturen groeperen"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr "Offerte voor <em>%s</em> <b>omgezet</b> naar verkooporder van %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Verkooporder factureren"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Contractbeheer"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Maand"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Door de boekhouder te controleren."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Facturen maken"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Factuur maken van verkooporderlijnen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Oude offertes"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betaald"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Verkoopanalyse"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Offerte"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"De verkoper maakt zelf een factuur als verkooporder leveringsmethode "
-"'Levering en handmatige factuur' is. De factuur wordt automatisch gemaakt "
-"als de leveringsmethode 'Vooruitbetaling' is."
+msgid "Other Information"
+msgstr "Overige informatie"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1367,27 +1724,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1402,7 +1742,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1443,96 +1783,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Gebruik prijslijsten als u specifieke prijzen per klant wilt"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bevestigde verkooporderlijnen, nog niet geleverd"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Verkoopfacturen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Verkoop"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"Hiermee wordt de 'Marge' toegevoegd per verkooporder.\n"
-"                Dit toont de winst op basis van het verschil tussen "
-"eenheidsprijs en kostprijs.\n"
-"                Hiermee wordt de module sale_margin geïnstalleerd."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Eenheidsprijs"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Gereed"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Brondocument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Nog te doen"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Bedrag zonder btw"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Voorschotfactuur"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1542,10 +1792,39 @@ msgid "Product"
 msgstr "Product"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Het totale bedrag"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Er is geen opbrengstenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Prijs"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1558,421 +1837,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Maandelijkse omzet"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Met dit overzicht analyseert u uw offertes en verkooporders.\n"
+"Volg uw inkomsten op, groepeer volgens verschillende criteria (verkoper, "
+"relatie, product, enz.). Gebruik dit overzicht voor niet-gefactureerde "
+"verkopen. Als u uw omzet wilt analyseren, moet u Factuuranalyse gebruiken in "
+"de boekhouding."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Factureer op"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Vaste prijs (aanbetaling)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Offerte / Order"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Besteldatum"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Productverkoopeenheid"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Handmatig"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Van een verkooporder"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Uitzondering negeren"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Afhankelijk van de facturatiemethode van de verkooporder kan de factuur "
-"gebaseerd zijn op bestelde of geleverde aantallen. Hierdoor kan een "
-"verkooporder een factuur of leveringsopdracht maken zodra de order wordt "
-"bevestigd door de verkoper."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Enkele orderlijnen"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Korting per lijn"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referentie klant"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Totaal"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Kies hoe u deze order wilt factureren. Er\n"
-"                        wordt een voorlopige factuur gemaakt die nog kan "
-"worden aangepast\n"
-"                        voor goedkeuring."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Verkoopdashboard"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Kies Alle om de eindfactuur te maken.\n"
-"                Kies Percentage als u een percentage van het totale bedrag "
-"wilt factureren.\n"
-"                Kies Vaste prijs als u een bepaald bedrag vooraf wilt "
-"factureren.\n"
-"                Kies Bepaalde orderlijnen als u een selectie van "
-"verkooporderlijnen wilt factureren."
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"Hiermee kunt u de contractvoorwaarden van een klant instellen: "
-"factuurmethode\n"
-"            (vaste prijs, volgesn uurrooster, voorschotfactuur), de juiste "
-"prijs\n"
-"            (650€/dag voor een ontwikkelaar), de duur (supportcontract van "
-"een jaar).\n"
-"            U kunt de vooruitgang van het contract opvolgen en automatisch "
-"factureren.\n"
-"            Hiermee wordt de module account_analytic_analysis geïnstalleerd."
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum waarop verkooporder is bevestigd."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "U moet eerst alle facturen voor deze verkooporder annuleren."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Factuurdatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Het bedrag dat vooruit wordt gefactureerd."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Factuuruitzondering"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Geen klant gedefinieerd"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Te factureren verkopen"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Magazijnopties"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Project"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Fout"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Nettototaal:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Niet-gefactureerde lijnen zoeken"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Verstuurde offerte"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Verkooppunt"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Bevestigingsdatum"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr "Stel een verkoopdagboek in voor dit bedrijf: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Verkooporder"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Hoeveelheid (verk.eenh.)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Afgewerkte verkooporderlijnen"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bevestigd"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Verkoopvoorwaarden"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bevestigen"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Volgers"
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Factuurlijnen"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# lijnen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Verkooporderlijnen"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Standaardopties"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Verkopen analytisch boeken"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI-prijslijst (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik als u een offerte of verkooporder voor deze klant wilt "
-"maken.\n"
-"              </p><p>\n"
-"                Met OpenERP handelt u de volledige verkoopflow efficiënt "
-"af:\n"
-"                offerte, order, levering, facturatie en\n"
-"                betaling.\n"
-"              </p><p>\n"
-"                Met de sociale opties kunt u discussies voeren op een order\n"
-"                en zo uw klant een zicht geven op de evolutie van de "
-"verkooporder.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Referentiemeeteenheid"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Wilt u de factuur (facturen) maken?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1982,262 +1874,47 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik om een offerte te maken, de eerste stap naar een nieuwe "
-"verkoop.\n"
-"              </p><p>\n"
-"                Met OpenERP handelt u de volledige verkoopflow efficiënt "
-"af:\n"
-"                offerte, order, levering, facturatie en\n"
-"                betaling.\n"
-"              </p><p>\n"
-"                Met de sociale opties kunt u discussies voeren op een order\n"
-"                en zo uw klant een zicht geven op de evolutie van de "
-"verkooporder.\n"
-"              </p>\n"
-"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
-"Factuur kan niet worden gemaakt voor deze verkooporderregel omdat:\\n\n"
-"1. de status van deze verkooporder \\\"concept\\\" is of \\\"geannuleerd\\"
-"\"\\n\n"
-"2. de verkooporderlijn al is gefactureerd."
+"Er is geen fiscale positie ingesteld of er is geen opbrengstenrekening "
+"ingesteld voor de productcategorie."
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Afgewerkte verkooporderlijnen"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Door de boekhouder te controleren."
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Gewicht"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Eigenschappen per lijn"
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"Er is geen opbrengstenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Niet gefactureerd"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Stuurt de verwervingen en facturatie"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Bedrag excl. btw"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Voorschotfactuur"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Het verkoopmenu openen"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Btw-bedrag"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Verkooporder "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Te factureren verkooporderlijnen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "E-mailsjablonen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Verkooporders"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Verkooppunt"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Commentaar en e-mails"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Voorschotproduct"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-"Toont de volgorde bij het weergeven van een lijst van verkooporderlijnen."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Lopende verkooporders"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Facturen voorbereiden op basis van uurroosters"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Verkooporder voor <em>%s</em> <b>geannuleerd</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referentie van het document op basis waarvan deze verkooporder is gemaakt."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Vertraging"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Te factureren lijnen weergeven"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Besteldatum"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Te factureren verkooporders"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Onbevestigde verkooporders"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "uit voorraad"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Geen prijslijst "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Gebruik contractbeheer"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Geeft aan dat de factuur is betaald."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mei"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Wilt u de factuur (facturen) maken?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Te factureren verkopen"
 
 #. module: sale
 #: view:sale.order:0
@@ -2261,11 +1938,131 @@ msgstr "Voorschot"
 msgid "February"
 msgstr "Februari"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Factureer op"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Vaste prijs (aanbetaling)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Besteldatum"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Productverkoopeenheid"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Conceptstatus van verkooporder"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Brondocument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Handmatig"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Oude offertes"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatiehistoriek"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Verkooporders zoeken"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Omschrijving"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2279,20 +2076,48 @@ msgstr ""
 "                        uw klant."
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestelmaand van verkooporder"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Van een verkooporder"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Verkooporders zoeken"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Wat wilt u factureren?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Afhankelijk van de facturatiemethode van de verkooporder kan de factuur "
+"gebaseerd zijn op bestelde of geleverde aantallen. Hierdoor kan een "
+"verkooporder een factuur of leveringsopdracht maken zodra de order wordt "
+"bevestigd door de verkoper."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Volgorde"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "VK-eenh."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Enkele orderlijnen"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
 
 #. module: sale
 #: report:sale.order:0
@@ -2301,45 +2126,103 @@ msgid "Payment Term"
 msgstr "Betalingstermijn"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr "Hiermee wordt de module sale_analytic_plans geïnstalleerd."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Te factureren verkooporders"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Met dit overzicht analyseert u uw offertes en verkooporders.\n"
-"Volg uw inkomsten op, groepeer volgens verschillende criteria (verkoper, "
-"relatie, product, enz.). Gebruik dit overzicht voor niet-gefactureerde "
-"verkopen. Als u uw omzet wilt analyseren, moet u Factuuranalyse gebruiken in "
-"de boekhouding."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkooporderlijnen"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prijslijst voor deze verkooporder."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Offertenr."
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Korting per lijn"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referentie klant"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Geleverd"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Jaar"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Hiermee wordt de 'Marge' toegevoegd per verkooporder.\n"
+"                Dit toont de winst op basis van het verschil tussen "
+"eenheidsprijs en kostprijs.\n"
+"                Hiermee wordt de module sale_margin geïnstalleerd."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
+"Kies eerst een klant in het verkoopformulier,\n"
+" en dan pas een product."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totaal incl. btw"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Kies hoe u deze order wilt factureren. Er\n"
+"                        wordt een voorlopige factuur gemaakt die nog kan "
+"worden aangepast\n"
+"                        voor goedkeuring."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Besteldatum van verkooporder"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -3209,6 +3092,9 @@ msgstr ""
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Hoofdeenheid werktijd"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mijn verkooporders"
+
 #~ msgid "Based on Tasks' Work"
 #~ msgstr "Volgens taakwerk"
 
@@ -3271,6 +3157,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Opties"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Een verkooporder zonder orderlijnen kan niet worden bevestigd."
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -3500,6 +3390,9 @@ msgstr ""
 #~ "Hier is een voorstel van aantallen volgens de verpakking:\n"
 #~ "EAN: %s Aantal: %s Soort: %s"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Bevestigde verkooporderlijnen, nog niet geleverd"
+
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
 
@@ -3517,6 +3410,9 @@ msgstr ""
 #~ "Geen prijslijstlijn gevonden voor dit product en deze hoeveelheid.\n"
 #~ "U moet het product, de hoeveelheid of de prijslijst veranderen."
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Afgewerkte verkooporderlijnen"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Hoofdmethode volgens"
 
@@ -3526,6 +3422,12 @@ msgstr ""
 #~ msgid "Sales order created in current year"
 #~ msgstr "Verkooporders gemaakt in dit jaar"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Afgewerkte verkooporderlijnen"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Te factureren verkooporderlijnen"
+
 #~ msgid "Sales order created in last month"
 #~ msgstr "Verkooporders gemaakt in de afgelopen maand"
 
@@ -3535,3 +3437,13 @@ msgstr ""
 #, python-format
 #~ msgid "Not enough stock ! : "
 #~ msgstr "Onvoldoende voorraad "
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Verkooporderlijnen in status bevestigd, gereed of uitzondering en die nog "
+#~ "niet zijn gefactureerd"
+
+#~ msgid "Sale Order"
+#~ msgstr "Verkooporder"
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index b1c05f83f75..13ac5ae5172 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.po
@@ -7,47 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-11-20 09:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
 msgstr ""
 
 #. module: sale
@@ -61,6 +207,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,11 +421,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Annada"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,20 +636,74 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
 msgstr ""
 
 #. module: sale
@@ -656,16 +711,30 @@ msgstr ""
 msgid "Total :"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,22 +812,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,345 +1593,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1258,11 +1629,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,8 +1722,36 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
 msgstr ""
 
 #. module: sale
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,19 +1995,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2153,18 +2041,32 @@ msgid "Payment Term"
 msgstr "Relambi de pagament"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2172,20 +2074,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "Devís N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Liurada"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Annada"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Invoice Based on Deliveries"
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 7c9345126f5..75ccd78b0b8 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -6,50 +6,200 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 20:19+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 15:58+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr ""
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Ksiągowość analityczna dla sprzedaży"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-"Pozycje zamówień sprzedaży potwierdzone, wykonane lub w stanie wyjątku, "
-"które jeszcze nie były zafakturowane"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potwierdź ofertę"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Konsola sprzedaży"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "Brak konta przychodów w globalnych właściwościach"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Pozycje do zafakturowania"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data potwierdzenia"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "JS"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Sprzedawca"
+msgid "Group By..."
+msgstr "Grupuj wg"
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cennik dla tego zamówienia sprzedaży."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partner współpracujący"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Zakturuj zamówienie"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Cechy produktu"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Pozwala definiować warunki sprzedaży dla klientów: fakturowanie\n"
+"            (Ustalona cena, wg karty czasu pracy, zaliczki), cennik\n"
+"            (650€/dzień za programistę), okresy (rok gwarancji).\n"
+"            Będziesz mógł sprawdzać postępy w umowie automatycznie.\n"
+"            To instaluje moduł account_analytic_analysis."
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Jednostka Miary"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda zapotrzebowania"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data potwierdzenia zamówienia sprzedaży."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Stosuj wiele kont analitycznych w sprzedaży"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzec"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+"Najpierw anuluj wszystkie faktury związane z tym zamówieniem sprzedaży."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Numer Oferty"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Nieprzeczytane wiadomości"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data faktury"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Pozycje dostarczone i niezafakturowane"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr "Oferta potwierdzona"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Wyjątek faktury"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Oferta "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Projekt oferty"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Adres dostawy"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr "Pozwól na grupowe fakturowanie dostaw przez dzienniki"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Suma częściowa"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +209,29 @@ msgstr "Dzień"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Anuluj zamówienie"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Waga"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Funkcjonalność magazynu"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "Domyślną jednostką miary czasu dla usług jest"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Jednostka miary "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +244,186 @@ msgstr "Niepoprawne dane"
 msgid "The value of Advance Amount must be positive."
 msgstr "Wartość przedpłaty musi być dodatnia"
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr "Pozwala zastosować upust do pozycji zamównienia sprzedaży."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr "Pozycje zamówienia sprzedaży, które są w stanie 'wykonano'"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na zamówienie"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Stan zamówienia"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Podatki"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Kwota bez podatku"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Błąd!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Suma netto :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Z zapasu: Produkt będzie pobrany z magazynu lub nastąpi oczekiwanie na "
+"uzupełnienie zapasów.\n"
+"Na zamówienie: Produkt będzie kupiony lub wyprodukowany."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Pozycje zamówienia sprzedaży związane z moim zamówieniem"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Oferta wysłana"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Kreator email"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi"
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Wyjątek wysyłki"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Ilość (JS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Sklep"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Sprzedaże w stanie wyjątku"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adres do faktury"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data utworzenia zamówienia sprzedaży"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Fałsz"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+"Stosuje Wszystko do fakturowania całościowego.\n"
+"                Stosuj Procentowo do fakturowania częściowego.\n"
+"                Stosuj Ustalona cena do fakturowania konkretnej kwoty "
+"zaliczkowej.\n"
+"                Stosuj Część pozycji do fakturowania wybranych pozycji "
+"zamówienia."
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Utwórz faktury"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Podatek"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Niedozwolona akcja!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +436,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data potwierdzenia"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Konto analityczne"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# pozycji"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -119,6 +456,11 @@ msgstr ""
 "jest bezpośrednio w formacie html, aby można je było stosować w widokach "
 "kanban."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr "Określa kolejność pozycji w zamówieniu"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -126,9 +468,68 @@ msgid "# of Qty"
 msgstr "# Ilości"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Pozwala zastosowac upust do pozycji zamówienia"
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+"Aby usunąć potwierdzone zamówienia sprzedaży, musisz najpierw je anulować."
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Zapisy umowy"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr "Włącz fakturowanie pozycji zamówienia sprzedaży"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pozycja zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Kwota zaliczki"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr "To oznacza, że zamówienie ma co najmniej jedną fakturę."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -137,16 +538,56 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "jeden pracownik może mieć różne role dla umowy"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr "Fakturuj całe zamówienie sprzedaży"
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Domyślne warunki płatności"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Generuj faktury na podstawie karty czasu pracy"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Faktura <b>zapłacona</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+"Nie możesz anulować pozycji zamówienia sprzedaży, która już została "
+"zafakturowana."
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Miesięczny obrót"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Wysyłane ilości"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Rok"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -154,9 +595,30 @@ msgid "Allow using different units of measures"
 msgstr "Pozwala stosowac różne jednostki miary"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Procentowo"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr "Zamówienie sprzedaży potwierdzone"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Zamówienia sprzedaży jeszcze nie potwierdzone"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Drukuj"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Nr zamówienia"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Pozycje zamówienia"
 
 #. module: sale
 #: report:sale.order:0
@@ -164,26 +626,57 @@ msgid "Disc.(%)"
 msgstr "Up.(%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Zdefiniuj konto przychodów dla tego produktu: \"%s\" (id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Pozycje faktury"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Pełna cena"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr "Pozwala podać konto analityczne na zamówieniu sprzedaży"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Zaznacz tę opcję, aby grupować faktury dla tych samych klientów"
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Moje zamówienia sprzedaży"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Utwórz faktury"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Godzina"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# zamówień sprzedaży"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -195,11 +688,59 @@ msgid ""
 "                This installs the module account_analytic_analysis."
 msgstr ""
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data utworzenia"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Do zafakturowania"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adres do faktury dla tego zamówienia sprzedaży."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Zamówione ilości"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Rok zamówienia sprzedaży"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr "Adresy na zamówieniach sprzedaży"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Suma :"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr "Pozycje zamówienia sprzedaży gotowe do fakturowania"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moja sprzedaż"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -207,46 +748,151 @@ msgid "Order Reference"
 msgstr "Numer"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Inne informacje"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Obszar podatkowy"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Lipiec"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Opcje domyślne"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Ostrzeżenie !"
+msgid "Configuration Error!"
+msgstr "Błąd konfiguracji!"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Księgowość analityczna dla sprzedaży"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stan"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Po kliknięciu 'Pokaż pozycje do fakturowania', wybierz pozycje do "
+"fakturowania i utwórz fakturę z rozwijanego menu 'Więcej'."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Wysłano jako mail"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Cennik EDI (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "Na podstawie wydania"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Proces fakturowania"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data zamówienia"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Wykonano Zamówienie sprzedaży"
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr "Zdefiniuj dziennik sprzedaży dla tej firmy: \"%s\" (id:%d)."
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Oferty i zamówienia"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Zapłacone"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr "Pozwala wybrać różne jednostki miary dla produktów."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Referencyjna jednostka miary"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Utwórz i pokaż fakturę"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr "Wykonane pozycje zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupuj faktury"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Kwota do zafakturowania z góry."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Sprzedaż tworzy fakturę"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Ostrzeżenie cennika!"
@@ -256,6 +902,20 @@ msgstr "Ostrzeżenie cennika!"
 msgid "Discount (%)"
 msgstr "Upust (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Nie można utworzyć faktury do tej pozycji zamówienia sprzedaży ponieważ:\n"
+"1.Stan tej pozycji zamówienia jest 'Projekt' lub 'Anulowano'!\n"
+"albo\n"
+"2.Pozycja jest już zafakturowana!"
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -267,6 +927,59 @@ msgstr "Utwórz i pokaż fakturę"
 msgid "My Quotations"
 msgstr "Moje oferty"
 
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktury"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Grudzień"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Umowy"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Wysłano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr "Waluta"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niezafakturowane"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategoria produktu"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Nie mozna anulowac tego zamówienia sprzedaży!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Utwórz fakturę od nowa"
+
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
@@ -277,6 +990,585 @@ msgstr "Pozwala ustawić powiadomienia dotyczące klienta lub produktół"
 msgid "Shop Name"
 msgstr "Nazwa sklepu"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr "Moje zamówienia sprzedaży"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Podatki :"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Zafakturowano"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktura zaliczkowa"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+"Aby pozwolić sprzedawcy fakturować zamówienie po pozycjach przy pomocy menu "
+"'Pozycje do fakturowania'."
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Otwórz menu Sprzedaż"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr "Nie możesz potwierdzić zamówienia sprzedaży bez pozycji."
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "W toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nie zdefiniowano żadnego klienta !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr "Uruchamia wydania automatycznie z zamówień sprzedaży."
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Utwórz faktury"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potwierdzone"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Zaliczka %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Projekt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Szablony wiadomości"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Partner, któremu produkt powinien być przydzielony."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Umowa / konto analityczne"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Czeka na planowanie"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Warunki i zapisy"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Zamówienia sprzedaży"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Kwota podatku"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr "Współczynnik zafakturowanych"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Na życzenie"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Sierpień"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Steruje zapotrzebowaniami i fakturowaniem"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Do zrobienia"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Czerwiec"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Kolejność"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza Sprzedaży"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Jest wypowiadającym się"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statystyka zamówień sprzedaży"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Sprzedawca"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Listopad"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Rozszerzone filtry..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Oferta"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Produkt - zaliczka"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Wyjątek"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Październik"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Sprzedawca tworzy fakturę ręcznie, Jeśli zasady wysyłki są 'Wysyłka i ręczna "
+"faktura'. Faktura jest tworzona automatycznie, jeśli zasady wysyłki są "
+"'Płatność przed dostawą'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Sklep sprzedaży"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Wybierz produkt typu usługa i nazwie 'Zaliczka'.\n"
+"                Możesz utworzyć taki produkt i ustawić go jako domyślny dla "
+"tego pola.."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Styczeń"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr "Pozwól na upusty na pozycjach zamówienia sprzedaży"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Zam. sprzedaży w trakcie przetwarzania"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+"Pozwala konfigurować powiadomienia przy produkcie i kliencie.\n"
+"Przykład: Produkt: ten produkt wychodzi z użycia - Ostrzeż klienta.\n"
+"               Klient: Zapytaj, czy chce ekspresową dostawę."
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Konto analityczne związane z zamówieniem sprzedaży."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Wyświetl fakturę"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Co chcesz fakturować?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Stosuj cenniki do przypisania różnych cen klientom"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Sprzedawca potwierdza ofertę. Stan zamówienia sprzedaży zmieni się na 'W "
+"toku' lub 'Ręczne w toku'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Musisz wybrać cennik lub klienta w zamówieniu !\n"
+"Wybierz przed wybraniem produktu."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Odnośnik do dokumentu, który wygenerował to zapytanie ofertowe."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nie znaleziono poprawnej pozycji cennika ! :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Zaliczka %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Opóźnienie dostawy"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Oferty"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoruj wyjątek"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Adres dostawy dla bieżącego zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Pokaż marże na zamówieniach sprzedaży"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"To jest lista faktur, które zostały wystawione do tego zamówienia sprzedaży. "
+"Zmaówienie mogło być fakturowane kilkukrotnie (np. po kilka pozycji)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Twój numer"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Pokaż pozycje do fakturowania"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Data zamówienia"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cennik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "NIP :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Faktury dla klientów"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Poztwierdzone zamówienia sprzedaży do fakturowania."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Sprzedaż"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Jeśli zmieniasz cennik lub walutę, to ceny w zamówieniu się nie zmienią."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Il."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "z zapasu"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data oferty"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Suma"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Wykonano"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adres do faktury :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Moje pozycje zamówień sprzedaży"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Wypowiadający się"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Brak cennika ! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr "Zamówienia sprzedaży "
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr "Oferta wysłana"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Przeszukaj niezafakturowane pozycje"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Odnośnik zamowienia musi być unikalny w firmie!"
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -300,213 +1592,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Oferta "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Zaliczka %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Sprzedaże w stanie wyjątku"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Partner, któremu produkt powinien być przydzielony."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Stan"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Sierpień"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknij, aby utworzyć ofertę, która później będzie "
-"zamówieniem sprzedaży\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP pomoże ci przejść proces sprzedaży:\n"
-"                Oferta, Zamówienie sprzedaży, Faktura i płatność.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Czerwiec"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statystyka zamówień sprzedaży"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Konto analityczne związane z zamówieniem sprzedaży."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Październik"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Podsumowanie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Wyświetl fakturę"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Zaliczka %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Oferty"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Ilość"
+msgid "Shipping address :"
+msgstr "Adres do wysyłki :"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Adres dostawy dla bieżącego zamówienia sprzedaży"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "NIP :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Wrzesień"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Obszar podatkowy"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "W toku"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Projekt faktury %s %s <b>czeka na zatwierdzenie</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Sprzedawca potwierdza ofertę. Stan zamówienia sprzedaży zmieni się na 'W "
-"toku' lub 'Ręczne w toku'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"Nie można anulować zamówienia sprzedaży,które już jest zafakturowane."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adres do faktury dla tego zamówienia sprzedaży."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Przed dostawą"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Adresy w zamówieniu sprzedaży"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Umowa / konto analityczne"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Włącz fakturowanie pozycji"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Miesiąc zamówień sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -515,435 +1606,24 @@ msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "lub"
+msgid "Invoice Sales Order"
+msgstr "Fakturuj zamówienie sprzedaży"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Zafakturowano"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Ksiągowość analityczna dla sprzedaży"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data potwierdzenia"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Partner współpracujący"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzec"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Sprzedaż: oznacz jako przeczytane"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Suma kwot"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr "Pozwól na grupowe fakturowanie dostaw przez dzienniki"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Suma częściowa"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Pozwól stosowac upust na pozycjach zamówienia sprzedaży"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adres do faktury :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Jednostka miary "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "Domyślną jednostką miary czasu dla usług jest"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adres do faktury"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Pozycje zamówienia sprzedaży związane z moim zamówieniem"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Oferta / Zamówienie"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Stosuj umowy"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Pozycja zamówienia sprzedaży"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "jeden pracownik może mieć różne role dla umowy"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Drukuj"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Nr zamówienia"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Pozycje zamówienia"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Stosuj wiele kont analitycznych w sprzedaży"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data utworzenia"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Zamówienie sprzedaży dla <em>%s</em> ustawiono na <b>Wykonano</b>"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Pozycje dostarczone i niezafakturowane"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Suma :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moja sprzedaż"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cennik"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr "Brak konta przychodów w globalnych właściwościach"
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Błąd konfiguracji!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "Wysłano jako mail"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Godzina"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data zamówienia"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Wysłano"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-"Aby pozwolić sprzedawcy tworzyć faktury dla pozycji zamówienia sprzedaży "
-"przez menu 'Pozycje do fakturowania'."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Utwórz i pokaż fakturę"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknij, aby utworzyć sklep.\n"
-"              </p><p>\n"
-"                Każda oferta i zamówienie sprzedaży musi być powiązana ze "
-"sklepem.\n"
-"                Sklep definiuje magazyn wydawania produktów dla danej "
-"sprzedaży.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data oferty"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Nie możesz potwierdzać zamówienia sprzedaży bez pozycji."
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Musisz wybrać cennik lub klienta w zamówieniu !\n"
-"Wybierz przed wybraniem produktu."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategoria produktu"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Nie mozna anulowac tego zamówienia sprzedaży!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Utwórz fakturę od nowa"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr "Aby usunąć zamówienie sprzedaży, musisz je najpierw anulować !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Podatki :"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "Na życzenie"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "nieznane"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Jest wypowiadającym się"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Rozszerzone filtry..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Wyjątek"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-"Wybierz produkt typu usługa i nazwie 'Zaliczka'.\n"
-"                Możesz utworzyć taki produkt i ustawić go jako domyślny dla "
-"tego pola.."
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-"Pozwala konfigurować powiadomienia przy produkcie i kliencie.\n"
-"Przykład: Produkt: ten produkt wychodzi z użycia - Ostrzeż klienta.\n"
-"               Klient: Zapytaj, czy chce ekspresową dostawę."
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nie znaleziono poprawnej pozycji cennika ! :"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Pokaż marże na zamówieniach sprzedaży"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"To jest lista faktur, które zostały wystawione do tego zamówienia sprzedaży. "
-"Zmaówienie mogło być fakturowane kilkukrotnie (np. po kilka pozycji)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Twój numer"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Il."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Moje pozycje zamówień sprzedaży"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Odnośnik zamowienia musi być unikalny w firmie!"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -952,382 +1632,60 @@ msgstr ""
 "Nie można znaleźć pozycji cennika odpowiadającej tej ilości i produktowi.\n"
 "Musisz zmienić ilość, produkt lub cennik."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Zaliczkowa faktura sprzedaży"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Utwórz fakturę"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Kwota bez podatku"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Odnośnik zamówienia"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and 'Oferta' "
-"or 'Zamówienie'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "To oznacza, że faktura została zapłacona."
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Numer Oferty"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na zamówienie"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adres do wysyłki :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Pozwala stosować konta analityczne dla sprzedaży."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Stan projekt zamówienia sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Oferta dla <em>%s</em> <b>została utworzona</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Wiadomości i historia komunikacji"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nowa kopia oferty"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-"Nie można usunąć pozycji zamówienia, jeśli zamówienie jest w stanie '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Właściwości pozycji"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Zanim wybierzesz produkt,\n"
-" wybierz klienta w formularzu."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Zawiera sumę podatków"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data zamówienia sprzedaży"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potwierdź ofertę"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Pozycje do zafakturowania"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupuj wg"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Cechy produktu"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Czeka na planowanie"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Jednostka Miary"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda zapotrzebowania"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena jednostkowa"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Fakturuj całe zamówienie sprzedaży"
+msgid "Percentage"
+msgstr "Procentowo"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Nieprzeczytane wiadomości"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Projekt oferty"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Zamówienie sprzedaży"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Podatki"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Zamówienia sprzedaży gotowe do fakturowania"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data utworzenia zamówienia sprzedaży"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Utwórz faktury"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Niedozwolona akcja!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Kwota zaliczki"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Wysyłane ilości"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Jeśli zmieniasz cennik lub walutę, to ceny w zamówieniu się nie zmienią."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Utwórz faktury"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# zamówień sprzedaży"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Do zafakturowania"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Rok zamówienia sprzedaży"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Lipiec"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Po kliknięciu 'Pokaż pozycje do fakturowania', wybierz pozycje do "
-"fakturowania i utwórz fakturę z rozwijanego menu 'Więcej'."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "To oznacza, że zamówienie sprzedaży na co najmniej jedną fakturę."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Wyjątek wysyłki"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupuj faktury"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-"Oferta dla <em>%s</em> <b> została skonwertowana</b> do zamówienia sprzedaży "
-"%s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Fakturuj zamówienie sprzedaży"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Umowy"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Miesiąc"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Do sprawdzenia przez księgowego."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Utwórz faktury"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Poprzednie oferty"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Zapłacone"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza Sprzedaży"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Oferta"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Sprzedawca tworzy fakturę ręcznie, Jeśli zasady wysyłki są 'Wysyłka i ręczna "
-"faktura'. Faktura jest tworzona automatycznie, jeśli zasady wysyłki są "
-"'Płatność przed dostawą'."
+msgid "Other Information"
+msgstr "Inne informacje"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1350,27 +1708,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1385,7 +1726,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1426,94 +1767,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Stosuj cenniki do przypisania różnych cen klientom"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Potwierdzone pozycje zamówienia sprzedaży, jeszcze nie dostarczone"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-"Zamówienie sprzedaży automatycznie tworzy propozycje faktury (Projekt "
-"faktury). Powinieneś to wybrać, jeśli chcesz fakturować na podstawie "
-"zamówionych "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Faktury dla klientów"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Sprzedaż"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"To dodaje 'Marżę' na zamówieniach sprzedaży.\n"
-"                To podaje zyskowność licząc różnicę między Ceną sprzedaży i "
-"ceną ksoztową.\n"
-"                To instaluje moduł sale_margin."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena jednostkowa"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Dokument źródłowy"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Do zrobienia"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Kwota bez podatku"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Zaliczkowa faktura sprzedaży"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1523,9 +1776,39 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Generuj faktury na podstawie pozycji zamówienia sprzedaży"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Suma kwot"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Potwierdź sprzedaż"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr "Nie zdefiniowano konta przychodów dla produktu: \"%s\" (id:%d)."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and 'Oferta' "
+"or 'Zamówienie'} (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1545,417 +1828,33 @@ msgstr ""
 "musi być zapłacony przed wydaniem."
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Miesięczny obrót"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"To jest raport do ofert i zamówień sprzedaży. Pozwala on analizować sprzedaż "
+"według różnych kryteriów (na sprzedawców , klientów, produkty). Stosuj ten "
+"raport do analizy sprzedaży niezafakturowanej. Jeśli chcesz analizować "
+"obroty, to powinieneś stosować analizę fakturową w aplikacji Księgowość."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura na"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Cena ustalona (kaucja)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Oferta / Zamówienie"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data zamówienia"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "JS produktu"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ręcznie w toku"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Sprzedaż: Oznacz jako nieprzeczytane"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Kolejność"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Potwierdź sprzedaż"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Z zamówienia sprzedaży"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignoruj wyjątek"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Zależnie od ustawień fakturowania zamówienia sprzedaży, faktura może być "
-"wygenerowana wg ilości pobranych lub zamówionych. W takim przypadku "
-"Zamówienie sprzedaży może wygenerować projekt faktury zaraz po zatwierdzeniu "
-"zamówienia."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Część pozycji sprzedaży"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Upust na pozycjach"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Odnośnik klienta"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Suma"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Wybierz jak chcesz fakturować to zamówienie. Zostanie\n"
-"                        utworzony projekt faktury, który może być "
-"modyfikowany\n"
-"                        przed zatwierdzeniem."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Konsola sprzedaży"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Zastosuj Wszystko, aby utworzyć końcową fakturę.\n"
-"                Zastosuj Procentowo, aby zafakturować część kwoty.\n"
-"                Zastosuj Ustalona cena, aby zafakturować konkretną kwotę "
-"zaliczki.\n"
-"                Zastosuj Część pozycji, aby zafakturować wybrane pozycje "
-"zamówienia."
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"Pozwala definiować warunki sprzedaży dla klientów: fakturowanie\n"
-"            (Ustalona cena, wg karty czasu pracy, zaliczki), cennik\n"
-"            (650€/dzień za programistę), okresy (rok gwarancji).\n"
-"            Będziesz mógł sprawdzać postępy w umowie automatycznie.\n"
-"            To instaluje moduł account_analytic_analysis."
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data potwierdzenia zamówienia sprzedaży."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-"Najpierw anuluj wszystkie faktury związane z tym zamówieniem sprzedaży."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data faktury"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Kwota do zafakturowania z góry."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Wyjątek faktury"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nie zdefiniowano żadnego klienta !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Adres dostawy"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Sprzedaż do faktury"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Funkcjonalność magazynu"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Wiadomości"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Błąd!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Suma netto :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Z zapasu: Produkt będzie pobrany z magazynu lub nastąpi oczekiwanie na "
-"uzupełnienie zapasów.\n"
-"Na zamówienie: Produkt będzie kupiony lub wyprodukowany."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Przeszukaj niezafakturowane pozycje"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Oferta wysłana"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Kreator email"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Sklep"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data potwierdzenia"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr "Zdefiniuj dziennik sprzedaży dla tej firmy: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Zapisy umowy"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Zamówienie sprzedaży"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Ilość (JS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Ppzycje zamówienia sprzedaży w stanie 'wykonano'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potwierdzone"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Warunki i zapisy"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potwierdź"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Wypowiadający się"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Pozycje faktury"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# pozycji"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Pozycje zamówienia sprzedaży"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Opcje domyślne"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Księgowość analityczna dla sprzedaży"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Cennik EDI (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknij, aby utworzyć ofertę lub zamówienie sprzedaży dla "
-"klienta.\n"
-"              </p><p>\n"
-"                OpenERP pomoże ci operować na całym procesie sprzedaży:\n"
-"                ofercie, zamówieniu sprzedaży, fakturze i płatności.\n"
-"              </p><p>\n"
-"                Specjalne funkcjonalności pomogą ci organizować kontakty\n"
-"                z klientem, a klientowi pozwolą obserwować\n"
-"                rozwój sytuacji w zakresie konkretnego zamówienia.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "Na podstawie wydania"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Referencyjna jednostka miary"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Czy chcesz utworzyć fakturę(y) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1965,267 +1864,45 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknij, aby utworzyć ofertę. Pierwszy krok procesu "
-"sprzedaży.\n"
-"              </p><p>\n"
-"                OpenERP pomoże ci w całym procesie:\n"
-"                od oferty przez zamówienie sprzedaży,\n"
-"                wydanie, fakturowanie do przyjęcia płatności.\n"
-"              </p><p>\n"
-"                Specjalne funkcjonalności pozwolą ci organizować "
-"komunikację\n"
-"                z klientem a klientowi obserwować rozwój sytuacji "
-"dotyczącej\n"
-"                konkretnego zamówienia.\n"
-"              </p>\n"
-"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
-"Nie można utworzyć faktury do tej pozycji zamówienia sprzedaży ponieważ:\n"
-"1.Stan tej pozycji zamówienia jest 'Projekt' lub 'Anulowano'!\n"
-"albo\n"
-"2.Pozycja jest już zafakturowana!"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Wykonane pozycje zamówienia sprzedaży"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Do sprawdzenia przez księgowego."
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Waga"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Właściwości pozycji"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faktury"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Grudzień"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr "Nie zdefiniowano konta przychodów dla produktu: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Niezafakturowane"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Steruje zapotrzebowaniami i fakturowaniem"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Kwota bez podatku"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktura zaliczkowa"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Otwórz menu Sprzedaż"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Generuj wydania prosto z Zamówień sprzedaży"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Kwota podatku"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Zamówienie sprzedaży "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Pozycje zamówienia sprzedaży do fakturowania"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Szablony wiadomości"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Zamówienia sprzedaży"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Sklep sprzedaży"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Listopad"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Produkt - zaliczka"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr "Określa kolejność pozycji w zamówieniu"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Styczeń"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Zam. sprzedaży w trakcie przetwarzania"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Generuj faktury na podstawie karty czasu pracy"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Zamówienie sprzedaży dla <em>%s</em> <b>anulowano</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Odnośnik do dokumentu, który wygenerował to zapytanie ofertowe."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Opóźnienie dostawy"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Stan zamówienia"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Pokaż pozycje do fakturowania"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Data zamówienia"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Poztwierdzone zamówienia sprzedaży do fakturowania."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Zamówienia sprzedaży jeszcze nie potwierdzone"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "z zapasu"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Brak cennika ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Zamówienia sprzedaży"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Stosuj umowy"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "To oznacza, że faktura została zapłacona."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Czy chcesz utworzyć fakturę(y) ?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Sprzedaż do faktury"
 
 #. module: sale
 #: view:sale.order:0
@@ -2249,11 +1926,131 @@ msgstr "Zaliczka"
 msgid "February"
 msgstr "Luty"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura na"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Cena ustalona (kaucja)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Wrzesień"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data zamówienia"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Przed dostawą"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "JS produktu"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Stan projekt zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Dokument źródłowy"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Kwiecień"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ręcznie w toku"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Ostrzeżenie !"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Poprzednie oferty"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Podsumowanie"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Wiadomości i historia komunikacji"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Przeszukaj zamówienia sprzedaży"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2264,20 +2061,49 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Miesiąc zamówień sprzedaży"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Z zamówienia sprzedaży"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Przeszukaj zamówienia sprzedaży"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr "Potwierdzone zamówienia sprzedaży, jeszcze nie wydane"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Co chcesz fakturować?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Zależnie od ustawień fakturowania zamówienia sprzedaży, faktura może być "
+"wygenerowana wg ilości pobranych lub zamówionych. W takim przypadku "
+"Zamówienie sprzedaży może wygenerować projekt faktury zaraz po zatwierdzeniu "
+"zamówienia."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Numeracja"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "JS"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Część pozycji sprzedaży"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+"Nie można usunąć pozycji zamówienia, jeśli zamówienie jest w stanie '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2286,23 +2112,33 @@ msgid "Payment Term"
 msgstr "Warunki płatności"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr ""
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Zamówienia sprzedaży gotowe do fakturowania"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"To jest raport do ofert i zamówień sprzedaży. Pozwala on analizować sprzedaż "
-"według różnych kryteriów (na sprzedawców , klientów, produkty). Stosuj ten "
-"raport do analizy sprzedaży niezafakturowanej. Jeśli chcesz analizować "
-"obroty, to powinieneś stosować analizę fakturową w aplikacji Księgowość."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr "Generuj faktury na podstawie pozycji zamówień sprzedaży"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "lub"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Pozycje zamówienia sprzedaży"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cennik dla tego zamówienia sprzedaży."
 
 #. module: sale
 #: report:sale.order:0
@@ -2310,21 +2146,69 @@ msgid "Quotation N°"
 msgstr "Nr oferty"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Upust na pozycjach"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Odnośnik klienta"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Wydano"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Rok"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"To dodaje 'Marżę' na zamówieniach sprzedaży.\n"
+"                To podaje zyskowność licząc różnicę między Ceną sprzedaży i "
+"ceną ksoztową.\n"
+"                To instaluje moduł sale_margin."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Zanim wybierzesz produkt,\n"
+" wybierz klienta w formularzu."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Zawiera sumę podatków"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nowa kopia oferty"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Wybierz jak chcesz fakturować to zamówienie. Zostanie\n"
+"                        utworzony projekt faktury, który może być "
+"modyfikowany\n"
+"                        przed zatwierdzeniem."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data zamówienia sprzedaży"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
@@ -2372,6 +2256,9 @@ msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
 #~ msgid "Our Salesman"
 #~ msgstr "Nasz sprzedawca"
 
+#~ msgid "Sale Order"
+#~ msgstr "Zamówienie sprzedaży"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Cennik sprzedaży"
 
@@ -3563,12 +3450,22 @@ msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
 #~ msgid "Based on Timesheet"
 #~ msgstr "Na podstawie karty czasu pracy"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Pozycje zamówień sprzedaży potwierdzone, wykonane lub w stanie wyjątku, "
+#~ "które jeszcze nie były zafakturowane"
+
 #~ msgid "Based on Tasks' Work"
 #~ msgstr "Na podstawie zadań"
 
 #~ msgid "Print Quotation"
 #~ msgstr "Drukuj Ofertę"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Moje zamówienia sprzedaży"
+
 #~ msgid "Invoice based on deliveries"
 #~ msgstr "Faktura wg dostaw"
 
@@ -3612,6 +3509,10 @@ msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
 #~ msgid "Options"
 #~ msgstr "Opcje"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Nie możesz potwierdzać zamówienia sprzedaży bez pozycji."
+
 #~ msgid "Qty(UoS)"
 #~ msgstr "Ilość(JS)"
 
@@ -3643,6 +3544,9 @@ msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Zamówienie (Odn ${object.name or 'n/a' })"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Potwierdzone pozycje zamówienia sprzedaży, jeszcze nie dostarczone"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -3672,6 +3576,9 @@ msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
 #~ msgid "Main Method Based On"
 #~ msgstr "Główna metoda na podstawie"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Ppzycje zamówienia sprzedaży w stanie 'wykonano'"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Zamówienia sprzedaży utworzone w tym roku"
 
@@ -3895,6 +3802,12 @@ msgstr "Chcesz fakturować wybrane pozycje zamówienia sprzedaży?"
 #~ "% endif\n"
 #~ "            "
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Wykonane pozycje zamówienia sprzedaży"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Pozycje zamówienia sprzedaży do fakturowania"
+
 #, python-format
 #~ msgid "Not enough stock ! : "
 #~ msgstr "Brak zapasu ! : "
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 7f5ed2a6b4c..34996be74e9 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -6,50 +6,196 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-17 14:20+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:38+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
-"Linhas da ordem de vendas estão confirmadas, concluídas ou em estado de "
-"exceção e ainda não foram faturados"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar cotação"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Painel de controlo de vendas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data de confirmação"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Vendedor"
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Lista de Preços para esta ordem de venda."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Parceiro do lote"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidade de Medida"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método de aquisição"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data em que ordem de venda é confirmada."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens por ler"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data da Fatura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Linhas não Faturadas e Entregues"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceção da Fatura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Orçamento "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Rascunho de orçamento"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Endereço de entrega"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Conta Analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +205,29 @@ msgstr "Dia"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar Ordem de Venda"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unidade de Medida "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +240,177 @@ msgstr "Dados incorretos"
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "sob pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Montante sem imposto"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Projeto"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Líquido :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Linhas da ordem de vendas relacionadas com uma ordem de vendas minha"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Orçamento enviado"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepção de Expedição"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantidade (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Loja"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Excepção de Vendas"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Endereço da Fatura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data em que a ordem de venda é criada."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Falso"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Criar Faturas"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ação inválida!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +423,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Confirmar Data"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Conta Analítica"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -116,6 +440,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -123,8 +452,66 @@ msgid "# of Qty"
 msgstr "# de Qtd"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(atualizar)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Ordem de venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha da ordem de venda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Adiantamento do Valor"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -134,16 +521,54 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Termos de Pagamento Padrão"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fatura <b>paga</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Turnover Mensal"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Quantidades Enviadas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Ano"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -151,465 +576,14 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Percentagem"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preço Total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque a caixa para agrupar as faturas para o mesmo cliente"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Minhas Ordens de Venda"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantidades Pedidas"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Ordem de Referência"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Outra informação"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Processo de faturação"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Cotações e Vendas"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vendas Gerar Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Aviso Lista de Preços!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Desconto (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr "Criar & ver fatura"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Minhas Cotações"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nome da Loja"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Quotation "
-msgstr "Orçamento "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Excepção de Vendas"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junho"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estatísticas de ordens de venda"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "A conta analítica relacionada com uma ordem de venda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Outubro"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Cotações"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Quantidade"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setembro"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posição Fiscal"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Em Progresso"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"O Vendedor confirma a cotação. O estado da ordem de venda passa a 'em "
-"processamento' ou 'Em Processamento Manual'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Morada de faturação para esta ordem de venda."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Ordenado pelo mês da ordem de vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Não pode agrupar vendas que tenham moedas diferentes para o mesmo parceiro."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "ou"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data de confirmação"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Parceiro do lote"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Março"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Montante total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Endereço da Fatura :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Unidade de Medida "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Endereço da Fatura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Linhas da ordem de vendas relacionadas com uma ordem de vendas minha"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotação / Ordem"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(atualizar)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linha da ordem de venda"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Ordem de Vendas que ainda não foram confirmadas"
 
 #. module: sale
 #: view:sale.order:0
@@ -622,13 +596,36 @@ msgid "Order N°"
 msgstr "Ordem Nº"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Linhas da Ordem"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Linhas da Fatura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -640,38 +637,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque a caixa para agrupar as faturas para o mesmo cliente"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Criar faturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Data da Criação"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para Faturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Morada de faturação para esta ordem de venda."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Ordenar por ano a ordem de venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Linhas não Faturadas e Entregues"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantidade"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "As minhas vendas"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Preços"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ordem de Referência"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posição Fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julho"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -688,29 +753,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr "Enviar por Email"
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Hora"
+msgid "EDI Pricelist (%s)"
+msgstr "Lista Preços EDI (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Processo de faturação"
 
 #. module: sale
 #: view:sale.order:0
@@ -718,23 +813,37 @@ msgid "Order Date"
 msgstr "Data da Ordem"
 
 #. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Enviado"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotações e Vendas"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pago"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -742,40 +851,97 @@ msgid "Create and View Invoice"
 msgstr "Criar e ver fatura"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data da cotação"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar as faturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "O valor a ser faturado com antecedência."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vendas Gerar Fatura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Não pode confirmar uma ordem de venda que não tem nenhuma linha."
+msgid "Pricelist Warning!"
+msgstr "Aviso Lista de Preços!"
 
 #. module: sale
-#: code:addons/sale/sale.py:1124
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Desconto (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Tem que selecionar uma lista de preços ou um cliente no formulário da "
-"venda!\n"
-"Por favor defina um antes de escolher o artigo."
+"Fatura não pode ser criada para esta linha de Ordem de vendas devido a uma "
+"das seguintes razões:\n"
+"1.O estado desta linha ordem de vendas esteja como \"Projeto\" ou "
+"\"cancelada\"!\n"
+"2.A linha da ordem de vendas é faturada!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr "Criar & ver fatura"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minhas Cotações"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Gestão de contratos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Por faturar"
 
 #. module: sale
 #: view:sale.report:0
@@ -784,7 +950,7 @@ msgid "Category of Product"
 msgstr "Categoria do artigo"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "Não é possível cancelar esta ordem de venda!"
@@ -795,10 +961,18 @@ msgid "Recreate Invoice"
 msgstr "Recriar Fatura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nome da Loja"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -806,36 +980,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Impostos :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Adiantamento da Fatura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Abrir menu de vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Em Progresso"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nenhum Cliente Definido !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Criar Faturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Sale OrderLine Make_invoice"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Email Templates"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "A Espera da Agenda"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Termos e condições"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Ordens de Vendas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "O valor do imposto."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr "A pedido"
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "desconhecido"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Configura aquisições e faturação"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "A Fazer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ordem"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análise de vendas"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr "É um seguidor"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estatísticas de ordens de venda"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Data"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Vendedor"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembro"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtros Avançados..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotação"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Artigo \"Adiantamento\""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepção"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"O vendedor cria uma fatura manualmente, se a política de entrega da ordem de "
+"vendas é 'Entrega Manual em Processamento'. A fatura é criada "
+"automaticamente se a política de entrega é 'Pagamento depois da Entrega'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Loja"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -844,6 +1245,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Ordem de Venda em Progresso"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -854,11 +1279,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "A conta analítica relacionada com uma ordem de venda."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Quer faturar o quê?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"O Vendedor confirma a cotação. O estado da ordem de venda passa a 'em "
+"processamento' ou 'Em Processamento Manual'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tem que selecionar uma lista de preços ou um cliente no formulário da "
+"venda!\n"
+"Por favor defina um antes de escolher o artigo."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Da referência do documento que gerou a ordem do pedido de vendas."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Nenhuma linha válida da lista de preços encontrada"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Atraso no Compromisso"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotações"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar Excepção"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -880,266 +1391,55 @@ msgid "Your Reference"
 msgstr "Sua Referência"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qtd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Minhas linhas da ordem de vendas"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Ordem de referência deve ser única por empresa!"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
-#, python-format
-msgid ""
-"Cannot find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Criar Fatura"
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Data da ordem"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Referência da ordem"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Preços"
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Preço"
+msgid "TVA :"
+msgstr "IVA :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "sob pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Endereço para envio :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado projeto de ordem de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
+#: code:addons/sale/sale.py:441
 #, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
+msgid "Customer Invoices"
+msgstr "Faturas de clientes"
 
 #. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Confirmação da fatura da ordem de vendas."
 
 #. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total com impostos"
-
-#. module: sale
 #: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data do Pedido da ordem de vendas"
+msgid "Sales"
+msgstr "Vendas"
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar cotação"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "A Espera da Agenda"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Unidade de Medida"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método de aquisição"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Fatura a ordem de venda inteira"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensagens por ler"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Rascunho de orçamento"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Ordem de Venda"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Ordem de vendas pronta a ser faturada"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data em que a ordem de venda é criada."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Criar Faturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Ação inválida!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Adiantamento do Valor"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantidades Enviadas"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
+#: code:addons/sale/sale.py:301
 #, python-format
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
@@ -1149,139 +1449,208 @@ msgstr ""
 "preços das linhas de pedidos existentes não serão atualizados."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qtd"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "do stock"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data da cotação"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
 #: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Criar faturas"
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Concluído"
 
 #. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Endereço da Fatura :"
 
 #. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Minhas linhas da ordem de vendas"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para Faturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Ordenar por ano a ordem de venda"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julho"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepção de Expedição"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar as faturas"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Faturar ordem de venda"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Gestão de contratos"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "A ser revisto pelo contabilista"
-
-#. module: sale
-#: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Criar Faturas"
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Sale OrderLine Make_invoice"
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotações antigas"
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Sem Lista de Preços ! : "
 
 #. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pago"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análise de vendas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotação"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+#: view:sale.order:0
+msgid "Sales Order "
 msgstr ""
-"O vendedor cria uma fatura manualmente, se a política de entrega da ordem de "
-"vendas é 'Entrega Manual em Processamento'. A fatura é criada "
-"automaticamente se a política de entrega é 'Pagamento depois da Entrega'."
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Procurar linhas não faturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordem de referência deve ser única por empresa!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Endereço para envio :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Não pode agrupar vendas que tenham moedas diferentes para o mesmo parceiro."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Fatura de Pagamento de Adiantamento das vendas"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Criar Fatura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Valor sem Imposto"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Referência da ordem"
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Isto indica que a fatura foi paga."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preço Unitário"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Percentagem"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Outra informação"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1304,27 +1673,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1339,7 +1691,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1380,87 +1732,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Linhas da ordem de vendas confirmadas, mas ainda não foram entregues"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Faturas de clientes"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Vendas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preço Unitário"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento de Origem"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "A Fazer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Valor sem Imposto"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Fatura de Pagamento de Adiantamento das vendas"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1470,9 +1741,37 @@ msgid "Product"
 msgstr "Artigo"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Gerar faturas com base nas linhas da ordem de venda"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Montante total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Preço"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1486,388 +1785,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Turnover Mensal"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fatura sobre"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Este relatório realiza uma análise sobre as cotações e pedidos das vendas. "
+"Analisa e verifica as receitas das vendas e classifica-as por critérios e "
+"diferentes grupos (vendedor, parceiro, artigo, etc.) Utilize este relatório "
+"para realizar a análise sobre as vendas que não foram faturadas ainda. Se "
+"quiser analisar o volume dos negócios, deve usar o relatório de análise da "
+"fatura na aplicação da Contabilidade."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotação / Ordem"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data Pedida"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UoS do artigo"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual em Progresso"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ordem"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "A partir de ordem de venda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar Excepção"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Dependendo da ordem de vendas e controle das faturas, estas pode ser "
-"baseadas em entregas ou em quantidades encomendadas. Assim, uma ordem de "
-"venda pode gerar uma fatura ou uma ordem de entrega, assim que é confirmada "
-"pelo vendedor."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referência do cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Painel de controlo de vendas"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data em que ordem de venda é confirmada."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data da Fatura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "O valor a ser faturado com antecedência."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceção da Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nenhum Cliente Definido !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Endereço de entrega"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Líquido :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Procurar linhas não faturadas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Orçamento enviado"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Loja"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Confirmar Data"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Ordem de venda"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantidade (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Linhas da ordem de vendas que estejam no estado 'Concluído'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Termos e condições"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Seguidores"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Linhas da Fatura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linhas"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Linhas da Ordem de Venda"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Lista Preços EDI (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Quer mesmo criar as faturas?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1877,254 +1823,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Fatura não pode ser criada para esta linha de Ordem de vendas devido a uma "
-"das seguintes razões:\n"
-"1.O estado desta linha ordem de vendas esteja como \"Projeto\" ou "
-"\"cancelada\"!\n"
-"2.A linha da ordem de vendas é faturada!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Linhas da ordem de vendas concluídas"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Dezembro"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Por faturar"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "A ser revisto pelo contabilista"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Configura aquisições e faturação"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Montante sem imposto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Adiantamento da Fatura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Abrir menu de vendas"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "O valor do imposto."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Ordem de venda "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Linhas da ordem de vendas prontas para serem faturadas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Email Templates"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Ordens de Vendas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Loja"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembro"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Artigo \"Adiantamento\""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Janeiro"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Ordem de Venda em Progresso"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Da referência do documento que gerou a ordem do pedido de vendas."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Atraso no Compromisso"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Data da ordem"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Confirmação da fatura da ordem de vendas."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Ordem de Vendas que ainda não foram confirmadas"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "do stock"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Sem Lista de Preços ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Ordens de venda"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Isto indica que a fatura foi paga."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maio"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Quer mesmo criar as faturas?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2147,11 +1885,131 @@ msgstr "Avançar"
 msgid "February"
 msgstr "Fevereiro"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fatura sobre"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data Pedida"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UoS do artigo"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado projeto de ordem de venda"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento de Origem"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual em Progresso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotações antigas"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Procurar ordens de venda"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descrição"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2162,20 +2020,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Ordenado pelo mês da ordem de vendas"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "A partir de ordem de venda"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Procurar ordens de venda"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Quer faturar o quê?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Dependendo da ordem de vendas e controle das faturas, estas pode ser "
+"baseadas em entregas ou em quantidades encomendadas. Assim, uma ordem de "
+"venda pode gerar uma fatura ou uma ordem de entrega, assim que é confirmada "
+"pelo vendedor."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2184,25 +2070,33 @@ msgid "Payment Term"
 msgstr "Termo do Pagamento"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Ordem de vendas pronta a ser faturada"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"Este relatório realiza uma análise sobre as cotações e pedidos das vendas. "
-"Analisa e verifica as receitas das vendas e classifica-as por critérios e "
-"diferentes grupos (vendedor, parceiro, artigo, etc.) Utilize este relatório "
-"para realizar a análise sobre as vendas que não foram faturadas ainda. Se "
-"quiser analisar o volume dos negócios, deve usar o relatório de análise da "
-"fatura na aplicação da Contabilidade."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "ou"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Linhas da Ordem de Venda"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Lista de Preços para esta ordem de venda."
 
 #. module: sale
 #: report:sale.order:0
@@ -2210,22 +2104,60 @@ msgid "Quotation N°"
 msgstr "Cotação nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referência do cliente"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Escolhido"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Ano"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total com impostos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data do Pedido da ordem de vendas"
+
 #~ msgid "Quantity (UoM)"
 #~ msgstr "Quantidade (UdM)"
 
@@ -2293,6 +2225,9 @@ msgstr ""
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Minhas vendas na excepção de envio"
 
+#~ msgid "Sale Order"
+#~ msgstr "Ordem de Venda"
+
 #~ msgid "Properties"
 #~ msgstr "Propriedades"
 
@@ -3305,9 +3240,19 @@ msgstr ""
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Unidade de tempo de trabalho principal"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Minhas Ordens de Venda"
+
 #~ msgid "Based on Timesheet"
 #~ msgstr "Com base na folha de horas"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Linhas da ordem de vendas estão confirmadas, concluídas ou em estado de "
+#~ "exceção e ainda não foram faturados"
+
 #~ msgid "Invoice based on deliveries"
 #~ msgstr "Fatura baseada nas entregas"
 
@@ -3380,6 +3325,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Opções"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Não pode confirmar uma ordem de venda que não tem nenhuma linha."
+
 #~ msgid "Deliver all products at once"
 #~ msgstr "Entregar todos os artigos de uma só vez"
 
@@ -3439,6 +3388,9 @@ msgstr ""
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Linhas da ordem de vendas confirmadas, mas ainda não foram entregues"
+
 #~ msgid "Setup your Invoicing Method"
 #~ msgstr "Configure o seu método de faturação"
 
@@ -3448,6 +3400,15 @@ msgstr ""
 #~ msgid "Print Order"
 #~ msgstr "Ordem de Impressão"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Linhas da ordem de vendas concluídas"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Linhas da ordem de vendas prontas para serem faturadas"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Linhas da ordem de vendas que estejam no estado 'Concluído'"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Métodos principais baseados"
 
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index e7abea174e8..6831c93059a 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -7,51 +7,207 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-18 00:47+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 17:48+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Contabilidade Analítica para Vendas"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar Cotação"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Painel de Vendas"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Linhas do Pedido de Venda que estão confirmadas, feitas ou em situação de "
-"excessão e não foram ainda faturadas."
+"Não existe nenhuma conta de recebimento definida como propriedade global."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Linhas do Pedido para Faturar"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data de Confirmação"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Vendedor"
+msgid "Group By..."
+msgstr "Agrupar Por..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Lista de preços para o pedido de venda atual."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Parceiro designado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Ordem de Fatura"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Características do Produto"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Permite definir as condições dos contratos de seus clientes : Método de "
+"Faturamento\n"
+"             (preço fixo, por planilha de horas, faturar antecipadamente), o "
+"valor exato\n"
+"             (R$ 120  / dia para um desenvolvedor), a duração (contrato de "
+"suporte de um ano).\n"
+"             Você será capaz de acompanhar o andamento do contrato e faturar "
+"automaticamente.\n"
+"             Ele instala o módulo account_analytic_analysis."
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidade de Medida"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método de Aquisição"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data na qual o pedido de venda é confirmado."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Usar múltiplas contas analíticas em vendas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "Primeiro cancele todas as faturas anexadas a este pedido de vendas."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Cotação Número"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens não lidas"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data da Fatura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Itens Entregues e não Faturados."
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr "Cotação Confirmada"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceção de Faturamento"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Cotação "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Cotação Provisória"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Endereço de Entrega"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Centro de Custo"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr "Permite faturar em lote de ordens de entrega através de diários"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,10 +217,29 @@ msgstr "Dia"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar Pedido"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Recursos do Armazém"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "O tempo de medida padrão para cada unidade de serviço é"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unidade de Medida "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -77,21 +252,194 @@ msgstr "Dados Incorretos"
 msgid "The value of Advance Amount must be positive."
 msgstr "O valor do Adiantamento deve ser positivo."
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr "Permite aplicar algum desconto por linha do pedido de venda"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr "Linhas do Pedido de Venda que estão como Concluído."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "no pedido"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Situação de Pedido"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Valor sem Impostos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Projeto"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Líquido"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Do estoque: Quando necessário, o produto é retirado do estoque ou "
+"esperaremos a reposição.\n"
+"No pedido: Quando necessário, o produto é comprado ou produzido."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Permite que você defina o que é a função padrão de um usuário específico em "
+"uma determinada conta.\n"
+"                 Isto é usado principalmente quando um usuário codifica seu "
+"quadro de horários. Os valores são recuperados e os campos são auto-"
+"completados.\n"
+"                 Mas a possibilidade de alterar esses valores ainda está "
+"disponível.\n"
+"                 Isso instala o módulo analytic_user_function."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Linhas de Pedido de Venda relacionadas ao meu pedido"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Cotação Enviada"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Assistente de composição de Email"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Pendência na Entrega"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantidade (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Estabelecimento"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Vendas em Exceção"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Endereço de Cobrança"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data em que foi criado o pedido de venda."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Falso"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+"Use Todos para criar a fatura final.\n"
+"                 Use Porcentagem para faturar uma parte do valor total.\n"
+"                 Use Valor Fixo para faturar um valor específico com "
+"antecedência.\n"
+"                 Use Algumas linhas do Pedido, para faturar uma seleção de "
+"linhas do pedidos de vendas."
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Criar Notas Fiscais"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Imposto"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ação Inválida!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -110,12 +458,15 @@ msgstr ""
 "             mas aguarda pelo processamento na data de pedido."
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data de Confirmação"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Centro de Custo"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -127,6 +478,12 @@ msgstr ""
 "gerado diretamente em formato HTML para que possa ser inserido nas visões "
 "kanban."
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+"Dá a ordem da seqüência ao exibir uma lista de linhas de pedidos de vendas."
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -134,9 +491,67 @@ msgid "# of Qty"
 msgstr "Nº de Qtd"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Permite aplicar algum desconto por linha do pedido de venda."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr "Cancele o pedido antes de excluir um pedido de vendas confirmado!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(atualizar)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Características do Contrato"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de Venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr "Habilita Faturar sobre Linhas do Pedido de Venda"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha de Pedido de Vendas"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Valor Antecipado"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr "Indica que o pedido de vendas possui pelo menos uma fatura."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -148,16 +563,55 @@ msgstr ""
 "cliente.\n"
 "Exemplo: 10% para varejistas, promoção de R$ 15 neste produto, etc."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Um funcionário pode ter diferentes papéis por contrato"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr "Faturar o pedido de vendas inteiro."
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Condição de Pagamento Padrão"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Preparar faturas baseada em planilha de horas"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fatura <b>paga</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+"Você não pode cancelar uma linha do pedido de vendas que já foi faturado."
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Faturamento Mensal"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Quantidade Entregue"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Ano"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -165,9 +619,30 @@ msgid "Allow using different units of measures"
 msgstr "Permite utilizar diferentes unidades de medida"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Porcentagem"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr "Pedido de Vendas Confirmado"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de Venda que não foram confirmados"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Itens do Pedido"
 
 #. module: sale
 #: report:sale.order:0
@@ -175,27 +650,62 @@ msgid "Disc.(%)"
 msgstr "Desc. (%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 "Por favor defina conta de recebimento para este produto: \"%s\" (id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Linhas da Fatura"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Preço Total"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr "Permite especificar uma conta analítica no pedido de vendas."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Permite categorizar suas vendas e entregas (listas de separação) entre "
+"diferentes diários,\n"
+"                 e realizar operações em lote nos diários.\n"
+"                 Irá instalar o módulo o sale_journal."
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Marque a caixa para agrupar as faturas do mesmo cliente"
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Meus Pedidos de Venda"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Gerar Faturas"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# de Pedidos de Vendas"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -212,11 +722,59 @@ msgstr ""
 "analítica por usuário ou mês.\n"
 "                Isto irá instalar o módulo account_analytic_analysis."
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data de Criação"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para Faturar"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Endereço de fatura para o pedido de venda atual."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Quantidades Pedidas"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Ano do pedido de venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr "Endereços no Pedido de Vendas"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr "Linhas do Pedido de Vendas pronta para ser faturada."
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Minhas Vendas"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -224,33 +782,123 @@ msgid "Order Reference"
 msgstr "Referência do Pedido"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Outras Informações"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posição Fiscal"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+"* A situação 'Provisório' é definido quando o pedido de vendas relacionado é "
+"provisório.\n"
+"* A situação 'Confirmado' é definido quando o pedido de vendas relacionado é "
+"confirmada.\n"
+"* A situação de 'Exceção' é definido quando o pedido de vendas relacionado é "
+"definido como exceção.\n"
+"* A situação 'Concluído' é definida quando o pedido de vendas foi separado.\n"
+"* A situação 'Cancelado' é definida quando o usuário cancelar o pedido de "
+"venda relacionado."
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Opções Padrão"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+msgid "Configuration Error!"
+msgstr "Erro de Configuração!"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Contabilidade Analítica para vendas"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Situação"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Após clicar em 'Mostrar linhas para Faturar', escolha as linhas para faturar "
+"e criar a fatura a partir do menu dropdown 'Mais'."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Enviar por e-mail"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Lista de Preços (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "Pedido na Entrega"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Processo de Faturamento"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data do Pedido"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Pedido de Venda concluído"
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+"Por favor defina o diário de vendas para esta empresa: \"%s\" (id:%d)."
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Cotação e Vendas"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pago"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
@@ -259,13 +907,38 @@ msgstr ""
 "Permite a você escolher e manter diferentes unidades de medidas para os "
 "produtos."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Unidade de Medida referencial"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Criar e Visualizar a Fatura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr "Linhas do Pedido de Vendas concluída"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar Notas Fiscais"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "O valor a ser faturado antecipadamente."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Fatura de Vendas"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Atenção com a Lista de Preços"
@@ -275,6 +948,20 @@ msgstr "Atenção com a Lista de Preços"
 msgid "Discount (%)"
 msgstr "Desconto (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"A Fatura não pode ser criada para esta Linha de Pedido de Vendas devido a um "
+"dos seguintes motivos:\n"
+"1. A situação desta linha de pedido é \"provisória\" ou \"cancelada\"!\n"
+"2. A Linha do Pedido de Venda está faturada!"
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -286,6 +973,59 @@ msgstr "Criar & Visualizar Fatura"
 msgid "My Quotations"
 msgstr "Minhas Cotações"
 
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Gestão de Contratos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr "Moeda"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Não faturado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria de Produtos"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Não é possível cancelar este pedido de venda!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recriar Fatura"
+
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
@@ -296,6 +1036,611 @@ msgstr "Permite configurar alertas por cliente ou produtos"
 msgid "Shop Name"
 msgstr "Nome do Estabelecimento"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr "Meus Pedidos de Venda"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impostos:"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturado"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avançar Fatura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+"Permite ao vendedor fazer faturas para linhas do pedido de vendas, usando o "
+"menu 'Linhas para Faturar'."
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Abrir Menu de Venda"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+"Você não pode confirmar um pedido de vendas que não possui ao menos uma "
+"linha."
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Em Andamento"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Sem Cliente definido!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+"Disparar a ordem de entrega automaticamente a partir do pedido de vendas"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Gerar faturas"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Avanço de %s %%"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Item de Pedido gerar Nota Fiscal"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Provisório"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Modelos de Email"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Um parceiro a quem o produto específico precisa ser alocado."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Contrato / Analítico"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Aguardando Programação"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Termos e condições"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de Venda"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Valor dos impostos."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr "Razão Faturado"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Sob Demanda"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Avançar Compras e Notas Fiscais"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "A Fazer"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo estabelecimento.\n"
+"              </p><p>\n"
+"                Cada cotação ou pedido de vendas precisa ser associado a um "
+"estabelecimento. \n"
+"                O estabelecimento também define o armazém a partir do qual "
+"os produtos \n"
+"                serão entregues para cada venda em particular.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análise de Vendas"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um Seguidor"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+"Linhas do Pedido de Vendas que estão confirmadas, concluídas ou em excessão "
+"e não foram faturadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estatísticas de Pedidos de Venda"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Vendedor"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros Extendidos..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotação"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Avançar o Produto"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Pendência"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"O Representante cria uma Nota Fiscal manualmente se a política de entrega do "
+"pedido for \"Entrega em Andamento Manual'. A Nota Fiscal é criada "
+"automaticamente se a política de embarque for 'Pagamento antes da Entrega'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Estabelecimento da Venda"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Permite que você faça uma Cotação, Pedido de Venda, usando políticas "
+"diferentes e gerenciar estoques relacionados.\n"
+"                     Isso instala o módulo sale_stock ."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Selecione um produto do tipo serviço que é chamado 'Avançar Produto'.\n"
+"                                                Você poderá ter que criá-lo "
+"e defini-lo um valor padrão neste campo."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr "Permite configurar um desconto nas linhas do pedido de vendas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pedido de Venda em Processamento"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+"Todos os itens dessas linhas de pedido serão faturados. Você também pode "
+"faturar um percentual do pedido de venda\n"
+"                     ou um valor fixo (para adiantamentos) diretamente do "
+"formulário de pedido de vendas, se você preferir."
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+"Permite configurar notificação sobre os produtos e dispará-los quando um "
+"usuário quer vender um determinado produto ou a um determinado cliente.\n"
+"Exemplo: Produto: este produto é obsoleto, não comprar mais do que 5.\n"
+"                 Fornecedor: não se esqueça de pedir uma entrega expressa."
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr "Url do Paypal"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Conta analítica relacionada ao pedido de venda."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Ver Fatura"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "O que você deseja faturar?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Use listas de preços para adaptar seu preço por clientes"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"O vendedor confirma a cotação. A situação do pedido de vendas se torna 'Em "
+"progresso' ou 'Manual em progresso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Você precisa escolher uma lista de preços ou um cliente no formulário de "
+"vendas!\n"
+"Por favor escolha um antes de escolher um produto."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referência para o documento que gerou esta solicitação de pedido de venda."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Não foi encontrada uma linha de preço válida!"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Adiantamento de %s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Compromisso Atrasado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotações"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "Isto irá instalar o módulo sale_analytic_plans."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar Excessão"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Endereço de entrega para o pedido de venda atual."
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Mostrar margens nos pedidos de vendas"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta é a lista de faturas que foram geradas para este pedido de venda. O "
+"mesmo pedido de venda pode ser faturado várias vezes (por linha por exemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Sua Referência"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Mostrar linhas para Faturar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Data do Pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Preços"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Imposto:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Faturas de Clientes"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedidos de venda confirmados para faturamento."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Se você desejar mudar a lista de preço para este pedido (e eventualmente a "
+"moeda), os preços da linha de pedido existente não serão atualizadas."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qtd"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "do estoque"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data da Cotação"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Endereço de Cobrança:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Minhas linhas de Pedido de Venda"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Nenhuma Lista de Preços! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr "Pedido de Vendas "
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr "Cotação enviada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar itens não Faturados"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "A Referência do Pedido deve ser única por empresa!"
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -321,215 +1666,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Cotação "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "Avanço de %s %%"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vendas em Exceção"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Um parceiro a quem o produto específico precisa ser alocado."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Situação"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para criar uma cotação que pode ser convertida em um\n"
-"                pedido de venda.\n"
-"              </p><p>\n"
-"                O OpenERP  vai ajudá-lo a lidar eficientemente com o fluxo "
-"de vendas:\n"
-"                cotação, pedido de venda, entrega, faturamento e pagamento.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junho"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estatísticas de Pedidos de Venda"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Conta analítica relacionada ao pedido de venda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Outubro"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Ver Fatura"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "Adiantamento de %s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Cotações"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Quantidade"
+msgid "Shipping address :"
+msgstr "Endereço de Entrega:"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Endereço de entrega para o pedido de venda atual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "Imposto:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setembro"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posição Fiscal"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Em Andamento"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Pedido de Venda Provisório de %s %s <b>aguardando validação</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"O vendedor confirma a cotação. A situação do pedido de vendas se torna 'Em "
-"progresso' ou 'Manual em progresso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"Você não pode cancelar uma linha de um pedido de venda que já foi faturado."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel."
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Endereço de fatura para o pedido de venda atual."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Antes da Entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-"Não existe uma Posição Fiscal definida ou Conta de Recebimento definidos "
-"para as propriedades padrão de categorias de produtos."
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Endereço no Pedido de Vendas"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Contrato / Analítico"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Habilitar o Faturamento de linhas do Pedido de Venda"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mês do pedido de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -538,460 +1680,26 @@ msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "ou"
+msgid "Invoice Sales Order"
+msgstr "Faturar Pedido de Vendas"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faturado"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Contabilidade Analítica para Vendas"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data de Confirmação"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Parceiro designado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Março"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Venda: Marcar como lido"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Valor total."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr "Permite faturar em lote de ordens de entrega através de diários"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Permite definir um desconto na linha do pedido de vendas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Endereço de Cobrança:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Unidade de Medida "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "O tempo de medida padrão para cada unidade de serviço é"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Endereço de Cobrança"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Linhas de Pedido de Venda relacionadas ao meu pedido"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotação / Pedido"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
-"Todos os itens dessas linhas de pedido serão faturados. Você também pode "
-"faturar um percentual do pedido de venda\n"
-"                     ou um preço fixo (para adiantamentos) diretamente do "
-"formulário de pedido de venda, se você preferir."
+"O pedido de vendas criará a fatura (provisória) automaticamente. Você "
+"precisa escolher se deseja faturar com base no pedido "
 
 #. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(atualizar)"
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Usar gestão de contratos"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linha de Pedido de Vendas"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Um funcionário pode ter diferentes papéis por contrato"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Imprimir"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pedido N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Itens do Pedido"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Usar múltiplas contas analíticas em vendas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-"Permite categorizar suas vendas e entregas (listas de separação) entre "
-"diferentes diários,\n"
-"                 e realizar operações em lote nos diários.\n"
-"                 Irá instalar o módulo o sale_journal."
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data de Criação"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Pedido de Venda para <em>%s</em> definido como <b>concluído</b>"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Itens Entregues e não Faturados."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Minhas Vendas"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Preços"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-"* A situação 'Provisório' é definido quando o pedido de vendas relacionado é "
-"provisório.\n"
-"* A situação 'Confirmado' é definido quando o pedido de vendas relacionado é "
-"confirmada.\n"
-"* A situação de 'Exceção' é definido quando o pedido de vendas relacionado é "
-"definido como exceção.\n"
-"* A situação 'Concluído' é definida quando o pedido de vendas foi separado.\n"
-"* A situação 'Cancelado' é definida quando o usuário cancelar o pedido de "
-"venda relacionado."
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr ""
-"Não existe nenhuma conta de recebimento definida como propriedade global."
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Erro de Configuração!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "Enviar por e-mail"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Hora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data do Pedido"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-"Para permitir que o vendedor faça faturas de linhas de pedido de venda "
-"usando o menu 'Linhas para Faturar'."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Criar e Visualizar a Fatura"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para definir um novo estabelecimento.\n"
-"              </p><p>\n"
-"                Cada cotação ou pedido de venda deve ser associado a um "
-"estabelecimento.\n"
-"                O estabelecimento também define o armazém a partir do qual  "
-"os produtos\n"
-"                serão entregues para cada venda em particular.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data da Cotação"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-"Você não pode confirmar um pedido de venda que não tem nenhuma linha de "
-"pedido."
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Você precisa escolher uma lista de preços ou um cliente no formulário de "
-"vendas!\n"
-"Por favor escolha um antes de escolher um produto."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria de Produtos"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Não é possível cancelar este pedido de venda!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recriar Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"Para poder excluir um pedido de venda confirmado, você precisa cancelar ele "
-"antes!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impostos:"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "Sob Demanda"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "desconhecido"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "É um Seguidor"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros Extendidos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Pendência"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-"Selecione um produto do tipo serviço que é chamado 'Avançar Produto'.\n"
-"                                                Você poderá ter que criá-lo "
-"e defini-lo um valor padrão neste campo."
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-"Permite configurar notificação sobre os produtos e dispará-los quando um "
-"usuário quer vender um determinado produto ou a um determinado cliente.\n"
-"Exemplo: Produto: este produto é obsoleto, não comprar mais do que 5.\n"
-"                 Fornecedor: não se esqueça de pedir uma entrega expressa."
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Não foi encontrada uma linha de preço válida!"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Mostrar margens nos pedidos de vendas"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Esta é a lista de faturas que foram geradas para este pedido de venda. O "
-"mesmo pedido de venda pode ser faturado várias vezes (por linha por exemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Sua Referência"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qtd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Minhas linhas de Pedido de Venda"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "A Referência do Pedido deve ser única por empresa!"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -1001,392 +1709,60 @@ msgstr ""
 "produto e quantidade.\n"
 "Você tem que mudar ou o produto, a quantidade ou a lista de preços."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Fatura de Vendas com Pagamento Antecipado"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Criar Nota Fiscal"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Valor sem impostos."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Referência do Pedido"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"Permite que você faça uma Cotação, Pedido de Venda, usando políticas "
-"diferentes e gerenciar estoques relacionados.\n"
-"                     Isso instala o módulo sale_stock ."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que uma fatura foi paga."
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Preço"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Cotação Número"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "no pedido"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Endereço de Entrega:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Permite escolher uma conta analítica no pedido de vendas."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Situação provisória dos pedidos de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Cotação para <em>%s</em> <b>criada</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Histórico de mensagens e comunicação"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nova Cópia da Cotação"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Não é possível excluir uma linha do pedido de vendas no estado '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Propriedades nas linhas"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Antes de escolher um produto,\n"
-" selecione um cliente no formulário de vendas."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total de Imposto incluído"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data do Pedido de Venda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar Cotação"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "Linhas do Pedido para Faturar"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Características do Produto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Aguardando Programação"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Unidade de Medida"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método de Aquisição"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preço Unitário"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Faturar o Pedido de Venda inteiro"
+msgid "Percentage"
+msgstr "Porcentagem"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Mensagens não lidas"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Cotação Provisória"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Pedido de Venda"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedido de Venda pronto para ser faturado"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-"Permite que você defina o que é a função padrão de um usuário específico em "
-"uma determinada conta.\n"
-"                 Isto é usado principalmente quando um usuário codifica seu "
-"quadro de horários. Os valores são recuperados e os campos são auto-"
-"completados.\n"
-"                 Mas a possibilidade de alterar esses valores ainda está "
-"disponível.\n"
-"                 Isso instala o módulo analytic_user_function."
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data em que foi criado o pedido de venda."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Criar Notas Fiscais"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Ação Inválida!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Valor Antecipado"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantidade Entregue"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Se você desejar mudar a lista de preço para este pedido (e eventualmente a "
-"moeda), os preços da linha de pedido existente não serão atualizadas."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Gerar Faturas"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "# de Pedidos de Vendas"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para Faturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Ano do pedido de venda"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julho"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"Após clicar em 'Mostrar linhas para Faturar', escolha as linhas para faturar "
-"e criar a fatura a partir do menu dropdown 'Mais'."
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Isto indica que o pedido de venda possui pelo menos uma fatura."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Pendência na Entrega"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar Notas Fiscais"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-"A cotação para <em>%s</em> <b>convertida</b> para Pedido de Vendas de %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Faturar Pedido de Vendas"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Gestão de Contratos"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Aguardando revisão do contador."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Gerar faturas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Item de Pedido gerar Nota Fiscal"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotações Anteriores"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pago"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análise de Vendas"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotação"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"O Representante cria uma Nota Fiscal manualmente se a política de entrega do "
-"pedido for \"Entrega em Andamento Manual'. A Nota Fiscal é criada "
-"automaticamente se a política de embarque for 'Pagamento antes da Entrega'."
+msgid "Other Information"
+msgstr "Outras Informações"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1409,27 +1785,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1444,7 +1803,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1486,23 +1845,21 @@ msgid ""
 msgstr ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
-"''},</p>\n"
+"    <p>Olá ${object.partner_id.name},</p>\n"
 "    \n"
-"    <p>Aqui está o seu ${object.state in ('draft', 'sent') and 'quotation' "
-"or 'order confirmation'} from ${object.company_id.name}: </p>\n"
+"    <p>Aqui está a ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
 "\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
-"       &nbsp;&nbsp;Número do pedido: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Total do pedido: <strong>${object.amount_total} "
+"       &nbsp;&nbsp;<strong>REFERENCIA</strong><br />\n"
+"       &nbsp;&nbsp;Número do Pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total do Pedido: <strong>${object.amount_total} "
 "${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Data do pedido: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;Data do Pedido: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
-"       &nbsp;&nbsp;Referência do pedido: ${object.origin}<br />\n"
+"       &nbsp;&nbsp;Referência do Pedido: ${object.origin}<br />\n"
 "       % endif\n"
 "       % if object.client_order_ref:\n"
 "       &nbsp;&nbsp;Sua referência: ${object.client_order_ref}<br />\n"
@@ -1513,27 +1870,10 @@ msgstr ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
-"    <p>Também é possível pagar diretamente através do Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"    <p>Também é possível pagar diretamente com o Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1549,7 +1889,7 @@ msgstr ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1575,7 +1915,7 @@ msgstr ""
 "            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
 "0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
 "0px; padding-left: 0px; \">\n"
-"                Telefone:&nbsp; ${object.company_id.phone}\n"
+"                Fone:&nbsp; ${object.company_id.phone}\n"
 "            </div>\n"
 "        % endif\n"
 "        % if object.company_id.website:\n"
@@ -1589,93 +1929,6 @@ msgstr ""
 "</div>\n"
 "            "
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Use listas de preços para adaptar seu preço por clientes"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Linhas de pedido confirmadas e não entregues"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-"O pedido de venda vai criar automaticamente a proposição de fatura (fatura "
-"provisória). Você tem que escolher se você quer faturar com base no pedido "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Faturas de Clientes"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Vendas"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"Isso adiciona a \"margem\" no pedido de venda.\n"
-"                 Isso dá a rentabilidade através do cálculo da diferença "
-"entre o preço unitário e o preço de custo.\n"
-"                 Isso instala o módulo sale_margin ."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preço Unitário"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento de Origem"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "A Fazer"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Valor sem impostos."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Fatura de Vendas com Pagamento Antecipado"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1685,9 +1938,40 @@ msgid "Product"
 msgstr "Produto"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Gerar faturas com base em linhas do pedido de vendas"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Valor total."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Confirmar Venda"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Não existe conta de entrada definida para este produto: \"%s\" (id:%d)."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Preço"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1707,426 +1991,34 @@ msgstr ""
 "vendas e deve ser paga antes que os produtos possam ser entregues."
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Faturamento Mensal"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Este relatório analisa suas cotações e pedidos de venda. Avalie suas "
+"receitas sobre vendas e ordene com diferentes critérios de grupo (vendedor, "
+"parceiro, produto, etc). Use este relatório para realizar análises em vendas "
+"que não foram faturadas ainda. Se você quiser analisar o volume de negócios, "
+"seria melhor usar o relatório de Análise de Faturamento no módulo Contas."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faturar em"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Preço fixo (depósito)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotação / Pedido"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data do Pedido"
+msgid "Tel. :"
+msgstr "Tel."
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV do Produto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Em Andamento Manual"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Vendas: Marcar como não lido"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Confirmar Venda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "A partir de pedido de venda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar Excessão"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Dependendo do controle de faturamento de pedido de venda, a fatura pode ser "
-"baseada na entrega ou na quantidade pedida. Desta forma, o pedido de venda "
-"pode gerar uma fatura ou ordem de entrega assim que for confirmado pelo "
-"vendendor."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Algumas linhas do pedido"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Desconto nas linhas"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referência do Cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-"Escolha como você deseja faturar este pedido.\n"
-"                                                                        Isto "
-"irá criar uma fatura provisória que pode ser\n"
-"                                                                        "
-"modificada antes da validação."
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Painel de Vendas"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-"Use tudo para criar a fatura final.\n"
-"                 Percentagem de utilização para faturar uma percentagem do "
-"valor total.\n"
-"                 Use Preço Fixo para faturar um valor específico com "
-"antecedência.\n"
-"                 Use Algumas linhas do Pedido para faturar uma seleção de as "
-"linhas de pedidos de venda."
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"Permite definir as condições dos contratos de seus clientes : Método de "
-"Faturamento\n"
-"             (preço fixo, por planilha de horas, faturar antecipadamente), o "
-"valor exato\n"
-"             (R$ 120  / dia para um desenvolvedor), a duração (contrato de "
-"suporte de um ano).\n"
-"             Você será capaz de acompanhar o andamento do contrato e faturar "
-"automaticamente.\n"
-"             Ele instala o módulo account_analytic_analysis."
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data na qual o pedido de venda é confirmado."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "Primeiro cancele todas as faturas anexadas a este pedido de vendas."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data da Fatura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "O valor a ser faturado antecipadamente."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceção de Faturamento"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Sem Cliente definido!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Endereço de Entrega"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Venda para Faturar"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Recursos do Armazém"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Líquido"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Do estoque: Quando necessário, o produto é retirado do estoque ou "
-"esperaremos a reposição.\n"
-"No pedido: Quando necessário, o produto é comprado ou produzido."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar itens não Faturados"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Cotação Enviada"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Assistente de composição de Email"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Estabelecimento"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data de Confirmação"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-"Por favor defina o diário de vendas para esta empresa: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Características do Contrato"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de Venda"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantidade (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Linhas do Pedido que estão 'Concluídas'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Termos e condições"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Seguidores"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Linhas da Fatura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linhas"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Linhas do Pedido de Venda"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Opções Padrão"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Contabilidade Analítica para vendas"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Lista de Preços (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para criar uma cotação ou pedido de venda para este "
-"cliente.\n"
-"              </p><p>\n"
-"              O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo "
-"completo da venda:\n"
-"                 cotação, pedido de venda, entrega, faturação e "
-"pagamento.</p><p>\n"
-"                  A característica social ajuda a organizar debates sobre "
-"cada pedido de venda,\n"
-"                 e permite que o seu cliente acompanhe a evolução do pedido "
-"de venda.</p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "Pedido na Entrega"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Unidade de Medida referencial"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Deseja Criar uma Fatura?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -2136,14 +2028,14 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
@@ -2151,254 +2043,47 @@ msgstr ""
 "                Clique para criar uma cotação, a primeira etapa de uma nova "
 "venda.\n"
 "              </p><p>\n"
-"          O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo completo "
-"da venda:\n"
+"                 O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo "
+"de vendas completo:\n"
 "                 cotação, pedido de venda, entrega, faturação e pagamento.\n"
 "              </p><p>\n"
-"                 A característica social ajuda a organizar debates sobre "
-"cada pedido de venda,\n"
-"                 e permite que o seu cliente acompanhe a evolução do pedido "
-"de venda.\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
-"A Fatura não pode ser criada para esta Linha de Pedido de Vendas devido a um "
-"dos seguintes motivos:\n"
-"1. A situação desta linha de pedido é \"provisória\" ou \"cancelada\"!\n"
-"2. A Linha do Pedido de Venda está faturada!"
+"Não existe uma Posição Fiscal definida ou Conta de Recebimento definidos "
+"para as propriedades padrão de categorias de produtos."
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Linhas de pedido concluídas"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Aguardando revisão do contador."
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Propriedades nas linhas"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Dezembro"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"Não existe conta de entrada definida para este produto: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Não faturado"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Avançar Compras e Notas Fiscais"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Valor sem Impostos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avançar Fatura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Abrir Menu de Venda"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Dispara ordens de entrega automaticamente no pedido de vendas"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Valor dos impostos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Pedido de Venda "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Linhas de pedido prontas para faturar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Modelos de Email"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de Venda"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Estabelecimento da Venda"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembro"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Avançar o Produto"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-"Dá a ordem da seqüência ao exibir uma lista de linhas de pedidos de vendas."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Janeiro"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Pedido de Venda em Processamento"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Preparar faturas baseada em planilha de horas"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Pedido de Vendas para <em>%s</em> <b>cancelado</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referência para o documento que gerou esta solicitação de pedido de venda."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Compromisso Atrasado"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Situação de Pedido"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Mostrar linhas para Faturar"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Data do Pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Pedidos de venda confirmados para faturamento."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de Venda que não foram confirmados"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "do estoque"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Nenhuma Lista de Preços! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Pedidos de Venda"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Usar gestão de contratos"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que uma fatura foi paga."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maio"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Deseja Criar uma Fatura?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Venda para Faturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -2422,11 +2107,155 @@ msgstr "Avançar"
 msgid "February"
 msgstr "Fevereiro"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma cotação que será convertida em um "
+"pedido de vendas.\n"
+"              </p><p>\n"
+"              A característica social ajuda a organizar as discussões sobre "
+"cada pedido de venda,\n"
+"               e permite que o seu cliente para acompanhe a evolução do "
+"pedido de vendas.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faturar em"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Preço fixo (depósito)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data do Pedido"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Antes da Entrega"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV do Produto"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Situação provisória dos pedidos de venda"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento de Origem"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Em Andamento Manual"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Aviso!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotações Anteriores"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma cotação ou pedido de vendas para este "
+"cliente.\n"
+"              </p><p>\n"
+"                 O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo "
+"de vendas completo:\n"
+"                 cotação, pedido de venda, entrega, faturação e pagamento.\n"
+"              </p><p>\n"
+"               A característica social ajuda a organizar as discussões sobre "
+"cada pedido de venda,\n"
+"               e permite que o seu cliente para acompanhe a evolução do "
+"pedido de vendas.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Procurar Pedido de Venda"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descrição"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2442,20 +2271,48 @@ msgstr ""
 "      com seu cliente."
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mês do pedido de venda"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "A partir de pedido de venda"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Procurar Pedido de Venda"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr "Linhas do pedido de vendas confirmadas que ainda não foram entregues"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "O que você deseja faturar?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Dependendo do controle de faturamento de pedido de venda, a fatura pode ser "
+"baseada na entrega ou na quantidade pedida. Desta forma, o pedido de venda "
+"pode gerar uma fatura ou ordem de entrega assim que for confirmado pelo "
+"vendendor."
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Algumas linhas do pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Não é possível excluir uma linha do pedido de vendas no estado '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2464,24 +2321,33 @@ msgid "Payment Term"
 msgstr "Condições de Pagamento"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr "Isto irá instalar o módulo sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedido de Venda pronto para ser faturado"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"Este relatório analisa suas cotações e pedidos de venda. Avalie suas "
-"receitas sobre vendas e ordene com diferentes critérios de grupo (vendedor, "
-"parceiro, produto, etc). Use este relatório para realizar análises em vendas "
-"que não foram faturadas ainda. Se você quiser analisar o volume de negócios, "
-"seria melhor usar o relatório de Análise de Faturamento no módulo Contas."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr "Gerar faturas baseadas nas linhas do pedido de vendas"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "ou"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Linhas do Pedido de Venda"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Lista de preços para o pedido de venda atual."
 
 #. module: sale
 #: report:sale.order:0
@@ -2489,21 +2355,70 @@ msgid "Quotation N°"
 msgstr "Cotação N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Desconto nas linhas"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referência do Cliente"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Separado"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Ano"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Isso adiciona a \"margem\" no pedido de venda.\n"
+"                 Isso dá a rentabilidade através do cálculo da diferença "
+"entre o preço unitário e o preço de custo.\n"
+"                 Isso instala o módulo sale_margin ."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Antes de escolher um produto,\n"
+" selecione um cliente no formulário de vendas."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total de Imposto incluído"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nova Cópia da Cotação"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Escolha como você deseja faturar este pedido.\n"
+"                                                                        Isto "
+"irá criar uma fatura provisória que pode ser\n"
+"                                                                        "
+"modificada antes da validação."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data do Pedido de Venda"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Recriar Aquisição"
@@ -3107,6 +3022,9 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 #~ msgid "Pick List"
 #~ msgstr "Lista de Seleção"
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de Venda"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Coletar Informação !"
@@ -3594,6 +3512,9 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Unidade de Tempo Principal"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Meus Pedidos de Venda"
+
 #~ msgid "Based on Delivery Orders"
 #~ msgstr "Baseado nas Ordens de Entrega"
 
@@ -3667,6 +3588,13 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 #~ msgstr ""
 #~ "Você não pode cancelar uma linha do  pedido de venda que já foi faturada!"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Linhas do Pedido de Venda que estão confirmadas, feitas ou em situação de "
+#~ "excessão e não foram ainda faturadas."
+
 #, python-format
 #~ msgid ""
 #~ "In order to delete a confirmed sale order, you must cancel it before ! To "
@@ -3707,6 +3635,12 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 #~ msgid "Invoice on order after delivery"
 #~ msgstr "Faturar depois da entrega"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr ""
+#~ "Você não pode confirmar um pedido de venda que não tem nenhuma linha de "
+#~ "pedido."
+
 #~ msgid "Setup your Invoicing Method"
 #~ msgstr "Configure o Método de Faturamento"
 
@@ -3738,6 +3672,9 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 #~ msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 #~ msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Linhas de pedido confirmadas e não entregues"
+
 #~ msgid ""
 #~ "This tool will help you to install the right module and configure the system "
 #~ "according to the method you use to invoice your customers."
@@ -3772,6 +3709,12 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 #~ msgid "Sales order created in current year"
 #~ msgstr "Pedidos de Venda criados este ano"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Linhas de pedido concluídas"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Linhas de pedido prontas para faturar"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Método principal baseado em"
 
@@ -4020,3 +3963,6 @@ msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
 
 #~ msgid "Notes"
 #~ msgstr "Observações"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Linhas do Pedido que estão 'Concluídas'"
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 0b41c96e2b7..a43b93d471d 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -6,50 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmare Cotatie"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablou de bord Vanzari"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Liniile Comenzii de vanzare care sunt confirmate, efectuate sau in starea "
-"exceptie si nu au fost inca facturate"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data confirmarii"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Grupeaza dupa..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Alocare partener"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Lista de preturi pentru comanda curenta de vanzari."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda de aprovizionare"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data la care comanda de vanzare este confirmata."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Martie"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Companie"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data facturii"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Linii Nefacturate si Livrate"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceptie factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cont analitic"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -62,6 +206,26 @@ msgstr "Zi"
 msgid "Cancel Order"
 msgstr "Anuleaza Comanda"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Greutate"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -74,21 +238,178 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "la comanda"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Taxe"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma neimpozitata"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Net:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Anulat(a)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Liniile Comenzii de vanzare asociate unei Comenzi de vanzare de-a mea"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Exceptie la expediere"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantitate (UdV)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Magazin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Vanzari in Stare de exceptie"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa de facturare"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data la care comanda de vanzare este creata."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Creeaza facturi"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -100,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Confirmarea datei"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cont analitic"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linii"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -114,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -121,8 +451,66 @@ msgid "# of Qty"
 msgstr "# a cantitătii"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partener"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Comanda de vanzare"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linie comanda de vanzare"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Suma in avans"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -132,483 +520,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Termen de plata implicit"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Cifra de afaceri lunara"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantitati expediate"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "An"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Discount (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Pret total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Bifati casuta pentru a grupa facturile pentru aceiasi clienti"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Comenzile mele de vanzare"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantitatile comandate"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referinta comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Alte informatii"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Cotatii si Vanzari"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vanzarile genereaza factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Avertizare Lista de preturi!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Reducere (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Cotatiile mele"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Numele magazinului"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Vanzari in Stare de exceptie"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Stare"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Iunie"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistici comenzi de vanzare"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Contul analitic asociat unei comenzi de vanzare."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octombrie"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Cotatii (oferte)"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Cantitate"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembrie"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Pozitie fiscala"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In desfasurare"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Agentul de vanzari confirma cotatia. Starea comenzii de vanzare devine 'In "
-"curs' sau 'Manual în desfasurare'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adresa de facturare pentru comanda curenta de vanzare."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Luna comandata a comenzii de vanzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Nu puteti grupa vanzarile care au valute diferite pentru acelasi partener."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturat"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data confirmarii"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Alocare partener"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Martie"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Suma totala."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa de facturare:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa de facturare"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-"Liniile Comenzii de vanzare asociate unei Comenzi de vanzare de-a mea"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotatie / Comanda"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Linie comanda de vanzare"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Comenzi de vanzare care nu au fost confirmate inca"
 
 #. module: sale
 #: view:sale.order:0
@@ -627,8 +601,30 @@ msgid "Order Lines"
 msgstr "Linii comanda"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Discount (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Linii factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Pret total"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -640,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Bifati casuta pentru a grupa facturile pentru aceiasi clienti"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Creeaza Facturi"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Ora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Data Crearii"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "De facturat"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adresa de facturare pentru comanda curenta de vanzare."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantitatile comandate"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Anul comenzii de vanzare"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Linii Nefacturate si Livrate"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantitate"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Total :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Vanzarile mele"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de preturi"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referinta comanda"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Pozitie fiscala"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Iulie"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -688,29 +752,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stare"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Ora"
+msgid "EDI Pricelist (%s)"
+msgstr "Lista de preturi EDI (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -718,23 +812,37 @@ msgid "Order Date"
 msgstr "Data comenzii"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Expediat"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotatii si Vanzari"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Platit"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partener"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -742,40 +850,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data cotatiei"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupeaza facturile"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Suma care va fi facturata in avans."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vanzarile genereaza factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Nu puteti confirma o comanda de vanzare care nu are nicio linie."
+msgid "Pricelist Warning!"
+msgstr "Avertizare Lista de preturi!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Reducere (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Trebuie sa selectati o lista de preturi sau un client in formularul de "
-"vanzare !\n"
-"Va rugam sa setati una/unul inainte de a alege un produs."
+"Factura nu poate fi creata pentru aceasta Linie a Comenzii de Vanzare "
+"datorita unuia dintre urmatoarele motive:\n"
+"1. Starea acestei linii a comenzii de vanzare este sau \"ciorna\" sau "
+"\"anulata\"!\n"
+"2. Linia Comenzii de Vanzare este facturata!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Cotatiile mele"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembrie"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Expediat"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Luna"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefacturat"
 
 #. module: sale
 #: view:sale.report:0
@@ -784,7 +949,7 @@ msgid "Category of Product"
 msgstr "Categoria Produsului"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -795,10 +960,18 @@ msgid "Recreate Invoice"
 msgstr "Recreeaza factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Numele magazinului"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -806,36 +979,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Taxe :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturat"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Factura in avans"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In desfasurare"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Niciun client definit !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Creeaza facturi"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmat(a)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Linie comanda de vanzare Creeaza_factura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Ciorna"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Sabloane e-mail"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Programul de asteptare"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Comenzi de vanzare"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Valoarea taxei."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Conduce aprovizionarea si facturarea"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "De efectuat"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Iunie"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Comanda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza vanzarilor"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistici comenzi de vanzare"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Data"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noiembrie"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotatie"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Avans Produse"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Exceptie"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octombrie"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Agentul de vanzari creeaza manual o factura, dacă politica de expediere a "
+"comenzii de vanzare este 'Expediere și Facturare Manuala in desfasurare'. "
+"Factura este creata in mod automat daca politica de expediere este 'Plata "
+"inainte de Livrare'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Magazin Vanzari"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -844,6 +1245,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Ianuarie"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Comanda de vanzare in desfasurare"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -854,11 +1279,98 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Contul analitic asociat unei comenzi de vanzare."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Agentul de vanzari confirma cotatia. Starea comenzii de vanzare devine 'In "
+"curs' sau 'Manual în desfasurare'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Trebuie sa selectati o lista de preturi sau un client in formularul de "
+"vanzare !\n"
+"Va rugam sa setati una/unul inainte de a alege un produs."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referinta documentului care a generat aceasta cerere a comenzii de vanzare."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Nu a fost gasita nicio linie valida a listei de preturi !:"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Angajament in cazul intarzierii"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotatii (oferte)"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora exceptia"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -880,11 +1392,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Referinta dumneavoastra"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Data comenzii"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de preturi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturi client"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Comanda de vanzare confirmata pentru facturare."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secvenţă"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vanzari"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Daca schimbati lista de preturi a acestei comenzi (si eventual moneda), "
+"preturile liniilor comenzii existente nu vor fi actualizate."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Cantitate"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "din stoc"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data cotatiei"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Efectuat"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa de facturare:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -900,19 +1508,102 @@ msgstr "Liniile Comenzii mele de vanzare"
 msgid "Cancel"
 msgstr "Anuleaza"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Nicio Lista de preturi ! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Cauta Linii Nefacturate"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa de expediere:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Nu puteti grupa vanzarile care au valute diferite pentru acelasi partener."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Factura Vanzare cu Plata in Avans"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -923,363 +1614,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Creeaza Factura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Suma neimpozitata."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Referinta comenzii"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica faptul ca o factura a fost platita."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Pret"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "la comanda"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa de expediere:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Starea ciorna a comenzii de vanzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Taxe Totale Incluse"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data comandata a comenzii de vanzare"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmare Cotatie"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupeaza dupa..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Programul de asteptare"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda de aprovizionare"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Pret unitar"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Comadă vânzare"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Taxe"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Comanda de vanzare este gata de facturat"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data la care comanda de vanzare este creata."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Creeaza facturi"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Suma in avans"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantitati expediate"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Daca schimbati lista de preturi a acestei comenzi (si eventual moneda), "
-"preturile liniilor comenzii existente nu vor fi actualizate."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Creeaza Facturi"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "De facturat"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Anul comenzii de vanzare"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Iulie"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Exceptie la expediere"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupeaza facturile"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Luna"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Urmeaza a fi verificat(a) de catre contabil."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Creeaza facturi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Linie comanda de vanzare Creeaza_factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotatii vechi"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Platit"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza vanzarilor"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotatie"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Agentul de vanzari creeaza manual o factura, dacă politica de expediere a "
-"comenzii de vanzare este 'Expediere și Facturare Manuala in desfasurare'. "
-"Factura este creata in mod automat daca politica de expediere este 'Plata "
-"inainte de Livrare'."
+msgid "Other Information"
+msgstr "Alte informatii"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1302,27 +1675,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1337,7 +1693,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1378,92 +1734,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Linii confirmate ale comenzii de vanzare, inca nelivrate"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturi client"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Vanzari"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Pret unitar"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Document sursa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "De efectuat"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Suma neimpozitata."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Factura Vanzare cu Plata in Avans"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1473,10 +1743,38 @@ msgid "Product"
 msgstr "Produs"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Suma totala."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pret"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1489,387 +1787,36 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Cifra de afaceri lunara"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturare pe"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Acest raport efectueaza analiza cotatiilor și a comenzilor de vanzare ale "
+"dumneavoastra. Analiza verifica veniturile din vanzari si le sorteaza dupa "
+"diferite criterii de grup (agent de vanzari, partener, produs, etc). "
+"Folositi acest raport pentru a efectua analiza vanzarilor care nu au fost "
+"facturate inca. Daca doriti sa analizați cifra dumneavoastra de afaceri, "
+"trebuie sa utilizati raportul Analiza Facturilor din Aplicatia de "
+"contabilitate."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotatie / Comanda"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data comenzii"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV produs"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual in Desfasurare"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Dintr-o comanda de vanzare"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignora exceptia"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"In functie de Controlul factuaării comenzii de aânzare, factura se poate "
-"baza pe cantitatile livrate sau comandate. Astfel, o comanda de vanzare "
-"poate genera o factura sau o comanda de livrare de indata ce este confirmata "
-"de catre agentul de vanzari."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referinta Client"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Tablou de bord Vanzari"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data la care comanda de vanzare este confirmata."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Companie"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data facturii"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Suma care va fi facturata in avans."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceptie factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Niciun client definit !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Net:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Anulat(a)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Cauta Linii Nefacturate"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Magazin"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Confirmarea datei"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Comanda de vanzare"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantitate (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Liniile Comenzii de vanzare care se afla in starea 'efectuat'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmat(a)"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirma"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Linii factura"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linii"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Linii comanda de vanzare"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Lista de preturi EDI (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Chiar doriți să creați factura(ile)?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1879,248 +1826,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Factura nu poate fi creata pentru aceasta Linie a Comenzii de Vanzare "
-"datorita unuia dintre urmatoarele motive:\n"
-"1. Starea acestei linii a comenzii de vanzare este sau \"ciorna\" sau "
-"\"anulata\"!\n"
-"2. Linia Comenzii de Vanzare este facturata!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Liniile efectuate ale comenzii de vanzare"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Greutate"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembrie"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefacturat"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Urmeaza a fi verificat(a) de catre contabil."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Conduce aprovizionarea si facturarea"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Suma neimpozitata"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Factura in avans"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Ciorna"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Valoarea taxei."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Linii din comenzile de vanzare gata de facturat"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Sabloane e-mail"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Comenzi de vanzare"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Magazin Vanzari"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noiembrie"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Avans Produse"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Ianuarie"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Comanda de vanzare in desfasurare"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referinta documentului care a generat aceasta cerere a comenzii de vanzare."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Angajament in cazul intarzierii"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Data comenzii"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Comanda de vanzare confirmata pentru facturare."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Comenzi de vanzare care nu au fost confirmate inca"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "din stoc"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Nicio Lista de preturi ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica faptul ca o factura a fost platita."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descriere"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mai"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Chiar doriți să creați factura(ile)?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2143,11 +1888,131 @@ msgstr "Avans"
 msgid "February"
 msgstr "Februarie"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturare pe"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembrie"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data comenzii"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV produs"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Starea ciorna a comenzii de vanzare"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Document sursa"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Aprilie"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual in Desfasurare"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotatii vechi"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Cauta comanda de vanzare"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descriere"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2158,20 +2023,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Cauta comanda de vanzare"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Luna comandata a comenzii de vanzare"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Dintr-o comanda de vanzare"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Secvenţă"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"In functie de Controlul factuaării comenzii de aânzare, factura se poate "
+"baza pe cantitatile livrate sau comandate. Astfel, o comanda de vanzare "
+"poate genera o factura sau o comanda de livrare de indata ce este confirmata "
+"de catre agentul de vanzari."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2180,48 +2073,94 @@ msgid "Payment Term"
 msgstr "Termen de plata"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Comanda de vanzare este gata de facturat"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Acest raport efectueaza analiza cotatiilor și a comenzilor de vanzare ale "
-"dumneavoastra. Analiza verifica veniturile din vanzari si le sorteaza dupa "
-"diferite criterii de grup (agent de vanzari, partener, produs, etc). "
-"Folositi acest raport pentru a efectua analiza vanzarilor care nu au fost "
-"facturate inca. Daca doriti sa analizați cifra dumneavoastra de afaceri, "
-"trebuie sa utilizati raportul Analiza Facturilor din Aplicatia de "
-"contabilitate."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Linii comanda de vanzare"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Lista de preturi pentru comanda curenta de vanzari."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Numar cotatie"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referinta Client"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Ridicat(a)"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "An"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Taxe Totale Incluse"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data comandata a comenzii de vanzare"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Livrare parţială"
 
@@ -2253,6 +2192,9 @@ msgstr ""
 #~ msgid "Draft Invoice"
 #~ msgstr "Factură ciornă"
 
+#~ msgid "Sale Order"
+#~ msgstr "Comadă vânzare"
+
 #~ msgid "History"
 #~ msgstr "Istoric"
 
@@ -2947,6 +2889,13 @@ msgstr ""
 #~ msgid "Based on Timesheet"
 #~ msgstr "Bazat pe Fisa de pontaj"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Liniile Comenzii de vanzare care sunt confirmate, efectuate sau in starea "
+#~ "exceptie si nu au fost inca facturate"
+
 #~ msgid ""
 #~ "If you don't have enough stock available to deliver all at once, do you "
 #~ "accept partial shipments or not?"
@@ -3046,6 +2995,9 @@ msgstr ""
 #~ msgid "Inventory Moves"
 #~ msgstr "Miscari inventar"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Comenzile mele de vanzare"
+
 #~ msgid "Sales by Salesman"
 #~ msgstr "Vanzari dupa Vanzator"
 
@@ -3205,6 +3157,10 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Optiuni"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Nu puteti confirma o comanda de vanzare care nu are nicio linie."
+
 #~ msgid "Security Days"
 #~ msgstr "Zile de siguranta"
 
@@ -3397,6 +3353,9 @@ msgstr ""
 #~ "Iata o propunere de cantitati conforme cu ambalajul:\n"
 #~ "EAN: %s Cantitate: %s Tip de ul: %s"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Linii confirmate ale comenzii de vanzare, inca nelivrate"
+
 #~ msgid ""
 #~ "You can generate invoices based on sales orders or based on shippings."
 #~ msgstr ""
@@ -3495,6 +3454,9 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Atentionare"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Liniile Comenzii de vanzare care se afla in starea 'efectuat'"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "Metoda Principala Bazata pe"
 
@@ -3510,6 +3472,9 @@ msgstr ""
 #~ msgid "Sales order created in current year"
 #~ msgstr "Comenzile de vanzare create in anul curent"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Liniile efectuate ale comenzii de vanzare"
+
 #~ msgid ""
 #~ "A procurement order is automatically created as soon as a sales order is "
 #~ "confirmed or as the invoice is paid. It drives the purchasing and the "
@@ -3549,6 +3514,9 @@ msgstr ""
 #~ "* Starea 'Anulata' este setata atunci cand un utilizator anuleaza comanda de "
 #~ "vanzari asociata."
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Linii din comenzile de vanzare gata de facturat"
+
 #~ msgid "Sales order created in last month"
 #~ msgstr "Comenzi de vanzare create in ultima luna"
 
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 69998179757..085c3fdfd57 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -6,50 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-05 08:26+0000\n"
 "Last-Translator: Denis Karataev <dskarataev@gmail.com>\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: 2012-12-06 04:40+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Аналитические счета для продаж"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Подтвердить предложение"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Панель продаж"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "Нет дебетовых счетов определенных в качестве глобального свойства."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-"Позиции заказа продаж в состоянии \"Подтвержден\", \"Cделано\" или  "
-"\"Исключение\" и на которые не был выставлен счет"
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Дата подтверждения"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Ед.прод."
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Продавец"
+msgid "Group By..."
+msgstr "Группировать по ..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Прайс-лист для текущего заказа продаж."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Долевой участник"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Характеристики продукта"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Единицы измерения"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Метод снабжения"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Дата подтверждения заказа продаж."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Использовать несколько аналитических счетов в продажах"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "Сначала отмените все счета прикрепленные к этому заказу продаж."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Номер предложения"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Непрочитанные сообщения"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Дата счёта"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Позиции, поставленные без выставления счета"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Исключение счета"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Предложение "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Черновик предложения"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Адрес доставки"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Счет аналитики"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+"Разрешить групповое выставление счета из заказов на доставку через журналы"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Подитог"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +204,29 @@ msgstr "День"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Отменить заказ"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Вес"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Особенности склада"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Единица измерения "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +239,180 @@ msgstr "Неверные данные"
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "по заказу"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Статус заказа"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Налоги"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Сумма до налогов"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Ошибка!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Чистый итог:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Из запаса: Когда нужно, продукт берется из запаса или мы ожидаем пополнение "
+"запаса.\n"
+"На заказ: Когда нужно, продукт заказывается или производится."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Позиции заказа продаж относящиеся к моим заказам"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Предложение отправлено"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Мастер составления эл. почты"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Исключение при доставке"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Количество (ед.прод.)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Продажи в состоянии \"Исключение\""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Адрес выставления счета"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Дата на которую был создан заказ продаж."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Создать счета"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Налог"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "Неверное действие!"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +425,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Дата подтверждения"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Счет аналитики"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Кол-во позиций"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -116,6 +442,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -123,9 +454,67 @@ msgid "# of Qty"
 msgstr "Кол-во"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Позволяет вам применять некоторые скидки к строке заказа продаж"
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Факс :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(обновление)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Партнёр"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Характеристики контракта"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Заказ продаж"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Позиция заказа продаж"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Сумма аванса"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -134,16 +523,54 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Один сотрудник может иметь различные роли в различных контактах"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Условия платежа по умолчанию"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Подтвердить"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Подготовить счета основанные на расписаниях"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Счет <b>оплачен</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Ежемесячный оборот"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Отправленное количество"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Год"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -151,37 +578,93 @@ msgid "Allow using different units of measures"
 msgstr "Разрешить использование различных единиц измерения"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Заказы продаж, которые еще не были подтверждены"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Печать"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Заказ №"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Позиции заказа"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr "Дисконт (%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 "Пожалуйста, определите дебетовый счет для этого продукта: \"%s\" (id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Позиции счета"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Итоговая цена"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Разрешает вам распределять ваши продажи и доставки (комплектовочные листы) "
+"по разным журналам,\n"
+"                и исполнять групповые операции на основе журналов.\n"
+"                Это устанавливает модуль sale_journal."
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Отметьте для группирования счетов по заказчикам"
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Мои заказы продаж"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Сформировать счета"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Час"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "№ заказа продаж"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -193,11 +676,59 @@ msgid ""
 "                This installs the module account_analytic_analysis."
 msgstr ""
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Дата создания"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "В счет"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Адрес счета для текущего заказа продаж."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Заказанное кол-во"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Год заказа в заказе продаж"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Всего :"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Мои продажи"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -205,33 +736,114 @@ msgid "Order Reference"
 msgstr "Описание заказа"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Прочая информация"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Система налогообложения"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Июль"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Параметры по умолчанию"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Внимание!"
+msgid "Configuration Error!"
+msgstr "Ошибка конфигурации!"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Аналитический учет для продаж"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"После нажатия 'Показать строки для добавления в счет', выберите строки для "
+"добавления в счет и создайте счет через выпадающее меню \"Еще\""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Отправить по Email"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Прайс-лист ЕОД(EDI) (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "На основе заказа на доставку"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Выставление счетов"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Дата заказа"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Заказ продаж исполнен"
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+"Пожалуйста определите журнал продаж для этой компании: \"%s\" (id:%d)"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Предложения цен и продажи"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Оплачено"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
@@ -239,13 +851,38 @@ msgid ""
 msgstr ""
 "Позволяет выбирать и поддерживать различные единицы измерения для товаров."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Базовая единица измерения"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Создать и просмотреть счет"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Сгруппировать счета"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Сумма аванса в выставляемом счете."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Продажи - создать счет"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Предупреждение по прайс листу!"
@@ -255,6 +892,19 @@ msgstr "Предупреждение по прайс листу!"
 msgid "Discount (%)"
 msgstr "Скидка (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Нельзя создать счет для этой позиции заказа продаж по одной из причин:\n"
+"1. Состояние позиции заказа продаж \"Черновик\" или \"Отменен\"!\n"
+"2. Счет на эту позицию заказа продаж уже выставлен!"
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -266,6 +916,59 @@ msgstr "Создать и просмотреть счет на оплату"
 msgid "My Quotations"
 msgstr "Мои предложения"
 
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Счета"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Декабрь"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Управление контрактами"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Доставлено"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Счет не выставлен"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Категория продукции"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Нельзя отменить этот заказ продаж!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Воссоздать счет"
+
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
@@ -276,6 +979,578 @@ msgstr ""
 msgid "Shop Name"
 msgstr "Название магазина"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Налоги :"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Выставлен счет"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Счет на предоплату"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Открыть меню продаж"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Выполняется"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Заказчик не определен !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Создать счета"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Подтвержден"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Позиция заказа продажи Make_invoice"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Шаблоны писем"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Партнер, кому предназначен конкретный продукт."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Ожидание планировщика"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Условия"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Заказы продаж"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Сумма налога."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "По запросу"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Управлять снабжением и выставлением счетов"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Сделать"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Июнь"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Заказ"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Анализ продаж"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Подписан"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Статистика заказов продаж"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Продавец"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Ноябрь"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Предложение"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Продвижение продукта"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Исключение"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Октябрь"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Продавец создает счет вручную если политика доставки \"Доставка & счет "
+"вручную\". Счет создается автоматически если политика доставки \"Платеж "
+"перед доставкой\"."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Январь"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Заказы в процессе выполнения"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Счет аналитики связанный с заказом продаж."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Просмотреть счет"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Используйте прайс-листы для установки персональных цен для клиентов"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Продавец подтверждает запрос цен. Состояние заказа продаж становится "
+"'Выполняется' или 'Выполняется вручную'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Перед выбором ТМЦ, \n"
+"вы должны выбрать прайс-лист или заказчика в форме ввода продаж !"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Ссылка на документ который создал запрос на этот заказ продаж."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Нет верной позиции в прайс листе ! :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Задержка по обязательствам"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Предложения"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Игнорировать исключение"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Адрес доставки для текущего заказа продаж."
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Показывать прибыль в заказах продаж"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Это список счетов созданных по этому заказу продаж. По одному заказу продаж "
+"можно выставить несколько счетов (например: по позициям заказа)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Ваша ссылка"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Показать строки для выставления в счет"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Дата заказа"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Прайс-лист"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "НДС"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Счета заказчику"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Подтвержденный заказ продаж в счет"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Продажи"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Даже если вы измените прайс-лист этого заказа (и даже валюту), то цена "
+"позиции заказа не обновиться."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Кол-во"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "из запасов"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Дата предложения"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Всего"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Сделано"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Адрес счета:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Счет"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Мои позиции заказов продаж"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Подписчики"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Нет прайс-листа ! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Искать позиции без счетов"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -301,214 +1576,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Предложение "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Продажи в состоянии \"Исключение\""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Партнер, кому предназначен конкретный продукт."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Статус"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Нажмите для создания предложения которое может быть "
-"конвертировано в\n"
-"                заказ продаж.\n"
-"              </p><p>\n"
-"                OpenERP поможет вам эффективнее обрабатывать весь поток "
-"продаж:\n"
-"                предложение, заказ продаж, доставка, выставление счетов и "
-"оплата.\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Июнь"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Статистика заказов продаж"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Счет аналитики связанный с заказом продаж."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Октябрь"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Итого"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Просмотреть счет"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Предложения"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Количество"
+msgid "Shipping address :"
+msgstr "Адрес доставки :"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Адрес доставки для текущего заказа продаж."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "НДС"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Сентябрь"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Система налогообложения"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Выполняется"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Черновик счета от %s %s <b>ожидает проверки</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Продавец подтверждает запрос цен. Состояние заказа продаж становится "
-"'Выполняется' или 'Выполняется вручную'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr "Вы не можете строку заказа продаж по которой уже был выставлен счет."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Тел. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Адрес счета для текущего заказа продаж."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Перед доставкой"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Адреса в заказах продаж"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Месяц заказа в заказе продаж"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -517,804 +1590,84 @@ msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "или"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Выставлен счет"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "Аналитические счета для продаж"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Дата подтверждения"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Долевой участник"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
+msgid "Invoice Sales Order"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Март"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Продажа: Пометить как прочитанное"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Общая сумма."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-"Разрешить групповое выставление счета из заказов на доставку через журналы"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Подитог"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Разрешить настраивать скидку строкам заказа продаж"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Адрес счета:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Единица измерения "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Адрес выставления счета"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Позиции заказа продаж относящиеся к моим заказам"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Предложение / Заказ"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(обновление)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Позиция заказа продаж"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "Один сотрудник может иметь различные роли в различных контактах"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Печать"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Заказ №"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Позиции заказа"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Использовать несколько аналитических счетов в продажах"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-"Разрешает вам распределять ваши продажи и доставки (комплектовочные листы) "
-"по разным журналам,\n"
-"                и исполнять групповые операции на основе журналов.\n"
-"                Это устанавливает модуль sale_journal."
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Дата создания"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "Заказ продаж для <em>%s</em> в статусе <b>Выполнен</b>"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Позиции, поставленные без выставления счета"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Всего :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Мои продажи"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Прайс-лист"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr "Нет дебетовых счетов определенных в качестве глобального свойства."
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Ошибка конфигурации!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "Отправить по Email"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Час"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Дата заказа"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Доставлено"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Партнёр"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Создать и просмотреть счет"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Дата предложения"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Нельзя подтвердить заказ продаж без товара"
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Перед выбором ТМЦ, \n"
-"вы должны выбрать прайс-лист или заказчика в форме ввода продаж !"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Категория продукции"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Нельзя отменить этот заказ продаж!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Воссоздать счет"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"Для того чтобы удалить утвержденный заказ продаж, вы должны сначала отменить "
-"его!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Налоги :"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr "По запросу"
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "неизвесно"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr "Подписан"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Дата"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Расширенные фильтры..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Исключение"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Нет верной позиции в прайс листе ! :"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Показывать прибыль в заказах продаж"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Это список счетов созданных по этому заказу продаж. По одному заказу продаж "
-"можно выставить несколько счетов (например: по позициям заказа)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Ваша ссылка"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Кол-во"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Мои позиции заказов продаж"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Счет на авансовый платеж"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Создать счет"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Сумма без налога."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Ссылка на заказ"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Показывает, что счет был оплачен."
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Цена"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Номер предложения"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "по заказу"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Адрес доставки :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "Разрешает вам выбирать аналитический счет в заказе продаж."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Черновик заказа продажи"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Предложение для <em>%s</em> <b>создано</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Сообщения и история общения"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Новая копия предложения"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Нельзя удалить строку заказа продаж которая в состоянии '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-"Перед выбором продукта,\n"
-" выберите покупателя на форме продаж."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Всего налог"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Дата заказа в заказе продаж"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Подтвердить предложение"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Группировать по ..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Характеристики продукта"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Ожидание планировщика"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Единицы измерения"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Метод снабжения"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Цена за ед."
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Выставить счет на весь заказ продажи"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "Непрочитанные сообщения"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Черновик предложения"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Заказ"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Налоги"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Заказ продаж готов к выставлению счета"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Дата на которую был создан заказ продаж."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Создать счета"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "Неверное действие!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Факс :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Сумма аванса"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Отправленное количество"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Даже если вы измените прайс-лист этого заказа (и даже валюту), то цена "
-"позиции заказа не обновиться."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 #: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Сформировать счета"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "№ заказа продаж"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "В счет"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Год заказа в заказе продаж"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Июль"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-"После нажатия 'Показать строки для добавления в счет', выберите строки для "
-"добавления в счет и создайте счет через выпадающее меню \"Еще\""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "Это означает что заказ продаж имеет как минимум один счет."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Исключение при доставке"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Сгруппировать счета"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-"Предложение для <em>%s</em> <b>превращено</b> в заказ продаж от %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "Выставить счет по заказу продаж"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Управление контрактами"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Месяц"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Будет проверено бухгалтером."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Создать счета"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Позиция заказа продажи Make_invoice"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Старые предложения"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Оплачено"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Анализ продаж"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Предложение"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Продавец создает счет вручную если политика доставки \"Доставка & счет "
-"вручную\". Счет создается автоматически если политика доставки \"Платеж "
-"перед доставкой\"."
+msgid "Other Information"
+msgstr "Прочая информация"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1337,27 +1690,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1372,7 +1708,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1413,89 +1749,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Используйте прайс-листы для установки персональных цен для клиентов"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Не доставленные подтвержденные позиции заказа продаж"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-"Заказ продаж автоматически создаст предложение счета (черновик счета). Вы "
-"должны выбрать если хотите счет основанный на заказанном "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Счета заказчику"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Продажи"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Цена за ед."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Сделано"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Счет"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Документ-источник"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Сделать"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Сумма без налога."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Счет на авансовый платеж"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1505,9 +1758,37 @@ msgid "Product"
 msgstr "ТМЦ"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Сгенерировать счета основанные на строках заказа продаж"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Общая сумма."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Подтвердить продажу"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr "Нет дебетовых счетов определенных для этого продукта: \"%s\" (id:%d)"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Май"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Цена"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1521,390 +1802,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Ежемесячный оборот"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Этот отчет проводит анализ предложений цен  и заказов продаж. Анализ "
+"учитывает доходы от продаж и сортирует их по различным группам критериев "
+"(ответственный, контрагент, ТМЦ и т.д.). Используйте этот отчет для "
+"проведения анализа по продажам без выставления счетов. Если вы хотите "
+"анализировать оборот, вы должны использовать отчет \"Анализ счетов\" в "
+"приложении \"Бухгалтерия\"."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Счет на"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "Фиксированная цена (депозит)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Предложение / Заказ"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Дата заказа"
+msgid "Tel. :"
+msgstr "Тел. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Ед.продажи товара"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Выполняется вручную"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "Продажа: Отметить как непрочитанное"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Заказ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Подтвердить продажу"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Из заказа продаж"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Игнорировать исключение"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"В зависимости от метода выставления счетов по заказам продаж, счет может "
-"основываться на доставляемом или заказанном количестве. Таким образом, заказ "
-"продаж может создать счет или заказ доставки, как только он будет "
-"подтвержден менеджером продаж."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "Некоторые строки заказа"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Скидка по строкам"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Ссылка на клиента"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Всего"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Панель продаж"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Дата подтверждения заказа продаж."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "Сначала отмените все счета прикрепленные к этому заказу продаж."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Компания"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Дата счёта"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Сумма аванса в выставляемом счете."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Исключение счета"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Заказчик не определен !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "Адрес доставки"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "Продажа в счет"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Особенности склада"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "Сообщения"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "Проект"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Ошибка!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Чистый итог:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Из запаса: Когда нужно, продукт берется из запаса или мы ожидаем пополнение "
-"запаса.\n"
-"На заказ: Когда нужно, продукт заказывается или производится."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Отменено"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Искать позиции без счетов"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Предложение отправлено"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Мастер составления эл. почты"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Дата подтверждения"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-"Пожалуйста определите журнал продаж для этой компании: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Характеристики контракта"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Заказ продаж"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Количество (ед.прод.)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Позиции заказа продаж  в состоянии «Сделано»"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Подтвержден"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "Условия"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Подтвердить"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "Подписчики"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Позиции счета"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Кол-во позиций"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Позиции заказа продаж"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Параметры по умолчанию"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Аналитический учет для продаж"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Прайс-лист ЕОД(EDI) (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "На основе заказа на доставку"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "Базовая единица измерения"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Вы уверены, что хотите создать счет(а) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1914,251 +1840,45 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Нельзя создать счет для этой позиции заказа продаж по одной из причин:\n"
-"1. Состояние позиции заказа продаж \"Черновик\" или \"Отменен\"!\n"
-"2. Счет на эту позицию заказа продаж уже выставлен!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Позиции заказа продаж сделаны"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Вес"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Счета"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Декабрь"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr "Нет дебетовых счетов определенных для этого продукта: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Счет не выставлен"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Управлять снабжением и выставлением счетов"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Сумма до налогов"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Счет на предоплату"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Открыть меню продаж"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Черновик"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "Создавать заказы на доставку автоматически из заказов продаж"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Сумма налога."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Заказ продаж "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Позиции заказа продаж готовы к выставлению счета"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Шаблоны писем"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Заказы продаж"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Ноябрь"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Комментарии и эл. письма"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Продвижение продукта"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Январь"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Будет проверено бухгалтером."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Заказы в процессе выполнения"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "Подготовить счета основанные на расписаниях"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Заказ продаж для <em>%s</em> <b>отменен</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Ссылка на документ который создал запрос на этот заказ продаж."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Задержка по обязательствам"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Статус заказа"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Показать строки для выставления в счет"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Дата заказа"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Подтвержденный заказ продаж в счет"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Заказы продаж, которые еще не были подтверждены"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "из запасов"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Нет прайс-листа ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Заказы продаж"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Показывает, что счет был оплачен."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Май"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Вы уверены, что хотите создать счет(а) ?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Продажа в счет"
 
 #. module: sale
 #: view:sale.order:0
@@ -2182,11 +1902,131 @@ msgstr ""
 msgid "February"
 msgstr "Февраль"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Счет на"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Фиксированная цена (депозит)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Сентябрь"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Дата заказа"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Перед доставкой"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Ед.продажи товара"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Черновик заказа продажи"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Документ-источник"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Апрель"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Выполняется вручную"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Внимание!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Старые предложения"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Итого"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Сообщения и история общения"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Искать заказ продаж"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Описание"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2197,20 +2037,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Искать заказ продаж"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Месяц заказа в заказе продаж"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Из заказа продаж"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"В зависимости от метода выставления счетов по заказам продаж, счет может "
+"основываться на доставляемом или заказанном количестве. Таким образом, заказ "
+"продаж может создать счет или заказ доставки, как только он будет "
+"подтвержден менеджером продаж."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Ед.прод."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Некоторые строки заказа"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Нельзя удалить строку заказа продаж которая в состоянии '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2219,25 +2087,33 @@ msgid "Payment Term"
 msgstr "Условия оплаты"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Заказ продаж готов к выставлению счета"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"Этот отчет проводит анализ предложений цен  и заказов продаж. Анализ "
-"учитывает доходы от продаж и сортирует их по различным группам критериев "
-"(ответственный, контрагент, ТМЦ и т.д.). Используйте этот отчет для "
-"проведения анализа по продажам без выставления счетов. Если вы хотите "
-"анализировать оборот, вы должны использовать отчет \"Анализ счетов\" в "
-"приложении \"Бухгалтерия\"."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "или"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Позиции заказа продаж"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Прайс-лист для текущего заказа продаж."
 
 #. module: sale
 #: report:sale.order:0
@@ -2245,21 +2121,61 @@ msgid "Quotation N°"
 msgstr "Предложение №"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Скидка по строкам"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Ссылка на клиента"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Скомплектовано"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Год"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
+"Перед выбором продукта,\n"
+" выберите покупателя на форме продаж."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Всего налог"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Новая копия предложения"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Дата заказа в заказе продаж"
 
 #~ msgid "Salesman"
 #~ msgstr "Продавец"
@@ -2330,6 +2246,9 @@ msgstr ""
 #~ msgid "Our Salesman"
 #~ msgstr "Наш менеджер продаж"
 
+#~ msgid "Sale Order"
+#~ msgstr "Заказ"
+
 #~ msgid "Properties"
 #~ msgstr "Свойства"
 
@@ -3214,6 +3133,13 @@ msgstr ""
 #~ msgid "Sales by Salesman in last 90 days"
 #~ msgstr "Продажи по продавцу за 90 дней"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Позиции заказа продаж в состоянии \"Подтвержден\", \"Cделано\" или  "
+#~ "\"Исключение\" и на которые не был выставлен счет"
+
 #~ msgid ""
 #~ "If you don't have enough stock available to deliver all at once, do you "
 #~ "accept partial shipments or not?"
@@ -3290,6 +3216,9 @@ msgstr ""
 #~ msgid "Based on Tasks' Work"
 #~ msgstr "Основан на работе по задаче"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Мои заказы продаж"
+
 #~ msgid "Sales by Salesman"
 #~ msgstr "Продажи по продавцу"
 
@@ -3374,6 +3303,10 @@ msgstr ""
 #~ msgid "Based on Sales Orders"
 #~ msgstr "Основан на заказах продаж"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Нельзя подтвердить заказ продаж без товара"
+
 #, python-format
 #~ msgid "Could not cancel sales order line!"
 #~ msgstr "Нельзя отменить позицию заказа продаж!"
@@ -3594,6 +3527,9 @@ msgstr ""
 #~ msgid "Reference UoM"
 #~ msgstr "Базовая ед. изм."
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Не доставленные подтвержденные позиции заказа продаж"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -3645,6 +3581,12 @@ msgstr ""
 #~ "позицию заказа продаж, который будет меняться в соответствии с наличием "
 #~ "комплектующих."
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Позиции заказа продаж  в состоянии «Сделано»"
+
+#~ msgid "Sale order lines done"
+#~ msgstr "Позиции заказа продаж сделаны"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Заказы продаж созданные в этом году"
 
@@ -3680,6 +3622,9 @@ msgstr ""
 #~ "* 'Сделано' - позиция заказа продаж скомплектована.                     \n"
 #~ "* 'Отменен' - пользователь отменил соответствующий заказ продаж."
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Позиции заказа продаж готовы к выставлению счета"
+
 #~ msgid "Sales order created in last month"
 #~ msgstr "Заказы продаж созданные в прошлом месяце"
 
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 1b5ae5da047..17682ab2be8 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdiť cenovú ponuku"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Dátum potvrdenia"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Zoskupiť podľa..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Pridelenie partnera"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cenník pre bežné objednávky predaja."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marec"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Spoločnosť"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Dátum faktúry"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nevyfakturované a dodané položky"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Medzisúčet"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Deň"
 msgid "Cancel Order"
 msgstr "Zrušiť objednávku"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Hmotnosť"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "podľa objednávky"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Dane"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma bez DPH"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Základ :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Zrušená"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Výnimka prepravy"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Množstvo (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Obchod"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturačná adresa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Vytvorenie faktúr"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Dátum potvrdenia"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytický účet"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# riadky"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "# z množ."
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Objednávka predaja"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Položka objednávky"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Záloha vo výške"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Predvolené platobné podmienky"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potvrdiť"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Dodané množstvo"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Rok"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Zľava(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Celková cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Objednané množstvo"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Odkaz na objednávku"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Ďalšie informácie"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Zľava (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Názov obchodu"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Stav"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Jún"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Štatistiky objednávok predaja"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analytický účet v súvislosti s objednávkou predaja."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Október"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Cenové ponuky"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Množstvo"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiškálna pozícia"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "spracováva sa"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturačná adresa pre aktuálnu objednávku predaja."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturovanej"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Dátum potvrdenia"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Pridelenie partnera"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marec"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Celková suma."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Medzisúčet"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturačná adresa:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturačná adresa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cenová ponuka / Objednávka"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Položka objednávky"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "Riadky objednávky"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Zľava(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Položky faktúry"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Dátum vytvorenia"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nevyfakturované a dodané položky"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturačná adresa pre aktuálnu objednávku predaja."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Objednané množstvo"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Množstvo"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Celkom :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Môj predaj"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenník"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Odkaz na objednávku"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiškálna pozícia"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Júl"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stav"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Dátum objednávky"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Dodané"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Platené"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,37 +850,96 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Dátum cenovej ponuky"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Skupina faktúr"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Suma, ktorá bude fakturovaná vopred."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Zľava (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
+"Faktúra nemôže byť vytvorená pre tento riadok v objednávky v dôsledku jednej "
+"z nasledujúcich dôvodov:\n"
+"1. Stav tohto riadku objednávky je buď v \"návrhu\" alebo je \"zrušená\"!\n"
+"2. Riadok v objednávke je účtovaný!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktúry"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Dodané"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesiac"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nevyfakturovaných"
 
 #. module: sale
 #: view:sale.report:0
@@ -776,7 +948,7 @@ msgid "Category of Product"
 msgstr "Kategória produktu"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +959,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Názov obchodu"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,36 +978,260 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Dane :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturovanej"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Zálohová faktúra"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "spracováva sa"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nie je definovaný zákazník !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Vytvorené faktúry"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrdené"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Návrh"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Objednávky predaja"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Výška dane."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Zostáva"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Jún"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Poradie"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analýza predaja"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Štatistiky objednávok predaja"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Rozšírené filtre..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cenová ponuka"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Výnimka"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Október"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1240,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Január"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Objednávka v spracovaní"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1274,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analytický účet v súvislosti s objednávkou predaja."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cenové ponuky"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorovať výnimku"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1378,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Váš odkaz"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Dátum objednávky"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenník"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Predaj"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Množ."
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "zo skladu"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Dátum cenovej ponuky"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Celkom"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Hotovo"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturačná adresa:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktúra"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1492,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Zrušené"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dodacia adresa :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Zálohová faktúra predaja"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,357 +1597,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Vytvoriť faktúru"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Suma bez dane."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Znamená to, že faktúra bola zaplatená."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "podľa objednávky"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dodacia adresa :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Spolu vrátane DPH"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdiť cenovú ponuku"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Zoskupiť podľa..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jednotková cena"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Dane"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Vytvorenie faktúr"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Záloha vo výške"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Dodané množstvo"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Júl"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Výnimka prepravy"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Skupina faktúr"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesiac"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Vytvorené faktúry"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Staré ponuky"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Platené"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analýza predaja"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cenová ponuka"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Ďalšie informácie"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1658,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1676,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1717,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Predaj"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jednotková cena"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Hotovo"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Faktúra"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Zdrojový dokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Zostáva"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Suma bez dane."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Zálohová faktúra predaja"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,10 +1726,38 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Celková suma."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Máj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1472,383 +1770,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Tento report vykonáva analýzu Vašich cenových ponúk a objednávok predaja. "
+"Report analyzuje tržby a triediť ich môžete podľa rôznych skupín kritérií "
+"(obchodník, partner, produkt, atď.). Report analyzuje predaj, ktorý nebol "
+"zatiaľ fakturovaný. Ak chcete analyzovať svoj obrat, mali by ste použiť "
+"analýzu faktúr v module účtovníctvo."
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktúra podľa"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cenová ponuka / Objednávka"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Dátum objednávky"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "manuálne spracovanie"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Poradie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorovať výnimku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencie zákazníkov"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Celkom"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Spoločnosť"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Dátum faktúry"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Suma, ktorá bude fakturovaná vopred."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nie je definovaný zákazník !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Základ :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Zrušená"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Obchod"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Dátum potvrdenia"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Objednávka predaja"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Množstvo (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrdené"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdiť"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Položky faktúry"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# riadky"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Položky objednávky"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Naozaj chcete vytvoriť faktúru (y)?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1858,246 +1807,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Faktúra nemôže byť vytvorená pre tento riadok v objednávky v dôsledku jednej "
-"z nasledujúcich dôvodov:\n"
-"1. Stav tohto riadku objednávky je buď v \"návrhu\" alebo je \"zrušená\"!\n"
-"2. Riadok v objednávke je účtovaný!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Hmotnosť"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faktúry"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nevyfakturovaných"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Suma bez DPH"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Zálohová faktúra"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Návrh"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Výška dane."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Objednávky predaja"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Január"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Objednávka v spracovaní"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Dátum objednávky"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "zo skladu"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Znamená to, že faktúra bola zaplatená."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Máj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Naozaj chcete vytvoriť faktúru (y)?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2120,11 +1869,131 @@ msgstr ""
 msgid "February"
 msgstr "Február"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktúra podľa"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Dátum objednávky"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Zdrojový dokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Apríl"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "manuálne spracovanie"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Staré ponuky"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Vyhľadávanie objednávky predaja"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2135,19 +2004,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Vyhľadávanie objednávky predaja"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2157,44 +2050,92 @@ msgid "Payment Term"
 msgstr "Termín úhrady"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
-"Tento report vykonáva analýzu Vašich cenových ponúk a objednávok predaja. "
-"Report analyzuje tržby a triediť ich môžete podľa rôznych skupín kritérií "
-"(obchodník, partner, produkt, atď.). Report analyzuje predaj, ktorý nebol "
-"zatiaľ fakturovaný. Ak chcete analyzovať svoj obrat, mali by ste použiť "
-"analýzu faktúr v module účtovníctvo."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Položky objednávky"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cenník pre bežné objednávky predaja."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cenová ponuka č."
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencie zákazníkov"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Rok"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Spolu vrátane DPH"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Partial Delivery"
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index c5890edff65..68f6322f43a 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -6,50 +6,196 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 12:04+0000\n"
 "Last-Translator: Vida Potočnik <vida.potocnik@mentis.si>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potrdi Ponudbo"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Nadzorna plošča prodaje"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Pozicije prodajnega naloga, ko so potrjene, zaključene ali s statusom "
-"\"izjema\" in še niso fakturirane"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Potrditve"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "EM prodaje"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Prodajalec"
+msgid "Group By..."
+msgstr "Združi po ..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cenik za trenutni prodajni nalog."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodelitev partnerja"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Lastnosti produkta"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').zamenjaj('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Enota mere"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda nabave"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum potrditve prodajnega naloga."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "Na prodaji uporabi več analitičnih kontov"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marec"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "Najprej prekliči vse račune, vezane na ta prodajni nalog."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Številka ponudbe"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum računa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Dostavljene in nefakturirane pozicije"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Napake računa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Ponudba "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Osnutek ponudbe"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Skupaj"
 
 #. module: sale
 #: view:sale.report:0
@@ -59,10 +205,29 @@ msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Prekliči nalog"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Teža"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Lastnosti skladišča"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Enota mere "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -75,21 +240,179 @@ msgstr "Napačni podatki"
 msgid "The value of Advance Amount must be positive."
 msgstr "Znesek avansa mora biti pozitiven."
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na nalogu"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Status naloga"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Davki"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neobdavčen znesek"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"Iz zaloge: Produkt se vzame iz zaloge ali se počaka na dopolnitev zalog.\n"
+"Po naročilu: Produkt se naroči ali proizvede."
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Ponudba poslana"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Čarovnik za sestavljanje e-pošte"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Če je izbrano, zahtevajo nova sporočila vašo pozornost."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Napake pri odpremi"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Trgovina"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Prodaja v izjemah"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Naslov za račun"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum kreiranja prodajnega naloga."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Napačno"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Ustvari račune"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Davek"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -102,12 +425,15 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Potrditev Datuma"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitični konto"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# pozicij"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -116,6 +442,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -123,9 +454,67 @@ msgid "# of Qty"
 msgstr "# od Kos"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "Omogoča uporabo popusta na poziciji prodajnega naloga."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(posodobi)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "Lastnost pogodbe"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pozicija prodajnega naročila"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Znesek Avansa"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -137,16 +526,54 @@ msgstr ""
 "kupcev.\n"
 "Primer: 10% za trgovce na drobno, 5 EUR za promocijo tega produkta, itd."
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Privzeti plačilni pogoj"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Račun <b>plačan>/b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Mesečni Promet"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Odpremljene količine"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Leto"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -154,9 +581,30 @@ msgid "Allow using different units of measures"
 msgstr "Dovoli uporabo različnih enot mere"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Odstotek"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Nepotrjen prodajni nalog"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Tiskanje"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Naročilo št."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Pozicije naročila"
 
 #. module: sale
 #: report:sale.order:0
@@ -164,26 +612,57 @@ msgid "Disc.(%)"
 msgstr "Pop. (%)"
 
 #. module: sale
-#: code:addons/sale/sale.py:787
+#: code:addons/sale/sale.py:756
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr "Prosim določite konto prihodkov za ta produkt: \"%s\" (id:%d)."
 
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Pozicije računa"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Skupna cena"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Označite polje za združitev računov za iste stranke"
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Moja prodajna naročila"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Naredite Račun"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Ura"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -195,11 +674,59 @@ msgid ""
 "                This installs the module account_analytic_analysis."
 msgstr ""
 
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Datum izdelave"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za fakturiranje"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Naslov za račun na trenutnem prodajnem nalogu."
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
 msgstr "Naročene količine"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Leto prodajnega naloga"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Skupaj:"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moja Prodaja"
+
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
@@ -207,46 +734,149 @@ msgid "Order Reference"
 msgstr "Referenčna številka"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Ostale informacije"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Davčno območje"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julij"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Privzete možnosti"
+
+#. module: sale
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
-msgid "Warning!"
-msgstr "Opozorilo!"
+msgid "Configuration Error!"
+msgstr "Napaka v nastavitvah"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Analitični konti prodaje"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Pošlji po e-pošti"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI cenik (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
 msgstr "Postopek fakturiranja"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Datum naročila"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
 msgstr "Prodajni nalog zaključen"
 
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr "Prosim, določite dnevnik prodaje za to podjetje: \"%s\" (id:%d)."
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
 msgstr "Ponudbe in Prodaja"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plačano"
+
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr "Omogoča izbiro in vzdrževanje različnih enot mere za produkte."
 
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Ustvari in poglej račun"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Združi račune"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Znesek za avansni račun."
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
 msgstr "Prodaja Izdela Račun"
 
 #. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/sale.py:300
 #, python-format
 msgid "Pricelist Warning!"
 msgstr ""
@@ -256,6 +886,20 @@ msgstr ""
 msgid "Discount (%)"
 msgstr "Popust (%)"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Račun za to pozicijo prodajnega naloga se ne more kreirati zaradi enega "
+"izmed naslednjih razlogov:\n"
+"1. Status pozicije prodajnega naloga je bodisi \"osnutek\" ali \"storno\"!\n"
+"2. Pozicija prodajnega naloga je že fakturirana!"
+
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
@@ -267,6 +911,59 @@ msgstr "Ustvari & Poglej račun"
 msgid "My Quotations"
 msgstr "Moje ponudbe"
 
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Poslano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturirano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Skupina izdelka"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Prodajni nalog ni mogoče preklicati."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Znova ustvari račun"
+
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
@@ -277,6 +974,571 @@ msgstr "Omogoči oblikovanje opozoril po kupcu ali produktu"
 msgid "Shop Name"
 msgstr "Ime trgovine"
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Davki :"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturirano"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avansni Račun"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Odpri meni prodaje"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "V obdelavi"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kupec ni določen!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Ustvari račune"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Kreiraj račun iz pozicije prodajnega naloga"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Predloge e-pošte"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "Partner, kateremu mora biti dodeljen posamezen produkt."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Pogodba / Analitično"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Čaka na uvrstitev"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodajni nalogi"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Znesek davka"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Avgust"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Upravlja nabavo in fakturiranje"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Za narediti"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junij"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Vrstni red"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Prodajne Analize"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika prodajnih nalogov"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Prodajalec"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Razširjeni filtri..."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponudba"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Avans Produkta"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Napaka"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodajalna"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Prodajni nalog v obdelavi"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analitični konto, povezan s prodajnim nalogom."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Poglej račun"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Kaj želite fakturirati?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Za prilagoditev cene po kupcih uporabi cenike"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Prodajalec potrdi ponudbo. Status prodajnega naloga je 'V obdelavi' ali  "
+"'Ročno v obdelavi'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr "Preden izberete produkt morate izbrati cenik ali kupca."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Sklic na dokument, ki je ustvaril zahtevo za prodajni nalog."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Ne najdem veljavne pozicije cenika!"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "%s %s avans"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Odložitev obveznosti"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Ponudbe"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Prezri napako"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Dobavni naslov za trenutni prodajni nalog."
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Prikaži marže na prodajnem nalogu"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"To je seznam računov, ki so bili ustvarjeni za ta prodajni nalog. Isti "
+"prodajni nalog se lahko večkrat fakturira (npr. po poziciji)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Vaš sklic"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Prikaži pozicije za fakturiranje"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "DDV"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Izdani računi"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Potrjen prodajni nalog za fakturiranje"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "iz zaloge"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum ponudbe"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Skupaj"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Opravljeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Naslov za račun:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Moje pozicije prodajnega naloga"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Ni cenika! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Iskanje nefakturiranih pozicij"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
@@ -301,204 +1563,12 @@ msgstr ""
 "            "
 
 #. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "Ponudba "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodaja v izjemah"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "Partner, kateremu mora biti dodeljen posamezen produkt."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Avgust"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junij"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistika prodajnih nalogov"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analitični konto, povezan s prodajnim nalogom."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Povzetek"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Poglej račun"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "%s %s avans"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Ponudbe"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
+msgid "Shipping address :"
+msgstr "Naslov za odpremo:"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "Dobavni naslov za trenutni prodajni nalog."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "DDV"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Davčno območje"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "V obdelavi"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "Osnutek računa %s%s <b> čaka na potrditev</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Prodajalec potrdi ponudbo. Status prodajnega naloga je 'V obdelavi' ali  "
-"'Ročno v obdelavi'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-"Ne morete preklicati pozicijo prodajnega naročila, ki je že bila fakturirana."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Naslov za račun na trenutnem prodajnem nalogu."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "Pred dobavo"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "Naslovi na prodajnih nalogih"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "Pogodba / Analitično"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "Omogoči fakturiranje pozicij prodajnega naloga"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mesec prodajnega naloga"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
+#: code:addons/sale/sale.py:502
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -506,419 +1576,24 @@ msgstr "Prodaj z istim partnerjem in različnimi valutami ne morete združiti."
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "ali"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturirano"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
+msgid "Invoice Sales Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Potrditve"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodelitev partnerja"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marec"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "Prodaja: Označi za prebrano"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Skupni znesek"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Skupaj"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "Omogoči vnos popusta na pozicije prodajnega naloga"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Naslov za račun:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "Enota mere "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Naslov za račun"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Povpraševanje / Naročilo"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(posodobi)"
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Uporabi upravljanje pogodb"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Pozicija prodajnega naročila"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print"
-msgstr "Tiskanje"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Naročilo št."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Pozicije naročila"
-
-#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "Na prodaji uporabi več analitičnih kontov"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_journal:0
-msgid ""
-"Allows you to categorize your sales and deliveries (picking lists) between "
-"different journals,\n"
-"                and perform batch operations on journals.\n"
-"                This installs the module sale_journal."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Datum izdelave"
-
-#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Dostavljene in nefakturirane pozicije"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Skupaj:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moja Prodaja"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenik"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' status is set when the related sales order in draft status.    "
-"                 \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed.   "
-"                  \n"
-"* The 'Exception' status is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' status is set when the sales order line has been picked.        "
-"             \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
-msgstr "Napaka v nastavitvah"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
-msgstr "Pošlji po e-pošti"
-
-#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
-msgstr "Ura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Datum naročila"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Poslano"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr ""
-"Omogoči prodajalcu, da za pozicije prodajnih naročil kreira račune z uporabo "
-"menija 'Pozicije za fakturiranje'."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
-msgstr "Ustvari in poglej račun"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum ponudbe"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Ne morete potrditi prodajni nalog na katerem ni nobene pozicije."
-
-#. module: sale
-#: code:addons/sale/sale.py:1124
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr "Preden izberete produkt morate izbrati cenik ali kupca."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Skupina izdelka"
-
-#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
-msgstr "Prodajni nalog ni mogoče preklicati."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Znova ustvari račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
-"Če želite zbrisati potrjen prodajni nalog, ga morate najprej preklicati!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Davki :"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "neznano"
-
-#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Razširjeni filtri..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Napaka"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'.\n"
-"                You may have to create it and set it as a default value on "
-"this field."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid ""
-"Allow to configure notification on products and trigger them when a user "
-"wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-"                Supplier: don't forget to ask for an express delivery."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Ne najdem veljavne pozicije cenika!"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
-msgstr "Prikaži marže na prodajnem nalogu"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"To je seznam računov, ki so bili ustvarjeni za ta prodajni nalog. Isti "
-"prodajni nalog se lahko večkrat fakturira (npr. po poziciji)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Vaš sklic"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kol."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Moje pozicije prodajnega naloga"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:976
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -927,369 +1602,60 @@ msgstr ""
 "Ne najdem pozicije cenika, ki bi se ujemala s tem produktom in količino.\n"
 "Prosim spremenite produkt, količino ali cenik."
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Avansni račun"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Ustvari račun"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Znesek brez davka."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "To pomeni, da je bil račun plačan"
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Številka ponudbe"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na nalogu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Naslov za odpremo:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Prodajni nalog s statusom osnutka"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "Ponudba za <em>%s</em> <b>ustvarjena</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "Sporočila in zgodovina sporočil"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "Nova kopija ponudbe"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "Ni mogoče brisati pozicijo prodajnega naloga, ki ima status '%s'."
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "Lastnosti pozicije"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr "Pred izbiro produkta določite kupca."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Davek vključen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Datum prodajenga naloga"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potrdi Ponudbo"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Združi po ..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "Lastnosti produkta"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Čaka na uvrstitev"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Enota mere"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda nabave"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena enote"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "Fakturiraj celotni prodajni nalog"
+msgid "Percentage"
+msgstr "Odstotek"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "Osnutek ponudbe"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Prodajni nalog"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Davki"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Prodajni nalog pripravljen za fakturiranje"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum kreiranja prodajnega naloga."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Ustvari račune"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Znesek Avansa"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Odpremljene količine"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Naredite Račun"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za fakturiranje"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Leto prodajnega naloga"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julij"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Napake pri odpremi"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Združi račune"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Potreben pregled računovodje."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Ustvari račune"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Kreiraj račun iz pozicije prodajnega naloga"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stare Ponudbe"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plačano"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Prodajne Analize"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponudba"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Ostale informacije"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1312,27 +1678,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1347,7 +1696,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1388,87 +1737,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "Za prilagoditev cene po kupcih uporabi cenike"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Potrjene, nedobavljene pozicije prodajnega naročila"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Izdani računi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena enote"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Opravljeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Izvorni dokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Za narediti"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Znesek brez davka."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Avansni račun"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1478,9 +1746,37 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "Ustvari račune na osnovi pozicij prodajnega naročila"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Skupni znesek"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Potrdi prodajo"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr "Za ta produkt: \"%s\" (id:%d) ni določen konto prihodkov."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1499,386 +1795,29 @@ msgstr ""
 "biti plačan pred dobavo."
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Mesečni Promet"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Račun na"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Povpraševanje / Naročilo"
+
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datum naročila"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ročno v Delu"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Vrstni red"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Potrdi prodajo"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Iz prodajnega naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Prezri napako"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "Popust na pozicijah"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Sklic stranke"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Skupaj"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Nadzorna plošča prodaje"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').zamenjaj('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum potrditve prodajnega naloga."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "Najprej prekliči vse račune, vezane na ta prodajni nalog."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum računa"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Znesek za avansni račun."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Napake računa"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kupec ni določen!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "Lastnosti skladišča"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "Napaka!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"Iz zaloge: Produkt se vzame iz zaloge ali se počaka na dopolnitev zalog.\n"
-"Po naročilu: Produkt se naroči ali proizvede."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Iskanje nefakturiranih pozicij"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "Ponudba poslana"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Čarovnik za sestavljanje e-pošte"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Trgovina"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Potrditev Datuma"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr "Prosim, določite dnevnik prodaje za to podjetje: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "Lastnost pogodbe"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Prodajni nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Postavke prodajnega naloga s statusom 'zaključeno'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potrjeno"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potrdi"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Pozicije računa"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# pozicij"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Pozicije prodajnega naloga"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "Privzete možnosti"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "Analitični konti prodaje"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI cenik (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Ali res želite ustvariti račun(e) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1888,253 +1827,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Račun za to pozicijo prodajnega naloga se ne more kreirati zaradi enega "
-"izmed naslednjih razlogov:\n"
-"1. Status pozicije prodajnega naloga je bodisi \"osnutek\" ali \"storno\"!\n"
-"2. Pozicija prodajnega naloga je že fakturirana!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Zaključene pozicije prodajnega naloga"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Teža"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Računi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr "Za ta produkt: \"%s\" (id:%d) ni določen konto prihodkov."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturirano"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Upravlja nabavo in fakturiranje"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neobdavčen znesek"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avansni Račun"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "Odpri meni prodaje"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Znesek davka"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Potreben pregled računovodje."
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "Prodajni nalog "
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Lastnosti pozicije"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Pozicije prodajnega naloga pripravljene za fakturiranje"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Predloge e-pošte"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodajni nalogi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodajalna"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Pripombe in e-pošta"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Avans Produkta"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Prodajni nalog v obdelavi"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "Prodajni nalog za <em>%s</em> <b>preklican</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Sklic na dokument, ki je ustvaril zahtevo za prodajni nalog."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Odložitev obveznosti"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "Status naloga"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "Prikaži pozicije za fakturiranje"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Potrjen prodajni nalog za fakturiranje"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Nepotrjen prodajni nalog"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "iz zaloge"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Ni cenika! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "Prodajni nalogi"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "Uporabi upravljanje pogodb"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "To pomeni, da je bil račun plačan"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Ali res želite ustvariti račun(e) ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2157,11 +1889,131 @@ msgstr "V naprej"
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Račun na"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datum naročila"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Pred dobavo"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Prodajni nalog s statusom osnutka"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Izvorni dokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ročno v Delu"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Opozorilo!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stare Ponudbe"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Povzetek"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Sporočila in zgodovina sporočil"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Iskanje prodajnih nalogov"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2172,20 +2024,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mesec prodajnega naloga"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Iz prodajnega naloga"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Iskanje prodajnih nalogov"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "Kaj želite fakturirati?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Zaporedje"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "EM prodaje"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Ni mogoče brisati pozicijo prodajnega naloga, ki ima status '%s'."
 
 #. module: sale
 #: report:sale.order:0
@@ -2194,19 +2070,33 @@ msgid "Payment Term"
 msgstr "Plačilni pogoj"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Prodajni nalog pripravljen za fakturiranje"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "ali"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Pozicije prodajnega naloga"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cenik za trenutni prodajni nalog."
 
 #. module: sale
 #: report:sale.order:0
@@ -2214,21 +2104,59 @@ msgid "Quotation N°"
 msgstr "Ponudba št."
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Popust na pozicijah"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Sklic stranke"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Leto"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "Želite fakturirati izbrane pozicije prodajnega naloga?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr "Pred izbiro produkta določite kupca."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Davek vključen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nova kopija ponudbe"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Datum prodajenga naloga"
 
 #~ msgid "Inventory Moves"
 #~ msgstr "Premiki inventarja"
@@ -2373,6 +2301,9 @@ msgstr "Želite fakturirati izbrane pozicije prodajnega naloga?"
 #~ msgid "Our Salesman"
 #~ msgstr "Naš prodajalec"
 
+#~ msgid "Sale Order"
+#~ msgstr "Prodajni nalog"
+
 #~ msgid "Direct Delivery"
 #~ msgstr "Direktna dostava"
 
@@ -2940,3 +2871,32 @@ msgstr "Želite fakturirati izbrane pozicije prodajnega naloga?"
 
 #~ msgid "Based on Timesheet"
 #~ msgstr "Na osnovi časovnice"
+
+#~ msgid "My Sale Orders"
+#~ msgstr "Moja prodajna naročila"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Račun na osnovi dobav"
+
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Pozicije prodajnega naloga, ko so potrjene, zaključene ali s statusom "
+#~ "\"izjema\" in še niso fakturirane"
+
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Ne morete potrditi prodajni nalog na katerem ni nobene pozicije."
+
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Potrjene, nedobavljene pozicije prodajnega naročila"
+
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Postavke prodajnega naloga s statusom 'zaključeno'"
+
+#~ msgid "Sale order lines done"
+#~ msgstr "Zaključene pozicije prodajnega naloga"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Pozicije prodajnega naloga pripravljene za fakturiranje"
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index bddc4688f83..6eaa807ea95 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.po
@@ -7,47 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:29+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
 msgstr ""
 
 #. module: sale
@@ -61,6 +207,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,11 +421,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,15 +520,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -148,461 +575,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,20 +636,74 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
 msgstr ""
 
 #. module: sale
@@ -656,16 +711,30 @@ msgstr ""
 msgid "Total :"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,22 +812,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,14 +974,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -813,21 +1146,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,345 +1593,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1258,11 +1629,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,8 +1722,36 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
 msgstr ""
 
 #. module: sale
@@ -1472,382 +1766,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1858,240 +1798,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,19 +1995,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2153,18 +2041,32 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2172,18 +2074,57 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 921f1c68487..766cf6efce7 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -7,49 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrđivanje ponude"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Potvrde"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Grupisano po..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodeljivanje partnera"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metod Nabavke"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mart"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Preduzece"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum Fakture"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Stavke za koje ne postoji račun a isporučene su"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Računi izuzeci"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitički nalog"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Ukupno"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -61,6 +207,26 @@ msgstr "Dan"
 msgid "Cancel Order"
 msgstr "Poništite nalog"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na nalog"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovani iznos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Ukupno neto"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Izuzeci kod transporta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Prodaje izuzeci"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa računa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Kreiraj Fakture"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrdjivanja"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitički nalog"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Linija"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "# Kol"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni Nalog"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Napredni Iznos"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Podrazumevani uslovi plaćanja"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potvrda"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Isporučene količine"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Godina"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna Cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Narucene Kolicine"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Reference Naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "OStale Informacije"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moja ponuda"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Ime prodavnice"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Prodaje izuzeci"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Avgust"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Jun"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistika Prodajnih Naloga"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktobar"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Upiti"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembar"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Račun"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Potvrde"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodeljivanje partnera"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mart"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Ukupno"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa računa:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa računa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponude / Nalozi"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "Stavke naloga"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavke računa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Napravi Fakture"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "datum Kreacije"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za Fakturu"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Stavke za koje ne postoji račun a isporučene su"
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Narucene Kolicine"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Ukupno:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Moje Prodaje"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenovnik"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Reference Naloga"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Datum Naloga"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Isporuceno"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeni"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,38 +850,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Upita"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupisanje računa"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Iznos koji bi trebalo unapred fakturisati"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moja ponuda"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembar"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Isporuceno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturisano"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr "Kategorija proizvoda"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Osvežavanje računa"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Ime prodavnice"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,36 +974,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Porezi:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Račun"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Račun unapred"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kupac nije definisan!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Kreiranje računa"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Prodajna linija naloga Napravi_fakturu"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Nalozi za prodaju"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Avgust"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pogoni nabavke i fakturiranja"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Za Uraditi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Jun"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza prodaje"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika Prodajnih Naloga"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembar"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Prosireni Filteri"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Unapređeni proizvod"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Izuzetak"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktobar"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
+"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
+"Plati pre isporuke' ."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1239,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Nalog za prodaju u toku"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1273,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Kasnjenje Komitenta"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Upiti"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1377,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Vaše veze"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Naruceno Dana"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenovnik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Kol"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "od akcije"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Upita"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Urađeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa računa:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Račun"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1491,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Otkaži"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pretrazi Nefakturisane linije"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,360 +1596,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Kreiranje računa"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na nalog"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Ukupno Ukljucenih Poreza"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrđivanje ponude"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupisano po..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metod Nabavke"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinica cene"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Nalog za prodaju"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Kreiraj Fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Napredni Iznos"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Isporučene količine"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Napravi Fakture"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za Fakturu"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzeci kod transporta"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupisanje računa"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Da bude pregledano od strane racunovodje."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Kreiranje računa"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Prodajna linija naloga Napravi_fakturu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stari Upiti"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeni"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza prodaje"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
-"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
-"Plati pre isporuke' ."
+msgid "Other Information"
+msgstr "OStale Informacije"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1288,27 +1657,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1323,7 +1675,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1364,92 +1716,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinica cene"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Urađeno"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Za Uraditi"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1459,10 +1725,38 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1475,383 +1769,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Račun na"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponude / Nalozi"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datum naručivanja"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Proizvod UoS"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Nalog"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenca Potrosaca"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Preduzece"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum Fakture"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Iznos koji bi trebalo unapred fakturisati"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Računi izuzeci"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kupac nije definisan!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Ukupno neto"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pretrazi Nefakturisane linije"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavnica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrdjivanja"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Prodajni Nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrda"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavke računa"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Linija"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke naloga za prodaju"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1861,242 +1801,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Da bude pregledano od strane racunovodje."
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Računi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturisano"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pogoni nabavke i fakturiranja"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovani iznos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Račun unapred"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Nalozi za prodaju"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembar"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Unapređeni proizvod"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Nalog za prodaju u toku"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Kasnjenje Komitenta"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Naruceno Dana"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "od akcije"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2119,11 +1863,131 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Račun na"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembar"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datum naručivanja"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Proizvod UoS"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stari Upiti"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Pretrazi Prodajne Naloge"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2134,20 +1998,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pretrazi Prodajne Naloge"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2156,18 +2044,32 @@ msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Stavke naloga za prodaju"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2175,20 +2077,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "Ponuda N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenca Potrosaca"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Isabrani"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Godina"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Ukupno Ukljucenih Poreza"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Partial Delivery"
@@ -2527,6 +2468,9 @@ msgstr ""
 #~ msgid "One procurement for each product."
 #~ msgstr "Jedna nabavka za svaki proizvod."
 
+#~ msgid "Sale Order"
+#~ msgstr "Nalog za prodaju"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Cenovnik prodaje"
 
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index 93e2ba923bf..991dec92948 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/i18n/sr@latin.po
@@ -7,49 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrđivanje ponude"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Potvrde"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Grupisano po..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodeljivanje partnera"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metod Nabavke"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mart"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Preduzece"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum Fakture"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Stavke za koje ne postoji račun a isporučene su"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Računi izuzeci"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitički nalog"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Ukupno"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -61,6 +207,26 @@ msgstr "Dan"
 msgid "Cancel Order"
 msgstr "Poništite nalog"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na nalog"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovani iznos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Ukupno neto"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Izuzeci kod transporta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Prodaje izuzeci"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa računa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Kreiraj Fakture"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrdjivanja"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitički nalog"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Linija"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr "# Kol"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni Nalog"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Napredni Iznos"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,478 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Podrazumevani uslovi plaćanja"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Potvrda"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Isporučene količine"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Godina"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna Cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Narucene Kolicine"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Reference Naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "OStale Informacije"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moja ponuda"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Ime prodavnice"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Prodaje izuzeci"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Avgust"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Jun"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistika Prodajnih Naloga"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktobar"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Upiti"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembar"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Račun"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Potvrde"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodeljivanje partnera"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mart"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Ukupno"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa računa:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa računa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponude / Nalozi"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "Stavke naloga"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavke računa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Napravi Fakture"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "datum Kreacije"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za Fakturu"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Stavke za koje ne postoji račun a isporučene su"
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Narucene Kolicine"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Ukupno:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Moje Prodaje"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenovnik"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Reference Naloga"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "Datum Naloga"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Isporuceno"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeni"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,38 +850,93 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Upita"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupisanje računa"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Iznos koji bi trebalo unapred fakturisati"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moja ponuda"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembar"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Isporuceno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturisano"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr "Kategorija proizvoda"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Osvežavanje računa"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Ime prodavnice"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,36 +974,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Porezi:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Račun"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Račun unapred"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kupac nije definisan!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Kreiranje računa"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Prodajna linija naloga Napravi_fakturu"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Nalozi za prodaju"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Avgust"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pogoni nabavke i fakturiranja"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Za Uraditi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Jun"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza prodaje"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika Prodajnih Naloga"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembar"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Prosireni Filteri"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Unapređeni proizvod"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Izuzetak"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktobar"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
+"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
+"Plati pre isporuke' ."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1239,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Nalog za prodaju u toku"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1273,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Kasnjenje Komitenta"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Upiti"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1377,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Vaše veze"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Naruceno Dana"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenovnik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Kol"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "od akcije"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Upita"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Urađeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa računa:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Račun"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1491,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Otkaži"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pretrazi Nefakturisane linije"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,360 +1596,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Kreiranje računa"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na nalog"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Ukupno Ukljucenih Poreza"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrđivanje ponude"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Grupisano po..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metod Nabavke"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinica cene"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Nalog za prodaju"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Kreiraj Fakture"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Napredni Iznos"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Isporučene količine"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Napravi Fakture"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za Fakturu"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzeci kod transporta"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupisanje računa"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Da bude pregledano od strane racunovodje."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Kreiranje računa"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Prodajna linija naloga Napravi_fakturu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stari Upiti"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeni"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza prodaje"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
-"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
-"Plati pre isporuke' ."
+msgid "Other Information"
+msgstr "OStale Informacije"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1288,27 +1657,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1323,7 +1675,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1364,92 +1716,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinica cene"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Urađeno"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Za Uraditi"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1459,10 +1725,38 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1475,383 +1769,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Račun na"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponude / Nalozi"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datum naručivanja"
+msgid "Tel. :"
+msgstr "Tel.:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Proizvod UoS"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Nalog"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenca Potrosaca"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Preduzece"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum Fakture"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Iznos koji bi trebalo unapred fakturisati"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Računi izuzeci"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kupac nije definisan!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Ukupno neto"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pretrazi Nefakturisane linije"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavnica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrdjivanja"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Prodajni Nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrda"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavke računa"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Linija"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke naloga za prodaju"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1861,242 +1801,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Da bude pregledano od strane racunovodje."
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Računi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturisano"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pogoni nabavke i fakturiranja"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovani iznos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Račun unapred"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Nalozi za prodaju"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembar"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Unapređeni proizvod"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Nalog za prodaju u toku"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Kasnjenje Komitenta"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Naruceno Dana"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "od akcije"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2119,11 +1863,131 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Račun na"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembar"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datum naručivanja"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Proizvod UoS"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stari Upiti"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Pretrazi Prodajne Naloge"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Opis"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2134,20 +1998,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pretrazi Prodajne Naloge"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2156,18 +2044,32 @@ msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Stavke naloga za prodaju"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2175,20 +2077,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "Ponuda N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenca Potrosaca"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Isabrani"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Godina"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Ukupno Ukljucenih Poreza"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
@@ -2486,6 +2427,9 @@ msgstr ""
 #~ msgid "Create Procurement Order"
 #~ msgstr "Kreiraj Nabavni Nalog"
 
+#~ msgid "Sale Order"
+#~ msgstr "Nalog za prodaju"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Opcije transporta"
 
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 143199ad0d0..84ecf6e0b10 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -6,50 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Godkänn offert"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Kundorder infopanel"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
 msgstr ""
-"Godkända kundorderrader, klara eller i status undantag och ännu ej är "
-"fakturerade"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bekräftat Datum"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Försäljningsenhet"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Andelsföretag"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prislista till aktuell kundorder."
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Anskaffningsmetod"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum när kundordern är bekräftad."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Företag"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fakturadatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Ej fakturerade med levererade rader"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakturaundantag"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Objekt"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Deltotal"
 
 #. module: sale
 #: view:sale.report:0
@@ -62,6 +206,26 @@ msgstr "Dag"
 msgid "Cancel Order"
 msgstr "Avbryt order"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Vikt"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -74,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "beställt"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Moms"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Belopp ex. moms"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Orderrader med anknytning till mina kundorder"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Leveransundantag"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Antal"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Butik"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Kundorder med fel"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturaadress"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum då kundordern skapades."
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Skapa fakturor"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -100,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Bekräfta Datum"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Objekt"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "rader"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -114,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -121,8 +450,66 @@ msgid "# of Qty"
 msgstr "Antal"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Kundorder"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Förskott Belopp"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -132,481 +519,69 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Standard betalningsvillkor"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Månatlig omsättning"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Levererat antal"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rab.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totalt belopp"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Markera checkboxen för att gruppera fakturorna per kund."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mina kundordrar"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Beställt antal"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Orderreferens"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Övrig information"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Offerter och order"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Skapa kundfaktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Prislistevarning"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabatt (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mina offerter"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Butiksnamn"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Kundorder med fel"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Status"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusti"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Kundorderstatistik"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Kundorderns objektkonton."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Offerter"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Antal"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "Moms :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiscal Position"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Pågår"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Säljaren bekräftar offerten. Status på ordern går över i 'pågår' eller "
-"'manuell pågående'."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturaadress för kundordern."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Kundorderns månad"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "Du kan inte gruppera försäljning med olika valutor på samma företag."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturerad"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bekräftat Datum"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Andelsföretag"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mars"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Den totala summan."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Deltotal"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturaadress :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturaadress"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Orderrader med anknytning till mina kundorder"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Quotation / Order"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Orderrad"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Icke bekräftade kundorder"
 
 #. module: sale
 #: view:sale.order:0
@@ -625,8 +600,30 @@ msgid "Order Lines"
 msgstr "Kundorderrader"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Fakturarader"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totalt belopp"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -638,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Markera checkboxen för att gruppera fakturorna per kund."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Skapa fakturor"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Timme"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Skapad datum"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Att fakturera"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturaadress för kundordern."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Beställt antal"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Kundorder innevarande år"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Ej fakturerade med levererade rader"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Antal"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Totalt:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Min försäljning"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prislista"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Orderreferens"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Momshantering"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -686,29 +751,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Timme"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI-prislista (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -716,23 +811,37 @@ msgid "Order Date"
 msgstr "Orderdatum"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Levererad"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Offerter och order"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betald"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -740,39 +849,95 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppera fakturorna"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Det belopp som skall förskottsfaktureras."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Skapa kundfaktura"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Du kan inte bekräfta en kundorder utan försäljningsrader."
+msgid "Pricelist Warning!"
+msgstr "Prislistevarning"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Du måste välja en prislista eller en kund i försäljningsformuläret!\n"
-"Ställ in en innan du väljer en produkt."
+"Fakturan kunde inte skapad för denna kundorder av något av följande skäl::\n"
+"1. Någon orderrad är antingen fortfarande i utkast eller avbruten!\n"
+"2. Någon orderrad är redan fakturerad!"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mina offerter"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakturor"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Levererad"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Ofakturerad"
 
 #. module: sale
 #: view:sale.report:0
@@ -781,7 +946,7 @@ msgid "Category of Product"
 msgstr "Produktkategori"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -792,10 +957,18 @@ msgid "Recreate Invoice"
 msgstr "Återskapa faktura"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Butiksnamn"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -803,36 +976,263 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Moms :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturerad"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avancerad faktura"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Pågår"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "No Customer Defined !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Skapa fakturor"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bekräftad"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Kundorderrad Skapa faktura"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Utdrag"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "E-postmallar"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Schemalagd väntan"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Kundorder"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Momsen."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusti"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Styr anskaffning och fakturering"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Att göra"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Försäljningsanalys"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Kundorderstatistik"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Datum"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Utökade filter..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offert"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Avancerad produkt"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Undantag"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Säljaren skapar en faktura manuellt, om leveranspolicyn är  'Leverans och "
+"manuell pågående'. Fakturan skapas automatiskt och leveranspolicyn är "
+"'Betalning innan leverans'."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Butik"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -841,6 +1241,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Pågående kundorder"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -851,11 +1275,97 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Kundorderns objektkonton."
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Säljaren bekräftar offerten. Status på ordern går över i 'pågår' eller "
+"'manuell pågående'."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Du måste välja en prislista eller en kund i försäljningsformuläret!\n"
+"Ställ in en innan du väljer en produkt."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"En hänvisning till det dokument som genererade denna försäljningsorder."
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Ingen korrekt prislista funnen!:"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Engagemangsfördröjning"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Offerter"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Bortse från undantag"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -876,11 +1386,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Er referens"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Orderdatum"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prislista"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Moms :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Kundfakturor"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Bekräftade kundorder att fakturera"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Kundorder"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Om du ändrar prislistan för denna order (och så småningom valuta) kommer "
+"priserna på befintliga orderrader inte uppdateras."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Antal"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "från lager"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Quotation Date"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Klar"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturaadress :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Faktura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -896,19 +1502,101 @@ msgstr "Mina kundorderrader"
 msgid "Cancel"
 msgstr "Avbryt"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Ingen prislista !: "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Sök ej fakturerade rader"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Orderreferensen måste vara unik per bolag!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Leveransadress :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "Du kan inte gruppera försäljning med olika valutor på samma företag."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Försäljning, avancerad fakturabetalning"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -919,362 +1607,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Skapa faktura"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Summa utan moms."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Orderreferens"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Anger att en faktura är betald."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr "Pris"
 
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "beställt"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Leveransadress :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Utkast status"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Inklusive moms"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Datum för kundordern"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Godkänn offert"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Gruppera på..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Schemalagd väntan"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Anskaffningsmetod"
-
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Kundorder"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Moms"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Kundorder redo för fakturering"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum då kundordern skapades."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Skapa fakturor"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Förskott Belopp"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Levererat antal"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Om du ändrar prislistan för denna order (och så småningom valuta) kommer "
-"priserna på befintliga orderrader inte uppdateras."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Skapa fakturor"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Att fakturera"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Kundorder innevarande år"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Leveransundantag"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppera fakturorna"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Månad"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Skall granskas av revisorn."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Skapa fakturor"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Kundorderrad Skapa faktura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Gamla offerters"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betald"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Försäljningsanalys"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Offert"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Säljaren skapar en faktura manuellt, om leveranspolicyn är  'Leverans och "
-"manuell pågående'. Fakturan skapas automatiskt och leveranspolicyn är "
-"'Betalning innan leverans'."
+msgid "Other Information"
+msgstr "Övrig information"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1297,27 +1668,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1332,7 +1686,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1373,92 +1727,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Icke levererade men bekräftade orderrader"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Kundfakturor"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Kundorder"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Pris"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Klar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Källdokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Att göra"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Summa utan moms."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Försäljning, avancerad fakturabetalning"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1468,10 +1736,38 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Den totala summan."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pris"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1484,386 +1780,34 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Månatlig omsättning"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fakturera utgående från"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Denna rapport analyserar dina offerter och försäljningsorder. Analysen "
+"belyser dina försäljningsintäkter inom olika kriterier (säljare, partner, "
+"produkt, etc.) Använd den här rapporten för att utföra analyser på "
+"försäljningen som ännu inte har fakturerats. Om du vill analysera din "
+"omsättning, bör du använda Fakturaanalysrapporten i Bokföringen."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Quotation / Order"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Orderdatum"
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkt"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuell pågående"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Från en kundorder"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Bortse från undantag"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Beroende på faktureringskontroll av kundorder, kan fakturan baseras på "
-"levererade eller beställda kvantiteterna. Således kan en kundorder genererar "
-"en faktura eller ett leveransordern så snart den bekräftas av försäljaren."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Kundreferens"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Kundorder infopanel"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum när kundordern är bekräftad."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Företag"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fakturadatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Det belopp som skall förskottsfaktureras."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakturaundantag"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "No Customer Defined !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto total:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Sök ej fakturerade rader"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Butik"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Bekräfta Datum"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Kundorder"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Antal"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Orderrader i klar-status"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bekräftad"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bekräfta"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Fakturarader"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "rader"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Kundorderrader"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI-prislista (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Vill du verkligen skapa fakturan/fakturorna ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1873,246 +1817,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Fakturan kunde inte skapad för denna kundorder av något av följande skäl::\n"
-"1. Någon orderrad är antingen fortfarande i utkast eller avbruten!\n"
-"2. Någon orderrad är redan fakturerad!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Kundorderrader klara"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Vikt"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakturor"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Ofakturerad"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Skall granskas av revisorn."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Styr anskaffning och fakturering"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Belopp ex. moms"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avancerad faktura"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Utdrag"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Momsen."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Kundorderrader färdiga för fakturering"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "E-postmallar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Kundorder"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Butik"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Avancerad produkt"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Pågående kundorder"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"En hänvisning till det dokument som genererade denna försäljningsorder."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Engagemangsfördröjning"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Orderdatum"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Bekräftade kundorder att fakturera"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Icke bekräftade kundorder"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "från lager"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Ingen prislista !: "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Anger att en faktura är betald."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Beskrivning"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Vill du verkligen skapa fakturan/fakturorna ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2135,11 +1879,131 @@ msgstr "Förskott"
 msgid "February"
 msgstr "Februari"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fakturera utgående från"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Orderdatum"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkt"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Utkast status"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Källdokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuell pågående"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Gamla offerters"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Sök kundorder"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Beskrivning"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2150,20 +2014,47 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Sök kundorder"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Kundorderns månad"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Från en kundorder"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvens"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Beroende på faktureringskontroll av kundorder, kan fakturan baseras på "
+"levererade eller beställda kvantiteterna. Således kan en kundorder genererar "
+"en faktura eller ett leveransordern så snart den bekräftas av försäljaren."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Försäljningsenhet"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2172,46 +2063,94 @@ msgid "Payment Term"
 msgstr "Betalningsvillkor"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Kundorder redo för fakturering"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
 msgstr ""
-"Denna rapport analyserar dina offerter och försäljningsorder. Analysen "
-"belyser dina försäljningsintäkter inom olika kriterier (säljare, partner, "
-"produkt, etc.) Använd den här rapporten för att utföra analyser på "
-"försäljningen som ännu inte har fakturerats. Om du vill analysera din "
-"omsättning, bör du använda Fakturaanalysrapporten i Bokföringen."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Kundorderrader"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prislista till aktuell kundorder."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Offertnummer"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Kundreferens"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Plockad"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "År"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Inklusive moms"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Datum för kundordern"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "Återskapa inköp"
 
@@ -2379,6 +2318,9 @@ msgstr ""
 #~ msgid "Product UoM"
 #~ msgstr "Produkt"
 
+#~ msgid "Sale Order"
+#~ msgstr "Kundorder"
+
 #~ msgid "Name"
 #~ msgstr "Namn"
 
@@ -3189,6 +3131,9 @@ msgstr ""
 #~ msgid "The sales order '%s' has been cancelled."
 #~ msgstr "Kundordern '%s' har annullerats."
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Mina kundordrar"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -3214,6 +3159,9 @@ msgstr ""
 #~ msgid "Sales by Partner"
 #~ msgstr "Försäljning per företag"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Icke levererade men bekräftade orderrader"
+
 #~ msgid ""
 #~ "This is a list of picking that has been generated for this sales order."
 #~ msgstr "Den här plocklistan är skapad för denna kundorder."
@@ -3236,6 +3184,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Du måste först avbryta all fakturering med anknytning till denna kundorder"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Kundorderrader klara"
+
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Kundorderrader färdiga för fakturering"
+
 #~ msgid "Sales order created in last month"
 #~ msgstr "Kundordrar under senaste månaden"
 
@@ -3371,6 +3325,13 @@ msgstr ""
 #~ msgid "You cannot cancel a sale order line that has already been invoiced!"
 #~ msgstr "Du kan inte avbryta en orderrad som redan är fakturerad!"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Godkända kundorderrader, klara eller i status undantag och ännu ej är "
+#~ "fakturerade"
+
 #, python-format
 #~ msgid ""
 #~ "In order to delete a confirmed sale order, you must cancel it before ! To "
@@ -3408,9 +3369,16 @@ msgstr ""
 #~ msgid "You can not move products from or to a location of the type view."
 #~ msgstr "Du kan inte flytta produkter från eller till en lokal av typen visa."
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Du kan inte bekräfta en kundorder utan försäljningsrader."
+
 #~ msgid "Sales by Product's Category in last 90 days"
 #~ msgstr "Senaste 90 dagarnas försäljning per produktkategori"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "Orderrader i klar-status"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is in state '%s'!"
 #~ msgstr "Kan inte radera orderrader som är i status '%s'!"
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index 095ab2417ad..23071f8cf9c 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "ยืนยันใบเสนอราคา"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "วันที่ยืนยัน"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "รายการราคาสำหรับใบขายนี้"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "วิธีการจัดซื้อ"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "รายการที่ยังไม่ได้จัดส่งและแจ้งหนี้"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "วิเคราะห์บัญชี"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "รวม"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "วัน"
 msgid "Cancel Order"
 msgstr "ยกเลิกคำสั่งซื้อ"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "อยู่ระหว่างการสั่งซื้อ"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "ภาษี"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "ยกเว้นการขาย"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "ที่อยู่ใบแจ้งหนี้"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "วิเคราะห์บัญชี"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "โทรสาร :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "พาร์ตเนอร์"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "รายการใบสั่งขาย"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,15 +520,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "เงื่อนไขการชำระเงินปรกติ"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -148,461 +575,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "ส่วนลด (%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "ราคารวม"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "จำนวนที่สั่งซื้อ"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "ข้อมูลอ้างอิงใบสั่งซื้อ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "ข้อมูลอื่นๆ"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "ส่วนลด (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "ชื่อร้าน"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "ยกเว้นการขาย"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "มิถุนายน"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "สถิติใบสั่งขาย"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "ตุลาคม"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "ใบเสนอราคา"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "จำนวน"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "กันยายน"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "กำลังดำเนินการ"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "โทรศัพท์ :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "ที่อยู่ใบแจ้งหนี้สำหรับใบสั่งขายนี้"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "ส่งใบแจ้งหนี้แล้ว"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "วันที่ยืนยัน"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "มีนาคม"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "รวมทั้งหมด"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "รวม"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "ที่อยู่ใบแจ้งหนี้ :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "ที่อยู่ใบแจ้งหนี้"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "ใบเสนอราคา / สั่งซื้อ"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "รายการใบสั่งขาย"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -622,8 +601,30 @@ msgid "Order Lines"
 msgstr "รายการสั่งสินค้า"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "ส่วนลด (%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "ราคารวม"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -635,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "วันที่สร้าง"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "รายการที่ยังไม่ได้จัดส่งและแจ้งหนี้"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "ที่อยู่ใบแจ้งหนี้สำหรับใบสั่งขายนี้"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "จำนวนที่สั่งซื้อ"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "จำนวน"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "รวม :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "การขายของฉัน"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "รายการราคา"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "ข้อมูลอ้างอิงใบสั่งซื้อ"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "กรกฎาคม"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -683,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -713,23 +812,37 @@ msgid "Order Date"
 msgstr "วันที่สั่งซื้อ"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "จัดส่งแล้ว"
-
-#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "ชำระแล้ว"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "พาร์ตเนอร์"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -737,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "วันที่เสนอราคา"
-
-#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "ส่วนลด (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "จัดส่งแล้ว"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -776,7 +944,7 @@ msgid "Category of Product"
 msgstr "ประเภทของสินค้า"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -787,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "สร้างใบแจ้งหนี้ใหม่"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "ชื่อร้าน"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -798,36 +974,260 @@ msgstr ""
 msgid "Taxes :"
 msgstr "ภาษี :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "ส่งใบแจ้งหนี้แล้ว"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "กำลังดำเนินการ"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "ไม่ได้ระบุลูกค้า !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "สิ่งที่จะทำ"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "มิถุนายน"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "วิเคราะห์การขาย"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "สถิติใบสั่งขาย"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "พฤศจิกายน"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "ใบเสนอราคา"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "ยกเว้น"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "ตุลาคม"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "ร้าน"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -836,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -846,11 +1270,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "ใบเสนอราคา"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -869,11 +1374,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "รายการราคา"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "การขาย"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "ปริมาณ"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "วันที่เสนอราคา"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "เสร็จแล้ว"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "ที่อยู่ใบแจ้งหนี้ :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "ใบแจ้งหนี้"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -889,19 +1488,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "ยกเลิก"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "ที่อยู่ในการจัดส่ง :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -912,357 +1593,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "สร้างใบแจ้งหนี้"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "ราคา"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "อยู่ระหว่างการสั่งซื้อ"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "ที่อยู่ในการจัดส่ง :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "รวมทั้งหมด รวมภาษี"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "ยืนยันใบเสนอราคา"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "จัดกลุ่มตาม..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "วิธีการจัดซื้อ"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "ราคาต่อหน่วย"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "ภาษี"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "โทรสาร :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "กรกฎาคม"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "เดือน"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "ใบเสนอราคาเก่า"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "ชำระแล้ว"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "วิเคราะห์การขาย"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "ใบเสนอราคา"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "ข้อมูลอื่นๆ"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1285,27 +1654,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1320,7 +1672,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1361,92 +1713,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "การขาย"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "ราคาต่อหน่วย"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "เสร็จแล้ว"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "ใบแจ้งหนี้"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "สิ่งที่จะทำ"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1456,10 +1722,38 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "รวมทั้งหมด"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "ราคา"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1472,383 +1766,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "ใบเสนอราคา / สั่งซื้อ"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
+msgid "Tel. :"
+msgstr "โทรศัพท์ :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "จากใบสั่งขาย"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "ไม่ได้ระบุลูกค้า !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "คุณต้องการสร้างใบแจ้งหนี้จริงหรือไม่ ?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1858,242 +1798,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "ร้าน"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "พฤศจิกายน"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "คุณต้องการสร้างใบแจ้งหนี้จริงหรือไม่ ?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2116,11 +1860,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "กันยายน"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "ใบเสนอราคาเก่า"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2131,19 +1995,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "จากใบสั่งขาย"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2153,39 +2041,92 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "รายการราคาสำหรับใบขายนี้"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "รวมทั้งหมด รวมภาษี"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Sales by Salesman in last 90 days"
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index f4fa614d958..fe7c44bf7e2 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -6,47 +6,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
 msgstr ""
 
 #. module: sale
@@ -60,6 +206,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,11 +420,15 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,15 +519,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -147,461 +574,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -621,8 +600,30 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -634,20 +635,74 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
 msgstr ""
 
 #. module: sale
@@ -655,16 +710,30 @@ msgstr ""
 msgid "Total :"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
@@ -682,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -712,22 +811,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -736,36 +849,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -775,7 +943,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -786,10 +954,18 @@ msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -797,14 +973,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -812,21 +1145,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -835,6 +1235,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -845,11 +1269,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -868,11 +1373,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -888,19 +1487,101 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -911,345 +1592,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1257,11 +1628,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1284,27 +1653,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1319,7 +1671,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1360,92 +1712,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1455,8 +1721,36 @@ msgid "Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
 msgstr ""
 
 #. module: sale
@@ -1471,382 +1765,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1857,240 +1797,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2115,11 +1859,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2130,19 +1994,43 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
@@ -2152,18 +2040,32 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2171,18 +2073,57 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 6a8ff59d1e3..75ffe9089c4 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -6,50 +6,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-27 21:47+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
-"Onaylanmış, yapılmış ya da istisna durumundaki ve henüz faturalandırılmamış "
-"Satış Siparişi Satırı"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Teklifi Onayla"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Satış Kontrol Paneli"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Onaylama Tarihi"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Satış Birimi"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "Satış Temsülcisi"
+msgid "Group By..."
+msgstr "Gruplandır..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Geçerli satış siparişi için Fiyat listesi"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Tahsisli Paydaş"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Ölçü Birimi"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Satınalma Yöntemi"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Satış siparişinin onaylandığı tarih."
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mart"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Teklif No"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fatura Tarihi"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Faturalanmamış ve Teslim edilmiş Öğeler"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fatura İstisnası"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Teklif "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analiz Hesabı"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Ara Toplam"
 
 #. module: sale
 #: view:sale.report:0
@@ -62,6 +206,26 @@ msgstr "Gün"
 msgid "Cancel Order"
 msgstr "Siparişi İptal Et"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Ağırlık"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -74,21 +238,177 @@ msgstr "Hatalı Veri"
 msgid "The value of Advance Amount must be positive."
 msgstr "Avans tutarı pozitif değer olmak zorunda."
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "sipariş üzerine"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Vergiler"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Vergilendirilmemiş Tutar"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Net Toplam :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "İptal edildi"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Benim Satış Siparişlerimle ilişkili Satış Siparişi Öğeleri"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "Eğer işaretlerseniz yeni mesajlar ilginizi gerektirir."
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Gönderim İstisnası"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Miktar (Satış Birimi)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Mağaza"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "İstisnai Satışlar"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fatura Adresi"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Satış siparişinin oluşturulduğu tarih"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "Yanlış"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Faturaları Oluştur"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "Vergi"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -100,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Onay Tarihi"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analiz Hesabı"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Öğe #"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -114,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -121,8 +450,66 @@ msgid "# of Qty"
 msgstr "Miktar #"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(güncelle)"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Paydaş"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Satış Siparişi"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Satış Siparişi Öğesi"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Peşinat Tutarı"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -132,16 +519,54 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Varsayılan Ödeme Şartı"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Onayla"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "Fatura <b>ödendi</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Aylık Gelir"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Gönderilen Miktar"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Yıl"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -149,465 +574,14 @@ msgid "Allow using different units of measures"
 msgstr "Farklı ölçü birimleri kullanmaya izin ver"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "Yüzde"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "İnd.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Toplam Fiyat"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Aynı müşteriye ait faturaları gruplamak için işaretleyin"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Satış Siparişlerim"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Sipariş edilen Miktarlar"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Sipariş Referansı"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Diğer Bilgiler"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "Uyarı!"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "Faturalama İşlemi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "Satış siparişi tamamlandı"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "Teklifler ve Satışlar"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Satış Fatura oluşturur"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Fiyat Listesi Uyarısı!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "İndirim (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Tekliflerim"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Mağaza Adı"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Quotation "
-msgstr "Teklif "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "İstisnai Satışlar"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Durum"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Ağustos"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Haziran"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Satış Siparişi İstatistikleri"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Satış Siparişi ile ilişkili analiz hesabı"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Ekim"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "Özet"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "Fatura Görüntüle"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Teklifler"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Miktar"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Eylül"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Mali Durum"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "İşlemde"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Satış temsilcisi teklifi onaylıyor. Satış Siparişinin durumu \"İşlemde\" ya "
-"da \"Manuel ilemde\"olur."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Şu anki sipariş için fatura adresi."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Satış siparişlerinin verildiği ay"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Aynı paydaş için farklı para birimlerindeki satışları gruplandıramazsınız."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "veya"
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faturalandı"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Onaylama Tarihi"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Tahsisli Paydaş"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mart"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Toplam Miktar."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Ara Toplam"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fatura adresi:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fatura Adresi"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Benim Satış Siparişlerimle ilişkili Satış Siparişi Öğeleri"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Teklif / Sipariş"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "(güncelle)"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Satış Siparişi Öğesi"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr ""
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Henüz onaylanmamış Satış Siparişi"
 
 #. module: sale
 #: view:sale.order:0
@@ -626,8 +600,30 @@ msgid "Order Lines"
 msgstr "Sipariş Öğeleri"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "İnd.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Fatura Öğeleri"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Toplam Fiyat"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -639,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Aynı müşteriye ait faturaları gruplamak için işaretleyin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Faturaları Yap"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Saat"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Oluşturma Tarihi"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Faturalandırılacak"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Şu anki sipariş için fatura adresi."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Sipariş edilen Miktarlar"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Satış siparişlerinin Veriliş Yılı"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Faturalanmamış ve Teslim edilmiş Öğeler"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Miktar"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Toplam :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "Satışlarım"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Fiyat Listesi"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Sipariş Referansı"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Mali Durum"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Temmuz"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -687,29 +751,59 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr "Yapılandırma Hatası!"
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Durum"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr "E-posta ile Gönder"
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "Saat"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Fiyat Listesi (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Faturalama İşlemi"
 
 #. module: sale
 #: view:sale.order:0
@@ -717,23 +811,37 @@ msgid "Order Date"
 msgstr "Sipariş Tarihi"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
-msgstr "Gönderildi"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Satış siparişi tamamlandı"
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Teklifler ve Satışlar"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Ödenmiş"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Paydaş"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -741,39 +849,97 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Teklif Tarihi"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Faturaları Gruplandır"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Önceden faturalanacak miktar."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Satış Fatura oluşturur"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Hiç öğesi olmayan bir satış siparişini onaylayamazsınız."
+msgid "Pricelist Warning!"
+msgstr "Fiyat Listesi Uyarısı!"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "İndirim (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Satış formunda bir fiyat listesi ya da müşteri seçmelisiniz!\n"
-"Ürünü seçmeden lütfen bir tane ayarlayın."
+"Aşağıdaki nedenlerden dolayı bu satış sipariş öğesi için fatura "
+"oluşturulamamaktadır:\n"
+"1.Satış sipariş öğesinin durumu \"taslak\" ya da \"iptal\" olarak "
+"belirlenmiştir.\n"
+"2.Satış sipariş öğesi zaten faturalanmıştır."
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Tekliflerim"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faturalar"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Aralık"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Şözleşmelerin Yönetimi"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Gönderildi"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Faturalanmamış"
 
 #. module: sale
 #: view:sale.report:0
@@ -782,7 +948,7 @@ msgid "Category of Product"
 msgstr "Ürün Kategorisi"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -793,10 +959,18 @@ msgid "Recreate Invoice"
 msgstr "Faturayı Yeniden Oluştur"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Mağaza Adı"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -804,36 +978,264 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Vergiler :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturalandı"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Fatura Peşinatı"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "İşlemde"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Tanımlı müşteri yok!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Faturaları Oluştur"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Onaylı"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Satış SiparişÖğesi Fatura_Kes"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Eposta Şablonları"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Bekleyen Planlama"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Satış Siparişleri"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Vergi tutarı."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr "Talep Üzerine"
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "bilinmeyen"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Ağustos"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Satınalma ve faturalamayı yürütür"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Yapılacaklar"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Haziran"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Sipariş"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Satış Analizi"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Satış Siparişi İstatistikleri"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Tarih"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Satış Temsülcisi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Kasım"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Genişletilmiş Süzgeçler..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Teklif"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Gelişmiş Ürün"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "İstisna"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Ekim"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Gönderi politikası \"Gönderi ve manüel fatura hazırlanıyor\" olarak "
+"seçilmişse, satış temsilcisi faturayı eliyle hazırlar. Eğer gönderi "
+"politikası \"Gönderimden önce Ödeme\" olarak seçilmişse, fatura otomatik "
+"olarak hazırlanır."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Satış Mağazası"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -842,6 +1244,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Ocak"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "İşlemdeki Satış Siparişleri"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -852,11 +1278,96 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Satış Siparişi ile ilişkili analiz hesabı"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Fatura Görüntüle"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Satış temsilcisi teklifi onaylıyor. Satış Siparişinin durumu \"İşlemde\" ya "
+"da \"Manuel ilemde\"olur."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Satış formunda bir fiyat listesi ya da müşteri seçmelisiniz!\n"
+"Ürünü seçmeden lütfen bir tane ayarlayın."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Bu satış siparişi isteğini oluşturan belgenin referans numarası"
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Geçerli fiyat listesi öğesi bulunamadı!:"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Taahhüt Gecikmesi"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Teklifler"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "İstisnayı Görmezden gel"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -877,11 +1388,107 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Referansınız"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Sipariş Tarihi"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Fiyat Listesi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "Müşteri Faturaları"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Faturalanacak onaylı satış siparişi"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sıra No"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Satışlar"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Bu siparişin fiyat listesini değiştirirseniz (ve sonunda para birimini de), "
+"varolan sipariş öğeleri fiyatları güncellenmeyecektir."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Mik"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "stoktan"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Teklif Tarihi"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Toplam"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Yapıldı"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fatura adresi:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Fatura"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -897,19 +1504,102 @@ msgstr "Satış Siparişlerimin Öğeleri"
 msgid "Cancel"
 msgstr "İptal"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Fiyat Listesi yok ! : "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Faturalanmamış Öğelerde Ara"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Sipariş Referansı her Firma için benzersiz olmalı!"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Sevk Adresi :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Aynı paydaş için farklı para birimlerindeki satışları gruplandıramazsınız."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Peşin Ödemeli Satış Faturası"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -920,363 +1610,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Fatura Oluştur"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "KDV hariç tutar"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "Sipariş kaynağı"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Faturanın ödendiğini gösterir."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Fiyat"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "Teklif No"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "sipariş üzerine"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Sevk Adresi :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Satış Siparişinin Taslak durumu"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "KDV Dahil Toplam"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Satış siparişinin veriliş tarihi"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Teklifi Onayla"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Gruplandır..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Bekleyen Planlama"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "Ölçü Birimi"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Satınalma Yöntemi"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Birim Fiyat"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr ""
+msgid "Percentage"
+msgstr "Yüzde"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Satış Siparişi"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Vergiler"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Faturalandırılmaya hazır Satış Siparişleri"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Satış siparişinin oluşturulduğu tarih"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Faturaları Oluştur"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Peşinat Tutarı"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Gönderilen Miktar"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Bu siparişin fiyat listesini değiştirirseniz (ve sonunda para birimini de), "
-"varolan sipariş öğeleri fiyatları güncellenmeyecektir."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr "Faturaları Yap"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Faturalandırılacak"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Satış siparişlerinin Veriliş Yılı"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Temmuz"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Gönderim İstisnası"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Faturaları Gruplandır"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "Şözleşmelerin Yönetimi"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Ay"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Muhasebeci tarafından incelenecek."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Faturaları Oluştur"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Satış SiparişÖğesi Fatura_Kes"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Eski Teklifleri"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Ödenmiş"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Satış Analizi"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Teklif"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Gönderi politikası \"Gönderi ve manüel fatura hazırlanıyor\" olarak "
-"seçilmişse, satış temsilcisi faturayı eliyle hazırlar. Eğer gönderi "
-"politikası \"Gönderimden önce Ödeme\" olarak seçilmişse, fatura otomatik "
-"olarak hazırlanır."
+msgid "Other Information"
+msgstr "Diğer Bilgiler"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1299,27 +1671,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1334,7 +1689,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1375,92 +1730,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Onaylı satış siparişi öğeleri, ancak henüz teslim edilmemiş"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "Müşteri Faturaları"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Satışlar"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Birim Fiyat"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Yapıldı"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Kaynak Belge"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Yapılacaklar"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "KDV hariç tutar"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Peşin Ödemeli Satış Faturası"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1470,10 +1739,38 @@ msgid "Product"
 msgstr "Ürün"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Toplam Miktar."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayıs"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Fiyat"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1486,387 +1783,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Aylık Gelir"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fatura üzerine"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Bu rapor fiyat teklifleri ve satış siparişlerinin analizini yapar. Bu analiz "
+"sizin satış gelirlerinizi kontrol eder ve farklı grup kriterlerine göre "
+"sıralar (satış temsilcisi, iş ortağı, ürün, vb.) Bu raporu henüz "
+"faturalanmamış satışlarınızı analiz etmek için kullanın. Eğer cironuzu "
+"analiz etmek istiyorsanız, muhasebe uygulamasındaki Fatura Analiz raporunu "
+"kullanmalısınız."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Teklif / Sipariş"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Sipariş Tarihi"
+msgid "Tel. :"
+msgstr "Tel :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Ürün Sipariş Birimi"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuel İşlem Devam Ediyor"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Sipariş"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Bir Satış siparişinden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "İstisnayı Görmezden gel"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Satış siparişinin faturalama kontrolüne bağlı olarak, fatura teslim edilen "
-"ya da sipariş edilen miktar esas alarak hazırlanmış olabilir. Böylelikle, "
-"bir satış siparişi satış temsilcisi onayladığı anda fatura ya da teslim fişi "
-"olarak hazırlanır."
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Müşteri Referansı"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Toplam"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "Satış Kontrol Paneli"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Satış siparişinin onaylandığı tarih."
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fatura Tarihi"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Önceden faturalanacak miktar."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fatura İstisnası"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Tanımlı müşteri yok!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Net Toplam :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "İptal edildi"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Faturalanmamış Öğelerde Ara"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Mağaza"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Onay Tarihi"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Satış Siparişi"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Miktar (Satış Birimi)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "'Yapıldı' durumundaki Satış Sipariş Öğeleri"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Onaylı"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Onayla"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Fatura Öğeleri"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Öğe #"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Satış Siparişi Öğeleri"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Fiyat Listesi (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1876,247 +1821,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Aşağıdaki nedenlerden dolayı bu satış sipariş öğesi için fatura "
-"oluşturulamamaktadır:\n"
-"1.Satış sipariş öğesinin durumu \"taslak\" ya da \"iptal\" olarak "
-"belirlenmiştir.\n"
-"2.Satış sipariş öğesi zaten faturalanmıştır."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Yapılan satış siparişi öğeleri"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Ağırlık"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faturalar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Aralık"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Faturalanmamış"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Muhasebeci tarafından incelenecek."
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Satınalma ve faturalamayı yürütür"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Vergilendirilmemiş Tutar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Fatura Peşinatı"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Taslak"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Vergi tutarı."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Faturalandırılmaya hazır Satış Siparişi Satırları"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "Eposta Şablonları"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Satış Siparişleri"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Satış Mağazası"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Kasım"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Gelişmiş Ürün"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Ocak"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "İşlemdeki Satış Siparişleri"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Bu satış siparişi isteğini oluşturan belgenin referans numarası"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Taahhüt Gecikmesi"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Sipariş Tarihi"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Faturalanacak onaylı satış siparişi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Henüz onaylanmamış Satış Siparişi"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "stoktan"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Fiyat Listesi yok ! : "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Faturanın ödendiğini gösterir."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Açıklama"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayıs"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2139,11 +1883,131 @@ msgstr "Gelişmiş"
 msgid "February"
 msgstr "Şubat"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fatura üzerine"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Eylül"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Sipariş Tarihi"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Ürün Sipariş Birimi"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Satış Siparişinin Taslak durumu"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Kaynak Belge"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Nisan"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuel İşlem Devam Ediyor"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "Uyarı!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Eski Teklifleri"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Özet"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Satış siparişlerini ara"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Açıklama"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2154,20 +2018,48 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Satış siparişlerini ara"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Satış siparişlerinin verildiği ay"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Bir Satış siparişinden"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sıra No"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Satış siparişinin faturalama kontrolüne bağlı olarak, fatura teslim edilen "
+"ya da sipariş edilen miktar esas alarak hazırlanmış olabilir. Böylelikle, "
+"bir satış siparişi satış temsilcisi onayladığı anda fatura ya da teslim fişi "
+"olarak hazırlanır."
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Satış Birimi"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2176,47 +2068,94 @@ msgid "Payment Term"
 msgstr "Ödeme Şekli"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Faturalandırılmaya hazır Satış Siparişleri"
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"Bu rapor fiyat teklifleri ve satış siparişlerinin analizini yapar. Bu analiz "
-"sizin satış gelirlerinizi kontrol eder ve farklı grup kriterlerine göre "
-"sıralar (satış temsilcisi, iş ortağı, ürün, vb.) Bu raporu henüz "
-"faturalanmamış satışlarınızı analiz etmek için kullanın. Eğer cironuzu "
-"analiz etmek istiyorsanız, muhasebe uygulamasındaki Fatura Analiz raporunu "
-"kullanmalısınız."
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "veya"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Satış Siparişi Öğeleri"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Geçerli satış siparişi için Fiyat listesi"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Teklif N°"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Müşteri Referansı"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Toplanmış"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Yıl"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "KDV Dahil Toplam"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Satış siparişinin veriliş tarihi"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Kısmi Teslimat"
 
@@ -2483,6 +2422,9 @@ msgstr ""
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Alış Fiyat Listeleri"
 
+#~ msgid "Sale Order"
+#~ msgstr "Satış Siparişi"
+
 #~ msgid "Name"
 #~ msgstr "Adı"
 
@@ -3024,6 +2966,9 @@ msgstr ""
 #~ msgid "Main Working Time Unit"
 #~ msgstr "Ana Çalışma Süresi Birimi"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "Satış Siparişlerim"
+
 #~ msgid "Based on Timesheet"
 #~ msgstr "Zaman Çizelgesine Bağlı"
 
@@ -3058,6 +3003,13 @@ msgstr ""
 #~ msgid "Deliver each product when available"
 #~ msgstr "Her ürün hazır olduğunda teslim et"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr ""
+#~ "Onaylanmış, yapılmış ya da istisna durumundaki ve henüz faturalandırılmamış "
+#~ "Satış Siparişi Satırı"
+
 #, python-format
 #~ msgid ""
 #~ "In order to delete a confirmed sale order, you must cancel it before ! To "
@@ -3106,6 +3058,9 @@ msgstr ""
 #~ msgid "Print Order"
 #~ msgstr "Sipariş Yazdır"
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "Faturalandırılmaya hazır Satış Siparişi Satırları"
+
 #~ msgid "Deliver & invoice on demand"
 #~ msgstr "İstek üzerine teslimat & fatura"
 
@@ -3414,6 +3369,10 @@ msgstr ""
 #~ msgid "Extra Info"
 #~ msgstr "Ek Bilgi"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "Hiç öğesi olmayan bir satış siparişini onaylayamazsınız."
+
 #~ msgid "Shipping Address"
 #~ msgstr "Sevkiyat Adresi"
 
@@ -3553,6 +3512,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Görüntü"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "Yapılan satış siparişi öğeleri"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "Geçerli yıldaki satış siparişleri"
 
@@ -3573,6 +3535,9 @@ msgstr ""
 #~ msgid "Error! You can not create recursive companies."
 #~ msgstr "Hata! Özyinelemeli şirketler oluşturamazsınız."
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "'Yapıldı' durumundaki Satış Sipariş Öğeleri"
+
 #~ msgid ""
 #~ "This is a list of picking that has been generated for this sales order."
 #~ msgstr ""
@@ -3592,6 +3557,9 @@ msgstr ""
 #~ msgid "Picking Policy"
 #~ msgstr "Toplama Kuralı"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "Onaylı satış siparişi öğeleri, ancak henüz teslim edilmemiş"
+
 #~ msgid "Reference UoM"
 #~ msgstr "Referans Ölçü Birimi"
 
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 30c7398e0e6..236e54abde5 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -6,49 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-15 20:52+0000\n"
 "Last-Translator: Jay Vora (Serpent Consulting Services) <Unknown>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Підтвердити Пропозицію"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Партнер у долі"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Незаінвойсовані і доставлені позиції"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Виключення з інвойса"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналітичний рахунок"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Попередня сума"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -60,6 +206,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr "Скасувати заявку"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Вага"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "на заявку"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Податки"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Неоподаткована сума"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Разом :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Виключення з доставки"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Торгова точка"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Адреса інвойса"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналітичний рахунок"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,15 +519,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Типовий термін оплати"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Підтвердити"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Відвантажена кількість"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -147,461 +574,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Замовлена кількість"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Знижка (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Мої пропозиції"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Статус"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Кількість"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Заінвойсовано"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Партнер у долі"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Попередня сума"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Адреса інвойса:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Адреса інвойса"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -621,8 +600,30 @@ msgid "Order Lines"
 msgstr "Рядки заявки"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Рядки інвойса"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -634,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Незаінвойсовані і доставлені позиції"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Замовлена кількість"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Кількість"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Всього :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Прейскурант"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -682,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -712,22 +811,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Оплачено"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -736,36 +849,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Групувати інвойси"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Знижка (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мої пропозиції"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -775,7 +943,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -786,10 +954,18 @@ msgid "Recreate Invoice"
 msgstr "Перестворити інвойс"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -797,14 +973,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Заінвойсовано"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Створити інвойси"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Затверджено"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Чорновик"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Очікує плану дій"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Замовлення на Продаж"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -812,21 +1145,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Комерційна пропозиція"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -835,6 +1235,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Замовлення на Продаж на Виконанні"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -845,11 +1269,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -868,11 +1373,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Прейскурант"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Порядок"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Продажі"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "К-сть"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "зі складу"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Разом"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Виконано"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Адреса інвойса:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Інвойс"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -888,19 +1487,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Скасувати"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Адреса доставки :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -911,345 +1592,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Створити інвойс"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Ціна"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "на заявку"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Адреса доставки :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Підтвердити Пропозицію"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Очікує плану дій"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Ціна за од."
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Заявка на продаж"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Податки"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Відвантажена кількість"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Виключення з доставки"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Групувати інвойси"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Створити інвойси"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Оплачено"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Комерційна пропозиція"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1257,11 +1628,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1284,27 +1653,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1319,7 +1671,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1360,92 +1712,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Продажі"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Ціна за од."
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Виконано"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Інвойс"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1455,10 +1721,38 @@ msgid "Product"
 msgstr "Продукт"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Ціна"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1471,382 +1765,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Інвойс на"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Дата заявки"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Разом"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Виключення з інвойса"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Разом :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Торгова точка"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Затверджено"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Підтвердити"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Рядки інвойса"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Рядки заявки на продаж"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1857,240 +1797,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Вага"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Неоподаткована сума"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Чорновик"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Замовлення на Продаж"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Замовлення на Продаж на Виконанні"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "зі складу"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Опис"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2115,11 +1859,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Інвойс на"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Дата заявки"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Опис"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2130,20 +1994,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Порядок"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2152,18 +2040,32 @@ msgid "Payment Term"
 msgstr "Термін Оплати"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Рядки заявки на продаж"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2171,20 +2073,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Відвантажено"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Delivery, from the warehouse to the customer."
@@ -2358,6 +2299,9 @@ msgstr ""
 #~ msgid "Our Salesman"
 #~ msgstr "Наш Менеджер"
 
+#~ msgid "Sale Order"
+#~ msgstr "Заявка на продаж"
+
 #~ msgid "Direct Delivery"
 #~ msgstr "Пряма Доставка"
 
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index a37cb6d5a6a..ef73e410fcb 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -7,48 +7,194 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Xác nhận báo giá"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Ngày xác nhận"
+
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
+msgstr "Nhóm theo..."
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Đối tác phân phối"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Bảng giá cho đơn hàng hiện tại"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Phương pháp mua hàng"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Tháng Ba"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Ngày Hóa đơn"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Sản phẩm không xuất hóa đơn và đã giao hàng"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Hóa đơn ngoại lệ"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Tài khoản KTQT"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Tổng số phụ"
 
 #. module: sale
 #: view:sale.report:0
@@ -61,6 +207,26 @@ msgstr "Ngày"
 msgid "Cancel Order"
 msgstr "Huỷ Đơn đặt hàng"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Khối lượng"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -73,21 +239,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "theo chào hàng"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Thuế"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Số tiền không chịu thuế"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Tổng số thực:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Hủy"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Vận chuyển ngoại lệ"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Số lượng (Đơn vị bán)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Cửa hàng"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "Bán hàng thuộc ngoại lệ"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Địa chỉ hóa đơn"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Tạo các hóa đơn"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -99,12 +421,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Ngày xác nhận"
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Tài khoản KTQT"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -113,6 +439,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -120,8 +451,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Đối tác"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "Đơn hàng"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -131,480 +520,68 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "Điều khoản thanh toán mặc định"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Xác nhận"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Số lượng vận chuyển"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Năm"
+
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Chiết khấu.(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Giá tổng"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Đánh dấu để nhóm hóa đơn theo khách hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Số lượng chào hàng"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Số tham chiếu đơn chào hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Thông tin khác"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Làm hóa đơn bán hàng"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Chiết khấu (%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Báo giá của tôi"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Tên cửa hàng"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "Bán hàng thuộc ngoại lệ"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "Trạng thái"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Tháng Tám"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Tháng Sáu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Thống kê đơn bán hàng"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Tháng Mười"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Các báo giá"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "Số lượng"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Tháng Chín"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Chức vụ tài chính"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Đang thực hiện"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Nhân viên bán hàng xác nhận báo giá. Tình trạng hóa đơn sẽ chuyển sang "
-"\"Đang tiến hành\" hoặc \"Tiến hàng thủ công\"."
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Điện thoại:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Đã xuất hóa đơn"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Ngày xác nhận"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Đối tác phân phối"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Tháng Ba"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Tổng số tiền."
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Tổng số phụ"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Địa chỉ hóa đơn:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Địa chỉ hóa đơn"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Báo giá / Đơn chào hàng"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -624,8 +601,30 @@ msgid "Order Lines"
 msgstr "Sản phẩm chào hàng"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Chiết khấu.(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Sản phẩm lập hóa đơn"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Giá tổng"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -637,38 +636,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Đánh dấu để nhóm hóa đơn theo khách hàng"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "Ngày tạo"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Sản phẩm không xuất hóa đơn và đã giao hàng"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Số lượng chào hàng"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Số lượng"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "Tổng số:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Bảng giá"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Số tham chiếu đơn chào hàng"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Chức vụ tài chính"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Tháng Bảy"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -685,28 +752,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Trạng thái"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -715,23 +812,37 @@ msgid "Order Date"
 msgstr "Ngày đặt hàng"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Đã thanh toán"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Đối tác"
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -739,36 +850,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Ngày báo giá"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Phân loại hóa đơn"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Làm hóa đơn bán hàng"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Chiết khấu (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Báo giá của tôi"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Hóa đơn"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Tháng Mười hai"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Tháng"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -778,7 +944,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -789,10 +955,18 @@ msgid "Recreate Invoice"
 msgstr "Tạo lại hóa đơn"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Tên cửa hàng"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -800,36 +974,260 @@ msgstr ""
 msgid "Taxes :"
 msgstr "Thuế :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Đã xuất hóa đơn"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "Hóa đơn ứng trước"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Đang thực hiện"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Không có khách hàng được thiết lập!"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Tạo hóa đơn"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Đã xác nhận"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Dự thảo"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Lịch chờ"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Đơn chào hàng"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Tháng Tám"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Cần thực hiện"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Tháng Sáu"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Đơn đặt hàng"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Phân tích Bán hàng"
+
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Thống kê đơn bán hàng"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Tháng Mười một"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Bộ lọc mở rộng..."
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Báo giá"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Ngoại lệ"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Tháng Mười"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -838,6 +1236,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Tháng Một"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "Đơn chào hàng đang được thực hiện"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -848,11 +1270,94 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Nhân viên bán hàng xác nhận báo giá. Tình trạng hóa đơn sẽ chuyển sang "
+"\"Đang tiến hành\" hoặc \"Tiến hàng thủ công\"."
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Các báo giá"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -871,11 +1376,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "Tham chiếu của bạn"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Bảng giá"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Thứ tự"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Bán hàng"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Số lượng"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "theo nhu cầu dự báo"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Ngày báo giá"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Tổng"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Hoàn thành"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Địa chỉ hóa đơn:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "Hóa đơn"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -891,19 +1490,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "Hủy"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Địa chỉ giao hàng:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -914,357 +1595,45 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Tạo hóa đơn"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "Giá"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "theo chào hàng"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Địa chỉ giao hàng:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Xác nhận báo giá"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Nhóm theo..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Lịch chờ"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Phương pháp mua hàng"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Đơn giá"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "Đơn chào hàng"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Thuế"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Tạo các hóa đơn"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Số lượng vận chuyển"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Tháng Bảy"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Vận chuyển ngoại lệ"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Phân loại hóa đơn"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Tháng"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Chờ kế toán viên xem xét"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Tạo hóa đơn"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Báo giá cũ"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Đã thanh toán"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Phân tích Bán hàng"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Báo giá"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
+msgid "Other Information"
+msgstr "Thông tin khác"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1287,27 +1656,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1322,7 +1674,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1363,92 +1715,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Bán hàng"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Đơn giá"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Hoàn thành"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "Hóa đơn"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Cần thực hiện"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1458,10 +1724,38 @@ msgid "Product"
 msgstr "Sản phẩm"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Tổng số tiền."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Tháng Năm"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Giá"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1474,383 +1768,29 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Hóa đơn theo"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Báo giá / Đơn chào hàng"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Ngày chào hàng"
+msgid "Tel. :"
+msgstr "Điện thoại:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Đơn vị bán của sản phẩm"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Đang thực hiện thủ công"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Đơn đặt hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Từ một đơn hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Tham chiếu của Khách hàng"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Tổng"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Công ty"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Ngày Hóa đơn"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Hóa đơn ngoại lệ"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Không có khách hàng được thiết lập!"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Tổng số thực:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Hủy"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Cửa hàng"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Ngày xác nhận"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr "Đơn hàng"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Số lượng (Đơn vị bán)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Đã xác nhận"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Xác nhận"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Sản phẩm lập hóa đơn"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Sản phẩm đơn chào hàng"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr ""
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Bạn có thật sự muốn tạo hóa đơn?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1860,242 +1800,46 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Chờ kế toán viên xem xét"
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Khối lượng"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Hóa đơn"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Tháng Mười hai"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Số tiền không chịu thuế"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "Hóa đơn ứng trước"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Dự thảo"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Đơn chào hàng"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Tháng Mười một"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Tháng Một"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "Đơn chào hàng đang được thực hiện"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "theo nhu cầu dự báo"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Mô tả"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Tháng Năm"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Bạn có thật sự muốn tạo hóa đơn?"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
@@ -2118,11 +1862,131 @@ msgstr ""
 msgid "February"
 msgstr "Tháng Hai"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Hóa đơn theo"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Tháng Chín"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Ngày chào hàng"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Đơn vị bán của sản phẩm"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Tháng Tư"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Đang thực hiện thủ công"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Báo giá cũ"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Tìm kiếm Đơn hàng"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Mô tả"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2133,20 +1997,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Tìm kiếm Đơn hàng"
-
-#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Thứ tự"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Từ một đơn hàng"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2155,39 +2043,92 @@ msgid "Payment Term"
 msgstr "Điều khoản thanh toán"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Sản phẩm đơn chào hàng"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Bảng giá cho đơn hàng hiện tại"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Báo giá Số"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Tham chiếu của Khách hàng"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Chọn"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Năm"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Partial Delivery"
@@ -2520,6 +2461,9 @@ msgstr ""
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Tạo hóa đơn ứng trước"
 
+#~ msgid "Sale Order"
+#~ msgstr "Đơn chào hàng"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Bảng giá bán hàng"
 
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 54817503a2b..a792667f628 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-14 14:24+0000\n"
-"Last-Translator: sum1201 <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-23 01:34+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -24,37 +24,192 @@ msgid ""
 msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "销售辅助核算"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr "已完成或在异常状态和尚未开发票的销售订单明细将被确认。"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "确认报价单"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "销售控制台"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "没有收益科目定义为全局属性"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "订单行开票"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "确认日期"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "销售单位"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
-msgstr "销售员"
+msgid "Group By..."
+msgstr "分组..."
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "当前销售订单的价格表。"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "分配给业务伙伴"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "开票订单"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "产品特性"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"允许定义你的客户合同条款：\n"
+"开票方法(固定价格，根据计工单，预付款发票),\n"
+"准确价格（每天每个开发人员650欧元）\n"
+"期间（一年的支持合同）\n"
+"你能跟踪合同的进程和自动开票。\n"
+"\n"
+"为此要安装模块  account_analytic_analysis module 。"
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
+"or ''}"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "计量单位"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "引起需求的方式"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "销售订单的日期已确认。"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr "在销售订单使用多重辅助核算项"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "首先取消所有关联这个销售订单的发票。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "报价单编号"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "未读信息"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "开票日期"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未开票已送货明细"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr "报价已经确认"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "发票异常"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "报价单 "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "报价单草稿"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "送货地址"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "辅助核算项"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr "允许通过日记账的发货单批量开票。"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小计"
 
 #. module: sale
 #: view:sale.report:0
@@ -64,10 +219,29 @@ msgstr "天"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "取消订单"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "仓库特性"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "默认的服务工作时间单位是"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "计量单位 "
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -80,21 +254,179 @@ msgstr "错误的数据"
 msgid "The value of Advance Amount must be positive."
 msgstr "定金必须是正的"
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr "允许在每个销售订单行 应用折扣"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr "销售订单行在完成状态"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "来自订单"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "订单状态"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "税"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "不含税金额"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "项目"
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr "错误!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "净合计:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+"从库存: 当需要时，产品从库存取得或者我们等待补充。\n"
+"根据订单: 需要时，产品被采购或者生产。"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "销售订单明细与我的销售订单"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "报价单发送"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Email撰写向导"
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr "如果要求你关注新消息，勾选此项"
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "送货异常"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "数量(销售单位)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "商店"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "销售异常"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "发票地址"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "销售订单创建日期"
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr "False"
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "创建发票"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr "税"
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr "非法的动作"
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -107,12 +439,20 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "确认日期"
+
+#. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "辅助核算项"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "明细#"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr "给出订单行列表显示的排列顺序"
 
 #. module: sale
 #: view:sale.report:0
@@ -121,9 +461,67 @@ msgid "# of Qty"
 msgstr "数量#"
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
-msgstr "允许你为每个销售订单行应用折扣"
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "传真:"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr "要删除已经确认的订单，你必须先取消"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "（更新）"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr "合同特性"
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr "允许逐行开票"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "销售订单明细"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "预付款总额"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr "它表明,销售订单至少有一个发票。"
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -134,16 +532,54 @@ msgstr ""
 "允许基于每种客户类别的规则管理不同的价格。\n"
 "例如: 10%"
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "每个合同里，一个员工能有不同的角色"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr "为整个销售订单开票"
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "默认付款条件"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "确认"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "准备基于计工单的发票"
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
-msgstr "发票 <b>已经支付</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr "你不能取消已经开票的销售订单行"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "月营业额"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "已送货数量"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "年"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -151,462 +587,14 @@ msgid "Allow using different units of measures"
 msgstr "允许使用不同的计量单位"
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr "百分比"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr "请为这个产品定义收益科目: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "总价"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "选择此项，发票将会按客户分组。"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr "销售订单已经确认"
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "我的销售订单"
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "已订数量"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "订单关联"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "其它信息"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr "警告！"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr "开发票过程"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr "销售订单完成"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr "报价单或销售订单"
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr "允许你选择和维护产品的不同计量单位"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "销售订单生成发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "价格表警告！"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr "创建和查看发票"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "我的报价单"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr "允许根据客户或者产品配置警告"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "商店名"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr "报价单 "
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr "%s%% 的预付款"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "销售异常"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr "需要分配特定产品的业务伙伴"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "状态"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "6月"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "销售订单统计"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "销售订单相关的辅助核算项。"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "10月"
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr "摘要"
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr "查看发票"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr "预付款：%s %s"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "报价单"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "数量"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr "当前销售订单的发运地址"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "增值税:"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "9月"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "财务结构"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "处理中"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr "发票草稿 %s %s <b>等待核准</b>."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或‘手动处理’。"
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr "你不能取消已经被开票的销售订单行。"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "电话:"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "当前销售订单的发票地址。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr "发运前"
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr "产品类别的属性中，没有定义财务结构或者 收益类科目。"
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr "销售订单中的地址"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr "合同/分析"
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr "允许按销售订单行开票"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "下单超一个月的销售订单"
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单进行分组。"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr "or"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "已开票"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr "销售辅助核算"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "确认日期"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "分配给业务伙伴"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr "开票订单"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "3月"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr "销售：标记为已读"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "总金额。"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr "允许通过日记账的发货单批量开票。"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "小计"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr "允许在销售订单行上设置折扣"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "发票地址:"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr "计量单位 "
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr "默认的服务工作时间单位是"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "发票地址"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "销售订单明细与我的销售订单"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "报价单/订单"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr "（更新）"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "销售订单明细"
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
-msgstr "每个合同里，一个员工能有不同的角色"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "销售订单尚未被确认"
 
 #. module: sale
 #: view:sale.order:0
@@ -619,14 +607,37 @@ msgid "Order N°"
 msgstr "单号"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "订单明细"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
-msgstr "在销售订单使用多重辅助核算项"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr "请为这个产品定义收益科目: \"%s\" (id:%d)."
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "发票明细"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "总价"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr "运行你在销售订单指定一个辅助核算项"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -639,38 +650,106 @@ msgstr ""
 "允许你对你的销售和发运（分拣单）在不同的分类账之间进行分类, 并且在分类账上进行批量操作。\n"
 "为此要安装模块  sale_journal。"
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "选择此项，发票将会按客户分组。"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "生成发票"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "小时"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "销售订单的 #"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr "创建日期"
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr "销售订单 <em>%s</em> 设置为 <b>完成</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "待开票"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "未开票已送货明细"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "当前销售订单的发票地址。"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "已订数量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "今年的销售订单"
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr "在销售订单中的地址"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "数量"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "合计:"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr "销售订单行已经被开票"
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr "我的销售订单"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "价格表"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "订单关联"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "财务结构"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7月"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -692,29 +771,59 @@ msgstr ""
 "*当用户取消了销售订单，状态成为“取消”。"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
-msgstr "没有收益科目定义为全局属性"
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "默认选项"
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "销售辅助核算项"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "状态"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr "点击“显示要开票的行”"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr "以邮件发送"
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
-msgstr "小时"
+msgid "EDI Pricelist (%s)"
+msgstr "EDI 价格表 (%s)"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "根据发运单"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "开发票过程"
 
 #. module: sale
 #: view:sale.order:0
@@ -722,23 +831,37 @@ msgid "Order Date"
 msgstr "订单日期"
 
 #. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "已送货"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "销售订单完成"
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr "轻微公司 \"%s\" (id:%d) 定义销售分类账"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "报价单或销售订单"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "支付"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
-msgstr "通过菜单“按行开票”，允许销售员为销售订单行制作发票"
+"Allows you to select and maintain different units of measure for products."
+msgstr "允许你选择和维护产品的不同计量单位"
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "业务伙伴"
+msgid "Reference Unit of Measure"
+msgstr "参考计量单位"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -746,47 +869,95 @@ msgid "Create and View Invoice"
 msgstr "创建和查看发票"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                单击定义一个新的销售商店。\n"
-"              </p><p>\n"
-"                每个报价单或者销售订单必须关联到一个\n"
-"               商店。为每次特地销售，商店也定义了产\n"
-"               品将被从哪个仓库发货。\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr "销售订单行完成"
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "报价日期"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "发票组"
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "预付款发票金额"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "销售订单生成发票"
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "你不能确认没有明细的销售订单。"
+msgid "Pricelist Warning!"
+msgstr "价格表警告！"
 
 #. module: sale
-#: code:addons/sale/sale.py:1124
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
-"你必须在销售界面选一个客户或价格表！\n"
-"请在选择产品前设置。"
+"由于以下原因不能为此销售订单明细生成发票：\n"
+"1. 销售订单明细的状态是“草稿”或者“取消”！\n"
+"2. 销售订单明细已经开票！"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr "创建和查看发票"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "我的报价单"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "发票"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "合同管理"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "已送货"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr "币种"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "未开票"
 
 #. module: sale
 #: view:sale.report:0
@@ -795,7 +966,7 @@ msgid "Category of Product"
 msgstr "产品类别"
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "不能取消这个销售订单！"
@@ -806,53 +977,311 @@ msgid "Recreate Invoice"
 msgstr "重新生成发票"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
-msgstr "要删除已经确认的销售订单，你必须先取消它！"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr "允许根据客户或者产品配置警告"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "商店名"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr "我的销售订单"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "税:"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "已开票"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "预付款发票"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr "允许销售员用“逐行开票”菜单为销售订单行开票"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "打开销售订单"
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr "不能确认没有明细行的销售订单"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "处理中"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "客户没有定义 ！"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr "自动从销售订单触发发运单"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "创建发票"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "已确认"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "%s%% 的预付款"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "销售订单明细开票"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "电子邮件模板"
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr "需要分配特定产品的业务伙伴"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "合同/分析"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "等待调度"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "条款和条件"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "销售订单"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "税额。"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr "开票率"
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr "需求"
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
-msgstr "未知"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "驱动需求计算和开发票"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "待办事项"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "订单"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "销售分析表"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
 msgstr "是一个关注者"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr "已经确认、完成或者意外状态和还没开票的销售订单"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "销售订单统计"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "日期"
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "销售员"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "11月"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "报价单"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "预付款产品"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "异常"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr "如果销售订单的送货方式是‘送货并手工开票’， 业务员需要手工生成发票。如果送货方式是‘先付款后送货’，发票将自动生成。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "销售商店"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"允许使用不同的订单策略 制作报价单、销售订单 并管理相关的库存。\n"
+"                为此要安装模块sale_stock."
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
 "Select a product of type service which is called 'Advance Product'.\n"
 "                You may have to create it and set it as a default value on "
 "this field."
+msgstr "选择一个叫做“预付款产品”的服务类型的产品，。你可以在这个字段创建并且设置默认值。"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr "允许逐行设置折扣"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "销售订单处理中"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
 msgstr ""
 
 #. module: sale
@@ -865,11 +1294,94 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr "Paypal Url"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "销售订单相关的辅助核算项。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "查看发票"
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "你要开什么发票？"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "为每个客户使用价格表来适配你的价格"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或‘手动处理’。"
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"你必须在销售界面选一个客户或价格表！\n"
+"请在选择产品前设置。"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "生成此销售订单相关的请求单据"
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "明细没有找到有效的价格表！"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "预付款：%s %s"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "承诺延迟"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "报价单"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "允许安装模块sale_analytic_plans."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "忽略异常"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "当前销售订单的发运地址"
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -889,11 +1401,104 @@ msgid "Your Reference"
 msgstr "您的关联单号"
 
 #. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "显示要开票的行"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "订单日期"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "价格表"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "增值税:"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr "客户发票"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "确认的销售订单开票。"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "销售"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr "如果你修改这订单的价格表（货币），现有订单明细的价格不会修改。"
+
+#. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "数量"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "来自库存"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "报价日期"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "合计"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "发票地址:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "发票"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -901,22 +1506,98 @@ msgstr "我的销售订单明细"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
+#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "取消"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "关注者"
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "没价格表！： "
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr "销售订单 "
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr "报价单发送"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "查找未开票明细"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "运货地址:"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单进行分组。"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr "销售订单开票"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "使用合同管理"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
@@ -925,373 +1606,60 @@ msgstr ""
 "找不到匹配这个产品和数量的价格表。\n"
 "你必须修改 产品、数量，或者价格表"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "销售预付款发票"
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "生成发票"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "除税后总额。"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr "订单关联单号"
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-"允许使用不同的订单策略 制作报价单、销售订单 并管理相关的库存。\n"
-"                为此要安装模块sale_stock."
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and '报价单' or "
-"'订单'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "它表示发票已经支付。"
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "价格"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr "报价单编号"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "来自订单"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "运货地址:"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr "允许在销售订单指定一个辅助核算科目"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "销售订单草稿状态"
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr "报价单 <em>%s</em> <b>已创建</b>."
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr "消息和通信历史"
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr "新的报价单副本"
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr "不能删除 '%s'状态的销售订单行。"
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr "行上的属性"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr "在挑选产品前，在 销售表单选择一个客户"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "含税总金额"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "销售订单的订购日期"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "确认报价单"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr "订单行开票"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "分组..."
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr "产品特性"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "等待调度"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr "计量单位"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "引起需求的方式"
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "单价"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
-msgstr "为整个销售单开票"
+msgid "Percentage"
+msgstr "百分比"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr "未读信息"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr "报价单草稿"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "销售订单"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "税"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "待开票的销售订单"
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "销售订单创建日期"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "创建发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr "非法的动作"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "传真:"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "预付款总额"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "已送货数量"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr "如果你修改这订单的价格表（货币），现有订单明细的价格不会修改。"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "生成发票"
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr "销售订单的 #"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "待开票"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "今年的销售订单"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "7月"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr "点击“显示要开票的行”"
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr "表明销售订单至少有一个发票"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "送货异常"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "发票组"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr "为 <em>%s</em>的报价单 <b>已经转化为</b>销售订单 %s %s."
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr "开发票 销售订单"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr "合同管理"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "月"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "等待会计复核。"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "创建发票"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "销售订单明细开票"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "旧的报价单"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "支付"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "销售分析表"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "报价单"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr "如果销售订单的送货方式是‘送货并手工开票’， 业务员需要手工生成发票。如果送货方式是‘先付款后送货’，发票将自动生成。"
+msgid "Other Information"
+msgstr "其它信息"
 
 #. module: sale
 #: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1314,27 +1682,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1349,7 +1700,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1390,90 +1741,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr "为每个客户使用价格表来适配你的价格"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "确认销售订单明细，尚未送货"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr "销售订单将自动建立发票（草稿）。如果你要发票基于订单，你必须选择。 "
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr "客户发票"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "销售"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-"增加“利润”在销售订单。\n"
-"          通过单价和成本价计算利润率\n"
-"          为此要安装模块  sale_margin."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "单价"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "已完成"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "发票"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "源单据"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "待办事项"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "除税后总额。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "销售预付款发票"
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1483,9 +1750,39 @@ msgid "Product"
 msgstr "产品"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
-msgstr "基于销售订单行生成发票"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "总金额。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "确认订单"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr "在这个产品没有定义收益科目: \"%s\" (id:%d)."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and '报价单' or "
+"'订单'} (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "价格"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1502,404 +1799,31 @@ msgstr ""
 "发运前：从销售订单创建发票草稿，并且必须在产品发运前付款。"
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "月营业额"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"这个报表会对你的报价单和销售订单进行分析。分析检查你的销售收入，并且按照不同的标准分组（业务员，合作伙伴，产品等）。用这个报表对还没有开票的销售订单进行分"
+"析。 如果你想分析你的营业额，你应该用会计模块里的发票分析报表。"
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "开票依据"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr "固定价格（押金）"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "报价单/订单"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "下单日期"
+msgid "Tel. :"
+msgstr "电话:"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "产品销售单位"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "手动处理"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr "销售单：标记未读"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "订单"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "确认订单"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "来自销售订单"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "忽略异常"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"根据销售订单的开票方式， 基于送货单或者订购数量生成发票。\r\n"
-"因此，一旦销售订单被业务员确认，就会为它生成发票或者送货单。"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr "一些订单行"
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr "sale.group_delivery_invoice_address"
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr "订单行折扣"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "客户关联单号"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "合计"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr "选择怎样为订单开票。这将建立一个可在核准前进行修改的发票草稿。"
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr "销售控制台"
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-"允许定义你的客户合同条款：\n"
-"开票方法(固定价格，根据计工单，预付款发票),\n"
-"准确价格（每天每个开发人员650欧元）\n"
-"期间（一年的支持合同）\n"
-"你能跟踪合同的进程和自动开票。\n"
-"\n"
-"为此要安装模块  account_analytic_analysis module 。"
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
-"or ''}"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "销售订单的日期已确认。"
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr "首先取消所有关联这个销售订单的发票。"
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "公司"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "开票日期"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "预付款发票金额"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "发票异常"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#, python-format
-msgid "No Customer Defined !"
-msgstr "客户没有定义 ！"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr "送货地址"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr "销售到发票"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr "仓库特性"
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr "消息"
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr "项目"
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr "错误!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "净合计:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-"从库存: 当需要时，产品从库存取得或者我们等待补充。\n"
-"根据订单: 需要时，产品被采购或者生产。"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "已取消"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "查找未开票明细"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr "报价单发送"
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr "Email撰写向导"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "商店"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "确认日期"
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr "轻微公司 \"%s\" (id:%d) 定义销售分类账"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr "合同特性"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "销售订单"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "数量(销售单位)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "“已完成”状态的销售订单明细"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "已确认"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr "条款和条件"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "确认"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr "关注者"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "发票明细"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "明细#"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "销售订单明细"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr "默认选项"
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr "销售辅助核算项"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI 价格表 (%s)"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                单击 为这个客户创建报价单或者订单。\n"
-"              </p><p>\n"
-"                OpenERP 将帮你有效地处理完整的销售流程：\n"
-"                报价,销售订单,发运,开票已经支付.\n"
-"              </p><p>\n"
-"                社交特性帮你组织每个订单的讨论，并允许你客户跟踪订单的进度。\n"
-"              </p>\n"
-"            "
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr "根据发运单"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
-msgstr "参考计量单位"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "你真的要生成发票吗 ？"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1909,260 +1833,45 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                单据创建报价单，销售的第一步。\n"
-"              </p><p>\n"
-"                OpenERP 将帮你有效地处理完整的销售流程：\n"
-"                报价,销售订单,发运,开票已经支付.\n"
-"              </p><p>\n"
-"                社交特性帮你组织每个订单的讨论，并允许你客户跟踪订单的进度。.\n"
-"              </p>\n"
-"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"由于以下原因不能为此销售订单明细生成发票：\n"
-"1. 销售订单明细的状态是“草稿”或者“取消”！\n"
-"2. 销售订单明细已经开票！"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr "产品类别的属性中，没有定义财务结构或者 收益类科目。"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "销售订单明细已完成"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "等待会计复核。"
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "重量"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "行上的属性"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "发票"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "12月"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr "在这个产品没有定义收益科目: \"%s\" (id:%d)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "未开票"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "驱动需求计算和开发票"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "不含税金额"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "预付款发票"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr "打开销售订单"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "草稿"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr "自动从销售订单触发发运单"
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "税额。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr "销售订单 "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "准备开发票的销售订单明细"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr "电子邮件模板"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "销售订单"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "销售商店"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "11月"
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "评论和电子邮件"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "预付款产品"
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr "给出订单行列表显示的排列顺序"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "1月"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "销售订单处理中"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr "准备基于计工单的发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr "销售订单<em>%s</em> <b>被取消</b>."
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "生成此销售订单相关的请求单据"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "承诺延迟"
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr "订单状态"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr "显示要开票的行"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "订单日期"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "确认的销售订单开票。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "销售订单尚未被确认"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "来自库存"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "没价格表！： "
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr "销售订单"
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr "使用合同管理"
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "它表示发票已经支付。"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "说明"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "5月"
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "你真的要生成发票吗 ？"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "销售待开票"
 
 #. module: sale
 #: view:sale.order:0
@@ -2186,11 +1895,131 @@ msgstr "预付款"
 msgid "February"
 msgstr "2月"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "开票依据"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "固定价格（押金）"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "下单日期"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "发运前"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "产品销售单位"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "销售订单草稿状态"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "源单据"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "4月"
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "手动处理"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "旧的报价单"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "消息和通信历史"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "查找销售订单"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "说明"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2201,20 +2030,46 @@ msgid ""
 msgstr "使用合同 管理 多次开票的服务作为你的客户的相同合同的一部分。"
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "下单超一个月的销售订单"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "来自销售订单"
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "查找销售订单"
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr "已经确认但是还没有发运的订单行"
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
-msgstr "你要开什么发票？"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"根据销售订单的开票方式， 基于送货单或者订购数量生成发票。\r\n"
+"因此，一旦销售订单被业务员确认，就会为它生成发票或者送货单。"
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "序列"
+#: view:sale.order:0
+msgid "UoS"
+msgstr "销售单位"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "一些订单行"
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "不能删除 '%s'状态的销售订单行。"
 
 #. module: sale
 #: report:sale.order:0
@@ -2223,21 +2078,33 @@ msgid "Payment Term"
 msgstr "付款条款"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
-msgstr "允许安装模块sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "待开票的销售订单"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
-msgstr ""
-"这个报表会对你的报价单和销售订单进行分析。分析检查你的销售收入，并且按照不同的标准分组（业务员，合作伙伴，产品等）。用这个报表对还没有开票的销售订单进行分"
-"析。 如果你想分析你的营业额，你应该用会计模块里的发票分析报表。"
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr "基于销售订单行生成发票"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "or"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "销售订单明细"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "当前销售订单的价格表。"
 
 #. module: sale
 #: report:sale.order:0
@@ -2245,21 +2112,62 @@ msgid "Quotation N°"
 msgstr "报价单号"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "订单行折扣"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "客户关联单号"
+
+#. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "已装箱"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "年"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"增加“利润”在销售订单。\n"
+"          通过单价和成本价计算利润率\n"
+"          为此要安装模块  sale_margin."
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
-msgstr "您要将选定的销售单记录生成发票吗？"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr "在挑选产品前，在 销售表单选择一个客户"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "含税总金额"
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "新的报价单副本"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr "选择怎样为订单开票。这将建立一个可在核准前进行修改的发票草稿。"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "销售订单的订购日期"
 
 #~ msgid "sale.config.picking_policy"
 #~ msgstr "sale.config.picking_policy"
@@ -2333,6 +2241,9 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ msgid "Order State"
 #~ msgstr "订单状态"
 
+#~ msgid "Sale Order"
+#~ msgstr "销售订单"
+
 #~ msgid "Properties"
 #~ msgstr "属性"
 
@@ -3178,6 +3089,11 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ msgid "State"
 #~ msgstr "状态"
 
+#~ msgid ""
+#~ "Sale Order Lines that are confirmed, done or in exception state and haven't "
+#~ "yet been invoiced"
+#~ msgstr "已完成或在异常状态和尚未开发票的销售订单明细将被确认。"
+
 #~ msgid "Based on Timesheet"
 #~ msgstr "基于时间表"
 
@@ -3203,6 +3119,9 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ msgid "Based on Tasks' Work"
 #~ msgstr "基于指派的工作"
 
+#~ msgid "My Sale Orders"
+#~ msgstr "我的销售订单"
+
 #~ msgid ""
 #~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay before delivery' choice will first generate the invoice and "
@@ -3263,6 +3182,10 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ msgid "Options"
 #~ msgstr "设置"
 
+#, python-format
+#~ msgid "You cannot confirm a sale order which has no line."
+#~ msgstr "你不能确认没有明细的销售订单。"
+
 #~ msgid "Shipping Address"
 #~ msgstr "送货地址"
 
@@ -3408,6 +3331,9 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ msgid "Reference UoM"
 #~ msgstr "相关计量单位"
 
+#~ msgid "Confirmed sale order lines, not yet delivered"
+#~ msgstr "确认销售订单明细，尚未送货"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -3457,6 +3383,9 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ "evolves with the availability of parts."
 #~ msgstr "一旦销售订单被确认，装箱单就会和需求单一起生成。表示销售订单所产生的需求。有效的销售订单明细会相应产生一张装箱单。"
 
+#~ msgid "Sale Order Lines that are in 'done' state"
+#~ msgstr "“已完成”状态的销售订单明细"
+
 #~ msgid "Main Method Based On"
 #~ msgstr "主要方法"
 
@@ -3469,6 +3398,9 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ msgid "Print Order"
 #~ msgstr "打印订单"
 
+#~ msgid "Sale order lines done"
+#~ msgstr "销售订单明细已完成"
+
 #~ msgid "Sales order created in current year"
 #~ msgstr "本年创建的销售订单"
 
@@ -3499,6 +3431,9 @@ msgstr "您要将选定的销售单记录生成发票吗？"
 #~ "*当销售订单明细已经装箱时设置为'已完成'状态。                     \n"
 #~ "*当用户取消相关销售订单时设置为'已取消'状态。"
 
+#~ msgid "Sale Order Lines ready to be invoiced"
+#~ msgstr "准备开发票的销售订单明细"
+
 #~ msgid "Sales order created in last month"
 #~ msgstr "上月创建的销售订单"
 
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 998cea67842..e02b037d262 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -6,49 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-07 04:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "確認報價"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
 #: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
 #: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未開票運貨明細"
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "發票異常情況"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "分析科目"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小計"
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -60,6 +206,26 @@ msgstr ""
 msgid "Cancel Order"
 msgstr "取消訂單"
 
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
@@ -72,21 +238,177 @@ msgstr ""
 msgid "The value of Advance Amount must be positive."
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "按要求"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "稅"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "未完稅金額"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "淨計 :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "貨運異常情況"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "數量 (UoS)"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "商店"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr "銷售異常情況"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "發票地址"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: view:res.partner:0
 msgid "False"
 msgstr ""
 
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,state:0
 msgid ""
@@ -98,12 +420,16 @@ msgid ""
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
 
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "分析科目"
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -112,6 +438,11 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
@@ -119,8 +450,66 @@ msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "傳真 :"
+
+#. module: sale
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
 msgstr ""
 
 #. module: sale
@@ -130,15 +519,53 @@ msgid ""
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
 msgstr "標準付款條件"
 
 #. module: sale
-#: code:addons/sale/sale.py:662
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:812
 #, python-format
-msgid "Invoice <b>paid</b>."
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "已運送數量"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -147,461 +574,13 @@ msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid ""
-"For modifying account analytic view to show important data to project "
-"manager of services companies.\n"
-"                You can also view the report of account analytic summary "
-"user-wise as well as month wise.\n"
-"                This installs the module account_analytic_analysis."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "已訂數量"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "訂單參考"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid ""
-"Allows you to select and maintain different units of measure for products."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:293
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "我的報價單"
-
-#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "商店名稱"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"<p>\n"
-"                Here is a list of each sales order line to be invoiced. You "
-"can\n"
-"                invoice sales orders partially, by lines of sales order. You "
-"do\n"
-"                not need this list if you invoice from the delivery orders "
-"or\n"
-"                if you invoice sales totally.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
-msgstr "銷售異常情況"
-
-#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
-msgstr "狀態"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation that can be converted into a "
-"sale\n"
-"                order.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sales "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and payment.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
-msgstr "數量"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "增值稅(TVA) :"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "進行中"
-
-#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "電話 :"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid ""
-"There is no Fiscal Position defined or Income category account defined for "
-"default properties of Product categories."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "已開發票"
-
-#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "小計"
-
-#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "發票地址 :"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "發票地址"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "報價單 / 訂單"
-
-#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid ""
-"All items in these order lines will be invoiced. You can also invoice a "
-"percentage of the sale order \n"
-"                    or a fixed price (for advances) directly from the sale "
-"order form if you prefer."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "(update)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
@@ -621,8 +600,30 @@ msgid "Order Lines"
 msgstr "訂單行"
 
 #. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "發票明細"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 
 #. module: sale
@@ -634,38 +635,106 @@ msgid ""
 "                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "未開票運貨明細"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "已訂數量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "數量"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
 msgstr "總計 :"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "價目表"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "訂單參考"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -682,28 +751,58 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: view:sale.config.settings:0
+msgid "Default Options"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:984
+#: code:addons/sale/sale.py:953
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:91
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
 
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "狀態"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/res_config.py:89
+#: code:addons/sale/edi/sale_order.py:140
 #, python-format
-msgid "Hour"
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
@@ -712,22 +811,36 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: view:sale.order:0
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "已付"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"To allow your salesman to make invoices for sale order lines using the menu "
-"'Lines to Invoice'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "Reference Unit of Measure"
 msgstr ""
 
 #. module: sale
@@ -736,36 +849,91 @@ msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new sale shop.\n"
-"              </p><p>\n"
-"                Each quotation or sale order must be linked to a shop. The\n"
-"                shop also defines the warehouse from which the products will "
-"be\n"
-"                delivered for each particular sales.\n"
-"              </p>\n"
-"            "
+#: view:sale.order.line:0
+msgid "Sales order lines done"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "發票分類"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:590
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:300
 #, python-format
-msgid "You cannot confirm a sale order which has no line."
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
 #, python-format
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "我的報價單"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "發票"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
@@ -775,7 +943,7 @@ msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:555
+#: code:addons/sale/sale.py:558
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr ""
@@ -786,10 +954,18 @@ msgid "Recreate Invoice"
 msgstr "重新開立發票"
 
 #. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before !"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "商店名稱"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
 msgstr ""
 
 #. module: sale
@@ -797,14 +973,171 @@ msgstr ""
 msgid "Taxes :"
 msgstr "稅 :"
 
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "已開發票"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr "先開發票"
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: sale
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
+msgstr "未定義客戶 !"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "開立發票"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "確認"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "等待排程"
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "銷貨單"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "訂單"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
@@ -812,21 +1145,88 @@ msgstr ""
 msgid "Is a Follower"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "報價單"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "異常情況"
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
@@ -835,6 +1235,30 @@ msgid ""
 "this field."
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr "處理中的銷貨單"
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
 #. module: sale
 #: help:sale.config.settings,module_warning:0
 msgid ""
@@ -845,11 +1269,92 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:979
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:935
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:948
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
@@ -868,11 +1373,105 @@ msgstr ""
 msgid "Your Reference"
 msgstr "您的參考"
 
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "價目表"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "增值稅(TVA) :"
+
+#. module: sale
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "次序"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "銷售"
+
+#. module: sale
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "數量"
 
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "自庫存"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "總計"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "發票地址 :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr "發票"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -888,19 +1487,101 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:976
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "貨運地址 :"
+
+#. module: sale
+#: code:addons/sale/sale.py:502
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
 msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
@@ -911,345 +1592,35 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "開立發票"
 
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid ""
-"Allows you to Make Quotation, Sale Order using different Order policy and "
-"Manage Related Stock.\n"
-"                    This installs the module sale_stock."
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Price"
-msgstr "價格"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "按要求"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "貨運地址 :"
-
-#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "New Copy of Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid ""
-"Before choosing a product,\n"
-" select a customer in the sales form."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "確認報價"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "等待排程"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "單價"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale Order"
-msgstr "銷貨單"
-
-#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "稅"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid ""
-"Allows you to define what is the default function of a specific user on a "
-"given account.\n"
-"                This is mostly used when a user encodes his timesheet. The "
-"values are retrieved and the fields are auto-filled.\n"
-"                But the possibility to change these values is still "
-"available.\n"
-"                This installs the module analytic_user_function."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "傳真 :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "已運送數量"
-
-#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"After clicking 'Show Lines to Invoice', select lines to invoice and create "
-"the invoice from the 'More' dropdown menu."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "貨運異常情況"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "發票分類"
-
-#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "開立發票"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "已付"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "報價單"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
@@ -1257,11 +1628,9 @@ msgstr ""
 msgid ""
 "\n"
 "<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
-"255, 255); \">\n"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
 "'order confirmation'} from ${object.company_id.name}: </p>\n"
@@ -1284,27 +1653,10 @@ msgid ""
 "       % endif\n"
 "    </p>\n"
 "\n"
-"    % if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account and object.state != 'draft':\n"
-"    <%\n"
-"    comp_name = quote(object.company_id.name)\n"
-"    order_name = quote(object.name)\n"
-"    paypal_account = quote(object.company_id.paypal_account)\n"
-"    order_amount = quote(str(object.amount_total))\n"
-"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"    paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
-"       "
-"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
-"ces&amp;no_note=1\" \\\n"
-"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"       "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"    %>\n"
+"    % if object.paypal_url:\n"
 "    <br/>\n"
 "    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
 "            <img class=\"oe_edi_paypal_button\" "
 "src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
 "        </a>\n"
@@ -1319,7 +1671,7 @@ msgid ""
 "#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#FFF;\">\n"
+"#DDD;\">\n"
 "            <strong style=\"text-"
 "transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
 "    </div>\n"
@@ -1360,92 +1712,6 @@ msgid ""
 "            "
 msgstr ""
 
-#. module: sale
-#: field:sale.config.settings,group_sale_pricelist:0
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice).                                              You have to choose  "
-"if you want your invoice based on ordered "
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:435
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "銷售"
-
-#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid ""
-"This adds the 'Margin' on sales order.\n"
-"                This gives the profitability by calculating the difference "
-"between the Unit Price and Cost Price.\n"
-"                This installs the module sale_margin."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "單價"
-
-#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "完成"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
-msgid "Invoice"
-msgstr "發票"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
@@ -1455,10 +1721,38 @@ msgid "Product"
 msgstr "產品"
 
 #. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "價格"
+
 #. module: sale
 #: help:sale.order,order_policy:0
 msgid ""
@@ -1471,382 +1765,28 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "根據以下之發票:"
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
-msgstr ""
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "報價單 / 訂單"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
-msgstr "訂單日期"
+msgid "Tel. :"
+msgstr "電話 :"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "手動進行中"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "訂單"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
-msgstr ""
-
-#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "總計"
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid ""
-"Select how you want to invoice this order. This\n"
-"                        will create a draft invoice that can be modified\n"
-"                        before validation."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid ""
-"Use All to create the final invoice.\n"
-"                Use Percentage to invoice a percentage of the total amount.\n"
-"                Use Fixed Price to invoice a specific amound in advance.\n"
-"                Use Some Order Lines to invoice a selection of the sale "
-"order lines."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid ""
-"Allows to define your customer contracts conditions: invoicing\n"
-"            method (fixed price, on timesheet, advance invoice), the exact "
-"pricing\n"
-"            (650€/day for a developer), the duration (one year support "
-"contract).\n"
-"            You will be able to follow the progress of the contract and "
-"invoice automatically.\n"
-"            It installs the account_analytic_analysis module."
-msgstr ""
-
-#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid ""
-"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
-"'draft' or ''}"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "發票異常情況"
-
-#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "No Customer Defined !"
-msgstr "未定義客戶 !"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "淨計 :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"From stock: When needed, the product is taken from the stock or we wait for "
-"replenishment.\n"
-"On order: When needed, the product is purchased or produced."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "商店"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "數量 (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "確認"
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "確認"
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "發票明細"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "銷貨單明細"
-
-#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
-msgstr ""
-
-#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation or sale order for this "
-"customer.\n"
-"              </p><p>\n"
-"                OpenERP will help you efficiently handle the complete sale "
-"flow:\n"
-"                quotation, sale order, delivery, invoicing and\n"
-"                payment.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each "
-"sale\n"
-"                order, and allow your customer to keep track of the "
-"evolution\n"
-"                of the sale order.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
 msgstr ""
 
 #. module: sale
@@ -1857,240 +1797,44 @@ msgid ""
 "              </p><p>\n"
 "                OpenERP will help you handle efficiently the complete sale "
 "flow:\n"
-"                from the quotation to the sale order, the\n"
+"                from the quotation to the sales order, the\n"
 "                delivery, the invoicing and the payment collection.\n"
 "              </p><p>\n"
 "                The social feature helps you organize discussions on each "
-"sale\n"
+"sales\n"
 "                order, and allow your customers to keep track of the "
 "evolution\n"
-"                of the sale order.\n"
+"                of the sales order.\n"
 "              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:773
 #, python-format
 msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "重量"
-
-#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "發票"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "未完稅金額"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
-msgstr "先開發票"
-
-#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "草稿"
-
-#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "銷貨單"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
-msgstr "處理中的銷貨單"
-
-#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "自庫存"
-
-#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "說明"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2115,11 +1859,131 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "根據以下之發票:"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "訂單日期"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "手動進行中"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "說明"
+
 #. module: sale
 #: view:sale.config.settings:0
 msgid ""
@@ -2130,20 +1994,44 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
 #: view:sale.order.line:0
-msgid "Search Sales Order"
+msgid "Confirmed sales order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "次序"
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -2152,18 +2040,32 @@ msgid "Payment Term"
 msgstr "付款條件"
 
 #. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "銷貨單明細"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -2171,20 +2073,59 @@ msgstr ""
 msgid "Quotation N°"
 msgstr "報價單編號"
 
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
 msgstr "已提貨"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Delivery Order"
@@ -2421,6 +2362,9 @@ msgstr ""
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "不能取消銷貨單 !"
 
+#~ msgid "Sale Order"
+#~ msgstr "銷貨單"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "只交貨單"
 
diff --git a/addons/sale_analytic_plans/i18n/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index 85448953eb7..b91566e27c3 100644
--- a/addons/sale_analytic_plans/i18n/ar.po
+++ b/addons/sale_analytic_plans/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index 53ac430b7af..81472ac6716 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_analytic_plans/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 14:17+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/bs.po b/addons/sale_analytic_plans/i18n/bs.po
index 4e30f46c367..5911e19b5f5 100644
--- a/addons/sale_analytic_plans/i18n/bs.po
+++ b/addons/sale_analytic_plans/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:36+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ca.po b/addons/sale_analytic_plans/i18n/ca.po
index 13bf9465acc..c99139a8790 100644
--- a/addons/sale_analytic_plans/i18n/ca.po
+++ b/addons/sale_analytic_plans/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:36+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index 9fcc92732b5..07c5f49eb1f 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_analytic_plans/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-06 04:50+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/da.po b/addons/sale_analytic_plans/i18n/da.po
index 6217bbde98f..1d92215c6e2 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-02 15:31+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index 9675a2121cf..957c06f2df7 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_analytic_plans/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-21 01:51+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index cbe89c21dc3..406ef1b9698 100644
--- a/addons/sale_analytic_plans/i18n/el.po
+++ b/addons/sale_analytic_plans/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-06-15 07:22+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 9ed2eb7b8ea..00e9cdb5757 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:02+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index cd11f5347c4..4554a4701b0 100644
--- a/addons/sale_analytic_plans/i18n/es_AR.po
+++ b/addons/sale_analytic_plans/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-14 14:18+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_CL.po b/addons/sale_analytic_plans/i18n/es_CL.po
index c6fbdf0839a..b89ab22d6c1 100644
--- a/addons/sale_analytic_plans/i18n/es_CL.po
+++ b/addons/sale_analytic_plans/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-17 16:56+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_CR.po b/addons/sale_analytic_plans/i18n/es_CR.po
index 9bd3675a8a9..6a9da7200f7 100644
--- a/addons/sale_analytic_plans/i18n/es_CR.po
+++ b/addons/sale_analytic_plans/i18n/es_CR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-17 00:33+0000\n"
 "Last-Translator: Carlos Vásquez (CLEARCORP) "
 "<carlos.vasquez@clearcorp.co.cr>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index 7a00da5e338..55751d319fa 100644
--- a/addons/sale_analytic_plans/i18n/et.po
+++ b/addons/sale_analytic_plans/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/fi.po b/addons/sale_analytic_plans/i18n/fi.po
index 59f433e3de0..33d14dcd1f2 100644
--- a/addons/sale_analytic_plans/i18n/fi.po
+++ b/addons/sale_analytic_plans/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 05:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index d42daebb596..edde7fc188d 100644
--- a/addons/sale_analytic_plans/i18n/fr.po
+++ b/addons/sale_analytic_plans/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-12 15:07+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index da787cb0876..cc675bced18 100644
--- a/addons/sale_analytic_plans/i18n/gl.po
+++ b/addons/sale_analytic_plans/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sale-analytic-plans-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-08-17 08:30+0000\n"
 "Last-Translator: Frco. Javier Rial <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index ee7d1f13d27..538c586f764 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 21:06+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/hu.po b/addons/sale_analytic_plans/i18n/hu.po
index e3581327b16..0341cb04656 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_analytic_plans/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-01 17:51+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index b8539654a0c..669b18525e6 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_analytic_plans/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:57+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index a5d19355395..2df9ff43367 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 20:32+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ja.po b/addons/sale_analytic_plans/i18n/ja.po
index 8545f6b7a0b..56e4119b088 100644
--- a/addons/sale_analytic_plans/i18n/ja.po
+++ b/addons/sale_analytic_plans/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 02:10+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index 3064f484bf5..d658267113e 100644
--- a/addons/sale_analytic_plans/i18n/ko.po
+++ b/addons/sale_analytic_plans/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 12:48+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/lt.po b/addons/sale_analytic_plans/i18n/lt.po
index c703e509941..502a933e088 100644
--- a/addons/sale_analytic_plans/i18n/lt.po
+++ b/addons/sale_analytic_plans/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/mn.po b/addons/sale_analytic_plans/i18n/mn.po
index f580b769342..efaffe62029 100644
--- a/addons/sale_analytic_plans/i18n/mn.po
+++ b/addons/sale_analytic_plans/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 02:15+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nb.po b/addons/sale_analytic_plans/i18n/nb.po
index 62f4686177d..fdb64f09784 100644
--- a/addons/sale_analytic_plans/i18n/nb.po
+++ b/addons/sale_analytic_plans/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-22 21:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nl.po b/addons/sale_analytic_plans/i18n/nl.po
index 6b1a96df3fb..8274afcb10a 100644
--- a/addons/sale_analytic_plans/i18n/nl.po
+++ b/addons/sale_analytic_plans/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-24 21:36+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nl_BE.po b/addons/sale_analytic_plans/i18n/nl_BE.po
index 59252ba4074..b45e2eac1c4 100644
--- a/addons/sale_analytic_plans/i18n/nl_BE.po
+++ b/addons/sale_analytic_plans/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-24 15:40+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/oc.po b/addons/sale_analytic_plans/i18n/oc.po
index 4e905bfb309..5c9289679a6 100644
--- a/addons/sale_analytic_plans/i18n/oc.po
+++ b/addons/sale_analytic_plans/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-20 09:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index 9f1ba24c32b..7e580837439 100644
--- a/addons/sale_analytic_plans/i18n/pl.po
+++ b/addons/sale_analytic_plans/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 04:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index a97bb8ce9d4..5927d6b13aa 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_analytic_plans/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 11:59+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index 59fcd3e6a65..8faf009b9bc 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-07 16:43+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index bdf74156f76..1341f7c7b0a 100644
--- a/addons/sale_analytic_plans/i18n/ro.po
+++ b/addons/sale_analytic_plans/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:35+0000\n"
 "Last-Translator: Claudia Cotună <special4ti@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index f1797e47842..86946a25c8a 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-25 22:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index 05aa0b7cb02..deda42889aa 100644
--- a/addons/sale_analytic_plans/i18n/sk.po
+++ b/addons/sale_analytic_plans/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:35+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sl.po b/addons/sale_analytic_plans/i18n/sl.po
index 995c4a66c4f..fb0e59b0df5 100644
--- a/addons/sale_analytic_plans/i18n/sl.po
+++ b/addons/sale_analytic_plans/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-27 05:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sq.po b/addons/sale_analytic_plans/i18n/sq.po
index 250219e5d95..6e45281522e 100644
--- a/addons/sale_analytic_plans/i18n/sq.po
+++ b/addons/sale_analytic_plans/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sr.po b/addons/sale_analytic_plans/i18n/sr.po
index ed6d9aba5d9..611b351305c 100644
--- a/addons/sale_analytic_plans/i18n/sr.po
+++ b/addons/sale_analytic_plans/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-09 08:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sr@latin.po b/addons/sale_analytic_plans/i18n/sr@latin.po
index 32945db475c..0f184695e96 100644
--- a/addons/sale_analytic_plans/i18n/sr@latin.po
+++ b/addons/sale_analytic_plans/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-13 15:11+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index 5684e70631a..c5bccbd674b 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_analytic_plans/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-23 09:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/tlh.po b/addons/sale_analytic_plans/i18n/tlh.po
index c46040bc327..2506fe7fdcd 100644
--- a/addons/sale_analytic_plans/i18n/tlh.po
+++ b/addons/sale_analytic_plans/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 6a16e31d7e7..91b505788eb 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:35+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/uk.po b/addons/sale_analytic_plans/i18n/uk.po
index f9e3dda0f4c..096e84b808e 100644
--- a/addons/sale_analytic_plans/i18n/uk.po
+++ b/addons/sale_analytic_plans/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2008-11-17 23:38+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/vi.po b/addons/sale_analytic_plans/i18n/vi.po
index 6a8a4e0a156..dab5860b699 100644
--- a/addons/sale_analytic_plans/i18n/vi.po
+++ b/addons/sale_analytic_plans/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index e2bdfe378c2..041675da672 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:25+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index b51d8f29488..b0376608ac2 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:34+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_crm/i18n/ar.po b/addons/sale_crm/i18n/ar.po
index 5f1bff61d48..ffb75f0602d 100644
--- a/addons/sale_crm/i18n/ar.po
+++ b/addons/sale_crm/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,8 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
-msgstr "تحقق من هذا لغلق الفرصة بعد ان انشأ امر البيع."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr ""
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -114,6 +119,11 @@ msgstr "المتجر"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -162,6 +172,10 @@ msgstr ""
 #~ msgid "Customer has no addresses defined!"
 #~ msgstr "لا يوجد عنوان محدد للعميل!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr "تحقق من هذا لغلق الفرصة بعد ان انشأ امر البيع."
+
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "تم تحويلها إلى أسعار."
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index 1ae8a961c30..1cd82af403c 100644
--- a/addons/sale_crm/i18n/bg.po
+++ b/addons/sale_crm/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 14:18+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,10 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Маркирайте тук, за да затворите възможноста след създаване на поръчка за "
-"продажба"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +119,11 @@ msgstr "Магазин"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -300,6 +308,12 @@ msgstr ""
 #~ "CRM.\n"
 #~ "    "
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Маркирайте тук, за да затворите възможноста след създаване на поръчка за "
+#~ "продажба"
+
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Възможност "
diff --git a/addons/sale_crm/i18n/bs.po b/addons/sale_crm/i18n/bs.po
index bab1c262a20..86c79d62105 100644
--- a/addons/sale_crm/i18n/bs.po
+++ b/addons/sale_crm/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 21:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr ""
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index b0c305cedf4..83f83f9d66a 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-17 23:05+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,10 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Marqueu aquesta opció per tancar l'oportunitat després d'haver creat la "
-"comanda de venda."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +119,11 @@ msgstr "Tenda"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -286,6 +294,12 @@ msgstr ""
 #~ msgid "Opportunities by Stage"
 #~ msgstr "Oportunitats per etapa"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Marqueu aquesta opció per tancar l'oportunitat després d'haver creat la "
+#~ "comanda de venda."
+
 #~ msgid ""
 #~ "\n"
 #~ "This module adds a shortcut on one or several opportunity cases in the CRM.\n"
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index ed4d47cba1c..7f1d6f2a640 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-06 05:16+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale_crm
@@ -57,10 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Zaškrtněte toto k uzavření příležitosti po té, když bude mít vytvořenu "
-"prodejní objednávku."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +120,11 @@ msgstr "Obchod"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -166,6 +174,12 @@ msgstr ""
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Odkaz objednávky musí být jedinečný !"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Zaškrtněte toto k uzavření příležitosti po té, když bude mít vytvořenu "
+#~ "prodejní objednávku."
+
 #~ msgid "Convert to Quote"
 #~ msgstr "Převést na ocenění"
 
diff --git a/addons/sale_crm/i18n/da.po b/addons/sale_crm/i18n/da.po
index 9059be484c4..d46e5dbeeea 100644
--- a/addons/sale_crm/i18n/da.po
+++ b/addons/sale_crm/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-02 15:39+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr "Butik"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 91e0a60e75d..b958ede11f0 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:42+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -58,9 +58,13 @@ msgstr "Benutzer"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Schliessen Sie die Verkaufschance nach Erzeugen des Verkaufsauftrages"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +121,11 @@ msgstr "Shop"
 msgid "No addresse(s) defined for this customer."
 msgstr "Keine Adresse für den Kunden definiert."
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -264,6 +273,11 @@ msgstr "oder"
 #~ msgid "Customer has no addresses defined!"
 #~ msgstr "Kunde hat keine Adresse"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Schliessen Sie die Verkaufschance nach Erzeugen des Verkaufsauftrages"
+
 #, python-format
 #~ msgid "Converted to Sales Quotation(id: %s)."
 #~ msgstr "Umgewandelt zu Verkaufsangebot (id: %s)."
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 9e1de213ead..588d69cc6be 100644
--- a/addons/sale_crm/i18n/el.po
+++ b/addons/sale_crm/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-12 09:10+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -59,10 +59,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Τσέκαρε αυτό για να κλείσει η ευκαιρία αφού δημιουργήθηκε η παραγγελία "
-"πώλησης."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -119,6 +122,11 @@ msgstr "Κατάστημα"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -271,6 +279,12 @@ msgstr ""
 #~ msgid "Data Insufficient!"
 #~ msgstr "Ανεπαρκή Δεδομένα!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Τσέκαρε αυτό για να κλείσει η ευκαιρία αφού δημιουργήθηκε η παραγγελία "
+#~ "πώλησης."
+
 #~ msgid "Monthly Turnover"
 #~ msgstr "Μηνιαίος Τζίρος"
 
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index d19ed52478a..003582d71c6 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 13:12+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:38+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:42+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,10 +56,15 @@ msgstr "Usuarios"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
 msgstr ""
-"Marque esta opción para cerrar la oportunidad después de haber creado el "
-"pedido de venta."
+"Marque esta casilla para cerrar la oportunidad después de crear el pedido de "
+"venta."
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr "Presupuesto enviado"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +122,11 @@ msgstr "Tienda"
 msgid "No addresse(s) defined for this customer."
 msgstr "No se han definido direcciones para este cliente."
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr "Pedido de venta confirmado"
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -257,6 +267,12 @@ msgstr "o"
 #~ msgid "Sale CRM Stuff"
 #~ msgstr "Herramientas CRM para ventas"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Marque esta opción para cerrar la oportunidad después de haber creado el "
+#~ "pedido de venta."
+
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "se ha convertido a presupuesto."
diff --git a/addons/sale_crm/i18n/es_AR.po b/addons/sale_crm/i18n/es_AR.po
index 07d7f9be128..6fb25873bee 100644
--- a/addons/sale_crm/i18n/es_AR.po
+++ b/addons/sale_crm/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-16 13:30+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr "Sucursal"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/es_CL.po b/addons/sale_crm/i18n/es_CL.po
index f847b5cf1ff..f9fbd10d165 100644
--- a/addons/sale_crm/i18n/es_CL.po
+++ b/addons/sale_crm/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-17 17:15+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,10 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Marque esta opción para cerrar la oportunidad después de haber creado el "
-"pedido de venta."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +120,11 @@ msgstr "Almacén"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -190,6 +198,12 @@ msgstr ""
 #~ "crm.\n"
 #~ "    "
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Marque esta opción para cerrar la oportunidad después de haber creado el "
+#~ "pedido de venta."
+
 #, python-format
 #~ msgid "Converted to Sales Quotation(id: %s)."
 #~ msgstr "Convertido a presupuesto de venta (id: %s)."
diff --git a/addons/sale_crm/i18n/es_CR.po b/addons/sale_crm/i18n/es_CR.po
index 2d831c453ba..ca3fd035e94 100644
--- a/addons/sale_crm/i18n/es_CR.po
+++ b/addons/sale_crm/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:13+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: sale_crm
@@ -57,10 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Marque esta opción para cerrar la oportunidad después de haber creado el "
-"pedido de venta."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +120,11 @@ msgstr "Tienda"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -159,6 +167,12 @@ msgstr ""
 #~ msgid "Customer has no addresses defined!"
 #~ msgstr "¡El cliente no tiene definidas direcciones!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Marque esta opción para cerrar la oportunidad después de haber creado el "
+#~ "pedido de venta."
+
 #~ msgid "Convert to Quote"
 #~ msgstr "Convertir a presupuesto"
 
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index 8c286f7f0f7..c1344fa5023 100644
--- a/addons/sale_crm/i18n/et.po
+++ b/addons/sale_crm/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 18:59+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr "Pood"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/fi.po b/addons/sale_crm/i18n/fi.po
index 94d35f67ec9..36190598bbb 100644
--- a/addons/sale_crm/i18n/fi.po
+++ b/addons/sale_crm/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-28 11:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,10 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Valitse tämä sulkeaksesi myyntimahdollisuuden myyntitilauksen luonnin "
-"jälkeen."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +120,11 @@ msgstr "Myymälä"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -166,6 +174,12 @@ msgstr ""
 #~ msgid "is converted to Quotation."
 #~ msgstr "on muutettu tarjoukseksi."
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Valitse tämä sulkeaksesi myyntimahdollisuuden myyntitilauksen luonnin "
+#~ "jälkeen."
+
 #, python-format
 #~ msgid "Converted to Sales Quotation(id: %s)."
 #~ msgstr "Muutettu myynnin tarjoukseksi (id: %s)."
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index eac938790dd..af582fea7d9 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-03 22:25+0000\n"
 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,10 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Cocher cette case pour fermer l'opportunité après avoir créé la commande "
-"client"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +119,11 @@ msgstr "Magasin"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -256,6 +264,12 @@ msgstr ""
 #~ msgid "Quotations"
 #~ msgstr "Devis"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Cocher cette case pour fermer l'opportunité après avoir créé la commande "
+#~ "client"
+
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "a été converti en devis."
diff --git a/addons/sale_crm/i18n/gl.po b/addons/sale_crm/i18n/gl.po
index e3067385d80..3a742fd4c5d 100644
--- a/addons/sale_crm/i18n/gl.po
+++ b/addons/sale_crm/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-09 16:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,10 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Marque esta opción para pechar a oportunidade despois de ter creado o pedido "
-"de venda."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +120,11 @@ msgstr "Tenda"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -189,6 +197,12 @@ msgstr ""
 #~ "módulos: o de vendas e o crm.\n"
 #~ "    "
 
+#~ 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."
+
 #~ msgid "Monthly Turnover"
 #~ msgstr "Volume mensual"
 
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index c256fee0ebf..01ccb4f37ef 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 19:28+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
@@ -57,9 +57,13 @@ msgstr "Korisnici"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Označi ovo da bi se prilika zatvorila nakon kreiranja prodajnog naloga."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +120,11 @@ msgstr "Prodavaonica"
 msgid "No addresse(s) defined for this customer."
 msgstr "Nema definirane adrese za ovog kupca."
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -260,6 +269,11 @@ msgstr "ili"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Oznaka naloga mora biti jedinstvena"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Označi ovo da bi se prilika zatvorila nakon kreiranja prodajnog naloga."
+
 #~ msgid ""
 #~ "\n"
 #~ "This module adds a shortcut on one or several opportunity cases in the CRM.\n"
diff --git a/addons/sale_crm/i18n/hu.po b/addons/sale_crm/i18n/hu.po
index aa7091b2431..ac2dc1e1093 100644
--- a/addons/sale_crm/i18n/hu.po
+++ b/addons/sale_crm/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-01 18:33+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,9 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Jelölje be, hogy lezárja a lehetőséget, miután a vevői megrendelés elkészült."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +119,11 @@ msgstr "Üzlet"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -192,3 +201,8 @@ msgstr ""
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "átalakítva árajánlattá."
+
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Jelölje be, hogy lezárja a lehetőséget, miután a vevői megrendelés elkészült."
diff --git a/addons/sale_crm/i18n/id.po b/addons/sale_crm/i18n/id.po
index 02e6054b1cd..52a5a6d89f6 100644
--- a/addons/sale_crm/i18n/id.po
+++ b/addons/sale_crm/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:57+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,8 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
-msgstr "Centang ini untuk menutup peluang setelah membuat order penjualan."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr ""
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -114,6 +119,11 @@ msgstr "Toko"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -163,6 +173,10 @@ msgstr ""
 #~ msgid "is converted to Quotation."
 #~ msgstr "ini sudah dikonversi ke Quotation"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr "Centang ini untuk menutup peluang setelah membuat order penjualan."
+
 #~ msgid ""
 #~ "\n"
 #~ "This module adds a shortcut on one or several opportunity cases in the CRM.\n"
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 9227e0f9710..cbc805c9033 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 22:33+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
@@ -56,10 +56,13 @@ msgstr "Utenti"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Spuntare questa opzione per chiudere l'opportunità dopo la creazione "
-"dell'ordine di vendita."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +119,11 @@ msgstr "Negozio"
 msgid "No addresse(s) defined for this customer."
 msgstr "Nessun indirizzo/i definito/i per il cliente."
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -295,6 +303,12 @@ msgstr "o"
 #~ " che quello del CRM.\n"
 #~ "    "
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Spuntare questa opzione per chiudere l'opportunità dopo la creazione "
+#~ "dell'ordine di vendita."
+
 #~ msgid "Monthly Turnover"
 #~ msgstr "Fatturato mensile"
 
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 8e77f8e8410..f4f3a53d651 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-30 16:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,8 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
-msgstr "発注書を作成後、商談を終了するためにこれをチェックします。"
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr ""
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +120,11 @@ msgstr "店"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -166,6 +176,10 @@ msgstr ""
 #~ msgid "Opportunity  '%s' is converted to Quotation."
 #~ msgstr "商談 %s は見積に変換されました。"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr "発注書を作成後、商談を終了するためにこれをチェックします。"
+
 #~ msgid "My Opportunities"
 #~ msgstr "私の商談"
 
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index 5f0a76d52a0..7ca5ddff815 100644
--- a/addons/sale_crm/i18n/ko.po
+++ b/addons/sale_crm/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:21+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr "샵"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/lt.po b/addons/sale_crm/i18n/lt.po
index df620e286e9..a75ae8b4dfc 100644
--- a/addons/sale_crm/i18n/lt.po
+++ b/addons/sale_crm/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:21+0000\n"
 "Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr "Parduotuvė"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/lv.po b/addons/sale_crm/i18n/lv.po
index 5125e71a436..0805f915be2 100644
--- a/addons/sale_crm/i18n/lv.po
+++ b/addons/sale_crm/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-21 14:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr ""
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/mn.po b/addons/sale_crm/i18n/mn.po
index 10fc3f57898..90bbc4d0746 100644
--- a/addons/sale_crm/i18n/mn.po
+++ b/addons/sale_crm/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-18 01:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,9 +57,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Борлуулалтын захиалга үүссэн дараа боломжийг хаахын тулд үүнийг тэмдэглэ."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +120,11 @@ msgstr "Дэлгүүр"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -168,6 +177,11 @@ msgstr ""
 #~ msgid "Category"
 #~ msgstr "Ангилал"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Борлуулалтын захиалга үүссэн дараа боломжийг хаахын тулд үүнийг тэмдэглэ."
+
 #, python-format
 #~ msgid "Opportunity  '%s' is converted to Quotation."
 #~ msgstr "'%s' боломж Үнийн санал рүү хөрвүүлэгдлээ."
diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
index 8569fb340e1..21ed0b1b0ca 100644
--- a/addons/sale_crm/i18n/nb.po
+++ b/addons/sale_crm/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-02 11:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr "Butikk"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index ce24e8a0993..b544e68ff40 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 18:40+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,9 +56,13 @@ msgstr "Gebruikers"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Vink dit aan om de prospect af te sluiten na het maken van de verkooporder."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +119,11 @@ msgstr "Verkooppunt"
 msgid "No addresse(s) defined for this customer."
 msgstr "Geen adres(sen) gedefinieerd voor deze klant."
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -337,3 +346,8 @@ msgstr "of"
 
 #~ msgid "Close Opportunity"
 #~ msgstr "Prospect sluiten"
+
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Vink dit aan om de prospect af te sluiten na het maken van de verkooporder."
diff --git a/addons/sale_crm/i18n/nl_BE.po b/addons/sale_crm/i18n/nl_BE.po
index 2a399c322a3..db2d55311ab 100644
--- a/addons/sale_crm/i18n/nl_BE.po
+++ b/addons/sale_crm/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-24 15:10+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,10 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Schakel dit vakje in als u de opportuniteit wilt afsluiten nadat de offerte "
-"is gemaakt."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +119,11 @@ msgstr "Verkooppunt"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -192,6 +200,12 @@ msgstr ""
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "De orderreferentie moet uniek zijn."
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Schakel dit vakje in als u de opportuniteit wilt afsluiten nadat de offerte "
+#~ "is gemaakt."
+
 #~ msgid "Convert to Quote"
 #~ msgstr "Omzetten naar offerte"
 
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index e8d86bd2e3f..6c752c4d2f4 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-28 07:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,8 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
-msgstr "Zaznacz to, aby zamknąć szansę po utworzeniu zamówienia."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr ""
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -114,6 +119,11 @@ msgstr "Sklep"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -252,6 +262,10 @@ msgstr ""
 #~ msgid "Customer has no addresses defined!"
 #~ msgstr "Nie zdefiniowano adresu klienta!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr "Zaznacz to, aby zamknąć szansę po utworzeniu zamówienia."
+
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "skonwertowano do oferty."
diff --git a/addons/sale_crm/i18n/pt.po b/addons/sale_crm/i18n/pt.po
index c83a11c286b..58c7a7575ca 100644
--- a/addons/sale_crm/i18n/pt.po
+++ b/addons/sale_crm/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-04 10:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,10 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Verificar isso para fechar a oportunidade depois de ter criado a ordem de "
-"venda."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -116,6 +119,11 @@ msgstr "Loja"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -298,6 +306,12 @@ msgstr ""
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Ordem da Referência deve ser exclusiva !"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Verificar isso para fechar a oportunidade depois de ter criado a ordem de "
+#~ "venda."
+
 #~ msgid "Monthly Turnover"
 #~ msgstr "Volume mensal"
 
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index c644cc02491..dfe6806fc70 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-18 00:49+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 17:50+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
@@ -57,10 +57,14 @@ msgstr "Usuários"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
 msgstr ""
-"Marque esta opção para fechar a oportunidade depois de ter criado o pedido "
-"de venda."
+"Marque se desejar fechar esta oportunidade após criar o pedido de vendas."
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr "Cotação Enviada"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -117,6 +121,11 @@ msgstr "Estabelecimento"
 msgid "No addresse(s) defined for this customer."
 msgstr "Nenhum endereço definido para o cliente."
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr "Pedido de Vendas Confirmado"
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -334,6 +343,12 @@ msgstr "ou"
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "A Referência do Pedido deve ser única por Empresa!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Marque esta opção para fechar a oportunidade depois de ter criado o pedido "
+#~ "de venda."
+
 #, python-format
 #~ msgid "Opportunity  '%s' is converted to Quotation."
 #~ msgstr "A Oportunidade '%s' foi convertida em Cotação."
diff --git a/addons/sale_crm/i18n/ro.po b/addons/sale_crm/i18n/ro.po
index 84af47f3b71..6391afcf072 100644
--- a/addons/sale_crm/i18n/ro.po
+++ b/addons/sale_crm/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-24 18:39+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,9 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Bifati pentru a inchide oportunitatea dupa ce ati creat comanda de vanzare."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +119,11 @@ msgstr "Magazin"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -225,6 +234,11 @@ msgstr ""
 #~ msgid "Category"
 #~ msgstr "Categorie"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Bifati pentru a inchide oportunitatea dupa ce ati creat comanda de vanzare."
+
 #, python-format
 #~ msgid "Opportunity  '%s' is converted to Quotation."
 #~ msgstr "Oportunitatea '%s' este schimbata in Cotatie."
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 5504e4d6204..8cc0bc7d8b0 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-23 13:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,8 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
-msgstr "Отметьте для закрытия предложения после создания заказа продаж."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr ""
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -114,6 +119,11 @@ msgstr "Магазин"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -313,6 +323,10 @@ msgstr ""
 #~ msgid "My Planned Revenues by Stage"
 #~ msgstr "Моя запланированная выручка по этапам"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr "Отметьте для закрытия предложения после создания заказа продаж."
+
 #, python-format
 #~ msgid "Opportunity  '%s' is converted to Quotation."
 #~ msgstr "Предложение '%s'  преобразовано в заказ продаж."
diff --git a/addons/sale_crm/i18n/sk.po b/addons/sale_crm/i18n/sk.po
index 4397d0732e7..fe41014858e 100644
--- a/addons/sale_crm/i18n/sk.po
+++ b/addons/sale_crm/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-21 14:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr "Obchod"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/sl.po b/addons/sale_crm/i18n/sl.po
index 996bbc4a6e7..98b894fec4a 100644
--- a/addons/sale_crm/i18n/sl.po
+++ b/addons/sale_crm/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,9 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Preverite to, da zaprete priložnost potem ko je ustvaril s prodajo naročilo."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +119,11 @@ msgstr "Trgovina"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -212,6 +221,11 @@ msgstr ""
 #~ msgid "Opportunities by Stage"
 #~ msgstr "Priložnosti po stopnjah"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Preverite to, da zaprete priložnost potem ko je ustvaril s prodajo naročilo."
+
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "je pretvorjeno v Ponudbo."
diff --git a/addons/sale_crm/i18n/sq.po b/addons/sale_crm/i18n/sq.po
index e8b0d3a02b3..fdac22822ab 100644
--- a/addons/sale_crm/i18n/sq.po
+++ b/addons/sale_crm/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr ""
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index d0a611538bc..ba8d300809e 100644
--- a/addons/sale_crm/i18n/sv.po
+++ b/addons/sale_crm/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-23 09:40+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,9 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Kryssa för att stänga affärsmöjligheten efter att ha skapar kundorder."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +119,11 @@ msgstr "Butik"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -227,6 +236,11 @@ msgstr ""
 #~ msgid "Customer has no addresses defined!"
 #~ msgstr "Kunden saknar adress!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Kryssa för att stänga affärsmöjligheten efter att ha skapar kundorder."
+
 #~ msgid "My Opportunities"
 #~ msgstr "Mina affärsmöjligheter"
 
diff --git a/addons/sale_crm/i18n/tlh.po b/addons/sale_crm/i18n/tlh.po
index c03007d3ac4..74a65722f6a 100644
--- a/addons/sale_crm/i18n/tlh.po
+++ b/addons/sale_crm/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr ""
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 82de425d01d..dc20c06b267 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 00:17+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,9 +56,13 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
-"Satış siparişini oluşturduktan sonra fırsatı kapatmak için bunu tıklayın."
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -115,6 +119,11 @@ msgstr "İş Yeri"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -328,5 +337,10 @@ msgstr ""
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Sipariş Referansı Her Firma için benzersiz olmalı!"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr ""
+#~ "Satış siparişini oluşturduktan sonra fırsatı kapatmak için bunu tıklayın."
+
 #~ msgid "My Planned Revenues by Stage"
 #~ msgstr "Aşamaya göre Planlanan Gelirlerim"
diff --git a/addons/sale_crm/i18n/uk.po b/addons/sale_crm/i18n/uk.po
index e841a3d3168..5538c7d1c79 100644
--- a/addons/sale_crm/i18n/uk.po
+++ b/addons/sale_crm/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 12:37+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr ""
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/vi.po b/addons/sale_crm/i18n/vi.po
index 2a2b396ff2f..3dd3619937a 100644
--- a/addons/sale_crm/i18n/vi.po
+++ b/addons/sale_crm/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-20 10:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -57,7 +57,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -115,6 +120,11 @@ msgstr "Cửa hàng"
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index d0bac4cb23f..0d662ace700 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-19 05:29+0000\n"
-"Last-Translator: David ma <mayongbin@foxmail.com>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 11:09+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.com>\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: 2012-12-20 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
@@ -56,8 +56,13 @@ msgstr "人员"
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
-msgstr "在生成销售订单后检查是否关闭商机。"
+"Check this to close the opportunity after having created the sales order."
+msgstr "选中 此项，创建销售订单后，将关闭商机"
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr "报价单已经发送"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -114,6 +119,11 @@ msgstr "商店"
 msgid "No addresse(s) defined for this customer."
 msgstr "这个客户没有定义地址"
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr "销售订单已经确认"
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
@@ -262,6 +272,10 @@ msgstr "or"
 #~ msgid "is converted to Quotation."
 #~ msgstr "已经被转为报价单。"
 
+#~ msgid ""
+#~ "Check this to close the opportunity after having created the sale order."
+#~ msgstr "在生成销售订单后检查是否关闭商机。"
+
 #~ msgid "Close Opportunity"
 #~ msgstr "关闭商机"
 
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 42de1e03b14..cd70a39392e 100644
--- a/addons/sale_crm/i18n/zh_TW.po
+++ b/addons/sale_crm/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:18+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:26+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -56,7 +56,12 @@ msgstr ""
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
-"Check this to close the opportunity after having created the sale order."
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
 msgstr ""
 
 #. module: sale_crm
@@ -114,6 +119,11 @@ msgstr ""
 msgid "No addresse(s) defined for this customer."
 msgstr ""
 
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
 #. module: sale_crm
 #: view:account.invoice:0
 #: field:account.invoice,section_id:0
diff --git a/addons/sale_journal/i18n/ar.po b/addons/sale_journal/i18n/ar.po
index f8cc4be8028..7832e4e6aa0 100644
--- a/addons/sale_journal/i18n/ar.po
+++ b/addons/sale_journal/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index b9de6ceddf4..a0499be2194 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:05+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index b04c04fe1b1..de01f2fef56 100644
--- a/addons/sale_journal/i18n/bs.po
+++ b/addons/sale_journal/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 12:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index 03a27a76bd8..72a47d695b0 100644
--- a/addons/sale_journal/i18n/ca.po
+++ b/addons/sale_journal/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:39+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index fe92d309b2f..4c4afdab885 100644
--- a/addons/sale_journal/i18n/cs.po
+++ b/addons/sale_journal/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/da.po b/addons/sale_journal/i18n/da.po
index d17e411b832..d55e73e1794 100644
--- a/addons/sale_journal/i18n/da.po
+++ b/addons/sale_journal/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-02 15:46+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 7307b88af4b..b39653067a0 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:51+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/el.po b/addons/sale_journal/i18n/el.po
index 3d987d7a4c8..ad489543e4a 100644
--- a/addons/sale_journal/i18n/el.po
+++ b/addons/sale_journal/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-21 14:22+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index 157d33f2cdc..b20a2f80e76 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:01+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index ae03dc02faf..07cf0b549cc 100644
--- a/addons/sale_journal/i18n/es_AR.po
+++ b/addons/sale_journal/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-20 21:39+0000\n"
 "Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/es_CL.po b/addons/sale_journal/i18n/es_CL.po
index 4f3c756a705..13a2e7415f7 100644
--- a/addons/sale_journal/i18n/es_CL.po
+++ b/addons/sale_journal/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-18 17:32+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/es_CR.po b/addons/sale_journal/i18n/es_CR.po
index 7b7f62f369c..dde5d6965e1 100644
--- a/addons/sale_journal/i18n/es_CR.po
+++ b/addons/sale_journal/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:16+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index 7595a0c58ae..14b5a52032a 100644
--- a/addons/sale_journal/i18n/et.po
+++ b/addons/sale_journal/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/fi.po b/addons/sale_journal/i18n/fi.po
index eb61db38f91..e3b8978702e 100644
--- a/addons/sale_journal/i18n/fi.po
+++ b/addons/sale_journal/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 05:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index 51052e1f19e..c051c9367fd 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 16:03+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/gl.po b/addons/sale_journal/i18n/gl.po
index dde4128f8ee..53149094ec0 100644
--- a/addons/sale_journal/i18n/gl.po
+++ b/addons/sale_journal/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-09 16:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 92fd18a6ee4..327756cafc8 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 19:31+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index a70a670fc7e..87d2fc32ee0 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-01 21:02+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index dd186a492ad..739b3d5234e 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 19:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index 82ca2f28587..77f1d73f5f9 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 20:52+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-17 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ja.po b/addons/sale_journal/i18n/ja.po
index 83fd7511497..22acf10c45f 100644
--- a/addons/sale_journal/i18n/ja.po
+++ b/addons/sale_journal/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 21:45+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index c6ee252b8fc..30cc111b8dc 100644
--- a/addons/sale_journal/i18n/ko.po
+++ b/addons/sale_journal/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 14:48+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index fe92d309b2f..4c4afdab885 100644
--- a/addons/sale_journal/i18n/lt.po
+++ b/addons/sale_journal/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/lv.po b/addons/sale_journal/i18n/lv.po
index 5d47c6a1e20..31384ec6fce 100644
--- a/addons/sale_journal/i18n/lv.po
+++ b/addons/sale_journal/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-28 08:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/mn.po b/addons/sale_journal/i18n/mn.po
index d5715e88044..144c543a095 100644
--- a/addons/sale_journal/i18n/mn.po
+++ b/addons/sale_journal/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-12 14:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/nb.po b/addons/sale_journal/i18n/nb.po
index 88e4571fa64..11f815dcd67 100644
--- a/addons/sale_journal/i18n/nb.po
+++ b/addons/sale_journal/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-08-10 09:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index ff8e2787f76..436f2959bfb 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 19:06+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index 4e442a905eb..0fe8514f404 100644
--- a/addons/sale_journal/i18n/nl_BE.po
+++ b/addons/sale_journal/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 09:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index bc535bf022b..00b2a73c24c 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index 7428e759f5e..efc7b3fd1d7 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 12:57+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index 8740e9c90c9..1d481d756b6 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-07 16:45+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index 68ea8f9ed24..b2ef8c330d9 100644
--- a/addons/sale_journal/i18n/ro.po
+++ b/addons/sale_journal/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:37+0000\n"
 "Last-Translator: Valentin <vali_ile@tybmad.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index 3a04ee9325e..7f3ce2316eb 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-20 08:56+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sk.po b/addons/sale_journal/i18n/sk.po
index 472b94df8e2..48963bb3c63 100644
--- a/addons/sale_journal/i18n/sk.po
+++ b/addons/sale_journal/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-23 19:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index ac585f519b2..a1788dc13c9 100644
--- a/addons/sale_journal/i18n/sl.po
+++ b/addons/sale_journal/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 06:01+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sq.po b/addons/sale_journal/i18n/sq.po
index 0d04a9cc09c..abb0db7bf71 100644
--- a/addons/sale_journal/i18n/sq.po
+++ b/addons/sale_journal/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index e1938f1aade..c64897c5352 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-23 09:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index c2c63a4acd0..88f9812a4a0 100644
--- a/addons/sale_journal/i18n/tlh.po
+++ b/addons/sale_journal/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 6ba038a104f..edb7181fd66 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 00:15+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index 1c8d1cc993c..dc352917e26 100644
--- a/addons/sale_journal/i18n/uk.po
+++ b/addons/sale_journal/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 16:30+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/vi.po b/addons/sale_journal/i18n/vi.po
index ded0508b077..dd5ef9ca516 100644
--- a/addons/sale_journal/i18n/vi.po
+++ b/addons/sale_journal/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-21 02:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index f7a9ca969bc..2aa09fe6508 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:24+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index 54cd85ceaa5..8d91c250dd5 100644
--- a/addons/sale_journal/i18n/zh_TW.po
+++ b/addons/sale_journal/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-30 13:14+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:43+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_margin/i18n/ar.po b/addons/sale_margin/i18n/ar.po
index cd038497c36..74a1825bc2c 100644
--- a/addons/sale_margin/i18n/ar.po
+++ b/addons/sale_margin/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-11 19:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/bg.po b/addons/sale_margin/i18n/bg.po
index 2ff46288ecf..50f6e6d59f4 100644
--- a/addons/sale_margin/i18n/bg.po
+++ b/addons/sale_margin/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-27 08:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/ca.po b/addons/sale_margin/i18n/ca.po
index 6c02f91b139..740600c00cb 100644
--- a/addons/sale_margin/i18n/ca.po
+++ b/addons/sale_margin/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-06-21 15:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/da.po b/addons/sale_margin/i18n/da.po
index 12918f76821..2077ae95730 100644
--- a/addons/sale_margin/i18n/da.po
+++ b/addons/sale_margin/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-02 15:59+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index 2d137ab6c7a..9bbf80c0ef3 100644
--- a/addons/sale_margin/i18n/de.po
+++ b/addons/sale_margin/i18n/de.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:08+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/el.po b/addons/sale_margin/i18n/el.po
index 11e3d0668dd..c5b3737e443 100644
--- a/addons/sale_margin/i18n/el.po
+++ b/addons/sale_margin/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-21 14:23+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index fb1141dd48f..a63e3e28738 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:01+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/es_CL.po b/addons/sale_margin/i18n/es_CL.po
index 0595ca41d6e..40ff4770f16 100644
--- a/addons/sale_margin/i18n/es_CL.po
+++ b/addons/sale_margin/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-18 18:31+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/es_CR.po b/addons/sale_margin/i18n/es_CR.po
index 1af09f6428e..0f1083535c8 100644
--- a/addons/sale_margin/i18n/es_CR.po
+++ b/addons/sale_margin/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:17+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/et.po b/addons/sale_margin/i18n/et.po
index 1b81da859af..8eaccd9520c 100644
--- a/addons/sale_margin/i18n/et.po
+++ b/addons/sale_margin/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-06-25 18:17+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/fi.po b/addons/sale_margin/i18n/fi.po
index c2f52439f2d..702c24a352f 100644
--- a/addons/sale_margin/i18n/fi.po
+++ b/addons/sale_margin/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 05:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/fr.po b/addons/sale_margin/i18n/fr.po
index ef157b12e8e..2eb8510ee87 100644
--- a/addons/sale_margin/i18n/fr.po
+++ b/addons/sale_margin/i18n/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 19:27+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/hr.po b/addons/sale_margin/i18n/hr.po
index e35e4f83fdc..f0ce10f0cb3 100644
--- a/addons/sale_margin/i18n/hr.po
+++ b/addons/sale_margin/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 21:05+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/hu.po b/addons/sale_margin/i18n/hu.po
index 22080fba7ac..ffa3a0c0346 100644
--- a/addons/sale_margin/i18n/hu.po
+++ b/addons/sale_margin/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-01 22:09+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/it.po b/addons/sale_margin/i18n/it.po
index 42e1e2a7b49..42406c0468a 100644
--- a/addons/sale_margin/i18n/it.po
+++ b/addons/sale_margin/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-03 20:53+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index f044107fcfa..36e2afc5c82 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-30 16:32+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/mn.po b/addons/sale_margin/i18n/mn.po
index 27b48178281..c8b596fc313 100644
--- a/addons/sale_margin/i18n/mn.po
+++ b/addons/sale_margin/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-18 18:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/nb.po b/addons/sale_margin/i18n/nb.po
index d1e8fe485e5..9a37130eaae 100644
--- a/addons/sale_margin/i18n/nb.po
+++ b/addons/sale_margin/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-22 21:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/nl.po b/addons/sale_margin/i18n/nl.po
index 21c54336556..7b6599cd8e3 100644
--- a/addons/sale_margin/i18n/nl.po
+++ b/addons/sale_margin/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 19:04+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/pl.po b/addons/sale_margin/i18n/pl.po
index 07165b09b2b..d04de703586 100644
--- a/addons/sale_margin/i18n/pl.po
+++ b/addons/sale_margin/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-26 15:12+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/pt.po b/addons/sale_margin/i18n/pt.po
index 604b6c50d17..7c422fcc7ff 100644
--- a/addons/sale_margin/i18n/pt.po
+++ b/addons/sale_margin/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:40+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index 63809a7cd7f..f7985855a63 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 00:52+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/ro.po b/addons/sale_margin/i18n/ro.po
index 3ab6ca12095..7a02ff19ca4 100644
--- a/addons/sale_margin/i18n/ro.po
+++ b/addons/sale_margin/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-04 14:32+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index 7872493afcf..c3ccd73c6c9 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-20 08:51+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/sk.po b/addons/sale_margin/i18n/sk.po
index c80ba360e39..541a286f596 100644
--- a/addons/sale_margin/i18n/sk.po
+++ b/addons/sale_margin/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-23 19:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
index 3cedf8b8244..954c421926c 100644
--- a/addons/sale_margin/i18n/sl.po
+++ b/addons/sale_margin/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-02 12:17+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po
index 00ef7c74cf0..602fb1fd438 100644
--- a/addons/sale_margin/i18n/sv.po
+++ b/addons/sale_margin/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-25 16:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index ef610ec04ad..ecf704245d7 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
index 2deccb72fb9..d8d69c9c99f 100644
--- a/addons/sale_margin/i18n/zh_CN.po
+++ b/addons/sale_margin/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 13:53+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_mrp/i18n/ar.po b/addons/sale_mrp/i18n/ar.po
index c7db83e6e5f..e5f736d2f1c 100644
--- a/addons/sale_mrp/i18n/ar.po
+++ b/addons/sale_mrp/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-05 11:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/bg.po b/addons/sale_mrp/i18n/bg.po
index 0343638bd84..342de7a01e2 100644
--- a/addons/sale_mrp/i18n/bg.po
+++ b/addons/sale_mrp/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-21 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/ca.po b/addons/sale_mrp/i18n/ca.po
index 0012ea400b8..d9c631e5c33 100644
--- a/addons/sale_mrp/i18n/ca.po
+++ b/addons/sale_mrp/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-05 17:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/da.po b/addons/sale_mrp/i18n/da.po
index 938d889468b..fbaa653f7c0 100644
--- a/addons/sale_mrp/i18n/da.po
+++ b/addons/sale_mrp/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-02 15:29+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index 35634be5b09..800022cbf7f 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:07+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 72021342099..a40079a70a0 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 13:00+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/es_CL.po b/addons/sale_mrp/i18n/es_CL.po
index 5b6e6b12b1d..a682469a924 100644
--- a/addons/sale_mrp/i18n/es_CL.po
+++ b/addons/sale_mrp/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-18 18:35+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/es_CR.po b/addons/sale_mrp/i18n/es_CR.po
index 27c65598d2e..c0603c1b954 100644
--- a/addons/sale_mrp/i18n/es_CR.po
+++ b/addons/sale_mrp/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-18 22:18+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/et.po b/addons/sale_mrp/i18n/et.po
index 80258172106..0491081463b 100644
--- a/addons/sale_mrp/i18n/et.po
+++ b/addons/sale_mrp/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-07 11:24+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/fi.po b/addons/sale_mrp/i18n/fi.po
index 822b19eb753..e8c759b0b58 100644
--- a/addons/sale_mrp/i18n/fi.po
+++ b/addons/sale_mrp/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 05:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/fr.po b/addons/sale_mrp/i18n/fr.po
index 32a53e4a320..046acaa9165 100644
--- a/addons/sale_mrp/i18n/fr.po
+++ b/addons/sale_mrp/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-09 09:27+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/gl.po b/addons/sale_mrp/i18n/gl.po
index 84285c85146..6e75a2a85d1 100644
--- a/addons/sale_mrp/i18n/gl.po
+++ b/addons/sale_mrp/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-11 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/hr.po b/addons/sale_mrp/i18n/hr.po
index e0513002be2..9f7581d8c97 100644
--- a/addons/sale_mrp/i18n/hr.po
+++ b/addons/sale_mrp/i18n/hr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 21:52+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/hu.po b/addons/sale_mrp/i18n/hu.po
index ceabd6eb3d9..ff1dd8f7e56 100644
--- a/addons/sale_mrp/i18n/hu.po
+++ b/addons/sale_mrp/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-01 22:23+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/it.po b/addons/sale_mrp/i18n/it.po
index 545b1ec2bd9..4b2c085e485 100644
--- a/addons/sale_mrp/i18n/it.po
+++ b/addons/sale_mrp/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 15:29+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/ja.po b/addons/sale_mrp/i18n/ja.po
index 8e701ab1f31..98065da0d96 100644
--- a/addons/sale_mrp/i18n/ja.po
+++ b/addons/sale_mrp/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 02:40+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/mn.po b/addons/sale_mrp/i18n/mn.po
index 26e534cb71e..e4077719a6a 100644
--- a/addons/sale_mrp/i18n/mn.po
+++ b/addons/sale_mrp/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-21 13:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/nb.po b/addons/sale_mrp/i18n/nb.po
index a5170d826d1..bd41a99b140 100644
--- a/addons/sale_mrp/i18n/nb.po
+++ b/addons/sale_mrp/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-22 20:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/nl.po b/addons/sale_mrp/i18n/nl.po
index e4d609f5c7d..d9c3e611c56 100644
--- a/addons/sale_mrp/i18n/nl.po
+++ b/addons/sale_mrp/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 18:42+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/nl_BE.po b/addons/sale_mrp/i18n/nl_BE.po
index de36551e405..497e24bc0c1 100644
--- a/addons/sale_mrp/i18n/nl_BE.po
+++ b/addons/sale_mrp/i18n/nl_BE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-01 12:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 3d2530081d6..a9c79024c0c 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-28 08:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index de0812da701..12f32639c35 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:42+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index 667f6f66a8c..62e36cdfbc4 100644
--- a/addons/sale_mrp/i18n/pt_BR.po
+++ b/addons/sale_mrp/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 00:53+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/ro.po b/addons/sale_mrp/i18n/ro.po
index 3c20d83b077..dfb05e06c93 100644
--- a/addons/sale_mrp/i18n/ro.po
+++ b/addons/sale_mrp/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-26 06:00+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index 59a28c16f62..82b1414ee2f 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-25 08:59+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
index 558628ff491..52e1538c8d7 100644
--- a/addons/sale_mrp/i18n/sl.po
+++ b/addons/sale_mrp/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-08 17:06+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/sr@latin.po b/addons/sale_mrp/i18n/sr@latin.po
index daa3f56465d..1a8224afb4b 100644
--- a/addons/sale_mrp/i18n/sr@latin.po
+++ b/addons/sale_mrp/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-13 15:09+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po
index 245c3767775..00003e7d2b8 100644
--- a/addons/sale_mrp/i18n/sv.po
+++ b/addons/sale_mrp/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-25 16:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/tr.po b/addons/sale_mrp/i18n/tr.po
index 45f6914485e..27cc3881c8f 100644
--- a/addons/sale_mrp/i18n/tr.po
+++ b/addons/sale_mrp/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:24+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index f14d97e74ac..515a0df0823 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 13:53+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_order_dates/i18n/ar.po b/addons/sale_order_dates/i18n/ar.po
index 688768c6f21..92e1e0691ac 100644
--- a/addons/sale_order_dates/i18n/ar.po
+++ b/addons/sale_order_dates/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-11 19:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/bg.po b/addons/sale_order_dates/i18n/bg.po
index 46df043c167..779ba503d5e 100644
--- a/addons/sale_order_dates/i18n/bg.po
+++ b/addons/sale_order_dates/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-26 21:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ca.po b/addons/sale_order_dates/i18n/ca.po
index 60187b3f959..db649e01579 100644
--- a/addons/sale_order_dates/i18n/ca.po
+++ b/addons/sale_order_dates/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-05 17:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/da.po b/addons/sale_order_dates/i18n/da.po
index 3edb3553847..d0d86c41655 100644
--- a/addons/sale_order_dates/i18n/da.po
+++ b/addons/sale_order_dates/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-02 15:24+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po
index 4d9b7622e2b..74d03c21d71 100644
--- a/addons/sale_order_dates/i18n/de.po
+++ b/addons/sale_order_dates/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:06+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/el.po b/addons/sale_order_dates/i18n/el.po
index 6c292af62e6..7fd2b965837 100644
--- a/addons/sale_order_dates/i18n/el.po
+++ b/addons/sale_order_dates/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-01 18:32+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index ba971f1a5f9..0b3493e8e90 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 12:58+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es_CL.po b/addons/sale_order_dates/i18n/es_CL.po
index 6d737bcd389..2a338e82cb9 100644
--- a/addons/sale_order_dates/i18n/es_CL.po
+++ b/addons/sale_order_dates/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-18 18:43+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es_CR.po b/addons/sale_order_dates/i18n/es_CR.po
index 23eb3a76cb8..4cb1f7ec3ba 100644
--- a/addons/sale_order_dates/i18n/es_CR.po
+++ b/addons/sale_order_dates/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-21 05:20+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/fi.po b/addons/sale_order_dates/i18n/fi.po
index 4f6f50cdc6c..8da0e60c98f 100644
--- a/addons/sale_order_dates/i18n/fi.po
+++ b/addons/sale_order_dates/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-09 05:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/fr.po b/addons/sale_order_dates/i18n/fr.po
index be62ae9991d..56e071039e6 100644
--- a/addons/sale_order_dates/i18n/fr.po
+++ b/addons/sale_order_dates/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 12:19+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/gl.po b/addons/sale_order_dates/i18n/gl.po
index 38d446753cc..c692cd9300b 100644
--- a/addons/sale_order_dates/i18n/gl.po
+++ b/addons/sale_order_dates/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-11 19:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/hr.po b/addons/sale_order_dates/i18n/hr.po
index 1dd36ab7390..459d6c00474 100644
--- a/addons/sale_order_dates/i18n/hr.po
+++ b/addons/sale_order_dates/i18n/hr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 19:34+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/hu.po b/addons/sale_order_dates/i18n/hu.po
index 77e220faa02..081fb1f31c5 100644
--- a/addons/sale_order_dates/i18n/hu.po
+++ b/addons/sale_order_dates/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-26 13:07+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/id.po b/addons/sale_order_dates/i18n/id.po
index 9cd2a093bb3..27cf1a4395e 100644
--- a/addons/sale_order_dates/i18n/id.po
+++ b/addons/sale_order_dates/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-11 08:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/it.po b/addons/sale_order_dates/i18n/it.po
index cb443ee2de4..38a05c6b910 100644
--- a/addons/sale_order_dates/i18n/it.po
+++ b/addons/sale_order_dates/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-15 15:30+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ja.po b/addons/sale_order_dates/i18n/ja.po
index e5b0545b9f3..27187b8ed65 100644
--- a/addons/sale_order_dates/i18n/ja.po
+++ b/addons/sale_order_dates/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 02:37+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/mn.po b/addons/sale_order_dates/i18n/mn.po
index 582c8121d35..52bf12adbc9 100644
--- a/addons/sale_order_dates/i18n/mn.po
+++ b/addons/sale_order_dates/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-03 09:14+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/nb.po b/addons/sale_order_dates/i18n/nb.po
index 9df7570379c..a4683b18a14 100644
--- a/addons/sale_order_dates/i18n/nb.po
+++ b/addons/sale_order_dates/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-23 10:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/nl.po b/addons/sale_order_dates/i18n/nl.po
index 163f1333d4d..ecd662080c5 100644
--- a/addons/sale_order_dates/i18n/nl.po
+++ b/addons/sale_order_dates/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 18:41+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pl.po b/addons/sale_order_dates/i18n/pl.po
index 88fc4d6f4ba..a9ae2dd83dc 100644
--- a/addons/sale_order_dates/i18n/pl.po
+++ b/addons/sale_order_dates/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-28 09:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pt.po b/addons/sale_order_dates/i18n/pt.po
index da73412b326..f1dcba65fb5 100644
--- a/addons/sale_order_dates/i18n/pt.po
+++ b/addons/sale_order_dates/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:41+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index 98691ede9b9..6c91fbbf7da 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 00:54+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/ro.po b/addons/sale_order_dates/i18n/ro.po
index 75a48cedf42..8d6ede6f131 100644
--- a/addons/sale_order_dates/i18n/ro.po
+++ b/addons/sale_order_dates/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-07 21:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ru.po b/addons/sale_order_dates/i18n/ru.po
index 6c7ba76a433..176a6b82367 100644
--- a/addons/sale_order_dates/i18n/ru.po
+++ b/addons/sale_order_dates/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-23 13:53+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sk.po b/addons/sale_order_dates/i18n/sk.po
index ee412285fda..8486a8889aa 100644
--- a/addons/sale_order_dates/i18n/sk.po
+++ b/addons/sale_order_dates/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-21 13:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sl.po b/addons/sale_order_dates/i18n/sl.po
index 0c7f4cb75b3..3cfffdf4cc1 100644
--- a/addons/sale_order_dates/i18n/sl.po
+++ b/addons/sale_order_dates/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-16 22:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sr@latin.po b/addons/sale_order_dates/i18n/sr@latin.po
index 77ccfe62ec9..06ab982383a 100644
--- a/addons/sale_order_dates/i18n/sr@latin.po
+++ b/addons/sale_order_dates/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-17 13:50+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sv.po b/addons/sale_order_dates/i18n/sv.po
index bc9b41afec4..62c4492032f 100644
--- a/addons/sale_order_dates/i18n/sv.po
+++ b/addons/sale_order_dates/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-29 16:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/tr.po b/addons/sale_order_dates/i18n/tr.po
index 3a408693fe8..f8c93baf2ba 100644
--- a/addons/sale_order_dates/i18n/tr.po
+++ b/addons/sale_order_dates/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:22+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_order_dates/i18n/zh_CN.po b/addons/sale_order_dates/i18n/zh_CN.po
index e5d7e514936..8def4e7773a 100644
--- a/addons/sale_order_dates/i18n/zh_CN.po
+++ b/addons/sale_order_dates/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:05+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_stock/i18n/ar.po b/addons/sale_stock/i18n/ar.po
index be96a6a4bf8..f307f265e36 100644
--- a/addons/sale_stock/i18n/ar.po
+++ b/addons/sale_stock/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "أمر التسليم"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "قائمة الالتقاط"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr "لكل سطر أمر مبيعات، يتمّ إنشاء أمر تحصيل يوفر المنتج المباع."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "سياسة الشحن"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -244,13 +222,13 @@ msgid "Delivery Lead Time"
 msgstr "الوقت اللازم للتسليم"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "وثيقة الانتقال إلى العميل."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -308,14 +286,13 @@ msgstr ""
 "والمعايير لترتيب المبيعات. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -340,6 +317,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -423,6 +409,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -436,7 +429,7 @@ msgid "Assign"
 msgstr "تعيين"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -457,9 +450,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "وثيقة الانتقال إلى العميل."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -496,11 +489,6 @@ msgstr "تمّ التسليم"
 msgid "Create Invoice"
 msgstr "إنشاء فاتورة"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -512,13 +500,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr "فاتورة الدفع المقدم للمبيعات"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr "يجب أولاً أن تلغي عمليات نقل المخزون المرتبطة بسطر أمر المبيعات هذا."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(غير ممكن)"
@@ -529,7 +517,7 @@ msgid "Incoterm"
 msgstr "مصطلحات تجارية مشتركة"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -582,7 +570,7 @@ msgid "Ignore Exception"
 msgstr "تجاهل الخلل"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/bg.po b/addons/sale_stock/i18n/bg.po
index 0ef75aca2dd..0381adccd06 100644
--- a/addons/sale_stock/i18n/bg.po
+++ b/addons/sale_stock/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:26+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Порчъка за доставка"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "Политика на доставки"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr "Назначаване"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr "Доставен/а/и"
 msgid "Create Invoice"
 msgstr "Създаване на фактура"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "не е налично/и"
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr "Инкотермс"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr "Игнорирай грешка"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/bs.po b/addons/sale_stock/i18n/bs.po
index fc9f4c2fc95..a3bdd9e8dcd 100644
--- a/addons/sale_stock/i18n/bs.po
+++ b/addons/sale_stock/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:16+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Otpremnica"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "Način otpreme"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr "Dodjeli"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Kreriaj Fakturu"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/ca.po b/addons/sale_stock/i18n/ca.po
index 4562c5dba10..f81319093cd 100644
--- a/addons/sale_stock/i18n/ca.po
+++ b/addons/sale_stock/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:21+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Ordre d'enviament"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Albarà"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -111,7 +98,7 @@ msgstr ""
 "subministrar el producte venut."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -122,7 +109,7 @@ msgid "Shipping Policy"
 msgstr "Política de facturació"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -155,23 +142,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -249,13 +227,13 @@ msgid "Delivery Lead Time"
 msgstr "Temps inicial d'entrega"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document del moviment al client."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -313,14 +291,13 @@ msgstr ""
 "productes segons les regles i els paràmetres de la comanda de venda. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -345,6 +322,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -430,6 +416,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -445,7 +438,7 @@ msgid "Assign"
 msgstr "Assigna"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -466,9 +459,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document del moviment al client."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -505,11 +498,6 @@ msgstr "Lliurat"
 msgid "Create Invoice"
 msgstr "Crea factura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -521,7 +509,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Vendes. Bestreta pagament factura"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -529,7 +517,7 @@ msgstr ""
 "comanda de venda."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -540,7 +528,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -593,7 +581,7 @@ msgid "Ignore Exception"
 msgstr "Ignora excepció"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/cs.po b/addons/sale_stock/i18n/cs.po
index 1eabb6ceccf..02769ff2a79 100644
--- a/addons/sale_stock/i18n/cs.po
+++ b/addons/sale_stock/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale_stock
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Objednávka doručení"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Seznam naskladnění"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -111,7 +98,7 @@ msgstr ""
 "zásobování prodaného výrobku."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -122,7 +109,7 @@ msgid "Shipping Policy"
 msgstr "Přepravní politika"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -155,23 +142,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -244,13 +222,13 @@ msgid "Delivery Lead Time"
 msgstr "Dodací čekací lhůta"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument přesunu k zákazníkovi."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -303,14 +281,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -335,6 +312,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -419,6 +405,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -432,7 +425,7 @@ msgid "Assign"
 msgstr "Přiřadit k"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -453,9 +446,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument přesunu k zákazníkovi."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -492,11 +485,6 @@ msgstr "Doručené množ."
 msgid "Create Invoice"
 msgstr "Vytvořit fakturu"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -508,7 +496,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Prodejní platba faktury dopředu"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -516,7 +504,7 @@ msgstr ""
 "příkazu."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(nedost.)"
@@ -527,7 +515,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -580,7 +568,7 @@ msgid "Ignore Exception"
 msgstr "Ignoravat výjimku"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/da.po b/addons/sale_stock/i18n/da.po
index abec177cb9c..26d23c8a35b 100644
--- a/addons/sale_stock/i18n/da.po
+++ b/addons/sale_stock/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -244,13 +222,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -305,14 +283,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -337,6 +314,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -419,6 +405,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -432,7 +425,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -453,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -492,11 +485,6 @@ msgstr "Leveret"
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -508,13 +496,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -525,7 +513,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -578,7 +566,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/de.po b/addons/sale_stock/i18n/de.po
index 54e2c907d41..d9df210c62c 100644
--- a/addons/sale_stock/i18n/de.po
+++ b/addons/sale_stock/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 17:07+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -27,24 +27,11 @@ msgstr ""
 "Um Ihren Verkäufern eine Abrechnung vom Lieferauftrag zu ermöglichen, wählen "
 "Sie \"abzurechnende Lieferungen\"aus."
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Warenauslieferung <em>%s</em> <b>wurde geplant</b> for %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Lieferschein"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr "Ermöglicht eine Differenzierung verschiedener Adressen für Aufträge."
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -52,7 +39,7 @@ msgid "Deliveries to Invoice"
 msgstr "Abzurechnende Lieferungen"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Lieferschein Info!: "
@@ -63,7 +50,7 @@ msgid "Pick List"
 msgstr "Kommissionsliste"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -118,7 +105,7 @@ msgstr ""
 "für den Einkauf des Produkts erstellt."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -129,7 +116,7 @@ msgid "Shipping Policy"
 msgstr "Abrechnungsbedingung"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -166,29 +153,14 @@ msgstr "Ungültige Aktion!"
 msgid "Project Timesheet"
 msgstr "Projekt Zeiterfassung"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-"Ermöglicht die Zuordnung einer Auslieferungsmethode zu Auftrag oder "
-"Lieferung.\n"
-"                        Sie können Ihre eigenen Frachtführer und "
-"Frachttarife definieren.\n"
-"                         Durch die Aktivierung wird das Modul delivery "
-"installiert."
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "Ermöglicht everschiedene Adressen für Auslieferung und Abrechnung "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfehler!"
@@ -268,16 +240,16 @@ msgstr "Die Standard Abrechnung ist"
 msgid "Delivery Lead Time"
 msgstr "Tage bis Auslieferung"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Beleg der Auslieferung an Kunden"
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Anzeige Auslieferauftrag"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "Rechnung von Auftrag"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -333,17 +305,16 @@ msgstr ""
 "Einkauf und die Fertigung sind dabei abhängig von den Einstellungen beim "
 "Verkaufsauftrag selbst. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "Erstelle Rechnungen durch  Auslieferungen"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "Auftrag wurde <b>ausgeliefert</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -368,6 +339,15 @@ msgstr ""
 "International Lieferbedingungen sind vordefinierte Konditionen und "
 "Bedingungen, die zumeist im internationalen Handel eingesetzt werden."
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -457,6 +437,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -472,7 +459,7 @@ msgid "Assign"
 msgstr "Annehmen"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Nicht genug auf Lager! "
@@ -497,9 +484,9 @@ msgstr ""
 "Kosten der Auslieferung machen."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Beleg der Auslieferung an Kunden"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Rechnung von Auftrag"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -538,11 +525,6 @@ msgstr "Ausgeliefert"
 msgid "Create Invoice"
 msgstr "Erzeuge Rechnung"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr "Kennzeichnung eines Auftrags durch Eigenschaften"
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -554,7 +536,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Anzahlungsrechnung"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -562,7 +544,7 @@ msgstr ""
 "abbrechen."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/v)"
@@ -573,7 +555,7 @@ msgid "Incoterm"
 msgstr "Lieferbedingung"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr "Es kann kein Auftrag erstellt werden!"
@@ -627,7 +609,7 @@ msgid "Ignore Exception"
 msgstr "Ignoriere den Ausnahmefehler"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/el.po b/addons/sale_stock/i18n/el.po
index e8341b92937..d2b8aab8876 100644
--- a/addons/sale_stock/i18n/el.po
+++ b/addons/sale_stock/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:18+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Εντολή Παράδοσης"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "Πολτική Μεταφορών"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -244,13 +222,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -305,14 +283,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -337,6 +314,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -419,6 +405,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -432,7 +425,7 @@ msgid "Assign"
 msgstr "Ανάθεση"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -453,8 +446,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -492,11 +485,6 @@ msgstr "Παραδόθηκε"
 msgid "Create Invoice"
 msgstr "Δημιουργία Τιμολογίου"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -508,7 +496,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -516,7 +504,7 @@ msgstr ""
 "π΄΄ωλησης."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(δεν υπάρχει)"
@@ -527,7 +515,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -580,7 +568,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/es.po b/addons/sale_stock/i18n/es.po
index d59dd9ed7ab..8a741e92b83 100644
--- a/addons/sale_stock/i18n/es.po
+++ b/addons/sale_stock/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-13 11:51+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:37+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -25,26 +25,11 @@ msgstr ""
 "Para permitir a su comercial realizar facturas desde las órdenes de entrega "
 "usando el menú 'Entregas a facturar'."
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Orden de entrega <em>%s</em> <b>planificada</b> para %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Orden de entrega"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-"Permitir especificar direcciones diferentes de entrega y de facturación en "
-"un pedido de venta."
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -52,7 +37,7 @@ msgid "Deliveries to Invoice"
 msgstr "Albaranes a facturar"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "¡Información del alabarán! "
@@ -63,7 +48,7 @@ msgid "Pick List"
 msgstr "Albarán"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -119,7 +104,7 @@ msgstr ""
 "suministrar el producto vendido."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -130,7 +115,7 @@ msgid "Shipping Policy"
 msgstr "Política de facturación"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -165,27 +150,14 @@ msgstr "¡Acción no válida!"
 msgid "Project Timesheet"
 msgstr "Parte de horas de proyectos"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-"Permite añadir métodos de entrega en los pedidos de venta y en las órdenes "
-"de entrega.\n"
-"Puede definir su propio transportista y tarifas de envío por precios.\n"
-"Esto instalará el módulo 'delivery'."
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "Permitir diferentes direcciones para la entrega y la factura "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -263,16 +235,16 @@ msgstr "El método de facturación por defecto es"
 msgid "Delivery Lead Time"
 msgstr "Tiempo inicial entrega"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento al cliente."
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Ver orden de entrega"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "Facturación basada en pedidos de venta"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -328,17 +300,16 @@ msgstr ""
 "producción de productos según las reglas y los parámetros del pedido de "
 "venta. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr "Permite etiquetar las líneas de pedido de venta con propiedades."
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "Generar facturas después y basadas en órdenes de entrega"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "Pedido <b>entregado</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -363,6 +334,19 @@ msgstr ""
 "Los términos de comercio internacional son una serie de condiciones "
 "comerciales usadas en las transacciones internacionales."
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+"Permite añadir métodos de entrega en los pedidos de venta y en las órdenes "
+"de entrega.\n"
+"Puede definir su propio transportista y las tarifas de envío.\n"
+"Esto instala el módulo 'delivery'."
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -455,6 +439,15 @@ msgstr ""
 "automáticamente tareas de proyecto de las líneas de abastecimiento.\n"
 "Esto instala el módulo 'project_timesheet' y 'project_mrp'."
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+"Permite especificar diversas direcciones de facturación y de entrega en los "
+"pedidos de venta."
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -470,7 +463,7 @@ msgid "Assign"
 msgstr "Asignar"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "¡No hay suficiente stock! "
@@ -496,9 +489,9 @@ msgstr ""
 "Esto puede tener impacto en el precio de envío."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento al cliente."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Facturación basada en pedidos de venta"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -538,11 +531,6 @@ msgstr "Entregado"
 msgid "Create Invoice"
 msgstr "Crear factura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr "Permitir etiquetar las líneas de pedido con propiedades."
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -554,7 +542,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Ventas. Anticipo pago factura"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -562,7 +550,7 @@ msgstr ""
 "pedido de venta."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -573,7 +561,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr "¡No se puede cancelar la línea del pedido de venta!"
@@ -628,7 +616,7 @@ msgid "Ignore Exception"
 msgstr "Ignorar excepción"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/et.po b/addons/sale_stock/i18n/et.po
index 973b4975868..2830ac3f253 100644
--- a/addons/sale_stock/i18n/et.po
+++ b/addons/sale_stock/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Tarnetellimus"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "Saatmispoliitika"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr "Omista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Loo arve"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr "Tarneklausel"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/fi.po b/addons/sale_stock/i18n/fi.po
index d801f1477f8..e07fab4926c 100644
--- a/addons/sale_stock/i18n/fi.po
+++ b/addons/sale_stock/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:57+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Toimitusmääräys"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Keräilytiedot ! : "
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Keräilylista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -111,7 +98,7 @@ msgstr ""
 "hankkimiseksi."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -122,7 +109,7 @@ msgid "Shipping Policy"
 msgstr "Toimituskäytäntö"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -155,23 +142,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -245,13 +223,13 @@ msgid "Delivery Lead Time"
 msgstr "Toimitusviive"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumentti siirrosta asiakkaalle"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -309,14 +287,13 @@ msgstr ""
 "ja sääntöjen mukaan. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -341,6 +318,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -425,6 +411,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -440,7 +433,7 @@ msgid "Assign"
 msgstr "Luovuta"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Ei tarpeeksi varastoa ! : "
@@ -461,9 +454,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumentti siirrosta asiakkaalle"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -500,11 +493,6 @@ msgstr "Toimitettu"
 msgid "Create Invoice"
 msgstr "Luo lasku"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -516,7 +504,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Myynnin ennakkomaksulasku"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -524,7 +512,7 @@ msgstr ""
 "varastosiirrot."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(ei saatavilla)"
@@ -535,7 +523,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -588,7 +576,7 @@ msgid "Ignore Exception"
 msgstr "Ohita poikkeus"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/fr.po b/addons/sale_stock/i18n/fr.po
index 8abfb2f2e18..e80c4b0e520 100644
--- a/addons/sale_stock/i18n/fr.po
+++ b/addons/sale_stock/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 15:02+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Bon de livraison"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Bon de transfert"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -110,7 +97,7 @@ msgstr ""
 "fournir l'article vendu."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -121,7 +108,7 @@ msgid "Shipping Policy"
 msgstr "Politique d'expédition"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -154,23 +141,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -249,13 +227,13 @@ msgid "Delivery Lead Time"
 msgstr "Délai de livraison"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document du mouvement vers le client"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -314,14 +292,13 @@ msgstr ""
 "paramètres des bons de commande. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -346,6 +323,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -432,6 +418,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -447,7 +440,7 @@ msgid "Assign"
 msgstr "Assigner"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Pas assez de stock ! "
@@ -468,9 +461,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document du mouvement vers le client"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -507,11 +500,6 @@ msgstr "Livré"
 msgid "Create Invoice"
 msgstr "Créer facture"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -523,7 +511,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Facture de paiement d'avance"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -531,7 +519,7 @@ msgstr ""
 "commandes."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -542,7 +530,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -595,7 +583,7 @@ msgid "Ignore Exception"
 msgstr "Ne pas traiter l'incident"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/gl.po b/addons/sale_stock/i18n/gl.po
index 988ec57de86..c9df03630c2 100644
--- a/addons/sale_stock/i18n/gl.po
+++ b/addons/sale_stock/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/hr.po b/addons/sale_stock/i18n/hr.po
index 1269d5d8969..0e9dfc0ad47 100644
--- a/addons/sale_stock/i18n/hr.po
+++ b/addons/sale_stock/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 20:44+0000\n"
 "Last-Translator: Bruno Bardić <bruno.bardic@procudo.hr>\n"
 "Language-Team: Vinteh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
@@ -26,26 +26,11 @@ msgstr ""
 "Omogućuje prodavaču izradu računa za otpremnice koristeći  izbornik "
 "\"Otpremnice u račune\""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Otpremnica<em>%s</em> <b>planirana</b> za %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Otpremnica"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-"Dozvoljava spcificiranje različite adrese za dostavu i za račun na prodajnom "
-"nalogu"
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -53,7 +38,7 @@ msgid "Deliveries to Invoice"
 msgstr "Otpremnice u fakturu"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -64,7 +49,7 @@ msgid "Pick List"
 msgstr "Lista odabira"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -117,7 +102,7 @@ msgstr ""
 "prodaje."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -128,7 +113,7 @@ msgid "Shipping Policy"
 msgstr "Pravila otpreme"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -161,23 +146,14 @@ msgstr "Nevažeća akcija"
 msgid "Project Timesheet"
 msgstr "Kontrolna kartica projekta"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "Dopusti različite adrese za dostavu i fakturiranje "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "Greška u konfiguraciji!"
@@ -253,16 +229,16 @@ msgstr "Zadana metoda fakturiranja je"
 msgid "Delivery Lead Time"
 msgstr "Glavno vrijeme dostave"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument premještaja kod kupca."
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Pregledaj otpremnicu"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "Računi bazirani na prodajnim nalozima"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -317,17 +293,16 @@ msgstr ""
 "faktura plaćena. Nalog pokreće nabavu i proizvodnju prema pravilima i "
 "parametrima iz prodajnog naloga. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "Generiraj račune poslije otpremnica"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "Narudžba <b>dostavljena</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -352,6 +327,15 @@ msgstr ""
 "Internacionalni komercijalni uvjeti su niz predefiniranih komercijalnih "
 "uvjeta koji se koriste za inozemne transakcije."
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -438,6 +422,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -452,7 +443,7 @@ msgid "Assign"
 msgstr "Dodijeli"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Nema dovoljno zaliha! : "
@@ -476,9 +467,9 @@ msgstr ""
 "bude dostupan. To može imati utjecaja na cijenu transporta."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument premještaja kod kupca."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Računi bazirani na prodajnim nalozima"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -517,11 +508,6 @@ msgstr "Dostavljeno"
 msgid "Create Invoice"
 msgstr "Napravi fakturu"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -533,14 +519,14 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Faktura za predujam"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 "Prvo morate otkazati sve skladišne dokumente vezane uz ovaj prodajni nalog."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -551,7 +537,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -604,7 +590,7 @@ msgid "Ignore Exception"
 msgstr "Zanemari iznimku"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/hu.po b/addons/sale_stock/i18n/hu.po
index c543ce09f1e..ad4c89f2b63 100644
--- a/addons/sale_stock/i18n/hu.po
+++ b/addons/sale_stock/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:01+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Kiszállítási megbízás"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Kiszedési lista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -110,7 +97,7 @@ msgstr ""
 "eladott termék előteremtésére."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -121,7 +108,7 @@ msgid "Shipping Policy"
 msgstr "Szállítási szabályok"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -154,23 +141,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -247,13 +225,13 @@ msgid "Delivery Lead Time"
 msgstr "Kiszállítás átfutási idő"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumentum a vevőnek történő mozgásról."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -313,14 +291,13 @@ msgstr ""
 "értékesítési megbízás paramétereinek megfelelően. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -345,6 +322,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -430,6 +416,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -445,7 +438,7 @@ msgid "Assign"
 msgstr "Hozzárendelés"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -466,9 +459,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumentum a vevőnek történő mozgásról."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -505,11 +498,6 @@ msgstr "Kiszállított"
 msgid "Create Invoice"
 msgstr "Számla készítése"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -521,7 +509,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Értékesítési Fizetési számla"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -529,7 +517,7 @@ msgstr ""
 "tartozó készletmozgásokat."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(nem alkalmazható)"
@@ -540,7 +528,7 @@ msgid "Incoterm"
 msgstr "Nemzetközi Kereskedelmi Feltételek"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -593,7 +581,7 @@ msgid "Ignore Exception"
 msgstr "Hiba figyelmen kívül hagyása"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/id.po b/addons/sale_stock/i18n/id.po
index 4d1ddb7e46f..13fe81af892 100644
--- a/addons/sale_stock/i18n/id.po
+++ b/addons/sale_stock/i18n/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:16+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Pengiriman Order"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Daftar Jemput"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -111,7 +98,7 @@ msgstr ""
 "produk yang terjual."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -122,7 +109,7 @@ msgid "Shipping Policy"
 msgstr "Kebijakan dalam pengiriman"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -155,23 +142,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -250,13 +228,13 @@ msgid "Delivery Lead Time"
 msgstr "Lama Waktu Pengiriman"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Berkas yang pindah pada rekanan"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -314,14 +292,13 @@ msgstr ""
 "produk sehubungan dengan  peraturan  dan parameter urutan's penjualan "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -346,6 +323,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -432,6 +418,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -447,7 +440,7 @@ msgid "Assign"
 msgstr "Menetapkan"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -468,9 +461,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Berkas yang pindah pada rekanan"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -507,11 +500,6 @@ msgstr "Sudah Terkirim"
 msgid "Create Invoice"
 msgstr "Buat Faktur"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -523,7 +511,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Pembayaran faktur penjualan"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -531,7 +519,7 @@ msgstr ""
 "penjualan."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "tidak tersedia"
@@ -542,7 +530,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -595,7 +583,7 @@ msgid "Ignore Exception"
 msgstr "Abaikan pengecualian"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/is.po b/addons/sale_stock/i18n/is.po
index 44f96a9079a..d5eedafab6f 100644
--- a/addons/sale_stock/i18n/is.po
+++ b/addons/sale_stock/i18n/is.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/it.po b/addons/sale_stock/i18n/it.po
index 51ee8996bc4..16996db9275 100644
--- a/addons/sale_stock/i18n/it.po
+++ b/addons/sale_stock/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-18 15:55+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 23:29+0000\n"
 "Last-Translator: Alessandro Camilli <a.camilli@yahoo.it>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
@@ -23,37 +23,22 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Ordine di consegna"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-"Consente nell'ordine di vendita di specificare un indirizzo di consegna "
-"diverso da quello di fatturazione"
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Consegne da fatturare"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
-msgstr ""
+msgstr "Informazione ordine di consegna!: "
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_packinglist0
@@ -61,7 +46,7 @@ msgid "Pick List"
 msgstr "Lista prelievo"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -78,7 +63,7 @@ msgstr "Documento del movimento verso area di uscita o verso area cliente."
 #. module: sale_stock
 #: field:sale.config.settings,group_multiple_shops:0
 msgid "Manage multiple shops"
-msgstr ""
+msgstr "Gestisci negozi multipli"
 
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_validate0
@@ -91,6 +76,7 @@ msgstr "Convalida"
 msgid ""
 "You must first cancel all delivery order(s) attached to this sales order."
 msgstr ""
+"Devi cancellare prima gli ordini di consegna collegati all'ordine di vendita"
 
 #. module: sale_stock
 #: model:process.transition,name:sale_stock.process_transition_saleprocurement0
@@ -112,10 +98,10 @@ msgstr ""
 "permettere la fornitura del prodotto venduto."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Errore!"
 
 #. module: sale_stock
 #: field:sale.order,picking_policy:0
@@ -123,7 +109,7 @@ msgid "Shipping Policy"
 msgstr "Politica di Spedizione"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -150,21 +136,12 @@ msgstr "Movimento di magazzino"
 #: code:addons/sale_stock/sale_stock.py:161
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Azione non valida!"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_project_timesheet:0
 msgid "Project Timesheet"
-msgstr ""
-
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
+msgstr "Tempi di Lavoro del progetto"
 
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
@@ -172,11 +149,11 @@ msgid "Allow a different address for delivery and invoicing "
 msgstr "Consente un diverso indirizzo di consegna e di fatturazione "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Errore di configurazione!"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_saleprocurement0
@@ -186,7 +163,7 @@ msgstr "Ordine di approvvigionamento"
 #. module: sale_stock
 #: selection:sale.config.settings,default_order_policy:0
 msgid "Invoice based on deliveries"
-msgstr ""
+msgstr "Fatturazione basata sulle consegne"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_order
@@ -197,7 +174,7 @@ msgstr "Ordine di vendita"
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Ordini di Consegna"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_order_line
@@ -244,7 +221,7 @@ msgstr "Forza Assegnazione"
 #. module: sale_stock
 #: field:sale.config.settings,default_order_policy:0
 msgid "The default invoicing method is"
-msgstr ""
+msgstr "La modalità di fatturazione di default è"
 
 #. module: sale_stock
 #: field:sale.order.line,delay:0
@@ -252,14 +229,14 @@ msgid "Delivery Lead Time"
 msgstr "Tempo di consegna"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimento per il cliente."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr ""
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr "Vedi ordine di consegna"
 
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
@@ -269,7 +246,7 @@ msgstr "Spostamenti Inventario"
 #. module: sale_stock
 #: view:sale.config.settings:0
 msgid "Default Options"
-msgstr ""
+msgstr "Opzioni Predefinite"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_project_mrp:0
@@ -316,26 +293,25 @@ msgstr ""
 "determina l'acquisto e la produzione delle merci in funzione delle regole e "
 "dei parametri dell'ordine di vendita. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr "Puoi etichettare le righe dell'ordine di vendita"
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
-msgstr ""
+msgstr "Aggiunge costi di spedizione"
 
 #. module: sale_stock
 #: view:sale.order:0
 msgid "days"
-msgstr ""
+msgstr "giorni"
 
 #. module: sale_stock
 #: field:sale.order.line,product_packaging:0
@@ -348,16 +324,31 @@ msgid ""
 "International Commercial Terms are a series of predefined commercial terms "
 "used in international transactions."
 msgstr ""
+"I termini commerciali internazionali sono una serie di termini commerciali "
+"predefiniti usati nelle transazioni internazionali"
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+"Consente di aggiungere metodi di consegna negli ordini di vendita e di "
+"consegna\n"
+"                Puoi definire vettore e consegne in base la prezzo\n"
+"                Questo installa il modulo consegne."
 
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
-msgstr ""
+msgstr "Evasione unica quando tutti i prodotti sono disponibili"
 
 #. module: sale_stock
 #: model:res.groups,name:sale_stock.group_invoice_deli_orders
 msgid "Enable Invoicing Delivery orders"
-msgstr ""
+msgstr "Abilita la fatturazione degli ordini di consegna"
 
 #. module: sale_stock
 #: field:res.company,security_lead:0
@@ -374,12 +365,14 @@ msgstr "Approviggionamento della merce venduta"
 msgid ""
 "Pick 'Deliver each product when available' if you allow partial delivery."
 msgstr ""
+"Scegli 'evadi ogni prodotto appena disponibile' per consentire la consegna "
+"parziale"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:206
 #, python-format
 msgid "Cannot cancel sales order!"
-msgstr ""
+msgstr "Non puoi cancellare gli ordini di vendita"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_shop
@@ -403,7 +396,7 @@ msgstr "Proprietà"
 #. module: sale_stock
 #: field:sale.config.settings,group_mrp_properties:0
 msgid "Product properties on order lines"
-msgstr ""
+msgstr "Proprietà del prodotto sulle righe d'ordine"
 
 #. module: sale_stock
 #: help:sale.config.settings,default_order_policy:0
@@ -435,6 +428,15 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+"Permette di specificare differenti indirizzi di consegna e fatturazione "
+"negli ordini di vendita"
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -450,10 +452,10 @@ msgid "Assign"
 msgstr "Assegna"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Non disponibile in magazzino!: "
 
 #. module: sale_stock
 #: help:sale.order.line,delay:0
@@ -461,6 +463,8 @@ msgid ""
 "Number of days between the order confirmation and the shipping of the "
 "products to the customer"
 msgstr ""
+"Numero di giorni tra la conferma dell'ordine e la consegna dei prodotti al "
+"cliente"
 
 #. module: sale_stock
 #: help:sale.config.settings,default_picking_policy:0
@@ -469,11 +473,14 @@ msgid ""
 "instead of delivering each product when it is available. This may have an "
 "impact on the shipping price."
 msgstr ""
+"Gli ordini di vendita per default saranno configurati per evadere tutti i "
+"prodotti in un'unica spedizione invece di spedire ogni prodotto appenda "
+"disponibile. Questo può avere conseguenze sul prezzo di vendita ."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimento per il cliente."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Fatturazione in base agli ordini di vendita"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -494,6 +501,8 @@ msgid ""
 "In order to delete a confirmed sales order, you must cancel it.\n"
 "To do so, you must first cancel related picking for delivery orders."
 msgstr ""
+"Prima di eliminare un ordine di vendita confermato, devi annullarlo.\n"
+"Per fare questo, devi prima cancellare le consegne collegate."
 
 #. module: sale_stock
 #: field:sale.order.line,number_packages:0
@@ -510,11 +519,6 @@ msgstr "Consegnato"
 msgid "Create Invoice"
 msgstr "Crea fattura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -526,7 +530,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Anticipo su fattura di vendita"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -534,7 +538,7 @@ msgstr ""
 "linea d'ordine."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/d)"
@@ -545,10 +549,10 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
-msgstr ""
+msgstr "Non puoi cancellare la riga dell'ordine di vendita"
 
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
@@ -563,7 +567,7 @@ msgstr "Basato sulle quantità spedite o ordinate."
 #. module: sale_stock
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "Evadi tutti i prodotti in un'unica spedizione"
 
 #. module: sale_stock
 #: field:sale.order,picking_ids:0
@@ -573,7 +577,7 @@ msgstr "Prelievi correlati"
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale_stock
 #: help:sale.order,picking_ids:0
@@ -581,6 +585,8 @@ msgid ""
 "This is a list of delivery orders that has been generated for this sales "
 "order."
 msgstr ""
+"Questa è una lista di ordini di consegna generati per questi ordini di "
+"vendita"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_saleorderprocurement0
@@ -598,7 +604,7 @@ msgid "Ignore Exception"
 msgstr "Ignora eccezione"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
@@ -611,12 +617,12 @@ msgstr ""
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Recreate Delivery Order"
-msgstr ""
+msgstr "Ricrea l'ordine di consegna"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_multiple_shops:0
 msgid "This allows to configure and use multiple shops."
-msgstr ""
+msgstr "Configurare e usare negozi multipli"
 
 #. module: sale_stock
 #: field:sale.order,picked_rate:0
@@ -626,7 +632,7 @@ msgstr "Prelevato"
 #. module: sale_stock
 #: selection:sale.order,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "Evade ogni prodotto quando è disponibile"
 
 #. module: sale_stock
 #: model:process.transition,name:sale_stock.process_transition_packing0
diff --git a/addons/sale_stock/i18n/ja.po b/addons/sale_stock/i18n/ja.po
index c952bb6829c..4cb0daa4272 100644
--- a/addons/sale_stock/i18n/ja.po
+++ b/addons/sale_stock/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "配達オーダー"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "集荷情報： "
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "集荷リスト"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -113,7 +100,7 @@ msgid ""
 msgstr "全ての受注オーダー行について、調達オーダーは販売された製品の供給を作成します。"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -124,7 +111,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -157,23 +144,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -248,13 +226,13 @@ msgid "Delivery Lead Time"
 msgstr "配達リードタイム"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "顧客への移動のドキュメント"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -309,14 +287,13 @@ msgstr ""
 "て制御します。 "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -341,6 +318,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -423,6 +409,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -436,7 +429,7 @@ msgid "Assign"
 msgstr "割当"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "在庫不足です： "
@@ -457,9 +450,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "顧客への移動のドキュメント"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -496,11 +489,6 @@ msgstr "配達済"
 msgid "Create Invoice"
 msgstr "請求書作成"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -512,13 +500,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr "受注前払請求書"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr "最初にこの受注オーダー行に付随する在庫移動をキャンセルする必要があります。"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "（利用不可）"
@@ -529,7 +517,7 @@ msgid "Incoterm"
 msgstr "インコターム"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -582,7 +570,7 @@ msgid "Ignore Exception"
 msgstr "例外を無視"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/ko.po b/addons/sale_stock/i18n/ko.po
index 2cea0ede54d..bb5ae62835c 100644
--- a/addons/sale_stock/i18n/ko.po
+++ b/addons/sale_stock/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:19+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "배송 주문"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "선적 정책"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr "할당"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "인보이스 생성"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr "인코텀"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/lo.po b/addons/sale_stock/i18n/lo.po
index 46b2df35a89..12d480cb63c 100644
--- a/addons/sale_stock/i18n/lo.po
+++ b/addons/sale_stock/i18n/lo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:17+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/lt.po b/addons/sale_stock/i18n/lt.po
index 6532f95914b..1b859986829 100644
--- a/addons/sale_stock/i18n/lt.po
+++ b/addons/sale_stock/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:59+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Pristatymo užsakymas"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "Dokumentų generavimo metodas"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr "Pristatymo laikotarpis"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr "Priskirti"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Sukurti sąskaitą faktūrą"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/lv.po b/addons/sale_stock/i18n/lv.po
index 4214f747ffd..3303c32ead9 100644
--- a/addons/sale_stock/i18n/lv.po
+++ b/addons/sale_stock/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Piegādes Pasūtījums"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "Piegādes noteikumi"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr "Piešķirt"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Izveidot Rēķinu"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr "Inkoterms"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/mn.po b/addons/sale_stock/i18n/mn.po
index 5ede7d1e6de..5536e068f90 100644
--- a/addons/sale_stock/i18n/mn.po
+++ b/addons/sale_stock/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Хүргэлтийн захиалга"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Бэлтгэх Мэдээлэл ! : "
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Хүргэлтийн баримт"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -115,7 +102,7 @@ msgstr ""
 "татахаар үүсгэгдэнэ."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -126,7 +113,7 @@ msgid "Shipping Policy"
 msgstr "Захиалга гүйцэтгэх арга"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -159,23 +146,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -252,13 +230,13 @@ msgid "Delivery Lead Time"
 msgstr "Хүргэлтийн урьтал хугацаа"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Захиалгачийн хөдөлгөөний баримт."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -317,14 +295,13 @@ msgstr ""
 "захиалгын тохиргооны параметрээс шалтаалуулан эхлүүлнэ. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -349,6 +326,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -435,6 +421,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -450,7 +443,7 @@ msgid "Assign"
 msgstr "Хувиарлах"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Бараа хүрэлцэхгүй байна ! : "
@@ -471,9 +464,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Захиалгачийн хөдөлгөөний баримт."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -510,11 +503,6 @@ msgstr "Хүргэгдсэн"
 msgid "Create Invoice"
 msgstr "Нэхэмжлэл үүсгэх"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -526,7 +514,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Борлуулалтын Урьдчилгаа Төлбөрийн Нэхэмжлэл"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -534,7 +522,7 @@ msgstr ""
 "цуцлах хэрэгтэй."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(б/гүй)"
@@ -545,7 +533,7 @@ msgid "Incoterm"
 msgstr "Худалдааны нөхцөл"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -598,7 +586,7 @@ msgid "Ignore Exception"
 msgstr "Онцгой тохиолдлыг үл хэрэгс"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/nb.po b/addons/sale_stock/i18n/nb.po
index 0c3c6df4133..c0bcfb0c67e 100644
--- a/addons/sale_stock/i18n/nb.po
+++ b/addons/sale_stock/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Leveringsordre"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Plukking informasjon "
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Plukkliste"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -115,7 +102,7 @@ msgstr ""
 "produktet."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -126,7 +113,7 @@ msgid "Shipping Policy"
 msgstr "Forsendelsesprinsipp"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -159,23 +146,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -252,13 +230,13 @@ msgid "Delivery Lead Time"
 msgstr "Leveringstid"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument av forsendelsen til kunden."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -316,14 +294,13 @@ msgstr ""
 "henhold til anskaffelsesregler og parametere på salgsordren. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -348,6 +325,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -432,6 +418,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -446,7 +439,7 @@ msgid "Assign"
 msgstr "Angi"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Ikke nok lager!: "
@@ -467,9 +460,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument av forsendelsen til kunden."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -506,11 +499,6 @@ msgstr "Levert"
 msgid "Create Invoice"
 msgstr "Lag faktura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -522,14 +510,14 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Forskuddsfaktura"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 "Du må først slette lagerbevegelser knyttet til denne salsgordrelinjen."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -540,7 +528,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -593,7 +581,7 @@ msgid "Ignore Exception"
 msgstr "Ignorer avvik"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/nl.po b/addons/sale_stock/i18n/nl.po
index 91ac05d23a6..cefbc46d22a 100644
--- a/addons/sale_stock/i18n/nl.po
+++ b/addons/sale_stock/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 14:43+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -26,26 +26,11 @@ msgstr ""
 "leveringen, gebruik makende van het menu \"Uitgaande leveringen te "
 "factureren\""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Uitgaande levering <em>%s</em> <b>ingeplant</b> voor %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Leveringsopdracht"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-"Geeft u de mogelijkheid om een afwijkend afleveradres en factuuradres te "
-"specificeren op een verkooporder."
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -53,7 +38,7 @@ msgid "Deliveries to Invoice"
 msgstr "Te factureren uitgaande leveringen"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Orderverzamel informatie!: "
@@ -64,7 +49,7 @@ msgid "Pick List"
 msgstr "Verzamellijst"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -121,7 +106,7 @@ msgstr ""
 "verkochte product te voorzien."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -132,7 +117,7 @@ msgid "Shipping Policy"
 msgstr "Behandelwijze"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -167,27 +152,14 @@ msgstr "Ongeldige actie!"
 msgid "Project Timesheet"
 msgstr "Project urenstaat"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-"Geeft u de mogelijkheid om een levenswijze te koppelen aan een verkooporder "
-"en uitgaande levering.\n"
-"                U kunt u eigen vervoerder en prijsstructuur maken.\n"
-"                Dit installeert de module 'delivery'"
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "Sta een afwijkend adres voor afleveren en facturering toe "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuratiefout!"
@@ -265,16 +237,16 @@ msgstr "De standaard factureer methode is"
 msgid "Delivery Lead Time"
 msgstr "Leveringstermijn"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document van de verplaatsing naar de klant."
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Bekijk uitgaande levering"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "Factuur gebaseerd op verkooporders"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -329,17 +301,16 @@ msgstr ""
 "bevestigd of als de factuur is betaald. Het stuurt de inkoop en productie "
 "aan van producten volgens de regels en volgens de verkooporder parameters. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "Maak facturen na en gebaseerd op uitgaande leveringen."
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "Order <b>geleverd</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -365,6 +336,15 @@ msgstr ""
 "voorgedefinieerde commerciële voorwaarden, welke worden gebruikt bij "
 "internationaal transport."
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -453,6 +433,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -468,7 +455,7 @@ msgid "Assign"
 msgstr "Toekennen"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Niet genoeg voorraad! "
@@ -494,9 +481,9 @@ msgstr ""
 "beschikbaar is. Dit kan namelijk een impact hebben op de leveringskosten."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document van de verplaatsing naar de klant."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Factuur gebaseerd op verkooporders"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -536,13 +523,6 @@ msgstr "Geleverd"
 msgid "Create Invoice"
 msgstr "Maak factuur"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-"Geeft u de mogelijkheid om een verkooporderregels te voorzien van een label "
-"met speciale kenmerken."
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -554,7 +534,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Verkoop vooruibetaling factuur"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -562,7 +542,7 @@ msgstr ""
 "verkooporderregel."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n.b.)"
@@ -573,7 +553,7 @@ msgid "Incoterm"
 msgstr "Leveringsvoorwaarden"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr "Het is niet mogelijk de verkooporder regel te annuleren!"
@@ -628,7 +608,7 @@ msgid "Ignore Exception"
 msgstr "Fouten negeren"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/oc.po b/addons/sale_stock/i18n/oc.po
index 5e0e2acdbb0..c611b1d6e95 100644
--- a/addons/sale_stock/i18n/oc.po
+++ b/addons/sale_stock/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/pl.po b/addons/sale_stock/i18n/pl.po
index de60691a95e..bbc877b27de 100644
--- a/addons/sale_stock/i18n/pl.po
+++ b/addons/sale_stock/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 22:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,25 +24,11 @@ msgid ""
 msgstr ""
 "Aby pozwolić sprzedawcy tworzyć faktury z wydań przez menu 'faktury z wydań'."
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Wydanie <em>%s</em> <b>zaplanowane</b> for %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Wydanie zewnętrzne"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-"Pozwala określić na zamówieniu sprzedaży różne adresy dostawy i fakturowania."
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -50,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr "Wydania do zafakturowania"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Informacja o pobraniu ! : "
@@ -61,7 +47,7 @@ msgid "Pick List"
 msgstr "Pobranie"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -116,7 +102,7 @@ msgstr ""
 "(zakupić lub wyprodukować) produkt."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -127,7 +113,7 @@ msgid "Shipping Policy"
 msgstr "Zasady wysyłki"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -162,26 +148,14 @@ msgstr "Niedozwolona akcja!"
 msgid "Project Timesheet"
 msgstr "Karta czasu pracy projektu"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-"Pozwala dodać metody dostaw do zamówień sprzedaży i wydań.\n"
-"                Możesz zdefiniować przewoźnika i siatkę cen dostawy.\n"
-"                To instaluje moduł delivery."
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "Pozwól na różne adresy dostawy i faktury "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "Błąd konfiguracji!"
@@ -257,16 +231,16 @@ msgstr "Domyślna metoda fakturowania jest"
 msgid "Delivery Lead Time"
 msgstr "Czas dostawy"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument przesunięcia do klienta"
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Pokaż wydanie zewnętrzne"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "Faktura na podstawie zamówienia sprzedaży"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -322,17 +296,16 @@ msgstr ""
 "zakupu lub produkcji na podstawie reguł w produkcie i w zamówieniu "
 "sprzedaży. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "Generuj faktury po wydaniu i na jego podstawie"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "Zamówienie <b>wydano</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -356,6 +329,15 @@ msgid ""
 msgstr ""
 "Międzynarodowe warunki handlowe są zestawem predefiniowanych procedur."
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -443,6 +425,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -458,7 +447,7 @@ msgid "Assign"
 msgstr "Przypisz"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Brak zapasu ! : "
@@ -482,9 +471,9 @@ msgstr ""
 "wpływ na cenę dostawy."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument przesunięcia do klienta"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Faktura na podstawie zamówienia sprzedaży"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -523,11 +512,6 @@ msgstr "Dostarczone"
 msgid "Create Invoice"
 msgstr "Utwórz fakturę"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr "Pozwala stosować włąściwości do pozycji"
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -539,7 +523,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Zaliczkowa faktura sprzedaży"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -547,7 +531,7 @@ msgstr ""
 "zamówienia sprzedaży."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(nd.)"
@@ -558,7 +542,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr "Nie można anulować pozycji zamówienia sprzedaży"
@@ -611,7 +595,7 @@ msgid "Ignore Exception"
 msgstr "Ignoruj wyjątek"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/pt.po b/addons/sale_stock/i18n/pt.po
index 245db5be14c..01ff2c71b48 100644
--- a/addons/sale_stock/i18n/pt.po
+++ b/addons/sale_stock/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-13 15:26+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Ordem de Entrega"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr "Entregas a faturar"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Informação Picking! : "
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Escolha Lista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -114,7 +101,7 @@ msgstr ""
 "fornecer o artigo vendido."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -125,7 +112,7 @@ msgid "Shipping Policy"
 msgstr "Política de expedição"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -158,23 +145,14 @@ msgstr "Ação inválida!"
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de configuração!"
@@ -252,16 +230,16 @@ msgstr ""
 msgid "Delivery Lead Time"
 msgstr "Prazo de entrega da lead"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento do movimento para o cliente."
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Ver ordem de entrega"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -317,14 +295,13 @@ msgstr ""
 "artigos em relação às regras e aos parâmetros da ordem de vendas. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -349,6 +326,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -433,6 +419,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -448,7 +441,7 @@ msgid "Assign"
 msgstr "Atribuir"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Sem stock suficiente ! : "
@@ -469,9 +462,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento do movimento para o cliente."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -508,11 +501,6 @@ msgstr "Entregue"
 msgid "Create Invoice"
 msgstr "Criar Fatura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -524,7 +512,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Fatura de Pagamento de Adiantamento das vendas"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -532,7 +520,7 @@ msgstr ""
 "ordem de venda."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/d)"
@@ -543,7 +531,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -596,7 +584,7 @@ msgid "Ignore Exception"
 msgstr "Ignorar Excepção"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/pt_BR.po b/addons/sale_stock/i18n/pt_BR.po
index 717f96bdfa9..8e7cdb870b0 100644
--- a/addons/sale_stock/i18n/pt_BR.po
+++ b/addons/sale_stock/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-18 01:14+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 18:04+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
@@ -27,26 +27,11 @@ msgstr ""
 "Para permitir que o vendedor gere faturas nas ordens de entrega usando o "
 "menu 'Entregas para faturar'."
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "Ordem de Entrega <em>%s</em> <b>agendada</b> para %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Ordem de Entrega"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-"Permite especificar endereços de entrega e fatura diferentes em um pedido de "
-"venda."
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -54,7 +39,7 @@ msgid "Deliveries to Invoice"
 msgstr "Entregas para Faturar"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Informações de Separação! : "
@@ -65,7 +50,7 @@ msgid "Pick List"
 msgstr "Lista de Separação"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -122,7 +107,7 @@ msgstr ""
 "suprir o produto vendido."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -133,7 +118,7 @@ msgid "Shipping Policy"
 msgstr "Política de Embarque"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -168,28 +153,14 @@ msgstr "Ação Inválida!"
 msgid "Project Timesheet"
 msgstr "Planilha de Horas do Projeto"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-"Permite que você adicione métodos de entrega nos pedidos de venda e ordens "
-"de entrega.\n"
-"                 Você pode definir sua própria transportadora e redes de "
-"distribuição para os preços.\n"
-"                 Isso instala o módulo delivery."
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "Permite um endereço diferente para entrega e fatura "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
@@ -267,16 +238,16 @@ msgstr "O método padrão de fatura é"
 msgid "Delivery Lead Time"
 msgstr "Prazo de Entrega"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento de entrega para o cliente."
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "Ver Ordem de Entrega"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "Fatura baseada em pedidos de venda"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -331,17 +302,16 @@ msgstr ""
 "é confirmado ou a fatura é paga. Isto direciona a compra e a produção de "
 "produtos de acordo com as regras e os parâmetros do pedido de venda. "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr "Te permite marcar linhas do pedido de vendas com propriedades."
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "Gerar faturas após e baseada em ordens de entrega"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "Pedido <b>entregue</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -366,6 +336,20 @@ msgstr ""
 "International Commercial Terms são uma série de termos comerciais pré-"
 "definidos utilizados em transações internacionais."
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+"Permite que você adicione métodos de entrega em pedidos de venda e ordens de "
+"entrega.\n"
+"                 Você pode definir seu próprio portador e redes de "
+"distribuição para os preços.\n"
+"                 Isso instala o módulo delivery."
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -462,6 +446,15 @@ msgstr ""
 "aquisição.\n"
 "                 Isso instala os módulos project_timesheet e project_mrp."
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+"Permite especificar endereços de entrega e fatura diferentes em um pedido de "
+"venda."
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -477,7 +470,7 @@ msgid "Assign"
 msgstr "Designar"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Sem Estoque Suficiente! : "
@@ -503,9 +496,9 @@ msgstr ""
 "impactar no valor da entrega."
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento de entrega para o cliente."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Fatura baseada em pedidos de venda"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -545,11 +538,6 @@ msgstr "Entregue"
 msgid "Create Invoice"
 msgstr "Criar Fatura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr "Permite você marcar linhas do pedido de vendas com propriedades."
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -561,7 +549,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Fatura de Vendas com Pagamento Antecipado"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -569,7 +557,7 @@ msgstr ""
 "esta linha de pedido de venda."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -580,7 +568,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr "Não é possível cancelar a linha do pedido de vendas!"
@@ -635,7 +623,7 @@ msgid "Ignore Exception"
 msgstr "Ignorar Excessão"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/ro.po b/addons/sale_stock/i18n/ro.po
index 793de137bba..a9b1cc3a365 100644
--- a/addons/sale_stock/i18n/ro.po
+++ b/addons/sale_stock/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:56+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Comanda de livrare"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Informatii la ridicare !: "
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Lista de ridicare"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -114,7 +101,7 @@ msgstr ""
 "aprovizionare pentru a furniza produsul vandut."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -125,7 +112,7 @@ msgid "Shipping Policy"
 msgstr "Politica de expediere"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -160,23 +147,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -254,13 +232,13 @@ msgid "Delivery Lead Time"
 msgstr "Timp de livrare"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documentul miscarii catre client."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -318,14 +296,13 @@ msgstr ""
 "si productia produselor dupa norme si la parametrii comenzii de vanzare. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -350,6 +327,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -435,6 +421,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -450,7 +443,7 @@ msgid "Assign"
 msgstr "Atribuie"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Stoc insuficient ! : "
@@ -471,9 +464,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documentul miscarii catre client."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -510,11 +503,6 @@ msgstr "Livrat"
 msgid "Create Invoice"
 msgstr "Creeaza Factura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -526,7 +514,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Factura Vanzare cu Plata in Avans"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -534,7 +522,7 @@ msgstr ""
 "comenzii de vanzare."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -545,7 +533,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -598,7 +586,7 @@ msgid "Ignore Exception"
 msgstr "Ignora exceptia"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/ru.po b/addons/sale_stock/i18n/ru.po
index 8a667a476fd..f7aba33bb65 100644
--- a/addons/sale_stock/i18n/ru.po
+++ b/addons/sale_stock/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Заказ на доставку"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Информация по комплектованию ! : "
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Комплектовочный лист"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -110,7 +97,7 @@ msgstr ""
 "поставки проданных ТМЦ."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -121,7 +108,7 @@ msgid "Shipping Policy"
 msgstr "Политика доставки"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -155,23 +142,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -249,13 +227,13 @@ msgid "Delivery Lead Time"
 msgstr "Время выполнения доставки"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Документ перемещения к заказчику."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -313,14 +291,13 @@ msgstr ""
 "по правилам и параметрам заказа на продажу. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -345,6 +322,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -430,6 +416,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -445,7 +438,7 @@ msgid "Assign"
 msgstr "Назначить"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Не достаточно запасов ! : "
@@ -466,9 +459,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Документ перемещения к заказчику."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -505,11 +498,6 @@ msgstr "Доставлено"
 msgid "Create Invoice"
 msgstr "Создать счет"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -521,7 +509,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Счет на авансовый платеж"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -529,7 +517,7 @@ msgstr ""
 "на продажу."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(нет)"
@@ -540,7 +528,7 @@ msgid "Incoterm"
 msgstr "Инкотерм"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -593,7 +581,7 @@ msgid "Ignore Exception"
 msgstr "Игнорировать исключение"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/sk.po b/addons/sale_stock/i18n/sk.po
index 99711903f50..71ce4460e9d 100644
--- a/addons/sale_stock/i18n/sk.po
+++ b/addons/sale_stock/i18n/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:17+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "Podmienky dopravy"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -417,6 +403,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -430,7 +423,7 @@ msgid "Assign"
 msgstr "Priradiť"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -451,8 +444,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -490,11 +483,6 @@ msgstr "Dodané"
 msgid "Create Invoice"
 msgstr "Vytvoriť faktúru"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -506,13 +494,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Zálohová faktúra predaja"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -523,7 +511,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -576,7 +564,7 @@ msgid "Ignore Exception"
 msgstr "Ignorovať výnimku"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/sl.po b/addons/sale_stock/i18n/sl.po
index 68fc78f4b18..46f0845006b 100644
--- a/addons/sale_stock/i18n/sl.po
+++ b/addons/sale_stock/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:24+0000\n"
 "Last-Translator: ERP Basing <erp@basing.si>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Nalog za dostavo"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Izberi seznam"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr "Pri vsaki prodaju ustvariti naročilo za dobavo prodajnih artiklov"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "Pravilnik odpreme"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr "Čas do Dobave"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument premika straniki"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -303,14 +281,13 @@ msgstr ""
 "pravila in parametre iz naročilnice. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -335,6 +312,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -417,6 +403,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -430,7 +423,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -451,9 +444,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument premika straniki"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -490,11 +483,6 @@ msgstr "Dostavljeno"
 msgid "Create Invoice"
 msgstr "Ustvari račun"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -506,13 +494,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Prodaja Predplačilo Računa"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr "Najprej morate preklicati premik zaloge priloženo k tej prodaji."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -523,7 +511,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -576,7 +564,7 @@ msgid "Ignore Exception"
 msgstr "Prezri Izjemo"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/sq.po b/addons/sale_stock/i18n/sq.po
index b2b5e2342e7..173840d5be1 100644
--- a/addons/sale_stock/i18n/sq.po
+++ b/addons/sale_stock/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/sr.po b/addons/sale_stock/i18n/sr.po
index 6c2d3d46220..d8dd4cbffb2 100644
--- a/addons/sale_stock/i18n/sr.po
+++ b/addons/sale_stock/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:07+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Nalog za isporuku"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Izborna Lista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "Opcije transporta"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -243,13 +221,13 @@ msgid "Delivery Lead Time"
 msgstr "Vreme trajanja Isporuke"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumenat za pomeriti ka klijentu."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -304,14 +282,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -336,6 +313,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -419,6 +405,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -432,7 +425,7 @@ msgid "Assign"
 msgstr "Dodeljivanje"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -453,9 +446,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumenat za pomeriti ka klijentu."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -492,11 +485,6 @@ msgstr "Isporuceno"
 msgid "Create Invoice"
 msgstr "Kreiranje računa"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -508,13 +496,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -525,7 +513,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -578,7 +566,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/sr@latin.po b/addons/sale_stock/i18n/sr@latin.po
index 282bc85b327..50cee011db2 100644
--- a/addons/sale_stock/i18n/sr@latin.po
+++ b/addons/sale_stock/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:13+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Nalog za isporuku"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr "Izborna Lista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "Opcije transporta"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -243,13 +221,13 @@ msgid "Delivery Lead Time"
 msgstr "Vreme trajanja Isporuke"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumenat za pomeriti ka klijentu."
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -304,14 +282,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -336,6 +313,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -419,6 +405,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -432,7 +425,7 @@ msgid "Assign"
 msgstr "Dodeljivanje"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -453,9 +446,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumenat za pomeriti ka klijentu."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -492,11 +485,6 @@ msgstr "Isporuceno"
 msgid "Create Invoice"
 msgstr "Kreiranje računa"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -508,13 +496,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -525,7 +513,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -578,7 +566,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/sv.po b/addons/sale_stock/i18n/sv.po
index c2b05125a8c..a6c2653d186 100644
--- a/addons/sale_stock/i18n/sv.po
+++ b/addons/sale_stock/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Leveransorder"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Plockinformation!: "
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Plocklista"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -115,7 +102,7 @@ msgstr ""
 "produkten."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -126,7 +113,7 @@ msgid "Shipping Policy"
 msgstr "Leveransvillkor"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -159,23 +146,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -254,13 +232,13 @@ msgid "Delivery Lead Time"
 msgstr "Delivery Lead Time"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumentation av bokföringstransaktionen till kunden"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -318,14 +296,13 @@ msgstr ""
 "inköpsorder eller produktionsunderlag. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -350,6 +327,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -435,6 +421,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -448,7 +441,7 @@ msgid "Assign"
 msgstr "Tilldela"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Ej tillräckligt i lager!: "
@@ -469,9 +462,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumentation av bokföringstransaktionen till kunden"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -508,11 +501,6 @@ msgstr "Levererad"
 msgid "Create Invoice"
 msgstr "Skapa faktura"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -524,14 +512,14 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Försäljning, avancerad fakturabetalning"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 "Du måste först avsluta lagerförändring som hör ihop med denna orderrad."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -542,7 +530,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -595,7 +583,7 @@ msgid "Ignore Exception"
 msgstr "Bortse från undantag"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/th.po b/addons/sale_stock/i18n/th.po
index 32b1fe00d70..663182af2d4 100644
--- a/addons/sale_stock/i18n/th.po
+++ b/addons/sale_stock/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:04+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "ใบส่งสินค้า"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "สร้างใบแจ้งหนี้"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/tlh.po b/addons/sale_stock/i18n/tlh.po
index 0114828bfee..e5e6fbd5cd6 100644
--- a/addons/sale_stock/i18n/tlh.po
+++ b/addons/sale_stock/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:52+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
index 601de8c4c0c..cfee00ed0e8 100644
--- a/addons/sale_stock/i18n/tr.po
+++ b/addons/sale_stock/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Teslimat Emri"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "Toplama Bilgisi ! : "
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "Seçim Listesi"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -114,7 +101,7 @@ msgstr ""
 "tedarik/satınalma siparişi hazırlanır."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -125,7 +112,7 @@ msgid "Shipping Policy"
 msgstr "Sevkiyat Politikası"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -158,23 +145,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -253,13 +231,13 @@ msgid "Delivery Lead Time"
 msgstr "Teslimat Süresi"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
-msgstr ""
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Müşteriye işlenen hareket belgesi"
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -317,14 +295,13 @@ msgstr ""
 "göz önünde bulundurarak satın alma ve ürünlerin üretimini yönetir. "
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -349,6 +326,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -435,6 +421,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -448,7 +441,7 @@ msgid "Assign"
 msgstr "Ata"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "Yeterli stok yok !: "
@@ -469,9 +462,9 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Müşteriye işlenen hareket belgesi"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -508,11 +501,6 @@ msgstr "Sevk edildi"
 msgid "Create Invoice"
 msgstr "Fatura Oluştur"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -524,7 +512,7 @@ msgid "Sales Advance Payment Invoice"
 msgstr "Peşin Ödemeli Satış Faturası"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
@@ -532,7 +520,7 @@ msgstr ""
 "etmelisiniz."
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "Uygulanabilir değil"
@@ -543,7 +531,7 @@ msgid "Incoterm"
 msgstr "Teslim Sekli"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -596,7 +584,7 @@ msgid "Ignore Exception"
 msgstr "İstisnayı görmezden gel"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/uk.po b/addons/sale_stock/i18n/uk.po
index 9f74400ad52..a09377d8175 100644
--- a/addons/sale_stock/i18n/uk.po
+++ b/addons/sale_stock/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Доставити Замовлення"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "Політика постачання"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "Створити інвойс"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/vi.po b/addons/sale_stock/i18n/vi.po
index 18c4c048b55..1dbcb4fc320 100644
--- a/addons/sale_stock/i18n/vi.po
+++ b/addons/sale_stock/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 14:07+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,24 +24,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "Yêu cầu Giao hàng"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -49,7 +36,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -60,7 +47,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -109,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -120,7 +107,7 @@ msgid "Shipping Policy"
 msgstr "Chính sách vận chuyển"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -153,23 +140,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -242,13 +220,13 @@ msgid "Delivery Lead Time"
 msgstr "Thời gian giao hàng"
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -301,14 +279,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -333,6 +310,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -415,6 +401,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -428,7 +421,7 @@ msgid "Assign"
 msgstr "Chỉ định"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -449,8 +442,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -488,11 +481,6 @@ msgstr "Đã giao hàng"
 msgid "Create Invoice"
 msgstr "Tạo hóa đơn"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -504,13 +492,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -521,7 +509,7 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -574,7 +562,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/zh_CN.po b/addons/sale_stock/i18n/zh_CN.po
index a8f453219c6..037b1a3b2d3 100644
--- a/addons/sale_stock/i18n/zh_CN.po
+++ b/addons/sale_stock/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-26 15:38+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr "允许销售员 使用菜单“按已交付数量开票”  根据发运单开发票"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr "发运单 <em>%s</em> <b>被排程</b> 为 %s."
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "送货单"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr "在销售订单，你可以指定不一样的发运和开票地址。"
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr "装箱信息！： "
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr "装箱单"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -110,7 +97,7 @@ msgid ""
 msgstr "对每个销售订单明细，将会创建对应的采购订单来供应销售的产品。"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -121,7 +108,7 @@ msgid "Shipping Policy"
 msgstr "运送方式"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -154,23 +141,14 @@ msgstr "非法的动作"
 msgid "Project Timesheet"
 msgstr "项目时间表"
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr "允许你在销售订单和提货单添加运输方法。"
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr "允许不一样的发运和开票地址。 "
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
@@ -242,16 +220,16 @@ msgstr "默认的开票方法"
 msgid "Delivery Lead Time"
 msgstr "送货提前期"
 
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "转移给客户的单据"
+
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
 msgstr "发运单视图"
 
-#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
-msgstr "基于销售单的发票"
-
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -301,17 +279,16 @@ msgid ""
 "parameters. "
 msgstr "需求会在销售订单确认或发票付款后自动生成。它是采购和生产则根据有关的规则和售订订单参数而得出的。 "
 
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
 msgstr "基于发运单生产发票"
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
-msgstr "订单 <b>已经交付</b>."
-
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
@@ -334,6 +311,15 @@ msgid ""
 "used in international transactions."
 msgstr "国际商业条款是一系列预定义的用于国际贸易的商业条款。"
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -418,6 +404,13 @@ msgstr ""
 "让你为特定时间和人员 传输项目管理的任务条目到工时单，进行创建、编辑和删除之一的操作。并自动从需求单明细创建项目任务。\n"
 "为此要安装模块project_timesheet 和project_mrp。"
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -431,7 +424,7 @@ msgid "Assign"
 msgstr "指定"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr "没足够的库存！： "
@@ -452,9 +445,9 @@ msgid ""
 msgstr "销售订单默认被配置为  当每个产品可用后，一次性发运所有的产品。这可能会影响运输价格。"
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "转移给客户的单据"
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "基于销售单的发票"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -493,11 +486,6 @@ msgstr "已送货"
 msgid "Create Invoice"
 msgstr "生成发票"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr "允许你用 属性 来标记销售订单 明细"
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -509,13 +497,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr "销售预付款发票"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr "你必须先取消所有属于此销售订单明细上的库存调拨。"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr "(n/a)"
@@ -526,7 +514,7 @@ msgid "Incoterm"
 msgstr "贸易术语"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr "不能取消销售订单明细"
@@ -579,7 +567,7 @@ msgid "Ignore Exception"
 msgstr "忽略异常"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/sale_stock/i18n/zh_TW.po b/addons/sale_stock/i18n/zh_TW.po
index b1f46bd43f5..049cc379cdc 100644
--- a/addons/sale_stock/i18n/zh_TW.po
+++ b/addons/sale_stock/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-21 13:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -23,24 +23,11 @@ msgid ""
 "'Deliveries to Invoice'."
 msgstr ""
 
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
 msgstr "交貨單"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-msgid ""
-"Allows you to specify different delivery and invoice addresses on a sale "
-"order."
-msgstr ""
-
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
@@ -48,7 +35,7 @@ msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
 #, python-format
 msgid "Picking Information ! : "
 msgstr ""
@@ -59,7 +46,7 @@ msgid "Pick List"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
 #, python-format
 msgid ""
 "You selected a quantity of %d Units.\n"
@@ -108,7 +95,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -119,7 +106,7 @@ msgid "Shipping Policy"
 msgstr "貨運規則"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
 #, python-format
 msgid ""
 "You cannot make an advance on a sales order                      that is "
@@ -152,23 +139,14 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid ""
-"Allows you to add delivery methods in sale orders and delivery orders.\n"
-"                You can define your own carrier and delivery grids for "
-"prices.\n"
-"                This installs the module delivery."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -241,13 +219,13 @@ msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
 msgstr ""
 
 #. module: sale_stock
@@ -300,14 +278,13 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
 msgstr ""
 
 #. module: sale_stock
@@ -332,6 +309,15 @@ msgid ""
 "used in international transactions."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
 msgid "Deliver all at once when all products are available."
@@ -414,6 +400,13 @@ msgid ""
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
 
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
 msgid ""
@@ -427,7 +420,7 @@ msgid "Assign"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
 #, python-format
 msgid "Not enough stock ! : "
 msgstr ""
@@ -448,8 +441,8 @@ msgid ""
 msgstr ""
 
 #. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
 msgstr ""
 
 #. module: sale_stock
@@ -487,11 +480,6 @@ msgstr ""
 msgid "Create Invoice"
 msgstr "開立發票"
 
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
@@ -503,13 +491,13 @@ msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -520,7 +508,7 @@ msgid "Incoterm"
 msgstr "國際商業用語"
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
 msgstr ""
@@ -573,7 +561,7 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
 #, python-format
 msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
diff --git a/addons/share/i18n/ar.po b/addons/share/i18n/ar.po
index 871fe2ae140..aa228275657 100644
--- a/addons/share/i18n/ar.po
+++ b/addons/share/i18n/ar.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-08 15:06+0000\n"
 "Last-Translator: almodhesh <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "عنوان المشاركة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "مشاركة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,7 +104,7 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
@@ -112,19 +112,26 @@ msgstr ""
 "لعرضها.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(عدل)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -136,8 +143,8 @@ msgid "Share URL"
 msgstr "مشاركة URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "هذا هو اعتمادك للوصول إلى هذه المناطق المحمية\n"
@@ -148,18 +155,21 @@ msgid "Access info"
 msgstr "معلومات الولوج"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "حصة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(تكرار للحصول على أذونات مشاركة تعديل)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -176,14 +186,14 @@ msgid "Next"
 msgstr "التالي"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "اسم المستخدم"
@@ -224,8 +234,8 @@ msgid "Share Group"
 msgstr "مشاركة المجموعة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "لا بدّ من ذكر عنوان بريد إلكتروني"
@@ -256,8 +266,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -291,13 +301,13 @@ msgstr "مجهول"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -319,7 +329,7 @@ msgid ""
 msgstr "الإجراء الذي يفتح شاشة تحتوي على البيانات التي ترغب في مشاركتها."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(نسخة من المشاركة)"
@@ -335,7 +345,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr "عنوان المشاركة (تعرض للمستخدمين كقائمة واسم مختصر)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -359,7 +369,7 @@ msgid "User"
 msgstr "مستخدم"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -373,8 +383,8 @@ msgid "Use this link"
 msgstr "استخدم هذا الرابط"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "قاعدة البيانات"
@@ -407,13 +417,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "نسخ الوصول للمشاركة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -429,7 +439,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -452,7 +462,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "استخدم نوع المستخدم الذي تود مشاركة المعلومات معه"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -494,7 +504,7 @@ msgid "Share Wizard"
 msgstr "معالج المشاركة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -508,7 +518,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -521,7 +531,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -539,8 +549,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -564,8 +574,8 @@ msgid "Personal Message"
 msgstr "رسالة شخصيّة"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/bg.po b/addons/share/i18n/bg.po
index 5407760b72f..ae5b2fdd767 100644
--- a/addons/share/i18n/bg.po
+++ b/addons/share/i18n/bg.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-06 19:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Споделяне"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Споделяне"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "Следващ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Потребителско Име"
@@ -221,8 +231,8 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -253,8 +263,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -284,13 +294,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -312,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -328,7 +338,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -352,7 +362,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -366,8 +376,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "База данни"
@@ -400,13 +410,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -422,7 +432,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -445,7 +455,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -487,7 +497,7 @@ msgid "Share Wizard"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -501,7 +511,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -514,7 +524,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -532,8 +542,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -557,8 +567,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index d30bca09bf2..4d14566bfb9 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/i18n/ca.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-17 22:38+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Compartits"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Filtre de compartició creat per l'usuari %s (%s) per al grup %s"
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr "Comparteix URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr "Informació d'accés"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Comparteix"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "Següent"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nom d'usuari"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "Grup compartit"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Correu electrònic requerit"
@@ -257,8 +267,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -288,13 +298,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -319,7 +329,7 @@ msgstr ""
 "L'acció que obre la pantalla que conté la informació que voleu compartir."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Còpia per compartir)"
@@ -335,7 +345,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -360,7 +370,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -377,8 +387,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Base de dades"
@@ -411,13 +421,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Accés copiat per a compartició"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -433,7 +443,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -457,7 +467,7 @@ msgstr ""
 "Seleccioneu el tipus d'usuaris amb els quals li agradaria compartir dades."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -501,7 +511,7 @@ msgid "Share Wizard"
 msgstr "Assistent de compartició"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -515,7 +525,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -528,7 +538,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -546,8 +556,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -571,8 +581,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/cs.po b/addons/share/i18n/cs.po
index 3aaa753c2dd..85d2b03aa0c 100644
--- a/addons/share/i18n/cs.po
+++ b/addons/share/i18n/cs.po
@@ -7,25 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-09-05 17:16+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -68,8 +68,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -84,8 +84,8 @@ msgid "Sharing"
 msgstr "Sdílení"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -105,25 +105,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Filtr sdílení vytvořený uživatelem %s (%s) pro skupinu %s"
@@ -135,8 +142,8 @@ msgid "Share URL"
 msgstr "Sdílet URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -147,18 +154,21 @@ msgid "Access info"
 msgstr "Přístupové informace"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Sdílení"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -175,14 +185,14 @@ msgid "Next"
 msgstr "Další"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Jméno uživatele"
@@ -224,8 +234,8 @@ msgid "Share Group"
 msgstr "Sdílena skupina"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Požadován email"
@@ -258,8 +268,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -289,13 +299,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -320,7 +330,7 @@ msgstr ""
 "Akce, které otevírají obrazovku obsahující data, které chcete sdílet."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopie pro sdílení)"
@@ -336,7 +346,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "Filtr nepřímého sdílení vytvořený uživatelem %s (%s) pro skupinu %s"
@@ -360,7 +370,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -377,8 +387,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Databáze"
@@ -411,13 +421,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Zkopírované práva pro sdílení"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -433,7 +443,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -456,7 +466,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Vyberte typ uživatele(ů), se kterým(i) chcete sdílet data."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -499,7 +509,7 @@ msgid "Share Wizard"
 msgstr "Průvodce sdílením"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -513,7 +523,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -526,7 +536,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -544,8 +554,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -569,8 +579,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
index 01a08287e48..39f2ced6e0f 100644
--- a/addons/share/i18n/da.po
+++ b/addons/share/i18n/da.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-09-23 17:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr ""
@@ -221,8 +231,8 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -253,8 +263,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -284,13 +294,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -312,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -328,7 +338,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -352,7 +362,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -366,8 +376,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Database"
@@ -400,13 +410,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -422,7 +432,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -445,7 +455,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -487,7 +497,7 @@ msgid "Share Wizard"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -501,7 +511,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -514,7 +524,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -532,8 +542,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -557,8 +567,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index 5702657130b..d85286ff0e4 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/i18n/de.po
@@ -6,24 +6,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 19:28+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr "Einladung zur Zusammenarbeit für %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -70,8 +70,8 @@ msgid "Share Title"
 msgstr "Freigabe Bezeichnung"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -91,8 +91,8 @@ msgid "Sharing"
 msgstr "Freigaben"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -114,7 +114,7 @@ msgid "New user email"
 msgstr "Neue Benutzer E-Mail"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
@@ -122,13 +122,13 @@ msgstr ""
 "sehen.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Verändert)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
@@ -136,7 +136,14 @@ msgstr ""
 "Assistenten\" zu nutzen."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Freigabe durch Benutzer %s (%s) für die Gruppe %s"
@@ -148,8 +155,8 @@ msgid "Share URL"
 msgstr "Freigabe URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Dies sind Ihre Berechtigungen um den geschützten Bereich zu sehen\n"
@@ -160,18 +167,21 @@ msgid "Access info"
 msgstr "Zugriffsinfo"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Freigabe"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Duplikat für modifizierte Freigabe Berechtigungen)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -190,7 +200,7 @@ msgid "Next"
 msgstr "Weiter"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
@@ -198,8 +208,8 @@ msgstr ""
 "erzeugen."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Benutzername"
@@ -241,8 +251,8 @@ msgid "Share Group"
 msgstr "Freigabe Gruppe"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Die E-Mail Adresse ist erforderlich"
@@ -276,8 +286,8 @@ msgid "Direct link or embed code"
 msgstr "Direkter Link oder Quellcode"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -310,13 +320,13 @@ msgstr "unbekannt"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr "Freigaben können nicht erstellt werden"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr "Datensatz wurde nicht gefunden."
@@ -342,7 +352,7 @@ msgstr ""
 "ausgetauscht und freigegeben werden sollen."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopie für Freigabe)"
@@ -360,7 +370,7 @@ msgstr ""
 "angezeigt)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "Indirekter Freigabefilter des Benutzers %s (%s) für die Gruppe %s"
@@ -386,7 +396,7 @@ msgid "User"
 msgstr "Benutzer"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -404,8 +414,8 @@ msgid "Use this link"
 msgstr "Verwenden Sie diesen Link"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Datenbank"
@@ -440,13 +450,13 @@ msgstr ""
 "möglich zu erhalten"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Kopierte Rechte für Nutzung"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr "Einladung"
@@ -463,7 +473,7 @@ msgstr ""
 "Oder Fügen Sie diesen Code ein, wenn das Dokument eingebettet werden soll"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -487,7 +497,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Wählen Sie die Benutzer aus, für die Sie Daten freigeben wollen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -531,7 +541,7 @@ msgid "Share Wizard"
 msgstr "Freigabeassistent"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Freigabe wurde erteilt!"
@@ -549,7 +559,7 @@ msgstr ""
 "lesen und/oder bearbeiten können."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -564,7 +574,7 @@ msgid "Users"
 msgstr "Benutzer"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -584,8 +594,8 @@ msgid "Invite users to OpenSocial record"
 msgstr "Benutzer zu OpenSocial einladen."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -609,8 +619,8 @@ msgid "Personal Message"
 msgstr "Persönliche Nachricht"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
index 4d6b3b3b451..5af7060b5d7 100644
--- a/addons/share/i18n/es.po
+++ b/addons/share/i18n/es.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-13 11:31+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:34+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr "Invitación a colaborar sobre %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -71,8 +71,8 @@ msgid "Share Title"
 msgstr "Título de compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -91,8 +91,8 @@ msgid "Sharing"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -114,19 +114,19 @@ msgid "New user email"
 msgstr "Correo electrónico del nuevo usuario"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr "Puede usar su usuario (%s) y contraseña actuales para verlo.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Modificado)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
@@ -134,7 +134,14 @@ msgstr ""
 "compartición."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr "Incrustar"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -147,8 +154,8 @@ msgid "Share URL"
 msgstr "Compartir URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Éstas son las credenciales para acceder a esta área protegida:\n"
@@ -159,18 +166,21 @@ msgid "Access info"
 msgstr "Información de acceso"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Duplicado para modificar los permisos de compartición)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -189,15 +199,15 @@ msgid "Next"
 msgstr "Siguiente"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 "Se requiere la acción y el modo de acceso para crear un acceso compartido."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -239,8 +249,8 @@ msgid "Share Group"
 msgstr "Grupo compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Correo electrónico requerido"
@@ -275,8 +285,8 @@ msgid "Direct link or embed code"
 msgstr "Enlace directo o código incrustado"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -310,13 +320,13 @@ msgstr "desconocido"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr "No se ha podido crear el acceso compartido."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr "Id. de registro no encontrado"
@@ -342,7 +352,7 @@ msgstr ""
 "compartir."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Copia para compartir)"
@@ -360,7 +370,7 @@ msgstr ""
 "acceso directo)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -390,7 +400,7 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -407,8 +417,8 @@ msgid "Use this link"
 msgstr "Usar este enlace"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Base de datos"
@@ -444,13 +454,13 @@ msgstr ""
 "compartido."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Acceso copiado para compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr "Invitación"
@@ -466,7 +476,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "O insertar el siguiente código donde quiera incrustar sus documentos"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -492,7 +502,7 @@ msgstr ""
 "Seleccione el tipo de usuario(s) con los que le gustaría compartir datos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -538,7 +548,7 @@ msgid "Share Wizard"
 msgstr "Asistente de compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "¡Acceso compartido creado!"
@@ -555,7 +565,7 @@ msgstr ""
 "permite invitar a usuarios externos a ver o editar algunos de sus documentos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -570,7 +580,7 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -590,8 +600,8 @@ msgid "Invite users to OpenSocial record"
 msgstr "Invitar a los usuarios al registro OpenSocial"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -615,8 +625,8 @@ msgid "Personal Message"
 msgstr "Mensaje personal"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/es_CR.po b/addons/share/i18n/es_CR.po
index f1e53ea6630..30a71faede3 100644
--- a/addons/share/i18n/es_CR.po
+++ b/addons/share/i18n/es_CR.po
@@ -7,25 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-23 05:16+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -68,8 +68,8 @@ msgid "Share Title"
 msgstr "Compartir el título"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -84,8 +84,8 @@ msgid "Sharing"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -105,7 +105,7 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
@@ -113,19 +113,26 @@ msgstr ""
 "verlos.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Modificado)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -138,8 +145,8 @@ msgid "Share URL"
 msgstr "Compartir URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Estas son sus credenciales para acceder a esta área protegida:\n"
@@ -150,18 +157,21 @@ msgid "Access info"
 msgstr "Información de acceso"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Duplicados de permisos de uso compartido modificados)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -178,14 +188,14 @@ msgid "Next"
 msgstr "Siguiente"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -227,8 +237,8 @@ msgid "Share Group"
 msgstr "Grupo compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Correo electrónico requerido"
@@ -261,8 +271,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -295,13 +305,13 @@ msgstr "Desconocido"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -327,7 +337,7 @@ msgstr ""
 "compartir."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Copia para compartir)"
@@ -345,7 +355,7 @@ msgstr ""
 "del acceso directo)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -372,7 +382,7 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -389,8 +399,8 @@ msgid "Use this link"
 msgstr "Use este enlace"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Base de datos"
@@ -423,13 +433,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Acceso copiado para compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -446,7 +456,7 @@ msgstr ""
 "O bien, introduzca el siguiente código donde desea incrustar los documentos"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -472,7 +482,7 @@ msgstr ""
 "Seleccione el tipo de usuario(s) con los que le gustaría compartir datos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -516,7 +526,7 @@ msgid "Share Wizard"
 msgstr "Asistente de compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "¡Acceso compartido creado!"
@@ -534,7 +544,7 @@ msgstr ""
 "documentos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -547,7 +557,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -565,8 +575,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -590,8 +600,8 @@ msgid "Personal Message"
 msgstr "Mensaje personal"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/et.po b/addons/share/i18n/et.po
index 5d346f428ad..b72ad76a648 100644
--- a/addons/share/i18n/et.po
+++ b/addons/share/i18n/et.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-20 17:19+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Jaga"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr ""
@@ -221,8 +231,8 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr ""
@@ -253,8 +263,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -284,13 +294,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -312,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -328,7 +338,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -352,7 +362,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -366,8 +376,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr ""
@@ -400,13 +410,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -422,7 +432,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -445,7 +455,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -487,7 +497,7 @@ msgid "Share Wizard"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -501,7 +511,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -514,7 +524,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -532,8 +542,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -557,8 +567,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
index ece0be5edd6..2af5450f678 100644
--- a/addons/share/i18n/fi.po
+++ b/addons/share/i18n/fi.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-25 12:21+0000\n"
 "Last-Translator: Jussi Mikkola <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Jaon otsikko"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Jakaminen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,26 +104,33 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 "Voit käyttää nykyistä kirjautumista (%s) ja salasanaa nähdäksesi ne.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(muokattu)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Jakosuodatin luotu käyttäjän %s (%s) toimesta ryhmälle %s"
@@ -135,8 +142,8 @@ msgid "Share URL"
 msgstr "Jaon URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Tässä ovat tunnuksesi suojatulle alueelle:\n"
@@ -147,18 +154,21 @@ msgid "Access info"
 msgstr "Pääsyn tiedot"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Jaa"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(kopioitu muutettuja jako-oikeuksia varten)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -175,14 +185,14 @@ msgid "Next"
 msgstr "Seuraava"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Käyttäjätunnus"
@@ -224,8 +234,8 @@ msgid "Share Group"
 msgstr "Jako ryhmä"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Sähköposti vaaditaan"
@@ -258,8 +268,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -289,13 +299,13 @@ msgstr "tuntematon"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -319,7 +329,7 @@ msgid ""
 msgstr "Toiminto avaa ruudun joka sisältää tiedot joita haluat jakaa."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(kopioi jaettavaksi)"
@@ -336,7 +346,7 @@ msgstr ""
 "Otsikko jaolle (näytetään käyttäjille valikkona ja pikakuvakkeen nimenä)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "Epäsuora jakosuodin luotu käyttäjän %s (%s) toimesta ryhmälle %s"
@@ -360,7 +370,7 @@ msgid "User"
 msgstr "Käyttäjä"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -377,8 +387,8 @@ msgid "Use this link"
 msgstr "Käytä tätä linkkiä"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Tietokanta"
@@ -411,13 +421,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Kopioitu pääsy jakamista varten"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -433,7 +443,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "Tai liitä seuraaava koodi kun haluat upottaa dokumenttisi"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -457,7 +467,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Valitse käyttäjien tyyppi joiden kanssa haluat jakaa tietoja."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -501,7 +511,7 @@ msgid "Share Wizard"
 msgstr "Jakovelho"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Jaettu pääsy on luotu!"
@@ -515,7 +525,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -528,7 +538,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -546,8 +556,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -571,8 +581,8 @@ msgid "Personal Message"
 msgstr "Henkilökohtainen viesti"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/fr.po b/addons/share/i18n/fr.po
index be6b756fe45..bf34c76de40 100644
--- a/addons/share/i18n/fr.po
+++ b/addons/share/i18n/fr.po
@@ -6,24 +6,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-17 16:49+0000\n"
 "Last-Translator: Aline (OpenERP) <Unknown>\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: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -66,8 +66,8 @@ msgid "Share Title"
 msgstr "Partager le titre"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -82,8 +82,8 @@ msgid "Sharing"
 msgstr "Partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -103,7 +103,7 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
@@ -111,19 +111,26 @@ msgstr ""
 "les visualiser.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Partager le filtre créé par l'utilisateur %s (%s) pour le groupe %s"
@@ -135,8 +142,8 @@ msgid "Share URL"
 msgstr "Adresse URL de partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -149,18 +156,21 @@ msgid "Access info"
 msgstr "Informations d'accès"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Partager"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Dupliqué pour les autorisations de partage modifiées)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -177,14 +187,14 @@ msgid "Next"
 msgstr "Suivant"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nom d’utilisateur"
@@ -226,8 +236,8 @@ msgid "Share Group"
 msgstr "Groupe de partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Courriel requis"
@@ -260,8 +270,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -294,13 +304,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -325,7 +335,7 @@ msgstr ""
 "L'action qui ouvre l'écran contenant les données que vous souhaitez partager."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(copie pour partage)"
@@ -343,7 +353,7 @@ msgstr ""
 "raccourci)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -369,7 +379,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -386,8 +396,8 @@ msgid "Use this link"
 msgstr "Utiliser ce lien"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Base de données"
@@ -420,13 +430,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Accès copié pour le partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -442,7 +452,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "Ou insérez le code suivant où vous souhaitez intégrer vos documents"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -468,7 +478,7 @@ msgstr ""
 "partager les données."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -512,7 +522,7 @@ msgid "Share Wizard"
 msgstr "Assistant de partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Accès partagé créé !"
@@ -530,7 +540,7 @@ msgstr ""
 "certains de leurs documents."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -543,7 +553,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -561,8 +571,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -586,8 +596,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
index 1a263c56b78..c25a4affbc6 100644
--- a/addons/share/i18n/gl.po
+++ b/addons/share/i18n/gl.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-05-10 09:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Compartindo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, 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"
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr "Compartir URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr "Información de acceso"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "Seguinte"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nome de usuario"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "Grupo compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Correo electrónico requirido"
@@ -257,8 +267,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -288,13 +298,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -319,7 +329,7 @@ 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:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Copia para compartir)"
@@ -335,7 +345,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -360,7 +370,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -376,8 +386,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Base de datos"
@@ -410,13 +420,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Acceso copiado para a compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -432,7 +442,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -456,7 +466,7 @@ msgstr ""
 "Seleccione o tipo de usuario(s) cos que lle gostaría compartir datos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -500,7 +510,7 @@ msgid "Share Wizard"
 msgstr "Asistente de compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -514,7 +524,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -527,7 +537,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -545,8 +555,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -570,8 +580,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/hr.po b/addons/share/i18n/hr.po
index bfc8256e365..788cd76bef3 100644
--- a/addons/share/i18n/hr.po
+++ b/addons/share/i18n/hr.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:32+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Dijeljenje"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Filtar dijeljenja je kreiran od strane korisnika %s (%s) za grupu %s"
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr "Share URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr "Access info"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Podjeli"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "Next"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Korisničko ime"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "Grupa dijeljenja"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Obavezan e-mail"
@@ -257,8 +267,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -288,13 +298,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -317,7 +327,7 @@ msgstr ""
 "The action that opens the screen containing the data you wish to share."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopiraj za dijeljenje)"
@@ -333,7 +343,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -359,7 +369,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -376,8 +386,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Baza podataka"
@@ -410,13 +420,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Kopiran pristup za dijeljenje"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -432,7 +442,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -455,7 +465,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Odaberite vrstu korisnika (e) s  kojima želite dijeliti podatke."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -499,7 +509,7 @@ msgid "Share Wizard"
 msgstr "Asistent dijeljenja"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -513,7 +523,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -526,7 +536,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -544,8 +554,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -569,8 +579,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/hu.po b/addons/share/i18n/hu.po
index b8694a7095f..7c64378decb 100644
--- a/addons/share/i18n/hu.po
+++ b/addons/share/i18n/hu.po
@@ -6,24 +6,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-26 14:47+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -66,8 +66,8 @@ msgid "Share Title"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -82,8 +82,8 @@ msgid "Sharing"
 msgstr "Megosztás"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -103,25 +103,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -133,8 +140,8 @@ msgid "Share URL"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -145,18 +152,21 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Megosztás"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -173,14 +183,14 @@ msgid "Next"
 msgstr "Következő"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Felhasználónév"
@@ -220,8 +230,8 @@ msgid "Share Group"
 msgstr "Megosztott csoport"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "E-mail szükséges"
@@ -252,8 +262,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -283,13 +293,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -311,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -327,7 +337,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -351,7 +361,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -365,8 +375,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Adatbázis"
@@ -399,13 +409,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -421,7 +431,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -444,7 +454,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -486,7 +496,7 @@ msgid "Share Wizard"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -500,7 +510,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -513,7 +523,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -531,8 +541,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -556,8 +566,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/it.po b/addons/share/i18n/it.po
index 17cbd1b115d..410cb8d10e3 100644
--- a/addons/share/i18n/it.po
+++ b/addons/share/i18n/it.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-29 18:15+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Condividi Titolo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Condivisione"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Modificato)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Filtro condivisione creato dall'utente %s (%s) per gruppo %s"
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr "Condividi URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr "Info accesso"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Condivisione"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "Prossimo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nome utente"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "Condividi gruppo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Richiesta email"
@@ -255,8 +265,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -286,13 +296,13 @@ msgstr "sconosciuto"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -317,7 +327,7 @@ msgstr ""
 "L'azione che apre la schermata contenente i dati che volete condividere."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(copia per condivisione)"
@@ -333,7 +343,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -359,7 +369,7 @@ msgid "User"
 msgstr "Utente"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -373,8 +383,8 @@ msgid "Use this link"
 msgstr "Usa questo collegamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Database"
@@ -407,13 +417,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -429,7 +439,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -452,7 +462,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -496,7 +506,7 @@ msgid "Share Wizard"
 msgstr "Wizard condivisione"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Accesso condiviso creato!"
@@ -510,7 +520,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -523,7 +533,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -541,8 +551,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -566,8 +576,8 @@ msgid "Personal Message"
 msgstr "Messaggio personale"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
index d717b3e256e..37ff35bb595 100644
--- a/addons/share/i18n/ja.po
+++ b/addons/share/i18n/ja.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-29 23:24+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "タイトルの共有"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "共有"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr "表示のために現在のログイン %s とパスワードが使用できます。\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "（修正済）"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "ユーザ %s（%s）、グループ %s により作成された共有フィルタ"
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr "共有URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "これはこの保護領域にアクセスするためのあなたの資格証明です：\n"
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr "アクセス情報"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "共有"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "（共有許可の変更のために複製されました）"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "次へ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "ユーザ名"
@@ -221,8 +231,8 @@ msgid "Share Group"
 msgstr "共有グループ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Eメールは必須"
@@ -253,8 +263,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -286,13 +296,13 @@ msgstr "不明"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -314,7 +324,7 @@ msgid ""
 msgstr "共有したいデータを含む画面を開くアクション"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "（共有のためにコピー）"
@@ -330,7 +340,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr "共有のタイトル（メニューとショートカット名としてユーザに表示）"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "ユーザ%s（%s） グループ %s により作成された間接的共有フィルタ"
@@ -354,7 +364,7 @@ msgid "User"
 msgstr "ユーザ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -370,8 +380,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "データベース"
@@ -404,13 +414,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "共有のためのアクセスをコピーしました。"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -426,7 +436,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "またはドキュメントを埋め込みたい場所に、次のコードを挿入します。"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -449,7 +459,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "データ共有をしたいユーザのタイプを選択します。"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -491,7 +501,7 @@ msgid "Share Wizard"
 msgstr "共有ウィザード"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "共有アクセスは作成されました。"
@@ -507,7 +517,7 @@ msgstr ""
 "このグループのメンバーは共有ウィザードにアクセスして、彼らのドキュメントの一部を表示や編集する外部ユーザを招待することができます。"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -520,7 +530,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -538,8 +548,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -563,8 +573,8 @@ msgid "Personal Message"
 msgstr "個人的メッセージ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/mn.po b/addons/share/i18n/mn.po
index 72fbb07feb0..b27b3d2f214 100644
--- a/addons/share/i18n/mn.po
+++ b/addons/share/i18n/mn.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-29 10:35+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Хуваалцах гарчиг"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Хуваалцах"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,7 +104,7 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
@@ -112,19 +112,26 @@ msgstr ""
 "болно.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Засагдсан)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Хуваалцах шүүлтүүрийг %s (%s) хэрэглэгч %s группэд зориулан үүсгэсэн"
@@ -136,8 +143,8 @@ msgid "Share URL"
 msgstr "Хуваалцах URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Эдгээр нь энэхүү хамгаалагдсан хэсэг рүү хандах таны зөвшөөрөл:\n"
@@ -148,18 +155,21 @@ msgid "Access info"
 msgstr "Хандалтын мэдээлэл"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Хуваалцах"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Хуваалцах эрхийг засварлахад зориулан хувилагдлаа)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -176,14 +186,14 @@ msgid "Next"
 msgstr "Дараах"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Хэрэглэгчийн нэр"
@@ -225,8 +235,8 @@ msgid "Share Group"
 msgstr "Хуваалцах Групп"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Имэйл шаардлагатай"
@@ -259,8 +269,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -294,13 +304,13 @@ msgstr "үл мэдэгдэх"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -324,7 +334,7 @@ msgid ""
 msgstr "Таны хуваалцахыг хүссэн өгөгдлийг агуулсан дэлгэцийг нээх үйлдэл."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Хуваалцах зориулсан хуулбар)"
@@ -341,7 +351,7 @@ msgstr ""
 "Хуваалцах гарчиг (Хэрэглэгчидэд меню болон богино холбоос болон харагдана)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -366,7 +376,7 @@ msgid "User"
 msgstr "Хэрэглэгч"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -383,8 +393,8 @@ msgid "Use this link"
 msgstr "Энэ холбоосыг хэрэглэ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Өгөгдлийн бааз"
@@ -417,13 +427,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Хуваалцахад зориулсан хувилсан хандалт"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -440,7 +450,7 @@ msgstr ""
 "Эсвэл дараах кодыг оруулах замаар өөрийн баримтуудыг шигтгээгээр зоож болно"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -463,7 +473,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Өгөгдлийг хуваалцахыг хүсч байгаа хэрэглэгчдийн төрөлийг сонго"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -507,7 +517,7 @@ msgid "Share Wizard"
 msgstr "Хуваалцах Харилцах Цонх"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Хуваалцах хандалт уусгэгдсэн!"
@@ -525,7 +535,7 @@ msgstr ""
 "чадна гэсэн үг юм."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -538,7 +548,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -556,8 +566,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -581,8 +591,8 @@ msgid "Personal Message"
 msgstr "Хувийн зурвас"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index ce385ea4d2f..64bc3b85ba2 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/i18n/nl.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-24 21:42+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -69,8 +69,8 @@ msgid "Share Title"
 msgstr "Deel titel"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -85,8 +85,8 @@ msgid "Sharing"
 msgstr "Delen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -108,26 +108,33 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 "U kunt u huidige login (%s) en wachtwoord gebruiken om deze te bekijken.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Aangepast)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Deel-filter gemaakt door gebruiker %s (%s) voor groep %s"
@@ -139,8 +146,8 @@ msgid "Share URL"
 msgstr "Deel URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -152,18 +159,21 @@ msgid "Access info"
 msgstr "Toegangsinfo"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Delen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Gedupliceerd voor aangepaste deel rechten)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -180,14 +190,14 @@ msgid "Next"
 msgstr "Volgende"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -229,8 +239,8 @@ msgid "Share Group"
 msgstr "Delen groep"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Email verplicht"
@@ -264,8 +274,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -298,13 +308,13 @@ msgstr "onbekend"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -329,7 +339,7 @@ msgstr ""
 "De actie die het scherm opent dat de gegevens bevat die u wilt delen."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopie voor delen)"
@@ -347,7 +357,7 @@ msgstr ""
 "naam)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "Indirect deel-filter gemaakt door gebruiker %s (%s) voor groep %s"
@@ -374,7 +384,7 @@ msgid "User"
 msgstr "Gebruiker"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -391,8 +401,8 @@ msgid "Use this link"
 msgstr "Gebruik deze link"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Database"
@@ -425,13 +435,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Toegang gekopieerd voor delen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr "Uitnodiging"
@@ -447,7 +457,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "Of voeg te volgende code toe waar u, uw documenten wilt insluiten"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -471,7 +481,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Het soort gebruiker(s) selecteren waarmee u gegevens wilt delen."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -515,7 +525,7 @@ msgid "Share Wizard"
 msgstr "Deel assistent"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Gedeelde toegang aangemaakt!"
@@ -533,7 +543,7 @@ msgstr ""
 "bekijken en/of te bewerken."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -546,7 +556,7 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -564,8 +574,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -589,8 +599,8 @@ msgid "Personal Message"
 msgstr "Persoonlijk bericht"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index 0279f8908c9..325033af3e4 100644
--- a/addons/share/i18n/pl.po
+++ b/addons/share/i18n/pl.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 19:48+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr "Zaproszenie do współpracy przy %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -69,8 +69,8 @@ msgid "Share Title"
 msgstr "Współdziel tytuł"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -89,8 +89,8 @@ msgid "Sharing"
 msgstr "Współdzielenie"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -112,19 +112,19 @@ msgid "New user email"
 msgstr "Mail nowego użytkownika"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr "Możesz stosować swój obecny login (%s) i hasło do oglądania.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Zmodyfikowano)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
@@ -132,7 +132,14 @@ msgstr ""
 "współdzielenia."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -145,8 +152,8 @@ msgid "Share URL"
 msgstr "URL współdzielenia"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "To są twoje dane dostępu do przestrzeni zastrzeżonej:\n"
@@ -157,18 +164,21 @@ msgid "Access info"
 msgstr "Informacja o dostępie"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Udostępnij"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Zduplikowane dla zmodyfikowanych praw współdzielenia)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -185,14 +195,14 @@ msgid "Next"
 msgstr "Następne"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr "Akcja i Tryb dostępu są wymagane do tworzenia dostępu."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nazwa użytkownika:"
@@ -233,8 +243,8 @@ msgid "Share Group"
 msgstr "Grupa współdzielenia"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Wymagany email"
@@ -268,8 +278,8 @@ msgid "Direct link or embed code"
 msgstr "Link bezpośredni lub kod zagnieżdżony"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -299,13 +309,13 @@ msgstr "nieznane"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr "Nie można utworzyć dostępu współdzielenia."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr "Nie znaleziono id rekordu"
@@ -327,7 +337,7 @@ msgid ""
 msgstr "Akcja otwierająca ekran zawierający udostępnione dane."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopia do udostępnienia)"
@@ -344,7 +354,7 @@ msgstr ""
 "Tytuł dla współdzielenia (wyświetlany użytkownikom jako menu i nazwa skrótu)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -372,7 +382,7 @@ msgid "User"
 msgstr "Użytkownik"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -389,8 +399,8 @@ msgid "Use this link"
 msgstr "Stosuj ten link"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Baza danych"
@@ -425,13 +435,13 @@ msgstr ""
 "dokumentu."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Skopiowany dostęp do udostępnienia"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr "Zaproszenie"
@@ -448,7 +458,7 @@ msgstr ""
 "Lub wstaw następujący kod w miejscu, gdzie chcesz zagnieździć swój dokument"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -473,7 +483,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Wybierz typ użytkowników, którym chcesz udostępnić dane."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -519,7 +529,7 @@ msgid "Share Wizard"
 msgstr "Kreator udostępniania"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Utworzono dostęp do współdzielenia!"
@@ -537,7 +547,7 @@ msgstr ""
 "edytowania niektórych ich dokumentów."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -552,7 +562,7 @@ msgid "Users"
 msgstr "Użytkownicy"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -572,8 +582,8 @@ msgid "Invite users to OpenSocial record"
 msgstr "Zaproś użytkowników do rekordu OpenSocial"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -597,8 +607,8 @@ msgid "Personal Message"
 msgstr "Wiadomość prywatna"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/pt.po b/addons/share/i18n/pt.po
index bc2451c4200..a2c2fe7554e 100644
--- a/addons/share/i18n/pt.po
+++ b/addons/share/i18n/pt.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-20 12:00+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Partilhar título"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "A Partilhar"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr "Pode usar o seu login atual (%s) e senha para visualizá-las.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Modificado)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "A compartilhar Filtro criado pelo utilizador %s (%s) para o grupo %s"
@@ -134,8 +141,8 @@ msgid "Share URL"
 msgstr "URL de partilha"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Estas são as suas credenciais para aceder a esta área protegida:\n"
@@ -146,18 +153,21 @@ msgid "Access info"
 msgstr "Informação de acesso"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Partilhar"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Duplicados para permissões de compartilhamentos modificados)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -174,14 +184,14 @@ msgid "Next"
 msgstr "Próximo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nome de utilizador"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "Grupo Compartilhar"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Email exigido"
@@ -257,8 +267,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -291,13 +301,13 @@ msgstr "Desconhecido"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -321,7 +331,7 @@ msgid ""
 msgstr "A ação que abre a tela que contêm os dados que quer compartilhar."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Copie para compartilhar)"
@@ -339,7 +349,7 @@ msgstr ""
 "atalho e nome)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -365,7 +375,7 @@ msgid "User"
 msgstr "Utilizador"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -382,8 +392,8 @@ msgid "Use this link"
 msgstr "Utilize este link"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Base de dados"
@@ -416,13 +426,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Acesso copiado para partilhar"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -438,7 +448,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "Ou insira o seguinte código onde quer inserir os seus documentos"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -464,7 +474,7 @@ msgstr ""
 "Selecione o tipo de utilizador(s) que gostaria de partilhar os dados."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -508,7 +518,7 @@ msgid "Share Wizard"
 msgstr "Assistente de partilha"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Acesso partilhado criado!"
@@ -526,7 +536,7 @@ msgstr ""
 "seus documentos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -539,7 +549,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -557,8 +567,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -582,8 +592,8 @@ msgid "Personal Message"
 msgstr "Mensagem Pessoal"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index ca51b2d70a8..c137f982a50 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -7,24 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 23:34+0000\n"
-"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-23 18:38+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr "Convite para colaboração sobre %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -70,8 +71,8 @@ msgid "Share Title"
 msgstr "Título do compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -90,8 +91,8 @@ msgid "Sharing"
 msgstr "Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -113,20 +114,20 @@ msgid "New user email"
 msgstr "E-mail para novo usuário"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 "Você pode utilizar o seu nome de usuário e senha atuais (%s) para vê-los.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Modificado)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
@@ -134,7 +135,14 @@ msgstr ""
 "assistente de compartilhamento."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr "Embutir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -147,8 +155,8 @@ msgid "Share URL"
 msgstr "URL de Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Estas são suas credenciais para acessar esta área protegida:\n"
@@ -159,18 +167,21 @@ msgid "Access info"
 msgstr "Informações de acesso"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Compartilhar"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Duplicado para permissões de compartilhamento modificadas)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -188,15 +199,15 @@ msgid "Next"
 msgstr "Próximo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 "Ação e Modo de Acesso são necessários para criar um acesso compartilhado."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nome do Usuário"
@@ -237,8 +248,8 @@ msgid "Share Group"
 msgstr "Grupo de Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "E-mail obrigatório"
@@ -273,8 +284,8 @@ msgid "Direct link or embed code"
 msgstr "Link direto ou código incorporado"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -308,13 +319,13 @@ msgstr "desconhecido"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr "O acesso ao compartilhamento não pode ser criado."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr "Id do registro não encontrado"
@@ -338,7 +349,7 @@ msgid ""
 msgstr "A ação que abre uma tela contendo os dados que deseja compartilhar."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Cópia para compartilhamento)"
@@ -356,7 +367,7 @@ msgstr ""
 "para o nome)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -386,7 +397,7 @@ msgid "User"
 msgstr "Usuário"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -403,8 +414,8 @@ msgid "Use this link"
 msgstr "Utilize esta ligação"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Banco de Dados"
@@ -439,13 +450,13 @@ msgstr ""
 "documento compartilhado."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Copiado o acesso para o compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr "Convite"
@@ -462,7 +473,7 @@ msgstr ""
 "Ou insira o código seguinte onde você pretende incorporar seus documentos"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -489,7 +500,7 @@ msgstr ""
 "compartilhar dados."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -535,7 +546,7 @@ msgid "Share Wizard"
 msgstr "Assistente de Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Acesso ao compartilhamento criado!"
@@ -553,7 +564,7 @@ msgstr ""
 "documentos."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -568,7 +579,7 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -588,8 +599,8 @@ msgid "Invite users to OpenSocial record"
 msgstr "Convide usuários para registro no OpenSocial"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -613,8 +624,8 @@ msgid "Personal Message"
 msgstr "Mensagem Pessoal"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/ro.po b/addons/share/i18n/ro.po
index 941c80735ae..dd6f802c14c 100644
--- a/addons/share/i18n/ro.po
+++ b/addons/share/i18n/ro.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-07 22:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Partajati titlul"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Partajare"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,7 +104,7 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
@@ -112,19 +112,26 @@ msgstr ""
 "vizuliza.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Modificat(a))"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -137,8 +144,8 @@ msgid "Share URL"
 msgstr "Partajeaza URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -151,18 +158,21 @@ msgid "Access info"
 msgstr "Informatii acces"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Partajeaza"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Copiat pentru permisiuni modificate de partajare)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -179,14 +189,14 @@ msgid "Next"
 msgstr "Urmatorul"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Nume de utilizator"
@@ -228,8 +238,8 @@ msgid "Share Group"
 msgstr "Partajeaza Grup"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Email necesar"
@@ -262,8 +272,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -296,13 +306,13 @@ msgstr "necunoscut(a)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -328,7 +338,7 @@ msgstr ""
 "partajati."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Copie pentru partajare)"
@@ -345,7 +355,7 @@ msgstr ""
 "Titlu pentru partajare (afisat utilizatorilor ca nume meniu si shortcut)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -373,7 +383,7 @@ msgid "User"
 msgstr "Utilizator"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -390,8 +400,8 @@ msgid "Use this link"
 msgstr "Folositi acest link"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Baza de date"
@@ -424,13 +434,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Acces copiat pentru partajare"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -447,7 +457,7 @@ msgstr ""
 "Sau introduceti codul urmator acolo unde doriti sa va integrati documentele"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -473,7 +483,7 @@ msgstr ""
 "Selecteaza tipul de utilizator(i) cu care ati dori sa partajati date."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -516,7 +526,7 @@ msgid "Share Wizard"
 msgstr "Asistent de Partajare"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Acces partajat creat!"
@@ -534,7 +544,7 @@ msgstr ""
 "documentele lor."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -547,7 +557,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -565,8 +575,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -590,8 +600,8 @@ msgid "Personal Message"
 msgstr "Mesaj personal"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index ea3071e0b2a..7be870c06a0 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-09-10 14:15+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Заголовок совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Совместный доступ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,26 +104,33 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 "Вы можете использовать ваш текущий логин (%s) и пароль, для их просмотра.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Изменено)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -136,8 +143,8 @@ msgid "Share URL"
 msgstr "Адрес совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Это ваши учетные данные для доступа к защищенной области:\n"
@@ -148,18 +155,21 @@ msgid "Access info"
 msgstr "Данные доступа"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Совместный доступ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Дублирован для измененных прав совместного доступа)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -176,14 +186,14 @@ msgid "Next"
 msgstr "Далее"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Пользователь"
@@ -225,8 +235,8 @@ msgid "Share Group"
 msgstr "Группа совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "Требуется эл. почта"
@@ -260,8 +270,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -294,13 +304,13 @@ msgstr "неизвесно"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -326,7 +336,7 @@ msgstr ""
 "поделиться"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Копировать для совместного доступа)"
@@ -344,7 +354,7 @@ msgstr ""
 "закладки)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -373,7 +383,7 @@ msgid "User"
 msgstr "Пользователь"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -391,8 +401,8 @@ msgid "Use this link"
 msgstr "Используйте эту ссылку"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "База данных"
@@ -425,13 +435,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Скопированы права совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -448,7 +458,7 @@ msgstr ""
 "Или вставьте следующий код туда, где вы хотите вставить ваши документы"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -474,7 +484,7 @@ msgstr ""
 "данным."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -518,7 +528,7 @@ msgid "Share Wizard"
 msgstr "Мастер совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Общий доступ создан!"
@@ -536,7 +546,7 @@ msgstr ""
 "некоторых своих документов."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -549,7 +559,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -567,8 +577,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -592,8 +602,8 @@ msgid "Personal Message"
 msgstr "Личное сообщение"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
index 1ad0b4ec7c4..9bb927601d8 100644
--- a/addons/share/i18n/sv.po
+++ b/addons/share/i18n/sv.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-04 10:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Delningstitel"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Delning"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,26 +104,33 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 "Du kan använda nuvarande inloggning (%s) och lösenord för att se dem.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Ändrad)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -135,8 +142,8 @@ msgid "Share URL"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -147,18 +154,21 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Utdelning"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -175,14 +185,14 @@ msgid "Next"
 msgstr "Nästa"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Användarnamn"
@@ -222,8 +232,8 @@ msgid "Share Group"
 msgstr "Delningsgrupp"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "E-post krävs"
@@ -254,8 +264,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -285,13 +295,13 @@ msgstr "okänd"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -313,7 +323,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -329,7 +339,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -353,7 +363,7 @@ msgid "User"
 msgstr "Användare"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -367,8 +377,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Databas"
@@ -401,13 +411,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -423,7 +433,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -446,7 +456,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -488,7 +498,7 @@ msgid "Share Wizard"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -502,7 +512,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -515,7 +525,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -533,8 +543,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -558,8 +568,8 @@ msgid "Personal Message"
 msgstr "Personligt meddelande"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index 7dc975d6bb1..a5a9c4c9aa1 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/i18n/tr.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:01+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "Paylaşım Başlığı"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "Paylaşım"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -104,25 +104,32 @@ msgid "New user email"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr "Görmek için şuanki kullanıcı (%s) ve şifrenizi kullanabilirsiniz.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(Değiştirildi)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -135,8 +142,8 @@ msgid "Share URL"
 msgstr "Paylaşım Adresi"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr "Korumalı alana erişebilmek için kimlik bilgileriniz:\n"
@@ -147,18 +154,21 @@ msgid "Access info"
 msgstr "Erişim Bilgisi"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "Paylaş"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr "(Değiştirilmiş paylaşım izinleri için çoğaltıldı)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -175,14 +185,14 @@ msgid "Next"
 msgstr "Sonraki"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "Kullanıcı Adı"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "Paylaşım Grubu"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "E-posta Gerekli"
@@ -257,8 +267,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -288,13 +298,13 @@ msgstr "bilinmeyen"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -318,7 +328,7 @@ msgid ""
 msgstr "Paylaşmak istediğiniz ekranı açan eylem"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(paylaşım için kopya)"
@@ -336,7 +346,7 @@ msgstr ""
 "gösterilecek)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -362,7 +372,7 @@ msgid "User"
 msgstr "Kullanıcı"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -379,8 +389,8 @@ msgid "Use this link"
 msgstr "Bu adrese gidin"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "Veritabanı"
@@ -413,13 +423,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Paylaşım için kopyalanmış erişim"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -435,7 +445,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr "ya da dökümanlarınızı gömmek istediğiniz yere kodu yerleştirin"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -460,7 +470,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "Verileri paylaşmak istediğiniz kullanıcıların tiplerini seçiniz"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -502,7 +512,7 @@ msgid "Share Wizard"
 msgstr "Paylaşım Sihirbazı"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr "Paylaşım izni oluşturuldu!"
@@ -520,7 +530,7 @@ msgstr ""
 "vardır."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -533,7 +543,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -551,8 +561,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -576,8 +586,8 @@ msgid "Personal Message"
 msgstr "Kişisel Mesaj"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 4b568387284..f2849b75553 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 05:00+0000\n"
 "Last-Translator: sum1201 <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
 #, python-format
 msgid "Invitation to collaborate about %s"
 msgstr "关于%s的合作邀请"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
@@ -67,8 +67,8 @@ msgid "Share Title"
 msgstr "共享标题"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid ""
 "The documents are not attached, you can view them online directly on my "
@@ -83,8 +83,8 @@ msgid "Sharing"
 msgstr "共享"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
 #, python-format
 msgid ""
 "Hello,\n"
@@ -106,25 +106,32 @@ msgid "New user email"
 msgstr "新用户Email"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
 #, python-format
 msgid "(Modified)"
 msgstr "(已修改)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr "必须是销售/用户组才能使用 分享向导"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "创建用户 %s （%s ）的共享过滤器，在用户组 %s"
@@ -136,8 +143,8 @@ msgid "Share URL"
 msgstr "共享URL"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
 msgstr ""
@@ -148,18 +155,21 @@ msgid "Access info"
 msgstr "访问信息"
 
 #. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
 #: view:share.wizard:0
+#, python-format
 msgid "Share"
 msgstr "共享"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
@@ -176,14 +186,14 @@ msgid "Next"
 msgstr "下一个"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "Username"
 msgstr "用户名"
@@ -223,8 +233,8 @@ msgid "Share Group"
 msgstr "共享用户组"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid "Email required"
 msgstr "需要一个电子邮件地址"
@@ -255,8 +265,8 @@ msgid "Direct link or embed code"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
 #, python-format
 msgid ""
 "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
@@ -286,13 +296,13 @@ msgstr ""
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
 #, python-format
 msgid "Sharing access cannot be created."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
 #, python-format
 msgid "Record id not found"
 msgstr ""
@@ -314,7 +324,7 @@ msgid ""
 msgstr "这操作是打开包含要共享数据的视图。"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "（共享复制）"
@@ -330,7 +340,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "创建用户 %s  （%s ）间接共享过滤器，在用户组 %s"
@@ -354,7 +364,7 @@ msgid "User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -368,8 +378,8 @@ msgid "Use this link"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
 #, python-format
 msgid "Database"
 msgstr "数据库"
@@ -402,13 +412,13 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
 #, python-format
 msgid "Copied access for sharing"
 msgstr "共享的复制访问"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
 #, python-format
 msgid "Invitation"
 msgstr ""
@@ -424,7 +434,7 @@ msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
 #, python-format
 msgid ""
 "The documents have been automatically added to your current OpenERP "
@@ -447,7 +457,7 @@ msgid "Select the type of user(s) you would like to share data with."
 msgstr "选择你想共享数据的用户类型。"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
 #, python-format
 msgid ""
 "I have shared %s (%s) with you!\n"
@@ -489,7 +499,7 @@ msgid "Share Wizard"
 msgstr "共享向导"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
 #, python-format
 msgid "Shared access created!"
 msgstr ""
@@ -503,7 +513,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
 #, python-format
 msgid ""
 "The documents have been automatically added to your subscriptions.\n"
@@ -516,7 +526,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
 #, python-format
 msgid ""
 "I've shared %s with you!\n"
@@ -534,8 +544,8 @@ msgid "Invite users to OpenSocial record"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -559,8 +569,8 @@ msgid "Personal Message"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index 36268616e5c..8170a135959 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 13:29+0000\n"
 "Last-Translator: kifcaliph <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "تتبع المنبع"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "تحركات المنتج"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "لا يمكنك اداء هذه العملية على اكثر من مخزونات المخزون الواحد."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "يومية المخزون"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr "غير ممكن"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "مرجع"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "منتجات التي سيتم التعامل معها"
@@ -342,7 +335,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -352,22 +344,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -573,12 +565,12 @@ msgid "Location Type"
 msgstr "نوع الموقع"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "سحب المخزونات المادية"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -614,7 +606,7 @@ msgid "Item Labels"
 msgstr "التسميات للعنصر"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -730,9 +722,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "استقبال"
 
@@ -805,21 +795,15 @@ msgstr "أغسطس"
 msgid "Packs"
 msgstr "المجموعات"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "في انتظار التنفيذ"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -874,7 +858,7 @@ msgstr ""
 "المدخلات تلقائيًا عند اجراء تحركات المخزون."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -882,7 +866,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -909,7 +892,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "استقبالات فيما بعد"
@@ -980,9 +963,9 @@ msgid "IT Suppliers"
 msgstr "مزود معلومات التكنولوجية"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "سحب المخزونات المادية"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -991,7 +974,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "مكان العبور لتنقلات الشركات الداخلية"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1004,9 +987,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "تحرك تلقائي"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1014,7 +997,7 @@ msgid "Change Product Quantity"
 msgstr "قم بتغيير كمية المنتج"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "المنتج و المكان الآتي"
@@ -1044,7 +1027,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1082,9 +1065,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "العملة"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1093,12 +1077,6 @@ msgstr ""
 msgid "Journal"
 msgstr "يومية"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1158,6 +1136,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1293,7 +1276,7 @@ msgid "Author"
 msgstr "المؤلف"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1305,10 +1288,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "أمر التسليم"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1316,10 +1298,8 @@ msgid "Manual Operation"
 msgstr "العملية اليدوية"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1331,7 +1311,7 @@ msgid "Supplier"
 msgstr "مورِّد"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1339,16 +1319,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "تم التأريخ"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1512,13 +1490,7 @@ msgstr ""
 "الاختيار (عند استخدام منهج تكلفة السعر المتوسط)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "هل هي في حالة سحب"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1540,13 +1512,13 @@ msgid "To be refunded/invoiced"
 msgstr "ليتم ردها/عمل الفاتورة"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "يمكنك فقط حذف تحركات السحب."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1563,11 +1535,14 @@ msgid "Ready"
 msgstr "جاهز"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "عرض النتيجة"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "مسودة"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1580,11 +1555,10 @@ msgid "Additional Info"
 msgstr "معلومات اضافية"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "نقل"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1621,10 +1595,11 @@ msgid "Internal Picking List"
 msgstr "قائمة للمختار الداخلي"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "جاري الانتظار"
 
 #. module: stock
 #: view:stock.move:0
@@ -1638,9 +1613,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "متوقّع"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "المخزون"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1680,18 +1662,6 @@ msgstr "هوية خط المخزون"
 msgid "Address of  customer or supplier."
 msgstr "عنوان العميل او المزود"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1754,7 +1724,7 @@ msgid "Order Date"
 msgstr "تاريخ الأمر"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1792,7 +1762,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "فاتورة المخزون للشحن"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1838,10 +1808,9 @@ msgid "Stock Statistics"
 msgstr "احصائيات المخزون"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "العملة"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1941,12 +1910,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "رف 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "جاهز للاجراء"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1972,7 +1935,7 @@ msgid "Localization"
 msgstr "المحلية"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "الكمية المستلمة"
@@ -2039,7 +2002,6 @@ msgid "Date"
 msgstr "تاريخ"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2058,7 +2020,7 @@ msgid "Location Stock"
 msgstr "مخزون المكان"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2258,14 +2220,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "جاري الانتظار"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "الكمية المستلمة"
@@ -2297,7 +2252,6 @@ msgstr "قم بتوريد الجرد"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "الاسم"
@@ -2333,8 +2287,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2350,7 +2304,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2390,7 +2343,7 @@ msgid "Creation"
 msgstr "إنشاء"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2477,12 +2430,6 @@ msgstr "اماكن متسلسله"
 msgid "Inventory loss"
 msgstr "المفقود من الجرد"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "مستند"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2506,7 +2453,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2569,7 +2515,7 @@ msgid "Warehouse board"
 msgstr "جانب المستودع"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "الكمية القادمة"
@@ -2631,12 +2577,7 @@ msgid "Products"
 msgstr "المنتجات"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2676,7 +2617,7 @@ msgid "Outgoing Products"
 msgstr "المنتجات الصادرة"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2689,19 +2630,14 @@ msgid "Delay(Days)"
 msgstr "التأخير (الايام)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "نقل"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "كمية P&L"
@@ -2817,7 +2753,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2841,7 +2777,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2849,9 +2785,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2906,7 +2841,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2918,6 +2853,7 @@ msgstr "توقع المستوى للمخزون"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2928,13 +2864,13 @@ msgid "Stock Journal"
 msgstr "يومية المخزون"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "المشتريات"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "الهوية الفعالة غير معينه في السياق"
@@ -2962,13 +2898,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "استقبل المنتجات"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "المشتريات"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2996,7 +2938,7 @@ msgid "Date of Completion"
 msgstr "تاريخ الاكتمال"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3063,13 +3005,6 @@ msgstr "مخزون حقيقي"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3078,7 +3013,6 @@ msgstr "تاريخ المُراجعة"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "دفعة"
@@ -3101,12 +3035,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "الكمية (وحدة المبيعات)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "منتظر."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3117,29 +3045,6 @@ msgstr "خصص الاتاحة"
 msgid "Contact Address :"
 msgstr "عنوان الحاسب :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3148,7 +3053,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3166,7 +3071,7 @@ msgid "Properties"
 msgstr "خصائص"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "خطأ, لا يوجد شريك !"
@@ -3254,13 +3159,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "مرجع الجرد"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "اختيار داخلي"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3291,18 +3189,6 @@ msgstr "عمليّة"
 msgid "Revision Name"
 msgstr "اسم المراجعة"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "المخزون"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3329,7 +3215,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3376,7 +3262,7 @@ msgid "Date done"
 msgstr "تاريخ الاكتمال"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3401,8 +3287,8 @@ msgstr "غير ضروري"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "في انتظار التنفيذ"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3446,7 +3332,7 @@ msgid "Stock"
 msgstr "أسهم"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3512,7 +3398,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3685,11 +3571,6 @@ msgstr "المدير"
 msgid "Internal Shippings"
 msgstr "الشحن الداخلي"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3733,7 +3614,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "الانتجات القادمة"
@@ -3828,12 +3709,6 @@ msgstr "شركة"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3845,9 +3720,27 @@ msgid "Lot Inventory"
 msgstr "جرد المتوفر"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "السبب"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3886,7 +3779,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3908,16 +3800,16 @@ msgstr "لا يوجد عملاء اوروبيين"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3951,10 +3843,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "اختيار"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3963,7 +3856,7 @@ msgid "This picking list does not require invoicing."
 msgstr "هذه القائمة المحددة ليست فواتير مطلوبة."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4010,7 +3903,7 @@ msgstr ""
 "الثابتة."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4076,7 +3969,6 @@ msgstr ""
 "تحقق من هذه الخانة لتسمح استخدم هذا المكان بتعيين السلع المتبقيه/المعطوبة."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4084,7 +3976,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4125,10 +4017,9 @@ msgid "Product Category"
 msgstr "فئة المنتج"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " لـ "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4165,7 +4056,7 @@ msgstr ""
 "المدخلات للمخزون."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4184,7 +4075,7 @@ msgid "Chaining Journal"
 msgstr "يومية التسلسل"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "مخزون غير كاف , غير قادر على حجز المنتجات."
@@ -4205,12 +4096,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "أُلغيت."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4222,7 +4107,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "التسليمات القادمة"
@@ -4245,7 +4130,7 @@ msgid "Auto Validate"
 msgstr "تحقق ذاتي"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4262,9 +4147,9 @@ msgid "December"
 msgstr "ديسمبر"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "تحرك تلقائي"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4340,12 +4225,18 @@ msgid "Invoiced"
 msgstr "مفوتر"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "معلومات"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4399,14 +4290,11 @@ msgid "Internal"
 msgstr "داخلي"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "مسودة"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "عرض النتيجة"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4434,13 +4322,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "الرفوف (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4466,7 +4359,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4499,23 +4392,11 @@ msgid "November"
 msgstr "نوفمبر"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "كمية غير مخططة"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4526,15 +4407,6 @@ msgstr "شركة متسلسلة"
 msgid "Check Availability"
 msgstr "تأكد من توافرها"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "اختيار"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4572,14 +4444,14 @@ msgid "Move History (parent moves)"
 msgstr "سجل الحركة (التحركات الاساسية)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "المخزون القادم"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "خطأ"
@@ -4728,6 +4600,7 @@ msgid "Real"
 msgstr "حقيقي"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4773,7 +4646,7 @@ msgid "Location Content"
 msgstr "محتوى المكان"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "الكمية المنتجة"
@@ -4804,12 +4677,6 @@ msgstr ""
 msgid "Production"
 msgstr "الإنتاج"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "تمت:"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4843,6 +4710,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4927,7 +4799,7 @@ msgstr ""
 "العلامة تلقائيًا بناءًا على مصدر و اماكن التخصيص)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -4992,6 +4864,10 @@ msgstr ""
 #~ msgid "Recipient"
 #~ msgstr "المستقبل"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "أمر التسليم"
+
 #~ msgid "stock.move.memory.in"
 #~ msgstr "stock.move.memory.in"
 
@@ -5020,6 +4896,10 @@ msgstr ""
 #~ msgid "Partial Delivery"
 #~ msgstr "التسليم الجزئي"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "مستند"
+
 #~ msgid "Update"
 #~ msgstr "تحديث"
 
@@ -5049,6 +4929,9 @@ msgstr ""
 #~ msgid "UserError"
 #~ msgstr "خطأ مستخدم"
 
+#~ msgid "Reason"
+#~ msgstr "السبب"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "تحذير"
@@ -5059,6 +4942,9 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "التقارير"
 
+#~ msgid "Expected"
+#~ msgstr "متوقّع"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "يجب تعيين دفعة إنتاج لهذا المنتج"
 
@@ -5283,6 +5169,9 @@ msgstr ""
 #~ msgid "Delivery Information"
 #~ msgstr "معلومات التسليم"
 
+#~ msgid "Date Done"
+#~ msgstr "تم التأريخ"
+
 #~ msgid "Address of partner"
 #~ msgstr "عنوان الاساسي"
 
@@ -5303,6 +5192,10 @@ msgstr ""
 #~ "بالنسبة للمنتج الحالي, سيستخدم مكان المخزون هذا, بدلًا من الافتراضي منها, "
 #~ "كمكان المصدر لتحركات المخزون المنتجة يواسطة اوامر الانتاج"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "هل هي في حالة سحب"
+
 #, python-format
 #~ msgid ""
 #~ "Can not create Journal Entry, Output Account defined on this product and "
@@ -5526,6 +5419,10 @@ msgstr ""
 #~ msgid "Tracking prefix"
 #~ msgstr "تعقب البادئة"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "اختيار داخلي"
+
 #~ msgid "Open Product"
 #~ msgstr "قم بفتح المنتج"
 
@@ -5590,9 +5487,17 @@ msgstr ""
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "تم التعبير عن هذهالكمية في وحدة قياس افتراضية للمنتج."
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "تمت:"
+
 #~ msgid "It specifies goods to be delivered all at once or by direct delivery"
 #~ msgstr "وهي تخصص السلع لتُسلم الكل مرة واحده او تسليم مباشر"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "أُلغيت."
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "وثيقة الاجراء"
@@ -5600,6 +5505,10 @@ msgstr ""
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "الكمية لتركها في المجموعة الحالية"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " لـ "
+
 #~ msgid ""
 #~ "This menu gives you the full traceability of inventory operations on a "
 #~ "specific product. You can filter on the product to see all the past or "
@@ -5655,6 +5564,10 @@ msgstr ""
 #~ "للمنتج الحالي, سيستخدم مكان المخزون هذا, بدلًا من المكان الافتراضي, كمكان "
 #~ "لمصدر تحركات المخزون المنتجه من المشتريات"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "جاهز للاجراء"
+
 #, python-format
 #~ msgid ""
 #~ "Total quantity after split exceeds the quantity to split for this product: "
@@ -5817,6 +5730,10 @@ msgstr ""
 #~ msgstr ""
 #~ "أنت تقوم بنقل %.2f %s من المنتجات لكن يبقى المتاح فقط %.2f %s في هذا المتوفر."
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "منتظر."
+
 #~ msgid "Cost Price :"
 #~ msgstr "سعر التكلفة:"
 
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index 64bdf557f32..75ad045326f 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Складов дневник"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr "Неприложим"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "Означение"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Продукти за обработка"
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr "Вид местонахождение"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr "Етикети на артикули"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,21 +791,15 @@ msgstr "Август"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Трябва да се направи"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,8 +957,8 @@ msgid "IT Suppliers"
 msgstr "ИТ доставчици"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,9 +981,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Автоматично движение"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,9 +1059,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Валута"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1153,6 +1131,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1267,7 +1250,7 @@ msgid "Author"
 msgstr "Автор"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1279,10 +1262,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Порчъка за доставка"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1290,10 +1272,8 @@ msgid "Manual Operation"
 msgstr "Ръчна операция"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1305,7 +1285,7 @@ msgid "Supplier"
 msgstr "Доставчик"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1313,16 +1293,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Дата на извършване"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1477,13 +1455,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1505,13 +1477,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Може да изтривате само движения в проект"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1528,11 +1500,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Изглед на календар"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Проект"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1545,11 +1520,10 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Движение"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1586,10 +1560,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Чакащи"
 
 #. module: stock
 #: view:stock.move:0
@@ -1603,9 +1578,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Склад"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1645,18 +1627,6 @@ msgstr "Идентификатор на ред от наличност"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1719,7 +1689,7 @@ msgid "Order Date"
 msgstr "Дата на поръчка"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1757,7 +1727,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1803,10 +1773,9 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Валута"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1906,12 +1875,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1937,7 +1900,7 @@ msgid "Localization"
 msgstr "Локализация"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Доставено к-во"
@@ -2004,7 +1967,6 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2023,7 +1985,7 @@ msgid "Location Stock"
 msgstr "Местонахождение на склад"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2220,14 +2182,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Чакащи"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Получено к-во"
@@ -2259,7 +2214,6 @@ msgstr "Импортиране на наличности"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Име"
@@ -2295,8 +2249,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2312,7 +2266,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2350,7 +2303,7 @@ msgid "Creation"
 msgstr "Създаване"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2436,12 +2389,6 @@ msgstr "Свързани местонахождения"
 msgid "Inventory loss"
 msgstr "Липси на наличност"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Документ"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2465,7 +2412,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2528,7 +2474,7 @@ msgid "Warehouse board"
 msgstr "Табло Склад"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Бъдещо количесто"
@@ -2590,12 +2536,7 @@ msgid "Products"
 msgstr "Продукти"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2635,7 +2576,7 @@ msgid "Outgoing Products"
 msgstr "Изходящи продукти"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2648,19 +2589,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Движение"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "К-во загуби и пачалби"
@@ -2768,7 +2704,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2792,7 +2728,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2800,9 +2736,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2854,7 +2789,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2866,6 +2801,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2876,13 +2812,13 @@ msgid "Stock Journal"
 msgstr "Складов дневник"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Снабдаване"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2910,13 +2846,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Получаване на продукти"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Снабдаване"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2944,7 +2886,7 @@ msgid "Date of Completion"
 msgstr "Дата на завършване"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3011,13 +2953,6 @@ msgstr "Налична стока"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3026,7 +2961,6 @@ msgstr "Дата на ревизия"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Партида"
@@ -3049,12 +2983,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Коливество (мер.ед)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3065,29 +2993,6 @@ msgstr "Указване за налично"
 msgid "Contact Address :"
 msgstr "Адрес за контакт"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3096,7 +3001,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3114,7 +3019,7 @@ msgid "Properties"
 msgstr "Характеристики"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Грешка, няма партньор !"
@@ -3198,13 +3103,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3235,18 +3133,6 @@ msgstr "Обработка"
 msgid "Revision Name"
 msgstr "Име на ревизия"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Склад"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3273,7 +3159,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3320,7 +3206,7 @@ msgid "Date done"
 msgstr "Дата на приключване"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3346,8 +3232,8 @@ msgstr "Не е спешно"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Трябва да се направи"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3391,7 +3277,7 @@ msgid "Stock"
 msgstr "Склад"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3457,7 +3343,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3630,11 +3516,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3678,7 +3559,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Бъдеща продукция"
@@ -3773,12 +3654,6 @@ msgstr "Фирма"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3790,9 +3665,27 @@ msgid "Lot Inventory"
 msgstr "Партида от наличност"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Причина"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3831,7 +3724,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3853,16 +3745,16 @@ msgstr "Неевропейски клиенти"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3896,9 +3788,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3908,7 +3801,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3946,7 +3839,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4011,7 +3904,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4019,7 +3911,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4060,9 +3952,8 @@ msgid "Product Category"
 msgstr "Категория на продукта"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4096,7 +3987,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4115,7 +4006,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4136,12 +4027,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4153,7 +4038,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4176,7 +4061,7 @@ msgid "Auto Validate"
 msgstr "Автоматична проверка"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4193,9 +4078,9 @@ msgid "December"
 msgstr "Декември"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Автоматично движение"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4269,12 +4154,18 @@ msgid "Invoiced"
 msgstr "Фактуриран"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Информация"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4328,14 +4219,11 @@ msgid "Internal"
 msgstr "Вътрешен"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Проект"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Изглед на календар"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4358,13 +4246,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Искате ли да обедините тези наличности ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Лавици (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4390,7 +4283,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4423,23 +4316,11 @@ msgid "November"
 msgstr "Ноември"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Непланирано к-во"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4450,15 +4331,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Проверка за наличност"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4496,14 +4368,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Грешка"
@@ -4652,6 +4524,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4697,7 +4570,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Произведено к-во"
@@ -4728,12 +4601,6 @@ msgstr ""
 msgid "Production"
 msgstr "Производство"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4767,6 +4634,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4849,7 +4721,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5152,6 +5024,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Дата на извършване"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Очаквана дата за транспортиране"
 
@@ -5800,6 +5675,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Адрес на партньор"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Порчъка за доставка"
+
 #~ msgid "Lot number"
 #~ msgstr "Номер на партида"
 
@@ -5889,6 +5768,10 @@ msgstr ""
 #~ msgid "Update"
 #~ msgstr "Обновяване"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Документ"
+
 #~ msgid "Partial Picking"
 #~ msgstr "Частично товарене"
 
@@ -5923,6 +5806,9 @@ msgstr ""
 #~ msgid "Total"
 #~ msgstr "Общо"
 
+#~ msgid "Reason"
+#~ msgstr "Причина"
+
 #~ msgid "You try to assign a lot which is not from the same product"
 #~ msgstr "Опитвате да свържете партида, която не е от същия продукт"
 
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 9bf494d85cb..a7b0e24f105 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:31+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Dnevnik zaliha"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr "Tip lokacije"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,20 +791,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,8 +957,8 @@ msgid "IT Suppliers"
 msgstr "IT Dobavljači"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,9 +981,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatsko kretanje"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,8 +1059,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1149,6 +1127,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1263,7 +1246,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1275,9 +1258,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1286,10 +1268,8 @@ msgid "Manual Operation"
 msgstr "Ručna operacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1301,7 +1281,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,16 +1289,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Datum završetka"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1473,13 +1451,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1501,13 +1473,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1524,11 +1496,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendarski prikaz"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "U pripremi"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1541,10 +1516,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1582,10 +1556,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Čekanje"
 
 #. module: stock
 #: view:stock.move:0
@@ -1599,9 +1574,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Skladište"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1641,18 +1623,6 @@ msgstr "Šifra stavke popisa"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1715,7 +1685,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1753,7 +1723,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1799,9 +1769,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1902,12 +1871,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1933,7 +1896,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2000,7 +1963,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2019,7 +1981,7 @@ msgid "Location Stock"
 msgstr "Zaliha lokacije"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2214,14 +2176,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Čekanje"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2253,7 +2208,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Ime"
@@ -2289,8 +2243,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2306,7 +2260,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2344,7 +2297,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2430,12 +2383,6 @@ msgstr "Povezane lokacije"
 msgid "Inventory loss"
 msgstr "Popisni gubitak (manjak na skladištu)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2459,7 +2406,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2522,7 +2468,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2584,12 +2530,7 @@ msgid "Products"
 msgstr "Proizvodi"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2629,7 +2570,7 @@ msgid "Outgoing Products"
 msgstr "Proizvodi u procesu otpreme"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2642,19 +2583,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2762,7 +2698,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2786,7 +2722,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2794,9 +2730,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2848,7 +2783,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2860,6 +2795,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2870,13 +2806,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zaliha"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Nabavka"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2904,13 +2840,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Nabavka"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2938,7 +2880,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3005,13 +2947,6 @@ msgstr "Stvarne zalihe"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3020,7 +2955,6 @@ msgstr "Datum revizije"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partija"
@@ -3043,12 +2977,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Količina (KOL)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3059,29 +2987,6 @@ msgstr "Postavi dostupnost"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3090,7 +2995,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3108,7 +3013,7 @@ msgid "Properties"
 msgstr "Svojstva"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3192,13 +3097,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3229,18 +3127,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Naziv revizije"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Skladište"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3267,7 +3153,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3314,7 +3200,7 @@ msgid "Date done"
 msgstr "Datum završetka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3339,7 +3225,7 @@ msgstr "Nije hitno"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3384,7 +3270,7 @@ msgid "Stock"
 msgstr "Zaliha"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3450,7 +3336,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3623,11 +3509,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3671,7 +3552,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3766,12 +3647,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3783,8 +3658,26 @@ msgid "Lot Inventory"
 msgstr "Partija popisa"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3824,7 +3717,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3846,16 +3738,16 @@ msgstr "Nevropski kupci"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3889,9 +3781,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3901,7 +3794,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3939,7 +3832,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4004,7 +3897,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4012,7 +3904,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4053,9 +3945,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4089,7 +3980,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4108,7 +3999,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4129,12 +4020,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4146,7 +4031,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4169,7 +4054,7 @@ msgid "Auto Validate"
 msgstr "Automatska provjera"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4186,9 +4071,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatsko kretanje"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4262,12 +4147,18 @@ msgid "Invoiced"
 msgstr "Fakturisano"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacija"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4321,14 +4212,11 @@ msgid "Internal"
 msgstr "Unutrašnji"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "U pripremi"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendarski prikaz"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4351,13 +4239,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Da li želite da objedinite ove popise ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4383,7 +4276,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4416,23 +4309,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4443,15 +4324,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Provjera dostupnosti"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4489,14 +4361,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4645,6 +4517,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4690,7 +4563,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4721,12 +4594,6 @@ msgstr ""
 msgid "Production"
 msgstr "Proizvodnja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4760,6 +4627,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4842,7 +4714,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5018,6 +4890,9 @@ msgstr ""
 #~ msgid "STOCK_INDEX"
 #~ msgstr "STOCK_INDEX"
 
+#~ msgid "Date Done"
+#~ msgstr "Datum završetka"
+
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index 788cbd13e90..523cc41ee37 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "Traçabilitat cap amunt"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Moviments productes"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "No podeu realitzar aquesta operació en més d'un inventari d'estoc."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diari d'estocs"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -268,7 +262,6 @@ msgid "Not Applicable"
 msgstr "No aplicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -316,7 +309,7 @@ msgid "Reference"
 msgstr "Referència"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Productes a processar"
@@ -346,7 +339,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -356,22 +348,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Avís!"
@@ -577,12 +569,12 @@ msgid "Location Type"
 msgstr "Tipus d'ubicació"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventaris físics en esborrany"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -618,7 +610,7 @@ msgid "Item Labels"
 msgstr "Etiquetes articles"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -734,9 +726,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recepció"
 
@@ -809,21 +799,15 @@ msgstr "Agost"
 msgid "Packs"
 msgstr "Paquets"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Per fer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -879,7 +863,7 @@ msgstr ""
 "processin."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -887,7 +871,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -914,7 +897,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recepcions futures"
@@ -985,9 +968,9 @@ msgid "IT Suppliers"
 msgstr "Proveïdors TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventaris físics en esborrany"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -996,7 +979,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ubicació de trànsit per a transferències inter-empreses"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1009,9 +992,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Moviment automàtic"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1019,7 +1002,7 @@ msgid "Change Product Quantity"
 msgstr "Canvia quantitat de producte"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L futures"
@@ -1049,7 +1032,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1087,9 +1070,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Divisa"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1098,12 +1082,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diari"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "Està previst %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1164,6 +1142,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1305,7 +1288,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1317,10 +1300,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Ordre d'enviament"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1328,10 +1310,8 @@ msgid "Manual Operation"
 msgstr "Operació manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1343,7 +1323,7 @@ msgid "Supplier"
 msgstr "Proveïdor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1351,16 +1331,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Data realitzat"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1525,13 +1503,7 @@ msgstr ""
 "mitjà de cost)."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "està en estat esborrany."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1553,13 +1525,13 @@ msgid "To be refunded/invoiced"
 msgstr "Per ser abonat/facturat"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Només pot eliminar moviments esborrany."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1576,11 +1548,14 @@ msgid "Ready"
 msgstr "Preparat"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista calendari"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Esborrany"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1593,11 +1568,10 @@ msgid "Additional Info"
 msgstr "Informació addicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Moviment"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1634,10 +1608,11 @@ msgid "Internal Picking List"
 msgstr "Albarà intern"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: stock
 #: view:stock.move:0
@@ -1651,9 +1626,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Previst"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Magatzem"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1693,18 +1675,6 @@ msgstr "Id línia d'inventari"
 msgid "Address of  customer or supplier."
 msgstr "Adreça del client o proveïdor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1768,7 +1738,7 @@ msgid "Order Date"
 msgstr "Data ordre"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1808,7 +1778,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Estoc factura en l'enviament"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1854,10 +1824,9 @@ msgid "Stock Statistics"
 msgstr "Estadístiques d'estoc"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Divisa"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1957,12 +1926,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Prestatge 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "preparat per processar."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1988,7 +1951,7 @@ msgid "Localization"
 msgstr "Ubicació"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Qtat enviada"
@@ -2055,7 +2018,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2074,7 +2036,7 @@ msgid "Location Stock"
 msgstr "Ubicació estoc"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2275,14 +2237,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Qttat rebuda"
@@ -2316,7 +2271,6 @@ msgstr "Importa inventari"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nom"
@@ -2352,8 +2306,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2369,7 +2323,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2409,7 +2362,7 @@ msgid "Creation"
 msgstr "Creació"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2497,12 +2450,6 @@ msgstr "Ubicacions encadenades"
 msgid "Inventory loss"
 msgstr "Pèrdues d'inventari"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Document"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2526,7 +2473,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2589,7 +2535,7 @@ msgid "Warehouse board"
 msgstr "Taulell magatzem"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Qtat futura"
@@ -2651,12 +2597,7 @@ msgid "Products"
 msgstr "Productes"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2696,7 +2637,7 @@ msgid "Outgoing Products"
 msgstr "Albarans de sortida"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2709,19 +2650,14 @@ msgid "Delay(Days)"
 msgstr "Retard (dies)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Moviment"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Qtat P&L"
@@ -2840,7 +2776,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2864,7 +2800,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2872,9 +2808,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2930,7 +2865,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2942,6 +2877,7 @@ msgstr "Previsió nivell d'estoc"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2952,13 +2888,13 @@ msgid "Stock Journal"
 msgstr "Diari d'estocs"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Proveïment"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "No s'ha establert el ID actiu en el Context"
@@ -2986,13 +2922,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Rebre productes"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Proveïment"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3020,7 +2962,7 @@ msgid "Date of Completion"
 msgstr "Data de realització"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3088,13 +3030,6 @@ msgstr "Estoc real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3103,7 +3038,6 @@ msgstr "Data de revisió"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3126,12 +3060,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Quantitat (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3142,29 +3070,6 @@ msgstr "Reserva"
 msgid "Contact Address :"
 msgstr "Adreça del contacte:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3173,7 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3191,7 +3096,7 @@ msgid "Properties"
 msgstr "Propietats"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Error, no empresa!"
@@ -3280,13 +3185,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referència inventari"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Albarà intern"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3317,18 +3215,6 @@ msgstr "Processa"
 msgid "Revision Name"
 msgstr "Nom de revisió"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Magatzem"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3355,7 +3241,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3402,7 +3288,7 @@ msgid "Date done"
 msgstr "Data realització"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3427,8 +3313,8 @@ msgstr "No urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Per fer"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3472,7 +3358,7 @@ msgid "Stock"
 msgstr "Estoc"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3538,7 +3424,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3711,11 +3597,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Enviaments interns"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3759,7 +3640,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Produccions futures"
@@ -3854,12 +3735,6 @@ msgstr "Companyia"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3871,9 +3746,27 @@ msgid "Lot Inventory"
 msgstr "Regularització d'inventari"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motiu"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3912,7 +3805,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3934,16 +3826,16 @@ msgstr "Clients no europeus"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3977,10 +3869,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Albarà"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3989,7 +3882,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Aquest albarà no requereix facturació"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4037,7 +3930,7 @@ msgstr ""
 "encadenada si fixa."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4104,7 +3997,6 @@ msgstr ""
 "mercaderies rebutjades/defectuoses."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4112,7 +4004,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4153,10 +4045,9 @@ msgid "Product Category"
 msgstr "Categoria del producte"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " pel "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4194,7 +4085,7 @@ msgstr ""
 "l'haver i el compte d'entrada d'estoc anirà al deure."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4213,7 +4104,7 @@ msgid "Chaining Journal"
 msgstr "Diari encadenament"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Estoc insuficient, no ha estat possible reservar els productes."
@@ -4234,12 +4125,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "està cancel·lat."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4251,7 +4136,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Lliurament futur"
@@ -4274,7 +4159,7 @@ msgid "Auto Validate"
 msgstr "Auto valida"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4291,9 +4176,9 @@ msgid "December"
 msgstr "Desembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Moviment automàtic"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4369,12 +4254,18 @@ msgid "Invoiced"
 msgstr "Facturat"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informació"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4428,14 +4319,11 @@ msgid "Internal"
 msgstr "Intern"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Esborrany"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista calendari"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4463,13 +4351,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Voleu fusionar aquests inventaris?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "prestatgeria (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4495,7 +4388,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4528,23 +4421,11 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Qtat no planificada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4555,15 +4436,6 @@ msgstr "Companyia encadenada"
 msgid "Check Availability"
 msgstr "Comprova disponibilitat"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Albarà"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4601,14 +4473,14 @@ msgid "Move History (parent moves)"
 msgstr "Historial moviments (mov. pares)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Estoc futur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4759,6 +4631,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4804,7 +4677,7 @@ msgid "Location Content"
 msgstr "Contingut ubicació"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ctat produïda"
@@ -4835,12 +4708,6 @@ msgstr ""
 msgid "Production"
 msgstr "Producció"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "està realitzat."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4874,6 +4741,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4959,7 +4831,7 @@ msgstr ""
 "d'origen i destinació)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5226,6 +5098,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Data realitzat"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Data d'enviament prevista"
 
@@ -6026,6 +5901,10 @@ msgstr ""
 #~ msgid "stock.move.memory.in"
 #~ msgstr "estoc.moviment.memòria.entrada"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Ordre d'enviament"
+
 #~ msgid "Not Available"
 #~ msgstr "No disponible"
 
@@ -6149,6 +6028,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Producte "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Document"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Albarà d'entrada"
 
@@ -6202,6 +6085,10 @@ msgstr ""
 #~ "No s'ha definit un compte d'entrada d'estoc per a aquest producte: \"%s\" "
 #~ "(id: %d)"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Albarà intern"
+
 #~ msgid "Open Product"
 #~ msgstr "Obre producte"
 
@@ -6266,6 +6153,13 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "Moviments per aquest lot de producció"
 
+#~ msgid "Reason"
+#~ msgstr "Motiu"
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "està realitzat."
+
 #~ msgid "Reception:"
 #~ msgstr "Recepció:"
 
@@ -6276,6 +6170,10 @@ msgstr ""
 #~ msgid "Additional info"
 #~ msgstr "Informació addicional"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "està cancel·lat."
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "Processar document"
@@ -6329,6 +6227,10 @@ msgstr ""
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referència del document que ha generat aquest albarà."
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "preparat per processar."
+
 #~ msgid ""
 #~ "Forces to specify a Production Lot for all moves containing this product and "
 #~ "coming from a Supplier Location"
@@ -6365,6 +6267,9 @@ msgstr ""
 #~ "No hi ha productes per retornar (només les línies en estat Realitzat i "
 #~ "encara no retornades totalment poden ser retornades)!"
 
+#~ msgid "Expected"
+#~ msgstr "Previst"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Heu d'assignar un lot de producció per a aquest producte"
 
@@ -6418,6 +6323,10 @@ msgstr ""
 #~ " Quan l'albarà s'envia l'estat és 'Realitzat'.              \n"
 #~ "L'estat és 'En espera' si el moviment està a l'espera d'un altre."
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "està en estat esborrany."
+
 #~ msgid ""
 #~ "This is the list of all delivery orders that have to be prepared, according "
 #~ "to your different sales orders and your logistics rules."
@@ -6732,6 +6641,10 @@ msgstr ""
 #~ msgid "To invoice"
 #~ msgstr "Per facturar"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " pel "
+
 #, python-format
 #~ msgid "Stock Inventory is already Validated."
 #~ msgstr "L'inventari d'estoc està ja validat."
@@ -6740,6 +6653,10 @@ msgstr ""
 #~ msgid "Product  '%s' is consumed with '%s' quantity."
 #~ msgstr "'%s' producte que es consumeix amb '%s' quantitat."
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "Està previst %s."
+
 #, python-format
 #~ msgid "Inventory '%s' is done."
 #~ msgstr "l'inventari '%s' està llest."
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 8101e081b63..d89462366f8 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:36+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: stock
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr "Sledování proti proudu"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr "Pohyby výrobků"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -148,7 +149,7 @@ msgstr ""
 "Tuto operaci nemůžete provést na více než jednom skladovém inventáři."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -201,18 +202,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Deník zásob"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -268,7 +262,6 @@ msgid "Not Applicable"
 msgstr "Nelze použít"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -316,7 +309,7 @@ msgid "Reference"
 msgstr "Odkaz"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Výrobky ke zpracování"
@@ -346,7 +339,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -356,22 +348,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
@@ -575,12 +567,12 @@ msgid "Location Type"
 msgstr "Typ umístění"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -616,7 +608,7 @@ msgid "Item Labels"
 msgstr "Štítky položek"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -732,9 +724,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Příjem"
 
@@ -807,21 +797,15 @@ msgstr "Srpen"
 msgid "Packs"
 msgstr "Balíky"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "K provedení"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -874,7 +858,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -882,7 +866,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -909,7 +892,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Budoucí příjmy"
@@ -980,8 +963,8 @@ msgid "IT Suppliers"
 msgstr "Dodavatelé IT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -991,7 +974,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Přepravní umístění pro přesuny mezi společnostmi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1004,9 +987,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatický přesun"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1014,7 +997,7 @@ msgid "Change Product Quantity"
 msgstr "Změnit množství výrobků"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Budoucí P&L"
@@ -1044,7 +1027,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1082,9 +1065,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Měna"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1093,12 +1077,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Deník"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1155,6 +1133,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1270,7 +1253,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1282,10 +1265,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Objednávka doručení"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1293,10 +1275,8 @@ msgid "Manual Operation"
 msgstr "Ruční operace"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1308,7 +1288,7 @@ msgid "Supplier"
 msgstr "Dodavatel"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1316,16 +1296,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Datum dokončení"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1480,13 +1458,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1508,13 +1480,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Můžete smazat pouze návrhové přesuny."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1531,11 +1503,14 @@ msgid "Ready"
 msgstr "Připraveno"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendářový pohled"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Koncept"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1548,11 +1523,10 @@ msgid "Additional Info"
 msgstr "Doplňkové info"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Pohyb"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1590,10 +1564,11 @@ msgid "Internal Picking List"
 msgstr "Vnitřní naváděcí seznam"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Čekající"
 
 #. module: stock
 #: view:stock.move:0
@@ -1607,9 +1582,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Očekáváno"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Sklad"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1649,18 +1631,6 @@ msgstr "Id řádku inventáře"
 msgid "Address of  customer or supplier."
 msgstr "Adresa zákazníka nebo dodavatele"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1723,7 +1693,7 @@ msgid "Order Date"
 msgstr "Datum objednávky"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1762,7 +1732,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1808,10 +1778,9 @@ msgid "Stock Statistics"
 msgstr "Statistiky zásob"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Měna"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1911,12 +1880,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Regál 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "je připraveno ke zpracování."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1942,7 +1905,7 @@ msgid "Localization"
 msgstr "Lokalizace"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Doručené množ."
@@ -2009,7 +1972,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2028,7 +1990,7 @@ msgid "Location Stock"
 msgstr "Umístění zásob"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2223,14 +2185,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Čekající"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Obdržené množ."
@@ -2262,7 +2217,6 @@ msgstr "Importovat inventář"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Jméno"
@@ -2298,8 +2252,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2315,7 +2269,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2355,7 +2308,7 @@ msgid "Creation"
 msgstr "Vytvoření"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2441,12 +2394,6 @@ msgstr "Zřetězené místa"
 msgid "Inventory loss"
 msgstr "Ztráty inventáře"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2470,7 +2417,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2533,7 +2479,7 @@ msgid "Warehouse board"
 msgstr "Tabule skladu"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Budoucí množ."
@@ -2595,12 +2541,7 @@ msgid "Products"
 msgstr "Výrobky"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2640,7 +2581,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2653,19 +2594,14 @@ msgid "Delay(Days)"
 msgstr "Zpoždění(Dnů)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Pohyb"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L množ."
@@ -2773,7 +2709,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2797,7 +2733,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2805,9 +2741,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2859,7 +2794,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2871,6 +2806,7 @@ msgstr "Předpověď úrovně zásob"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2881,13 +2817,13 @@ msgid "Stock Journal"
 msgstr "Skladový deník"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Zásobování"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktivní ID není nastaveno v kontextu"
@@ -2915,13 +2851,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Obdržet výrobky"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Zásobování"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2949,7 +2891,7 @@ msgid "Date of Completion"
 msgstr "Datum dokončení"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3016,13 +2958,6 @@ msgstr "Skutečný sklad"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3031,7 +2966,6 @@ msgstr "Datum revize"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Dávka"
@@ -3054,12 +2988,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Množství (UOS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3070,29 +2998,6 @@ msgstr "Nastavit dostupné"
 msgid "Contact Address :"
 msgstr "Kontaktní adresa :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3101,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3119,7 +3024,7 @@ msgid "Properties"
 msgstr "Vlastnosti"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Chyba, žádný partner !"
@@ -3207,13 +3112,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Odkaz inventáře"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Vnitřní navádění"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3244,18 +3142,6 @@ msgstr "Proces"
 msgid "Revision Name"
 msgstr "Jméno revize"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Sklad"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3282,7 +3168,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3329,7 +3215,7 @@ msgid "Date done"
 msgstr "Datum dokončení"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3356,8 +3242,8 @@ msgstr "Není naléhavé"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "K provedení"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3401,7 +3287,7 @@ msgid "Stock"
 msgstr "Sklad"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3467,7 +3353,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3640,11 +3526,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Vnitřní zásilka"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3688,7 +3569,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Budoucí výroba"
@@ -3783,12 +3664,6 @@ msgstr "Společnost"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3800,9 +3675,27 @@ msgid "Lot Inventory"
 msgstr "Inventář dávek"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Důvod"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3841,7 +3734,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3863,16 +3755,16 @@ msgstr "Neevropský zákazník"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3906,10 +3798,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Navádění"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3918,7 +3811,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Naváděcí seznam nevyžaduje fakturaci."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3956,7 +3849,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4023,7 +3916,6 @@ msgstr ""
 "zmetkového/poškozeného zboží."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4031,7 +3923,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4072,10 +3964,9 @@ msgid "Product Category"
 msgstr "Kategorie výrobku"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " pro "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4108,7 +3999,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4127,7 +4018,7 @@ msgid "Chaining Journal"
 msgstr "Deník zřetězení"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nelze rezervovat výrobky kvůli nedostatku zásob."
@@ -4148,12 +4039,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "je zrušeno."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4165,7 +4050,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Budoucí dodávky"
@@ -4188,7 +4073,7 @@ msgid "Auto Validate"
 msgstr "Automaticky ověřit"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4205,9 +4090,9 @@ msgid "December"
 msgstr "Prosinec"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatický přesun"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4281,12 +4166,18 @@ msgid "Invoiced"
 msgstr "Fakturováno"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informace"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4338,14 +4229,11 @@ msgid "Internal"
 msgstr "Vnitřní"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Koncept"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendářový pohled"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4368,13 +4256,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Chcete sloučit tyto inventáře ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Regál (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4400,7 +4293,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4433,23 +4326,11 @@ msgid "November"
 msgstr "Listopad"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplánované množ."
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4460,15 +4341,6 @@ msgstr "Zřetězená společnost"
 msgid "Check Availability"
 msgstr "Zkontrolovat dostupnost"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Navádění"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4506,14 +4378,14 @@ msgid "Move History (parent moves)"
 msgstr "Historie pohybů (nadřazené pohyby)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Budoucí zásoby"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Chyba"
@@ -4662,6 +4534,7 @@ msgid "Real"
 msgstr "Skutečný"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4707,7 +4580,7 @@ msgid "Location Content"
 msgstr "Obsah místa"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Vyrobené množ."
@@ -4738,12 +4611,6 @@ msgstr ""
 msgid "Production"
 msgstr "Výroba"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "dokončeno."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4777,6 +4644,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4859,7 +4731,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5037,9 +4909,16 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Adresa partnera"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Objednávka doručení"
+
 #~ msgid "stock.move.memory.in"
 #~ msgstr "stock.move.memory.in"
 
+#~ msgid "Date Done"
+#~ msgstr "Datum dokončení"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Očekáváné datum přepravy"
 
@@ -5211,6 +5090,10 @@ msgstr ""
 #~ msgid "Stock Location Analysis"
 #~ msgstr "Analýza umístění zásob"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Vstupní seznam navádění"
 
@@ -5277,6 +5160,10 @@ msgstr ""
 #~ msgid "Tracking prefix"
 #~ msgstr "Předpona sledování"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Vnitřní navádění"
+
 #~ msgid "Open Product"
 #~ msgstr "Otevřít výrobek"
 
@@ -5315,6 +5202,9 @@ msgstr ""
 #~ msgid "stock.move.memory.out"
 #~ msgstr "stock.move.memory.out"
 
+#~ msgid "Reason"
+#~ msgstr "Důvod"
+
 #~ msgid "Delivery Order:"
 #~ msgstr "Objednávka doručení:"
 
@@ -5332,6 +5222,10 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Varování"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "dokončeno."
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Toto množství je vyjádřeno ve výchozím UoM výrobku."
 
@@ -5348,12 +5242,20 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "Hlášení"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " pro "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Množství k opuštění v aktuálním balíku"
 
 #~ msgid "Existing Lots"
 #~ msgstr "Existující dávky"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "je zrušeno."
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "Zpracovat dokument"
@@ -5391,6 +5293,10 @@ msgstr ""
 #~ "Pro aktuální výrobek bude použito toto umístění skladu namísto výchozího, "
 #~ "protože zdrojové umístění pro pohyb zásob je generováno zásobováním"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "je připraveno ke zpracování."
+
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Odkazuje na dokument, který vytvořilo toto navádění."
 
@@ -5442,6 +5348,9 @@ msgstr ""
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Pro tento výrobek musíte přiřadit výrobní dávku"
 
+#~ msgid "Expected"
+#~ msgstr "Očekáváno"
+
 #, python-format
 #~ msgid ""
 #~ "There are no products to return (only lines in Done state and not fully "
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
index 62b68990f7a..34db82fe940 100644
--- a/addons/stock/i18n/da.po
+++ b/addons/stock/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-09-22 19:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr "Lagerflytning"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr "August"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,9 +1060,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr "Leverandør"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,10 +1497,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1542,11 +1517,10 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Flyt"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1583,9 +1557,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1600,9 +1575,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Lagersted"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1642,18 +1624,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr "Ordredato"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,10 +1770,9 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr "Dato"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Flyt"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Indkøb"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Indkøb"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Lagersted"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr "Lager"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Fremtidige produktioner"
@@ -3767,12 +3648,6 @@ msgstr "Virksomhed"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,9 +3659,27 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Årsag"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,8 +4072,8 @@ msgid "December"
 msgstr "December"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr "Faktureret"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,13 +4211,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produktion"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -4897,5 +4769,8 @@ msgstr ""
 #~ msgid "Dates"
 #~ msgstr "Datoer"
 
+#~ msgid "Reason"
+#~ msgstr "Årsag"
+
 #~ msgid "Reporting"
 #~ msgstr "Rapportering"
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index e77fcb394a7..9628a964d8c 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-16 19:28+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 15:26+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -88,10 +89,11 @@ msgid "Upstream Traceability"
 msgstr "Verfolgung Upstream"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "Produkte wurden <b>ausgeliefert</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -129,8 +131,8 @@ msgid "Product Moves"
 msgstr "Produktlieferungen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Bitte geben Sie eine korrekte Anzahl an"
@@ -156,7 +158,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Dieser Vorgang kann nur in Zusammenhang mit einer Inventur erfolgen."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Menge darf nicht negativ sein"
@@ -209,18 +211,11 @@ msgid "Analyse a Period"
 msgstr "Analyse Zeitraum"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Lagerjournal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Produkte sind <b>eingegangen</b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -277,7 +272,6 @@ msgid "Not Applicable"
 msgstr "Nicht abzurechnen"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -325,7 +319,7 @@ msgid "Reference"
 msgstr "Referenz"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Produkte zu Lieferauftrag"
@@ -355,7 +349,6 @@ msgid "_Validate"
 msgstr "_Validiere"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -368,22 +361,22 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Warnung !"
@@ -593,12 +586,12 @@ msgid "Location Type"
 msgstr "Lagerort Art"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Lagerort & Lager"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Entwurf Lagerinventur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -646,7 +639,7 @@ msgid "Item Labels"
 msgstr "Produktetiketten"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "Die Lieferrückstande <em>%s</em> wurden erfolgreich <b>erstellt</b>."
@@ -681,7 +674,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Receive/Deliver Products"
-msgstr "Zugang / Abgang Produkte"
+msgstr "Einzelne Lieferpositionen"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -767,9 +760,7 @@ msgid "Destination Address "
 msgstr "Zieladresse "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Annahme"
 
@@ -842,21 +833,15 @@ msgstr "August"
 msgid "Packs"
 msgstr "Pakete"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Verfügbare Lagerbuchungen (zur Verarbeitung)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr "Sie können Kommissionierung  im Status %s  nicht entfernen!"
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Zu erledigen"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -915,7 +900,7 @@ msgid ""
 msgstr "Dies ist das Buchungsjournal für Echtzeitlagerbuchungen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -925,7 +910,6 @@ msgstr ""
 "oder dessen Kategorie: \"%s\" (id: %d)"
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -952,7 +936,7 @@ msgid "Time"
 msgstr "Bestelldatum"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Zukünftige Wareneingänge"
@@ -1025,9 +1009,9 @@ msgid "IT Suppliers"
 msgstr "IT Suppliers"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Entwurf Lagerinventur"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Lagerort & Lager"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1036,7 +1020,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Zwischenlager für  Lieferungen zwischen internen Unternehmen"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1051,9 +1035,9 @@ msgid "Decimal precision on weight"
 msgstr "Dezimalstellen für das Gewicht"
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatische Lieferung"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Verfügbare Produktionslose"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1061,7 +1045,7 @@ msgid "Change Product Quantity"
 msgstr "Ändere Menge"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Zukünftige G&V"
@@ -1091,7 +1075,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Sie müssen dem Produkt eine Seriennummer zuweisen."
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1130,9 +1114,10 @@ msgid "Pickings already processed"
 msgstr "Lieferscheine Bereits verarbeitet"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Planungsmonat"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Währung"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1141,12 +1126,6 @@ msgstr "Planungsmonat"
 msgid "Journal"
 msgstr "Journal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "ist geplant %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1195,7 +1174,7 @@ msgstr "Bestand nach Orten"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 msgid "Receive/Deliver By Orders"
-msgstr "Zugang / Abgang nach Auftrag"
+msgstr "Lieferscheine"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1207,6 +1186,11 @@ msgstr "Fertigungslose"
 msgid "Reverse Transfer"
 msgstr "Rücklieferung"
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1221,7 +1205,7 @@ msgstr ""
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
 msgstr ""
-"Wälen Sie mehrere reale Inventuren, die in dieser Liste zusammengeführt "
+"Wählen Sie mehrere reale Inventuren, die in dieser Liste zusammengeführt "
 "werden sollen."
 
 #. module: stock
@@ -1348,7 +1332,7 @@ msgid "Author"
 msgstr "Urheber"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1362,10 +1346,9 @@ msgid "Internal Shipment :"
 msgstr "Interne Lieferung"
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Lieferauftrag"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr "Aufteilen der Bestandspositionen"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1373,10 +1356,8 @@ msgid "Manual Operation"
 msgstr "Manuelle Durchführung"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr "Lieferung"
 
@@ -1388,7 +1369,7 @@ msgid "Supplier"
 msgstr "Lieferant"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1398,17 +1379,15 @@ msgstr ""
 "storniert werden."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Erledigt am"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr "Spezifizieren Sie Unternehmen in Lagerort"
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr "Produkte Lieferung wurde <b>gebucht</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Verfügbare Lagerbuchungen (zur Verarbeitung)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1598,13 +1577,7 @@ msgstr ""
 "(wenn Durschnittspreisbewertung gewählt ist)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "ist im Entwurf..."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Warnung: Keine Rückstandslieferung"
@@ -1626,13 +1599,13 @@ msgid "To be refunded/invoiced"
 msgstr "Rückvergütung/Rechungslegung zu erledigen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sie können lediglich Lieferungen im Entwurf Status löschen."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1650,11 +1623,14 @@ msgid "Ready"
 msgstr "Verfügbar"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalenderansicht"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Entwurf"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1667,11 +1643,10 @@ msgid "Additional Info"
 msgstr "Zusätzliche Information"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Buchung"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr "Fehlende Daten der Teillieferung für Lieferung #%s."
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1710,10 +1685,11 @@ msgid "Internal Picking List"
 msgstr "Interne Pickliste"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr "Produkte wurden <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Warteliste"
 
 #. module: stock
 #: view:stock.move:0
@@ -1727,9 +1703,16 @@ msgid "Delivery Slip"
 msgstr "Liefernachweis"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Erwartet"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Lager"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1773,18 +1756,6 @@ msgstr "Position"
 msgid "Address of  customer or supplier."
 msgstr "Kunden- oder Lieferantenadresse"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s wurde <b>erstellt</b>."
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr "%s wurde <b>bestätigt</b>."
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1859,7 +1830,7 @@ msgid "Order Date"
 msgstr "Auftragsdatum"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1899,7 +1870,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Rechnungserstellung bei Lieferung"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1946,10 +1917,9 @@ msgid "Stock Statistics"
 msgstr "Lager Statistik"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Währung"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Planungsmonat"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -2054,12 +2024,6 @@ msgstr "Lagerbewertungskonto (Eingehend)"
 msgid "Shelf 2"
 msgstr "Regal 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "ist bereit für Verarbeitung"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2085,7 +2049,7 @@ msgid "Localization"
 msgstr "Standort Lager"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Liefermenge"
@@ -2178,7 +2142,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2197,7 +2160,7 @@ msgid "Location Stock"
 msgstr "Hauptlager"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2435,14 +2398,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr "Erstelle Buchungen der Lagerbuchhaltung in Echtzeit"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Warteliste"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Angenommene Menge"
@@ -2476,7 +2432,6 @@ msgstr "Importiere Inventur"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Bezeichnung"
@@ -2512,8 +2467,8 @@ msgid "Customer Locations"
 msgstr "Kunden Lagerort"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Benutzerfehler !"
@@ -2529,7 +2484,6 @@ msgid "Create Invoice/Refund"
 msgstr "Erstelle Rechnung / Gutschrift"
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2570,7 +2524,7 @@ msgid "Creation"
 msgstr "Erstellung am"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr "Dieser Vorgang ist nicht erlaubt!"
@@ -2668,12 +2622,6 @@ msgstr "Verketteter Lagerort"
 msgid "Inventory loss"
 msgstr "Bestandsaufnahme"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2697,7 +2645,6 @@ msgid "Track serial number on products"
 msgstr "Seriennummern Rückverfolgung für Produkte"
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2760,7 +2707,7 @@ msgid "Warehouse board"
 msgstr "Anzeigetafel Lager"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Zukünftige Menge"
@@ -2822,12 +2769,7 @@ msgid "Products"
 msgstr "Produkte"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr "Aufteilen der Bestandspositionen"
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2870,7 +2812,7 @@ msgid "Outgoing Products"
 msgstr "Warenversand"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2885,19 +2827,14 @@ msgid "Delay(Days)"
 msgstr "Verzögerung(Tage)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr "Fehlende Daten der Teillieferung für Lieferung #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Buchung"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s wurde <b>abgebrochen</b>."
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Anzahl"
@@ -3014,10 +2951,10 @@ msgstr "Bestandsaufnahme Abbrechen"
 #. module: stock
 #: field:stock.config.settings,group_product_variant:0
 msgid "Support multiple variants per products  "
-msgstr "Unterstützung für mehrere Produkt Varianten  "
+msgstr "Unterstützung für mehrfache Produkt Varianten  "
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -3044,7 +2981,7 @@ msgid "scrap"
 msgstr "verschrotten"
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3054,10 +2991,9 @@ msgstr ""
 "aktualisiert."
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
-msgstr "Spezifizieren Sie Unternehmen in Lagerort"
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
+msgstr ""
 
 #. module: stock
 #: view:product.product:0
@@ -3119,7 +3055,7 @@ msgstr ""
 "Die Aktivierung installiert das Modul product_expiry."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr "Bitte geben Sie die richtige Menge an"
@@ -3131,6 +3067,7 @@ msgstr "Bestandsvorschau"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -3141,13 +3078,13 @@ msgid "Stock Journal"
 msgstr "Lager Journal"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Beschaffung"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktive ID ist nicht nicht in Kontext definiert"
@@ -3175,13 +3112,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr "Die Seriennummer wird zur Zuordnung bei der Fertigung eingesetzt"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Produktzugänge"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Beschaffung"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3209,7 +3152,7 @@ msgid "Date of Completion"
 msgstr "Datum der Vollständigkeit"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr "Produkt %s kann nicht von Ansicht Lagerort %s geliefert werden."
@@ -3289,15 +3232,6 @@ msgstr "Bestand"
 msgid "Logistic Serial Number"
 msgstr "Logistik Seriennummer"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-"<b>Menge wurde geändert</ b>auf<em> %s %s </ em>für den Lagerort<em>%s </ "
-"em> ."
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3306,7 +3240,6 @@ msgstr "Korrekturdatum"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Fertigungslos"
@@ -3331,12 +3264,6 @@ msgstr "Teillieferung Position"
 msgid "Quantity (UOS)"
 msgstr "Menge (VE)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "ist unerledigt"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3347,29 +3274,6 @@ msgstr "Ändere auf Verfügbar"
 msgid "Contact Address :"
 msgstr "Kontakt Adresse"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr "Seriennummer"
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3380,7 +3284,7 @@ msgstr ""
 "Upstream als auch Downstream Rückverfolgung möglich."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3398,7 +3302,7 @@ msgid "Properties"
 msgstr "Eigenschaften"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Fehler, kein Partner!"
@@ -3501,13 +3405,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Inventurauftrag"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Interne Buchung"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3552,18 +3449,6 @@ msgstr "Bestätigen"
 msgid "Revision Name"
 msgstr "Revisions Name"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Lager"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3600,7 +3485,7 @@ msgstr ""
 "            "
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr "%s %s %s wurde<b>gebucht als</b> verschrottet."
@@ -3647,7 +3532,7 @@ msgid "Date done"
 msgstr "Datum erledigt"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3674,8 +3559,8 @@ msgstr "Nicht dringend"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Zu erledigen"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3691,7 +3576,7 @@ msgstr "Verantwortlich"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Entirely"
-msgstr ""
+msgstr "Komplettlieferung vornehmen"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3721,7 +3606,7 @@ msgid "Stock"
 msgstr "Lager"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr "Gesendete Auslieferung"
@@ -3798,7 +3683,7 @@ msgid "Assigned Internal Moves"
 msgstr "Zugeordnete Interne Buchungen"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "Sie können keine Lieferung ohne Lagerbuchungen vornehmen"
@@ -3989,12 +3874,6 @@ msgstr "Manager"
 msgid "Internal Shippings"
 msgstr "Interne Lagerbewegungen"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-"Abrechnung von Produktzugängen in einer anderen Einheit als im Auftrag."
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -4048,7 +3927,7 @@ msgid "Inventory Move"
 msgstr "Lagerbuchung"
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Zukünftige Produktionen"
@@ -4162,12 +4041,6 @@ msgstr "Unternehmen"
 msgid "Product Unit of Measure"
 msgstr "Produkt Einheit"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr "Lieferauftrag"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -4179,9 +4052,27 @@ msgid "Lot Inventory"
 msgstr "Inventurlos"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Begründung"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr "Seriennummer"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -4224,7 +4115,6 @@ msgstr ""
 "dieser Kategorie, kann aber auch je Produkt individuell festgelegt werden."
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -4246,16 +4136,16 @@ msgstr "Kunden ausserhalb Europas"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4293,10 +4183,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Bestätigte Auslieferungsaufträge"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Lieferschein"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4305,7 +4196,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Diese Lieferscheine erfordern keine Rechnungserstellung"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4353,7 +4244,7 @@ msgstr ""
 "entnommen: Lagerort bei  Fester Lagerort."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4374,7 +4265,7 @@ msgstr "Seriennummer Revisionen"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 #: view:stock.picking.out:0
 msgid "Delivery Orders"
-msgstr "Warenauslieferung"
+msgstr "Warenausgang"
 
 #. module: stock
 #: view:stock.picking:0
@@ -4423,7 +4314,6 @@ msgstr ""
 "Produkte einzusetzen."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4431,7 +4321,7 @@ msgid "Followers"
 msgstr "Followers"
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4477,10 +4367,9 @@ msgid "Product Category"
 msgstr "Produktkategorie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " für diese "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4500,7 +4389,7 @@ msgstr "Konfiguration"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr "Verwaltung mehrerer Lagerorte und Lager"
+msgstr "Verwaltung mehrfacher Lagerorte und Lager"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4520,7 +4409,7 @@ msgstr ""
 "entlasted (Haben)."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "Re.:"
@@ -4543,7 +4432,7 @@ msgid "Chaining Journal"
 msgstr "Journal Lieferkette"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4572,12 +4461,6 @@ msgstr ""
 "Reservierungen aus, und sollte deshalb mit großer Vorsicht vorgenommen "
 "werden."
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "ist storniert"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4595,7 +4478,7 @@ msgstr ""
 "Lagerveränderungen hat diese Einstellung keine Auswirkung."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Zukünftige Lieferungen"
@@ -4618,7 +4501,7 @@ msgid "Auto Validate"
 msgstr "Automatisch Genehmigen"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "Ungültiger Lagerort für Seriennummer !"
@@ -4635,9 +4518,9 @@ msgid "December"
 msgstr "Dezember"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Verfügbare Produktionslose"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatische Lieferung"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4717,12 +4600,18 @@ msgid "Invoiced"
 msgstr "Abgerechnet"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Information"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr "Sie können Kommissionierung  im Status %s  nicht entfernen!"
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4776,14 +4665,11 @@ msgid "Internal"
 msgstr "Intern"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Entwurf"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalenderansicht"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4812,13 +4698,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Wollen Sie diese Bestandsaufnahmen zusammenfassen?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Lagerort Adresse (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4848,7 +4739,7 @@ msgstr ""
 "                        Es wird das Modul claim_from_delivery installiert."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr "Bitte spezifizieren Sie wenigstens eine Menge ungleich 0"
@@ -4881,23 +4772,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ungeplante Menge"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Kommentare und E-Mails"
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4908,15 +4787,6 @@ msgstr "Lieferkette zu Unternehmen"
 msgid "Check Availability"
 msgstr "Prüfe Verfügbarkeit"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Lieferschein"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4961,14 +4831,14 @@ msgid "Move History (parent moves)"
 msgstr "Buchungshistorie (übergeordnete Buchungen)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Zukünftiger Lagerbestand"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Fehler"
@@ -5098,7 +4968,7 @@ msgstr ""
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "Geplante Zeit"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -5132,6 +5002,7 @@ msgid "Real"
 msgstr "Bestand"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -5177,7 +5048,7 @@ msgid "Location Content"
 msgstr "Lagerinhalt"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Prod. Anzahl"
@@ -5208,12 +5079,6 @@ msgstr "Geplante Zeit für weitere Auslieferung"
 msgid "Production"
 msgstr "Produktionsstätte"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "ist erledigt"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -5262,6 +5127,11 @@ msgstr ""
 "              </p>\n"
 "            "
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -5360,7 +5230,7 @@ msgstr ""
 "Ziel erkannt werden soll)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5637,6 +5507,9 @@ msgstr "Lager Anschrift"
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Erledigt am"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Erwartete Auslieferung"
 
@@ -6328,6 +6201,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Action"
 #~ msgstr "Aktion"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Lieferauftrag"
+
 #~ msgid "Lot number"
 #~ msgstr "Fertigungslosnummer"
 
@@ -6345,6 +6222,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Product "
 #~ msgstr "Produkt "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
 #~ msgid "Update"
 #~ msgstr "Aktualisieren"
 
@@ -6363,6 +6244,9 @@ msgstr "Lager Anschrift"
 #~ msgid "Order"
 #~ msgstr "Auftrag"
 
+#~ msgid "Reason"
+#~ msgstr "Begründung"
+
 #~ msgid "Destination Address"
 #~ msgstr "Lieferanschrift:"
 
@@ -6468,6 +6352,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Production Lot Number"
 #~ msgstr "Produktionslosnummer"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Interne Buchung"
+
 #, python-format
 #~ msgid "Please provide Proper Quantity !"
 #~ msgstr "Bitte eine richtige Menge angeben!"
@@ -6479,9 +6367,21 @@ msgstr "Lager Anschrift"
 #~ msgid "You cannot remove the picking which is in %s state !"
 #~ msgstr "Ein Lieferschein mit Status %s kann nicht entfernt werden."
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "ist erledigt"
+
+#, python-format
+#~ msgid " for the "
+#~ msgstr " für diese "
+
 #~ msgid "Existing Lots"
 #~ msgstr "bestehende Lose"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "ist storniert"
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "Verarbeite Dokument"
@@ -6495,6 +6395,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Existing Lot"
 #~ msgstr "Bestehendes Los"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "ist bereit für Verarbeitung"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "is geplant"
@@ -6502,6 +6406,9 @@ msgstr "Lager Anschrift"
 #~ msgid "XML File"
 #~ msgstr "XML Datei"
 
+#~ msgid "Expected"
+#~ msgstr "Erwartet"
+
 #~ msgid "Keep in one lot"
 #~ msgstr "In einem Los verarbeiten"
 
@@ -6525,6 +6432,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Month-1"
 #~ msgstr "Monat-1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "ist im Entwurf..."
+
 #, python-format
 #~ msgid "Company is not specified in Location"
 #~ msgstr "Das Unternehmen ist für den Lagerort nicht definiert"
@@ -7132,6 +7043,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Product  '%s' is consumed with '%s' quantity."
 #~ msgstr "Produkt  '%s'  Verbracuhsmenge '%s' ."
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "ist geplant %s."
+
 #, python-format
 #~ msgid "Inventory '%s' is done."
 #~ msgstr "Inventur '%s' is erledigt."
@@ -7179,6 +7094,10 @@ msgstr "Lager Anschrift"
 #~ msgid "Last month"
 #~ msgstr "Letzter Monat"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "ist unerledigt"
+
 #~ msgid "Current year"
 #~ msgstr "Aktuelles Jahr"
 
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index dfdeaafd522..84ee16cb964 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -82,9 +82,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -123,8 +124,8 @@ msgid "Product Moves"
 msgstr "Κινήσεις Προϊόντων"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -150,7 +151,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -203,18 +204,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Ημερολόγιο Αποθέματος"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -269,7 +263,6 @@ msgid "Not Applicable"
 msgstr "Μη Εφαρμόσιμο"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -317,7 +310,7 @@ msgid "Reference"
 msgstr "Παραπομπή"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Προϊόντα για Επεξεργασία"
@@ -347,7 +340,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -357,22 +349,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Προειδοποίηση!"
@@ -576,12 +568,12 @@ msgid "Location Type"
 msgstr "Τύπος Τοποθεσίας"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -617,7 +609,7 @@ msgid "Item Labels"
 msgstr "Ετικέτα Είδους"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -733,9 +725,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Αποδοχή"
 
@@ -808,21 +798,15 @@ msgstr "Αύγουστος"
 msgid "Packs"
 msgstr "Πακέτο"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Εκκρεμότητες"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -875,7 +859,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -883,7 +867,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -910,7 +893,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Μελοντικές Εισαγωγές"
@@ -981,8 +964,8 @@ msgid "IT Suppliers"
 msgstr "Προμηθευτές ΙΤ"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -992,7 +975,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1005,9 +988,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Αυτόματη Κίνηση"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1015,7 +998,7 @@ msgid "Change Product Quantity"
 msgstr "Άλλαξε την Ποσότητα Προϊόντος"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1045,7 +1028,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1083,9 +1066,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Νόμισμα"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1094,12 +1078,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1160,6 +1138,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1274,7 +1257,7 @@ msgid "Author"
 msgstr "Δημιουργός"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1286,10 +1269,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Εντολή Παράδοσης"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1297,10 +1279,8 @@ msgid "Manual Operation"
 msgstr "Μη Αυτόματη Διαδικασία"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1312,7 +1292,7 @@ msgid "Supplier"
 msgstr "Προμηθευτής"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1320,16 +1300,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Ημερ/νία Ολοκλήρωσης"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1484,13 +1462,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "είναι σε πρόχειτη κατάσταση"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1512,13 +1484,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Μπορείτε να διαγράψετε μόνο πρόχειρες κινήσεις."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1535,11 +1507,14 @@ msgid "Ready"
 msgstr "Έτοιμο"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Ημερολογιακή Προβολή"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Πρόχειρο"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1552,11 +1527,10 @@ msgid "Additional Info"
 msgstr "Επιπλέον Πληροφορίες"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Μετακίνηση"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1593,10 +1567,11 @@ msgid "Internal Picking List"
 msgstr "Εσωτερική  Λίστα Διακίνησης"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Σε αναμονή"
 
 #. module: stock
 #: view:stock.move:0
@@ -1610,9 +1585,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Αναμενόμενο"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Αποθηκευτικός Χώρος"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1652,18 +1634,6 @@ msgstr "Αριθμός Γραμμής Απογραφής"
 msgid "Address of  customer or supplier."
 msgstr "Διεύθυνση πελάτη ή προμηθευτή"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1726,7 +1696,7 @@ msgid "Order Date"
 msgstr "Ημερομηνία Παραγγελίας"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1765,7 +1735,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1811,10 +1781,9 @@ msgid "Stock Statistics"
 msgstr "Στατιστικά Στοκ"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Νόμισμα"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1914,12 +1883,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Ράφι 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "είναι έτοιμο για επεξεργασία"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1945,7 +1908,7 @@ msgid "Localization"
 msgstr "Τοπικοποίηση"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Παραληφθήσα Ποσ."
@@ -2012,7 +1975,6 @@ msgid "Date"
 msgstr "Ημερ/νία"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2031,7 +1993,7 @@ msgid "Location Stock"
 msgstr "Απόθεμα Τοποθεσίας"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2229,14 +2191,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Σε αναμονή"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Παραληφθήσα Ποσ."
@@ -2268,7 +2223,6 @@ msgstr "Εισαγωγή Αποθέμάτων"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Όνομα"
@@ -2304,8 +2258,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2321,7 +2275,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2359,7 +2312,7 @@ msgid "Creation"
 msgstr "Δημιουργία"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2445,12 +2398,6 @@ msgstr "Συνδεδεμένες Τοποθεσίες"
 msgid "Inventory loss"
 msgstr "Απώλεια αποθέματος"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Έγγραφο"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2474,7 +2421,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2537,7 +2483,7 @@ msgid "Warehouse board"
 msgstr "Πινακίδα Αποθήκης"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Μελοντική Ποσ."
@@ -2599,12 +2545,7 @@ msgid "Products"
 msgstr "Προϊόντα"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2644,7 +2585,7 @@ msgid "Outgoing Products"
 msgstr "Εξερχόμενα Προϊόντα"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2657,19 +2598,14 @@ msgid "Delay(Days)"
 msgstr "Καθυστέρηση(Μέρες)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Μετακίνηση"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L Ποσ."
@@ -2777,7 +2713,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2801,7 +2737,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2809,9 +2745,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2863,7 +2798,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2875,6 +2810,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2885,13 +2821,13 @@ msgid "Stock Journal"
 msgstr "Ημερολόγιο Αποθέματος"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Προμήθειες"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2919,13 +2855,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Παραλαβή Προϊόντων"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Προμήθειες"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2953,7 +2895,7 @@ msgid "Date of Completion"
 msgstr "Ημερομηνία Ολοκλήρωσης"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3020,13 +2962,6 @@ msgstr "Πραγματικό Απόθεμα"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3035,7 +2970,6 @@ msgstr "Ημερ/νία Αναθεώρησης"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Παρτίδα"
@@ -3058,12 +2992,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Ποσότητα (ΜoΠ)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3074,29 +3002,6 @@ msgstr "Ορισμός ως Διαθεσίμου"
 msgid "Contact Address :"
 msgstr "Διεύθυνση Επαφής"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3105,7 +3010,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3123,7 +3028,7 @@ msgid "Properties"
 msgstr "Ιδιότητες"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Σφάλμα! Δεν έχει οριστεί Συνεργάτης"
@@ -3207,13 +3112,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Εσωτερική Παραλαβή"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3244,18 +3142,6 @@ msgstr "Διαδικασία"
 msgid "Revision Name"
 msgstr "Όνομα Αναθεώρησης"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Αποθηκευτικός Χώρος"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3282,7 +3168,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3329,7 +3215,7 @@ msgid "Date done"
 msgstr "Ημερ/νία ολοκλήρωσης"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3354,8 +3240,8 @@ msgstr "Όχι επείγον"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Εκκρεμότητες"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3399,7 +3285,7 @@ msgid "Stock"
 msgstr "Απόθεμα"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3465,7 +3351,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3638,11 +3524,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Εσωτερικές διακινήσεις"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3686,7 +3567,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3781,12 +3662,6 @@ msgstr "Εταιρεία"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3798,9 +3673,27 @@ msgid "Lot Inventory"
 msgstr "Απογραφή Παρτίδας"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Αιτία"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3839,7 +3732,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3861,16 +3753,16 @@ msgstr "Πελάτες εκτός Ευρώπης"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3904,10 +3796,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Παραλαβή"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3916,7 +3809,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3954,7 +3847,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4019,7 +3912,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4027,7 +3919,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4068,10 +3960,9 @@ msgid "Product Category"
 msgstr "Κατηγορία Προϊόντος"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " για "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4104,7 +3995,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4123,7 +4014,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Δεν υπάρχει αρκετό στοκ,δεν μπορούνε να διατηρηθούν τα προϊόντα"
@@ -4144,12 +4035,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "έχει ακυρωθεί"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4161,7 +4046,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Μελοντικές Παραδόσεις"
@@ -4184,7 +4069,7 @@ msgid "Auto Validate"
 msgstr "Αυτόματη Επικύρωση"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4201,9 +4086,9 @@ msgid "December"
 msgstr "Δεκέμβριος"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Αυτόματη Κίνηση"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4277,12 +4162,18 @@ msgid "Invoiced"
 msgstr "Τιμολογημένο"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Πληροφορίες"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4336,14 +4227,11 @@ msgid "Internal"
 msgstr "Εσωτερικό"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Πρόχειρο"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Ημερολογιακή Προβολή"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4366,13 +4254,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Επιθυμείτε να συγχωνεύσετε αυτές τις απογραφές;"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Ράφια (Υ)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4398,7 +4291,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4431,23 +4324,11 @@ msgid "November"
 msgstr "Νοέμβριος"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ποσ. Εκτός Προγραμματισμού"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4458,15 +4339,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Έλεγχος Δαθεσιμότητας"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Παραλαβή"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4504,14 +4376,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -4660,6 +4532,7 @@ msgid "Real"
 msgstr "Πραγματικό"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4705,7 +4578,7 @@ msgid "Location Content"
 msgstr "Τοποθεσία Περιεχομένου"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ποσ. Παραγωγής"
@@ -4736,12 +4609,6 @@ msgstr ""
 msgid "Production"
 msgstr "Παραγωγή"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4775,6 +4642,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4857,7 +4729,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5162,6 +5034,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Ημερ/νία Ολοκλήρωσης"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Αναμενόμενη Ημερ/νία Αποστολής"
 
@@ -5845,6 +5720,10 @@ msgstr ""
 #~ msgid "Partial Delivery"
 #~ msgstr "Μερική Παράδοση"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Εντολή Παράδοσης"
+
 #, python-format
 #~ msgid "Cannot deliver products which are already delivered !"
 #~ msgstr "Δεν μπορείτε να παραδώσετε προϊόντα που έχουνε ήδη παραληφθεί !"
@@ -5887,6 +5766,9 @@ msgstr ""
 #~ msgid "Warning !"
 #~ msgstr "Προειδοποίηση!"
 
+#~ msgid "Expected"
+#~ msgstr "Αναμενόμενο"
+
 #~ msgid "You try to assign a lot which is not from the same product"
 #~ msgstr ""
 #~ "Προσπαθείτε να αντιστοιχίσετε μια παρτίδα που δεν είναι από το ίδιο προϊόν"
@@ -5894,6 +5776,10 @@ msgstr ""
 #~ msgid "Shop 1"
 #~ msgstr "Κατάστημα 1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "είναι σε πρόχειτη κατάσταση"
+
 #, python-format
 #~ msgid "Operation forbidden"
 #~ msgstr "Απαγορευμένη διαδικασία"
@@ -5936,6 +5822,10 @@ msgstr ""
 #~ msgid "Incoming Product"
 #~ msgstr "Εισερχόμενο Προϊόν"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Έγγραφο"
+
 #~ msgid "Update"
 #~ msgstr "Ενημέρωση"
 
@@ -5979,6 +5869,10 @@ msgstr ""
 #~ "Σφάλμα: Η προκαθορισμένη ΜΜ και η ΜΜ αγορών πρέπει να είναι στην ίδια "
 #~ "κατηγορία."
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Εσωτερική Παραλαβή"
+
 #~ msgid "Open Product"
 #~ msgstr "Ανοιχτό Προϊόν"
 
@@ -6004,6 +5898,9 @@ msgstr ""
 #~ msgid "Message !"
 #~ msgstr "Μύνημα !"
 
+#~ msgid "Reason"
+#~ msgstr "Αιτία"
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Αυτή η ποσότητα εκφράζεται στην προεπιλεγμένη Μ.Μ. του προϊόντος."
 
@@ -6014,9 +5911,17 @@ msgstr ""
 #~ msgid "Existing Lots"
 #~ msgstr "Υπάρχουσες Παρτίδες"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " για "
+
 #~ msgid "Additional info"
 #~ msgstr "Επιπλέον Πληροφορίες"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "έχει ακυρωθεί"
+
 #~ msgid "Products Moves"
 #~ msgstr "Κινήσεις Προϊόντων"
 
@@ -6029,6 +5934,10 @@ msgstr ""
 #~ msgid "Existing Lot"
 #~ msgstr "Υπάρχουσες Παρτίδες"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "είναι έτοιμο για επεξεργασία"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "είναι προγραμματιζμένο"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index d89c7af4f0c..abc02adf394 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-20 03:45+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 11:40+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Stock Management"
@@ -91,10 +91,11 @@ msgid "Upstream Traceability"
 msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "Los productos han sido <b>enviados</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr "Fecha de transferencia"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -132,8 +133,8 @@ msgid "Product Moves"
 msgstr "Movimientos productos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Por favor introduzca una cantidad adecuada."
@@ -159,7 +160,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "No puedes realizar esta operación en más de un Inventario de Stock."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "La cantidad no puede ser negativa"
@@ -212,18 +213,11 @@ msgid "Analyse a Period"
 msgstr "Analizar un periodo"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Los productos han sido <b>recibidos</b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -280,7 +274,6 @@ msgid "Not Applicable"
 msgstr "No aplicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -328,7 +321,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Productos a procesar"
@@ -358,7 +351,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -370,22 +362,22 @@ msgstr ""
 "directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -593,12 +585,12 @@ msgid "Location Type"
 msgstr "Tipo de ubicación"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Ubicación y almacén"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios físicos borrador"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -645,7 +637,7 @@ msgid "Item Labels"
 msgstr "Etiquetas artículos"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "El pedido en espera <em>%s</em> ha sido <b>creado</b>."
@@ -766,9 +758,7 @@ msgid "Destination Address "
 msgstr "Dirección de destino "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recepción"
 
@@ -841,22 +831,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Paquetes"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-"Movimientos de stock que están disponibles (preparados para ser procesados)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr "Analizar inventario actual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr "¡No puede eliminar un albrán que está en estado %s!"
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Para hacer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -918,7 +901,7 @@ msgstr ""
 "movimientos de stock se procesen."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -928,7 +911,6 @@ msgstr ""
 "categoría: \"%s\" (id: %d)"
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -955,7 +937,7 @@ msgid "Time"
 msgstr "Tiempo"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recepciones futuras"
@@ -1028,9 +1010,9 @@ msgid "IT Suppliers"
 msgstr "Proveedores TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Ubicación y almacén"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1039,7 +1021,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ubicación de tránsito para transferencias inter-compañías"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1054,9 +1036,9 @@ msgid "Decimal precision on weight"
 msgstr "Precisión decimal en los pesos"
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Lotes de producto disponibles"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1064,7 +1046,7 @@ msgid "Change Product Quantity"
 msgstr "Cambiar cantidad producto"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L futuras"
@@ -1094,7 +1076,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Debe asignar un nº de serie para este producto."
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1133,9 +1115,10 @@ msgid "Pickings already processed"
 msgstr "Albaranes ya procesados"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Mes planificado"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1144,12 +1127,6 @@ msgstr "Mes planificado"
 msgid "Journal"
 msgstr "Diario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "está planificado %s"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1209,6 +1186,12 @@ msgstr "Lotes de producto"
 msgid "Reverse Transfer"
 msgstr "Revertir transferencia"
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+"Facturar productos en una unidad de medida diferente a la del pedido de venta"
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1353,7 +1336,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1367,10 +1350,9 @@ msgid "Internal Shipment :"
 msgstr "Envío interno:"
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Albarán de salida"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr "Dividir línea de inventario"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1378,10 +1360,8 @@ msgid "Manual Operation"
 msgstr "Operación manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr "Envío"
 
@@ -1393,7 +1373,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1403,17 +1383,16 @@ msgstr ""
 "en el diario"
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Fecha realizado"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr "Especifique por favor una compañía en 'Ubicación'."
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr "Los productos han sido <b>movidos</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
+"Movimientos de stock que están disponibles (preparados para ser procesados)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1600,13 +1579,7 @@ msgstr ""
 "precio medio de coste)."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "está en estado borrador."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Advertencia: No hay pedido en espera"
@@ -1628,13 +1601,13 @@ msgid "To be refunded/invoiced"
 msgstr "Para ser abonado/facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sólo puede eliminar movimientos borrador."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr "No puede mover el producto %s a la ubicación de tipo vista %s."
@@ -1651,11 +1624,14 @@ msgid "Ready"
 msgstr "Preparado"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista calendario"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1668,11 +1644,10 @@ msgid "Additional Info"
 msgstr "Información adicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Movimiento"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr "Datos incompletos para el albarán parcial para el movimiento #%s."
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1711,10 +1686,11 @@ msgid "Internal Picking List"
 msgstr "Albarán interno"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr "Los productos han sido <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: stock
 #: view:stock.move:0
@@ -1728,9 +1704,16 @@ msgid "Delivery Slip"
 msgstr "Vale de entrega"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Previsto"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Almacén"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1776,18 +1759,6 @@ msgstr "Id línea de inventario"
 msgid "Address of  customer or supplier."
 msgstr "Dirección del cliente o proveedor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s ha sido  <b>creado</b>."
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr "%s ha sido  <b>confirmado</b>."
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1862,7 +1833,7 @@ msgid "Order Date"
 msgstr "Fecha orden"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1904,7 +1875,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Stock factura en el envío"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr "Introduzca por favor una cantidad positiva a deshechar"
@@ -1950,10 +1921,9 @@ msgid "Stock Statistics"
 msgstr "Estadísticas de stock"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Mes planificado"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -2059,12 +2029,6 @@ msgstr "Cuenta de valoracion de existencias (entrada)"
 msgid "Shelf 2"
 msgstr "Estante 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "preparado para procesar."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2090,7 +2054,7 @@ msgid "Localization"
 msgstr "Ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Ctdad enviada"
@@ -2176,7 +2140,6 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2195,7 +2158,7 @@ msgid "Location Stock"
 msgstr "Ubicación stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr "_Entregar"
@@ -2420,14 +2383,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr "Generar asientos contrables por cada movimiento de stock"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ctdad recibida"
@@ -2463,7 +2419,6 @@ msgstr "Importar inventario"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -2499,8 +2454,8 @@ msgid "Customer Locations"
 msgstr "Ubicaciones de cliente"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "¡Error de usuario!"
@@ -2516,7 +2471,6 @@ msgid "Create Invoice/Refund"
 msgstr "Crear factura/abono"
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2557,7 +2511,7 @@ msgid "Creation"
 msgstr "Creación"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr "¡Operación prohibida!"
@@ -2654,12 +2608,6 @@ msgstr "Ubicaciones encadenadas"
 msgid "Inventory loss"
 msgstr "Pérdidas de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2683,7 +2631,6 @@ msgid "Track serial number on products"
 msgstr "Rastrear nº de serie en los productos"
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2748,7 +2695,7 @@ msgid "Warehouse board"
 msgstr "Tablero almacén"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Ctdad futura"
@@ -2811,12 +2758,7 @@ msgid "Products"
 msgstr "Productos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr "Dividir línea de inventario"
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2858,7 +2800,7 @@ msgid "Outgoing Products"
 msgstr "Albaranes de salida"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2873,19 +2815,14 @@ msgid "Delay(Days)"
 msgstr "Retraso (días)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr "Datos incompletos para el albarán parcial para el movimiento #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Movimiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s ha sido  <b>cancelado</b>."
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Ctdad P&L"
@@ -3004,7 +2941,7 @@ msgid "Support multiple variants per products  "
 msgstr "Permite múltiples variantes por producto  "
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -3030,7 +2967,7 @@ msgid "scrap"
 msgstr "desecho"
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3040,10 +2977,9 @@ msgstr ""
 "no generará automáticamente un pedido en espera."
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
-msgstr "Especifique por favor una compañía en 'Ubicación'."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
+msgstr "Cantidad manual"
 
 #. module: stock
 #: view:product.product:0
@@ -3105,7 +3041,7 @@ msgstr ""
 "Esto instala el módulo 'product_expiry'."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr "Introduzca por favor una cantidad adecuada."
@@ -3117,6 +3053,7 @@ msgstr "Previsión nivel de stock"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -3127,13 +3064,13 @@ msgid "Stock Journal"
 msgstr "Diario de inventario"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Abastecimiento"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr "%s-%s-devolver"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "No se ha establecido el ID activo en el Contexto"
@@ -3161,13 +3098,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr "El nº de serie se usa para poner un nº de serie en la fabricación"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Recibir productos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3195,7 +3138,7 @@ msgid "Date of Completion"
 msgstr "Fecha de realización."
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr "No puede mover el producto %s de una ubicación de tipo vista %s."
@@ -3271,15 +3214,6 @@ msgstr "Stock real"
 msgid "Logistic Serial Number"
 msgstr "Número de serie logístico"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-"<b>La cantidad ha sido cambiada</b> a <em>%s %s </em> para la ubicación "
-"<em>%s</em>."
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3288,7 +3222,6 @@ msgstr "Fecha de revisión"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3313,12 +3246,6 @@ msgstr "Línea de movimiento parcial de stock"
 msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "está en espera."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3329,29 +3256,6 @@ msgstr "Reservar"
 msgid "Contact Address :"
 msgstr "Dirección de contacto :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr "Nº de serie"
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3362,7 +3266,7 @@ msgstr ""
 "obtener la trazabilidad ascendente o descendente de ese producto."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr "_Recibir"
@@ -3380,7 +3284,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "¡Error, sin empresa!"
@@ -3484,13 +3388,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referencia inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Albarán interno"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3531,18 +3428,6 @@ msgstr "Procesar"
 msgid "Revision Name"
 msgstr "Nombre de revisión"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Almacén"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3577,7 +3462,7 @@ msgstr ""
 "            "
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr "%s %s %s ha sido <b>desechado</b>."
@@ -3624,7 +3509,7 @@ msgid "Date done"
 msgstr "Fecha realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3650,8 +3535,8 @@ msgstr "No urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
+msgid "Scheduled"
+msgstr "Planificado"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3698,7 +3583,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr "Albarán devuelto"
@@ -3773,7 +3658,7 @@ msgid "Assigned Internal Moves"
 msgstr "Movimientos internos asignados"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "No puede procesar un albarán sin movimientos de stock."
@@ -3961,12 +3846,6 @@ msgstr "Responsable"
 msgid "Internal Shippings"
 msgstr "Envíos internos"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-"Factura productos en una unidad de medida distinta a la del pedido de venta"
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -4018,7 +3897,7 @@ msgid "Inventory Move"
 msgstr "Movimiento de inventario"
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Producciones futuras"
@@ -4123,12 +4002,6 @@ msgstr "Compañía"
 msgid "Product Unit of Measure"
 msgstr "Unidad de medida del producto"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr "Orden de entrega"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -4140,9 +4013,27 @@ msgid "Lot Inventory"
 msgstr "Regularización de inventario"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivo"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr "Nº de serie"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -4187,7 +4078,6 @@ msgstr ""
 "cada producto."
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -4209,16 +4099,16 @@ msgstr "Clientes no europeos"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4256,10 +4146,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Órdenes de entrega confirmadas"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr "%s-devolución"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Albarán"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4268,7 +4159,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Este albarán no requiere facturación."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4317,7 +4208,7 @@ msgstr ""
 "Ubicación encadenada si fija."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4386,7 +4277,6 @@ msgstr ""
 "mercancías desechadas/defectuosas."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4394,7 +4284,7 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr "No se puede consumir un movimiento con cantidad negativa o nula."
@@ -4437,10 +4327,9 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " para el "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr "Nº de serie"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4478,7 +4367,7 @@ msgstr ""
 "al haber y la cuenta de entrada de stock irá al debe."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "FV:"
@@ -4500,7 +4389,7 @@ msgid "Chaining Journal"
 msgstr "Diario encadenamiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "No suficiente stock, no ha sido posible reservar los productos."
@@ -4527,12 +4416,6 @@ msgstr ""
 "pedido en espera. Cambiando esta cantidad en movimientos asignados, afecta "
 "la reserva de producto, y debe ser realizado con cuidado."
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "está cancelado."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4550,7 +4433,7 @@ msgstr ""
 "internas."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Entregas futuras"
@@ -4573,7 +4456,7 @@ msgid "Auto Validate"
 msgstr "Auto validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "¡Stock insuficiente para el nº de serie!"
@@ -4590,9 +4473,9 @@ msgid "December"
 msgstr "Diciembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Lotes de producto disponibles"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4671,12 +4554,18 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Información"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr "¡No puede eliminar un albrán que está en estado %s!"
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4730,14 +4619,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista calendario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4765,13 +4651,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "¿Desea fusionar estos inventarios?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr "Fecha de entrega"
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Estantería (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4802,7 +4693,7 @@ msgstr ""
 "Esto instala el módulo 'claim_from_delivery'."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr "Especifique por favor al menos una cantidad no nula."
@@ -4835,23 +4726,11 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ctdad no planificada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentarios y correos electrónicos"
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4862,15 +4741,6 @@ msgstr "Compañía encadenada"
 msgid "Check Availability"
 msgstr "Comprobar disponibilidad"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Albarán"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4913,14 +4783,14 @@ msgid "Move History (parent moves)"
 msgstr "Historial movimientos (mov. padres)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stock futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -5086,6 +4956,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -5131,7 +5002,7 @@ msgid "Location Content"
 msgstr "Contenido ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ctdad producida"
@@ -5162,12 +5033,6 @@ msgstr "Tiempo planificado para que se procese el envío"
 msgid "Production"
 msgstr "Producción"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "está realizado."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -5212,6 +5077,11 @@ msgstr ""
 "</p>\n"
 "            "
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr "Fecha de recepción"
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -5308,7 +5178,7 @@ msgstr ""
 "origen y destino)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5575,6 +5445,9 @@ msgstr "Dirección del almacén:"
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Fecha realizado"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Fecha de envío prevista"
 
@@ -6357,6 +6230,10 @@ msgstr "Dirección del almacén:"
 #~ msgid "Shop 1"
 #~ msgstr "Tienda 1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "está en estado borrador."
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "¡Acción no válida!"
@@ -6429,6 +6306,10 @@ msgstr "Dirección del almacén:"
 #~ msgid "Product "
 #~ msgstr "Producto "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Albarán de entrada"
 
@@ -6492,6 +6373,10 @@ msgstr "Dirección del almacén:"
 #~ msgid "Production Lot Number"
 #~ msgstr "Número lote de producción"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Albarán interno"
+
 #~ msgid "Open Product"
 #~ msgstr "Abrir producto"
 
@@ -6531,9 +6416,16 @@ msgstr "Dirección del almacén:"
 #~ msgid "Moves for this production lot"
 #~ msgstr "Movimientos para este lote de producción"
 
+#~ msgid "Reason"
+#~ msgstr "Motivo"
+
 #~ msgid "Stock ups final"
 #~ msgstr "Stock ups final"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "está realizado."
+
 #~ msgid "It specifies goods to be delivered all at once or by direct delivery"
 #~ msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
 
@@ -6546,6 +6438,10 @@ msgstr "Dirección del almacén:"
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Cantidad a dejar en el paquete actual"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " para el "
+
 #~ msgid "Additional info"
 #~ msgstr "Información adicional"
 
@@ -6553,6 +6449,10 @@ msgstr "Dirección del almacén:"
 #~ msgid "Process Document"
 #~ msgstr "Procesar documento"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "está cancelado."
+
 #~ msgid "Products Moves"
 #~ msgstr "Movimientos de productos"
 
@@ -6589,6 +6489,10 @@ msgstr "Dirección del almacén:"
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referencia del documento que ha generado este albarán."
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "preparado para procesar."
+
 #~ msgid "To invoice"
 #~ msgstr "Para facturar"
 
@@ -6613,6 +6517,9 @@ msgstr "Dirección del almacén:"
 #~ msgid "Split in Production lots"
 #~ msgstr "Dividir en lotes de producción"
 
+#~ msgid "Expected"
+#~ msgstr "Previsto"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "cantidad."
@@ -6841,6 +6748,10 @@ msgstr "Dirección del almacén:"
 #~ "recibir en función del pedido de compra original. Puede validar el envío "
 #~ "totalmente o parcialmente."
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Albarán de salida"
+
 #~ msgid "Delivery Order:"
 #~ msgstr "Albarán de salida:"
 
@@ -7095,9 +7006,17 @@ msgstr "Dirección del almacén:"
 #~ msgid "Last month"
 #~ msgstr "Último mes"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "está en espera."
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Albaranes confirmados"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "está planificado %s"
+
 #~ msgid "Back Order"
 #~ msgstr "Albarán relacionado"
 
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index c1dfa012ecb..2125f84e0d4 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-23 14:14+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr "Tipo de ubicación"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,20 +791,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,8 +957,8 @@ msgid "IT Suppliers"
 msgstr "Proveedores de TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,9 +981,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,8 +1059,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1149,6 +1127,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1263,7 +1246,7 @@ msgid "Author"
 msgstr "Autor/a"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1275,9 +1258,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1286,10 +1268,8 @@ msgid "Manual Operation"
 msgstr "Manual de operación"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1301,7 +1281,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,16 +1289,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Fecha realizado"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1473,13 +1451,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1501,13 +1473,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sólo puede eliminar movimientos en borrador."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1524,11 +1496,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista calendario"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1541,10 +1516,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1582,10 +1556,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "En espera..."
 
 #. module: stock
 #: view:stock.move:0
@@ -1599,9 +1574,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Depósito"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1641,18 +1623,6 @@ msgstr "Id línea de inventario"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1715,7 +1685,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1753,7 +1723,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1799,9 +1769,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1902,12 +1871,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1933,7 +1896,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Ctdad enviada"
@@ -2000,7 +1963,6 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2019,7 +1981,7 @@ msgid "Location Stock"
 msgstr "Ubicación stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2217,14 +2179,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "En espera..."
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ctdad recibida"
@@ -2256,7 +2211,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nombre:"
@@ -2292,8 +2246,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2309,7 +2263,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2347,7 +2300,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2433,12 +2386,6 @@ msgstr "Ubicaciones encadenadas"
 msgid "Inventory loss"
 msgstr "Pérdidas de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2462,7 +2409,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2525,7 +2471,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2587,12 +2533,7 @@ msgid "Products"
 msgstr "Productos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2632,7 +2573,7 @@ msgid "Outgoing Products"
 msgstr "Productos salientes"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2645,19 +2586,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Ctdad P&L"
@@ -2765,7 +2701,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2789,7 +2725,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2797,9 +2733,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2851,7 +2786,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2863,6 +2798,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2873,13 +2809,13 @@ msgid "Stock Journal"
 msgstr "Diario de inventario"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Adquisición"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2907,13 +2843,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Adquisición"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2941,7 +2883,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3008,13 +2950,6 @@ msgstr "Inventario real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3023,7 +2958,6 @@ msgstr "Fecha de revisión"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3046,12 +2980,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3062,29 +2990,6 @@ msgstr "Fijar disponible"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3093,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3111,7 +3016,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "¡Error,sin partner!"
@@ -3195,13 +3100,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3232,18 +3130,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Nombre de revisión"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Depósito"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3270,7 +3156,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3317,7 +3203,7 @@ msgid "Date done"
 msgstr "Fecha realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3343,7 +3229,7 @@ msgstr "No Urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3388,7 +3274,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3454,7 +3340,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3627,11 +3513,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3675,7 +3556,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3770,12 +3651,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3787,8 +3662,26 @@ msgid "Lot Inventory"
 msgstr "Regularización de inventario"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3828,7 +3721,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3850,16 +3742,16 @@ msgstr "Clientes no europeos"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3893,9 +3785,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3905,7 +3798,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3943,7 +3836,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4008,7 +3901,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4016,7 +3908,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4057,9 +3949,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4093,7 +3984,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4112,7 +4003,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4133,12 +4024,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4150,7 +4035,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4173,7 +4058,7 @@ msgid "Auto Validate"
 msgstr "Auto validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4190,9 +4075,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4266,12 +4151,18 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Configuración"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4325,14 +4216,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista calendario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4355,13 +4243,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Estantería (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4387,7 +4280,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4420,23 +4313,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ctdad no planificada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4447,15 +4328,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Comprobar disponibilidad"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4493,14 +4365,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4649,6 +4521,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4694,7 +4567,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ctdad producida"
@@ -4725,12 +4598,6 @@ msgstr ""
 msgid "Production"
 msgstr "Producción (MRP)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4764,6 +4631,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4846,7 +4718,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5155,6 +5027,9 @@ msgstr ""
 #~ msgid "STOCK_SELECT_FONT"
 #~ msgstr "STOCK_SELECT_FONT"
 
+#~ msgid "Date Done"
+#~ msgstr "Fecha realizado"
+
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index a92970aa193..6449cf70bbd 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-21 08:03+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Movimientos de producto"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "No puedes realizar esta operación en más de un Inventario de Stock."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "La cantidad no puede ser negativa"
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -268,7 +262,6 @@ msgid "Not Applicable"
 msgstr "No aplicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -316,7 +309,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Productos a procesar"
@@ -346,7 +339,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -356,22 +348,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -577,12 +569,12 @@ msgid "Location Type"
 msgstr "Tipo de ubicación"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios físicos borrador"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -618,7 +610,7 @@ msgid "Item Labels"
 msgstr "Etiquetas artículos"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -734,9 +726,7 @@ msgid "Destination Address "
 msgstr "Dirección de destino "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recepción"
 
@@ -809,22 +799,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Paquetes"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-"Movimientos de stock que se encuentran disponibles (Listo para procesar)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Para hacer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -880,7 +863,7 @@ msgstr ""
 "movimientos de stock se procesen."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -888,7 +871,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -915,7 +897,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recepciones futuras"
@@ -986,9 +968,9 @@ msgid "IT Suppliers"
 msgstr "Proveedores TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -997,7 +979,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ubicación de tránsito para transferencias inter-compañías"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1010,9 +992,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Lotes de producto disponible"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1020,7 +1002,7 @@ msgid "Change Product Quantity"
 msgstr "Cambiar cantidad producto"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L futuras"
@@ -1050,7 +1032,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1088,9 +1070,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1099,12 +1082,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "está planificado %s"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1164,6 +1141,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1305,7 +1287,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1317,10 +1299,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Orden de entrega"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1328,10 +1309,8 @@ msgid "Manual Operation"
 msgstr "Operación manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1343,7 +1322,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1353,17 +1332,16 @@ msgstr ""
 "en el diario"
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Fecha realizado"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
+"Movimientos de stock que se encuentran disponibles (Listo para procesar)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1529,13 +1507,7 @@ msgstr ""
 "precio medio de coste)."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "está en estado borrador."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1557,13 +1529,13 @@ msgid "To be refunded/invoiced"
 msgstr "Para ser abonado/facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sólo puede eliminar movimientos borrador."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1580,11 +1552,14 @@ msgid "Ready"
 msgstr "Preparado"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista calendario"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1597,11 +1572,10 @@ msgid "Additional Info"
 msgstr "Información adicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Movimiento"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1640,10 +1614,11 @@ msgid "Internal Picking List"
 msgstr "Guía de despacho interna"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: stock
 #: view:stock.move:0
@@ -1657,9 +1632,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Previsto"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Inventario"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1699,18 +1681,6 @@ msgstr "Id línea de inventario"
 msgid "Address of  customer or supplier."
 msgstr "Dirección del cliente o proveedor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1774,7 +1744,7 @@ msgid "Order Date"
 msgstr "Fecha orden"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1814,7 +1784,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Stock factura en el envío"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1860,10 +1830,9 @@ msgid "Stock Statistics"
 msgstr "Estadísticas de stock"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1963,12 +1932,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Estante 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "preparado para procesar."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1994,7 +1957,7 @@ msgid "Localization"
 msgstr "Ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Ctdad enviada"
@@ -2061,7 +2024,6 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2080,7 +2042,7 @@ msgid "Location Stock"
 msgstr "Ubicación stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2282,14 +2244,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ctdad recibida"
@@ -2323,7 +2278,6 @@ msgstr "Importar inventario"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -2359,8 +2313,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2376,7 +2330,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2417,7 +2370,7 @@ msgid "Creation"
 msgstr "Creación"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2505,12 +2458,6 @@ msgstr "Ubicaciones encadenadas"
 msgid "Inventory loss"
 msgstr "Pérdidas de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2534,7 +2481,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2597,7 +2543,7 @@ msgid "Warehouse board"
 msgstr "Tablero Inventario"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Ctdad futura"
@@ -2659,12 +2605,7 @@ msgid "Products"
 msgstr "Productos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2704,7 +2645,7 @@ msgid "Outgoing Products"
 msgstr "Movimientos de salida"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2717,19 +2658,14 @@ msgid "Delay(Days)"
 msgstr "Retraso (días)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Movimiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Ctdad P&L"
@@ -2848,7 +2784,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2872,7 +2808,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2880,9 +2816,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2938,7 +2873,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2950,6 +2885,7 @@ msgstr "Previsión nivel de stock"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2960,13 +2896,13 @@ msgid "Stock Journal"
 msgstr "Diario de inventario"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Abastecimiento"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "No se ha establecido el ID activo en el Contexto"
@@ -2994,13 +2930,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Recibir productos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3028,7 +2970,7 @@ msgid "Date of Completion"
 msgstr "Fecha de realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3096,13 +3038,6 @@ msgstr "Stock real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3111,7 +3046,6 @@ msgstr "Fecha de revisión"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3134,12 +3068,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "está en espera."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3150,29 +3078,6 @@ msgstr "Cambiar a disponible"
 msgid "Contact Address :"
 msgstr "Dirección de contacto :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3181,7 +3086,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3199,7 +3104,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "¡Error, sin empresa!"
@@ -3288,13 +3193,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referencia inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Movimiento interno"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3325,18 +3223,6 @@ msgstr "Procesar"
 msgid "Revision Name"
 msgstr "Nombre de revisión"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Inventario"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3363,7 +3249,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3410,7 +3296,7 @@ msgid "Date done"
 msgstr "Fecha realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3437,8 +3323,8 @@ msgstr "No urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3482,7 +3368,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3548,7 +3434,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3721,11 +3607,6 @@ msgstr "Administrador"
 msgid "Internal Shippings"
 msgstr "Envíos internos"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3769,7 +3650,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Producciones futuras"
@@ -3864,12 +3745,6 @@ msgstr "Compañía"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3881,9 +3756,27 @@ msgid "Lot Inventory"
 msgstr "Regularización de inventario"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivo"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3922,7 +3815,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3944,16 +3836,16 @@ msgstr "Clientes no europeos"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3987,10 +3879,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Guía de despacho"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3999,7 +3892,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Esta guía de despacho no requiere facturación."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4047,7 +3940,7 @@ msgstr ""
 "Encadenada si es Fija."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4114,7 +4007,6 @@ msgstr ""
 "mercancías desechadas/defectuosas."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4122,7 +4014,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4163,10 +4055,9 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " para el "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4204,7 +4095,7 @@ msgstr ""
 "haber y la cuenta de entrada de stock irá al debe."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4223,7 +4114,7 @@ msgid "Chaining Journal"
 msgstr "Diario encadenamiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "No suficiente stock, no ha sido posible reservar los productos."
@@ -4244,12 +4135,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "está cancelado."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4261,7 +4146,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Entregas futuras"
@@ -4284,7 +4169,7 @@ msgid "Auto Validate"
 msgstr "Auto validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4301,9 +4186,9 @@ msgid "December"
 msgstr "Diciembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Lotes de producto disponible"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4380,12 +4265,18 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Información"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4439,14 +4330,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista calendario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4474,13 +4362,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Estantería (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4506,7 +4399,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4539,23 +4432,11 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ctdad no planificada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4566,15 +4447,6 @@ msgstr "Compañía encadenada"
 msgid "Check Availability"
 msgstr "Comprobar disponibilidad"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Guía de despacho"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4612,14 +4484,14 @@ msgid "Move History (parent moves)"
 msgstr "Historial movimientos (mov. padres)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stock futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4770,6 +4642,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4815,7 +4688,7 @@ msgid "Location Content"
 msgstr "Contenido ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ctdad producida"
@@ -4846,12 +4719,6 @@ msgstr ""
 msgid "Production"
 msgstr "Producción"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "está realizado."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4885,6 +4752,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4970,7 +4842,7 @@ msgstr ""
 "ubicaciones de origen y destino)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5187,6 +5059,13 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Dirección de empresa"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Orden de entrega"
+
+#~ msgid "Date Done"
+#~ msgstr "Fecha realizado"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Fecha de envío prevista"
 
@@ -5219,6 +5098,10 @@ msgstr ""
 #~ "No se puede crear el asiento, la cuenta de salida definida en este producto "
 #~ "y la cuenta variante de la categoría de producto son la misma."
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "está en estado borrador."
+
 #~ msgid ""
 #~ "This is the list of all your packs. When you select a Pack, you can get the "
 #~ "upstream or downstream traceability of the products contained in the pack."
@@ -5371,6 +5254,10 @@ msgstr ""
 #~ msgid "Stock Location Analysis"
 #~ msgstr "Análisis ubicación stock"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid ""
 #~ "Forces to specify a Production Lot for all moves containing this product and "
 #~ "generated by a Manufacturing Order"
@@ -5551,6 +5438,9 @@ msgstr ""
 #~ msgid "Message !"
 #~ msgstr "¡ Mensaje !"
 
+#~ msgid "Reason"
+#~ msgstr "Motivo"
+
 #~ msgid "Delivery Order:"
 #~ msgstr "Orden de entrega:"
 
@@ -5576,6 +5466,10 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Advertencia"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "está realizado."
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
 
@@ -5589,12 +5483,20 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " para el "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Cantidad a dejar en el paquete actual"
 
 #~ msgid "Existing Lots"
 #~ msgstr "Lotes existentes"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "está cancelado."
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "Procesar documento"
@@ -5649,6 +5551,10 @@ msgstr ""
 #~ "de la por defecto, como la ubicación de origen para los movimientos de stock "
 #~ "generados por los abastecimientos."
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "preparado para procesar."
+
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referencia del documento que ha generado este albarán."
 
@@ -5692,6 +5598,9 @@ msgstr ""
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
 
+#~ msgid "Expected"
+#~ msgstr "Previsto"
+
 #, python-format
 #~ msgid ""
 #~ "There are no products to return (only lines in Done state and not fully "
@@ -6669,6 +6578,10 @@ msgstr ""
 #~ msgid "Packing"
 #~ msgstr "Guía de despacho"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Movimiento interno"
+
 #~ msgid "Related Picking"
 #~ msgstr "Guía de despacho"
 
@@ -6714,9 +6627,17 @@ msgstr ""
 #~ msgid "unknown"
 #~ msgstr "desconocido(a)"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "está planificado %s"
+
 #~ msgid "Last month"
 #~ msgstr "Último mes"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "está en espera."
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Despachos confirmados"
 
diff --git a/addons/stock/i18n/es_CR.po b/addons/stock/i18n/es_CR.po
index 7dc509e7034..dfed6638000 100644
--- a/addons/stock/i18n/es_CR.po
+++ b/addons/stock/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-23 05:47+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: stock
@@ -86,9 +86,10 @@ msgid "Upstream Traceability"
 msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -127,8 +128,8 @@ msgid "Product Moves"
 msgstr "Movimientos productos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -154,7 +155,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "No puedes realizar esta operación en más de un Inventario de Stock."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Cantidad no puede ser negativa."
@@ -207,18 +208,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -275,7 +269,6 @@ msgid "Not Applicable"
 msgstr "No aplicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -323,7 +316,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Productos a procesar"
@@ -353,7 +346,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -363,22 +355,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -584,12 +576,12 @@ msgid "Location Type"
 msgstr "Tipo de ubicación"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios físicos borrador"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -625,7 +617,7 @@ msgid "Item Labels"
 msgstr "Etiquetas artículos"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -741,9 +733,7 @@ msgid "Destination Address "
 msgstr "Dirección de destino "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recepción"
 
@@ -816,21 +806,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Paquetes"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Se mueve de archivo que están disponibles (listo para procesar)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Para hacer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -886,7 +870,7 @@ msgstr ""
 "movimientos de stock se procesen."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -894,7 +878,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -921,7 +904,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recepciones futuras"
@@ -992,9 +975,9 @@ msgid "IT Suppliers"
 msgstr "Proveedores TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1003,7 +986,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ubicación de tránsito para transferencias inter-compañías"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1016,9 +999,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1026,7 +1009,7 @@ msgid "Change Product Quantity"
 msgstr "Cambiar cantidad producto"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L futuras"
@@ -1056,7 +1039,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1094,9 +1077,10 @@ msgid "Pickings already processed"
 msgstr "Ganancias ya procesadas"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Mes Planeado"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1105,12 +1089,6 @@ msgstr "Mes Planeado"
 msgid "Journal"
 msgstr "Diario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "Está previsto%s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1170,6 +1148,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1311,7 +1294,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1323,10 +1306,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Albarán de salida"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1334,10 +1316,8 @@ msgid "Manual Operation"
 msgstr "Operación manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1349,7 +1329,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1359,17 +1339,15 @@ msgstr ""
 "relacionadas con las entradas."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Fecha realizado"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Se mueve de archivo que están disponibles (listo para procesar)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1535,13 +1513,7 @@ msgstr ""
 "precio medio de coste)."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "está en estado borrador."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1563,13 +1535,13 @@ msgid "To be refunded/invoiced"
 msgstr "Para ser abonado/facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sólo puede eliminar movimientos borrador."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1586,11 +1558,14 @@ msgid "Ready"
 msgstr "Preparado"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista calendario"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1603,11 +1578,10 @@ msgid "Additional Info"
 msgstr "Información adicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Movimiento"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1646,10 +1620,11 @@ msgid "Internal Picking List"
 msgstr "Albarán interno"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "En espera"
 
 #. module: stock
 #: view:stock.move:0
@@ -1663,9 +1638,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Previsto"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Almacén"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1711,18 +1693,6 @@ msgstr "Id línea de inventario"
 msgid "Address of  customer or supplier."
 msgstr "Dirección del cliente o proveedor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1788,7 +1758,7 @@ msgid "Order Date"
 msgstr "Fecha orden"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1828,7 +1798,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Stock factura en el envío"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1874,10 +1844,9 @@ msgid "Stock Statistics"
 msgstr "Estadísticas de stock"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Mes Planeado"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1977,12 +1946,6 @@ msgstr "Existencia de cuenta de evaluación (entrante)"
 msgid "Shelf 2"
 msgstr "Estante 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "preparado para procesar."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2008,7 +1971,7 @@ msgid "Localization"
 msgstr "Ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Ctdad enviada"
@@ -2080,7 +2043,6 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2099,7 +2061,7 @@ msgid "Location Stock"
 msgstr "Ubicación stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2301,14 +2263,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ctdad recibida"
@@ -2342,7 +2297,6 @@ msgstr "Importar inventario"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -2378,8 +2332,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2395,7 +2349,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2436,7 +2389,7 @@ msgid "Creation"
 msgstr "Creación"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2524,12 +2477,6 @@ msgstr "Ubicaciones encadenadas"
 msgid "Inventory loss"
 msgstr "Pérdidas de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2553,7 +2500,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2616,7 +2562,7 @@ msgid "Warehouse board"
 msgstr "Tablero almacén"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Ctdad futura"
@@ -2678,12 +2624,7 @@ msgid "Products"
 msgstr "Productos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2723,7 +2664,7 @@ msgid "Outgoing Products"
 msgstr "Productos salientes"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2736,19 +2677,14 @@ msgid "Delay(Days)"
 msgstr "Retraso (días)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Movimiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Ctdad P&L"
@@ -2867,7 +2803,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2891,7 +2827,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2899,9 +2835,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2957,7 +2892,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2969,6 +2904,7 @@ msgstr "Previsión nivel de stock"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2979,13 +2915,13 @@ msgid "Stock Journal"
 msgstr "Diario de inventario"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Abastecimiento"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "No se ha establecido el ID activo en el Contexto"
@@ -3013,13 +2949,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Recibir productos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3047,7 +2989,7 @@ msgid "Date of Completion"
 msgstr "Fecha de realización."
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3115,13 +3057,6 @@ msgstr "Stock real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3130,7 +3065,6 @@ msgstr "Fecha de revisión"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3153,12 +3087,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "esta esperando."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3169,29 +3097,6 @@ msgstr "Reservar"
 msgid "Contact Address :"
 msgstr "Dirección de contacto :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3200,7 +3105,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3218,7 +3123,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "¡Error, sin empresa!"
@@ -3307,13 +3212,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referencia inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Albarán interno"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3344,18 +3242,6 @@ msgstr "Procesar"
 msgid "Revision Name"
 msgstr "Nombre de revisión"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Almacén"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3382,7 +3268,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3429,7 +3315,7 @@ msgid "Date done"
 msgstr "Fecha realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3455,8 +3341,8 @@ msgstr "No urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3500,7 +3386,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3566,7 +3452,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3739,11 +3625,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Envíos internos"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3787,7 +3668,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Producciones futuras"
@@ -3882,12 +3763,6 @@ msgstr "Compañía"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3899,9 +3774,27 @@ msgid "Lot Inventory"
 msgstr "Regularización de inventario"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivo"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3940,7 +3833,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3962,16 +3854,16 @@ msgstr "Clientes no europeos"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4005,10 +3897,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Albarán"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4017,7 +3910,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Este albarán no requiere facturación."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4064,7 +3957,7 @@ msgstr ""
 "Ubicación encadenada si fija."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4131,7 +4024,6 @@ msgstr ""
 "mercancías desechadas/defectuosas."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4139,7 +4031,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4180,10 +4072,9 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " para el "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4221,7 +4112,7 @@ msgstr ""
 "al haber y la cuenta de entrada de stock irá al debe."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4240,7 +4131,7 @@ msgid "Chaining Journal"
 msgstr "Diario encadenamiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "No suficiente stock, no ha sido posible reservar los productos."
@@ -4261,12 +4152,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "está cancelado."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4278,7 +4163,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Entregas futuras"
@@ -4301,7 +4186,7 @@ msgid "Auto Validate"
 msgstr "Auto validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4318,9 +4203,9 @@ msgid "December"
 msgstr "Diciembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4397,12 +4282,18 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Información"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4456,14 +4347,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista calendario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4491,13 +4379,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Estantería (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4523,7 +4416,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4556,23 +4449,11 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ctdad no planificada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4583,15 +4464,6 @@ msgstr "Compañía encadenada"
 msgid "Check Availability"
 msgstr "Comprobar disponibilidad"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Albarán"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4629,14 +4501,14 @@ msgid "Move History (parent moves)"
 msgstr "Historial movimientos (mov. padres)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stock futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4787,6 +4659,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4832,7 +4705,7 @@ msgid "Location Content"
 msgstr "Contenido ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ctdad producida"
@@ -4863,12 +4736,6 @@ msgstr ""
 msgid "Production"
 msgstr "Producción"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "está realizado."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4902,6 +4769,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4987,7 +4859,7 @@ msgstr ""
 "origen y destino)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5190,6 +5062,13 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Dirección de la empresa."
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Albarán de salida"
+
+#~ msgid "Date Done"
+#~ msgstr "Fecha realizado"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Fecha de envío prevista"
 
@@ -5214,6 +5093,10 @@ msgstr ""
 #~ "de la de por defecto, como la ubicación de origen para los movimientos de "
 #~ "stock generados por las órdenes de producción."
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "está en estado borrador."
+
 #~ msgid "Shop 1"
 #~ msgstr "Tienda 1"
 
@@ -5357,6 +5240,10 @@ msgstr ""
 #~ msgid "Stock Location Analysis"
 #~ msgstr "Análisis ubicación stock"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Albarán de entrada"
 
@@ -5473,6 +5360,10 @@ msgstr ""
 #~ msgid "Back Order"
 #~ msgstr "Albarán pendiente"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Albarán interno"
+
 #~ msgid "Open Product"
 #~ msgstr "Abrir producto"
 
@@ -5527,6 +5418,9 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "Movimientos para este lote de producción"
 
+#~ msgid "Reason"
+#~ msgstr "Motivo"
+
 #~ msgid ""
 #~ "This is the list of all the production lots (serial numbers) you recorded. "
 #~ "When you select a lot, you can get the upstream or downstream traceability "
@@ -5556,6 +5450,10 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Advertencia"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "está realizado."
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
 
@@ -5568,6 +5466,10 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " para el "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Cantidad a dejar en el paquete actual"
 
@@ -5577,6 +5479,10 @@ msgstr ""
 #~ msgid "Packing list"
 #~ msgstr "Albarán"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "está cancelado."
+
 #~ msgid "Additional info"
 #~ msgstr "Información adicional"
 
@@ -5611,6 +5517,10 @@ msgstr ""
 #~ "de la por defecto, como la ubicación de origen para los movimientos de stock "
 #~ "generados por los abastecimientos."
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "preparado para procesar."
+
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referencia del documento que ha generado este albarán."
 
@@ -5652,6 +5562,9 @@ msgstr ""
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
 
+#~ msgid "Expected"
+#~ msgstr "Previsto"
+
 #, python-format
 #~ msgid ""
 #~ "There are no products to return (only lines in Done state and not fully "
@@ -6817,6 +6730,10 @@ msgstr ""
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Ganancias confirmadas"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "Está previsto%s."
+
 #, python-format
 #~ msgid ""
 #~ "There is no inventory Valuation account defined on the product category: "
@@ -6833,6 +6750,10 @@ msgstr ""
 #~ "El redondeo de la UOM no le permite enviar \"%s%s\", redondeos sólo de "
 #~ "\"%s%s\" es aceptado por la UOM."
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "esta esperando."
+
 #~ msgid "Current year"
 #~ msgstr "Año actual"
 
diff --git a/addons/stock/i18n/es_DO.po b/addons/stock/i18n/es_DO.po
index 20119c79219..0e47ada933b 100644
--- a/addons/stock/i18n/es_DO.po
+++ b/addons/stock/i18n/es_DO.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-03 19:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,10 +1497,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,9 +1557,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1600,8 +1575,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1642,18 +1624,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3767,12 +3648,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,8 +3659,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,8 +4072,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,13 +4211,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index 8a353d7e86d..8e8116329a1 100644
--- a/addons/stock/i18n/es_EC.po
+++ b/addons/stock/i18n/es_EC.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 04:45+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -84,9 +84,10 @@ msgid "Upstream Traceability"
 msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -125,8 +126,8 @@ msgid "Product Moves"
 msgstr "Movimientos de Productos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -152,7 +153,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "No puedes realizar esta operación en más de un Inventario de Stock."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Cantidad no puede ser negativo"
@@ -205,18 +206,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -273,7 +267,6 @@ msgid "Not Applicable"
 msgstr "No Aplicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -321,7 +314,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Productos a Procesar"
@@ -351,7 +344,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -361,22 +353,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Warning!"
@@ -582,12 +574,12 @@ msgid "Location Type"
 msgstr "Tipo Ubicación"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios periódicos borrador"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -623,7 +615,7 @@ msgid "Item Labels"
 msgstr "Etiquetas"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -739,9 +731,7 @@ msgid "Destination Address "
 msgstr "Dirección Destino "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recepción"
 
@@ -814,21 +804,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Paquetes"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Movimientos que están disponibles"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Por hacer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -884,7 +868,7 @@ msgstr ""
 "cuando los movimientos de stock sean procesados."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -892,7 +876,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -919,7 +902,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recepciones Futuras"
@@ -990,9 +973,9 @@ msgid "IT Suppliers"
 msgstr "Proveedores TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventarios periódicos borrador"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1001,7 +984,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ubicación de transito, para transferencias entre companias"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1014,9 +997,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1024,7 +1007,7 @@ msgid "Change Product Quantity"
 msgstr "Cambiar cantidad producto"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Futuro P&L"
@@ -1054,7 +1037,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1092,9 +1075,10 @@ msgid "Pickings already processed"
 msgstr "Picking ya procesado"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1103,12 +1087,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Diario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "está programado %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1168,6 +1146,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1307,7 +1290,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1319,10 +1302,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Orden Entrega"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1330,10 +1312,8 @@ msgid "Manual Operation"
 msgstr "Operación manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1345,7 +1325,7 @@ msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1354,17 +1334,15 @@ msgstr ""
 "Para cancelar el inventario, debes primero cancelar el asiento relacionado."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Fecha realizado"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Movimientos que están disponibles"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1527,13 +1505,7 @@ msgstr ""
 "picking confirmation (when average price costing method is used)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "esta en estado borrador."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1555,13 +1527,13 @@ msgid "To be refunded/invoiced"
 msgstr "Para ser reembolsado/facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Se puede solo eliminar movimientos borrador."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1578,11 +1550,14 @@ msgid "Ready"
 msgstr "Listo"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista calendario"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1595,11 +1570,10 @@ msgid "Additional Info"
 msgstr "Información Adicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Asiento"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1636,10 +1610,11 @@ msgid "Internal Picking List"
 msgstr "Lista Albaranes Internos"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Esperando"
 
 #. module: stock
 #: view:stock.move:0
@@ -1653,9 +1628,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Prevista"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Gestión Inventario"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1695,18 +1677,6 @@ msgstr "Id línea de inventario"
 msgid "Address of  customer or supplier."
 msgstr "Dirección de cliente o proveedor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1769,7 +1739,7 @@ msgid "Order Date"
 msgstr "Fecha Orden"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1808,7 +1778,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Facturación sobre envio"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1854,10 +1824,9 @@ msgid "Stock Statistics"
 msgstr "Estadísticas inventario"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1957,12 +1926,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Plataforma 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "esta listo para ser procesado."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1988,7 +1951,7 @@ msgid "Localization"
 msgstr "Localización"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Ctdad Enviada"
@@ -2055,7 +2018,6 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2074,7 +2036,7 @@ msgid "Location Stock"
 msgstr "Ubicación stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2276,14 +2238,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Esperando"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ctdad. Recibida"
@@ -2317,7 +2272,6 @@ msgstr "Importar Inventario"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -2353,8 +2307,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2370,7 +2324,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2410,7 +2363,7 @@ msgid "Creation"
 msgstr "Creación"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2497,12 +2450,6 @@ msgstr "Ubicaciones encadenadas"
 msgid "Inventory loss"
 msgstr "Pérdidas de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2526,7 +2473,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2589,7 +2535,7 @@ msgid "Warehouse board"
 msgstr "Tablero Almacen"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Ctdad. Futura"
@@ -2651,12 +2597,7 @@ msgid "Products"
 msgstr "Productos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2696,7 +2637,7 @@ msgid "Outgoing Products"
 msgstr "Albaranes de salida"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2709,19 +2650,14 @@ msgid "Delay(Days)"
 msgstr "Retraso (días)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Asiento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L Ctdad"
@@ -2839,7 +2775,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2863,7 +2799,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2871,9 +2807,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2929,7 +2864,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2941,6 +2876,7 @@ msgstr "Previsión Niveles stock"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2951,13 +2887,13 @@ msgid "Stock Journal"
 msgstr "Diario de inventario"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Abastecimiento"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "ID activo no esta seteado en el contexto"
@@ -2985,13 +2921,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Recibir Productos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3019,7 +2961,7 @@ msgid "Date of Completion"
 msgstr "Fechas de completación"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3087,13 +3029,6 @@ msgstr "Stock real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3102,7 +3037,6 @@ msgstr "Fecha de revisión"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3125,12 +3059,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "en espera"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3141,29 +3069,6 @@ msgstr "Cambiar a disponible"
 msgid "Contact Address :"
 msgstr "Dirección del contacto :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3172,7 +3077,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3190,7 +3095,7 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Error, no partner !"
@@ -3279,13 +3184,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referencia de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Movimiento interno"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3316,18 +3214,6 @@ msgstr "Procesar"
 msgid "Revision Name"
 msgstr "Nombre de revisión"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Gestión Inventario"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3354,7 +3240,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3401,7 +3287,7 @@ msgid "Date done"
 msgstr "Fecha realización"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3427,8 +3313,8 @@ msgstr "No urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Por hacer"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3472,7 +3358,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3538,7 +3424,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3711,11 +3597,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Envios Internos"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3759,7 +3640,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Producciones futuras"
@@ -3854,12 +3735,6 @@ msgstr "Compania"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3871,9 +3746,27 @@ msgid "Lot Inventory"
 msgstr "Regularización de inventario"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Razón"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3912,7 +3805,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3934,16 +3826,16 @@ msgstr "Clientes no europeos"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3977,10 +3869,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Movimiento"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3989,7 +3882,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Esta lista de movimientos no require facturación ."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4037,7 +3930,7 @@ msgstr ""
 "Location if Fixed."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4104,7 +3997,6 @@ msgstr ""
 "bienes dañados."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4112,7 +4004,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4153,10 +4045,9 @@ msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4194,7 +4085,7 @@ msgstr ""
 "stock input account will be debited."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4213,7 +4104,7 @@ msgid "Chaining Journal"
 msgstr "Diario Cadena"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "No suficiente stock, no ha sido posible reservar los productos."
@@ -4234,12 +4125,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "esta cancelada."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4251,7 +4136,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Envios futuros"
@@ -4274,7 +4159,7 @@ msgid "Auto Validate"
 msgstr "Auto validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4291,9 +4176,9 @@ msgid "December"
 msgstr "Diciembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4369,12 +4254,18 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Información"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4428,14 +4319,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Borrador"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista calendario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4463,13 +4351,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Estantería (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4495,7 +4388,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4528,23 +4421,11 @@ msgid "November"
 msgstr "Noviembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ctdad. No planeda"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4555,15 +4436,6 @@ msgstr "Compania Relacionada"
 msgid "Check Availability"
 msgstr "Comprobar disponibilidad"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Movimiento"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4601,14 +4473,14 @@ msgid "Move History (parent moves)"
 msgstr "Historial Movimientos (movimientos padre)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stock Futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4758,6 +4630,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4803,7 +4676,7 @@ msgid "Location Content"
 msgstr "Contenido Ubicación"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ctdad. Producida"
@@ -4834,12 +4707,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produccíon"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "esta realizado."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4873,6 +4740,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4958,7 +4830,7 @@ msgstr ""
 "locations)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5244,6 +5116,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Fecha realizado"
+
 #~ msgid "Tracking/Serial"
 #~ msgstr "Seguimiento/Número de serie"
 
@@ -5894,6 +5769,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Dirección empresa"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Orden Entrega"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Fecha prevista de envio"
 
@@ -5915,6 +5794,10 @@ msgstr ""
 #~ "default one, as the source location for stock moves generated by production "
 #~ "orders"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "esta en estado borrador."
+
 #~ msgid "Shop 1"
 #~ msgstr "Compra 1"
 
@@ -6069,6 +5952,10 @@ msgstr ""
 #~ msgid "Stock Location Analysis"
 #~ msgstr "Análisis de Ubicaciones de stock"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Lista Movimiento Entrantes"
 
@@ -6155,6 +6042,10 @@ msgstr ""
 #~ msgid "Tracking prefix"
 #~ msgstr "Prefijo de seguimiento"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Movimiento interno"
+
 #~ msgid "Open Product"
 #~ msgstr "Abrir producto"
 
@@ -6208,6 +6099,9 @@ msgstr ""
 #~ msgid "Message !"
 #~ msgstr "Mensaje !"
 
+#~ msgid "Reason"
+#~ msgstr "Razón"
+
 #, python-format
 #~ msgid "UserError"
 #~ msgstr "UserError"
@@ -6231,18 +6125,30 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Warning"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "esta realizado."
+
 #~ msgid "Stock ups final"
 #~ msgstr "Stock ups final"
 
 #~ msgid "Reporting"
 #~ msgstr "Reportes"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " for the "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Quantity to leave in the current pack"
 
 #~ msgid "Existing Lots"
 #~ msgstr "Lotes existentes"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "esta cancelada."
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "Procesar documento"
@@ -6282,6 +6188,10 @@ msgstr ""
 #~ "For the current product, this stock location will be used, instead of the "
 #~ "default one, as the source location for stock moves generated by procurements"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "esta listo para ser procesado."
+
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referencia del documento que produjo este movimiento."
 
@@ -6311,6 +6221,9 @@ msgstr ""
 #~ msgid "quantity."
 #~ msgstr "cantidad."
 
+#~ msgid "Expected"
+#~ msgstr "Prevista"
+
 #, python-format
 #~ msgid ""
 #~ "There are no products to return (only lines in Done state and not fully "
@@ -6528,12 +6441,20 @@ msgstr ""
 #~ msgid "Last month"
 #~ msgstr "Último mes"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "en espera"
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Pickings Confirmados"
 
 #~ msgid "Current year"
 #~ msgstr "Año actual"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "está programado %s."
+
 #~ msgid "Picking List:"
 #~ msgstr "Lista de Pedidos:"
 
diff --git a/addons/stock/i18n/es_MX.po b/addons/stock/i18n/es_MX.po
index da9c5769912..682bfad4e86 100644
--- a/addons/stock/i18n/es_MX.po
+++ b/addons/stock/i18n/es_MX.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-26 15:37+0000\n"
 "Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
 "<anegrinm@gmail.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -87,9 +87,10 @@ msgid "Upstream Traceability"
 msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -128,8 +129,8 @@ msgid "Product Moves"
 msgstr "Movimientos productos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -155,7 +156,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "No puedes realizar esta operación en más de un Inventario de Stock."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "La cantidad no puede ser negativa"
@@ -208,18 +209,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Los productos han sido <b>recibidos/<b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -276,7 +270,6 @@ msgid "Not Applicable"
 msgstr "No aplicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -324,7 +317,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Productos a procesar"
@@ -354,7 +347,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -364,22 +356,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -583,12 +575,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -624,7 +616,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -740,9 +732,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -815,20 +805,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -882,7 +866,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -890,7 +874,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -917,7 +900,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -988,8 +971,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -999,7 +982,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1012,8 +995,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1022,7 +1005,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1052,7 +1035,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1090,8 +1073,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1101,12 +1085,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1163,6 +1141,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1277,7 +1260,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1289,9 +1272,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1300,10 +1282,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1315,7 +1295,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1323,16 +1303,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1487,13 +1465,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1515,13 +1487,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1538,10 +1510,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1555,10 +1530,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1596,9 +1570,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1613,8 +1588,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1655,18 +1637,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1729,7 +1699,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1767,7 +1737,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1813,9 +1783,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1916,12 +1885,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1947,7 +1910,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2014,7 +1977,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2033,7 +1995,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2228,14 +2190,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2267,7 +2222,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2303,8 +2257,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2320,7 +2274,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2358,7 +2311,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2444,12 +2397,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2473,7 +2420,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2536,7 +2482,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2598,12 +2544,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2643,7 +2584,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2656,19 +2597,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2776,7 +2712,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2800,7 +2736,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2808,9 +2744,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2862,7 +2797,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2874,6 +2809,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2884,13 +2820,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2918,13 +2854,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2952,7 +2894,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3019,13 +2961,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3034,7 +2969,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3057,12 +2991,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3073,29 +3001,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3104,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3122,7 +3027,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3206,13 +3111,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3243,18 +3141,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3281,7 +3167,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3328,7 +3214,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3353,7 +3239,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3398,7 +3284,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3464,7 +3350,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3637,11 +3523,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3685,7 +3566,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3780,12 +3661,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3797,8 +3672,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3838,7 +3731,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3860,16 +3752,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3903,9 +3795,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3915,7 +3808,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3953,7 +3846,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4018,7 +3911,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4026,7 +3918,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4067,9 +3959,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4103,7 +3994,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4122,7 +4013,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4143,12 +4034,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4160,7 +4045,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4183,7 +4068,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4200,8 +4085,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4276,12 +4161,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4333,13 +4224,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4363,13 +4251,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4395,7 +4288,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4428,23 +4321,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4455,15 +4336,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4501,14 +4373,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4664,6 +4536,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4709,7 +4582,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4740,12 +4613,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4779,6 +4646,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4861,7 +4733,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/es_VE.po b/addons/stock/i18n/es_VE.po
index 46caf46a2a8..7d547adf94d 100644
--- a/addons/stock/i18n/es_VE.po
+++ b/addons/stock/i18n/es_VE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-08 02:35+0000\n"
-"Last-Translator: Nhomar Hernandez (Vauxoo) <nhomar@gmail.com>\n"
+"Last-Translator: Nhomar - Vauxoo <nhomar@gmail.com>\n"
 "Language-Team: Spanish (Venezuela) <es_VE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr "La orden de despacho se encuentra procesada."
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1477,13 +1455,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1505,13 +1477,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1528,10 +1500,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1545,10 +1520,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1586,9 +1560,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1603,8 +1578,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1645,18 +1627,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1719,7 +1689,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1757,7 +1727,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1803,9 +1773,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1906,12 +1875,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1937,7 +1900,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2004,7 +1967,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2023,7 +1985,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2218,14 +2180,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2257,7 +2212,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2293,8 +2247,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2310,7 +2264,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2348,7 +2301,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2434,12 +2387,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2463,7 +2410,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2526,7 +2472,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2588,12 +2534,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2633,7 +2574,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2646,19 +2587,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2766,7 +2702,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2790,7 +2726,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2798,9 +2734,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2852,7 +2787,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2864,6 +2799,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2874,13 +2810,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2908,13 +2844,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2942,7 +2884,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3009,13 +2951,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3024,7 +2959,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3047,12 +2981,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3063,29 +2991,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3094,7 +2999,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3112,7 +3017,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3196,13 +3101,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3233,18 +3131,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3271,7 +3157,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3318,7 +3204,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3343,7 +3229,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3388,7 +3274,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3454,7 +3340,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3627,11 +3513,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3675,7 +3556,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3770,12 +3651,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3787,8 +3662,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3828,7 +3721,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3850,16 +3742,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3893,9 +3785,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3905,7 +3798,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3943,7 +3836,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4008,7 +3901,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4016,7 +3908,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4057,9 +3949,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4093,7 +3984,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4112,7 +4003,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4133,12 +4024,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4150,7 +4035,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4173,7 +4058,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4190,8 +4075,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4266,12 +4151,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4323,13 +4214,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4353,13 +4241,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4385,7 +4278,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4418,23 +4311,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4445,15 +4326,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4491,14 +4363,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4647,6 +4519,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4692,7 +4565,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4723,12 +4596,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4762,6 +4629,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4844,7 +4716,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 367048ce9ca..a318ac9fddb 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 17:59+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Laopäevik"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "Viide"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Hoiatus!"
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr "Asukoha tüüp"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Asukoht ja ladu"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,20 +791,14 @@ msgstr "August"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr "Aeg"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,9 +957,9 @@ msgid "IT Suppliers"
 msgstr "IT tarnijad"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr ""
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Asukoht ja ladu"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,9 +981,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automaatne liigutamine"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr "Muuda kogust"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,9 +1059,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Päevik"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1149,6 +1127,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1263,7 +1246,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1275,10 +1258,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Tarnekorraldus"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1286,10 +1268,8 @@ msgid "Manual Operation"
 msgstr "Käsitsi opereerimine"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr "Saadetis"
 
@@ -1301,7 +1281,7 @@ msgid "Supplier"
 msgstr "Tarnija"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,16 +1289,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Lõpetamise kuupäev"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1473,13 +1451,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1501,13 +1473,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sa saad kustutada ainult liigutamise mustandeid."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1524,11 +1496,14 @@ msgid "Ready"
 msgstr "Valmis"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendrivaade"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Mustand"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1541,10 +1516,9 @@ msgid "Additional Info"
 msgstr "Lisainfo"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1582,10 +1556,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Ootel"
 
 #. module: stock
 #: view:stock.move:0
@@ -1599,9 +1574,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Eeldatav"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Ladu"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1641,18 +1623,6 @@ msgstr "Inventuuri rea id"
 msgid "Address of  customer or supplier."
 msgstr "Kliendi või hankija aadress."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1715,7 +1685,7 @@ msgid "Order Date"
 msgstr "Tellimuse kuupäev"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1753,7 +1723,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1799,10 +1769,9 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1902,12 +1871,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Riiul 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1933,7 +1896,7 @@ msgid "Localization"
 msgstr "Lokaliseerimine"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Tarnitud kogus"
@@ -2000,7 +1963,6 @@ msgid "Date"
 msgstr "Kuupäev"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2019,7 +1981,7 @@ msgid "Location Stock"
 msgstr "Lao asukoht"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2216,14 +2178,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Ootel"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Vastuvõetud kogus"
@@ -2255,7 +2210,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -2291,8 +2245,8 @@ msgid "Customer Locations"
 msgstr "Kliendi asukoht"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2308,7 +2262,6 @@ msgid "Create Invoice/Refund"
 msgstr "Loo arve/hüvitus"
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2346,7 +2299,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2432,12 +2385,6 @@ msgstr "Ahelasukohad"
 msgid "Inventory loss"
 msgstr "Inventuuri kadu"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2461,7 +2408,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2524,7 +2470,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2586,12 +2532,7 @@ msgid "Products"
 msgstr "Tooted"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2631,7 +2572,7 @@ msgid "Outgoing Products"
 msgstr "Väljuvad tooted"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2644,19 +2585,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Kasumi ja kahjumi kogus"
@@ -2764,7 +2700,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2788,7 +2724,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2796,9 +2732,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2850,7 +2785,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2862,6 +2797,7 @@ msgstr "Laoseisu prognoos"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2872,13 +2808,13 @@ msgid "Stock Journal"
 msgstr "Laopäevik"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Hankimine"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2906,13 +2842,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Võta vastu"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Hankimine"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2940,7 +2882,7 @@ msgid "Date of Completion"
 msgstr "Lõpetamise kuupäev"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3007,13 +2949,6 @@ msgstr "Reaalne ladu"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3022,7 +2957,6 @@ msgstr "Revisjoni kuupäev"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partii"
@@ -3045,12 +2979,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "ootel"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3061,29 +2989,6 @@ msgstr "Määra saadavaks"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3092,7 +2997,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3110,7 +3015,7 @@ msgid "Properties"
 msgstr "Omadused"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Viga, puudub partner!"
@@ -3194,13 +3099,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3231,18 +3129,6 @@ msgstr "Töötle"
 msgid "Revision Name"
 msgstr "Revisjoni nimi"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Ladu"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3269,7 +3155,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3316,7 +3202,7 @@ msgid "Date done"
 msgstr "Lõpetamise kuupäev"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3341,7 +3227,7 @@ msgstr "Pole kiire"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3386,7 +3272,7 @@ msgid "Stock"
 msgstr "Ladu"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3452,7 +3338,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3625,11 +3511,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3673,7 +3554,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3768,12 +3649,6 @@ msgstr "Ettevõte"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3785,9 +3660,27 @@ msgid "Lot Inventory"
 msgstr "Partii inventuur"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Põhjus"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3826,7 +3719,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3848,16 +3740,16 @@ msgstr "Mitte-Euroopa kliendid"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3891,10 +3783,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Noppimine"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3903,7 +3796,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3941,7 +3834,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4006,7 +3899,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4014,7 +3906,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4055,9 +3947,8 @@ msgid "Product Category"
 msgstr "Toote kategooria"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4091,7 +3982,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4110,7 +4001,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4131,12 +4022,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "on tühistatud."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4148,7 +4033,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4171,7 +4056,7 @@ msgid "Auto Validate"
 msgstr "Kinnita automaatselt"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4188,9 +4073,9 @@ msgid "December"
 msgstr "Detsember"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automaatne liigutamine"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4264,12 +4149,18 @@ msgid "Invoiced"
 msgstr "Arveldatud"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Info"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4323,14 +4214,11 @@ msgid "Internal"
 msgstr "Sisemine"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Mustand"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendrivaade"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4353,13 +4241,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Kas sa tahad liita need inventuurid?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Riiulid (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4385,7 +4278,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4418,23 +4311,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Planeerimata kogus"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4445,15 +4326,6 @@ msgstr "Sidusettevõte"
 msgid "Check Availability"
 msgstr "Kontrolli saadavust"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Noppimine"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4491,14 +4363,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Tulevane laoseis"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Viga"
@@ -4647,6 +4519,7 @@ msgid "Real"
 msgstr "Tegelik"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4692,7 +4565,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Toodetud kogus"
@@ -4723,12 +4596,6 @@ msgstr ""
 msgid "Production"
 msgstr "Tootmine"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "lõpetatud."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4762,6 +4629,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4844,7 +4716,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5809,9 +5681,20 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Viga: Vigane EAN kood"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "ootel"
+
 #~ msgid "Address of partner"
 #~ msgstr "Partneri aadress"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Tarnekorraldus"
+
+#~ msgid "Date Done"
+#~ msgstr "Lõpetamise kuupäev"
+
 #~ msgid "Lot number"
 #~ msgstr "Partii number"
 
@@ -5836,6 +5719,10 @@ msgstr ""
 #~ msgid "Update"
 #~ msgstr "Uuenda"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
 #~ msgid "Products "
 #~ msgstr "Tooted "
 
@@ -5864,6 +5751,17 @@ msgstr ""
 #~ msgid "Order"
 #~ msgstr "Tellimus"
 
+#~ msgid "Reason"
+#~ msgstr "Põhjus"
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "lõpetatud."
+
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "on tühistatud."
+
 #~ msgid "Additional info"
 #~ msgstr "Täiendav informatsioon"
 
@@ -5876,6 +5774,9 @@ msgstr ""
 #~ msgid "Select Quantity"
 #~ msgstr "Vali kogus"
 
+#~ msgid "Expected"
+#~ msgstr "Eeldatav"
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Hoiatus!"
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index 77fa6f45ea1..3078a5c4041 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:10+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr "Ylävirtauksen seurattavuus"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr "Tuotesiirrot"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -148,7 +149,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Et voi tehdä tätä toimintoa enemmälle kuin yhdelle varastolle."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Määrä ei voi olla negatiivinen"
@@ -201,18 +202,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Varastopäiväkirja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -269,7 +263,6 @@ msgid "Not Applicable"
 msgstr "Sopimaton"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -317,7 +310,7 @@ msgid "Reference"
 msgstr "Viite"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Käsiteltävät tuotteet"
@@ -347,7 +340,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -357,22 +349,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Varoitus!"
@@ -578,12 +570,12 @@ msgid "Location Type"
 msgstr "Paikan tyyppi"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Luonnos fyysisitä varastoista"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -619,7 +611,7 @@ msgid "Item Labels"
 msgstr "Nimikkeen tarrat"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -735,9 +727,7 @@ msgid "Destination Address "
 msgstr "Kohdeosoite "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Vastaanotto"
 
@@ -810,21 +800,15 @@ msgstr "Elokuu"
 msgid "Packs"
 msgstr "Pakkaukset"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Varastosiirrot jotka ovat saatavilla (valmiina käsiteltäviksi)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Tehtävät"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -879,7 +863,7 @@ msgstr ""
 "johon tapahtumat lisätään automaattisesti kun varastosiirtoja käsitellään."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -887,7 +871,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -914,7 +897,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Tulevat saapumiset"
@@ -985,9 +968,9 @@ msgid "IT Suppliers"
 msgstr "IT-toimittajat"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Luonnos fyysisitä varastoista"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -996,7 +979,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Siirtopaikka yritysten välisille siirroille"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1009,9 +992,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automaattinen siirto"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Saatavilla olevat tuote-erät"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1019,7 +1002,7 @@ msgid "Change Product Quantity"
 msgstr "Muuta tuotteen määrää"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Tulevat P&L"
@@ -1049,7 +1032,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1087,9 +1070,10 @@ msgid "Pickings already processed"
 msgstr "Keräilyt jo hoidettu"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Suunniteltu KK"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuutta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1098,12 +1082,6 @@ msgstr "Suunniteltu KK"
 msgid "Journal"
 msgstr "Loki"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "on aikataulutettu %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1163,6 +1141,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1279,7 +1262,7 @@ msgid "Author"
 msgstr "Tekijä"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1291,10 +1274,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Toimitusmääräys"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1302,10 +1284,8 @@ msgid "Manual Operation"
 msgstr "Manuaalinen toimenpide"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1317,7 +1297,7 @@ msgid "Supplier"
 msgstr "Toimittaja"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1325,17 +1305,15 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Valmis pvm."
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Varastosiirrot jotka ovat saatavilla (valmiina käsiteltäviksi)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1493,13 +1471,7 @@ msgstr ""
 "käyttäjä syötti keräilyvahvistuksessa (kun keskihinta menetelemää käytetään)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "on luonnostilassa"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1521,13 +1493,13 @@ msgid "To be refunded/invoiced"
 msgstr "Tulee hyvittää/laskuttaa"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Voit poistaa ainoastaan luonnossiirtoja."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1544,11 +1516,14 @@ msgid "Ready"
 msgstr "Valmis"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalenterinäkymä"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Luonnos"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1561,11 +1536,10 @@ msgid "Additional Info"
 msgstr "Lisätietoa"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Siirrä"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1604,10 +1578,11 @@ msgid "Internal Picking List"
 msgstr "Sisäinen keräilylista"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Odottaa"
 
 #. module: stock
 #: view:stock.move:0
@@ -1621,9 +1596,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Oletettu"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Varastonhallinta"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1663,18 +1645,6 @@ msgstr "Varastorivin koodi"
 msgid "Address of  customer or supplier."
 msgstr "Asiakkaan tai toimittajan osoite"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1739,7 +1709,7 @@ msgid "Order Date"
 msgstr "Tilauksen päivämäärä"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1777,7 +1747,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Varastolaskutus toimitettaessa"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1823,10 +1793,9 @@ msgid "Stock Statistics"
 msgstr "Varaston tilastot"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuutta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Suunniteltu KK"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1926,12 +1895,6 @@ msgstr "Varaston arvostustili (saapuva)"
 msgid "Shelf 2"
 msgstr "Hylly 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "On valmis prosessoitavaksi"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1957,7 +1920,7 @@ msgid "Localization"
 msgstr "Lokalisointi"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Toimitettu määrä"
@@ -2024,7 +1987,6 @@ msgid "Date"
 msgstr "Päivämäärä"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2043,7 +2005,7 @@ msgid "Location Stock"
 msgstr "Paikan varasto"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2240,14 +2202,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Odottaa"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Vastaanotettu määrä"
@@ -2281,7 +2236,6 @@ msgstr "Tuo varasto"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -2317,8 +2271,8 @@ msgid "Customer Locations"
 msgstr "Asiakkaiden sijainnit"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2334,7 +2288,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2374,7 +2327,7 @@ msgid "Creation"
 msgstr "Luonti"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2462,12 +2415,6 @@ msgstr "Ketjutetut paikat"
 msgid "Inventory loss"
 msgstr "Varastohävikki"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokumentti"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2491,7 +2438,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2554,7 +2500,7 @@ msgid "Warehouse board"
 msgstr "Varastohallinnan työpöytä"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Tuleva määrä"
@@ -2616,12 +2562,7 @@ msgid "Products"
 msgstr "Tuotteet"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2661,7 +2602,7 @@ msgid "Outgoing Products"
 msgstr "Lähtevät tuotteet"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2674,19 +2615,14 @@ msgid "Delay(Days)"
 msgstr "Viive(päivää)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Siirrä"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L Määrä"
@@ -2794,7 +2730,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2818,7 +2754,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2826,9 +2762,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2880,7 +2815,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2892,6 +2827,7 @@ msgstr "Varastotasojen ennuste"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2902,13 +2838,13 @@ msgid "Stock Journal"
 msgstr "Varastopäiväkirja"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Hankinta"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktiivista ID:tä ei ole asetettu kontekstissä"
@@ -2936,13 +2872,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Tuotteen vastaanotto"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Hankinta"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2970,7 +2912,7 @@ msgid "Date of Completion"
 msgstr "Valmistumispäivä"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3039,13 +2981,6 @@ msgstr "Todellinen varasto"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3054,7 +2989,6 @@ msgstr "Revision pvm."
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Erä"
@@ -3077,12 +3011,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Määrä (myyntiyksikköä)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "odottaa"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3093,29 +3021,6 @@ msgstr "Aseta saataville"
 msgid "Contact Address :"
 msgstr "Kontaktiosoite:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3124,7 +3029,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3142,7 +3047,7 @@ msgid "Properties"
 msgstr "Ominaisuudet"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Virhe, ei kumppania!"
@@ -3229,13 +3134,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Varaston viite"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Sisäinen keräily"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3266,18 +3164,6 @@ msgstr "Prosessi"
 msgid "Revision Name"
 msgstr "Revision nimi"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Varastonhallinta"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3304,7 +3190,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3351,7 +3237,7 @@ msgid "Date done"
 msgstr "Valmis pvm."
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3376,8 +3262,8 @@ msgstr "Ei kiireellinen"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Tehtävät"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3421,7 +3307,7 @@ msgid "Stock"
 msgstr "Varasto"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3487,7 +3373,7 @@ msgid "Assigned Internal Moves"
 msgstr "Määritellyt sisäiset siirrot"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3660,11 +3546,6 @@ msgstr "Päällikkö"
 msgid "Internal Shippings"
 msgstr "Sisäiset toimitukset"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3708,7 +3589,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Tulevat tuotannot"
@@ -3803,12 +3684,6 @@ msgstr "Yritys"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3820,9 +3695,27 @@ msgid "Lot Inventory"
 msgstr "Erän tavaraluettelo"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Syy"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3861,7 +3754,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3883,16 +3775,16 @@ msgstr "Ei-eurooppalaiset asiakkat"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3926,10 +3818,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Vahvistetut toimitusmääräykset"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Keräily"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3938,7 +3831,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Tämä keräilylistä ei vaadi laskutusta."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3976,7 +3869,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4043,7 +3936,6 @@ msgstr ""
 "laittamisen paikkaan."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4051,7 +3943,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4092,9 +3984,8 @@ msgid "Product Category"
 msgstr "Tuotteen kategoria"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4128,7 +4019,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4147,7 +4038,7 @@ msgid "Chaining Journal"
 msgstr "Ketjupäiväkirja"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Ei tarpeeksi varstoa, ei voida varata tuotteita"
@@ -4168,12 +4059,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "on peruutettu."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4185,7 +4070,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Tulevat toimitukset"
@@ -4208,7 +4093,7 @@ msgid "Auto Validate"
 msgstr "Automaattinen hyväksyntä"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4225,9 +4110,9 @@ msgid "December"
 msgstr "Joulukuu"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Saatavilla olevat tuote-erät"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automaattinen siirto"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4301,12 +4186,18 @@ msgid "Invoiced"
 msgstr "Laskutettu"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Tiedot"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4360,14 +4251,11 @@ msgid "Internal"
 msgstr "Sisäinen"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Luonnos"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalenterinäkymä"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4390,13 +4278,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Haluatko yhdistää nämä tavaraluettelot?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Hyllyt (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4422,7 +4315,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4455,23 +4348,11 @@ msgid "November"
 msgstr "Marraskuu"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ei suunniteltu määrä"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4482,15 +4363,6 @@ msgstr "Ketjutettu yritys"
 msgid "Check Availability"
 msgstr "Tarkista saatavuus"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Keräily"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4528,14 +4400,14 @@ msgid "Move History (parent moves)"
 msgstr "Siirtohistoria (ylätason siirrot)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Tuleva varasto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Virhe"
@@ -4684,6 +4556,7 @@ msgid "Real"
 msgstr "Todellinen"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4729,7 +4602,7 @@ msgid "Location Content"
 msgstr "Paikan sisältö"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Tuotettu määrä"
@@ -4760,12 +4633,6 @@ msgstr ""
 msgid "Production"
 msgstr "Tuotanto"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "on tehty."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4799,6 +4666,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4884,7 +4756,7 @@ msgstr ""
 "mukaan)"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5156,6 +5028,9 @@ msgstr ""
 #~ msgid "STOCK_SELECT_FONT"
 #~ msgstr "STOCK_SELECT_FONT"
 
+#~ msgid "Date Done"
+#~ msgstr "Valmis pvm."
+
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
@@ -6036,6 +5911,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Yhteistyökumppanin osoite"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Toimitusmääräys"
+
 #~ msgid "Not Available"
 #~ msgstr "Ei saatavissa"
 
@@ -6053,6 +5932,10 @@ msgstr ""
 #~ "Ei voitu luoda päiväkirjamerkintää, koska lähtevä tili on määritelty "
 #~ "tuotteelle ja muutos tili tuotekategorialle ovat sama."
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "on luonnostilassa"
+
 #~ msgid ""
 #~ "This is the list of all your packs. When you select a Pack, you can get the "
 #~ "upstream or downstream traceability of the products contained in the pack."
@@ -6153,6 +6036,10 @@ msgstr ""
 #~ "Paikottaa määrittelemään tuotantoerän kaikille tämän tuotteen siirroille ja "
 #~ "jotka on luotu valmistustilauksesta"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokumentti"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Syötä keräilylista"
 
@@ -6217,6 +6104,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Tälle tuotteelle ei ole määritelty varaston tulojen tiliä: \"%s\" (id:%d)"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Sisäinen keräily"
+
 #~ msgid "Open Product"
 #~ msgstr "Avaa tuote"
 
@@ -6270,12 +6161,23 @@ msgstr ""
 #~ msgid "Delivery Order:"
 #~ msgstr "Toimitusmääräin:"
 
+#~ msgid "Reason"
+#~ msgstr "Syy"
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "on tehty."
+
 #~ msgid "Reception:"
 #~ msgstr "Vastaanotto:"
 
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Tämä määrä on määritelty tuotteen oletusmittayksikössä"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "on peruutettu."
+
 #~ msgid "Additional info"
 #~ msgstr "Lisätietoja"
 
@@ -6320,6 +6222,10 @@ msgstr ""
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Viite dokumenttiin joka loi tämän keräilyn"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "On valmis prosessoitavaksi"
+
 #~ msgid "To invoice"
 #~ msgstr "Laskutettava"
 
@@ -6340,6 +6246,9 @@ msgstr ""
 #~ "Palautettavia tuotteita ei ole (vain rivit valmis tilassa joita ei ole vielä "
 #~ "kokonaan palautettu voidaan palauttaa)"
 
+#~ msgid "Expected"
+#~ msgstr "Oletettu"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "määrä"
@@ -6389,9 +6298,17 @@ msgstr ""
 #~ msgid "unknown"
 #~ msgstr "tuntematon"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "on aikataulutettu %s."
+
 #~ msgid "Last month"
 #~ msgstr "Edellinen kuukausi"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "odottaa"
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Vahvistetut keräilyt"
 
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index fb0fd89327e..26b941990b5 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-26 17:09+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -97,9 +97,10 @@ msgid "Upstream Traceability"
 msgstr "Traçabilité amont"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -138,8 +139,8 @@ msgid "Product Moves"
 msgstr "Mouvements de stock"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -166,7 +167,7 @@ msgstr ""
 "Vous ne pouvez pas effectuer cette opération sur plus d'un inventaire."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "La quantité ne peut pas être négative."
@@ -219,18 +220,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Journal des stocks"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -287,7 +281,6 @@ msgid "Not Applicable"
 msgstr "Non Applicable"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -335,7 +328,7 @@ msgid "Reference"
 msgstr "Référence"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Articles à traiter"
@@ -365,7 +358,6 @@ msgid "_Validate"
 msgstr "_Valider"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -375,22 +367,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Attention !"
@@ -596,12 +588,12 @@ msgid "Location Type"
 msgstr "Type d'emplacement"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Brouillon des stocks physiques"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -638,7 +630,7 @@ msgid "Item Labels"
 msgstr "Etiquettes des articles"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -754,9 +746,7 @@ msgid "Destination Address "
 msgstr "Adresse de destination "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Réception"
 
@@ -829,21 +819,15 @@ msgstr "Août"
 msgid "Packs"
 msgstr "Colis"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Les mouvements de stock qui sont disponiibles (prêts à traiter)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "À faire"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -900,7 +884,7 @@ msgstr ""
 "mouvements de stock seront comptabilisées sur ce compte."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -908,7 +892,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -935,7 +918,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Réceptions à venir"
@@ -1006,9 +989,9 @@ msgid "IT Suppliers"
 msgstr "Fournisseurs IT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Brouillon des stocks physiques"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1017,7 +1000,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Emplacement de transit pour les transferts inter-entrepôts"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1030,9 +1013,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Mouvement automatique"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1040,7 +1023,7 @@ msgid "Change Product Quantity"
 msgstr "Changer la quantité d'articles"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L future"
@@ -1070,7 +1053,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1108,9 +1091,10 @@ msgid "Pickings already processed"
 msgstr "Bons de préparation déjà traités"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Mois planifié"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Devise"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1119,12 +1103,6 @@ msgstr "Mois planifié"
 msgid "Journal"
 msgstr "Journal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "est planifié %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1184,6 +1162,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1327,7 +1310,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1339,10 +1322,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Bon de livraison"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1350,10 +1332,8 @@ msgid "Manual Operation"
 msgstr "Opération manuelle"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1365,7 +1345,7 @@ msgid "Supplier"
 msgstr "Fournisseur"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1374,17 +1354,15 @@ msgstr ""
 "Pour annuler cet inventaire, vous devez d'abord annuler les écritures liés"
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Date de fin"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Les mouvements de stock qui sont disponiibles (prêts à traiter)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1551,13 +1529,7 @@ msgstr ""
 "la valorisation se fait sur le prix moyen)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "est à l'état 'Brouillon'."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1579,13 +1551,13 @@ msgid "To be refunded/invoiced"
 msgstr "A rembourser / facturer."
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Vous ne pouvez supprimer que les mouvements en brouillon"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1602,11 +1574,14 @@ msgid "Ready"
 msgstr "Prêt"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vue calendrier"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Brouillon"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1619,11 +1594,10 @@ msgid "Additional Info"
 msgstr "Informations complémentaires."
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Mouvement"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1662,10 +1636,11 @@ msgid "Internal Picking List"
 msgstr "Bon de transfert"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "En attente"
 
 #. module: stock
 #: view:stock.move:0
@@ -1679,9 +1654,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Attendu"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Entrepôt"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1721,18 +1703,6 @@ msgstr "Id. ligne d'inventaire"
 msgid "Address of  customer or supplier."
 msgstr "Adresse du client ou du fournisseur."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1798,7 +1768,7 @@ msgid "Order Date"
 msgstr "Date de commande"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1838,7 +1808,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Facturation du stock au moment de l'expédition"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1884,10 +1854,9 @@ msgid "Stock Statistics"
 msgstr "Statistiques de stock"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Devise"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Mois planifié"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1987,12 +1956,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Etagère 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "prêt à être traité."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2019,7 +1982,7 @@ msgid "Localization"
 msgstr "Localisation"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Qté livrée"
@@ -2086,7 +2049,6 @@ msgid "Date"
 msgstr "Date"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2105,7 +2067,7 @@ msgid "Location Stock"
 msgstr "Emplacement de Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2306,14 +2268,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "En attente"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Qté reçue"
@@ -2347,7 +2302,6 @@ msgstr "Importer un inventaire"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nom"
@@ -2383,8 +2337,8 @@ msgid "Customer Locations"
 msgstr "Emplacements clients"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2400,7 +2354,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2441,7 +2394,7 @@ msgid "Creation"
 msgstr "Création"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2538,12 +2491,6 @@ msgstr "Emplacements Liés"
 msgid "Inventory loss"
 msgstr "Pertes d'inventaire"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Document"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2567,7 +2514,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2630,7 +2576,7 @@ msgid "Warehouse board"
 msgstr "Tableau de bord entrepôt"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Qté à venir"
@@ -2692,12 +2638,7 @@ msgid "Products"
 msgstr "Articles"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2737,7 +2678,7 @@ msgid "Outgoing Products"
 msgstr "Articles à expédier"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2750,19 +2691,14 @@ msgid "Delay(Days)"
 msgstr "Dali(Jour)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Mouvement"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Qté pertes et profits"
@@ -2883,7 +2819,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2907,7 +2843,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2915,9 +2851,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2973,7 +2908,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2985,6 +2920,7 @@ msgstr "Prévision du niveau de stock"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2995,13 +2931,13 @@ msgid "Stock Journal"
 msgstr "Journal de stock"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Approvisionnement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Active ID n'est pas mis dans le context"
@@ -3029,13 +2965,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Réception par article"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Approvisionnement"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3063,7 +3005,7 @@ msgid "Date of Completion"
 msgstr "Date de fin prévue"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3130,13 +3072,6 @@ msgstr "Stock réel"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3145,7 +3080,6 @@ msgstr "Date de révision"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3163,12 +3097,6 @@ msgstr ""
 msgid "Stock Partial Move Line"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "est en attente."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3179,29 +3107,6 @@ msgstr "Rendre disponible"
 msgid "Contact Address :"
 msgstr "Adresse du contact :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3210,7 +3115,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3228,7 +3133,7 @@ msgid "Properties"
 msgstr "Propriétés"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Erreur, pas de partenaire !"
@@ -3318,13 +3223,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Référence de l'inventaire"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Bon de transfert"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3355,18 +3253,6 @@ msgstr "Traiter"
 msgid "Revision Name"
 msgstr "Nom de révision"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Entrepôt"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3393,7 +3279,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3440,7 +3326,7 @@ msgid "Date done"
 msgstr "Date de réalisation"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3467,8 +3353,8 @@ msgstr "Non urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "À faire"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3512,7 +3398,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3578,7 +3464,7 @@ msgid "Assigned Internal Moves"
 msgstr "Mouvements internes non assignés"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3746,11 +3632,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Livraison interne"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3794,7 +3675,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Production future"
@@ -3889,12 +3770,6 @@ msgstr "Société"
 msgid "Product Unit of Measure"
 msgstr "Unité de mesure d'article"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3906,9 +3781,27 @@ msgid "Lot Inventory"
 msgstr "Inventaire par lot"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motif"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3947,7 +3840,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3969,16 +3861,16 @@ msgstr "Clients non européen"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4012,10 +3904,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Opération de manutention"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4024,7 +3917,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Cette opération de manutention n'a pas à être facturée."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4072,7 +3965,7 @@ msgstr ""
 "\"Emplacement chaîné si fixe\"."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4139,7 +4032,6 @@ msgstr ""
 "rebuts et les produits endommagés."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4147,7 +4039,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4188,10 +4080,9 @@ msgid "Product Category"
 msgstr "Catégorie d'articles"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " pour le "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4229,7 +4120,7 @@ msgstr ""
 "créditrice et le compte d'entrée en stock sera débiteur."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4248,7 +4139,7 @@ msgid "Chaining Journal"
 msgstr "Journal d'enchainement"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Pas encore de stock, impossible de réserver les articles."
@@ -4269,12 +4160,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "est annulé"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4286,7 +4171,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Livraison future"
@@ -4309,7 +4194,7 @@ msgid "Auto Validate"
 msgstr "Validation Automatique"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4326,9 +4211,9 @@ msgid "December"
 msgstr "Décembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Mouvement automatique"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4405,12 +4290,18 @@ msgid "Invoiced"
 msgstr "Facturé"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Information"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4465,14 +4356,11 @@ msgid "Internal"
 msgstr "Interne"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Brouillon"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vue calendrier"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4501,13 +4389,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Voulez vous fusionnez ces inventaires"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Rayon (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4533,7 +4426,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4566,23 +4459,11 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Qté non prévu"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4593,15 +4474,6 @@ msgstr "Société chainée"
 msgid "Check Availability"
 msgstr "Vérifier la disponibilité"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Opération de manutention"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4641,14 +4513,14 @@ msgid "Move History (parent moves)"
 msgstr "Historique du mouvement (mouvements parent)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stock prévisionnel"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -4799,6 +4671,7 @@ msgid "Real"
 msgstr "Réel"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4844,7 +4717,7 @@ msgid "Location Content"
 msgstr "Contenu de l'emplacement"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Qté produite"
@@ -4875,12 +4748,6 @@ msgstr ""
 msgid "Production"
 msgstr "Production"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "est terminé."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4914,6 +4781,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4999,7 +4871,7 @@ msgstr ""
 "emplacements source et destination)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5249,6 +5121,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Date de fin"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Date d'envoi prévue"
 
@@ -6003,6 +5878,10 @@ msgstr ""
 #~ msgid "Internal Picking list"
 #~ msgstr "Bon de transfert interne"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Bon de transfert"
+
 #~ msgid "Expected date for the picking to be processed"
 #~ msgstr "Date à laquelle l'opération de manutention doit être effectuée"
 
@@ -6093,6 +5972,10 @@ msgstr ""
 #~ msgid "Shop 1"
 #~ msgstr "Magasin 1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "est à l'état 'Brouillon'."
+
 #~ msgid "Stock Replacement"
 #~ msgstr "Renouvellement de stock"
 
@@ -6158,6 +6041,10 @@ msgstr ""
 #~ "Il n'y pas de compte d'entrée en stock défini pour ce produit ou sa "
 #~ "catégorie : \"%s\" (id: %d)"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "est terminé."
+
 #~ msgid ""
 #~ "OpenERP Inventory Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -6209,6 +6096,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Produit "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Document"
+
 #~ msgid "Update"
 #~ msgstr "Mise à jour"
 
@@ -6314,16 +6205,27 @@ msgstr ""
 #~ msgid "Order"
 #~ msgstr "Commande"
 
+#~ msgid "Reason"
+#~ msgstr "Motif"
+
 #~ msgid "Reception:"
 #~ msgstr "Réception"
 
 #~ msgid "Existing Lots"
 #~ msgstr "Lots existants"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " pour le "
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "est annulé"
+
 #~ msgid "Additional info"
 #~ msgstr "Informations complémentaires"
 
@@ -6376,6 +6278,9 @@ msgstr ""
 #~ msgid "Split in Production lots"
 #~ msgstr "Éclater en lot de production"
 
+#~ msgid "Expected"
+#~ msgstr "Attendu"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "quantité."
@@ -6619,6 +6524,10 @@ msgstr ""
 #~ msgid "Keep in one lot"
 #~ msgstr "Garder dans un seul lot"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "prêt à être traité."
+
 #, python-format
 #~ msgid ""
 #~ "Can not create Journal Entry, Input Account defined on this product and "
@@ -6671,6 +6580,10 @@ msgstr ""
 #~ "fonction de la commande d'achat originale. Vous pouvez valider une livraison "
 #~ "en totalité ou partiellement."
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Bon de livraison"
+
 #~ msgid ""
 #~ "This is the list of all delivery orders that have to be prepared, according "
 #~ "to your different sales orders and your logistics rules."
@@ -6685,6 +6598,10 @@ msgstr ""
 #~ msgid "Product  '%s' is consumed with '%s' quantity."
 #~ msgstr "Le produit '%s' est consommé pour une quantité de '%s'."
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "est planifié %s."
+
 #, python-format
 #~ msgid "Inventory '%s' is done."
 #~ msgstr "L'inventaire '%s' est terminé."
@@ -6775,6 +6692,10 @@ msgstr ""
 #~ msgid "Stock to be receive"
 #~ msgstr "Stock à recevoir"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "est en attente."
+
 #~ msgid "Expected Stock Variations"
 #~ msgstr "Variations de stock prévues"
 
diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po
index 921f7d00b39..d56a4fbfcb2 100644
--- a/addons/stock/i18n/gl.po
+++ b/addons/stock/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-11-02 16:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,10 +1497,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,9 +1557,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1600,8 +1575,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1642,18 +1624,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3767,12 +3648,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,8 +3659,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,8 +4072,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,13 +4211,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 16c30b8b7cf..73384273775 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 12:21+0000\n"
 "Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\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: 2012-12-16 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "Upstream Traceability"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Product Moves"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Stock journal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -267,7 +261,6 @@ msgid "Not Applicable"
 msgstr "Ne fakturira se"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -315,7 +308,7 @@ msgid "Reference"
 msgstr "Vezna oznaka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Artikli za obradu"
@@ -345,7 +338,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -355,22 +347,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -576,12 +568,12 @@ msgid "Location Type"
 msgstr "Tip lokacije"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Nacrti fizičkih inventura"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -617,7 +609,7 @@ msgid "Item Labels"
 msgstr "Labela"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -733,9 +725,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -808,21 +798,15 @@ msgstr "Kolovoz"
 msgid "Packs"
 msgstr "Paketi"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Za napraviti"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -877,7 +861,7 @@ msgstr ""
 "which entries will be automatically posted when stock moves are processed."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -885,7 +869,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -912,7 +895,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -983,9 +966,9 @@ msgid "IT Suppliers"
 msgstr "IT dobavljači"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Nacrti fizičkih inventura"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -994,7 +977,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Tranzitna lokacija za transfere između organizacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1007,9 +990,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatski prijenos"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1017,7 +1000,7 @@ msgid "Change Product Quantity"
 msgstr "Promjeni količinu proizvoda"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1047,7 +1030,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1085,9 +1068,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1096,12 +1080,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "je zakazan %s"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1161,6 +1139,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1299,7 +1282,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1311,10 +1294,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Nalog za otpremu"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1322,10 +1304,8 @@ msgid "Manual Operation"
 msgstr "Ručna operacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1337,7 +1317,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1345,16 +1325,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Datum izvršenja"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1519,13 +1497,7 @@ msgstr ""
 "otpremnice koja utječe na prosječnu cijenu proizvoda."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "je u statusu nacrt."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1547,13 +1519,13 @@ msgid "To be refunded/invoiced"
 msgstr "To be refunded/invoiced"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Možete izbrisati samo transakcije u nacrtu."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1570,11 +1542,14 @@ msgid "Ready"
 msgstr "Spremno"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Nacrt"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1587,11 +1562,10 @@ msgid "Additional Info"
 msgstr "Dodatni podaci"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Temeljnica"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1629,10 +1603,11 @@ msgid "Internal Picking List"
 msgstr "Međuskladišnica (interni prijenos)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Waiting"
 
 #. module: stock
 #: view:stock.move:0
@@ -1646,9 +1621,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Očekivano"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Skladište"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1688,18 +1670,6 @@ msgstr "ID stavke inventara"
 msgid "Address of  customer or supplier."
 msgstr "Address of  customer or supplier."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1763,7 +1733,7 @@ msgid "Order Date"
 msgstr "Datum naloga"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1801,7 +1771,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Račun nakon isporuke"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1847,10 +1817,9 @@ msgid "Stock Statistics"
 msgstr "Stock Statistics"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1950,12 +1919,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Shelf 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "je spreman za procesiranje."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1981,7 +1944,7 @@ msgid "Localization"
 msgstr "Lokacija"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Otpremljena kol."
@@ -2048,7 +2011,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2067,7 +2029,7 @@ msgid "Location Stock"
 msgstr "Lokacija zalihe"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2267,14 +2229,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Waiting"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Zaprimljena kol."
@@ -2308,7 +2263,6 @@ msgstr "Uvezi inventuru"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -2344,8 +2298,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2361,7 +2315,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2401,7 +2354,7 @@ msgid "Creation"
 msgstr "Kreiranje"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2489,12 +2442,6 @@ msgstr "Ulančane lokacije"
 msgid "Inventory loss"
 msgstr "Gubitak inventure"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2518,7 +2465,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2581,7 +2527,7 @@ msgid "Warehouse board"
 msgstr "Kokpit skladišta"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Buduće kol."
@@ -2643,12 +2589,7 @@ msgid "Products"
 msgstr "Products"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2688,7 +2629,7 @@ msgid "Outgoing Products"
 msgstr "Izlazni proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2701,19 +2642,14 @@ msgid "Delay(Days)"
 msgstr "Delay(Days)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Temeljnica"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2831,7 +2767,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2855,7 +2791,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2863,9 +2799,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2920,7 +2855,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2932,6 +2867,7 @@ msgstr "Prognoza stanja zaliha"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2942,13 +2878,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zalihe"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktivni ID nije u kontekstu"
@@ -2976,13 +2912,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Prihvat proizvoda"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Procurement"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3010,7 +2952,7 @@ msgid "Date of Completion"
 msgstr "Datum izvršenja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3078,13 +3020,6 @@ msgstr "Dostupna zaliha"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3093,7 +3028,6 @@ msgstr "Datum revizije"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3116,12 +3050,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Količina (JS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3132,29 +3060,6 @@ msgstr "Postavi raspoloživo"
 msgid "Contact Address :"
 msgstr "Kontakt adresa :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3163,7 +3068,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3181,7 +3086,7 @@ msgid "Properties"
 msgstr "Svojstva"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Greška, nema partnera !"
@@ -3270,13 +3175,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Inventura broj"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Interni prijenos"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3307,18 +3205,6 @@ msgstr "Process"
 msgid "Revision Name"
 msgstr "Naziv revizije"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Skladište"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3345,7 +3231,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3392,7 +3278,7 @@ msgid "Date done"
 msgstr "Datum izvršenja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3417,8 +3303,8 @@ msgstr "Not urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Za napraviti"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3462,7 +3348,7 @@ msgid "Stock"
 msgstr "Zaliha"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3528,7 +3414,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3701,11 +3587,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Interne otpreme"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3749,7 +3630,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Buduća proizvodnja"
@@ -3844,12 +3725,6 @@ msgstr "Organizacija"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3861,9 +3736,27 @@ msgid "Lot Inventory"
 msgstr "Inventar lotova"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Razlog"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3902,7 +3795,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3924,16 +3816,16 @@ msgstr "Klijenti izvan Europe"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3967,10 +3859,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Skladišnice"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3979,7 +3872,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Lista prienosa ne zahtjeva fakturiranje."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4026,7 +3919,7 @@ msgstr ""
 "je fiksna."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4091,7 +3984,6 @@ msgid ""
 msgstr "Označite za lokaciju otpisanih/oštećenih proizvoda."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4099,7 +3991,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4140,10 +4032,9 @@ msgid "Product Category"
 msgstr "Grupa proizvoda"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " za "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4181,7 +4072,7 @@ msgstr ""
 "stock input account will be debited."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4200,7 +4091,7 @@ msgid "Chaining Journal"
 msgstr "Dnevnik ulančavanja"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nedovoljna količina na zalihi, rezervacija artikla nije moguća."
@@ -4221,12 +4112,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "je poništen"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4238,7 +4123,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Buduće otpreme"
@@ -4261,7 +4146,7 @@ msgid "Auto Validate"
 msgstr "Automatska potvrda"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4278,9 +4163,9 @@ msgid "December"
 msgstr "Prosinac"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatski prijenos"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4356,12 +4241,18 @@ msgid "Invoiced"
 msgstr "Fakturirano"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacija"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4415,14 +4306,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Nacrt"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Calendar View"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4451,13 +4339,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Želite li spojiti ove inventare ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4483,7 +4376,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4516,23 +4409,11 @@ msgid "November"
 msgstr "Studeni"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplanirana kol."
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4543,15 +4424,6 @@ msgstr "Chained Company"
 msgid "Check Availability"
 msgstr "Provjeri dostupnost"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Skladišnice"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4589,14 +4461,14 @@ msgid "Move History (parent moves)"
 msgstr "Move History (parent moves)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Buduća zaliha"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -4746,6 +4618,7 @@ msgid "Real"
 msgstr "Realan"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4791,7 +4664,7 @@ msgid "Location Content"
 msgstr "Location Content"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Proizvedena kol."
@@ -4822,12 +4695,6 @@ msgstr ""
 msgid "Production"
 msgstr "Proizvodnja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "je završeno."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4861,6 +4728,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4946,7 +4818,7 @@ msgstr ""
 "locations)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5879,6 +5751,9 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Adresa partnera"
 
+#~ msgid "Date Done"
+#~ msgstr "Datum izvršenja"
+
 #~ msgid "Lot number"
 #~ msgstr "Lot number"
 
@@ -5912,6 +5787,9 @@ msgstr ""
 #~ msgid "Search Stock Picking"
 #~ msgstr "Traži skladišnice"
 
+#~ msgid "Expected"
+#~ msgstr "Očekivano"
+
 #~ msgid "Picking List:"
 #~ msgstr "Skladišnica:"
 
@@ -6115,6 +5993,9 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "Moves for this production lot"
 
+#~ msgid "Reason"
+#~ msgstr "Razlog"
+
 #~ msgid ""
 #~ "This is the list of all the production lots (serial numbers) you recorded. "
 #~ "When you select a lot, you can get the upstream or downstream traceability "
@@ -6262,6 +6143,14 @@ msgstr ""
 #~ msgid "Exist Split lines"
 #~ msgstr "Izađi iz razdvajanja redaka"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "je zakazan %s"
+
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Nalog za otpremu"
+
 #~ msgid "Not Available"
 #~ msgstr "Nije dostupno"
 
@@ -6292,6 +6181,10 @@ msgstr ""
 #~ msgid "Receive Information"
 #~ msgstr "Informacije o zaprimanju"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "je u statusu nacrt."
+
 #, python-format
 #~ msgid "Operation forbidden"
 #~ msgstr "Zabranjena operacija"
@@ -6379,6 +6272,10 @@ msgstr ""
 #~ "grafikon za tjedan po danima)\n"
 #~ "    "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock input account defined for this product or its category: "
@@ -6406,6 +6303,10 @@ msgstr ""
 #~ msgid "Tracking prefix"
 #~ msgstr "Prefiks za praćenje"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Interni prijenos"
+
 #, python-format
 #~ msgid "Can not consume a move with negative or zero quantity !"
 #~ msgstr ""
@@ -6455,10 +6356,22 @@ msgstr ""
 #~ "Količine, jedince mjere, artikli i lokacije ne mogu biti mijenjane na "
 #~ "transakcijama zalihe koje su već proknjižen (osim administratora)"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "je poništen"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Upozorenje"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " za "
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "je završeno."
+
 #, python-format
 #~ msgid ""
 #~ "There is no inventory variation account defined on the product category: "
@@ -6486,6 +6399,10 @@ msgstr ""
 #~ "originalnom nabavnom nalogu. Možete potvrditi zaprimanje u cjelosti ili "
 #~ "djelomično."
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "je spreman za procesiranje."
+
 #, python-format
 #~ msgid "Please specify at least one non-zero quantity!"
 #~ msgstr "Molim navedite bar jednu količinu različitu od nule!"
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index c8bb7763b2d..c016cf2c473 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Termékmozgások"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Készletnapló"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -266,7 +260,6 @@ msgid "Not Applicable"
 msgstr "Nem alkalmazható"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -314,7 +307,7 @@ msgid "Reference"
 msgstr "Hivatkozás"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Feldolgozandó termékek"
@@ -344,7 +337,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -354,22 +346,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Vigyázat!"
@@ -575,12 +567,12 @@ msgid "Location Type"
 msgstr "Telephely típusa"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Fizikai leltártervezetek"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -616,7 +608,7 @@ msgid "Item Labels"
 msgstr "Tétel címkéje"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -732,9 +724,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Átvétel"
 
@@ -807,21 +797,15 @@ msgstr "Augusztus"
 msgid "Packs"
 msgstr "Csomagok"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Tennivalók"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -876,7 +860,7 @@ msgstr ""
 "könyvelődnek automatikusan a készletmozgások feldolgozásakor a tételek."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -884,7 +868,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -911,7 +894,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Jövőbeni átvételek"
@@ -982,9 +965,9 @@ msgid "IT Suppliers"
 msgstr "IT Beszállítók"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Fizikai leltártervezetek"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -993,7 +976,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1006,9 +989,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatikus mozgás"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1016,7 +999,7 @@ msgid "Change Product Quantity"
 msgstr "Termékmennyiség megváltoztatása"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "jövő"
@@ -1046,7 +1029,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1084,9 +1067,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Pénznem"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1095,12 +1079,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Napló"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1157,6 +1135,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1271,7 +1254,7 @@ msgid "Author"
 msgstr "Szerző"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1283,10 +1266,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Szállítólevél"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1294,10 +1276,8 @@ msgid "Manual Operation"
 msgstr "Manuális művelet"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1309,7 +1289,7 @@ msgid "Supplier"
 msgstr "Szállító"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1317,16 +1297,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Befejezés dátuma"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1484,13 +1462,7 @@ msgstr ""
 "átlagáras nyilvántartást alkalmaznak)."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "tervezet állapotban van."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1512,13 +1484,13 @@ msgid "To be refunded/invoiced"
 msgstr "Jóváírandó/számlázandó"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Csak a készletmozgás tervezetek törölhetők."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1535,11 +1507,14 @@ msgid "Ready"
 msgstr "Kész"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Naptárnézet"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Tervezet"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1552,11 +1527,10 @@ msgid "Additional Info"
 msgstr "További információ"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Mozgatás"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1595,10 +1569,11 @@ msgid "Internal Picking List"
 msgstr "Belső kiszedési lista"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Várakozó"
 
 #. module: stock
 #: view:stock.move:0
@@ -1612,9 +1587,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Raktár"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1654,18 +1636,6 @@ msgstr "Leltársor ID"
 msgid "Address of  customer or supplier."
 msgstr "Vevő vagy szállító címe"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1728,7 +1698,7 @@ msgid "Order Date"
 msgstr "Megrendelés dátuma"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1766,7 +1736,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1812,10 +1782,9 @@ msgid "Stock Statistics"
 msgstr "Készletstatisztika"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Pénznem"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1915,12 +1884,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1946,7 +1909,7 @@ msgid "Localization"
 msgstr "Lokalizáció"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Szállított mennyiség"
@@ -2013,7 +1976,6 @@ msgid "Date"
 msgstr "Dátum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2032,7 +1994,7 @@ msgid "Location Stock"
 msgstr "Raktárhely"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2230,14 +2192,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Várakozó"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Átvett mennyiség"
@@ -2269,7 +2224,6 @@ msgstr "Készletek importálása"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Név"
@@ -2305,8 +2259,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2322,7 +2276,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2360,7 +2313,7 @@ msgid "Creation"
 msgstr "Létrehozás"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2448,12 +2401,6 @@ msgstr "Összekapcsolt telephelyek"
 msgid "Inventory loss"
 msgstr "Leltárhiány"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokumentum"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2477,7 +2424,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2540,7 +2486,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Jövőbeni mennyiség"
@@ -2602,12 +2548,7 @@ msgid "Products"
 msgstr "Termékek"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2647,7 +2588,7 @@ msgid "Outgoing Products"
 msgstr "Kifutó termékek"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2660,19 +2601,14 @@ msgid "Delay(Days)"
 msgstr "Késedelem (napok)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Mozgatás"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2788,7 +2724,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2812,7 +2748,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2820,9 +2756,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2879,7 +2814,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2891,6 +2826,7 @@ msgstr "Készletszint előrejelzés"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2901,13 +2837,13 @@ msgid "Stock Journal"
 msgstr "Készletnapló"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Beszerzés"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2935,13 +2871,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Termékek átvétele"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Beszerzés"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2969,7 +2911,7 @@ msgid "Date of Completion"
 msgstr "Befejezés dátuma"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3036,13 +2978,6 @@ msgstr "Valós készlet"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3051,7 +2986,6 @@ msgstr "Felülvizsgálat dátuma"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Tétel"
@@ -3074,12 +3008,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Mennyiség (EE)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3090,29 +3018,6 @@ msgstr "Beállítás rendelkezésre állónak"
 msgid "Contact Address :"
 msgstr "Cím :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3121,7 +3026,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3139,7 +3044,7 @@ msgid "Properties"
 msgstr "Tulajdonságok"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Hiba, nincs partner !"
@@ -3223,13 +3128,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Készlet hivatkozás"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Belső kiszedés"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3260,18 +3158,6 @@ msgstr "Feldolgozás"
 msgid "Revision Name"
 msgstr "Felülvizsgálat neve"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Raktár"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3298,7 +3184,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3345,7 +3231,7 @@ msgid "Date done"
 msgstr "Befejezés dátuma"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3372,8 +3258,8 @@ msgstr "Nem sürgős"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Tennivalók"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3417,7 +3303,7 @@ msgid "Stock"
 msgstr "Készlet"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3483,7 +3369,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3656,11 +3542,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Belső szállítások"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3704,7 +3585,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Jövőbeni gyártások"
@@ -3799,12 +3680,6 @@ msgstr "Vállalat"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3816,9 +3691,27 @@ msgid "Lot Inventory"
 msgstr "Leltártétel"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Ok"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3857,7 +3750,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3879,16 +3771,16 @@ msgstr "Európán kívüli vevők"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3922,10 +3814,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Kiszedés"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3934,7 +3827,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Ezt a kiszedési listát nem kell számlázni."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3972,7 +3865,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4037,7 +3930,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4045,7 +3937,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4086,9 +3978,8 @@ msgid "Product Category"
 msgstr "Termék kategória"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4127,7 +4018,7 @@ msgstr ""
 "megterhelik és a készletszámlát jóváírják."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4146,7 +4037,7 @@ msgid "Chaining Journal"
 msgstr "Összekapcsolási napló"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nincs elég készlet, nem lehet foglalni a termékeket."
@@ -4167,12 +4058,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "törölt"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4184,7 +4069,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Jövőbeni szállítások"
@@ -4207,7 +4092,7 @@ msgid "Auto Validate"
 msgstr "Automatikus jóváhagyás"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4224,9 +4109,9 @@ msgid "December"
 msgstr "December"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatikus mozgás"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4303,12 +4188,18 @@ msgid "Invoiced"
 msgstr "Kiszámlázott"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Információ"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4360,14 +4251,11 @@ msgid "Internal"
 msgstr "Belső"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Tervezet"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Naptárnézet"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4396,13 +4284,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Szeretné összevonni ezeket a készleteket?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Y pozíció"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4428,7 +4321,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4461,23 +4354,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Nem tervezett mennyiség"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4488,15 +4369,6 @@ msgstr "Összekapcsolt vállalat"
 msgid "Check Availability"
 msgstr "Rendelkezésre állás ellenőrzése"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Kiszedés"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4534,14 +4406,14 @@ msgid "Move History (parent moves)"
 msgstr "Mozgás előzmények (főmozgások)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Jövőbeni készlet"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Hiba"
@@ -4690,6 +4562,7 @@ msgid "Real"
 msgstr "Valós"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4735,7 +4608,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Termelt mennyiség"
@@ -4766,12 +4639,6 @@ msgstr ""
 msgid "Production"
 msgstr "Gyártás"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "elkészült."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4805,6 +4672,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4887,7 +4759,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5764,6 +5636,10 @@ msgstr ""
 #~ msgid "Stock Location Analysis"
 #~ msgstr "Készlethelyszín analízis"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokumentum"
+
 #~ msgid "Tracking a move"
 #~ msgstr "Mozgás követése"
 
@@ -5802,6 +5678,10 @@ msgstr ""
 #~ msgid "Tracking prefix"
 #~ msgstr "Követési előtag"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Belső kiszedés"
+
 #~ msgid "Address"
 #~ msgstr "Cím"
 
@@ -5814,6 +5694,9 @@ msgstr ""
 #~ msgid "New pack"
 #~ msgstr "Új csomag"
 
+#~ msgid "Reason"
+#~ msgstr "Ok"
+
 #, python-format
 #~ msgid "UserError"
 #~ msgstr "Felhasználói hiba"
@@ -5888,6 +5771,10 @@ msgstr ""
 #~ "készletcsökkenés főkönyvi számlája és a termék kategória készlet főkönyvi "
 #~ "számlája ugyanaz."
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "tervezet állapotban van."
+
 #, python-format
 #~ msgid "Operation forbidden"
 #~ msgstr "Tiltott művelet"
@@ -5949,6 +5836,10 @@ msgstr ""
 #~ "\"%s\" (kód: %d) termék kategóriára nem állítottak be készlet főkönyvi "
 #~ "számlát"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "elkészült."
+
 #~ msgid ""
 #~ "This menu gives you the full traceability of inventory operations on a "
 #~ "specific product. You can filter on the product to see all the past or "
@@ -6093,6 +5984,10 @@ msgstr ""
 #~ msgid "Process Now"
 #~ msgstr "Feldolgozás indítása"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Szállítólevél"
+
 #~ msgid "Packing list"
 #~ msgstr "Kiszedési lista"
 
@@ -6110,6 +6005,9 @@ msgstr ""
 #~ msgid "Date of Order"
 #~ msgstr "Megrendelés időpontja"
 
+#~ msgid "Date Done"
+#~ msgstr "Befejezés dátuma"
+
 #~ msgid ""
 #~ "(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
 #~ "filter all resources of the day for the 'From' date and 23:59:59 for the "
@@ -6136,6 +6034,10 @@ msgstr ""
 #~ msgid "Outgoing Products Delay"
 #~ msgstr "Kimenő termékek késedelme"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "törölt"
+
 #~ msgid "Reception:"
 #~ msgstr "Átvétel:"
 
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index d0f8404604b..efbc70f51bd 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:15+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "Penelusuran Ke Hilir"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Produk Bergerak"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Jurnal Stok"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -267,7 +261,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -315,7 +308,7 @@ msgid "Reference"
 msgstr "Referensi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -343,7 +336,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -353,22 +345,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Perhatian!"
@@ -574,12 +566,12 @@ msgid "Location Type"
 msgstr "Tipe Lokasi"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -615,7 +607,7 @@ msgid "Item Labels"
 msgstr "Label item"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -731,9 +723,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -806,20 +796,14 @@ msgstr ""
 msgid "Packs"
 msgstr "Kemasan"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -875,7 +859,7 @@ msgstr ""
 "di mana entri akan secara otomatis diposting ketika stok bergerak diproses"
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -883,7 +867,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -910,7 +893,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -981,8 +964,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -992,7 +975,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Lokasi Transit Transfer-Perusahaan Internal"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1005,9 +988,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Perpindahan Otomatis"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1015,7 +998,7 @@ msgid "Change Product Quantity"
 msgstr "Merubah Kuantitas Produk"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1045,7 +1028,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1083,9 +1066,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Mata Uang"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1094,12 +1078,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1156,6 +1134,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1274,7 +1257,7 @@ msgid "Author"
 msgstr "Penulis"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1286,9 +1269,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1297,10 +1279,8 @@ msgid "Manual Operation"
 msgstr "Proses Manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1312,7 +1292,7 @@ msgid "Supplier"
 msgstr "Pemasok"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1320,16 +1300,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Tanggal Selesai"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1489,13 +1467,7 @@ msgstr ""
 "harga rata-rata  )"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1517,13 +1489,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1540,11 +1512,14 @@ msgid "Ready"
 msgstr "Siap"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Rancangan"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1557,11 +1532,10 @@ msgid "Additional Info"
 msgstr "Informasi tambahan"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Pindah"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1600,10 +1574,11 @@ msgid "Internal Picking List"
 msgstr "Daftar Pengambilan Internal"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Menunggu"
 
 #. module: stock
 #: view:stock.move:0
@@ -1617,9 +1592,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ". Seharusnya: </%S>."
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1659,18 +1641,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr "Alamat rekanan atau pemasok"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1735,7 +1705,7 @@ msgid "Order Date"
 msgstr "Tanggal Order"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1773,7 +1743,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Stok faktur pada pengiriman"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1819,10 +1789,9 @@ msgid "Stock Statistics"
 msgstr "Stok Statistik"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Mata Uang"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1922,12 +1891,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "Siap untuk di proses"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1953,7 +1916,7 @@ msgid "Localization"
 msgstr "Lokalisasi"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Kuantitas yang dikirimkan"
@@ -2020,7 +1983,6 @@ msgid "Date"
 msgstr "Tanggal"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2039,7 +2001,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2240,14 +2202,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Menunggu"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2281,7 +2236,6 @@ msgstr "Impor Persediaan"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2317,8 +2271,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2334,7 +2288,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2372,7 +2325,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2460,12 +2413,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr "Penurunan Nilai Persediaan"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokumen"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2489,7 +2436,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2552,7 +2498,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2614,12 +2560,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2659,7 +2600,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2672,19 +2613,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Pindah"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2799,7 +2735,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2823,7 +2759,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2831,9 +2767,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2889,7 +2824,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2901,6 +2836,7 @@ msgstr "Prediksi Level Stok"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2911,13 +2847,13 @@ msgid "Stock Journal"
 msgstr "Jurnal Stok"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2945,13 +2881,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2979,7 +2921,7 @@ msgid "Date of Completion"
 msgstr "Tanggal Penyelesaian"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3046,13 +2988,6 @@ msgstr "Stok nyata"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3061,7 +2996,6 @@ msgstr "Tanggal Revisi"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3084,12 +3018,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3100,29 +3028,6 @@ msgstr "Set Tersedia"
 msgid "Contact Address :"
 msgstr "Alamat Kontak"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3131,7 +3036,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3149,7 +3054,7 @@ msgid "Properties"
 msgstr "Properti"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "ada kesalahan ! Tidak ada rekanan .."
@@ -3233,13 +3138,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referensi Persediaan"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Pengambilan Internal"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3270,18 +3168,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Nama Revisi"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3308,7 +3194,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3355,7 +3241,7 @@ msgid "Date done"
 msgstr "Tanggal Selesai"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3380,7 +3266,7 @@ msgstr "Not urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3425,7 +3311,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3491,7 +3377,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3664,11 +3550,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Pengiriman internal"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3712,7 +3593,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Produksi Akan datang"
@@ -3807,12 +3688,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3824,8 +3699,26 @@ msgid "Lot Inventory"
 msgstr "Lot Persediaan"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3865,7 +3758,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3887,16 +3779,16 @@ msgstr "Konsumen Non Eropa"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3930,10 +3822,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Pengambilan"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3942,7 +3835,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Daftar pengambilan ini tidak memerlukan faktur"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3980,7 +3873,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4047,7 +3940,6 @@ msgstr ""
 "dibuang / barang yang rusak."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4055,7 +3947,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4096,9 +3988,8 @@ msgid "Product Category"
 msgstr "Kategori Produk"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4137,7 +4028,7 @@ msgstr ""
 "stok input akan didebet."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4156,7 +4047,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4177,12 +4068,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "Telah Dibatalkan"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4194,7 +4079,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4217,7 +4102,7 @@ msgid "Auto Validate"
 msgstr "Divalidasi Otomatis"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4234,9 +4119,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Perpindahan Otomatis"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4312,12 +4197,18 @@ msgid "Invoiced"
 msgstr "Difakturkan"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informasi"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4371,14 +4262,11 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Rancangan"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4401,13 +4289,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Anda ingin menggabungkan persediaan ini ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4433,7 +4326,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4466,23 +4359,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Qty Tidak direncanakan"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4493,15 +4374,6 @@ msgstr "Perusahaan terkait"
 msgid "Check Availability"
 msgstr "Cek Ketersediaan"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Pengambilan"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4539,14 +4411,14 @@ msgid "Move History (parent moves)"
 msgstr "Riwayat Perpindahan"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4695,6 +4567,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4740,7 +4613,7 @@ msgid "Location Content"
 msgstr "Lokasi konten"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Produksi Qty"
@@ -4771,12 +4644,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produksi"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "Selesai"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4810,6 +4677,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4892,7 +4764,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5111,6 +4983,9 @@ msgstr ""
 #~ "There is no stock output account defined for this product: \"%s\" (id: %d)"
 #~ msgstr "Tidak ditemukan akun  kluaran untuk produk  :\"%s\" (id: %d)"
 
+#~ msgid "Date Done"
+#~ msgstr "Tanggal Selesai"
+
 #~ msgid "Address of partner"
 #~ msgstr "Alamat rekanan"
 
@@ -5240,6 +5115,10 @@ msgstr ""
 #~ msgid "Update"
 #~ msgstr "Perbaharui"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokumen"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Masukan daftar pengambilan"
 
@@ -5336,6 +5215,10 @@ msgstr ""
 #~ msgid "Inventory Management"
 #~ msgstr "Manajemen Persediaan"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Pengambilan Internal"
+
 #~ msgid "Accounting Stock Properties"
 #~ msgstr "Properti Akun Stok"
 
@@ -5409,6 +5292,10 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Peringatan"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "Selesai"
+
 #~ msgid "It specifies goods to be delivered all at once or by direct delivery"
 #~ msgstr ""
 #~ "Ini menentukan barang yang akan diserahkan sekaligus atau dengan pengiriman "
@@ -5420,6 +5307,10 @@ msgstr ""
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Kuantitas ini dinyatakan dalam UoM Default produk"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "Telah Dibatalkan"
+
 #~ msgid "Additional info"
 #~ msgstr "Informasi Tambahan"
 
@@ -5470,6 +5361,10 @@ msgstr ""
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referensi dokumen yang memproduksi pengambilan ini"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "Siap untuk di proses"
+
 #, python-format
 #~ msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 #~ msgstr ""
@@ -5541,6 +5436,9 @@ msgstr ""
 #~ "Jumlah Kuantitas setelah pemecahan melebihi jumlah untuk dibagi pada produk "
 #~ "ini: \"% s\" (id:% d)"
 
+#~ msgid "Expected"
+#~ msgstr ". Seharusnya: </%S>."
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Anda harus menetapkan lot produksi untuk produk  ini"
 
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index f0f4b691e99..bfd94e42e25 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:24+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\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: 2012-12-21 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "Tracciabilità a monte"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Movimenti prodotto"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Registro Inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -266,7 +260,6 @@ msgid "Not Applicable"
 msgstr "Non applicabile"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -314,7 +307,7 @@ msgid "Reference"
 msgstr "Riferimento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Prodotti da elaborare"
@@ -344,7 +337,6 @@ msgid "_Validate"
 msgstr "_Valida"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -356,22 +348,22 @@ msgstr ""
 "direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -575,12 +567,12 @@ msgid "Location Type"
 msgstr "Tipo di luogo"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventari fisici bozza"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -616,7 +608,7 @@ msgid "Item Labels"
 msgstr "Etichette articolo"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -734,9 +726,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Ricevimento"
 
@@ -809,21 +799,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Imballaggi"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Da fare"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -876,7 +860,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -884,7 +868,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -911,7 +894,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Ricevimenti futuri"
@@ -982,9 +965,9 @@ msgid "IT Suppliers"
 msgstr "Fornitori IT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventari fisici bozza"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -993,7 +976,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1006,9 +989,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimento Automatico"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1016,7 +999,7 @@ msgid "Change Product Quantity"
 msgstr "Cambia quantità prodotto"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1046,7 +1029,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1084,9 +1067,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1095,12 +1079,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Giornale"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1157,6 +1135,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1273,7 +1256,7 @@ msgid "Author"
 msgstr "Autore"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1285,10 +1268,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Ordine di consegna"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1296,10 +1278,8 @@ msgid "Manual Operation"
 msgstr "Operazione Manuale"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1311,7 +1291,7 @@ msgid "Supplier"
 msgstr "Fornitore"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1319,16 +1299,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Data Fine"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1483,13 +1461,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "è in stato bozza"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1511,13 +1483,13 @@ msgid "To be refunded/invoiced"
 msgstr "Da rendere / fatturare"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Puoi cancellare solo i movimenti in bozza"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1534,11 +1506,14 @@ msgid "Ready"
 msgstr "Pronto"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Panoramica del calendario"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Bozza"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1551,10 +1526,9 @@ msgid "Additional Info"
 msgstr "Informazioni aggiuntive"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1594,10 +1568,11 @@ msgid "Internal Picking List"
 msgstr "Picking list interna"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "In attesa"
 
 #. module: stock
 #: view:stock.move:0
@@ -1611,9 +1586,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Atteso"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Magazzino"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1653,18 +1635,6 @@ msgstr "Id linea inventario"
 msgid "Address of  customer or supplier."
 msgstr "Indirizzo del cliente o fornitore."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1729,7 +1699,7 @@ msgid "Order Date"
 msgstr "Data ordine"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1768,7 +1738,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1814,10 +1784,9 @@ msgid "Stock Statistics"
 msgstr "Statistiche di magazzino"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1917,12 +1886,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Scaffale 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "è pronto per essere elaborato."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1948,7 +1911,7 @@ msgid "Localization"
 msgstr "Localizzazione"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Q.ta Consegnate"
@@ -2015,7 +1978,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2034,7 +1996,7 @@ msgid "Location Stock"
 msgstr "Punto di Stoccaggio"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2232,14 +2194,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "In attesa"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Q.tà ricevuta"
@@ -2273,7 +2228,6 @@ msgstr "Importa inventario"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nome"
@@ -2309,8 +2263,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2326,7 +2280,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2364,7 +2317,7 @@ msgid "Creation"
 msgstr "Creazione"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2450,12 +2403,6 @@ msgstr "Punti di Stoccaggio Collegati"
 msgid "Inventory loss"
 msgstr "Perdita di Inventario"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2479,7 +2426,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2542,7 +2488,7 @@ msgid "Warehouse board"
 msgstr "Board magazzino"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Q.tà futura"
@@ -2604,12 +2550,7 @@ msgid "Products"
 msgstr "Prodotti"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2649,7 +2590,7 @@ msgid "Outgoing Products"
 msgstr "Prodotti in uscita"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2662,19 +2603,14 @@ msgid "Delay(Days)"
 msgstr "Ritardo (giorni)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2782,7 +2718,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2806,7 +2742,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2814,9 +2750,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2868,7 +2803,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2880,6 +2815,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2890,13 +2826,13 @@ msgid "Stock Journal"
 msgstr "Giornale di magazzino"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Approvvigionamento"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "L'ID elemento attivo non è stato impostato nel contesto"
@@ -2924,13 +2860,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Prodotti in entrata"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Approvvigionamento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2958,7 +2900,7 @@ msgid "Date of Completion"
 msgstr "Data di completamento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3027,13 +2969,6 @@ msgstr "Giacenza Reale"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3042,7 +2977,6 @@ msgstr "Data di revisione"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lotto"
@@ -3065,12 +2999,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Quantità (UoS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3081,29 +3009,6 @@ msgstr "Imposta disponibilità"
 msgid "Contact Address :"
 msgstr "Indirizzo contatto:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3112,7 +3017,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3130,7 +3035,7 @@ msgid "Properties"
 msgstr "Proprietà"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Errore, nessun partner !"
@@ -3214,13 +3119,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Picking interno"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3251,18 +3149,6 @@ msgstr "Elabora"
 msgid "Revision Name"
 msgstr "Nome revisione"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Magazzino"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3289,7 +3175,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3336,7 +3222,7 @@ msgid "Date done"
 msgstr "Data Chiusura"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3362,8 +3248,8 @@ msgstr "Non Urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Da fare"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3407,7 +3293,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3473,7 +3359,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3646,11 +3532,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3694,7 +3575,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Produzioni future"
@@ -3789,12 +3670,6 @@ msgstr "Azienda"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3806,9 +3681,27 @@ msgid "Lot Inventory"
 msgstr "Inventario Lotti"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivo"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3847,7 +3740,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3869,16 +3761,16 @@ msgstr "Clienti non europei"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3912,10 +3804,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Picking"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3924,7 +3817,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Questa picking non richiede fatturazione."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3962,7 +3855,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4027,7 +3920,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4035,7 +3927,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4076,9 +3968,8 @@ msgid "Product Category"
 msgstr "Categoria prodotto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4112,7 +4003,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4131,7 +4022,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4152,12 +4043,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "è annullato."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4169,7 +4054,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Consegne future"
@@ -4192,7 +4077,7 @@ msgid "Auto Validate"
 msgstr "Convalida automatica"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4209,9 +4094,9 @@ msgid "December"
 msgstr "Dicembre"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimento Automatico"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4285,12 +4170,18 @@ msgid "Invoiced"
 msgstr "Fatturato"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informazioni"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4344,14 +4235,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Bozza"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Panoramica del calendario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4374,13 +4262,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Vuoi incorporare inventari?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Scaffali (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4406,7 +4299,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4439,23 +4332,11 @@ msgid "November"
 msgstr "Novembre"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Qtà non pianificata"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4466,15 +4347,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Controllo disponibilità"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Picking"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4512,14 +4384,14 @@ msgid "Move History (parent moves)"
 msgstr "Storico movimento (movimenti superiori)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Errore"
@@ -4668,6 +4540,7 @@ msgid "Real"
 msgstr "Reale"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4713,7 +4586,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Qtà prodotta"
@@ -4744,12 +4617,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produzione"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "è completato."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4783,6 +4650,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4865,7 +4737,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5262,6 +5134,9 @@ msgstr ""
 #~ msgid "STOCK_SELECT_FONT"
 #~ msgstr "STOCK_SELECT_FONT"
 
+#~ msgid "Date Done"
+#~ msgstr "Data Fine"
+
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
@@ -5761,6 +5636,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Indirizzo del partner"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Ordine di consegna"
+
 #~ msgid "Additional info"
 #~ msgstr "Informazioni aggiuntive"
 
@@ -5804,6 +5683,10 @@ msgstr ""
 #~ msgid "Shop 1"
 #~ msgstr "Negozio 1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "è in stato bozza"
+
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Azione non valida!"
@@ -5832,6 +5715,10 @@ msgstr ""
 #~ msgid "Update"
 #~ msgstr "Aggiorna"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Products "
 #~ msgstr "Prodotti "
 
@@ -5842,6 +5729,10 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "Errore!"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Picking interno"
+
 #~ msgid "Lot weight"
 #~ msgstr "Peso lotto"
 
@@ -5862,6 +5753,9 @@ msgstr ""
 #~ msgid "UserError"
 #~ msgstr "Errore Utente"
 
+#~ msgid "Reason"
+#~ msgstr "Motivo"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Attenzione"
@@ -6020,9 +5914,17 @@ msgstr ""
 #~ msgid "Delivery Order:"
 #~ msgstr "Ordine consegna:"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "è completato."
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Questa quantità è espressa nell'U.M. di default del prodotto."
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "è annullato."
+
 #~ msgid "Existing Lots"
 #~ msgstr "Lotti esistenti"
 
@@ -6064,6 +5966,9 @@ msgstr ""
 #~ msgid "Split in Production lots"
 #~ msgstr "Dividi in lotti di produzione"
 
+#~ msgid "Expected"
+#~ msgstr "Atteso"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "quantità."
@@ -6180,6 +6085,10 @@ msgstr ""
 #~ msgid "Related Picking"
 #~ msgstr "Picking collegato"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "è pronto per essere elaborato."
+
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Riferimento al documento che ha generato questo picking"
 
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index 8535e98e096..2c5eac5c4e9 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-11 05:35+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -82,9 +82,10 @@ msgid "Upstream Traceability"
 msgstr "上流追跡能力"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -123,8 +124,8 @@ msgid "Product Moves"
 msgstr "製品移動"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -148,7 +149,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "１つの棚卸を超えて、この操作の実行はできません。"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "数量は交渉不可"
@@ -201,18 +202,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "在庫仕訳帳"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -267,7 +261,6 @@ msgid "Not Applicable"
 msgstr "適用不可"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -315,7 +308,7 @@ msgid "Reference"
 msgstr "参照"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "処理する製品"
@@ -343,7 +336,6 @@ msgid "_Validate"
 msgstr "検証"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -353,22 +345,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "警告"
@@ -572,12 +564,12 @@ msgid "Location Type"
 msgstr "場所のタイプ"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "実在庫のドラフト"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -613,7 +605,7 @@ msgid "Item Labels"
 msgstr "項目ラベル"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -729,9 +721,7 @@ msgid "Destination Address "
 msgstr "宛先住所 "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "受理"
 
@@ -804,20 +794,14 @@ msgstr "8月"
 msgid "Packs"
 msgstr "梱包"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "利用可能な在庫移動（処理準備完了）"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -871,7 +855,7 @@ msgid ""
 msgstr "リアルタイム在庫評価を行う場合、これは在庫移動が処理される時に自動的に記帳される会計仕訳帳エントリーです。"
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -879,7 +863,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -906,7 +889,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "将来の受取"
@@ -977,9 +960,9 @@ msgid "IT Suppliers"
 msgstr "IT仕入先"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "実在庫のドラフト"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -988,7 +971,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "会社間転送の中継場所"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1001,9 +984,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "自動移動"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "利用可能な製品ロット"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1011,7 +994,7 @@ msgid "Change Product Quantity"
 msgstr "製品数量の変更"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "将来の損益計算書"
@@ -1041,7 +1024,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1079,9 +1062,10 @@ msgid "Pickings already processed"
 msgstr "梱包は既に処理済です。"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "計画月"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "通貨"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1090,12 +1074,6 @@ msgstr "計画月"
 msgid "Journal"
 msgstr "仕訳帳"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "%s 予定済"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1154,6 +1132,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1283,7 +1266,7 @@ msgid "Author"
 msgstr "著者"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1295,10 +1278,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "配達オーダー"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1306,10 +1288,8 @@ msgid "Manual Operation"
 msgstr "手動操作"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1321,7 +1301,7 @@ msgid "Supplier"
 msgstr "仕入先"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1329,17 +1309,15 @@ msgid ""
 msgstr "この棚卸をキャンセルするためには、最初に関連する仕訳帳エントリーを未記帳にする必要があります。"
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "完了日"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "利用可能な在庫移動（処理準備完了）"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1496,13 +1474,7 @@ msgid ""
 msgstr "集荷確認（平均原価方式が使われる時）の間に、ユーザによる製品コストの設定を記録するために使用される技術的な項目"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "ドラフト状態です。"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1524,13 +1496,13 @@ msgid "To be refunded/invoiced"
 msgstr "返金 / 請求"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "ドラフト移動のみ削除ができます。"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1547,11 +1519,14 @@ msgid "Ready"
 msgstr "準備完了"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "カレンダービュー"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "ドラフト"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1564,11 +1539,10 @@ msgid "Additional Info"
 msgstr "付加情報"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "移動"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1605,10 +1579,11 @@ msgid "Internal Picking List"
 msgstr "内部集荷リスト"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "待機中"
 
 #. module: stock
 #: view:stock.move:0
@@ -1622,9 +1597,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "予定"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "倉庫"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1666,18 +1648,6 @@ msgstr "在庫行ID"
 msgid "Address of  customer or supplier."
 msgstr "顧客または仕入先住所"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1740,7 +1710,7 @@ msgid "Order Date"
 msgstr "オーダー日"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "請求書：%s"
@@ -1778,7 +1748,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "出荷される在庫の請求書"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1824,10 +1794,9 @@ msgid "Stock Statistics"
 msgstr "在庫の統計値"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "通貨"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "計画月"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1927,12 +1896,6 @@ msgstr "在庫評価アカウント（入庫）"
 msgid "Shelf 2"
 msgstr "棚 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "処理準備完了"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1958,7 +1921,7 @@ msgid "Localization"
 msgstr "ローカル化"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "配送数量"
@@ -2027,7 +1990,6 @@ msgid "Date"
 msgstr "日付"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2046,7 +2008,7 @@ msgid "Location Stock"
 msgstr "在庫場所"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2242,14 +2204,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "待機中"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "受領済数量"
@@ -2281,7 +2236,6 @@ msgstr "在庫のインポート"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "名前"
@@ -2317,8 +2271,8 @@ msgid "Customer Locations"
 msgstr "顧客の場所"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2334,7 +2288,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2372,7 +2325,7 @@ msgid "Creation"
 msgstr "作成"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2458,12 +2411,6 @@ msgstr "連鎖した場所"
 msgid "Inventory loss"
 msgstr "棚卸損失"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "ドキュメント"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2487,7 +2434,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2550,7 +2496,7 @@ msgid "Warehouse board"
 msgstr "倉庫のボード"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "将来の数量"
@@ -2612,12 +2558,7 @@ msgid "Products"
 msgstr "製品"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2657,7 +2598,7 @@ msgid "Outgoing Products"
 msgstr "出庫製品"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2670,19 +2611,14 @@ msgid "Delay(Days)"
 msgstr "遅延（日数）"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "移動"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "損益計算書数量"
@@ -2794,7 +2730,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2818,7 +2754,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2826,9 +2762,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2882,7 +2817,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2894,6 +2829,7 @@ msgstr "在庫レベルの予測"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2904,13 +2840,13 @@ msgid "Stock Journal"
 msgstr "在庫仕訳帳"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "調達"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "アクティブIDはコンテキストにセットされません。"
@@ -2938,13 +2874,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "製品の受領"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "調達"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2972,7 +2914,7 @@ msgid "Date of Completion"
 msgstr "完了日"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3039,13 +2981,6 @@ msgstr "実在庫"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3054,7 +2989,6 @@ msgstr "改訂日"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "ロット"
@@ -3077,12 +3011,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "数量（販売単位）"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "待機中"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3093,29 +3021,6 @@ msgstr "使用可能に設定"
 msgid "Contact Address :"
 msgstr "連絡先住所："
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3124,7 +3029,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3142,7 +3047,7 @@ msgid "Properties"
 msgstr "属性"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "エラー、パートナがありません。"
@@ -3227,13 +3132,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "棚卸参照"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "内部集荷"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3264,18 +3162,6 @@ msgstr "処理"
 msgid "Revision Name"
 msgstr "リビジョン名"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "倉庫"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3302,7 +3188,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3349,7 +3235,7 @@ msgid "Date done"
 msgstr "完了日"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3374,7 +3260,7 @@ msgstr "緊急外"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3419,7 +3305,7 @@ msgid "Stock"
 msgstr "在庫"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3485,7 +3371,7 @@ msgid "Assigned Internal Moves"
 msgstr "内部移動の割当"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3658,11 +3544,6 @@ msgstr "マネジャ"
 msgid "Internal Shippings"
 msgstr "内部出荷"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3706,7 +3587,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "将来の製品"
@@ -3801,12 +3682,6 @@ msgstr "会社"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3818,9 +3693,27 @@ msgid "Lot Inventory"
 msgstr "棚卸のロット"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "理由"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3861,7 +3754,6 @@ msgstr ""
 "。これはこの分類の全ての製品のためのデフォルト値です。これは各製品に直接セットすることができます。"
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3883,16 +3775,16 @@ msgstr "欧州顧客以外"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3926,10 +3818,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "確認済配達オーダー"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "集荷"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3938,7 +3831,7 @@ msgid "This picking list does not require invoicing."
 msgstr "この集荷リストは請求を必要としません。"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3981,7 +3874,7 @@ msgstr ""
 "・ 固定の場所：もし固定されているなら、連鎖された場所は連鎖された場所の項目から取得"
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4046,7 +3939,6 @@ msgid ""
 msgstr "廃棄 / 破損品を置くためにこの場所を使用する場合は、このボックスをチェックします。"
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4054,7 +3946,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4095,10 +3987,9 @@ msgid "Product Category"
 msgstr "製品分類"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " ために "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4134,7 +4025,7 @@ msgstr ""
 "原価が減少した場合、在庫の変動アカウントは貸方に記帳され、そして在庫入力アカウントは借方に記帳されます。"
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4153,7 +4044,7 @@ msgid "Chaining Journal"
 msgstr "連鎖的な仕訳帳"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "十分な在庫がなく、製品の予約はできません。"
@@ -4174,12 +4065,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "キャンセル済"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4193,7 +4078,7 @@ msgstr ""
 "わりに、内部の場所からこの場所に移動される製品の価値を保持するために使用されます。"
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "将来の配達"
@@ -4216,7 +4101,7 @@ msgid "Auto Validate"
 msgstr "自動確認"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4233,9 +4118,9 @@ msgid "December"
 msgstr "12月"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "利用可能な製品ロット"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "自動移動"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4309,12 +4194,18 @@ msgid "Invoiced"
 msgstr "請求済"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "情報"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4366,14 +4257,11 @@ msgid "Internal"
 msgstr "内部"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "ドラフト"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "カレンダービュー"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4401,13 +4289,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "これらの棚卸を統合しますか？"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "棚（Y）"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4433,7 +4326,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4466,23 +4359,11 @@ msgid "November"
 msgstr "11月"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "未計画の数量"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4493,15 +4374,6 @@ msgstr "連鎖会社"
 msgid "Check Availability"
 msgstr "利用可能確認"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "集荷"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4539,14 +4411,14 @@ msgid "Move History (parent moves)"
 msgstr "移動履歴（親の移動）"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "将来の在庫"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "エラー"
@@ -4697,6 +4569,7 @@ msgid "Real"
 msgstr "実物"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4742,7 +4615,7 @@ msgid "Location Content"
 msgstr "場所のコンテンツ"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "製品数量"
@@ -4773,12 +4646,6 @@ msgstr ""
 msgid "Production"
 msgstr "製造"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "完了"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4812,6 +4679,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4894,7 +4766,7 @@ msgid ""
 msgstr "連鎖移動を含む集荷リストの出荷タイプ（元の場所と到着場所を元にタイプを自動検出する場合は空白のままとします）"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5136,6 +5008,10 @@ msgstr ""
 #~ msgid "Month-1"
 #~ msgstr "月-1"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "%s 予定済"
+
 #~ msgid "Last month"
 #~ msgstr "先月"
 
@@ -5145,6 +5021,10 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "エラー：無効な商品識別番号です。"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "待機中"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock output account defined for this product: \"%s\" (id: %d)"
@@ -5153,6 +5033,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "パートナの住所"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "配達オーダー"
+
 #, python-format
 #~ msgid ""
 #~ "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
@@ -5162,6 +5046,9 @@ msgstr ""
 #~ msgid "Lot number"
 #~ msgstr "ロット番号"
 
+#~ msgid "Date Done"
+#~ msgstr "完了日"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "予定出荷日"
 
@@ -5189,6 +5076,10 @@ msgstr ""
 #~ msgid "Shop 1"
 #~ msgstr "店 1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "ドラフト状態です。"
+
 #, python-format
 #~ msgid "Company is not specified in Location"
 #~ msgstr "会社が場所に指定されていません。"
@@ -5335,6 +5226,10 @@ msgstr ""
 #~ "generated by a Manufacturing Order"
 #~ msgstr "この製品を含む全ての移動と製造オーダーによって生成のための製造ロットの指定を強制します。"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "ドキュメント"
+
 #~ msgid "Input Picking List"
 #~ msgstr "集荷リストの入力"
 
@@ -5448,6 +5343,10 @@ msgstr ""
 #~ "You are moving %.2f %s products but only %.2f %s available in this lot."
 #~ msgstr "あなたは製品 %.2f %s を移動させようとしていますが、このロットでは %.2f %s のみが利用可能です。"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "内部集荷"
+
 #~ msgid "Open Product"
 #~ msgstr "製品を開く"
 
@@ -5501,6 +5400,9 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "この製造ロットの移動"
 
+#~ msgid "Reason"
+#~ msgstr "理由"
+
 #, python-format
 #~ msgid "UserError"
 #~ msgstr "ユーザエラー"
@@ -5509,6 +5411,10 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "警告"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "完了"
+
 #~ msgid "It specifies goods to be delivered all at once or by direct delivery"
 #~ msgstr "一度に全てを配達する、または直接配送による製品を指定します。"
 
@@ -5524,12 +5430,20 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "レポート"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " ために "
+
 #~ msgid "Stock available to be delivered"
 #~ msgstr "配達するために利用可能な在庫"
 
 #~ msgid "Packing list"
 #~ msgstr "梱包リスト"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "キャンセル済"
+
 #~ msgid "Existing Lots"
 #~ msgstr "既存ロット"
 
@@ -5557,6 +5471,10 @@ msgstr ""
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "この集荷を製造したドキュメントの参照"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "処理準備完了"
+
 #, python-format
 #~ msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 #~ msgstr "製品分類に仕訳帳が定義されていません：%s（ID：%d）"
@@ -5585,6 +5503,9 @@ msgstr ""
 #~ "\"%s\" (id: %d)"
 #~ msgstr "分割はこの製品を分割するための数量を超えた数量です：%s（ID：%d）"
 
+#~ msgid "Expected"
+#~ msgstr "予定"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "この製品に製造ロットを割り当てる必要があります。"
 
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 0e936a0d72f..bb1c26d1bfd 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:02+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "재고 저널"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr "참조"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr "위치 타입"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr "IT 공급자"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,9 +982,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "자동 이동"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr "저자"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr "수동"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "완료 날짜"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "이동 초안만 삭제할 수 있습니다."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,11 +1497,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "카렌더 뷰"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "초안"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,10 +1557,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "대기"
 
 #. module: stock
 #: view:stock.move:0
@@ -1600,9 +1575,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "창고"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1642,18 +1624,6 @@ msgstr "재고 라인 ID"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "배송된 수량"
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr "날짜"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr "창고"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "대기"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "수령한 수량"
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "이름"
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr "위치 체인"
 msgid "Inventory loss"
 msgstr "재고 손실"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr "상품"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr "출고 상품들"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L 수량"
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr "재고 저널"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "조달"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "조달"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr "실제 스톡"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr "리비전 날짜"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "로트"
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "수량 (UOS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr "가용으로 설정"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr "속성"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "에러, 파트너가 없습니다 !"
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "개정 이름"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "창고"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr "완료 날짜"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr "긴급하지 않음"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr "재고"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3767,12 +3648,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,8 +3659,26 @@ msgid "Lot Inventory"
 msgstr "로트 재고"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr "유럽외　고객들"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr "자동 검증"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,9 +4072,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "자동 이동"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr "인보이스됨"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "정보"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,14 +4211,11 @@ msgid "Internal"
 msgstr "내부"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "초안"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "카렌더 뷰"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "이 재고들을 합치겠습니까?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "선반 (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "미계획 수량"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "가용성 체크"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "에러"
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "생산된 수량"
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr "생산"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -4991,6 +4863,9 @@ msgstr ""
 #~ msgid "New Reception Packing"
 #~ msgstr "새로운 수령 포장"
 
+#~ msgid "Date Done"
+#~ msgstr "완료 날짜"
+
 #~ msgid ""
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr "트래킹 로트는 물류 유닛/파레트 상에 위치할 코드입니다."
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index bd7459e540c..04371096417 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\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: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: lt\n"
 
 #. module: stock
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Atsargų žurnalas"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr "Nuoroda"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr "Vietos tipas"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr "IT tiekėjai"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,9 +982,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatiniai įrašai"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr "Autorius"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr "Rankinės operacijos"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Atlikimo data"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Jūs galite ištrinti tik juodraščio būsenos įrašus"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,11 +1497,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendorius"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Juodraštis"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,10 +1557,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Laukiama"
 
 #. module: stock
 #: view:stock.move:0
@@ -1600,9 +1575,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Sandėlis"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1642,18 +1624,6 @@ msgstr "Atsargų eilutės nr."
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Pristatyti kiekiai"
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr "Atsargų vieta"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2216,14 +2178,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Laukiama"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Gauti kiekiai"
@@ -2255,7 +2210,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Pavadinimas"
@@ -2291,8 +2245,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2308,7 +2262,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2346,7 +2299,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2432,12 +2385,6 @@ msgstr "Vietų valdymas"
 msgid "Inventory loss"
 msgstr "Atsargų nurašymas"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2461,7 +2408,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2524,7 +2470,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2586,12 +2532,7 @@ msgid "Products"
 msgstr "Produktai"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2631,7 +2572,7 @@ msgid "Outgoing Products"
 msgstr "Išsiunčiami produktai"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2644,19 +2585,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Kiekis"
@@ -2764,7 +2700,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2788,7 +2724,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2796,9 +2732,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2850,7 +2785,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2862,6 +2797,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2872,13 +2808,13 @@ msgid "Stock Journal"
 msgstr "Atsargų žurnalas"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Planiniai užsakymai"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2906,13 +2842,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Planiniai užsakymai"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2940,7 +2882,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3007,13 +2949,6 @@ msgstr "Tikros atsargos"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3022,7 +2957,6 @@ msgstr "Revizijos data"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partija"
@@ -3045,12 +2979,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Kiekis (Pirkimo mat. vnt.)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3061,29 +2989,6 @@ msgstr "Rezervuoti"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3092,7 +2997,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3110,7 +3015,7 @@ msgid "Properties"
 msgstr "Savybės"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Klaida, nėra nurodytas partneris!"
@@ -3194,13 +3099,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3231,18 +3129,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Revizijos pavadinimas"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Sandėlis"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3269,7 +3155,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3316,7 +3202,7 @@ msgid "Date done"
 msgstr "Atlikimo data"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3343,7 +3229,7 @@ msgstr "Neskubu"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3388,7 +3274,7 @@ msgid "Stock"
 msgstr "Sandėlys"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3454,7 +3340,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3627,11 +3513,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3675,7 +3556,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3770,12 +3651,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3787,8 +3662,26 @@ msgid "Lot Inventory"
 msgstr "Partijų Atsargos"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3828,7 +3721,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3850,16 +3742,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3893,9 +3785,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3905,7 +3798,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3943,7 +3836,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4008,7 +3901,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4016,7 +3908,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4057,9 +3949,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4093,7 +3984,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4112,7 +4003,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4133,12 +4024,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4150,7 +4035,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4173,7 +4058,7 @@ msgid "Auto Validate"
 msgstr "Automatiškai patvirtinti"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4190,9 +4075,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatiniai įrašai"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4266,12 +4151,18 @@ msgid "Invoiced"
 msgstr "Užpajamuota"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacija"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4325,14 +4216,11 @@ msgid "Internal"
 msgstr "Vidinis perdavimas"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Juodraštis"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendorius"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4355,13 +4243,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Ar Jūs norite apjungti šį inventorių?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Lentynos (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4387,7 +4280,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4420,23 +4313,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Nesuplanuoti kiekiai"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4447,15 +4328,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Patikrinti rezervacija"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4493,14 +4365,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Klaida"
@@ -4649,6 +4521,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4694,7 +4567,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Pagaminti kiekiai"
@@ -4725,12 +4598,6 @@ msgstr ""
 msgid "Production"
 msgstr "Gamyba"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4764,6 +4631,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4846,7 +4718,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5073,6 +4945,9 @@ msgstr ""
 #~ msgid "Tracking Lot"
 #~ msgstr "Sekti Partija"
 
+#~ msgid "Date Done"
+#~ msgstr "Atlikimo data"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Tikėtina pristatymo data"
 
diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po
index 32073f540ab..558dd1859ea 100644
--- a/addons/stock/i18n/lv.po
+++ b/addons/stock/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-13 19:22+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr "Izsekot Pretējā Virzienā"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr "Krājumu pārvietošana"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Noliktavas žurnāls"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -267,7 +261,6 @@ msgid "Not Applicable"
 msgstr "Nav Pielietojams"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -315,7 +308,7 @@ msgid "Reference"
 msgstr "Atsauce"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Apstrādājamie Produkti"
@@ -345,7 +338,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -355,22 +347,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Uzmanību!"
@@ -574,12 +566,12 @@ msgid "Location Type"
 msgstr "Noliktavas posteņa Tips"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Neapstiprināta Inventarizācija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -615,7 +607,7 @@ msgid "Item Labels"
 msgstr "Preču Etiķetes"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -731,9 +723,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Pieņemšana"
 
@@ -806,21 +796,15 @@ msgstr "Augusts"
 msgid "Packs"
 msgstr "Pakas"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Darāmais"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -873,7 +857,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -881,7 +865,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -908,7 +891,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Paredzamās Ienākošās Preces"
@@ -979,9 +962,9 @@ msgid "IT Suppliers"
 msgstr "IT piegādātāji"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Neapstiprināta Inventarizācija"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -990,7 +973,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1003,9 +986,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automātisks Grāmatojums"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1013,7 +996,7 @@ msgid "Change Product Quantity"
 msgstr "Mainīt Produkta Skaitu"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1043,7 +1026,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1081,9 +1064,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valūta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1092,12 +1076,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Žurnāls"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1154,6 +1132,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1268,7 +1251,7 @@ msgid "Author"
 msgstr "Autors"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1280,10 +1263,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Piegādes Pasūtījums"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1291,10 +1273,8 @@ msgid "Manual Operation"
 msgstr "Manuāla Darbība"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1306,7 +1286,7 @@ msgid "Supplier"
 msgstr "Piegādātājs"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1314,16 +1294,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Pabeigšanas Datums"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1478,13 +1456,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "ir melnraksts."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1506,13 +1478,13 @@ msgid "To be refunded/invoiced"
 msgstr "Tiks atmaksāts/piestādīts rēķins"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Var dzēst tikai grāmatojumu melnrakstus."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1529,11 +1501,14 @@ msgid "Ready"
 msgstr "Pabeigta"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendāra skats"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Melnraksts"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1546,11 +1521,10 @@ msgid "Additional Info"
 msgstr "Papildus info"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Krājumu pārvietošana"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1589,10 +1563,11 @@ msgid "Internal Picking List"
 msgstr "Iekšējais Komplektācijas Saraksts"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Gaida"
 
 #. module: stock
 #: view:stock.move:0
@@ -1606,9 +1581,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Sagaidāms"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Noliktava"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1648,18 +1630,6 @@ msgstr "Inventarizācijas Rindas ID"
 msgid "Address of  customer or supplier."
 msgstr "Klienta vai piegādātāja adrese."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1722,7 +1692,7 @@ msgid "Order Date"
 msgstr "Pasūtījuma datums"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1760,7 +1730,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Rēķina Piestādīšana Piegādes Brīdī"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1806,10 +1776,9 @@ msgid "Stock Statistics"
 msgstr "Krājumu Statistika"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valūta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1909,12 +1878,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "Plaukts 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "gatavs apstrādei."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1940,7 +1903,7 @@ msgid "Localization"
 msgstr "Lokalizācija"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Piegādātais Sk."
@@ -2007,7 +1970,6 @@ msgid "Date"
 msgstr "Datums"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2026,7 +1988,7 @@ msgid "Location Stock"
 msgstr "Postenis Krājumi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2221,14 +2183,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Gaida"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Saņemtais Sk."
@@ -2262,7 +2217,6 @@ msgstr "Importēt Inventarizācijas sarakstu"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nosaukums"
@@ -2298,8 +2252,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2315,7 +2269,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2353,7 +2306,7 @@ msgid "Creation"
 msgstr "Izveidošana"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2441,12 +2394,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr "Norakstītie krājumi"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokuments"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2470,7 +2417,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2533,7 +2479,7 @@ msgid "Warehouse board"
 msgstr "Noliktavas instrumentu panelis"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Nākotnes Sk."
@@ -2595,12 +2541,7 @@ msgid "Products"
 msgstr "Produkti"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2640,7 +2581,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2653,19 +2594,14 @@ msgid "Delay(Days)"
 msgstr "Aizkave (dienās)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Krājumu pārvietošana"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Sk. Peļņas un Zaudējumu aprēķinam"
@@ -2773,7 +2709,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2797,7 +2733,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2805,9 +2741,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2859,7 +2794,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2871,6 +2806,7 @@ msgstr "Krājumu Līmeņa Prognoze"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2881,13 +2817,13 @@ msgid "Stock Journal"
 msgstr "Noliktavas Žurnāls"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Sagāde"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2915,13 +2851,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Saņemt Preci"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Sagāde"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2949,7 +2891,7 @@ msgid "Date of Completion"
 msgstr "Pabeigšanas datums"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3016,13 +2958,6 @@ msgstr "Reāli noliktavā"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3031,7 +2966,6 @@ msgstr "Revīzijas datums"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Preču Partija"
@@ -3054,12 +2988,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Skaits (Pārdošanas mērvienības)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3070,29 +2998,6 @@ msgstr "Atzīmēt kā Pieejamu"
 msgid "Contact Address :"
 msgstr "Kontaktpersonas Adrese:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3101,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3119,7 +3024,7 @@ msgid "Properties"
 msgstr "Īpašības"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Kļūda, nav paertnera!"
@@ -3203,13 +3108,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Inventarizācijas Kods"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Iekšējā komplektācija"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3240,18 +3138,6 @@ msgstr "Process"
 msgid "Revision Name"
 msgstr "Revīzijas nosaukums"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Noliktava"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3278,7 +3164,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3325,7 +3211,7 @@ msgid "Date done"
 msgstr "Pabeig. datums"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3350,8 +3236,8 @@ msgstr "Nav steidzams"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Darāmais"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3395,7 +3281,7 @@ msgid "Stock"
 msgstr "Krājums"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3461,7 +3347,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3634,11 +3520,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr "Iekšējās Piegādes"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3682,7 +3563,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Saražotais Nākotnē"
@@ -3777,12 +3658,6 @@ msgstr "Uzņēmums"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3794,9 +3669,27 @@ msgid "Lot Inventory"
 msgstr "Preču Partijas Inventarizācija"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Iemesls"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3835,7 +3728,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3857,16 +3749,16 @@ msgstr "Klienti ārpus ES"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3900,10 +3792,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Komplektācija"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3912,7 +3805,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Šai komplektācijai nav nepieciešams piestādīt rēķinu."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3950,7 +3843,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4015,7 +3908,6 @@ msgid ""
 msgstr "Atzīmēt, lai ļautu izmantot posteni norakstītām/bojātām precēm."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4023,7 +3915,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4064,10 +3956,9 @@ msgid "Product Category"
 msgstr "Produkta kategorija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " priekš "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4100,7 +3991,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4119,7 +4010,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nav pietiekošs skaits noliktavā, nav iespējams rezervēt preces."
@@ -4140,12 +4031,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "ir atcelts."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4157,7 +4042,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Nākotnes Piegādes"
@@ -4180,7 +4065,7 @@ msgid "Auto Validate"
 msgstr "Automātiska Apstiprināšana"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4197,9 +4082,9 @@ msgid "December"
 msgstr "Decembris"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automātisks Grāmatojums"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4273,12 +4158,18 @@ msgid "Invoiced"
 msgstr "Rēķins izrakstīts"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informācija"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4330,14 +4221,11 @@ msgid "Internal"
 msgstr "Iekšējais"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Melnraksts"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendāra skats"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4365,13 +4253,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Plaukti (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4397,7 +4290,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4430,23 +4323,11 @@ msgid "November"
 msgstr "Novembris"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplānotais daudz."
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4457,15 +4338,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Pārbaudīt Pieejamību"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Komplektācija"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4503,14 +4375,14 @@ msgid "Move History (parent moves)"
 msgstr "Grāmatojumu Vēsture (virsgrāmatojumi)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Kļūda"
@@ -4659,6 +4531,7 @@ msgid "Real"
 msgstr "Īsts"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4704,7 +4577,7 @@ msgid "Location Content"
 msgstr "Posteņa Saturs"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Saražotais daudz."
@@ -4735,12 +4608,6 @@ msgstr ""
 msgid "Production"
 msgstr "Ražošana"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "ir pabeigts."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4774,6 +4641,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4856,7 +4728,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -4933,6 +4805,10 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Kļūda: nederīgs EAN kods"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Piegādes Pasūtījums"
+
 #~ msgid "Shop 1"
 #~ msgstr "Veikals 1"
 
@@ -4965,6 +4841,10 @@ msgstr ""
 #~ msgid "Update"
 #~ msgstr "Atjaunināt"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokuments"
+
 #~ msgid "Dates"
 #~ msgstr "Datumi"
 
@@ -4993,6 +4873,9 @@ msgstr ""
 #~ msgid "UserError"
 #~ msgstr "Lietotāja Kļūda"
 
+#~ msgid "Reason"
+#~ msgstr "Iemesls"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Brīdinājums"
@@ -5000,6 +4883,10 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "Atskaites"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "ir atcelts."
+
 #~ msgid "Additional info"
 #~ msgstr "Papildus info"
 
@@ -5013,6 +4900,10 @@ msgstr ""
 #~ msgid "is scheduled"
 #~ msgstr "ir ieplānots"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "gatavs apstrādei."
+
 #~ msgid "XML File"
 #~ msgstr "XML Fails"
 
@@ -5023,6 +4914,9 @@ msgstr ""
 #~ msgid "quantity."
 #~ msgstr "daudzums."
 
+#~ msgid "Expected"
+#~ msgstr "Sagaidāms"
+
 #~ msgid "Cost Price:"
 #~ msgstr "Pašizmaksa:"
 
@@ -5040,6 +4934,10 @@ msgstr ""
 #~ msgid "Not Available"
 #~ msgstr "Nav Pieejams"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "ir melnraksts."
+
 #~ msgid "General Informations"
 #~ msgstr "Vispārīgā Informācija"
 
@@ -5058,6 +4956,9 @@ msgstr ""
 #~ msgid "Packing list"
 #~ msgstr "Pakošanas saraksts"
 
+#~ msgid "Date Done"
+#~ msgstr "Pabeigšanas Datums"
+
 #~ msgid "Product UOM"
 #~ msgstr "Produkta Mērv."
 
@@ -5093,6 +4994,10 @@ msgstr ""
 #~ msgid "Delivery Order:"
 #~ msgstr "Piegādes Pasūtījums:"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "ir pabeigts."
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Skaits tiek izteikts produkta Noklusējuma mērvienībā."
 
@@ -5153,6 +5058,10 @@ msgstr ""
 #~ msgid "It specifies goods to be delivered all at once or by direct delivery"
 #~ msgstr "Norāda, kuras preces piegādāt uzreiz vai ar tiešo piegādi"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " priekš "
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
@@ -5313,6 +5222,10 @@ msgstr ""
 #~ msgid "Back Order"
 #~ msgstr "Atliktais Pasūtījums"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Iekšējā komplektācija"
+
 #~ msgid "Open Product"
 #~ msgstr "Atvērt Produktu"
 
diff --git a/addons/stock/i18n/mk.po b/addons/stock/i18n/mk.po
index 7fc1a8c7f4e..959f5de5098 100644
--- a/addons/stock/i18n/mk.po
+++ b/addons/stock/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-23 11:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,10 +1497,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,9 +1557,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1600,8 +1575,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1642,18 +1624,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3767,12 +3648,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,8 +3659,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,8 +4072,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,13 +4211,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 229013603db..f23e252c130 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:30+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -84,9 +84,10 @@ msgid "Upstream Traceability"
 msgstr "Сөрөг урсгалыг Хөтлөх боломж"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -125,8 +126,8 @@ msgid "Product Moves"
 msgstr "Барааны хөдөлгөөн"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -150,7 +151,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Энэ үйлдлийг нэгээс олон Барааны Нөөц дээр хийх боломжгүй."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Тоо хэмжээ сөрөг байж болохгүй."
@@ -203,18 +204,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Барааны журнал"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -269,7 +263,6 @@ msgid "Not Applicable"
 msgstr "Хэрэглэх боломжгүй"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -317,7 +310,7 @@ msgid "Reference"
 msgstr "Маршрутын дугаар"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Боловсруулах Бараанууд"
@@ -347,7 +340,6 @@ msgid "_Validate"
 msgstr "_Шалгах"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -357,22 +349,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Сэрэмжлүүлэг!"
@@ -578,12 +570,12 @@ msgid "Location Type"
 msgstr "Байрлалын Төрөл"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Ноорог тооллого"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -620,7 +612,7 @@ msgid "Item Labels"
 msgstr "Зүйлийн Шошго"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -736,9 +728,7 @@ msgid "Destination Address "
 msgstr "Хүргэх хаяг "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Хүлээн Авалт"
 
@@ -811,20 +801,14 @@ msgstr "8 сар"
 msgid "Packs"
 msgstr "Баглаа"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Бэлэн (боловсруулахад бэлэн) барааны хөдөлгөөнүүд"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -880,7 +864,7 @@ msgstr ""
 "боловсруулахад санхүүгийн бичилт хийгдэх Санхүүгийн Журнал юм."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -888,7 +872,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -915,7 +898,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Ирээдүйн Хүлээн авалтууд"
@@ -986,9 +969,9 @@ msgid "IT Suppliers"
 msgstr "IT Нийлүүлэгчид"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Ноорог тооллого"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -997,7 +980,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Компани хоорондын дамжуулалтын Дамжилтын Байрлал"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1010,9 +993,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Автоматаар хөдөлгөөн хийх"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Барааны бэлэн цувралууд"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1020,7 +1003,7 @@ msgid "Change Product Quantity"
 msgstr "Барааны Тоо хэмжээг өөрчлөх"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Ирээдүйн ашиг, алдагдал"
@@ -1050,7 +1033,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1088,9 +1071,10 @@ msgid "Pickings already processed"
 msgstr "Боловсруулагдсан бэлтгэлтүүд"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Төлөвлөгдсөн Сар"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Валют"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1099,12 +1083,6 @@ msgstr "Төлөвлөгдсөн Сар"
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "товлогдсон %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1164,6 +1142,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1299,7 +1282,7 @@ msgid "Author"
 msgstr "Зохиогч"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1311,10 +1294,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Хүргэлтийн захиалга"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1322,10 +1304,8 @@ msgid "Manual Operation"
 msgstr "Гар аргаар тохируулах"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1337,7 +1317,7 @@ msgid "Supplier"
 msgstr "Нийлүүлэгч"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1347,17 +1327,15 @@ msgstr ""
 "хэрэгтэй."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Хийгдсэн огноо"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Бэлэн (боловсруулахад бэлэн) барааны хөдөлгөөнүүд"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1522,13 +1500,7 @@ msgstr ""
 "талбар. (дундаж өртөгийн аргын үед хэрэглэгдэнэ)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "ноорог төлөвтэй байна"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1550,13 +1522,13 @@ msgid "To be refunded/invoiced"
 msgstr "Төлөгдөх/Нэхэмжлэгдэх"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Зөвхөн ноорог хөдөлгөөнийг л устгах боломжтой."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1573,11 +1545,14 @@ msgid "Ready"
 msgstr "Бэлэн"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Хуанли харах"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Ноорог"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1590,11 +1565,10 @@ msgid "Additional Info"
 msgstr "Нэмэлт Мэдээлэл"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Хөдөлгөөн"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1631,10 +1605,11 @@ msgid "Internal Picking List"
 msgstr "Дотоод Бэлтгэх Жагсаалт"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Хүлээгдэж буй"
 
 #. module: stock
 #: view:stock.move:0
@@ -1648,9 +1623,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Таамаглагдсан"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Агуулах"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1694,18 +1676,6 @@ msgstr "Бүртгэлийн мөрний дугаар"
 msgid "Address of  customer or supplier."
 msgstr "Захиалагч эсвэл нийлүүлэгчийн хаяг."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1769,7 +1739,7 @@ msgid "Order Date"
 msgstr "Захиалгын Огноо"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "БАР: %s"
@@ -1808,7 +1778,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Хүргэлтээс барааны нэхэмжлэл"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1854,10 +1824,9 @@ msgid "Stock Statistics"
 msgstr "Барааны Статистик"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Валют"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Төлөвлөгдсөн Сар"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1957,12 +1926,6 @@ msgstr "Барааны Үнэлгээний Данс (Орох)"
 msgid "Shelf 2"
 msgstr "Тавиур 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "боловсруулахад бэлэн"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1988,7 +1951,7 @@ msgid "Localization"
 msgstr "Бүсчлэх"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Хүргэгдсэн Тоо Хэмжээ"
@@ -2059,7 +2022,6 @@ msgid "Date"
 msgstr "Үүсгэсэн огноо"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2078,7 +2040,7 @@ msgid "Location Stock"
 msgstr "Хадгалах байрлал"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2278,14 +2240,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Хүлээгдэж буй"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Хүлээн Авсан Тоо Хэмжээ"
@@ -2319,7 +2274,6 @@ msgstr "Тооллогыг Импортлох"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Маршрутын нэр"
@@ -2355,8 +2309,8 @@ msgid "Customer Locations"
 msgstr "Захиалагчийн Байрлалууд"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2372,7 +2326,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2412,7 +2365,7 @@ msgid "Creation"
 msgstr "Үүсгэх"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2501,12 +2454,6 @@ msgstr "Хэлхээтэй байрлал"
 msgid "Inventory loss"
 msgstr "Нөөцийн алдагдал"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Баримт"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2530,7 +2477,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2593,7 +2539,7 @@ msgid "Warehouse board"
 msgstr "Агуулахын Самбар"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Ирээдүйн Тоо Хэмжээ"
@@ -2655,12 +2601,7 @@ msgid "Products"
 msgstr "Бараанууд"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2700,7 +2641,7 @@ msgid "Outgoing Products"
 msgstr "Гарч байгаа бараа"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2713,19 +2654,14 @@ msgid "Delay(Days)"
 msgstr "Азналт(Өдрөөр)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Хөдөлгөөн"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "А&А Тоо хэмжээ"
@@ -2843,7 +2779,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2867,7 +2803,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2875,9 +2811,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2933,7 +2868,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2945,6 +2880,7 @@ msgstr "Барааны Үлдэгдлийн Урьдчилсан Таамаг"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2955,13 +2891,13 @@ msgid "Stock Journal"
 msgstr "Барааны журнал"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Татан авалт"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Идэвхтэй ID нь Context-д алга"
@@ -2989,13 +2925,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Бараа хүлээж авах"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Татан авалт"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3023,7 +2965,7 @@ msgid "Date of Completion"
 msgstr "Гүйцээгдсэн Огноо"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3090,13 +3032,6 @@ msgstr "Жинхэнэ бараа"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3105,7 +3040,6 @@ msgstr "Залруулсан огноо"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Цуврал"
@@ -3128,12 +3062,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Тоо хэмжээ"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "хүлээгдэж байна."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3144,29 +3072,6 @@ msgstr "Бэлэн Болгох"
 msgid "Contact Address :"
 msgstr "Холбогдох Хаяг :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3175,7 +3080,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3193,7 +3098,7 @@ msgid "Properties"
 msgstr "Шинж чанар"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Алдаа, харилцагч алга !"
@@ -3282,13 +3187,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Тооллогын код"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Дотоод бэлтгэлт"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3319,18 +3217,6 @@ msgstr "Процесс"
 msgid "Revision Name"
 msgstr "Хяналтын нэр"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Агуулах"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3357,7 +3243,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3404,7 +3290,7 @@ msgid "Date done"
 msgstr "Хийгдсэн огноо"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3431,7 +3317,7 @@ msgstr "Яаралтай бус"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3476,7 +3362,7 @@ msgid "Stock"
 msgstr "Бараа"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3542,7 +3428,7 @@ msgid "Assigned Internal Moves"
 msgstr "Оноогдсон Дотоод Хөдөлгөөнүд"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3715,11 +3601,6 @@ msgstr "Менежер"
 msgid "Internal Shippings"
 msgstr "Дотоод Хүргэлтүүд"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3763,7 +3644,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Ирээдүйн Үйлдвэрлэлүүд"
@@ -3858,12 +3739,6 @@ msgstr "Компани"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3875,9 +3750,27 @@ msgid "Lot Inventory"
 msgstr "Цувралын Тооллого"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Шалтгаан"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3920,7 +3813,6 @@ msgstr ""
 "бүх барааны анхны утга болно. Мөн бараа тус бүр дээр тохируулагдаж бас болно."
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3942,16 +3834,16 @@ msgstr "Европын харилцагч биш"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3985,10 +3877,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Батлагдсан Хүргэх Захиалгууд"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Бэлтгэх"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3997,7 +3890,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Энэ бэлтгэх жагсаалт нэхэмжлэлийг шаардахгүй байна."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4045,7 +3938,7 @@ msgstr ""
 "сонгож өгнө."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4112,7 +4005,6 @@ msgstr ""
 "хэрэглэнэ."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4120,7 +4012,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4161,10 +4053,9 @@ msgid "Product Category"
 msgstr "Барааны ангилал"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " хувьд "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4201,7 +4092,7 @@ msgstr ""
 "данс дебитлэгдэнэ."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4220,7 +4111,7 @@ msgid "Chaining Journal"
 msgstr "Журналын Хэлхээ"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Барааг нөөцлөх боломжгүй, бараа хангалттай биш байна."
@@ -4241,12 +4132,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "цуцлагдсан"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4262,7 +4147,7 @@ msgstr ""
 "нөлөөлөхгүй."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Ирээдүйн Хүргэлтүүд"
@@ -4285,7 +4170,7 @@ msgid "Auto Validate"
 msgstr "Автоматаар батлах"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4302,9 +4187,9 @@ msgid "December"
 msgstr "12-р сар"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Барааны бэлэн цувралууд"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Автоматаар хөдөлгөөн хийх"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4380,12 +4265,18 @@ msgid "Invoiced"
 msgstr "Нэхэмжилсэн"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Мэдээлэл"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4439,14 +4330,11 @@ msgid "Internal"
 msgstr "Дотоод"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Ноорог"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Хуанли харах"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4474,13 +4362,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Эдгээр нөөцийг нэгтгэхийг та хүсч байна уу?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Багана (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4506,7 +4399,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4539,23 +4432,11 @@ msgid "November"
 msgstr "11-р сар"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Төлөвлөгдөөгүй тоо хэмжээ"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4566,15 +4447,6 @@ msgstr "Хэлхэгдсэн Компани"
 msgid "Check Availability"
 msgstr "Бэлэн байдлыг шалгах"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Бэлтгэх"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4612,14 +4484,14 @@ msgid "Move History (parent moves)"
 msgstr "Хөдөлгөөний түүх (эцэг хөдөлгөөнүүд)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Ирээдүйн Бараа"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Алдаа"
@@ -4773,6 +4645,7 @@ msgid "Real"
 msgstr "Бодит"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4818,7 +4691,7 @@ msgid "Location Content"
 msgstr "Байрлалтын Агуулга"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Үйлдвэрлэгдсэн Тоо хэмжээ"
@@ -4849,12 +4722,6 @@ msgstr ""
 msgid "Production"
 msgstr "Үйлдвэрлэлийн"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "хийгдсэн."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4888,6 +4755,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4974,7 +4846,7 @@ msgstr ""
 "болон хүргэх байрлалаас хамаарч автоматаар сонгохоор бол хоосон үлдээ)"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5991,6 +5863,10 @@ msgstr ""
 #~ "худалдан авах захиалгаар шүүх боломжтой. Үүнийхээ дараа мөр бүрийн баруун "
 #~ "талд байгаа даруулыг ашиглан баруунуудыг хүлээн авах боломжтой."
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "хүлээгдэж байна."
+
 #~ msgid " Waiting"
 #~ msgstr " Хүлээгдэж буй"
 
@@ -6070,6 +5946,10 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Алдаа: EAN код буруу"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Хүргэлтийн захиалга"
+
 #~ msgid "Current year"
 #~ msgstr "Энэ жил"
 
@@ -6121,6 +6001,9 @@ msgstr ""
 #~ msgid "Shop 2"
 #~ msgstr "Дэлгүүр 2"
 
+#~ msgid "Expected"
+#~ msgstr "Таамаглагдсан"
+
 #~ msgid "To invoice"
 #~ msgstr "Нэхэмжлэх"
 
@@ -6177,6 +6060,10 @@ msgstr ""
 #~ msgid "Inventory Properties"
 #~ msgstr "Тооллогын Үзүүлэлтүүд"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "товлогдсон %s."
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock output account defined for this product: \"%s\" (id: %d)"
@@ -6193,6 +6080,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "Харилцагчийн хаяг"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "ноорог төлөвтэй байна"
+
 #~ msgid "Expected Stock Variations"
 #~ msgstr "Таамаглагдсан Барааны Хазайлт"
 
@@ -6230,6 +6121,10 @@ msgstr ""
 #~ msgid "Back Order"
 #~ msgstr "Арын захиалга"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "боловсруулахад бэлэн"
+
 #~ msgid "Waiting "
 #~ msgstr "Хүлээгдэж буй "
 
@@ -6246,6 +6141,13 @@ msgstr ""
 #~ msgid "Inventory '%s' is done."
 #~ msgstr "Тооллого '%s' хийгдсэн."
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "хийгдсэн."
+
+#~ msgid "Date Done"
+#~ msgstr "Хийгдсэн огноо"
+
 #~ msgid "Production Lot Numbers"
 #~ msgstr "Үйлдвэрлэлийн Цувралын Дугаар"
 
@@ -6367,6 +6269,10 @@ msgstr ""
 #~ "Энэ бараа болон үйлдвэрлэлийн захиалгаар үүссэн бүх хөдөлгөөний хувьд "
 #~ "үйлдвэрлэлийн цувралын дугаарыг оруулахыг шаардана."
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Баримт"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Орох Бэлтгэх Жагсаалт"
 
@@ -6441,6 +6347,10 @@ msgstr ""
 #~ msgid "Insufficient Stock in Lot !"
 #~ msgstr "Цувралт Хангалтай биш бараа байна !"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Дотоод бэлтгэлт"
+
 #~ msgid "Open Product"
 #~ msgstr "Барааг Нээх"
 
@@ -6462,6 +6372,9 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "Энэ үйлдвэрийн цувралын хөдөлгөөнүүд"
 
+#~ msgid "Reason"
+#~ msgstr "Шалтгаан"
+
 #~ msgid ""
 #~ "This is the list of all the production lots (serial numbers) you recorded. "
 #~ "When you select a lot, you can get the upstream or downstream traceability "
@@ -6480,9 +6393,17 @@ msgstr ""
 #~ msgid "UserError"
 #~ msgstr "ХэрэглэгчийнАлдаа"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "цуцлагдсан"
+
 #~ msgid "Existing Lots"
 #~ msgstr "Байгаа цувралууд"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " хувьд "
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Тоо хэмжээ нь барааны анхны хэмжих нэгжээр илэрхийлэгддэг."
 
diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po
index fff3de70f5a..3a7fd453885 100644
--- a/addons/stock/i18n/nb.po
+++ b/addons/stock/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-30 18:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -85,9 +85,10 @@ msgid "Upstream Traceability"
 msgstr "Sporing tilbake"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -126,8 +127,8 @@ msgid "Product Moves"
 msgstr "Produktbevegelser"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -152,7 +153,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Du kan ikke utføre denne operasjonen på mer enn en lagertelling"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Kvantum kan ikke være negativt"
@@ -205,18 +206,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Lagerjournal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -272,7 +266,6 @@ msgid "Not Applicable"
 msgstr "Ikke tilgjengelig"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -320,7 +313,7 @@ msgid "Reference"
 msgstr "Referanse"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Produkter som skal behandles"
@@ -350,7 +343,6 @@ msgid "_Validate"
 msgstr "_Validere"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -360,22 +352,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel"
@@ -581,12 +573,12 @@ msgid "Location Type"
 msgstr "Lokasjonstype"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Utkast fysisk telling"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -622,7 +614,7 @@ msgid "Item Labels"
 msgstr "Produktetiketter"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -738,9 +730,7 @@ msgid "Destination Address "
 msgstr "Destinasjonsadresse "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Mottak"
 
@@ -813,20 +803,14 @@ msgstr "August"
 msgid "Packs"
 msgstr "Kolli"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Lagerflyttinger som er ledige (klar for prosess)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -882,7 +866,7 @@ msgstr ""
 "oppføringene vil bli automatisk lagt når aksjekursene trekk er behandlet."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -890,7 +874,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -917,7 +900,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Framtidige mottak"
@@ -988,9 +971,9 @@ msgid "IT Suppliers"
 msgstr "IT leverandører"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Utkast fysisk telling"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -999,7 +982,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Transportlokasjon for konserninterne overføringer"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1012,9 +995,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatisk bevegelse"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Tilgjengelig produkt Masse"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1022,7 +1005,7 @@ msgid "Change Product Quantity"
 msgstr "Endre produkt kvanum"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Framtidig resulatregnskap"
@@ -1052,7 +1035,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1090,9 +1073,10 @@ msgid "Pickings already processed"
 msgstr "Bytter allerede behandlet"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Månedplanlagt"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1101,12 +1085,6 @@ msgstr "Månedplanlagt"
 msgid "Journal"
 msgstr "Journal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "er planlagt% s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1167,6 +1145,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1305,7 +1288,7 @@ msgid "Author"
 msgstr "Forfatter"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1317,10 +1300,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Leveringsordre"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1328,10 +1310,8 @@ msgid "Manual Operation"
 msgstr "Manuell operasjon"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1343,7 +1323,7 @@ msgid "Supplier"
 msgstr "Leverandør"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1353,17 +1333,15 @@ msgstr ""
 "loggoppføringer."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Dato utført"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Lagerflyttinger som er ledige (klar for prosess)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1525,13 +1503,7 @@ msgstr ""
 "metoden brukes)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "er i utkast."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1553,13 +1525,13 @@ msgid "To be refunded/invoiced"
 msgstr "Skal få refundert/faktura"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Du kan bare slette forslag til bevegelser"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1576,11 +1548,14 @@ msgid "Ready"
 msgstr "Klar"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendervisning"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Utkast"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1593,11 +1568,10 @@ msgid "Additional Info"
 msgstr "Tilleggsinformasjon"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Bevegelse"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1634,10 +1608,11 @@ msgid "Internal Picking List"
 msgstr "Intern plukkliste"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Venter"
 
 #. module: stock
 #: view:stock.move:0
@@ -1651,9 +1626,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Forventet"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Lager"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1698,18 +1680,6 @@ msgstr "Innholdslinje ID"
 msgid "Address of  customer or supplier."
 msgstr "Kunde eller leverandøradresse."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1773,7 +1743,7 @@ msgid "Order Date"
 msgstr "Ordredato"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1811,7 +1781,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "lager faktura på Shipping"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1857,10 +1827,9 @@ msgid "Stock Statistics"
 msgstr "Lager statistikker"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Månedplanlagt"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1960,12 +1929,6 @@ msgstr "Lagervurderingskonto (innkommende)"
 msgid "Shelf 2"
 msgstr "Hylle 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "Er klar til å behandle."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1991,7 +1954,7 @@ msgid "Localization"
 msgstr "Lokalisering"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Levert kvantum"
@@ -2062,7 +2025,6 @@ msgid "Date"
 msgstr "Dato"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2081,7 +2043,7 @@ msgid "Location Stock"
 msgstr "Lokasjon lager"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2281,14 +2243,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Venter"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Mottatt kvantum"
@@ -2322,7 +2277,6 @@ msgstr "Import Varelager"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Navn"
@@ -2358,8 +2312,8 @@ msgid "Customer Locations"
 msgstr "Kundelokasjon"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2375,7 +2329,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2415,7 +2368,7 @@ msgid "Creation"
 msgstr "Opprettet"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2503,12 +2456,6 @@ msgstr "Knyttede lokasjoner"
 msgid "Inventory loss"
 msgstr "Beholdningstap"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2532,7 +2479,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2595,7 +2541,7 @@ msgid "Warehouse board"
 msgstr "varehus styret"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "fremtidig Antall"
@@ -2657,12 +2603,7 @@ msgid "Products"
 msgstr "Produkter"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2702,7 +2643,7 @@ msgid "Outgoing Products"
 msgstr "Utgående produkter"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2715,19 +2656,14 @@ msgid "Delay(Days)"
 msgstr "Forsinkelse (dager)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Bevegelse"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P & L Antall"
@@ -2845,7 +2781,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2869,7 +2805,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2877,9 +2813,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2935,7 +2870,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2947,6 +2882,7 @@ msgstr "Lagerbeholdningsprognose"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2957,13 +2893,13 @@ msgid "Stock Journal"
 msgstr "Lagerjournal"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Innkjøp"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktiv ID er ikke satt i sammenheng."
@@ -2991,13 +2927,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Motta produkter"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Innkjøp"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3025,7 +2967,7 @@ msgid "Date of Completion"
 msgstr "Dato for ferdigstillelse"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3093,13 +3035,6 @@ msgstr "Virkelig lager"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3108,7 +3043,6 @@ msgstr "Revisjonsdato"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3131,12 +3065,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Kvantum (salgsenhet)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "Venter"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3147,29 +3075,6 @@ msgstr "Gjør tilgjengelig"
 msgid "Contact Address :"
 msgstr "Kontaktadresse:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3178,7 +3083,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3196,7 +3101,7 @@ msgid "Properties"
 msgstr "Egenskaper"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Feil, ingen klient !"
@@ -3282,13 +3187,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Inventar Referanse."
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Intern plukking"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3319,18 +3217,6 @@ msgstr "Prosess"
 msgid "Revision Name"
 msgstr "Revisjonsnavn"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Lager"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3357,7 +3243,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3404,7 +3290,7 @@ msgid "Date done"
 msgstr "Dato utført"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3430,7 +3316,7 @@ msgstr "Haster ikke"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3475,7 +3361,7 @@ msgid "Stock"
 msgstr "Lager"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3541,7 +3427,7 @@ msgid "Assigned Internal Moves"
 msgstr "Tildelte Intern trekk"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3714,11 +3600,6 @@ msgstr "Manager"
 msgid "Internal Shippings"
 msgstr "Intern frakt"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3762,7 +3643,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Fremtidige produkter"
@@ -3857,12 +3738,6 @@ msgstr "Firma"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3874,9 +3749,27 @@ msgid "Lot Inventory"
 msgstr "Varelager"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Grunn"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3920,7 +3813,6 @@ msgstr ""
 "settes på hvert produkt."
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3942,16 +3834,16 @@ msgstr "Kunder som ikke er fra Europa"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3985,10 +3877,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Godkjente leveringsordre"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Plukker"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3997,7 +3890,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Denne plukklisten krever ikke fakturering."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4045,7 +3938,7 @@ msgstr ""
 "Lenket Plassering hvis den er fikset."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4112,7 +4005,6 @@ msgstr ""
 "ødelagte/skadede varer."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4120,7 +4012,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4161,10 +4053,9 @@ msgid "Product Category"
 msgstr "Produktkategori"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " for "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4202,7 +4093,7 @@ msgstr ""
 "innspill konto vil bli belastet."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4221,7 +4112,7 @@ msgid "Chaining Journal"
 msgstr "Kjeding Journal"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Ikke nok lager, ute av stand til å reservere produktene."
@@ -4242,12 +4133,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "er avbrutt"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4264,7 +4149,7 @@ msgstr ""
 "effekt for interne steder."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Fremtidige leveranser"
@@ -4287,7 +4172,7 @@ msgid "Auto Validate"
 msgstr "Automatisk Valider"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4304,9 +4189,9 @@ msgid "December"
 msgstr "Desember"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Tilgjengelig produkt Masse"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatisk bevegelse"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4382,12 +4267,18 @@ msgid "Invoiced"
 msgstr "Fakturert"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informasjon"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4441,14 +4332,11 @@ msgid "Internal"
 msgstr "Intern"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Utkast"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendervisning"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4476,13 +4364,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Hyller (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4508,7 +4401,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4541,23 +4434,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Uplanlagt kvantum"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4568,15 +4449,6 @@ msgstr "Lenket Selvskap"
 msgid "Check Availability"
 msgstr "Sjekk tilgjengelighet"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Plukker"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4614,14 +4486,14 @@ msgid "Move History (parent moves)"
 msgstr "Flytte Historie (foreldre trekk)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Fremtidig lager"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Feil"
@@ -4775,6 +4647,7 @@ msgid "Real"
 msgstr "Ekte"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4820,7 +4693,7 @@ msgid "Location Content"
 msgstr "Plassering innhold"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Produsert antall"
@@ -4851,12 +4724,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produksjon"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "er ferdig."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4890,6 +4757,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4976,7 +4848,7 @@ msgstr ""
 "automatisk oppdage hvilken type basert på kilden og målet steder)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5058,6 +4930,13 @@ msgstr ""
 #~ msgid "Packing list"
 #~ msgstr "Pakkseddel"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Leveringsordre"
+
+#~ msgid "Date Done"
+#~ msgstr "Dato utført"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Forventet forsendelsesdato"
 
@@ -5113,6 +4992,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Produkt "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
 #~ msgid "Tracking a move"
 #~ msgstr "Spor en bevegelse"
 
@@ -5667,6 +5550,10 @@ msgstr ""
 #~ msgid "Last month"
 #~ msgstr "Forrige måned"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "Venter"
+
 #~ msgid "Address of partner"
 #~ msgstr "Partners adresse"
 
@@ -5770,6 +5657,10 @@ msgstr ""
 #~ "Gjeldende mengde av produkter med denne produksjonen. Varenummer er "
 #~ "tilgjengelig i selskapets varehus"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "er i utkast."
+
 #~ msgid ""
 #~ "This is the list of all your packs. When you select a Pack, you can get the "
 #~ "upstream or downstream traceability of the products contained in the pack."
@@ -5990,15 +5881,30 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "Flyttinger for denne produksjonsvaren"
 
+#~ msgid "Reason"
+#~ msgstr "Grunn"
+
 #~ msgid "Do you want to merge theses inventories ?"
 #~ msgstr "Vil du slå sammen disse varelagerene?"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "er ferdig."
+
 #~ msgid "It specifies goods to be delivered all at once or by direct delivery"
 #~ msgstr "Den angir varer skal leveres på en gang eller ved direkte levering"
 
 #~ msgid "Reception:"
 #~ msgstr "Resepsjon:"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " for "
+
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "er avbrutt"
+
 #~ msgid "Existing Lots"
 #~ msgstr "Eksisterende produkter"
 
@@ -6039,6 +5945,10 @@ msgstr ""
 #~ "på høyre side av hver linje. Du kan filtrere produkter levere etter kundens, "
 #~ "produkter eller salgsordre (ved hjelp av Origin feltet)."
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "er planlagt% s."
+
 #~ msgid "Search Stock Picking"
 #~ msgstr "Søk lager Plukking"
 
@@ -6174,6 +6084,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Feil: Standard målenheter og kjøp målenheter må være i samme kategori."
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Intern plukking"
+
 #~ msgid "Accounting Stock Properties"
 #~ msgstr "Regnskapsmessige Lager Egenskaper"
 
@@ -6267,6 +6181,10 @@ msgstr ""
 #~ msgid "Please specify at least one non-zero quantity!"
 #~ msgstr "Vennligst oppgi minst én ikke-null kvantitet!"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "Er klar til å behandle."
+
 #, python-format
 #~ msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 #~ msgstr "Det er ingen journal definert på produktkategori: \"% s\" (id:% d)"
@@ -6286,6 +6204,9 @@ msgstr ""
 #~ "Total mengde etter splitt overskrider antallet å splitte for dette "
 #~ "produktet: \"% s\" (id:% d)"
 
+#~ msgid "Expected"
+#~ msgstr "Forventet"
+
 #~ msgid "To invoice"
 #~ msgstr "til faktura"
 
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 9139a599d52..4d03bd3dad5 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 18:39+0000\n"
 "Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\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: 2012-12-10 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:13+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -81,13 +81,14 @@ msgstr "In nieuwe verpakking plaatsen"
 #: view:stock.tracking:0
 #, python-format
 msgid "Upstream Traceability"
-msgstr "Terug traceren"
+msgstr "Vooruit traceren"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "Producten zijn <b>geleverd</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -125,8 +126,8 @@ msgid "Product Moves"
 msgstr "Productmutaties"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -152,7 +153,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "U kunt deze bewerking niet op meer dan een voorraad uitvoeren."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Hoeveelheid mag niet negatief zijn."
@@ -205,18 +206,11 @@ msgid "Analyse a Period"
 msgstr "Analyseer een periode"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Voorraad dagboek"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Producten zijn <b>ontvangen</b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -272,7 +266,6 @@ msgid "Not Applicable"
 msgstr "Niet van toepassing"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -307,7 +300,7 @@ msgstr "Geen vrd"
 #: view:stock.tracking:0
 #, python-format
 msgid "Downstream Traceability"
-msgstr "Vooruit traceren"
+msgstr "Terug traceren"
 
 #. module: stock
 #: view:stock.move:0
@@ -320,7 +313,7 @@ msgid "Reference"
 msgstr "Referentie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Te verwerken producten"
@@ -350,7 +343,6 @@ msgid "_Validate"
 msgstr "_Valideren"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -363,22 +355,22 @@ msgstr ""
 "ingevoegd."
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -584,12 +576,12 @@ msgid "Location Type"
 msgstr "Locatiesoort"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Locatie & Magazijn"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Concept voorraadtellingen"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -625,7 +617,7 @@ msgid "Item Labels"
 msgstr "Labels"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -741,9 +733,7 @@ msgid "Destination Address "
 msgstr "Bestemming adres "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Ontvangst"
 
@@ -816,21 +806,15 @@ msgstr "Augustus"
 msgid "Packs"
 msgstr "Verpakkingen"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Voorraadmutaties welke beschikbaar zijn (gereed voor verwerking)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Te doen"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -886,7 +870,7 @@ msgstr ""
 "worden verwerkt."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -894,7 +878,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -921,7 +904,7 @@ msgid "Time"
 msgstr "Tijd"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Toekomstige ontvangsten"
@@ -992,9 +975,9 @@ msgid "IT Suppliers"
 msgstr "IT leveranciers"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Concept voorraadtellingen"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Locatie & Magazijn"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1003,7 +986,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Doorvoerlocatie voor inter-company verplaatsingen"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1016,9 +999,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatische verwerking"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Beschikbare productie partijen"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1026,7 +1009,7 @@ msgid "Change Product Quantity"
 msgstr "Hoeveelheid aanpassen"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Toekomstige W&V"
@@ -1056,7 +1039,7 @@ msgid "You must assign a serial number for this product."
 msgstr "U dient een productie partij toe te wijzen voor dit product."
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1094,9 +1077,10 @@ msgid "Pickings already processed"
 msgstr "Verzamelopdracht reeds verwerkt"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Maand gepland"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1105,12 +1089,6 @@ msgstr "Maand gepland"
 msgid "Journal"
 msgstr "Dagboek"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "is gepland %s"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1170,6 +1148,11 @@ msgstr "Productie partijen"
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1313,7 +1296,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1325,10 +1308,9 @@ msgid "Internal Shipment :"
 msgstr "Interne levering:"
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Uitgaande levering"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1336,10 +1318,8 @@ msgid "Manual Operation"
 msgstr "Handmatige verwerking"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr "Levering"
 
@@ -1351,7 +1331,7 @@ msgid "Supplier"
 msgstr "Leverancier"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1361,17 +1341,15 @@ msgstr ""
 "journaalpsoten tegen te boeken."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Verwerkingsdatum"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr "Producten zijn <b>verplaatst</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Voorraadmutaties welke beschikbaar zijn (gereed voor verwerking)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1535,13 +1513,7 @@ msgstr ""
 "(wanneer de gemiddelde kostprijs methode is gebruikt)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "is in concept fase"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Waarschuwing: Geen back-order"
@@ -1563,13 +1535,13 @@ msgid "To be refunded/invoiced"
 msgstr "Terug te betalen (Credit factuur)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Er kunnen alleen concept-wijzigingen worden verwijderd."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1586,11 +1558,14 @@ msgid "Ready"
 msgstr "Gereed"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalenderoverzicht"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Concept"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1603,11 +1578,10 @@ msgid "Additional Info"
 msgstr "Aanvullende informatie"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Verplaats"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1646,10 +1620,11 @@ msgid "Internal Picking List"
 msgstr "Interne verzamellijst"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr "Producten zijn <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Wachten"
 
 #. module: stock
 #: view:stock.move:0
@@ -1663,9 +1638,16 @@ msgid "Delivery Slip"
 msgstr "Pakbon"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Verwacht"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Magazijn"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1711,18 +1693,6 @@ msgstr "Voorraadregel-id"
 msgid "Address of  customer or supplier."
 msgstr "Adres van klant of leverancier"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr "%s is <b>bevestigd</b>."
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1750,7 +1720,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3
 msgid "Downstream traceability"
-msgstr "Vooruit traceren"
+msgstr "Terug traceren"
 
 #. module: stock
 #: view:stock.picking.in:0
@@ -1788,7 +1758,7 @@ msgid "Order Date"
 msgstr "Orderdatum"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "TEL: %s"
@@ -1826,7 +1796,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Factureren bij levering"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1872,10 +1842,9 @@ msgid "Stock Statistics"
 msgstr "Voorraad analyse"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Maand gepland"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1975,12 +1944,6 @@ msgstr "Voorraadwaarde rekening (inkomend)"
 msgid "Shelf 2"
 msgstr "Plank 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "is gereed om te verwerken"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2006,7 +1969,7 @@ msgid "Localization"
 msgstr "Positie in magazijn"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Geleverd aantal"
@@ -2078,7 +2041,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2097,7 +2059,7 @@ msgid "Location Stock"
 msgstr "Locatie voorraad"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr "_Leveren"
@@ -2298,14 +2260,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Wachten"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ontvangen aantal"
@@ -2339,7 +2294,6 @@ msgstr "Importeer voorraadtelling"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Naam"
@@ -2375,8 +2329,8 @@ msgid "Customer Locations"
 msgstr "Klant locaties"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Gebruikersfout!"
@@ -2392,7 +2346,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2420,7 +2373,7 @@ msgstr ""
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "Leveranciers locatie"
+msgstr "Leverancier locatie"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2433,7 +2386,7 @@ msgid "Creation"
 msgstr "Aanmaken"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2522,12 +2475,6 @@ msgstr "Gekoppelde locaties"
 msgid "Inventory loss"
 msgstr "Voorraadverlies"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Document"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2551,7 +2498,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2614,7 +2560,7 @@ msgid "Warehouse board"
 msgstr "Magazijn Dashboard"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Toekomstige HvH"
@@ -2676,12 +2622,7 @@ msgid "Products"
 msgstr "Producten"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2721,7 +2662,7 @@ msgid "Outgoing Products"
 msgstr "Uitgaande leveringen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2734,19 +2675,14 @@ msgid "Delay(Days)"
 msgstr "Vertraging (dagen)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Verplaats"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s is <b>geannuleerd</b>."
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Winst&Verlies hoeveelheid"
@@ -2865,7 +2801,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2889,7 +2825,7 @@ msgid "scrap"
 msgstr "afkeur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2897,9 +2833,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2955,7 +2890,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2967,6 +2902,7 @@ msgstr "Voorraadniveau prognose"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2977,13 +2913,13 @@ msgid "Stock Journal"
 msgstr "Voorraadboek"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Levering"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Active ID is niet ingesteld in Context"
@@ -3011,13 +2947,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Producten ontvangen"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Levering"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3045,7 +2987,7 @@ msgid "Date of Completion"
 msgstr "Datum gereed"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3114,13 +3056,6 @@ msgstr "Aanwezige Voorraad"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3129,7 +3064,6 @@ msgstr "Revisiedatum"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partij"
@@ -3152,12 +3086,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Aantal (UOS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "is wachtend"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3168,29 +3096,6 @@ msgstr "Maak beschikbaar"
 msgid "Contact Address :"
 msgstr "Contactpersoon Adres :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr "Serienummer"
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3199,7 +3104,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3217,7 +3122,7 @@ msgid "Properties"
 msgstr "Waarden"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Fout, geen relatie!"
@@ -3306,13 +3211,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Voorraadtelling referentie"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Interne verzamelopdracht"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3343,18 +3241,6 @@ msgstr "Verwerk"
 msgid "Revision Name"
 msgstr "Revisienaam"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Magazijn"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3381,7 +3267,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3428,7 +3314,7 @@ msgid "Date done"
 msgstr "Datum verwerkt"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3454,8 +3340,8 @@ msgstr "Niet urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Te doen"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3499,7 +3385,7 @@ msgid "Stock"
 msgstr "Voorraad"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3565,7 +3451,7 @@ msgid "Assigned Internal Moves"
 msgstr "Toegewezen interne mutaties"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3738,11 +3624,6 @@ msgstr "Manager"
 msgid "Internal Shippings"
 msgstr "Interne leveringen"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3786,7 +3667,7 @@ msgid "Inventory Move"
 msgstr "Voorraadverplaatsing"
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Toekomstige productie"
@@ -3881,12 +3762,6 @@ msgstr "Bedrijf"
 msgid "Product Unit of Measure"
 msgstr "Maateenheid product"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr "Uitgaande levering"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3898,9 +3773,27 @@ msgid "Lot Inventory"
 msgstr "Partijvoorraad"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Oorzaak"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr "Serienummer"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3944,7 +3837,6 @@ msgstr ""
 "categorie. Het kan ook direct worden ingesteld bij elk product"
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3966,16 +3858,16 @@ msgstr "Niet-europese afnemers"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4013,10 +3905,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Bevestigde uitgaande leveringen"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr "%s-retour"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Verzamelen"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4025,7 +3918,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Deze verzamellijst hoeft niet te worden gefactureerd"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4073,7 +3966,7 @@ msgstr ""
 "Gekoppelde locatie is vast."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4140,7 +4033,6 @@ msgstr ""
 "beschadigde producten."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4148,7 +4040,7 @@ msgid "Followers"
 msgstr "Volgers"
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4189,10 +4081,9 @@ msgid "Product Category"
 msgstr "Productcategorie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " voor de "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4230,7 +4121,7 @@ msgstr ""
 "gecrediteerd en voorraadtoename rekening zal worden gedebiteerd."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "TEL:"
@@ -4249,7 +4140,7 @@ msgid "Chaining Journal"
 msgstr "Gekoppeld dagboek"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Niet genoeg voorraad, niet mogelijk om producten te reserveren."
@@ -4270,12 +4161,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "is geannuleerd"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4293,7 +4178,7 @@ msgstr ""
 "interne locaties."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Toekomstige leveringen"
@@ -4316,7 +4201,7 @@ msgid "Auto Validate"
 msgstr "Automatisch akkoord geven"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4333,9 +4218,9 @@ msgid "December"
 msgstr "December"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Beschikbare productie partijen"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatische verwerking"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4412,12 +4297,18 @@ msgid "Invoiced"
 msgstr "Gefactureerd"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informatie"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4471,14 +4362,11 @@ msgid "Internal"
 msgstr "Intern"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Concept"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalenderoverzicht"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4508,13 +4396,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Wilt u deze voorraadtelling samenvoegen?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Schap (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4540,7 +4433,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4573,23 +4466,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Niet geplande aantal"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Opmerkingen en e-mails."
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4600,15 +4481,6 @@ msgstr "Gekoppeld bedrijf"
 msgid "Check Availability"
 msgstr "Beschikbaarheid controleren"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Verzamelen"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4648,14 +4520,14 @@ msgid "Move History (parent moves)"
 msgstr "Mutatiehistorie (bovenliggende mutaties)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Virtuele voorraad"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -4811,6 +4683,7 @@ msgid "Real"
 msgstr "Werkelijk"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4847,7 +4720,7 @@ msgstr "Import huidige voorraad"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
 msgid "Upstream traceability"
-msgstr "Terug traceren"
+msgstr "Vooruit traceren"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
@@ -4856,7 +4729,7 @@ msgid "Location Content"
 msgstr "Locatie inhoud"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Geproduceerd aantal"
@@ -4887,12 +4760,6 @@ msgstr ""
 msgid "Production"
 msgstr "Productie"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "is verwerkt."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4926,6 +4793,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -5013,7 +4885,7 @@ msgstr ""
 "locaties te baseren)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5277,6 +5149,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Verwerkingsdatum"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Verwachte verzenddatum"
 
@@ -5937,6 +5812,10 @@ msgstr ""
 #~ msgid "Outgoing Product"
 #~ msgstr "Uitgaande producten"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "is gepland %s"
+
 #, python-format
 #~ msgid "Delivery Information"
 #~ msgstr "Levering informatie"
@@ -6051,9 +5930,17 @@ msgstr ""
 #~ msgid "Last month"
 #~ msgstr "Afgelopen maand"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "is wachtend"
+
 #~ msgid "Current year"
 #~ msgstr "Huidige jaar"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "is in concept fase"
+
 #, python-format
 #~ msgid "Company is not specified in Location"
 #~ msgstr "Bedrijf is niet gespecificeerd in de locatie"
@@ -6070,6 +5957,10 @@ msgstr ""
 #~ msgid "Partial Delivery"
 #~ msgstr "Deellevering"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Document"
+
 #~ msgid "Update"
 #~ msgstr "Bijwerken"
 
@@ -6201,6 +6092,9 @@ msgstr ""
 #~ msgid "Select Quantity"
 #~ msgstr "Selecteer hoeveelheid"
 
+#~ msgid "Expected"
+#~ msgstr "Verwacht"
+
 #~ msgid "To invoice"
 #~ msgstr "Te factureren"
 
@@ -6221,12 +6115,20 @@ msgstr ""
 #~ msgid "Stock available to be delivered"
 #~ msgstr "Voorraad beschikbaar om te leveren"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " voor de "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Hoeveelheid achterlaten in huidige verpakking"
 
 #~ msgid "Additional info"
 #~ msgstr "Extra informatie"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "is geannuleerd"
+
 #~ msgid "Waiting "
 #~ msgstr "Wachten "
 
@@ -6240,6 +6142,10 @@ msgstr ""
 #~ msgid "Please specify at least one non-zero quantity!"
 #~ msgstr "Specificeer ten minste één niet nul hoeveelheid!"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "is gereed om te verwerken"
+
 #~ msgid "Small Refrigerator"
 #~ msgstr "Kleine koelkast"
 
@@ -6283,6 +6189,9 @@ msgstr ""
 #~ msgid "Ice Cream"
 #~ msgstr "Ijs"
 
+#~ msgid "Reason"
+#~ msgstr "Oorzaak"
+
 #~ msgid "Reception:"
 #~ msgstr "Ontvangst:"
 
@@ -6613,6 +6522,10 @@ msgstr ""
 #~ "Vervolgens kan u de ontvangst van de producten bevestigen door gebruik te "
 #~ "maken van de knoppen aan de rechterzijde van iedere regel."
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Interne verzamelopdracht"
+
 #~ msgid "Expected date for the picking to be processed"
 #~ msgstr "Verwachte datum waarop de verzamelopdracht verwerkt kan worden"
 
@@ -6688,6 +6601,10 @@ msgstr ""
 #~ "Er zijn geen producten retour te nemen (alleen regels die verwerkt zijn en "
 #~ "nog niet volledig retour genomen zijn kunnen retour genomen worden)!"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "is verwerkt."
+
 #~ msgid ""
 #~ "This is the list of all delivery orders that have to be prepared, according "
 #~ "to your different sales orders and your logistics rules."
@@ -6725,6 +6642,10 @@ msgstr ""
 #~ msgid "Please provide a positive quantity to scrap!"
 #~ msgstr "Geef een positieve hoeveelheid om af te keuren!"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Uitgaande levering"
+
 #, python-format
 #~ msgid "Could not find any difference between standard price and new price!"
 #~ msgstr "Er is geen verschil tussen de huidige kostprijs en de nieuwe prijs!"
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index 19d0e9c58d5..8134814117f 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-04-10 08:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr "Upstreamtraceerbaarheid"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Productbewegingen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Voorraaddagboek"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -268,7 +262,6 @@ msgid "Not Applicable"
 msgstr "Niet van toepassing"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -316,7 +309,7 @@ msgid "Reference"
 msgstr "Referentie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Te verwerken producten"
@@ -346,7 +339,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -356,22 +348,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -575,12 +567,12 @@ msgid "Location Type"
 msgstr "Locatietype"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Voorlopige actuele inventarissen"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -616,7 +608,7 @@ msgid "Item Labels"
 msgstr "Etiketten"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -732,9 +724,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Ontvangst"
 
@@ -807,20 +797,14 @@ msgstr "Augustus"
 msgid "Packs"
 msgstr "Verpakkingen"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -876,7 +860,7 @@ msgstr ""
 "boekingen in functie van de verwerkte voorraadbewegingen."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -884,7 +868,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -911,7 +894,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Toekomstige ontvangsten"
@@ -982,9 +965,9 @@ msgid "IT Suppliers"
 msgstr "IT-leveranciers"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Voorlopige actuele inventarissen"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -993,7 +976,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Transitlocatie voor intercompany"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1006,8 +989,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1016,7 +999,7 @@ msgid "Change Product Quantity"
 msgstr "Producthoeveelheid wijzigen"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Toekomstige W&V"
@@ -1046,7 +1029,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1084,8 +1067,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1095,12 +1079,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dagboek"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1160,6 +1138,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1297,7 +1280,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1309,10 +1292,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Leveringsorder"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1320,10 +1302,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1335,7 +1315,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1343,16 +1323,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1507,13 +1485,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1535,13 +1507,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1558,10 +1530,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1575,10 +1550,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1616,9 +1590,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1633,8 +1608,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1675,18 +1657,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1749,7 +1719,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1787,7 +1757,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1833,9 +1803,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1936,12 +1905,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1967,7 +1930,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2034,7 +1997,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2053,7 +2015,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2248,14 +2210,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2287,7 +2242,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2323,8 +2277,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2340,7 +2294,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2378,7 +2331,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2464,12 +2417,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2493,7 +2440,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2556,7 +2502,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2618,12 +2564,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2663,7 +2604,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2676,19 +2617,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2796,7 +2732,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2820,7 +2756,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2828,9 +2764,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2882,7 +2817,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2894,6 +2829,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2904,13 +2840,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2938,13 +2874,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2972,7 +2914,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3039,13 +2981,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3054,7 +2989,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3077,12 +3011,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3093,29 +3021,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3124,7 +3029,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3142,7 +3047,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3226,13 +3131,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3263,18 +3161,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3301,7 +3187,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3348,7 +3234,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3373,7 +3259,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3418,7 +3304,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3484,7 +3370,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3657,11 +3543,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3705,7 +3586,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3800,12 +3681,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3817,8 +3692,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3858,7 +3751,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3880,16 +3772,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3923,9 +3815,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3935,7 +3828,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3973,7 +3866,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4038,7 +3931,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4046,7 +3938,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4087,9 +3979,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4123,7 +4014,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4142,7 +4033,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4163,12 +4054,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4180,7 +4065,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4203,7 +4088,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4220,8 +4105,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4296,12 +4181,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4353,13 +4244,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4383,13 +4271,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Schappen (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4415,7 +4308,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4448,23 +4341,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4475,15 +4356,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4521,14 +4393,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4677,6 +4549,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4722,7 +4595,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4753,12 +4626,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4792,6 +4659,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4874,7 +4746,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5138,3 +5010,7 @@ msgstr ""
 
 #~ msgid "Address of partner"
 #~ msgstr "Adres van relatie"
+
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Leveringsorder"
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 9a77c3edf44..7bfb4f12497 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 08:49+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-22 15:56+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -85,10 +85,11 @@ msgid "Upstream Traceability"
 msgstr "Śledzenie wstecz"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "Produkty zostały <b>dostarczone</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr "Data przesunięcia"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -126,8 +127,8 @@ msgid "Product Moves"
 msgstr "Przesunięcia produktu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Podaj poprawną ilość"
@@ -151,7 +152,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Nie możesz wykonac tej operacji na więcej niż jednej inwentaryzacji."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Ilość nie może być ujemna"
@@ -204,18 +205,11 @@ msgid "Analyse a Period"
 msgstr "Analizuj okres"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Dziennik magazynowy"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Produkty zostały <b>przyjęte</b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -271,7 +265,6 @@ msgid "Not Applicable"
 msgstr "Nie dotyczy"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -319,7 +312,7 @@ msgid "Reference"
 msgstr "Numer"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Produkty do przetworzenia"
@@ -348,7 +341,6 @@ msgid "_Validate"
 msgstr "_Zatwierdź"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -361,22 +353,22 @@ msgstr ""
 "kanban."
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Uwaga!"
@@ -584,12 +576,12 @@ msgid "Location Type"
 msgstr "Typ strefy magazynowej"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Strefy i Magazyn"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Projekt inwentaryzacji"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -636,7 +628,7 @@ msgid "Item Labels"
 msgstr "Etykiety elementów"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "Pobranie częściowe <em>%s</em> zostało <b>utworzone</b>."
@@ -755,9 +747,7 @@ msgid "Destination Address "
 msgstr "Adres docelowy "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Przyjęcie"
 
@@ -830,21 +820,15 @@ msgstr "Sierpień"
 msgid "Packs"
 msgstr "Paczki"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Przesunięcia dostępne (gotowe do wykonania)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr "Analizuj zapasy"
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr "Nie możesz usunąć pobrania w stanie %s !"
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Do zrobienia"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -904,7 +888,7 @@ msgstr ""
 "księgowania zapisów z przesunięć magazynowych."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -913,7 +897,6 @@ msgstr ""
 "Zdefiniuj konto wydań dla tego produktu lub jego kategorii: \"%s\" (id: %d)"
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -940,7 +923,7 @@ msgid "Time"
 msgstr "Czas"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Przyszłe przyjęcia"
@@ -975,7 +958,7 @@ msgstr "Produkty uszkodzone"
 #. module: stock
 #: view:product.product:0
 msgid "- update"
-msgstr ""
+msgstr "- aktualizacja"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1011,9 +994,9 @@ msgid "IT Suppliers"
 msgstr "Dostawcy IT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Projekt inwentaryzacji"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Strefy i Magazyn"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1022,7 +1005,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Strefa tranzytowa do przesunięć między firmowych"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1037,9 +1020,9 @@ msgid "Decimal precision on weight"
 msgstr "Zaokrąglenie wagi"
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatyczne przesunięcie"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Dostępne partie"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1047,7 +1030,7 @@ msgid "Change Product Quantity"
 msgstr "Zmień ilość produktu"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Przyszłe zyski i straty"
@@ -1077,7 +1060,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Musisz podac numer seryjny dla produktu."
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Zdefiniuj dziennik w kategorii produktu: \"%s\" (id: %d)"
@@ -1115,9 +1098,10 @@ msgid "Pickings already processed"
 msgstr "Pobranie już zrealizowane"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Planowany miesiąc"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Waluta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1126,12 +1110,6 @@ msgstr "Planowany miesiąc"
 msgid "Journal"
 msgstr "Dziennik"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "jest zaplanowany %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1191,6 +1169,11 @@ msgstr "Numery partii"
 msgid "Reverse Transfer"
 msgstr "Pobranie odwrotne"
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr "Fakturuj produkty w innej jednostce miary niż w zamówieniu sprzedaży"
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1333,7 +1316,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1347,10 +1330,9 @@ msgid "Internal Shipment :"
 msgstr "Przesunięcie wewnętrzne :"
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Wydanie zewnętrzne"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr "Podziel pozycję zapasu"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1358,10 +1340,8 @@ msgid "Manual Operation"
 msgstr "Ręczna operacja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr "Pobranie"
 
@@ -1373,7 +1353,7 @@ msgid "Supplier"
 msgstr "Dostawca"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1381,17 +1361,15 @@ msgid ""
 msgstr "Aby anulować inwentaryzację musisz najpierw odksięgować zapisy."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Data wykonania"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr "Podaj firmę w strefie."
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr "Produkty zostały <b>przesunięte</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Przesunięcia dostępne (gotowe do wykonania)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1570,13 +1548,7 @@ msgstr ""
 "(stosowane przy wycenie wg cen przeciętnych i ewentualnie FIFO)."
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "jest w stanie projekt"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Ostrzeżenie: Brak pobrania częściowego"
@@ -1598,13 +1570,13 @@ msgid "To be refunded/invoiced"
 msgstr "Do korekty/fakturowania"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Możesz usuwać tylko projekty przesunięć"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr "Nie możesz przesunąć produktu %s do strefy typu widok %s."
@@ -1621,11 +1593,14 @@ msgid "Ready"
 msgstr "Gotowe"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Widok kalendarza"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Projekt"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1638,11 +1613,10 @@ msgid "Additional Info"
 msgstr "Dodatkowe informacje"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Przesunięcie"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr "Brak danych do częściowego pobrania #%s."
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1681,10 +1655,11 @@ msgid "Internal Picking List"
 msgstr "Pobranie wewnętrzne (MM)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr "Produkty zostały <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Oczekiwanie"
 
 #. module: stock
 #: view:stock.move:0
@@ -1698,9 +1673,16 @@ msgid "Delivery Slip"
 msgstr "Wydruk wydania"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Oczekiwany"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Magazyn"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1744,18 +1726,6 @@ msgstr "ID pozycji inwentaryzacji"
 msgid "Address of  customer or supplier."
 msgstr "Adres klienta lub dostawcy"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s zostało <b>utworzone</b>."
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr "%s został <b>potwierdzony</b>."
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1820,7 +1790,7 @@ msgid "Order Date"
 msgstr "Data zamówienia"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INW: %s"
@@ -1859,7 +1829,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Fakturowanie przy wydaniach"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr "Wprowadź dodatnią wartość dla odpadu"
@@ -1905,10 +1875,9 @@ msgid "Stock Statistics"
 msgstr "Statystyka zapasu"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Waluta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Planowany miesiąc"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -2012,12 +1981,6 @@ msgstr "Konto wyceny zapasów (wchodzących)"
 msgid "Shelf 2"
 msgstr "Półka 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "jest gotowy do przetwarzania."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2043,7 +2006,7 @@ msgid "Localization"
 msgstr "Lokalizacja"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Ilość bieżąca"
@@ -2100,6 +2063,20 @@ msgid ""
 "\n"
 "            * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"\n"
+"            * Projekt: Jeszcze nie potwierdzone i nie zaplanowane\n"
+"\n"
+"            * Oczekiwanie na inną operację: Po wykonaniu innej operacji "
+"będzie dostępne automatycznie (zwykle przy pobraniach Na zamówienie)\n"
+"\n"
+"            * Oczekiwanie na dostępność: oczekuje na uzupełnienie zapasów\n"
+"\n"
+"            * Gotowe do pobrania: produkty są zarezerwowane, oczekiwanie na "
+"zatwierdzenie.\n"
+"\n"
+"            * Pobrane: zostało wykonane, nie można modyfikować lub anulować\n"
+"\n"
+"            * Anulowano: nie może być potwierdzone"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2115,7 +2092,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2134,7 +2110,7 @@ msgid "Location Stock"
 msgstr "Strefa składowania"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr "_Pobierz"
@@ -2165,6 +2141,19 @@ msgid ""
 "\n"
 "                 * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* Projekt: Jeszcze nie potwierdzone i nie zaplanowane\n"
+"\n"
+"* Oczekiwanie na inną operację: Po wykonaniu innej operacji będzie dostępne "
+"automatycznie (zwykle przy pobraniach Na zamówienie)\n"
+"\n"
+"* Oczekiwanie na dostępność: oczekuje na uzupełnienie zapasów\n"
+"\n"
+"* Gotowe do pobrania: produkty są zarezerwowane, oczekiwanie na "
+"zatwierdzenie.\n"
+"\n"
+"* Pobrane: zostało wykonane, nie można modyfikować lub anulować\n"
+"\n"
+"* Anulowano: nie może być potwierdzone"
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -2180,7 +2169,7 @@ msgstr "Numer partii"
 #: model:ir.actions.act_window,name:stock.action_deliver_move
 #: view:product.product:0
 msgid "Deliveries"
-msgstr ""
+msgstr "Dostawy"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2344,14 +2333,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr "Generuj zapisy księgowe dla ruchów magazynowych"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Oczekiwanie"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ilość bieżąca"
@@ -2387,7 +2369,6 @@ msgstr "Importuj Inwentaryzację"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nazwa"
@@ -2423,8 +2404,8 @@ msgid "Customer Locations"
 msgstr "Strefy klienta"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Błąd użytkownika!"
@@ -2440,7 +2421,6 @@ msgid "Create Invoice/Refund"
 msgstr "Utwórz fakturę/korektę"
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2481,7 +2461,7 @@ msgid "Creation"
 msgstr "Data utworzenia"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr "Operacja zabroniona!"
@@ -2569,12 +2549,6 @@ msgstr "Strefy związane"
 msgid "Inventory loss"
 msgstr "Straty inwentaryzacyjne"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2598,7 +2572,6 @@ msgid "Track serial number on products"
 msgstr "Śledź numer seryjny na produktach"
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2662,7 +2635,7 @@ msgid "Warehouse board"
 msgstr "Konsola magazynu"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Ilość planowana"
@@ -2724,12 +2697,7 @@ msgid "Products"
 msgstr "Produkty"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr "Podziel pozycję zapasu"
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2771,7 +2739,7 @@ msgid "Outgoing Products"
 msgstr "Wydawanie produktów"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2785,19 +2753,14 @@ msgid "Delay(Days)"
 msgstr "Opóźnienie (dni)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr "Brak danych do częściowego pobrania #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Przesunięcie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s zostało <b>anulowane</b>."
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Ilość bieżąca"
@@ -2914,7 +2877,7 @@ msgid "Support multiple variants per products  "
 msgstr "Obsługuje warianty produktów  "
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2940,7 +2903,7 @@ msgid "scrap"
 msgstr "odpad"
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2950,10 +2913,9 @@ msgstr ""
 "utworzy automatycznie pobrania częściowego."
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
-msgstr "Podaj firmę w strefie."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
+msgstr "Ręczna ilość"
 
 #. module: stock
 #: view:product.product:0
@@ -3007,7 +2969,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr "Podaj prawidłową ilość"
@@ -3019,6 +2981,7 @@ msgstr "Prognoza stanu zapasów"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -3029,13 +2992,13 @@ msgid "Stock Journal"
 msgstr "Dziennik magazynowy"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Nabycie"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr "%s-%s-zwrot"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktywny ID nie jest ustawiony w kontekście"
@@ -3061,15 +3024,23 @@ msgstr "Przesunięcie odpadu"
 #: help:stock.move,prodlot_id:0
 msgid "Serial number is used to put a serial number on the production"
 msgstr ""
+"Numer seryjny jest stosowany do identyfikacji konkretnego egzemplarza "
+"produktu"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Przyjmij produkty"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Nabycie"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3097,7 +3068,7 @@ msgid "Date of Completion"
 msgstr "Data wykonania"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr "Nie możesz przesunąć produktu %s ze strefy typu widok %s."
@@ -3165,14 +3136,6 @@ msgstr "Rzeczywiste zapasy"
 msgid "Logistic Serial Number"
 msgstr "Numer seryjny"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-"<b>Ilość została zmieniona</b> na <em>%s %s </em> dla strefy <em>%s</em>."
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3181,7 +3144,6 @@ msgstr "Data wersji"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partia"
@@ -3206,12 +3168,6 @@ msgstr "Pozycja pobrania częściowego"
 msgid "Quantity (UOS)"
 msgstr "Ilość (JS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "oczekuje."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3222,29 +3178,6 @@ msgstr "Ustaw jako dostępne"
 msgid "Contact Address :"
 msgstr "Adres kontaktu :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr "Numer Seryjny"
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3255,7 +3188,7 @@ msgstr ""
 "obieg konkretnego produktu."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr "_Przyjmij"
@@ -3273,7 +3206,7 @@ msgid "Properties"
 msgstr "Właściwości"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Błąd, brak partnera !"
@@ -3370,13 +3303,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Odnośnik inwentaryzacji"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Pobranie wewnętrzne (MM)"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3418,18 +3344,6 @@ msgstr "Przetwarzaj"
 msgid "Revision Name"
 msgstr "Nazwa wersji"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Magazyn"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3463,7 +3377,7 @@ msgstr ""
 "            "
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr "%s %s %s zostało <b>przesunięte do</b> odpadów."
@@ -3510,7 +3424,7 @@ msgid "Date done"
 msgstr "Data wykonania"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3535,8 +3449,8 @@ msgstr "Nie pilne"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Do zrobienia"
+msgid "Scheduled"
+msgstr "Zaplanowane"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3582,7 +3496,7 @@ msgid "Stock"
 msgstr "Strefa składowania"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr "Pobranie zwrotne"
@@ -3656,7 +3570,7 @@ msgid "Assigned Internal Moves"
 msgstr "Powiązane wewnętrzne przesunięcia"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "Nie można przetwarzać pobrania bez pozycji."
@@ -3829,11 +3743,6 @@ msgstr "Menedżer"
 msgid "Internal Shippings"
 msgstr "Przesunięcia wewnętrzne (MM)"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr "Fakturuj w innej jednostce miary niż w zamówieniu sprzedaży"
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3885,7 +3794,7 @@ msgid "Inventory Move"
 msgstr "Przesunięcie zapasów"
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Przyszłe produkcje"
@@ -3994,12 +3903,6 @@ msgstr "Firma"
 msgid "Product Unit of Measure"
 msgstr "Jednostka miary produktu"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr "Wydanie zewnętrzne"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -4011,9 +3914,27 @@ msgid "Lot Inventory"
 msgstr "Ewidencja partii"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Przyczyna"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr "Numer Seryjny"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -4056,7 +3977,6 @@ msgstr ""
 "ustawione w produkcie, to zostanie użyte konto z kategorii produktu."
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -4078,16 +3998,16 @@ msgstr "Klienci pozaeuropejscy"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4125,10 +4045,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Potwierdzone wydania"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr "%s-zwrot"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Pobranie"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4137,7 +4058,7 @@ msgid "This picking list does not require invoicing."
 msgstr "To wydanie nie wymaga fakturowania."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4184,7 +4105,7 @@ msgstr ""
 "* Strefa stała: Strefa będzie pobrana z następnego pola."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4253,7 +4174,6 @@ msgstr ""
 "produkty."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4261,7 +4181,7 @@ msgid "Followers"
 msgstr "Wypowiadający się"
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr "Nie mozna zużyć ilości zerowej lub ujemnej."
@@ -4302,10 +4222,9 @@ msgid "Product Category"
 msgstr "Kategoria Produktu"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " dla "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr "Numer seryjny"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4343,7 +4262,7 @@ msgstr ""
 "stronie Ma a konto zapasów wchodzących po stronie Winien."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "FA:"
@@ -4362,7 +4281,7 @@ msgid "Chaining Journal"
 msgstr "Dziennik powiązania"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Zbyt mały zapas. Nie mozna rezerwować produktów."
@@ -4383,12 +4302,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "jest anulowane."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4404,7 +4317,7 @@ msgstr ""
 "ustawionego w produkcie."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Przyszłe wydania"
@@ -4427,7 +4340,7 @@ msgid "Auto Validate"
 msgstr "Automatyczne zatwierdzanie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "Zbyt mały zapas dla tego numeru seryjnego !"
@@ -4444,9 +4357,9 @@ msgid "December"
 msgstr "Grudzień"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Dostępne partie"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatyczne przesunięcie"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4523,12 +4436,18 @@ msgid "Invoiced"
 msgstr "Zafakturowano"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacja"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr "Nie możesz usunąć pobrania w stanie %s !"
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4582,14 +4501,11 @@ msgid "Internal"
 msgstr "Wewnętrzne"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Projekt"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Widok kalendarza"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4619,13 +4535,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Chcesz połączyć te inwentaryzacje ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr "Data pobrania"
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Półki (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4651,7 +4572,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr "Podaj wartość niezerową i dodatnią"
@@ -4684,23 +4605,11 @@ msgid "November"
 msgstr "Listopad"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Ilość bieżąca"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Komentarze i emaile"
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4711,15 +4620,6 @@ msgstr "Związana firma"
 msgid "Check Availability"
 msgstr "Sprawdź dostępność"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Pobranie"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4758,14 +4658,14 @@ msgid "Move History (parent moves)"
 msgstr "Histora przesunięć (przesunięcia nadrzędne)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Przyszły zapas"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Błąd"
@@ -4925,6 +4825,7 @@ msgid "Real"
 msgstr "Rzeczywiste"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4970,7 +4871,7 @@ msgid "Location Content"
 msgstr "Zawartość strefy"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Ilość bieżąca"
@@ -5001,12 +4902,6 @@ msgstr "Zaplanowany czas dla pobrania"
 msgid "Production"
 msgstr "Produkcja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "jest wykonane"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -5040,6 +4935,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr "Data pobrania"
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -5133,7 +5033,7 @@ msgstr ""
 "wybrał typ na podstawie strefy źródłowej i docelowej)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5364,6 +5264,9 @@ msgstr "Adres magazynu :"
 #~ msgid "Quantity per lot"
 #~ msgstr "Ilość wg partii"
 
+#~ msgid "Date Done"
+#~ msgstr "Data wykonania"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Spodziewana data wysyłki"
 
@@ -5842,12 +5745,20 @@ msgstr "Adres magazynu :"
 #~ msgid "Address of partner"
 #~ msgstr "Adres partnera"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Wydanie zewnętrzne"
+
 #~ msgid "Lot number"
 #~ msgstr "Numer partii"
 
 #~ msgid "Shop 1"
 #~ msgstr "Sklep 1"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "jest w stanie projekt"
+
 #, python-format
 #~ msgid "Company is not specified in Location"
 #~ msgstr "Nie określono firmy w strefie"
@@ -5922,6 +5833,10 @@ msgstr "Adres magazynu :"
 #~ "\"%s\" (id: %d)"
 #~ msgstr "Brak konta przyjęć dla produktu lub jego kategorii: \"%s\" (id: %d)"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "jest wykonane"
+
 #~ msgid "Incoming Product"
 #~ msgstr "Przyjmowanie produktów"
 
@@ -5932,6 +5847,10 @@ msgstr "Adres magazynu :"
 #~ msgid "Product "
 #~ msgstr "Produkt "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
 #~ msgid "Update"
 #~ msgstr "Aktualizuj"
 
@@ -5975,6 +5894,10 @@ msgstr "Adres magazynu :"
 #~ "There is no stock input account defined for this product: \"%s\" (id: %d)"
 #~ msgstr "Nie zdefiniowano konta przyjęć dla produktu: '%s' (id: %d)"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Pobranie wewnętrzne (MM)"
+
 #~ msgid "Lot weight"
 #~ msgstr "Waga partii"
 
@@ -5991,6 +5914,13 @@ msgstr "Adres magazynu :"
 #~ msgid "Total"
 #~ msgstr "Suma"
 
+#~ msgid "Reason"
+#~ msgstr "Przyczyna"
+
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "jest anulowane."
+
 #~ msgid "Additional info"
 #~ msgstr "Dodatkowe informacje"
 
@@ -6004,6 +5934,10 @@ msgstr "Adres magazynu :"
 #~ msgid "Existing Lot"
 #~ msgstr "Istniejąca partia"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "jest gotowy do przetwarzania."
+
 #, python-format
 #~ msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 #~ msgstr "Nie zdefiniowano dziennika w kategorii produktu: \"%s\" (id: %d)"
@@ -6015,6 +5949,9 @@ msgstr "Adres magazynu :"
 #~ msgid "To invoice"
 #~ msgstr "Do zafakturowania"
 
+#~ msgid "Expected"
+#~ msgstr "Oczekiwany"
+
 #~ msgid "Split in Production lots"
 #~ msgstr "Podziel na partie produkcyjne"
 
@@ -6302,6 +6239,10 @@ msgstr "Adres magazynu :"
 #~ msgid "INV: "
 #~ msgstr "FAK: "
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " dla "
+
 #~ msgid "Reception:"
 #~ msgstr "Przyjęcie:"
 
@@ -6618,9 +6559,17 @@ msgstr "Adres magazynu :"
 #~ msgid "Valuation Account is not specified for Product Category: %s"
 #~ msgstr "Konto wyceny nie zostało zdefiniowane w kategorii produktu: %s"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "oczekuje."
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Potwierdzone pobrania"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "jest zaplanowany %s."
+
 #, python-format
 #~ msgid ""
 #~ "There is no inventory Valuation account defined on the product category: "
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 29d28161395..86c654f0d12 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 15:22+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -84,9 +84,10 @@ msgid "Upstream Traceability"
 msgstr "Rastreabilidade Upstream"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -125,8 +126,8 @@ msgid "Product Moves"
 msgstr "Movimentos de Artigo"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Por favor indique uma quantidade adequada."
@@ -152,7 +153,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Não pode executar esta operação em mais do que uma das existências."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "A quantidade não pode ser negativa"
@@ -205,18 +206,11 @@ msgid "Analyse a Period"
 msgstr "Analisar um período"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diário de Stock"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Os produtos foram <b>rececionados</b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -273,7 +267,6 @@ msgid "Not Applicable"
 msgstr "Não Aplicável"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -321,7 +314,7 @@ msgid "Reference"
 msgstr "Referência"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Artigos a Processar"
@@ -351,7 +344,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -361,22 +353,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -582,12 +574,12 @@ msgid "Location Type"
 msgstr "Tipo de Localização"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Localização & armazém"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventários Físicos em Rascunho"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -623,7 +615,7 @@ msgid "Item Labels"
 msgstr "Rótulos dos items"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -739,9 +731,7 @@ msgid "Destination Address "
 msgstr "Endereço de destino "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recepção"
 
@@ -814,21 +804,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Embalagens"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Movimento de stock que estão disponíveis (Prontos para processar)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "A Fazer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -884,7 +868,7 @@ msgstr ""
 "movimento do stock é processado."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -892,7 +876,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -919,7 +902,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recepções Futuras"
@@ -990,9 +973,9 @@ msgid "IT Suppliers"
 msgstr "Fornecedores de TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventários Físicos em Rascunho"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Localização & armazém"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1001,7 +984,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Localização de trânsito para Transferências Inter-Empresas"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1014,9 +997,9 @@ msgid "Decimal precision on weight"
 msgstr "Precisão decimal no peso"
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimento Automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Lotes de artigos disponíveis"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1024,7 +1007,7 @@ msgid "Change Product Quantity"
 msgstr "Alterar quantidade do artigo"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Futuro da P&L"
@@ -1054,7 +1037,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Deve atribuir um número de série a este produto"
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1092,9 +1075,10 @@ msgid "Pickings already processed"
 msgstr "Pickings já processados"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Mês Planeado"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moeda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1103,12 +1087,6 @@ msgstr "Mês Planeado"
 msgid "Journal"
 msgstr "Diário"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "está agendado %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1168,6 +1146,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1307,7 +1290,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1319,10 +1302,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Ordem de Entrega"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1330,10 +1312,8 @@ msgid "Manual Operation"
 msgstr "Operação Manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr "Expedição"
 
@@ -1345,7 +1325,7 @@ msgid "Supplier"
 msgstr "Fornecedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1354,17 +1334,15 @@ msgstr ""
 "Para cancelar este inventário, deve primeiro unpost lançamentos relacionados."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Data de Conclusão"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Movimento de stock que estão disponíveis (Prontos para processar)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1528,13 +1506,7 @@ msgstr ""
 "é usado)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "Está no estado de rascunho"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1556,13 +1528,13 @@ msgid "To be refunded/invoiced"
 msgstr "Para ser reembolsado / faturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Só pode apagar movimentos em rascunho."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1579,11 +1551,14 @@ msgid "Ready"
 msgstr "Pronto"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vista do Calendário"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Rascunho"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1596,11 +1571,10 @@ msgid "Additional Info"
 msgstr "Informação Adicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Movimento"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1639,10 +1613,11 @@ msgid "Internal Picking List"
 msgstr "Lista de picking direta"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr "Os produtos foram <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Em Espera"
 
 #. module: stock
 #: view:stock.move:0
@@ -1656,9 +1631,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Esperado"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Armazém"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1703,18 +1685,6 @@ msgstr "ID da Linha de Inventário"
 msgid "Address of  customer or supplier."
 msgstr "Endereço do cliente ou fornecedor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s foi <b>criada</b>."
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr "%s foi <b>confirmada</b>."
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1778,7 +1748,7 @@ msgid "Order Date"
 msgstr "Ordem da Data"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1818,7 +1788,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Fatura do stock Onshipping"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1864,10 +1834,9 @@ msgid "Stock Statistics"
 msgstr "Estatísticas do stock"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moeda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Mês Planeado"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1967,12 +1936,6 @@ msgstr "Conta de avaliação de stock (Incoming)"
 msgid "Shelf 2"
 msgstr "Prateleira 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "está pronto para processar."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1998,7 +1961,7 @@ msgid "Localization"
 msgstr "Localização"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Quantidade Entregue"
@@ -2070,7 +2033,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2089,7 +2051,7 @@ msgid "Location Stock"
 msgstr "Locslização de Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2290,14 +2252,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Em Espera"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Qtd Recebida"
@@ -2331,7 +2286,6 @@ msgstr "Importar inventário"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nome"
@@ -2367,8 +2321,8 @@ msgid "Customer Locations"
 msgstr "Localização do cliente"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Erro do utilizador!"
@@ -2384,7 +2338,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2425,7 +2378,7 @@ msgid "Creation"
 msgstr "Criação"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2515,12 +2468,6 @@ msgstr "Localizações Encadeadas"
 msgid "Inventory loss"
 msgstr "Perdas de Inventário"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2544,7 +2491,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2607,7 +2553,7 @@ msgid "Warehouse board"
 msgstr "Painel do armazém"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Qtd Futura"
@@ -2670,12 +2616,7 @@ msgid "Products"
 msgstr "Artigos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2715,7 +2656,7 @@ msgid "Outgoing Products"
 msgstr "Artigos A Sair"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2728,19 +2669,14 @@ msgid "Delay(Days)"
 msgstr "Atraso (dias)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Movimento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Qtd P&L"
@@ -2859,7 +2795,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2883,7 +2819,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2891,9 +2827,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2949,7 +2884,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr "Por favor, indique uma quantidade adequada."
@@ -2961,6 +2896,7 @@ msgstr "Previsão do Nível de stock"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2971,13 +2907,13 @@ msgid "Stock Journal"
 msgstr "Diário de Stock"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Aquisições"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "ID ativo não está definido no Contexto"
@@ -3005,13 +2941,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Recepcionar Artigos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Aquisições"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3039,7 +2981,7 @@ msgid "Date of Completion"
 msgstr "Data da Conclusão"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3106,13 +3048,6 @@ msgstr "Stock Real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3121,7 +3056,6 @@ msgstr "Data de Revisão"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3144,12 +3078,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Quantidade (UOS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "em espera."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3160,29 +3088,6 @@ msgstr "Definir como Disponível"
 msgid "Contact Address :"
 msgstr "Endereço de contato:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr "Número de série"
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3191,7 +3096,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3209,7 +3114,7 @@ msgid "Properties"
 msgstr "Propriedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Erro, sem parceiro !"
@@ -3298,13 +3203,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referência do Inventário"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Picking Interno"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3335,18 +3233,6 @@ msgstr "Processo"
 msgid "Revision Name"
 msgstr "Nome da Revisão"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Armazém"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3373,7 +3259,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3420,7 +3306,7 @@ msgid "Date done"
 msgstr "Data efetuada"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3446,8 +3332,8 @@ msgstr "Não urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "A Fazer"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3491,7 +3377,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3557,7 +3443,7 @@ msgid "Assigned Internal Moves"
 msgstr "Movimentos Internos Atribuídos"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3730,11 +3616,6 @@ msgstr "Gestor"
 msgid "Internal Shippings"
 msgstr "Shippings internos"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3778,7 +3659,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Produções Futuras"
@@ -3873,12 +3754,6 @@ msgstr "Empresa"
 msgid "Product Unit of Measure"
 msgstr "Unidade de medida do produto"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr "Ordem de entrega"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3890,9 +3765,27 @@ msgid "Lot Inventory"
 msgstr "Inventario do Lote"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Razão"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr "Número de série"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3936,7 +3829,6 @@ msgstr ""
 "categoria. Também pode ser definida diretamente sobre cada artigo"
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3958,16 +3850,16 @@ msgstr "Clientes não Europeus"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4001,10 +3893,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Ordens de entrega confirmadas"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Picking"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4013,7 +3906,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Esta lista de picking não requer faturação."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4061,7 +3954,7 @@ msgstr ""
 "Localização Encadeada se Corrigido."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4128,7 +4021,6 @@ msgstr ""
 "destruídos / danificados."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4136,7 +4028,7 @@ msgid "Followers"
 msgstr "Seguidores"
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4177,10 +4069,9 @@ msgid "Product Category"
 msgstr "Categoria do Artigo"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " para o "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4218,7 +4109,7 @@ msgstr ""
 "conta a entrada stock será debitada."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4237,7 +4128,7 @@ msgid "Chaining Journal"
 msgstr "Diário encadeado"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Não existe stock suficiente, incapaz de reservar os artigos."
@@ -4258,12 +4149,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "está cancelada."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4280,7 +4165,7 @@ msgstr ""
 "locais internos."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Entregas Futuras"
@@ -4303,7 +4188,7 @@ msgid "Auto Validate"
 msgstr "Auto Validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4320,9 +4205,9 @@ msgid "December"
 msgstr "Dezembro"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Lotes de artigos disponíveis"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimento Automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4398,12 +4283,18 @@ msgid "Invoiced"
 msgstr "Faturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informação"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4457,14 +4348,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Rascunho"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vista do Calendário"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4492,13 +4380,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Pretende unir estes inventários ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Prateleiras (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4524,7 +4417,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4557,23 +4450,11 @@ msgid "November"
 msgstr "Novembro"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Qtd não Planeada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Comentários e emails"
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4584,15 +4465,6 @@ msgstr "Empresa encadeada"
 msgid "Check Availability"
 msgstr "Verificar a Disponibilidade"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Picking"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4630,14 +4502,14 @@ msgid "Move History (parent moves)"
 msgstr "Histórico de Movimentos ( movimentos ascendentes)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stock Futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -4793,6 +4665,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4838,7 +4711,7 @@ msgid "Location Content"
 msgstr "Conteúdo local"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Quantidade Produzida"
@@ -4869,12 +4742,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produção"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "está concluído."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4908,6 +4775,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4995,7 +4867,7 @@ msgstr ""
 "locais de destino)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5581,6 +5453,9 @@ msgstr "Endereço do armazém :"
 #~ msgid "Tracking Lot"
 #~ msgstr "Rastrear Lote"
 
+#~ msgid "Date Done"
+#~ msgstr "Data de Conclusão"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Data Esperada de Envio"
 
@@ -5985,6 +5860,10 @@ msgstr "Endereço do armazém :"
 #~ msgid "Product "
 #~ msgstr "Artigo "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Products "
 #~ msgstr "Artigos "
 
@@ -6203,6 +6082,10 @@ msgstr "Endereço do armazém :"
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Pickings confirmados"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "está agendado %s."
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock output account defined for this product: \"%s\" (id: %d)"
@@ -6221,6 +6104,14 @@ msgstr "Endereço do armazém :"
 #~ msgid "Last month"
 #~ msgstr "Último mês"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "em espera."
+
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Ordem de Entrega"
+
 #~ msgid "Import current product inventory from the following location"
 #~ msgstr "Importar inventário atual do artigo a partir do seguinte local"
 
@@ -6470,6 +6361,10 @@ msgstr "Endereço do armazém :"
 #~ "Não existe uma conta de entrada de stock definida para este artigo: \"%s\" "
 #~ "(id: %d)"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Picking Interno"
+
 #~ msgid "Open Product"
 #~ msgstr "Artigo Aberto"
 
@@ -6544,18 +6439,33 @@ msgstr "Endereço do armazém :"
 #~ msgid "New pack"
 #~ msgstr "Nova embalagem"
 
+#~ msgid "Reason"
+#~ msgstr "Razão"
+
 #~ msgid "Reception:"
 #~ msgstr "Recepção:"
 
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Esta quantidade é expressa na UdM por omissão do artigo."
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "está concluído."
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Quantidade a deixar na embalagem atual"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " para o "
+
 #~ msgid "Stock available to be delivered"
 #~ msgstr "Stock disponível a ser entregue"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "está cancelada."
+
 #~ msgid ""
 #~ "This menu gives you the full traceability of inventory operations on a "
 #~ "specific product. You can filter on the product to see all the past or "
@@ -6598,6 +6508,10 @@ msgstr "Endereço do armazém :"
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Referência do documento que produziu este picking."
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "está pronto para processar."
+
 #~ msgid ""
 #~ "Forces to specify a Production Lot for all moves containing this product and "
 #~ "coming from a Supplier Location"
@@ -6613,6 +6527,9 @@ msgstr "Endereço do armazém :"
 #~ "Quantidade total após desdobramento exceder a quantidade de dividir para "
 #~ "este artigo: \"%s\" (id: %d)"
 
+#~ msgid "Expected"
+#~ msgstr "Esperado"
+
 #~ msgid ""
 #~ "This is the structure of your company's warehouses and locations. You can "
 #~ "click on a location to get the list of the products and their stock level in "
@@ -6757,3 +6674,7 @@ msgstr "Endereço do armazém :"
 
 #~ msgid "Products Moves"
 #~ msgstr "Movimentos de Artigos"
+
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "Está no estado de rascunho"
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index f744e15029d..56dbb2959a2 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 01:43+0000\n"
 "Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\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: 2012-12-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -84,10 +84,11 @@ msgid "Upstream Traceability"
 msgstr "Rastreabilidade Posterior"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "O Produto foi <b>entregue</b>"
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -125,8 +126,8 @@ msgid "Product Moves"
 msgstr "Movimentações de Produto"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Favor fornecer a quantidade correta"
@@ -151,7 +152,7 @@ msgstr ""
 "Você não pode executar esta operação em mais de um Inventário de Estoque"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "A Quantidade não pode ser negativa"
@@ -204,18 +205,11 @@ msgid "Analyse a Period"
 msgstr "Analisar um Período"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Diário do Estoque"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Os Produtos foram <b>recebidos</b>"
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -272,7 +266,6 @@ msgid "Not Applicable"
 msgstr "Não Aplicável"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -320,7 +313,7 @@ msgid "Reference"
 msgstr "Referência"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Produtos a processar"
@@ -350,7 +343,6 @@ msgid "_Validate"
 msgstr "_Validar"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -360,22 +352,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -581,12 +573,12 @@ msgid "Location Type"
 msgstr "Tipo de Localização"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventário Físico Provisório"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -622,7 +614,7 @@ msgid "Item Labels"
 msgstr "Etiquetas de Itens"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -738,9 +730,7 @@ msgid "Destination Address "
 msgstr "Destinatário "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Recebimento"
 
@@ -813,21 +803,15 @@ msgstr "Agosto"
 msgid "Packs"
 msgstr "Embalagens"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Movimentação de estoque Disponíveis (Prontas para processar)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "A Ser Feito"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -883,7 +867,7 @@ msgstr ""
 "quando o movimento de estoque for processado."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -891,7 +875,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -918,7 +901,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Recebimento Futuro"
@@ -989,9 +972,9 @@ msgid "IT Suppliers"
 msgstr "Fornecedores de TI"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventário Físico Provisório"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1000,7 +983,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Local de Trânsito para Transferências Inter-Empresas"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1013,9 +996,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimento Automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Lotes de Produto Disponíveis"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1023,7 +1006,7 @@ msgid "Change Product Quantity"
 msgstr "Mudar Quantidade do Produto"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L Futuro"
@@ -1053,7 +1036,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1091,9 +1074,10 @@ msgid "Pickings already processed"
 msgstr "Separações já processadas"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Mês Planejado"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moeda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1102,12 +1086,6 @@ msgstr "Mês Planejado"
 msgid "Journal"
 msgstr "Diário"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "está agendado %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1167,6 +1145,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1305,7 +1288,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1317,10 +1300,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Ordem de Entrega"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1328,10 +1310,8 @@ msgid "Manual Operation"
 msgstr "Operação Manual"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1343,7 +1323,7 @@ msgid "Supplier"
 msgstr "Fornecedor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1353,17 +1333,15 @@ msgstr ""
 "diário relacionadas."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Data de Saída"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Movimentação de estoque Disponíveis (Prontas para processar)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1526,13 +1504,7 @@ msgstr ""
 "durante a entrada (quando o método de custo médio é usado)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "está com situação Provisório."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1554,13 +1526,13 @@ msgid "To be refunded/invoiced"
 msgstr "Para ser reembolsado/faturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Você só pode apagar movimentação provisórias"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1577,11 +1549,14 @@ msgid "Ready"
 msgstr "Pronto"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Visão de Calendário"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Provisório"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1594,11 +1569,10 @@ msgid "Additional Info"
 msgstr "Informação Adicional"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Movimento"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1637,10 +1611,11 @@ msgid "Internal Picking List"
 msgstr "Lista de Separação Interna"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Aguardando"
 
 #. module: stock
 #: view:stock.move:0
@@ -1654,9 +1629,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Esperado"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Armazém"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1701,18 +1683,6 @@ msgstr "Id da Linha do Inventário"
 msgid "Address of  customer or supplier."
 msgstr "Endereço do cliente ou fornecedor."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1777,7 +1747,7 @@ msgid "Order Date"
 msgstr "Data do Pedido"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "FAT: %s"
@@ -1816,7 +1786,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Faturar Estoque no Envio"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1862,10 +1832,9 @@ msgid "Stock Statistics"
 msgstr "Estatísticas de Estoque"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moeda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Mês Planejado"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1965,12 +1934,6 @@ msgstr "Conta de Valorização de Estoque (Entrada)"
 msgid "Shelf 2"
 msgstr "Box 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "está pronto para processamento."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1996,7 +1959,7 @@ msgid "Localization"
 msgstr "Localização"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Quantidade Entregue"
@@ -2067,7 +2030,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2086,7 +2048,7 @@ msgid "Location Stock"
 msgstr "Localizacão do Estoque"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2287,14 +2249,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Aguardando"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Qtde Recebida"
@@ -2328,7 +2283,6 @@ msgstr "Importar Inventário"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nome"
@@ -2364,8 +2318,8 @@ msgid "Customer Locations"
 msgstr "Local do Cliente"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2381,7 +2335,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2422,7 +2375,7 @@ msgid "Creation"
 msgstr "Criação"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2511,12 +2464,6 @@ msgstr "Localizações Encadeadas"
 msgid "Inventory loss"
 msgstr "Perda de Inventário"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2540,7 +2487,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2603,7 +2549,7 @@ msgid "Warehouse board"
 msgstr "Placa de armazém"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Qtde Futura"
@@ -2666,12 +2612,7 @@ msgid "Products"
 msgstr "Produtos"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2711,7 +2652,7 @@ msgid "Outgoing Products"
 msgstr "Saída de Produtos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2724,19 +2665,14 @@ msgid "Delay(Days)"
 msgstr "Prazo(Dias)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Movimento"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Qtd P&L"
@@ -2855,7 +2791,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2879,7 +2815,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2887,9 +2823,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2945,7 +2880,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2957,6 +2892,7 @@ msgstr "Previsão de Nível de Estoque"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2967,13 +2903,13 @@ msgid "Stock Journal"
 msgstr "Diário de Estoque"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Aquisição"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "O ID ativo não está no Conteúdo"
@@ -3001,13 +2937,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Receber Produtos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3035,7 +2977,7 @@ msgid "Date of Completion"
 msgstr "Data de Conclusão"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3103,13 +3045,6 @@ msgstr "Estoque Real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3118,7 +3053,6 @@ msgstr "Data de Revisão"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lote"
@@ -3141,12 +3075,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Quantidade (UdV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "está aguardando."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3157,29 +3085,6 @@ msgstr "Definir como Disponível"
 msgid "Contact Address :"
 msgstr "Endereço de Contato :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3188,7 +3093,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3206,7 +3111,7 @@ msgid "Properties"
 msgstr "Propriedades"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Erro, nenhum parceiro !"
@@ -3295,13 +3200,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referência de Inventário"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Separação interna"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3332,18 +3230,6 @@ msgstr "Processar"
 msgid "Revision Name"
 msgstr "Nome de Revisão"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Armazém"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3370,7 +3256,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3417,7 +3303,7 @@ msgid "Date done"
 msgstr "Data de conclusão"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3444,8 +3330,8 @@ msgstr "Não urgente"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "A Ser Feito"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3489,7 +3375,7 @@ msgid "Stock"
 msgstr "Estoque"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3555,7 +3441,7 @@ msgid "Assigned Internal Moves"
 msgstr "Movimentação Interna Atribuída"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3728,11 +3614,6 @@ msgstr "Gerente"
 msgid "Internal Shippings"
 msgstr "Envios Internos"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3776,7 +3657,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Produções Futuras"
@@ -3871,12 +3752,6 @@ msgstr "Empresa"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3888,9 +3763,27 @@ msgid "Lot Inventory"
 msgstr "Lote de Inventário"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivo"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3934,7 +3827,6 @@ msgstr ""
 "Ela também pode ser definida diretamente em cada produto"
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3956,16 +3848,16 @@ msgstr "Clientes não Europeus"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3999,10 +3891,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Ordens de Entrega Confirmadas"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Separação"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4011,7 +3904,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Esta lista de separação não requer faturamento."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4059,7 +3952,7 @@ msgstr ""
 "Localização Encadeada se Fixo."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4126,7 +4019,6 @@ msgstr ""
 "danificados."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4134,7 +4026,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4175,10 +4067,9 @@ msgid "Product Category"
 msgstr "Categoria de Produto"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " para o "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4216,7 +4107,7 @@ msgstr ""
 "conta a entrada estoque será debitado."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4235,7 +4126,7 @@ msgid "Chaining Journal"
 msgstr "Diário de Encadeamentos"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Estoque insuficiente, impossível reservar os produtos."
@@ -4256,12 +4147,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "está cancelado."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4278,7 +4163,7 @@ msgstr ""
 "locais internos."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Entregas Futuras"
@@ -4301,7 +4186,7 @@ msgid "Auto Validate"
 msgstr "Auto Validar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4318,9 +4203,9 @@ msgid "December"
 msgstr "Dezembro"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Lotes de Produto Disponíveis"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimento Automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4397,12 +4282,18 @@ msgid "Invoiced"
 msgstr "Faturado"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informação"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4456,14 +4347,11 @@ msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Provisório"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Visão de Calendário"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4492,13 +4380,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Você deseja mesclar estes inventários?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Prateleiras (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4524,7 +4417,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4557,23 +4450,11 @@ msgid "November"
 msgstr "Novembro"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Quantidade não planejada"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4584,15 +4465,6 @@ msgstr "Empresa Encadeada"
 msgid "Check Availability"
 msgstr "Verificar Disponibilidade"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Separação"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4630,14 +4502,14 @@ msgid "Move History (parent moves)"
 msgstr "Histórico de Movimentação (pais)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Estoque Futuro"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -4791,6 +4663,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4836,7 +4709,7 @@ msgid "Location Content"
 msgstr "Conteúdo do Local"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Qtde Produzida"
@@ -4867,12 +4740,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produção"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "está concluído."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4906,6 +4773,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4993,7 +4865,7 @@ msgstr ""
 "destino)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5124,6 +4996,9 @@ msgstr ""
 #~ msgid "Quantity per lot"
 #~ msgstr "Quantidade por Lote"
 
+#~ msgid "Date Done"
+#~ msgstr "Data de Saída"
+
 #~ msgid "Tracking Number"
 #~ msgstr "Número de Rastreamento"
 
@@ -5554,6 +5429,10 @@ msgstr ""
 #~ msgid "Not Available"
 #~ msgstr "Não Disponível"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Ordem de Entrega"
+
 #~ msgid "Shop 1"
 #~ msgstr "Loja 1"
 
@@ -5594,6 +5473,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Produto "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Documento"
+
 #~ msgid "Partial Picking"
 #~ msgstr "Separação Parcial"
 
@@ -5647,6 +5530,13 @@ msgstr ""
 #~ msgid "Delivery Order:"
 #~ msgstr "Ordem de Entrega"
 
+#~ msgid "Reason"
+#~ msgstr "Motivo"
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "está concluído."
+
 #~ msgid "Reception:"
 #~ msgstr "Recebimento:"
 
@@ -5655,9 +5545,17 @@ msgstr ""
 #~ "Especifica mercadorias para serem entregues todas de uma vez ou por entrega "
 #~ "direta"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "está cancelado."
+
 #~ msgid "Existing Lots"
 #~ msgstr "Lotes Existentes"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " para o "
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
@@ -5681,6 +5579,10 @@ msgstr ""
 #~ msgid "Existing Lot"
 #~ msgstr "Lote Existente"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "está pronto para processamento."
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "está agendado"
@@ -5691,6 +5593,9 @@ msgstr ""
 #~ msgid "Select Quantity"
 #~ msgstr "Selecione Quantidade"
 
+#~ msgid "Expected"
+#~ msgstr "Esperado"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "quantidade."
@@ -5772,6 +5677,10 @@ msgstr ""
 #~ "Nenhuma conta de entrada no estoque foi definida para o produto: \"%s\" (id: "
 #~ "%d)"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Separação interna"
+
 #, python-format
 #~ msgid ""
 #~ "You are moving %.2f %s products but only %.2f %s available in this lot."
@@ -6177,12 +6086,20 @@ msgstr ""
 #~ msgid "unknown"
 #~ msgstr "desconhecido"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "está agendado %s."
+
 #~ msgid "Last month"
 #~ msgstr "Mês passado"
 
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Separações Confirmadas"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "está aguardando."
+
 #, python-format
 #~ msgid ""
 #~ "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
@@ -6200,6 +6117,10 @@ msgstr ""
 #~ msgid "Expected Stock Variations"
 #~ msgstr "Variação de Estoque Esperada"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "está com situação Provisório."
+
 #~ msgid "Stock to be receive"
 #~ msgstr "Estoque a receber"
 
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 7dcf0c41e3a..d4b47d5a2bf 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:21+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -85,9 +85,10 @@ msgid "Upstream Traceability"
 msgstr "Trasabilitate in sus"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -126,8 +127,8 @@ msgid "Product Moves"
 msgstr "Miscari produs"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -155,7 +156,7 @@ msgstr ""
 "Stocului."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Cantitatea nu poate fi negativa."
@@ -208,18 +209,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Jurnal de stoc"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -276,7 +270,6 @@ msgid "Not Applicable"
 msgstr "Nu se aplica"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -324,7 +317,7 @@ msgid "Reference"
 msgstr "Referinta"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Produse de procesat"
@@ -354,7 +347,6 @@ msgid "_Validate"
 msgstr "_Valideaza"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -364,22 +356,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Avertizare!"
@@ -585,12 +577,12 @@ msgid "Location Type"
 msgstr "Tip Locatie"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Ciorna Inventare Fizice"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -626,7 +618,7 @@ msgid "Item Labels"
 msgstr "Etichete articol"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -742,9 +734,7 @@ msgid "Destination Address "
 msgstr "Adresa de Destinatie "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Primire"
 
@@ -817,21 +807,15 @@ msgstr "August"
 msgid "Packs"
 msgstr "Pachete"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Miscariel de stoc care sunt Disponibile (Gata de procesare)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "De făcut"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -887,7 +871,7 @@ msgstr ""
 "sunt procesate miscarile stocului."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -895,7 +879,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -922,7 +905,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Receptii Viitoare"
@@ -993,9 +976,9 @@ msgid "IT Suppliers"
 msgstr "Furnizori IT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Ciorna Inventare Fizice"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1004,7 +987,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Locatie de Tranzit pentru Transferurile intre Companii"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1017,9 +1000,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Miscare Automata"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Loturi de Productie Disponibile"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1027,7 +1010,7 @@ msgid "Change Product Quantity"
 msgstr "Schimba Cantitatea Produsului"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "P&L viitor"
@@ -1057,7 +1040,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1095,9 +1078,10 @@ msgid "Pickings already processed"
 msgstr "Ridicari deja procesate"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Luna Planificata"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1106,12 +1090,6 @@ msgstr "Luna Planificata"
 msgid "Journal"
 msgstr "Jurnal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "este programat %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1171,6 +1149,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1312,7 +1295,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1324,10 +1307,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Comanda de livrare"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1335,10 +1317,8 @@ msgid "Manual Operation"
 msgstr "Operatiune Manuala"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1350,7 +1330,7 @@ msgid "Supplier"
 msgstr "Furnizor"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1360,17 +1340,15 @@ msgstr ""
 "inregistrarile asociate in jurnal."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Data adoptata"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Miscariel de stoc care sunt Disponibile (Gata de procesare)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1535,13 +1513,7 @@ msgstr ""
 "este folosita metoda calcularii pretului mediu de cost)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "este in starea de ciorna."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1563,13 +1535,13 @@ msgid "To be refunded/invoiced"
 msgstr "De rambursat/facturat"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Puteti sterge doar miscari in starea ciorna."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1586,11 +1558,14 @@ msgid "Ready"
 msgstr "Pregatit(a)"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Vizualizare calendar"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Ciorna"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1603,11 +1578,10 @@ msgid "Additional Info"
 msgstr "Informatii suplimentare"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Miscare"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1646,10 +1620,11 @@ msgid "Internal Picking List"
 msgstr "Lista de Ridicare Interna"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "In asteptare"
 
 #. module: stock
 #: view:stock.move:0
@@ -1663,9 +1638,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Estimat"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Depozit"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1710,18 +1692,6 @@ msgstr "Id Linie Inventar"
 msgid "Address of  customer or supplier."
 msgstr "Adresa clientului sau a furnizorului."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1786,7 +1756,7 @@ msgid "Order Date"
 msgstr "Data comenzii"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1826,7 +1796,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Factura Transport Stoc"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1872,10 +1842,9 @@ msgid "Stock Statistics"
 msgstr "Statistici Stoc"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Luna Planificata"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1975,12 +1944,6 @@ msgstr "Cont pentru Inventarul Stocului (Intrare)"
 msgid "Shelf 2"
 msgstr "Raft 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "este gata de procesare."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -2006,7 +1969,7 @@ msgid "Localization"
 msgstr "Localizare"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Cantitatea Livrata"
@@ -2078,7 +2041,6 @@ msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2097,7 +2059,7 @@ msgid "Location Stock"
 msgstr "Locatia Stocului"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2298,14 +2260,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "In asteptare"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Cantitatea primita"
@@ -2339,7 +2294,6 @@ msgstr "Importa Inventar"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nume"
@@ -2375,8 +2329,8 @@ msgid "Customer Locations"
 msgstr "Locatii Client"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2392,7 +2346,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2433,7 +2386,7 @@ msgid "Creation"
 msgstr "Creare"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2522,12 +2475,6 @@ msgstr "Locatii in lant"
 msgid "Inventory loss"
 msgstr "Pierdere la inventar"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Document"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2551,7 +2498,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2614,7 +2560,7 @@ msgid "Warehouse board"
 msgstr "Panou depozit"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Cantitatea viitoare"
@@ -2676,12 +2622,7 @@ msgid "Products"
 msgstr "Produse"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2721,7 +2662,7 @@ msgid "Outgoing Products"
 msgstr "Produse iesite"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2734,19 +2675,14 @@ msgid "Delay(Days)"
 msgstr "Intarziere(Zile)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Miscare"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Cantitate P&L"
@@ -2866,7 +2802,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2890,7 +2826,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2898,9 +2834,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2956,7 +2891,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2968,6 +2903,7 @@ msgstr "Estimare Nivel Stoc"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2978,13 +2914,13 @@ msgid "Stock Journal"
 msgstr "Jurnal de stoc"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Aprovizionare"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "ID-ul activ nu este setat in context"
@@ -3012,13 +2948,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Primire Produse"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Aprovizionare"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3046,7 +2988,7 @@ msgid "Date of Completion"
 msgstr "Data finalizarii"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3115,13 +3057,6 @@ msgstr "Stoc real"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3130,7 +3065,6 @@ msgstr "Data Reviziei"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3153,12 +3087,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Cantitate (UDV)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "in asteptare."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3169,29 +3097,6 @@ msgstr "Setati Disponibil"
 msgid "Contact Address :"
 msgstr "Adresa Contact:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3200,7 +3105,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3218,7 +3123,7 @@ msgid "Properties"
 msgstr "Proprietati"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Eroare, niciun partener!"
@@ -3307,13 +3212,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Referinta Inventar"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Ridicare interna"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3344,18 +3242,6 @@ msgstr "Procesare"
 msgid "Revision Name"
 msgstr "Nume revizie"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Depozit"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3382,7 +3268,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3429,7 +3315,7 @@ msgid "Date done"
 msgstr "Data efectuata"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3456,8 +3342,8 @@ msgstr "Nu e urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "De făcut"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3501,7 +3387,7 @@ msgid "Stock"
 msgstr "Stoc"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3567,7 +3453,7 @@ msgid "Assigned Internal Moves"
 msgstr "Miscari Interne Atribuite"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3740,11 +3626,6 @@ msgstr "Director"
 msgid "Internal Shippings"
 msgstr "Expedieri Interne"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3788,7 +3669,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Productii viitoare"
@@ -3883,12 +3764,6 @@ msgstr "Companie"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3900,9 +3775,27 @@ msgid "Lot Inventory"
 msgstr "Inventar Lot"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivul"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3947,7 +3840,6 @@ msgstr ""
 "fiecare produs"
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3969,16 +3861,16 @@ msgstr "Clienti care nu sunt europeni"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -4012,10 +3904,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Comenzi de Livrare Confirmate"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Ridicare"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4024,7 +3917,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Aceasta lista de ridicare nu necesita facturare."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4072,7 +3965,7 @@ msgstr ""
 "Inlantuita daca este Fixa."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4139,7 +4032,6 @@ msgstr ""
 "bunurile defecte/rabaturi."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4147,7 +4039,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4188,10 +4080,9 @@ msgid "Product Category"
 msgstr "Categoria Produsului"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " pentru "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4229,7 +4120,7 @@ msgstr ""
 "contul de intrare al stocului va fi debitat."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4248,7 +4139,7 @@ msgid "Chaining Journal"
 msgstr "Jurnal inlantuire"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Stoc insuficient, nu se poate face rezervarea produselor."
@@ -4269,12 +4160,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "este anulat."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4291,7 +4176,7 @@ msgstr ""
 "produs. Acesta nu are niciun efect asupra locatiilor interne."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Livrari Viitoare"
@@ -4314,7 +4199,7 @@ msgid "Auto Validate"
 msgstr "Valideaza Automat"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4331,9 +4216,9 @@ msgid "December"
 msgstr "Decembrie"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Loturi de Productie Disponibile"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Miscare Automata"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4410,12 +4295,18 @@ msgid "Invoiced"
 msgstr "Facturat"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informatii"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4469,14 +4360,11 @@ msgid "Internal"
 msgstr "Intern"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Ciorna"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Vizualizare calendar"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4504,13 +4392,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Doriti sa uniti aceste inventare ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Rafturi (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4536,7 +4429,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4569,23 +4462,11 @@ msgid "November"
 msgstr "Noiembrie"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Cantitate neplanificata"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4596,15 +4477,6 @@ msgstr "Companie in lant"
 msgid "Check Availability"
 msgstr "Verifica Disponibilitatea"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Ridicare"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4642,14 +4514,14 @@ msgid "Move History (parent moves)"
 msgstr "Istoric Miscari (miscari principale)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Stoc viitor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Eroare"
@@ -4804,6 +4676,7 @@ msgid "Real"
 msgstr "Real"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4849,7 +4722,7 @@ msgid "Location Content"
 msgstr "Continut Locatie"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Cantitatea produsa"
@@ -4880,12 +4753,6 @@ msgstr ""
 msgid "Production"
 msgstr "Productie"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "este gata."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4919,6 +4786,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -5006,7 +4878,7 @@ msgstr ""
 "si destinatie)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5123,6 +4995,10 @@ msgstr ""
 #~ msgid "Incoming Product"
 #~ msgstr "Intrare produs"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Document"
+
 #~ msgid "Dates"
 #~ msgstr "Date"
 
@@ -5142,10 +5018,21 @@ msgstr ""
 #~ msgid "Delivery Order:"
 #~ msgstr "Comandă livrare:"
 
+#~ msgid "Reason"
+#~ msgstr "Motivul"
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "este gata."
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "este anulat."
+
 #~ msgid "Destination Address"
 #~ msgstr "Adresă destinaţie"
 
@@ -5163,6 +5050,10 @@ msgstr ""
 #~ msgid "Outgoing Product"
 #~ msgstr "Ieșire produs"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "este programat %s."
+
 #~ msgid "Inventory Management"
 #~ msgstr "Gestiune inventar"
 
@@ -5482,6 +5373,10 @@ msgstr ""
 #~ msgid "Related Picking"
 #~ msgstr "Ridicari asociate"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " pentru "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Cantitatea care trebuie sa plece in pachetul actual"
 
@@ -5550,6 +5445,9 @@ msgstr ""
 #~ msgid "Product  '%s' is consumed with '%s' quantity."
 #~ msgstr "Produsul '%s' este epuizat cu '%s' cantitate."
 
+#~ msgid "Expected"
+#~ msgstr "Estimat"
+
 #, python-format
 #~ msgid ""
 #~ "There are no products to return (only lines in Done state and not fully "
@@ -5655,6 +5553,10 @@ msgstr ""
 #~ msgid "Incoming Products Delay"
 #~ msgstr "Întârziere primire produse"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "este gata de procesare."
+
 #~ msgid "Current year"
 #~ msgstr "Anul curent"
 
@@ -5846,6 +5748,14 @@ msgstr ""
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Ridicari Confirmate"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "in asteptare."
+
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Comanda de livrare"
+
 #, python-format
 #~ msgid ""
 #~ "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
@@ -5857,6 +5767,9 @@ msgstr ""
 #~ msgid "Lot number"
 #~ msgstr "Numar lot"
 
+#~ msgid "Date Done"
+#~ msgstr "Data adoptata"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Data Estimata a Transportului"
 
@@ -5866,6 +5779,10 @@ msgstr ""
 #~ msgid "Packing List:"
 #~ msgstr "Lista de Ambalare:"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "este in starea de ciorna."
+
 #~ msgid ""
 #~ "For the current product, this stock location will be used, instead of the "
 #~ "default one, as the source location for stock moves generated by production "
@@ -6037,6 +5954,10 @@ msgstr ""
 #~ msgid "Back Order"
 #~ msgstr "Comanda de rezerva"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Ridicare interna"
+
 #~ msgid "Address"
 #~ msgstr "Adresa"
 
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 79bde5bc78e..a7c83dcb43f 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-09-20 14:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:14+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -83,9 +83,10 @@ msgid "Upstream Traceability"
 msgstr "Отслеживание вверх"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -124,8 +125,8 @@ msgid "Product Moves"
 msgstr "Перемещения ТМЦ"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -150,7 +151,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Вы не можете произвести эту операцию с несколькими инвентаризациями."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Количество не может быть отрицательным"
@@ -203,18 +204,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Складской журнал"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -270,7 +264,6 @@ msgid "Not Applicable"
 msgstr "Неприменимо"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -318,7 +311,7 @@ msgid "Reference"
 msgstr "Ссылка"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "ТМЦ к обработке"
@@ -348,7 +341,6 @@ msgid "_Validate"
 msgstr "_Проверить"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -358,22 +350,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Внимание!"
@@ -579,12 +571,12 @@ msgid "Location Type"
 msgstr "Тип места хранения"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Черновик физической инвентаризации"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -620,7 +612,7 @@ msgid "Item Labels"
 msgstr "Метки изделия"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -736,9 +728,7 @@ msgid "Destination Address "
 msgstr "Адрес назначения "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Прием"
 
@@ -811,21 +801,15 @@ msgstr "Август"
 msgid "Packs"
 msgstr "Пакет"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Доступные для обработки перемещения"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Сделать"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -880,7 +864,7 @@ msgstr ""
 "который будут автоматически добавляться записи при обработке перемещений ТМЦ."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -888,7 +872,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -915,7 +898,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Будущие приходы"
@@ -986,9 +969,9 @@ msgid "IT Suppliers"
 msgstr "ИТ поставщики"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Черновик физической инвентаризации"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -997,7 +980,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Место транзита для перемещений между компаниями"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1010,9 +993,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Автоматическое перемещение"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Партии доступных ТМЦ"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1020,7 +1003,7 @@ msgid "Change Product Quantity"
 msgstr "Изменение количества ТМЦ"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Будущие п/у"
@@ -1050,7 +1033,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1088,9 +1071,10 @@ msgid "Pickings already processed"
 msgstr "Комплектование уже осуществлено"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Плановый месяц"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Валюта"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1099,12 +1083,6 @@ msgstr "Плановый месяц"
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "запланировано %s."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1164,6 +1142,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1305,7 +1288,7 @@ msgid "Author"
 msgstr "Автор"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1317,10 +1300,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Заказ доставки"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1328,10 +1310,8 @@ msgid "Manual Operation"
 msgstr "Ручное управление"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1343,7 +1323,7 @@ msgid "Supplier"
 msgstr "Поставщик"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1353,17 +1333,15 @@ msgstr ""
 "записи в журнале"
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Дата исполнения"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Доступные для обработки перемещения"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1527,13 +1505,7 @@ msgstr ""
 "используется средняя цена как метод учета себестоимости)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "в состоянии \"Черновик\""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1555,13 +1527,13 @@ msgid "To be refunded/invoiced"
 msgstr "Будет возвращено / выставлено в счете"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Вы можете удалить только черновик перемещения."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1578,11 +1550,14 @@ msgid "Ready"
 msgstr "Готово"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Вид календаря"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Черновик"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1595,11 +1570,10 @@ msgid "Additional Info"
 msgstr "Доп. инфо"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Перемещение"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1637,10 +1611,11 @@ msgid "Internal Picking List"
 msgstr "Внутренний комплектовочный лист"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Ожидание"
 
 #. module: stock
 #: view:stock.move:0
@@ -1654,9 +1629,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Ожидается"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Склад"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1701,18 +1683,6 @@ msgstr "Id позиции инвентаризации"
 msgid "Address of  customer or supplier."
 msgstr "Адрес заказчика или поставщика"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1776,7 +1746,7 @@ msgid "Order Date"
 msgstr "Дата заказа"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "ИНВ: %s"
@@ -1815,7 +1785,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Счёт по доставке"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1861,10 +1831,9 @@ msgid "Stock Statistics"
 msgstr "Статистика запасов"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Валюта"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Плановый месяц"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1964,12 +1933,6 @@ msgstr "Счёт оценки запаса (входяшего)"
 msgid "Shelf 2"
 msgstr "Полка 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "готов к обработке."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1995,7 +1958,7 @@ msgid "Localization"
 msgstr "Локализация"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Доставленое кол-во"
@@ -2066,7 +2029,6 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2085,7 +2047,7 @@ msgid "Location Stock"
 msgstr "Место хранения ТМЦ"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2286,14 +2248,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Ожидание"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Полученное кол-во"
@@ -2327,7 +2282,6 @@ msgstr "Импорт инвентаризации"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Название"
@@ -2363,8 +2317,8 @@ msgid "Customer Locations"
 msgstr "Места хранения заказчиков"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2380,7 +2334,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2421,7 +2374,7 @@ msgid "Creation"
 msgstr "Создание"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2511,12 +2464,6 @@ msgstr "Сцепленные места хранения"
 msgid "Inventory loss"
 msgstr "Потери при инвентаризации"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Документ"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2540,7 +2487,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2603,7 +2549,7 @@ msgid "Warehouse board"
 msgstr "Панель склада"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Будущее Кол-во"
@@ -2665,12 +2611,7 @@ msgid "Products"
 msgstr "Продукция"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2710,7 +2651,7 @@ msgid "Outgoing Products"
 msgstr "Исходящие ТМЦ"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2723,19 +2664,14 @@ msgid "Delay(Days)"
 msgstr "Задержка(дней)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Перемещение"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Кол-во п/у"
@@ -2853,7 +2789,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2877,7 +2813,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2885,9 +2821,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2943,7 +2878,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2955,6 +2890,7 @@ msgstr "Прогноз остатков ТМЦ"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2965,13 +2901,13 @@ msgid "Stock Journal"
 msgstr "Складской журнал"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Снабжение"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Действующий ID не задан в контексте"
@@ -2999,13 +2935,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Приход ТМЦ"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Снабжение"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3033,7 +2975,7 @@ msgid "Date of Completion"
 msgstr "Дата завершения"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3101,13 +3043,6 @@ msgstr "Доступные запасы"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3116,7 +3051,6 @@ msgstr "Дата ревизии"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Партия"
@@ -3139,12 +3073,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Количество(единицы продажи)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "ожидает."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3155,29 +3083,6 @@ msgstr "Установить в \"Доступно\""
 msgid "Contact Address :"
 msgstr "Адрес контакта :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3186,7 +3091,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3204,7 +3109,7 @@ msgid "Properties"
 msgstr "Свойства"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Ошибка, нет партнера !"
@@ -3295,13 +3200,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Описание инвентаризации"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Внутреннее комплектование"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3332,18 +3230,6 @@ msgstr "Обработать"
 msgid "Revision Name"
 msgstr "Название ревизии"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Склад"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3370,7 +3256,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3417,7 +3303,7 @@ msgid "Date done"
 msgstr "Дата выполнения"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3444,8 +3330,8 @@ msgstr "Не срочно"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Сделать"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3489,7 +3375,7 @@ msgid "Stock"
 msgstr "Запасы"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3555,7 +3441,7 @@ msgid "Assigned Internal Moves"
 msgstr "Назначенные внутренние перемещения"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3728,11 +3614,6 @@ msgstr "Менеджер"
 msgid "Internal Shippings"
 msgstr "Внутренние перевозки"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3776,7 +3657,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Будущие производства"
@@ -3871,12 +3752,6 @@ msgstr "Компания"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3888,9 +3763,27 @@ msgid "Lot Inventory"
 msgstr "Инвентаризация партии"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Причина"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3933,7 +3826,6 @@ msgstr ""
 "также можно установить непосредственно для каждого продукта."
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3955,16 +3847,16 @@ msgstr "Неевропейские заказчики"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3998,10 +3890,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Подтверждённые заказы доставки"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Комплектование"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4010,7 +3903,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Этот комплектовочный лист не требует выставления счета."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4058,7 +3951,7 @@ msgstr ""
 "\"Связанное место хранения, если определено\" этой же формы."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4125,7 +4018,6 @@ msgstr ""
 "бракованных/сломанных товаров."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4133,7 +4025,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4174,10 +4066,9 @@ msgid "Product Category"
 msgstr "Категория ТМЦ"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " для "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4215,7 +4106,7 @@ msgstr ""
 "кредитоваться, а счет исходящих ТМЦ  дебитоваться."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4234,7 +4125,7 @@ msgid "Chaining Journal"
 msgstr "Сцепленный журнал"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Не хватает остатка, нельзя зарезервировать ТМЦ."
@@ -4255,12 +4146,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "отменено."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4277,7 +4162,7 @@ msgstr ""
 "товаре. Это не оказывает влияния на внутренние места хранения."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Будущие доставки"
@@ -4300,7 +4185,7 @@ msgid "Auto Validate"
 msgstr "Автопроверка"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4317,9 +4202,9 @@ msgid "December"
 msgstr "Декабрь"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Партии доступных ТМЦ"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Автоматическое перемещение"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4396,12 +4281,18 @@ msgid "Invoiced"
 msgstr "Выставлен счет"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Информация"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4455,14 +4346,11 @@ msgid "Internal"
 msgstr "Внутренний"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Черновик"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Вид календаря"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4490,13 +4378,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Вы действительно хотите объединить эти инвентаризации ?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Полки (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4522,7 +4415,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4555,23 +4448,11 @@ msgid "November"
 msgstr "Ноябрь"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Незапланированное кол-во"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4582,15 +4463,6 @@ msgstr "Сцепленная компания"
 msgid "Check Availability"
 msgstr "Проверить доступность"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Комплектование"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4628,14 +4500,14 @@ msgid "Move History (parent moves)"
 msgstr "История перемещений (родительские перемещения)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Будущие остатки"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Ошибка"
@@ -4789,6 +4661,7 @@ msgid "Real"
 msgstr "Реально"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4834,7 +4707,7 @@ msgid "Location Content"
 msgstr "Содержимое места хранения"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Произведенное кол-во"
@@ -4865,12 +4738,6 @@ msgstr ""
 msgid "Production"
 msgstr "Производство"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "делается."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4904,6 +4771,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4991,7 +4863,7 @@ msgstr ""
 "исходного и целевого мест хранения)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5482,6 +5354,10 @@ msgstr ""
 #~ msgid "terp-calendar"
 #~ msgstr "terp-calendar"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "в состоянии \"Черновик\""
+
 #~ msgid "STOCK_MEDIA_RECORD"
 #~ msgstr "STOCK_MEDIA_RECORD"
 
@@ -5607,6 +5483,10 @@ msgstr ""
 #~ msgid "STOCK_HARDDISK"
 #~ msgstr "STOCK_HARDDISK"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Внутреннее комплектование"
+
 #~ msgid "Partial Picking"
 #~ msgstr "Частичное комплектование"
 
@@ -5689,6 +5569,9 @@ msgstr ""
 #~ msgid "Stock report by tracking lots"
 #~ msgstr "Отчет о ТМЦ по отслеживаемым партиям"
 
+#~ msgid "Date Done"
+#~ msgstr "Дата исполнения"
+
 #~ msgid "Destination Address"
 #~ msgstr "Адрес назначения"
 
@@ -5713,6 +5596,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "ТМЦ "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Документ"
+
 #, python-format
 #~ msgid "Could not find any difference between standard price and new price!"
 #~ msgstr "Не удалось найти разницу между стандартной и новой ценой !"
@@ -5812,6 +5699,9 @@ msgstr ""
 #~ msgid "STOCK_DISCONNECT"
 #~ msgstr "STOCK_DISCONNECT"
 
+#~ msgid "Expected"
+#~ msgstr "Ожидается"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "количество."
@@ -5857,6 +5747,9 @@ msgstr ""
 #~ msgid "Message !"
 #~ msgstr "Сообщение !"
 
+#~ msgid "Reason"
+#~ msgstr "Причина"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "Внимание"
@@ -5867,9 +5760,17 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PLAY"
 #~ msgstr "STOCK_MEDIA_PLAY"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "делается."
+
 #~ msgid "STOCK_NETWORK"
 #~ msgstr "STOCK_NETWORK"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " для "
+
 #~ msgid "STOCK_REDO"
 #~ msgstr "STOCK_REDO"
 
@@ -6291,6 +6192,10 @@ msgstr ""
 #~ msgid "INV: "
 #~ msgstr "ИНВ: "
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "готов к обработке."
+
 #, python-format
 #~ msgid "Can not consume a move with negative or zero quantity !"
 #~ msgstr ""
@@ -6343,6 +6248,10 @@ msgstr ""
 #~ msgid "unknown"
 #~ msgstr "неизвестно"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "запланировано %s."
+
 #, python-format
 #~ msgid ""
 #~ "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
@@ -6354,6 +6263,10 @@ msgstr ""
 #~ msgid "Last month"
 #~ msgstr "Последний месяц"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "ожидает."
+
 #~ msgid "Current year"
 #~ msgstr "Текущий год"
 
@@ -6446,6 +6359,10 @@ msgstr ""
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Подтверждённые комплектования"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Заказ доставки"
+
 #~ msgid "Packing List:"
 #~ msgstr "Упаковочный лист:"
 
@@ -6574,6 +6491,10 @@ msgstr ""
 #~ msgid "Stock available to be delivered"
 #~ msgstr "Запас доступный для доставки"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "отменено."
+
 #~ msgid ""
 #~ "* Draft: not confirmed yet and will not be scheduled until confirmed\n"
 #~ "* Confirmed: still waiting for the availability of products\n"
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 21b66600c1e..df4cf495111 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-18 21:43+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\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: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
@@ -79,10 +79,11 @@ msgid "Upstream Traceability"
 msgstr "Sledenje-navzgor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "Izdelki so bili <b>izdobavljeni</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "Premiki izdelka"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Vnesite pravilno količino"
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Ta postopek ne morete izvajati na več kot eni inventuri zaloge"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Količina ne sme biti negativna"
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr "Analiza obdobja"
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Dnevnik zaloge"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "Izdelki so  <b>prevzeti</b>"
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -266,7 +260,6 @@ msgid "Not Applicable"
 msgstr "Brezpredmetno"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -314,7 +307,7 @@ msgid "Reference"
 msgstr "Sklic"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -342,7 +335,6 @@ msgid "_Validate"
 msgstr "_Potrditev"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -352,22 +344,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Opozorilo!"
@@ -573,12 +565,12 @@ msgid "Location Type"
 msgstr "Vrsta lokacije"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "Lokacija & Skladišče"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -616,7 +608,7 @@ msgid "Item Labels"
 msgstr "Oznake izdelka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -732,9 +724,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Prevzem"
 
@@ -807,21 +797,15 @@ msgstr "Avgust"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr "Analiza trenutne zaloge"
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr "Ne morete odstraniti prevzema s statusom %s!"
+#: view:stock.move:0
+msgid "To Do"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -874,7 +858,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -882,7 +866,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -909,7 +892,7 @@ msgid "Time"
 msgstr "Čas"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -980,9 +963,9 @@ msgid "IT Suppliers"
 msgstr "Dobavitelji IT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr ""
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "Lokacija & Skladišče"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -991,7 +974,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1004,9 +987,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Samodejna knjižba"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1014,7 +997,7 @@ msgid "Change Product Quantity"
 msgstr "Spremeni količino"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1044,7 +1027,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Temu izdelku morate določiti serijsko številko."
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Prosim, določite dnevnik na skupini izdelkov: \"%s\" (id: %d)"
@@ -1082,9 +1065,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1093,12 +1077,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1155,6 +1133,11 @@ msgstr "Izdelek -Sklopi"
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1269,7 +1252,7 @@ msgid "Author"
 msgstr "Avtor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1281,10 +1264,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Dobavnica"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1292,10 +1274,8 @@ msgid "Manual Operation"
 msgstr "Ročno delovanje"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1307,7 +1287,7 @@ msgid "Supplier"
 msgstr "Dobavitelj"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1315,16 +1295,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Datum zaključka"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1479,13 +1457,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "ima status osnutek"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1507,13 +1479,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Lahko brišete samo osnutke premikov."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1530,11 +1502,14 @@ msgid "Ready"
 msgstr "Pripravljeno"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Pogled koledarja"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Osnutek"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1547,11 +1522,10 @@ msgid "Additional Info"
 msgstr "Dodatne informacije"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Premik"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1588,10 +1562,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Čakanje"
 
 #. module: stock
 #: view:stock.move:0
@@ -1605,9 +1580,16 @@ msgid "Delivery Slip"
 msgstr "Dobavnica"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Skladišče"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1647,18 +1629,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr "Naslov kupca oz. dobavitelja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr "%s je <b>ustvarjen</b>."
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr "%s je <b>potrjen</b>."
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1721,7 +1691,7 @@ msgid "Order Date"
 msgstr "Datum Naročila"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1759,7 +1729,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1805,10 +1775,9 @@ msgid "Stock Statistics"
 msgstr "Statistika zaloge"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1908,12 +1877,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1939,7 +1902,7 @@ msgid "Localization"
 msgstr "Lokalizacija"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Dobavljena količina"
@@ -2006,7 +1969,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2025,7 +1987,7 @@ msgid "Location Stock"
 msgstr "Lokacija zaloge"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2220,14 +2182,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Čakanje"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Prejeta količina"
@@ -2259,7 +2214,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Ime"
@@ -2295,8 +2249,8 @@ msgid "Customer Locations"
 msgstr "Lokacije kupca"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Napaka uporabnika!"
@@ -2312,7 +2266,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2350,7 +2303,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr "Prepovedana operacija !"
@@ -2436,12 +2389,6 @@ msgstr "Verižne lokacije"
 msgid "Inventory loss"
 msgstr "Primanjkljaj inventarja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Dokument"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2465,7 +2412,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2528,7 +2474,7 @@ msgid "Warehouse board"
 msgstr "Nadzorna plošča skladišča"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2590,12 +2536,7 @@ msgid "Products"
 msgstr "Proizvodi"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2635,7 +2576,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2648,19 +2589,14 @@ msgid "Delay(Days)"
 msgstr "Zamuda(dni)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Premik"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr "%s je <b>preklican</b>."
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2768,7 +2704,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2792,7 +2728,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2800,9 +2736,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2854,7 +2789,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr "Prosim zagotovite ustrezno količino."
@@ -2866,6 +2801,7 @@ msgstr "Predvideno stanje zaloge"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2876,13 +2812,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zaloge"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Nabava"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2910,13 +2846,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Prejem izdelkov"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2944,7 +2886,7 @@ msgid "Date of Completion"
 msgstr "Datum dokončanja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3011,13 +2953,6 @@ msgstr "Dejanska zaloga"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3026,7 +2961,6 @@ msgstr "Datum revizije"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3049,12 +2983,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Količina (Prodajna EM)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3065,29 +2993,6 @@ msgstr "Določi za razpoložljivo"
 msgid "Contact Address :"
 msgstr "Kontaktni naslov:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr "Serijska številka"
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3096,7 +3001,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3114,7 +3019,7 @@ msgid "Properties"
 msgstr "Lastnosti"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Napaka, manjka partner!"
@@ -3201,13 +3106,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3238,18 +3136,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Skladišče"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3276,7 +3162,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3323,7 +3209,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3348,7 +3234,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3393,7 +3279,7 @@ msgid "Stock"
 msgstr "Zaloga"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3459,7 +3345,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3632,11 +3518,6 @@ msgstr "Vodja"
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3680,7 +3561,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3775,12 +3656,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr "Enota mere izdelka"
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr "Dobavnica"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3792,9 +3667,27 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Vzrok"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr "Serijska številka"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3833,7 +3726,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3855,16 +3747,16 @@ msgstr "Ne evropske stranke"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3898,9 +3790,10 @@ msgid "Confirmed Delivery Orders"
 msgstr "Potrjene dobavnice"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3910,7 +3803,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3948,7 +3841,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4013,7 +3906,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4021,7 +3913,7 @@ msgid "Followers"
 msgstr "Sledilci"
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr "Količina ne sme biti 0 ali manj od 0"
@@ -4062,9 +3954,8 @@ msgid "Product Category"
 msgstr "Skupina izdelkov"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4098,7 +3989,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4117,7 +4008,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nezadostna količina izdelkov na zalogi, rezervacija ni možna."
@@ -4138,12 +4029,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "je preklican"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4155,7 +4040,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4178,7 +4063,7 @@ msgid "Auto Validate"
 msgstr "Samodejno preveri"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "Nezadostna zaloga za serijsko številko !"
@@ -4195,9 +4080,9 @@ msgid "December"
 msgstr "December"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Samodejna knjižba"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4271,12 +4156,18 @@ msgid "Invoiced"
 msgstr "Zaračunano"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacije"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr "Ne morete odstraniti prevzema s statusom %s!"
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4328,14 +4219,11 @@ msgid "Internal"
 msgstr "Notranji"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Osnutek"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Pogled koledarja"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4358,13 +4246,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4390,7 +4283,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4423,23 +4316,11 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr "Pripombe in e-pošta"
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4450,15 +4331,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Preveri razpoložljivost"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4496,14 +4368,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Napaka"
@@ -4652,6 +4524,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4697,7 +4570,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Proizvedena količina"
@@ -4728,12 +4601,6 @@ msgstr ""
 msgid "Production"
 msgstr "Proizvodnja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "je zaključeno"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4767,6 +4634,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4849,7 +4721,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5072,6 +4944,9 @@ msgstr "Naslov skladišča:"
 #~ msgid "STOCK_SELECT_FONT"
 #~ msgstr "STOCK_SELECT_FONT"
 
+#~ msgid "Date Done"
+#~ msgstr "Datum zaključka"
+
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
@@ -5417,8 +5292,85 @@ msgstr "Naslov skladišča:"
 #~ msgid "Products Sent"
 #~ msgstr "Poslani proizvod"
 
+#, python-format
+#~ msgid "No product in this location."
+#~ msgstr "Na tej lokaciji ni zaloge"
+
+#~ msgid "Date of Order"
+#~ msgstr "Datum naročila"
+
+#~ msgid "Process Now"
+#~ msgstr "Začni postopek"
+
 #~ msgid "Address of partner"
 #~ msgstr "Naslov partnerja"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Dobavnica"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Predvideni datum odpreme"
+
+#~ msgid "Lot number"
+#~ msgstr "Številka serije"
+
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "ima status osnutek"
+
+#, python-format
+#~ msgid "No Invoices were created"
+#~ msgstr "Računi niso bili kreirani"
+
+#, python-format
+#~ msgid "Please provide a positive quantity to scrap!"
+#~ msgstr "Prosim, vnesite pozitivno količino za odpis"
+
+#, python-format
+#~ msgid "were scrapped"
+#~ msgstr "so odpisani"
+
+#~ msgid "Production Lot Numbers"
+#~ msgstr "Številka proizvodne serije"
+
+#~ msgid "Warehouse Dashboard"
+#~ msgstr "Nadzorna pločša skladišča"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Delna dobava"
+
+#, python-format
+#~ msgid "Operation forbidden"
+#~ msgstr "Prepovedana operacija"
+
+#~ msgid "Order"
+#~ msgstr "Naročilo"
+
+#, python-format
+#~ msgid "is done."
+#~ msgstr "je zaključeno"
+
+#~ msgid "Additional info"
+#~ msgstr "Dodatne informacije"
+
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "je preklican"
+
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Reason"
+#~ msgstr "Vzrok"
+
+#~ msgid "Shipping Address :"
+#~ msgstr "Naslov za dostavo"
+
+#~ msgid "Select Quantity"
+#~ msgstr "Izberite količino"
+
+#~ msgid ""
+#~ "Create and manage your warehouses and assign them a location from here"
+#~ msgstr "Upravljanje skladišč"
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index ee597836784..09881b9380f 100644
--- a/addons/stock/i18n/sq.po
+++ b/addons/stock/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:05+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:12+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,10 +1497,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,9 +1557,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1600,8 +1575,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1642,18 +1624,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3767,12 +3648,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,8 +3659,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,8 +4072,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,13 +4211,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 3ca0f2ca9a9..d52eb3d5b70 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -148,7 +149,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -201,18 +202,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Dnevnik zaliha"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -269,7 +263,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -317,7 +310,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -347,7 +340,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -357,22 +349,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje !"
@@ -576,12 +568,12 @@ msgid "Location Type"
 msgstr "Tip lokacije"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -617,7 +609,7 @@ msgid "Item Labels"
 msgstr "Stavke"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -733,9 +725,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Prijem"
 
@@ -808,20 +798,14 @@ msgstr "Avgust"
 msgid "Packs"
 msgstr "Pakovanja"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -875,7 +859,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -883,7 +867,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -910,7 +893,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -981,8 +964,8 @@ msgid "IT Suppliers"
 msgstr "IT dobavljači"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -992,7 +975,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1005,9 +988,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatsko premeštanje"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1015,7 +998,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1045,7 +1028,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1083,8 +1066,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1094,12 +1078,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1156,6 +1134,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1270,7 +1253,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1282,9 +1265,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1293,10 +1275,8 @@ msgid "Manual Operation"
 msgstr "Manuelna operacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1308,7 +1288,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1316,16 +1296,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Datum završetka"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1480,13 +1458,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1508,13 +1480,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Možete da izbrišete isključivo nacrte premeštanja."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1531,11 +1503,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendarski pregled"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Nacrt"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1548,10 +1523,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1589,10 +1563,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Čekanje"
 
 #. module: stock
 #: view:stock.move:0
@@ -1606,9 +1581,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Skladište"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1648,18 +1630,6 @@ msgstr "Šifra stavke popisa"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1722,7 +1692,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1760,7 +1730,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1806,9 +1776,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1909,12 +1878,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1940,7 +1903,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Isporučena kol."
@@ -2007,7 +1970,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2026,7 +1988,7 @@ msgid "Location Stock"
 msgstr "Lokacija zaliha"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2223,14 +2185,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Čekanje"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Primljena kol."
@@ -2262,7 +2217,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Ime"
@@ -2298,8 +2252,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2315,7 +2269,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2353,7 +2306,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2439,12 +2392,6 @@ msgstr "Povezane lokacije"
 msgid "Inventory loss"
 msgstr "Popisni gubitak"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2468,7 +2415,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2531,7 +2477,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2593,12 +2539,7 @@ msgid "Products"
 msgstr "Proizvodi"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2638,7 +2579,7 @@ msgid "Outgoing Products"
 msgstr "Izlazni proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2651,19 +2592,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L kol."
@@ -2771,7 +2707,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2795,7 +2731,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2803,9 +2739,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2857,7 +2792,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2869,6 +2804,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2879,13 +2815,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zaliha"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2913,13 +2849,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2947,7 +2889,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3014,13 +2956,6 @@ msgstr "Realne zalihe"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3029,7 +2964,6 @@ msgstr "Datum revizije"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partija"
@@ -3052,12 +2986,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Količina (KOL)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3068,29 +2996,6 @@ msgstr "Postavi Dostupno"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3099,7 +3004,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3117,7 +3022,7 @@ msgid "Properties"
 msgstr "Osobine"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Greška, nema partnera!"
@@ -3201,13 +3106,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3238,18 +3136,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Naziv revizije"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Skladište"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3276,7 +3162,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3323,7 +3209,7 @@ msgid "Date done"
 msgstr "Datum završetka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3348,7 +3234,7 @@ msgstr "Nije hitno"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3393,7 +3279,7 @@ msgid "Stock"
 msgstr "Zalihe"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3459,7 +3345,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3632,11 +3518,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3680,7 +3561,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3775,12 +3656,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3792,8 +3667,26 @@ msgid "Lot Inventory"
 msgstr "Partija popisa"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3833,7 +3726,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3855,16 +3747,16 @@ msgstr "Kupci koji nisu iz Evrope"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3898,9 +3790,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3910,7 +3803,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3948,7 +3841,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4013,7 +3906,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4021,7 +3913,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4062,9 +3954,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4098,7 +3989,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4117,7 +4008,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4138,12 +4029,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4155,7 +4040,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4178,7 +4063,7 @@ msgid "Auto Validate"
 msgstr "Automatska provera"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4195,9 +4080,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatsko premeštanje"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4271,12 +4156,18 @@ msgid "Invoiced"
 msgstr "Račun"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacije"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4330,14 +4221,11 @@ msgid "Internal"
 msgstr "Interni"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Nacrt"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendarski pregled"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4360,13 +4248,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Da li želite da objedinite ove popise"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4392,7 +4285,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4425,23 +4318,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplanirana kol."
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4452,15 +4333,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Provera dostupnosti"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4498,14 +4370,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -4654,6 +4526,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4699,7 +4572,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Proizvedena kol."
@@ -4730,12 +4603,6 @@ msgstr ""
 msgid "Production"
 msgstr "Proizvodnja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4769,6 +4636,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4851,7 +4723,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5116,6 +4988,9 @@ msgstr ""
 #~ msgid "STOCK_SELECT_FONT"
 #~ msgstr "STOCK_SELECT_FONT"
 
+#~ msgid "Date Done"
+#~ msgstr "Datum završetka"
+
 #~ msgid "STOCK_EXECUTE"
 #~ msgstr "STOCK_EXECUTE"
 
diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po
index 40f915b9817..c0e77911adb 100644
--- a/addons/stock/i18n/sr@latin.po
+++ b/addons/stock/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -148,7 +149,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -201,18 +202,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Dnevnik zaliha"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -269,7 +263,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -317,7 +310,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -347,7 +340,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -357,22 +349,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje !"
@@ -576,12 +568,12 @@ msgid "Location Type"
 msgstr "Tip lokacije"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -617,7 +609,7 @@ msgid "Item Labels"
 msgstr "Stavke"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -733,9 +725,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Prijem"
 
@@ -808,20 +798,14 @@ msgstr "Avgust"
 msgid "Packs"
 msgstr "Pakovanja"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -875,7 +859,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -883,7 +867,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -910,7 +893,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -981,8 +964,8 @@ msgid "IT Suppliers"
 msgstr "IT dobavljači"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -992,7 +975,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1005,9 +988,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatsko premeštanje"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1015,7 +998,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1045,7 +1028,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1083,8 +1066,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1094,12 +1078,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1156,6 +1134,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1270,7 +1253,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1282,9 +1265,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1293,10 +1275,8 @@ msgid "Manual Operation"
 msgstr "Manuelna operacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1308,7 +1288,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1316,16 +1296,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Datum završetka"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1480,13 +1458,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1508,13 +1480,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Možete da izbrišete isključivo nacrte premeštanja."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1531,11 +1503,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendarski pregled"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Nacrt"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1548,10 +1523,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1589,10 +1563,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Čekanje"
 
 #. module: stock
 #: view:stock.move:0
@@ -1606,9 +1581,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Skladište"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1648,18 +1630,6 @@ msgstr "Šifra stavke popisa"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1722,7 +1692,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1760,7 +1730,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1806,9 +1776,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1909,12 +1878,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1940,7 +1903,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Isporučena kol."
@@ -2007,7 +1970,6 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2026,7 +1988,7 @@ msgid "Location Stock"
 msgstr "Lokacija zaliha"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2223,14 +2185,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Čekanje"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Primljena kol."
@@ -2262,7 +2217,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Ime"
@@ -2298,8 +2252,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2315,7 +2269,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2353,7 +2306,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2439,12 +2392,6 @@ msgstr "Povezane lokacije"
 msgid "Inventory loss"
 msgstr "Popisni gubitak"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2468,7 +2415,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2531,7 +2477,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2593,12 +2539,7 @@ msgid "Products"
 msgstr "Proizvodi"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2638,7 +2579,7 @@ msgid "Outgoing Products"
 msgstr "Izlazni proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2651,19 +2592,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L kol."
@@ -2771,7 +2707,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2795,7 +2731,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2803,9 +2739,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2857,7 +2792,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2869,6 +2804,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2879,13 +2815,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zaliha"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2913,13 +2849,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2947,7 +2889,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3014,13 +2956,6 @@ msgstr "Realne zalihe"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3029,7 +2964,6 @@ msgstr "Datum revizije"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Partija"
@@ -3052,12 +2986,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Količina (KOL)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3068,29 +2996,6 @@ msgstr "Postavi Dostupno"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3099,7 +3004,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3117,7 +3022,7 @@ msgid "Properties"
 msgstr "Osobine"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Greška, nema partnera!"
@@ -3201,13 +3106,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3238,18 +3136,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Naziv revizije"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Skladište"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3276,7 +3162,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3323,7 +3209,7 @@ msgid "Date done"
 msgstr "Datum završetka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3348,7 +3234,7 @@ msgstr "Nije hitno"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3393,7 +3279,7 @@ msgid "Stock"
 msgstr "Zalihe"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3459,7 +3345,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3632,11 +3518,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3680,7 +3561,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3775,12 +3656,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3792,8 +3667,26 @@ msgid "Lot Inventory"
 msgstr "Partija popisa"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3833,7 +3726,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3855,16 +3747,16 @@ msgstr "Kupci koji nisu iz Evrope"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3898,9 +3790,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3910,7 +3803,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3948,7 +3841,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4013,7 +3906,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4021,7 +3913,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4062,9 +3954,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4098,7 +3989,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4117,7 +4008,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4138,12 +4029,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4155,7 +4040,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4178,7 +4063,7 @@ msgid "Auto Validate"
 msgstr "Automatska provera"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4195,9 +4080,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatsko premeštanje"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4271,12 +4156,18 @@ msgid "Invoiced"
 msgstr "Račun"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacije"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4330,14 +4221,11 @@ msgid "Internal"
 msgstr "Interni"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Nacrt"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendarski pregled"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4360,13 +4248,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Da li želite da objedinite ove popise"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4392,7 +4285,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4425,23 +4318,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplanirana kol."
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4452,15 +4333,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Provera dostupnosti"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4498,14 +4370,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -4654,6 +4526,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4699,7 +4572,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Proizvedena kol."
@@ -4730,12 +4603,6 @@ msgstr ""
 msgid "Production"
 msgstr "Proizvodnja"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4769,6 +4636,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4851,7 +4723,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5038,6 +4910,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Datum završetka"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Očekivani datum isporuke"
 
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 72131db677b..4d80e9d5570 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:24+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -83,9 +83,10 @@ msgid "Upstream Traceability"
 msgstr "Uppströms spårbarhet"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -124,8 +125,8 @@ msgid "Product Moves"
 msgstr "Produktförflyttning"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -149,7 +150,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Antal kan inte vara negativ."
@@ -202,18 +203,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Lagerjournal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -268,7 +262,6 @@ msgid "Not Applicable"
 msgstr "Ej tillämpbart"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -316,7 +309,7 @@ msgid "Reference"
 msgstr "Referens"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Produkter att bearbeta"
@@ -346,7 +339,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -356,22 +348,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -577,12 +569,12 @@ msgid "Location Type"
 msgstr "Lagerställetyp"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -618,7 +610,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -734,9 +726,7 @@ msgid "Destination Address "
 msgstr "Destinationsadress "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Mottagning"
 
@@ -809,20 +799,14 @@ msgstr "augusti"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -876,7 +860,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -884,7 +868,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -911,7 +894,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Framtida mottagningar"
@@ -982,8 +965,8 @@ msgid "IT Suppliers"
 msgstr "IT leverantör"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -993,7 +976,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1006,9 +989,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatisk flytt"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Tillgängliga produktionspartier"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1016,7 +999,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Future P&L"
@@ -1046,7 +1029,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1084,9 +1067,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1095,12 +1079,6 @@ msgstr ""
 msgid "Journal"
 msgstr "Journal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1157,6 +1135,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1294,7 +1277,7 @@ msgid "Author"
 msgstr "Upphovsman"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1306,10 +1289,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Leveransorder"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1317,10 +1299,8 @@ msgid "Manual Operation"
 msgstr "Manuell åtgärd"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1332,7 +1312,7 @@ msgid "Supplier"
 msgstr "Leverantör"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1340,16 +1320,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1504,13 +1482,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1532,13 +1504,13 @@ msgid "To be refunded/invoiced"
 msgstr "Att få tillbaka / faktureras"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "You can only delete draft moves."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1555,11 +1527,14 @@ msgid "Ready"
 msgstr "Klar"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Kalendervy"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Utdrag"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1572,11 +1547,10 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Flytta"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1613,10 +1587,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Väntar"
 
 #. module: stock
 #: view:stock.move:0
@@ -1630,9 +1605,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Lager"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1672,18 +1654,6 @@ msgstr "Inventory Line Id"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1746,7 +1716,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1784,7 +1754,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1830,10 +1800,9 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1933,12 +1902,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1964,7 +1927,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Delivered Qty"
@@ -2031,7 +1994,6 @@ msgid "Date"
 msgstr "Date"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2050,7 +2012,7 @@ msgid "Location Stock"
 msgstr "Lagerställesaldo"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2247,14 +2209,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Väntar"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Received Qty"
@@ -2286,7 +2241,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Namn"
@@ -2322,8 +2276,8 @@ msgid "Customer Locations"
 msgstr "Kundplatser"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2339,7 +2293,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2377,7 +2330,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2463,12 +2416,6 @@ msgstr "Länkade lagerställen"
 msgid "Inventory loss"
 msgstr "Lagerförlust"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2492,7 +2439,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2555,7 +2501,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Future Qty"
@@ -2617,12 +2563,7 @@ msgid "Products"
 msgstr "Produkter"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2662,7 +2603,7 @@ msgid "Outgoing Products"
 msgstr "Utleverans"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2675,19 +2616,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Flytta"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L Qty"
@@ -2795,7 +2731,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2819,7 +2755,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2827,9 +2763,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2881,7 +2816,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2893,6 +2828,7 @@ msgstr "Lagersaldoprognos"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2903,13 +2839,13 @@ msgid "Stock Journal"
 msgstr "Stock Journal"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2937,13 +2873,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Ta emot produkter"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Procurement"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2971,7 +2913,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3038,13 +2980,6 @@ msgstr "Real Stock"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3053,7 +2988,6 @@ msgstr "Revision Date"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Parti"
@@ -3076,12 +3010,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Quantity (UOS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3092,29 +3020,6 @@ msgstr "Set Available"
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3123,7 +3028,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3141,7 +3046,7 @@ msgid "Properties"
 msgstr "Properties"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Error, no partner !"
@@ -3225,13 +3130,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3262,18 +3160,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr "Revision Name"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Lager"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3300,7 +3186,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3347,7 +3233,7 @@ msgid "Date done"
 msgstr "Date done"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3372,7 +3258,7 @@ msgstr "Not urgent"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3417,7 +3303,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3483,7 +3369,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3656,11 +3542,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3704,7 +3585,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Framtida produktioner"
@@ -3799,12 +3680,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3816,8 +3691,26 @@ msgid "Lot Inventory"
 msgstr "Partiinventering"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3857,7 +3750,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3879,16 +3771,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3922,9 +3814,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3934,7 +3827,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3972,7 +3865,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4037,7 +3930,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4045,7 +3937,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4086,9 +3978,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4122,7 +4013,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4141,7 +4032,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4162,12 +4053,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4179,7 +4064,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Framtida leveranser"
@@ -4202,7 +4087,7 @@ msgid "Auto Validate"
 msgstr "Auto Validate"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4219,9 +4104,9 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Tillgängliga produktionspartier"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatisk flytt"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4295,12 +4180,18 @@ msgid "Invoiced"
 msgstr "Fakturerad"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Information"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4354,14 +4245,11 @@ msgid "Internal"
 msgstr "Intern"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Utdrag"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Kalendervy"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4384,13 +4272,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Do you want to merge theses inventories?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Shelves (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4416,7 +4309,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4449,23 +4342,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Unplanned Qty"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4476,15 +4357,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Check Availability"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4522,14 +4394,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Framtida lager"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4678,6 +4550,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4723,7 +4596,7 @@ msgid "Location Content"
 msgstr "Innehåll lagerställe"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Produced Qty"
@@ -4754,12 +4627,6 @@ msgstr ""
 msgid "Production"
 msgstr "Produktion"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4793,6 +4660,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4875,7 +4747,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5141,6 +5013,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Date Done"
+
 #~ msgid "Tracking/Serial"
 #~ msgstr "Tracking/Serial"
 
@@ -5868,6 +5743,10 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fel: Felaktig EAN kod"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Leveransorder"
+
 #~ msgid "Current year"
 #~ msgstr "Detta år"
 
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index 46fd1bdb652..e855a9f3121 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-19 11:36+0000\n"
 "Last-Translator: Boonyong <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:07+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr "เคลื่อนย้ายสินค้า"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -146,7 +147,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -199,18 +200,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -265,7 +259,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -313,7 +306,7 @@ msgid "Reference"
 msgstr "ข้อมูลอ้างอิง"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -341,7 +334,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -351,22 +343,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -570,12 +562,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -611,7 +603,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -727,9 +719,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -802,20 +792,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -869,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -877,7 +861,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -904,7 +887,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -975,8 +958,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -986,7 +969,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -999,8 +982,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1009,7 +992,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1039,7 +1022,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1077,8 +1060,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1088,12 +1072,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1150,6 +1128,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1264,7 +1247,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1276,9 +1259,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1287,10 +1269,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1302,7 +1282,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1310,16 +1290,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1474,13 +1452,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1502,13 +1474,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1525,10 +1497,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1542,10 +1517,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1583,9 +1557,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1600,8 +1575,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1642,18 +1624,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1716,7 +1686,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1754,7 +1724,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1800,9 +1770,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1903,12 +1872,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1934,7 +1897,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2001,7 +1964,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2020,7 +1982,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2215,14 +2177,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2254,7 +2209,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2290,8 +2244,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2307,7 +2261,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2345,7 +2298,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2431,12 +2384,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2460,7 +2407,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2523,7 +2469,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2585,12 +2531,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2630,7 +2571,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2643,19 +2584,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2763,7 +2699,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2787,7 +2723,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2795,9 +2731,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2849,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2861,6 +2796,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2871,13 +2807,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2905,13 +2841,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2939,7 +2881,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3006,13 +2948,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3021,7 +2956,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3044,12 +2978,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3060,29 +2988,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3091,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3109,7 +3014,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3193,13 +3098,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3230,18 +3128,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3268,7 +3154,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3315,7 +3201,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3340,7 +3226,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3385,7 +3271,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3451,7 +3337,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3624,11 +3510,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3672,7 +3553,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3767,12 +3648,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3784,8 +3659,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3825,7 +3718,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3847,16 +3739,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3890,9 +3782,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3902,7 +3795,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3940,7 +3833,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4005,7 +3898,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4013,7 +3905,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4054,9 +3946,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4090,7 +3981,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4109,7 +4000,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4130,12 +4021,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4147,7 +4032,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4170,7 +4055,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4187,8 +4072,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4263,12 +4148,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4320,13 +4211,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4350,13 +4238,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4382,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4415,23 +4308,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4442,15 +4323,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4488,14 +4360,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4644,6 +4516,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4689,7 +4562,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4720,12 +4593,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4759,6 +4626,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4841,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index f453d0ac717..9b1e192889b 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,20 +791,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,8 +957,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,8 +981,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,8 +1059,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1149,6 +1127,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1263,7 +1246,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1275,9 +1258,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1286,10 +1268,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1301,7 +1281,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,16 +1289,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1473,13 +1451,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1501,13 +1473,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1524,10 +1496,13 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: stock
@@ -1541,10 +1516,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1582,9 +1556,10 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1599,8 +1574,15 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: stock
@@ -1641,18 +1623,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1715,7 +1685,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1753,7 +1723,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1799,9 +1769,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1902,12 +1871,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1933,7 +1896,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2000,7 +1963,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2019,7 +1981,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2214,14 +2176,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2253,7 +2208,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr ""
@@ -2289,8 +2243,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2306,7 +2260,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2344,7 +2297,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2430,12 +2383,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2459,7 +2406,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2522,7 +2468,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2584,12 +2530,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2629,7 +2570,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2642,19 +2583,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2762,7 +2698,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2786,7 +2722,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2794,9 +2730,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2848,7 +2783,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2860,6 +2795,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2870,13 +2806,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2904,13 +2840,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2938,7 +2880,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3005,13 +2947,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3020,7 +2955,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3043,12 +2977,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3059,29 +2987,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3090,7 +2995,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3108,7 +3013,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3192,13 +3097,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3229,18 +3127,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3267,7 +3153,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3314,7 +3200,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3339,7 +3225,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3384,7 +3270,7 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3450,7 +3336,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3623,11 +3509,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3671,7 +3552,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3766,12 +3647,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3783,8 +3658,26 @@ msgid "Lot Inventory"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3824,7 +3717,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3846,16 +3738,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3889,9 +3781,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3901,7 +3794,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3939,7 +3832,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4004,7 +3897,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4012,7 +3904,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4053,9 +3945,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4089,7 +3980,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4108,7 +3999,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4129,12 +4020,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4146,7 +4031,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4169,7 +4054,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4186,8 +4071,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4262,12 +4147,18 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4319,13 +4210,10 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
 msgstr ""
 
 #. module: stock
@@ -4349,13 +4237,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4381,7 +4274,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4414,23 +4307,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4441,15 +4322,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4487,14 +4359,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4643,6 +4515,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4688,7 +4561,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4719,12 +4592,6 @@ msgstr ""
 msgid "Production"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4758,6 +4625,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4840,7 +4712,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 6f6c616c290..3c21811038f 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -83,9 +83,10 @@ msgid "Upstream Traceability"
 msgstr "Üretime Dönük İzlenebilirlik"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -124,8 +125,8 @@ msgid "Product Moves"
 msgstr "Ürün Hareketleri"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -150,7 +151,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Bu işlemi birden fazla stok kalemi üzerinde uygulayamazsınız."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Miktar eksi olamaz"
@@ -203,18 +204,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Stok Defteri"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -271,7 +265,6 @@ msgid "Not Applicable"
 msgstr "Uygulanabilir Değil"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -319,7 +312,7 @@ msgid "Reference"
 msgstr "Kaynak"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "İşlenecek Ürünler"
@@ -349,7 +342,6 @@ msgid "_Validate"
 msgstr "Onayla"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -359,22 +351,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -580,12 +572,12 @@ msgid "Location Type"
 msgstr "Konum Tipi"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Fiziksel Taslak Envanterler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -621,7 +613,7 @@ msgid "Item Labels"
 msgstr "Öğe Etiketleri"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -737,9 +729,7 @@ msgid "Destination Address "
 msgstr "Varış Adresi "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "Kabul"
 
@@ -812,21 +802,15 @@ msgstr "Ağustos"
 msgid "Packs"
 msgstr "Paketler"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "Mevcut stok hareketleri (İşlenmeye hazır)"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Yapılacak İşlemler"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -882,7 +866,7 @@ msgstr ""
 "Defteridir."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -890,7 +874,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -917,7 +900,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Gelecek Kabuller"
@@ -988,9 +971,9 @@ msgid "IT Suppliers"
 msgstr "Bilişim Tedarikçileri"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Fiziksel Taslak Envanterler"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -999,7 +982,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ara Firma Transferleri için Geçiş Lokasyonu"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1012,9 +995,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Otomatik Hareket"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "Mevcut Ürün Partileri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1022,7 +1005,7 @@ msgid "Change Product Quantity"
 msgstr "Ürün Miktarını Değiştir"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Gelecek Kâr ve Zarar"
@@ -1052,7 +1035,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1090,9 +1073,10 @@ msgid "Pickings already processed"
 msgstr "Toplama zaten yürütülmüş"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "Planlanan Ay"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "Para birimi"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1101,12 +1085,6 @@ msgstr "Planlanan Ay"
 msgid "Journal"
 msgstr "Yevmiye"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "%s planlanmıştır."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1166,6 +1144,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1304,7 +1287,7 @@ msgid "Author"
 msgstr "Yazar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1316,10 +1299,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Teslim Emri"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1327,10 +1309,8 @@ msgid "Manual Operation"
 msgstr "Manuel İşlem"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1342,7 +1322,7 @@ msgid "Supplier"
 msgstr "Tedarikçi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1352,17 +1332,15 @@ msgstr ""
 "kaldırmalısınız."
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Bitiş Tarihi"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "Mevcut stok hareketleri (İşlenmeye hazır)"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1527,13 +1505,7 @@ msgstr ""
 "kullanılırken)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "taslak durumunda."
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1555,13 +1527,13 @@ msgid "To be refunded/invoiced"
 msgstr "İade edilecek/faturalandırılacak"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sadece taslak hareketlerini silebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1578,11 +1550,14 @@ msgid "Ready"
 msgstr "Hazır"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Takvimi Göster"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Taslak"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1595,11 +1570,10 @@ msgid "Additional Info"
 msgstr "Ek Bilgi"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "Hareket"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1638,10 +1612,11 @@ msgid "Internal Picking List"
 msgstr "Dahili Alım Listesi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Bekliyor"
 
 #. module: stock
 #: view:stock.move:0
@@ -1655,9 +1630,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Beklenen"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Depo"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1702,18 +1684,6 @@ msgstr "Envanter Kalem No"
 msgid "Address of  customer or supplier."
 msgstr "Müşteri veya tedarikçini adresi."
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1778,7 +1748,7 @@ msgid "Order Date"
 msgstr "Sipariş Tarihi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1817,7 +1787,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Sevkiyatta Stok Faturalandırma"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1863,10 +1833,9 @@ msgid "Stock Statistics"
 msgstr "Stok İstatistikleri"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "Para birimi"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "Planlanan Ay"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1966,12 +1935,6 @@ msgstr "Stok Değerleme Hesabı (Girenn)"
 msgid "Shelf 2"
 msgstr "Raf 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "işleme hazır."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1997,7 +1960,7 @@ msgid "Localization"
 msgstr "Lokalizasyon"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Teslim Edilen Miktar"
@@ -2067,7 +2030,6 @@ msgid "Date"
 msgstr "Tarih"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2086,7 +2048,7 @@ msgid "Location Stock"
 msgstr "Lokasyon Stoğu"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2286,14 +2248,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Bekliyor"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Alınan Miktar"
@@ -2327,7 +2282,6 @@ msgstr "Envanter Al"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Adı"
@@ -2363,8 +2317,8 @@ msgid "Customer Locations"
 msgstr "Müşteri Konumları"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2380,7 +2334,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2420,7 +2373,7 @@ msgid "Creation"
 msgstr "Oluşturma"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2509,12 +2462,6 @@ msgstr "Zincirlenmiş Lokasyon Bilgisi"
 msgid "Inventory loss"
 msgstr "Envanter kaybı"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Belge"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2538,7 +2485,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2601,7 +2547,7 @@ msgid "Warehouse board"
 msgstr "Depo değerlendirme panosu"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Gelecek Miktar"
@@ -2663,12 +2609,7 @@ msgid "Products"
 msgstr "Stok Kartları"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2708,7 +2649,7 @@ msgid "Outgoing Products"
 msgstr "Giden Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2721,19 +2662,14 @@ msgid "Delay(Days)"
 msgstr "Gecikme (Gün)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "Hareket"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Kâr ve Zarar Miktarı"
@@ -2851,7 +2787,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2875,7 +2811,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2883,9 +2819,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2941,7 +2876,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2953,6 +2888,7 @@ msgstr "Stok Seviyesi Tahmini"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2963,13 +2899,13 @@ msgid "Stock Journal"
 msgstr "Stok Defteri"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Satınalma"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktif Kimlik Bağlam bölümünde ayarlanmamış"
@@ -2997,13 +2933,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Ürünleri Al"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Satınalma"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -3031,7 +2973,7 @@ msgid "Date of Completion"
 msgstr "Tamamlama Tarihi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3099,13 +3041,6 @@ msgstr "Fiili Stok"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3114,7 +3049,6 @@ msgstr "Revizyon Tarihi"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3137,12 +3071,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Miktar (2.Br.)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "bekliyor."
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3153,29 +3081,6 @@ msgstr "Kullanılabilir Yap"
 msgid "Contact Address :"
 msgstr "İletişim Adresi:"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3184,7 +3089,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3202,7 +3107,7 @@ msgid "Properties"
 msgstr "Özellikler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Hata, hiç ortak yok!"
@@ -3291,13 +3196,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Envanter Referansı"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "Dahili alım"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3328,18 +3226,6 @@ msgstr "İşlem"
 msgid "Revision Name"
 msgstr "Revizyon Adı"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Depo"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3366,7 +3252,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3413,7 +3299,7 @@ msgid "Date done"
 msgstr "Tamamlanan Tarih"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3439,8 +3325,8 @@ msgstr "Acil Değil"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Yapılacak İşlemler"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3484,7 +3370,7 @@ msgid "Stock"
 msgstr "Stok"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3550,7 +3436,7 @@ msgid "Assigned Internal Moves"
 msgstr "Atanmış İç Hareketler"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3723,11 +3609,6 @@ msgstr "Yönetici"
 msgid "Internal Shippings"
 msgstr "Dahili Sevkiyatlar"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3771,7 +3652,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Sonraki Üretimler"
@@ -3866,12 +3747,6 @@ msgstr "Firma"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3883,9 +3758,27 @@ msgid "Lot Inventory"
 msgstr "Lot Envanteri"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Neden"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3924,7 +3817,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3946,16 +3838,16 @@ msgstr "Avrupalı Olmayan Müşteriler"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3989,10 +3881,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "Onaylanmış Teslimat Emirleri"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "Alım"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4001,7 +3894,7 @@ msgid "This picking list does not require invoicing."
 msgstr "Bu alım listesi faturalandırma gerektirmez."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -4048,7 +3941,7 @@ msgstr ""
 "olması durumunda Zincirlenen Lokasyon."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4115,7 +4008,6 @@ msgstr ""
 "kullanılmasına izin vermek üzere bu kutuyu işaretleyin."
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4123,7 +4015,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4164,10 +4056,9 @@ msgid "Product Category"
 msgstr "Ürün Kategorisi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " için "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4204,7 +4095,7 @@ msgstr ""
 "giriş hesabı borçlandırılacaktır."
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4223,7 +4114,7 @@ msgid "Chaining Journal"
 msgstr "Zincirleme Defteri"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Yeterli stok yok, ürünler rezerve edilemiyor."
@@ -4244,12 +4135,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "iptal edildi."
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4266,7 +4151,7 @@ msgstr ""
 "olmayacaktır."
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Sonraki Teslimatlar"
@@ -4289,7 +4174,7 @@ msgid "Auto Validate"
 msgstr "Otomatik Onaylama"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4306,9 +4191,9 @@ msgid "December"
 msgstr "Aralık"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "Mevcut Ürün Partileri"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Otomatik Hareket"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4385,12 +4270,18 @@ msgid "Invoiced"
 msgstr "Faturalandı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Bilgi"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4444,14 +4335,11 @@ msgid "Internal"
 msgstr "Dahili"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Taslak"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Takvimi Göster"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4479,13 +4367,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Bu envanterleri birleştirmek istiyor musunuz?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Raflar (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4511,7 +4404,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4544,23 +4437,11 @@ msgid "November"
 msgstr "Kasım"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Planlanmayan Miktar"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4571,15 +4452,6 @@ msgstr "Zincirlenen Firma"
 msgid "Check Availability"
 msgstr "Kullanılırlığını Kontrol Et"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "Alım"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4617,14 +4489,14 @@ msgid "Move History (parent moves)"
 msgstr "Hareket Geçmşi (üst hareketler)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Sonraki Stok"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Hata"
@@ -4773,6 +4645,7 @@ msgid "Real"
 msgstr "Gerçek"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4818,7 +4691,7 @@ msgid "Location Content"
 msgstr "Lokasyon İçeriği"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Üretilen Miktar"
@@ -4849,12 +4722,6 @@ msgstr ""
 msgid "Production"
 msgstr "Üretim"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "yapıldı."
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4888,6 +4755,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4973,7 +4845,7 @@ msgstr ""
 "bırakın)."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5701,6 +5573,13 @@ msgstr ""
 #~ msgid "stock.move.memory.in"
 #~ msgstr "stok.hareket.hafıza.içeri"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Teslim Emri"
+
+#~ msgid "Date Done"
+#~ msgstr "Bitiş Tarihi"
+
 #~ msgid "Expected Shipping Date"
 #~ msgstr "Tahmini Yükleme Tarihi"
 
@@ -5887,6 +5766,10 @@ msgstr ""
 #~ "Bu üründe belirtilen Defter Giriş, Çıkış Hesabı oluşturulamıyor ve bu ürün "
 #~ "kategorisinde Varyant hesabı aynıdır."
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "taslak durumunda."
+
 #~ msgid ""
 #~ "This is the list of all your packs. When you select a Pack, you can get the "
 #~ "upstream or downstream traceability of the products contained in the pack."
@@ -6093,6 +5976,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Ürün "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Belge"
+
 #~ msgid "Input Picking List"
 #~ msgstr "Giriş Alım Listesi"
 
@@ -6226,6 +6113,10 @@ msgstr ""
 #~ msgid "Tracking prefix"
 #~ msgstr "Önek izleme"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "Dahili alım"
+
 #~ msgid "Open Product"
 #~ msgstr "Açık Ürün"
 
@@ -6297,6 +6188,9 @@ msgstr ""
 #~ msgid "Message !"
 #~ msgstr "Mesaj!"
 
+#~ msgid "Reason"
+#~ msgstr "Neden"
+
 #~ msgid "Delivery Order:"
 #~ msgstr "Teslimat Siparişi:"
 
@@ -6338,6 +6232,10 @@ msgstr ""
 #~ msgid "Warning"
 #~ msgstr "Uyarı"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "yapıldı."
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "Bu miktar, Varsayılan ürün birimi olarak ifade edilir."
 
@@ -6348,12 +6246,20 @@ msgstr ""
 #~ msgid "INV: "
 #~ msgstr "FAT: "
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " için "
+
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "Mevcut pakette bırakılacak miktar"
 
 #~ msgid "Existing Lots"
 #~ msgstr "Mevcut Lotlar"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "iptal edildi."
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "İşlem Belgesi"
@@ -6406,6 +6312,10 @@ msgstr ""
 #~ "Mevcut ürün için, satınalmalar tarafından oluşturulan stok hareketleri için "
 #~ "kaynak konum olarak, varsayılan yerine bu stok lokasyonu kullanılacaktır"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "işleme hazır."
+
 #~ msgid "Reference of the document that produced this picking."
 #~ msgstr "Bu alımı oluşturan belge referansı."
 
@@ -6458,6 +6368,9 @@ msgstr ""
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Bu ürün için bir üretim lotu atamanız gerekir"
 
+#~ msgid "Expected"
+#~ msgstr "Beklenen"
+
 #, python-format
 #~ msgid ""
 #~ "There are no products to return (only lines in Done state and not fully "
@@ -6504,6 +6417,10 @@ msgstr ""
 #~ msgid "Product  '%s' is consumed with '%s' quantity."
 #~ msgstr "'%s' ürünü '%s' kadar tüketilmiştir."
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "%s planlanmıştır."
+
 #, python-format
 #~ msgid "Inventory '%s' is done."
 #~ msgstr "'%s' stoğu yapılmıştır."
@@ -6553,6 +6470,10 @@ msgstr ""
 #~ msgid "Valuation Account is not specified for Product Category: %s"
 #~ msgstr "Değerleme Hesabının tanımlanmadığı Ürün Kategorisi: %s"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "bekliyor."
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "Onaylanmış Toplamalar"
 
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index ba16e5ca87a..ffe47ab2d9f 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-02-03 11:05+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Журнал запасів"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "Посилання"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr ""
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,20 +791,14 @@ msgstr ""
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
 msgstr ""
 
 #. module: stock
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,8 +957,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,8 +981,8 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
 msgstr ""
 
 #. module: stock
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,8 +1059,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1149,6 +1127,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1263,7 +1246,7 @@ msgid "Author"
 msgstr "Автор"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1275,9 +1258,8 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
 msgstr ""
 
 #. module: stock
@@ -1286,10 +1268,8 @@ msgid "Manual Operation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1301,7 +1281,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,16 +1289,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1473,13 +1451,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1501,13 +1473,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1524,11 +1496,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Чорновик"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1541,10 +1516,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1582,10 +1556,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Очікування"
 
 #. module: stock
 #: view:stock.move:0
@@ -1599,9 +1574,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Склад"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1641,18 +1623,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1715,7 +1685,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1753,7 +1723,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1799,9 +1769,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1902,12 +1871,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1933,7 +1896,7 @@ msgid "Localization"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -2000,7 +1963,6 @@ msgid "Date"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2019,7 +1981,7 @@ msgid "Location Stock"
 msgstr "Запаси місця"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2216,14 +2178,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Очікування"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -2255,7 +2210,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Назва"
@@ -2291,8 +2245,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2308,7 +2262,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2346,7 +2299,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2432,12 +2385,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2461,7 +2408,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2524,7 +2470,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2586,12 +2532,7 @@ msgid "Products"
 msgstr "Продукти"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2631,7 +2572,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2644,19 +2585,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2764,7 +2700,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2788,7 +2724,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2796,9 +2732,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2850,7 +2785,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2862,6 +2797,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2872,13 +2808,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Заготовка"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2906,13 +2842,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Заготовка"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2940,7 +2882,7 @@ msgid "Date of Completion"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3007,13 +2949,6 @@ msgstr ""
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3022,7 +2957,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr ""
@@ -3045,12 +2979,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Кількість (ОП)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3061,29 +2989,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3092,7 +2997,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3110,7 +3015,7 @@ msgid "Properties"
 msgstr "Властивості"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -3194,13 +3099,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3231,18 +3129,6 @@ msgstr ""
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Склад"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3269,7 +3155,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3316,7 +3202,7 @@ msgid "Date done"
 msgstr "Дата проведення"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3341,7 +3227,7 @@ msgstr "Нетерміновий"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
 msgstr ""
 
 #. module: stock
@@ -3386,7 +3272,7 @@ msgid "Stock"
 msgstr "Запаси"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3452,7 +3338,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3625,11 +3511,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3673,7 +3554,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -3768,12 +3649,6 @@ msgstr ""
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3785,8 +3660,26 @@ msgid "Lot Inventory"
 msgstr "Інвентаризація партії"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3826,7 +3719,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3848,16 +3740,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3891,9 +3783,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3903,7 +3796,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3941,7 +3834,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4006,7 +3899,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4014,7 +3906,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4055,9 +3947,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4091,7 +3982,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4110,7 +4001,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -4131,12 +4022,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4148,7 +4033,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -4171,7 +4056,7 @@ msgid "Auto Validate"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4188,8 +4073,8 @@ msgid "December"
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
@@ -4264,12 +4149,18 @@ msgid "Invoiced"
 msgstr "Виписано"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Інформація"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4323,14 +4214,11 @@ msgid "Internal"
 msgstr "Внутрішній"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Чорновик"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4353,13 +4241,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Позиція Y"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4385,7 +4278,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4418,23 +4311,11 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4445,15 +4326,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4491,14 +4363,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4647,6 +4519,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4692,7 +4565,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -4723,12 +4596,6 @@ msgstr ""
 msgid "Production"
 msgstr "Виробництво"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4762,6 +4629,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4844,7 +4716,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index e0852f5c3ad..81069faa1b2 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:13+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -80,9 +80,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -121,8 +122,8 @@ msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -147,7 +148,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -200,18 +201,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Stock journal"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -266,7 +260,6 @@ msgid "Not Applicable"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -314,7 +307,7 @@ msgid "Reference"
 msgstr "Reference"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Sản phẩm để xử lý"
@@ -342,7 +335,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -352,22 +344,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Cảnh báo!"
@@ -571,12 +563,12 @@ msgid "Location Type"
 msgstr "Loại Địa điểm"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -612,7 +604,7 @@ msgid "Item Labels"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -728,9 +720,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -803,21 +793,15 @@ msgstr "Tháng Tám"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "Cần thực hiện"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -870,7 +854,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -878,7 +862,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -905,7 +888,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Future Receptions"
@@ -976,8 +959,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -987,7 +970,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1000,9 +983,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1010,7 +993,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Future P&L"
@@ -1040,7 +1023,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1078,8 +1061,9 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
 msgstr ""
 
 #. module: stock
@@ -1089,12 +1073,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1151,6 +1129,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1265,7 +1248,7 @@ msgid "Author"
 msgstr "Tác giả"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1277,10 +1260,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "Yêu cầu Giao hàng"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1288,10 +1270,8 @@ msgid "Manual Operation"
 msgstr "Manual Operation"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1303,7 +1283,7 @@ msgid "Supplier"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1311,16 +1291,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1475,13 +1453,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1503,13 +1475,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "You can only delete draft moves."
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1526,11 +1498,14 @@ msgid "Ready"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "Dự thảo"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1543,10 +1518,9 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
 msgstr ""
 
 #. module: stock
@@ -1584,10 +1558,11 @@ msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "Waiting"
 
 #. module: stock
 #: view:stock.move:0
@@ -1601,9 +1576,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Kho hàng"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1643,18 +1625,6 @@ msgstr "Inventory Line Id"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1717,7 +1687,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1755,7 +1725,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1801,9 +1771,8 @@ msgid "Stock Statistics"
 msgstr "Thống kê hàng hóa"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
 msgstr ""
 
 #. module: stock
@@ -1904,12 +1873,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "sẵn sàng để xử lý."
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1935,7 +1898,7 @@ msgid "Localization"
 msgstr "Bản địa hóa"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Số lượng đã giao"
@@ -2002,7 +1965,6 @@ msgid "Date"
 msgstr "Ngày"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2021,7 +1983,7 @@ msgid "Location Stock"
 msgstr "Vị trí hàng hóa"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2218,14 +2180,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "Waiting"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Số lượng nhận vào"
@@ -2257,7 +2212,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Tên"
@@ -2293,8 +2247,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2310,7 +2264,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2348,7 +2301,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2434,12 +2387,6 @@ msgstr "Chained Locations"
 msgid "Inventory loss"
 msgstr "Inventory loss"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "Tài liệu"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2463,7 +2410,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2526,7 +2472,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Future Qty"
@@ -2588,12 +2534,7 @@ msgid "Products"
 msgstr "Products"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2633,7 +2574,7 @@ msgid "Outgoing Products"
 msgstr "Outgoing Products"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2646,19 +2587,14 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L Qty"
@@ -2766,7 +2702,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2790,7 +2726,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2798,9 +2734,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2852,7 +2787,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2864,6 +2799,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2874,13 +2810,13 @@ msgid "Stock Journal"
 msgstr "Stock Journal"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2908,13 +2844,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "Sản phẩm nhận được"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Procurement"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2942,7 +2884,7 @@ msgid "Date of Completion"
 msgstr "Ngày hoàn tất"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3009,13 +2951,6 @@ msgstr "Tồn kho thực tế"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3024,7 +2959,6 @@ msgstr "Revision Date"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lot"
@@ -3047,12 +2981,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Quantity (UOS)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3063,29 +2991,6 @@ msgstr "Set Available"
 msgid "Contact Address :"
 msgstr "Địa chỉ liên hệ :"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3094,7 +2999,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3112,7 +3017,7 @@ msgid "Properties"
 msgstr "Properties"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "Lỗi, không có đối tác !"
@@ -3196,13 +3101,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "Tham chiếu tồn kho"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3233,18 +3131,6 @@ msgstr "Xử lý"
 msgid "Revision Name"
 msgstr "Revision Name"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Kho hàng"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3271,7 +3157,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3318,7 +3204,7 @@ msgid "Date done"
 msgstr "Ngày hoàn tất"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3344,8 +3230,8 @@ msgstr "Không gấp"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "Cần thực hiện"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3389,7 +3275,7 @@ msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3455,7 +3341,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3628,11 +3514,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3676,7 +3557,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Future Productions"
@@ -3771,12 +3652,6 @@ msgstr "Công ty"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3788,8 +3663,26 @@ msgid "Lot Inventory"
 msgstr "Lot Inventory"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
 msgstr ""
 
 #. module: stock
@@ -3829,7 +3722,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3851,16 +3743,16 @@ msgstr ""
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3894,9 +3786,10 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -3906,7 +3799,7 @@ msgid "This picking list does not require invoicing."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3944,7 +3837,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4009,7 +3902,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4017,7 +3909,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4058,9 +3950,8 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4094,7 +3985,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4113,7 +4004,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Không đủ hàng, không thể đặt trước sản phẩm"
@@ -4134,12 +4025,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "được hủy"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4151,7 +4036,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Giao hàng tương lai"
@@ -4174,7 +4059,7 @@ msgid "Auto Validate"
 msgstr "Auto Validate"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4191,9 +4076,9 @@ msgid "December"
 msgstr "Tháng Mười hai"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Automatic Move"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4267,12 +4152,18 @@ msgid "Invoiced"
 msgstr "Đã ra hóa đơn"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Thông tin"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4326,14 +4217,11 @@ msgid "Internal"
 msgstr "Nội bộ"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "Dự thảo"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "Calendar View"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4356,13 +4244,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "Do you want to merge theses inventories?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "Shelves (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4388,7 +4281,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4421,23 +4314,11 @@ msgid "November"
 msgstr "Tháng Mười một"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Unplanned Qty"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4448,15 +4329,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr "Check Availability"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4494,14 +4366,14 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Future Stock"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Lỗi"
@@ -4650,6 +4522,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4695,7 +4568,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Số lượng sản xuất"
@@ -4726,12 +4599,6 @@ msgstr ""
 msgid "Production"
 msgstr "Production"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4765,6 +4632,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4847,7 +4719,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5131,6 +5003,9 @@ msgstr ""
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
+#~ msgid "Date Done"
+#~ msgstr "Date Done"
+
 #~ msgid "Tracking/Serial"
 #~ msgstr "Tracking/Serial"
 
@@ -5791,6 +5666,10 @@ msgstr ""
 #~ msgid "Warehouse Dashboard"
 #~ msgstr "Bảng điều khiển kho"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "được hủy"
+
 #, python-format
 #~ msgid "Process Document"
 #~ msgstr "Xử lý tài liệu"
@@ -5841,6 +5720,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Sản phẩm "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "Tài liệu"
+
 #~ msgid "Update"
 #~ msgstr "Cập nhật"
 
@@ -5853,3 +5736,11 @@ msgstr ""
 
 #~ msgid "Process Now"
 #~ msgstr "Xử lý bây giờ"
+
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "sẵn sàng để xử lý."
+
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "Yêu cầu Giao hàng"
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index d033265ab80..7cd916c0259 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-09 05:05+0000\n"
 "Last-Translator: sum1201 <Unknown>\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: 2012-12-10 04:37+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -82,10 +82,11 @@ msgid "Upstream Traceability"
 msgstr "向前追溯"
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
-msgstr "产品已<b>送货</db>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -123,8 +124,8 @@ msgid "Product Moves"
 msgstr "产品调拨"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "输入数量不正确"
@@ -148,7 +149,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "您不能在一个以上的库存盘点执行这操作。"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "数量不能为负"
@@ -201,18 +202,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "库存账簿"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr "产品已<b>收货</b>."
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -267,7 +261,6 @@ msgid "Not Applicable"
 msgstr "无效"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -315,7 +308,7 @@ msgid "Reference"
 msgstr "相关单号"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "待处理产品"
@@ -343,7 +336,6 @@ msgid "_Validate"
 msgstr "审核（_V）"
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -353,22 +345,22 @@ msgid ""
 msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "警告!"
@@ -572,12 +564,12 @@ msgid "Location Type"
 msgstr "库位类型"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
-msgstr "库位和仓库"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "实物盘点表草稿"
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -619,7 +611,7 @@ msgid "Item Labels"
 msgstr "标签"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "未交付清单<em>%s</em> 已经被 <b>创建</b>."
@@ -735,9 +727,7 @@ msgid "Destination Address "
 msgstr "目的地址 "
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr "收货"
 
@@ -810,21 +800,15 @@ msgstr "8月"
 msgid "Packs"
 msgstr "包装"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr "库存调拨可用（已准备好）"
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr "分析当前库存"
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr "不能删除 %s 状态的装箱单！"
+#: view:stock.move:0
+msgid "To Do"
+msgstr "待处理"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -877,7 +861,7 @@ msgid ""
 msgstr "在进行实时库存核算时，库存调拨处理将自动登入这账簿的明细里."
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -885,7 +869,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -912,7 +895,7 @@ msgid "Time"
 msgstr "时间"
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "未来的入库"
@@ -983,9 +966,9 @@ msgid "IT Suppliers"
 msgstr "IT供应商"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "实物盘点表草稿"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr "库位和仓库"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -994,7 +977,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "公司间转移的中途库位"
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1007,9 +990,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "自动调拨"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr "可用产品批次"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1017,7 +1000,7 @@ msgid "Change Product Quantity"
 msgstr "更改产品数量"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "未来的产品和库位"
@@ -1047,7 +1030,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1085,9 +1068,10 @@ msgid "Pickings already processed"
 msgstr "已处理的分拣"
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr "月计划"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "币别"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1096,12 +1080,6 @@ msgstr "月计划"
 msgid "Journal"
 msgstr "账簿"
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr "已计划安排 %s"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1158,6 +1136,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1280,7 +1263,7 @@ msgid "Author"
 msgstr "建立者"
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1292,10 +1275,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "送货单"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1303,10 +1285,8 @@ msgid "Manual Operation"
 msgstr "手动操作"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1318,7 +1298,7 @@ msgid "Supplier"
 msgstr "供应商"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1326,17 +1306,15 @@ msgid ""
 msgstr "为取消这个盘存，你必须要先取消相关的分录。"
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
-msgstr "完成日期"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
-msgstr ""
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "库存调拨可用（已准备好）"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1494,13 +1472,7 @@ msgid ""
 msgstr "用户在确认分拣时设置期间，字段用于记录产品的成本。（用于在计算成本的平均价格）"
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "处于草稿状态"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1522,13 +1494,13 @@ msgid "To be refunded/invoiced"
 msgstr "已开票或退票"
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "您只能删除草稿状态的调拨。"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1545,11 +1517,14 @@ msgid "Ready"
 msgstr "就绪"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "日历视图"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "草稿"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1562,11 +1537,10 @@ msgid "Additional Info"
 msgstr "附加信息"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "调拨"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1603,10 +1577,11 @@ msgid "Internal Picking List"
 msgstr "内部分拣单"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
-msgstr ""
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "正在等待"
 
 #. module: stock
 #: view:stock.move:0
@@ -1620,9 +1595,16 @@ msgid "Delivery Slip"
 msgstr "出库单"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "预期"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "仓库"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1664,18 +1646,6 @@ msgstr "盘点明细ID"
 msgid "Address of  customer or supplier."
 msgstr "客户或供应商地址"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1738,7 +1708,7 @@ msgid "Order Date"
 msgstr "订单日期"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "盘点:%s"
@@ -1776,7 +1746,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "发票未到"
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1822,10 +1792,9 @@ msgid "Stock Statistics"
 msgstr "库存统计"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "币别"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr "月计划"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1925,12 +1894,6 @@ msgstr "库存核算科目（入仓）"
 msgid "Shelf 2"
 msgstr "货架 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "准备过程"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1956,7 +1919,7 @@ msgid "Localization"
 msgstr "本地化"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "已配送数量"
@@ -2023,7 +1986,6 @@ msgid "Date"
 msgstr "日期"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2042,7 +2004,7 @@ msgid "Location Stock"
 msgstr "库位库存"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2237,14 +2199,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr "正在等待"
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "已接收数量"
@@ -2276,7 +2231,6 @@ msgstr "导入盘点"
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "名称"
@@ -2312,8 +2266,8 @@ msgid "Customer Locations"
 msgstr "客户库位"
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2329,7 +2283,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2367,7 +2320,7 @@ msgid "Creation"
 msgstr "创建"
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2453,12 +2406,6 @@ msgstr "连锁库位"
 msgid "Inventory loss"
 msgstr "盘点盈亏"
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "单据"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2482,7 +2429,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2545,7 +2491,7 @@ msgid "Warehouse board"
 msgstr "仓库控制台"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "未来数量"
@@ -2607,12 +2553,7 @@ msgid "Products"
 msgstr "产品"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2652,7 +2593,7 @@ msgid "Outgoing Products"
 msgstr "出仓产品"
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2665,19 +2606,14 @@ msgid "Delay(Days)"
 msgstr "延期（日）"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "调拨"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "损益数量"
@@ -2787,7 +2723,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2811,7 +2747,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2819,9 +2755,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2873,7 +2808,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2885,6 +2820,7 @@ msgstr "库存量预测"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2895,13 +2831,13 @@ msgid "Stock Journal"
 msgstr "库存账簿"
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "需求"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "上下文里没有设置活动ID"
@@ -2929,13 +2865,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "收货"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "需求"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2963,7 +2905,7 @@ msgid "Date of Completion"
 msgstr "完成日期"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3030,13 +2972,6 @@ msgstr "实际库存"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3045,7 +2980,6 @@ msgstr "修改日期"
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "批次"
@@ -3068,12 +3002,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "数量(销售单位)"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr "正等待"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3084,29 +3012,6 @@ msgstr "设为可用"
 msgid "Contact Address :"
 msgstr "联系地址："
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3115,7 +3020,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3133,7 +3038,7 @@ msgid "Properties"
 msgstr "属性"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "错误，无业务伙伴！"
@@ -3217,13 +3122,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr "盘点表单号"
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "内部分拣单"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3254,18 +3152,6 @@ msgstr "处理"
 msgid "Revision Name"
 msgstr "修订版名称"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "仓库"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3292,7 +3178,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3339,7 +3225,7 @@ msgid "Date done"
 msgstr "完成日期"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3364,8 +3250,8 @@ msgstr "不紧急"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "待处理"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3409,7 +3295,7 @@ msgid "Stock"
 msgstr "库存"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3475,7 +3361,7 @@ msgid "Assigned Internal Moves"
 msgstr "指定的内部调拨"
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3648,11 +3534,6 @@ msgstr "主管"
 msgid "Internal Shippings"
 msgstr "内部配送"
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3696,7 +3577,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "未来生产"
@@ -3791,12 +3672,6 @@ msgstr "公司"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3808,9 +3683,27 @@ msgid "Lot Inventory"
 msgstr "盘点批次"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "原因"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3850,7 +3743,6 @@ msgstr ""
 "在进行实时库存核算时，除非目标库位指定一个核算科目否则所有出库调拨账簿明细将记录到这科目。这是该产品类别的默认设置。它也可直接设定在每个产品上。"
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3872,16 +3764,16 @@ msgstr "非欧洲客户"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3915,10 +3807,11 @@ msgid "Confirmed Delivery Orders"
 msgstr "确认送货单"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "分拣"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3927,7 +3820,7 @@ msgid "This picking list does not require invoicing."
 msgstr "这分拣单不需要开发票。"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3970,7 +3863,7 @@ msgstr ""
 "  * 固定库位 : 如果连锁库位为固定."
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4035,7 +3928,6 @@ msgid ""
 msgstr "这选项允许这库位能不能放置废料"
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4043,7 +3935,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4084,10 +3976,9 @@ msgid "Product Category"
 msgstr "产品类别"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
-msgstr " 为了 "
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4122,7 +4013,7 @@ msgstr ""
 "如果成本价减少，库存核算科目为贷方，入库科目为借方。"
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4141,7 +4032,7 @@ msgid "Chaining Journal"
 msgstr "连锁库位账簿"
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "没足够的库存不能预订这产品"
@@ -4162,12 +4053,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "已取消"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4180,7 +4065,7 @@ msgstr ""
 "用于实时库存核算。当设定在一个虚拟库位（而不是内部类型）时，这科目将用于记录从内部库位调拨产品的估值。一般代替这产品的出库科目。它不影响内部库位。"
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "未来送货"
@@ -4203,7 +4088,7 @@ msgid "Auto Validate"
 msgstr "自动审核"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4220,9 +4105,9 @@ msgid "December"
 msgstr "12月"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr "可用产品批次"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "自动调拨"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4296,12 +4181,18 @@ msgid "Invoiced"
 msgstr "已开发票"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "信息"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr "不能删除 %s 状态的装箱单！"
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4353,14 +4244,11 @@ msgid "Internal"
 msgstr "内部"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "草稿"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "日历视图"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4388,13 +4276,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr "你真的要合并盘点?"
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "货架(Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4420,7 +4313,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4453,23 +4346,11 @@ msgid "November"
 msgstr "11月"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "计划外数量"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4480,15 +4361,6 @@ msgstr "连锁公司"
 msgid "Check Availability"
 msgstr "检查可用"
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "分拣"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4526,14 +4398,14 @@ msgid "Move History (parent moves)"
 msgstr "调拨日志(上级调拨)"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "未来库存"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "错误"
@@ -4682,6 +4554,7 @@ msgid "Real"
 msgstr "实际"
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4727,7 +4600,7 @@ msgid "Location Content"
 msgstr "库位包含"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "产品数量"
@@ -4758,12 +4631,6 @@ msgstr ""
 msgid "Production"
 msgstr "生产"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "已完成。"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4797,6 +4664,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4879,7 +4751,7 @@ msgid ""
 msgstr "分拣单的运送类型将包含连锁调拨(为空根据源和目标库位自动检测)"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -5109,6 +4981,9 @@ msgstr ""
 #~ msgid "STOCK_SELECT_FONT"
 #~ msgstr "STOCK_SELECT_FONT"
 
+#~ msgid "Date Done"
+#~ msgstr "完成日期"
+
 #~ msgid "STOCK_DIALOG_QUESTION"
 #~ msgstr "STOCK_DIALOG_QUESTION"
 
@@ -5822,6 +5697,14 @@ msgstr ""
 #~ msgid "stock.move.memory.in"
 #~ msgstr "stock.move.memory.in"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "送货单"
+
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "处于草稿状态"
+
 #~ msgid "Shop 1"
 #~ msgstr "门店 1"
 
@@ -5868,6 +5751,10 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "产品 "
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "单据"
+
 #~ msgid "Input Picking List"
 #~ msgstr "入库分拣单"
 
@@ -5895,6 +5782,10 @@ msgstr ""
 #~ "You are moving %.2f %s products but only %.2f %s available in this lot."
 #~ msgstr "您要调拨 %.2f 数量的 %s 产品，但是此批次中只有 %.2f %s"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "内部分拣单"
+
 #~ msgid "Open Product"
 #~ msgstr "打开产品信息"
 
@@ -5924,9 +5815,16 @@ msgstr ""
 #~ msgid "Moves for this production lot"
 #~ msgstr "此生产批次的调拨信息"
 
+#~ msgid "Reason"
+#~ msgstr "原因"
+
 #~ msgid "This quantity is expressed in the Default UoM of the product."
 #~ msgstr "数量使用产品的默认计量单位表示。"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "已完成。"
+
 #~ msgid "Reception:"
 #~ msgstr "收货："
 
@@ -5985,6 +5883,14 @@ msgstr ""
 #~ msgid "Quantity to leave in the current pack"
 #~ msgstr "在当前托盘里的数量"
 
+#, python-format
+#~ msgid " for the "
+#~ msgstr " 为了 "
+
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "已取消"
+
 #~ msgid "Products Moves"
 #~ msgstr "产品调拨"
 
@@ -5998,6 +5904,10 @@ msgstr ""
 #~ msgid "Please specify at least one non-zero quantity!"
 #~ msgstr "请指定一个不为0的数量!"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "准备过程"
+
 #, python-format
 #~ msgid ""
 #~ "Total quantity after split exceeds the quantity to split for this product: "
@@ -6021,6 +5931,9 @@ msgstr ""
 #~ msgid "Inventory '%s' is done."
 #~ msgstr "盘点  '%s'完成"
 
+#~ msgid "Expected"
+#~ msgstr "预期"
+
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "您必须为此产品赋予一个生产批次"
 
@@ -6388,9 +6301,17 @@ msgstr ""
 #~ msgid "Valuation Account is not specified for Product Category: %s"
 #~ msgstr "这产品类别: %s 未指定估价科目。"
 
+#, python-format
+#~ msgid "is scheduled %s."
+#~ msgstr "已计划安排 %s"
+
 #~ msgid "Confirmed Pickings"
 #~ msgstr "确认分拣"
 
+#, python-format
+#~ msgid "is waiting."
+#~ msgstr "正等待"
+
 #, python-format
 #~ msgid ""
 #~ "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 777137d383c..c3331a3636e 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-23 08:16+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-12-04 05:08+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -79,9 +79,10 @@ msgid "Upstream Traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
 msgstr ""
 
 #. module: stock
@@ -120,8 +121,8 @@ msgid "Product Moves"
 msgstr "產品調度"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr ""
@@ -145,7 +146,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr ""
@@ -198,18 +199,11 @@ msgid "Analyse a Period"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "庫存日誌"
 
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
@@ -264,7 +258,6 @@ msgid "Not Applicable"
 msgstr "不適用"
 
 #. module: stock
-#: help:stock.change.product.qty,message_unread:0
 #: help:stock.picking,message_unread:0
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
@@ -312,7 +305,7 @@ msgid "Reference"
 msgstr "參照"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr ""
@@ -340,7 +333,6 @@ msgid "_Validate"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_summary:0
 #: help:stock.picking,message_summary:0
 #: help:stock.picking.in,message_summary:0
 #: help:stock.picking.out,message_summary:0
@@ -350,22 +342,22 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -569,12 +561,12 @@ msgid "Location Type"
 msgstr "地點類別"
 
 #. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -610,7 +602,7 @@ msgid "Item Labels"
 msgstr "項目標籤"
 
 #. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -726,9 +718,7 @@ msgid "Destination Address "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1402
 #: field:product.product,reception_count:0
-#, python-format
 msgid "Reception"
 msgstr ""
 
@@ -801,21 +791,15 @@ msgstr "八月"
 msgid "Packs"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+#: view:stock.move:0
+msgid "To Do"
+msgstr "待辦"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -868,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -876,7 +860,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_summary:0
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
@@ -903,7 +886,7 @@ msgid "Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -974,8 +957,8 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
 msgstr ""
 
 #. module: stock
@@ -985,7 +968,7 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -998,9 +981,9 @@ msgid "Decimal precision on weight"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "自動調動"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1008,7 +991,7 @@ msgid "Change Product Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -1038,7 +1021,7 @@ msgid "You must assign a serial number for this product."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -1076,9 +1059,10 @@ msgid "Pickings already processed"
 msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
-msgstr ""
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "貨幣"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1087,12 +1071,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
@@ -1149,6 +1127,11 @@ msgstr ""
 msgid "Reverse Transfer"
 msgstr ""
 
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1263,7 +1246,7 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1275,10 +1258,9 @@ msgid "Internal Shipment :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
-msgstr "交貨單"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1286,10 +1268,8 @@ msgid "Manual Operation"
 msgstr "手動操作"
 
 #. module: stock
-#: code:addons/stock/stock.py:1427
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
-#, python-format
 msgid "Shipment"
 msgstr ""
 
@@ -1301,7 +1281,7 @@ msgid "Supplier"
 msgstr "供應商"
 
 #. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,16 +1289,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
 msgstr ""
 
 #. module: stock
@@ -1473,13 +1451,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr "尚在草案階段。"
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1501,13 +1473,13 @@ msgid "To be refunded/invoiced"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "只能刪除調動草案。"
 
 #. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1524,11 +1496,14 @@ msgid "Ready"
 msgstr "就緒"
 
 #. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
-msgstr "行事曆檢視"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr "草案"
 
 #. module: stock
 #: field:product.template,sale_delay:0
@@ -1541,11 +1516,10 @@ msgid "Additional Info"
 msgstr "附加資訊"
 
 #. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
-msgstr "調動"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1582,9 +1556,10 @@ msgid "Internal Picking List"
 msgstr "內部提貨清單"
 
 #. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
 msgstr ""
 
 #. module: stock
@@ -1599,9 +1574,16 @@ msgid "Delivery Slip"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "預期"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "倉庫"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1641,18 +1623,6 @@ msgstr ""
 msgid "Address of  customer or supplier."
 msgstr "客戶或供應商地址"
 
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1715,7 +1685,7 @@ msgid "Order Date"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr ""
@@ -1753,7 +1723,7 @@ msgid "Stock Invoice Onshipping"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1799,10 +1769,9 @@ msgid "Stock Statistics"
 msgstr "庫存統計"
 
 #. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
-msgstr "貨幣"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -1902,12 +1871,6 @@ msgstr ""
 msgid "Shelf 2"
 msgstr "貨架 2"
 
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr "可以處理"
-
 #. module: stock
 #: code:addons/stock/stock.py:529
 #, python-format
@@ -1933,7 +1896,7 @@ msgid "Localization"
 msgstr "本地化"
 
 #. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "交貨量"
@@ -2000,7 +1963,6 @@ msgid "Date"
 msgstr "日期"
 
 #. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
 #: field:stock.picking,message_is_follower:0
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
@@ -2019,7 +1981,7 @@ msgid "Location Stock"
 msgstr "地點庫存"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
 msgstr ""
@@ -2214,14 +2176,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "接收量"
@@ -2253,7 +2208,6 @@ msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
-#: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "名稱"
@@ -2289,8 +2243,8 @@ msgid "Customer Locations"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -2306,7 +2260,6 @@ msgid "Create Invoice/Refund"
 msgstr ""
 
 #. module: stock
-#: help:stock.change.product.qty,message_ids:0
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
@@ -2344,7 +2297,7 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
 msgstr ""
@@ -2430,12 +2383,6 @@ msgstr ""
 msgid "Inventory loss"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr "文件"
-
 #. module: stock
 #: view:stock.inventory:0
 #: field:stock.inventory.line.split,product_uom:0
@@ -2459,7 +2406,6 @@ msgid "Track serial number on products"
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_unread:0
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
@@ -2522,7 +2468,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2584,12 +2530,7 @@ msgid "Products"
 msgstr "產品"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2629,7 +2570,7 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2642,19 +2583,14 @@ msgid "Delay(Days)"
 msgstr "延遲（日）"
 
 #. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr "調動"
 
 #. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2762,7 +2698,7 @@ msgid "Support multiple variants per products  "
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2786,7 +2722,7 @@ msgid "scrap"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -2794,9 +2730,8 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
 msgstr ""
 
 #. module: stock
@@ -2848,7 +2783,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
 msgstr ""
@@ -2860,6 +2795,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
 #: field:stock.journal,name:0
@@ -2870,13 +2806,13 @@ msgid "Stock Journal"
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "採購"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2904,13 +2840,19 @@ msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
 #, python-format
 msgid "Receive Products"
 msgstr "接收產品"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "採購"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2938,7 +2880,7 @@ msgid "Date of Completion"
 msgstr "完成日期"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3005,13 +2947,6 @@ msgstr "真實庫存"
 msgid "Logistic Serial Number"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid ""
-"<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
@@ -3020,7 +2955,6 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
 #: report:stock.picking.list:0
 msgid "Lot"
 msgstr "批次"
@@ -3043,12 +2977,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "數量（量度單位）"
 
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3059,29 +2987,6 @@ msgstr ""
 msgid "Contact Address :"
 msgstr "聯絡人地址："
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
-#: report:stock.picking.list:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
 msgid ""
@@ -3090,7 +2995,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
 msgstr ""
@@ -3108,7 +3013,7 @@ msgid "Properties"
 msgstr "屬性"
 
 #. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "Error, no partner !"
 msgstr "錯誤，無伙伴！"
@@ -3192,13 +3097,6 @@ msgstr ""
 msgid "Inventory Reference"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr "內部提貨"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
 msgid ""
@@ -3229,18 +3127,6 @@ msgstr "處理程序"
 msgid "Revision Name"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "倉庫"
-
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
@@ -3267,7 +3153,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3314,7 +3200,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3339,8 +3225,8 @@ msgstr "不緊急"
 
 #. module: stock
 #: view:stock.move:0
-msgid "To Do"
-msgstr "待辦"
+msgid "Scheduled"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3384,7 +3270,7 @@ msgid "Stock"
 msgstr "庫存"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3450,7 +3336,7 @@ msgid "Assigned Internal Moves"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -3623,11 +3509,6 @@ msgstr ""
 msgid "Internal Shippings"
 msgstr ""
 
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
@@ -3671,7 +3552,7 @@ msgid "Inventory Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "未來生產"
@@ -3766,12 +3647,6 @@ msgstr "公司"
 msgid "Product Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "Put in current pack"
@@ -3783,9 +3658,27 @@ msgid "Lot Inventory"
 msgstr "批次存貨"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "原因"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3824,7 +3717,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_ids:0
 #: field:stock.picking,message_ids:0
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
@@ -3846,16 +3738,16 @@ msgstr "非歐洲客戶"
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3889,10 +3781,11 @@ msgid "Confirmed Delivery Orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
-msgstr ""
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr "提貨"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -3901,7 +3794,7 @@ msgid "This picking list does not require invoicing."
 msgstr "本次提貨無須發票"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
 #, python-format
 msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
@@ -3939,7 +3832,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4004,7 +3897,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
 #: field:stock.picking,message_follower_ids:0
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
@@ -4012,7 +3904,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4053,9 +3945,8 @@ msgid "Product Category"
 msgstr "產品分類"
 
 #. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial  Number"
 msgstr ""
 
 #. module: stock
@@ -4089,7 +3980,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4108,7 +3999,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "庫存不足，無法保留產品"
@@ -4129,12 +4020,6 @@ msgid ""
 "be done with care."
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr "已取消"
-
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
 msgid ""
@@ -4146,7 +4031,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "未來交貨"
@@ -4169,7 +4054,7 @@ msgid "Auto Validate"
 msgstr "自動檢驗"
 
 #. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4186,9 +4071,9 @@ msgid "December"
 msgstr "十二月"
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
-msgstr ""
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "自動調動"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -4262,12 +4147,18 @@ msgid "Invoiced"
 msgstr "已開發票"
 
 #. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "資訊"
 
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -4319,14 +4210,11 @@ msgid "Internal"
 msgstr "內部"
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
-msgstr "草案"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr "行事曆檢視"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -4354,13 +4242,18 @@ msgstr ""
 msgid "Do you want to merge theses inventories?"
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
 msgstr "貨架 (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4386,7 +4279,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4419,23 +4312,11 @@ msgid "November"
 msgstr "十一月"
 
 #. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "未計劃量"
 
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
@@ -4446,15 +4327,6 @@ msgstr ""
 msgid "Check Availability"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr "提貨"
-
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
@@ -4492,14 +4364,14 @@ msgid "Move History (parent moves)"
 msgstr "調動歷史（上級調動）"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "未來庫存"
 
 #. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "錯誤"
@@ -4648,6 +4520,7 @@ msgid "Real"
 msgstr ""
 
 #. module: stock
+#: field:stock.move,name:0
 #: report:stock.picking.list:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
@@ -4693,7 +4566,7 @@ msgid "Location Content"
 msgstr "地點內容"
 
 #. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "生產量"
@@ -4724,12 +4597,6 @@ msgstr ""
 msgid "Production"
 msgstr "生產"
 
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr "完成"
-
 #. module: stock
 #: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
@@ -4763,6 +4630,11 @@ msgid ""
 "            "
 msgstr ""
 
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
@@ -4845,7 +4717,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
 #, python-format
 msgid ""
 "The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
@@ -4935,6 +4807,10 @@ msgstr ""
 #~ msgid "Address of partner"
 #~ msgstr "伙伴地址"
 
+#, python-format
+#~ msgid "Delivery Order"
+#~ msgstr "交貨單"
+
 #~ msgid "Lot number"
 #~ msgstr "批次號"
 
@@ -4989,6 +4865,10 @@ msgstr ""
 #~ msgid "Update"
 #~ msgstr "更新"
 
+#, python-format
+#~ msgid "Document"
+#~ msgstr "文件"
+
 #~ msgid "Products "
 #~ msgstr "產品 "
 
@@ -5033,10 +4913,17 @@ msgstr ""
 #~ msgid "UserError"
 #~ msgstr "用戶錯誤"
 
+#~ msgid "Reason"
+#~ msgstr "原因"
+
 #, python-format
 #~ msgid "Warning"
 #~ msgstr "警告"
 
+#, python-format
+#~ msgid "is done."
+#~ msgstr "完成"
+
 #~ msgid "Reporting"
 #~ msgstr "報告"
 
@@ -5046,6 +4933,10 @@ msgstr ""
 #~ msgid "Additional info"
 #~ msgstr "附加資訊"
 
+#, python-format
+#~ msgid "is cancelled."
+#~ msgstr "已取消"
+
 #, python-format
 #~ msgid "You cannot cancel picking because stock move is in done state !"
 #~ msgstr "不能取消提貨，因庫存調動已處於完成狀態！"
@@ -5077,6 +4968,10 @@ msgstr ""
 #~ msgid "Related Picking"
 #~ msgstr "相關提貨"
 
+#, python-format
+#~ msgid "Internal picking"
+#~ msgstr "內部提貨"
+
 #~ msgid "Internal Picking list"
 #~ msgstr "內部提貨清單"
 
@@ -5105,6 +5000,10 @@ msgstr ""
 #~ msgid "Please specify at least one non-zero quantity!"
 #~ msgstr "請指定至少一個非零值！"
 
+#, python-format
+#~ msgid "is ready to process."
+#~ msgstr "可以處理"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "已安排"
@@ -5115,6 +5014,9 @@ msgstr ""
 #~ msgid "Select Quantity"
 #~ msgstr "選取數量"
 
+#~ msgid "Expected"
+#~ msgstr "預期"
+
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "數量"
@@ -5176,6 +5078,10 @@ msgstr ""
 #~ "  完成提貨後狀態為「完成(Done)」。              \n"
 #~ "如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
 
+#, python-format
+#~ msgid "is in draft state."
+#~ msgstr "尚在草案階段。"
+
 #~ msgid "You try to assign a lot which is not from the same product"
 #~ msgstr "指定了不同產品的批次"
 
diff --git a/addons/stock_invoice_directly/i18n/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index 8071df0e7c5..864b3f61c48 100644
--- a/addons/stock_invoice_directly/i18n/ar.po
+++ b/addons/stock_invoice_directly/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:57+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/bg.po b/addons/stock_invoice_directly/i18n/bg.po
index 1305d1a7d85..26530c0a94f 100644
--- a/addons/stock_invoice_directly/i18n/bg.po
+++ b/addons/stock_invoice_directly/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 14:46+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/bs.po b/addons/stock_invoice_directly/i18n/bs.po
index 5ad430c6eca..73ca647fea8 100644
--- a/addons/stock_invoice_directly/i18n/bs.po
+++ b/addons/stock_invoice_directly/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:57+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ca.po b/addons/stock_invoice_directly/i18n/ca.po
index 00d71338ca6..f98153e64cd 100644
--- a/addons/stock_invoice_directly/i18n/ca.po
+++ b/addons/stock_invoice_directly/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:54+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/cs.po b/addons/stock_invoice_directly/i18n/cs.po
index db875303cdb..0dc5371c85d 100644
--- a/addons/stock_invoice_directly/i18n/cs.po
+++ b/addons/stock_invoice_directly/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-06 04:48+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index 6dd3586b5bf..7f4ead354c8 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-08 11:51+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index 88dad89317d..8b5667f29fa 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-13 18:19+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index 217fd73c9f7..ffcbf438395 100644
--- a/addons/stock_invoice_directly/i18n/el.po
+++ b/addons/stock_invoice_directly/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 15:49+0000\n"
 "Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index 5e019be7e57..bdcc6339741 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-28 07:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index 591155cc0d9..0d005b3fbc1 100644
--- a/addons/stock_invoice_directly/i18n/es_AR.po
+++ b/addons/stock_invoice_directly/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-20 21:37+0000\n"
 "Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_CL.po b/addons/stock_invoice_directly/i18n/es_CL.po
index 7f188bbb5ff..7ca6d3bf979 100644
--- a/addons/stock_invoice_directly/i18n/es_CL.po
+++ b/addons/stock_invoice_directly/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-18 19:16+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_CR.po b/addons/stock_invoice_directly/i18n/es_CR.po
index 7f80d4cf14a..e21d8460773 100644
--- a/addons/stock_invoice_directly/i18n/es_CR.po
+++ b/addons/stock_invoice_directly/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-20 03:33+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index 026c56913b1..eef79eec5d8 100644
--- a/addons/stock_invoice_directly/i18n/et.po
+++ b/addons/stock_invoice_directly/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 20:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/fi.po b/addons/stock_invoice_directly/i18n/fi.po
index ebf2649be1c..3f4bb4bd8c3 100644
--- a/addons/stock_invoice_directly/i18n/fi.po
+++ b/addons/stock_invoice_directly/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-24 10:05+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index d1ebd3e25a8..6b58acf173f 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 01:06+0000\n"
 "Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/gl.po b/addons/stock_invoice_directly/i18n/gl.po
index 8f09d07dc5c..968af778345 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: stock-invoice-directly-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-08-17 08:30+0000\n"
 "Last-Translator: Frco. Javier Rial <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index 047b5a6d46d..2282ee31f6d 100644
--- a/addons/stock_invoice_directly/i18n/hr.po
+++ b/addons/stock_invoice_directly/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-28 21:59+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/hu.po b/addons/stock_invoice_directly/i18n/hu.po
index 70124f6c07b..53bc6bd6f3f 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-24 16:38+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/id.po b/addons/stock_invoice_directly/i18n/id.po
index af2ee4d9c5a..1a72b88e6c4 100644
--- a/addons/stock_invoice_directly/i18n/id.po
+++ b/addons/stock_invoice_directly/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-07 03:43+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index 7f1a4aebe9f..20527fb6ebd 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-03 20:58+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ja.po b/addons/stock_invoice_directly/i18n/ja.po
index 3c061d6dbdb..29043d31f57 100644
--- a/addons/stock_invoice_directly/i18n/ja.po
+++ b/addons/stock_invoice_directly/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-21 21:30+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index 00da68c018f..08b17e1b17e 100644
--- a/addons/stock_invoice_directly/i18n/ko.po
+++ b/addons/stock_invoice_directly/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 16:15+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/lt.po b/addons/stock_invoice_directly/i18n/lt.po
index a650b2013fd..284e554c186 100644
--- a/addons/stock_invoice_directly/i18n/lt.po
+++ b/addons/stock_invoice_directly/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/lv.po b/addons/stock_invoice_directly/i18n/lv.po
index 0507698d9a8..fa96a7ae386 100644
--- a/addons/stock_invoice_directly/i18n/lv.po
+++ b/addons/stock_invoice_directly/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-21 14:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/mk.po b/addons/stock_invoice_directly/i18n/mk.po
index 3345dcf7864..b4b94cbe2b4 100644
--- a/addons/stock_invoice_directly/i18n/mk.po
+++ b/addons/stock_invoice_directly/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-23 11:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/mn.po b/addons/stock_invoice_directly/i18n/mn.po
index dac110cf1a9..a1bd866b32f 100644
--- a/addons/stock_invoice_directly/i18n/mn.po
+++ b/addons/stock_invoice_directly/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-21 12:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nb.po b/addons/stock_invoice_directly/i18n/nb.po
index 4086cef1816..37ca92f8fa4 100644
--- a/addons/stock_invoice_directly/i18n/nb.po
+++ b/addons/stock_invoice_directly/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-24 20:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nl.po b/addons/stock_invoice_directly/i18n/nl.po
index ecd43ed4088..47a76bcf4dd 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-09 07:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nl_BE.po b/addons/stock_invoice_directly/i18n/nl_BE.po
index b303689ee47..a64a00e2736 100644
--- a/addons/stock_invoice_directly/i18n/nl_BE.po
+++ b/addons/stock_invoice_directly/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-24 15:43+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/oc.po b/addons/stock_invoice_directly/i18n/oc.po
index 60565a3feed..09526fb0daa 100644
--- a/addons/stock_invoice_directly/i18n/oc.po
+++ b/addons/stock_invoice_directly/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-20 09:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 2bff5e3ea05..a6a60d43850 100644
--- a/addons/stock_invoice_directly/i18n/pl.po
+++ b/addons/stock_invoice_directly/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:28+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pt.po b/addons/stock_invoice_directly/i18n/pt.po
index d920d8e2d5c..9fa6d6967db 100644
--- a/addons/stock_invoice_directly/i18n/pt.po
+++ b/addons/stock_invoice_directly/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-26 23:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index 4a6fbc3599b..e761ba28364 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-14 16:41+0000\n"
 "Last-Translator: Emerson <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index cd7a8f86791..a2cc4688fc3 100644
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-24 12:00+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index 289e7ece337..ad97119645c 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-18 08:08+0000\n"
 "Last-Translator: Ivan Baz <freeExec@mail.ru>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index 844d9ca3433..2c5086dee12 100644
--- a/addons/stock_invoice_directly/i18n/sl.po
+++ b/addons/stock_invoice_directly/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-25 11:27+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sq.po b/addons/stock_invoice_directly/i18n/sq.po
index f0e6e795964..38e3a2f289a 100644
--- a/addons/stock_invoice_directly/i18n/sq.po
+++ b/addons/stock_invoice_directly/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sr.po b/addons/stock_invoice_directly/i18n/sr.po
index dcf6a8b5de3..322b9bffdcc 100644
--- a/addons/stock_invoice_directly/i18n/sr.po
+++ b/addons/stock_invoice_directly/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-29 06:34+0000\n"
 "Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sr@latin.po b/addons/stock_invoice_directly/i18n/sr@latin.po
index 7322c5d8fe3..cd346377cd6 100644
--- a/addons/stock_invoice_directly/i18n/sr@latin.po
+++ b/addons/stock_invoice_directly/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-17 13:55+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index 453f3fe29ca..0168691dfc1 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-22 20:07+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index d0de5eee584..a24d50646ea 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:21+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/uk.po b/addons/stock_invoice_directly/i18n/uk.po
index a94f1c964a5..30ac50e139b 100644
--- a/addons/stock_invoice_directly/i18n/uk.po
+++ b/addons/stock_invoice_directly/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/vi.po b/addons/stock_invoice_directly/i18n/vi.po
index 43927e681bf..08a777b5067 100644
--- a/addons/stock_invoice_directly/i18n/vi.po
+++ b/addons/stock_invoice_directly/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index ee4557de6b5..f48242de9bf 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-08 03:36+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/zh_TW.po b/addons/stock_invoice_directly/i18n/zh_TW.po
index a650b2013fd..284e554c186 100644
--- a/addons/stock_invoice_directly/i18n/zh_TW.po
+++ b/addons/stock_invoice_directly/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po
index e73dbd4b9f0..4a6777318b0 100644
--- a/addons/stock_location/i18n/ar.po
+++ b/addons/stock_location/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -304,6 +304,16 @@ msgstr ""
 "التحرك بالنسبة للمشتريات المسحوبة تأتي من المكان الاصلي %s, قاعدة السحب %s, "
 "عبر المشترى الاصلي %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po
index 81a497b39fe..240939f5533 100644
--- a/addons/stock_location/i18n/bg.po
+++ b/addons/stock_location/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 15:00+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -299,6 +299,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po
index 32539f929c5..77d43097932 100644
--- a/addons/stock_location/i18n/bs.po
+++ b/addons/stock_location/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:15+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -299,6 +299,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index 49a152c598c..8a6db0243cb 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/i18n/ca.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-12 05:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -313,6 +313,16 @@ msgstr ""
 "Moviment per a proveïment arrossegat provinent de la ubicació original %s, "
 "regla d'arrossegament %s, via proveïment original %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index 11159935c67..b7af4c7f500 100644
--- a/addons/stock_location/i18n/cs.po
+++ b/addons/stock_location/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:14+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/da.po b/addons/stock_location/i18n/da.po
index bad51c034b9..6a2b615e201 100644
--- a/addons/stock_location/i18n/da.po
+++ b/addons/stock_location/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -292,6 +292,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index 49fd9f4d761..d68c04623f3 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:05+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
@@ -317,6 +317,16 @@ msgstr ""
 "Regel vom ursprünglichen Lager %s, mit Pull Regel %s und  ursprünglichem "
 "Beschaffungauftrag %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index a0c632c2ffe..0c9659eccf8 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-01 17:50+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -306,6 +306,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 49d1ca5e2f1..a13da2b91b2 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 12:57+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:34+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -314,6 +314,16 @@ msgstr ""
 "Movimiento para abastecimiento arrastrado proveniente de la ubicación "
 "original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr "Flujo \"push\" (optimización local)"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr "Flujo \"pull\" (optimización global)"
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index 3134173c3da..b3dcb5b9a9c 100644
--- a/addons/stock_location/i18n/es_AR.po
+++ b/addons/stock_location/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-23 14:19+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -299,6 +299,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/es_CL.po b/addons/stock_location/i18n/es_CL.po
index ca2addf35b8..e1c0a8279a0 100644
--- a/addons/stock_location/i18n/es_CL.po
+++ b/addons/stock_location/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-24 19:30+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -315,6 +315,16 @@ msgstr ""
 "Movimiento para abastecimiento arrastrado proveniente de la ubicación "
 "original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/es_CR.po b/addons/stock_location/i18n/es_CR.po
index 90ac903b251..93a682f6ae0 100644
--- a/addons/stock_location/i18n/es_CR.po
+++ b/addons/stock_location/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-20 03:33+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: stock_location
@@ -314,6 +314,16 @@ msgstr ""
 "Movimiento para abastecimiento arrastrado proveniente de la ubicación "
 "original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 027da027af8..537c26067d2 100644
--- a/addons/stock_location/i18n/et.po
+++ b/addons/stock_location/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 20:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -296,6 +296,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/fi.po b/addons/stock_location/i18n/fi.po
index 8a7af51a16b..3f07d68da91 100644
--- a/addons/stock_location/i18n/fi.po
+++ b/addons/stock_location/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-17 13:18+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -296,6 +296,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 92bfde25deb..8ee1a13d37a 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 14:10+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -316,6 +316,16 @@ msgstr ""
 "d'origine %s, règle de flux tiré %s, pour satisfaire l'approvisionnement "
 "original %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/gl.po b/addons/stock_location/i18n/gl.po
index 428757f5a16..157e1d730cb 100644
--- a/addons/stock_location/i18n/gl.po
+++ b/addons/stock_location/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-10 19:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -310,6 +310,16 @@ msgstr ""
 "Movemento para abastecemento arrastrado procedente do lugar orixinal %s, "
 "regra de arrastre %s, mediante abastecemento orixinal %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po
index f98c031c1a8..c97087b13b9 100644
--- a/addons/stock_location/i18n/hr.po
+++ b/addons/stock_location/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-12-08 17:51+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -302,6 +302,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index 78ce278e24f..a9ce486586a 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-26 15:24+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po
index b271e398604..719b6525397 100644
--- a/addons/stock_location/i18n/id.po
+++ b/addons/stock_location/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-21 05:13+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -304,6 +304,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po
index a2a0b185030..99be8a8311a 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-30 22:46+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -296,6 +296,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/ja.po b/addons/stock_location/i18n/ja.po
index 6b4252a96b6..95a89840ef1 100644
--- a/addons/stock_location/i18n/ja.po
+++ b/addons/stock_location/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-30 02:46+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -295,6 +295,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr "オリジナルの場所 %s から来るプル型調達のための移動、プルのルール %s、オリジナルの調達  %s（番号 %d）"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index a9a61a1bbb2..5d411da3439 100644
--- a/addons/stock_location/i18n/ko.po
+++ b/addons/stock_location/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:24+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -295,6 +295,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index e8f97425c82..dc3657a0822 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-13 10:19+0000\n"
 "Last-Translator: Andrius Vilciauskas <a.vilciauskas@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/lv.po b/addons/stock_location/i18n/lv.po
index 55c385a1d92..cca8c327267 100644
--- a/addons/stock_location/i18n/lv.po
+++ b/addons/stock_location/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-21 14:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -292,6 +292,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/mk.po b/addons/stock_location/i18n/mk.po
index 5fe34149dcd..31ecd433ab4 100644
--- a/addons/stock_location/i18n/mk.po
+++ b/addons/stock_location/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-23 11:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -292,6 +292,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po
index 8335ac5abf0..d5c9eebfbac 100644
--- a/addons/stock_location/i18n/mn.po
+++ b/addons/stock_location/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-09-29 09:58+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -311,6 +311,16 @@ msgstr ""
 "%s гэсэн оригиналь байрлалаас татагдсан татан авалтын хөдөлгөөн, татах дүрэм "
 "нь %s, оригиналь татан авалт нь %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/nb.po b/addons/stock_location/i18n/nb.po
index a98c996f656..097fde30a1d 100644
--- a/addons/stock_location/i18n/nb.po
+++ b/addons/stock_location/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-22 21:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -295,6 +295,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po
index be5049f22e1..111b66aac2f 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 21:03+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -288,7 +288,7 @@ msgstr "Niet van toepassing"
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "Vertraging (days)"
+msgstr "Vertraging (dagen)"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:67
@@ -315,6 +315,16 @@ msgstr ""
 "Mutatie van een pulled verwerving, komende van originele locatie %s, pull "
 "regel %s, via originele verwerving %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index 940beea7da6..e3abfd2414f 100644
--- a/addons/stock_location/i18n/nl_BE.po
+++ b/addons/stock_location/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 10:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index 010bb44495e..c5442a0251b 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-09 11:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -307,6 +307,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index a4665d5becc..b5e638fb7ee 100644
--- a/addons/stock_location/i18n/pt.po
+++ b/addons/stock_location/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 14:45+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -312,6 +312,16 @@ msgstr ""
 "Move for pulled procurement coming from original location %s, pull rule %s, "
 "via original Procurement %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index 240f5b03ff8..ec27dca7846 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-08 21:28+0000\n"
 "Last-Translator: pedrobom <pedrobomlimeira@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -307,6 +307,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index dc439228433..228f26734a6 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-06 08:02+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -312,6 +312,16 @@ msgstr ""
 "Miscarea pentru aprovizionarea retrasă provenită din locatia originală %s, "
 "regula de retragere %s, prin intermediul Aprovizionării originale %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index e65e2e3f38f..234dc31d447 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-09 09:49+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -313,6 +313,16 @@ msgstr ""
 "Перемещение для входящего снабжения поступающего из исходного места хранения "
 "%s, правило прихода %s, через исходное снабжение %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index 801e23877d1..cb2020f65cb 100644
--- a/addons/stock_location/i18n/sl.po
+++ b/addons/stock_location/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 01:06+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -292,6 +292,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/sq.po b/addons/stock_location/i18n/sq.po
index c5cf3ab78bd..2d73d3d95a6 100644
--- a/addons/stock_location/i18n/sq.po
+++ b/addons/stock_location/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:51+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -292,6 +292,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po
index 6b6abaf56b3..f4b78a7361e 100644
--- a/addons/stock_location/i18n/sv.po
+++ b/addons/stock_location/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-16 12:04+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po
index 68d654a2b04..17936a81914 100644
--- a/addons/stock_location/i18n/tlh.po
+++ b/addons/stock_location/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 1d9d1447f75..f0931bfc31b 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:23+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -307,6 +307,16 @@ msgstr ""
 "Orijinal konumdan %s iletilen satınalma için hareket, çekme kuralı %s, "
 "orijinal Satınalma %s (#%d) aracılığıyla"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index 50548de7dd3..cf86c33859c 100644
--- a/addons/stock_location/i18n/uk.po
+++ b/addons/stock_location/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 13:21+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/vi.po b/addons/stock_location/i18n/vi.po
index 6317437146f..4f0124c1dcf 100644
--- a/addons/stock_location/i18n/vi.po
+++ b/addons/stock_location/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -292,6 +292,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index dcc36857c93..6e5a98a156f 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 12:39+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -297,6 +297,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr "拉式调拨需求来自源库位 %s,拉式规则 %s,通过源需求 %s (#%d)"
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index 19263b4e11c..10620b7cd5c 100644
--- a/addons/stock_location/i18n/zh_TW.po
+++ b/addons/stock_location/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-23 17:16+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -291,6 +291,16 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index 6e2a7b8a669..20ae0d0a51e 100644
--- a/addons/stock_no_autopicking/i18n/ar.po
+++ b/addons/stock_no_autopicking/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 00:39+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/bg.po b/addons/stock_no_autopicking/i18n/bg.po
index 0b6611ce898..6d76f16613b 100644
--- a/addons/stock_no_autopicking/i18n/bg.po
+++ b/addons/stock_no_autopicking/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 14:49+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/bs.po b/addons/stock_no_autopicking/i18n/bs.po
index 5cda2d98d95..bd6e3210409 100644
--- a/addons/stock_no_autopicking/i18n/bs.po
+++ b/addons/stock_no_autopicking/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 09:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/ca.po b/addons/stock_no_autopicking/i18n/ca.po
index c20f8c603a0..ff8d7e63bc6 100644
--- a/addons/stock_no_autopicking/i18n/ca.po
+++ b/addons/stock_no_autopicking/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 12:35+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/cs.po b/addons/stock_no_autopicking/i18n/cs.po
index c778596aac5..5406ccfa795 100644
--- a/addons/stock_no_autopicking/i18n/cs.po
+++ b/addons/stock_no_autopicking/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-06 05:15+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po
index ed966c05200..377ec1dc0e3 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-08 11:54+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index 47c65589210..f2524d09d89 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-13 18:18+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/el.po b/addons/stock_no_autopicking/i18n/el.po
index 482b57d7135..6f00aea8d11 100644
--- a/addons/stock_no_autopicking/i18n/el.po
+++ b/addons/stock_no_autopicking/i18n/el.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-06-15 07:23+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index 32b0cf5c19f..6959aa63aa6 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 14:20+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/es_AR.po b/addons/stock_no_autopicking/i18n/es_AR.po
index 774b4e8040f..4f7e1b7e0dc 100644
--- a/addons/stock_no_autopicking/i18n/es_AR.po
+++ b/addons/stock_no_autopicking/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-14 14:20+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/es_CL.po b/addons/stock_no_autopicking/i18n/es_CL.po
index 3edf130690f..b2353325b66 100644
--- a/addons/stock_no_autopicking/i18n/es_CL.po
+++ b/addons/stock_no_autopicking/i18n/es_CL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-24 19:35+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/es_CR.po b/addons/stock_no_autopicking/i18n/es_CR.po
index 8ce3afa417a..81cbafe8c7c 100644
--- a/addons/stock_no_autopicking/i18n/es_CR.po
+++ b/addons/stock_no_autopicking/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-20 02:31+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/et.po b/addons/stock_no_autopicking/i18n/et.po
index bfae0f59735..bc60cbce55e 100644
--- a/addons/stock_no_autopicking/i18n/et.po
+++ b/addons/stock_no_autopicking/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-29 19:10+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/fi.po b/addons/stock_no_autopicking/i18n/fi.po
index 287717cafbb..f7cc4c0392b 100644
--- a/addons/stock_no_autopicking/i18n/fi.po
+++ b/addons/stock_no_autopicking/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-08 10:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index f032f1f3c5d..07ef86c45a8 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 15:06+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/gl.po b/addons/stock_no_autopicking/i18n/gl.po
index 7c730b19fc3..ddfb67de37c 100644
--- a/addons/stock_no_autopicking/i18n/gl.po
+++ b/addons/stock_no_autopicking/i18n/gl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: stock-no-autopicking-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-08-17 08:30+0000\n"
 "Last-Translator: Frco. Javier Rial <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/hr.po b/addons/stock_no_autopicking/i18n/hr.po
index d57328968e3..f2df9ed5fe5 100644
--- a/addons/stock_no_autopicking/i18n/hr.po
+++ b/addons/stock_no_autopicking/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-28 22:01+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/hu.po b/addons/stock_no_autopicking/i18n/hu.po
index 98f2fb652cf..8dce94286ee 100644
--- a/addons/stock_no_autopicking/i18n/hu.po
+++ b/addons/stock_no_autopicking/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-24 17:50+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/id.po b/addons/stock_no_autopicking/i18n/id.po
index 17592ea7069..6db7b4edccf 100644
--- a/addons/stock_no_autopicking/i18n/id.po
+++ b/addons/stock_no_autopicking/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-14 13:49+0000\n"
 "Last-Translator: moelyana <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index b3e67b16110..5784ac80523 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 14:03+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/ja.po b/addons/stock_no_autopicking/i18n/ja.po
index b7e1416852b..03c3cd7167d 100644
--- a/addons/stock_no_autopicking/i18n/ja.po
+++ b/addons/stock_no_autopicking/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-21 23:54+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 7752e055294..c8fbfeda9b3 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-03 03:12+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/lt.po b/addons/stock_no_autopicking/i18n/lt.po
index b83b017cab3..99c5d6c9791 100644
--- a/addons/stock_no_autopicking/i18n/lt.po
+++ b/addons/stock_no_autopicking/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/lv.po b/addons/stock_no_autopicking/i18n/lv.po
index 213ac8a5f1d..9a06dbb2981 100644
--- a/addons/stock_no_autopicking/i18n/lv.po
+++ b/addons/stock_no_autopicking/i18n/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-21 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/mk.po b/addons/stock_no_autopicking/i18n/mk.po
index 6cad97490e3..81ce0118ab9 100644
--- a/addons/stock_no_autopicking/i18n/mk.po
+++ b/addons/stock_no_autopicking/i18n/mk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-23 11:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/mn.po b/addons/stock_no_autopicking/i18n/mn.po
index 74e38227248..129ef647ee2 100644
--- a/addons/stock_no_autopicking/i18n/mn.po
+++ b/addons/stock_no_autopicking/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-13 01:44+0000\n"
 "Last-Translator: badralb <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/nl.po b/addons/stock_no_autopicking/i18n/nl.po
index f17d33639b4..91924cb4b58 100644
--- a/addons/stock_no_autopicking/i18n/nl.po
+++ b/addons/stock_no_autopicking/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 19:17+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/nl_BE.po b/addons/stock_no_autopicking/i18n/nl_BE.po
index 1a1b8d6234a..09b805d3577 100644
--- a/addons/stock_no_autopicking/i18n/nl_BE.po
+++ b/addons/stock_no_autopicking/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 12:20+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/oc.po b/addons/stock_no_autopicking/i18n/oc.po
index b59e961bc3e..1663608ab9b 100644
--- a/addons/stock_no_autopicking/i18n/oc.po
+++ b/addons/stock_no_autopicking/i18n/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-11-20 09:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/pl.po b/addons/stock_no_autopicking/i18n/pl.po
index 51ad4db0888..a007c65e004 100644
--- a/addons/stock_no_autopicking/i18n/pl.po
+++ b/addons/stock_no_autopicking/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 12:54+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/pt.po b/addons/stock_no_autopicking/i18n/pt.po
index aa93df5f8af..6133ad1b20e 100644
--- a/addons/stock_no_autopicking/i18n/pt.po
+++ b/addons/stock_no_autopicking/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-09 11:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/pt_BR.po b/addons/stock_no_autopicking/i18n/pt_BR.po
index 4a74cf0e1fd..9d459b061c3 100644
--- a/addons/stock_no_autopicking/i18n/pt_BR.po
+++ b/addons/stock_no_autopicking/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-14 16:47+0000\n"
 "Last-Translator: Emerson <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/ro.po b/addons/stock_no_autopicking/i18n/ro.po
index e3292c8fb0d..4ac828cc5be 100644
--- a/addons/stock_no_autopicking/i18n/ro.po
+++ b/addons/stock_no_autopicking/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index 9da69eb0eb8..28c2b328f6c 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-09 09:46+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/sl.po b/addons/stock_no_autopicking/i18n/sl.po
index 712a54d1156..8dd495a2846 100644
--- a/addons/stock_no_autopicking/i18n/sl.po
+++ b/addons/stock_no_autopicking/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-27 05:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/sq.po b/addons/stock_no_autopicking/i18n/sq.po
index ec0e5c687f0..f7aeb57ec1f 100644
--- a/addons/stock_no_autopicking/i18n/sq.po
+++ b/addons/stock_no_autopicking/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/sr@latin.po b/addons/stock_no_autopicking/i18n/sr@latin.po
index 0dca73effc9..958ca9ef0e7 100644
--- a/addons/stock_no_autopicking/i18n/sr@latin.po
+++ b/addons/stock_no_autopicking/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-17 13:45+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/sv.po b/addons/stock_no_autopicking/i18n/sv.po
index f7ac610be4d..4e8bcba97ba 100644
--- a/addons/stock_no_autopicking/i18n/sv.po
+++ b/addons/stock_no_autopicking/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-23 09:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/tlh.po b/addons/stock_no_autopicking/i18n/tlh.po
index 99596f7d9b0..92c0d82d7d2 100644
--- a/addons/stock_no_autopicking/i18n/tlh.po
+++ b/addons/stock_no_autopicking/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index c89b6ea7920..a794da6b2ff 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-23 23:24+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/uk.po b/addons/stock_no_autopicking/i18n/uk.po
index 8e20372cd70..414ebfb8a9d 100644
--- a/addons/stock_no_autopicking/i18n/uk.po
+++ b/addons/stock_no_autopicking/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 09:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/vi.po b/addons/stock_no_autopicking/i18n/vi.po
index 6f67057a41f..743ba7bfcbd 100644
--- a/addons/stock_no_autopicking/i18n/vi.po
+++ b/addons/stock_no_autopicking/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-20 23:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 553d770c684..c2f6b7d9918 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:21+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/zh_TW.po b/addons/stock_no_autopicking/i18n/zh_TW.po
index 43f4dfc1e54..5f6be77f27d 100644
--- a/addons/stock_no_autopicking/i18n/zh_TW.po
+++ b/addons/stock_no_autopicking/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-01-23 17:16+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:49+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/subscription/i18n/ar.po b/addons/subscription/i18n/ar.po
index cec4bf113af..4dfb27aa26e 100644
--- a/addons/subscription/i18n/ar.po
+++ b/addons/subscription/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index 91645741c99..13cfd914d36 100644
--- a/addons/subscription/i18n/bg.po
+++ b/addons/subscription/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 15:07+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index 0222c9d0931..9ac2212ae52 100644
--- a/addons/subscription/i18n/bs.po
+++ b/addons/subscription/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 05:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index 2e5da6d7667..e41272e7c33 100644
--- a/addons/subscription/i18n/ca.po
+++ b/addons/subscription/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:31+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index d9af4db87ba..668886da579 100644
--- a/addons/subscription/i18n/cs.po
+++ b/addons/subscription/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 23:10+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/da.po b/addons/subscription/i18n/da.po
index 56dde8de566..a71237c935a 100644
--- a/addons/subscription/i18n/da.po
+++ b/addons/subscription/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index 3fd63ba9423..8223f97393a 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:04+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index 4474813c9b0..7dc5af21e80 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 12:56+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:42+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index 86b95f0a501..94a697a721a 100644
--- a/addons/subscription/i18n/es_AR.po
+++ b/addons/subscription/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-14 13:17+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_CR.po b/addons/subscription/i18n/es_CR.po
index a0c33ca26cd..67d7687c40c 100644
--- a/addons/subscription/i18n/es_CR.po
+++ b/addons/subscription/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-20 03:31+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index f94ebeb050f..0debaf30e9a 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-11 18:14+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fi.po b/addons/subscription/i18n/fi.po
index 70a266bae7e..2e5db088397 100644
--- a/addons/subscription/i18n/fi.po
+++ b/addons/subscription/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-08-04 08:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index 6ccf805f73f..e676f579e66 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-16 17:39+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/gl.po b/addons/subscription/i18n/gl.po
index 9f8fe3fe6f2..88a1712e724 100644
--- a/addons/subscription/i18n/gl.po
+++ b/addons/subscription/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-14 18:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index ed40ca599ef..fb0385c7f1b 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 21:23+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-12-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index 2c0db3184de..ce08aada8a4 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-04 15:31+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index ba6d494a93f..94a673d77c3 100644
--- a/addons/subscription/i18n/id.po
+++ b/addons/subscription/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 13:58+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 637705e5700..4e95b8ea024 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-03 20:54+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ja.po b/addons/subscription/i18n/ja.po
index 2e03c23e9f2..d550843c123 100644
--- a/addons/subscription/i18n/ja.po
+++ b/addons/subscription/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 21:20+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index 85ce19b4746..2bee4dfe050 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 22:02+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index 1683ed4b002..3abb50597aa 100644
--- a/addons/subscription/i18n/lt.po
+++ b/addons/subscription/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 05:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 7a3ef568d6b..91d0c503041 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-24 21:34+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index 83296317f4d..f38ec77c862 100644
--- a/addons/subscription/i18n/nl_BE.po
+++ b/addons/subscription/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-20 10:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index b50c34e5e5f..bea86f2c189 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-26 06:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index ad97f7bef53..ca3afa49c87 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:40+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index 082af7fce60..bcfd55aa4ec 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 17:24+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index fc5984cc407..2366edf6666 100644
--- a/addons/subscription/i18n/ro.po
+++ b/addons/subscription/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index 262fb894a0a..61e8c8884ed 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 20:49+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index 75c35843d40..2aad9c19bc5 100644
--- a/addons/subscription/i18n/sl.po
+++ b/addons/subscription/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 10:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sq.po b/addons/subscription/i18n/sq.po
index acc4a131839..d66e5a9da6e 100644
--- a/addons/subscription/i18n/sq.po
+++ b/addons/subscription/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index dde9e51d98a..1aab32f4016 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-23 09:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index 09ebe510250..e86ba9f1026 100644
--- a/addons/subscription/i18n/tlh.po
+++ b/addons/subscription/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 0d636acba76..c195eee7c04 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 19:57+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index cbc4b397264..68bfb8f7618 100644
--- a/addons/subscription/i18n/uk.po
+++ b/addons/subscription/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-04 05:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/vi.po b/addons/subscription/i18n/vi.po
index dbb132655c2..ef258f09f07 100644
--- a/addons/subscription/i18n/vi.po
+++ b/addons/subscription/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index 9aaeeb5ebb3..521e60ce49d 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:20+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-11-28 04:40+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index 769f333bb85..89c73d19c49 100644
--- a/addons/subscription/i18n/zh_TW.po
+++ b/addons/subscription/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-27 12:04+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/survey/i18n/ar.po b/addons/survey/i18n/ar.po
index 084fb7c4791..01f14fba37c 100644
--- a/addons/survey/i18n/ar.po
+++ b/addons/survey/i18n/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-17 03:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr "مرحلة خطة التقييم"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr "بريد إلكتروني"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr "رسالة الخطأ"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr "خيارات"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "الرسالة"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "فتح"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr "صفحات"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr "رسالة خطأ"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr "معرّف"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr "جدول"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/bg.po b/addons/survey/i18n/bg.po
index 8c406399766..708d1648fd1 100644
--- a/addons/survey/i18n/bg.po
+++ b/addons/survey/i18n/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Изпрати напомняне за съществуващ потребител"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Дата на отваряне на анкета"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr "Редактиране на проучване"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr "Имейл"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Избери партньор"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr "Съобщение за грешка"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr "Опции"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "Съобщение"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr "Пропуснато"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "Отвoри"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr "Общо започнати анкети"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr "Страници"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr "Съобщение за грешка"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
index 7a0b53e137f..231380361cc 100644
--- a/addons/survey/i18n/ca.po
+++ b/addons/survey/i18n/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:25+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Camp de text únic"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Camp per agregar comentari"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "enquesta.nom.assist"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Envia recordatori per a usuari existent"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -293,7 +293,7 @@ msgid " Column heading"
 msgstr " Capçalera columna"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -326,8 +326,8 @@ msgid "Rating Scale"
 msgstr "Escala de qualificació"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -350,7 +350,7 @@ msgid "Survey Open Date"
 msgstr "Data d'obertura de l'enquesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -371,8 +371,8 @@ msgid "Edit Survey"
 msgstr "Edita enquesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -383,7 +383,7 @@ msgid "Menu Choice"
 msgstr "Menú Selecció"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -407,7 +407,7 @@ msgid "Survey Answer Line"
 msgstr "Línia de resposta enquesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -491,7 +491,7 @@ msgid "Don't Validate Comment Text."
 msgstr "No valideu el text del comentari"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -527,9 +527,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Fase del pla d'avaluació"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -571,8 +571,8 @@ msgid "Email"
 msgstr "Correu electrònic"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -593,7 +593,7 @@ msgid "Select Partner"
 msgstr "Selecciona empresa"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -646,7 +646,7 @@ msgid "Error Message"
 msgstr "Missatge d'error"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -703,7 +703,7 @@ msgid "Paragraph of Text"
 msgstr "Paràgraf de text"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -729,7 +729,7 @@ msgid "Options"
 msgstr "Opcions"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -834,8 +834,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Estableix a un si només requereix una resposta per usuari."
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -853,7 +853,7 @@ msgid "Message"
 msgstr "Missatge"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1150,7 +1150,7 @@ msgid "Skiped"
 msgstr "Omès"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1180,7 +1180,7 @@ msgid "Survey Response Line"
 msgstr "Línia de resposta d'enquesta"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1333,7 +1333,7 @@ msgid "Open"
 msgstr "Obre"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1344,7 +1344,7 @@ msgid "Total Started Survey"
 msgstr "Total d'enquestes començades"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1402,7 +1402,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Enquesta completada"
@@ -1476,8 +1476,8 @@ msgid "Portrait(Vertical)"
 msgstr "Retrat (Vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1494,19 +1494,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "No podeu duplicar el recurs!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1537,7 +1537,7 @@ msgid "Pages"
 msgstr "Pàgines"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1587,58 +1587,58 @@ msgid "Error message"
 msgstr "Missatge d'error"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1659,7 +1659,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1765,7 +1765,7 @@ msgid "Table"
 msgstr "Taula"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po
index 5652ac0998f..2c79e356687 100644
--- a/addons/survey/i18n/cs.po
+++ b/addons/survey/i18n/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Poslat připomenutí existujícímu uživateli"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Datum zahájení průzkumu"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Vybrat partnera"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr "Přeskočeno"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr "Celkem zahájených průzkumů"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/da.po b/addons/survey/i18n/da.po
index fdbd4683289..2558641ca9c 100644
--- a/addons/survey/i18n/da.po
+++ b/addons/survey/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 02424e47338..19a907db675 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-19 23:06+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
@@ -24,7 +24,7 @@ msgid "Single Textboxes"
 msgstr "Einfache Texteingabebox"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -178,7 +178,7 @@ msgid "Add Comment Field"
 msgstr "Hinzufügen Kommentar"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -204,7 +204,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -226,7 +226,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Setze Erinnerung für bestehend Benutzer"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -294,7 +294,7 @@ msgid " Column heading"
 msgstr " Spaltenüberschrift"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr "Die folgenden Umfragen sind nicht eröffnet: %s"
@@ -326,8 +326,8 @@ msgid "Rating Scale"
 msgstr "Skala Bewertung"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -352,7 +352,7 @@ msgid "Survey Open Date"
 msgstr "Umfrage Start Datum"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr "Sie können nicht mehrmals die identische Antwort geben."
@@ -373,8 +373,8 @@ msgid "Edit Survey"
 msgstr "Bearbeite Umfrage"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr "Bitte tragen Sie einen ganze Zahl ein."
@@ -385,7 +385,7 @@ msgid "Menu Choice"
 msgstr "Menüauswahl"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -410,7 +410,7 @@ msgid "Survey Answer Line"
 msgstr "Umfrage Antwortzeile"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -512,7 +512,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Bitte validieren Sie keine Kommentartexte."
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -549,9 +549,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Evaluation Planphase"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -593,8 +593,8 @@ msgid "Email"
 msgstr "E-Mail"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
@@ -615,7 +615,7 @@ msgid "Select Partner"
 msgstr "Wähle Partner"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -669,7 +669,7 @@ msgid "Error Message"
 msgstr "Fehlermeldung"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr "Sie können diese Umfrage nicht mehr als %s -mal beantworten."
@@ -726,7 +726,7 @@ msgid "Paragraph of Text"
 msgstr "Textparagraph"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -752,7 +752,7 @@ msgid "Options"
 msgstr "Optionen"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -859,8 +859,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Aktivieren, wenn Sie nur eine Antwort pro Frage gebrauchen"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -880,7 +880,7 @@ msgid "Message"
 msgstr "Nachricht"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1194,7 +1194,7 @@ msgid "Skiped"
 msgstr "Übersprungen"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1226,7 +1226,7 @@ msgid "Survey Response Line"
 msgstr "Umfrage Antwortzeilen"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1381,7 +1381,7 @@ msgid "Open"
 msgstr "Öffnen"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1394,7 +1394,7 @@ msgid "Total Started Survey"
 msgstr "Gesamt gestartete Umfragen"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1453,7 +1453,7 @@ msgid "Email Notification on Answer"
 msgstr "E-Mail Nachricht bei Antwort"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Komplettiere Antworten zur Umfrage"
@@ -1527,8 +1527,8 @@ msgid "Portrait(Vertical)"
 msgstr "Portrait (Vertikal)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr "Einladung für %s"
@@ -1545,19 +1545,19 @@ msgid "Supplier Selection"
 msgstr "Lieferantenauswahl"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr "Sie können nicht dieselbe Antwort mehr als einmal abgeben."
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Sie können diese Ressource nicht duplizieren!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1589,7 +1589,7 @@ msgid "Pages"
 msgstr "Seiten"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1639,58 +1639,58 @@ msgid "Error message"
 msgstr "Fehlermeldung"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1711,7 +1711,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1817,7 +1817,7 @@ msgid "Table"
 msgstr "Tabelle"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index ce9f6e95c25..22972a8b1c0 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 19:20+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Campos de texto únicos"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Campo para agregar comentario"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "encuesta.nombre.asist"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Enviar recordatorio para usuario existente"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -293,7 +293,7 @@ msgid " Column heading"
 msgstr " Cabecera columna"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr "Las siguientes encuestas no están es estado abierto: %s"
@@ -325,8 +325,8 @@ msgid "Rating Scale"
 msgstr "Escala de calificación"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -351,7 +351,7 @@ msgid "Survey Open Date"
 msgstr "Fecha apertura de encuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr "No puede seleccionar la misma respuesta más de una vez."
@@ -372,8 +372,8 @@ msgid "Edit Survey"
 msgstr "Editar encuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr "Introduzca por favor un valor entero."
@@ -384,7 +384,7 @@ msgid "Menu Choice"
 msgstr "Selección Menú"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -409,7 +409,7 @@ msgid "Survey Answer Line"
 msgstr "Líne de respuesta encuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -507,7 +507,7 @@ msgid "Don't Validate Comment Text."
 msgstr "No validar texto de comentario"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -544,9 +544,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Fase del plan de evaluación"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr "Desconocido"
@@ -588,8 +588,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -610,7 +610,7 @@ msgid "Select Partner"
 msgstr "Seleccionar empresa"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -665,7 +665,7 @@ msgid "Error Message"
 msgstr "Mensaje de error"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr "No puede responder esta encuesta más de %s veces."
@@ -722,7 +722,7 @@ msgid "Paragraph of Text"
 msgstr "Párrafo de texto"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -748,7 +748,7 @@ msgid "Options"
 msgstr "Opciones"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -854,8 +854,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Establecer a uno si sólo requiere una respuesta por usuario."
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -875,7 +875,7 @@ msgid "Message"
 msgstr "Mensaje"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1188,7 +1188,7 @@ msgid "Skiped"
 msgstr "Omitido"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1220,7 +1220,7 @@ msgid "Survey Response Line"
 msgstr "Línea de respuesta de encuesta"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1374,7 +1374,7 @@ msgid "Open"
 msgstr "Abrir"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1386,7 +1386,7 @@ msgid "Total Started Survey"
 msgstr "Total encuestas empezadas"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1444,7 +1444,7 @@ msgid "Email Notification on Answer"
 msgstr "Notificación por correo electrónico ante una respuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Respuesta completa de la encuesta"
@@ -1518,8 +1518,8 @@ msgid "Portrait(Vertical)"
 msgstr "Retrato (Vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr "Invitación para %s"
@@ -1536,19 +1536,19 @@ msgid "Supplier Selection"
 msgstr "Selección de proveedor"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr "No puedeo seleccionar la misma respuesta más de una vez."
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "¡No puede duplicar el recurso!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1579,7 +1579,7 @@ msgid "Pages"
 msgstr "Páginas"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1629,58 +1629,58 @@ msgid "Error message"
 msgstr "Mensaje de error"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1701,7 +1701,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1807,7 +1807,7 @@ msgid "Table"
 msgstr "Tabla"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr "No puede responder porque la encuesta no está abierta."
diff --git a/addons/survey/i18n/es_CR.po b/addons/survey/i18n/es_CR.po
index 545cd7ddfa1..3cf87ddcd7e 100644
--- a/addons/survey/i18n/es_CR.po
+++ b/addons/survey/i18n/es_CR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-20 02:30+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: es\n"
 
 #. module: survey
@@ -24,7 +24,7 @@ msgid "Single Textboxes"
 msgstr "Campos de texto únicos"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -178,7 +178,7 @@ msgid "Add Comment Field"
 msgstr "Campo para agregar comentario"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -204,7 +204,7 @@ msgid "survey.name.wiz"
 msgstr "encuesta.nombre.asist"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -226,7 +226,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -294,7 +294,7 @@ msgid " Column heading"
 msgstr " Cabecera columna"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -326,8 +326,8 @@ msgid "Rating Scale"
 msgstr "Escala de calificación"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -350,7 +350,7 @@ msgid "Survey Open Date"
 msgstr "Fecha apertura de encuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -371,8 +371,8 @@ msgid "Edit Survey"
 msgstr "Editar encuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -383,7 +383,7 @@ msgid "Menu Choice"
 msgstr "Selección Menú"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -407,7 +407,7 @@ msgid "Survey Answer Line"
 msgstr "Líne de respuesta encuesta"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -491,7 +491,7 @@ msgid "Don't Validate Comment Text."
 msgstr "No validar texto de comentario"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -527,9 +527,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Fase del plan de evaluación"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -571,8 +571,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -593,7 +593,7 @@ msgid "Select Partner"
 msgstr "Seleccionar empresa"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -646,7 +646,7 @@ msgid "Error Message"
 msgstr "Mensaje de error"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -703,7 +703,7 @@ msgid "Paragraph of Text"
 msgstr "Párrafo de texto"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -729,7 +729,7 @@ msgid "Options"
 msgstr "Opciones"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -834,8 +834,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Establecer a uno si sólo requiere una respuesta por usuario."
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -853,7 +853,7 @@ msgid "Message"
 msgstr "Mensaje"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1151,7 +1151,7 @@ msgid "Skiped"
 msgstr "Omitido"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1181,7 +1181,7 @@ msgid "Survey Response Line"
 msgstr "Línea de respuesta de encuesta"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1334,7 +1334,7 @@ msgid "Open"
 msgstr "Abrir"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1345,7 +1345,7 @@ msgid "Total Started Survey"
 msgstr "Total encuestas empezadas"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1403,7 +1403,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Respuesta completa de la encuesta"
@@ -1477,8 +1477,8 @@ msgid "Portrait(Vertical)"
 msgstr "Retrato (Vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1495,19 +1495,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "¡No puede duplicar el recurso!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1538,7 +1538,7 @@ msgid "Pages"
 msgstr "Páginas"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1588,58 +1588,58 @@ msgid "Error message"
 msgstr "Mensaje de error"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1660,7 +1660,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1766,7 +1766,7 @@ msgid "Table"
 msgstr "Tabla"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/et.po b/addons/survey/i18n/et.po
index e48198f0ff6..3e1f63801a6 100644
--- a/addons/survey/i18n/et.po
+++ b/addons/survey/i18n/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-10-11 18:13+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Märgi partner"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "Sõnum"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "Ava"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/fi.po b/addons/survey/i18n/fi.po
index f3993346abd..7712699cacf 100644
--- a/addons/survey/i18n/fi.po
+++ b/addons/survey/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-04-30 06:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index aa07c42ff85..ba2b0cb7dff 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 10:56+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Zones de texte simple"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Ajouter un champ pour les commentaires"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Envoyer un rappel à un utilisateur existant"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -293,7 +293,7 @@ msgid " Column heading"
 msgstr " En-tête de colonne"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -326,8 +326,8 @@ msgid "Rating Scale"
 msgstr "Echelle d'évaluation"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -350,7 +350,7 @@ msgid "Survey Open Date"
 msgstr "Date de début du sondage"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr "Vous ne pouvez pas sélectionner la même réponse plusieurs fois."
@@ -371,8 +371,8 @@ msgid "Edit Survey"
 msgstr "Éditer un sondage"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -383,7 +383,7 @@ msgid "Menu Choice"
 msgstr "Choix du menu"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -407,7 +407,7 @@ msgid "Survey Answer Line"
 msgstr "Ligne de réponses au sondage"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -491,7 +491,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Ne pas valider le texte de commentaire."
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -527,9 +527,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Phase du plan d'évaluation"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -571,8 +571,8 @@ msgid "Email"
 msgstr "Courriel"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -593,7 +593,7 @@ msgid "Select Partner"
 msgstr "Sélectionner un partenaire"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -646,7 +646,7 @@ msgid "Error Message"
 msgstr "Message d'erreur"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -703,7 +703,7 @@ msgid "Paragraph of Text"
 msgstr "Paragraphe de texte"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -729,7 +729,7 @@ msgid "Options"
 msgstr "Options"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -834,8 +834,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Mettez \"1\" si vous ne voulez qu'une seule réponse par utilisateur"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -853,7 +853,7 @@ msgid "Message"
 msgstr "Message"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1151,7 +1151,7 @@ msgid "Skiped"
 msgstr "Ignoré"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1181,7 +1181,7 @@ msgid "Survey Response Line"
 msgstr "Ligne de réponse au sondage"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1334,7 +1334,7 @@ msgid "Open"
 msgstr "Ouvert"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1345,7 +1345,7 @@ msgid "Total Started Survey"
 msgstr "Nombre de sondages démarrés"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1403,7 +1403,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Terminer de répondre au sondage"
@@ -1477,8 +1477,8 @@ msgid "Portrait(Vertical)"
 msgstr "Portrait (vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1495,19 +1495,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Vous ne pouvez pas dupliquer la ressource !"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1538,7 +1538,7 @@ msgid "Pages"
 msgstr "Pages"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1588,58 +1588,58 @@ msgid "Error message"
 msgstr "Message d'erreur"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1660,7 +1660,7 @@ msgid "ID"
 msgstr "Id."
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1766,7 +1766,7 @@ msgid "Table"
 msgstr "Table"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/gl.po b/addons/survey/i18n/gl.po
index f0100a888b9..f8eb4984ee4 100644
--- a/addons/survey/i18n/gl.po
+++ b/addons/survey/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-05 02:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index a7ec1dc02b5..886d75b87c6 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 08:30+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: survey
@@ -24,7 +24,7 @@ msgid "Single Textboxes"
 msgstr "Single Textboxes"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -178,7 +178,7 @@ msgid "Add Comment Field"
 msgstr "Dodaj polje za komentar"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -205,7 +205,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -228,7 +228,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Pošalji podsjetnik postojećem korisniku"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -296,7 +296,7 @@ msgid " Column heading"
 msgstr " Naslov stupca"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -328,8 +328,8 @@ msgid "Rating Scale"
 msgstr "Rating Scale"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -352,7 +352,7 @@ msgid "Survey Open Date"
 msgstr "Datum otvaranja upitnika"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -373,8 +373,8 @@ msgid "Edit Survey"
 msgstr "Edit Survey"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -385,7 +385,7 @@ msgid "Menu Choice"
 msgstr "Menu Choice"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -409,7 +409,7 @@ msgid "Survey Answer Line"
 msgstr "Survey Answer Line"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -493,7 +493,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Don't Validate Comment Text."
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -529,9 +529,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Faza plana ocjenjivanja"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr "Nepoznato"
@@ -573,8 +573,8 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
@@ -595,7 +595,7 @@ msgid "Select Partner"
 msgstr "Odaberi partnera"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -648,7 +648,7 @@ msgid "Error Message"
 msgstr "Error Message"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -705,7 +705,7 @@ msgid "Paragraph of Text"
 msgstr "Odlomak teksta"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -731,7 +731,7 @@ msgid "Options"
 msgstr "Options"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -835,8 +835,8 @@ msgstr ""
 "Postavite na jedan ukoliko vam je potrebna samo jedan odgovor po korisniku"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -854,7 +854,7 @@ msgid "Message"
 msgstr "Poruka"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1150,7 +1150,7 @@ msgid "Skiped"
 msgstr "Preskočen"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1180,7 +1180,7 @@ msgid "Survey Response Line"
 msgstr "Survey Response Line"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1333,7 +1333,7 @@ msgid "Open"
 msgstr "Otvoreno"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1344,7 +1344,7 @@ msgid "Total Started Survey"
 msgstr "Ukupno aktivnih upitnika"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1401,7 +1401,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Odgovor na anketno pitanje"
@@ -1475,8 +1475,8 @@ msgid "Portrait(Vertical)"
 msgstr "Portrait(Vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1493,19 +1493,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Ne možete duplicirati resurs !"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1536,7 +1536,7 @@ msgid "Pages"
 msgstr "Pages"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1587,58 +1587,58 @@ msgid "Error message"
 msgstr "Error message"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1660,7 +1660,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1766,7 +1766,7 @@ msgid "Table"
 msgstr "Table"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/hu.po b/addons/survey/i18n/hu.po
index 53927f9ae3a..ed1d939061d 100644
--- a/addons/survey/i18n/hu.po
+++ b/addons/survey/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -22,7 +22,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -174,7 +174,7 @@ msgid "Add Comment Field"
 msgstr "Megjegyzés mező hozzáadása"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -198,7 +198,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -218,7 +218,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Meglévő felhasználónak emlékeztető küldése"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -284,7 +284,7 @@ msgid " Column heading"
 msgstr " Oszlopfejléc"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -316,8 +316,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -340,7 +340,7 @@ msgid "Survey Open Date"
 msgstr "Felmérés megnyitásának időpontja"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -361,8 +361,8 @@ msgid "Edit Survey"
 msgstr "Felmérés szerksztése"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -373,7 +373,7 @@ msgid "Menu Choice"
 msgstr "Menüválasztás"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -397,7 +397,7 @@ msgid "Survey Answer Line"
 msgstr "Felmérés válasz sor"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -481,7 +481,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Nincs jóváhagyva a megjegyzés szövege"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -517,9 +517,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Értékelési terv fázisa"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -561,8 +561,8 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -583,7 +583,7 @@ msgid "Select Partner"
 msgstr "Partner kiválasztása"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -636,7 +636,7 @@ msgid "Error Message"
 msgstr "Hibaüzenet"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -693,7 +693,7 @@ msgid "Paragraph of Text"
 msgstr "Szövegbekezdés"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -716,7 +716,7 @@ msgid "Options"
 msgstr "Opciók"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -819,8 +819,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -838,7 +838,7 @@ msgid "Message"
 msgstr "Üzenet"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1134,7 +1134,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1164,7 +1164,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1317,7 +1317,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1328,7 +1328,7 @@ msgid "Total Started Survey"
 msgstr "Összes elindított felmérés"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1382,7 +1382,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1456,8 +1456,8 @@ msgid "Portrait(Vertical)"
 msgstr "Álló(függőleges)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1474,19 +1474,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1515,7 +1515,7 @@ msgid "Pages"
 msgstr "Oldalak"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1563,58 +1563,58 @@ msgid "Error message"
 msgstr "Hibaüzenet"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1633,7 +1633,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1737,7 +1737,7 @@ msgid "Table"
 msgstr "Táblázat"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/it.po b/addons/survey/i18n/it.po
index 85c19133b07..5d5652af78c 100644
--- a/addons/survey/i18n/it.po
+++ b/addons/survey/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:16+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr "Aggiungi campo commento"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Invia promemoria per gli utenti esistenti"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr " Intestazione colonna"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Data apertura sondaggio"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr "Modifica sondaggio"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr "Scelta menù"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr "Riga risposta sondaggio"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Fase piano di valutazione"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Seleziona partner"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr "Messaggio di Errore"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr "Paragrafo del testo"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr "Opzioni"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -822,8 +822,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Imposta ad uno se si richiede solo una risposta per utente"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -841,7 +841,7 @@ msgid "Message"
 msgstr "Messaggio"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1137,7 +1137,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1167,7 +1167,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1320,7 +1320,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1331,7 +1331,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1385,7 +1385,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1459,8 +1459,8 @@ msgid "Portrait(Vertical)"
 msgstr "Portrait (Verticale)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1477,19 +1477,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1518,7 +1518,7 @@ msgid "Pages"
 msgstr "Pagine"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1566,58 +1566,58 @@ msgid "Error message"
 msgstr "Messaggio di errore"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1636,7 +1636,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1740,7 +1740,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
index 106d464582f..a0b3f7cee01 100644
--- a/addons/survey/i18n/ja.po
+++ b/addons/survey/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-07-06 03:16+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "単数テキストボックス"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr "コメント項目の追加"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "既存ユーザに注意喚起を送信"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr " 列見出し"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr "評価尺度"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "調査開設日"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr "調査の編集"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr "メニュー選択"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr "調査の回答行"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr "コメントテキストを検証しない"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr "計画段階の評価"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr "Eメール"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "パートナの選択"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr "エラーメッセージ"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr "テキストの段落"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr "オプション"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "1ユーザにつき1回答のみとする場合は、1を設定します。"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "メッセージ"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr "スキップ済"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr "調査回答行"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "開く"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr "開始した調査合計"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "調査の回答の完了"
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr "縦向き"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "リソースの複製はできません。"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr "ページ"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr "エラーメッセージ"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr "表"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/mn.po b/addons/survey/i18n/mn.po
index 1c972213ee9..525fb043d5b 100644
--- a/addons/survey/i18n/mn.po
+++ b/addons/survey/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:49+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Дан текст"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Тайлбарын талбар нэмэх"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Хэрэглэгчид сануулга илгээх"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -293,7 +293,7 @@ msgid " Column heading"
 msgstr " Баганы гарчиг"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -325,8 +325,8 @@ msgid "Rating Scale"
 msgstr "Онооны Үнэлгээ"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -349,7 +349,7 @@ msgid "Survey Open Date"
 msgstr "Санал асуулга нээх огноо"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -370,8 +370,8 @@ msgid "Edit Survey"
 msgstr "Санал асуулга засах"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -382,7 +382,7 @@ msgid "Menu Choice"
 msgstr "Цэс сонгох"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -406,7 +406,7 @@ msgid "Survey Answer Line"
 msgstr "Хариултын мөр"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -490,7 +490,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Тайлбар текст батлагдсангүй."
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -526,9 +526,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Үнэлгээг төлөвлөх үе шат"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -570,8 +570,8 @@ msgid "Email"
 msgstr "Э-мэйл"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -592,7 +592,7 @@ msgid "Select Partner"
 msgstr "Оролцогч сонгох"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -645,7 +645,7 @@ msgid "Error Message"
 msgstr "Алдааны мэссэж"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -702,7 +702,7 @@ msgid "Paragraph of Text"
 msgstr "Текстийн хэв"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -727,7 +727,7 @@ msgid "Options"
 msgstr "Сонголт"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -831,8 +831,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Хэрэглэгчээс зөвхөн нэг л хариулт авах бол 1 гэж тохируулна"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -850,7 +850,7 @@ msgid "Message"
 msgstr "Мэссэж"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1146,7 +1146,7 @@ msgid "Skiped"
 msgstr "Алгассан"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1176,7 +1176,7 @@ msgid "Survey Response Line"
 msgstr "Санал Асуулгын Хариултын Мөр"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1330,7 +1330,7 @@ msgid "Open"
 msgstr "Нээх"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1341,7 +1341,7 @@ msgid "Total Started Survey"
 msgstr "Нийт эхэлсэн санал асуулга"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1399,7 +1399,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Санал Асуулгын Хариултыг Гүйцээнэ үү"
@@ -1473,8 +1473,8 @@ msgid "Portrait(Vertical)"
 msgstr "Босоо"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1491,19 +1491,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Та нөөцийг хуулбарлаж болохгүй!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1534,7 +1534,7 @@ msgid "Pages"
 msgstr "Хуудсууд"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1584,58 +1584,58 @@ msgid "Error message"
 msgstr "Алдааны мэссэж"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1656,7 +1656,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1761,7 +1761,7 @@ msgid "Table"
 msgstr "Хүснэгт"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po
index 989680d9271..a59ee45a655 100644
--- a/addons/survey/i18n/nl.po
+++ b/addons/survey/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 21:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Enkele tekstbox"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Opmerkingsveld toevoegen"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Stuur een herinnering naar bestaande gebruiker"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -293,7 +293,7 @@ msgid " Column heading"
 msgstr " Kolomkop"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr "De volgende enquêtes staan niet geopende staat: %s"
@@ -325,8 +325,8 @@ msgid "Rating Scale"
 msgstr "Waarderingsschaal"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -351,7 +351,7 @@ msgid "Survey Open Date"
 msgstr "Begindatum enquête"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr "U kunt niet meerdere keren hetzelfde antwoord kiezen."
@@ -372,8 +372,8 @@ msgid "Edit Survey"
 msgstr "Enquête bewerken"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr "Voer a.u.b. een heel getal in."
@@ -384,7 +384,7 @@ msgid "Menu Choice"
 msgstr "Menukeuze"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -408,7 +408,7 @@ msgid "Survey Answer Line"
 msgstr "Enquête antwoordregel"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -509,7 +509,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Opmerking tekst niet valideren"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr "U moet een of meerdere menukeuzes ingeven in de kolomkop."
@@ -545,9 +545,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Beoordelingsplan stadium"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr "Onbekend"
@@ -589,8 +589,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopie)"
@@ -611,7 +611,7 @@ msgid "Select Partner"
 msgstr "Relatie selecteren"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr "Maximum vereist antwoord is groter dan minimum vereist antwoord."
@@ -664,7 +664,7 @@ msgid "Error Message"
 msgstr "Foutmelding"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr "U kunt deze enquête niet meer dan %s beantwoorden."
@@ -721,7 +721,7 @@ msgid "Paragraph of Text"
 msgstr "Paragraaf tekst"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -746,7 +746,7 @@ msgid "Options"
 msgstr "Instellingen"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -850,8 +850,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Stel in op één als u slechts één antwoord per gebruiker wilt"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -870,7 +870,7 @@ msgid "Message"
 msgstr "Bericht"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1168,7 +1168,7 @@ msgid "Skiped"
 msgstr "Overgeslagen"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1198,7 +1198,7 @@ msgid "Survey Response Line"
 msgstr "Enquête antwoord regel"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1351,7 +1351,7 @@ msgid "Open"
 msgstr "Open"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1362,7 +1362,7 @@ msgid "Total Started Survey"
 msgstr "Totaal gestarte enquêtes"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1420,7 +1420,7 @@ msgid "Email Notification on Answer"
 msgstr "E-mail notificatie bij antwoord"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Volledig enquête antwoord"
@@ -1494,8 +1494,8 @@ msgid "Portrait(Vertical)"
 msgstr "Staand(verticaal)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr "Uitnodiging voor %s."
@@ -1512,19 +1512,19 @@ msgid "Supplier Selection"
 msgstr "Leverancier Selectie"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "U kunt de resource niet dupliceren!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1555,7 +1555,7 @@ msgid "Pages"
 msgstr "Pagina's"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1605,58 +1605,58 @@ msgid "Error message"
 msgstr "Foutmelding"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1677,7 +1677,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1782,7 +1782,7 @@ msgid "Table"
 msgstr "Tabel"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr "U kunt niet antwoorden omdat de enquête niet geopend is."
diff --git a/addons/survey/i18n/pl.po b/addons/survey/i18n/pl.po
index 7d994dc74b3..2344356fd44 100644
--- a/addons/survey/i18n/pl.po
+++ b/addons/survey/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-26 06:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "Wiadomość"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "Otwórz"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/pt.po b/addons/survey/i18n/pt.po
index 0dab6aa3a3a..db82ca2b641 100644
--- a/addons/survey/i18n/pt.po
+++ b/addons/survey/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 17:36+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Caixas de texto simples"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -178,7 +178,7 @@ msgid "Add Comment Field"
 msgstr "Adicionar um campo para comentários"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -204,7 +204,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -227,7 +227,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Enviar lembrete para o utilizador existente"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -295,7 +295,7 @@ msgid " Column heading"
 msgstr " Título da coluna"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -327,8 +327,8 @@ msgid "Rating Scale"
 msgstr "Escala de Avaliação"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -351,7 +351,7 @@ msgid "Survey Open Date"
 msgstr "Data de Abertura do inquérito"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -372,8 +372,8 @@ msgid "Edit Survey"
 msgstr "Editar inquérito"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr "Por favor, indique um número inteiro."
@@ -384,7 +384,7 @@ msgid "Menu Choice"
 msgstr "Opção do Menu"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -408,7 +408,7 @@ msgid "Survey Answer Line"
 msgstr "Linha de Resposta do Inquérito"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -492,7 +492,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Não validar texto do comentário."
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -528,9 +528,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Fase do plano de avaliação"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -572,8 +572,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
@@ -594,7 +594,7 @@ msgid "Select Partner"
 msgstr "Selecionar Parceiro"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -647,7 +647,7 @@ msgid "Error Message"
 msgstr "Mensagem de erro"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -704,7 +704,7 @@ msgid "Paragraph of Text"
 msgstr "Parágrafo"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -729,7 +729,7 @@ msgid "Options"
 msgstr "Opções"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -833,8 +833,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Colocar para um se apenas necessita de uma resposta por utilizador"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -852,7 +852,7 @@ msgid "Message"
 msgstr "Mensagem"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1149,7 +1149,7 @@ msgid "Skiped"
 msgstr "Ignorado"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1179,7 +1179,7 @@ msgid "Survey Response Line"
 msgstr "Linha de resposta do Inquérito"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1332,7 +1332,7 @@ msgid "Open"
 msgstr "Abrir"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1343,7 +1343,7 @@ msgid "Total Started Survey"
 msgstr "Total de Questionario Iniciado"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1400,7 +1400,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Complete Resposta do Inquérito"
@@ -1474,8 +1474,8 @@ msgid "Portrait(Vertical)"
 msgstr "Retrato(Vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1492,19 +1492,19 @@ msgid "Supplier Selection"
 msgstr "Seleção de fornecedor"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Não pode duplicar recursos!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1535,7 +1535,7 @@ msgid "Pages"
 msgstr "Páginas"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1585,58 +1585,58 @@ msgid "Error message"
 msgstr "Mensagem de erro"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1657,7 +1657,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1763,7 +1763,7 @@ msgid "Table"
 msgstr "Tabela"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index 1a8f253f938..2ac02d46cfc 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-10-17 00:09+0000\n"
 "Last-Translator: ERIVELTON PIRES GUEDES <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Caixas de texto simples"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr "Adicionar Campo de Comentário"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Enviar lembrete para usuário existente"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr " Título de coluna"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Data de Abertura da Pesquisa"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr "Editar Pesquisa"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr "Menu de Escolha"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr "Linha de Resposta da Pesquisa"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Fase do Plano de Avaliação"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Selecione o Parceiro"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr "Mensagem de Erro"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr "Parágrafo de Texto"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr "Opções"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -822,8 +822,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Informe 1 caso somente uma resposta por usuário sejá requerida"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -841,7 +841,7 @@ msgid "Message"
 msgstr "Mensagem"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1137,7 +1137,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1167,7 +1167,7 @@ msgid "Survey Response Line"
 msgstr "Linha de Resposta da Pesquisa"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1320,7 +1320,7 @@ msgid "Open"
 msgstr "Abrir"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1331,7 +1331,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1387,7 +1387,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Resposta Completa da Pesquisa"
@@ -1461,8 +1461,8 @@ msgid "Portrait(Vertical)"
 msgstr "Retrato (Vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1479,19 +1479,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Você não pode duplicar o recurso!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1520,7 +1520,7 @@ msgid "Pages"
 msgstr "Páginas"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1568,58 +1568,58 @@ msgid "Error message"
 msgstr "Mensagem de erro"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1638,7 +1638,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1742,7 +1742,7 @@ msgid "Table"
 msgstr "Tabela"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/ro.po b/addons/survey/i18n/ro.po
index 2cfa5b2858c..aabc6c0bb56 100644
--- a/addons/survey/i18n/ro.po
+++ b/addons/survey/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:51+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Casute de text unice"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Adauga Camp Comentarii"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "asistent.nume.sondaj"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -226,7 +226,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Trimite memento pentru utilizator existent"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -296,7 +296,7 @@ msgid " Column heading"
 msgstr " Titlul coloanei"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -330,8 +330,8 @@ msgid "Rating Scale"
 msgstr "Scara de clasificare"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -354,7 +354,7 @@ msgid "Survey Open Date"
 msgstr "Data de incepere a sondajului"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -375,8 +375,8 @@ msgid "Edit Survey"
 msgstr "Editeaza Sondajul"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -387,7 +387,7 @@ msgid "Menu Choice"
 msgstr "Meniu optiuni"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -411,7 +411,7 @@ msgid "Survey Answer Line"
 msgstr "Linie Raspuns Sondaj"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -495,7 +495,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Nu validati textul comentariului"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -531,9 +531,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Etapa Planului de evaluare"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -575,8 +575,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -597,7 +597,7 @@ msgid "Select Partner"
 msgstr "Selecteaza Partenerul"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -650,7 +650,7 @@ msgid "Error Message"
 msgstr "Mesaj Eroare"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -707,7 +707,7 @@ msgid "Paragraph of Text"
 msgstr "Paragraf al textului"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -734,7 +734,7 @@ msgid "Options"
 msgstr "Optiuni"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -838,8 +838,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Setati pe unu daca solicitati un singur Raspuns per utilizator"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -857,7 +857,7 @@ msgid "Message"
 msgstr "Mesaj"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1155,7 +1155,7 @@ msgid "Skiped"
 msgstr "Omis"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1185,7 +1185,7 @@ msgid "Survey Response Line"
 msgstr "Linie de Raspuns la Sondaj"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1338,7 +1338,7 @@ msgid "Open"
 msgstr "Deschide"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1349,7 +1349,7 @@ msgid "Total Started Survey"
 msgstr "Total Sondaj Inceput"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1407,7 +1407,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Completeaza Raspuns la sondaj"
@@ -1481,8 +1481,8 @@ msgid "Portrait(Vertical)"
 msgstr "Portret (vertical)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1499,19 +1499,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Nu puteti copia resursa!"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1542,7 +1542,7 @@ msgid "Pages"
 msgstr "Pagini"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1592,58 +1592,58 @@ msgid "Error message"
 msgstr "Mesaj de eroare"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1664,7 +1664,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1770,7 +1770,7 @@ msgid "Table"
 msgstr "Tabel"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/ru.po b/addons/survey/i18n/ru.po
index 7e028db4655..5c5332647fa 100644
--- a/addons/survey/i18n/ru.po
+++ b/addons/survey/i18n/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-07-10 21:03+0000\n"
 "Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Дата открытия опроса"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "Сообщение"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "Открыть"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index 727e8d42830..b4dca53d169 100644
--- a/addons/survey/i18n/sl.po
+++ b/addons/survey/i18n/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-01-27 14:22+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/sr.po b/addons/survey/i18n/sr.po
index d4502650ef6..96631171557 100644
--- a/addons/survey/i18n/sr.po
+++ b/addons/survey/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 17:42+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Pošalji podsetnik postojećem korisniku"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Datum otvaranja Ankete"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Odaberi Partnera"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "Poruka"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr "Preskočen"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "Otvori"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr "Ukupno pokrenuto Anketa"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/sr@latin.po b/addons/survey/i18n/sr@latin.po
index 0948f6d2224..436688825f3 100644
--- a/addons/survey/i18n/sr@latin.po
+++ b/addons/survey/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-05-10 18:12+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr "Pošalji podsetnik postojećem korisniku"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr "Datum otvaranja Ankete"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr "Odaberi Partnera"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "Poruka"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr "Preskočen"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "Otvori"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr "Ukupno pokrenuto Anketa"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/sv.po b/addons/survey/i18n/sv.po
index 98db1f932c9..12ab696e900 100644
--- a/addons/survey/i18n/sv.po
+++ b/addons/survey/i18n/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-11 15:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -175,7 +175,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -199,7 +199,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -219,7 +219,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -285,7 +285,7 @@ msgid " Column heading"
 msgstr " Kolumnrubrik"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -317,8 +317,8 @@ msgid "Rating Scale"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -341,7 +341,7 @@ msgid "Survey Open Date"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -362,8 +362,8 @@ msgid "Edit Survey"
 msgstr "Redigera enkät"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -374,7 +374,7 @@ msgid "Menu Choice"
 msgstr "Menyval"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -398,7 +398,7 @@ msgid "Survey Answer Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -482,7 +482,7 @@ msgid "Don't Validate Comment Text."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -518,9 +518,9 @@ msgid "Evaluation Plan Phase"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -562,8 +562,8 @@ msgid "Email"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -584,7 +584,7 @@ msgid "Select Partner"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -637,7 +637,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/tr.po b/addons/survey/i18n/tr.po
index 84c8287514d..646f86d1d10 100644
--- a/addons/survey/i18n/tr.po
+++ b/addons/survey/i18n/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 17:40+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -23,7 +23,7 @@ msgid "Single Textboxes"
 msgstr "Tek metin Kutucuğu"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -177,7 +177,7 @@ msgid "Add Comment Field"
 msgstr "Yorum Alanı Ekle"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -203,7 +203,7 @@ msgid "survey.name.wiz"
 msgstr "anket.ad.sih"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -293,7 +293,7 @@ msgid " Column heading"
 msgstr " Sütun Başlığı"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr ""
@@ -325,8 +325,8 @@ msgid "Rating Scale"
 msgstr "Ölçüm Skalası (Rating Scale)"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -349,7 +349,7 @@ msgid "Survey Open Date"
 msgstr "Anket Başlangıç Tarihi"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -370,8 +370,8 @@ msgid "Edit Survey"
 msgstr "Anket Düzenle"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr ""
@@ -382,7 +382,7 @@ msgid "Menu Choice"
 msgstr "Menü Seçeneği"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -406,7 +406,7 @@ msgid "Survey Answer Line"
 msgstr "Anket Cevap Satırı"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -490,7 +490,7 @@ msgid "Don't Validate Comment Text."
 msgstr "Metnin geçerliliğini kontrol etme"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr ""
@@ -526,9 +526,9 @@ msgid "Evaluation Plan Phase"
 msgstr "Eleme Planı Fazı"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr ""
@@ -570,8 +570,8 @@ msgid "Email"
 msgstr "Email"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -592,7 +592,7 @@ msgid "Select Partner"
 msgstr "Ortak Seç"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -645,7 +645,7 @@ msgid "Error Message"
 msgstr "Hata Mesajı"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr ""
@@ -702,7 +702,7 @@ msgid "Paragraph of Text"
 msgstr "Metnin Paragrafı"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -727,7 +727,7 @@ msgid "Options"
 msgstr "Seçenekler"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr ""
@@ -830,8 +830,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "Eğer kullanıcı başına bir cevap gerekiyorsa seçiniz"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -849,7 +849,7 @@ msgid "Message"
 msgstr "Mesaj"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1145,7 +1145,7 @@ msgid "Skiped"
 msgstr "Atlanmış"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1175,7 +1175,7 @@ msgid "Survey Response Line"
 msgstr "Anket Cevap Hattı"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1328,7 +1328,7 @@ msgid "Open"
 msgstr "Açık"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1339,7 +1339,7 @@ msgid "Total Started Survey"
 msgstr "Toplam Başlatılmış Anket"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1393,7 +1393,7 @@ msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Anketi Yanıtlar"
@@ -1467,8 +1467,8 @@ msgid "Portrait(Vertical)"
 msgstr "Dikey"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr ""
@@ -1485,19 +1485,19 @@ msgid "Supplier Selection"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "Kaynağın bir eşini kopyalayamazsınız(duplicate)"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1528,7 +1528,7 @@ msgid "Pages"
 msgstr "Sayfalar"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1578,58 +1578,58 @@ msgid "Error message"
 msgstr "Hata mesajı"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1650,7 +1650,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1754,7 +1754,7 @@ msgid "Table"
 msgstr "Tablo"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr ""
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 30fbc3203c9..8f6d190254d 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 14:29+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
 #: view:survey.question.column.heading:0
@@ -29,7 +29,7 @@ msgid "Single Textboxes"
 msgstr "单行文本框"
 
 #. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
 #, python-format
 msgid ""
 "Minimum Required Answer you                                     entered is "
@@ -181,7 +181,7 @@ msgid "Add Comment Field"
 msgstr "增加注释字段"
 
 #. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
 #, python-format
 msgid ""
 "#Required Answer you entered                                     is greater "
@@ -205,7 +205,7 @@ msgid "survey.name.wiz"
 msgstr "survey.name.wiz"
 
 #. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -225,7 +225,7 @@ msgid "Send Reminder for Existing User"
 msgstr "为现有用户发送提醒"
 
 #. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
 #, python-format
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
@@ -291,7 +291,7 @@ msgid " Column heading"
 msgstr " 列头"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "The following surveys are not in open state: %s"
 msgstr "下列调查不在开放状态：%s"
@@ -323,8 +323,8 @@ msgid "Rating Scale"
 msgstr "rating scale"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
 #, python-format
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
@@ -347,7 +347,7 @@ msgid "Survey Open Date"
 msgstr "调查开展日期"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
 #, python-format
 msgid "You cannot select the same answer more than one time."
 msgstr ""
@@ -368,8 +368,8 @@ msgid "Edit Survey"
 msgstr "编辑问卷"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
 msgstr "请输入一个整型值"
@@ -380,7 +380,7 @@ msgid "Menu Choice"
 msgstr "菜单选项"
 
 #. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
 #, python-format
 msgid ""
 "You must enter one or more menu choices                                 in "
@@ -404,7 +404,7 @@ msgid "Survey Answer Line"
 msgstr "问卷答案明细"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
 #, python-format
 msgid ""
 "\n"
@@ -488,7 +488,7 @@ msgid "Don't Validate Comment Text."
 msgstr "未验证注释内容"
 
 #. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
 msgstr "你必须在列首输入一个或者多个菜单选择"
@@ -524,9 +524,9 @@ msgid "Evaluation Plan Phase"
 msgstr "评估计划阶段"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
 #: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
 msgstr "未知"
@@ -568,8 +568,8 @@ msgid "Email"
 msgstr "电子邮箱"
 
 #. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -590,7 +590,7 @@ msgid "Select Partner"
 msgstr "选择业务伙伴"
 
 #. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer."
 msgstr ""
@@ -643,7 +643,7 @@ msgid "Error Message"
 msgstr "错误消息"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You cannot answer this survey more than %s times."
 msgstr "你不能回答这个调查超过 %s 次。"
@@ -694,7 +694,7 @@ msgid "Paragraph of Text"
 msgstr "文本段落"
 
 #. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid ""
 "Maximum Required Answer you                                     entered for "
@@ -717,7 +717,7 @@ msgid "Options"
 msgstr "选项"
 
 #. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
 msgstr "你必须为提问 \"%s\" 输入一个或者多个答案（ %s页）。"
@@ -820,8 +820,8 @@ msgid "Set to one if  you require only one Answer per user"
 msgstr "如果你需要每个用户只提供一份答案，把它设为1"
 
 #. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
@@ -839,7 +839,7 @@ msgid "Message"
 msgstr "消息"
 
 #. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
 #, python-format
 msgid ""
 "You must enter one or more menu                                 choices in "
@@ -1135,7 +1135,7 @@ msgid "Skiped"
 msgstr "忽略"
 
 #. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
 #, python-format
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
@@ -1165,7 +1165,7 @@ msgid "Survey Response Line"
 msgstr "问卷回复明细"
 
 #. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
 #, python-format
 msgid "This survey has no pages defined. Please define pages first."
 msgstr ""
@@ -1318,7 +1318,7 @@ msgid "Open"
 msgstr "开始"
 
 #. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
 #, python-format
 msgid "You must enter one or more answers for question \"%s\" of page %s ."
 msgstr ""
@@ -1329,7 +1329,7 @@ msgid "Total Started Survey"
 msgstr "已开始的文件总数"
 
 #. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
 #, python-format
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
@@ -1383,7 +1383,7 @@ msgid "Email Notification on Answer"
 msgstr "Email提醒"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "完成问卷回复"
@@ -1457,8 +1457,8 @@ msgid "Portrait(Vertical)"
 msgstr "纵向打印（纵向）"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
 msgstr "邀请 %s"
@@ -1475,19 +1475,19 @@ msgid "Supplier Selection"
 msgstr "选择供应商"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
 msgstr "你不能选择相同的答案多余1次"
 
 #. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr "无法复制资源！"
 
 #. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
 #, python-format
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
@@ -1516,7 +1516,7 @@ msgid "Pages"
 msgstr "页面"
 
 #. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
 #, python-format
 msgid ""
 "#Required Answer you entered is                                     greater "
@@ -1564,58 +1564,58 @@ msgid "Error message"
 msgstr "错误消息"
 
 #. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
 #: code:addons/survey/survey.py:525
 #: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
 #: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
 #: code:addons/survey/wizard/survey_selection.py:80
 #: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
 
 #. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
 #, python-format
 msgid ""
 "Minimum Required Answer                                     you entered is "
@@ -1634,7 +1634,7 @@ msgid "ID"
 msgstr "编号"
 
 #. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
 #, python-format
 msgid ""
 "Maximum Required Answer is greater                                     than "
@@ -1738,7 +1738,7 @@ msgid "Table"
 msgstr "表格(Table)"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
 msgstr "你不能回答，因为调查还没开放。"
diff --git a/addons/warning/i18n/ar.po b/addons/warning/i18n/ar.po
index 907b6d2cc78..ecd97fa55d4 100644
--- a/addons/warning/i18n/ar.po
+++ b/addons/warning/i18n/ar.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "خط امر الشراء"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "رسالة لخط طلب البيع"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "رسالة لخط طلب المشتروات"
 msgid "Picking List"
 msgstr "قائمة الالتقاط"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "خط طلب البيع"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "فاتورة"
 msgid "Warning when Selling this Product"
 msgstr "تحذير عند بيع هذا المنتج"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "طلب بيع"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "أمر الشراء"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "رسالة لطلب البيع"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "رسالة للفاتورة"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,19 +162,19 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "تحذير لـ %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "تحذير على طلب البيع"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -208,6 +198,7 @@ msgstr "شريك"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "أمر المبيعات"
 
@@ -218,6 +209,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "سطر أمر المبيعات"
 
@@ -227,12 +219,27 @@ msgstr "سطر أمر المبيعات"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "لا بدّ أن يكون مرجع الأمر فريداً"
 
+#~ msgid "Sale Order"
+#~ msgstr "طلب بيع"
+
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "خطأ: كود إين غير صالح"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "خط طلب البيع"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "رسالة لخط طلب البيع"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "رسالة لطلب البيع"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "تحذير على طلب البيع"
+
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "رقم الفاتورة يجب أن يكون فريداً داخل المشأة !"
 
diff --git a/addons/warning/i18n/bg.po b/addons/warning/i18n/bg.po
index 39a5fdfedbb..7357c31880f 100644
--- a/addons/warning/i18n/bg.po
+++ b/addons/warning/i18n/bg.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-27 13:11+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Ред от поръчка за покупка"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Съобщение за ред от поръчка за продажба"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Съобщение за ред от поръчка за покупка"
 msgid "Picking List"
 msgstr "Списък за товарене"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Ред от поръчка за продажба"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Фактура"
 msgid "Warning when Selling this Product"
 msgstr "Предупреждение при продажба на този продукт"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Поръчка за продажба"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Вдигане от склад"
 msgid "Purchase Order"
 msgstr "Поръчка за покупка"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Съобщение за поръчка за продажба"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Предупреждение за %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Съобщение за фактура"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Предупреждение при поръчка за покупка"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Предупреждение за %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Предупреждение при поръчка за продажба"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Партньор"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Нареждане за продажба"
 
@@ -222,12 +213,28 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Ред от нареждане за продажба"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Невалиден XML за преглед на архитектурата"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Ред от поръчка за продажба"
+
+#~ msgid "Sale Order"
+#~ msgstr "Поръчка за продажба"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Съобщение за поръчка за продажба"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Предупреждение при поръчка за продажба"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Съобщение за ред от поръчка за продажба"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Модул за формуляр за предупреждения при промяна на събите"
 
diff --git a/addons/warning/i18n/bs.po b/addons/warning/i18n/bs.po
index c8e60cd0e67..02ba64da9c9 100644
--- a/addons/warning/i18n/bs.po
+++ b/addons/warning/i18n/bs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Faktura"
 msgid "Warning when Selling this Product"
 msgstr "Upozorenje kod Prodaje ovog Proizvoda"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Poruka za Fakturu"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,6 +209,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
diff --git a/addons/warning/i18n/ca.po b/addons/warning/i18n/ca.po
index 7d5eecefc46..cb3dea00dce 100644
--- a/addons/warning/i18n/ca.po
+++ b/addons/warning/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-30 11:00+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Línia de la comanda de compra"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Missatge per a la línia de la comanda de venda"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Missatge per a la línia de la comanda de compra"
 msgid "Picking List"
 msgstr "Albarà"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Línia de comanda de venda"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Factura"
 msgid "Warning when Selling this Product"
 msgstr "Avís quan ven aquest producte"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Comanda de venda"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Empaquetat d'estoc"
 msgid "Purchase Order"
 msgstr "Comanda de compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Missatge per a la comanda de venda"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -149,20 +129,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alerta per a %s!"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Missatge per a factura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -177,19 +167,19 @@ msgstr "Avís en la comanda de compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Avís per a %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Avís en la comanda de venda"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -213,6 +203,7 @@ msgstr "Empresa"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Comanda de venda"
 
@@ -223,12 +214,28 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Línia comanda de venda"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Missatge per a la línia de la comanda de venda"
+
+#~ msgid "Sale Order"
+#~ msgstr "Comanda de venda"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Missatge per a la comanda de venda"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línia de comanda de venda"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Avís en la comanda de venda"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Mòdul per la configuració d'avís en esdeveniments"
 
diff --git a/addons/warning/i18n/cs.po b/addons/warning/i18n/cs.po
index 7a5bb2ae0f6..97daa3a6ca4 100644
--- a/addons/warning/i18n/cs.po
+++ b/addons/warning/i18n/cs.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:56+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,6 +209,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
diff --git a/addons/warning/i18n/da.po b/addons/warning/i18n/da.po
index 0f817ce7ee5..b8953711127 100644
--- a/addons/warning/i18n/da.po
+++ b/addons/warning/i18n/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-27 06:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -145,20 +125,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -173,18 +163,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -209,6 +199,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -219,5 +210,6 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index d1938c6dbef..612671e7073 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 06:03+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
@@ -27,11 +27,6 @@ msgstr "Einkaufspositionen"
 msgid "Incoming Shipments"
 msgstr "Wareneingang"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Nachricht bei Auftragszeile"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Bachricht bei Beschaffungsauftragsposition"
 msgid "Picking List"
 msgstr "Lieferschein"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Verkaufsauftragsposition"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Rechnung"
 msgid "Warning when Selling this Product"
 msgstr "Warnung beim Verkauf des Produktes"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Verkaufsauftrag"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Lagerpackauftrag"
 msgid "Purchase Order"
 msgstr "Beschaffungsauftrag"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Nachricht bei Verkauf"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -149,20 +129,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Warnhinweis an %s"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Nachricht zu Rechnung"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -177,19 +167,19 @@ msgstr "Warnung beim Einkaufsauftrag"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Warnung für %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Warnung beim Verkaufsauftrag"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -213,6 +203,7 @@ msgstr "Partner"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Verkaufsauftrag"
 
@@ -223,15 +214,31 @@ msgstr "Warenauslieferung"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Nachricht bei Auftragszeile"
+
+#~ msgid "Sale Order"
+#~ msgstr "Verkaufsauftrag"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Nachricht bei Verkauf"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Verkaufsauftragsposition"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Module für Warnungen für on_change Event"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Warnung beim Verkaufsauftrag"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modul für Warnungen bei Statusänderungen"
 
diff --git a/addons/warning/i18n/el.po b/addons/warning/i18n/el.po
index 27e87f86dfc..d08f6bcfb66 100644
--- a/addons/warning/i18n/el.po
+++ b/addons/warning/i18n/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-17 10:49+0000\n"
 "Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Γραμμή Παραγγελίας Αγοράς"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr ""
 msgid "Picking List"
 msgstr "Λίστα Συλλογής"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Γραμμή Παραγγελίας Πώλησης"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Τιμολόγιο"
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Παραγγελία Πώλησης"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Εντολή Αγοράς"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Μύνημα για Παραγγελία Πώλησης"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -145,20 +125,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Μύνημα για Τιμολόγιο"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -173,19 +163,19 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Προειδοποίηση για %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Προειδοποίηση στην Παραγγελία Πώλησης"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -209,6 +199,7 @@ msgstr "Συνεργάτης"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -219,14 +210,27 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Γραμμή Παραγγελίας Πώλησης"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Σφάλμα! Δεν επιτρέπεται η δημιουργία μελών σε κυκλικό συσχετισμό"
 
+#~ msgid "Sale Order"
+#~ msgstr "Παραγγελία Πώλησης"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Μύνημα για Παραγγελία Πώλησης"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Άρθρωμα για φόρμα Προειδοποιήσεων στο Γεγονός με την αλλαγή"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Προειδοποίηση στην Παραγγελία Πώλησης"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Σφάλμα: Λανθασμένος κωδικός ΕΑΝ"
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 8b7ec1ab97d..0a4492b8bfb 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 12:55+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-22 11:31+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Línea pedido de compra"
 msgid "Incoming Shipments"
 msgstr "Envíos a recibir"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mensaje para la línea del pedido de venta"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Mensaje para la línea del pedido de compra"
 msgid "Picking List"
 msgstr "Albarán"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Línea pedido de venta"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Factura"
 msgid "Warning when Selling this Product"
 msgstr "Aviso cuando vende este producto"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Albarán de stock"
 msgid "Purchase Order"
 msgstr "Pedido de compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mensaje para el pedido de venta"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "¡Alerta para %s!"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr "Advertencia en el pedido de venta"
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr "Mensaje para el pedido de venta"
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Aviso en el pedido de compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Aviso para %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Aviso en el pedido de venta"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr "Mensaje para la línea de pedido de venta"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Empresa"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Pedido de venta"
 
@@ -222,12 +213,28 @@ msgstr "Órdenes de entrega"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mensaje para la línea del pedido de venta"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mensaje para el pedido de venta"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Aviso en el pedido de venta"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN no válido"
 
diff --git a/addons/warning/i18n/es_AR.po b/addons/warning/i18n/es_AR.po
index ac0ef061b64..3f9e83d3884 100644
--- a/addons/warning/i18n/es_AR.po
+++ b/addons/warning/i18n/es_AR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-23 14:41+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Línea de orden de compra"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mensaje para la línea del pedido de venta"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Mensaje para la línea de la orden de compra"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Línea del depedido de venta"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Factura"
 msgid "Warning when Selling this Product"
 msgstr "Aviso cuando venda este producto"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Stock Picking"
 msgid "Purchase Order"
 msgstr "Orden de compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mensaje para el pedido de venta"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Aviso en la orden de compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Aviso en el pedido de venta"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -221,14 +212,30 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea del depedido de venta"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mensaje para la línea del pedido de venta"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Módulo de formularios de aviso por cambios de evento"
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mensaje para el pedido de venta"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Módulo para formulario de avisos para cambios de evento"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Aviso en el pedido de venta"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
diff --git a/addons/warning/i18n/es_CR.po b/addons/warning/i18n/es_CR.po
index 90839dadf70..724cbb7936f 100644
--- a/addons/warning/i18n/es_CR.po
+++ b/addons/warning/i18n/es_CR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-02-20 01:14+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
 
 #. module: warning
@@ -28,11 +28,6 @@ msgstr "Línea pedido de compra"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mensaje para la línea del pedido de venta"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Mensaje para la línea del pedido de compra"
 msgid "Picking List"
 msgstr "Albarán"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Línea pedido de venta"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Factura"
 msgid "Warning when Selling this Product"
 msgstr "Aviso cuando vende este producto"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Pedido de venta"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Albarán de stock"
 msgid "Purchase Order"
 msgstr "Pedido de compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mensaje para el pedido de venta"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -149,20 +129,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "¡Alerta para %s!"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -177,19 +167,19 @@ msgstr "Aviso en el pedido de compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Aviso para %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Aviso en el pedido de venta"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -213,6 +203,7 @@ msgstr "Empresa"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Pedido de venta"
 
@@ -223,9 +214,25 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Línea pedido de venta"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mensaje para la línea del pedido de venta"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mensaje para el pedido de venta"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Aviso en el pedido de venta"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN no válido"
 
diff --git a/addons/warning/i18n/et.po b/addons/warning/i18n/et.po
index e9d71e65f34..43c89e9f324 100644
--- a/addons/warning/i18n/et.po
+++ b/addons/warning/i18n/et.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-09 20:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Ostukorralduse rida"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Sõnum müügikorralduse reale"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Sõnum ostukorralduse reale"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Müügikorralduse rida"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Arve"
 msgid "Warning when Selling this Product"
 msgstr "Hoiatus selle toote müümisel"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Müügikorraldus"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Laonope"
 msgid "Purchase Order"
 msgstr "Ostutellimus"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Sõnum müügikorraldusele"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Sõnum arvele"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,19 +162,19 @@ msgstr "Hoiatus ostukorraldusel"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Hoiatus müügikorraldusel"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,14 +209,30 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Sõnum müügikorralduse reale"
+
+#~ msgid "Sale Order"
+#~ msgstr "Müügikorraldus"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Sõnum müügikorraldusele"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Müügikorralduse rida"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Moodul hoiatuste jaoks muutuvalt sündmuselt"
 
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Moodul hoiatuste jaoks muutuvalt sündmuselt."
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Hoiatus müügikorraldusel"
diff --git a/addons/warning/i18n/fi.po b/addons/warning/i18n/fi.po
index d795328dea8..f095dbcece3 100644
--- a/addons/warning/i18n/fi.po
+++ b/addons/warning/i18n/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-06-08 10:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Ostotilauksen rivi"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Vietsi myyntitilausriville"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Viesti ostotilausriville"
 msgid "Picking List"
 msgstr "Keräilylista"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Myyntitilausrivi"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Lasku"
 msgid "Warning when Selling this Product"
 msgstr "Varoitus myytäessä tätä tuotetta"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Myyntitilaus"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Varatokeräily"
 msgid "Purchase Order"
 msgstr "Ostotilaus"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Viesti myyntitilaukselle"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -145,20 +125,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Varoita %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Viesti laskulle"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -173,19 +163,19 @@ msgstr "Varoitus ostotilaukselle"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Varoitus %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Varoitus ostotilaukselle"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -209,6 +199,7 @@ msgstr "Kumppani"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Myyntitilaus"
 
@@ -219,15 +210,31 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Myyntitilauksen Rivi"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Vietsi myyntitilausriville"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Myyntitilausrivi"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Tilauksen viite tulee olla yksilöllinen!"
 
+#~ msgid "Sale Order"
+#~ msgstr "Myyntitilaus"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Varoitus ostotilaukselle"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Viesti myyntitilaukselle"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Virhe: Väärä EAN-koodi"
 
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 4edb6a2225f..d0290bd6a11 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 08:33+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Ligne de bon de commande"
 msgid "Incoming Shipments"
 msgstr "Réceptions"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Message pour ligne de commande client"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Message à la ligne de commande"
 msgid "Picking List"
 msgstr "Liste de colisage"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Ligne de commande client"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Facture"
 msgid "Warning when Selling this Product"
 msgstr "Avertissement lorsque vous vendez cet article"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Commande Client"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Colisage"
 msgid "Purchase Order"
 msgstr "Commande fournisseur"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Message pour Commande Client"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alerte pour %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Message pour Facture"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Avertissement sur les commandes d'achat"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Avertissement pour %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Avertissement sur les Commandes de Ventes"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Partenaire"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Commande de vente"
 
@@ -222,12 +213,19 @@ msgstr "Livraisons"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Ligne de commande de vente"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
 
+#~ msgid "Sale Order"
+#~ msgstr "Commande Client"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Message pour Commande Client"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr ""
 #~ "Module pour gérer des Avertissements lors d'événements de changement sur les "
@@ -238,6 +236,9 @@ msgstr "Ligne de commande de vente"
 #~ "Module pour gérer des Avertissements lors d'événements de changement sur les "
 #~ "formulaires"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Avertissement sur les Commandes de Ventes"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr ""
 #~ "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
@@ -248,6 +249,12 @@ msgstr "Ligne de commande de vente"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "La référence de la commande doit être unique !"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Ligne de commande client"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Message pour ligne de commande client"
+
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "La référence doit être unique par société !"
 
diff --git a/addons/warning/i18n/gl.po b/addons/warning/i18n/gl.po
index 6eb5d6be825..28efbc20239 100644
--- a/addons/warning/i18n/gl.po
+++ b/addons/warning/i18n/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-05 01:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Liña pedido de compra"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mensaxe para a liña do pedido de venda"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Mensaxe para a liña do pedido de compra"
 msgid "Picking List"
 msgstr "Albará"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Liña pedido de venda"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Factura"
 msgid "Warning when Selling this Product"
 msgstr "Aviso cando venda este produto"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Pedido de venda"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Empaquetado de stock"
 msgid "Purchase Order"
 msgstr "Orde de Compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mensaxe para o pedido de venda"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alerta para %s!"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mensaxe para factura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Aviso no pedido de compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Aviso para %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Aviso no pedido de venda"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Socio"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Orde de venta"
 
@@ -222,18 +213,34 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Liña de ordes de venda"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Liña pedido de venda"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mensaxe para a liña do pedido de venda"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "A referencia do pedido debe ser única!"
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venda"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Módulo para a configuración de avisos en eventos"
 
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Módulo para a configuración de avisos en eventos"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Aviso no pedido de venda"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mensaxe para o pedido de venda"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN non válido"
 
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 3a7726dcd92..fb4a8d58ca6 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 21:02+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: warning
@@ -28,11 +28,6 @@ msgstr "Stavka naloga nabave"
 msgid "Incoming Shipments"
 msgstr "Primke"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Poruka za stavku prodajnog naloga"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Poruka za liniju dobave"
 msgid "Picking List"
 msgstr "Skladišni dokument"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Sale Order Line"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Račun"
 msgid "Warning when Selling this Product"
 msgstr "Upozorenje kod prodaje ovog proizvoda"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Sale Order"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Skladišnica"
 msgid "Purchase Order"
 msgstr "Nalog za nabavu"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Poruka za prodajni nalog"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alarm za %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Poruka uz račun"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Upozorenje vezano uz prodajnu narudžbu"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Upozorenje za %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Upozorenje vezano uz prodajni nalog"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Partner"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Prodajni nalog"
 
@@ -222,6 +213,7 @@ msgstr "Otpremnice"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Stavka prodajnog naloga"
 
@@ -234,5 +226,20 @@ msgstr "Stavka prodajnog naloga"
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Module for Warnings form onchange Event."
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Poruka za stavku prodajnog naloga"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Sale Order Line"
+
+#~ msgid "Sale Order"
+#~ msgstr "Sale Order"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Poruka za prodajni nalog"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Upozorenje vezano uz prodajni nalog"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: Neispravan barkod!"
diff --git a/addons/warning/i18n/hu.po b/addons/warning/i18n/hu.po
index fa1a0ade506..f95b95df64f 100644
--- a/addons/warning/i18n/hu.po
+++ b/addons/warning/i18n/hu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-02-04 15:42+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Szállítói megrendelés sor"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Üzenet a vevői megrendelés sorról"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Üzenet a szállítói megrendelés sorról"
 msgid "Picking List"
 msgstr "Kiszedési lista"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Vevői megrendelés sor"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Számla"
 msgid "Warning when Selling this Product"
 msgstr "Figyelmeztetés, amikor ebből a termékből értékesítés történik"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Vevői megrendelés"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Készlet kiszedés"
 msgid "Purchase Order"
 msgstr "Szállítói megrendelés"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Üzenet a vevői megrendelésről"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Üzenet a számláról"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,19 +162,19 @@ msgstr "Figyelmeztetés a szállítói megrendelésre"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Figyelmeztetés a vevői megrendelésre"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -208,6 +198,7 @@ msgstr "Partner"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Vevői megrendelés"
 
@@ -218,6 +209,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Vevői megrendelés sor"
 
@@ -227,5 +219,20 @@ msgstr "Vevői megrendelés sor"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "A megrendelés hivatkozásnak egyedinek kell lennie!"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Vevői megrendelés sor"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Üzenet a vevői megrendelés sorról"
+
+#~ msgid "Sale Order"
+#~ msgstr "Vevői megrendelés"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Figyelmeztetés a vevői megrendelésre"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Üzenet a vevői megrendelésről"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Hiba: Érvénytelen vonalkód"
diff --git a/addons/warning/i18n/id.po b/addons/warning/i18n/id.po
index 6ab775b81b9..1e4ded13e23 100644
--- a/addons/warning/i18n/id.po
+++ b/addons/warning/i18n/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-09 08:35+0000\n"
 "Last-Translator: Budhi Hartono <klikmaxima@gmail.com>\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: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Daftar Order Pembelian"
 msgid "Incoming Shipments"
 msgstr "Pengiriman barang masuk"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr "Daftar pengambilan"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,5 +209,6 @@ msgstr "Order Pengiriman"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Daftar order penjualan"
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index 94fc0993850..c9259e64291 100644
--- a/addons/warning/i18n/it.po
+++ b/addons/warning/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-03 20:55+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Riga Ordine d'Acquisto"
 msgid "Incoming Shipments"
 msgstr "Spedizioni in Ingresso"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Messaggio per Riga Ordine di Vendita"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Messaggio per Riga Ordine di Acquisto"
 msgid "Picking List"
 msgstr "Bolla di prelievo"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Riga Ordine di vendita"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Fattura"
 msgid "Warning when Selling this Product"
 msgstr "Avviso sulla vendita di questo prodotto"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Ordine di Vendita"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Prelievo di Magazzino"
 msgid "Purchase Order"
 msgstr "Ordine di Acquisto"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Messaggio per l'Ordine di Vendita"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Allarme per %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Messaggio per Fattura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Avviso sull'Ordine di Acquisto"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Avviso per %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Avviso sull'Ordine di Vendita"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Partner"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Ordine di vendita"
 
@@ -221,12 +212,28 @@ msgstr "Ordini di Consegna"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Linea ordine di vendita"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
 
+#~ msgid "Sale Order"
+#~ msgstr "Ordine di Vendita"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Messaggio per l'Ordine di Vendita"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Riga Ordine di vendita"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Messaggio per Riga Ordine di Vendita"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Avviso sull'Ordine di Vendita"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modulo per il formulario Avvisi onchange Event"
 
diff --git a/addons/warning/i18n/ja.po b/addons/warning/i18n/ja.po
index 20faa3e46ba..fdc276d97dd 100644
--- a/addons/warning/i18n/ja.po
+++ b/addons/warning/i18n/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-06-16 21:49+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "発注オーダー行"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "受注オーダー行のためのメッセージ"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "発注オーダー行のためのメッセージ"
 msgid "Picking List"
 msgstr "集荷リスト"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "受注オーダー行"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "請求書"
 msgid "Warning when Selling this Product"
 msgstr "この製品の販売時に警告"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "受注オーダー"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "在庫集荷"
 msgid "Purchase Order"
 msgstr "発注オーダー"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "受注オーダーのためのメッセージ"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "%s の注意です。"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "請求書のためのメッセージ"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "発注オーダー時に警告"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "%s の警告です。"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "受注オーダー時に警告"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "パートナ"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "受注オーダー"
 
@@ -221,12 +212,22 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "受注オーダー行"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "受注オーダー行"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "受注オーダー行のためのメッセージ"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
+#~ msgid "Sale Order"
+#~ msgstr "受注オーダー"
+
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "参照は会社ごとに固有でなければいけません。"
 
@@ -239,5 +240,11 @@ msgstr "受注オーダー行"
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "請求書番号は会社ごとに固有である必要があります。"
 
+#~ msgid "Message for Sale Order"
+#~ msgstr "受注オーダーのためのメッセージ"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "受注オーダー時に警告"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "エラー：無効な商品識別番号です。"
diff --git a/addons/warning/i18n/ko.po b/addons/warning/i18n/ko.po
index 2b721ff31e0..480d9b48845 100644
--- a/addons/warning/i18n/ko.po
+++ b/addons/warning/i18n/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-09-08 12:52+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "구매 주문 라인"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "판매 주문 라인을 위한 메시지"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "구매 주문 라인을 위한 메시지"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "판매 주문 라인"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "인보이스"
 msgid "Warning when Selling this Product"
 msgstr "이 상품을 판매할 때 경고"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "판매 주문"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "스톡 피킹"
 msgid "Purchase Order"
 msgstr "구매 주문"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "판매 주문을 위한 메시지"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "인보이스를 위한 메시지"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "구매 주문에 관한 경고"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "판매 주문에 관한 경고"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -221,5 +212,21 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
+
+#~ msgid "Sale Order Line"
+#~ msgstr "판매 주문 라인"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "판매 주문 라인을 위한 메시지"
+
+#~ msgid "Sale Order"
+#~ msgstr "판매 주문"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "판매 주문을 위한 메시지"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "판매 주문에 관한 경고"
diff --git a/addons/warning/i18n/lt.po b/addons/warning/i18n/lt.po
index 4deb7cae4cd..aa9e191720e 100644
--- a/addons/warning/i18n/lt.po
+++ b/addons/warning/i18n/lt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-11 17:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Pardavimų užsakymo eilutė"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Žinutė pardavimų užsakymo eilutei"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Pardavimų užsakymo eilutė"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Sąskaita faktūra"
 msgid "Warning when Selling this Product"
 msgstr "Įspėjimas kai parduodate šį produktą"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Pardavimo užsakymas"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Pirkimo užsakymas"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Žinutė pardavimų užsakymui"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Žinutė sąskaitai faktūrai"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,19 +162,19 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Įspėjimas pardavimų užsakime"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,8 +209,21 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Pardavimų užsakymo eilutė"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Netinkamas XML peržiūros struktūrai!"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pardavimo užsakymas"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Žinutė pardavimų užsakymui"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Įspėjimas pardavimų užsakime"
diff --git a/addons/warning/i18n/mn.po b/addons/warning/i18n/mn.po
index 8d5f600238c..33989868dd7 100644
--- a/addons/warning/i18n/mn.po
+++ b/addons/warning/i18n/mn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-11-25 19:17+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Захиалгын мөр"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Борлуулалтын захиалгын мэссэж"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Худалдан авалтын захиалгын мэссэж"
 msgid "Picking List"
 msgstr "Бэлтгэх жагсаалт"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Борлуулалтын захиалгын мөр"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Нэхэмжлэл"
 msgid "Warning when Selling this Product"
 msgstr "Энэ барааг борлуулах үеийн сануулга"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Борлуулалтын захиалга"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Бараа бэлтгэлт"
 msgid "Purchase Order"
 msgstr "Худалдан авах захиалга"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Борлуулах захиалгын мессеж"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "%s-д зориулсан анхааруулга !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Нэхэмжлэлийн мессеж"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Худалдан авалтын анхааруулга"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "%s-д зориулсан анхааруулга"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Борлуулалтын захиалгын анхааруулга"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Харилцагч"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Борлуулалтын захиалга"
 
@@ -222,12 +213,28 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Борлуулалтын Захиалгын Мөр"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Борлуулалтын захиалгын мөр"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Борлуулах захиалгын мессеж"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Борлуулалтын захиалгын мэссэж"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
 
+#~ msgid "Sale Order"
+#~ msgstr "Борлуулалтын захиалга"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Борлуулалтын захиалгын анхааруулга"
+
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Компаний хэмжээнд нэхэмжлэлийн дугаар үл давхцах ёстой!"
 
diff --git a/addons/warning/i18n/nb.po b/addons/warning/i18n/nb.po
index c6197d4b220..84bd9fc9694 100644
--- a/addons/warning/i18n/nb.po
+++ b/addons/warning/i18n/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-04-07 07:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Innkjøpsordrelinje"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Melding for salgsordrelinje"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Melding for innkjøpsordelinje"
 msgid "Picking List"
 msgstr "Plukkliste"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Salgsordrelinje"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Faktura"
 msgid "Warning when Selling this Product"
 msgstr "Advarsel ved salg av dette produktet"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Salgsordre"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Innkjøpsordre"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Melding for salgsordre"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -145,20 +125,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Melding for faktura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -173,19 +163,19 @@ msgstr "Advarsel på innkjøpsordren"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Advarsel for %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Advarsel på salgsordren"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -209,6 +199,7 @@ msgstr "Partner"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Salgsordre"
 
@@ -219,11 +210,27 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Salgsordrelinje"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Salgsordrelinje"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Melding for salgsordrelinje"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Ordrereferanse må være unik !"
 
+#~ msgid "Sale Order"
+#~ msgstr "Salgsordre"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Advarsel på salgsordren"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Melding for salgsordre"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Feil: Ugyldig ean kode"
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index 3581bf08bff..5f15e510ace 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-11-25 20:39+0000\n"
-"Last-Translator: Mario Gielissen <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 19:08+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Inkooporderregel"
 msgid "Incoming Shipments"
 msgstr "Inkomende leveringen"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Bericht voor Verkooporderregel"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Bericht voor Aankooporderregel"
 msgid "Picking List"
 msgstr "Verzamellijst"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Verkooporderregel"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Factuur"
 msgid "Warning when Selling this Product"
 msgstr "Waarschuw bij verkopen van dit product"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Verkooporder"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Stock Picking"
 msgid "Purchase Order"
 msgstr "Inkooporder"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Bericht voor Verkooporder"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Bericht voor %s!"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr "Waarschuwing bij een verkooprder"
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Bericht voor Factuur"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr "Bericht bij een verkooporder"
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Waarschuwing op de inkooporder"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Waarschuwing voor %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Waarschuwing bij de verkooporder."
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr "Bericht bij een verkooporderregel"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr "Relatie"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Verkooporder"
 
@@ -222,9 +213,25 @@ msgstr "Uitgaande leveringen"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Verkooporderregel"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Bericht voor Verkooporderregel"
+
+#~ msgid "Sale Order"
+#~ msgstr "Verkooporder"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Bericht voor Verkooporder"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Verkooporderregel"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Waarschuwing bij de verkooporder."
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index a25fe53563c..03700447a7d 100644
--- a/addons/warning/i18n/nl_BE.po
+++ b/addons/warning/i18n/nl_BE.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-24 15:40+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,5 +209,6 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/warning/i18n/pl.po b/addons/warning/i18n/pl.po
index 69667e85189..f26e3ee27cf 100644
--- a/addons/warning/i18n/pl.po
+++ b/addons/warning/i18n/pl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-11-17 10:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Pozycja zamówienia zakupu"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Informacja dla pozycji zamówienia sprzedaży"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Informacja dla pozycji zamówienia sprzedaży"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Pozycja zamówienia sprzedaży"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Faktura"
 msgid "Warning when Selling this Product"
 msgstr "Ostrzeżenie przy sprzedaży tego produktu"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Zamówienie sprzedaży"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Zamówienie zakupu"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Notatka dla zamówienia sprzedaży"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Informacja dla faktury"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Ostrzeżenie dla zamówienia zakupu"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Ostrzeżenie dla zamówienia sprzedaży"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -221,8 +212,24 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Pozycja zamówienia sprzedaży"
+
+#~ msgid "Sale Order"
+#~ msgstr "Zamówienie sprzedaży"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Notatka dla zamówienia sprzedaży"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Ostrzeżenie dla zamówienia sprzedaży"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Informacja dla pozycji zamówienia sprzedaży"
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index 0cdb294d3be..7de457e874e 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/i18n/pt.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-11 15:41+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\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: 2012-12-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Linha de Ordem de Compra"
 msgid "Incoming Shipments"
 msgstr "Receções Agendadas"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mensagem para a Linha de Ordem de Venda"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Mensagem para Linha de Ordem de Compra"
 msgid "Picking List"
 msgstr "Lista Picking"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Linha de Ordem de Venda"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Fatura"
 msgid "Warning when Selling this Product"
 msgstr "Atenção Quando Vender este Artigo"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Ordem de Venda"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Recolha de Stock"
 msgid "Purchase Order"
 msgstr "Ordem de Compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mensagem para Ordem de Venda"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alerta para %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mensagem para Fatura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Aviso na Ordem de Compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Aviso para %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Aviso na Ordem de Venda"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Parceiro"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Ordem de Vendas"
 
@@ -221,9 +212,22 @@ msgstr "Ordens de entrega"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Linha da ordem de venda"
 
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mensagem para Ordem de Venda"
+
+#~ msgid "Sale Order"
+#~ msgstr "Ordem de Venda"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mensagem para a Linha de Ordem de Venda"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Linha de Ordem de Venda"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista!"
 
@@ -233,6 +237,9 @@ msgstr "Linha da ordem de venda"
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modulo para Formulários de Avisos de Eventos ."
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Aviso na Ordem de Venda"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN inválido"
 
diff --git a/addons/warning/i18n/pt_BR.po b/addons/warning/i18n/pt_BR.po
index 5f9c7690171..975efaac75e 100644
--- a/addons/warning/i18n/pt_BR.po
+++ b/addons/warning/i18n/pt_BR.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-12 23:35+0000\n"
-"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 23:03+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +28,6 @@ msgstr "Linha de Pedido de Compra"
 msgid "Incoming Shipments"
 msgstr "Recebimento de Mercadorias"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mensagem para Linha do Pedido de Venda"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +38,6 @@ msgstr "Mensagem para Linha do Pedido de Compra"
 msgid "Picking List"
 msgstr "Lista de Separação"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Linha do Pedido de Venda"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +90,6 @@ msgstr "Fatura"
 msgid "Warning when Selling this Product"
 msgstr "Aviso para quando Vender este Produto"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Pedido de Venda"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +101,6 @@ msgstr "Separação de Estoque"
 msgid "Purchase Order"
 msgstr "Pedido de Compra"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mensagem para Pedido de Venda"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alerta para %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr "Aviso no Pedido de Vendas"
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mensagem para Fatura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr "Mensagem para o Pedido de Vendas"
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +166,19 @@ msgstr "Aviso no Pedido de Compra"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Aviso para %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Aviso no Pedido de Venda"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr "Mensagem para a Linha do Pedido de Vendas"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,31 +202,48 @@ msgstr "Parceiro"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Pedido de Venda"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr "Ordens de entrega"
+msgstr "Ordens de Entrega"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Linha de Pedido de Vendas"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
 
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de Venda"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Linha do Pedido de Venda"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mensagem para Linha do Pedido de Venda"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Erro ! Você não pode criar membros recursivos associados."
 
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Referência de Pedido deve ser única !"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Aviso no Pedido de Venda"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN inválido"
 
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mensagem para Pedido de Venda"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Módulo para tela de Avisos no Evento onchange."
 
diff --git a/addons/warning/i18n/ro.po b/addons/warning/i18n/ro.po
index 6eedf44c7fa..4da5acbb6e8 100644
--- a/addons/warning/i18n/ro.po
+++ b/addons/warning/i18n/ro.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-11 16:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Linie comanda de achizitie"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Mesaj pentru Linia Comenzii de vanzare"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Mesaj pentru Linia Comenzii de Achizitie"
 msgid "Picking List"
 msgstr "Lista de ridicare"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Linia comenzii de vanzare"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Factura"
 msgid "Warning when Selling this Product"
 msgstr "Avertizare la Vanzarea acestui Produs"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Comanda de vanzare"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Ridicare stoc"
 msgid "Purchase Order"
 msgstr "Comanda de achizitie"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Mesaj pentru Comanda de vanzare"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Alarma pentru %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Mesaj pentru Factura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Avertizare pe Comanda de Achizitie"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Avertizare pentru %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Avertizare pe Comanda de Vanzare"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Partener"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Comanda de vanzare"
 
@@ -221,24 +212,40 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Linie comanda de vanzare"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Mesaj pentru Linia Comenzii de vanzare"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Modulul pentru Avertizări din Evenimentul in schimbare"
 
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modul pentru Avertizări din Evenimentul in schimbare."
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Avertizare pe Comanda de Vanzare"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Mesaj pentru Comanda de vanzare"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Referința comenzii trebuie să fie unică!"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Eroare ! Nu puteți crea membri asociați recursiv."
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Linia comenzii de vanzare"
+
 #~ msgid "Order Reference must be unique per Company!"
 #~ msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
 
+#~ msgid "Sale Order"
+#~ msgstr "Comanda de vanzare"
+
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "Referinta trebuie sa fie unica per Companie!"
 
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index 9e32298018a..e74cb386a3e 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-11 16:24+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Позиция заказа на закупку"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Сообщение о продаже позиции в заказе"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Сообщение о покупке позиции в заказе"
 msgid "Picking List"
 msgstr "Комплектовочный лист"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Позиция заказа на продажу"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Счет"
 msgid "Warning when Selling this Product"
 msgstr "Предупреждение при продаже этого товара"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Заказ на продажу"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Комплектование запасов"
 msgid "Purchase Order"
 msgstr "Заказ на закупку"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Сообщение для заказа на продажу"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Сигнал о %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Сообщение при выставлении счета"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Предупреждение при заказе на закупку"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Предупреждение для %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Предупреждение при заказе на продажу"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Контрагент"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Заказ на продажу"
 
@@ -221,18 +212,34 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Позиция заказа на продажу"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Сообщение о продаже позиции в заказе"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Сообщение для заказа на продажу"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Позиция заказа на продажу"
+
+#~ msgid "Sale Order"
+#~ msgstr "Заказ на продажу"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Модуль для предупреждений при внесении изменении"
 
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Модуль для предупреждений при внесении изменении"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Предупреждение при заказе на продажу"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
 
diff --git a/addons/warning/i18n/sl.po b/addons/warning/i18n/sl.po
index 34715a2fc75..69e72315682 100644
--- a/addons/warning/i18n/sl.po
+++ b/addons/warning/i18n/sl.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-03-01 21:10+0000\n"
 "Last-Translator: Matic Gradišer <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Postavka nabavnega naloga"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Sporočilo za vrstico prodajnega naročila"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Sporočilo za vrstico nakupnega naročila"
 msgid "Picking List"
 msgstr "Izbirni seznam"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Postavka prodajnega naloga"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Račun"
 msgid "Warning when Selling this Product"
 msgstr "Opozorilo pri prodaji tega produkta"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Prodajni nalog"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Izbira zaloge"
 msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Sporočilo za prodajno naročilo"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Opozorilo za %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Sporočilo za račun"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Opozorilo na nakupnem nalogu"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Opozorila za %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Opozorilo na prodajnem nalogu"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Partner"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Prodajno naročilo"
 
@@ -221,18 +212,34 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Postavka prodajnega naročila"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Postavka prodajnega naloga"
+
+#~ msgid "Sale Order"
+#~ msgstr "Prodajni nalog"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Sporočilo za vrstico prodajnega naročila"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Modul za opozorila na dogodek spremembe forme"
 
+#~ msgid "Message for Sale Order"
+#~ msgstr "Sporočilo za prodajno naročilo"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modula za opozorila dogodka spremembe na formi"
 
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Opozorilo na prodajnem nalogu"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Napaka: neveljavna ean koda"
 
diff --git a/addons/warning/i18n/sq.po b/addons/warning/i18n/sq.po
index 5bced18b695..f39b18f5951 100644
--- a/addons/warning/i18n/sq.po
+++ b/addons/warning/i18n/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:52+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -145,20 +125,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -173,18 +163,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -209,6 +199,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -219,5 +210,6 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index 4a1a743034d..a745eb68c1c 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/i18n/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-10-15 09:41+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Stavka Trebovanja"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Poruka Stavke Narudžbenice"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Poruka Stavke Trebovanja"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Stavka Narudžbenice"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Faktura"
 msgid "Warning when Selling this Product"
 msgstr "Upozorenej pri Prodaji ovog Proizvoda"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Nalog za prodaju"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Biranje Zaliha"
 msgid "Purchase Order"
 msgstr "Zahtev za nabavku"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Poruka za Narudžbenicu"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Upozorenje za Fakturu"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Upozorenje za Zahtev za Nabavku"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Upozorenje o kreiranje porudzbenice"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -222,9 +213,22 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Stavka Narudžbenice"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Poruka Stavke Narudžbenice"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Poruka za Narudžbenicu"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Upozorenje o kreiranje porudzbenice"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modul za Formu upozorenja za dogadjaj promene"
 
@@ -233,3 +237,6 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
+
+#~ msgid "Sale Order"
+#~ msgstr "Nalog za prodaju"
diff --git a/addons/warning/i18n/sr@latin.po b/addons/warning/i18n/sr@latin.po
index e4414298efe..c4b55eab12e 100644
--- a/addons/warning/i18n/sr@latin.po
+++ b/addons/warning/i18n/sr@latin.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-12-23 11:09+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr "Stavka Trebovanja"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Poruka Stavke Narudžbenice"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr "Poruka Stavke Trebovanja"
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Stavka Narudžbenice"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr "Faktura"
 msgid "Warning when Selling this Product"
 msgstr "Upozorenej pri Prodaji ovog Proizvoda"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Nalog za prodaju"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr "Biranje Zaliha"
 msgid "Purchase Order"
 msgstr "Zahtev za nabavku"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Poruka za Narudžbenicu"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -148,20 +128,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Upozorenje za Fakturu"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -176,19 +166,19 @@ msgstr "Upozorenje za Zahtev za Nabavku"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Upozorenje o kreiranje porudzbenice"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -212,6 +202,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -222,14 +213,30 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Poruka Stavke Narudžbenice"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Stavka Narudžbenice"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "Modul za Upozorenje za Dogadjaj promene"
 
+#~ msgid "Sale Order"
+#~ msgstr "Nalog za prodaju"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Poruka za Narudžbenicu"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Modul za Formu upozorenja za dogadjaj promene"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Upozorenje o kreiranje porudzbenice"
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index 0c8bc948410..55c057e4cb9 100644
--- a/addons/warning/i18n/sv.po
+++ b/addons/warning/i18n/sv.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2011-01-18 05:43+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Inköpsorderrad"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Meddelande för säljorderrad"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Meddelande för inköpsorderrad"
 msgid "Picking List"
 msgstr "Plocklista"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Säljorderrad"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Faktura"
 msgid "Warning when Selling this Product"
 msgstr "Varning när denna produkt säljs"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Försäljningsorder"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Plockning från lager"
 msgid "Purchase Order"
 msgstr "Inköpsorder"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Meddelande för kundorder"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "Var uppmärksam på %s !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Meddelande för faktura"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Varning på inköpsordern"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "Varning för %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Varning på kundordern"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Företag"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Kundorder"
 
@@ -221,9 +212,16 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Orderrad"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "Säljorderrad"
+
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Meddelande för säljorderrad"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Module for Warnings form onchange Event."
 
@@ -233,6 +231,9 @@ msgstr "Orderrad"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Orderreferensen måste vara unik !"
 
+#~ msgid "Sale Order"
+#~ msgstr "Försäljningsorder"
+
 #~ msgid "Reference must be unique per Company!"
 #~ msgstr "Referensen måste vara unik per bolag!"
 
@@ -250,3 +251,9 @@ msgstr "Orderrad"
 
 #~ msgid "Invoice Number must be unique per Company!"
 #~ msgstr "Fakturanummer måste vara unikt per bolag!"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Meddelande för kundorder"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Varning på kundordern"
diff --git a/addons/warning/i18n/tlh.po b/addons/warning/i18n/tlh.po
index 6b7bbe558ad..f83a6142d58 100644
--- a/addons/warning/i18n/tlh.po
+++ b/addons/warning/i18n/tlh.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,5 +209,6 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 96d9481c649..1aef3b6c23a 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-01-25 00:10+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "Alış Sipariş Kalemi"
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "Satış Siparişi için Mesaj"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "Alış Siparişi için Mesaj"
 msgid "Picking List"
 msgstr "Paket Listesi"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "Satış Sipariş Kalemi"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "Fatura"
 msgid "Warning when Selling this Product"
 msgstr "Bu Ürün Satılırken yapılacak Uyarı"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "Satış Siparişi"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "Stok Hazırlığı"
 msgid "Purchase Order"
 msgstr "Satınalma Siparişi"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "Satış Siparişi için Mesaj"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "%s için uyarı !"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "Fatura Mesajı"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "Alış Siparişi Uyarısı"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "%s için uyarı"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "Satış Siparişi Uyarısı"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "Ortak"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "Satış Siparişi"
 
@@ -221,12 +212,28 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "Satış Siparişi Kalemi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "Satış Siparişi için Mesaj"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Satış Sipariş Kalemi"
+
+#~ msgid "Sale Order"
+#~ msgstr "Satış Siparişi"
+
+#~ msgid "Message for Sale Order"
+#~ msgstr "Satış Siparişi için Mesaj"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "Satış Siparişi Uyarısı"
+
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "Onchange olaylarından genen uyarılar için modül"
 
diff --git a/addons/warning/i18n/uk.po b/addons/warning/i18n/uk.po
index ea6b33d3224..91ea3041056 100644
--- a/addons/warning/i18n/uk.po
+++ b/addons/warning/i18n/uk.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2009-04-10 10:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,6 +209,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
 
diff --git a/addons/warning/i18n/vi.po b/addons/warning/i18n/vi.po
index f56dd5d9f8f..c0aca0d2ab3 100644
--- a/addons/warning/i18n/vi.po
+++ b/addons/warning/i18n/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-02 14:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -28,11 +28,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -43,11 +38,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -100,11 +90,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -116,11 +101,6 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -145,20 +125,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -173,18 +163,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -209,6 +199,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -219,5 +210,6 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index bf2eb410c8c..1074c15ff4b 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:17+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr "采购订单明细"
 msgid "Incoming Shipments"
 msgstr "入库"
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr "销售订单明细消息"
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr "采购订单明细消息"
 msgid "Picking List"
 msgstr "装箱单"
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr "销售订单明细"
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr "发票"
 msgid "Warning when Selling this Product"
 msgstr "销售这产品时的警告"
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr "销售订单"
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "库存装箱"
 msgid "Purchase Order"
 msgstr "采购订单"
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr "销售订单消息"
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -147,20 +127,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr "警报%s ！"
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr "发票消息"
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -175,19 +165,19 @@ msgstr "采购订单警告"
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr "警告 %s"
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
-msgstr "销售订单警告"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -211,6 +201,7 @@ msgstr "业务伙伴"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr "销售订单"
 
@@ -221,9 +212,19 @@ msgstr "送货单"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr "销售订单明细"
 
+#~ msgid "Sale Order Line"
+#~ msgstr "销售订单明细"
+
+#~ msgid "Sale Order"
+#~ msgstr "销售订单"
+
+#~ msgid "Warning on the Sale Order"
+#~ msgstr "销售订单警告"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
@@ -233,9 +234,15 @@ msgstr "销售订单明细"
 #~ msgid "Module for Warnings form onchange Event."
 #~ msgstr "模块提供事件变更警告。"
 
+#~ msgid "Message for Sale Order"
+#~ msgstr "销售订单消息"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "错误：无效的(EAN)条码"
 
+#~ msgid "Message for Sale Order Line"
+#~ msgstr "销售订单明细消息"
+
 #~ msgid "Module for Warnings form onchange Event"
 #~ msgstr "模块提供事件变更警告"
 
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index b1a25ffd4ca..8181fe6a2d0 100644
--- a/addons/warning/i18n/zh_TW.po
+++ b/addons/warning/i18n/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2010-08-13 11:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2012-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -27,11 +27,6 @@ msgstr ""
 msgid "Incoming Shipments"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
@@ -42,11 +37,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
@@ -99,11 +89,6 @@ msgstr ""
 msgid "Warning when Selling this Product"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
@@ -115,11 +100,6 @@ msgstr "選股"
 msgid "Purchase Order"
 msgstr ""
 
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
@@ -144,20 +124,30 @@ msgstr ""
 #: code:addons/warning/warning.py:67
 #: code:addons/warning/warning.py:96
 #: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
 
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
@@ -172,18 +162,18 @@ msgstr ""
 #: code:addons/warning/warning.py:68
 #: code:addons/warning/warning.py:97
 #: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
 msgstr ""
 
 #. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
 msgstr ""
 
 #. module: warning
@@ -208,6 +198,7 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
 msgid "Sales Order"
 msgstr ""
 
@@ -218,5 +209,6 @@ msgstr ""
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
 msgstr ""
diff --git a/addons/web_linkedin/i18n/de.po b/addons/web_linkedin/i18n/de.po
index f965b57534f..d97ee6f1438 100644
--- a/addons/web_linkedin/i18n/de.po
+++ b/addons/web_linkedin/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-16 19:35+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/es.po b/addons/web_linkedin/i18n/es.po
index 1ff0edb39e8..092cab64f9f 100644
--- a/addons/web_linkedin/i18n/es.po
+++ b/addons/web_linkedin/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 12:54+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/fr.po b/addons/web_linkedin/i18n/fr.po
index 823792c9017..9119b9e4873 100644
--- a/addons/web_linkedin/i18n/fr.po
+++ b/addons/web_linkedin/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 10:54+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/hr.po b/addons/web_linkedin/i18n/hr.po
index cd36d145b3b..ca703c87599 100644
--- a/addons/web_linkedin/i18n/hr.po
+++ b/addons/web_linkedin/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 07:03+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/it.po b/addons/web_linkedin/i18n/it.po
index e0507535192..f6da09caccb 100644
--- a/addons/web_linkedin/i18n/it.po
+++ b/addons/web_linkedin/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-14 21:06+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:06+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/nl.po b/addons/web_linkedin/i18n/nl.po
index 5e390344ae5..38045395a63 100644
--- a/addons/web_linkedin/i18n/nl.po
+++ b/addons/web_linkedin/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 16:29+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/pl.po b/addons/web_linkedin/i18n/pl.po
index 99b3517d286..181ecb33fa4 100644
--- a/addons/web_linkedin/i18n/pl.po
+++ b/addons/web_linkedin/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 10:09+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/pt.po b/addons/web_linkedin/i18n/pt.po
index e32db7518ad..1b205d3d905 100644
--- a/addons/web_linkedin/i18n/pt.po
+++ b/addons/web_linkedin/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-05 09:47+0000\n"
-"Last-Translator: Aires Correia Lopes Silvestre <aires.silvestre@gmail.com>\n"
+"Last-Translator: Alien Group Lda <aires.silvestre@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/pt_BR.po b/addons/web_linkedin/i18n/pt_BR.po
index 0590d90bf60..60016c18b49 100644
--- a/addons/web_linkedin/i18n/pt_BR.po
+++ b/addons/web_linkedin/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 22:11+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_linkedin/i18n/ro.po b/addons/web_linkedin/i18n/ro.po
index 8997f261e33..4b20ddbad4d 100644
--- a/addons/web_linkedin/i18n/ro.po
+++ b/addons/web_linkedin/i18n/ro.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 04:41+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
diff --git a/addons/web_linkedin/i18n/zh_CN.po b/addons/web_linkedin/i18n/zh_CN.po
index af82f070f6e..a10ea1664dc 100644
--- a/addons/web_linkedin/i18n/zh_CN.po
+++ b/addons/web_linkedin/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-28 09:35+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_shortcuts/i18n/de.po b/addons/web_shortcuts/i18n/de.po
index 9dd1d63342b..50c56ce2ac6 100644
--- a/addons/web_shortcuts/i18n/de.po
+++ b/addons/web_shortcuts/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 07:22+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/es.po b/addons/web_shortcuts/i18n/es.po
index aa4bcb722e0..00fd28efdcb 100644
--- a/addons/web_shortcuts/i18n/es.po
+++ b/addons/web_shortcuts/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 12:54+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/fr.po b/addons/web_shortcuts/i18n/fr.po
index 2b8a613a9d9..bd898573be9 100644
--- a/addons/web_shortcuts/i18n/fr.po
+++ b/addons/web_shortcuts/i18n/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 08:11+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/hr.po b/addons/web_shortcuts/i18n/hr.po
index ac3b78371b4..0fd52d531ee 100644
--- a/addons/web_shortcuts/i18n/hr.po
+++ b/addons/web_shortcuts/i18n/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 06:51+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/it.po b/addons/web_shortcuts/i18n/it.po
index 2508876eef0..25c16705dc4 100644
--- a/addons/web_shortcuts/i18n/it.po
+++ b/addons/web_shortcuts/i18n/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 07:33+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/nl.po b/addons/web_shortcuts/i18n/nl.po
index 1d5d9802f60..6dbf570e3bd 100644
--- a/addons/web_shortcuts/i18n/nl.po
+++ b/addons/web_shortcuts/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 19:29+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/pl.po b/addons/web_shortcuts/i18n/pl.po
index 47928149541..c7ecdbae91f 100644
--- a/addons/web_shortcuts/i18n/pl.po
+++ b/addons/web_shortcuts/i18n/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-17 10:08+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/pt.po b/addons/web_shortcuts/i18n/pt.po
index a3185a4bb00..b0e11d535b5 100644
--- a/addons/web_shortcuts/i18n/pt.po
+++ b/addons/web_shortcuts/i18n/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-05 10:09+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/pt_BR.po b/addons/web_shortcuts/i18n/pt_BR.po
index 8aa3d4bc930..432dd30bfbf 100644
--- a/addons/web_shortcuts/i18n/pt_BR.po
+++ b/addons/web_shortcuts/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 23:53+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/ro.po b/addons/web_shortcuts/i18n/ro.po
index 3be484612fa..5fec9a656d8 100644
--- a/addons/web_shortcuts/i18n/ro.po
+++ b/addons/web_shortcuts/i18n/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-10 07:32+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/sl.po b/addons/web_shortcuts/i18n/sl.po
index 0d227589eee..3e8746fb0f2 100644
--- a/addons/web_shortcuts/i18n/sl.po
+++ b/addons/web_shortcuts/i18n/sl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-18 22:32+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
diff --git a/addons/web_shortcuts/i18n/zh_CN.po b/addons/web_shortcuts/i18n/zh_CN.po
index 614bb9fc0ff..cbc191c3d23 100644
--- a/addons/web_shortcuts/i18n/zh_CN.po
+++ b/addons/web_shortcuts/i18n/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-27 14:18+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_shortcuts
 #. openerp-web

From 3da0c3a878e4e0f2877e6f0569bb9346d6cfbb0f Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Mon, 24 Dec 2012 12:32:55 +0100
Subject: [PATCH 06/12] [FIX]On_change missing + index content working when
 create/edit attachment

bzr revid: dle@openerp.com-20121224113255-zfezakhjp852bya8
---
 addons/document/document.py       | 14 ++++++++++++++
 addons/document/document_view.xml |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 6cb2cabbf38..1671b6bc1ba 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -117,8 +117,22 @@ class document_file(osv.osv):
         # take partner from uid
         if vals.get('res_id', False) and vals.get('res_model', False) and not vals.get('partner_id', False):
             vals['partner_id'] = self.__get_partner_id(cr, uid, vals['res_model'], vals['res_id'], context)
+        if vals.get('datas', False):
+            vals['file_type'], vals['index_content'] = self._index(cr, uid, vals['datas'].decode('base64'), vals.get('datas_fname', False), None)
         return super(document_file, self).create(cr, uid, vals, context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('datas', False):
+            vals['file_type'], vals['index_content'] = self._index(cr, uid, vals['datas'].decode('base64'), vals.get('datas_fname', False), None)
+        return super(document_file, self).write(cr, uid, ids, vals, context)
+
+    def _index(self, cr, uid, data, datas_fname, file_type):
+        mime, icont = cntIndex.doIndex(data, datas_fname,  file_type or None, None)
+        icont_u = ustr(icont)
+        return mime, icont_u
+
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
         """ A helper to retrieve the associated partner from any res_model+id
             It is a hack that will try to discover if the mentioned record is
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 4c2456de827..68f294b251c 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -167,7 +167,7 @@
         <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='datas_fname']" position="replace">
-                <field name="datas_fname" invisible="1" on_change="onchange_file(datas_fname)"/>
+                <field name="datas_fname" invisible="1"/>
             </xpath>
             <field name="url" position="after">
                 <field name="user_id"/>

From 71e1261e3a0abddedaa5a9a67bba5ea832a47504 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Mon, 24 Dec 2012 14:53:32 +0100
Subject: [PATCH 07/12] [DEL]Revert changes. Wrong target : Was for 7.0 instead
 of trunk

bzr revid: dle@openerp.com-20121224135332-a6irq9gimyaedqx4
---
 addons/document/document.py       | 14 --------------
 addons/document/document_view.xml |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 1671b6bc1ba..6cb2cabbf38 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -117,22 +117,8 @@ class document_file(osv.osv):
         # take partner from uid
         if vals.get('res_id', False) and vals.get('res_model', False) and not vals.get('partner_id', False):
             vals['partner_id'] = self.__get_partner_id(cr, uid, vals['res_model'], vals['res_id'], context)
-        if vals.get('datas', False):
-            vals['file_type'], vals['index_content'] = self._index(cr, uid, vals['datas'].decode('base64'), vals.get('datas_fname', False), None)
         return super(document_file, self).create(cr, uid, vals, context)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
-        if vals.get('datas', False):
-            vals['file_type'], vals['index_content'] = self._index(cr, uid, vals['datas'].decode('base64'), vals.get('datas_fname', False), None)
-        return super(document_file, self).write(cr, uid, ids, vals, context)
-
-    def _index(self, cr, uid, data, datas_fname, file_type):
-        mime, icont = cntIndex.doIndex(data, datas_fname,  file_type or None, None)
-        icont_u = ustr(icont)
-        return mime, icont_u
-
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
         """ A helper to retrieve the associated partner from any res_model+id
             It is a hack that will try to discover if the mentioned record is
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 68f294b251c..4c2456de827 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -167,7 +167,7 @@
         <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='datas_fname']" position="replace">
-                <field name="datas_fname" invisible="1"/>
+                <field name="datas_fname" invisible="1" on_change="onchange_file(datas_fname)"/>
             </xpath>
             <field name="url" position="after">
                 <field name="user_id"/>

From bf271207f6aa9d629d6b52caed2537dfb1863315 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Mon, 24 Dec 2012 16:08:35 +0100
Subject: [PATCH 08/12] [FIX]State not important

bzr revid: dle@openerp.com-20121224150835-6refmf8xo18tv4rd
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 24837cff586..42da8faf9c4 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -156,7 +156,7 @@
                             <label for="section_id"/>
                             <div>
                                 <field name="section_id"/>
-                                <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': [('section_id','=',False)]}"/>
                             </div>
                             <field name="type" invisible="1"/>
                         </group>
@@ -421,7 +421,7 @@
                                 <label for="section_id"/>
                                 <div>
                                     <field name="section_id" widget="selection"/>
-                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': [('section_id','=',False)]}"/>
                                 </div>
                             </group>
                             <group>

From 5c360f7327479f07eb371fce7676ed24b38ecfb0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 26 Dec 2012 04:39:38 +0000
Subject: [PATCH 09/12] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
---
 addons/account/i18n/es.po                   |  159 +-
 addons/account/i18n/ru.po                   |  142 +-
 addons/account_accountant/i18n/ru.po        |    6 +-
 addons/account_analytic_analysis/i18n/es.po |   16 +-
 addons/account_analytic_default/i18n/es.po  |   18 +-
 addons/account_asset/i18n/es.po             |   18 +-
 addons/account_check_writing/i18n/es.po     |   24 +-
 addons/account_followup/i18n/es.po          |  231 ++-
 addons/account_followup/i18n/zh_CN.po       |   12 +-
 addons/account_voucher/i18n/es.po           |   29 +-
 addons/analytic/i18n/es.po                  |   16 +-
 addons/anonymization/i18n/es.po             |   26 +-
 addons/auth_signup/i18n/es.po               |   11 +-
 addons/base_action_rule/i18n/es.po          |   62 +-
 addons/base_import/i18n/et.po               | 1166 +++++++++++
 addons/base_import/i18n/pt_BR.po            |   51 +-
 addons/base_setup/i18n/es.po                |   21 +-
 addons/crm/i18n/es.po                       |   81 +-
 addons/delivery/i18n/es.po                  |   24 +-
 addons/email_template/i18n/ru.po            |   36 +-
 addons/event/i18n/pt_BR.po                  |  218 ++-
 addons/event_moodle/i18n/pt_BR.po           |  195 ++
 addons/event_project/i18n/pt_BR.po          |   13 +-
 addons/event_sale/i18n/es.po                |   13 +-
 addons/event_sale/i18n/pt_BR.po             |   13 +-
 addons/fetchmail/i18n/pt_BR.po              |    6 +-
 addons/fleet/i18n/es.po                     |   16 +-
 addons/fleet/i18n/pt_BR.po                  | 1913 +++++++++++++++++++
 addons/hr/i18n/pt_BR.po                     |  232 ++-
 addons/hr_attendance/i18n/es.po             |    6 +-
 addons/hr_attendance/i18n/pt_BR.po          |   37 +-
 addons/hr_contract/i18n/pt_BR.po            |   18 +-
 addons/hr_evaluation/i18n/es.po             |   14 +-
 addons/hr_evaluation/i18n/pt_BR.po          |   81 +-
 addons/hr_expense/i18n/es.po                |   14 +-
 addons/hr_expense/i18n/pt_BR.po             |  100 +-
 addons/hr_holidays/i18n/es.po               |   12 +-
 addons/hr_holidays/i18n/pt_BR.po            |  150 +-
 addons/hr_payroll/i18n/pt_BR.po             |   63 +-
 addons/hr_payroll_account/i18n/pt_BR.po     |    9 +-
 addons/hr_recruitment/i18n/es.po            |   18 +-
 addons/hr_recruitment/i18n/pt_BR.po         |  163 +-
 addons/hr_timesheet/i18n/pt_BR.po           |   80 +-
 addons/hr_timesheet_invoice/i18n/es.po      |    2 +-
 addons/hr_timesheet_invoice/i18n/pt_BR.po   |   88 +-
 addons/hr_timesheet_sheet/i18n/pt_BR.po     |  128 +-
 addons/knowledge/i18n/sl.po                 |  126 ++
 addons/l10n_be_coda/i18n/es.po              |   89 +-
 addons/l10n_bo/i18n/pt_BR.po                |   54 +
 addons/l10n_in_hr_payroll/i18n/es.po        |  288 +--
 addons/lunch/i18n/pt_BR.po                  |  294 ++-
 addons/mail/i18n/ru.po                      |  162 +-
 addons/mrp_repair/i18n/pt_BR.po             |   83 +-
 addons/pad/i18n/pt_BR.po                    |    9 +-
 addons/portal_sale/i18n/pt_BR.po            |  202 +-
 addons/sale/i18n/es.po                      |  190 +-
 addons/stock/i18n/pt_BR.po                  |  705 +++++--
 addons/stock/i18n/ru.po                     |  303 +--
 addons/stock_location/i18n/pt_BR.po         |   30 +-
 addons/stock_location/i18n/ru.po            |    8 +-
 addons/subscription/i18n/ru.po              |   24 +-
 addons/survey/i18n/pt_BR.po                 |   35 +-
 addons/warning/i18n/ru.po                   |   14 +-
 addons/web_shortcuts/i18n/ru.po             |   25 +
 64 files changed, 6863 insertions(+), 1529 deletions(-)
 create mode 100644 addons/base_import/i18n/et.po
 create mode 100644 addons/event_moodle/i18n/pt_BR.po
 create mode 100644 addons/fleet/i18n/pt_BR.po
 create mode 100644 addons/knowledge/i18n/sl.po
 create mode 100644 addons/l10n_bo/i18n/pt_BR.po
 create mode 100644 addons/web_shortcuts/i18n/ru.po

diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 3fed803ac4f..9e2d6603b79 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-19 15:38+0000\n"
+"PO-Revision-Date: 2012-12-24 11:01+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:34+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -259,7 +259,7 @@ msgstr "Informes Belgas"
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
@@ -428,7 +428,7 @@ msgstr "Fecha creación"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Abono de compra"
+msgstr "Factura rectificativa de proveedor"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -471,7 +471,7 @@ msgstr ""
 #. module: account
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Información del emisor al beneficiario"
 
 #. module: account
 #. openerp-web
@@ -492,6 +492,7 @@ msgstr "Plantilla plan contable"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
 msgstr ""
+"Modificar: crea el reembolso, concilia y crea una nueva factura borrador"
 
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
@@ -754,7 +755,7 @@ msgstr "Cerrar período"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "Rapport du compte commun partenaire"
+msgstr "Informe de la cuenta común de empresa"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -803,7 +804,7 @@ msgstr "Configure los números de cuenta bancaria de su compañía"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Crear factura rectificativa"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -833,7 +834,7 @@ msgstr "¿Está seguro que desea crear los asientos?"
 #: code:addons/account/account_invoice.py:1329
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Factura parcialmente pagada: %s %s de %s %s (%s %s restante)."
 
 #. module: account
 #: view:account.invoice:0
@@ -905,7 +906,9 @@ msgstr "Tipo"
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
-msgstr "¡Faltan impuestos!"
+msgstr ""
+"¡Faltan los impuestos!\n"
+"Pulse en el botón \"Calcular\"."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -995,7 +998,7 @@ msgid ""
 "            "
 msgstr ""
 "<p>\n"
-"No se han encontrado elementos de diario.\n"
+"No se han encontrado asientos en el diario.\n"
 "</p>\n"
 "            "
 
@@ -1051,7 +1054,7 @@ msgstr "Diario de compra"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
-msgstr ""
+msgstr "Factura pagada"
 
 #. module: account
 #: view:validate.account.move:0
@@ -1931,7 +1934,7 @@ msgstr "Ventas por tipo de cuenta"
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
-msgstr ""
+msgstr "15 días"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -2075,7 +2078,7 @@ msgstr "Extracto borrador"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Factura validada"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
@@ -2801,7 +2804,7 @@ msgstr "Propiedades de la cuenta"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Crear una factura rectificativa borrador"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -3350,7 +3353,7 @@ msgstr ""
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Transacciones sin conciliar"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3548,7 +3551,7 @@ msgstr "Núm. de dígitos a usar para código de cuenta."
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Plazo de pago del proveedor"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3623,7 +3626,7 @@ msgstr "Archivo electrónico"
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "Referencia de conciliación"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
@@ -3724,6 +3727,86 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"<p>Hola ${object.partner_id.name},</p>\n"
+"\n"
+"<p>Hay una nueva factura disponible: </p>\n"
+"    \n"
+"<p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Nº de factura: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Total de la factura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha de factura: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Factura%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Es posible pagarla directamente con Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Si tiene cualquier pregunta, no dude en contactarnos.</p>\n"
+"    <p>Gracias por elegir ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Teléfono:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: view:account.period:0
@@ -4701,6 +4784,8 @@ msgid ""
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
 msgstr ""
+"Se usará este plazo de pago en lugar del predeterminado para los pedidos de "
+"venta y las facturas de cliente"
 
 #. module: account
 #: view:account.config.settings:0
@@ -4726,7 +4811,7 @@ msgstr "Asientos validados/asentados"
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "Sin seguimiento"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4893,7 +4978,7 @@ msgstr "Tipo cuenta"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Banco y cheques"
 
 #. module: account
 #: field:account.account.template,note:0
@@ -5017,7 +5102,7 @@ msgstr "Plan contable"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
-msgstr ""
+msgstr "Referencia del pago"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5091,7 +5176,7 @@ msgstr "Apuntes a conciliar"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Plantilla para los impuestos"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -6231,6 +6316,8 @@ msgid ""
 "This payment term will be used instead of the default one for purchase "
 "orders and supplier invoices"
 msgstr ""
+"Se usará este plazo de pago en lugar del predeterminado para los pedidos de "
+"compra y las facturas de proveedor"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -7064,6 +7151,12 @@ msgid ""
 "due date, make sure that the payment term is not set on the invoice. If you "
 "keep the payment term and the due date empty, it means direct payment."
 msgstr ""
+"Si usa plazos de pago, la fecha de vencimiento se calculará automáticamente "
+"con la generación de los asientos contables. El plazo de pago puede calcular "
+"varias fechas de vencimiento, por ejemplo 50% ahora y 50% en un mes, pero si "
+"quiere forzar una fecha de vencimiento, asegúrese que el plazo de pago no se "
+"establece en la factura. Si deja vacío el plazo de pago y la fecha de "
+"vencimiento, significa pago directo."
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -7311,6 +7404,8 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disabled"
 msgstr ""
+"Si concilia transacciones, debe verificar también todas la acciones que "
+"están enlazadas con ellas porque no se deshabilitarán"
 
 #. module: account
 #: view:account.account.template:0
@@ -7483,7 +7578,7 @@ msgstr "Manual"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Cancelar: crea la factura rectificativa y concilia"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7701,7 +7796,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "URL de Paypal"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
@@ -8406,7 +8501,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "Importe residual en la moneda"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8460,6 +8555,8 @@ msgid ""
 "Refund base on this type. You can not Modify and Cancel if the invoice is "
 "already reconciled"
 msgstr ""
+"Factura rectificativa basada en este tipo. No puede modificar o cancelar si "
+"la factura ya está conciliada"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -9032,7 +9129,7 @@ msgstr "Saldo final"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Contrapartida centralizada"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -9104,7 +9201,7 @@ msgstr "Tipos de cuentas"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Factura (Ref. ${object.number or 'n/a'})"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1211
@@ -10198,7 +10295,7 @@ msgstr "No se pueden crear apuntes de compañías diferentes."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "Procesamiento periódico"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10278,7 +10375,7 @@ msgstr "Fecha vencimiento"
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr ""
+msgstr "Pago inmediato"
 
 #. module: account
 #: code:addons/account/account.py:1464
@@ -10500,7 +10597,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
-msgstr ""
+msgstr "OBI"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10989,6 +11086,8 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disable"
 msgstr ""
+"Si rompe la conciliación de las transacciones, debe verificar también todas "
+"las acciones enlazadas, ya que no serán deshabilitadas"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1059
@@ -11577,7 +11676,7 @@ msgstr "Cuenta de gastos en plantilla producto"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Plazo de pago de cliente"
 
 #. module: account
 #: help:accounting.report,label_filter:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 6db31803dc2..44223cf3508 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-31 10:41+0000\n"
+"PO-Revision-Date: 2012-12-25 12:48+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-22 05:33+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -80,7 +80,7 @@ msgstr "Импорт из счета или платежного поручен
 #: code:addons/account/account_move_line.py:1211
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Плохой счет !"
 
 #. module: account
 #: view:account.move:0
@@ -94,6 +94,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"Ошибка!\n"
+"Нельзя создать рекурсивный шаблон счета."
 
 #. module: account
 #. openerp-web
@@ -197,7 +199,7 @@ msgstr "Заголовок столбца"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Кол-во цифр в коде счета"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -241,7 +243,7 @@ msgstr "Бельгийские отчеты"
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
-msgstr ""
+msgstr "Утверждено"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
@@ -319,7 +321,7 @@ msgstr "Отменить сверку счета"
 #. module: account
 #: field:account.config.settings,module_account_budget:0
 msgid "Budget management"
-msgstr ""
+msgstr "Управление бюджетом"
 
 #. module: account
 #: view:product.template:0
@@ -340,7 +342,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Разрешить мульти-валютность"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -361,12 +363,12 @@ msgstr "Июнь"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Вы должны выбрать счета для сверки."
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Позволяет использовать аналитический учет."
 
 #. module: account
 #: view:account.invoice:0
@@ -374,7 +376,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -440,7 +442,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Период :"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -481,7 +483,7 @@ msgstr "Сумма выраженная в дополнительной друг
 #. module: account
 #: view:account.journal:0
 msgid "Available Coins"
-msgstr ""
+msgstr "Доступные монеты"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -534,7 +536,7 @@ msgstr "Родительская цель"
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Определяет порядок вывода строки счета."
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -603,12 +605,12 @@ msgstr "Бухгалтер подтверждает документ."
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing to reconcile"
-msgstr ""
+msgstr "Нечего сверять"
 
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Десятичная точность проводок журнала"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -633,7 +635,7 @@ msgstr "Значение отчёта"
 msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
-msgstr ""
+msgstr "В указанном журнале нет ни одной черновой проводки за этот период."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -656,12 +658,12 @@ msgstr "Основная нумерация должна отличаться о
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "Текущая валюта настроена неправильно."
 
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr ""
+msgstr "Счет прибыли"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1157
@@ -684,7 +686,7 @@ msgstr "КнП"
 #: code:addons/account/account.py:1551
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Нельзя сделать движение по валюте отличной от.."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -742,12 +744,12 @@ msgstr "Счета к получению"
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Настройка банковских счетов компании"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Создать возврат"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -777,7 +779,7 @@ msgstr "Вы действительно хотите создать провод
 #: code:addons/account/account_invoice.py:1329
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Счет частично оплачен: %s%s из %s%s (%s%s остаток)."
 
 #. module: account
 #: view:account.invoice:0
@@ -870,7 +872,7 @@ msgstr "Счета поставщиков и возмещения"
 #: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "Проводка уже сверена."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -887,7 +889,7 @@ msgstr "Журнал аналитики"
 #. module: account
 #: view:account.invoice:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Отправить по эл.почте"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -907,7 +909,7 @@ msgstr "Код журн./Операция"
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
+msgstr "Код и название счета"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -983,12 +985,12 @@ msgstr "Срок"
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Журнал покупок"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
-msgstr ""
+msgstr "Счет оплачен"
 
 #. module: account
 #: view:validate.account.move:0
@@ -1006,7 +1008,7 @@ msgstr "Общая сумма"
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
 msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "Описание счета, как предоставил поставщик."
 
 #. module: account
 #: selection:account.account,type:0
@@ -1094,7 +1096,7 @@ msgstr "Код"
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Возможности"
 
 #. module: account
 #: code:addons/account/account.py:2298
@@ -1175,13 +1177,13 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Возврат "
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Для этого товара не определен счет расходов : \"%s\" (id:%d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1203,7 +1205,7 @@ msgstr "Кассы"
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Журнал возврата продаж"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1239,7 +1241,7 @@ msgstr "Начало периода"
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Возвраты"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1316,7 +1318,7 @@ msgstr "Исходящий курс валют"
 #. module: account
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Шаблон"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1408,7 +1410,7 @@ msgstr "Уровень"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Изменить валюту можно только в черновике счета."
 
 #. module: account
 #: report:account.invoice:0
@@ -1479,12 +1481,12 @@ msgstr "Параметры отчета"
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Финансовый год для закрыть"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
 msgid "Invoice sequence"
-msgstr ""
+msgstr "Нумерация счета"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
@@ -1507,7 +1509,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Статус счета"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1529,7 +1531,7 @@ msgstr "Счет к получению"
 #: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (копия)"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1598,17 +1600,17 @@ msgstr "Пропускать состояние \"Черновик\" при ру
 #: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Не реализовано."
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Credit Note"
-msgstr ""
+msgstr "Кредит-нота"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "Эл. счета и платежи"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1689,7 +1691,7 @@ msgstr "Без налога"
 #. module: account
 #: view:account.journal:0
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Расширенные настройки"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1788,7 +1790,7 @@ msgstr "Последовательность финансовых лет"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Аналитический учет"
 
 #. module: account
 #: report:account.overdue:0
@@ -1818,7 +1820,7 @@ msgstr "Продажи по типу счета"
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
-msgstr ""
+msgstr "15 дней"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1843,7 +1845,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
+msgstr "Некоторые записи уже сверены."
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1900,12 +1902,12 @@ msgstr "Дебиторы и кредиторы"
 #. module: account
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
-msgstr ""
+msgstr "Управление платежными распоряжениями"
 
 #. module: account
 #: view:account.period:0
 msgid "Duration"
-msgstr ""
+msgstr "Длительность"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1943,7 +1945,7 @@ msgstr "Ссылка на клиента:"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Используйте этот код для налоговой декларации."
 
 #. module: account
 #: help:account.period,special:0
@@ -1958,12 +1960,12 @@ msgstr "Черновик документа"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Счет утвержден"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Оплата поставщикам чеком"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1974,7 +1976,7 @@ msgstr "Сумма кредита"
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2072,7 +2074,7 @@ msgstr "Анализ счетов"
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -2118,7 +2120,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Валюта компании по умолчанию"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2166,7 +2168,7 @@ msgstr "Корректный"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -2195,14 +2197,14 @@ msgstr "Сальдовая ведомость по счету"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Закрыть финансовый год"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Журнал :"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2219,12 +2221,12 @@ msgstr "Определение налога"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Настройка учета"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Базовая единица измерения"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2240,12 +2242,12 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Молодец!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Управление активами"
 
 #. module: account
 #: view:account.account:0
@@ -2386,7 +2388,7 @@ msgstr "30 рабочих дней"
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "У вас нет прав открыть журнал %s !"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
@@ -2559,7 +2561,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Позиция счета"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -2617,7 +2619,7 @@ msgstr "Системы налогообложения"
 #: code:addons/account/account_move_line.py:578
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по закрытому счету %s %s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2638,12 +2640,12 @@ msgstr "Состояние счета - \"Черновик\""
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Параметры счета"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Создать черновик возврата"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2653,7 +2655,7 @@ msgstr "Сверка с контрагентом"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Фин. счет"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2773,7 +2775,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Следующий номер счета поставщика"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2822,7 +2824,7 @@ msgstr "Счёт аналитики"
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Налог на покупку по умолчанию"
 
 #. module: account
 #: view:account.account:0
@@ -2855,7 +2857,7 @@ msgstr "Ошибка конфигурации!"
 #: code:addons/account/account_bank_statement.py:433
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "Распоряжение %s подтверждено, элементы журнала созданы."
 
 #. module: account
 #: field:account.invoice.report,price_average:0
diff --git a/addons/account_accountant/i18n/ru.po b/addons/account_accountant/i18n/ru.po
index 20e8a849037..c11623e2c32 100644
--- a/addons/account_accountant/i18n/ru.po
+++ b/addons/account_accountant/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2011-01-12 04:04+0000\n"
+"PO-Revision-Date: 2012-12-25 11:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Открыть меню учета"
 
 #~ msgid "Accountant"
 #~ msgstr "Бухгалтер"
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index d27fe90c169..07da227b1d4 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-11 12:28+0000\n"
+"PO-Revision-Date: 2012-12-24 09:31+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
@@ -108,7 +108,7 @@ msgstr ""
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
 #, python-format
 msgid "Sales Order Lines of %s"
-msgstr ""
+msgstr "Líneas del pedido de venta de %s"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -172,7 +172,7 @@ msgstr "Fecha fin"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Gestor contable"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -273,7 +273,7 @@ msgstr "o ver"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Customer Contracts"
-msgstr ""
+msgstr "Contratos de clientes"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -509,7 +509,7 @@ msgstr "Fecha última factura"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Units Remaining"
-msgstr ""
+msgstr "Unidades restantes"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -613,12 +613,12 @@ msgstr "Uso obligatorio de plantillas"
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Contract Template"
-msgstr ""
+msgstr "Plantilla de contrato"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Units Done"
-msgstr ""
+msgstr "Unidades realizadas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index 7c2e267f309..24775f94836 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-10 21:42+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 09:34+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
@@ -40,6 +40,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Seleccione un producto que utilizará la cuenta analítica especificada en la "
+"analítica por defecto (por ejemplo, creando una nueva factura de cliente o "
+"un pedido de venta, si se selecciona este producto, automáticamente lo "
+"tomará como una cuenta analítica)"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -64,6 +68,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Seleccione una empresa que utilizará la cuenta analítica especificada en la "
+"analítica por defecto (por ejemplo, creando una nueva factura de cliente o "
+"un pedido de ventas, si se seleccionamos esta empresa, automáticamente la "
+"tomará como una cuenta analítica)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -119,6 +127,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Seleccione una compañía que utilizará la cuenta analítica especificada en la "
+"analítica por defecto (por ejemplo, creando una nueva factura de cliente o "
+"un pedido de ventas, si se seleccionamos esta compañía, automáticamente la "
+"tomará como una cuenta analítica)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index c9fb5d7ef0d..f6c3c3f08b2 100755
--- a/addons/account_asset/i18n/es.po
+++ b/addons/account_asset/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-11 11:45+0000\n"
+"PO-Revision-Date: 2012-12-24 09:38+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
@@ -148,7 +148,7 @@ msgstr "Es el importe que prevee tener que no puede depreciar"
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "La cantidad de tiempo entre dos amortizaciones, en meses"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
@@ -265,7 +265,7 @@ msgstr "Cambiar duración"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "El número de amortizaciones para amortizar el activo"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -295,7 +295,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Amortización del siguiente período"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -346,7 +346,7 @@ msgstr "Buscar categoría de activo"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "meses"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
@@ -609,7 +609,7 @@ msgstr "Método de depreciación"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Current Depreciation"
-msgstr ""
+msgstr "Amortización actual"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -654,6 +654,10 @@ msgid ""
 "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
 "  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
 msgstr ""
+"Escoja el método a utilizar para calcular la cantidad de líneas de "
+"amortización:\n"
+"  * Lineal: Calculado en base a: Valor bruto / número de amortizaciones\n"
+"  * Decreciente: Calculado en base a: Valor residual * Factor decreciente"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
diff --git a/addons/account_check_writing/i18n/es.po b/addons/account_check_writing/i18n/es.po
index cb404fb3f87..58164f54892 100644
--- a/addons/account_check_writing/i18n/es.po
+++ b/addons/account_check_writing/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 11:55+0000\n"
+"PO-Revision-Date: 2012-12-24 09:40+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_check_writing
@@ -58,13 +58,13 @@ msgstr "Cheque en la parte de abajo"
 #. module: account_check_writing
 #: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
 msgid "Print Check in Batch"
-msgstr ""
+msgstr "Imprimir cheques en lote"
 
 #. module: account_check_writing
 #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
 #, python-format
 msgid "One of the printed check already got a number."
-msgstr ""
+msgstr "Uno de los cheques impresos ya tiene un número."
 
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
@@ -111,7 +111,7 @@ msgstr "Importe original"
 #. module: account_check_writing
 #: field:res.company,check_layout:0
 msgid "Check Layout"
-msgstr ""
+msgstr "Disposición del cheque"
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
@@ -183,12 +183,12 @@ msgstr "Compañías"
 #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: account_check_writing
 #: help:account.check.write,check_number:0
 msgid "The number of the next check number to be printed."
-msgstr ""
+msgstr "Nº del siguiente cheque a ser impreso."
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -216,7 +216,7 @@ msgstr "Comprobante contable"
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
@@ -226,22 +226,22 @@ msgstr "Cantidad en palabras"
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_check_write
 msgid "Prin Check in Batch"
-msgstr ""
+msgstr "Imprimir cheques en lote"
 
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_check_writing
 #: field:account.check.write,check_number:0
 msgid "Next Check Number"
-msgstr ""
+msgstr "Nº del próximo cheque"
 
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "Check"
-msgstr ""
+msgstr "Cheque"
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 7f8aa7a17f7..f9483417a99 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-14 11:14+0000\n"
+"PO-Revision-Date: 2012-12-24 11:21+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:27+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
@@ -22,7 +22,7 @@ msgstr ""
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Reminder"
-msgstr ""
+msgstr "${user.company_id.name} Recordatorio de pago"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
@@ -125,6 +125,8 @@ msgid ""
 "This is the next action to be taken.  It will automatically be set when the "
 "partner gets a follow-up level that requires a manual action. "
 msgstr ""
+"Ésta es la próxima acción a realizar. Se establecerá automáticamente cuando "
+"la empresa llegue al nivel de seguimiento que requiere una acción manual. "
 
 #. module: account_followup
 #: view:res.partner:0
@@ -154,6 +156,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"Estamos decepcionados de ver que a pesar de enviarle un recordatorio, su "
+"cuenta está ahora seriamente atrasada.\n"
+"\n"
+"Es esencial que realice el pago inmediatamente, o de lo contrario tendremos "
+"que considerar parar su cuenta, lo que significa que no podremos "
+"suministrarle más bienes/servicios a su empresa.\n"
+"\n"
+"Por favor, tome las medidas adecuadas para realizar el pago en los próximos "
+"8 días.\n"
+"\n"
+"Si hay algún problema con el pago de la factura del que no tenemos "
+"conocimiento, no dude en contactar con nuestro departamento de contabilidad, "
+"para que podamos resolver el asunto rápidamente.\n"
+"\n"
+"Se acompañan los detalles de los pagos vencidos a continuación.\n"
+"\n"
+"Saludos cordiales,\n"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -191,6 +213,37 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"<p>Estimado/a ${object.name},</p>\n"
+"<p>\n"
+"Si no ha habido equivocación por nuestra parte, parece que el siguiente "
+"importe permanece sin pagar. Por favor, tome las medidas apropiadas para "
+"realizar este pago en los próximos 8 días.\n"
+"\n"
+"Si ha realizado el pago después de que se enviara este correo, por favor "
+"ignore este mensaje. No dude en contactar con nuestro departamento de "
+"contabilidad.\n"
+"</p>\n"
+"<br/>\n"
+"Saludos cordiales,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -251,6 +304,12 @@ msgid ""
 "                        same customer, the actions of the most \n"
 "                        overdue invoice will be executed."
 msgstr ""
+"Para recordar a los clientes el pago de sus facturas, puede definir diversas "
+"acciones dependiendo de lo atrasada que sea la deuda. Estas acciones se "
+"empaquetan en niveles de seguimiento que son lanzados cuando la fecha de "
+"vencimiento de una factura sobrepasa cierto número de días. Si hay otras "
+"facturas vencidas para el mismo cliente, se ejecutarán las acciones para la "
+"factura más atrasada."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -281,7 +340,7 @@ msgstr "Al ser procesado, imprimirá una carta"
 #. module: account_followup
 #: field:res.partner,payment_earliest_due_date:0
 msgid "Worst Due Date"
-msgstr ""
+msgstr "Pero fecha vencida"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -343,6 +402,47 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Estimado/a ${object.name},</p>\n"
+"   <p>\n"
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"Estamos decepcionados de ver que a pesar de enviarle un recordatorio, su "
+"cuenta está ahora seriamente atrasada.\n"
+"\n"
+"Es esencial que realice el pago inmediatamente, o de lo contrario tendremos "
+"que considerar parar su cuenta, lo que significa que no podremos "
+"suministrarle más bienes/servicios a su empresa.\n"
+"\n"
+"Por favor, tome las medidas adecuadas para realizar el pago en los próximos "
+"8 días.\n"
+"\n"
+"Si hay algún problema con el pago de la factura del que no tenemos "
+"conocimiento, no dude en contactar con nuestro departamento de contabilidad, "
+"para que podamos resolver el asunto rápidamente.\n"
+"\n"
+"Se acompañan los detalles de los pagos vencidos a continuación.\n"
+" </p>\n"
+"<br/>\n"
+"Saludos cordiales,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -465,7 +565,7 @@ msgstr "Mensaje impreso"
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Anybody"
-msgstr ""
+msgstr "Cualquiera"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -507,6 +607,8 @@ msgid ""
 "Optionally you can assign a user to this field, which will make him "
 "responsible for the action."
 msgstr ""
+"Puede asignar un usuario a este campo de manera opcional, lo que lo hará "
+"responsable para la acción."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
@@ -565,6 +667,8 @@ msgid ""
 "If not specified by the latest follow-up level, it will send from the "
 "default email template"
 msgstr ""
+"Si no se especifica en el próximo nivel de seguimiento, se enviará con la "
+"plantilla de correo electrónico por defecto"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
@@ -589,6 +693,10 @@ msgid ""
 "action. Can be practical to set manually e.g. to see if he keeps his "
 "promises."
 msgstr ""
+"Ésta es la fecha en la que se necesita un seguimiento manual. La fecha se "
+"establecerá a la actual cuando la empresa llegue a un nivel que requiera una "
+"acción manual. Puede ser práctica establecerla manualmente por ejemplo para "
+"ver si se cumple lo prometido."
 
 #. module: account_followup
 #: view:res.partner:0
@@ -649,6 +757,36 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"<p>Estimado ${object.name},</p>\n"
+"<p>\n"
+"A pesar de varios recordatorios, su cuenta aún no está arreglada.\n"
+"A menos que haga el pago completo en los próximos 8 días, podrán tomarse "
+"acciones legales para la recuperación de la deuda sin más notificaciones.\n"
+"Confiamos en que está acción no sea necesaria y los detalles de los pagos "
+"vencidos se muestran a continuación.\n"
+"En caso de alguna consulta con respecto a este asunto, no dude en contactar "
+"con nuestro departamento de contabilidad.\n"
+"</p>\n"
+"<br/>\n"
+"Saludos cordiales,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -681,11 +819,27 @@ msgid ""
 "Best Regards,\n"
 "            "
 msgstr ""
+"\n"
+"Estimado/a %(partner_name)s,\n"
+"\n"
+"A pesar de varios recordatorios, su cuenta aún no está arreglada.\n"
+"\n"
+"A menos que haga el pago completo en los próximos 8 días, podrán tomarse "
+"acciones legales para la recuperación de la deuda sin más notificaciones.\n"
+"\n"
+"Confiamos en que está acción no sea necesaria y los detalles de los pagos "
+"vencidos se muestran a continuación.\n"
+"\n"
+"En caso de alguna consulta con respecto a este asunto, no dude en contactar "
+"con nuestro departamento de contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
+"            "
 
 #. module: account_followup
 #: field:res.partner,payment_amount_due:0
 msgid "Amount Due"
-msgstr ""
+msgstr "Importe adeudado"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -726,6 +880,9 @@ msgid ""
 "                            order to exclude it from the next follow-up "
 "actions."
 msgstr ""
+"A continuación está el historial de las transacciones de este cliente. Puede "
+"marcar \"No seguir\" para excluirlo de las siguientes acciones de "
+"seguimiento."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
@@ -775,7 +932,7 @@ msgstr "Haber"
 #. module: account_followup
 #: field:res.partner,payment_amount_overdue:0
 msgid "Amount Overdue"
-msgstr ""
+msgstr "Importe atrasado"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -823,6 +980,34 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Estimado/a ${object.name},</p>\n"
+"    <p>\n"
+"Si no ha habido equivocación por nuestra parte, parece que el siguiente "
+"importe permanece sin pagar. Por favor, tome las medidas apropiadas para "
+"realizar este pago en los próximos 8 días.\n"
+"\n"
+"Si ha realizado el pago después de que se enviara este correo, por favor "
+"ignore este mensaje. No dude en contactar con nuestro departamento de "
+"contabilidad.\n"
+"    </p>\n"
+"<br/>\n"
+"Saludos cordiales,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"<br/>\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -863,6 +1048,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Si no ha habido equivocación por nuestra parte, parece que el siguiente "
+"importe permanece sin pagar. Por favor, tome las medidas apropiadas para "
+"realizar este pago en los próximos 8 días.\n"
+"\n"
+"Si ha realizado el pago después de que se enviara este correo, por favor "
+"ignore este mensaje. No dude en contactar con nuestro departamento de "
+"contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -945,6 +1142,9 @@ msgid ""
 "                        set the manual actions per customer, according to "
 "the follow-up levels defined."
 msgstr ""
+"Esta acción enviará correos electrónicos de seguimiento, imprimirá las "
+"cartas y establecerá las acciones manuales por cliente, de acuerdo a los "
+"niveles de seguimiento definidos."
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
@@ -1029,6 +1229,21 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Estimado/a %(partner_name)s,\n"
+"\n"
+"A pesar de varios recordatorios, su cuenta aún no está arreglada.\n"
+"\n"
+"A menos que haga el pago completo en los próximos 8 días, podrán tomarse "
+"acciones legales para la recuperación de la deuda sin más notificaciones.\n"
+"\n"
+"Confiamos en que está acción no sea necesaria y los detalles de los pagos "
+"vencidos se muestran a continuación.\n"
+"\n"
+"En caso de alguna consulta con respecto a este asunto, no dude en contactar "
+"con nuestro departamento de contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1091,7 +1306,7 @@ msgstr " carta(s) en el informe"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Partners with Overdue Credits"
-msgstr ""
+msgstr "Empresas con créditos vencidos"
 
 #. module: account_followup
 #: view:res.partner:0
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 81e9e1b5e60..b814bfbd934 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-09 04:57+0000\n"
-"Last-Translator: sum1201 <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 10:28+0000\n"
+"Last-Translator: aaronmou <mouhongkuan@163.com>\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: 2012-12-22 05:27+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
@@ -22,7 +22,7 @@ msgstr ""
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Reminder"
-msgstr ""
+msgstr "${user.company_id.name} 支付提醒"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
@@ -33,7 +33,7 @@ msgstr "最大跟踪级别"
 #: view:account_followup.stat:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr "基于...分组"
+msgstr "分组..."
 
 #. module: account_followup
 #: field:account_followup.print,followup_id:0
@@ -69,7 +69,7 @@ msgstr "标记为完成"
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "动作"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index ed96b74c095..a8c0942399b 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-13 12:02+0000\n"
+"PO-Revision-Date: 2012-12-24 09:57+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:50+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_voucher
@@ -149,7 +149,7 @@ msgstr "Validar"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "Pagos a proveedores"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -224,7 +224,7 @@ msgstr "Mensajes"
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipts"
-msgstr ""
+msgstr "Recibos de compra"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -367,7 +367,7 @@ msgstr "Importar facturas"
 #: code:addons/account_voucher/account_voucher.py:1098
 #, python-format
 msgid "Wrong voucher line"
-msgstr ""
+msgstr "Línea de comprobante errónea"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -467,6 +467,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un nuevo pago de proveedor.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar fácilmente los pagos que hace y los saldos "
+"pendientes que necesita pagar a sus proveedores.\n"
+"</p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -760,7 +767,7 @@ msgstr "Agosto"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Validar pago"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -802,7 +809,7 @@ msgstr "Pagado"
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipts"
-msgstr ""
+msgstr "Recibo de ventas"
 
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
@@ -861,7 +868,7 @@ msgstr "¿Pagos previos?"
 #: code:addons/account_voucher/account_voucher.py:1098
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "La factura que iba a pagar ya no es válida."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -900,14 +907,14 @@ msgstr "Por favor defina una secuencia en el diario."
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Pagos de cliente"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipts Analysis"
-msgstr ""
+msgstr "Análisis de los recibos de venta"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -1304,7 +1311,7 @@ msgstr "Abrir balance"
 #. module: account_voucher
 #: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
 msgid "Status <b>changed</b>"
-msgstr ""
+msgstr "Estado <b>cambiado</b>"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1000
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 319b7326037..6364e040873 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 12:55+0000\n"
+"PO-Revision-Date: 2012-12-24 09:57+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic
@@ -119,7 +119,7 @@ msgstr "Cerrado"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_pending
 msgid "Contract to Renew"
-msgstr ""
+msgstr "Contrato a renovar"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -182,7 +182,7 @@ msgstr "Mensajes e historial de comunicación"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_opened
 msgid "Stage <b>opened</b>"
-msgstr ""
+msgstr "Etapa <b>abierta</b>"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -224,7 +224,7 @@ msgstr "Usuario"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
 msgid "Contract <b>pending</b>"
-msgstr ""
+msgstr "Contrato <b>pendiente</b>"
 
 #. module: analytic
 #: field:account.analytic.line,date:0
@@ -234,7 +234,7 @@ msgstr "Fecha"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_closed
 msgid "Contract Finished"
-msgstr ""
+msgstr "Contrato finalizado"
 
 #. module: analytic
 #: view:account.analytic.account:0
@@ -299,12 +299,12 @@ msgstr "Haber"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_opened
 msgid "Contract Opened"
-msgstr ""
+msgstr "Contrato abierto"
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_closed
 msgid "Contract <b>closed</b>"
-msgstr ""
+msgstr "Contrato <b>cerrado</b>"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
diff --git a/addons/anonymization/i18n/es.po b/addons/anonymization/i18n/es.po
index a5d3dd4261e..caded2b5966 100644
--- a/addons/anonymization/i18n/es.po
+++ b/addons/anonymization/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 14:05+0000\n"
+"PO-Revision-Date: 2012-12-24 10:02+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
@@ -50,6 +50,9 @@ msgid ""
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to create, write or delete fields."
 msgstr ""
+"La anonimización de la base de datos está actualmente en un estado "
+"inestable. Algunos campos se anonimizan, mientras otros no. Debería intentar "
+"resolver este problema antes de crear, escribir o eliminar campos."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
@@ -65,7 +68,7 @@ msgstr "campo"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 msgid "New"
-msgstr ""
+msgstr "Nuevo"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
@@ -84,6 +87,8 @@ msgid ""
 "Before executing the anonymization process, you should make a backup of your "
 "database."
 msgstr ""
+"Antes de ejecutar el proceso de anonimización, debería realizar una copia de "
+"seguridad de su base de datos."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
@@ -128,7 +133,7 @@ msgstr "desconocido"
 #: code:addons/anonymization/anonymization.py:448
 #, python-format
 msgid "Anonymized value is None. This cannot happens."
-msgstr ""
+msgstr "El valor anonimizado es \"ninguno\". Esto no debería pasar."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
@@ -166,6 +171,8 @@ msgid ""
 "Cannot anonymize fields of these types: binary, many2many, many2one, "
 "one2many, reference."
 msgstr ""
+"No se pueden anonimizar campos de estos tipos: binarios, many2many, "
+"many2one, one2many, referencia."
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
@@ -201,6 +208,8 @@ msgid ""
 "It is not possible to reverse the anonymization process without supplying "
 "the anonymization export file."
 msgstr ""
+"No es posible revertir el proceso de anonimización sin proveer el archivo "
+"exportado de anonimización."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
@@ -221,6 +230,9 @@ msgid ""
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to do anything."
 msgstr ""
+"La anonimización de la base de datos está actualmente en un estado "
+"inestable. Algunos campos se anonimizan, mientras otros no. Debería intentar "
+"resolver este problema antes de hacer nada."
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
@@ -267,13 +279,16 @@ msgid ""
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to do anything else."
 msgstr ""
+"La anonimización de la base de datos está actualmente en un estado "
+"inestable. Algunos campos se anonimizan, mientras otros no. Debería intentar "
+"resolver este problema antes de hacer nada más."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:389
 #: code:addons/anonymization/anonymization.py:448
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -306,6 +321,7 @@ msgstr "Iniciado"
 #, python-format
 msgid "The database is currently anonymized, you cannot anonymize it again."
 msgstr ""
+"La base de datos ya está anonimizada. No puede anonimizarla otra vez."
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
diff --git a/addons/auth_signup/i18n/es.po b/addons/auth_signup/i18n/es.po
index 7f9e3aa6c62..0ac808e9e44 100644
--- a/addons/auth_signup/i18n/es.po
+++ b/addons/auth_signup/i18n/es.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 14:32+0000\n"
+"PO-Revision-Date: 2012-12-24 10:04+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
 msgid "Signup Token Type"
-msgstr ""
+msgstr "Tipo de la palabra de ingreso"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -98,7 +98,7 @@ msgstr "Nuevo"
 #: code:addons/auth_signup/res_users.py:258
 #, python-format
 msgid "Mail sent to:"
-msgstr ""
+msgstr "Correo enviado a:"
 
 #. module: auth_signup
 #: field:res.users,state:0
@@ -163,6 +163,9 @@ msgid ""
 "Cannot send email: no outgoing email server configured.\n"
 "You can configure it under Settings/General Settings."
 msgstr ""
+"No se puede enviar el correo electrónico: no se ha configurado servidor de "
+"correo saliente.\n"
+"Puede configurarlo en Configuración / Configuración general."
 
 #. module: auth_signup
 #. openerp-web
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index c9f7b1689f3..740825edbea 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 12:47+0000\n"
+"PO-Revision-Date: 2012-12-24 10:13+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:02+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -29,6 +29,9 @@ msgid ""
 "enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
 "all users\""
 msgstr ""
+"- En la misma vista \"Búsqueda\", seleccione el menú \"Guardar filtro "
+"actual\", introduzca el nombre (por ejemplo, 'Creado el 01/01/2012') y "
+"marque la opción \"Compartir con todos los usuarios\""
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -38,7 +41,7 @@ msgstr "Reglas acción"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Select a filter or a timer as condition."
-msgstr ""
+msgstr "Seleccione un filtro o un temporizador como condición."
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,user_id:0
@@ -49,16 +52,18 @@ msgstr "Responsable"
 #: help:base.action.rule,server_action_ids:0
 msgid "Examples: email reminders, call object service, etc."
 msgstr ""
+"Ejemplos: recordatorios de correo electrónico, llamadas a servicios de "
+"objeto, etc."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_followers:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Añadir seguidores"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible"
-msgstr ""
+msgstr "Establecer responsable"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -67,21 +72,24 @@ msgid ""
 "delay before thetrigger date, like sending a reminder 15 minutes before a "
 "meeting."
 msgstr ""
+"Retraso después de la fecha de lanzamiento. Puede poner un número negativo "
+"si necesita un adelanto antes de la fecha de lanzamiento, como enviar un "
+"recordatorio 15 minutos antes de una reunión."
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
 msgid "base.action.rule.lead.test"
-msgstr ""
+msgstr "Test de regla de iniciativa"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Cerrado"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "New"
-msgstr ""
+msgstr "Nuevo"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
@@ -96,7 +104,7 @@ msgstr "Condiciones"
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,state:0
@@ -106,7 +114,7 @@ msgstr "Estado"
 #. module: base_action_rule
 #: field:base.action.rule,filter_pre_id:0
 msgid "Before Update Filter"
-msgstr ""
+msgstr "Filtro para antes de la actualización"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -118,6 +126,8 @@ msgstr "Regla acción"
 msgid ""
 "If present, this condition must be satisfied after the update of the record."
 msgstr ""
+"Si se encuentra presente, esta condición debe satisfacerse después de la "
+"actualización del registro."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -127,12 +137,12 @@ msgstr "Campos a cambiar"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "The filter must therefore be available in this page."
-msgstr ""
+msgstr "El filtro debe estar por lo tanto disponible en esta página."
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "After Update Filter"
-msgstr ""
+msgstr "Filtro para después de la actualización"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -142,7 +152,7 @@ msgstr "Horas"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "To create a new filter:"
-msgstr ""
+msgstr "Para crear un nuevo filtro:"
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
@@ -163,11 +173,16 @@ msgid ""
 "while the postcondition filter is checked after the modification. A "
 "precondition filter will therefore not work during a creation."
 msgstr ""
+"Las reglas de acción se comprueban cuando se crea o se modifica el \"Modelo "
+"de documento relacionado\". El filtro de precondición se comprueba justo "
+"antes de la modificación, mientras que el filtro de post-condición se hace "
+"después de la modificación. El filtro de precondición no funcionará por lo "
+"tanto durante una creación."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Filter Condition"
-msgstr ""
+msgstr "Condición de filtro"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -176,6 +191,9 @@ msgid ""
 "in the \"Search\" view (Example of filter based on Leads/Opportunities: "
 "Creation Date \"is equal to\" 01/01/2012)"
 msgstr ""
+"- Vaya a la página del \"Modelo de documento relacionado\" y establezca los "
+"parámetros del filtro en la vista \"Búsqueda\" (Ejemplo de filtro basado en "
+"Iniciativas/Oportunidades: Fecha de creación \"es igual a\" 01/01/2012)"
 
 #. module: base_action_rule
 #: field:base.action.rule,name:0
@@ -206,7 +224,7 @@ msgstr "Días"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Timer"
-msgstr ""
+msgstr "Temporizador"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
@@ -216,17 +234,17 @@ msgstr "Tipo retraso"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server actions to run"
-msgstr ""
+msgstr "Acciones de servidor a ejecutar"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
 msgid "When unchecked, the rule is hidden and will not be executed."
-msgstr ""
+msgstr "Si no está marcado, la regla está oculta y no se ejecutará."
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
@@ -253,6 +271,8 @@ msgstr "Modelo de documento relacionado"
 msgid ""
 "If present, this condition must be satisfied before the update of the record."
 msgstr ""
+"Si está presente, esta condición debe satisfacerse antes de la actualización "
+"del registro."
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
@@ -299,7 +319,7 @@ msgstr "Fecha creación"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última acción"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,partner_id:0
@@ -320,7 +340,7 @@ msgstr "Acciones de servidor"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #~ msgid ""
 #~ "Check this if you want the rule to send an email to the responsible person."
diff --git a/addons/base_import/i18n/et.po b/addons/base_import/i18n/et.po
new file mode 100644
index 00000000000..ff45aeafb6b
--- /dev/null
+++ b/addons/base_import/i18n/et.po
@@ -0,0 +1,1166 @@
+# Estonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-24 20:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the "
+"External \n"
+"                        ID of each record you import. Then, you will be able "
+"\n"
+"                        to make a reference to that record with columns like "
+"\n"
+"                        \"Field/External ID\". The following two CSV files "
+"give \n"
+"                        you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+"                        application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+"                        record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's "
+"main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always "
+"\n"
+"                        have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+"                        (select 'company_'||id as \"External "
+"ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/External ID: Use External ID when you import "
+"\n"
+"                        data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr "Ära impordi"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr "Vali"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+"                        has a tabulation as separator, OpenERP will not \n"
+"                        detect the separations. You will need to change the "
+"\n"
+"                        file format options in your spreadsheet application. "
+"\n"
+"                        See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr "Kinnita"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+"                        External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+"                        reference the country of a contact, OpenERP proposes "
+"\n"
+"                        you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+"                        suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation "
+"\n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a "
+"\n"
+"                        conflict of ID between persons and companies "
+"(person_1 \n"
+"                        and company_1 who shared the same ID 1 in the "
+"orignial \n"
+"                        database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO "
+"\n"
+"                        '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import "
+"the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category "
+"list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+"                        one of the duplicates' values or your product "
+"category \n"
+"                        hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in "
+"\n"
+"                        PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
+msgstr ""
+"fail importimiseks. Kui sa vajad näidisfaili siis\n"
+"            sa saad selle tekitamiseks kasutada eksportimist."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+"                        ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+"                the column names, OpenERP can try auto-detecting the\n"
+"                field corresponding to the column. This makes imports\n"
+"                simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ".CSV"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+"            usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+"                        applications, your computer's regional settings will "
+"\n"
+"                        be applied for the separator and delimiter. \n"
+"                        We suggest you use OpenOffice or LibreOffice Calc \n"
+"                        as they will allow you to modify all three options \n"
+"                        (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+"                        settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file "
+"\n"
+"                        that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr "Lae andmed uuesti, et tuvastada muutused."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, OpenERP will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, OpenERP provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism "
+"\n"
+"                        per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be "
+"\n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+"                file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr "Impordi"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and "
+"\n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+"                        you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+"                        The \"External ID\" of a record is the unique "
+"identifier \n"
+"                        of this record in another application. This "
+"\"External \n"
+"                        ID\" must be unique accoss all the records of all \n"
+"                        objects, so it's a good practice to prefix this \n"
+"                        \"External ID\" with the name of the application or "
+"\n"
+"                        table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend "
+"you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records "
+"\n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the "
+"\n"
+"                        link between each person and the company they work \n"
+"                        for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+"                        one of these 3 ways to reference records in "
+"relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+"                        OpenERP will assign the default value for every non "
+"\n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, "
+"OpenERP \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+"                        specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+"                        allows you to use the Import/Export tool of OpenERP "
+"to \n"
+"                        modify a batch of records in your favorite "
+"spreadsheet \n"
+"                        application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+"                        import an other record that links to the first\n"
+"                        one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records "
+"that \n"
+"                        have already been imported will be modified instead "
+"of \n"
+"                        being created. This is very usefull as it allows you "
+"\n"
+"                        to import several times the same CSV file while "
+"having \n"
+"                        made some changes in between two imports. OpenERP "
+"will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to "
+"reserve \n"
+"                        a specific row in the CSV file. The first order line "
+"\n"
+"                        will be imported on the same row as the information "
+"\n"
+"                        relative to order. Any additional lines will need an "
+"\n"
+"                        addtional row that does not have any information in "
+"\n"
+"                        the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+"                        OpenERP without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 "
+"contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked "
+"\n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+"                        file of some quotations you can import, based on "
+"demo \n"
+"                        data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_import/i18n/pt_BR.po b/addons/base_import/i18n/pt_BR.po
index cece86d5281..654ec64a8c3 100644
--- a/addons/base_import/i18n/pt_BR.po
+++ b/addons/base_import/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-01 11:52+0000\n"
-"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 18:37+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
@@ -107,6 +108,9 @@ msgid ""
 "For the country \n"
 "                        Belgium, you can use one of these 3 ways to import:"
 msgstr ""
+"Para o país\n"
+"                                     Bélgica, você pode usar uma dessas 3 "
+"formas de importar:"
 
 #. module: base_import
 #. openerp-web
@@ -170,14 +174,14 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:351
 #, python-format
 msgid "Don't Import"
-msgstr ""
+msgstr "Não Importar"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:24
 #, python-format
 msgid "Select the"
-msgstr ""
+msgstr "Escolha o"
 
 #. module: base_import
 #. openerp-web
@@ -198,33 +202,33 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:141
 #, python-format
 msgid "Country: the name or code of the country"
-msgstr ""
+msgstr "Pais: o nome ou código do país"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
 msgid "base_import.tests.models.o2m.child"
-msgstr ""
+msgstr "base_import.tests.models.o2m.child"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:239
 #, python-format
 msgid "Can I import several times the same record?"
-msgstr ""
+msgstr "Posso importar várias vezes o mesmo registro?"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:15
 #, python-format
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:55
 #, python-format
 msgid "Map your data to OpenERP"
-msgstr ""
+msgstr "Mapear seus dados para o OpenERP"
 
 #. module: base_import
 #. openerp-web
@@ -235,6 +239,10 @@ msgid ""
 "                        the easiest way when your data come from CSV files \n"
 "                        that have been created manually."
 msgstr ""
+"Usar País: Este é\n"
+"                         a maneira mais fácil quando os dados vêm de "
+"arquivos CSV\n"
+"                         que tenham sido criada manualmente."
 
 #. module: base_import
 #. openerp-web
@@ -243,7 +251,7 @@ msgstr ""
 msgid ""
 "What's the difference between Database ID and \n"
 "                        External ID?"
-msgstr ""
+msgstr "Qual é a diferença entre o ID da Database e o ID Externo?"
 
 #. module: base_import
 #. openerp-web
@@ -255,25 +263,28 @@ msgid ""
 "\n"
 "                        you 3 different fields to import:"
 msgstr ""
+"Por exemplo, a\n"
+"                         referência ao país de um contato, p OpenERP propõe\n"
+"                         a você três campos diferentes para importação:"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:175
 #, python-format
 msgid "What can I do if I have multiple matches for a field?"
-msgstr ""
+msgstr "O que posso fazer se eu tiver várias correspondências para um campo?"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:302
 #, python-format
 msgid "External ID,Name,Is a Company"
-msgstr ""
+msgstr "Id Externo,Nome,É uma Empresa"
 
 #. module: base_import
 #: field:base_import.tests.models.preview,somevalue:0
 msgid "Some Value"
-msgstr ""
+msgstr "Algum Valor"
 
 #. module: base_import
 #. openerp-web
@@ -283,6 +294,8 @@ msgid ""
 "The following CSV file shows how to import \n"
 "                        suppliers and their respective contacts"
 msgstr ""
+"O arquivo CSV a seguir mostra como importar\n"
+"                         fornecedores e seus respectivos contatos"
 
 #. module: base_import
 #. openerp-web
@@ -292,6 +305,8 @@ msgid ""
 "How can I change the CSV file format options when \n"
 "                        saving in my spreadsheet application?"
 msgstr ""
+"Como posso alterar as opções de formato de arquivo CSV quando\n"
+"                         salvar em meu aplicativo de planilha?"
 
 #. module: base_import
 #. openerp-web
@@ -332,12 +347,12 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:148
 #, python-format
 msgid "Country: Belgium"
-msgstr ""
+msgstr "País: Bélgica"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
 msgid "base_import.tests.models.char.stillreadonly"
-msgstr ""
+msgstr "base_import.tests.models.char.stillreadonly"
 
 #. module: base_import
 #. openerp-web
@@ -353,7 +368,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:233
 #, python-format
 msgid "Suppliers and their respective contacts"
-msgstr ""
+msgstr "Fornecedores e seus respectivos contatos"
 
 #. module: base_import
 #. openerp-web
@@ -401,7 +416,7 @@ msgstr ""
 #. module: base_import
 #: field:base_import.tests.models.preview,othervalue:0
 msgid "Other Variable"
-msgstr ""
+msgstr "Outra Variável"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 01180a9b438..5b8948d6125 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-12 10:19+0000\n"
+"PO-Revision-Date: 2012-12-24 10:16+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:28+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_setup
@@ -62,7 +62,7 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "VENTAS"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -129,7 +129,7 @@ msgstr "En cliente email"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+msgstr "--db-filter=SU_BASE_DE_DATOS"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
@@ -217,6 +217,8 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"El portal público es accesible sólo si está en modo de base de datos único. "
+"Puede ejecutar el servidor OpenERP con la opción"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -249,6 +251,9 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Cuando envía un documento a un cliente (presupuesto, factura), el cliente "
+"podrá ingresar para obtener todos sus documentos, leer las noticias de la "
+"compañía, comprobar sus proyectos, etc."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -325,7 +330,7 @@ msgstr "Opciones"
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Activar el portal de cliente"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -334,6 +339,9 @@ msgid ""
 "                                    Once activated, the login page will be "
 "replaced by the public website."
 msgstr ""
+"para hacerlo.\n"
+"Una vez activado, la página de inicio de sesión será reemplazada con el "
+"sitio web público."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
@@ -344,6 +352,7 @@ msgstr "Permitir compartir documentos"
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
 msgstr ""
+"(noticias de la compañía, puestos de trabajo, formulario de contacto, etc.)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
@@ -363,7 +372,7 @@ msgstr "Integración red social"
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Dar a sus clientes acceso a sus documentos."
 
 #. module: base_setup
 #: view:base.config.settings:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 9f664b02f70..b579df3fc83 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-13 12:36+0000\n"
+"PO-Revision-Date: 2012-12-24 10:59+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:25+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
@@ -55,6 +55,11 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"Advertencia: Una iniciativa entrante está sin procesar más de 5 días.\n"
+"Nombre: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Descripción: [[object.description]]\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
@@ -65,7 +70,7 @@ msgstr "Acción"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "Establecer como equipo al Departamento de ventas"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -152,7 +157,7 @@ msgstr "Nombre de regla"
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "Sólo es posible convertir una llamada telefónica cada vez."
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -233,7 +238,7 @@ msgstr "Estado"
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "Nº reuniones"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -253,7 +258,7 @@ msgstr "Respuestas excluidas:"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "Fusionar oportunidades"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -471,6 +476,8 @@ msgstr "# Oportunidades"
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
 msgstr ""
+"Seleccione por favor más de un elemento (iniciativa u oportunidad) desde la "
+"vista lista."
 
 #. module: crm
 #: view:crm.lead:0
@@ -541,7 +548,7 @@ msgstr "Mailings"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Etapa cambiada"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -606,7 +613,7 @@ msgstr "Fusionar"
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
 msgid "Opportunity ${object.name | h})"
-msgstr ""
+msgstr "Oportunidad ${object.name | h})"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -993,7 +1000,7 @@ msgstr "Acción siguiente"
 #: code:addons/crm/crm_lead.py:762
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
-msgstr ""
+msgstr "<b>Empresa</b> establecida a <em>%s</em>."
 
 #. module: crm
 #: selection:crm.lead.report,state:0
@@ -1084,7 +1091,7 @@ msgstr "Fecha creación"
 #: code:addons/crm/crm_lead.py:703
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr ""
+msgstr "Iniciativa <b>convertida a oportunidad</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1147,7 +1154,7 @@ msgstr "Borrar"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Oportunidad creada"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1176,6 +1183,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una nueva oportunidad.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar el flujo de ventas para seguir ventas "
+"potenciales y prever mejor sus futuros ingresos.\n"
+"</p><p>\n"
+"Será capaz de planificar reuniones y llamadas telefónicas desde las "
+"oportunidades, convertirlas en presupuestos, adjuntar documentos "
+"relacionados, seguir todas las discusiones, y mucho más.\n"
+"</p>\n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1254,7 +1272,7 @@ msgstr ""
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "Iniciativa creada"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1358,6 +1376,8 @@ msgid ""
 "Phone Calls Assigned to the current user or with a team having the current "
 "user as team leader"
 msgstr ""
+"Llamadas telefónicas asignadas al usuario actual o con un equipo que tiene "
+"al usuario actual como líder del equipo"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1444,7 +1464,7 @@ msgstr "Por hacer"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "Oportunidad perdida"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -1493,7 +1513,7 @@ msgstr "Usuarios"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Etapa cambiada"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -1907,7 +1927,7 @@ msgstr "Equipos de ventas"
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Default to New Sales Team"
-msgstr ""
+msgstr "Por defecto a un nuevo equipo de ventas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1949,7 +1969,7 @@ msgstr "Iniciativas"
 #: code:addons/crm/crm_lead.py:571
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "Combinar iniciativas"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1972,7 +1992,7 @@ msgstr "Por hacer"
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "Iniciativa a oportunidad"
 
 #. module: crm
 #: field:crm.lead,user_email:0
@@ -2175,6 +2195,8 @@ msgid ""
 "Follow this salesteam to automatically track the events associated to users "
 "of this team."
 msgstr ""
+"Seguir a este equipo de ventas para rastrear automáticamente los eventos "
+"asociados a los usuarios de este equipo."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2346,7 +2368,7 @@ msgstr "En proceso"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
 msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "Iniciativa convertida a oportunidad"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2356,7 +2378,7 @@ msgstr "Iniciativas sin asignar"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
 msgid "Opportunity won"
-msgstr ""
+msgstr "Oportunidad ganada"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2426,7 +2448,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Fold by Default"
-msgstr ""
+msgstr "Replegar por defecto"
 
 #. module: crm
 #: field:crm.case.stage,state:0
@@ -2463,6 +2485,7 @@ msgstr "Confirmado"
 #: model:ir.model,name:crm.model_crm_partner_binding
 msgid "Handle partner binding or generation in CRM wizards."
 msgstr ""
+"Asistentes CRM para gestionar el enlanzamiento o la generación de empresas."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
@@ -2513,6 +2536,18 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una iniciativa sin calificar.\n"
+"</p><p>\n"
+"Use las iniciativas si necesita un paso de calificación antes de crear una "
+"oportunidad o un cliente. Puede ser una tarjeta de visita que recibió, un "
+"formulario de contacto rellenado en su sitio web, o un archivo de prospectos "
+"sin calificar importado.\n"
+"</p><p>\n"
+"Una vez calificada, la iniciativa se puede convertir en una oportunidad de "
+"negocio y/o un nuevo cliente en su libreta de direcciones.\n"
+"</p>\n"
+"        "
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
@@ -2665,7 +2700,7 @@ msgstr "Agosto"
 #: model:mail.message.subtype,name:crm.mt_lead_lost
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
 msgid "Opportunity Lost"
-msgstr ""
+msgstr "Oportunidad perdida"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2764,7 +2799,7 @@ msgstr "Llamadas registradas"
 #: model:mail.message.subtype,name:crm.mt_lead_won
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
 msgid "Opportunity Won"
-msgstr ""
+msgstr "Oportunidad ganada"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -3150,7 +3185,7 @@ msgstr "Boletín de noticias"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "Etapa de la oportunidad cambiada"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 86c837240f6..e452d322c79 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 22:00+0000\n"
-"Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
+"PO-Revision-Date: 2012-12-24 10:20+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:18+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
@@ -51,7 +51,7 @@ msgstr "Línea cuadrícula envío"
 #: field:stock.move,weight_uom_id:0
 #: field:stock.picking,weight_uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -453,6 +453,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir una nueva forma de envío.\n"
+"</p><p>\n"
+"Cada transportista (por ejemplo, UPS) puede tener varias formas de envío "
+"(por ejemplo, UPS express, UPS estándar) con un conjunto de reglas de "
+"precios para cada método.\n"
+"</p><p>\n"
+"Estos método permiten calcular automáticamente el precio del envío de "
+"acuerdo a su configuración: sobre el pedido de venta (basado en el "
+"presupuesto) o sobre la factura (basado en las órdenes de entrega).\n"
+"</p>\n"
+"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -495,7 +507,7 @@ msgstr "<="
 #. module: delivery
 #: help:stock.picking,weight_uom_id:0
 msgid "Unit of measurement for Weight"
-msgstr ""
+msgstr "Unidad de medida para el peso"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -609,7 +621,7 @@ msgstr "Provincias"
 #: help:stock.move,weight_uom_id:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+msgstr "La unidad de medida es la unidad de medición del peso"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index ad3f698a9a5..c41534cd632 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-05 11:59+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2012-12-25 12:16+0000\n"
+"Last-Translator: Olga <chikiro.spam@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
@@ -76,7 +76,7 @@ msgstr "Адрес отправителя (здесь могут быть исп
 #. module: email_template
 #: view:email.template:0
 msgid "Remove context action"
-msgstr ""
+msgstr "Удалить контекстное действие"
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -97,7 +97,7 @@ msgstr "Файл отчета"
 #. module: email_template
 #: view:email.template:0
 msgid "Preview"
-msgstr ""
+msgstr "Просмотр"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -108,7 +108,7 @@ msgstr "Обратный адрес"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use template"
-msgstr ""
+msgstr "Использовать шаблон"
 
 #. module: email_template
 #: field:email.template,body_html:0
@@ -120,7 +120,7 @@ msgstr "Тело"
 #: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (копия)"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -140,7 +140,7 @@ msgstr "Сервер SMTP"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as new template"
-msgstr ""
+msgstr "Сохранить как новый шаблон"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Value Builder"
-msgstr ""
+msgstr "Конструктор динамических значений"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -249,7 +249,7 @@ msgstr "Расширенный"
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Preview of"
-msgstr ""
+msgstr "Просмотр"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -320,7 +320,7 @@ msgstr ""
 #: field:email.template,ref_ir_value:0
 #: field:email_template.preview,ref_ir_value:0
 msgid "Sidebar Button"
-msgstr ""
+msgstr "Кнопка боковой панели"
 
 #. module: email_template
 #: field:email.template,report_template:0
@@ -342,18 +342,18 @@ msgstr "Модель"
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add context action"
-msgstr ""
+msgstr "Добавить контекстное действие"
 
 #. module: email_template
 #: help:email.template,model_id:0
 #: help:email_template.preview,model_id:0
 msgid "The kind of document with with this template can be used"
-msgstr ""
+msgstr "Вид документа этого шаблона можно использовать"
 
 #. module: email_template
 #: field:email.template,email_recipients:0
@@ -381,12 +381,12 @@ msgstr ""
 #: field:email.template,model:0
 #: field:email_template.preview,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addressing"
-msgstr ""
+msgstr "Адресация"
 
 #. module: email_template
 #: help:email.template,email_recipients:0
@@ -417,7 +417,7 @@ msgstr "Копия"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Applies to"
-msgstr ""
+msgstr "Применяется к"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
@@ -487,7 +487,7 @@ msgstr "Партнёр"
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Значение по умолчанию"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index 21242f2f893..974dde11450 100644
--- a/addons/event/i18n/pt_BR.po
+++ b/addons/event/i18n/pt_BR.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-16 14:01+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 18:18+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
@@ -25,12 +26,12 @@ msgstr "Meus Eventos"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Participants"
-msgstr ""
+msgstr "Número de Participantes"
 
 #. module: event
 #: field:event.event,register_attended:0
 msgid "# of Participations"
-msgstr ""
+msgstr "Nº de Participações"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -56,6 +57,9 @@ msgid ""
 "enough registrations you are not able to confirm your event. (put 0 to "
 "ignore this rule )"
 msgstr ""
+"É possível definir um nível mínimo de inscritos para cada evento. Se não "
+"houverem inscrições suficientes você não será capaz de confirmar o seu "
+"evento. (coloque 0 para ignorar esta regra)"
 
 #. module: event
 #: field:event.registration,date_open:0
@@ -65,7 +69,7 @@ msgstr "Data de Inscrição"
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
-msgstr ""
+msgstr "Tipo de Evento"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -77,7 +81,7 @@ msgstr "Show do Calypso"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,registration_state:0
 msgid "Attended"
-msgstr ""
+msgstr "Frequentou"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -87,7 +91,7 @@ msgstr "Março"
 #. module: event
 #: view:event.registration:0
 msgid "Send Email"
-msgstr ""
+msgstr "Enviar E-mail"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -101,22 +105,22 @@ msgstr "Empresa"
 #: field:event.event,email_confirmation_id:0
 #: field:event.type,default_email_event:0
 msgid "Event Confirmation Email"
-msgstr ""
+msgstr "Email de Confirmação do Evento"
 
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "Padrão de Máximo de Inscrições"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Display"
-msgstr ""
+msgstr "Exibir"
 
 #. module: event
 #: field:event.event,register_avail:0
 msgid "Available Registrations"
-msgstr ""
+msgstr "Inscrições Disponíveis"
 
 #. module: event
 #: view:event.registration:0
@@ -127,12 +131,12 @@ msgstr "Inscrição no Evento"
 #. module: event
 #: model:ir.module.category,description:event.module_category_event_management
 msgid "Helps you manage your Events."
-msgstr ""
+msgstr "Te auxilia a gerenciar seus Eventos."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: event
 #: view:report.event.registration:0
@@ -160,13 +164,13 @@ msgstr "Análise de Eventos"
 #. module: event
 #: help:event.type,default_registration_max:0
 msgid "It will select this default maximum value when you choose this event"
-msgstr ""
+msgstr "Irá definir este valor maximo por padrão ao selecionar este evento"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id_registration:0
 msgid "Register"
-msgstr ""
+msgstr "Inscrição"
 
 #. module: event
 #: field:event.event,message_ids:0
@@ -214,7 +218,7 @@ msgstr "Cancelado"
 #. module: event
 #: view:event.event:0
 msgid "ticket"
-msgstr ""
+msgstr "Ticket"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -225,28 +229,28 @@ msgstr "Ópera de Verdi"
 #: help:event.event,message_unread:0
 #: help:event.registration,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,registration_state:0
 msgid "Registration State"
-msgstr ""
+msgstr "Estado da Inscrição"
 
 #. module: event
 #: view:event.event:0
 msgid "tickets"
-msgstr ""
+msgstr "tickets"
 
 #. module: event
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Data final do Evento"
 
 #. module: event
 #: help:event.event,message_summary:0
@@ -255,6 +259,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: event
 #: view:report.event.registration:0
@@ -266,7 +273,7 @@ msgstr "Inscrições que estão como confirmadas ou concluídas"
 #: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: event
 #: view:event.event:0
@@ -285,6 +292,7 @@ msgstr "Parceiro"
 #: help:event.type,default_registration_min:0
 msgid "It will select this default minimum value when you choose this event"
 msgstr ""
+"Irá selecionar este valor mínimo padrão quando você escolher este evento"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -314,7 +322,7 @@ msgstr "Confirmado"
 #. module: event
 #: view:event.registration:0
 msgid "Participant"
-msgstr ""
+msgstr "Participante"
 
 #. module: event
 #: view:event.registration:0
@@ -325,12 +333,12 @@ msgstr "Confirmar"
 #. module: event
 #: view:event.event:0
 msgid "Organized by"
-msgstr ""
+msgstr "Organizado por"
 
 #. module: event
 #: view:event.event:0
 msgid "Register with this event"
-msgstr ""
+msgstr "Inscreva-se neste evento"
 
 #. module: event
 #: help:event.type,default_email_registration:0
@@ -338,17 +346,19 @@ msgid ""
 "It will select this default confirmation registration mail value when you "
 "choose this event"
 msgstr ""
+"Irá selecionar esse email de confirmação padrão quando você escolher este "
+"evento"
 
 #. module: event
 #: view:event.event:0
 msgid "Only"
-msgstr ""
+msgstr "Apenas"
 
 #. module: event
 #: field:event.event,message_follower_ids:0
 #: field:event.registration,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: event
 #: view:event.event:0
@@ -361,7 +371,7 @@ msgstr "Localização"
 #: view:event.registration:0
 #: field:event.registration,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: event
 #: view:event.registration:0
@@ -383,12 +393,12 @@ msgstr "Email"
 #: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
-msgstr ""
+msgstr "Nova inscrição confirmada: %s."
 
 #. module: event
 #: view:event.event:0
 msgid "Upcoming"
-msgstr ""
+msgstr "Próximos"
 
 #. module: event
 #: field:event.registration,create_date:0
@@ -399,7 +409,7 @@ msgstr "Data de Criação"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Event Responsible"
-msgstr ""
+msgstr "Responsável pelo Evento"
 
 #. module: event
 #: view:event.event:0
@@ -416,7 +426,7 @@ msgstr "Julho"
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To Email"
-msgstr ""
+msgstr "Email Responder para"
 
 #. module: event
 #: view:event.registration:0
@@ -426,7 +436,7 @@ msgstr "Inscrições confirmadas"
 #. module: event
 #: view:event.event:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: event
 #: view:event.event:0
@@ -462,7 +472,7 @@ msgstr "Status de Lotação de Eventos"
 #. module: event
 #: view:event.event:0
 msgid "Event Category"
-msgstr ""
+msgstr "Categoria de Evento"
 
 #. module: event
 #: field:event.event,register_prospect:0
@@ -472,13 +482,13 @@ msgstr "Inscrições Não Confirmadas"
 #. module: event
 #: model:ir.actions.client,name:event.action_client_event_menu
 msgid "Open Event Menu"
-msgstr ""
+msgstr "Abrir Menu de Evento"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,event_state:0
 msgid "Event State"
-msgstr ""
+msgstr "Situação do Evento"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -503,7 +513,7 @@ msgstr "Dezembro"
 #. module: event
 #: help:event.registration,origin:0
 msgid "Reference of the sales order which created the registration"
-msgstr ""
+msgstr "Referência do pedido de vendas que criou a inscrição"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
@@ -514,7 +524,7 @@ msgstr " # No de rascunho de Inscrições"
 #: field:event.event,email_registration_id:0
 #: field:event.type,default_email_registration:0
 msgid "Registration Confirmation Email"
-msgstr ""
+msgstr "Email de Confirmação da Inscrição"
 
 #. module: event
 #: view:report.event.registration:0
@@ -525,12 +535,12 @@ msgstr "Mês"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Attended Date"
-msgstr ""
+msgstr "Data da participação"
 
 #. module: event
 #: view:event.event:0
 msgid "Finish Event"
-msgstr ""
+msgstr "Finalizar Evento"
 
 #. module: event
 #: view:event.registration:0
@@ -540,7 +550,7 @@ msgstr "Inscrições não confirmadas"
 #. module: event
 #: view:event.event:0
 msgid "Event Description"
-msgstr ""
+msgstr "Descrição do Evento"
 
 #. module: event
 #: field:event.event,date_begin:0
@@ -550,18 +560,18 @@ msgstr "Data de Início"
 #. module: event
 #: view:event.confirm:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
-msgstr ""
+msgstr "Marque esta caixa se este contato é um palestrante."
 
 #. module: event
 #: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
-msgstr ""
+msgstr "Nenhum ticket disponível!"
 
 #. module: event
 #: help:event.event,state:0
@@ -571,6 +581,10 @@ msgid ""
 "status is set to 'Done'.If event is cancelled the status is set to "
 "'Cancelled'."
 msgstr ""
+"Se o evento é criado, a situação é 'Provisório'. Se o evento está confirmado "
+"para as datas especiais o status é definido como \"confirmado\". Se o evento "
+"é acabou, o status é definido como 'Concluído'. Se o evento é cancelado o "
+"status é definido como \"Cancelado\"."
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -586,6 +600,16 @@ msgid ""
 "             </p>\n"
 "           "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Clique para adicionar um novo evento.\n"
+"             </p><p>\n"
+"             O OpenERP ajuda a programar e organizar eficazmente os seus "
+"eventos:\n"
+"                acompanha inscrições e participações, automatiza os e-mails "
+"de confirmação,\n"
+"                vender tickets, etc\n"
+"             </p>\n"
+"           "
 
 #. module: event
 #: help:event.event,register_max:0
@@ -594,6 +618,9 @@ msgid ""
 "much registrations you are not able to confirm your event. (put 0 to ignore "
 "this rule )"
 msgstr ""
+"Você pode definir para cada evento um nível máximo de inscrições. Se você "
+"tem muitas inscrições você não será capaz de confirmar o seu evento. "
+"(coloque 0 para ignorar esta regra)"
 
 #. module: event
 #: field:event.event,user_id:0
@@ -608,6 +635,8 @@ msgid ""
 "expected minimum/maximum. Please reconsider those limits before going "
 "further."
 msgstr ""
+"O número total de inscrições confirmadas para o evento '%s' não está dentro "
+"do mínimo / máximo. Por favor reconsidere estes limites antes de continuar"
 
 #. module: event
 #: help:event.event,email_confirmation_id:0
@@ -615,11 +644,13 @@ msgid ""
 "If you set an email template, each participant will receive this email "
 "announcing the confirmation of the event."
 msgstr ""
+"Se você definir um modelo de e-mail, cada participante irá receber este e-"
+"mail anunciando a confirmação do evento."
 
 #. module: event
 #: view:board.board:0
 msgid "Events Filling By Status"
-msgstr ""
+msgstr "Lotação do Evento por Situação"
 
 #. module: event
 #: selection:report.event.registration,event_state:0
@@ -656,12 +687,12 @@ msgstr "Eventos"
 #: view:event.registration:0
 #: field:event.registration,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: event
 #: field:event.event,city:0
 msgid "city"
-msgstr ""
+msgstr "cidade"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -671,7 +702,7 @@ msgstr "Agosto"
 #. module: event
 #: field:event.event,zip:0
 msgid "zip"
-msgstr ""
+msgstr "CEP"
 
 #. module: event
 #: field:res.partner,event_ids:0
@@ -682,7 +713,7 @@ msgstr "desconhecido"
 #. module: event
 #: field:event.event,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Complemento"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -696,17 +727,20 @@ msgid ""
 "emails sent automatically at event or registrations confirmation. You can "
 "also put your email address of your mail gateway if you use one."
 msgstr ""
+"O endereço de e-mail do organizador, que é colocado no 'resposta' de todos "
+"os e-mails enviados automaticamente no evento ou confirmação de inscrições. "
+"Você também pode colocar o endereço de e-mail do seu servidor de mensagens."
 
 #. module: event
 #: help:event.event,message_ids:0
 #: help:event.registration,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: event
 #: field:event.registration,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Fone"
 
 #. module: event
 #: model:email.template,body_html:event.confirmation_event
@@ -721,18 +755,26 @@ msgid ""
 "        <p>Thank you for your participation!</p>\n"
 "        <p>Best regards</p>"
 msgstr ""
+"\n"
+"        <p>Olá ${object.name},</p>\n"
+"        <p>O evento ${object.event_id.name} que você se inscreveu está "
+"confirmado e será entre ${object.event_id.date_begin} até "
+"${object.event_id.date_end}.\n"
+"        Para mais informações por favor entre em contato conosco.</p>\n"
+"        <p>Obrigado por sua participação!</p>\n"
+"        <p>Atenciosamente</p>"
 
 #. module: event
 #: field:event.event,message_is_follower:0
 #: field:event.registration,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: event
 #: field:event.registration,user_id:0
 #: model:res.groups,name:event.group_event_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: event
 #: view:event.confirm:0
@@ -746,7 +788,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "(confirmed:"
-msgstr ""
+msgstr "(confirmado:"
 
 #. module: event
 #: view:event.registration:0
@@ -792,6 +834,8 @@ msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
 "reset it to draft if you want to cancel this event."
 msgstr ""
+"você já está inscrito neste evento como 'Participei'. Por favor volte ao "
+"estado provisório se você deseja cancelar este evento."
 
 #. module: event
 #: view:res.partner:0
@@ -801,12 +845,12 @@ msgstr "Data"
 #. module: event
 #: view:event.event:0
 msgid "Email Configuration"
-msgstr ""
+msgstr "Configuração de Email"
 
 #. module: event
 #: field:event.type,default_registration_min:0
 msgid "Default Minimum Registration"
-msgstr ""
+msgstr "Inscrições Mínimas Padrão"
 
 #. module: event
 #: field:event.event,address_id:0
@@ -825,12 +869,14 @@ msgid ""
 "This field contains the template of the mail that will be automatically sent "
 "each time a registration for this event is confirmed."
 msgstr ""
+"Este campo contém o modelo de email que será enviado automaticamente a cada "
+"inscrição confirmada para este evento."
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Attended the Event"
-msgstr ""
+msgstr "Participaram do evento"
 
 #. module: event
 #: constraint:event.event:0
@@ -841,7 +887,7 @@ msgstr "Erro! A Data de Encerramento não pode ser anterior a Data de Início."
 #: code:addons/event/event.py:355
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
-msgstr ""
+msgstr "Você deve esperar o dia de início do evento para fazer esta ação."
 
 #. module: event
 #: selection:event.event,state:0
@@ -852,7 +898,7 @@ msgstr "Concluído"
 #. module: event
 #: view:report.event.registration:0
 msgid "Show Confirmed Registrations"
-msgstr ""
+msgstr "Mostrar Inscrições Confirmadas"
 
 #. module: event
 #: view:event.confirm:0
@@ -862,35 +908,35 @@ msgstr "Cancelar"
 #. module: event
 #: field:event.registration,reply_to:0
 msgid "Reply-to Email"
-msgstr ""
+msgstr "Email Reponder para"
 
 #. module: event
 #: code:addons/event/event.py:106
 #, python-format
 msgid "Only %d Seats are Available!"
-msgstr ""
+msgstr "Apenas %d Lugares estão Disponíveis!"
 
 #. module: event
 #: model:email.template,subject:event.confirmation_event
 #: model:email.template,subject:event.confirmation_registration
 msgid "Your registration at ${object.event_id.name}"
-msgstr ""
+msgstr "Sua inscrição para ${object.event_id.name}"
 
 #. module: event
 #: view:event.registration:0
 msgid "Set To Unconfirmed"
-msgstr ""
+msgstr "Definir como Não Confirmado"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,is_subscribed:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Inscrito"
 
 #. module: event
 #: view:event.event:0
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Cancelar a inscrição"
 
 #. module: event
 #: view:event.event:0
@@ -901,7 +947,7 @@ msgstr "Responsável"
 #. module: event
 #: view:report.event.registration:0
 msgid "Registration contact"
-msgstr ""
+msgstr "Contato da Inscrição"
 
 #. module: event
 #: view:report.event.registration:0
@@ -913,18 +959,18 @@ msgstr "Orador"
 #. module: event
 #: view:event.event:0
 msgid "Upcoming events from today"
-msgstr ""
+msgstr "Próximos eventos a partir de hoje"
 
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
-msgstr ""
+msgstr "Conferencia em Negócios de ERP"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
 #: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registration"
-msgstr ""
+msgstr "Nova Inscrição"
 
 #. module: event
 #: field:event.event,note:0
@@ -939,7 +985,7 @@ msgstr " # No de Inscrições Confirmadas"
 #. module: event
 #: field:report.event.registration,name_registration:0
 msgid "Participant / Contact Name"
-msgstr ""
+msgstr "Participante / Nome do Contato"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -954,7 +1000,7 @@ msgstr "Inscrições de Eventos"
 #. module: event
 #: view:event.event:0
 msgid "No ticket available."
-msgstr ""
+msgstr "Nenhum ticket disponível."
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1004,7 +1050,7 @@ msgstr "Encerrar Inscrição"
 #. module: event
 #: field:event.registration,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento de Origem"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -1017,6 +1063,8 @@ msgid ""
 "It will select this default confirmation event mail value when you choose "
 "this event"
 msgstr ""
+"Irá selecionar esse email padrão de confirmação do evento quando você "
+"escolher este evento"
 
 #. module: event
 #: view:report.event.registration:0
@@ -1046,12 +1094,12 @@ msgstr "ID (identificação)"
 #. module: event
 #: field:event.type,default_reply_to:0
 msgid "Default Reply-To"
-msgstr ""
+msgstr "Responder-Para padrão"
 
 #. module: event
 #: view:event.event:0
 msgid "available."
-msgstr ""
+msgstr "disponível"
 
 #. module: event
 #: field:event.registration,event_begin_date:0
@@ -1062,12 +1110,12 @@ msgstr "Data de Início do Evento"
 #. module: event
 #: view:report.event.registration:0
 msgid "Participant / Contact"
-msgstr ""
+msgstr "Participante / Contato"
 
 #. module: event
 #: view:event.event:0
 msgid "Current Registrations"
-msgstr ""
+msgstr "Inscrições Atuais"
 
 #. module: event
 #: model:email.template,body_html:event.confirmation_registration
@@ -1082,6 +1130,14 @@ msgid ""
 "        <p>Thank you for your participation!</p>\n"
 "        <p>Best regards</p>"
 msgstr ""
+"\n"
+"        <p>Olá ${object.name},</p>\n"
+"        <p>Nós confirmamos sua inscrição para o evento "
+"${object.event_id.name} .\n"
+"        Você irá receber um email com mais informações (como o horário, "
+"agenda...) assim que o evento for confirmado.</p>\n"
+"        <p>Obrigado por sua participação!</p>\n"
+"        <p>Atenciosamente</p>"
 
 #. module: event
 #: help:event.event,reply_to:0
@@ -1091,6 +1147,10 @@ msgid ""
 "registrations confirmation. You can also put the email address of your mail "
 "gateway if you use one."
 msgstr ""
+"O endereço de e-mail do organizador é usado aqui, para ficar como padrão de "
+"'Responder Para' dos e-mails enviados automaticamente no evento ou "
+"confirmação de inscrições. Você também pode colocar o endereço de e-mail de "
+"seu servidor."
 
 #. module: event
 #: view:event.event:0
@@ -1101,12 +1161,12 @@ msgstr "Inscrever"
 #. module: event
 #: model:res.groups,name:event.group_event_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: event
 #: field:event.event,street:0
 msgid "Street"
-msgstr ""
+msgstr "Endereço"
 
 #. module: event
 #: view:event.confirm:0
diff --git a/addons/event_moodle/i18n/pt_BR.po b/addons/event_moodle/i18n/pt_BR.po
new file mode 100644
index 00000000000..ddc21dcf057
--- /dev/null
+++ b/addons/event_moodle/i18n/pt_BR.po
@@ -0,0 +1,195 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-24 18:29+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with username and password"
+msgstr "Conectar com usuário e senha"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_moodle_config_wiz
+msgid "event.moodle.config.wiz"
+msgstr "event.moodle.config.wiz"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,server_moodle:0
+msgid ""
+"URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
+"'http://localhost'"
+msgstr ""
+"URL aonde está configurado o servidor moodle. Por exemplo 'http://127.0.0.1' "
+"ou 'http://localhost'"
+
+#. module: event_moodle
+#: field:event.registration,moodle_user_password:0
+msgid "Password for Moodle User"
+msgstr "Senha para o Usuário Moodle"
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_password:0
+msgid "Moodle Password"
+msgstr "Senha Moodle"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Your email '%s' is wrong."
+msgstr "Seu email '%s' está errado."
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with a Token"
+msgstr "Conectar com um Token"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"The easiest way to connect OpenERP with a moodle server is to create a "
+"'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
+"application."
+msgstr ""
+"A maneira mais fácil de conectar o OpenERP com um servidor moodle é criar um "
+"token no Moodle. Ele será usado para autenticar o OpenERP como uma aplicação "
+"confiável."
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,url:0
+msgid "URL to Moodle Server"
+msgstr "URL para o Servidor Moodle"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,url:0
+msgid "The url that will be used for the connection with moodle in xml-rpc"
+msgstr "A url que será usada para a conexão do moodle em xml-rpc"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_registration
+msgid "Event Registration"
+msgstr "Inscrição no Evento"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"Another approach is to create a user for OpenERP in Moodle. If you do so, "
+"make sure that this user has appropriate access rights."
+msgstr ""
+"Outra maneira é criar um usuário para o OpenERP no Moodle. Se você fizer "
+"dessa forma, tenha certeza de que este usuário possui os direitos de acesso "
+"apropriados."
+
+#. module: event_moodle
+#: field:event.registration,moodle_uid:0
+msgid "Moodle User ID"
+msgstr "ID do Usuário no Moodle"
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,server_moodle:0
+msgid "Moodle Server"
+msgstr "Servidor Moodle"
+
+#. module: event_moodle
+#: field:event.event,moodle_id:0
+msgid "Moodle ID"
+msgstr "ID Moodle"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#: code:addons/event_moodle/event_moodle.py:105
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:105
+#, python-format
+msgid "You must configure your moodle connection."
+msgstr "Você precisa configurar sua conexão ao moodle."
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_username:0
+#: field:event.registration,moodle_username:0
+msgid "Moodle Username"
+msgstr "Usuário Moodle"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+#: model:ir.actions.act_window,name:event_moodle.configure_moodle
+msgid "Configure Moodle"
+msgstr "Configurar Moodle"
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_token:0
+msgid "Moodle Token"
+msgstr "Token Moodle"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_username:0
+msgid ""
+"You can also connect with your username that you define when you create a "
+"token"
+msgstr ""
+"Você também pode conectar com o usuário que você definiu ao criar um token"
+
+#. module: event_moodle
+#: help:event.event,moodle_id:0
+msgid "The identifier of this event in Moodle"
+msgstr "O identificador deste evento no Moodle"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_token:0
+msgid "Put your token that you created in your moodle server"
+msgstr "Coloque o token que você criou no seu servidor moodle"
+
+#. module: event_moodle
+#: model:ir.ui.menu,name:event_moodle.wizard_moodle
+msgid "Moodle Configuration"
+msgstr "Configuracão do Moodle"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "or"
+msgstr "ou"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#, python-format
+msgid "First configure your moodle connection."
+msgstr "Primeiro configure sua conexão do Moodle"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Apply"
+msgstr "Aplicar"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_event
+msgid "Event"
+msgstr "Evento"
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po
index 2e0168cb054..b0fe39ebe78 100644
--- a/addons/event_project/i18n/pt_BR.po
+++ b/addons/event_project/i18n/pt_BR.po
@@ -7,19 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-12-07 19:29+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-24 18:22+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr "Evento de Projeto"
+msgstr "Projeto de Evento"
 
 #. module: event_project
 #: field:event.project,date:0
@@ -77,7 +78,7 @@ msgstr "Tarefas"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr "Erro ! Você não pode criar um evento recursivo."
+msgstr "Erro! Você não pode criar um evento recursivo."
 
 #. module: event_project
 #: field:event.event,task_ids:0
diff --git a/addons/event_sale/i18n/es.po b/addons/event_sale/i18n/es.po
index d9483a22a3d..6dc896b7947 100644
--- a/addons/event_sale/i18n/es.po
+++ b/addons/event_sale/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 21:53+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 10:22+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
@@ -28,6 +28,8 @@ msgid ""
 "Determine if a product needs to create automatically an event registration "
 "at the confirmation of a sales order line."
 msgstr ""
+"Determina si un producto crea automáticamente una inscripción a un evento en "
+"la confirmación de la línea del pedido de venta."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -48,6 +50,9 @@ msgid ""
 "Select event types so when we use this product in sales order lines, it will "
 "filter events of this type only."
 msgstr ""
+"Seleccione los tipos de evento para que cuando se utilice este producto en "
+"las líneas de los pedidos de venta, se filtren eventos de este tipo "
+"únicamente."
 
 #. module: event_sale
 #: field:product.product,event_type_id:0
@@ -78,7 +83,7 @@ msgstr "Formación técnica"
 #: code:addons/event_sale/event_sale.py:88
 #, python-format
 msgid "The registration %s has been created from the Sales Order %s."
-msgstr ""
+msgstr "Se ha creado la inscripción %s desde el pedido de venta %s."
 
 #. module: event_sale
 #: field:sale.order.line,event_id:0
diff --git a/addons/event_sale/i18n/pt_BR.po b/addons/event_sale/i18n/pt_BR.po
index b677fe0583e..1448c9f8217 100644
--- a/addons/event_sale/i18n/pt_BR.po
+++ b/addons/event_sale/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-07 19:28+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-24 18:20+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:06+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: event_sale
@@ -28,6 +29,8 @@ msgid ""
 "Determine if a product needs to create automatically an event registration "
 "at the confirmation of a sales order line."
 msgstr ""
+"Determina se um produto precisa criar uma inscrição automaticamente na "
+"confirmação da linha do pedido de vendas."
 
 #. module: event_sale
 #: help:sale.order.line,event_id:0
@@ -48,6 +51,8 @@ msgid ""
 "Select event types so when we use this product in sales order lines, it will "
 "filter events of this type only."
 msgstr ""
+"Escolha o tipo de evento quando usar este produto em linhas do pedido de "
+"vendas, irá filtrar apenas eventos desse tipo."
 
 #. module: event_sale
 #: field:product.product,event_type_id:0
@@ -78,7 +83,7 @@ msgstr "Treinamento Técnico"
 #: code:addons/event_sale/event_sale.py:88
 #, python-format
 msgid "The registration %s has been created from the Sales Order %s."
-msgstr ""
+msgstr "A inscrição %s foi criada pelo Pedido de Vendas %s."
 
 #. module: event_sale
 #: field:sale.order.line,event_id:0
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 6e49cad4fc2..281f988d0b5 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-17 00:43+0000\n"
+"PO-Revision-Date: 2012-12-24 18:20+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
@@ -73,7 +73,7 @@ msgstr ""
 #. module: fetchmail
 #: view:base.config.settings:0
 msgid "Configure the incoming email gateway"
-msgstr ""
+msgstr "Configure o servidor de emails de entrada"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
diff --git a/addons/fleet/i18n/es.po b/addons/fleet/i18n/es.po
index 08b33e4c700..f45b9f95186 100644
--- a/addons/fleet/i18n/es.po
+++ b/addons/fleet/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-20 01:27+0000\n"
+"PO-Revision-Date: 2012-12-24 10:24+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:07+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
@@ -144,7 +144,7 @@ msgstr "Litro"
 #. module: fleet
 #: model:ir.actions.client,name:fleet.action_fleet_menu
 msgid "Open Fleet Menu"
-msgstr ""
+msgstr "Abrir menú de flota"
 
 #. module: fleet
 #: view:board.board:0
@@ -301,7 +301,7 @@ msgstr "Mensajes"
 #. module: fleet
 #: model:res.groups,name:fleet.group_fleet_user
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
@@ -972,7 +972,7 @@ msgstr "Registros de los servicios"
 #. module: fleet
 #: view:fleet.vehicle.model:0
 msgid "Brand"
-msgstr ""
+msgstr "Marca"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
@@ -1058,7 +1058,7 @@ msgstr "Repuesto del inyector de combustible"
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
 msgid "Vehicle Status"
-msgstr ""
+msgstr "Estado del vehículo"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
@@ -1933,7 +1933,7 @@ msgstr "Costes generados"
 #. module: fleet
 #: field:fleet.vehicle.state,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: fleet
 #: field:fleet.vehicle,color:0
@@ -1978,7 +1978,7 @@ msgstr "Nº de asientos del vehículo"
 #. module: fleet
 #: model:res.groups,name:fleet.group_fleet_manager
 msgid "Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
diff --git a/addons/fleet/i18n/pt_BR.po b/addons/fleet/i18n/pt_BR.po
new file mode 100644
index 00000000000..48da74d633e
--- /dev/null
+++ b/addons/fleet/i18n/pt_BR.po
@@ -0,0 +1,1913 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-24 19:47+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr "Híbrido"
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr "Compacto"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr "Substituição do Compressor do A/C"
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr "Número do Chassi"
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr "Serviços"
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr "Mensalmente"
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr "Substituição da Correia de Transmissão / Motor"
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr "Custos do Veículo"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr "Diesel"
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr "Troca da Bomba de Óleo"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr "Inspeção da Correia do Motor"
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr "Não"
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr "Potência do Veículo em Kw"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr "Depreciação e Juros"
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr "Fornecedor"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr "Detalhes do Odômetro"
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr "Possui Alerta(s)"
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr "Litro"
+
+#. module: fleet
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr "Abrir Menu Frota"
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr "Custos com Combustível"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr "Inspeção da Bateria"
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr "Data da Fatura"
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr "Detalhes de Abastecimento"
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:659
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr "%s contrato(s) precisa(m) ser renovado ou fechado!"
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr "Serviços"
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr "Termos e Condições"
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr "Veículos com alertas"
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr "Custo Total"
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr "Ambos"
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr "Terminar Contrato"
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr "Observações"
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:730
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver_id:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state_id:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state_id:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand_id:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver_id:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 80fe8d8c532..2f894c678c1 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-16 23:42+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 14:14+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:48+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr
@@ -24,7 +25,7 @@ msgstr "Usuário Openerp"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "Permite validação da planilha de horas por gerentes"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -34,7 +35,7 @@ msgstr "Pré-requisitos"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "Ligar o funcionário à informação"
+msgstr "Associar o funcionário a informação"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -49,7 +50,7 @@ msgstr "No SIN"
 #: model:ir.ui.menu,name:hr.menu_hr_root
 #: model:ir.ui.menu,name:hr.menu_human_resources_configuration
 msgid "Human Resources"
-msgstr "Recursos humanos"
+msgstr "Recursos Humanos"
 
 #. module: hr
 #: help:hr.employee,image_medium:0
@@ -58,11 +59,13 @@ msgid ""
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
 msgstr ""
+"Foto média do funcionário. Será automaticamente redimensionado para 128x128 "
+"px, mantendo o aspecto. Use este campo em visões de formulário ou kanban."
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Time Tracking"
-msgstr ""
+msgstr "Apontamento de Tempo"
 
 #. module: hr
 #: view:hr.employee:0
@@ -83,7 +86,7 @@ msgstr "Número de empregados atualmente ocupando esta posição"
 #. module: hr
 #: field:hr.config.settings,module_hr_evaluation:0
 msgid "Organize employees periodic evaluation"
-msgstr ""
+msgstr "Organizar avaliação periódica dos funcionários"
 
 #. module: hr
 #: view:hr.department:0
@@ -106,11 +109,13 @@ msgid ""
 "This field holds the image used as photo for the employee, limited to "
 "1024x1024px."
 msgstr ""
+"Este campo guarda a imagem usada como foto do funcionário, limitada para "
+"1024x1024px."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "Isto instala o módulo hr_holidays"
 
 #. module: hr
 #: view:hr.job:0
@@ -125,7 +130,7 @@ msgstr "Em Recrutamento"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -143,33 +148,33 @@ msgstr "Esperado em Recrutamento"
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "Funcionários Relacionados"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error! You cannot create recursive Categories."
-msgstr ""
+msgstr "Erro! Você não pode criar categorias recursivas"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "Isto instala o módulo hr_recruitment."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Birth"
-msgstr ""
+msgstr "Nascimento"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Employee Tags"
-msgstr ""
+msgstr "Marcadores de Funcionário"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Launch Recruitement"
-msgstr ""
+msgstr "Lançar Recrutamento"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -184,7 +189,7 @@ msgstr "Departamento pai"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr "Faltas"
+msgstr "Folgas"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -194,22 +199,22 @@ msgstr "Casado(a)"
 #. module: hr
 #: field:hr.job,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr ""
+msgstr "Gestão de Talentos"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "Isto instala o módulo hr_timesheet_sheet."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Celular:"
 
 #. module: hr
 #: view:hr.employee:0
@@ -219,7 +224,7 @@ msgstr "Posição"
 #. module: hr
 #: help:hr.job,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -238,7 +243,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Foto de tamanho médio"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -279,14 +284,14 @@ msgstr "Localização do escritório"
 #. module: hr
 #: field:hr.job,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: hr
 #: view:hr.employee:0
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Colaborador"
+msgstr "Funcionário"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
@@ -300,6 +305,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Foto pequena do funcionário. Será automaticamente redimensionada para 64x64 "
+"px mantendo o aspecto. Use este campo em qualquer lugar que uma imagem "
+"miniatura for necessária."
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -309,12 +317,12 @@ msgstr "Data de Nascimento"
 #. module: hr
 #: help:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr "Número de novos empregados a serem contratados."
+msgstr "Número de novos funcionários a serem contratados."
 
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "Abrir Menu RH"
 
 #. module: hr
 #: help:hr.job,message_summary:0
@@ -322,6 +330,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
@@ -329,6 +340,8 @@ msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
 msgstr ""
+"Isto instala o módulo account_analytic_analysis, que irá instalar também a "
+"gestão de vendas."
 
 #. module: hr
 #: view:board.board:0
@@ -345,7 +358,7 @@ msgstr "Função"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Current Number of Employees"
-msgstr ""
+msgstr "Número de Funcionários Atuais"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -355,7 +368,7 @@ msgstr "Membros"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr "Configuração."
+msgstr "Configuração"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
@@ -365,12 +378,12 @@ msgstr "Formulário de Funcionários e estrutura"
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "Gestão de despesas de funcionários"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -416,6 +429,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo cargo\n"
+"              </p><p>\n"
+"Cargos são usados ​​para definir os trabalhos e os seus requisitos.\n"
+"                 Você pode manter o controle do número de funcionários que "
+"você tem por cargo\n"
+"                 posicionar e acompanhar a evolução de acordo com o que foi "
+"planejado\n"
+"                 para o futuro.\n"
+"              </p><p>\n"
+"Você pode anexar uma pesquisa para um cargo. Será usado no processo de\n"
+"seleção para avaliar os candidatos para esta posição de trabalho.\n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -428,42 +455,44 @@ msgid ""
 "$('.oe_employee_picture').load(function() { if($(this).width() > "
 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Isto instala o módulo hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "Erro! Você não pode criar hierarquias recursivas para Funcionários"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Isto instala o módulo hr_attendance."
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Foto pequena."
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categoria de Colaborador"
+msgstr "Categoria de Funcionários"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Marcadores"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Isto instala o módulo hr_contract."
 
 #. module: hr
 #: view:hr.employee:0
@@ -473,7 +502,7 @@ msgstr "Usuário relacionado"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -483,27 +512,27 @@ msgstr "Categoria"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "Parar Recrutamento"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "Instalar o recurso atendimentos"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "Conta Salário bancária do Funcionário"
+msgstr "Conta Bancária para Salário do Funcionário"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr "Nota"
+msgstr "Observação"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Estrutura de Funcional"
+msgstr "Estrutura de Funcionários"
 
 #. module: hr
 #: view:hr.employee:0
@@ -513,7 +542,7 @@ msgstr "Informações do contato"
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Gestão de Folgas, Férias e Pedidos de alocação"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -525,7 +554,7 @@ msgstr "Departamentos filho (Subordinados)"
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "Status"
-msgstr "Situação atual"
+msgstr "Situação"
 
 #. module: hr
 #: field:hr.employee,otherid:0
@@ -540,12 +569,12 @@ msgstr "Contrato do Funcionário"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratos"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -555,12 +584,12 @@ msgstr "No SSN"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Gestão do processo de seleção"
 
 #. module: hr
 #: view:hr.employee:0
@@ -570,12 +599,12 @@ msgstr "Ativo"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "Gestão de Recursos Humanos"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "Instala a Folha de Pagamentos"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -590,7 +619,7 @@ msgstr "Empresas"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -615,21 +644,29 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um novo funcionário.\n"
+"              </p><p>\n"
+"Com apenas uma rápida olhada na tela de funcionário, você pode facilmente\n"
+"encontrar todas as informações que você precisa para cada pessoa;\n"
+"                 dados de contato, cargo que ocupa, disponibilidade, etc\n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "Configurações de RH"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Cidadania & Outras Informações"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Erro! Você não pode criar departamentos recursivos."
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -639,7 +676,7 @@ msgstr "Endereço comercial"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "Informação Pública"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -654,7 +691,7 @@ msgstr "ir.actions.act_window"
 #. module: hr
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Conexão mais recente"
 
 #. module: hr
 #: field:hr.employee,image:0
@@ -664,7 +701,7 @@ msgstr "Foto"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -679,11 +716,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um departamento.\n"
+"              </p><p>\n"
+"A estrutura de departamento é usado para gerenciar todos os documentos\n"
+"                 relacionados aos funcionários pelos departamentos: "
+"despesas, planilhas,\n"
+"                 folgas e férias, recrutamentos, etc\n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Isto instala o módulo hr_timesheet."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
@@ -705,6 +751,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo departamento.\n"
+"              </p><p>\n"
+"           A estrutura de departamento é usado para gerenciar todos os "
+"documentos\n"
+"                 relacionados aos funcionários pelos departamentos: "
+"despesas, planilhas,\n"
+"                 folgas e férias, recrutamentos, etc\n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -729,18 +785,20 @@ msgstr "Celular Comercial"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Recrutamento em Andamento"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
 msgstr ""
+"Permite o faturamento baseado em planilha de horas (a aplicação de vendas "
+"será instalada)"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Categorias de Colaboradores"
+msgstr "Categorias de Funcionários"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
@@ -750,7 +808,7 @@ msgstr "Endereço Residencial"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
 msgid "Manage timesheets"
-msgstr ""
+msgstr "Gerenciar Planilha de Horas"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_payroll_modules
@@ -775,12 +833,12 @@ msgstr "Em Posição"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Isto instala o módulo hr_payroll."
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
 msgid "Record contracts per employee"
-msgstr ""
+msgstr "Registra contratos por funcionários"
 
 #. module: hr
 #: view:hr.department:0
@@ -795,12 +853,12 @@ msgstr "Nacionalidade"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "Características Adicionais"
 
 #. module: hr
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr "Notas"
+msgstr "Observações"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -833,7 +891,7 @@ msgstr "Sexo"
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "Employees"
-msgstr "Colaboradores"
+msgstr "Funcionários"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -848,23 +906,23 @@ msgstr "Nome do Departamento"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "Relatórios"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "Gerenciar folha de pagamentos"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "Configurar Recursos Humanos"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "No de Recrutamento"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -884,7 +942,7 @@ msgstr "Nome de acesso"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Total de Funcionários Previstos"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -892,11 +950,13 @@ msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
 msgstr ""
+"Por padrão 'Em posição' defina para 'Em seleção' se o processo de seleção "
+"segue para este cargo"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -922,6 +982,22 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>O Painel de Recursos Humanos está vazio.</b>\n"
+"                  </p><p>\n"
+"                    Para adicionar seu primeiro relatório a este painel, vá "
+"em qualquer\n"
+"                    menu, mude a visão para listagem ou gráfico, e clique "
+"<i>'Adicionar \n"
+"                    ao Painél'</i> nas opções da busca extendida.\n"
+"                  </p><p>\n"
+"                    Você pode filtrar e agrupar dados antes de inserir no "
+"painél\n"
+"usando as opções da busca.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -937,19 +1013,19 @@ msgstr "O nome do cargo deve ser único por empresa!"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Isto instala o módulo hr_expense"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr
 #: field:hr.department,manager_id:0
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "Gestor"
+msgstr "Gerente"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -964,7 +1040,7 @@ msgstr "Subordinados"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #~ msgid "Error! You can not create recursive departments."
 #~ msgstr "Erro! Voce não pode criar departamentos recursivos."
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index bc2e1c3f707..80bf93bd596 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-12 11:56+0000\n"
+"PO-Revision-Date: 2012-12-24 10:22+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:51+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
@@ -97,7 +97,7 @@ msgstr "Octubre"
 #. module: hr_attendance
 #: field:hr.employee,attendance_access:0
 msgid "Attendance Access"
-msgstr ""
+msgstr "Acceso a la asistencia"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 413ce27d40e..46b8940a3fa 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 14:23+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:51+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_attendance
@@ -29,7 +30,7 @@ msgstr "Pesquisa por Frequência de RH"
 #. module: hr_attendance
 #: field:hr.employee,last_sign:0
 msgid "Last Sign"
-msgstr ""
+msgstr "Último Acesso"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -43,12 +44,12 @@ msgstr "Frequência"
 #: code:addons/hr_attendance/static/src/js/attendance.js:34
 #, python-format
 msgid "Last sign in: %s,<br />%s.<br />Click to sign out."
-msgstr ""
+msgstr "Último acesso em:  %s,<br />%s.<br />Clique para sair."
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "Erro! Entrar (resp. Sair) deve seguir Sair (resp. Entrar)"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
@@ -72,7 +73,7 @@ msgstr "Imprimir Relatório de Frequência Mensal"
 #: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
-msgstr ""
+msgstr "Freqüência por semana"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -97,7 +98,7 @@ msgstr "Outubro"
 #. module: hr_attendance
 #: field:hr.employee,attendance_access:0
 msgid "Attendance Access"
-msgstr ""
+msgstr "Acesso ao Atendimento"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:154
@@ -111,7 +112,7 @@ msgstr "Saída"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records are found for your selection!"
-msgstr ""
+msgstr "Nenhum registro encontrado para sua seleção!"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -177,7 +178,7 @@ msgstr "Atenção"
 #. module: hr_attendance
 #: help:hr.config.settings,group_hr_attendance:0
 msgid "Allocates attendance group to all users."
-msgstr ""
+msgstr "Aloca grupo atendimento a todos os usuários."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -193,7 +194,7 @@ msgstr "Junho"
 #: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
-msgstr ""
+msgstr "Atendimentos por mês"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
@@ -249,7 +250,7 @@ msgstr "Data"
 #. module: hr_attendance
 #: field:hr.config.settings,group_hr_attendance:0
 msgid "Track attendances for all employees"
-msgstr ""
+msgstr "Acompanhar atendimentos para todos os funcionários"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -333,7 +334,7 @@ msgstr "Janeiro"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available !"
-msgstr ""
+msgstr "Nenhum dado disponível!"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -359,7 +360,7 @@ msgstr "Ação"
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr "Rastreamento de Tempo"
+msgstr "Apontamento de Tempo"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -406,14 +407,14 @@ msgstr "Imprimir Relatório de Frequência Semanal"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/js/attendance.js:36
 #, python-format
 msgid "Click to Sign In at %s."
-msgstr ""
+msgstr "Clique para Entrar em %s."
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
@@ -432,6 +433,8 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the HR Manager to correct attendances."
 msgstr ""
+"Você tentou %s com uma data anterior para outro evento!\n"
+"Entrar em contato com o Gerente de RH para atendimentos corretos"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -463,7 +466,7 @@ msgstr ""
 #: view:hr.attendance.month:0
 #: view:hr.attendance.week:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index beb8c052f1b..669ff11cdbc 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/i18n/pt_BR.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-20 17:33+0000\n"
-"Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 16:40+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_contract
@@ -102,7 +103,7 @@ msgstr "Tipos de Contrato"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Exam"
-msgstr ""
+msgstr "Exame Médico"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -128,7 +129,7 @@ msgstr "Em Quilometros"
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
 msgid "Notes"
-msgstr "Notas"
+msgstr "Observações"
 
 #. module: hr_contract
 #: field:hr.contract,permit_no:0
@@ -162,7 +163,7 @@ msgstr "Horário de Trabalho"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Salary and Advantages"
-msgstr ""
+msgstr "Salário e Benefícios"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
@@ -173,6 +174,7 @@ msgstr "Função"
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
 msgstr ""
+"Erro! A data de início do contrato deve ser anterior a data de término."
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
@@ -192,7 +194,7 @@ msgstr "Núm. do Visto"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Dist."
-msgstr ""
+msgstr "Distância do Trabalho"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -202,7 +204,7 @@ msgstr "Naturalidade"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period Duration"
-msgstr ""
+msgstr "Duração do Período de Experiência"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 383bc2eeb57..d2782d5b9e5 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-13 12:48+0000\n"
+"PO-Revision-Date: 2012-12-24 10:24+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
@@ -906,6 +906,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una nueva petición de entrevista relacionada con una "
+"evaluación personal.\n"
+"</p><p>\n"
+"Las peticiones de entrevista se generan normalmente automáticamente por "
+"OpenERP de acuerdo al plan de evaluación del empleado. Cada usuario recibe "
+"automáticamente correos electrónicos y peticiones para evaluar a sus "
+"compañeros periódicamente.\n"
+"</p>\n"
+"            "
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index 2d7ba1eca1c..fb396e4a7ab 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-17 00:10+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 15:30+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_evaluation
@@ -83,7 +84,7 @@ msgstr "Fases de Avaliação"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Request"
-msgstr ""
+msgstr "Enviar Requisição"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -98,7 +99,7 @@ msgstr ""
 #: view:hr.employee:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Appraisals"
-msgstr ""
+msgstr "Avaliações"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -109,7 +110,7 @@ msgstr "(eval_name)s:Nome da Avaliação"
 #: field:hr.evaluation.interview,message_ids:0
 #: field:hr_evaluation.evaluation,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -149,7 +150,7 @@ msgstr "Avaliar"
 #: help:hr.evaluation.interview,message_unread:0
 #: help:hr_evaluation.evaluation,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -224,6 +225,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -240,7 +244,7 @@ msgstr "Prazo final"
 #: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -260,7 +264,7 @@ msgstr "Data Atual"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Interviews"
-msgstr ""
+msgstr "Entrevistas"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:83
@@ -272,13 +276,13 @@ msgstr "A respeito de "
 #: field:hr.evaluation.interview,message_follower_ids:0
 #: field:hr_evaluation.evaluation,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_unread:0
 #: field:hr_evaluation.evaluation,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -379,7 +383,7 @@ msgstr "Julho"
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
@@ -401,6 +405,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um plano de avaliação.\n"
+"              </p><p>\n"
+"               Você pode definir planos de avaliação (ex: primeira "
+"entrevista após 6\n"
+"                 meses, depois a cada ano). Então, cada funcionário pode ser "
+"associado a\n"
+"                 um plano de avaliação para que o OpenERP possa gerar "
+"automaticamente\n"
+"                 pedidos de entrevista para os gestores e / ou "
+"subordinados.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -448,7 +465,7 @@ msgstr "Todas as Respostas"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Responder Pesquisa"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -561,7 +578,7 @@ msgstr " (employee_name)s: Nome do funcionário"
 #: field:hr.evaluation.interview,message_is_follower:0
 #: field:hr_evaluation.evaluation,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -610,7 +627,7 @@ msgstr "Entrevistas de Avaliação"
 #: field:hr.evaluation.interview,message_summary:0
 #: field:hr_evaluation.evaluation,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -674,7 +691,7 @@ msgstr "Data Final"
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on which the evaluation is summarized."
-msgstr ""
+msgstr "Esta é a valorização no qual a avaliação é resumido."
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -804,6 +821,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma nova avaliação.\n"
+"              </p><p>\n"
+"                Cada funcionário pode ser atribuído um Plano de Avaliação. "
+"Tal plano\n"
+"                 define a freqüência e a maneira como você gerencia a sua "
+"avaliação\n"
+"                 pessoal periódica. Você será capaz de definir as etapas e\n"
+"                 anexar entrevistas a cada passo.O OpenERP gerencia todos os "
+"tipos de\n"
+"                 avaliações: de baixo para cima, de cima para baixo, a auto-"
+"avaliação e final\n"
+"                 avaliação por parte do gerente.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -859,6 +891,8 @@ msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
 "draft state."
 msgstr ""
+"Você não pode alterar o estado, por que algumas avaliações estão aguardando "
+"respostas ou estão como provisórias."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -885,12 +919,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma solicitação de nova entrevista "
+"relacionada a uma avaliação pessoal.\n"
+"              </p><p>\n"
+"              Pedidos de entrevista geralmente são gerados automaticamente "
+"pelo\n"
+"              OpenERP de acordo com o plano de avaliação do funcionário. "
+"cada\n"
+"              usuário recebe e-mails automáticos e pedidos para avaliar os "
+"seus\n"
+"                 colegas periodicamente.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 84da8430548..c84d2f9e29d 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-13 12:58+0000\n"
+"PO-Revision-Date: 2012-12-24 10:26+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
@@ -35,7 +35,7 @@ msgstr "El contable reembolsa los gastos"
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_approved
 msgid "Expense approved"
-msgstr ""
+msgstr "Gasto aprobado"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
@@ -112,6 +112,8 @@ msgid ""
 "No expense journal found. Please make sure you have a journal with type "
 "'purchase' configured."
 msgstr ""
+"No se ha encontrado diario de gastos. Asegúrese por favor que tiene un "
+"diario con el tipo 'Compras' configurado."
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
@@ -159,7 +161,7 @@ msgstr "¡Error!"
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_refused
 msgid "Expense refused"
-msgstr ""
+msgstr "Gasto rechazado"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
@@ -600,7 +602,7 @@ msgstr "Usuario"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_product
 msgid "Expense Categories"
-msgstr ""
+msgstr "Categorías de gasto"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -841,7 +843,7 @@ msgstr "Puede ser un gasto"
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
 msgid "Expense confirmed, waiting confirmation"
-msgstr ""
+msgstr "Gasto confirmado, esperando confirmación"
 
 #. module: hr_expense
 #: report:hr.expense:0
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 7c6de9e9f25..a004870b3de 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-12-24 15:23+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_expense
@@ -35,7 +36,7 @@ msgstr "A conta para reembolso de despesas"
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_approved
 msgid "Expense approved"
-msgstr ""
+msgstr "Despesa aprovada"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
@@ -76,7 +77,7 @@ msgstr "Nova Despesa"
 #: field:hr.expense.line,uom_id:0
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -86,7 +87,7 @@ msgstr "Março"
 #. module: hr_expense
 #: field:hr.expense.expense,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: hr_expense
 #: field:hr.expense.expense,company_id:0
@@ -112,6 +113,8 @@ msgid ""
 "No expense journal found. Please make sure you have a journal with type "
 "'purchase' configured."
 msgstr ""
+"Nenhum diário de despesas encontrado. Por favor verifique se você possui um "
+"diário com o tipo 'compras' configurado."
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
@@ -121,7 +124,7 @@ msgstr "Estatísticas das Despesas"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Open Receipt"
-msgstr ""
+msgstr "Recibo Aberto"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -146,7 +149,7 @@ msgstr "Observações"
 #. module: hr_expense
 #: field:hr.expense.expense,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:172
@@ -154,12 +157,12 @@ msgstr ""
 #: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_refused
 msgid "Expense refused"
-msgstr ""
+msgstr "Despesa recusada"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
@@ -185,7 +188,7 @@ msgstr "O gerente recusa as despesas. Retorna para Provisório."
 #. module: hr_expense
 #: help:hr.expense.expense,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -216,6 +219,11 @@ msgid ""
 "If the admin accepts it, the status is 'Accepted'.\n"
 " If a receipt is made for the expense request, the status is 'Done'."
 msgstr ""
+"Quando a solicitação de despesa é criada o estado é 'Provisório'.\n"
+"Quando é confirmado pelo usuário e o pedido é enviado ao administrador, a "
+"situação é 'Aguardando Confirmação'.\n"
+"Se o administrador aceita, a situação é 'Aceito'.\n"
+"Se um recibo é feito para a solicitação de despesa, a situação é 'Concluído'."
 
 #. module: hr_expense
 #: help:hr.expense.expense,date_confirm:0
@@ -238,12 +246,15 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:302
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Atenção"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -292,7 +303,7 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
@@ -314,7 +325,7 @@ msgstr "Aguardando"
 #. module: hr_expense
 #: field:hr.expense.expense,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -351,7 +362,7 @@ msgstr "Alguns custos podem ser refaturados para o cliente"
 #: code:addons/hr_expense/hr_expense.py:197
 #, python-format
 msgid "The employee must have a home address."
-msgstr ""
+msgstr "O funcionário precisa ter um endereço residencial."
 
 #. module: hr_expense
 #: view:board.board:0
@@ -384,7 +395,7 @@ msgstr "Despesa reembolsável"
 #: field:hr.expense.expense,journal_id:0
 #: field:hr.expense.report,journal_id:0
 msgid "Force Journal"
-msgstr "Forçar Livro"
+msgstr "Forçar Diário"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -400,13 +411,13 @@ msgstr "Julho"
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
 msgid "After creating invoice, reimburse expenses"
-msgstr "Depois de criar a fatura, reimbolsar despesas"
+msgstr "Depois de criar a fatura, reembolsar despesas"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
@@ -423,7 +434,7 @@ msgstr "Data de Validação"
 #: code:addons/hr_expense/hr_expense.py:227
 #, python-format
 msgid "Expense Receipt"
-msgstr ""
+msgstr "Recibo de Despesa"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -478,7 +489,7 @@ msgstr "Moeda"
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
-msgstr ""
+msgstr "Recibo do Funcionário"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -497,11 +508,13 @@ msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure"
 msgstr ""
+"A Unidade de Medida não pertence a mesma categoria da unidade de medida do "
+"produto"
 
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is done."
-msgstr ""
+msgstr "O diário usado quando a despesa é concluída."
 
 #. module: hr_expense
 #: field:hr.expense.expense,note:0
@@ -525,6 +538,8 @@ msgid ""
 "Please configure Default Expense account for Product purchase: "
 "`property_account_expense_categ`."
 msgstr ""
+"Por favor configure a conta padrão de despesas para compra de produto: "
+"`property_account_expense_categ`."
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveexpense0
@@ -559,7 +574,7 @@ msgstr "Despesas Provisórias"
 #. module: hr_expense
 #: field:hr.expense.expense,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.product_normal_form_view_installer
@@ -591,7 +606,7 @@ msgstr "Usuário"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_product
 msgid "Expense Categories"
-msgstr ""
+msgstr "Categorias de Depesas"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -613,11 +628,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar novas despesas. \n"
+"              </p><p>\n"
+"O OpenERP irá garantir que todo o processo é seguido, a folha de despesa\n"
+"                 é validada pelo gerente(s), o funcionário é reembolsado\n"
+"                 de seus gastos, algumas despesas devem ser re-faturadas "
+"aos\n"
+"                 clientes.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Generate Accounting Entries"
-msgstr ""
+msgstr "Gerar Lançamentos Contábeis"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -632,7 +657,7 @@ msgstr "Despesas de RH"
 #. module: hr_expense
 #: field:hr.expense.expense,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.car_travel_product_template
@@ -647,7 +672,7 @@ msgstr "Enviar ao Gerente"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Done Expenses"
-msgstr ""
+msgstr "Despesas Concluídas"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_confirmedexpenses0
@@ -673,7 +698,7 @@ msgstr "Despesas"
 #. module: hr_expense
 #: field:hr.expense.report,voucher_id:0
 msgid "Receipt"
-msgstr ""
+msgstr "Recibo"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -691,7 +716,7 @@ msgstr "Preço Unitário"
 #: view:hr.expense.report:0
 #: selection:hr.expense.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: hr_expense
 #: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
@@ -712,12 +737,12 @@ msgstr "Refaturar"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expense Date"
-msgstr ""
+msgstr "Data da Despesa"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
 msgid "Validation By"
-msgstr ""
+msgstr "Validada por"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -819,12 +844,12 @@ msgstr "Recusado"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can be Expensed"
-msgstr "Pode conter despesa"
+msgstr "Pode ser debitado"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
 msgid "Expense confirmed, waiting confirmation"
-msgstr ""
+msgstr "Despesa confirmada, aguardando validação"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -845,7 +870,7 @@ msgstr "Usuário de validação"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting Data"
-msgstr "Contabilizando dados"
+msgstr "Dados Contábeis"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -861,7 +886,7 @@ msgstr "Nome"
 #: code:addons/hr_expense/hr_expense.py:116
 #, python-format
 msgid "You can only delete draft expenses!"
-msgstr ""
+msgstr "Você só pode excluir despesas provisórias!"
 
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
@@ -896,12 +921,12 @@ msgstr "Aprovar"
 #. module: hr_expense
 #: help:hr.expense.expense,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
 msgid "Sequence"
-msgstr "Sequencia"
+msgstr "Seqüência"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
@@ -921,11 +946,12 @@ msgstr "Despesas"
 #: help:product.product,hr_expense_ok:0
 msgid "Specify if the product can be selected in an HR expense line."
 msgstr ""
+"Especifica se o produto pode ser selecionado em uma linha de despesa do RH."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidade"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index f5fd612a1d1..f33a9a81f7d 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-13 22:46+0000\n"
-"Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
+"PO-Revision-Date: 2012-12-24 10:27+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
@@ -115,7 +115,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
 msgid "Request refused"
-msgstr ""
+msgstr "Petición rechazada"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
@@ -753,7 +753,7 @@ msgstr "Ausencias de mi departamento"
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
 msgid "Request confirmed, waiting confirmation"
-msgstr ""
+msgstr "Petición confirmada, esperando confirmación"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
@@ -1060,7 +1060,7 @@ msgstr "Para aprobar"
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
 msgid "Request approved"
-msgstr ""
+msgstr "Petición aprobada"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 51df4430d46..9936fb540cd 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-17 00:16+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 15:47+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_holidays
@@ -39,6 +40,8 @@ msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
 "resource manager."
 msgstr ""
+"Você não pode modificar um pedido de folga que foi aprovado. Contate o "
+"Gerente de RH."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
@@ -63,7 +66,7 @@ msgstr "Modo de Alocação"
 #. module: hr_holidays
 #: field:hr.employee,leave_date_from:0
 msgid "From Date"
-msgstr ""
+msgstr "Data Inicial"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -75,7 +78,7 @@ msgstr "Departamento"
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_allocation
 msgid "Allocation Requests to Approve"
-msgstr ""
+msgstr "Pedidos de alocação de aprovar"
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
@@ -95,7 +98,7 @@ msgstr "Dias Restantes"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "of the"
-msgstr ""
+msgstr "de"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
@@ -108,21 +111,23 @@ msgid ""
 "The default duration interval between the start date and the end date is 8 "
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
+"O intervalo de duração padrão entre a data de início e a data final é de 8 "
+"horas. Você pode adaptá-lo às suas necessidades livremente."
 
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
 msgid "Request refused"
-msgstr ""
+msgstr "Solicitação recusada"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
-msgstr ""
+msgstr "Alocação"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "to"
-msgstr ""
+msgstr "para"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -132,7 +137,7 @@ msgstr "Ciano Claro"
 #. module: hr_holidays
 #: constraint:hr.holidays:0
 msgid "You can not have 2 leaves that overlaps on same day!"
-msgstr ""
+msgstr "Você não pode ter duas folgas que se sobrepõe no mesmo dia!"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -147,7 +152,7 @@ msgstr "Tipo de Folga Atual"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -172,7 +177,7 @@ msgstr "Recusar"
 #: code:addons/hr_holidays/hr_holidays.py:433
 #, python-format
 msgid "Request <b>approved</b>, waiting second validation."
-msgstr ""
+msgstr "Solicitação <b>aprovada</b>. aguardando segunda validação."
 
 #. module: hr_holidays
 #: view:hr.employee:0
@@ -184,18 +189,18 @@ msgstr "Folgas"
 #. module: hr_holidays
 #: field:hr.holidays,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Analyze from"
-msgstr ""
+msgstr "Análise"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
@@ -240,7 +245,7 @@ msgstr "Validação"
 #. module: hr_holidays
 #: help:hr.holidays,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -270,6 +275,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:238
@@ -290,12 +298,12 @@ msgstr "Lilás"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_leave_request_to_meeting
 msgid "Leave Meetings"
-msgstr ""
+msgstr "Deixar Reuniões"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves 2012"
-msgstr ""
+msgstr "Folgas Legais 2012"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -323,13 +331,13 @@ msgstr "Folga Solicitada por %s"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Sum"
-msgstr ""
+msgstr "Total"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 msgid "Leave Types"
-msgstr ""
+msgstr "Tipo de Folga"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
@@ -339,7 +347,7 @@ msgstr "Folhas Restantes"
 #. module: hr_holidays
 #: field:hr.holidays,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -402,6 +410,12 @@ msgid ""
 "   \n"
 "The status is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"O status é definido como a 'Apresentar', quando um pedido de férias é "
+"criado.\n"
+"O status é 'Para aprovar', quando o pedido de férias é confirmado pelo "
+"usuário.\n"
+"O status é 'Recusado', quando o pedido de férias é recusado pelo gerente.\n"
+"O status é 'Aprovado', quando o pedido de férias é aceito pelo gerente."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -443,7 +457,7 @@ msgstr "Aguardando Aprovação"
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Employee Tag"
-msgstr ""
+msgstr "Marcador de Funcionário"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -456,6 +470,8 @@ msgid ""
 "Filters only on allocations and requests that belong to an holiday type that "
 "is 'active' (active field is True)"
 msgstr ""
+"Filtra apenas sobre as alocações e pedidos que pertencem a um tipo de férias "
+"que é \"ativo\" (campo ativo é verdadeiro)"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
@@ -467,6 +483,12 @@ msgid ""
 "             </p>\n"
 "           "
 msgstr ""
+"<p>\n"
+"            Você pode atribuir folgas restantes Legais para cada "
+"funcionário, o OpenERP\n"
+"                automaticamente cria e valida as solicitações de alocação.\n"
+"             </p>\n"
+"           "
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -474,12 +496,15 @@ msgid ""
 "Once a leave is validated, OpenERP will create a corresponding meeting of "
 "this type in the calendar."
 msgstr ""
+"Assim que a folga é validada, o OpenERP irá criar uma reunião correspondente "
+"desde tipo no calendário."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least one Department. And try again."
 msgstr ""
+"Você precisa selecionar pelo menos um Departamento, e tentar novamente."
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
@@ -499,7 +524,7 @@ msgstr "Mês"
 #. module: hr_holidays
 #: field:hr.holidays,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -526,12 +551,14 @@ msgid ""
 "There are not enough %s allocated for employee %s; please create an "
 "allocation request for this leave type."
 msgstr ""
+"Não existe %s suficientes alocados ao funcionário %s; por favor crie uma "
+"solicitação de alocação para este tipo de folga."
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -546,11 +573,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma solicitação de folga.\n"
+"              </p><p>\n"
+"               Depois de ter registrado o seu pedido de licença, ele será "
+"enviado para\n"
+" um gerente para validação. Certifique-se de definir o direito a licença\n"
+"                 Tipo (recuperação, férias legais, doença) e a quantidade "
+"exata\n"
+"                 do número de dias em aberto relacionadas com a sua "
+"licença.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The employee or employee category of this request is missing."
 msgstr ""
+"O funcionário ou categoria de funcionário desde pedido está faltando."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -573,16 +613,19 @@ msgid ""
 "leaves than the available ones for this type and take them into account for "
 "the \"Remaining Legal Leaves\" defined on the employee form."
 msgstr ""
+"Se você selecionar esta opção, o sistema permite que os funcionários a tire "
+"mais folgas do que as disponíveis para este tipo e levá em conta para as "
+"\"Folgas Legais Remanescentes\", definidos no formulário do funcionário."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Reiniciar como Novo"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0."
-msgstr ""
+msgstr "O número de dias deve ser maior do que 0."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -592,7 +635,7 @@ msgstr "Coral Leve"
 #. module: hr_holidays
 #: field:hr.employee,leave_date_to:0
 msgid "To Date"
-msgstr ""
+msgstr "Até a Data"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -607,7 +650,7 @@ msgstr "Definir Folgas para os Funcionários"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leaves Types"
-msgstr ""
+msgstr "Tipo de Folga"
 
 #. module: hr_holidays
 #: field:hr.holidays,meeting_id:0
@@ -620,12 +663,14 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Department."
 msgstr ""
+"Esta cor será usada no resumo da folga localizada em Relatórios \\ Folgas "
+"por Departamento."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -635,12 +680,12 @@ msgstr "Marfim"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Leaves Summary Report By Employee"
-msgstr ""
+msgstr "Relatório do Resumo de Folgas do RH por funcionário"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests to Approve"
-msgstr ""
+msgstr "Solicitações a Aprovar"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
@@ -650,7 +695,7 @@ msgstr "Folga já tirada"
 #. module: hr_holidays
 #: field:hr.holidays,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -677,7 +722,7 @@ msgstr "Primeira Aprovação"
 #. module: hr_holidays
 #: field:hr.holidays,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
@@ -698,7 +743,7 @@ msgstr "Resumo das Folgas"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Submit to Manager"
-msgstr ""
+msgstr "Enviar ao Gerente"
 
 #. module: hr_holidays
 #: view:hr.employee:0
@@ -718,7 +763,7 @@ msgstr "Folgas em meu Departamento"
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
 msgid "Request confirmed, waiting confirmation"
-msgstr ""
+msgstr "Solicitação confirmada, aguardando validação"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
@@ -775,7 +820,7 @@ msgstr "Validado"
 #: code:addons/hr_holidays/hr_holidays.py:238
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
-msgstr ""
+msgstr "Você não pode excluir uma folga que está no estado %s."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -789,6 +834,8 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee Tag: "
 "Allocation/Request for group of employees in category"
 msgstr ""
+"Por Funcionário: Alocação / Pedido individual, por Marcador de Funcionário: "
+"Alocação / Pedido de grupo de funcionários na categoria"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
@@ -805,7 +852,7 @@ msgstr "Aplicar Validação Dupla"
 #: view:hr.employee:0
 #: view:hr.holidays:0
 msgid "days"
-msgstr ""
+msgstr "dias"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -833,7 +880,7 @@ msgstr "Departamento(s)"
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "To Submit"
-msgstr ""
+msgstr "Para Enviar"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:336
@@ -853,7 +900,7 @@ msgstr "Descrição"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Tag"
-msgstr ""
+msgstr "Por marcador de funcionário"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -865,7 +912,7 @@ msgstr "Recusado"
 #. module: hr_holidays
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Tipo de Reunião"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
@@ -875,7 +922,7 @@ msgstr "Folgas Restantes"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocated Days"
-msgstr ""
+msgstr "Dias alocados"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -924,7 +971,7 @@ msgstr "Modo"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Approved and Confirmed"
-msgstr ""
+msgstr "Ambos Aprovado e Confirmado"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -934,7 +981,7 @@ msgstr "Aprovar"
 #. module: hr_holidays
 #: help:hr.holidays,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:249
@@ -942,7 +989,7 @@ msgstr ""
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
-msgstr ""
+msgstr "A data inicial deve ser anterior a data final."
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -968,7 +1015,7 @@ msgstr "Solicitações de Alocação"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Color"
-msgstr ""
+msgstr "Cor"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -977,6 +1024,9 @@ msgid ""
 "to create allocation/leave request. Total based on all the leave types "
 "without overriding limit."
 msgstr ""
+"Número total de folgas legais alocados a este funcionário, alterando este "
+"valor para criar um pedido de folga/alocação. Total com base em todos os "
+"tipos de folgas, sem limite de substituição."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -986,7 +1036,7 @@ msgstr "Rosa"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "leaves."
-msgstr ""
+msgstr "Folgas"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -996,7 +1046,7 @@ msgstr "Gerente"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Leaves Summary Report By Department"
-msgstr ""
+msgstr "Relatório de Folgas do RH por Departamento"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -1006,7 +1056,7 @@ msgstr "Ano"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Duration"
-msgstr ""
+msgstr "Duration"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -1018,7 +1068,7 @@ msgstr "Para Aprovar"
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
 msgid "Request approved"
-msgstr ""
+msgstr "Solicitação Aprovada"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
@@ -1028,7 +1078,7 @@ msgstr "Motivos"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
-msgstr ""
+msgstr "Escolha o Tipo de Folga"
 
 #~ msgid "Holidays"
 #~ msgstr "Feriados"
diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po
index ea5c294f9be..8bc84c32ae6 100644
--- a/addons/hr_payroll/i18n/pt_BR.po
+++ b/addons/hr_payroll/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 16:49+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:56+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll
@@ -125,7 +126,7 @@ msgstr "hr.salary.rule"
 #: view:hr.payslip:0
 #: view:hr.payslip.run:0
 msgid "to"
-msgstr ""
+msgstr "até"
 
 #. module: hr_payroll
 #: field:hr.payslip,payslip_run_id:0
@@ -210,7 +211,7 @@ msgstr "Anotações"
 #: code:addons/hr_payroll/hr_payroll.py:900
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -236,7 +237,7 @@ msgstr "Outra informação"
 #. module: hr_payroll
 #: field:hr.config.settings,module_hr_payroll_account:0
 msgid "Link your payroll to accounting system"
-msgstr ""
+msgstr "Associar a folha de pagamento a contabilidade"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_select:0
@@ -305,7 +306,7 @@ msgstr "Estrutura"
 #. module: hr_payroll
 #: field:hr.contribution.register,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Parceiro"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -351,6 +352,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um novo registo de contribuição.\n"
+"              </p><p>\n"
+"               Um registo de contribuição é um terceiro envolvido no "
+"pagamento do\n"
+"               salário dos funcionários. Ela pode ser a INSSl, o\n"
+"               Governo ou qualquer pessoa que coletar ou injetar dinheiro no "
+"holerites.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_max:0
@@ -439,12 +450,12 @@ msgstr "Porcentagem baseada na"
 #: code:addons/hr_payroll/hr_payroll.py:85
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: hr_payroll
 #: help:hr.config.settings,module_hr_payroll_account:0
 msgid "Create journal entries from payslips"
-msgstr ""
+msgstr "Criar lançamentos de diário a partir de holetires"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
@@ -467,7 +478,7 @@ msgstr "Linhas do Holerite"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
@@ -519,7 +530,7 @@ msgstr "Quantidade fixa"
 #: code:addons/hr_payroll/hr_payroll.py:365
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,active:0
@@ -535,7 +546,7 @@ msgstr ""
 #: field:hr.payslip,state:0
 #: field:hr.payslip.run,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -629,7 +640,7 @@ msgstr "Detalhes do Cálculo de Holerite"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used to display the salary rule on payslip."
-msgstr ""
+msgstr "Usado para mostrar a regra do salário no holerite."
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
@@ -659,6 +670,7 @@ msgstr "Calcular"
 #, python-format
 msgid "Wrong range condition defined for salary rule %s (%s)."
 msgstr ""
+"Condição de intervalo errada definido para a regra de salário %s (%s)."
 
 #. module: hr_payroll
 #: help:hr.payslip.input,amount:0
@@ -704,6 +716,7 @@ msgstr ""
 #, python-format
 msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
 msgstr ""
+"Percentual base errada ou quantidade definida para a regra salário %s (%s)."
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
@@ -761,7 +774,7 @@ msgstr "Porcentagem (%)"
 #: code:addons/hr_payroll/hr_payroll.py:866
 #, python-format
 msgid "Wrong quantity defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Quantidade errada definida para a regra de salário %s (%s)."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -846,7 +859,7 @@ msgstr "Contrato"
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
 #, python-format
 msgid "You must select employee(s) to generate payslip(s)."
-msgstr ""
+msgstr "Você precisa selecionar o funcionário para gerar o holerite."
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -925,12 +938,12 @@ msgstr "Seqüência"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Period from"
-msgstr ""
+msgstr "Período de"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -1017,7 +1030,7 @@ msgstr "Holerites do Funcionário"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1099,6 +1112,7 @@ msgstr "Holerites por linhas de Contribuições Registrada"
 #, python-format
 msgid "You cannot delete a payslip which is not draft or cancelled!"
 msgstr ""
+"Você não pode excluir um holerite que não está como provisório ou cancelado!"
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -1170,6 +1184,11 @@ msgid ""
 "* If the payslip is confirmed then status is set to 'Done'.            \n"
 "* When user cancel payslip the status is 'Rejected'."
 msgstr ""
+"* Quando o holerite é criado o estado é 'Provisório'.\n"
+"* Se o holerite está sob verificação, a situação 'Aguardando'.\n"
+"* Se o holerite é confirmado em seguida a situação é definida como "
+"'Concluído'.\n"
+"* Quando o usuário cancelar o holerite a situação é 'Rejeitado'."
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range:0
@@ -1196,7 +1215,7 @@ msgstr "Entradas de Holerites"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Other Inputs"
-msgstr ""
+msgstr "Outras Entradas"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
@@ -1208,7 +1227,7 @@ msgstr "Hierarquia da Regra de Salário"
 #: code:addons/hr_payroll/hr_payroll.py:877
 #, python-format
 msgid "Wrong python code defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Código Python errado definido para a regra de salário %s (%s)."
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -1239,7 +1258,7 @@ msgstr "O código que pode ser usado nas regras de salários"
 #: code:addons/hr_payroll/hr_payroll.py:900
 #, python-format
 msgid "Wrong python condition defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Condição python errada definida para a regra de salário %s (%s)."
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -1271,7 +1290,7 @@ msgstr "Nome do Holerite"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidade"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range:0
diff --git a/addons/hr_payroll_account/i18n/pt_BR.po b/addons/hr_payroll_account/i18n/pt_BR.po
index 047c283d8bf..4a62918ef8e 100644
--- a/addons/hr_payroll_account/i18n/pt_BR.po
+++ b/addons/hr_payroll_account/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-26 22:43+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 16:51+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_payroll_account
@@ -52,7 +53,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_tax_id:0
 msgid "Tax Code"
-msgstr "Código da Taxa"
+msgstr "Código do Imposto"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,period_id:0
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 235927e3ee3..cb0aeac29fa 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-12 12:28+0000\n"
+"PO-Revision-Date: 2012-12-24 10:27+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
@@ -393,7 +393,7 @@ msgstr "Enlace ficha Monster"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
 msgid "Applicant Hired"
-msgstr ""
+msgstr "Solicitante contratado"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -602,7 +602,7 @@ msgstr "Contratar y crear empleado"
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
 msgid "Applicant hired"
-msgstr ""
+msgstr "Solicitante contratado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -686,7 +686,7 @@ msgstr "o"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
 msgid "Applicant Refused"
-msgstr ""
+msgstr "Solicitante rechazado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -796,7 +796,7 @@ msgstr "Planificar reunión con este solicitante"
 #: code:addons/hr_recruitment/hr_recruitment.py:397
 #, python-format
 msgid "Applicant <b>created</b>"
-msgstr ""
+msgstr "Solicitante <b>creado</b>"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1024,7 +1024,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
 msgid "Stage changed"
-msgstr ""
+msgstr "Etapa cambiada"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1098,7 +1098,7 @@ msgstr "Descripción"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
 msgid "Stage Changed"
-msgstr ""
+msgstr "Etapa cambiada"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1253,7 +1253,7 @@ msgstr "Mensajes e historial de comunicación"
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
 msgid "Applicant refused"
-msgstr ""
+msgstr "Solicitante rechazado"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
diff --git a/addons/hr_recruitment/i18n/pt_BR.po b/addons/hr_recruitment/i18n/pt_BR.po
index c32a267c186..c951c1a25f1 100644
--- a/addons/hr_recruitment/i18n/pt_BR.po
+++ b/addons/hr_recruitment/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-02-19 02:23+0000\n"
-"Last-Translator: Cintia Sayuri Sato - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 17:10+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:58+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
@@ -35,17 +36,17 @@ msgstr "Pré-requisitos"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Application Summary"
-msgstr ""
+msgstr "Resumo da Aplicação"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Start Interview"
-msgstr ""
+msgstr "Iniciar Entrevista"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Celular:"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,fold:0
@@ -53,6 +54,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Este estágio não é visível, por exemplo na barra de situação ou visão "
+"kanban, quando não há registros definidos no mesmo para visualizar."
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
@@ -101,7 +104,7 @@ msgstr "Trabalhos Pendentes"
 #: view:hr.applicant:0
 #: field:hr.applicant,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -154,12 +157,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Clique para adicionar um novo candidato a emprego.\n"
+"              </p><p>\n"
+"O OpenERP te ajuda no acompanhamento dos candidatos no processo de\n"
+"seleção e acompanhar todas as operações: reuniões, entrevistas, etc\n"
+"              </p><p>\n"
+"Se você configurar o servidor de e-mail, os candidatos e seus CV em anexo\n"
+"                são criados automaticamente quando um email é enviado para\n"
+"                 vagas@suaempresa.com.br. Se você instalar o módulo de "
+"gerenciamento de\n"
+"                documentos, todos os currículos são indexados "
+"automaticamente, de modo que\n"
+"                 você pode pesquisar o seu conteúdo facilmente.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applications"
-msgstr ""
+msgstr "Aplicações"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -169,12 +187,12 @@ msgstr "Dias para Abrir"
 #. module: hr_recruitment
 #: field:hr.applicant,emp_id:0
 msgid "employee"
-msgstr ""
+msgstr "funcionário"
 
 #. module: hr_recruitment
 #: field:hr.config.settings,fetchmail_applicants:0
 msgid "Create applicants from an incoming email account"
-msgstr ""
+msgstr "Criar candidatos a partir de uma conta de email de entrada"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -186,7 +204,7 @@ msgstr "Dia"
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Contact"
-msgstr ""
+msgstr "Criar contato"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -218,7 +236,7 @@ msgstr "Próximas Ações"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -237,11 +255,13 @@ msgid ""
 "Stages of the recruitment process may be different per department. If this "
 "stage is common to all departments, keep this field empty."
 msgstr ""
+"Etapas do processo de recrutamento pode ser diferente por departamento. Se "
+"esta fase, é comum a todos os departamentos, deixe este campo em branco."
 
 #. module: hr_recruitment
 #: help:hr.applicant,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: hr_recruitment
 #: field:hr.applicant,color:0
@@ -251,7 +271,7 @@ msgstr "Índice de cores"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting
 msgid "Meetings"
-msgstr ""
+msgstr "Reuniões"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -290,6 +310,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:435
@@ -344,7 +367,7 @@ msgstr "Estatísticas de Recrutamentos"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Print interview report"
-msgstr ""
+msgstr "Imprimir relatório da entrevista"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -365,7 +388,7 @@ msgstr "Origem"
 #. module: hr_recruitment
 #: field:hr.applicant,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_monster
@@ -375,7 +398,7 @@ msgstr "Sites de Emprego"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
 msgid "Applicant Hired"
-msgstr ""
+msgstr "Candidato Contratado"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -395,6 +418,15 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para adicionar uma nova etapa no processo de seleção.\n"
+"          </p><p>\n"
+"           Definir aqui as suas etapas do processo de seleção, por exemplo:\n"
+"            qualificação, primeira entrevista, segunda entrevista, "
+"recusado,\n"
+"             contratado.\n"
+"          </p>\n"
+"        "
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -412,6 +444,8 @@ msgid ""
 "Email alias for this job position. New emails will automatically create new "
 "applicants for this job position."
 msgstr ""
+"Apelido de e-mail para este cargo. Novos e-mails criarão novos candidatos "
+"para este cargo automaticamente."
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -534,6 +568,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"A situação é definida como 'Provisória' quando o caso é criado. Se o caso "
+"está em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -565,12 +603,12 @@ msgstr "Em andamento"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Hire & Create Employee"
-msgstr ""
+msgstr "Contratar & Criar Funcionário"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
 msgid "Applicant hired"
-msgstr ""
+msgstr "Candidato contratado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -601,17 +639,17 @@ msgstr "Dezembro"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
 #, python-format
 msgid "A contact is already defined on this job request."
-msgstr ""
+msgstr "Um contato já está defnido para esta vaga de emprego."
 
 #. module: hr_recruitment
 #: field:hr.applicant,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Marcadores"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant_category
 msgid "Category of applicant"
-msgstr ""
+msgstr "Categoria de candidato"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -622,7 +660,7 @@ msgstr "Mês"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Answer related job question"
-msgstr ""
+msgstr "Responda a pergunta relacionada com o trabalho"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
@@ -649,12 +687,12 @@ msgstr "Assunto"
 #: view:hired.employee:0
 #: view:hr.recruitment.partner.create:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
 msgid "Applicant Refused"
-msgstr ""
+msgstr "Candidato Recusado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -758,13 +796,13 @@ msgstr "Status"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Schedule interview with this applicant"
-msgstr ""
+msgstr "Agendar entrevista com este candidato"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:397
 #, python-format
 msgid "Applicant <b>created</b>"
-msgstr ""
+msgstr "Candidato <b>criado</b>"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -794,7 +832,7 @@ msgstr "Dias para concluir"
 #. module: hr_recruitment
 #: field:hr.applicant,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,user_id:0
@@ -816,7 +854,7 @@ msgstr "Ativo"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,nbr:0
 msgid "# of Applications"
-msgstr ""
+msgstr "# de Candidatos"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
@@ -830,6 +868,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"             Clique para adicionar uma nova etapa no processo de seleção.\n"
+"           </p><p>\n"
+"             Não se esqueça de especificar o departamento se o seu processo "
+"de seleção\n"
+"             é diferente de acordo com o cargo.\n"
+"           </ p>\n"
+"        "
 
 #. module: hr_recruitment
 #: field:hr.applicant,response:0
@@ -844,7 +890,7 @@ msgstr "Outubro"
 #. module: hr_recruitment
 #: field:hr.config.settings,module_document_ftp:0
 msgid "Allow the automatic indexation of resumes"
-msgstr ""
+msgstr "Permite a indexação automática de currículos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_proposed_extra:0
@@ -860,7 +906,7 @@ msgstr "Janeiro"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
 #, python-format
 msgid "A contact is already existing with the same name."
-msgstr ""
+msgstr "Um contato com o mesmo nome já existe."
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
@@ -870,7 +916,7 @@ msgstr "Reveja os Estágios de Recrutamento"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contact:"
-msgstr ""
+msgstr "Contato:"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -896,7 +942,7 @@ msgstr "Gostaria de criar um funcionário?"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Degree:"
-msgstr ""
+msgstr "Grau:"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -917,7 +963,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
@@ -950,6 +996,7 @@ msgstr "Cancelar"
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a contact based on this job request ?"
 msgstr ""
+"Tem certeza de que deseja criar um contato com base neste pedido de emprego?"
 
 #. module: hr_recruitment
 #: help:hr.config.settings,fetchmail_applicants:0
@@ -958,6 +1005,9 @@ msgid ""
 "(jobs@mycompany.com),\n"
 "                and create automatically application documents in the system."
 msgstr ""
+"Permitir que os candidatos enviem seus pedidos de emprego para um endereço "
+"de e-mail (vagas@minhaempresa.com.br),\n"
+"                 e criar automaticamente documentos de candidatos do sistema."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -980,7 +1030,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
 msgid "Stage changed"
-msgstr ""
+msgstr "Estágio alterado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1009,7 +1059,7 @@ msgstr "LinkedIn"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
-msgstr ""
+msgstr "Novo Candidato"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
@@ -1044,7 +1094,7 @@ msgstr "Nome da Fonte"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Dia(s)"
 
 #. module: hr_recruitment
 #: field:hr.applicant,description:0
@@ -1054,7 +1104,7 @@ msgstr "Descrição"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
 msgid "Stage Changed"
-msgstr ""
+msgstr "Estágio Alterado"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1074,7 +1124,7 @@ msgstr "Boca a Boca"
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,fold:0
 msgid "Hide in views if empty"
-msgstr ""
+msgstr "Esconder se visão estiver vazia"
 
 #. module: hr_recruitment
 #: help:hr.config.settings,module_document_ftp:0
@@ -1084,6 +1134,11 @@ msgid ""
 "knowledge management  module in order to allow you to search using specific "
 "keywords through  the content of all documents (PDF, .DOCx...)"
 msgstr ""
+"Gerenciar seu CV e carta de motivação relacionada a todos os candidatos.\n"
+"                 Isso instala o módulo document_ftp. Isto irá instalar o "
+"módulo de gestão do conhecimento, para permitir que você pesquise usando "
+"palavras-chave específicas, através do conteúdo de todos os documentos "
+"(PDF,. DOCX ...)"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,state:0
@@ -1104,12 +1159,12 @@ msgstr "Contratado"
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Referred By"
-msgstr ""
+msgstr "Indicado por"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Departement:"
-msgstr ""
+msgstr "Departamento:"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -1125,7 +1180,7 @@ msgstr "Grau de Recrutamento"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
 msgid "Avg. Proposed Salary"
-msgstr ""
+msgstr "Média Salarial"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1158,12 +1213,12 @@ msgstr "Novembro"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_exp_avg:0
 msgid "Avg. Expected Salary"
-msgstr ""
+msgstr "Média Salarial Esperada"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Avg Expected Salary"
-msgstr ""
+msgstr "Média Salarial Esperada"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
@@ -1178,7 +1233,7 @@ msgstr "Essas pessoas receberão e-mail."
 #. module: hr_recruitment
 #: field:hr.job,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Apelido"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1188,22 +1243,22 @@ msgstr "Recrutamento Pendente"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract"
-msgstr ""
+msgstr "Contrato"
 
 #. module: hr_recruitment
 #: field:hr.applicant,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
 msgid "Applicant refused"
-msgstr ""
+msgstr "Candidato recusado"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1234,7 +1289,7 @@ msgstr "Recrutamentos sem assinar"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,state:0
@@ -1244,6 +1299,10 @@ msgid ""
 "related to the status 'Close', when your document reach this stage, it will "
 "be automatically closed."
 msgstr ""
+"A situação relacionada com o estágio. O estado do documento irá mudar "
+"automaticamente de acordo com a fase selecionada. Exemplo, uma etapa está "
+"relacionada a situação \"Fechada\", quando o documento chegar a esta fase, "
+"será automaticamente fechado."
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed_extra:0
@@ -1263,12 +1322,12 @@ msgstr "Aberto"
 #. module: hr_recruitment
 #: view:board.board:0
 msgid "Applications to be Processed"
-msgstr ""
+msgstr "Candidatos a serem processados"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Schedule Interview"
-msgstr ""
+msgstr "Agendar Entrevista"
 
 #~ msgid "# of Cases"
 #~ msgstr "Nº de Casos"
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index d31079284ed..ec5ec60c49e 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-10 17:44+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 17:20+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet
@@ -42,6 +43,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Nenhuma atividade ainda sobre este contrato.\n"
+"              </p><p>\n"
+"             No OpenERP, contratos e projetos são implementados usando\n"
+"                 conta analítica. Assim, você pode controlar os custos e "
+"receitas para analisar\n"
+"                 suas margens facilmente.\n"
+"              </p><p>\n"
+"Os custos serão criados automaticamente quando você se cadastrar faturas\n"
+"do fornecedor, despesas ou planilhas de horas.\n"
+"              </p><p>\n"
+"As receitas serão criadas automaticamente quando você cria faturas de "
+"clientes.\n"
+"                 Faturas de clientes pode ser criada com base em pedidos de "
+"venda\n"
+"                 (faturas com preços fixos), em planilhas de horas (com base "
+"no trabalho feito) ou\n"
+"                 em despesas (por exemplo reembolsos das despesas de "
+"viagem).\n"
+"              </p>\n"
+"            "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -76,7 +98,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -104,7 +126,7 @@ msgstr "Planilha de Horas"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Please define employee for this user!"
-msgstr ""
+msgstr "Por favor defina o funcionário para este usuário!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -130,7 +152,7 @@ msgstr "Sex"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Atividades da Planilha de Horas"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -167,12 +189,12 @@ msgstr "Imprimir Quadro de Horas"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "Please define employee for your user."
-msgstr ""
+msgstr "Por favor defina o funcionário para seu usuário."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_analytic_cost_revenue
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Custos & Receitas"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -189,7 +211,7 @@ msgstr "Conta Analítica"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Costs and Revenues"
-msgstr ""
+msgstr "Custos e Receitas"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:144
@@ -199,7 +221,7 @@ msgstr ""
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
@@ -245,6 +267,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"              Clique para registrar as atividades\n"
+"              </p><p>\n"
+"Você pode se cadastrar e controlar as horas de seus funcionamentos para cada "
+"projeto\n"
+"                 todos os dias. Todo o tempo gasto em um projeto vai se "
+"tornar um custo na\n"
+"                 contabilidade analítica / contrato e pode ser re-faturados "
+"aos clientes, se necessário.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -255,7 +288,7 @@ msgstr "Imprimir"
 #. module: hr_timesheet
 #: help:account.analytic.account,use_timesheets:0
 msgid "Check this field if this project manages timesheets"
-msgstr ""
+msgstr "Marque este campo se este projeto gera planilha de horas"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -281,7 +314,7 @@ msgstr "Data Inicial"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "Please define cost unit for this employee."
-msgstr ""
+msgstr "Por favor defina o custo unitário para este funcionário."
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -296,6 +329,8 @@ msgid ""
 "No analytic account is defined on the project.\n"
 "Please set one or we cannot automatically fill the timesheet."
 msgstr ""
+"Sem conta analítica definida no projeto.\n"
+"Por favor defina uma ou não poderemos preencher a planilha de horas."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -309,6 +344,9 @@ msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
 "Define an employee for the selected user and assign an 'Analytic Journal'!"
 msgstr ""
+"Nenhum 'Diário Analítico' definido para o funcionário %s\n"
+"Defina um funcionário para o usuário selecionado e associe um 'Diário "
+"Analítico'!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -350,12 +388,12 @@ msgstr "Descrição do Trabalho"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Timesheet by Employee"
-msgstr ""
+msgstr "Planilha de Horas por Funcionários"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -423,6 +461,8 @@ msgid ""
 "No analytic journal defined for '%s'.\n"
 "You should assign an analytic journal on the employee form."
 msgstr ""
+"Nenhum diário analítico definido para '%s'.\n"
+"Você deve associar um diário analítico no formulário do funcionário."
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -437,7 +477,7 @@ msgstr "Junho"
 #: field:hr.sign.in.project,state:0
 #: field:hr.sign.out.project,state:0
 msgid "Current Status"
-msgstr ""
+msgstr "Situação Atual"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -487,7 +527,7 @@ msgstr "Qui"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out by Project"
-msgstr ""
+msgstr "Entrada/Saída por Projeto"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
@@ -503,7 +543,7 @@ msgstr "ID do Funcionário"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -617,6 +657,8 @@ msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
 "Employees."
 msgstr ""
+"Por favor crie um funcionário para este usuário, usando o menu: Recursos "
+"Humanos > Funcionários."
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -646,7 +688,7 @@ msgstr "Abril"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Erro de Usuário!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -662,7 +704,7 @@ msgstr "Ano"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 85448846f58..188c57a4c91 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-24 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 9fa305abd5f..f1b59a87c6c 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-10 17:43+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 17:33+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_invoice
@@ -26,7 +27,7 @@ msgstr "Planilhas de Horas por usuário"
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
 msgid "Internal Name"
-msgstr ""
+msgstr "Nome Interno"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -39,18 +40,20 @@ msgid ""
 "The product to invoice is defined on the employee form, the price will be "
 "deducted by this pricelist on the product."
 msgstr ""
+"O produto a faturar está definido no formulário do funcionário, o preço será "
+"deduzido por esta lista de preços no produto."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No record(s) found for this report."
-msgstr ""
+msgstr "Nenhum registro encontrado para este relatório."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dados insuficientes!"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -70,7 +73,7 @@ msgstr "Receita"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
 msgid "Log of Activity"
-msgstr ""
+msgstr "Registro de Atividades"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -80,7 +83,7 @@ msgstr "Reabrir projeto"
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -129,6 +132,8 @@ msgid ""
 "Fill this field only if you want to force to use a specific product. Keep "
 "empty to use the real product that comes from the cost."
 msgstr ""
+"Preencha este campo se você deseja forçar o uso de um produto específico. "
+"Deixe em branco para usar o produto real que vem a partir do custo."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -146,6 +151,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um novo tipo de faturamento.\n"
+"              </p><p>\n"
+"O OpenERP permite que você crie tipos de faturamento padrão. você pode\n"
+"                 ter que atribuir descontos regularmente  por causa de um "
+"contrato\n"
+"                 específico ou acordo com um cliente. A partir deste menu, "
+"você pode\n"
+"                 criar outros tipos de faturamento para acelerar o seu\n"
+"                 faturamento.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -166,7 +183,7 @@ msgstr "Valor Faturado"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
 #, python-format
 msgid "Analytic Account incomplete !"
-msgstr ""
+msgstr "Conta Analítica incompleta!"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -176,7 +193,7 @@ msgstr "Projeto"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoice on Timesheets Options"
-msgstr ""
+msgstr "Faturar nas Opções da Planilha de Horas"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -191,7 +208,7 @@ msgstr "O  detalhe de cada trabalho realizado será mostrado na fatura"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Lista de Preços"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
@@ -216,6 +233,11 @@ msgid ""
 "20% advance invoice (fixed price, based on a sales order), you should "
 "invoice the rest on timesheet with a 80% ratio."
 msgstr ""
+"Você geralmente fatura 100% da planilha de horas. Mas se você misturar preço "
+"fixo e faturamento de horários, você pode usar outra proporção. Por exemplo, "
+"se você fizer uma fatura com adiantamento de 20% (preço fixo, com base em um "
+"pedido de venda), você deve faturar o restante na planilha de horas com uma "
+"proporção de 80%."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -245,7 +267,7 @@ msgstr "Prazo final"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -260,7 +282,7 @@ msgstr "O tempo de cada trabalho realizado será mostrado na fatura"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Cancel Contract"
-msgstr ""
+msgstr "Cancelar Contrato"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,date_from:0
@@ -282,7 +304,7 @@ msgstr "Custos para fatura"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
 #, python-format
 msgid "Please define income account for product '%s'."
-msgstr ""
+msgstr "Por favor defina a conta de receitas para o produto '%s'."
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,account_id:0
@@ -337,12 +359,12 @@ msgstr "Ganho da Planilha de Horas"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
 msgid "Force Product"
-msgstr ""
+msgstr "Forçar Produto"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Contract Finished"
-msgstr ""
+msgstr "Contrato Terminado"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -356,13 +378,13 @@ msgstr "Julho"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Faturável"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -378,7 +400,7 @@ msgstr "Teórico"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
 msgid "Free of charge"
-msgstr ""
+msgstr "Sem custo"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -409,7 +431,7 @@ msgstr "Sim (100%)"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by users"
-msgstr ""
+msgstr "Planilha de Horas por usuários"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:58
@@ -606,7 +628,7 @@ msgstr "Data"
 #: field:report_timesheet.invoice,quantity:0
 #: field:report_timesheet.user,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "Tempo"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
@@ -651,6 +673,8 @@ msgid ""
 "It allows to set the discount while making invoice, keep empty if the "
 "activities should not be invoiced."
 msgstr ""
+"Permite a você definir um desconto ao fazer uma fatura, deixe em branco se "
+"as atividades não devem ser faturadas."
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_max:0
@@ -660,7 +684,7 @@ msgstr "Preço Máx. Fatura"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Proporção de Faturamento da Planilha de Horas"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -711,7 +735,7 @@ msgstr "Até"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Do you want to show details of work in invoice?"
-msgstr ""
+msgstr "Você quer mostrar detalhes do trabalho na fatura?"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -747,6 +771,8 @@ msgstr "Planilhas de Horas a faturar"
 msgid ""
 "Contract incomplete. Please fill in the Customer and Pricelist fields."
 msgstr ""
+"Contrato incompleto. Por favor preencha os campos de Cliente e Lista de "
+"Preços."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
@@ -793,7 +819,7 @@ msgstr "O produto que será usado para cobrar o valor restante"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Tempo Gasto"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
@@ -804,7 +830,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Do you want to show details of each activity to your customer?"
-msgstr ""
+msgstr "Você quer mostrar detalhes de cada atividade para o seu cliente?"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
@@ -833,7 +859,7 @@ msgstr "Nome"
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Linhas Analíticas"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
@@ -866,6 +892,8 @@ msgid ""
 "There is no product defined. Please select one or force the product through "
 "the wizard."
 msgstr ""
+"Não existe nenhum produto definido. Por favor, selecione ou forçe um produto "
+"através do assistente."
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
@@ -894,19 +922,19 @@ msgstr "Unidades"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
 msgid "80%"
-msgstr ""
+msgstr "80%"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 #: view:hr.timesheet.invoice.create:0
 #: view:hr.timesheet.invoice.create.final:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
@@ -936,7 +964,7 @@ msgstr "Ano"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index c284394382e..2aeca4bbed1 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-10 14:56+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 17:51+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_timesheet_sheet
@@ -34,7 +35,7 @@ msgstr "Serviço"
 #: field:hr.timesheet.report,quantity:0
 #: field:timesheet.report,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "Tempo"
 
 #. module: hr_timesheet_sheet
 #: help:hr.config.settings,timesheet_max_difference:0
@@ -43,6 +44,9 @@ msgid ""
 "                computation for one sheet. Set this to 0 if you do not want "
 "any control."
 msgstr ""
+"Diferença permitida em horas entre a entrada / saída e o cálculo da planilha "
+"de horários.\n"
+"                  Configure para 0 se você não quer qualquer controle."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -77,6 +81,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign an "
 "analytic journal to the employee, like 'Timesheet Journal'."
 msgstr ""
+"A fim de criar uma planilha de horas para este funcionário, você deve "
+"atribuir um diário analítico para o funcionário, como 'Diário de Horas'."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -93,7 +99,7 @@ msgstr "#Custo"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -123,7 +129,7 @@ msgstr "Definir como Provisório"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Timesheet Period"
-msgstr ""
+msgstr "Período da Planilha de Horas"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
@@ -134,7 +140,7 @@ msgstr "Data até"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "to"
-msgstr ""
+msgstr "até"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -147,6 +153,7 @@ msgstr "Baseado na planilha de apontamento"
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
 msgstr ""
+"você não pode modificar um lançamento em uma planilha de horas confirmada."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -189,13 +196,13 @@ msgstr "Recusar"
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Atividades da Planilha de Horas"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Please create an employee and associate it with this user."
-msgstr ""
+msgstr "Por favor crie um funcionário e associe com o usuário."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
@@ -204,12 +211,14 @@ msgstr ""
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
 msgstr ""
+"Você não pode inserir uma data de atendimento fora das datas de horários "
+"atuais."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
 #, python-format
 msgid "Week "
-msgstr ""
+msgstr "Semana "
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -232,7 +241,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -244,6 +253,11 @@ msgid ""
 "* The 'Done' status is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * A situação 'Provisória' é usada quando um usuário codifica uma planilha "
+"de horas nova.\n"
+"* 'Confirmada' é usado para confirmar a planilha de horas por usuário.\n"
+"* 'Concluído' é usado quando a planilha de horas do usuário é aceita por seu "
+"superior."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
@@ -258,20 +272,22 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.config.settings,timesheet_max_difference:0
 msgid ""
 "Allow a difference of time between timesheets and attendances of (in hours)"
 msgstr ""
+"Permitir uma diferença de tempo entre planilha de horas e atendimentos de "
+"(em horas)"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
 #, python-format
 msgid ""
 "Please verify that the total difference of the sheet is lower than %.2f."
-msgstr ""
+msgstr "Verifique que a diferença total da planilha é inferior a %.2f."
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -292,7 +308,7 @@ msgstr "Validação"
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:69
@@ -302,6 +318,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user."
 msgstr ""
+"para criar uma planilha de horas para este funcionário, você precisa associá-"
+"lo ao usuário."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
@@ -313,7 +331,7 @@ msgstr "Entrada na Folha de Hora do Funcionário"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -329,6 +347,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
@@ -376,7 +397,7 @@ msgstr "Linhas do apontamento de horas"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -408,7 +429,7 @@ msgstr "Tempo Total"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 msgid "Timesheets to Validate"
-msgstr ""
+msgstr "Planilha de Horas para Validar"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -436,14 +457,14 @@ msgstr "Julho"
 #. module: hr_timesheet_sheet
 #: field:hr.config.settings,timesheet_range:0
 msgid "Validate timesheets every"
-msgstr ""
+msgstr "Validar a planilha de horas a cada"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -502,6 +523,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'."
 msgstr ""
+"para criar uma planilha de horas para este funcionário, você precisa "
+"associar o funcionário ao produto, como 'Consultor'."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -553,6 +576,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product."
 msgstr ""
+"para criar uma planilha de horas para este funcionário, você precisa "
+"associar o funcionário ao produto."
 
 #. module: hr_timesheet_sheet
 #. openerp-web
@@ -561,12 +586,12 @@ msgstr ""
 msgid ""
 "You will be able to register your working hours and\n"
 "                        activities."
-msgstr ""
+msgstr "Você poderá registrar as horas trabalhadas e atividades."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -592,7 +617,7 @@ msgstr "Observação"
 #: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:33
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -631,11 +656,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Nova planilha de horas para aprovar.\n"
+"              </p><p>\n"
+"Você deve registrar planilhas todos os dias e confirmar no final\n"
+"                 da semana. Uma vez que a planilha de horas é confirmada, "
+"deve ser\n"
+"                 validado por um gerente.\n"
+"              </p><p>\n"
+"               Planilhas de Horas também podem ser faturada aos clientes, de "
+"acordo com o\n"
+"                 configuração do contrato relacionado a cada projeto.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linha Analítica"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -646,7 +684,7 @@ msgstr "Agosto"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Differences"
-msgstr ""
+msgstr "Diferenças"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -674,7 +712,7 @@ msgstr "Folha de Horas por Período"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -732,6 +770,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs."
 msgstr ""
+"A planilha de horas não pode ser validada, pois não contém um número igual "
+"de entradas e saídas."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -760,6 +800,8 @@ msgstr "Resumo"
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries."
 msgstr ""
+"Você não pode excluir uma planilha de horas que possui entradas de "
+"atendimentos."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -773,11 +815,13 @@ msgid ""
 "You cannot have 2 timesheets that overlap!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Você não pode ter duas planilhas de horas que se sobrepõem!\n"
+"Você deve usar o menu 'Minha Planilha de Horas' para evitar este problema."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submit to Manager"
-msgstr ""
+msgstr "Enviar ao Gerente"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -803,6 +847,7 @@ msgstr "Buscar Conta"
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
 msgstr ""
+"Você não pode modificar uma entrada em uma planilha de horas confirmada"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -837,6 +882,8 @@ msgid ""
 "You cannot have 2 timesheets that overlap!\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Você não pode ter duas planilhas de horas que se sobrepõem!\n"
+"Você deve usar o menu 'Minha Planilha de Horas' para evitar este problema."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -893,7 +940,7 @@ msgstr "Agrupar por data do ano"
 #: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:56
 #, python-format
 msgid "Click to add projects, contracts or analytic accounts."
-msgstr ""
+msgstr "Clique para adicionar projetos, contratos ou contas analíticas."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -903,7 +950,7 @@ msgstr "Situação é \"Validado\""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -925,7 +972,7 @@ msgstr "Folha de Horas Confirmadas"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -936,7 +983,7 @@ msgstr "Linha de Apontamento de Horas"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed."
-msgstr ""
+msgstr "Você não pode excluir uma planilha de horas que já foi confirmada."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -995,7 +1042,7 @@ msgstr "Total de Atendimentos"
 #: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:39
 #, python-format
 msgid "Add a Line"
-msgstr ""
+msgstr "Adicionar uma linha"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -1007,7 +1054,7 @@ msgstr "Diferença"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
 #, python-format
 msgid "You cannot duplicate a timesheet."
-msgstr ""
+msgstr "Você não pode duplicar uma planilha de horas."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -1032,6 +1079,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"               Este relatório realiza análise em planilhas criadas pelo\n"
+"                 recursos humanos no sistema. Ele permite que você tenha uma "
+"visão geral\n"
+" de entradas feitas por seus funcionários. Você pode agrupá-los\n"
+"                 por critérios específicos de seleção graças à ferramenta de "
+"busca.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1042,6 +1098,8 @@ msgstr "Funcionários"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
 msgstr ""
+"Você não pode modificar uma entrada em uma Planilha de Horas "
+"Confirmada/Concluída!"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -1063,7 +1121,7 @@ msgstr "Confirmação"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -1075,7 +1133,7 @@ msgstr "Taxa da Fatura"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Erro de Usuário!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -1090,7 +1148,7 @@ msgstr "Aprovar"
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
diff --git a/addons/knowledge/i18n/sl.po b/addons/knowledge/i18n/sl.po
new file mode 100644
index 00000000000..279ba020298
--- /dev/null
+++ b/addons/knowledge/i18n/sl.po
@@ -0,0 +1,126 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-25 12:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Documents"
+msgstr "Dokumenti"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_config_settings
+msgid "knowledge.config.settings"
+msgstr "knowledge.config.settings"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_webdav:0
+msgid ""
+"Access your documents in OpenERP through WebDAV.\n"
+"                This installs the module document_webdav."
+msgstr ""
+"Access your documents in OpenERP through WebDAV.\n"
+"                This installs the module document_webdav."
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_page:0
+msgid "This installs the module document_page."
+msgstr "This installs the module document_page."
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
+#: view:knowledge.config.settings:0
+msgid "Configure Knowledge"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Knowledge and Documents Management"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document:0
+msgid ""
+"This is a complete document management system, with: user authentication,\n"
+"                full document search (but pptx and docx are not supported), "
+"and a document dashboard.\n"
+"                This installs the module document."
+msgstr ""
+"This is a complete document management system, with: user authentication,\n"
+"                full document search (but pptx and docx are not supported), "
+"and a document dashboard.\n"
+"                This installs the module document."
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_page:0
+msgid "Create static web pages"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_ftp:0
+msgid "Share repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document:0
+msgid "Manage documents"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Apply"
+msgstr "Uporabi"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Nastavitve"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_ftp:0
+msgid ""
+"Access your documents in OpenERP through an FTP interface.\n"
+"                This installs the module document_ftp."
+msgstr ""
+"Access your documents in OpenERP through an FTP interface.\n"
+"                This installs the module document_ftp."
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "or"
+msgstr "ali"
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_webdav:0
+msgid "Share repositories (WebDAV)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
+msgid "Knowledge"
+msgstr "Znanje"
diff --git a/addons/l10n_be_coda/i18n/es.po b/addons/l10n_be_coda/i18n/es.po
index 250c310389a..07aae601d7a 100644
--- a/addons/l10n_be_coda/i18n/es.po
+++ b/addons/l10n_be_coda/i18n/es.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-08-30 17:18+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2012-12-24 16:55+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:20+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_09_21
@@ -26,57 +25,58 @@ msgstr ""
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_412
 msgid "Advice of expiry charges"
-msgstr ""
+msgstr "Aviso de cargos expirados"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "Su compra de vales de comida"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_11_05
 msgid "Partial payment subscription"
-msgstr ""
+msgstr "Suscripción de pago parcial"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_01_54
 msgid "Unexecutable transfer order"
-msgstr ""
+msgstr "Orden de transferencia no ejecutable"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_01_02
 msgid "Individual transfer order initiated by the bank"
-msgstr ""
+msgstr "Orden de transferencia individual iniciada por el banco"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,comment:l10n_be_coda.actcc_80_21
 msgid "Charges for preparing pay packets"
-msgstr ""
+msgstr "Los cargos por la preparación de los paquetes salariales"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.type,description:l10n_be_coda.actt_9
 msgid "Detail of 7. The records in a separate application keep type 9."
 msgstr ""
+"Detalle de 7. Los registros en una solicitud separada mantienen el tipo 9."
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_426
 msgid "Belgian broker's commission"
-msgstr ""
+msgstr "Comisión del corredor belga"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_031
 msgid "Charges foreign cheque"
-msgstr ""
+msgstr "Cargos de cheque al extranjero"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_002
 msgid "Interest paid"
-msgstr ""
+msgstr "Intereses pagados"
 
 #. module: l10n_be_coda
 #: field:account.coda.trans.type,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Padre"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,comment:l10n_be_coda.actcc_03_62
@@ -84,47 +84,49 @@ msgid ""
 "cheques debited on account, but debit cancelled afterwards for lack of cover "
 "(double debit/contra-entry of transaction 01 or 05)"
 msgstr ""
+"cheques adeudados en cuenta, pero cancelados después por falta de cobertura "
+"(doble débito/contrapartida en la transacción 01 o 05)"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_47_05
 msgid "Bill claimed back"
-msgstr ""
+msgstr "Facturas reclamadas"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_016
 msgid "BLIW/IBLC dues"
-msgstr ""
+msgstr "Cuotas BLIW/IBLC"
 
 #. module: l10n_be_coda
 #: code:addons/l10n_be_coda/wizard/account_coda_import.py:909
 #, python-format
 msgid "CODA File is Imported  :"
-msgstr ""
+msgstr "El archivo CODA se ha importado:"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_066
 msgid "Fixed loan advance - reimbursement"
-msgstr ""
+msgstr "Avance de préstamo fijo - reembolso"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_09_05
 msgid "Purchase of foreign bank notes"
-msgstr ""
+msgstr "Compra de billetes de banco extranjeros"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_030
 msgid "Account insurance"
-msgstr ""
+msgstr "Seguro de cuenta"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_042
 msgid "Payment card costs"
-msgstr ""
+msgstr "Costes de la tarjeta de crédito"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_212
 msgid "Warehousing fee"
-msgstr ""
+msgstr "Cuota de mantenimiento"
 
 #. module: l10n_be_coda
 #: code:addons/l10n_be_coda/wizard/account_coda_import.py:278
@@ -134,21 +136,23 @@ msgid ""
 "\n"
 "The File contains an invalid CODA Transaction Family : %s."
 msgstr ""
+"\n"
+"El archivo contiene una familia de transacción CODA no válida: %s."
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_01_66
 msgid "Financial centralization"
-msgstr ""
+msgstr "Centralización financiera"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_420
 msgid "Retention charges"
-msgstr ""
+msgstr "Cargos de retención"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_01_50
 msgid "Transfer in your favour"
-msgstr ""
+msgstr "Transferencia a su favor"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_01_87
@@ -164,37 +168,37 @@ msgstr ""
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_43_87
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_47_87
 msgid "Reimbursement of costs"
-msgstr ""
+msgstr "Reembolso de los costes"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_07_56
 msgid "Remittance of supplier's bill with guarantee"
-msgstr ""
+msgstr "Envío de factura del proveedor con garantía"
 
 #. module: l10n_be_coda
 #: model:account.coda.comm.type,description:l10n_be_coda.acct_002
 msgid "Communication of the bank"
-msgstr ""
+msgstr "Comunicación del banco"
 
 #. module: l10n_be_coda
 #: field:coda.bank.statement.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Importe"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,comment:l10n_be_coda.actcc_11_70
 msgid "Only with stockbrokers when they deliver the securities to the bank"
-msgstr ""
+msgstr "Sólo con corredores de bolsa cuando entregan los valores al banco"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_413
 msgid "Acceptance charges"
-msgstr ""
+msgstr "Cargos de aceptación"
 
 #. module: l10n_be_coda
 #: field:coda.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "BIC de la contrapartida"
 
 #. module: l10n_be_coda
 #: help:coda.bank.account,def_receivable:0
@@ -202,6 +206,8 @@ msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found."
 msgstr ""
+"Establezca aquí la cuenta de ingresos que se usará por defecto si no se "
+"encuentra la empresa."
 
 #. module: l10n_be_coda
 #: help:coda.bank.account,def_payable:0
@@ -209,33 +215,35 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found."
 msgstr ""
+"Establezca aquí la cuenta de gastos que se usará por defecto si no se "
+"encuentra la empresa."
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_07_39
 msgid "Return of an irregular bill of exchange"
-msgstr ""
+msgstr "Devolución de una letra de cambio irregular"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.category,description:l10n_be_coda.actrca_011
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,comment:l10n_be_coda.actcc_07_09
 msgid "Debit of the agios to the account of the drawee"
-msgstr ""
+msgstr "Débito de los agios en la cuenta del librado"
 
 #. module: l10n_be_coda
 #: view:account.coda.comm.type:0
 #: model:ir.actions.act_window,name:l10n_be_coda.action_account_coda_comm_type_form
 #: model:ir.ui.menu,name:l10n_be_coda.menu_action_account_coda_comm_type_form
 msgid "CODA Structured Communication Types"
-msgstr ""
+msgstr "Tipos de comunicación estructurada CODA"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_30_50
 msgid "Spot sale of foreign exchange"
-msgstr ""
+msgstr "Punto de venta de divisas"
 
 #. module: l10n_be_coda
 #: code:addons/l10n_be_coda/wizard/account_coda_import.py:321
@@ -245,6 +253,11 @@ msgid ""
 "CODA parsing error on movement data record 2.2, seq nr %s.\n"
 "Please report this issue via your OpenERP support channel."
 msgstr ""
+"\n"
+"Error de análisis CODE en el registro de datos de movimientos 2.2, nº de "
+"secuencia %s.\n"
+"Por favor, informe de esta incidencia a través de su canal de soporte "
+"OpenERP."
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_07_58
diff --git a/addons/l10n_bo/i18n/pt_BR.po b/addons/l10n_bo/i18n/pt_BR.po
new file mode 100644
index 00000000000..d0c10b62ea5
--- /dev/null
+++ b/addons/l10n_bo/i18n/pt_BR.po
@@ -0,0 +1,54 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-12-24 18:39+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: l10n_ar
+#: model:ir.module.module,description:l10n_ar.module_meta_information
+msgid ""
+"\n"
+"    Argentinian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Contabilidade Argentina: Plano de Contas\n"
+"    "
+
+#. module: l10n_ar
+#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
+msgid "Argentinian Chart of Account"
+msgstr "Plano de Contas da Argentina"
+
+#. module: l10n_ar
+#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Gerar Plano de Contas a partir de um modelo. Você deverá informar o nome da "
+"empresa, o plano padrão, o número de dígitos para gerar o código para suas "
+"contas, a conta bancária e a moeda para gerar a sequência. Em seguida uma "
+"cópia do plano modelo é gerada.\n"
+"Este é o mesmo assistente que é executado a partir de Gerenciamento "
+"Financeiro/Configuração/Contabilidade Financeira/Contas Financeiras/Gerar "
+"Plano de Contas a partir de um modelo."
diff --git a/addons/l10n_in_hr_payroll/i18n/es.po b/addons/l10n_in_hr_payroll/i18n/es.po
index 9fba3d392da..117c1d5d443 100644
--- a/addons/l10n_in_hr_payroll/i18n/es.po
+++ b/addons/l10n_in_hr_payroll/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-19 17:44+0000\n"
+"PO-Revision-Date: 2012-12-24 17:26+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-20 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: l10n_in_hr_payroll
@@ -30,7 +30,7 @@ msgstr "Cuenta bancaria del empleado"
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Payment Advices which are in draft state"
-msgstr "Avisos de pago que se encuentran en estado borrador"
+msgstr "Notificaciones de pago que se encuentran en estado borrador"
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
@@ -40,7 +40,7 @@ msgstr "Título"
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "Payment Advice from"
-msgstr "Aviso de pago de"
+msgstr "Notificación de pago de"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
@@ -50,7 +50,7 @@ msgstr "Informe de salario del empleado por categoría"
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Payslips which are paid"
-msgstr ""
+msgstr "Nómina pagadas"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -67,7 +67,7 @@ msgstr "Derechos de emisión con base:"
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Payslips which are in done state"
-msgstr ""
+msgstr "Nóminas en estado \"Realizada\""
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
@@ -82,12 +82,12 @@ msgstr "Deducciones:"
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "A/C no."
-msgstr ""
+msgstr "Número A/C"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,driver_salay:0
 msgid "Driver Salary"
-msgstr ""
+msgstr "Salario del conductor"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
@@ -105,7 +105,7 @@ msgstr "Nóminas"
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -126,7 +126,7 @@ msgstr "Gerente"
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr ""
+msgstr "Detalles de la carta"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -146,12 +146,12 @@ msgstr "Total:"
 #. module: l10n_in_hr_payroll
 #: field:hr.payslip.run,available_advice:0
 msgid "Made Payment Advice?"
-msgstr "¿Realizar consejo de pago?"
+msgstr "¿Realizar notificación de pago?"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Advices which are paid using NEFT transfer"
-msgstr ""
+msgstr "Notificaciones pagadas usando transferencia NEFT"
 
 #. module: l10n_in_hr_payroll
 #: field:payslip.report,nbr:0
@@ -161,7 +161,7 @@ msgstr "Nº de líneas de nómina"
 #. module: l10n_in_hr_payroll
 #: help:hr.contract,tds:0
 msgid "Amount for Tax Deduction at Source"
-msgstr ""
+msgstr "Importe de la deducción de impuestos en el origen"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
@@ -179,7 +179,7 @@ msgstr "Día"
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Month of Payment Advices"
-msgstr ""
+msgstr "Mes de las notificaciones de pago"
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.payslip:0
@@ -236,97 +236,97 @@ msgstr "Seguro médico"
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Identification No"
-msgstr ""
+msgstr "Nº identificación"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 #: field:payslip.report,struct_id:0
 msgid "Structure"
-msgstr ""
+msgstr "Estructura"
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "form period"
-msgstr ""
+msgstr "periodo formal"
 
 #. module: l10n_in_hr_payroll
 #: selection:hr.payroll.advice,state:0
 #: selection:payment.advice.report,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmada"
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
 #: report:salary.employee.bymonth:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 #: field:payment.advice.report,bysal:0
 #: report:payroll.advice:0
 msgid "By Salary"
-msgstr ""
+msgstr "Por salario"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: view:payment.advice.report:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
 #: field:payment.advice.report,cheque_nos:0
 msgid "Cheque Numbers"
-msgstr ""
+msgstr "Números de cheque"
 
 #. module: l10n_in_hr_payroll
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No se pueden crear compañías recursivas."
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
 #: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
 #: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
 msgid "Yearly Salary by Head"
-msgstr ""
+msgstr "Salario anual por cabeza"
 
 #. module: l10n_in_hr_payroll
 #: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:134
 #, python-format
 msgid "You can not confirm Payment advice without advice lines."
-msgstr ""
+msgstr "No peude confirmar una notificación de pago que no tiene líneas."
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "Yours Sincerely"
-msgstr ""
+msgstr "Atentamente"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "# Payslip Lines"
-msgstr ""
+msgstr "Nº de líneas de nómina"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.contract,medical_insurance:0
 msgid "Deduction towards company provided medical insurance"
-msgstr ""
+msgstr "Deducción respecto al seguro médico provisto por la compañía"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
 msgid "Bank Advice Lines"
-msgstr ""
+msgstr "Líneas de notificación bancaria"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Day of Payslip"
-msgstr ""
+msgstr "Día de la nómina"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.payslip.run,available_advice:0
@@ -334,6 +334,8 @@ msgid ""
 "If this box is checked which means that Payment Advice exists for current "
 "batch"
 msgstr ""
+"Si la casilla está marcada, significa que existe una notificación de pago "
+"para el proceso por lotes actual"
 
 #. module: l10n_in_hr_payroll
 #: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:108
@@ -342,83 +344,83 @@ msgstr ""
 #: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:207
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: l10n_in_hr_payroll
 #: field:payslip.report,paid:0
 msgid "Made Payment Order ? "
-msgstr ""
+msgstr "¿Realizar orden de pago? "
 
 #. module: l10n_in_hr_payroll
 #: view:hr.salary.employee.month:0
 #: view:yearly.salary.detail:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: l10n_in_hr_payroll
 #: selection:payslip.report,state:0
 msgid "Rejected"
-msgstr ""
+msgstr "Rechazada"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Year of Payslip"
-msgstr ""
+msgstr "Año de la nómina"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
 msgid "Payslip Batches"
-msgstr ""
+msgstr "Procesamientos de nóminas"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,debit_credit:0
 #: report:payroll.advice:0
 msgid "C/D"
-msgstr ""
+msgstr "C/D"
 
 #. module: l10n_in_hr_payroll
 #: report:salary.employee.bymonth:0
 msgid "Yearly Salary Details"
-msgstr ""
+msgstr "Detalles del salario anual"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
 msgid "Print Advice"
-msgstr ""
+msgstr "Imprimir notificación"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,line_ids:0
 msgid "Employee Salary"
-msgstr ""
+msgstr "Salario del empleado"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: l10n_in_hr_payroll
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Payslip Line"
-msgstr ""
+msgstr "Línea de nómina"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
 msgid "Payment Advices"
-msgstr ""
+msgstr "Notificaciones de pago"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
 #: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
 #: view:payment.advice.report:0
 msgid "Advices Analysis"
-msgstr ""
+msgstr "Análisis de notificaciones"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.salary.employee.month:0
@@ -426,69 +428,72 @@ msgid ""
 "This wizard will print report which displays employees break-up of Net Head "
 "for a specified dates."
 msgstr ""
+"Este asistente imprimirá un informe que muestra el neto de los empleados "
+"para una fechas específicas."
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,ifsc:0
 msgid "IFSC"
-msgstr ""
+msgstr "IFSC"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 #: field:payslip.report,date_to:0
 msgid "Date To"
-msgstr ""
+msgstr "Fecha hasta"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,tds:0
 msgid "TDS"
-msgstr ""
+msgstr "TDS"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Confirm Advices"
-msgstr ""
+msgstr "Confirmar notificaciones"
 
 #. module: l10n_in_hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
 msgstr ""
+"¡Error! La fecha de inicio del contrato debe ser anterior a la de fin."
 
 #. module: l10n_in_hr_payroll
 #: field:res.company,dearness_allowance:0
 msgid "Dearness Allowance"
-msgstr ""
+msgstr "Subsidio de caridad"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.contract:0
 msgid "Deduction"
-msgstr ""
+msgstr "Deducción"
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "SI. No."
-msgstr ""
+msgstr "Nº SS"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Payment Advices which are in confirm state"
-msgstr ""
+msgstr "Notificaciones de pago que están en estado confirmado"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Confirm Sheet"
-msgstr ""
+msgstr "Hoja de confirmación"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
@@ -496,30 +501,30 @@ msgstr ""
 #: view:payslip.report:0
 #: field:payslip.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
 msgid "Employee Code"
-msgstr ""
+msgstr "Código de empleado"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.salary.employee.month:0
 #: view:yearly.salary.detail:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
 msgid "Hr Salary Employee By Month Report"
-msgstr ""
+msgstr "Informe de salario del empleado por mes"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.salary.employee.month,category_id:0
 #: view:payslip.report:0
 #: field:payslip.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: l10n_in_hr_payroll
 #: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:190
@@ -527,21 +532,23 @@ msgstr ""
 msgid ""
 "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
 msgstr ""
+"La notificación de pago para %s ya existe. Pulse 'Establecer a borrador' "
+"para crear una nueva notificación."
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payslip.run:0
 msgid "To Advice"
-msgstr ""
+msgstr "A notificar"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Salary Rule Category"
-msgstr ""
+msgstr "Categoría de regla salarial"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -551,23 +558,23 @@ msgstr ""
 #: view:payslip.report:0
 #: selection:payslip.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 #: field:payslip.report,date_from:0
 msgid "Date From"
-msgstr ""
+msgstr "Fecha desde"
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
 msgid "Payment Advice Analysis"
-msgstr ""
+msgstr "Análisis de la notificación de pago"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -577,30 +584,31 @@ msgstr ""
 #: view:payslip.report:0
 #: field:payslip.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: l10n_in_hr_payroll
 #: help:res.company,dearness_allowance:0
 msgid "Check this box if your company provide Dearness Allowance to employee"
 msgstr ""
+"Marque esta casilla si su compañía ofrece subsidio de caridad al empleado"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,ifsc_code:0
 #: field:payment.advice.report,ifsc_code:0
 #: report:payroll.advice:0
 msgid "IFSC Code"
-msgstr ""
+msgstr "Código IFSC"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagada"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.contract,voluntary_provident_fund:0
@@ -614,63 +622,63 @@ msgstr ""
 #: view:payment.advice.report:0
 #: field:payment.advice.report,nbr:0
 msgid "# Payment Lines"
-msgstr ""
+msgstr "Nº de líneas del pago"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
 msgid "PaySlip Details"
-msgstr ""
+msgstr "Detalles de la nómina"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,date:0
 #: field:payment.advice.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 #: view:payslip.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
 msgid "This report performs analysis on Payment Advices"
-msgstr ""
+msgstr "Este informe realiza un análisis en las notificaciones de pago"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 #: report:salary.detail.byyear:0
 msgid "Designation"
-msgstr ""
+msgstr "Designación"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Month of Payslip"
-msgstr ""
+msgstr "Mes de la nómina"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: l10n_in_hr_payroll
 #: view:yearly.salary.detail:0
@@ -680,43 +688,43 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 #: report:payroll.advice:0
 msgid "Authorized Signature"
-msgstr ""
+msgstr "Firma autorizada"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
 msgid "Contract"
-msgstr ""
+msgstr "Contrato"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,supplementary_allowance:0
 msgid "Supplementary Allowance"
-msgstr ""
+msgstr "Prestación complementaria"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice.line:0
 msgid "Advice Lines"
-msgstr ""
+msgstr "Líneas de notificación"
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "To,"
-msgstr ""
+msgstr "A,"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.contract,driver_salay:0
 msgid "Check this box if you provide allowance for driver"
-msgstr ""
+msgstr "Marque esta casilla si provee prestaciones para el conductor"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 msgid "Payslips which are in draft state"
-msgstr ""
+msgstr "Nóminas en estado borrador"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -724,57 +732,59 @@ msgstr ""
 #: field:hr.payslip,advice_id:0
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
-msgstr ""
+msgstr "Notificación bancaria"
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
 msgid "Other No."
-msgstr ""
+msgstr "Nº otro"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Draft Advices"
-msgstr ""
+msgstr "Notificaciones en borrador"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.payroll.advice,neft:0
 msgid "Check this box if your company use online transfer for salary"
 msgstr ""
+"Marque esta casilla si su compañía usa transferencia en línea para el pago "
+"de nóminas"
 
 #. module: l10n_in_hr_payroll
 #: field:payment.advice.report,number:0
 #: field:payslip.report,number:0
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
 #: selection:payslip.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realizada"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 #: view:hr.salary.employee.month:0
 #: view:yearly.salary.detail:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Day of Payment Advices"
-msgstr ""
+msgstr "Día de notificaciones de pago"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Search Payment advice"
-msgstr ""
+msgstr "Buscar notificación de pago"
 
 #. module: l10n_in_hr_payroll
 #: view:yearly.salary.detail:0
@@ -786,12 +796,12 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Pay Slip Details"
-msgstr ""
+msgstr "Detalles de la nómina"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Total Salary"
-msgstr ""
+msgstr "Salario total"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,employee_id:0
@@ -800,44 +810,44 @@ msgstr ""
 #: view:payslip.report:0
 #: field:payslip.report,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Compute Advice"
-msgstr ""
+msgstr "Calcular notificación"
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Estimado/a Sr./Sra.,"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: l10n_in_hr_payroll
 #: view:res.company:0
 msgid "Payroll"
-msgstr ""
+msgstr "Sueldos"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "NEFT"
-msgstr ""
+msgstr "NEFT"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 #: report:salary.detail.byyear:0
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -847,24 +857,24 @@ msgstr ""
 #: report:payroll.advice:0
 #: report:salary.detail.byyear:0
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.salary.employee.month,end_date:0
 #: field:yearly.salary.detail,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: l10n_in_hr_payroll
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la compañía debe ser único!"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -874,7 +884,7 @@ msgstr ""
 #: field:payslip.report,name:0
 #: report:salary.employee.bymonth:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.salary.employee.month:0
@@ -882,12 +892,12 @@ msgstr ""
 #: view:yearly.salary.detail:0
 #: field:yearly.salary.detail,employee_ids:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: l10n_in_hr_payroll
 #: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payslip_report_all
@@ -895,51 +905,51 @@ msgstr ""
 #: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payslip
 #: view:payslip.report:0
 msgid "Payslip Analysis"
-msgstr ""
+msgstr "Análisis de las nóminas"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0
 #: selection:payslip.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
 msgid "Name of the Employe"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: l10n_in_hr_payroll
 #: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:108
 #: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:207
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.salary.employee.month,start_date:0
 #: field:yearly.salary.detail,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha de inicio"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.contract:0
 msgid "Allowance"
-msgstr ""
+msgstr "Prima"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,voluntary_provident_fund:0
 msgid "Voluntary Provident Fund (%)"
-msgstr ""
+msgstr "Fondo de previsión voluntario (%)"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.contract,house_rent_allowance_metro_nonmetro:0
 msgid "House Rent Allowance (%)"
-msgstr ""
+msgstr "Prima de alquiler de la casa (%)"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.payroll.advice,bank_id:0
 msgid "Select the Bank from which the salary is going to be paid"
-msgstr ""
+msgstr "Seleccione el banco desde el que va a ser pagado el salario"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.salary.employee.month:0
@@ -949,33 +959,33 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
 msgid "Phone No."
-msgstr ""
+msgstr "Nº de teléfono"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Credit"
-msgstr ""
+msgstr "Haber"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,name:0
 #: report:payroll.advice:0
 msgid "Bank Account No."
-msgstr ""
+msgstr "Nº de cuenta bancaria"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.payroll.advice,date:0
 msgid "Advice Date is used to search Payslips"
-msgstr ""
+msgstr "La fecha de notificación se usa para buscar nóminas"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payslip.run:0
 msgid "Payslip Batches ready to be Adviced"
-msgstr ""
+msgstr "Paquete de nóminas listo para ser notificado"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payslip.run:0
 msgid "Create Advice"
-msgstr ""
+msgstr "Crear notificación"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
@@ -983,13 +993,13 @@ msgstr ""
 #: view:payslip.report:0
 #: field:payslip.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,neft:0
 #: field:payment.advice.report,neft:0
 msgid "NEFT Transaction"
-msgstr ""
+msgstr "Transacción NEFT"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
@@ -997,7 +1007,7 @@ msgstr ""
 #: report:salary.detail.byyear:0
 #: report:salary.employee.bymonth:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: l10n_in_hr_payroll
 #: help:hr.contract,house_rent_allowance_metro_nonmetro:0
@@ -1006,8 +1016,12 @@ msgid ""
 "his rental or accommodation expenses for metro city it is 50 % and for non "
 "metro 40%.HRA computed as percentage(%)"
 msgstr ""
+"La prima por alquiler de vivienda (HRA) es una prima dada por el empleador "
+"al empleado para hacerse cargo de su alquiler o de gastos de alojamiento. "
+"Para ciudades con metro es 50% y para ciudades sin metro es 40%. La HRA se "
+"calcula en porcentaje (%)."
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
 msgid "Year of Payment Advices"
-msgstr ""
+msgstr "Año de notificaciones de pago"
diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po
index f4f7757a0e1..8cdd930758d 100644
--- a/addons/lunch/i18n/pt_BR.po
+++ b/addons/lunch/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-17 00:27+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 19:30+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: lunch
@@ -26,17 +27,17 @@ msgstr "Categoria"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_by_supplier_form
 msgid "Today's Orders by Supplier"
-msgstr ""
+msgstr "Pedidos de Hoje por Fornecedor"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "My Orders"
-msgstr ""
+msgstr "Meus Pedidos"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "Partially Confirmed"
-msgstr ""
+msgstr "Parcialmente Confirmado"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -47,13 +48,13 @@ msgstr "Agrupar Por..."
 #. module: lunch
 #: field:lunch.alert,sunday:0
 msgid "Sunday"
-msgstr ""
+msgstr "Domingo"
 
 #. module: lunch
 #: field:lunch.order.line,supplier:0
 #: field:lunch.product,supplier:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fornecedor"
 
 #. module: lunch
 #: view:lunch.order.line:0
@@ -68,22 +69,22 @@ msgstr "Março"
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "By Employee"
-msgstr ""
+msgstr "Por Funcionário"
 
 #. module: lunch
 #: field:lunch.alert,friday:0
 msgid "Friday"
-msgstr ""
+msgstr "Sexta-feira"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "validate order lines"
-msgstr ""
+msgstr "validar linhas do pedido"
 
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "Order lines Tree"
-msgstr ""
+msgstr "Árvore de linhas do pedido"
 
 #. module: lunch
 #: field:lunch.alert,specific_day:0
@@ -95,12 +96,12 @@ msgstr "Dia"
 #: view:lunch.order.line:0
 #: selection:lunch.order.line,state:0
 msgid "Received"
-msgstr ""
+msgstr "Recebido"
 
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "By Supplier"
-msgstr ""
+msgstr "Por fornecedor"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_order_tree
@@ -117,27 +118,39 @@ msgid ""
 "            </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um pedido de almoço. \n"
+"            </p>\n"
+"            <p>\n"
+"                Um pedido de almoço é definido por usuário, data e linhas do "
+"pedido.\n"
+"                Cada linha do pedido corresponde a um produto, uma "
+"informação adicional e o valor.\n"
+"               Antes de selecionar suas linhas do pedido, não se esqueça de "
+"ler os avisos mostrados na área avermelhada.\n"
+"            </p>\n"
+"            "
 
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "Not Received"
-msgstr ""
+msgstr "Não Recebido"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_by_supplier_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_control_suppliers
 msgid "Orders by Supplier"
-msgstr ""
+msgstr "Pedidos por Fornecedor"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Receive Meals"
-msgstr ""
+msgstr "Receber Refeições"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "cashmove form"
-msgstr ""
+msgstr "formulário de movimentação do caixa"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_cashmove_form
@@ -151,6 +164,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                 Aqui você pode ver seus movimentos de caixa. <br/> Um "
+"movimento de caixa pode ser uma despesa ou um pagamento.\n"
+"                 Uma despesa é automaticamente criada quando uma ordem é "
+"recebida, enquanto o pagamento é um reembolso para a empresa codificada pelo "
+"gerente.\n"
+"               </ p>\n"
+"            "
 
 #. module: lunch
 #: field:lunch.cashmove,amount:0
@@ -167,24 +188,24 @@ msgstr "Produtos"
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "By Date"
-msgstr ""
+msgstr "Por data"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 #: view:lunch.order.line:0
 #: selection:lunch.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "lunch employee payment"
-msgstr ""
+msgstr "pagamento de almoço do funcionário"
 
 #. module: lunch
 #: view:lunch.alert:0
 msgid "alert tree"
-msgstr ""
+msgstr "árvore de alerta"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order_line
@@ -194,23 +215,24 @@ msgstr "Estatísticas de Pedido de Almoço"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_alert
 msgid "Lunch Alert"
-msgstr ""
+msgstr "alerta de almoço"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:183
 #, python-format
 msgid "Select a product and put your order comments on the note."
 msgstr ""
+"Escolha um produto e coloque os comentários de seu pedido na observação"
 
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Week"
-msgstr ""
+msgstr "A cada Semana"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
 msgid "Register Cash Moves"
-msgstr ""
+msgstr "Registrar Movimentos de Caixa"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -220,7 +242,7 @@ msgstr "Confirmado"
 #. module: lunch
 #: view:lunch.order:0
 msgid "lunch orders"
-msgstr ""
+msgstr "Pedidos de Almoço"
 
 #. module: lunch
 #: view:lunch.order.line:0
@@ -230,22 +252,22 @@ msgstr "Confirmar"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 msgid "Your Account"
-msgstr ""
+msgstr "Sua Conta"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
 msgid "Your Lunch Account"
-msgstr ""
+msgstr "Sua Conta de Almoço"
 
 #. module: lunch
 #: field:lunch.alert,active_from:0
 msgid "Between"
-msgstr ""
+msgstr "Entre"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_order
 msgid "Wizard to order a meal"
-msgstr ""
+msgstr "Assistente para pedir refeições"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -257,7 +279,7 @@ msgstr "Novo"
 #: code:addons/lunch/lunch.py:180
 #, python-format
 msgid "This is the first time you order a meal"
-msgstr ""
+msgstr "Esta é a primeira vez que você pede uma refeição"
 
 #. module: lunch
 #: field:report.lunch.order.line,price_total:0
@@ -267,7 +289,7 @@ msgstr "Preço Total"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_validation
 msgid "lunch validation for order"
-msgstr ""
+msgstr "validação de almoço para o pedido"
 
 #. module: lunch
 #: report:lunch.order.line:0
@@ -287,13 +309,13 @@ msgstr "Julho"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_config
 msgid "Configuration"
-msgstr ""
+msgstr "Configuração"
 
 #. module: lunch
 #: field:lunch.order,state:0
 #: field:lunch.order.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: lunch
 #: view:lunch.order.order:0
@@ -301,17 +323,19 @@ msgid ""
 "Order a meal doesn't mean that we have to pay it.\n"
 "                        A meal should be paid when it is received."
 msgstr ""
+"Pedir uma refeição não significa que temos que pagar.\n"
+"                         A refeição deve ser paga quando ele é recebida."
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
 #: model:ir.ui.menu,name:lunch.menu_lunch_control_accounts
 msgid "Control Accounts"
-msgstr ""
+msgstr "Controlar Contas"
 
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
-msgstr ""
+msgstr "Diariamente"
 
 #. module: lunch
 #: field:lunch.order.line,cashmove:0
@@ -321,12 +345,12 @@ msgstr "Movimentos do Caixa"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.order_order_lines
 msgid "Order meals"
-msgstr ""
+msgstr "Pedir Refeições"
 
 #. module: lunch
 #: view:lunch.alert:0
 msgid "Schedule Hour"
-msgstr ""
+msgstr "Agendar Horário"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -353,16 +377,30 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Aqui você pode ver cada pedido agrupado por fornecedor e "
+"data.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Clique em <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> para avisar "
+"que o pedido foi efetuado <br/>\n"
+"                - Clique em <img src=\"../../../web/static/src/img/icons/gtk-"
+"apply.png\"/> para avisar que o pedido chegou <br/>\n"
+"                - Clique em <img src=\"../../../web/static/src/img/icons/gtk-"
+"cancel.png\"/> X vermelho para avisar que o pedido não está disponível\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: field:lunch.alert,tuesday:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Terça-feira"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
 msgid "Your Orders"
-msgstr ""
+msgstr "Seus Pedidos"
 
 #. module: lunch
 #: field:report.lunch.order.line,month:0
@@ -381,24 +419,32 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um produto para almoço. \n"
+"            </p>\n"
+"              <p>\n"
+"                Um produto é fefinido por seu nome, categoria, preço e "
+"fornecedor.\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: view:lunch.alert:0
 #: field:lunch.alert,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Order Meals"
-msgstr ""
+msgstr "Pedir Refeições"
 
 #. module: lunch
 #: view:lunch.cancel:0
 #: view:lunch.order.order:0
 #: view:lunch.validation:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
@@ -411,11 +457,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma categoria de almoço. \n"
+"            </p>\n"
+"              <p>\n"
+"                Aqui você pode definir cada categoria de almoço para os "
+"produtos.\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Order meal"
-msgstr ""
+msgstr "Pedir Refeição"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
@@ -426,58 +480,58 @@ msgstr "Categorias de Produtos"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_control_suppliers
 msgid "Control Suppliers"
-msgstr ""
+msgstr "Controlar Fornecedores"
 
 #. module: lunch
 #: view:lunch.alert:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "Data Agendada"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_alert
 #: model:ir.ui.menu,name:lunch.menu_lunch_alert
 #: field:lunch.order,alerts:0
 msgid "Alerts"
-msgstr ""
+msgstr "Alertas"
 
 #. module: lunch
 #: field:lunch.order.line,note:0
 #: field:report.lunch.order.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "Observação"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:250
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #. module: lunch
 #: view:lunch.product:0
 #: view:lunch.product.category:0
 msgid "Products Form"
-msgstr ""
+msgstr "Formulário de Produtos"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.cancel_order_lines
 msgid "Cancel meals"
-msgstr ""
+msgstr "Cancelar refeições"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
 #: view:lunch.cashmove:0
 msgid "lunch cashmove"
-msgstr ""
+msgstr "movimentação de caixa de almoço"
 
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Are you sure you want to cancel these meals?"
-msgstr ""
+msgstr "Você tem certeza de que deseja cancelar estas refeições?"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "My Account"
-msgstr ""
+msgstr "Minha Conta"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -487,17 +541,17 @@ msgstr "Agosto"
 #. module: lunch
 #: field:lunch.alert,monday:0
 msgid "Monday"
-msgstr ""
+msgstr "Segunda-feira"
 
 #. module: lunch
 #: field:lunch.order.line,name:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.validate_order_lines
 msgid "Receive meals"
-msgstr ""
+msgstr "Receber Refeições"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -521,12 +575,12 @@ msgstr "Almoço"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_line
 msgid "lunch order line"
-msgstr ""
+msgstr "Linha do pedido de almoço"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "lunch product"
-msgstr ""
+msgstr "produto de almoço"
 
 #. module: lunch
 #: field:lunch.order.line,user_id:0
@@ -549,18 +603,18 @@ msgstr "Novembro"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Orders Tree"
-msgstr ""
+msgstr "Árvore de Pedidos"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Orders Form"
-msgstr ""
+msgstr "Formulário de Pedidos"
 
 #. module: lunch
 #: view:lunch.alert:0
 #: view:lunch.order.line:0
 msgid "Search"
-msgstr ""
+msgstr "Procurar"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -586,6 +640,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Aqui você pode ver os pedidos de hoje agrupado por "
+"fornecedores.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Clique em <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> para avisar "
+"que o almoço foi pedido <br/>\n"
+"                - Clique em <img src=\"../../../web/static/src/img/icons/gtk-"
+"apply.png\"/> para avisar que o almoço chegou <br/>\n"
+"                - Clique em <img src=\"../../../web/static/src/img/icons/gtk-"
+"cancel.png\"/> para avisar que o pedido não está disponível\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -595,27 +663,27 @@ msgstr "Janeiro"
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Specific Day"
-msgstr ""
+msgstr "Dia Específico"
 
 #. module: lunch
 #: field:lunch.alert,wednesday:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Quarta-feira"
 
 #. module: lunch
 #: view:lunch.product.category:0
 msgid "Product Category: "
-msgstr ""
+msgstr "Categoria de Produto "
 
 #. module: lunch
 #: field:lunch.alert,active_to:0
 msgid "And"
-msgstr ""
+msgstr "E"
 
 #. module: lunch
 #: selection:lunch.order.line,state:0
 msgid "Ordered"
-msgstr ""
+msgstr "Pedido"
 
 #. module: lunch
 #: field:report.lunch.order.line,date:0
@@ -625,7 +693,7 @@ msgstr "Data do Pedido"
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel Orders"
-msgstr ""
+msgstr "Cancelar Pedidos"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_alert
@@ -648,21 +716,39 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um alerta de almoço. \n"
+"            </p>\n"
+"              <p>\n"
+"                Alertas são usados ​​para avisar funcionários sobre "
+"possíveis questões sobre os pedidos de almoço.\n"
+"                 Para criar um alerta do almoço, você tem que definir a sua "
+"recorrência, o intervalo de tempo durante o qual o alerta deve ser executado "
+"e a mensagem a ser exibida.\n"
+"            </p>\n"
+"            <p>\n"
+"                Exemplo: <br/>\n"
+"                - Recorrência: Diariamente<br/>\n"
+"                - Intervalo de Tempo: de 00:00 hs até 23:59 hs<br/>\n"
+"                - Mensagem: \"Você precisa pedir o almoço antes de 10:30 "
+"hs\"\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "A cancelled meal should not be paid by employees."
-msgstr ""
+msgstr "Uma refeição cancelada não deve ser paga pelos funcionários."
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cash
 msgid "Administrate Cash Moves"
-msgstr ""
+msgstr "Administrar Movimentos de Caixa"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cancel
 msgid "cancel lunch order"
-msgstr ""
+msgstr "cancelar pedido de almoço"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -689,12 +775,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um pagamento. \n"
+"            </p>\n"
+"              <p>\n"
+"                Aqui você pode ver os pagamentos dos funcionários. Um "
+"pagamento é um movimento de caixa do funcionário para a empresa.\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:186
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
 msgstr ""
+"Suas refeições favoritas serão criadas baseada em seus últimos pedidos."
 
 #. module: lunch
 #: model:ir.module.category,description:lunch.module_lunch_category
@@ -702,6 +797,9 @@ msgid ""
 "Helps you handle your lunch needs, if you are a manager you will be able to "
 "create new products, cashmoves and to confirm or cancel orders."
 msgstr ""
+"Ajuda a lidar com as suas necessidades de almoço, se você é um gerente que "
+"você vai ser capaz de criar novos produtos, movimentações de caixa e para "
+"confirmar ou cancelar encomendas."
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
@@ -718,22 +816,34 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um novo pagamento. \n"
+"            </p>\n"
+"              <p>\n"
+"                Um movimento de caixa pode ser tanto uma despesa ou um "
+"pagamento.<br/>\n"
+"                Uma despesa é criada automaticamente no recibo do "
+"pedido.<br/>\n"
+"                Um pagamento representa um reembolso do funcionário para a "
+"empresa.\n"
+"              </p>\n"
+"            "
 
 #. module: lunch
 #: field:lunch.alert,alter_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recorrência"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:189
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
-msgstr ""
+msgstr "Não se esqueça dos alertas mostrados na área avermelhada"
 
 #. module: lunch
 #: field:lunch.alert,thursday:0
 msgid "Thursday"
-msgstr ""
+msgstr "Quinta-feira"
 
 #. module: lunch
 #: report:lunch.order.line:0
@@ -767,34 +877,34 @@ msgstr "Preço"
 #. module: lunch
 #: field:lunch.cashmove,state:0
 msgid "Is an order or a Payment"
-msgstr ""
+msgstr "é um pedido ou um Pagamento"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_form
 msgid "New Order"
-msgstr ""
+msgstr "Novo Pedido"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "cashmove tree"
-msgstr ""
+msgstr "árvore de movimentação de caixa"
 
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel a meal means that we didn't receive it from the supplier."
-msgstr ""
+msgstr "Cancelar uma refeição significa que nós não recebemos do fornecedor."
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
 msgid "Employee Payments"
-msgstr ""
+msgstr "Pagamentos de Funcionários"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
 msgid "Payment"
-msgstr ""
+msgstr "Pagamento"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -809,12 +919,12 @@ msgstr "Ano"
 #. module: lunch
 #: view:lunch.order:0
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_admin
 msgid "Administrate Orders"
-msgstr ""
+msgstr "Administrar Pedidos"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -824,7 +934,7 @@ msgstr "Abril"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Select your order"
-msgstr ""
+msgstr "Escolha seu pedido"
 
 #. module: lunch
 #: field:lunch.cashmove,order_id:0
@@ -845,22 +955,22 @@ msgstr "Pedido de Almoço"
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Are you sure you want to order these meals?"
-msgstr ""
+msgstr "Você tem certeza de que deseja pedir estas refeições?"
 
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "cancel order lines"
-msgstr ""
+msgstr "cancelar linhas do pedido"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product_category
 msgid "lunch product category"
-msgstr ""
+msgstr "categoria de produto de almoço"
 
 #. module: lunch
 #: field:lunch.alert,saturday:0
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #. module: lunch
 #: model:res.groups,name:lunch.group_lunch_manager
@@ -870,17 +980,19 @@ msgstr "Gerente"
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Did your received these meals?"
-msgstr ""
+msgstr "Você recebeu essas refeições?"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Once a meal is received a new cash move is created for the employee."
 msgstr ""
+"Assim que a refeição é recebida, um movimento de caixa é criado para o "
+"funcionário."
 
 #. module: lunch
 #: view:lunch.product:0
 msgid "Products Tree"
-msgstr ""
+msgstr "Árvore de Produtos"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -888,12 +1000,12 @@ msgstr ""
 #: field:lunch.order,total:0
 #: view:lunch.order.line:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
 msgid "Previous Orders"
-msgstr ""
+msgstr "Pedidos Anteriores"
 
 #~ msgid "    7 Days    "
 #~ msgstr "    7 Dias    "
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index aa5dcd2e6cb..6fb0c12440c 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-05 09:23+0000\n"
-"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
+"PO-Revision-Date: 2012-12-25 14:27+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: mail
@@ -25,7 +25,7 @@ msgstr "Форма подписчиков"
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: mail
 #: field:mail.compose.message,author_id:0
@@ -46,7 +46,7 @@ msgstr "Получатели сообщения"
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Activated by default when subscribing."
-msgstr ""
+msgstr "Активируется по умолчанию при подписке."
 
 #. module: mail
 #: view:mail.message:0
@@ -83,7 +83,7 @@ msgstr "Написать письмо"
 #: code:addons/mail/static/src/xml/mail.xml:132
 #, python-format
 msgid "Add them into recipients and followers"
-msgstr ""
+msgstr "Добавить их к получателям и подписчикам"
 
 #. module: mail
 #: view:mail.group:0
@@ -125,12 +125,12 @@ msgstr "Мастер составления эл. почты"
 #: code:addons/mail/static/src/xml/mail_followers.xml:23
 #, python-format
 msgid "Add others"
-msgstr ""
+msgstr "Добавить других"
 
 #. module: mail
 #: field:mail.message.subtype,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Источник"
 
 #. module: mail
 #: field:mail.group,message_unread:0
@@ -203,7 +203,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:194
 #, python-format
 msgid "Uploading error"
-msgstr ""
+msgstr "Ошибка выгрузки"
 
 #. module: mail
 #: model:mail.group,name:mail.group_support
@@ -219,6 +219,10 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"Запрошенная операция не может быть завершена из-за ограничений по "
+"безопасности . Пожалуйста, обратитесь к вашему системному администратору.\n"
+"\n"
+"(Тип документа :%s, операция: %s)"
 
 #. module: mail
 #: view:mail.mail:0
@@ -243,7 +247,7 @@ msgstr "Открыть полноценный составитель письм
 #: code:addons/mail/static/src/xml/mail.xml:37
 #, python-format
 msgid "&ograve"
-msgstr ""
+msgstr "&ograve"
 
 #. module: mail
 #: field:base.config.settings,alias_domain:0
@@ -285,7 +289,7 @@ msgstr "отправка данных"
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "more."
-msgstr ""
+msgstr "больше."
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -400,6 +404,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: mail
 #: help:mail.alias,alias_model_id:0
@@ -412,7 +418,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
 msgid "Relation field"
-msgstr ""
+msgstr "Относящееся поле"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
@@ -429,7 +435,7 @@ msgstr "Партнёр"
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_my_stuff
 msgid "Organizer"
-msgstr ""
+msgstr "Организатор"
 
 #. module: mail
 #: field:mail.compose.message,subject:0
@@ -463,7 +469,7 @@ msgstr "Сообщение эл. почты"
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -550,7 +556,7 @@ msgstr "Комментарии и эл. почта"
 #. module: mail
 #: field:mail.alias,alias_defaults:0
 msgid "Default Values"
-msgstr ""
+msgstr "Значения по умолчанию"
 
 #. module: mail
 #: code:addons/mail/res_users.py:100
@@ -580,7 +586,7 @@ msgstr "Получатели"
 #: code:addons/mail/static/src/xml/mail.xml:127
 #, python-format
 msgid "<<<"
-msgstr ""
+msgstr "<<<"
 
 #. module: mail
 #. openerp-web
@@ -645,7 +651,7 @@ msgstr "НИОКР"
 #: code:addons/mail/static/src/xml/mail.xml:61
 #, python-format
 msgid "/web/binary/upload_attachment"
-msgstr ""
+msgstr "/web/binary/upload_attachment"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread
@@ -662,7 +668,7 @@ msgstr "Дополнительно"
 #: code:addons/mail/static/src/xml/mail.xml:226
 #, python-format
 msgid "Move to Inbox"
-msgstr ""
+msgstr "Переместить во входящие"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:165
@@ -690,7 +696,7 @@ msgstr ""
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
 msgid "Model of the followed resource"
-msgstr ""
+msgstr "Модель обсуждаемого ресурса"
 
 #. module: mail
 #. openerp-web
@@ -730,7 +736,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: mail
 #: view:mail.message:0
@@ -762,7 +768,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "Message subtypes"
-msgstr ""
+msgstr "Подтип сообщения"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -855,7 +861,7 @@ msgstr "или"
 #: help:mail.compose.message,vote_user_ids:0
 #: help:mail.message,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Пользователи, которые проголосовали за это сообщение"
 
 #. module: mail
 #: help:mail.group,alias_id:0
@@ -880,7 +886,7 @@ msgstr "Искать эл. почту"
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Связанные сообщения"
 
 #. module: mail
 #: field:mail.alias,alias_user_id:0
@@ -958,7 +964,7 @@ msgstr "Уведомление"
 #: code:addons/mail/static/src/js/mail.js:585
 #, python-format
 msgid "Please complete partner's informations"
-msgstr ""
+msgstr "Пожалуйста дополните информацию о партнере"
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -1071,7 +1077,7 @@ msgstr ""
 #. module: mail
 #: view:mail.mail:0
 msgid "by"
-msgstr ""
+msgstr "по"
 
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
@@ -1099,12 +1105,12 @@ msgstr "Пользователь"
 #. module: mail
 #: view:mail.group:0
 msgid "Groups"
-msgstr ""
+msgstr "Группы"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Messages Search"
-msgstr ""
+msgstr "Поиск сообщений"
 
 #. module: mail
 #: field:mail.compose.message,date:0
@@ -1117,7 +1123,7 @@ msgstr "Дата"
 #: code:addons/mail/static/src/xml/mail.xml:34
 #, python-format
 msgid "Post"
-msgstr ""
+msgstr "Послать"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1129,38 +1135,38 @@ msgstr "Расширенные фильтры..."
 #: code:addons/mail/static/src/xml/mail.xml:107
 #, python-format
 msgid "To:"
-msgstr ""
+msgstr "Кому:"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:175
 #, python-format
 msgid "Write to my followers"
-msgstr ""
+msgstr "Написать подписчикам"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Группы доступа"
 
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "По умолчанию"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:260
 #, python-format
 msgid "show more message"
-msgstr ""
+msgstr "показать больше сообщений"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:228
 #, python-format
 msgid "Mark as Todo"
-msgstr ""
+msgstr "Добавить в список задач"
 
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
@@ -1177,7 +1183,7 @@ msgstr "Мастер приглашений"
 #: field:mail.thread,message_summary:0
 #: field:res.partner,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Описание"
 
 #. module: mail
 #: help:mail.message.subtype,res_model:0
@@ -1191,7 +1197,7 @@ msgstr ""
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Подтип"
 
 #. module: mail
 #: view:mail.group:0
@@ -1203,27 +1209,27 @@ msgstr ""
 #: field:mail.message,starred:0
 #: field:mail.notification,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Отмеченные"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:262
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "больше сообщений"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:13
 #, python-format
 msgid "Following"
-msgstr ""
+msgstr "Подписан"
 
 #. module: mail
 #: sql_constraint:mail.alias:0
@@ -1245,7 +1251,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "And"
-msgstr ""
+msgstr "И"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
@@ -1289,7 +1295,7 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "Followers of"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: mail
 #: help:mail.mail,auto_delete:0
@@ -1299,36 +1305,36 @@ msgstr "Навсегда удалить это письмо после отпр
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "Группа обсуждения"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:224
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Сделано"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
-msgstr ""
+msgstr "Обсуждения"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:11
 #, python-format
 msgid "Follow"
-msgstr ""
+msgstr "Подписаться"
 
 #. module: mail
 #: field:mail.group,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: mail
 #: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
-msgstr ""
+msgstr "Вся компания"
 
 #. module: mail
 #. openerp-web
@@ -1336,12 +1342,12 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "and"
-msgstr ""
+msgstr "и"
 
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Текст с форматированием/HTML сообщение"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1353,17 +1359,17 @@ msgstr "Месяц создания"
 #: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "Compose new Message"
-msgstr ""
+msgstr "Написать новое сообщение"
 
 #. module: mail
 #: field:mail.group,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Связанное меню"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Content"
-msgstr ""
+msgstr "Содержание"
 
 #. module: mail
 #: field:mail.mail,email_to:0
@@ -1374,7 +1380,7 @@ msgstr "Кому"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Уведомленные партнеры"
 
 #. module: mail
 #: help:mail.group,public:0
@@ -1412,24 +1418,24 @@ msgstr "Уникальный идентификатор сообщения"
 #: field:mail.group,description:0
 #: field:mail.message.subtype,description:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr ""
+msgstr "Подписчики документа"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
 msgid "Remove this follower"
-msgstr ""
+msgstr "Удалить подписчика"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Never"
-msgstr ""
+msgstr "Никогда"
 
 #. module: mail
 #: field:mail.mail,mail_server_id:0
@@ -1440,7 +1446,7 @@ msgstr "Сервер исходящей почты"
 #: code:addons/mail/mail_message.py:920
 #, python-format
 msgid "Partners email addresses not found"
-msgstr ""
+msgstr "Эл. почта партнера не найдена"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1469,7 +1475,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_groups
 #: model:ir.ui.menu,name:mail.mail_allgroups
 msgid "Join a group"
-msgstr ""
+msgstr "Присоединиться к группе"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_group_feeds
@@ -1485,7 +1491,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:195
 #, python-format
 msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Пожалуйста, подождите , пока файл загружается."
 
 #. module: mail
 #: view:mail.group:0
@@ -1501,14 +1507,14 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:225
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Вернуть в список задач"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:113
 #, python-format
 msgid "this document"
-msgstr ""
+msgstr "этот документ"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
@@ -1542,13 +1548,13 @@ msgstr "Сообщения"
 #: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "others..."
-msgstr ""
+msgstr "остальные..."
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "To-do"
-msgstr ""
+msgstr "Задачи"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1556,12 +1562,12 @@ msgstr ""
 #: field:mail.group,alias_id:0
 #: field:res.users,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Псевдоним"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Исходящие письма"
 
 #. module: mail
 #: help:mail.compose.message,notification_ids:0
@@ -1575,18 +1581,18 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr ""
+msgstr "Модель"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Unread"
-msgstr ""
+msgstr "Непрочитанное"
 
 #. module: mail
 #: help:mail.followers,subtype_ids:0
@@ -1600,7 +1606,7 @@ msgstr ""
 #: help:mail.thread,message_ids:0
 #: help:res.partner,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: mail
 #: help:mail.mail,references:0
@@ -1610,7 +1616,7 @@ msgstr "Ссылки сообщения, такие как идентифика
 #. module: mail
 #: field:mail.compose.message,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Режим составления"
 
 #. module: mail
 #: field:mail.compose.message,model:0
@@ -1625,7 +1631,7 @@ msgstr "Модель связанного документа"
 #: code:addons/mail/static/src/xml/mail.xml:287
 #, python-format
 msgid "unlike"
-msgstr ""
+msgstr "не нравится"
 
 #. module: mail
 #: help:mail.compose.message,author_id:0
@@ -1649,12 +1655,12 @@ msgstr ""
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Ошибка во время связи с сервером гарантии издателя."
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Private"
-msgstr ""
+msgstr "Личное"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1678,13 +1684,13 @@ msgstr "Доставка не удалась"
 #. module: mail
 #: field:mail.compose.message,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Дополнительные контакты"
 
 #. module: mail
 #: help:mail.compose.message,parent_id:0
 #: help:mail.message,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Первое сообщение цепочки."
 
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
@@ -1694,7 +1700,7 @@ msgstr ""
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Emails only"
-msgstr ""
+msgstr "Только эл. почта"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_inbox_feeds
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 6fa15811de9..641b7234b33 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.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: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-24 00:09+0000\n"
+"PO-Revision-Date: 2012-12-24 09:51+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-24 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_repair
@@ -221,6 +221,12 @@ msgid ""
 "                   \n"
 "* The 'Cancelled' status is set automatically when user cancel repair order."
 msgstr ""
+" * A situação 'Provisório' é definida quando a ordem de reparo está em "
+"situação provisória.\n"
+"* A situação 'Confirmado' é quando a ordem de reparo for confirmada.\n"
+"* A situação 'Concluído' é definido quando a ordem de reparo está "
+"terminada.\n"
+"* A situação 'Cancelado' é quando o usuário cancela a ordem de reparo."
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
@@ -249,11 +255,14 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr "Info. Extra"
+msgstr "Informações Adicionais"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
@@ -262,12 +271,12 @@ msgstr "Info. Extra"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
-msgstr "Informação!"
+msgstr "Aviso!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "(update)"
-msgstr ""
+msgstr "(atualizar)"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -302,6 +311,17 @@ msgid ""
 "* The 'Done' status is set when repairing is completed.            \n"
 "* The 'Cancelled' status is used when user cancel repair order."
 msgstr ""
+" * A situação 'Provisório' é usada quando o usuário está preparando uma "
+"ordem de reparo nova ou não confirmada.\n"
+"* A situação 'Confirmada' é usada quando um usuário confirmar a ordem de "
+"reparos.\n"
+"* A situação 'Pronto para o Reparo' é usada para iniciar o reparo, o usuário "
+"somente poderá reparar após a confirmação.\n"
+"* A situação 'A ser faturado' é usada para gerar a fatura antes ou depois do "
+"reparo concluído.\n"
+"* A situação 'Concluído' é usada quando a ordem de serviço estiver pronta.\n"
+"* A situação 'Cancelada' é usada quando o usuário cancelar a ordem de "
+"reparos."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -313,6 +333,7 @@ msgstr "Ordens de Reparo"
 #, python-format
 msgid "Serial number is required for operation line with product '%s'"
 msgstr ""
+"O Número de série é obrigatório para a linha de operação com o produto '%s'"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -329,7 +350,7 @@ msgstr "Número do Lote"
 #. module: mrp_repair
 #: field:mrp.repair,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
@@ -444,7 +465,7 @@ msgstr "Sim"
 #: view:mrp.repair.cancel:0
 #: view:mrp.repair.make_invoice:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -458,7 +479,7 @@ msgstr "Faturado"
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida do Produto"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
@@ -478,7 +499,7 @@ msgstr "Adicionar"
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
@@ -513,16 +534,19 @@ msgid ""
 "invoice before or after the repair is done respectively. 'No invoice' means "
 "you don't want to generate invoice for this repair order."
 msgstr ""
+"Selecionando 'Antes do reparo' ou 'Após o reparo', irá permitir-lhe gerar a "
+"fatura antes ou após o reparo é feito, respectivamente. 'Não faturar' "
+"significa que você não quer gerar fatura para esta ordem de reparos."
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Warranty Expiration"
-msgstr ""
+msgstr "Término da Garantia"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "Pricelist of the selected partner."
-msgstr ""
+msgstr "Lista de preços do parceiro selecionado."
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -549,17 +573,17 @@ msgstr "Depois de ser Reparado"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID not Found"
-msgstr ""
+msgstr "ID Ativo não encontrado"
 
 #. module: mrp_repair
 #: field:mrp.repair,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr "Data:"
+msgstr "Data"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
@@ -584,7 +608,7 @@ msgstr "Cotação do Reparo"
 #. module: mrp_repair
 #: field:mrp.repair,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -596,7 +620,7 @@ msgstr "Finalizar Reparo"
 #: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr "Sem conta definida para o produtot \"%s\"."
+msgstr "Sem conta definida para o produto \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -614,14 +638,14 @@ msgstr "Quantidade"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Product Information"
-msgstr ""
+msgstr "Informação do Produto"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
 #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr "Faturar"
+msgstr "Gerar Fatura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -643,7 +667,7 @@ msgstr "Concluído"
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
 msgid "Invoice"
-msgstr "Nota Fiscal"
+msgstr "Fatura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -678,6 +702,9 @@ msgid ""
 "repaired and create a picking with selected product. Note that you can "
 "select the locations in the Info tab, if you have the extended view."
 msgstr ""
+"Marque esta caixa se você deseja gerenciar a entrega assim que o produto for "
+"reparado e criar uma separação com o produto selecionado. Note que você pode "
+"selecionar os locais na aba Info."
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -687,16 +714,20 @@ msgid ""
 "expiration limit, each operation and fee you will add will be set as 'not to "
 "invoiced' by default. Note that you can change manually afterwards."
 msgstr ""
+"O Prazo de Garantia é calculado como: data de último movimento + garantia "
+"definida no produto selecionado. Se a data atual é inferior ao prazo de "
+"garantia, cada operação e valor que você adicionar será definido como \"não "
+"faturado\" por padrão. Note que você pode alterar isso depois manualmente."
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr "Criar Fatura"
+msgstr "Gerar Fatura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Reair Orders"
-msgstr ""
+msgstr "Ordens de Reparo"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -735,7 +766,7 @@ msgstr "Entregar"
 #. module: mrp_repair
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr "Notas Internas"
+msgstr "Anotações Internas"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -745,13 +776,13 @@ msgstr "Impostos:"
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s)?"
-msgstr "Deseja Criar uma Fatura ?"
+msgstr "Deseja Criar uma Fatura?"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:349
 #, python-format
 msgid "Repair order is already invoiced."
-msgstr ""
+msgstr "A Ordem de Reparos já foi faturada."
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
@@ -767,7 +798,7 @@ msgstr "Valor sem impostos"
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr "Ref. da Ordem"
+msgstr "Ref. da Ordem de Reparos"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
@@ -793,7 +824,7 @@ msgstr "Endereço de Faturamento"
 #. module: mrp_repair
 #: help:mrp.repair,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index b72889a2533..5dab8bcfe57 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-06 13:03+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-24 09:52+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 06:04+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
@@ -32,6 +33,8 @@ msgid ""
 "You must configure the etherpad through the menu Settings > Companies > "
 "Companies, in the configuration tab of your company."
 msgstr ""
+"Você precisa configurar o etherpad através do menu Configurações > Empresas "
+"> Empresas, na aba de configuração da sua empresa"
 
 #. module: pad
 #: help:res.company,pad_key:0
diff --git a/addons/portal_sale/i18n/pt_BR.po b/addons/portal_sale/i18n/pt_BR.po
index ac58d3121ee..a89ce52247e 100644
--- a/addons/portal_sale/i18n/pt_BR.po
+++ b/addons/portal_sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-22 01:48+0000\n"
+"PO-Revision-Date: 2012-12-24 13:14+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-23 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal_sale
@@ -183,6 +183,107 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Olá ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Aqui está o seu ${object.state in ('draft', 'sent') and 'quotation' "
+"or 'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número do pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total do pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data do pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referência do pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Sua referência: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Você pode acessar este documento e pagar online através de nosso Portal "
+"do Cliente:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Se você tiver alguma dúvida, entre em contato conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Fone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
@@ -341,6 +442,103 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Olá ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Uma nova fatura está disponível para você: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número da fatura: <strong>${object.number}</strong><br "
+"/>\n"
+"       &nbsp;&nbsp;Total da fatura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data da fatura: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referência do pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Você pode acessar a fatura e efetuar o pagamento online ou através do "
+"nosso Portal de Clientes:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">Ver Fatura</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Se você tiver alguma dúvida, entre em contato conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Fone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_orders_portal
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 94ed20eb04c..67a812fae78 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-18 18:24+0000\n"
+"PO-Revision-Date: 2012-12-24 11:47+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
@@ -162,7 +162,7 @@ msgstr "Líneas no facturadas y entregadas"
 #. module: sale
 #: model:mail.message.subtype,description:sale.mt_order_confirmed
 msgid "Quotation confirmed"
-msgstr ""
+msgstr "Presupuesto confirmado"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -249,12 +249,12 @@ msgstr "El valor del importe avanzado debe ser positivo."
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sales order line."
-msgstr ""
+msgstr "Permite aplicar un descuento por línea de pedido de venta."
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr ""
+msgstr "Líneas de pedido de venta que están en estado 'Realizada'"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -406,6 +406,11 @@ msgid ""
 "                Use Some Order Lines to invoice a selection of the sales "
 "order lines."
 msgstr ""
+"Utilice 'Todas' para crear la factura final.\n"
+"Utilice 'Porcentaje' para facturar un porcentaje del importe total.\n"
+"Utilice 'Precio fijo' para facturar un importe específico como avance.\n"
+"Utilice 'Algunas líneas de pedido' para facturar una selección de las líneas "
+"de pedido de venta."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -487,7 +492,7 @@ msgstr "Fax :"
 #, python-format
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
-msgstr ""
+msgstr "¡Para eliminar un pedido de venta confirmado, debe cancelarlo antes!"
 
 #. module: sale
 #: view:sale.order:0
@@ -523,7 +528,7 @@ msgstr "Pedido de venta"
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sales order lines"
-msgstr ""
+msgstr "Activar facturación de las líneas de pedido de venta"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -538,7 +543,7 @@ msgstr "Importe avanzado"
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sales order has at least one invoice."
-msgstr ""
+msgstr "Indica que el pedido de venta tiene por lo menos una factura."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -558,7 +563,7 @@ msgstr "Un empleado puede tener diferentes roles por contrato"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoice the whole sales order"
-msgstr ""
+msgstr "Facturar el pedido de ventas completo"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -580,6 +585,7 @@ msgstr "Preparar facturas basadas en los partes de horas"
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
+"No se puede cancelar una línea de pedido de venta que ya se ha facturado."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -607,7 +613,7 @@ msgstr "Permite usar diferentes unidades de medida"
 #. module: sale
 #: model:mail.message.subtype,name:sale.mt_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "Pedido de venta confirmado"
 
 #. module: sale
 #: view:sale.order:0
@@ -656,7 +662,7 @@ msgstr "Precio total"
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sales orders."
-msgstr ""
+msgstr "Permite especificar una cuenta analítica en pedidos de venta."
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -736,7 +742,7 @@ msgstr "Año ordenado de los pedidos de venta"
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sales Orders"
-msgstr ""
+msgstr "Direcciones en los pedidos de venta"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -753,7 +759,7 @@ msgstr "Total :"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Líneas de pedidos de venta listas para facturar"
 
 #. module: sale
 #: view:sale.report:0
@@ -906,7 +912,7 @@ msgstr "Crear y ver factura"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales order lines done"
-msgstr ""
+msgstr "Líneas de pedidos de venta realizadas"
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
@@ -989,7 +995,7 @@ msgstr "Mes"
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Moneda"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1026,7 +1032,7 @@ msgstr "Nombre tienda"
 #. module: sale
 #: view:sale.order:0
 msgid "My Sales Orders"
-msgstr ""
+msgstr "Mis pedidos de venta"
 
 #. module: sale
 #: report:sale.order:0
@@ -1051,6 +1057,8 @@ msgid ""
 "To allow your salesman to make invoices for sales order lines using the menu "
 "'Lines to Invoice'."
 msgstr ""
+"Permitir a los comerciales realizar facturas de las líneas de los pedidos de "
+"venta usando el menú 'Líneas a facturar'."
 
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
@@ -1061,7 +1069,7 @@ msgstr "Abrir menú de ventas"
 #: code:addons/sale/sale.py:592
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
-msgstr ""
+msgstr "No puede confirmar un pedido de venta que no tiene ninguna línea."
 
 #. module: sale
 #: selection:sale.report,state:0
@@ -1077,7 +1085,7 @@ msgstr "¡No se ha definido un cliente!"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sales orders"
-msgstr ""
+msgstr "Lanzar órdenes de entrega automáticas desde los pedidos de venta"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1147,7 +1155,7 @@ msgstr "El importe de los impuestos."
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 msgid "Invoiced Ratio"
-msgstr ""
+msgstr "Proporción facturada"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1187,6 +1195,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir una nueva tienda.\n"
+"</p><p>\n"
+"Cada presupuesto o pedido de venta debe estar enlzadado con una tienda. La "
+"tienda define el almacén desde el que los productos serán entregados para "
+"cada venta en concreto.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1211,6 +1227,8 @@ msgid ""
 "Sales Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Líneas de los pedidos de venta que están confirmadas, realizadas o en "
+"excepción y que no han sido facturadas"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -1314,6 +1332,7 @@ msgstr "Enero"
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
 msgstr ""
+"Permite establecer un descuento en las líneas de los pedidos de venta"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_in_progress
@@ -1328,6 +1347,9 @@ msgid ""
 "                    or a fixed price (for advances) directly from the sales "
 "order form if you prefer."
 msgstr ""
+"Todos los elementos en estas líneas de pedido serán facturadas. Puede "
+"también facturar un porcentaje del pedido de venta o un precio fijo (para "
+"avances) directamente desde el formulario de pedido de ventas si lo prefiere."
 
 #. module: sale
 #: help:sale.config.settings,module_warning:0
@@ -1346,7 +1368,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "URL de Paypal"
 
 #. module: sale
 #: help:sale.order,project_id:0
@@ -1586,13 +1608,13 @@ msgstr "¡No hay tarifa! "
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order "
-msgstr ""
+msgstr "Pedido de venta "
 
 #. module: sale
 #: model:mail.message.subtype,description:sale.mt_order_sent
 #: model:mail.message.subtype,name:sale.mt_order_sent
 msgid "Quotation send"
-msgstr ""
+msgstr "Presupuesto enviado"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1647,7 +1669,7 @@ msgstr ""
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sales Order"
-msgstr ""
+msgstr "Facturar pedido de venta"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -1656,6 +1678,9 @@ msgid ""
 "invoice).                                              You have to choose  "
 "if you want your invoice based on ordered "
 msgstr ""
+"Este pedido de venta creará automáticamente la propuesta de factura (factura "
+"borrador). Tiene que escoger si quiere generar la factura basada en lo "
+"pedido "
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
@@ -1807,6 +1832,90 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hola ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Aquí está su ${object.state in ('draft', 'sent') and 'presupuesto' or "
+"'confirmación de pedido'} de ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Nº de pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Su referencia: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Pedido%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>También es posible pagar directamente con Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Si tiene alguna pregunta, no dude en contactar con nosotros.</p>\n"
+"    <p>Gracias por escoger a ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Teléfono:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1919,6 +2028,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un presupuesto, el primer paso de una nueva venta.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar eficientemente el flujo completo de ventas: "
+"desde el presupuesto al pedido de venta, la entrega, la facturación y el "
+"pago.\n"
+"</p><p>\n"
+"Las características sociales le ayudan a organizar discusiones en cada "
+"pedido de venta, y permite a sus clientes seguir la evolución del pedido de "
+"venta.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: view:res.partner:0
@@ -1986,6 +2107,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un presupuesto que puede ser convertido en un pedido de "
+"venta.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar eficientemente el flujo completo de ventas: "
+"presupuesto, pedido de venta, entrega, facturación y pago.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -2074,6 +2203,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un presupuesto o un pedido de venta para este cliente.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar eficientemente el flujo completo de ventas: "
+"presupuesto, pedido de venta, entrega, facturación y pago.\n"
+"</p><p>\n"
+"Las características sociales le ayudan a organizar discusiones en cada "
+"pedido de venta, y permite a su cliente seguir la evolución del pedido de "
+"venta.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: field:sale.order,message_summary:0
@@ -2121,7 +2261,7 @@ msgstr "Desde un pedido de venta"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sales order lines, not yet delivered"
-msgstr ""
+msgstr "Líneas de pedido confirmadas y aún sin entregar"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -2167,7 +2307,7 @@ msgstr "Pedidos preparados para ser facturados"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sales order lines"
-msgstr ""
+msgstr "Generar facturas basadas en las líneas de los pedidos de venta"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 56dbb2959a2..dc224ec14d9 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-13 01:43+0000\n"
-"Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 12:58+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
@@ -32,6 +33,9 @@ msgid ""
 "Shirts, for the same \"Linux T-Shirt\", you may have variants on  sizes or "
 "colors; S, M, L, XL, XXL."
 msgstr ""
+"Permite gerenciar diversas variantes por produto. Por exemplo, se você vende "
+"Camisetas, para a mesma 'Camiseta' você pode ter variantes como tamanho ou "
+"cores; P,M, G, GG"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -88,7 +92,7 @@ msgstr "Rastreabilidade Posterior"
 #: field:stock.picking.in,date_done:0
 #: field:stock.picking.out,date_done:0
 msgid "Date of Transfer"
-msgstr ""
+msgstr "Data da Transferência"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -256,7 +260,7 @@ msgstr "Ordens de Entrega Atribuídas"
 #: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context."
-msgstr ""
+msgstr "O ID Ativo não está definido no contexto."
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -270,7 +274,7 @@ msgstr "Não Aplicável"
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -300,7 +304,7 @@ msgstr "Sem Fat"
 #: view:stock.tracking:0
 #, python-format
 msgid "Downstream Traceability"
-msgstr "Rastreabilidade de Abastecimento"
+msgstr "Rastreabilidade anterior"
 
 #. module: stock
 #: view:stock.move:0
@@ -329,13 +333,13 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
-"Se estiver assinalada, todas as quantidades de produtos serão fixados em "
-"zero para ajudar a garantir um inventário físico real"
+"Se estiver marcada, todas as quantidades de produtos serão fixados em zero "
+"para ajudar a garantir um inventário físico real"
 
 #. module: stock
 #: view:product.product:0
 msgid "Forecasted:"
-msgstr ""
+msgstr "Prevista:"
 
 #. module: stock
 #: view:stock.partial.move:0
@@ -350,6 +354,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: stock
 #: code:addons/stock/stock.py:768
@@ -382,7 +389,7 @@ msgstr "Agrupar por Parceiro"
 #: help:stock.picking.in,move_type:0
 #: help:stock.picking.out,move_type:0
 msgid "It specifies goods to be deliver partially or all at once"
-msgstr ""
+msgstr "Especifica mercadorias para entregar parcialmente ou tudo de uma vez"
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -400,7 +407,7 @@ msgstr "Parceiro"
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
 msgid "Allow claim on deliveries"
-msgstr ""
+msgstr "Permite solicitações nas entregas"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -416,12 +423,12 @@ msgstr "Movimentação de Estoque que foram processadas"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Serial Numbers"
-msgstr ""
+msgstr "Números de Série existentes"
 
 #. module: stock
 #: model:res.groups,name:stock.group_inventory_valuation
 msgid "Manage Inventory valuation"
-msgstr ""
+msgstr "Gerenciar Valorização do Estoque"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
@@ -452,7 +459,7 @@ msgstr "Localização Interna"
 #. module: stock
 #: view:stock.move:0
 msgid "Split in Serial Number"
-msgstr ""
+msgstr "Dividir em Números de Série"
 
 #. module: stock
 #: view:stock.location:0
@@ -472,7 +479,7 @@ msgstr "Atraso (Dias)"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Ready to Deliver"
-msgstr ""
+msgstr "Pronto para Entregar"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
@@ -510,7 +517,7 @@ msgstr "Qtde Ent"
 #. module: stock
 #: model:ir.actions.client,name:stock.action_client_warehouse_menu
 msgid "Open Warehouse Menu"
-msgstr ""
+msgstr "Abrir o Menu do Armazém"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
@@ -526,7 +533,7 @@ msgstr "Dividido em"
 #. module: stock
 #: field:stock.config.settings,module_product_expiry:0
 msgid "Expiry date on serial numbers"
-msgstr ""
+msgstr "Data de Expiração nos Números de Série"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -536,7 +543,7 @@ msgstr "Moeda para preço médio"
 #. module: stock
 #: view:product.product:0
 msgid "Stock and Expected Variations"
-msgstr ""
+msgstr "Estoque e Variações esperadas"
 
 #. module: stock
 #: help:product.category,property_stock_valuation_account_id:0
@@ -550,7 +557,7 @@ msgstr ""
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
 msgid "Track serial number on logistic units (pallets)"
-msgstr ""
+msgstr "Rastrear números de série em unidades logísticas (pallets)"
 
 #. module: stock
 #: help:product.template,sale_delay:0
@@ -559,6 +566,8 @@ msgid ""
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
 msgstr ""
+"O prazo médio em dias entre a confirmação da ordem do cliente e a entrega "
+"dos produtos acabados. É o tempo que você promete a seus clientes."
 
 #. module: stock
 #: code:addons/stock/product.py:196
@@ -584,6 +593,9 @@ msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
 "stock moves that have already been processed (except by the Administrator)."
 msgstr ""
+"Quantidades, unidades de medida, produtos e locais não podem ser modificados "
+"em movimentos de estoque que já foram processados ​​(exceto pelo "
+"Administrador)."
 
 #. module: stock
 #: help:report.stock.move,type:0
@@ -607,6 +619,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma solicitação de movimentação interna. \n"
+"              </p><p>\n"
+"A maioria das operações são preparadas automaticamente pelo OpenERP de "
+"acordo\n"
+"                 com as regras pré-configuradas de logística, mas você "
+"também pode gravar\n"
+"                 movimentos de estoque manuais.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -617,7 +639,7 @@ msgstr "Etiquetas de Itens"
 #: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
-msgstr ""
+msgstr "Back order <em>%s</em> foi <b>criada</b>."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -629,11 +651,13 @@ msgstr "Estatísticas de Movimentação"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Permite a você escolher e manter diferentes unidades de medidas para os "
+"produtos."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by logistic serial number"
-msgstr ""
+msgstr "Relatório do Estoque por número de série logístico"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
@@ -641,11 +665,13 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Forçar a especificação do número de série para todos os movimentos que "
+"contenham este produto e vão para um local do Cliente"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Receive/Deliver Products"
-msgstr ""
+msgstr "Receber/Entregar Produtos"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -688,6 +714,8 @@ msgstr ""
 msgid ""
 "Serial number quantity %d of %s is larger than available quantity (%d)!"
 msgstr ""
+"A quantidade do Número de Série %d de %s é maior do que a quantidade "
+"disponível (%d)!"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -697,7 +725,7 @@ msgstr "Pedido (Origem)"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Categorias de Unidade de Medida"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -742,7 +770,7 @@ msgstr "Referência Adicional"
 #. module: stock
 #: view:stock.partial.picking.line:0
 msgid "Stock Picking Line"
-msgstr ""
+msgstr "Linha de Separação de Estoque"
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -782,7 +810,7 @@ msgstr "Ano Planejado"
 #: report:stock.picking.list:0
 #: field:stock.picking.out,state:0
 msgid "Status"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -806,12 +834,12 @@ msgstr "Embalagens"
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
-msgstr ""
+msgstr "Analise o Inventário Atual"
 
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
-msgstr "A Ser Feito"
+msgstr "A Fazer"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -825,6 +853,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Força a especificação de um Número de Série para todos os movimentos que "
+"contém este produto e vai para um local de Fornecedor."
 
 #. module: stock
 #: help:stock.config.settings,group_uos:0
@@ -834,11 +864,15 @@ msgid ""
 "                For instance, you can sell pieces of meat that you invoice "
 "based on their weight."
 msgstr ""
+"Permite a você vender unidades de um produto, mas faturar com base em outra "
+"unidade de medida.\n"
+"                 Por exemplo, você pode vender pedaços de carne que você "
+"fatura com base em seu peso."
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Localização da Aquisição"
+msgstr "Local da Aquisição"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -873,18 +907,20 @@ msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
 "(id: %d)"
 msgstr ""
+"Por favor defina a conta de saída de estoque para este produto ou categoria: "
+"\"%s\" (id: %d)"
 
 #. module: stock
 #: field:stock.picking,message_summary:0
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: stock
 #: view:product.category:0
 msgid "Account Stock Properties"
-msgstr ""
+msgstr "Propriedades da Conta de Estoque"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
@@ -898,7 +934,7 @@ msgstr "A referência deve ser única por empresa!"
 #: field:stock.picking.in,date:0
 #: field:stock.picking.out,date:0
 msgid "Time"
-msgstr ""
+msgstr "Tempo"
 
 #. module: stock
 #: code:addons/stock/product.py:447
@@ -914,7 +950,7 @@ msgstr "Urgente"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Delivered"
-msgstr ""
+msgstr "Entregue"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -936,7 +972,7 @@ msgstr "Produtos Sucata"
 #. module: stock
 #: view:product.product:0
 msgid "- update"
-msgstr ""
+msgstr "- atualizar"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -955,6 +991,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "production lot has to be shown on the moves or not."
 msgstr ""
+"Este campo é para uso interno. Ele é usado para decidir se a coluna lote de "
+"produção será mostrada nos movimentos ou não."
 
 #. module: stock
 #: selection:product.product,valuation:0
@@ -974,7 +1012,7 @@ msgstr "Fornecedores de TI"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Location & Warehouse"
-msgstr ""
+msgstr "Local & Armazém"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -989,11 +1027,13 @@ msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
 "cancel the picking lines."
 msgstr ""
+"Você não pode cancelar a separação já que alguns movimentos já foram feitos. "
+"Você deve cancelar as linhas de separação."
 
 #. module: stock
 #: field:stock.config.settings,decimal_precision:0
 msgid "Decimal precision on weight"
-msgstr ""
+msgstr "Precisão decimal no peso"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1033,23 +1073,23 @@ msgstr "Localização do Inventário"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Você precisa definir um número de série para este produto."
 
 #. module: stock
 #: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Por favor defina o diário, na categoria do produto: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Ready to Transfer"
-msgstr ""
+msgstr "Pronto para ser Transferido"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1089,7 +1129,7 @@ msgstr "Diário"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
-msgstr ""
+msgstr "Criar Faturas Provisórias"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -1100,14 +1140,14 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"Mantenha vazio se você produzir no local onde são necessários produtos "
-"acabados. Defina um local se você produz em um local fixo. Isto pode ser um "
-"local de parceiro se você tem operações de subcontratação."
+"Mantenha vazio se você produzir no local onde os produtos acabados são "
+"necessários. Defina um local se você produz em um local fixo. Isto pode ser "
+"um local de parceiro se você tem operações de subcontratação."
 
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Ready to Receive"
-msgstr ""
+msgstr "Pronto para receber"
 
 #. module: stock
 #: view:stock.move:0
@@ -1133,22 +1173,23 @@ msgstr "Estoque por Local"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 msgid "Receive/Deliver By Orders"
-msgstr ""
+msgstr "Recebimento/Entrega por Ordens"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots"
-msgstr ""
+msgstr "Lotes do Produto"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Reverse Transfer"
-msgstr ""
+msgstr "Transferência Reversa"
 
 #. module: stock
 #: field:stock.config.settings,group_uos:0
 msgid "Invoice products in a different unit of measure than the sales order"
 msgstr ""
+"Faturar produtos em uma unidade de medida diferente do que o pedido de vendas"
 
 #. module: stock
 #: help:stock.location,active:0
@@ -1171,12 +1212,14 @@ msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
 "can be returned)!"
 msgstr ""
+"Nenhum produto a retornar (somente linhas Concluídas e que não foram "
+"integralmente devolvidas podem ser retornadas)!"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Back Orders"
-msgstr "Devoluções"
+msgstr "Back Orders"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1202,12 +1245,12 @@ msgstr "Conta de Valorização do Estoque"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: stock
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Linha"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1218,7 +1261,7 @@ msgstr "Local de Produção"
 #: code:addons/stock/product.py:121
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)."
-msgstr ""
+msgstr "Por favor defina o diário na categoria de produto: \"%s\" (id: %d)."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -1293,16 +1336,18 @@ msgstr "Autor"
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
 msgstr ""
+"Você está movimentando  %.2f %s mas só existe  %.2f %s disponível para este "
+"número de série."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Internal Shipment :"
-msgstr ""
+msgstr "Entrega Interna:"
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Split Inventory Line"
-msgstr ""
+msgstr "Dividir linha do inventário"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1313,7 +1358,7 @@ msgstr "Operação Manual"
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Shipment"
-msgstr ""
+msgstr "Remessa"
 
 #. module: stock
 #: view:stock.location:0
@@ -1336,7 +1381,7 @@ msgstr ""
 #: code:addons/stock/product.py:113
 #, python-format
 msgid "Please specify company in Location."
-msgstr ""
+msgstr "Por favor especifique a empresa em Local."
 
 #. module: stock
 #: view:stock.move:0
@@ -1349,6 +1394,8 @@ msgid ""
 "Allows you to create and manage your packaging dimensions and types you want "
 "to be maintained in your system."
 msgstr ""
+"Permite criar e gerenciar dimensões e tipos de embalagens que você quer ser "
+"manter em seu sistema."
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1373,7 +1420,7 @@ msgstr "Inventário Físico"
 #: code:addons/stock/wizard/stock_move.py:214
 #, python-format
 msgid "Processing Error!"
-msgstr ""
+msgstr "Erro de Processamento!"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1396,6 +1443,14 @@ msgid ""
 "* Available: When products are reserved, it is set to 'Available'.\n"
 "* Done: When the shipment is processed, the state is 'Done'."
 msgstr ""
+"* Novo: Quando o movimento do estoque é criado e ainda não confirmado.\n"
+"* Esperando um outro movimento: Este estado pode ser visto quando um "
+"movimento está à espera de um outro, por exemplo, em um fluxo encadeado.\n"
+"* Esperando Disponibilidade: Este estado é atingido quando a resolução de "
+"aquisição não é direta. Existe um passo adicional não concluído ...\n"
+"* Disponível: Quando os produtos são reservados, ela é definida como "
+"\"Disponível\".\n"
+"* Concluído: Quando a transferência é processada, o estado é \"Concluído\"."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
@@ -1405,7 +1460,7 @@ msgstr "Local dos Parceiros"
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Received"
-msgstr ""
+msgstr "Recebido"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1418,7 +1473,7 @@ msgstr "Quantidade total"
 #: field:stock.picking.in,min_date:0
 #: field:stock.picking.out,min_date:0
 msgid "Scheduled Time"
-msgstr ""
+msgstr "Hora agendada"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
@@ -1429,7 +1484,7 @@ msgstr "Movimento de Consumo"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Ordem de Entrega"
 
 #. module: stock
 #: help:stock.location,chained_delay:0
@@ -1452,6 +1507,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um novo diário. \n"
+"              </p><p>\n"
+"O diário do estoque permite atribuir a cada unidade\n"
+"                 operação um diário específico de acordo com o tipo de\n"
+"                 operação executada ou o funcionário / equipe que deve "
+"realizar o\n"
+"                 operação. Exemplos de diários de ações podem ser: controle "
+"de qualidade,\n"
+"                 listas de seleção, embalagem, etc\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1492,7 +1559,7 @@ msgstr "Aguardando Outra Movimentação"
 #: help:stock.change.product.qty,new_quantity:0
 msgid ""
 "This quantity is expressed in the Default Unit of Measure of the product."
-msgstr ""
+msgstr "Esta quantidade é expressa na Unidade de Medida padrão do produto."
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1507,7 +1574,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
-msgstr ""
+msgstr "Aviso: Nenhuma Back Order"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1536,11 +1603,12 @@ msgstr "Você só pode apagar movimentação provisórias"
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
+"Você não pode mover um produto %s para um local %s do tipo Visualização."
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Split in serial numbers"
-msgstr ""
+msgstr "Dividir em Números de Série"
 
 #. module: stock
 #: view:stock.move:0
@@ -1561,7 +1629,7 @@ msgstr "Provisório"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Prazo de Entrega ao Cliente"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1572,7 +1640,7 @@ msgstr "Informação Adicional"
 #: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
-msgstr ""
+msgstr "Está faltando dados da separação parcial para o movimento #%s."
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1732,6 +1800,18 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Prezado Senhor / Senhora,\n"
+"\n"
+"Nossos registros indicam que alguns pagamentos em sua conta estão em aberto. "
+"Por favor, veja os detalhes abaixo.\n"
+"Se o valor já tiver sido pago, por favor desconsidere este aviso. Caso "
+"contrário, regularize os pagamentos o mais breve possível.\n"
+"Se você tiver alguma dúvida sobre seus pagamentos, por favor, entre em "
+"contato conosco.\n"
+"\n"
+"Obrigado antecipadamente pela sua colaboração.\n"
+"\n"
+"Atenciosamente,"
 
 #. module: stock
 #: help:stock.incoterms,active:0
@@ -1763,6 +1843,8 @@ msgstr "Local Pai"
 #, python-format
 msgid "Please define stock output account for this product: \"%s\" (id: %d)."
 msgstr ""
+"Por favor defina a conta de saída de estoque para o produto:  \"%s\" (id: "
+"%d)."
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1778,7 +1860,7 @@ msgstr "Prazo de Encadeamento"
 #. module: stock
 #: field:stock.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr ""
+msgstr "Gerencia as diferentes unidades de medidas para produtos"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
@@ -1789,18 +1871,18 @@ msgstr "Faturar Estoque no Envio"
 #: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
-msgstr ""
+msgstr "Por favor forneça um valor positivo para sucatear."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Your Company, Birmingham shop"
-msgstr ""
+msgstr "Sua Empresa"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Location"
-msgstr ""
+msgstr "Local de armazenamento"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
@@ -1813,7 +1895,7 @@ msgstr "Moeda do preço unitário de custo"
 #: selection:stock.picking.in,move_type:0
 #: selection:stock.picking.out,move_type:0
 msgid "Partial"
-msgstr ""
+msgstr "Parcial"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1824,7 +1906,7 @@ msgstr "Setembro"
 #. module: stock
 #: view:product.product:0
 msgid "days"
-msgstr ""
+msgstr "dias"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1841,18 +1923,18 @@ msgstr "Mês Planejado"
 #: help:stock.picking.in,origin:0
 #: help:stock.picking.out,origin:0
 msgid "Reference of the document"
-msgstr ""
+msgstr "Referência do documento"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Is a Back Order"
-msgstr "É uma Devolução"
+msgstr "É uma Back Order"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Incoming Shipment :"
-msgstr ""
+msgstr "Recebimentos:"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
@@ -1862,7 +1944,7 @@ msgstr "Conta de Valorização do Estoque (Saindo)"
 #. module: stock
 #: view:stock.return.picking.memory:0
 msgid "Return Picking Memory"
-msgstr ""
+msgstr "Retornar Memória da Separação"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -1871,7 +1953,7 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.production.lot:0
 msgid "Stock Moves"
-msgstr "Movimentos de Estoque"
+msgstr "Movimentação de Estoque"
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -1880,6 +1962,8 @@ msgid ""
 "Check this option to select existing serial numbers in the list below, "
 "otherwise you should enter new ones line by line."
 msgstr ""
+"Marque esta opção para seleccionar os números de série existentes na lista "
+"abaixo, caso contrário, você deve digitar os novos linha por linha."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1905,7 +1989,7 @@ msgstr "Cancelar Disponibilidade"
 #: code:addons/stock/wizard/stock_location_product.py:49
 #, python-format
 msgid "Current Inventory"
-msgstr ""
+msgstr "Inventário Atual"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1913,6 +1997,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by manufacturing orders."
 msgstr ""
+"Esta localização de estoque será usada, em vez do padrão, como o local de "
+"origem dos movimentos de estoque gerados por ordens de fabricação."
 
 #. module: stock
 #: help:stock.move,date_expected:0
@@ -1938,7 +2024,7 @@ msgstr "Box 2"
 #: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
-msgstr ""
+msgstr "Você não pode remover uma linha de lote."
 
 #. module: stock
 #: help:stock.location,posx:0
@@ -1967,7 +2053,7 @@ msgstr "Quantidade Entregue"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Transfer Products"
-msgstr ""
+msgstr "Transferir Produtos"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1975,6 +2061,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated when you do an inventory."
 msgstr ""
+"Esta localização de estoque será usada, em vez do padrão, como o local de "
+"origem dos movimentos de estoque geradas quando você faz um inventário."
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2015,6 +2103,24 @@ msgid ""
 "\n"
 "            * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"\n"
+"            * Provisória: não confirmado ainda e não vai ser agendada até "
+"confirmado\n"
+"\n"
+"             * Esperando uma outra operação: à espera de um outro movimento "
+"finalizar antes que se torne automaticamente disponível (por exemplo, Fluxos "
+"Fazer a Pedido)\n"
+"\n"
+"             * Aguardando Disponibilidade: ainda à espera da disponibilidade "
+"de produtos\n"
+"\n"
+"             * Pronto para transferir: produtos reservados, simplesmente à "
+"espera de confirmação.\n"
+"\n"
+"             * Transferidos: foi processado, não pode mais ser modificado ou "
+"anulado.\n"
+"\n"
+"             * Cancelado: foi cancelada, não pode ser mais confirmada."
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2034,7 +2140,7 @@ msgstr "Data"
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2051,7 +2157,7 @@ msgstr "Localizacão do Estoque"
 #: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
-msgstr ""
+msgstr "_(D)Entregar"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2079,6 +2185,22 @@ msgid ""
 "\n"
 "                 * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* Provisória: não confirmado ainda e não vai ser agendada até confirmado\n"
+"\n"
+"             * Esperando uma outra operação: à espera de um outro movimento "
+"finalizar antes que se torne automaticamente disponível (por exemplo, Fluxos "
+"Fazer a Pedido)\n"
+"\n"
+"             * Aguardando Disponibilidade: ainda à espera da disponibilidade "
+"de produtos\n"
+"\n"
+"             * Pronto para transferir: produtos reservados, simplesmente à "
+"espera de confirmação.\n"
+"\n"
+"             * Transferidos: foi processado, não pode mais ser modificado ou "
+"anulado.\n"
+"\n"
+"             * Cancelado: foi cancelada, não pode ser mais confirmada."
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -2094,7 +2216,7 @@ msgstr "Números de Lote"
 #: model:ir.actions.act_window,name:stock.action_deliver_move
 #: view:product.product:0
 msgid "Deliveries"
-msgstr ""
+msgstr "Entregas"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2115,6 +2237,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar a recepção de um produto. \n"
+"              </p><p>\n"
+"Aqui você pode receber os produtos individuais, não importa qual\n"
+"                 ordem de compra ou ordem de separação eles vêm. Você vai "
+"encontrar\n"
+"                 a lista de todos os produtos que você está esperando. "
+"Depois de receber\n"
+"                 uma ordem, você pode filtrar com base no nome do fornecedor "
+"ou\n"
+"                 da referência da ordem de compra. Depois, você pode "
+"confirmar todos os produtos\n"
+"                 que recebeu usando os botões do lado direito de cada "
+"linha.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -2145,7 +2283,7 @@ msgstr "Retornar Separação"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_in
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_out
 msgid "Return Shipment"
-msgstr ""
+msgstr "Retornar Expedição"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -2199,7 +2337,7 @@ msgstr ""
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of Serial Number and internal reference must be unique !"
-msgstr ""
+msgstr "A combinação do número de série e referência interna deve ser única!"
 
 #. module: stock
 #: field:stock.warehouse,partner_id:0
@@ -2222,6 +2360,7 @@ msgstr ""
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
 msgstr ""
+"Você está tentando associar um lote que não pertence ao mesmo produto."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -2236,7 +2375,7 @@ msgstr "Preço"
 #. module: stock
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
-msgstr ""
+msgstr "Criar e abrir a fatura quando o usuário finalizar a ordem de entrega"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2246,7 +2385,7 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr ""
+msgstr "Gerar lançamentos contábeis por movimentação de estoque"
 
 #. module: stock
 #: code:addons/stock/product.py:449
@@ -2274,6 +2413,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Força a especificação de um número de série para toda movimentação contendo "
+"este produto e gerada por uma Ordem de Produção"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2290,7 +2431,7 @@ msgstr "Nome"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Supplier Address :"
-msgstr ""
+msgstr "Endereço do Fornecedor:"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -2322,24 +2463,24 @@ msgstr "Local do Cliente"
 #: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Erro de Usuário!"
 
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Stock partial Picking"
-msgstr ""
+msgstr "Separação Parcial do Estoque"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice/Refund"
-msgstr ""
+msgstr "Criar Fatura/Reembolso"
 
 #. module: stock
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2367,7 +2508,7 @@ msgstr "Localizacão dos Fornecedores"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Products Inventory"
-msgstr ""
+msgstr "Ver Inventário do Produto"
 
 #. module: stock
 #: view:stock.move:0
@@ -2378,7 +2519,7 @@ msgstr "Criação"
 #: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
-msgstr ""
+msgstr "Operação Proibida!"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2408,7 +2549,7 @@ msgstr "Tipo de transporte especificar, mercadorias entrando ou saindo"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidade"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
@@ -2453,6 +2594,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um movimento de estoque.\n"
+"              </p><p>\n"
+"Este menu fornece total rastreabilidade de operações de estoque\n"
+"em um produto específico. Você pode filtrar o produto\n"
+"                 para ver todos os movimentos do passado ou do futuro para o "
+"produto.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.location:0
@@ -2479,19 +2629,19 @@ msgstr "Unidade de Medida"
 #. module: stock
 #: field:stock.config.settings,group_stock_multiple_locations:0
 msgid "Manage multiple locations and warehouses"
-msgstr ""
+msgstr "Gerenciar múltiplos locais e armazéns"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_production_lot:0
 msgid "Track serial number on products"
-msgstr ""
+msgstr "Rastrear número de série em produtos"
 
 #. module: stock
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -2499,6 +2649,8 @@ msgid ""
 "Current quantity of products with this Serial Number available in company "
 "warehouses"
 msgstr ""
+"Quantidade de produtos atualmente disponível com este Número de Série nos "
+"armazéns da empresa"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2520,7 +2672,7 @@ msgstr "Lotes"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr ""
+msgstr "_Transferir"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2546,7 +2698,7 @@ msgstr "Localizações Internas"
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr "Placa de armazém"
+msgstr "Quadro do Armazém"
 
 #. module: stock
 #: code:addons/stock/product.py:469
@@ -2557,7 +2709,7 @@ msgstr "Qtde Futura"
 #. module: stock
 #: model:res.groups,name:stock.group_production_lot
 msgid "Manage Serial Numbers"
-msgstr ""
+msgstr "Gerenciar Números de Série"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2570,7 +2722,7 @@ msgstr "Observações"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Transferred"
-msgstr ""
+msgstr "Transferido"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2591,7 +2743,7 @@ msgstr "Tipo de Envio"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Partially"
-msgstr ""
+msgstr "Processar Parcialmente"
 
 #. module: stock
 #: view:stock.move:0
@@ -2618,6 +2770,8 @@ msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
 "account on category of this product are same."
 msgstr ""
+"Não é possível criar uma Entrada de Diário, a Conta de Saida e Conta de "
+"Avaliação na categoria deste produto são as mesmas."
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2658,6 +2812,8 @@ msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
 "(id: %d)"
 msgstr ""
+"Por favor defina a conta de entrada de estoque para este produto ou "
+"categoria: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2680,7 +2836,7 @@ msgstr "Qtd P&L"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_config_settings
 msgid "stock.config.settings"
-msgstr ""
+msgstr "stock.config.settings"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2707,7 +2863,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Big Suppliers"
-msgstr ""
+msgstr "Grandes Fornecedores"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2738,7 +2894,7 @@ msgstr "Criar"
 #. module: stock
 #: field:stock.change.product.qty,new_quantity:0
 msgid "New Quantity on Hand"
-msgstr ""
+msgstr "Nova Quantidade na Mão"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2788,7 +2944,7 @@ msgstr "Cancelar Inventário"
 #. module: stock
 #: field:stock.config.settings,group_product_variant:0
 msgid "Support multiple variants per products  "
-msgstr ""
+msgstr "Suporte a múltiplas variantes por produtos  "
 
 #. module: stock
 #: code:addons/stock/stock.py:2246
@@ -2797,6 +2953,8 @@ msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
 "account on category of this product are same."
 msgstr ""
+"Não é possível criar uma entrada de diário, a Conta de entrada e Conta de "
+"Avaliação da categoria deste produto são as mesmas."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
@@ -2812,7 +2970,7 @@ msgstr "Localização Fixa"
 #. module: stock
 #: field:report.stock.inventory,scrap_location:0
 msgid "scrap"
-msgstr ""
+msgstr "sucata"
 
 #. module: stock
 #: code:addons/stock/stock.py:1891
@@ -2821,21 +2979,23 @@ msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a Back Order."
 msgstr ""
+"Alterando a quantidade aqui, você aceita que a nova quantidade está "
+"completa: O OpenERP não irá gerar uma Back Order automaticamente."
 
 #. module: stock
 #: report:stock.inventory.move:0
 msgid "Manual Quantity"
-msgstr ""
+msgstr "Quantidade Manual"
 
 #. module: stock
 #: view:product.product:0
 msgid "On hand:"
-msgstr ""
+msgstr "Na mão"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by serial number"
-msgstr ""
+msgstr "Relatório de Estoque por número de série"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2865,7 +3025,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Please create Invoices."
-msgstr ""
+msgstr "Por favor gere as faturas."
 
 #. module: stock
 #: help:stock.config.settings,module_product_expiry:0
@@ -2878,12 +3038,19 @@ msgid ""
 "    - alert date.\n"
 "This installs the module product_expiry."
 msgstr ""
+"Controlar diferentes datas em produtos e números de serie.\n"
+"As seguintes datas podem ser monitorados:\n"
+"     - Fim da vida\n"
+"     - Melhor antes de data\n"
+"     - Data de remoção\n"
+"     - Data de alerta.\n"
+"Isso instala o módulo product_expiry."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
-msgstr ""
+msgstr "Por favor informe a Quantidade apropriada"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2906,7 +3073,7 @@ msgstr "Diário de Estoque"
 #: code:addons/stock/wizard/stock_return_picking.py:171
 #, python-format
 msgid "%s-%s-return"
-msgstr ""
+msgstr "%s-%s - retorno"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:82
@@ -2923,7 +3090,7 @@ msgstr "Forçar Disponibilidade"
 #. module: stock
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Rack"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap
@@ -2934,7 +3101,7 @@ msgstr "Movimentação de Sucata"
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Serial number is used to put a serial number on the production"
-msgstr ""
+msgstr "Número de série usado para colocar um número de série na produção"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:100
@@ -2981,6 +3148,7 @@ msgstr "Data de Conclusão"
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
+"Você não pode movimentar um produto %s de um local %s do tipo visualização."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -3034,6 +3202,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um local.\n"
+"              </p><p>\n"
+"                 Esta é a estrutura de armazéns da sua empresa e\n"
+"                 locais. Você pode clicar em um local para obter a lista de\n"
+"                 produtos e nível de estoque neste determinado local e\n"
+"                 todos os seus filhos.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -3043,7 +3220,7 @@ msgstr "Estoque Real"
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Logistic Serial Number"
-msgstr ""
+msgstr "Número de Série da Logística"
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -3064,11 +3241,13 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)."
 msgstr ""
+"A quantidade total após a divisão excede a quantidade a dividir para este "
+"produto: \"%s\" (id: %d)."
 
 #. module: stock
 #: view:stock.partial.move.line:0
 msgid "Stock Partial Move Line"
-msgstr ""
+msgstr "Linha de Movimentação Parcial do Estoque"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -3091,12 +3270,14 @@ msgid ""
 "When you select a serial number on product moves, you can get the upstream "
 "or downstream traceability of that product."
 msgstr ""
+"Quando você seleciona um número de série na movimentação do produto, você "
+"obtém a rastreabilidade anterior ou posterior do produto."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
-msgstr ""
+msgstr "_Receber"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -3167,6 +3348,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar uma recepção para este produto. \n"
+"              </p><p>\n"
+"                 Aqui você vai encontrar ao histórico de todas as recepções "
+"relacionadas com\n"
+"                 este produto, bem como todas as recepções futuras está à "
+"espera\n"
+"                 de seus fornecedores.\n"
+"\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -3182,6 +3374,8 @@ msgstr ""
 msgid ""
 "Allows to configure inventory valuations on products and product categories."
 msgstr ""
+"Permite configurar uma valorização de inventário nos produtos e categorias "
+"de produtos."
 
 #. module: stock
 #: help:stock.config.settings,module_stock_location:0
@@ -3193,6 +3387,13 @@ msgid ""
 "needs, etc.\n"
 "                This installs the module stock_location."
 msgstr ""
+"Fornece fluxos de entrada e saida de estoque. Os usos típicos deste recurso "
+"são:\n"
+"                 gestão de cadeias de fabricação de produtos, gerenciar "
+"locais padrão por produto,\n"
+"                 definir rotas dentro do seu armazém de acordo com as "
+"necessidades de negócios, etc\n"
+"                 Isso instala o módulo stock_location."
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3219,6 +3420,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar uma entrega de produto.\n"
+"              </p>\n"
+"              <p>\n"
+"Você vai encontrar nesta lista todos os produtos que você tem para entregar "
+"a\n"
+"                 seus clientes. Você pode processar as entregas diretamente "
+"desta\n"
+"                 lista usando os botões do lado direito de cada linha. você "
+"pode\n"
+"                 filtrar os produtos para entregar por clientes, produtos ou "
+"pedido de\n"
+"                 venda (usando o campo de origem).\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.move:0
@@ -3233,7 +3449,7 @@ msgstr "Nome de Revisão"
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
-msgstr ""
+msgstr "Gerenciar Números de Série da Logística"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3254,12 +3470,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um número de rastreamento.\n"
+"              </p><p>\n"
+"Esta é a lista de todas as suas embalagens. Quando você seleciona uma\n"
+"embalagem, você pode obter a rastreabilidade anterior ou posterior\n"
+"dos produtos contido na embalagem.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr ""
+msgstr "%s %s %s  foram <b>movidos para</b> sucata."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
@@ -3314,14 +3538,14 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Confirm & Receive"
-msgstr ""
+msgstr "Confirmar & Receber"
 
 #. module: stock
 #: field:stock.picking,origin:0
 #: field:stock.picking.in,origin:0
 #: field:stock.picking.out,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento de Origem"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -3331,7 +3555,7 @@ msgstr "Não urgente"
 #. module: stock
 #: view:stock.move:0
 msgid "Scheduled"
-msgstr ""
+msgstr "Agendado"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3347,7 +3571,7 @@ msgstr "Responsável"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Entirely"
-msgstr ""
+msgstr "Processar Totalmente"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3355,6 +3579,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by procurements."
 msgstr ""
+"Este local de estoque será usado, em vez do padrão, como origem de "
+"movimentos de estoque gerados por aquisições."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
@@ -3378,7 +3604,7 @@ msgstr "Estoque"
 #: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "Separação Devolvida"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
@@ -3424,6 +3650,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para iniciar um inventário. \n"
+"              </p><p>\n"
+"              Inventários periódicos são usados ​​para contar o número de "
+"produtos\n"
+"                 disponíveis por localidade. Você pode usá-lo uma vez por "
+"ano, quando você faz\n"
+"                 o inventário geral ou sempre que necessário, para adaptar "
+"o\n"
+"                 nível de estoque atual de um produto.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -3444,12 +3682,12 @@ msgstr "Movimentação Interna Atribuída"
 #: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
-msgstr ""
+msgstr "Você não pode processar uma separação sem movimentos de estoque."
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this serial number"
-msgstr ""
+msgstr "Movimentos para este número de série"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -3486,7 +3724,7 @@ msgstr "Corredor (X)"
 #. module: stock
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
-msgstr ""
+msgstr "Permite definir diversos métodos de empacotamento nos produtos"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3537,7 +3775,7 @@ msgstr "Produtos por Localização"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logística"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -3567,6 +3805,28 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um local.\n"
+"              </p><p>\n"
+"Definir os locais para refletir sua estrutura de armazém e\n"
+"                 organização. O OpenERP é capaz de gerenciar os locais "
+"físicos\n"
+"                 (armazéns, prateleiras, caixa, etc), locais parceiros "
+"(clientes,\n"
+"                 fornecedores) e locais virtuais que são a contrapartida "
+"das\n"
+"                 operações de estoque como as ordens de produção\n"
+"                 consumos, estoques, etc\n"
+"              </p><p>  \n"
+"Cada operação de estoque no OpenERP move os produtos de um\n"
+"                 local para outro. Por exemplo, se você receber produtos\n"
+"                 de um fornecedor, OpenERP vai movimentar os produtos\n"
+"                 local do Fornecedor para o local do Estoque. Cada "
+"relatório\n"
+"                 pode ser realizado em locais físicos, de parceiro ou locais "
+"virtuais.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
@@ -3583,7 +3843,7 @@ msgstr "Box 1"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation time, usually the time of the order."
-msgstr ""
+msgstr "Data de Criação, geralmente o horário do pedido."
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3622,7 +3882,7 @@ msgstr "Ativar Conta Relacionada"
 #. module: stock
 #: field:stock.location.product,type:0
 msgid "Analyse Type"
-msgstr ""
+msgstr "Tipo de Análise"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3638,6 +3898,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar um recebimento. \n"
+"              </p><p>\n"
+"Recebimentos é lista de todos os pedidos que você vai\n"
+"                 receber de seus fornecedores. Uma expedição recebida contém "
+"uma\n"
+"                 lista de produtos a ser recebida de acordo com o pedido de "
+"compra original\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.move:0
@@ -3654,7 +3924,7 @@ msgstr "Tudo de uma vez"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "Inventory Move"
-msgstr ""
+msgstr "Movimentação de Inventário"
 
 #. module: stock
 #: code:addons/stock/product.py:475
@@ -3682,12 +3952,28 @@ msgid ""
 "\n"
 "                 * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* Provisório: não confirmado ainda e não vai ser agendada até confirmado\n"
+"\n"
+"                  * Esperando uma outra operação: à espera de um outro "
+"movimento para finalizar antes que se torne automaticamente disponível (por "
+"exemplo, Fluxos Fazer a Pedido)\n"
+"\n"
+"                  * Aguardando Disponibilidade: à espera da disponibilidade "
+"de produtos\n"
+"\n"
+"                  * Pronto para Receber: produtos reservados, simplesmente à "
+"espera de confirmação.\n"
+"\n"
+"                  * Recebido: foi processado, não pode mais ser modificado "
+"ou cancelado\n"
+"\n"
+"                  * Cancelado: foi cancelada, não pode mais ser confirmada"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_config_settings
 #: view:stock.config.settings:0
 msgid "Configure Warehouse"
-msgstr ""
+msgstr "Configurar Armazém"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3715,7 +4001,7 @@ msgstr "Datas dos Inventários"
 #: model:ir.actions.act_window,name:stock.action_receive_move
 #: view:product.product:0
 msgid "Receptions"
-msgstr ""
+msgstr "Recebimentos"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3750,7 +4036,7 @@ msgstr "Empresa"
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida do Produto"
 
 #. module: stock
 #: view:stock.move:0
@@ -3783,7 +4069,7 @@ msgstr "Lote de Inventário"
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Número de Série"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3831,7 +4117,7 @@ msgstr ""
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3873,6 +4159,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo armazém.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3910,11 +4200,13 @@ msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
 "roundings of \"%s %s\" is accepted by the Unit of Measure."
 msgstr ""
+"O arredondamento da unidade de medida não te permite enviar \"%s %s\", "
+"apenas múltiplos de \"%s %s\" são aceitos pela unidade de medida."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Your Company, Chicago shop"
-msgstr ""
+msgstr "Sua Empresa, Loja de Chicago"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3958,11 +4250,13 @@ msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a back order."
 msgstr ""
+"Alterando esta quantidade aqui, você aceita que a nova quantidade como "
+"completa: O OpenERP não irá  gerar uma back order."
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Serial Number Revisions"
-msgstr ""
+msgstr "Revisões de Número de Série"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
@@ -3980,7 +4274,7 @@ msgstr "Ordens de entrega já processada"
 #. module: stock
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Caso"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -4023,13 +4317,13 @@ msgstr ""
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: stock
 #: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
-msgstr ""
+msgstr "Não pode consumir um movimento com uma quantidade negativa ou zero."
 
 #. module: stock
 #: help:stock.config.settings,decimal_precision:0
@@ -4037,6 +4331,8 @@ msgid ""
 "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, "
 "whereas a decimal precision of 4 will allow weights like:  0.0231 kg."
 msgstr ""
+"Como exemplo, uma precisão decimal de 2 irá permitir pesos como: 9.99 kg, ou "
+"uma precisão decimal de 4 irá permitir pesos como: 0.0231 kg."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -4049,7 +4345,7 @@ msgstr "Quantidade total saindo"
 #: field:stock.picking.in,backorder_id:0
 #: field:stock.picking.out,backorder_id:0
 msgid "Back Order of"
-msgstr "Devolução de"
+msgstr "Back Order de"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0
@@ -4069,7 +4365,7 @@ msgstr "Categoria de Produto"
 #. module: stock
 #: view:stock.move:0
 msgid "Serial  Number"
-msgstr ""
+msgstr "Número de Série"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4089,7 +4385,7 @@ msgstr "Configuração"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "Gerenciar Múltiplos Locais e Armazéns"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4110,7 +4406,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
-msgstr ""
+msgstr "FAT:"
 
 #. module: stock
 #: help:stock.config.settings,module_stock_invoice_directly:0
@@ -4119,6 +4415,10 @@ msgid ""
 "                to be invoiced when you send or deliver goods.\n"
 "                This installs the module stock_invoice_directly."
 msgstr ""
+"Isso permite iniciar automaticamente o assistente de faturamento se a "
+"entrega é\n"
+"                 a faturar quando você enviar ou entregar mercadorias.\n"
+"                 Isso instala o módulo stock_invoice_directly."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
@@ -4146,6 +4446,12 @@ msgid ""
 "this quantity on assigned moves affects the product reservation, and should "
 "be done with care."
 msgstr ""
+"Esta é a quantidade de produtos a partir de um ponto de vista de inventário. "
+"Para movimentos em situação \"Concluido\", esta é a quantidade de produtos "
+"que foram realmente movidoss. Para outros movimentos, esta é a quantidade de "
+"produto previsto para ser movida. A redução desta quantidade não gera uma "
+"backorder. Mudar essa quantidade em movimentos atribuídos afeta a reserva do "
+"produto, e deve ser feito com cuidado."
 
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
@@ -4189,7 +4495,7 @@ msgstr "Auto Validar"
 #: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
-msgstr ""
+msgstr "Estoque insuficiente para o Número de Série!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4221,7 +4527,7 @@ msgstr "Retornar Produtos"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr "Validar Inventório"
+msgstr "Validar Inventário"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -4229,31 +4535,33 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico usado para gravar a moeda escolhida pelo usuário durante a "
-"confirmação da separação (quando o método de custificação por preço médio é "
+"Campo técnico usado para registrar a moeda escolhida pelo usuário durante a "
+"confirmação da separação (quando o método de valorização por preço médio é "
 "usado)"
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "Número de Série Único, será mostrado como: PREFIXO/SERIAL [INT_REF]"
 
 #. module: stock
 #: code:addons/stock/product.py:142
 #, python-format
 msgid "Please define stock input account for this product: \"%s\" (id: %d)."
 msgstr ""
+"Por favor defina a conta de entrada de estoque para este produto: \"%s\" "
+"(id: %d)."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 msgid "Incoming  Products"
-msgstr ""
+msgstr "Recebimentos de Produtos"
 
 #. module: stock
 #: view:product.product:0
 msgid "update"
-msgstr ""
+msgstr "atualizar"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -4272,7 +4580,7 @@ msgstr ""
 #: view:stock.return.picking:0
 #: view:stock.split.into:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -4292,7 +4600,7 @@ msgstr "Informação"
 #: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+msgstr "Você não pode movimentar uma separação no estado %s !"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -4326,7 +4634,7 @@ msgstr "Separação Automática"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Customer Address :"
-msgstr ""
+msgstr "Endereço do Cliente:"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -4383,7 +4691,7 @@ msgstr "Você deseja mesclar estes inventários?"
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Date of Delivery"
-msgstr ""
+msgstr "Data de Entrega"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -4397,17 +4705,19 @@ msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
 "(id: %d)"
 msgstr ""
+"Por favor defina a conta de valorização do inventário para a categoria de "
+"produto: \"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Serial Number Revision"
-msgstr ""
+msgstr "Revisão do Número de Série"
 
 #. module: stock
 #: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
-msgstr ""
+msgstr "Especifique a conta de valorização para a Categoria de Produto: %s."
 
 #. module: stock
 #: help:stock.config.settings,module_claim_from_delivery:0
@@ -4415,12 +4725,15 @@ msgid ""
 "Adds a Claim link to the delivery order.\n"
 "                This installs the module claim_from_delivery."
 msgstr ""
+"Adiciona um link de Solicitações para a ordem de entrega.\n"
+"                                                                             "
+"                     Insto instala o módulo claim_from_delivery."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
-msgstr ""
+msgstr "Por favor espeficique pelo menos uma quantidade diferente de zero."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -4435,7 +4748,7 @@ msgstr "Usuário"
 #. module: stock
 #: field:stock.config.settings,module_stock_location:0
 msgid "Create push/pull logistic rules"
-msgstr ""
+msgstr "Crie regras de logística push/pull"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -4475,6 +4788,7 @@ msgstr "Janeiro"
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
 msgstr ""
+"Você não pode movimentar produtos de/para um local do tipo visualização."
 
 #. module: stock
 #: help:stock.config.settings,group_stock_production_lot:0
@@ -4483,6 +4797,9 @@ msgid ""
 "a serial number on product moves, you can get the upstream or downstream "
 "traceability of that product."
 msgstr ""
+"Isso permite que você gerencie produtos usando números de série. Quando você "
+"seleciona um número de série em movimentação de produtos, você pode obter a "
+"rastreabilidade a anterior ou posterior do produto."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
@@ -4490,6 +4807,8 @@ msgstr ""
 msgid ""
 "No product in this location. Please select a location in the product form."
 msgstr ""
+"Nenhum produto neste local. Por favor selecione um local no formulário do "
+"produto."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -4541,6 +4860,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar uma ordem de entrega para este "
+"produto.\n"
+"              </p><p>\n"
+"Aqui você vai encontrar a histórico de todos as entregas anteriores "
+"relacionadas com\n"
+"este produto, assim como todos os produtos que devem ser fornecidos a "
+"clientes.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -4558,6 +4887,8 @@ msgid ""
 "If this shipment was split, then this field links to the shipment which "
 "contains the already processed part."
 msgstr ""
+"Se esta entrega for dividida, então este campo associa a entrega que contém "
+"a parte já processada."
 
 #. module: stock
 #: view:stock.inventory:0
@@ -4576,7 +4907,7 @@ msgstr "Prefixo"
 #: view:stock.move:0
 #: view:stock.move.split:0
 msgid "Split in Serial Numbers"
-msgstr ""
+msgstr "Dividir em Números de Série"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -4624,12 +4955,12 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Delays"
-msgstr ""
+msgstr "Atrasos"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "Data Agendada"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -4680,7 +5011,7 @@ msgstr "Maio"
 #: code:addons/stock/product.py:110
 #, python-format
 msgid "No difference between standard price and new price!"
-msgstr ""
+msgstr "Nenhuma diferença entre o preço padrão e o novo preço!"
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -4690,12 +5021,12 @@ msgstr "Entrega"
 #. module: stock
 #: field:product.product,delivery_count:0
 msgid "Delivery"
-msgstr ""
+msgstr "Entrega"
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import the current inventory"
-msgstr ""
+msgstr "Importar o inventário atual"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
@@ -4731,7 +5062,7 @@ msgstr "Tipo de Local Encadeado"
 #: help:stock.picking.in,min_date:0
 #: help:stock.picking.out,min_date:0
 msgid "Scheduled time for the shipment to be processed"
-msgstr ""
+msgstr "Data agendada para o embarque a ser processado"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -4772,11 +5103,26 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um número de série.\n"
+"              </p><p>\n"
+"Esta é a lista de todos os lotes de produção que você registrou. Quando\n"
+"                 você selecionar um lote, você pode obter a rastreabilidade\n"
+"                 anterior ou posterior dos produtos contidos no lote. Por "
+"padrão, a\n"
+"                 lista é filtrada sobre os números de série que estão "
+"disponíveis no\n"
+"                 seu armazém, mas você pode desmarcar o botão 'disponível' "
+"para\n"
+"                 obter todos os lotes produzidos, recebidos ou entregues\n"
+"                 clientes.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Date of Reception"
-msgstr ""
+msgstr "Data da Recepção"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
@@ -4784,11 +5130,13 @@ msgid ""
 "This allows to configure and use multiple stock locations and warehouses,\n"
 "                instead of having a single default one."
 msgstr ""
+"Isso permite configurar e usar várias localidades de estoque e armazéns,\n"
+"                 em vez de ter um único."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm & Transfer"
-msgstr ""
+msgstr "Confirmar & Transferir"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
@@ -4834,6 +5182,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma ordem de entrega. \n"
+"              </p><p>\n"
+"Esta é a lista de todas as ordens de entrega que têm de ser\n"
+"                 preparada, de acordo com suas diferentes pedidos de vendas "
+"e suas\n"
+"                 regras de logística.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: help:stock.tracking,name:0
@@ -4872,9 +5229,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
-"O arredondamento da UdM inicial não permite que você envie \"% s% s\", como "
-"seria deixar uma quantidade de \"% s% s\" para enviar se apenas "
-"arredondamentos de \"% s% s\" são aceito pela UdM."
+"O arredondamento da UdM inicial não permite que você envie \"%s %s\", como "
+"seria deixar uma quantidade de \"%s %s\" para enviar se apenas "
+"arredondamentos de \"%s %s\" são aceito pela UdM."
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
@@ -4907,7 +5264,7 @@ msgstr "Pronto para Processar"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Warehouse Address :"
-msgstr ""
+msgstr "Endereço do Armazém:"
 
 #~ msgid "Sub Products"
 #~ msgstr "Sub Produtos"
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index a7c83dcb43f..d00eea7a18b 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-09-20 14:52+0000\n"
+"PO-Revision-Date: 2012-12-25 14:19+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-22 05:14+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
@@ -23,7 +23,7 @@ msgstr ""
 #: field:stock.move.split,line_exist_ids:0
 #: field:stock.move.split,line_ids:0
 msgid "Serial Numbers"
-msgstr ""
+msgstr "Серийные номера"
 
 #. module: stock
 #: help:stock.config.settings,group_product_variant:0
@@ -32,6 +32,9 @@ msgid ""
 "Shirts, for the same \"Linux T-Shirt\", you may have variants on  sizes or "
 "colors; S, M, L, XL, XXL."
 msgstr ""
+"Позволяет управлять несколькими вариантами для каждого продукта. Например, "
+"если вы продаете футболки, на одну и ту же футболку, вы можете иметь "
+"варианты размеров или цветов; S, M, L, XL, XXL."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -55,13 +58,13 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Confirm & Deliver"
-msgstr ""
+msgstr "Подтвердить и доставить"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
 #: view:stock.change.product.qty:0
 msgid "Update Product Quantity"
-msgstr ""
+msgstr "Обновить количество товаров"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -87,7 +90,7 @@ msgstr "Отслеживание вверх"
 #: field:stock.picking.in,date_done:0
 #: field:stock.picking.out,date_done:0
 msgid "Date of Transfer"
-msgstr ""
+msgstr "Дата перемещения"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -129,7 +132,7 @@ msgstr "Перемещения ТМЦ"
 #: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
-msgstr ""
+msgstr "Пожалуйста введите правильное количество."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -201,7 +204,7 @@ msgstr "Физические инвентаризации"
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse a Period"
-msgstr ""
+msgstr "Анализ периода"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -268,7 +271,7 @@ msgstr "Неприменимо"
 #: help:stock.picking.in,message_unread:0
 #: help:stock.picking.out,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -333,7 +336,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Forecasted:"
-msgstr ""
+msgstr "Прогнозируется:"
 
 #. module: stock
 #: view:stock.partial.move:0
@@ -348,6 +351,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: stock
 #: code:addons/stock/stock.py:768
@@ -380,7 +385,7 @@ msgstr "Группировать по партнерам"
 #: help:stock.picking.in,move_type:0
 #: help:stock.picking.out,move_type:0
 msgid "It specifies goods to be deliver partially or all at once"
-msgstr ""
+msgstr "Это определяет будут ли товары доставлены по частями или все сразу"
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -398,7 +403,7 @@ msgstr "Партнер"
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
 msgid "Allow claim on deliveries"
-msgstr ""
+msgstr "Разрешить претензии по доставкам"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -414,12 +419,12 @@ msgstr "Складские перемещения, которые были об
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Serial Numbers"
-msgstr ""
+msgstr "Существующие серийные номера"
 
 #. module: stock
 #: model:res.groups,name:stock.group_inventory_valuation
 msgid "Manage Inventory valuation"
-msgstr ""
+msgstr "Управление оценкой запасов"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
@@ -450,7 +455,7 @@ msgstr "Внутреннее место хранения"
 #. module: stock
 #: view:stock.move:0
 msgid "Split in Serial Number"
-msgstr ""
+msgstr "Разделить по серийным номерам"
 
 #. module: stock
 #: view:stock.location:0
@@ -470,7 +475,7 @@ msgstr "Задержка (в днях)"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Ready to Deliver"
-msgstr ""
+msgstr "Готово к доставке"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
@@ -508,7 +513,7 @@ msgstr "В кол-ве"
 #. module: stock
 #: model:ir.actions.client,name:stock.action_client_warehouse_menu
 msgid "Open Warehouse Menu"
-msgstr ""
+msgstr "Открыть меню склада"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
@@ -524,7 +529,7 @@ msgstr "Разделить на"
 #. module: stock
 #: field:stock.config.settings,module_product_expiry:0
 msgid "Expiry date on serial numbers"
-msgstr ""
+msgstr "Срок годности по серийным номерам"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -548,7 +553,7 @@ msgstr ""
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
 msgid "Track serial number on logistic units (pallets)"
-msgstr ""
+msgstr "Отслеживать серийный номер по логистическим единицам (паллетам)"
 
 #. module: stock
 #: help:product.template,sale_delay:0
@@ -557,6 +562,8 @@ msgid ""
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
 msgstr ""
+"Средняя задержка в днях между подтверждением клиентского заказа и доставкой "
+"завершенных товаров. Это время которое вы обещаете клиенту."
 
 #. module: stock
 #: code:addons/stock/product.py:196
@@ -582,6 +589,9 @@ msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
 "stock moves that have already been processed (except by the Administrator)."
 msgstr ""
+"Количества, единицы измерения, товары и расположения не могут быть изменены "
+"при движении остатков которые уже были выполнены (за исключением "
+"Администратора)."
 
 #. module: stock
 #: help:report.stock.move,type:0
@@ -615,7 +625,7 @@ msgstr "Метки изделия"
 #: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
-msgstr ""
+msgstr "Возврат <em>%s</em> был <b>создан</b>."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -627,11 +637,12 @@ msgstr "Статистика перемещений"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Позволяет выбирать и поддерживать различные единицы измерения товаров."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by logistic serial number"
-msgstr ""
+msgstr "Отчет остатков по логистическим серийным номерам"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
@@ -643,7 +654,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Receive/Deliver Products"
-msgstr ""
+msgstr "Получить/доставить товары"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -686,6 +697,7 @@ msgstr ""
 msgid ""
 "Serial number quantity %d of %s is larger than available quantity (%d)!"
 msgstr ""
+"Количество серийных номеров %d из %s больше допустимого количества (%d)!"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -695,7 +707,7 @@ msgstr "Заказ(Происхождение)"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Категории единиц измерения"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -740,7 +752,7 @@ msgstr "Дополнительная ссылка"
 #. module: stock
 #: view:stock.partial.picking.line:0
 msgid "Stock Picking Line"
-msgstr ""
+msgstr "Позиция комплектования"
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -804,7 +816,7 @@ msgstr "Пакет"
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
-msgstr ""
+msgstr "Анализировать текущую инвентаризацию"
 
 #. module: stock
 #: view:stock.move:0
@@ -876,12 +888,12 @@ msgstr ""
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Описание"
 
 #. module: stock
 #: view:product.category:0
 msgid "Account Stock Properties"
-msgstr ""
+msgstr "Свойства счета запасов"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
@@ -895,7 +907,7 @@ msgstr "Ссылка должна быть уникальна для каждо
 #: field:stock.picking.in,date:0
 #: field:stock.picking.out,date:0
 msgid "Time"
-msgstr ""
+msgstr "Время"
 
 #. module: stock
 #: code:addons/stock/product.py:447
@@ -911,7 +923,7 @@ msgstr "Срочно"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Delivered"
-msgstr ""
+msgstr "Доставлено"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -933,7 +945,7 @@ msgstr "Бракованная продукция"
 #. module: stock
 #: view:product.product:0
 msgid "- update"
-msgstr ""
+msgstr "- обновить"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -971,7 +983,7 @@ msgstr "ИТ поставщики"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Location & Warehouse"
-msgstr ""
+msgstr "Расположение и склад"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -986,11 +998,13 @@ msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
 "cancel the picking lines."
 msgstr ""
+"Вы не можете отменить комплектацию, так как некоторые перемещения  уже были "
+"сделаны. Вы должны отменить строки комплектации."
 
 #. module: stock
 #: field:stock.config.settings,decimal_precision:0
 msgid "Decimal precision on weight"
-msgstr ""
+msgstr "Десятичная точность веса"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1030,23 +1044,23 @@ msgstr "Место инвентаризации"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Вы должны назначить серийный номер этому товару."
 
 #. module: stock
 #: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Пожалуйста, определите журнал в категории товара: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Details"
-msgstr ""
+msgstr "Подробности"
 
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Ready to Transfer"
-msgstr ""
+msgstr "Готово к перемещению"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1086,7 +1100,7 @@ msgstr "Журнал"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
-msgstr ""
+msgstr "Создать черновые счета"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -1104,7 +1118,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Ready to Receive"
-msgstr ""
+msgstr "Готово к получению"
 
 #. module: stock
 #: view:stock.move:0
@@ -1130,17 +1144,17 @@ msgstr "Запасы по местам хранения"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 msgid "Receive/Deliver By Orders"
-msgstr ""
+msgstr "Получить/Доставить по заказам"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots"
-msgstr ""
+msgstr "Партии товара"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Reverse Transfer"
-msgstr ""
+msgstr "Обратное перемещение"
 
 #. module: stock
 #: field:stock.config.settings,group_uos:0
@@ -1171,6 +1185,8 @@ msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
 "can be returned)!"
 msgstr ""
+"Нет товаров к возврату (только строки со статусом Сделано и еще не полностью "
+"возвращенные могут быть возвращенными)!"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1202,12 +1218,12 @@ msgstr "Счёт оценки запасов"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 #. module: stock
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Ряд"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1218,7 +1234,7 @@ msgstr "Место производства"
 #: code:addons/stock/product.py:121
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)."
-msgstr ""
+msgstr "Пожалуйста, определите журнал в категории товара: \"%s\" (id: %d)."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -1297,12 +1313,12 @@ msgstr ""
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Internal Shipment :"
-msgstr ""
+msgstr "Внутренние отгрузки:"
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Split Inventory Line"
-msgstr ""
+msgstr "Разделить строку инвентаризации"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1313,7 +1329,7 @@ msgstr "Ручное управление"
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Shipment"
-msgstr ""
+msgstr "Доставка"
 
 #. module: stock
 #: view:stock.location:0
@@ -1336,7 +1352,7 @@ msgstr ""
 #: code:addons/stock/product.py:113
 #, python-format
 msgid "Please specify company in Location."
-msgstr ""
+msgstr "Пожалуйста укажите компанию в месте хранения."
 
 #. module: stock
 #: view:stock.move:0
@@ -1373,7 +1389,7 @@ msgstr "Физическая инвентаризация"
 #: code:addons/stock/wizard/stock_move.py:214
 #, python-format
 msgid "Processing Error!"
-msgstr ""
+msgstr "Ошибка обработки!"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1403,7 +1419,7 @@ msgstr "Мета хранения партнера"
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Received"
-msgstr ""
+msgstr "Получено"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1416,7 +1432,7 @@ msgstr "Общее количество"
 #: field:stock.picking.in,min_date:0
 #: field:stock.picking.out,min_date:0
 msgid "Scheduled Time"
-msgstr ""
+msgstr "Запланированное время"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
@@ -1427,7 +1443,7 @@ msgstr "Перемещение потребляемого"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Заказ на доставку:"
 
 #. module: stock
 #: help:stock.location,chained_delay:0
@@ -1492,7 +1508,7 @@ msgstr "Ожидает другого перемещения"
 #: help:stock.change.product.qty,new_quantity:0
 msgid ""
 "This quantity is expressed in the Default Unit of Measure of the product."
-msgstr ""
+msgstr "Это количество выражено в единицах измерения товара по умолчанию."
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1536,12 +1552,12 @@ msgstr "Вы можете удалить только черновик пере
 #: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
-msgstr ""
+msgstr "Нельзя переместить товар %s в место хранения типа вид %s."
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Split in serial numbers"
-msgstr ""
+msgstr "Разбить по серийным номерам"
 
 #. module: stock
 #: view:stock.move:0
@@ -1562,7 +1578,7 @@ msgstr "Черновик"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Срок поставки"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1573,7 +1589,7 @@ msgstr "Доп. инфо"
 #: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
-msgstr ""
+msgstr "Недостаточно данных частичного комплектования для перемещения №%s."
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1731,6 +1747,16 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Уважаемые господа,\n"
+"\n"
+"Наши записи зафиксировали что некоторые платежи остаются неоплаченными. "
+"Пожалуйста ознакомьтесь с подробностями ниже.\n"
+"Если сумма уже была оплачена, пожалуйста проигнорируйте это оповещение. В "
+"ином случае, пожалуйста перечислите нам всю сумму отображенную ниже.\n"
+"Если у вас есть какие-либо замечания, пожалуйста свяжитесь с нами.\n"
+"\n"
+"Заранее благодарим за сотрудничество.\n"
+"С наилучшими пожеланиями,"
 
 #. module: stock
 #: help:stock.incoterms,active:0
@@ -1777,7 +1803,7 @@ msgstr "Последовательность во времени"
 #. module: stock
 #: field:stock.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr ""
+msgstr "Управление различными единицами измерения товаров"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
@@ -1788,7 +1814,7 @@ msgstr "Счёт по доставке"
 #: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
-msgstr ""
+msgstr "Пожалуйста, предоставьте положительное количество брака."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
@@ -1799,7 +1825,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Location"
-msgstr ""
+msgstr "Место хранения"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
@@ -1812,7 +1838,7 @@ msgstr "Валюта в которой выражена стоимость ед
 #: selection:stock.picking.in,move_type:0
 #: selection:stock.picking.out,move_type:0
 msgid "Partial"
-msgstr ""
+msgstr "Частично"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1823,7 +1849,7 @@ msgstr "Сентябрь"
 #. module: stock
 #: view:product.product:0
 msgid "days"
-msgstr ""
+msgstr "дней"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1840,7 +1866,7 @@ msgstr "Плановый месяц"
 #: help:stock.picking.in,origin:0
 #: help:stock.picking.out,origin:0
 msgid "Reference of the document"
-msgstr ""
+msgstr "Ссылка на документ"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1851,7 +1877,7 @@ msgstr "Является дозаказом"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Incoming Shipment :"
-msgstr ""
+msgstr "Поступающие товары :"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
@@ -1966,7 +1992,7 @@ msgstr "Доставленое кол-во"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Transfer Products"
-msgstr ""
+msgstr "Перенос товара"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2033,7 +2059,7 @@ msgstr "Дата"
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2050,7 +2076,7 @@ msgstr "Место хранения ТМЦ"
 #: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
-msgstr ""
+msgstr "_Доставить"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2093,7 +2119,7 @@ msgstr "Номер партий"
 #: model:ir.actions.act_window,name:stock.action_deliver_move
 #: view:product.product:0
 msgid "Deliveries"
-msgstr ""
+msgstr "Доставки"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2220,7 +2246,7 @@ msgstr ""
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Вы пытаетесь назначить партию не из такого же товара."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -2235,7 +2261,7 @@ msgstr "Цена"
 #. module: stock
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
-msgstr ""
+msgstr "Создать и открыть счет когда пользователь завершит заказ на доставку"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2245,7 +2271,7 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr ""
+msgstr "Генерировать с проводки по складским перемещениям"
 
 #. module: stock
 #: code:addons/stock/product.py:449
@@ -2289,7 +2315,7 @@ msgstr "Название"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Supplier Address :"
-msgstr ""
+msgstr "Адрес поставщика:"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -2321,24 +2347,24 @@ msgstr "Места хранения заказчиков"
 #: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Ошибка пользователя!"
 
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Stock partial Picking"
-msgstr ""
+msgstr "Частичное комплектование"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice/Refund"
-msgstr ""
+msgstr "Создать счет/возврат"
 
 #. module: stock
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2377,7 +2403,7 @@ msgstr "Создание"
 #: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
-msgstr ""
+msgstr "Операция запрещена!"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2408,7 +2434,7 @@ msgstr "Тип доставки определяет приходящие или
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Accounting"
-msgstr ""
+msgstr "Учет"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
@@ -2479,19 +2505,19 @@ msgstr "Единицы измерения"
 #. module: stock
 #: field:stock.config.settings,group_stock_multiple_locations:0
 msgid "Manage multiple locations and warehouses"
-msgstr ""
+msgstr "Управлять местами хранения и складами"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_production_lot:0
 msgid "Track serial number on products"
-msgstr ""
+msgstr "Отслеживать серийные номера товара"
 
 #. module: stock
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -2520,7 +2546,7 @@ msgstr "Партии"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr ""
+msgstr "_Перенос"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2557,7 +2583,7 @@ msgstr "Будущее Кол-во"
 #. module: stock
 #: model:res.groups,name:stock.group_production_lot
 msgid "Manage Serial Numbers"
-msgstr ""
+msgstr "Управлять серийными номерами"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2570,7 +2596,7 @@ msgstr "Примечания"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Transferred"
-msgstr ""
+msgstr "Перемещено"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2591,7 +2617,7 @@ msgstr "Тип поставки"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Partially"
-msgstr ""
+msgstr "Обработать частями"
 
 #. module: stock
 #: view:stock.move:0
@@ -2679,7 +2705,7 @@ msgstr "Кол-во п/у"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_config_settings
 msgid "stock.config.settings"
-msgstr ""
+msgstr "stock.config.settings"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2705,7 +2731,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Big Suppliers"
-msgstr ""
+msgstr "Большие поставщики"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2736,7 +2762,7 @@ msgstr "Создать"
 #. module: stock
 #: field:stock.change.product.qty,new_quantity:0
 msgid "New Quantity on Hand"
-msgstr ""
+msgstr "Новое количество на руках"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2786,7 +2812,7 @@ msgstr "Отменить инвентаризацию"
 #. module: stock
 #: field:stock.config.settings,group_product_variant:0
 msgid "Support multiple variants per products  "
-msgstr ""
+msgstr "Поддержка вариантов товаров  "
 
 #. module: stock
 #: code:addons/stock/stock.py:2246
@@ -2810,7 +2836,7 @@ msgstr "Определенное место хранения"
 #. module: stock
 #: field:report.stock.inventory,scrap_location:0
 msgid "scrap"
-msgstr ""
+msgstr "брак"
 
 #. module: stock
 #: code:addons/stock/stock.py:1891
@@ -2823,17 +2849,17 @@ msgstr ""
 #. module: stock
 #: report:stock.inventory.move:0
 msgid "Manual Quantity"
-msgstr ""
+msgstr "Количество вручную"
 
 #. module: stock
 #: view:product.product:0
 msgid "On hand:"
-msgstr ""
+msgstr "На руках:"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by serial number"
-msgstr ""
+msgstr "Отчет по остаткам по серийным номерам"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2863,7 +2889,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Please create Invoices."
-msgstr ""
+msgstr "Пожалуйста, создайте счета"
 
 #. module: stock
 #: help:stock.config.settings,module_product_expiry:0
@@ -2881,7 +2907,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
-msgstr ""
+msgstr "Пожалуйста предоставьте правильное количество."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2921,7 +2947,7 @@ msgstr "Сделать доступным принудительно"
 #. module: stock
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Полка"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap
@@ -3041,7 +3067,7 @@ msgstr "Доступные запасы"
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Logistic Serial Number"
-msgstr ""
+msgstr "Логистический серийный номер"
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -3094,7 +3120,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
-msgstr ""
+msgstr "_Принять"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -3233,7 +3259,7 @@ msgstr "Название ревизии"
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
-msgstr ""
+msgstr "Управление логистическими серийными номерами"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3259,7 +3285,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr ""
+msgstr "%s %s %s было <b>перемещено в</b> брак."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
@@ -3314,14 +3340,14 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Confirm & Receive"
-msgstr ""
+msgstr "Подтвердить и получить"
 
 #. module: stock
 #: field:stock.picking,origin:0
 #: field:stock.picking.in,origin:0
 #: field:stock.picking.out,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Исходный документ"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -3331,7 +3357,7 @@ msgstr "Не срочно"
 #. module: stock
 #: view:stock.move:0
 msgid "Scheduled"
-msgstr ""
+msgstr "Запланировано"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3347,7 +3373,7 @@ msgstr "Ответственный"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Entirely"
-msgstr ""
+msgstr "Обработать полностью"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3378,7 +3404,7 @@ msgstr "Запасы"
 #: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "Возвращенное комплектование"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
@@ -3444,12 +3470,12 @@ msgstr "Назначенные внутренние перемещения"
 #: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
-msgstr ""
+msgstr "Вы не можете обработать комплектацию без движений остатков."
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this serial number"
-msgstr ""
+msgstr "Движения для этого серийного номера"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -3486,7 +3512,7 @@ msgstr "Ряд (X)"
 #. module: stock
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
-msgstr ""
+msgstr "Позволяет определять несколько методов упаковки продуктов"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3537,7 +3563,7 @@ msgstr "ТМЦ по местам хранения"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Logistic"
-msgstr ""
+msgstr "Логистика"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -3583,7 +3609,7 @@ msgstr "Полка 1"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation time, usually the time of the order."
-msgstr ""
+msgstr "Время создания, обычно время заказа."
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3654,7 +3680,7 @@ msgstr "Все сразу"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "Inventory Move"
-msgstr ""
+msgstr "Инвентаризац. перемещение"
 
 #. module: stock
 #: code:addons/stock/product.py:475
@@ -3687,7 +3713,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_stock_config_settings
 #: view:stock.config.settings:0
 msgid "Configure Warehouse"
-msgstr ""
+msgstr "Настроить склад"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3715,7 +3741,7 @@ msgstr "Даты инвентаризаций"
 #: model:ir.actions.act_window,name:stock.action_receive_move
 #: view:product.product:0
 msgid "Receptions"
-msgstr ""
+msgstr "Поступления"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3750,7 +3776,7 @@ msgstr "Компания"
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Ед. изм. товара"
 
 #. module: stock
 #: view:stock.move:0
@@ -3783,7 +3809,7 @@ msgstr "Инвентаризация партии"
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Серийный номер"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3830,7 +3856,7 @@ msgstr ""
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3979,7 +4005,7 @@ msgstr "Уже обработанные заказы доставки"
 #. module: stock
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Место"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -4022,13 +4048,13 @@ msgstr ""
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: stock
 #: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
-msgstr ""
+msgstr "Нельзя израсходовать негативное или нулевое количество."
 
 #. module: stock
 #: help:stock.config.settings,decimal_precision:0
@@ -4068,7 +4094,7 @@ msgstr "Категория ТМЦ"
 #. module: stock
 #: view:stock.move:0
 msgid "Serial  Number"
-msgstr ""
+msgstr "Серийный номер"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4088,7 +4114,7 @@ msgstr "Настройки"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "Управлять местами хранения и складами"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4109,7 +4135,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
-msgstr ""
+msgstr "ИНВ:"
 
 #. module: stock
 #: help:stock.config.settings,module_stock_invoice_directly:0
@@ -4188,7 +4214,7 @@ msgstr "Автопроверка"
 #: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
-msgstr ""
+msgstr "Недостаточный запас для серийного номера !"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4247,12 +4273,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 msgid "Incoming  Products"
-msgstr ""
+msgstr "Входящие товары"
 
 #. module: stock
 #: view:product.product:0
 msgid "update"
-msgstr ""
+msgstr "обновить"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -4271,7 +4297,7 @@ msgstr ""
 #: view:stock.return.picking:0
 #: view:stock.split.into:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -4291,7 +4317,7 @@ msgstr "Информация"
 #: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+msgstr "Вы не можете удалить комплектование в состоянии %s!"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -4325,7 +4351,7 @@ msgstr "Авто-комплектование"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Customer Address :"
-msgstr ""
+msgstr "Адрес заказчика:"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -4381,7 +4407,7 @@ msgstr "Вы действительно хотите объединить эти
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Date of Delivery"
-msgstr ""
+msgstr "Срок поставки"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -4418,7 +4444,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
-msgstr ""
+msgstr "Пожалуйста укажите как минимум одно ненулевое количество."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -4472,7 +4498,7 @@ msgstr "Январь"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить товар в/из место хранения с типом вид."
 
 #. module: stock
 #: help:stock.config.settings,group_stock_production_lot:0
@@ -4488,6 +4514,7 @@ msgstr ""
 msgid ""
 "No product in this location. Please select a location in the product form."
 msgstr ""
+"Нет товаров в этом месте хранения. Пожалуйста выберите место в форме товара."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -4574,7 +4601,7 @@ msgstr "Префикс"
 #: view:stock.move:0
 #: view:stock.move.split:0
 msgid "Split in Serial Numbers"
-msgstr ""
+msgstr "Разбить по серийным номерам"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -4622,12 +4649,12 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Delays"
-msgstr ""
+msgstr "Задержки"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "Запланировать дату"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -4678,7 +4705,7 @@ msgstr "Май"
 #: code:addons/stock/product.py:110
 #, python-format
 msgid "No difference between standard price and new price!"
-msgstr ""
+msgstr "Нет разницы между стандартной ценой и новой ценой!"
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -4774,7 +4801,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Date of Reception"
-msgstr ""
+msgstr "Дата приема"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
@@ -4786,7 +4813,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm & Transfer"
-msgstr ""
+msgstr "Подтвердить и переместить"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
@@ -4905,7 +4932,7 @@ msgstr "Готовые к обработке"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Warehouse Address :"
-msgstr ""
+msgstr "Адрес склада:"
 
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index ec27dca7846..5c5d624cbad 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/i18n/pt_BR.po
@@ -7,19 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-03-08 21:28+0000\n"
-"Last-Translator: pedrobom <pedrobomlimeira@gmail.com>\n"
+"PO-Revision-Date: 2012-12-24 13:05+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-22 05:52+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company the pickings and moves belong."
 msgstr ""
+"É usado para saber a qual empresa as separações e movimentos pertencem."
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -141,7 +143,7 @@ msgstr "Comprar"
 #. module: stock_location
 #: view:product.product:0
 msgid "Pushed flows"
-msgstr ""
+msgstr "Fluxos Empurrados"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_dispatch_zone
@@ -151,7 +153,7 @@ msgstr "Zona de Despacho"
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled flows"
-msgstr ""
+msgstr "Fluxos Puxados"
 
 #. module: stock_location
 #: field:product.pulled.flow,company_id:0
@@ -179,18 +181,18 @@ msgstr "Produzir"
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Order"
-msgstr "Adquirir Sempre"
+msgstr "Fabricar para Pedido"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr "Avaliar Estoque"
+msgstr "Fabricar para Estoque"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr ""
+msgstr "Empurrado de outro local."
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
@@ -256,9 +258,9 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
-"'Avaliar Estoque': Quando necessário, obter do estoque ou aguardar "
-"reposição. 'Adquirir Sempre': Quando necessário, adquirir ou produzir de "
-"acordo com a requisição"
+"'Fazer para Estoque': Quando é necessário obter do estoque ou aguardar "
+"reposição. 'Fazer para Pedido': Quando é necessário adquirir ou produzir de "
+"acordo com a requisição."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
@@ -297,7 +299,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.product,path_ids:0
 msgid "Pushed Flow"
-msgstr ""
+msgstr "Fluxo Empurrado"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:89
@@ -310,12 +312,12 @@ msgstr ""
 #. module: stock_location
 #: view:product.product:0
 msgid "Push Flow"
-msgstr ""
+msgstr "Fluxo Empurrado"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pull Flow"
-msgstr ""
+msgstr "Fluxo Puxado"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index 234dc31d447..d8c3a0bb6db 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -7,19 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2010-12-09 09:49+0000\n"
+"PO-Revision-Date: 2012-12-25 14:24+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-22 05:52+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company the pickings and moves belong."
 msgstr ""
+"Используется , чтобы узнать, к какой компании принадлежат комплектования и "
+"перемещения."
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -191,7 +193,7 @@ msgstr "Изготовить на склад"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr ""
+msgstr "Взяли из другого места."
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index 61e8c8884ed..1114aa0c768 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2010-08-02 20:49+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-25 12:58+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-22 05:16+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
@@ -30,7 +30,7 @@ msgstr "Объект"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "Поиск подписки"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -134,6 +134,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"Если поле \"Активно\" не установлено, то можно скрыть документ подписки без "
+"удаления."
 
 #. module: subscription
 #: field:subscription.document,name:0
@@ -145,7 +147,7 @@ msgstr "Название"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "You cannot delete an active subscription !"
-msgstr ""
+msgstr "Вы не можете удалять активные подписки!"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
@@ -173,12 +175,12 @@ msgstr "Дни"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
-msgstr ""
+msgstr "Задание cron"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription
@@ -196,7 +198,7 @@ msgstr "Партнер"
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "Планировщик подписки"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -206,7 +208,7 @@ msgstr "Дата подписки"
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Описание содержания подписки"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
@@ -221,6 +223,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Если поле \"Активно\" не установлено, то можно скрыть подписку без ее "
+"удаления."
 
 #. module: subscription
 #: help:subscription.document.fields,value:0
@@ -248,6 +252,8 @@ msgstr "Выполняется"
 msgid ""
 "User can choose the source document on which he wants to create documents"
 msgstr ""
+"Пользователь может выбрать исходный документ, по которому он хочет создавать "
+"документы"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index 2ac02d46cfc..f7d9d7be16b 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-10-17 00:09+0000\n"
-"Last-Translator: ERIVELTON PIRES GUEDES <Unknown>\n"
+"PO-Revision-Date: 2012-12-24 19:53+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
+"X-Launchpad-Export-Date: 2012-12-25 04:48+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: survey
@@ -45,7 +46,7 @@ msgstr "Validação de Texto"
 #. module: survey
 #: view:survey:0
 msgid "Answers:"
-msgstr ""
+msgstr "Respostas"
 
 #. module: survey
 #: view:survey:0
@@ -56,7 +57,7 @@ msgstr "Usuário Convidado"
 #. module: survey
 #: model:survey.type,name:survey.survey_type1
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos Humanos"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -349,7 +350,7 @@ msgstr ""
 #. module: survey
 #: field:survey,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de Cores"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -366,7 +367,7 @@ msgstr "Editar Pesquisa"
 #: code:addons/survey/wizard/survey_answer.py:961
 #, python-format
 msgid "Please enter an integer value."
-msgstr ""
+msgstr "Por favor entre com um número inteiro"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
@@ -390,7 +391,7 @@ msgstr "No Máximo"
 #: view:survey:0
 #: view:survey.request:0
 msgid "My Survey(s)"
-msgstr ""
+msgstr "Minhas Pesquisas"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -428,7 +429,7 @@ msgstr "Texto"
 #. module: survey
 #: view:survey:0
 msgid "Edit..."
-msgstr ""
+msgstr "Editar..."
 
 #. module: survey
 #: selection:survey.print,paper_size:0
@@ -542,7 +543,7 @@ msgstr "Imprimir"
 #. module: survey
 #: view:survey:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
@@ -566,7 +567,7 @@ msgstr "Email"
 #: code:addons/survey/survey.py:259
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: survey
 #: selection:survey.response,state:0
@@ -592,7 +593,7 @@ msgstr ""
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Relatórios"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
@@ -619,7 +620,7 @@ msgstr "Núm. Página"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_form
 msgid "Print Surveys"
-msgstr ""
+msgstr "Imprimir Pesquisas"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
@@ -645,7 +646,7 @@ msgstr ""
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "Prazo Final"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -725,7 +726,7 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "Delete"
-msgstr ""
+msgstr "Excluir"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
@@ -769,7 +770,7 @@ msgstr "Manualmente"
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Send"
-msgstr ""
+msgstr "_Enviar"
 
 #. module: survey
 #: help:survey,responsible_id:0
@@ -792,7 +793,7 @@ msgstr "Acrescentar coluna de comentário na matriz"
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "#Resposta"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index e74cb386a3e..1133504de5b 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2010-12-11 16:24+0000\n"
+"PO-Revision-Date: 2012-12-25 12:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-22 05:53+0000\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
@@ -25,7 +25,7 @@ msgstr "Позиция заказа на закупку"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Поступающие грузы"
 
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
@@ -139,7 +139,7 @@ msgstr "Сигнал о %s !"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sales Order"
-msgstr ""
+msgstr "Предупреждение по заказу продаж"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -149,7 +149,7 @@ msgstr "Сообщение при выставлении счета"
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sales Order"
-msgstr ""
+msgstr "Сообщение по заказу продаж"
 
 #. module: warning
 #: view:res.partner:0
@@ -177,7 +177,7 @@ msgstr "Предупреждение для %s"
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sales Order Line"
-msgstr ""
+msgstr "Сообщение по позиции заказа продаж"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -208,7 +208,7 @@ msgstr "Заказ на продажу"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Заказы на доставку"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
diff --git a/addons/web_shortcuts/i18n/ru.po b/addons/web_shortcuts/i18n/ru.po
new file mode 100644
index 00000000000..253ccddea32
--- /dev/null
+++ b/addons/web_shortcuts/i18n/ru.po
@@ -0,0 +1,25 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-25 12:18+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-26 04:39+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Добавить / Удалить ярлык..."

From ed88f2f635217e08465590c7bbbf81752a94531b Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Wed, 26 Dec 2012 11:33:19 +0100
Subject: [PATCH 10/12] [DEL]Revert changes of rev 8478

bzr revid: dle@openerp.com-20121226103319-1w4ac1h4y7cfrhns
---
 addons/crm/crm_lead_view.xml | 5 +++--
 addons/sale/sale_view.xml    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 42da8faf9c4..2bab40ee457 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -156,7 +156,7 @@
                             <label for="section_id"/>
                             <div>
                                 <field name="section_id"/>
-                                <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': [('section_id','=',False)]}"/>
+                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
                             </div>
                             <field name="type" invisible="1"/>
                         </group>
@@ -421,7 +421,8 @@
                                 <label for="section_id"/>
                                 <div>
                                     <field name="section_id" widget="selection"/>
-                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': [('section_id','=',False)]}"/>
+                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link"
+                                        attrs="{'invisible': [('section_id', '=', False)]}"/>
                                 </div>
                             </group>
                             <group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7ded7cc1d42..0edda45b6d1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -246,7 +246,7 @@
                                 <div class="oe_subtotal_footer_separator oe_inline">
                                     <label for="amount_total" />
                                     <button name="button_dummy"
-                                        states="draft,sent" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                             </group>

From fc30d0cdc0241456b8bb57f23b4d1000adf0596c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 27 Dec 2012 05:22:25 +0000
Subject: [PATCH 11/12] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121224043910-40kmjctd0vsk40e4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044716-jkvfe6uzseq8kibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043855-sxdshan9dl7zfxjl
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052225-be2juv5iu3hyr8gh
---
 openerp/addons/base/i18n/es.po | 1004 ++++++++++++++++++++++++++++++--
 openerp/addons/base/i18n/hu.po |   67 ++-
 openerp/addons/base/i18n/ro.po |  842 +++++++++++++++++++++++---
 openerp/addons/base/i18n/ru.po |  301 +++++++---
 4 files changed, 2016 insertions(+), 198 deletions(-)

diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index cfd0a83ea5f..622c57278a8 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-21 18:23+0000\n"
-"Last-Translator: Omar (Pexego) <bronxkds@hotmail.com>\n"
+"PO-Revision-Date: 2012-12-26 14:21+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-22 05:07+0000\n"
+"X-Launchpad-Export-Date: 2012-12-27 05:22+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -803,7 +803,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr "Méjico - Contabilidad"
+msgstr "México - Contabilidad"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -939,7 +939,7 @@ msgstr "Jordania"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hr
 msgid "Croatia - RRIF 2012 COA"
-msgstr ""
+msgstr "Croacia - RRIF 2012 COA"
 
 #. module: base
 #: help:ir.cron,nextcall:0
@@ -1457,6 +1457,45 @@ msgid ""
 "come with any additional paid permission for online use of 'private "
 "modules'.\n"
 msgstr ""
+"\n"
+"Módulo base para la localización brasileña\n"
+"==========================================\n"
+"\n"
+"Este módulo consiste en:\n"
+"\n"
+" - Plan de cuentas general brasiñeño\n"
+" - Impuestos brasileños tales como:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"Se ha añadido también un campo tax_discount en los objetos "
+"account.tax.template y account.tax objects para permitir el cálculo correcto "
+"de algunos IVAs brasileños, tales como el ICMS. Se ha extendido el asistente "
+"de creación del plan de cuentas para propagar estos nuevos datos "
+"convenientemente.\n"
+"\n"
+"Es importante destacar sin embargo que a este módulo le falta algunas "
+"implementaciones para usar OpenERP adecuadamente en Brasil. Estas "
+"implementaciones (como la factura electrónica fiscal que ya es operativa), "
+"se consiguen con más de 15 módulos adicionales en el proyecto de "
+"localización brasileña de Launchpad en https://launchpad.net/openerp.pt-br-"
+"localiz y sus dependencias en la rama de extra addons. Esos módulos buscan "
+"no romper con la modularidad destacable de OpenERP, por eso es por lo que "
+"son tan numeroso aunque pequeños. Una de las razones para mantener esos "
+"módulos aparte es que los líderes de la localización brasileña necesitan "
+"agilidad en los aportes para complear la localización conforme las compañías "
+"subvencionan los requisitos legales remanentes (tales como libro mayor "
+"fiscal, SPED de contabilidad, SPED fiscal y PAF ECF que aún están pendientes "
+"a fecha septiembre de 2011). Estos módulos están licenciados estrictamente "
+"bajo AGPL V3 y hoy no vienen con ningún permiso adicional pagado para el uso "
+"en línea de 'módulos privados'.\n"
 
 #. module: base
 #: code:addons/orm.py:406
@@ -1523,7 +1562,7 @@ msgstr "Corea del Sur"
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_si
 msgid "Kontni načrt za gospodarske družbe"
-msgstr ""
+msgstr "Plan contable para las empresas"
 
 #. module: base
 #: code:addons/orm.py:4917
@@ -1904,6 +1943,16 @@ msgid ""
 "    * the main taxes used in Luxembourg\n"
 "    * default fiscal position for local, intracom, extracom "
 msgstr ""
+"\n"
+"Éste es el módulo base para gestionar el plan de cuentas para Luxemburgo.\n"
+"======================================================================\n"
+"\n"
+"    * Plan de cuentas oficial de Luxemburgo (plan e impuesto de la ley de "
+"junio de 2009 + 2011),\n"
+"    * Códigos de impuesto para Luxemburgo\n"
+"    * Impuestos principales usados en Luxemburgo\n"
+"    * Posición fiscal por defecto para local, intracomunitario y "
+"extracomunitario "
 
 #. module: base
 #: code:addons/base/module/wizard/base_update_translations.py:39
@@ -1956,6 +2005,28 @@ msgid ""
 "in their pockets, this module is essential.\n"
 "    "
 msgstr ""
+"\n"
+"Módulo de base para gestionar el almuerzo.\n"
+"================================\n"
+"\n"
+"Muchas empresas piden sándwiches, pizzas y otros, de proveedores habituales, "
+"para sus empleados para ofrecerles más facilidades.\n"
+"\n"
+"Sin embargo, la gestión de los almuerzos en la empresa requiere una "
+"administración adecuada, especialmente cuando el número de empleados o "
+"proveedores es importante.\n"
+"\n"
+"El módulo de pedidos de comida ha sido desarrollado para hacer más fácil "
+"esta gestión y también para ofrecer a los empleados más herramientas y "
+"usabilidad.\n"
+"\n"
+"Además de una gestión de comida y de proveedores completa, este módulo "
+"ofrece la posibilidad de mostrar advertencias y proporciona una selección "
+"rápida de pedido basado en las preferencias de los empleados.\n"
+"\n"
+"Si quiere ahorrar tiempo de sus empleados, y evitar que tengan siempre las "
+"monedas en sus bolsillos, este módulo es esencial.\n"
+"    "
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
@@ -2245,7 +2316,7 @@ msgstr "Permiso para leer"
 #. module: base
 #: help:ir.attachment,res_id:0
 msgid "The record id this is attached to"
-msgstr ""
+msgstr "El id. de registro está adjuntado a"
 
 #. module: base
 #: model:ir.module.module,description:base.module_share
@@ -2267,6 +2338,24 @@ msgid ""
 "synchronization with other companies.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo incluye herramientas genéricas para compartir su base de datos "
+"de OpenERP actual.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Añade específicamente un botón 'compartir', que está disponible en el "
+"cliente Web para compartir cualquier tipo de datos de OpenERP con "
+"compañeros, clientes, amigos.\n"
+"\n"
+"El sistema trabajará  se encargará de la creación de nuevos usuarios y "
+"grupos sobre la marcha, combinando los permisos y reglas de registro "
+"adecuados para asegurar que los usuarios compartidos sólo tengan el acceso a "
+"los datos que se ha compartido con ellos.\n"
+"\n"
+"Esto es muy útil para el trabajo colaborativo, el intercambio de "
+"conocimiento o la sincronización con otras compañías.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
@@ -2475,6 +2564,26 @@ msgid ""
 "* *Before Delivery*: A Draft invoice is created and must be paid before "
 "delivery\n"
 msgstr ""
+"\n"
+"Gestione presupuestos y pedidos de venta\n"
+"==================================\n"
+"\n"
+"Este módulo enlaza las aplicaciones de ventas y gestión de almacenes.\n"
+"\n"
+"Preferencias\n"
+"----------------------\n"
+"* Envío: Elección de envío total o parcial\n"
+"* Facturación: escoja cómo serán pagadas las facturas\n"
+"* Incoterms: Formas de pago internacionales\n"
+"\n"
+"Puede elegir métodos de facturación flexibles:\n"
+"\n"
+"* 'Bajo demanda': Las facturas se crean manualmente desde los pedidos de "
+"venta cuando sean necesarias.\n"
+"* 'Con la orden de entrega': Las facturas se generan desde el albarán "
+"(entrega).\n"
+"* 'Antes del envío': Se crea una factura borrador y debe ser pagada antes "
+"del envío.\n"
 
 #. module: base
 #: field:ir.ui.menu,complete_name:0
@@ -2628,7 +2737,7 @@ msgstr "Método"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
 msgid "Password Encryption"
-msgstr ""
+msgstr "Encriptación de la contraseña"
 
 #. module: base
 #: view:workflow.activity:0
@@ -2661,6 +2770,29 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Registra y valida partes de horas y asistencia fácilmente\n"
+"=====================================================\n"
+"\n"
+"Esta aplicación proporciona una nueva pantalla habilitándole gestionar tanto "
+"asistencias (entradas / salidas) y la codificación del trabajo (partes de "
+"horas) por periodo. Las entradas del parte de hroras se realizan por el "
+"empleado cada día. Al final de periodo definido, los empleados validan sus "
+"hojas y el responsable debe aprobar entonces las entradas de su equipo. Los "
+"periodos se definen en los formularios de la compañía y pueden establecerse "
+"para ejecutarse mensualmente o semanalmente.\n"
+"\n"
+"El proceso de validación completo del parte de horas es:\n"
+"---------------------------------------------\n"
+"* Parte en borrador\n"
+"* Confirmación al final del periodo por el empleado\n"
+"* Validación del responsable de proyecto\n"
+"\n"
+"La validación puede ser configurada en la compañía:\n"
+"------------------------------------------------\n"
+"* Tamaño del periodo (día, semana, mes)\n"
+"* Máxima diferencia entre los partes de horas y las asistencias\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:341
@@ -2674,7 +2806,7 @@ msgstr ""
 #. module: base
 #: field:change.password.user,new_passwd:0
 msgid "New Password"
-msgstr ""
+msgstr "Nueva contraseña"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2734,6 +2866,10 @@ msgid ""
 "=================================\n"
 " "
 msgstr ""
+"\n"
+"Permite acceso anónimo al portal.\n"
+"=============================\n"
+" "
 
 #. module: base
 #: model:res.country,name:base.ge
@@ -2915,6 +3051,27 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"Éste el módulo base para gestionar productos y tarifas en OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Los productos soportan variantes, diversos métodos de tarificación, "
+"información del proveedor, información de almacenaje, diversas unidades de "
+"medida, empaquetado y propiedades.\n"
+"\n"
+"Soporte de tarifas:\n"
+"-------------------------------\n"
+"    * Múltiples niveles de descuento (por producto, categoría, cantidades)\n"
+"    * Calcular precio basado en diferentes criterios:\n"
+"        * Otras tarifas\n"
+"        * Precio de coste\n"
+"        * PVP\n"
+"        * Precio de proveedor\n"
+"\n"
+"Las preferencias de tarifa se establecen por producto y/o empresas.\n"
+"\n"
+"Imprime etiquetas de producto con código de barras.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -2932,6 +3089,20 @@ msgid ""
 "    * Date\n"
 "    "
 msgstr ""
+"\n"
+"Establece valores por defecto para las cuentas analíticas.\n"
+"==============================================\n"
+"\n"
+"Permite seleccionar automáticamente cuentas analíticas basadas en "
+"criterios:\n"
+"-----------------------------------------------------------------------------"
+"--------------------------------------------------\n"
+"    * Producto\n"
+"    * Empresa\n"
+"    * Usuario\n"
+"    * Compañía\n"
+"    * Fecha\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.bb
@@ -3076,6 +3247,17 @@ msgid ""
 "        * Files by Partner (graph)\n"
 "        * Files Size by Month (graph)\n"
 msgstr ""
+"\n"
+"Éste es un completo sistema gestor de documentos.\n"
+"==============================================\n"
+"    * Autentifación de usuario\n"
+"    * Indexación de documentos: pptx y docx no están soportados en la "
+"plataforma Windows.\n"
+"    * El tablero para los documentos incluye:\n"
+"        * Nuevos archivos (lista)\n"
+"        * Archivos por tipo de recurso (gráfico)\n"
+"        * Archivos por empresa (gráfico)\n"
+"        * Tamaño de archivos por mes (gráfico)\n"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3125,6 +3307,43 @@ msgid ""
 "* Monthly Turnover (Graph)\n"
 "    "
 msgstr ""
+"\n"
+"Gestiona presupuestos y pedidos de venta\n"
+"==================================\n"
+"\n"
+"Esta aplicación permite gestionar los objetivos de venta de una manera "
+"eficiente y eficaz siguiendo todos los pedidos de venta y su historial.\n"
+"\n"
+"Maneja el flujo completo de ventas:\n"
+"\n"
+"* **Presupuesto** -> **Pedido de venta** -> **Factura**\n"
+"\n"
+"Preferencias (sólo con la gestión de almacenes instalada)\n"
+"-----------------------------------------------------------------------------"
+"------------\n"
+"\n"
+"Si también tiene instalada la gestión de almacenes, puede gestionar las "
+"siguientes preferencias:\n"
+"\n"
+"* Envío: Elección de envío total o parcial\n"
+"* Facturación: Escoja cómo serán pagadas las facturas\n"
+"* Incoterms: Términos de comercio internacional\n"
+"\n"
+"Puede elegir métodos de facturación flexibles:\n"
+"\n"
+"* 'Bajo demanda': Las facturas se crean manualmente desde los pedidos de "
+"venta cuando sean necesarias.\n"
+"* 'Con la orden de entrega': Las facturas se generan desde el albarán "
+"(entrega).\n"
+"* 'Antes del envío': Se crea una factura borrador y debe ser pagada antes "
+"del envío.\n"
+"\n"
+"El tablero para el responsable de compras incluye\n"
+"----------------------------------------------------------------------------"
+"\n"
+"* Mis presupuestos\n"
+"* Volumen de negocios mensual (Gráfico)\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window,res_id:0
@@ -3237,6 +3456,15 @@ msgid ""
 "This module is currently not compatible with the ``user_ldap`` module and\n"
 "will disable LDAP authentication completely if installed at the same time.\n"
 msgstr ""
+"\n"
+"Contraseñas encriptadas\n"
+"==================\n"
+"\n"
+"Interacción con autentificación LDAP:\n"
+"-------------------------------------------------------------\n"
+"Este módulo no es compatible actualmente con el módulo 'user_ldap' y "
+"deshabilitará completamente la autentificación LDAP si se instala al mismo "
+"tiempo.\n"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
@@ -3293,6 +3521,31 @@ msgid ""
 "* Purchase Analysis\n"
 "    "
 msgstr ""
+"\n"
+"Gestiona los requisitos de bienes por pedidos de compra fácilmente\n"
+"========================================================\n"
+"\n"
+"La gestión de compras le permite seguir la solicitudes de presupuesto de sus "
+"proveedores y convertirlas en pedidos de compra si es necesario. OpenERP "
+"tiene varios métodos para monitorizar facturas y rastrear la recepción de "
+"los bienes pedidos. Puede manejar envíos parciales en OpenERP, siguiendo "
+"todos los elementos que aún quedan por recibir en sus pedidos, y puede "
+"enviar recordatorios automáticamente.\n"
+"\n"
+"Las reglas de gestión de reabastecimiento de OpenERP habilitan que el "
+"sistema pueda generar pedidos de compra borrador de forma automática, o se "
+"puede configurar para ejecutar un proceso totalmente impulsado por las "
+"necesidades de producción actuales.\n"
+"\n"
+"El tablero / los informes de gestión de compras serán los siguientes:\n"
+"-----------------------------------------------------------------------------"
+"--------------\n"
+"* Solicitud de presupuestos\n"
+"* Pedidos de compra en espera de aprobación\n"
+"* Compras mensuales por categoría\n"
+"* Análisis de recepciones\n"
+"* Análisis de compras\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
@@ -3373,6 +3626,21 @@ msgid ""
 "    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
 "    "
 msgstr ""
+"\n"
+"Reglas salariales belgas.\n"
+"======================\n"
+"\n"
+"    * Detalles de empleado\n"
+"    * Contratos de empleado\n"
+"    * Contrato basado en el pasaporte\n"
+"    * Complementos / Deducciones\n"
+"    * Permite configurar el salario base/bruto/neto.\n"
+"    * Nómina del empleado\n"
+"    * Registro mensual de nóminas\n"
+"    * Integrado con la gestión de vacaciones\n"
+"    * Maj del salario, ONSS, retención de impuestos, complemento por niños, "
+"...\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:174
@@ -3563,11 +3831,25 @@ msgid ""
 "      above. Specify the interval information and partner to be invoice.\n"
 "    "
 msgstr ""
+"\n"
+"Crea documentos recurrentes.\n"
+"===========================\n"
+"\n"
+"Este módulo permite crear nuevos documentos y añadir suscripciones en ese "
+"documento.\n"
+"\n"
+"Por ejemplo, tener una factura generada automáticamente periódicamente:\n"
+"-------------------------------------------------------------\n"
+"    * Defina un tipo de documento basado en el objeto factura\n"
+"    * Defina una suscripción cuyo documento fuente es el documento definido "
+"antes. Especifique la información del intervalo y la empresa a ser "
+"facturada.\n"
+"    "
 
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
-msgstr ""
+msgstr "Lema de la compañía"
 
 #. module: base
 #: code:addons/base/res/res_users.py:668
@@ -3708,6 +3990,22 @@ msgid ""
 "    - Yearly Salary by Head and Yearly Salary by Employee Report\n"
 "    "
 msgstr ""
+"\n"
+"Reglas salariales indias.\n"
+"============================\n"
+"\n"
+"    - Configuración de hr_payroll para la localización india.\n"
+"    - Todas las principales contribuciones para la nómina india.\n"
+"    * Nuevo informe de nómina\n"
+"    * Contratos de empleado\n"
+"    * Permite configurar salario base / bruto / neto\n"
+"    * Nómina de empleado\n"
+"    * Complementos / Deducciones\n"
+"    * Integrado con el gestor de vacaciones\n"
+"    * Contribución médica, de viajes, por niños...\n"
+"    - Notificaciones de pagos e informe\n"
+"    - Informes de salarios anuales por responsable y empleado\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:3870
@@ -4235,7 +4533,7 @@ msgstr "Se ha detectado recursividad."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_et
 msgid "Ethiopia - Accounting"
-msgstr ""
+msgstr "Ethiopia - Contabilidad"
 
 #. module: base
 #: code:addons/base/module/module.py:366
@@ -4580,6 +4878,33 @@ msgid ""
 ".. _link: http://puc.com.co/normatividad/\n"
 "    "
 msgstr ""
+"\n"
+"Plan de cuentas para Colombia\n"
+"=============================\n"
+"\n"
+"La fuente de este plan de cuentas es: http://puc.com.co/.\n"
+"\n"
+"Toda la documentación disponible está incrustada en este módulo, para "
+"asegurarse que OpenERP tiene toda la información necesaria para gestionar la "
+"contabilidad en Colombia.\n"
+"\n"
+"La ley que habilita este plan de cuentas como válida para el país se puede "
+"encontrar en: http://puc.com.co/normatividad/.\n"
+"\n"
+"Este módulo tiene la intención de hacer disponible sin más ajustes el plan "
+"de cuentas para Colombia en OpenERP.\n"
+"\n"
+"Recomendamos instalar el módulo 'account_anglo_saxon' para tener los costes "
+"de contabilidad correctamente establecidos en las facturas de cliente.\n"
+"\n"
+"Después de instalar este módulo, se lanza el asistente de configuración para "
+"contabilidad.\n"
+"    * Plantillas de cuentas que pueden ser de ayuda para generar el plan de "
+"cuentas.\n"
+"    * En el asistente, se le preguntará por el nombre de la compañía, la "
+"plantilla de cuentas a utilizar, el nº de dígitos a generar, el código para "
+"las cuentas de banco, y la moneda para crear los diarios.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4638,7 +4963,7 @@ msgstr "S.L."
 #. module: base
 #: model:ir.actions.server,name:base.action_run_ir_action_todo
 msgid "Run Remaining Action Todo"
-msgstr ""
+msgstr "Ejecutar acciones pendientes de realizar"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -4704,6 +5029,15 @@ msgid ""
 "comptable\n"
 "Seddik au cours du troisième trimestre 2010."
 msgstr ""
+"\n"
+"Módulo base para gestionar el plan de cuenta para Marruecos.\n"
+"=================================================================\n"
+"\n"
+"Este módulo es compatible con el plan de cuentas modelo estándar y permite "
+"generar estados contables estándares marroquí (Bilan, CPC (cuentas de "
+"ingresos y gastos), balance general en 6 columnas, mayor acumulado ...).\n"
+"La integración contable se validó mediante la firma de contabilidad Seddik "
+"durante el tercer trimestre de 2010."
 
 #. module: base
 #: help:ir.module.module,auto_install:0
@@ -4867,6 +5201,22 @@ msgid ""
 "very handy when used in combination with the module 'share'.\n"
 "    "
 msgstr ""
+"\n"
+"Personaliza el acceso a su base de datos de OpenERP para usuarios externos "
+"creando portales.\n"
+"============================================================================="
+"===\n"
+"Un portal define un menú y permisos específicos para sus miembros. Este menú "
+"puede verse por los miembros del portal, usuarios anónimos y cualquier otro "
+"usuario que tenga acceso a las características técnicas (por ejemplo, el "
+"administrador). También, cada miembro del portal se enlaza a una empresa "
+"específica.\n"
+"\n"
+"El módulo también asocia grupos de usuario a los usuarios del portal "
+"(añadiendo un grupo en el portal lo añade automáticamente a los usuarios del "
+"portal, etc). Esta característica es muy útil cuando se usa en combinación "
+"con el módulo 'share'.\n"
+"    "
 
 #. module: base
 #: field:multi_company.default,expression:0
@@ -4891,7 +5241,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_sale
 msgid "Quotations, Sales Orders, Invoicing"
-msgstr ""
+msgstr "Presupuesto, pedidos de venta, facturación"
 
 #. module: base
 #: field:res.partner,parent_id:0
@@ -4966,6 +5316,14 @@ msgid ""
 "invite.\n"
 "\n"
 msgstr ""
+"\n"
+"Este módulo actualiza las notas dentro de OpenERP para usar un editor pad "
+"externo\n"
+"=================================================================\n"
+"\n"
+"Usado para actualizar los textos memo en tiempo real con los usuarios a los "
+"que invite.\n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4985,6 +5343,22 @@ msgid ""
 "    * Number Padding\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo mantiene números de secuencia internos para los asientos "
+"contables.\n"
+"======================================================================\n"
+"\n"
+"Permite configurar las secuencias de contabilidad a ser mantenidas.\n"
+"\n"
+"Se puede personalizar los siguientes atributos de la secuencia:\n"
+"-----------------------------------------------------------------------------"
+"----------------------\n"
+"    * Prefijo\n"
+"    * Sufijo\n"
+"    * Próximo número\n"
+"    * Incremento de número\n"
+"    * Relleno del número\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
@@ -5064,6 +5438,17 @@ msgid ""
 "then select the test \n"
 "and print the report from Print button in header area.\n"
 msgstr ""
+"\n"
+"Aseveraciones en contabilidad.\n"
+"==========================\n"
+"Con este módulo se pueden comprobar manualmente consistencias e "
+"inconsistencias del módulo de contabilidad desde el menú Informes / "
+"Contabilidad /Tests contables.\n"
+"\n"
+"Puede escribir una consulta para crear un test de consistencia y se obtendrá "
+"el test en formato PDF, que puede ser accedido desde el menú Informes / "
+"Contabilidad / Tests contables, seleccionando el test e imprimiendo el "
+"informe desde el botón de impresión en el área de cabecera.\n"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -5113,6 +5498,19 @@ msgid ""
 "for\n"
 "this event.\n"
 msgstr ""
+"\n"
+"Crear inscripciones con los pedidos de venta.\n"
+"=======================================\n"
+"\n"
+"Este módulo permite automatizar y conectar la creación de inscripciones con "
+"el flujo principal de venta y, por tanto, habilitar la característica de "
+"facturación de las inscripciones.\n"
+"\n"
+"Define un nuevo tipo de productos de servicio que ofrece la posibilidad de "
+"escoger una categoría de evento asociada a ello. Cuando introduzca un pedido "
+"de venta para ese producto, podrá escoger un evento existente de esa "
+"categoría y al confirmar el pedido de venta se creará automáticamente una "
+"inscripción para ese evento.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_order_dates
@@ -5127,6 +5525,16 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"Añade información de fechas adicionales al pedido de venta.\n"
+"===================================================\n"
+"\n"
+"Se puede añadir las siguientes fechas adicionales al pedido de venta:\n"
+"-----------------------------------------------------------------------------"
+"--------------------------\n"
+"    * Fecha solicitada\n"
+"    * Fecha comprometida\n"
+"    * Fecha efectiva\n"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -5181,6 +5589,20 @@ msgid ""
 "You can also use the geolocalization without using the GPS coordinates.\n"
 "    "
 msgstr ""
+"\n"
+"Éste es el módulo usado por OpenERP SA para redigir clientes a sus socios, "
+"basados en la geolocalización.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"Puede geolocalizar sus oportunidades usando este módulo.\n"
+"\n"
+"Use la geolocalización cuando asigne oportunidades a sus empresas. Determine "
+"las coordenadas GPS de acuerdo a la dirección de la empresa.\n"
+"\n"
+"Se asignará el socio más apropiado.\n"
+"Puede también usar la geolocalización sin utilizar coordenadas GPS.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5375,6 +5797,20 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite a los usuarios realizar segmentación en las empresas.\n"
+"=================================================================\n"
+"\n"
+"Usa criterios de perfiles del módulo de segmentación anterior y los mejora, "
+"gracias al nuevo concepto de cuestionario. Ahora se pueden reagrupar "
+"preguntas en un cuestionario y usarlo directamente en una empresa.\n"
+"\n"
+"También se ha combinado con la anterior herramienta de segmentación de CRM & "
+"SRM, porque se solapaban.\n"
+"\n"
+"    **Nota:** este módulo no es compatible con el módulo 'segmentation', ya "
+"que es el mismo que ha sido renombrado.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.gt
@@ -5437,7 +5873,7 @@ msgstr "Integración con Google Docs"
 #. module: base
 #: help:ir.attachment,res_model:0
 msgid "The database object this attachment will be attached to"
-msgstr ""
+msgstr "Objeto de la base de datos a la que será añadido este adjunto"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:327
@@ -5660,7 +6096,7 @@ msgstr "Acceso completo"
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pt
 msgid "Plano de contas SNC para Portugal"
-msgstr ""
+msgstr "Plan de cuentas SNC para Portugal"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5729,6 +6165,12 @@ msgid ""
 "Collects web application usage with Google Analytics.\n"
 "    "
 msgstr ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Recoge estadísticas de uso de la aplicación con Google Analytics.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
@@ -6004,6 +6446,13 @@ msgid ""
 "wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Asistente de facturación para envíos.\n"
+"=================================\n"
+"\n"
+"Cuando envía o entrega bienes, este módulo lanza automáticamente el "
+"asistente de facturación si se debe facturar el envío.\n"
+"    "
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -6464,6 +6913,10 @@ msgid ""
 "===============================================\n"
 "    "
 msgstr ""
+"\n"
+"Permite a los usuarios registrarse y restablecer su contraseña\n"
+"===============================================\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
@@ -6663,7 +7116,7 @@ msgstr "Sin categoría"
 #. module: base
 #: view:res.partner:0
 msgid "Phone:"
-msgstr ""
+msgstr "Teléfono:"
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -7420,7 +7873,7 @@ msgstr "Reino Unido"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pa
 msgid "Panama Localization Chart Account"
-msgstr ""
+msgstr "Localización del plan de cuentas de Panamá"
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -7527,6 +7980,27 @@ msgid ""
 "* In a module, so that administrators and users of OpenERP who do not\n"
 "  need or want an online import can avoid it being available to users.\n"
 msgstr ""
+"\n"
+"Nueva importación de archivos extensible para OpenERP\n"
+"==============================================\n"
+"\n"
+"Reimplementa el sistema de importación de archivos de OpenERP:\n"
+"\n"
+"* Del lado del servidor, el anterior sistema fuerza la mayoría de la lógica "
+"en el cliente, lo que duplicaba el esfuerzo (entre diferentes clientes, hace "
+"mucho más difícil de usar sin un cliente (RPC directo u otras formas de "
+"automatización) y hace mucho más difícil la recolección del conocimiento del "
+"sistema de importación/exportación, puesto que se expande en 3+ proyectos "
+"diferentes.\n"
+"\n"
+"* De una manera más flexible, para que los usuarios y las empresas puedan "
+"construir su propio front-end para importar otros formatos de archivos (por "
+"ejemplo, archivos OpenDocument), que serán más fáciles de manejar en su "
+"flujo de trabajo o de sus fuentes de datos en producción.\n"
+"\n"
+"* En un sólo módulo, para que los usuarios de OpenERP que no lo necesiten o "
+"los administradores que no quieran importación en línea puedan evitar "
+"hacerlo disponible a los usuarios.\n"
 
 #. module: base
 #: selection:res.currency,position:0
@@ -7690,6 +8164,16 @@ msgid ""
 "their status quickly as they evolve.\n"
 "    "
 msgstr ""
+"\n"
+"Gestionar incidencias/errores para proyectos\n"
+"=========================================\n"
+"Esta aplicación permite gestionar las incidencias que se encuentran en un "
+"proyecto, así como los errores en un sistema, quejas de cliente o roturas de "
+"material.\n"
+"\n"
+"Permite al responsable comprobar rápidamente las incidencias, asignarlas y "
+"decidir su estado conforme evolucionan.\n"
+"    "
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -7716,6 +8200,19 @@ msgid ""
 "up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo implementa un sistema de partes de horas.\n"
+"==============================================\n"
+"\n"
+"Cada empleado puede codificar y seguir su tiempo gastado en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo gastado en el "
+"proyecto genera costes en la cuenta analítica.\n"
+"\n"
+"Se incluyen multitud de informes de rastreo del tiempo y de los empleados.\n"
+"\n"
+"Está completamente integrado con el módulo de contabilidad de costes. "
+"Permite establecer una gestión por asuntos.\n"
+"    "
 
 #. module: base
 #: field:res.bank,state:0
@@ -7904,6 +8401,18 @@ msgid ""
 "trigger an automatic reminder email.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite implementar reglas de acción para cada objeto.\n"
+"============================================================\n"
+"\n"
+"Use acciones automáticas para lanzar automáticamente acciones para varias "
+"pantallas.\n"
+"\n"
+"**Ejemplo:** Una iniciativa creada por un usuario específico podría "
+"establecerse automáticamente a un equipo de ventas, o una oportunidad que "
+"tiene estado pendiente después de 14 días podría lanzar un correo automático "
+"de recordatorio.\n"
+"    "
 
 #. module: base
 #: field:res.partner,function:0
@@ -7950,7 +8459,7 @@ msgstr "Islas Marianas del Norte"
 #. module: base
 #: field:change.password.user,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Nombre de usuario"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -8198,7 +8707,7 @@ msgstr "Esta ventana"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_anonymous
 msgid "Anonymous portal"
-msgstr ""
+msgstr "Portal anónimo"
 
 #. module: base
 #: field:base.language.export,format:0
@@ -8302,6 +8811,16 @@ msgid ""
 "shortcut.\n"
 "    "
 msgstr ""
+"\n"
+"Habilita la característica de accesos directos en el cliente web.\n"
+"===================================================\n"
+"\n"
+"Añade un icono de acceso directo en la barra de sistema para acceder a los "
+"accesos directos del usuario (si hay alguno).\n"
+"\n"
+"Añade un icono de acceso directo dentro del título de las vista para "
+"añadir/eliminar accesos directos.\n"
+"    "
 
 #. module: base
 #: field:res.company,rml_header2:0
@@ -8388,6 +8907,21 @@ msgid ""
 "requested it.\n"
 "    "
 msgstr ""
+"\n"
+"Traducciones automáticas a través de la API Gengo\n"
+"========================================\n"
+"\n"
+"Este módulo instala una tarea del planificador pasiva para traducciones "
+"automáticas utilizando la API Gengo. Para activarla, debe\n"
+"1) Configurar los parámetros de autentificación de Gengo en  'Configuración "
+"> Compañías > Parámetros Gengo'\n"
+"2) Ejecutar el asistente en 'Configuración > Términos de la aplicación > "
+"Gengo: Petición manual de traducción' y seguir el asistente.\n"
+"\n"
+"Este asistente activará una tarea CRON y el planificador iniciará la "
+"traducción automática vía los servicios de Gengo para todos los términos que "
+"solicite.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8791,6 +9325,51 @@ msgid ""
 "of creation of distribution models.\n"
 "        "
 msgstr ""
+"\n"
+"Este módulo permite usar varios planes analíticas de acuerdo al diario "
+"general.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"Con él se pueden crear varias líneas analíticas cuando la factura o las "
+"entradas se confirman.\n"
+"\n"
+"Por ejemplo, puede definir la siguiente estructura analítica:\n"
+"-----------------------------------------------------------------------------"
+"-------------------\n"
+"  * **Proyectos**\n"
+"      * Proyecto 1\n"
+"          + Subproyecto 1.1\n"
+"          + Subproyecto 1.2\n"
+"\n"
+"      * Proyecto 2\n"
+"      \n"
+"  * **Comercial**\n"
+"      * Eric\n"
+"      * Fabien\n"
+"\n"
+"Aquí, hay dos planes: proyectos y comercial. Una línea de factura debe ser "
+"capaz de escribir entradas analíticas en 2 planes: Subproyecto 1.1 y Fabien. "
+"El importe puede ser dividido.\n"
+" \n"
+"El siguiente ejemplo es para una factura que toca los dos subproyectos y "
+"asigna a un comercial:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"**Plan1:**\n"
+"\n"
+"    * Subproyecto 1.1 : 50%\n"
+"    * Subproyecto 1.2 : 50%\n"
+"    \n"
+"**Plan2:**\n"
+"    Eric: 100%\n"
+"\n"
+"Por lo que cuando esta línea de factura se confirme, generará 3 líneas "
+"analítica para un apunte contable.\n"
+"\n"
+"El plan analítico valida el porcentaje mínimo y máximo a la hora de la "
+"creación de los modelos de distribución.\n"
+"        "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -9191,6 +9770,19 @@ msgid ""
 "\n"
 "Notes can be found in the 'Home' menu.\n"
 msgstr ""
+"\n"
+"Este módulo permite a los usuarios crear sus propias notas dentro de "
+"OpenERP\n"
+"=================================================================\n"
+"\n"
+"Use las notes para escribir apuntes de reuniones, organizar ideas, organizar "
+"lista de tareas pendientes personales, etc. Cada usuario gestiona sus "
+"propias notas personales. Las notas están disponibles sólo para sus autores, "
+"pero pueden ser compartidas con otros usuarios para que varias personas "
+"puedan trabajar en la misma nota en tiempo real. Es muy eficiente compartir "
+"apuntes de reuniones.\n"
+"\n"
+"Las notas podrán encontrarse en el menú 'Inicio'.\n"
 
 #. module: base
 #: model:res.country,name:base.dm
@@ -9376,6 +9968,10 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:res.lang:0
@@ -9530,6 +10126,23 @@ msgid ""
 "* Show all costs associated to a vehicle or to a type of service\n"
 "* Analysis graph for costs\n"
 msgstr ""
+"\n"
+"Vehículos, leasing, seguros, costes\n"
+"==================================\n"
+"Con este módulo, OpenERP le ayuda a gestionar todos sus vehículos, el "
+"contrato asociado a dichos vehículos y sus servicios, registro de "
+"combustible, costes y otras muchas características necesarias para la "
+"gestión de su flota de vehículo(s).\n"
+"\n"
+"Características principales\n"
+"--------------------------------------------\n"
+"* Añadir vehículos a su flota\n"
+"* Gestionar contratos por vehículos\n"
+"* Recordatorios cuando un contrato llega a su fecha de expiración\n"
+"* Añadir servicios, registros de combustible, valores de odómetro para todos "
+"los vehículos\n"
+"* Mostrar todos los costes asociados a un vehículo o a un tipo de servicio\n"
+"* Gráficos de análisis para costes\n"
 
 #. module: base
 #: field:multi_company.default,company_dest_id:0
@@ -10121,7 +10734,7 @@ msgstr "Accesos rápidos personalizados"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_si
 msgid "Slovenian - Accounting"
-msgstr ""
+msgstr "Contabilidad eslovena"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -10387,6 +11000,28 @@ msgid ""
 "Accounting/Invoicing settings.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo añade un menú de ventas al portal mientras estén instalados los "
+"módulos 'sale' y 'portal'.\n"
+"============================================================================="
+"=========\n"
+"\n"
+"Después de instalar este módulo, los usuarios del portal podrán acceder a "
+"sus propios documentos a través de los siguientes menús:\n"
+"\n"
+"  - Presupuestos\n"
+"  - Pedidos de venta\n"
+"  - Órdenes de entrega\n"
+"  - Productos (los públicos)\n"
+"  - Facturas\n"
+"  - Pagos/Reembolsos\n"
+"\n"
+"Si se han configurado métodos de pago en línea, los usuarios del portal "
+"también tendrán la oportunidad de pagar en línea sus pedidos de venta y "
+"facturas que aún no estén pagadas. Paypal se incluye por defecto. Sólo es "
+"necesario configurar una cuenta de Paypal en la configuración de "
+"contabilidad / facturación.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:316
@@ -10662,7 +11297,7 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Nombre del archivo almacenado"
 
 #. module: base
 #: field:res.partner,use_parent_address:0
@@ -10904,7 +11539,7 @@ msgstr "Unidad de intervalo"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_stock
 msgid "Portal Stock"
-msgstr ""
+msgstr "Portal para stock"
 
 #. module: base
 #: field:workflow.activity,kind:0
@@ -11137,7 +11772,7 @@ msgstr "Restricción PostgreSQL o nombre de la clave externa."
 #. module: base
 #: view:res.company:0
 msgid "Click to set your company logo."
-msgstr ""
+msgstr "Pulse para establecer el logo de la compañía"
 
 #. module: base
 #: view:res.lang:0
@@ -11186,6 +11821,13 @@ msgid ""
 "pads (by default, http://ietherpad.com/).\n"
 "    "
 msgstr ""
+"\n"
+"Añade soporte extendido para adjuntos (Ether)Pad en el cliente web.\n"
+"===================================================================\n"
+"\n"
+"Permite a la compañía personalizar que instalación de Pad debe usarse para "
+"enlazar con nuevos pads (por defecto, http://ietherpad.com/).\n"
+"    "
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -11411,6 +12053,31 @@ msgid ""
 "    Reporting / Accounting / **Follow-ups Analysis\n"
 "\n"
 msgstr ""
+"\n"
+"Módulo para automatizar cartas para facturas impagadas, con avisos multi-"
+"nivel.\n"
+"=========================================================================\n"
+"\n"
+"Puede definir múltiples niveles de aviso a través del menú:\n"
+"---------------------------------------------------------------\n"
+"    Configuración / Niveles de seguimiento\n"
+"    \n"
+"Una vez definidos, puede imprimir automáticamente avisos cada día a través "
+"del menú:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Seguimientos de pago / Enviar correos electrónicos y cartas\n"
+"\n"
+"Generará un PDF / enviará correos electrónicos / establecerá acciones "
+"manuales de acuerdo a los diferentes niveles de aviso definidos. Puede "
+"definir diferentes políticas para diferentes compañías.\n"
+"\n"
+"Tenga en cuenta que si quiere comprobar el nivel de aviso para una "
+"empresa/cuenta dad, puede hacerlo desde el menú:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Informes / Contabilidad / **Análisis de seguimientos\n"
+"\n"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:728
@@ -11591,6 +12258,21 @@ msgid ""
 "You can define the different phases of interviews and easily rate the "
 "applicant from the kanban view.\n"
 msgstr ""
+"\n"
+"Gestiona puestos de trabajo y el proceso de reclutamiento\n"
+"================================================\n"
+"\n"
+"Esta aplicación permite gestionar los puestos de trabajo, vacantes, "
+"solicitantes, entrevistas...\n"
+"\n"
+"Está integrado con la pasarela de correo electrónico para coger "
+"automáticamente el correo enviado a <jobs@tucompañia.com> en la lista de "
+"solicitudes. También está integrado con el sistema de gestión documental "
+"para almacenar y buscar en la base de CV y encontrar el candidato que está "
+"buscando. Similarmente, está integrado con el módulo de encuestas para "
+"permitir definir entrevistas para diferentes puestos. Puede definir diversas "
+"fases de entrevistas y puntuar fácilmente al solicitante desde la vista "
+"kanban.\n"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -11671,7 +12353,7 @@ msgstr "Tipo de secuencias"
 #. module: base
 #: view:res.partner:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Móvil:"
 
 #. module: base
 #: code:addons/base/res/res_bank.py:195
@@ -11819,7 +12501,7 @@ msgstr "Material de oficina"
 #. module: base
 #: field:ir.attachment,res_model:0
 msgid "Resource Model"
-msgstr ""
+msgstr "Modelo del recurso"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -11997,7 +12679,7 @@ msgstr "Nombre provincia"
 #. module: base
 #: help:ir.attachment,type:0
 msgid "Binary File or URL"
-msgstr ""
+msgstr "Archivo binario o URL"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:313
@@ -12237,6 +12919,13 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes.\n"
+"\n"
+"Con la colaboración de:\n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:293
@@ -12563,11 +13252,20 @@ msgid ""
 "into mail.message with attachments.\n"
 "      "
 msgstr ""
+"\n"
+"Este módulo provee el conector de Outlook.\n"
+"=========================================\n"
+"\n"
+"El conector de Outlook permite seleccionar el objeto al que quiera añadir un "
+"correo y sus adjuntos desde MS Outlook. Se puede seleccionar una empresa, "
+"una tarea, un proyecto, una cuenta analítica, o cualquier otro objeto, y "
+"archivar el correo seleccionado en mail.message con los adjuntos.\n"
+"      "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_bo
 msgid "Bolivia Localization Chart Account"
-msgstr ""
+msgstr "Localización del plan de cuentas para Bolivia"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12666,6 +13364,39 @@ msgid ""
 "Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"El módulo de diario de ventas permite categorizar sus ventas y entregas "
+"(albaranes) entre diferentes diarios.\n"
+"============================================================================="
+"===========\n"
+"\n"
+"Este módulo es muy útil para compañías grandes que trabajan por "
+"departamentos.\n"
+"\n"
+"Puede usar un diario para diversos propósitos. Por ejemplo:\n"
+"-----------------------------------------------------------------------------"
+"--------------------\n"
+"    * separar ventas de varios departamentos\n"
+"    * diarios para entregas por camión o por UPS\n"
+"\n"
+"Los diarios tienen un responsables y evolucionan entre diferentes estados:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------------\n"
+"    * borrador, abierto, cancelado, realizado.\n"
+"\n"
+"Se pueden procesar operaciones en lote en los diferentes diarios para "
+"confirmar todas las ventas de una, validarlas o realizar facturación "
+"empaquetada.\n"
+"\n"
+"También soporta métodos de facturación en lote que puede ser configurados "
+"por empresas y pedidos de venta. Ejemplos:\n"
+"-----------------------------------------------------------------------------"
+"--------------------------\n"
+"    * facturación diaria\n"
+"    * facturación mensual\n"
+"\n"
+"Se proveen algunas estadísticas por diarios.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:469
@@ -12997,7 +13728,7 @@ msgstr "Selección"
 #: model:ir.actions.act_window,name:base.change_password_wizard_action
 #: view:res.users:0
 msgid "Change Password"
-msgstr ""
+msgstr "Cambiar la contraseña"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -13097,6 +13828,20 @@ msgid ""
 "    * Repair quotation report\n"
 "    * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"El objetivo es tener un completo módulo para gestionar las reparaciones de "
+"los productos.\n"
+"====================================================================\n"
+"\n"
+"Los siguientes temas deberían estar cubiertos con este módulo:\n"
+"-----------------------------------------------------------------------------"
+"-----------------\n"
+"    * Añadir/eliminar productos en la reparación\n"
+"    * Impacto en los stocks\n"
+"    * Facturación (productos y/o servicios)\n"
+"    * Concepto de garantía\n"
+"    * Informe de presupuesto de reparación\n"
+"    * Notas para el técnico y para el cliente final\n"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -13335,7 +14080,7 @@ msgstr "Formato de dirección"
 #. module: base
 #: model:ir.model,name:base.model_change_password_user
 msgid "Change Password Wizard User"
-msgstr ""
+msgstr "Asistente de cambio de contraseña del usuario"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
@@ -13830,6 +14575,22 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite gestionar todas las operaciones para la gestión de "
+"socios.\n"
+"=========================================================================\n"
+"\n"
+"Soporte diferentes tipos de miembros:\n"
+"--------------------------------------------------------\n"
+"    * Miembro gratuito\n"
+"    * Miembro asociado (por ejemplo: un grupo que se suscribe para todas sus "
+"filiales)\n"
+"    * Miembros pagados\n"
+"    * Precios especiales de miembros\n"
+"\n"
+"Está integrado con las ventas y la contabilidad para permitir facturar y "
+"enviar propuestas de renovación a los miembros.\n"
+"    "
 
 #. module: base
 #: selection:res.currency,position:0
@@ -13862,6 +14623,13 @@ msgid ""
 "Test suite example, same code as that used in the testing documentation.\n"
 "    "
 msgstr ""
+"\n"
+"Demo web de OpenERP de la suite de test\n"
+"================================\n"
+"\n"
+"Ejemplo de suite de test, mismo código que el usado en la documentación de "
+"prueba.\n"
+"    "
 
 #. module: base
 #: help:ir.cron,function:0
@@ -14073,11 +14841,22 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"Gestionar reclamaciones de clientes.\n"
+"==============================\n"
+"Esta aplicación permite seguir las reclamaciones y quejas de sus "
+"clientes/proveedores.\n"
+"\n"
+"Está totalmente integrada con la pasarela de correo electrónico para que se "
+"puedan crear automáticamente nuevas reclamaciones basadas en correos "
+"entrantes.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_test
 msgid "Accounting Consistency Tests"
-msgstr ""
+msgstr "Tests de consistencia de contabilidad"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
@@ -14091,6 +14870,13 @@ msgid ""
 "exceeds minimum amount set by configuration wizard.\n"
 "    "
 msgstr ""
+"\n"
+"Doble validación para compras que excedan un importe máximo.\n"
+"=========================================================\n"
+"\n"
+"Este módulo modifica el flujo de ventas de compras para validar compras que "
+"exceden de un importe establecido en el asistente de configuración.\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_administration
@@ -14448,7 +15234,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -14562,6 +15348,15 @@ msgid ""
 "and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite al administrador seguir cada operación de usuario en "
+"todos los objetos del sistema.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"El administrador puede suscribirse a reglas para la lectura, escritura o "
+"eliminación en los objetos y puede comprobar los registros.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
@@ -14840,6 +15635,22 @@ msgid ""
 "    Unit price=225, Discount=0,00, Net price=225.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite calcular descuentos en las líneas de pedido de venta y "
+"en las líneas de factura basados en la tarifa de la empresa.\n"
+"============================================================================="
+"==================================\n"
+"\n"
+"Con esta finalidad, una nueva casilla llamada 'Descuento visible' se añade "
+"al formulario de la tarifa.\n"
+"\n"
+"**Ejemplo:**\n"
+"    Para el producto PC1 y la empresa 'Asustek': si la tarifa=450, y el "
+"precio calculado usando la tarifa de Asustek es 225. Si la casilla está "
+"marcada, en la línea del pedido de venta pondrá: Precio unitario=450, "
+"Descuento=50,00, Precio neto=225. Si la casilla no está marcada, entonces "
+"pondrá: Precio unitario=225, Descuento=0,00, Precio neto=225\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm
@@ -14948,6 +15759,12 @@ msgid ""
 "=============\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo añade reglas de acceso a su portal si los módulos 'stock' y "
+"'portal' están instalados.\n"
+"============================================================================="
+"=============\n"
+"    "
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14981,7 +15798,7 @@ msgstr "Configuración del sistema realizada."
 #. module: base
 #: field:ir.attachment,db_datas:0
 msgid "Database Data"
-msgstr ""
+msgstr "Datos de la base de datos"
 
 #. module: base
 #: model:res.country,name:base.tc
@@ -15026,6 +15843,19 @@ msgid ""
 "anonymization process to recover your previous data.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite anonimizar una base de datos.\n"
+"===============================================\n"
+"\n"
+"Este módulo permite mantener sus datos confidenciales para una base de datos "
+"dada. Este proceso es útil, si se quiere usar el proceso de migración y "
+"proteger sus propios datos o los de su cliente. El principio de "
+"funcionamiento es que se ejecuta una herramienta de anonimización que "
+"esconde los datos confidenciales (son sustituidos por caracteres 'XXX'). "
+"Entonces se puede enviar la base de datos anonimizada al equipo de "
+"migración. Una vez de vuelta la base de datos migrada, se puede restaurar y "
+"revertir el proceso de anonimización para recuperar los datos previos.\n"
+"    "
 
 #. module: base
 #: help:ir.sequence,implementation:0
@@ -15167,7 +15997,7 @@ msgstr "Tailandia"
 #. module: base
 #: model:ir.model,name:base.model_change_password_wizard
 msgid "Change Password Wizard"
-msgstr ""
+msgstr "Asistente de cambio de contraseña"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
@@ -15212,6 +16042,25 @@ msgid ""
 ".. SAT: http://www.sat.gob.mx/\n"
 "    "
 msgstr ""
+"\n"
+"Configuración mínima de contabilidad para México.\n"
+"============================================\n"
+"\n"
+"Este plan de cuentas es una propuesta mínima para usar la características de "
+"contabilidad de OpenERP.\n"
+"\n"
+"No pretende ser toda la localización para México, sólo los datos mínimos "
+"para empezar de 0 en la localización mexicana.\n"
+"\n"
+"Este módulo y sus contenidos es actualizado frecuentemente por el equipo de "
+"openerp-mexico.\n"
+"\n"
+"Con este módulo tendrá:\n"
+"\n"
+" - Plan de cuentas mínimo comprobado en entornos en producción.\n"
+" - Plan de impuestos mínimo, para cumplir con los requisitos del SAT "
+"(http://www.sat.gob.mx/).\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_tr
@@ -15226,6 +16075,16 @@ msgid ""
 "      bilgileriniz, ilgili para birimi gibi bilgiler isteyecek.\n"
 "    "
 msgstr ""
+"\n"
+"Módulo de plantilla de cuentas contables de OpenERP para Turquía.\n"
+"=========================================================\n"
+"\n"
+"Después de instalar este módulo, ejecute el asistente de configuración de "
+"contabilidad\n"
+"* El asistente será responsable de la plantilla del plan de cuentas, la "
+"compañía creada, la información de las cuentas bancarias, y de solicitar "
+"información, tal como la moneda que se usa.\n"
+"    "
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -15313,7 +16172,7 @@ msgstr "Aplicar para escritura"
 #. module: base
 #: field:ir.ui.menu,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Padre izquierdo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_page
@@ -15433,6 +16292,16 @@ msgid ""
 "    - Regional State listings\n"
 "    "
 msgstr ""
+"\n"
+"Módulo base para la localización etíope.\n"
+"======================================\n"
+"\n"
+"Ésta es la última localización de OpenERP para Etiopía y consiste en:\n"
+"    - Plan de cuentas\n"
+"    - Estructura de impuestos\n"
+"    - Estructura de retenciones\n"
+"    - Listado de regiones\n"
+"    "
 
 #. module: base
 #: view:res.users:0
@@ -15571,6 +16440,21 @@ msgid ""
 "The managers can obtain an easy view of best ideas from all the users.\n"
 "Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"Este módulo permite al usuario participar fácil y eficientemente en la "
+"innovación de la empresa.\n"
+"============================================================================="
+"==========\n"
+"\n"
+"Permite a todo el mundo expresar ideas sobre diferentes asuntos. Entonces, "
+"los usuarios pueden comentar sobre estas ideas y votar algunas. Cada idea "
+"tiene una puntuación basada en los diferentes votos.\n"
+"\n"
+"Los responsables puede obtener un vista sencilla de las mejores ideas para "
+"todos los usuarios.\n"
+"\n"
+"Una vez instalado, compruebe el menú 'Idead' en el menú principal "
+"'Herramientas'."
 
 #. module: base
 #: code:addons/orm.py:5321
@@ -15612,6 +16496,28 @@ msgid ""
 "have a new option to import payment orders as bank statement lines.\n"
 "    "
 msgstr ""
+"\n"
+"Módulo para gestionar el pago de las facturas de proveedor.\n"
+"=======================================================\n"
+"\n"
+"Este módulo permite crear y gestionar sus órdenes de pago, con los "
+"siguientes propósitos:\n"
+"-----------------------------------------------------------------------------"
+"---- \n"
+"    * servir como base para un conector para múltiples mecanismos de pago "
+"automáticos.\n"
+"    * proveer una forma más eficiente de gestionar el pago de facturas.\n"
+"\n"
+"Advertencia:\n"
+"~~~~~~~~\n"
+"La confirmación de una orden de pago no crea asientos contable, sólo "
+"registra el hecho de que ha dado la orden de pago al banco. El registro de "
+"la orden debe codificarse como habitualmente a través del extracto bancario. "
+"De hecho, sólo cuando se recibe la confirmación del banco que la orden ha "
+"sido aceptada cuando tiene que registrarlo en su contabilidad. Para ayudar "
+"con esta operación, tiene una nueva opción para importar las órdenes de pago "
+"con líneas de extractos bancarios.\n"
+"    "
 
 #. module: base
 #: field:ir.model,access_ids:0
@@ -16173,7 +17079,7 @@ msgstr "Canada - Contabilidad"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_co
 msgid "Colombian - Accounting"
-msgstr ""
+msgstr "Contabilidad colombiana"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_voucher
@@ -16270,7 +17176,7 @@ msgstr "Condición"
 #: model:ir.actions.client,name:base.modules_updates_act_cl
 #: model:ir.ui.menu,name:base.menu_module_updates
 msgid "Updates"
-msgstr ""
+msgstr "Actualizaciones"
 
 #. module: base
 #: help:res.currency,rate:0
@@ -16362,7 +17268,7 @@ msgstr "Contenido del SXW"
 #. module: base
 #: field:ir.attachment,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Tamaño del archivo"
 
 #. module: base
 #: help:ir.sequence,prefix:0
@@ -16404,7 +17310,7 @@ msgstr "Información general"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pt
 msgid "Portugal - Chart of Accounts"
-msgstr ""
+msgstr "Portugal - Plan de cuentas"
 
 #. module: base
 #: field:ir.model.data,complete_name:0
@@ -16486,7 +17392,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Installed Modules"
-msgstr ""
+msgstr "Módulos instalados"
 
 #. module: base
 #: code:addons/base/res/res_users.py:170
@@ -16517,7 +17423,7 @@ msgstr "Función"
 #. module: base
 #: field:ir.ui.menu,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Padre derecho"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
@@ -16550,6 +17456,24 @@ msgid ""
 "* Cumulative Flow\n"
 "    "
 msgstr ""
+"\n"
+"Gestiona proyectos multi-nivel, tareas, y trabajo realizado en las tareas\n"
+"=====================================================\n"
+"\n"
+"Esta aplicación permite un sistema de gestión de proyectos operacional para "
+"organizar sus actividades en tareas y planificar el trabajo necesario para "
+"tener las tareas completadas.\n"
+"\n"
+"Los diagramas de Gantt dan una representación gráfica de los planes del "
+"proyecto, así como la disponibilidad de recursos y la carga de trabajo.\n"
+"\n"
+"El tablero / los informes para la gestión de proyectos incluyen:\n"
+"------------------------------------------------------------------\n"
+"* Mis tareas\n"
+"* Tareas abiertas\n"
+"* Análisis de tareas\n"
+"* Flujo acumulado\n"
+"    "
 
 #. module: base
 #: view:res.partner:0
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 87893920dab..61e13785105 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-21 14:58+0000\n"
+"PO-Revision-Date: 2012-12-23 19:57+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <openerp-hungarian-team@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:03+0000\n"
+"X-Launchpad-Export-Date: 2012-12-24 04:38+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -10448,6 +10448,10 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Bolíviai szmlatükör és adózás\n"
+"\n"
+"    "
 
 #. module: base
 #: view:res.lang:0
@@ -11324,7 +11328,7 @@ msgstr "Egyéni gyorsbillentyűk"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_si
 msgid "Slovenian - Accounting"
-msgstr ""
+msgstr "Slovén számlatükör"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -11557,6 +11561,40 @@ msgid ""
 "launchpad:\n"
 "https://launchpad.net/openerp-swiss-localization\n"
 msgstr ""
+"\n"
+"Svájci lokalizáció\n"
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
 
 #. module: base
 #: model:res.country,name:base.nt
@@ -11891,7 +11929,7 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Tárolt fájlnév"
 
 #. module: base
 #: field:res.partner,use_parent_address:0
@@ -12368,7 +12406,7 @@ msgstr "PostgreSQL érintés vagy idegen kulcs név."
 #. module: base
 #: view:res.company:0
 msgid "Click to set your company logo."
-msgstr ""
+msgstr "Kattintson a vállalati logó beállításához."
 
 #. module: base
 #: view:res.lang:0
@@ -12917,7 +12955,7 @@ msgstr "Sorszám típusok"
 #. module: base
 #: view:res.partner:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Mobil:"
 
 #. module: base
 #: code:addons/base/res/res_bank.py:195
@@ -13915,7 +13953,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_bo
 msgid "Bolivia Localization Chart Account"
-msgstr ""
+msgstr "Bolíviai lokalizáció"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -14420,7 +14458,7 @@ msgstr "Kiválasztás"
 #: model:ir.actions.act_window,name:base.change_password_wizard_action
 #: view:res.users:0
 msgid "Change Password"
-msgstr ""
+msgstr "Jelszó megváltoztatása"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -15972,7 +16010,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -16538,7 +16576,7 @@ msgstr "Rendszer konfigurálása kész"
 #. module: base
 #: field:ir.attachment,db_datas:0
 msgid "Database Data"
-msgstr ""
+msgstr "Adatbázis adat"
 
 #. module: base
 #: model:res.country,name:base.tc
@@ -16784,7 +16822,7 @@ msgstr "Thaiföld"
 #. module: base
 #: model:ir.model,name:base.model_change_password_wizard
 msgid "Change Password Wizard"
-msgstr ""
+msgstr "Jelszó megváltoztatás varázsló"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
@@ -16942,7 +16980,7 @@ msgstr "Íráshoz alkamaz"
 #. module: base
 #: field:ir.ui.menu,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Bal szülő"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_page
@@ -17058,6 +17096,9 @@ msgid ""
 "    - Regional State listings\n"
 "    "
 msgstr ""
+"\n"
+"Etióp lokalizáció\n"
+"    "
 
 #. module: base
 #: view:res.users:0
@@ -17888,7 +17929,7 @@ msgstr "Kanada - Könyvelés"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_co
 msgid "Colombian - Accounting"
-msgstr ""
+msgstr "Kolumbiai - könyvelés"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_voucher
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 7f76c8b1309..ea943ac941b 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-22 20:35+0000\n"
+"PO-Revision-Date: 2012-12-26 20:02+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\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: 2012-12-23 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-27 05:21+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -1456,6 +1456,49 @@ msgid ""
 "come with any additional paid permission for online use of 'private "
 "modules'.\n"
 msgstr ""
+"\n"
+"Modulul de baza pentru localizarea braziliana\n"
+"==========================================\n"
+"\n"
+"Acest modul consta in:\n"
+" \n"
+"- Plan de conturi brazilian general\n"
+"- Taxe braziliene precum:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"Campul deduceri_impozite a fost de asemenea adaugat la account.tax.template "
+"si\n"
+"account.tax pentru a permite calcularea corecta a unor TVA-uri braziliene\n"
+"precum  ICMS. Wizardul crearii planului de conturi a fost extins\n"
+"pentru a propaga acele date noi in mod corespunzator.\n"
+"\n"
+"Totusi, este important sa stiti ca acestui modul ii lipsesc multe "
+"implementari \n"
+"pentru a putea folosi OpenERP in mod corespunzator in Brazilia. Aceste "
+"implementari (precum Facturarea fiscala\n"
+"electonica care este deja operationala) au la baza mai mult de 15 \n"
+"module suplimentare ale proiectului de localizareLaunchpad  brazilian \n"
+"https://launchpad.net/openerp.pt-br-localiz si dependentele lor in \n"
+"ramura addons suplimentare. Aceste module nu intrerup modularitatea\n"
+"remarcabila a lui OpenERP, de aceea ele sunt numeroase, dar mici.Unul "
+"dintre\n"
+"motivele pentru care aceste module sunt separate este faptul ca liderii "
+"Localizarii\n"
+"braziliene au nevoie sa le fie acordate drepturi pentru a finaliza "
+"localizarea, companiile\n"
+"ocupandu-se  de cerintele legale ramase (precum registrele fiscale,\n"
+"contabilitate SPED, SPED fiscal si PAF ECF care inca lipseau in septembrie\n"
+"2011). Aceste module au de asemenea licenta stricta AGPL V3, iar astazi nu\n"
+"au nicio permisiune suplimentara platita pentru utilizarea online a "
+"'modulelor private'.\n"
 
 #. module: base
 #: code:addons/orm.py:406
@@ -1480,12 +1523,12 @@ msgstr "Numele tarii trebuie sa fie unic !"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Cea mai recenta versiune"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Delete Access Right"
-msgstr ""
+msgstr "Sterge Dreptul de Acces"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:212
@@ -1512,7 +1555,7 @@ msgstr "Insulele Cayman"
 #. module: base
 #: view:ir.rule:0
 msgid "Record Rule"
-msgstr ""
+msgstr "Regula Inregistrare"
 
 #. module: base
 #: model:res.country,name:base.kr
@@ -1522,7 +1565,7 @@ msgstr "Coreea de Sud"
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_si
 msgid "Kontni načrt za gospodarske družbe"
-msgstr ""
+msgstr "Plan economic pentru societati"
 
 #. module: base
 #: code:addons/orm.py:4917
@@ -1538,7 +1581,7 @@ msgstr "Colaboratori"
 #. module: base
 #: field:ir.rule,perm_unlink:0
 msgid "Apply for Delete"
-msgstr ""
+msgstr "Aplica pentru Stergere"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1553,7 +1596,7 @@ msgstr "Vizibil(a)"
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Deschide Meniul Setari"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1613,6 +1656,10 @@ msgid ""
 "                                for uploading to OpenERP's translation "
 "platform,"
 msgstr ""
+"Format TGZ: aceasta este o arhiva comprimata care contine un fisier PO, care "
+"este adecvat\n"
+"                                pentru incarcarea pe platforma de traduceri "
+"OpenERP,"
 
 #. module: base
 #: view:res.lang:0
@@ -1639,7 +1686,7 @@ msgstr "Teste"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save as Attachment Prefix"
-msgstr ""
+msgstr "Salveaza ca Prefix Atasament"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1676,7 +1723,7 @@ msgstr "Haiti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
 msgid "French Payroll"
-msgstr ""
+msgstr "Stat de plata francez"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -1757,6 +1804,34 @@ msgid ""
 "Also implements IETF RFC 5785 for services discovery on a http server,\n"
 "which needs explicit configuration in openerp-server.conf too.\n"
 msgstr ""
+"\n"
+"Cu acest modul, este activat serverul WebDAV pentru documente.\n"
+" ===============================================================\n"
+"\n"
+"Apoi puteti folosi orice browser compatibil pentru a vedea de la distanta "
+"atasamentele din OpenObject.\n"
+"\n"
+"Dupa instalare, serverul WebDAV poate fi controlat de o sectiune [webdav] "
+"din\n"
+"configurarea serverului.\n"
+"\n"
+"Parametrii de Configurare ai Serverului:\n"
+"-------------------------------\n"
+"[webdav]:\n"
+"+++++++++ \n"
+"    * activeaza = Adevarat ;  Executia webdav prin serverele http(s)\n"
+"    * vdir = webdav ; directoarea de pe care webdav va fi executat\n"
+"    * aceasta valoare predefinita inseamna ca webdav va fi\n"
+"    * la adresa \"http://localhost:8069/webdav/\n"
+"    * prolix = Adevarat ; Porniti mesajele din webdav\n"
+"    * depanare = Adevarat ; Porniti mesajele de depanare din webdav \n"
+"    * din moment ce mesajele sunt directionate catre inregistrarea jurnal "
+"python, cu\n"
+"    * nivelurile \"depanare\" si respectiv \"depanare_rpc\", puteti lasa\n"
+"    * aceste optiuni pornite\n"
+"\n"
+"De asemenea implementeaza IETF RFC 5785 pentru service la un server http,\n"
+"ceea ce necesita o configurare explicita in opererp-server.conf.\n"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_purchase_management
@@ -1783,6 +1858,16 @@ msgid ""
 "with a single statement.\n"
 "    "
 msgstr ""
+"\n"
+"Acest modul instaleaza baza pentru conturile bancare IBAN (Numarul "
+"International de Cont Bancar) si le verifica validitatea.\n"
+"============================================================================="
+"==========================\n"
+"\n"
+"Abilitatea de a extrage conturile locale reprezentate corect din conturile "
+"IBAN \n"
+"cu un singur extras de cont.\n"
+"    "
 
 #. module: base
 #: view:ir.module.module:0
@@ -1804,6 +1889,12 @@ msgid ""
 "=============\n"
 "    "
 msgstr ""
+"\n"
+"Acest modul adauga meniul cereri si caracteristici la portalul dumneavoastra "
+"daca cererile si portalul sunt instalate.\n"
+"============================================================================="
+"=============\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
@@ -1836,7 +1927,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mf
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Sfantul Martin (partea franceza)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1856,6 +1947,16 @@ msgid ""
 "    * the main taxes used in Luxembourg\n"
 "    * default fiscal position for local, intracom, extracom "
 msgstr ""
+"\n"
+"Acesta este modulul de baza pentru gestionarea planului de conturi pentru "
+"Luxemburg. \n"
+"======================================================================\n"
+"\n"
+"    * Planul de Conturi oficial pentru Luxemburg (legea din iunie 2009 + "
+"2011 pentru plan si Taxe),\n"
+"    * Diagrama Codurilor Fiscale pentru Luxemburg\n"
+"    * principalele taxe folosite in Luxemburg\n"
+"    * pozitia fiscala predefinita pentru local, intracom, extracom "
 
 #. module: base
 #: code:addons/base/module/wizard/base_update_translations.py:39
@@ -1867,7 +1968,7 @@ msgstr "Nu exista nici o limba cu codul \"%s\""
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Retea Sociala"
 
 #. module: base
 #: view:res.lang:0
@@ -1877,12 +1978,12 @@ msgstr "%Y - An cu secol."
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Configurare Subsol Raport"
 
 #. module: base
 #: field:ir.translation,comments:0
 msgid "Translation comments"
-msgstr ""
+msgstr "Comentarii traducere"
 
 #. module: base
 #: model:ir.module.module,description:base.module_lunch
@@ -1908,6 +2009,28 @@ msgid ""
 "in their pockets, this module is essential.\n"
 "    "
 msgstr ""
+"\n"
+"Modulul de baza pentru gestionarea pranzului.\n"
+"================================\n"
+"\n"
+"Multe companii comanda sandwich-uri, pizza si alte mancaruri de la "
+"furnizorii obisnuiti, pentru angajatii lor pentru a le oferi mai multe "
+"facilitati. \n"
+"\n"
+"Totusi, managementul pranzului in cadrul companiei necesita o administrare "
+"speciala, mai ales daca numarul angajatilor sau al furnizorilor este "
+"important. \n"
+"\n"
+"Modulul \"Comanda Pranz\" a fost dezvoltat pentru a usura gestionarea lui, "
+"dar si pentru a le oferi angajatilor mai multe unelte si utilitate. \n"
+"\n"
+"Pe langa o gestionare completa a pranzului si furnizorilor, acest modul "
+"ofera si posibilitatea de a afisa avertizari si ofera o selectie rapida a "
+"comenzii pe baza preferintelor angajatului.\n"
+"\n"
+"Acest modul este esential daca doriti sa economisiti timpul angajatilor "
+"dumneavoastra si sa evitati ca ei sa aiba monede in buzunar tot timpul.\n"
+"    "
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
@@ -1947,7 +2070,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,website:0
 msgid "Website of Partner or Company"
-msgstr ""
+msgstr "Site-ul web al Partenerului sau Companiei"
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1955,7 +2078,7 @@ msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
 msgstr ""
-"Dacă bifati aceasta casuta, traducerile dumneavoastra personalizate vor fi "
+"Daca bifati aceasta casuta, traducerile dumneavoastra personalizate vor fi "
 "rescrise si inlocuite cu cele oficiale."
 
 #. module: base
@@ -2008,7 +2131,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project_issue
 msgid "Portal Issue"
-msgstr ""
+msgstr "Problema Portal"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -2028,11 +2151,15 @@ msgid ""
 "Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
+"Manual: Lansat manual.\n"
+"Automat: Ruleaza oricand sistemul este reconfigurat.\n"
+"Lanseaza Manual Odata: dupa ce a fost lansat manual, este setat automat pe "
+"Efectuat."
 
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Imagine de dimensiune mica"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
@@ -2042,7 +2169,7 @@ msgstr "Gestiunea depozitului"
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
 msgid "res.request.link"
-msgstr "res.request.link"
+msgstr "res.link.cerere"
 
 #. module: base
 #: field:ir.actions.wizard,name:0
@@ -2077,7 +2204,7 @@ msgstr "Timorul de Est"
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
-msgstr "Instalati"
+msgstr "Instaleaza"
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -2095,6 +2222,14 @@ msgid ""
 "Please keep in mind that you should review and adapt it with your "
 "Accountant, before using it in a live Environment.\n"
 msgstr ""
+"\n"
+"Acest modul ofera Planul de conturi standard pentru Austria care este bazat "
+"pe Sablonul de la BMF.gv.at.\n"
+"============================================================================="
+"========================== \n"
+"Va rugam sa tineti minte faptul ca trebuie sa il verificati si sa il "
+"adaptati cu Contabilul dumneavoastra inainte de a-l folosi intr-un mediu "
+"live.\n"
 
 #. module: base
 #: model:res.country,name:base.kg
@@ -2113,6 +2248,14 @@ msgid ""
 "It assigns manager and user access rights to the Administrator and only user "
 "rights to the Demo user. \n"
 msgstr ""
+"\n"
+"Drepturi de acces contabile\n"
+"========================\n"
+"Ii ofera utilizatorului Administrator acces la toate caracteristicile "
+"contabile, precum elemente ale jurnalului si planul de conturi.\n"
+"\n"
+"Ii atribuie Administratorului drepturi de acces de manager si utilizator, si "
+"doar drepturi de utilizator Utilizatorului demo. \n"
 
 #. module: base
 #: view:ir.sequence:0
@@ -2135,6 +2278,8 @@ msgstr ""
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
+"Valoare '%s' necunoscuta pentru campul booleean '%%(field)s', presupunand ca "
+"'%s'"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -2144,12 +2289,12 @@ msgstr "Olanda"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_event
 msgid "Portal Event"
-msgstr ""
+msgstr "Eveniment Portal"
 
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translation in Progress"
-msgstr ""
+msgstr "Traducere in desfasurare"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -2164,7 +2309,7 @@ msgstr "Zile"
 #. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
-msgstr ""
+msgstr "Vehicul, leasing, asigurari, costuri"
 
 #. module: base
 #: view:ir.model.access:0
@@ -2175,7 +2320,7 @@ msgstr "Acces Citire"
 #. module: base
 #: help:ir.attachment,res_id:0
 msgid "The record id this is attached to"
-msgstr ""
+msgstr "Id-ul inregistrarii la care aceasta este atasat"
 
 #. module: base
 #: model:ir.module.module,description:base.module_share
@@ -2197,6 +2342,23 @@ msgid ""
 "synchronization with other companies.\n"
 "    "
 msgstr ""
+"\n"
+"Acest modul adauga unelte comune generale bazei de date actuale OpenERP. \n"
+"========================================================================\n"
+"\n"
+"Adauga in mod specific un buton 'comun' care este disponibil in Clientul web "
+"pentru a\n"
+"imparti orice fel de date OpenERP cu colegii, clientii, prietenii.\n"
+"\n"
+"Sistemul va crea pe loc utilizatori si grupuri noi, iar prin\n"
+"combinarea drepturilor de acces adecvate cu regulile.ir se va asigura ca "
+"utilizatorii\n"
+"comuni au acces doar la datele care au fost impartite cu ei.\n"
+"\n"
+"Acest lucru este extrem de util pentru munca in echipa, impartirea "
+"cunostintelor,\n"
+"sincronizarea cu alte companii.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
@@ -2209,6 +2371,9 @@ msgid ""
 "Check this box if this contact is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Bifati aceasta casuta daca acest contact este un furnizor. Daca nu este "
+"bifata, angajatii de la achizitii nu o vor vedea atunci cand inregistreaza o "
+"comanda de achizitie."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
@@ -2256,7 +2421,7 @@ msgstr "Creare sarcini in CV"
 #: code:addons/base/ir/ir_model.py:318
 #, python-format
 msgid "This column contains module data and cannot be removed!"
-msgstr ""
+msgstr "Aceasta coloana contine datele modulului si nu poate fi stearsa!"
 
 #. module: base
 #: field:res.partner.bank,footer:0
@@ -2276,6 +2441,17 @@ msgid ""
 "with the effect of creating, editing and deleting either ways.\n"
 "    "
 msgstr ""
+"\n"
+"Sincronizarea inregistrarilor sarcinilor proiectului cu inregistrarile fisei "
+"de pontaj.\n"
+"====================================================================\n"
+"\n"
+"Acest modul va permite sa transferati inregistrarile sub sarcini definite "
+"pentru Managementul\n"
+"Proiectelor in inregistrarile liniei fisei de pontaj pentru o anumita data "
+"si un anumit utilizator\n"
+"cu efectul de a le crea, edita si sterge pe ambele.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -2295,6 +2471,15 @@ msgid ""
 "          templates to target objects.\n"
 "    "
 msgstr ""
+"\n"
+"    * Suport multi lingvist pentru Planul de Conturi, Taxe, Coduri Fiscale, "
+"Jurnale,\n"
+"      Sabloane Contabile, Plan de Conturi Analitic si Jurnale Analitice.\n"
+"    * Modificari la wizard-ul de setare\n"
+"        - Copiaza traducerile pentru COA, Taxa, Cod Fiscal si Pozitia "
+"Fiscala din \n"
+"          sabloane in obiectele tinta.\n"
+"    "
 
 #. module: base
 #: field:workflow.transition,act_from:0
@@ -2384,6 +2569,26 @@ msgid ""
 "* *Before Delivery*: A Draft invoice is created and must be paid before "
 "delivery\n"
 msgstr ""
+"\n"
+"Gestioneaza cotatiile si comenzile de vanzare\n"
+"==================================\n"
+"\n"
+"Acest modul face lagatura intre aplicatiile de gestionare a vanzazarilor si "
+"depozitelor.\n"
+"\n"
+"Preferinte\n"
+"-----------\n"
+"* Transport: Selecteaza livrarea o data sau livrarea partiala\n"
+"* Facturare: selecteaza modalitatea de plata a facturilor\n"
+"* Incotermeni: termeni Comerciali Internationali\n"
+"\n"
+"Puteti selecta metode flexibile de facturare:\n"
+"\n"
+"** La Cerere*: Facturile sunt create manual din Comenzile de Vanzare atunci "
+"cand este nevoie\n"
+"** Pe Comanda de Livrare*: Facturile sunt generate la ridicare (livrare)\n"
+"** Inainte de Livrare*: O Factura ciorna este creata si trebuie platita "
+"inainte de livrare\n"
 
 #. module: base
 #: field:ir.ui.menu,complete_name:0
@@ -2393,7 +2598,7 @@ msgstr "Calea completa"
 #. module: base
 #: view:base.language.export:0
 msgid "The next step depends on the file format:"
-msgstr ""
+msgstr "Urmatorul pas depinde de formatul fisierului:"
 
 #. module: base
 #: view:res.lang:0
@@ -2404,12 +2609,13 @@ msgid ""
 msgstr ""
 "%U - Numarul saptamanii din an (Duminica este considerata prima zi a "
 "saptamanii) ca numar zecimal din intervalul [00,53]. Toate zilele dintr-un "
-"an nou care preced prima duminica din an se considera a fi in saptamana 0."
+"an nou care preced prima zi de duminica din an se considera a fi in "
+"saptamana 0."
 
 #. module: base
 #: view:base.language.export:0
 msgid "PO(T) format: you should edit it with a PO editor such as"
-msgstr ""
+msgstr "Format PO(T): ar trebui editat cu un editor PO, cum ar fi"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
@@ -2433,7 +2639,7 @@ msgstr "Creati / Scrieti / Copiati"
 #. module: base
 #: view:ir.sequence:0
 msgid "Second: %(sec)s"
-msgstr ""
+msgstr "Secunda: %(sec)s"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -2462,7 +2668,7 @@ msgstr "Coreana (KP) / 한국어 (KP)"
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
-msgstr ""
+msgstr "Insulele Aaland"
 
 #. module: base
 #: field:res.company,logo:0
@@ -2498,7 +2704,7 @@ msgstr "Bahamas"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply for Create"
-msgstr ""
+msgstr "Aplica pentru Creare"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
@@ -2521,6 +2727,8 @@ msgid ""
 "Appears by default on the top right corner of your printed documents (report "
 "header)."
 msgstr ""
+"Apare implicit in coltul din dreapta sus a documentelor dumneavoastra "
+"tiparite (antet raport)."
 
 #. module: base
 #: field:base.module.update,update:0
@@ -2535,7 +2743,7 @@ msgstr "Metoda"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
 msgid "Password Encryption"
-msgstr ""
+msgstr "Codificare Parola"
 
 #. module: base
 #: view:workflow.activity:0
@@ -2568,6 +2776,29 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Inregistreaza si valideaza fisele de pontaj si prezenta cu usurinta\n"
+"=====================================================\n"
+"\n"
+"Aceasta aplicatie ofera un ecran nou care va permite sa gestionati atat "
+"prezenta (La intrare/La iesire) cat si inregistrare muncii (fisa de pontaj) "
+"dupa perioada. Inregistrarile in fisele de pontaj sunt facute zilnic de "
+"catre angajati. La sfarsitul perioadei definite,  angajatii isi valideaza "
+"fisele de pontaj, iar apoi managerul trebuie sa aprobe inregistrarile "
+"echipei sale. Perioadele sunt definite in formularele companiei, iar d-"
+"voastra le puteti configura sa ruleze lunar sau saptamanal.\n"
+"\n"
+"Procesul complet de validare a fiselor de pontaj este:\n"
+"---------------------------------------------\n"
+"* Foaia ciorna\n"
+"* Confirmarea la sfarsitul perioadei de catre angajat\n"
+"* Validarea de catre managerul de proiect\n"
+"\n"
+"Validarea poate fi configurata in companie:\n"
+"------------------------------------------------\n"
+"* Durata perioadei (Zi, Saptamana, Luna)\n"
+"* Diferenta maxima dintre fisa de pontaj si prezenta\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:341
@@ -2575,11 +2806,13 @@ msgstr ""
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
+"Nu s-a gasit nici o inregistrare care sa se potriveasca cu %(field_type)s "
+"'%(value)s' in campul '%%(field)s'"
 
 #. module: base
 #: field:change.password.user,new_passwd:0
 msgid "New Password"
-msgstr ""
+msgstr "Parola Noua"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2639,6 +2872,10 @@ msgid ""
 "=================================\n"
 " "
 msgstr ""
+"\n"
+"Permite anonimilor sa Acceseze Portalul.\n"
+"=================================\n"
+" "
 
 #. module: base
 #: model:res.country,name:base.ge
@@ -2677,6 +2914,43 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    \n"
+"Localizare belgiana pentru facturile care intra si cele care ies (conditie "
+"la cont_coda):\n"
+"============================================================================"
+"\n"
+"    - Redenumeste campul 'referinta' in 'Comunicare'\n"
+"    - Adauga asistenta pentru Comunicarea Structurata Belgiana\n"
+"\n"
+"O Comunicare Structurata poate fi generata automat la facturile care ies in "
+"functie de algoritmii urmatori:\n"
+"-----------------------------------------------------------------------------"
+"----------------------------------------\n"
+"    1) Aleatoriu : +++RRR/RRRR/RRRDD+++\n"
+"        **R..R =** Random Digits (Cifre Aleatorii), **DD =** Check Digits "
+"(Verifica Cifrele)\n"
+"    2) Data : +++DOY/YEAR/SSSDD+++\n"
+"        **DOY =** Ziua din an, **SSS =**Numar Secventa, **DD =** Verifica "
+"Cifrele\n"
+"    3) Referinta Client +++RRR/RRRR/SSSDDD+++\n"
+"        **R..R =** Referinta Client fara caractere non-numerice, **SSS =** "
+"Numar Secventa, **DD =** Verifica Cifrele  \n"
+"        \n"
+"Tipul preferat de Comunicare Structurata si Algoritm asociat poate fi\n"
+"specificat in Inregistrarile partenerului. O Comunicare Structurata "
+"'aleatorie' va\n"
+"fi generata daca niciun algoritm nu este specificat in Inregistrarea "
+"Partenerului. \n"
+"\n"
+"    \n"
+" \n"
+"A Structured Communication can be generated automatically on outgoing "
+"invoices according to the following algorithms:\n"
+" ----------------------------------------------------------------------------"
+"----------------------------------------- \n"
+"\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.pl
@@ -2764,6 +3038,9 @@ msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
 msgstr ""
+"Tipul vizualizarii: tipul arbore va fi folosit pentru vizualizarea arbore, "
+"setati pe 'arbore' pentru o vizualizare arbore ierarhica, sau pe 'formular' "
+"pentru o vizualizare obisnuita a listei"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2815,6 +3092,29 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"Acesta este modulul de baza pentru gestionarea produselor si a listelor de "
+"preturi in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Produsele accepta variante, diferite metode de stabilire a pretului, "
+"informatii referitoare la furnizori,\n"
+"facut pe stoc/la comanda, diferite unitati de masura, ambalare si "
+"proprietati.\n"
+"\n"
+"Listele de preturi accepta:\n"
+"--------------------\n"
+"    * Niveluri multiple de reducere (dupa produs, categorie, cantitati)\n"
+"    * Calculeaza pretul pe baza unor criterii diferite:\n"
+"        * Alte liste de preturi\n"
+"        * Pretul de cost\n"
+"        * Pretul din lista\n"
+"        * Pretul furnizorului\n"
+"\n"
+"Preferintele listelor de preturi dupa produs si/sau parteneri.\n"
+"\n"
+"Tipareste etichetele produselor cu codul de bare.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -2832,6 +3132,19 @@ msgid ""
 "    * Date\n"
 "    "
 msgstr ""
+"\n"
+"Configureaza valorile implicite pentru conturile dumneavoastra analitice.\n"
+"==============================================\n"
+"\n"
+"Permite selectarea automata a conturilor analitice pe baza criteriilor:\n"
+"-----------------------------------------------------------------------------"
+"------\n"
+"    * Produs \n"
+"    * Partener\n"
+"    * Utilizator\n"
+"    * Companie\n"
+"    * Data\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.bb
@@ -2855,7 +3168,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
 msgid "Signup with OAuth2 Authentication"
-msgstr ""
+msgstr "Inregistrare cu Autentificarea OAuth2"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -2882,7 +3195,7 @@ msgstr "Greaca / Ελληνικά"
 #. module: base
 #: field:res.company,custom_footer:0
 msgid "Custom Footer"
-msgstr ""
+msgstr "Subsol pagina Personalizat"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
@@ -2917,6 +3230,10 @@ msgid ""
 "==================================\n"
 "    "
 msgstr ""
+"\n"
+"Statele Unite - Plan de conturi.\n"
+"==================================\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_url,target:0
@@ -2951,7 +3268,7 @@ msgstr "Nume shortcut"
 #. module: base
 #: field:res.partner,contact_address:0
 msgid "Complete Address"
-msgstr ""
+msgstr "Completeaza Adresa"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
@@ -2973,6 +3290,17 @@ msgid ""
 "        * Files by Partner (graph)\n"
 "        * Files Size by Month (graph)\n"
 msgstr ""
+"\n"
+"Acesta este un sistem complet de gestionare a documentelor.\n"
+"==============================================\n"
+"    * Autentificare Utilizator\n"
+"    * Indexare Documente:- fisierele .pptx si .docx nu sunt acceptate in "
+"platforma Windows.\n"
+"    * Tablou de bord pentru Documente, care include:\n"
+"        * Fisierele Noi (lista)\n"
+"        * Fisiere dupa Tipul Resursei (grafic)\n"
+"        * Fisiere dupa Partener (grafic)\n"
+"        * Dimensiunea Fisierelor dupa Luna (grafic)\n"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3022,6 +3350,42 @@ msgid ""
 "* Monthly Turnover (Graph)\n"
 "    "
 msgstr ""
+"\n"
+"Gestiunea cotarilor si a comenzilor de vanzare\n"
+" ==================================\n"
+"\n"
+"Aceasta aplicatie va permite sa va gestionati obiectivele de vanzari intr-un "
+"mod efectiv si eficient, tinand evidenta tuturor comenzilor de vanzare si "
+"istoricul lor.\n"
+"\n"
+"Gestioneaza intregul flux de vanzari:\n"
+"\n"
+"* **Cotare** -> **Comanda de vanzare** -> **Factura**\n"
+"\n"
+"Preferinte (numai daca este instalat si modulul Gestionarea Depozitului)\n"
+"-----------------------------------------------------\n"
+"\n"
+"Daca ati instalat si Gestionarea Depozitului, puteti efectua urmatoarele:\n"
+"\n"
+"* Transport: Posibilitatea de a selecta intre livrarea o data sau livrarea "
+"partiala\n"
+"* Facturare: selectati modalitatea de plata a facturilor\n"
+"* Incotermeni: termeni Comerciali Internationali\n"
+"\n"
+"Puteti selecta intre metode de facturare flexibile:\n"
+"\n"
+"* *La Cerere*: Facturile sunt create manual din Comenzile de Vanzari atunci "
+"cand este nevoie\n"
+"* *La Comanda de Livrare*: Facturile sunt generate la ridicare (livrare)\n"
+"* *Inainte de Livrare*: O Factura ciorna este creata si trebuie achitata "
+"inainte de livrare\n"
+"\n"
+"\n"
+"Tabloul de bord pentru Managerul de Vanzari va include\n"
+"------------------------------------------------\n"
+"* Cotatiile mele\n"
+"* Cifra de afaceri lunara (Grafic)\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window,res_id:0
@@ -3034,7 +3398,7 @@ msgstr "ID Inregistrare"
 #. module: base
 #: view:ir.filters:0
 msgid "My Filters"
-msgstr ""
+msgstr "Filtrele mele"
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -3048,12 +3412,16 @@ msgid ""
 "Module to attach a google document to any model.\n"
 "================================================\n"
 msgstr ""
+"\n"
+"Modul pentru atasarea unui document google oricarui model.\n"
+"================================================\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
+"Au fost gasite mai multe potriviri pentru campul '%%(field)s' (%d potriviri)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3072,6 +3440,15 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Localizarea peruana a Planului de conturi si a taxelor. In conformitate cu "
+"PCGE 2010.\n"
+"========================================================================\n"
+"\n"
+"Plan de conturi peruan si impozite in conformitate cu dispozitiile in "
+"vigoare SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3087,7 +3464,7 @@ msgstr "Argumentele trimise clientului impreuna cu eticheta vizualizarii"
 #. module: base
 #: model:ir.module.module,summary:base.module_contacts
 msgid "Contacts, People and Companies"
-msgstr ""
+msgstr "Contacte, Oameni si Companii"
 
 #. module: base
 #: model:res.country,name:base.tt
@@ -3121,6 +3498,15 @@ msgid ""
 "This module is currently not compatible with the ``user_ldap`` module and\n"
 "will disable LDAP authentication completely if installed at the same time.\n"
 msgstr ""
+"\n"
+"Parole criptate\n"
+"==================\n"
+"\n"
+"Interactiune cu autentificarea LDAP:\n"
+"-------------------------------------\n"
+"Acest modul momentan nu este compatibil cu modulul ``user_ldap`` si\n"
+"va dezactiva autentificarea LDAP complet daca este instalat in acelasi "
+"timp.\n"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
@@ -3133,7 +3519,7 @@ msgstr "Manager"
 #: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
-msgstr ""
+msgstr "Ne pare rau, dar nu aveti acces la acest document."
 
 #. module: base
 #: model:res.country,name:base.py
@@ -3148,7 +3534,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Raport Xml"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -3177,6 +3563,30 @@ msgid ""
 "* Purchase Analysis\n"
 "    "
 msgstr ""
+"\n"
+"Gestioneaza cererea de bunuri cu usurinta dupa Comenzile de Achizitii\n"
+"==================================================\n"
+"\n"
+"Managementul achizitiilor va permite sa tineti evidenta cotatiilor de pret "
+"ale furnizorilor dumneavoastra si le transforma in comenzi de achizitie, "
+"daca este necesar.\n"
+"OpenERP dispune de diverse metode de monitorizare a facturilor si de "
+"urmarire a primirii bunurilor comandate. Puteti gestiona livrari partiale in "
+"OpenERP, astfel ca puteti tine evidenta bunurilor care vor mai fi livrate si "
+"puteti emite memento-uri automat.\n"
+"\n"
+"Normele OpenERP de gestionare a reaprovizionarii permit sistemului sa "
+"genereze automat comenzi ciorna de achizitii, sau puteti configura sistemul "
+"pentru a rula un proces derivat complet din nevoile de productie curente.\n"
+"\n"
+"Tabloul de bord / Rapoartele pentru Gestionarea Achizitiilor vor include:\n"
+"---------------------------------------------------------\n"
+"* Cererea pentru Cotatii\n"
+"* Comenzi de Achizitie care asteapta sa fie Aprobate \n"
+"* Achizitii Lunare dupa Categorie\n"
+"* Analiza Receptiilor\n"
+"* Analiza Achizitiilor\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
@@ -3209,6 +3619,19 @@ msgid ""
 "    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
 "(stacked)\n"
 msgstr ""
+"\n"
+"Vizualizare Grafice pentru Clientul Web.\n"
+"===========================\n"
+"\n"
+"    * Analizeaza o vizualizare a <graficului>, dar permite schimbarea "
+"dinamica a prezentarii\n"
+"    * Tipuri de Grafic: cu structura radiala, linii, arie, bare, radar\n"
+"    * Suprapus/Nesuprapus pentru arii si bare\n"
+"    * Legende: sus, in interior (sus/stanga), ascunse\n"
+"    * Caracteristici: descarca drept PNG sau CSV, rasfoieste grila de date, "
+"schimba orientarea\n"
+"    * Niveluri nelimitate \"Grupeaza Dupa\" (nesuprapuse), analiza pe doua "
+"niceluri cruce (suprapuse)\n"
 
 #. module: base
 #: view:res.groups:0
@@ -3219,7 +3642,7 @@ msgstr "Mostenit"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "da"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -3244,12 +3667,26 @@ msgid ""
 "    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
 "    "
 msgstr ""
+"\n"
+"Normele Statului de Plata belgian.\n"
+"======================\n"
+"\n"
+"    * Detalii Angajat\n"
+"    * Contracte Angajat\n"
+"    * Contract pe baza Pasaportului\n"
+"    * Indemnizatii/Deduceri\n"
+"    * Permite configurarea Salariului de Baza/Brut/Net\n"
+"    * Fluturas de salariu al angajatului\n"
+"    * Registru lunar de Salarizare\n"
+"    * Integrat cu Managementul Concediilor\n"
+"    * Majorare Salariu, ONSS, Retinere Impozit, Pensie alimentara, ...\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' nu pare a fi o integrala pentru campul '%%(field)s'"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -3287,6 +3724,31 @@ msgid ""
 "purchase price and fixed product standard price are booked on a separate \n"
 "account."
 msgstr ""
+"\n"
+"Acest modul accepta metodologia contabila anglo-saxona, schimband logica "
+"contabila cu tranzactiile bursiere.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"Diferenta dintre tarile cu contabilitate anglo-saxona si tarile Rinului \n"
+"(numita si Contabilitatea continentala) o reprezinta momentul in care se ia "
+"in considerare \n"
+"Costul Bunurilor Vandute versus Costul de Vanzare. Contabilitatea anglo-"
+"saxona ia \n"
+"in considerare costul atunci cand este creata factura, in schimb "
+"Contabilitatea continentala ia \n"
+"in considerare costul in momentul in care bunurile sunt livrate.\n"
+"\n"
+"Acest modul va adauga functionalitate folosind un cont interimar pentru a "
+"salva \n"
+"valoarea bunurilor livrate si va contra rezerva acest cont \n"
+"interimar atunci cand este creata factura pentru a transfera aceasta suma in "
+"\n"
+"contul debitor sau creditor. In al doilea rand, diferentele de pret dintre "
+"pretul \n"
+"de achizitie actual si pretul standard fix al produsului sunt inregistrate "
+"intr-un\n"
+"cont separat."
 
 #. module: base
 #: model:res.country,name:base.si
@@ -3306,11 +3768,20 @@ msgid ""
 "    * ``base_stage``: stage management\n"
 "    "
 msgstr ""
+"\n"
+"Acest modul gestioneaza starea si etapa. Este derivat din crm_base si "
+"crm_case.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"    * ``base_state``: management stare\n"
+"    * ``base_stage``: management etapa\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "Integrare LinkedIn"
 
 #. module: base
 #: code:addons/orm.py:2020
@@ -3359,6 +3830,8 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic "
 "reports."
 msgstr ""
+"utilizatorul va avea acces atat la configurarea vanzarilor, cat si la "
+"rapoartele statistice."
 
 #. module: base
 #: model:res.country,name:base.nz
@@ -3423,11 +3896,26 @@ msgid ""
 "      above. Specify the interval information and partner to be invoice.\n"
 "    "
 msgstr ""
+"\n"
+"Creeaza documente recurente.\n"
+"===========================\n"
+"\n"
+"Acest modul permite crearea de documente noi si adauga semnaturi la acel "
+"document.\n"
+"\n"
+"De exemplu: pentru a avea o factura generata automat periodic:\n"
+"-------------------------------------------------------------\n"
+"    * Defineste tipul unui document pe baza obiectului facturii\n"
+"    * Defineste o semnatura a carei document sursa este documentul definit "
+"ca\n"
+"      mai sus. Specifica intervalul de informatii si partener care vor fi "
+"facturate.\n"
+"    "
 
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
-msgstr ""
+msgstr "Sloganul Companiei"
 
 #. module: base
 #: code:addons/base/res/res_users.py:668
@@ -3445,6 +3933,8 @@ msgid ""
 "the user will have an access to the human resources configuration as well as "
 "statistic reports."
 msgstr ""
+"utilizatorul va avea acces la configuratia resurselor umane, precum si la "
+"rapoartele statistice."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pl
@@ -3468,17 +3958,17 @@ msgstr ""
 "============================================================================="
 "=====================\n"
 "\n"
-"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
-"podatków\n"
-"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
-"zakładając,\n"
-"że wszystkie towary są w obrocie hurtowym.\n"
+"\n"
+"Acesta este un modul pentru a crearea unei diagrame standard de conturi, "
+"precum si setarile de baza corectate cu TVA 0%, 7% si 22%. Modulul "
+"stabileste, de asemenea, un cont pentru a cumpara si vinde bunuri, "
+"presupunand ca toate bunurile sunt en-gros.\n"
 "    "
 
 #. module: base
 #: field:ir.actions.client,params_store:0
 msgid "Params storage"
-msgstr "Stocare params"
+msgstr "Stocare parametri"
 
 #. module: base
 #: code:addons/base/module/module.py:526
@@ -3500,7 +3990,7 @@ msgstr "Tip necunoscut de raport: %s"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense
 msgid "Expenses Validation, Invoicing"
-msgstr ""
+msgstr "Validare Cheltuieli, Facturare"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
@@ -3510,6 +4000,10 @@ msgid ""
 "==========================================\n"
 "    "
 msgstr ""
+"\n"
+"Date contabile pentru Normele de Salarizare belgiene.\n"
+"==========================================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.am
@@ -3519,7 +4013,7 @@ msgstr "Armenia"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_evaluation
 msgid "Periodical Evaluations, Appraisals, Surveys"
-msgstr ""
+msgstr "Evaluari Periodice, Evaluari, Sondaje"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -3540,13 +4034,13 @@ msgstr "Suedia"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report File"
-msgstr ""
+msgstr "Fisier Raport"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 msgid "Gantt"
-msgstr "Gantt"
+msgstr "Diagrama Gantt"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_in_hr_payroll
@@ -3568,12 +4062,30 @@ msgid ""
 "    - Yearly Salary by Head and Yearly Salary by Employee Report\n"
 "    "
 msgstr ""
+"\n"
+"Norme de Salarizare indiene.\n"
+"============================\n"
+"\n"
+"    -Configurarea lui hr_payroll pentru localiuzarea indiana\n"
+"    -Toate normele principale de contributii pentru fluturasul de salarizare "
+"indian.\n"
+"    * Raport nou fluturas de salarizare\n"
+"    * Contracte Angajat\n"
+"    * Permite configurarea Salariului de baza / Brut / Net\n"
+"    * Fluturas de salarizare angajat\n"
+"    * Indemnizatie / Deducere\n"
+"    * Integrat cu Managementul Concediilor\n"
+"    * Indemnizatie pentru concediul medical, Indemnizatie pentru concediul "
+"de odihna, Pensie alimentara, ...\n"
+"    - Sfaturi salarizare si Raport\n"
+"    - Salariul anual dupa Raport Sef si Salariul anual dupa Raport Angajat\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:3870
 #, python-format
 msgid "Missing document(s)"
-msgstr ""
+msgstr "Document(e) lipsa"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
@@ -3609,6 +4121,29 @@ msgid ""
 "customers' expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"Gestioneaza cheltuielile dupa Angajati\n"
+"============================\n"
+"\n"
+"Aceasta aplicatie va permite sa gestionati cheltuielile zilnice ale "
+"angajatilor dumneavoastra. Va permite accesul la notele de plata ale "
+"angajatilor dumneavoastra si va da dreptul de a le completa si valida sau "
+"refuza. Dupa validare, creeaza o factura pentru angajat.\n"
+"Angajatii isi pot inregistra propriile cheltuieli, iar fluxul de validare le "
+"trimite automat la contabilitate dupa validarea de catre manageri.\n"
+"\n"
+"\n"
+"Intregul flux este implementat ca:\n"
+"---------------------------------\n"
+"* Cheltuieli ciorna\n"
+"* Confirmarea notei de plata de catre angajat\n"
+"* Validarea de catre manager\n"
+"* Validarea de catre contabil si crearea chitantei\n"
+"\n"
+"Acest modul foloseste de asemenea contabilitatea analitica si este "
+"compatibil cu factura din modulul fisei de pontaj, astfel incat puteti re-"
+"factura automat cheltuielile clientilor dupa proiect.\n"
+"    "
 
 #. module: base
 #: view:base.language.export:0
@@ -3616,6 +4151,8 @@ msgid ""
 "For more details about translating OpenERP in your language, please refer to "
 "the"
 msgstr ""
+"Pentru mai multe detalii referitoare la traducerea OpenERP in limba "
+"dumneavoastra, va rugam sa consultati"
 
 #. module: base
 #: field:res.partner,image:0
@@ -3638,7 +4175,7 @@ msgstr "Calendar"
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge"
-msgstr ""
+msgstr "Cunostinte"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3781,7 +4318,7 @@ msgstr "activitate.flux_de_lucru"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Export Terminat"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3810,7 +4347,7 @@ msgstr "Finlandeza / Suomi"
 #. module: base
 #: view:ir.config_parameter:0
 msgid "System Properties"
-msgstr ""
+msgstr "Proprietatile Sistemului"
 
 #. module: base
 #: field:ir.sequence,prefix:0
@@ -3846,12 +4383,12 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Acesta este modulul pentru a gestiona planul de conturi englez si francez - "
-"canadian in OpenERP.\n"
+"Acesta este modulul pentru gestionarea contabilitatii englezo-franco-"
+"canadiene in OpenERP.\n"
 "============================================================================="
 "==============\n"
 "\n"
-"Planurile de conturi si localizarile canadiene.\n"
+"Contabilitate si localizare canadiene.\n"
 "    "
 
 #. module: base
@@ -3862,12 +4399,12 @@ msgstr "Selectati pachetul modulului care va fi importat (fisier .zip):"
 #. module: base
 #: view:ir.filters:0
 msgid "Personal"
-msgstr ""
+msgstr "Privat"
 
 #. module: base
 #: field:base.language.export,modules:0
 msgid "Modules To Export"
-msgstr ""
+msgstr "Module care vor fi Exportate"
 
 #. module: base
 #: model:res.country,name:base.mt
@@ -3880,6 +4417,8 @@ msgstr "Malta"
 msgid ""
 "Only users with the following access level are currently allowed to do that"
 msgstr ""
+"Numai utilizatorilor cu urmatorul nivel de acces li se permite momentan sa "
+"faca acest lucru"
 
 #. module: base
 #: field:ir.actions.server,fields_lines:0
@@ -3927,6 +4466,38 @@ msgid ""
 "* Work Order Analysis\n"
 "    "
 msgstr ""
+"\n"
+"Gestioneaza Procesul de productie in OpenERP\n"
+"===========================================\n"
+"\n"
+"Modulul de productie va permite sa includeti planificarea, comenzile, "
+"stocurile si productia sau asamblarea produselor din materie prima si "
+"componente. Gestioneaza consumul si productia de produse in conformitate cu "
+"o lista de materiale si operatiunile necesare de pe utilaje, unelte sau "
+"resurse umane in functie de distribuiri.\n"
+"\n"
+"Permite integrarea completa si planificarea bunurilor care pot fi stocate, "
+"consumabile sau servicii. Serviciile sunt integrate complet cu restul "
+"programului. De exemplu, puteti configura un serviciu de sub-contractare "
+"intr-o lista de materiale pentru a achizitiona comanda de asamblare a "
+"productiei.\n"
+"\n"
+"Caracteristici cheie\n"
+"-------------\n"
+"* Facut pe Stoc/Facut la Comanda\n"
+"* Lista de materiale pe mai multe niveluri, fara limita\n"
+"* Distribuire pe mai multe niveluri, fara limita\n"
+"* Distribuire si centru de lucru integrat cu contabilitatea analitica\n"
+"* Calculul programatorului de lucrari periodice \n"
+"* Permite rasfoirea listelor de materiale intr-o structura completa care "
+"include si listele de materiale secundare si provizorii\n"
+"\n"
+"Tabloul de bord / Rapoartele pentru MRP vor include:\n"
+"-----------------------------------------\n"
+"* Achizitii in exceptie (Grafic)\n"
+"* Variatia Valorii Stocului (Grafic)\n"
+"*Analiza Ordinelor de lucru\n"
+"    "
 
 #. module: base
 #: view:ir.attachment:0
@@ -3956,6 +4527,14 @@ msgid ""
 "easily\n"
 "keep track and order all your purchase orders.\n"
 msgstr ""
+"\n"
+"Acest modul va permite sa gestionati Solicitarile pentru Achizitii.\n"
+"===========================================================\n"
+"\n"
+"Atunci cand este creata o comanda de achizitie aveti ocazia de a salva\n"
+"cererea relationata cu aceasta. Acest obiect nou se va regrupa si va va "
+"permite sa\n"
+"tineti evidenta cu usurinta si sa va ordonati toate comenzile de achizitie.\n"
 
 #. module: base
 #: help:ir.mail_server,smtp_host:0
@@ -3970,17 +4549,17 @@ msgstr "Antarctica"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Persoane"
 
 #. module: base
 #: view:base.language.import:0
 msgid "_Import"
-msgstr "_Importati"
+msgstr "_Importa"
 
 #. module: base
 #: field:res.users,action_id:0
 msgid "Home Action"
-msgstr "Actiune acasa"
+msgstr "Actiunea Initiala"
 
 #. module: base
 #: field:res.lang,grouping:0
@@ -4030,7 +4609,7 @@ msgstr "Interactiune intre norme"
 #: field:res.company,rml_footer:0
 #: field:res.company,rml_footer_readonly:0
 msgid "Report Footer"
-msgstr ""
+msgstr "Subsolul paginii Raportului"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -4040,7 +4619,7 @@ msgstr "De la dreapta la stanga"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (partea olandeza)"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -4055,7 +4634,7 @@ msgstr "Filtre"
 #: view:ir.cron:0
 #: model:ir.ui.menu,name:base.menu_ir_cron_act
 msgid "Scheduled Actions"
-msgstr "Actiuni planificate."
+msgstr "Actiuni Planificate"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_reporting
@@ -4085,7 +4664,7 @@ msgstr "Recursivitate detectata."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_et
 msgid "Ethiopia - Accounting"
-msgstr ""
+msgstr "Etiopia - Contabilitate"
 
 #. module: base
 #: code:addons/base/module/module.py:366
@@ -4115,6 +4694,24 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Acest modul va permite sa definiti care este functia implicita a unui anumit "
+"utilizator intr-un anumit cont.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"Acest modul este folosit mai ales atunci cand un utilizator isi "
+"inregistreaza fisa de pontaj: valorile sunt recuperate\n"
+"si campurile sunt completate automat. Dar posibilitatea de a schimba aceste "
+"valori este inca disponibila.\n"
+"\n"
+"Este evident faptul ca daca nu au fost inregistrate date pentru contul "
+"curent, valoarea\n"
+"implicita este data ca de obicei de catre datele angajatului, astfel ca "
+"acest modul este perfect\n"
+"compatibil cu configurarile mai vechi.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -4130,7 +4727,7 @@ msgstr "Togo"
 #: field:ir.actions.act_window,res_model:0
 #: field:ir.actions.client,res_model:0
 msgid "Destination Model"
-msgstr ""
+msgstr "Model Destinatie"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -4154,7 +4751,7 @@ msgstr "Urdu / اردو"
 #: code:addons/orm.py:3901
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Acces Interzis"
 
 #. module: base
 #: field:res.company,name:0
@@ -4209,6 +4806,28 @@ msgid ""
 "      payslip interface, but not in the payslip report\n"
 "    "
 msgstr ""
+"\n"
+"Normele de salarizare franceze.\n"
+"=====================\n"
+"\n"
+"    - Configuratia lui hr_payroll pentru localizarea franceza\n"
+"    - Toate normele de contributie pentru foaia de salarizare franceza, "
+"pentru 'executiv' si 'non-executiv'\n"
+"    - Raport nou de salarizare\n"
+"\n"
+"DE EFECTUAT:\n"
+"-----\n"
+"    - Integrarea cu modulul concedii pentru deduceri si indemnizatii\n"
+"    - Integrarea cu hr_payroll_account (cont_salarizare_resurse_umane) "
+"pentru crearea automata a account_move_line\n"
+"      (linie_miscare_cont) din foaia de salarizare\n"
+"    - Continua integrarea contributiei. Doar contributiile principale sunt\n"
+"      implementate in prezent\n"
+"    - Reface raportul in webkit\n"
+"    - Linie.foaie de salarizare cu apare_pe_foaia_de_salarizare = Fals apare "
+"in\n"
+"      interfata foii de salarizare, dar nu si in raportul ei\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.pm
@@ -4235,11 +4854,23 @@ msgid ""
 "If you need to manage your meetings, you should install the CRM module.\n"
 "    "
 msgstr ""
+"\n"
+"Acesta este un sistem calendar complet.\n"
+"========================================\n"
+"\n"
+"Permite:\n"
+"------------\n"
+"    - Calendar al evenimentelor\n"
+"    - Evenimente recurente\n"
+"\n"
+"Daca trebuie sa va gestionati intalnirile, ar trebui sa instalati modulul "
+"MRC.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.je
 msgid "Jersey"
-msgstr ""
+msgstr "Jersey"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_translation
@@ -4264,7 +4895,7 @@ msgstr "%x- Reprezentarea adecvata a datei."
 #. module: base
 #: view:res.partner:0
 msgid "Tag"
-msgstr ""
+msgstr "Eticheta"
 
 #. module: base
 #: view:res.lang:0
@@ -4304,7 +4935,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovacia"
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -4315,7 +4946,7 @@ msgstr "Nauru"
 #: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
-msgstr ""
+msgstr "Reg"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -4347,9 +4978,9 @@ msgid ""
 msgstr ""
 "\n"
 "Plan de conturi italian al unei companii generale.\n"
-"==============================================\n"
+"================================================\n"
 "\n"
-"Plan de conturi italian si localizarea lui.\n"
+"Plan de conturi si localizare italiene.\n"
 "    "
 
 #. module: base
@@ -4421,6 +5052,41 @@ msgid ""
 ".. _link: http://puc.com.co/normatividad/\n"
 "    "
 msgstr ""
+"\n"
+"Plan de conturi pentru Columbia\n"
+"=============================\n"
+"\n"
+"Sursa acestui plan de conturi este aici_.\n"
+"\n"
+"Toata documentatia disponibila pe aceasta pagina de Internet este "
+"incorporata in acest modul, pentru\n"
+"a va asigura ca atunci cand deschideti OpenERP aveti toate informatiile "
+"necesare pentru a gestiona\n"
+"contabilitatea in Columbia.\n"
+"\n"
+"Legea care valideaza acest plan de conturi pentru aceasta tara este\n"
+"disponibila la acest link_.\n"
+"\n"
+"Acest modul intentioneaza sa faca disponibil planul de \n"
+"conturi pentru Columbia in Openerp.\n"
+"\n"
+"Recomandam instalarea modulului account_anglo_saxon (cont_anglo_saxon) "
+"pentru a avea\n"
+"calculele setate corect in facturi.\n"
+"\n"
+"Dupa instalarea acestui modul, este lansat wizardul de Configurare pentru "
+"contabilitate.\n"
+"    * Avem sabloanele conturilor care pot fi utile pentru a genera Planuri "
+"de Conturi.\n"
+"    * In acel wizard anumit, vi se va cere sa introduceti numele companiei,\n"
+"      sablonul planului de urmat, numarul de cifre care vor fi generate, "
+"codul pentru\n"
+"      contul dumneavoastra si contul bancar, moneda pentru crearea "
+"jurnalelor.\n"
+"\n"
+".._aici: http://puc.com.co/\n"
+".._link: http://puc.com.com/regulament/\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_extensions
@@ -4444,6 +5110,26 @@ msgid ""
 "      and iban account numbers\n"
 "    "
 msgstr ""
+"\n"
+"Modul care extinde obiectul account_bank_statement_line "
+"(linie_extras_de_cont) standard pentru asistenta e-banking imbunatatita.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"Acest modul adauga:\n"
+"-----------------\n"
+"    - data valutei\n"
+"    - serii plati\n"
+"    - trasabilitatea schimbarilor liniilor extrasului bancar\n"
+"    - vizualizarile liniei extrasului bancar\n"
+"    - raportul soldului extraselor bancare\n"
+"    - imbunatatiri ale performantei pentru importul digital al extrasului "
+"bancar (prin \n"
+"      contextul 'ebanking_import')\n"
+"    - name_search (cautare_nume) in res.partener.bank (res.banca.partener) "
+"permite cautarea numarului \n"
+"      de cont si a codului iban\n"
+"    "
 
 #. module: base
 #: selection:ir.module.module,state:0
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 571ad6dc918..1b5d499e0fe 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-05 09:43+0000\n"
-"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
+"PO-Revision-Date: 2012-12-26 11:53+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-12-22 05:06+0000\n"
+"X-Launchpad-Export-Date: 2012-12-27 05:22+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: base
@@ -24,21 +24,25 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Модуль для проверки написания и проверки печати.\n"
+"================================================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr "Остров Святой Елены"
+msgstr "Остров Св. Елены"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "Другие настройки"
+msgstr "Прочие настройки"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr "DateTime"
+msgstr "Дата и время"
 
 #. module: base
 #: code:addons/fields.py:643
@@ -65,7 +69,7 @@ msgstr "Предложение, заказ продажи, доставка и 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr "Неразрывно"
+msgstr "Без пропусков"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -94,13 +98,13 @@ msgstr "Сенсорный интерфейс для магазинов"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "Индийская платежная ведомость"
 
 #. module: base
 #: help:ir.cron,model:0
 msgid ""
 "Model name on which the method to be called is located, e.g. 'res.partner'."
-msgstr "Имя модели, метод которого будет вызван. Например \"res.partner\""
+msgstr "Имя модели, метод которой будет вызван. Например \"res.partner\""
 
 #. module: base
 #: view:ir.module.module:0
@@ -122,6 +126,17 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"Модуль который добавляет производителей и характеристики на форму продукта.\n"
+"===================================================================\n"
+"\n"
+"Теперь вы можете определить следующее для продукта:\n"
+"-----------------------------------------------\n"
+"    * Производитель\n"
+"    * Наименование продукта у производителя\n"
+"    * Код продукта у производителя\n"
+"    * Характеристики продукта\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params:0
@@ -158,7 +173,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
-msgstr "Ссылка"
+msgstr "Обозначение"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
@@ -173,7 +188,7 @@ msgstr "Окно назначения"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr "Главный путь к файлу отчета"
+msgstr "Путь к главному файлу отчёта"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -194,6 +209,16 @@ msgid ""
 "revenue\n"
 "reports."
 msgstr ""
+"\n"
+"Генерируйте Счета из Затрат, Записей расписания.\n"
+"========================================================\n"
+"\n"
+"Модуль для генерации счетов основанных на издержках (человеческие ресурсы, "
+"затраты, ...).\n"
+"\n"
+"Можно определять прайс-листы в аналитическом счете, делать некоторые "
+"теоретические отчеты \n"
+"о доходах."
 
 #. module: base
 #: code:addons/base/ir/ir_sequence.py:104
@@ -201,7 +226,7 @@ msgstr ""
 #: code:addons/base/res/res_users.py:467
 #, python-format
 msgid "Warning!"
-msgstr "Предупреждение!"
+msgstr "Внимание!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:399
@@ -323,6 +348,8 @@ msgid ""
 "Database ID of record to open in form view, when ``view_mode`` is set to "
 "'form' only"
 msgstr ""
+"Идентификатор записи в базе данных для открытия в виде формы, когда "
+"``view_mode`` установлено только в 'form'"
 
 #. module: base
 #: help:ir.values,key2:0
@@ -386,6 +413,14 @@ msgid ""
 "invoices from picking, OpenERP is able to add and compute the shipping "
 "line.\n"
 msgstr ""
+"\n"
+"Позволяет вам добавлять способы доставки в заказы продаж и комплектовочные "
+"листы.\n"
+"==============================================================\n"
+"\n"
+"Вы можете определить вашего собственного перевозчика и таблицы стоимости "
+"доставки. Когда счета создаются  из комплектовочного листа, OpenERP может "
+"добавлять и подсчитывать стоимость доставки.\n"
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:80
@@ -491,7 +526,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "Название связи"
 
 #. module: base
 #: view:ir.rule:0
@@ -698,7 +733,7 @@ msgstr ""
 #. module: base
 #: field:res.company,logo_web:0
 msgid "Logo Web"
-msgstr ""
+msgstr "Web логотип"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:339
@@ -709,7 +744,7 @@ msgstr "Названия пользовательских полей должн
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Мексика - Учет"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -757,6 +792,32 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Бухгалтерский учет и управление финансами.\n"
+"====================================\n"
+"\n"
+"Финансовый и бухгалтерский модуль включает в себя:\n"
+"--------------------------------------------\n"
+"    * Основы бухучета\n"
+"    * Затраты/аналитический учет\n"
+"    * Учет третьей стороны\n"
+"    * Управление налогами\n"
+"    * Бюджеты\n"
+"    * Выставление счетов клиентам и поставщиками\n"
+"    * Банковские выписки\n"
+"    * Процесс сверки с партнерами\n"
+"\n"
+"Создает информационную панель для бухгалтеров, включающую в себя:\n"
+"--------------------------------------------------\n"
+"    * Список счетов клиентам на утверждение\n"
+"    * Анализ компании\n"
+"    * График остатка денежных средств\n"
+"\n"
+"Процессы такие как ведение главной бухгалтерской книги выполнены через "
+"объявленные финансовые журналы (записи движения группируются по журналам) "
+"для конкретного финансового года и для подготовки ваучеров есть модуль "
+"account_voucher.\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -790,6 +851,11 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web LinkedIn модуль.\n"
+"============================\n"
+"Этот модуль предоставляет интеграцию LinkedIn с OpenERP.\n"
+"        "
 
 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -841,7 +907,7 @@ msgstr "Автоматические действия"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro
 msgid "Romania - Accounting"
-msgstr ""
+msgstr "Румыния - Учет"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
@@ -997,6 +1063,7 @@ msgstr "Зимбабве"
 msgid ""
 "Type of the constraint: `f` for a foreign key, `u` for other constraints."
 msgstr ""
+"Тип ограничения: `f` для внешнего ключа, `u` для остальных ограничений."
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -1193,7 +1260,7 @@ msgstr "Модель документа"
 #. module: base
 #: view:res.users:0
 msgid "Change the user password."
-msgstr ""
+msgstr "Изменение пароля пользователя."
 
 #. module: base
 #: view:res.lang:0
@@ -1423,6 +1490,8 @@ msgid ""
 "                                for uploading to OpenERP's translation "
 "platform,"
 msgstr ""
+"TGZ формат: это сжатый архив содержащий PO файл, непосредственно пригодный\n"
+"                                для загрузки в платформу переводов OpenERP,"
 
 #. module: base
 #: view:res.lang:0
@@ -1449,7 +1518,7 @@ msgstr "Тесты"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save as Attachment Prefix"
-msgstr ""
+msgstr "Сохранить как префикс вложения"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1486,7 +1555,7 @@ msgstr "Гаити"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
 msgid "French Payroll"
-msgstr ""
+msgstr "Французская платежная ведомость"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -1614,6 +1683,12 @@ msgid ""
 "=============\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль добавляет меню претензий и функций для вашего портала, если "
+"претензии и портал установленны.\n"
+"============================================================================="
+"=============\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
@@ -1835,6 +1910,10 @@ msgid ""
 "Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
+"Вручную: запускаемый вручную.\n"
+"Автоматически: Работает каждый раз когда в системе изменилась конфигурация.\n"
+"Запустить вручную один раз: после того как было запущено вручную, это "
+"устанавливается автоматически в Выполнено."
 
 #. module: base
 #: field:res.partner,image_small:0
@@ -1872,7 +1951,7 @@ msgstr "Действия сервера"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Люксембург - Учет"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1920,6 +1999,14 @@ msgid ""
 "It assigns manager and user access rights to the Administrator and only user "
 "rights to the Demo user. \n"
 msgstr ""
+"\n"
+"Права доступа к учету\n"
+"========================\n"
+"Предоставляет администратору доступ ко всем функциям учета таким как записи "
+"журнала и план счетов.\n"
+"\n"
+"Назначает права управляющего и пользователя администратору, и только права "
+"пользователя демо пользователю. \n"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1942,6 +2029,8 @@ msgstr ""
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
 msgstr ""
+"Неизвестное значение '%s' для логического поля '%%(поле)я' принимая во "
+"внимание '%s'"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -1951,7 +2040,7 @@ msgstr "Нидерланды"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_event
 msgid "Portal Event"
-msgstr ""
+msgstr "Событие Портала"
 
 #. module: base
 #: selection:ir.translation,state:0
@@ -1982,7 +2071,7 @@ msgstr "Доступ на чтение"
 #. module: base
 #: help:ir.attachment,res_id:0
 msgid "The record id this is attached to"
-msgstr ""
+msgstr "Прикреплено к идентификатору записи"
 
 #. module: base
 #: model:ir.module.module,description:base.module_share
@@ -2276,7 +2365,7 @@ msgstr "Логотип"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Коста Рика - Учет"
 
 #. module: base
 #: selection:ir.actions.act_url,target:0
@@ -2341,7 +2430,7 @@ msgstr "Метод"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
 msgid "Password Encryption"
-msgstr ""
+msgstr "Шифрование пароля"
 
 #. module: base
 #: view:workflow.activity:0
@@ -2386,7 +2475,7 @@ msgstr ""
 #. module: base
 #: field:change.password.user,new_passwd:0
 msgid "New Password"
-msgstr ""
+msgstr "Новый пароль"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2569,6 +2658,9 @@ msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
 msgstr ""
+"Тип вида: Тип дерева для использования в качестве вида дерева, установите в "
+"'дерево' для иерархического древовидного отображения, или 'форма' для "
+"обычного отображения в виде списка"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -3235,7 +3327,7 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
-msgstr ""
+msgstr "Девиз компании"
 
 #. module: base
 #: code:addons/base/res/res_users.py:668
@@ -3758,6 +3850,13 @@ msgid ""
 "easily\n"
 "keep track and order all your purchase orders.\n"
 msgstr ""
+"\n"
+"Этот модуль позволяет управлять запросами на закупку.\n"
+"=====================================================\n"
+"\n"
+"Когда запрос на закупку создан, вы можете сохранить связанные \n"
+"требования. Этот новый объект перестроит и позволит вам легко\n"
+"отслеживать и сортировать все заказы закупки.\n"
 
 #. module: base
 #: help:ir.mail_server,smtp_host:0
@@ -4038,6 +4137,17 @@ msgid ""
 "If you need to manage your meetings, you should install the CRM module.\n"
 "    "
 msgstr ""
+"\n"
+"Это полноценная система календаря.\n"
+"==================================\n"
+"\n"
+"Поддерживает:\n"
+"-------------\n"
+"    - Календарь событий\n"
+"    - Повторяющиеся события\n"
+"\n"
+"Если вам нужно управлять вашими встречами, вы должны установить модуль CRM.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.je
@@ -4118,7 +4228,7 @@ msgstr "Науру"
 #: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
-msgstr ""
+msgstr "Рег"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -4276,7 +4386,7 @@ msgstr "ООО"
 #. module: base
 #: model:ir.actions.server,name:base.action_run_ir_action_todo
 msgid "Run Remaining Action Todo"
-msgstr ""
+msgstr "Запуск остальных действий"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -4312,7 +4422,7 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Италия - Учет"
 
 #. module: base
 #: field:ir.actions.act_url,help:0
@@ -4435,7 +4545,7 @@ msgstr "res.config"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Польша - Учет"
 
 #. module: base
 #: view:ir.cron:0
@@ -4528,7 +4638,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_sale
 msgid "Quotations, Sales Orders, Invoicing"
-msgstr ""
+msgstr "Предложения, заказы продаж, счета"
 
 #. module: base
 #: field:res.partner,parent_id:0
@@ -4881,7 +4991,7 @@ msgstr "Палестинская территория, оккупированн
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Швейцария - Учет"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -5040,7 +5150,7 @@ msgstr "Закупка"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese (BR) / Português (BR)"
-msgstr ""
+msgstr "Португальский (BR) / Português (BR)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
@@ -5050,7 +5160,7 @@ msgstr "ir.needaction_mixin"
 #. module: base
 #: view:base.language.export:0
 msgid "This file was generated using the universal"
-msgstr ""
+msgstr "Этот файл был сгенерирован используя универсальный"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -5070,7 +5180,7 @@ msgstr "Интеграция Google Docs"
 #. module: base
 #: help:ir.attachment,res_model:0
 msgid "The database object this attachment will be attached to"
-msgstr ""
+msgstr "Объект базы данных, к которому относится это вложение"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:327
@@ -5304,7 +5414,7 @@ msgstr "Права доступа"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese / Português"
-msgstr ""
+msgstr "Португальский / Português"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:366
@@ -5436,6 +5546,10 @@ msgid ""
 "================\n"
 "\n"
 msgstr ""
+"\n"
+"Openerp Web API.\n"
+"================\n"
+"\n"
 
 #. module: base
 #: selection:res.request,state:0
@@ -5628,6 +5742,14 @@ msgid ""
 "wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Мастер счетов для доставки.\n"
+"===========================\n"
+"\n"
+"Когда вы отправляете или доставляете товары, этот модуль автоматически "
+"запускает мастер\n"
+"выставления счета если на доставку должен быть выставлен счет.\n"
+"    "
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -6179,6 +6301,12 @@ msgid ""
 "Allows users to create custom dashboard.\n"
 "    "
 msgstr ""
+"\n"
+"Позволяет пользователю создать произвольную информационную панель.\n"
+"==================================================================\n"
+"\n"
+"Позволяет пользователю создать произвольную информационную панель.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -6245,7 +6373,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Бельгия - Платежная ведомость"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6271,7 +6399,7 @@ msgstr "Без категории"
 #. module: base
 #: view:res.partner:0
 msgid "Phone:"
-msgstr ""
+msgstr "Телефон:"
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6320,6 +6448,10 @@ msgid ""
 "========================\n"
 "\n"
 msgstr ""
+"\n"
+"OpenERP Web вид канбан.\n"
+"=======================\n"
+"\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:182
@@ -6557,6 +6689,13 @@ msgid ""
 "Price and Cost Price.\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль добавляет 'прибыль' в заказ продаж.\n"
+"===============================================\n"
+"\n"
+"Прибыль, определяется как разница между ценой единицы товара и его "
+"себестоимостью.\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -6593,6 +6732,9 @@ msgid ""
 "the user will be able to manage his own human resources stuff (leave "
 "request, timesheets, ...), if he is linked to an employee in the system."
 msgstr ""
+"пользователь сможет управлять собственными человеческими ресурсами (запросы "
+"на отгулы, табель рабочего времени, ...), если он связан с работодателем в "
+"этой системе."
 
 #. module: base
 #: code:addons/orm.py:2246
@@ -6786,7 +6928,7 @@ msgstr "Проведение аудита"
 #: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
-msgstr ""
+msgstr "Значение '%s' не найдено в поле выбора '%%(field)s'"
 
 #. module: base
 #: model:res.country,name:base.sd
@@ -6893,7 +7035,7 @@ msgstr "Иногда называемый БИК или Swift."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "Indian - Accounting"
-msgstr ""
+msgstr "Индия - Учет"
 
 #. module: base
 #: field:res.lang,time_format:0
@@ -6960,6 +7102,12 @@ msgid ""
 "This module provides the core of the OpenERP Web Client.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web базовый модуль.\n"
+"===========================\n"
+"\n"
+"Этот модуль предоставляет ядро клиента OpenERP Web.\n"
+"        "
 
 #. module: base
 #: view:ir.sequence:0
@@ -7065,7 +7213,7 @@ msgstr "Рабочие элементы"
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Invalid Bank Account Type Name format."
-msgstr ""
+msgstr "Неверный формат типа имени банковского счета"
 
 #. module: base
 #: view:ir.filters:0
@@ -7508,7 +7656,7 @@ msgstr "Пожалуйста, укажите действие для запус
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Эквадор - учет"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -7523,12 +7671,12 @@ msgstr "Северные Марианские острова"
 #. module: base
 #: field:change.password.user,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Логин пользователя"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Гондурас - учет"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
@@ -7766,7 +7914,7 @@ msgstr "Данное окно"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_anonymous
 msgid "Anonymous portal"
-msgstr ""
+msgstr "Анонимный портал"
 
 #. module: base
 #: field:base.language.export,format:0
@@ -7823,7 +7971,7 @@ msgstr "Пароль"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_claim
 msgid "Portal Claim"
-msgstr ""
+msgstr "Портал претензий"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pe
@@ -8127,6 +8275,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Нажмите чтобы добавить контакт в вашу адресную книгу.\n"
+"              </p><p>\n"
+"                OpenERP помогает вам легко отслеживать всю активность "
+"связанную с\n"
+"                клиентом: общение, историю деловых возможностей, \n"
+"                документы и т.д.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -8412,7 +8569,7 @@ msgstr "Финляндия"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_shortcuts
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Web закладки"
 
 #. module: base
 #: view:res.partner:0
@@ -8498,7 +8655,7 @@ msgstr "Кувейт"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Управление напоминаниями о платежах"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -9453,7 +9610,7 @@ msgstr "Ничего"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
 msgid "Leave Management"
-msgstr ""
+msgstr "Управление отгулами/отпусками"
 
 #. module: base
 #: model:res.company,overdue_msg:base.main_company
@@ -9469,6 +9626,16 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Уважаемые господа,\n"
+"\n"
+"Наши записи зафиксировали что некоторые платежи остаются неоплаченными. "
+"Пожалуйста ознакомьтесь с подробностями ниже.\n"
+"Если сумма уже была оплачена, пожалуйста проигнорируйте это оповещение. В "
+"ином случае, пожалуйста перечислите нам всю сумму отображенную ниже.\n"
+"Если у вас есть какие-либо замечания, пожалуйста свяжитесь с нами.\n"
+"\n"
+"Заранее благодарим за сотрудничество.\n"
+"С наилучшими пожеланиями,"
 
 #. module: base
 #: view:ir.module.category:0
@@ -10077,7 +10244,7 @@ msgstr "Описание полей"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
 msgid "Contracts Management: hr_expense link"
-msgstr ""
+msgstr "Управление контрактами: ссылка hr_expense"
 
 #. module: base
 #: view:ir.attachment:0
@@ -10111,7 +10278,7 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Сохраненный файл"
 
 #. module: base
 #: field:res.partner,use_parent_address:0
@@ -10121,7 +10288,7 @@ msgstr "Использовать адрес компании"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_holidays
 msgid "Holidays, Allocation and Leave Requests"
-msgstr ""
+msgstr "Праздники, отпуска, отгулы"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_hello
@@ -10335,7 +10502,7 @@ msgstr "Ед. изм. интервала"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_stock
 msgid "Portal Stock"
-msgstr ""
+msgstr "Портал - запасы"
 
 #. module: base
 #: field:workflow.activity,kind:0
@@ -10446,7 +10613,7 @@ msgstr "Содержание файла"
 #: view:ir.model.relation:0
 #: model:ir.ui.menu,name:base.ir_model_relation_menu
 msgid "ManyToMany Relations"
-msgstr ""
+msgstr "Связи ManyToMany"
 
 #. module: base
 #: model:res.country,name:base.pa
@@ -10557,12 +10724,12 @@ msgstr ""
 #. module: base
 #: help:ir.model.constraint,name:0
 msgid "PostgreSQL constraint or foreign key name."
-msgstr ""
+msgstr "Ограничение PostgreSQL или имя внешнего ключа."
 
 #. module: base
 #: view:res.company:0
 msgid "Click to set your company logo."
-msgstr ""
+msgstr "Нажмите, чтобы установить логотип Вашей компании."
 
 #. module: base
 #: view:res.lang:0
@@ -11077,7 +11244,7 @@ msgstr "Тип нумерации"
 #. module: base
 #: view:res.partner:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Мобильный:"
 
 #. module: base
 #: code:addons/base/res/res_bank.py:195
@@ -11098,7 +11265,7 @@ msgstr "Или"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br
 msgid "Brazilian - Accounting"
-msgstr ""
+msgstr "Бразилия - учет"
 
 #. module: base
 #: model:res.country,name:base.pk
@@ -11227,7 +11394,7 @@ msgstr "Канцтовары"
 #. module: base
 #: field:ir.attachment,res_model:0
 msgid "Resource Model"
-msgstr ""
+msgstr "Модель ресурса"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -11404,7 +11571,7 @@ msgstr "Название области"
 #. module: base
 #: help:ir.attachment,type:0
 msgid "Binary File or URL"
-msgstr ""
+msgstr "Двоичный файл или URL"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:313
@@ -12255,7 +12422,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Please make sure no workitems refer to an activity before deleting it!"
-msgstr ""
+msgstr "Убедитесь в отсутствии ссылок на действие перед его удалением !"
 
 #. module: base
 #: model:res.country,name:base.tr
@@ -12384,7 +12551,7 @@ msgstr "Выбор"
 #: model:ir.actions.act_window,name:base.change_password_wizard_action
 #: view:res.users:0
 msgid "Change Password"
-msgstr ""
+msgstr "Изменить пароль"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -12676,7 +12843,7 @@ msgstr "Мальдивы"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_crm
 msgid "Portal CRM"
-msgstr ""
+msgstr "Портал CRM"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_4
@@ -13179,7 +13346,7 @@ msgstr "Настройки"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
 msgid "Components Buyer"
-msgstr ""
+msgstr "Покупатель комплектующих"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_tests_demo
@@ -13394,7 +13561,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_test
 msgid "Accounting Consistency Tests"
-msgstr ""
+msgstr "Проверка согласованности учета"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
@@ -13720,7 +13887,7 @@ msgstr "Поле osv_memory можно сравнивать только с по
 #. module: base
 #: view:res.partner:0
 msgid "Fax:"
-msgstr ""
+msgstr "Факс:"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -13740,7 +13907,7 @@ msgstr "Комплектование перед изготовлением"
 #. module: base
 #: model:ir.module.module,summary:base.module_note_pad
 msgid "Sticky memos, Collaborative"
-msgstr ""
+msgstr "Заметки, совместная деятельность"
 
 #. module: base
 #: model:res.country,name:base.wf

From 9faf27da5ecef92f5e6909ea69d33b21563db4f9 Mon Sep 17 00:00:00 2001
From: Michael Telahun Makonnen <mmakonnen@gmail.com>
Date: Thu, 27 Dec 2012 10:52:00 +0300
Subject: [PATCH 12/12] Enable loading of Amharic (Ethiopia) language.

bzr revid: mmakonnen@gmail.com-20121227075200-junjlo2sj4vxk87h
---
 openerp/tools/misc.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 47a2ae4faac..1d40006144e 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -433,6 +433,7 @@ def get_iso_codes(lang):
 
 ALL_LANGUAGES = {
         'ab_RU': u'Abkhazian / аҧсуа',
+        'am_ET': u'Amharic / አምሃርኛ',
         'ar_SY': u'Arabic / الْعَرَبيّة',
         'bg_BG': u'Bulgarian / български език',
         'bs_BS': u'Bosnian / bosanski jezik',